@riddix/hamh 2.0.42 → 2.0.44

package/dist/backend/cli.js

@@ -145734,6 +145734,9 @@ var init_home_assistant_filter = __esm({
       HomeAssistantMatcherType2["Label"] = "label";
       HomeAssistantMatcherType2["EntityLabel"] = "entity_label";
       HomeAssistantMatcherType2["DeviceLabel"] = "device_label";
+      HomeAssistantMatcherType2["EntityLabelRegex"] = "entity_label_regex";
+      HomeAssistantMatcherType2["DeviceLabelRegex"] = "device_label_regex";
+      HomeAssistantMatcherType2["AnyFieldRegex"] = "any_field_regex";
       HomeAssistantMatcherType2["Area"] = "area";
       HomeAssistantMatcherType2["EntityCategory"] = "entity_category";
       HomeAssistantMatcherType2["DeviceName"] = "device_name";
@@ -146125,6 +146128,7 @@ var init_clusters2 = __esm({
       ClusterId3["pm10ConcentrationMeasurement"] = "pm10ConcentrationMeasurement";
       ClusterId3["pm25ConcentrationMeasurement"] = "pm25ConcentrationMeasurement";
       ClusterId3["powerSource"] = "powerSource";
+      ClusterId3["powerTopology"] = "powerTopology";
       ClusterId3["pressureMeasurement"] = "pressureMeasurement";
       ClusterId3["relativeHumidityMeasurement"] = "relativeHumidityMeasurement";
       ClusterId3["smokeCoAlarm"] = "smokeCoAlarm";
@@ -146638,7 +146642,7 @@ var init_bridge_config_schema = __esm({
             {
               const: "regex",
               title: "regex",
-              description: "Full regular expression matching entity IDs. Use ^ and $ for anchors. Example: '^(light|switch)\\.kitchen_.*' matches all kitchen lights and switches."
+              description: "Regex tested against the entity_id only (e.g. 'light.kitchen_lamp'). For labels use entity_label_regex or device_label_regex. Example: '^(light|switch)\\.kitchen_.*'."
             },
             {
               const: "domain",
@@ -146665,6 +146669,21 @@ var init_bridge_config_schema = __esm({
               title: "device_label",
               description: "Matches ALL entities of a device if the device has this label. Use this to include a complete device with all its entities."
             },
+            {
+              const: "entity_label_regex",
+              title: "entity_label_regex",
+              description: "Regex tested against entity-label slugs and display names. Matches if any label assigned to the entity matches. Example: '^(matter|voice).*'."
+            },
+            {
+              const: "device_label_regex",
+              title: "device_label_regex",
+              description: "Regex tested against device-label slugs and display names. Matches ALL entities of a device whose label matches. Example: '^(matter|voice).*'."
+            },
+            {
+              const: "any_field_regex",
+              title: "any_field_regex",
+              description: "Regex tested against a single-line key=value haystack covering entity_id, domain, platform, area, entity_category, device_class, entity_labels, entity_label_names, device_labels, device_label_names, device_name, product_name. Use lookaheads for AND, alternation for OR. Example: '(?=.*domain=light)(?=.*area=living_room)|(?=.*domain=switch)(?=.*entity_labels=.*\\bvoice\\b)'."
+            },
             {
               const: "area",
               title: "area",
@@ -146781,7 +146800,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 +146818,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: {
@@ -146813,6 +146832,20 @@ var init_bridge_config_schema = __esm({
           description: "Workaround for Alexa resetting light brightness to 100% after subscription renewal. When enabled, the bridge ignores brightness commands that set lights to 100% within 200ms of a turn-on command for the same light. WARNING: breaks Apple Home's 'set room to 100%' Siri commands, which use the same on() + moveToLevel(254) pattern. Only enable on Alexa-only bridges.",
           type: "boolean",
           default: false
+        },
+        useHaRegistrySerial: {
+          title: "Use HA Registry Serial Number",
+          description: "Fall back to the Home Assistant device registry serial_number when no per-entity customSerialNumber is configured. Default off because changing serialNumber after commissioning can confuse controllers. A per-entity customSerialNumber still takes precedence.",
+          type: "boolean",
+          default: false
+        },
+        coverSliderDebounceMs: {
+          title: "Cover Slider Debounce (ms)",
+          description: "Override the cover position-update debounce window for this bridge. Some controllers (Apple Home) stream slider updates while the user is still dragging, causing covers to start moving toward an intermediate target. Set to the time the bridge should wait after the last update before sending the final value to Home Assistant. 0 keeps the built-in two-phase debounce (400 ms initial / 150 ms subsequent), which fits most controllers. Try 800\u20131500 ms for slow blinds. A per-entity override on a single cover wins over this flag.",
+          type: "number",
+          minimum: 0,
+          maximum: 5e3,
+          default: 0
         }
       }
     };
@@ -146879,6 +146912,14 @@ var init_bridge_config_schema = __esm({
           description: "Append a suffix to every entity serial number on this bridge. Useful for forcing controllers like Aqara to treat devices as new and bypass cached device data. Leave empty for default behavior.",
           maxLength: 16
         },
+        sessionMaxAgeHours: {
+          title: "Session Rotation Max Age (hours)",
+          type: "number",
+          description: "Server Mode only. Rotate matter sessions older than this many hours so iPhone clients re-subscribe and Apple Home unsticks 'Updating' tiles. Set 0 to disable rotation. Range 0-168, default 4. (#287)",
+          default: 4,
+          minimum: 0,
+          maximum: 168
+        },
         filter: homeAssistantFilterSchema,
         featureFlags: featureFlagSchema
       },
@@ -147325,7 +147366,7 @@ var HA_MESSAGE_TIMEOUT_MS;
 var init_send_ha_message = __esm({
   "src/utils/send-ha-message.ts"() {
     "use strict";
-    HA_MESSAGE_TIMEOUT_MS = 3e4;
+    HA_MESSAGE_TIMEOUT_MS = 6e4;
   }
 });
 
@@ -147873,6 +147914,7 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                     mopIntensityEntity: config10.mopIntensityEntity,
                     valetudoIdentifier: config10.valetudoIdentifier,
                     coverSwapOpenClose: config10.coverSwapOpenClose,
+                    coverSliderDebounceMs: config10.coverSliderDebounceMs,
                     disableClimateOnOff: config10.disableClimateOnOff,
                     disableClimateFanControl: config10.disableClimateFanControl,
                     customServiceAreas: config10.customServiceAreas,
@@ -148020,6 +148062,7 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                   temperatureEntity: config10.temperatureEntity,
                   valetudoIdentifier: config10.valetudoIdentifier,
                   coverSwapOpenClose: config10.coverSwapOpenClose,
+                  coverSliderDebounceMs: config10.coverSliderDebounceMs,
                   disableClimateOnOff: config10.disableClimateOnOff,
                   disableClimateFanControl: config10.disableClimateFanControl,
                   customServiceAreas: config10.customServiceAreas,
@@ -148390,6 +148433,15 @@ function bridgeIconApi(storageLocation) {
       res.json({ success: true, iconUrl });
     }
   );
+  router.get(
+    "/:bridgeId/exists",
+    (req, res) => {
+      const bridgeId = req.params.bridgeId;
+      const files = fs2.readdirSync(iconsDir);
+      const exists = files.some((f) => f.startsWith(`${bridgeId}.`));
+      res.json({ exists });
+    }
+  );
   router.get("/:bridgeId", (req, res) => {
     const bridgeId = req.params.bridgeId;
     const files = fs2.readdirSync(iconsDir);
@@ -148413,16 +148465,6 @@ function bridgeIconApi(storageLocation) {
     fs2.unlinkSync(filePath);
     res.json({ success: true });
   });
-  router.head("/:bridgeId", (req, res) => {
-    const bridgeId = req.params.bridgeId;
-    const files = fs2.readdirSync(iconsDir);
-    const iconFile = files.find((f) => f.startsWith(`${bridgeId}.`));
-    if (iconFile) {
-      res.status(200).end();
-    } else {
-      res.status(404).end();
-    }
-  });
   return router;
 }
 
@@ -148596,7 +148638,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)
@@ -148607,6 +148656,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(
@@ -148823,6 +148884,7 @@ function entityMappingApi(mappingStorage) {
       customProductName: body.customProductName,
       customVendorName: body.customVendorName,
       customSerialNumber: body.customSerialNumber,
+      customVendorId: body.customVendorId,
       disabled: body.disabled,
       filterLifeEntity: body.filterLifeEntity,
       cleaningModeEntity: body.cleaningModeEntity,
@@ -148841,8 +148903,10 @@ function entityMappingApi(mappingStorage) {
       currentRoomEntity: body.currentRoomEntity,
       valetudoIdentifier: body.valetudoIdentifier,
       coverSwapOpenClose: body.coverSwapOpenClose,
+      coverSliderDebounceMs: body.coverSliderDebounceMs,
       disableClimateOnOff: body.disableClimateOnOff,
       disableClimateFanControl: body.disableClimateFanControl,
+      climateKeepModeOnIdle: body.climateKeepModeOnIdle,
       composedEntities: body.composedEntities
     };
     const config10 = await mappingStorage.setMapping(request);
@@ -149306,8 +149370,10 @@ function configToProfileEntry(config10) {
     customFanSpeedTags: config10.customFanSpeedTags,
     valetudoIdentifier: config10.valetudoIdentifier,
     coverSwapOpenClose: config10.coverSwapOpenClose,
+    coverSliderDebounceMs: config10.coverSliderDebounceMs,
     disableClimateOnOff: config10.disableClimateOnOff,
-    disableClimateFanControl: config10.disableClimateFanControl
+    disableClimateFanControl: config10.disableClimateFanControl,
+    climateKeepModeOnIdle: config10.climateKeepModeOnIdle
   };
 }
 function mappingProfileApi(mappingStorage) {
@@ -149429,8 +149495,10 @@ function mappingProfileApi(mappingStorage) {
           customFanSpeedTags: entry.customFanSpeedTags,
           valetudoIdentifier: entry.valetudoIdentifier,
           coverSwapOpenClose: entry.coverSwapOpenClose,
+          coverSliderDebounceMs: entry.coverSliderDebounceMs,
           disableClimateOnOff: entry.disableClimateOnOff,
-          disableClimateFanControl: entry.disableClimateFanControl
+          disableClimateFanControl: entry.disableClimateFanControl,
+          climateKeepModeOnIdle: entry.climateKeepModeOnIdle
         });
         applied++;
       } catch (e) {
@@ -149482,6 +149550,18 @@ function testMatcher(matcher, device, entity, entityState, labels) {
       const slug = resolveLabelValue(matcher.value, labels);
       return !!device?.labels && device.labels.includes(slug);
     }
+    case "entity_label_regex":
+      return testLabelRegex(matcher.value, entity?.labels, labels);
+    case "device_label_regex":
+      return testLabelRegex(matcher.value, device?.labels, labels);
+    case "any_field_regex":
+      return testAnyFieldRegex(
+        matcher.value,
+        entity,
+        device,
+        entityState,
+        labels
+      );
     case "entity_category":
       return entity?.entity_category === matcher.value;
     case "platform":
@@ -149516,6 +149596,62 @@ function testRegex(pattern2, value) {
     return false;
   }
 }
+function testLabelRegex(pattern2, assigned, labels) {
+  if (!assigned?.length) {
+    return false;
+  }
+  let regex;
+  try {
+    regex = new RegExp(pattern2);
+  } catch {
+    return false;
+  }
+  for (const slug of assigned) {
+    if (regex.test(slug)) {
+      return true;
+    }
+    const named = labels?.find((l) => l.label_id === slug)?.name;
+    if (named && regex.test(named)) {
+      return true;
+    }
+  }
+  return false;
+}
+function testAnyFieldRegex(pattern2, entity, device, entityState, labels) {
+  let regex;
+  try {
+    regex = new RegExp(pattern2);
+  } catch {
+    return false;
+  }
+  return regex.test(buildEntityHaystack(entity, device, entityState, labels));
+}
+function buildEntityHaystack(entity, device, entityState, labels) {
+  const domain = entity.entity_id.split(".")[0];
+  const entityArea = entity.area_id ?? (typeof device?.area_id === "string" ? device.area_id : "");
+  const entityCategory = typeof entity.entity_category === "string" ? entity.entity_category : "";
+  const deviceClass = typeof entityState?.attributes?.device_class === "string" ? entityState.attributes.device_class : "";
+  const entityLabelSlugs = entity.labels ?? [];
+  const deviceLabelSlugs = device?.labels ?? [];
+  const entityLabelNames = entityLabelSlugs.map((slug) => labels?.find((l) => l.label_id === slug)?.name ?? "").filter((name) => name.length > 0);
+  const deviceLabelNames = deviceLabelSlugs.map((slug) => labels?.find((l) => l.label_id === slug)?.name ?? "").filter((name) => name.length > 0);
+  const deviceName = device?.name_by_user ?? device?.name ?? device?.default_name ?? "";
+  const productName = device?.model ?? device?.default_model ?? "";
+  return [
+    `entity_id=${entity.entity_id}`,
+    `domain=${domain}`,
+    `platform=${entity.platform ?? ""}`,
+    `area=${entityArea ?? ""}`,
+    `entity_category=${entityCategory}`,
+    `device_class=${deviceClass}`,
+    `entity_labels=${entityLabelSlugs.join(",")}`,
+    `entity_label_names=${entityLabelNames.join(",")}`,
+    `device_labels=${deviceLabelSlugs.join(",")}`,
+    `device_label_names=${deviceLabelNames.join(",")}`,
+    `device_name=${deviceName}`,
+    `product_name=${productName}`
+  ].join(" ");
+}
 function testDeviceName(pattern2, device) {
   if (!device) {
     return false;
@@ -151608,6 +151744,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 */
@@ -151653,6 +151800,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;
@@ -151992,7 +152159,8 @@ var Options = class {
     return {
       url: this.startOptions.homeAssistantUrl,
       accessToken: this.startOptions.homeAssistantAccessToken,
-      refreshInterval: this.startOptions.homeAssistantRefreshInterval
+      refreshInterval: this.startOptions.homeAssistantRefreshInterval,
+      messageTimeoutMs: this.startOptions.haMessageTimeout
     };
   }
   get webApi() {
@@ -152684,25 +152852,33 @@ init_retry();
 
 // src/services/home-assistant/api/get-registry.ts
 init_send_ha_message();
-async function getRegistry(connection) {
-  return sendHaMessage(connection, {
-    type: "config/entity_registry/list"
-  });
+async function getRegistry(connection, timeoutMs) {
+  return sendHaMessage(
+    connection,
+    { type: "config/entity_registry/list" },
+    timeoutMs
+  );
 }
-async function getDeviceRegistry(connection) {
-  return sendHaMessage(connection, {
-    type: "config/device_registry/list"
-  });
+async function getDeviceRegistry(connection, timeoutMs) {
+  return sendHaMessage(
+    connection,
+    { type: "config/device_registry/list" },
+    timeoutMs
+  );
 }
-async function getLabelRegistry(connection) {
-  return sendHaMessage(connection, {
-    type: "config/label_registry/list"
-  });
+async function getLabelRegistry(connection, timeoutMs) {
+  return sendHaMessage(
+    connection,
+    { type: "config/label_registry/list" },
+    timeoutMs
+  );
 }
-async function getAreaRegistry(connection) {
-  return sendHaMessage(connection, {
-    type: "config/area_registry/list"
-  });
+async function getAreaRegistry(connection, timeoutMs) {
+  return sendHaMessage(
+    connection,
+    { type: "config/area_registry/list" },
+    timeoutMs
+  );
 }
 
 // src/services/home-assistant/home-assistant-registry.ts
@@ -152748,7 +152924,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;
@@ -152805,12 +152981,15 @@ var HomeAssistantRegistry = class extends Service {
         }
       });
     }
+    const timeoutMs = this.options.messageTimeoutMs;
     const [entityRegistry, statesList, deviceRegistry, labels, areas] = await Promise.all([
-      getRegistry(connection),
+      getRegistry(connection, timeoutMs),
       getStates(connection),
-      getDeviceRegistry(connection),
-      getLabelRegistry(connection).catch(() => []),
-      getAreaRegistry(connection).catch(
+      getDeviceRegistry(connection, timeoutMs),
+      getLabelRegistry(connection, timeoutMs).catch(
+        () => []
+      ),
+      getAreaRegistry(connection, timeoutMs).catch(
         () => []
       )
     ]);
@@ -153279,6 +153458,7 @@ var EntityMappingStorage = class extends Service {
       customProductName: request.customProductName?.trim() || void 0,
       customVendorName: request.customVendorName?.trim() || void 0,
       customSerialNumber: request.customSerialNumber?.trim() || void 0,
+      customVendorId: sanitizeVendorId(request.customVendorId),
       disabled: request.disabled,
       filterLifeEntity: request.filterLifeEntity?.trim() || void 0,
       cleaningModeEntity: request.cleaningModeEntity?.trim() || void 0,
@@ -153299,11 +153479,13 @@ var EntityMappingStorage = class extends Service {
       currentRoomEntity: request.currentRoomEntity?.trim() || void 0,
       valetudoIdentifier: request.valetudoIdentifier?.trim() || void 0,
       coverSwapOpenClose: request.coverSwapOpenClose || void 0,
+      coverSliderDebounceMs: sanitizeDebounceMs(request.coverSliderDebounceMs),
       disableClimateOnOff: request.disableClimateOnOff || void 0,
       disableClimateFanControl: request.disableClimateFanControl || void 0,
+      climateKeepModeOnIdle: request.climateKeepModeOnIdle || 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.disableClimateFanControl && (!config10.composedEntities || config10.composedEntities.length === 0)) {
+    if (!config10.matterDeviceType && !config10.customName && !config10.customProductName && !config10.customVendorName && !config10.customSerialNumber && config10.customVendorId === void 0 && 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.coverSliderDebounceMs && !config10.disableClimateOnOff && !config10.disableClimateFanControl && !config10.climateKeepModeOnIdle && (!config10.composedEntities || config10.composedEntities.length === 0)) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config10);
@@ -153323,6 +153505,26 @@ var EntityMappingStorage = class extends Service {
     await this.persist();
   }
 };
+function sanitizeVendorId(value) {
+  if (value === void 0 || value === null || value === "") {
+    return void 0;
+  }
+  const n = typeof value === "string" ? Number(value) : value;
+  if (typeof n !== "number" || !Number.isInteger(n) || n < 1 || n > 65534) {
+    return void 0;
+  }
+  return n;
+}
+function sanitizeDebounceMs(value) {
+  if (value === void 0 || value === null || value === "") {
+    return void 0;
+  }
+  const n = typeof value === "string" ? Number(value) : value;
+  if (typeof n !== "number" || !Number.isFinite(n) || n <= 0) {
+    return void 0;
+  }
+  return Math.min(5e3, Math.round(n));
+}
 
 // src/services/storage/lock-credential-storage.ts
 init_service();
@@ -165337,14 +165539,16 @@ 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) {
     const nodeLabel = trimToLength(mapping?.customName, 32, "...") ?? trimToLength(friendlyName, 32, "...") ?? trimToLength(entityId, 32, "...");
     const productNameFromNodeLabel = this.featureFlags?.productNameFromNodeLabel === true ? trimToLength(sanitizeMatterString(nodeLabel ?? ""), 32, "...") ?? void 0 : void 0;
-    const rawSerial = trimToLength(mapping?.customSerialNumber, 32, "...");
-    const serialNumber = rawSerial && this.serialNumberSuffix ? trimToLength(`${rawSerial}${this.serialNumberSuffix}`, 32, "...") : rawSerial;
+    const maxRawLen = 32 - (this.serialNumberSuffix?.length ?? 0);
+    const registrySerial = this.featureFlags?.useHaRegistrySerial ? trimToLength(device?.serial_number, maxRawLen, "...") : void 0;
+    const rawSerial = trimToLength(mapping?.customSerialNumber, maxRawLen, "...") ?? registrySerial;
+    const serialNumber = rawSerial && this.serialNumberSuffix ? `${rawSerial}${this.serialNumberSuffix}` : rawSerial;
     const basicInformation = dropUndefined({
       vendorName: trimToLength(mapping?.customVendorName, 32, "...") ?? trimToLength(device?.manufacturer, 32, "..."),
       productName: trimToLength(mapping?.customProductName, 32, "...") ?? productNameFromNodeLabel ?? trimToLength(device?.model_id, 32, "...") ?? trimToLength(device?.model, 32, "..."),
@@ -166447,6 +166651,9 @@ var BridgeDataProvider = class extends Service {
   get serialNumberSuffix() {
     return this.data.serialNumberSuffix;
   }
+  get sessionMaxAgeHours() {
+    return this.data.sessionMaxAgeHours;
+  }
   /************************************************
    * Functions
    ************************************************/
@@ -166472,6 +166679,7 @@ var BridgeDataProvider = class extends Service {
       icon: this.icon,
       priority: this.priority,
       serialNumberSuffix: this.serialNumberSuffix,
+      sessionMaxAgeHours: this.sessionMaxAgeHours,
       status: status3.code,
       statusReason: status3.reason,
       commissioning: commissioning ? {
@@ -167848,7 +168056,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(() => {
@@ -167896,7 +168104,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(() => {
             });
@@ -168068,6 +168276,12 @@ ${e?.toString()}`);
     if (!this.dataProvider.featureFlags?.autoForceSync) {
       return 0;
     }
+    if (isHeapUnderPressure()) {
+      this.log.warn(
+        "Force sync skipped: heap under pressure, reduce entities or raise NODE_OPTIONS=--max-old-space-size"
+      );
+      return 0;
+    }
     const { HomeAssistantEntityBehavior: HomeAssistantEntityBehavior2 } = await Promise.resolve().then(() => (init_home_assistant_entity_behavior(), home_assistant_entity_behavior_exports));
     const allEndpoints = [];
     const collect = (ep) => {
@@ -168351,7 +168565,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) {
@@ -168365,10 +168579,14 @@ var BasicInformationServer2 = class extends BridgedDeviceBasicInformationServer
     const nodeLabel = ellipse(32, homeAssistant.state.customName) ?? ellipse(32, registryName) ?? ellipse(32, entity.state?.attributes?.friendly_name) ?? ellipse(32, entity.entity_id);
     const productNameFromNodeLabel = featureFlags?.productNameFromNodeLabel === true ? ellipse(32, sanitizeMatterString(nodeLabel ?? "")) ?? void 0 : void 0;
     const serialNumberSuffix = this.env.get(BridgeDataProvider).serialNumberSuffix;
-    const rawSerial = ellipse(32, mapping?.customSerialNumber) ?? hash(32, entity.entity_id);
-    const serialNumber = serialNumberSuffix ? ellipse(32, `${rawSerial}${serialNumberSuffix}`) : rawSerial;
+    const maxRawLen = 32 - (serialNumberSuffix?.length ?? 0);
+    const registrySerial = featureFlags?.useHaRegistrySerial ? ellipse(maxRawLen, device?.serial_number) : void 0;
+    const rawSerial = ellipse(maxRawLen, mapping?.customSerialNumber) ?? registrySerial ?? hash(maxRawLen, entity.entity_id);
+    const serialNumber = rawSerial && serialNumberSuffix ? `${rawSerial}${serialNumberSuffix}` : rawSerial;
+    const customVendorId = mapping?.customVendorId;
+    const vendorId3 = isValidVendorId(customVendorId) ? customVendorId : basicInformation.vendorId;
     applyPatchState(this.state, {
-      vendorId: VendorId(basicInformation.vendorId),
+      vendorId: VendorId(vendorId3),
       vendorName: ellipse(32, mapping?.customVendorName) ?? ellipse(32, device?.manufacturer) ?? hash(32, basicInformation.vendorName),
       productName: ellipse(32, mapping?.customProductName) ?? productNameFromNodeLabel ?? ellipse(32, device?.model_id) ?? ellipse(32, device?.model) ?? hash(32, basicInformation.productName),
       productLabel: ellipse(64, device?.model) ?? hash(64, basicInformation.productLabel),
@@ -168393,6 +168611,9 @@ function hash(maxLength, value) {
   const suffix = crypto6.createHash("md5").update(value ?? "").digest("hex").substring(0, hashLength);
   return trimToLength(value, maxLength, suffix);
 }
+function isValidVendorId(value) {
+  return typeof value === "number" && Number.isInteger(value) && value >= 1 && value <= 65534;
+}
 
 // src/matter/behaviors/electrical-energy-measurement-server.ts
 init_esm();
@@ -168417,7 +168638,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);
@@ -168443,6 +168664,10 @@ var ElectricalEnergyMeasurementServerBase = class extends FeaturedBase {
   ElectricalEnergyMeasurementServerBase2.State = State;
 })(ElectricalEnergyMeasurementServerBase || (ElectricalEnergyMeasurementServerBase = {}));
 var HaElectricalEnergyMeasurementServer = ElectricalEnergyMeasurementServerBase.set({
+  // Match the activePower=0 default in HaElectricalPowerMeasurementServer
+  // so SmartThings doesn't show "- kWh" before the first state update or
+  // when an entity only carries power (not energy) data.
+  cumulativeEnergyImported: { energy: 0 },
   accuracy: {
     measurementType: ElectricalPowerMeasurement3.MeasurementType.ElectricalEnergy,
     measured: true,
@@ -168477,7 +168702,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);
@@ -168530,7 +168755,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) {
@@ -168594,7 +168819,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) {
@@ -168673,6 +168898,11 @@ var defaultBatteryConfig = {
 };
 var DefaultPowerSourceServer = PowerSourceServer2(defaultBatteryConfig);
 
+// src/matter/behaviors/power-topology-server.ts
+var HaPowerTopologyServer = PowerTopologyServer.with(
+  PowerTopology3.Feature.NodeTopology
+);
+
 // src/matter/behaviors/temperature-measurement-server.ts
 init_home_assistant_entity_behavior();
 var TemperatureMeasurementServerBase = class extends TemperatureMeasurementServer {
@@ -168680,7 +168910,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) {
@@ -168722,7 +168952,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) {
@@ -169200,7 +169430,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 },
@@ -169776,6 +170006,9 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
     if (config10.batteryEntityId) {
       parentType = parentType.with(PowerSourceServer2(batteryConfig));
     }
+    if (config10.powerEntityId || config10.energyEntityId) {
+      parentType = parentType.with(HaPowerTopologyServer);
+    }
     if (config10.powerEntityId) {
       parentType = parentType.with(HaElectricalPowerMeasurementServer);
     }
@@ -169976,7 +170209,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) {
@@ -170111,6 +170344,9 @@ var ComposedSensorEndpoint = class _ComposedSensorEndpoint extends Endpoint {
     if (config10.batteryEntityId) {
       parentType = parentType.with(PowerSourceServer2(batteryConfig2));
     }
+    if (config10.powerEntityId || config10.energyEntityId) {
+      parentType = parentType.with(HaPowerTopologyServer);
+    }
     if (config10.powerEntityId) {
       parentType = parentType.with(HaElectricalPowerMeasurementServer);
     }
@@ -170536,7 +170772,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) {
@@ -170614,7 +170850,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) {
@@ -170682,7 +170918,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) {
@@ -170797,7 +171033,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";
@@ -170811,7 +171047,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";
@@ -171092,6 +171328,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
@@ -171287,7 +171540,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 } : {}
     });
@@ -171572,7 +171825,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();
@@ -171594,7 +171847,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();
@@ -171675,6 +171928,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,
@@ -171712,6 +171977,7 @@ function isHeatCoolOnly(modes) {
   return modes.includes(ClimateHvacMode.heat_cool) && !modes.includes(ClimateHvacMode.heat) && !modes.includes(ClimateHvacMode.cool);
 }
 var lastHvacDirection = /* @__PURE__ */ new Map();
+var climateFreezeState = /* @__PURE__ */ new Map();
 function getHeatCoolOnlyDirection(entity, agent) {
   const action = attributes4(entity).hvac_action;
   const homeAssistant = agent.get(HomeAssistantEntityBehavior);
@@ -171726,6 +171992,95 @@ function getHeatCoolOnlyDirection(entity, agent) {
   }
   return lastHvacDirection.get(entityId) ?? "heating";
 }
+function computeSystemMode(entity, agent) {
+  const hvacMode = entity.state;
+  const systemMode = hvacModeToSystemMode[hvacMode] ?? Thermostat3.SystemMode.Off;
+  if (systemMode === Thermostat3.SystemMode.Auto) {
+    const modes = attributes4(entity).hvac_modes ?? [];
+    if (isHeatCoolOnly(modes)) {
+      const direction = getHeatCoolOnlyDirection(entity, agent);
+      return direction === "cooling" ? Thermostat3.SystemMode.Cool : Thermostat3.SystemMode.Heat;
+    }
+    const hasMatterAuto = modes.includes(ClimateHvacMode.heat_cool) && (modes.includes(ClimateHvacMode.heat) || modes.includes(ClimateHvacMode.cool));
+    if (hasMatterAuto) {
+      return systemMode;
+    }
+    const hasCooling = modes.some((m) => m === ClimateHvacMode.cool);
+    const hasHeating = modes.some(
+      (m) => m === ClimateHvacMode.heat || m === ClimateHvacMode.auto
+    );
+    if (hasHeating && !hasCooling) {
+      return Thermostat3.SystemMode.Heat;
+    }
+    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;
+    }
+    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;
+}
+function applyClimateFreezeForKeepModeOnIdle(computed, entity, entityId, keepModeOnIdle) {
+  if (computed !== Thermostat3.SystemMode.Off) {
+    const existing2 = climateFreezeState.get(entityId);
+    if (existing2) {
+      existing2.lastNonOffMode = computed;
+      existing2.pending = true;
+      existing2.confirmedOff = false;
+    } else {
+      climateFreezeState.set(entityId, {
+        lastNonOffMode: computed,
+        pending: true,
+        confirmedOff: false
+      });
+    }
+    return computed;
+  }
+  const action = attributes4(entity).hvac_action;
+  const existing = climateFreezeState.get(entityId);
+  if (action === ClimateHvacAction.off) {
+    if (existing) {
+      if (existing.confirmedOff) {
+        existing.pending = false;
+        existing.confirmedOff = false;
+      } else {
+        existing.confirmedOff = true;
+      }
+    }
+  } else if (existing) {
+    existing.confirmedOff = false;
+  }
+  if (keepModeOnIdle && existing?.pending) {
+    return existing.lastNonOffMode;
+  }
+  return computed;
+}
 var config4 = {
   // Temperature range (target_temp_low/high) only works in heat_cool mode.
   // In heat or cool mode, HA expects a single "temperature" value.
@@ -171745,37 +172100,14 @@ var config4 = {
   getTargetHeatingTemperature: (entity, agent) => getTemp(agent, entity, "target_temp_low") ?? getTemp(agent, entity, "target_temperature") ?? getTemp(agent, entity, "temperature"),
   getTargetCoolingTemperature: (entity, agent) => getTemp(agent, entity, "target_temp_high") ?? getTemp(agent, entity, "target_temperature") ?? getTemp(agent, entity, "temperature"),
   getSystemMode: (entity, agent) => {
-    const hvacMode = entity.state;
-    const systemMode = hvacModeToSystemMode[hvacMode] ?? Thermostat3.SystemMode.Off;
-    if (systemMode === Thermostat3.SystemMode.Auto) {
-      const modes = attributes4(entity).hvac_modes ?? [];
-      if (isHeatCoolOnly(modes)) {
-        const direction = getHeatCoolOnlyDirection(entity, agent);
-        return direction === "cooling" ? Thermostat3.SystemMode.Cool : Thermostat3.SystemMode.Heat;
-      }
-      const hasCoolCapability = modes.includes(ClimateHvacMode.cool) || modes.includes(ClimateHvacMode.heat_cool);
-      const hasHeatCapability = modes.includes(ClimateHvacMode.heat) || modes.includes(ClimateHvacMode.heat_cool);
-      const hasMatterAuto = (modes.includes(ClimateHvacMode.heat_cool) || modes.includes(ClimateHvacMode.auto)) && hasCoolCapability && hasHeatCapability;
-      if (hasMatterAuto) {
-        return systemMode;
-      }
-      const hasCooling = modes.some((m) => m === ClimateHvacMode.cool);
-      const hasHeating = modes.some(
-        (m) => m === ClimateHvacMode.heat || m === ClimateHvacMode.auto
-      );
-      if (hasHeating && !hasCooling) {
-        return Thermostat3.SystemMode.Heat;
-      }
-      if (hasCooling && !hasHeating) {
-        return Thermostat3.SystemMode.Cool;
-      }
-      const action = attributes4(entity).hvac_action;
-      if (action === ClimateHvacAction.cooling) {
-        return Thermostat3.SystemMode.Cool;
-      }
-      return Thermostat3.SystemMode.Heat;
-    }
-    return systemMode;
+    const homeAssistant = agent.get(HomeAssistantEntityBehavior);
+    const computed = computeSystemMode(entity, agent);
+    return applyClimateFreezeForKeepModeOnIdle(
+      computed,
+      entity,
+      homeAssistant.entityId,
+      homeAssistant.state.mapping?.climateKeepModeOnIdle === true
+    );
   },
   getRunningMode: (entity) => {
     const action = attributes4(entity).hvac_action;
@@ -171835,19 +172167,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);
@@ -171941,7 +172291,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,
@@ -172020,6 +172370,18 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
   static DEBOUNCE_INITIAL_MS = 400;
   static DEBOUNCE_SUBSEQUENT_MS = 150;
   static COMMAND_SEQUENCE_THRESHOLD_MS = 600;
+  // Per-entity override wins over per-bridge flag; both must be > 0 to count.
+  resolveDebounceOverride(homeAssistant) {
+    const fromEntity = homeAssistant.state.mapping?.coverSliderDebounceMs;
+    if (typeof fromEntity === "number" && fromEntity > 0) {
+      return fromEntity;
+    }
+    const fromBridge = this.env.get(BridgeDataProvider).featureFlags?.coverSliderDebounceMs;
+    if (typeof fromBridge === "number" && fromBridge > 0) {
+      return fromBridge;
+    }
+    return null;
+  }
   async [Symbol.asyncDispose]() {
     if (this.liftDebounceTimer) {
       clearTimeout(this.liftDebounceTimer);
@@ -172034,23 +172396,9 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     await super[Symbol.asyncDispose]();
   }
   async initialize() {
-    if (this.features.lift) {
-      if (this.state.installedOpenLimitLift == null) {
-        this.state.installedOpenLimitLift = 0;
-      }
-      if (this.state.installedClosedLimitLift == null) {
-        this.state.installedClosedLimitLift = 1e4;
-      }
-    }
-    if (this.features.tilt) {
-      if (this.state.installedOpenLimitTilt == null) {
-        this.state.installedOpenLimitTilt = 0;
-      }
-      if (this.state.installedClosedLimitTilt == null) {
-        this.state.installedClosedLimitTilt = 1e4;
-      }
-    }
+    this.internal.disableOperationalModeHandling = true;
     if (this.features.positionAwareLift) {
+      this.state.currentPositionLiftPercentage = void 0;
       if (this.state.currentPositionLiftPercent100ths === void 0) {
         this.state.currentPositionLiftPercent100ths = null;
       }
@@ -172059,6 +172407,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
       }
     }
     if (this.features.positionAwareTilt) {
+      this.state.currentPositionTiltPercentage = void 0;
       if (this.state.currentPositionTiltPercent100ths === void 0) {
         this.state.currentPositionTiltPercent100ths = null;
       }
@@ -172066,6 +172415,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);
@@ -172114,41 +172464,39 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     );
     const overrideType = config10.getCoverType?.(state, this.agent);
     const overrideEndProduct = config10.getEndProductType?.(state, this.agent);
+    const previousStatus = this.state.operationalStatus?.global;
+    const startedMoving = !isStopped && previousStatus === MovementStatus.Stopped;
     const appliedPatch = applyPatchState(
       this.state,
       {
         type: overrideType ?? (this.features.lift && this.features.tilt ? WindowCovering3.WindowCoveringType.TiltBlindLift : this.features.tilt ? WindowCovering3.WindowCoveringType.TiltBlindTiltOnly : WindowCovering3.WindowCoveringType.Rollershade),
         endProductType: overrideEndProduct ?? (this.features.lift && this.features.tilt ? WindowCovering3.EndProductType.SheerShade : this.features.tilt ? WindowCovering3.EndProductType.TiltOnlyInteriorBlind : WindowCovering3.EndProductType.RollerShade),
-        operationalStatus: {
-          global: movementStatus,
-          ...this.features.lift ? { lift: movementStatus } : {},
-          ...this.features.tilt ? { tilt: movementStatus } : {}
-        },
-        ...this.features.absolutePosition && this.features.lift ? {
-          installedOpenLimitLift: 0,
-          installedClosedLimitLift: 1e4,
-          currentPositionLift: currentLift100ths
-        } : {},
-        ...this.features.absolutePosition && this.features.tilt ? {
-          installedOpenLimitTilt: 0,
-          installedClosedLimitTilt: 1e4,
-          currentPositionTilt: currentTilt100ths
-        } : {},
+        // Target before operationalStatus so the wire order matches the
+        // certified Eve MotionBlinds (state, target, current). Patch insertion
+        // order propagates into matter.js's changeList via for-in over values
+        // (Datasource.js:414), then through attrsChanged.emit (#328).
         ...this.features.positionAwareLift ? {
-          currentPositionLiftPercentage: currentLift,
-          currentPositionLiftPercent100ths: currentLift100ths,
           targetPositionLiftPercent100ths: inferTarget(
             currentLift100ths,
             this.state.targetPositionLiftPercent100ths
           )
         } : {},
         ...this.features.positionAwareTilt ? {
-          currentPositionTiltPercentage: currentTilt,
-          currentPositionTiltPercent100ths: currentTilt100ths,
           targetPositionTiltPercent100ths: inferTarget(
             currentTilt100ths,
             this.state.targetPositionTiltPercent100ths
           )
+        } : {},
+        operationalStatus: {
+          global: movementStatus,
+          ...this.features.lift ? { lift: movementStatus } : {},
+          ...this.features.tilt ? { tilt: movementStatus } : {}
+        },
+        ...this.features.positionAwareLift && !startedMoving ? {
+          currentPositionLiftPercent100ths: currentLift100ths
+        } : {},
+        ...this.features.positionAwareTilt && !startedMoving ? {
+          currentPositionTiltPercent100ths: currentTilt100ths
         } : {}
       }
     );
@@ -172165,7 +172513,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     const currentLift = this.state.currentPositionLiftPercent100ths ?? 0;
     const currentTilt = this.state.currentPositionTiltPercent100ths ?? 0;
     logger179.info(
-      `handleMovement: type=${MovementType[type]}, direction=${MovementDirection[direction]}, target=${targetPercent100ths}, currentLift=${currentLift}, currentTilt=${currentTilt}, absolutePosition=${this.features.absolutePosition}`
+      `handleMovement: type=${MovementType[type]}, direction=${MovementDirection[direction]}, target=${targetPercent100ths}, currentLift=${currentLift}, currentTilt=${currentTilt}`
     );
     if (type === MovementType.Lift) {
       this.lastLiftMovementMs = Date.now();
@@ -172174,7 +172522,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
         this.handleLiftOpen();
       } else if (targetPercent100ths === 1e4) {
         this.handleLiftClose();
-      } else if (targetPercent100ths != null && this.features.absolutePosition) {
+      } else if (targetPercent100ths != null && this.features.positionAwareLift) {
         this.handleGoToLiftPosition(targetPercent100ths);
       } else if (direction === MovementDirection.Open) {
         this.handleLiftOpen();
@@ -172184,7 +172532,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;
       }
@@ -172192,7 +172540,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
         this.handleTiltOpen();
       } else if (targetPercent100ths === 1e4) {
         this.handleTiltClose();
-      } else if (targetPercent100ths != null && this.features.absolutePosition) {
+      } else if (targetPercent100ths != null && this.features.positionAwareTilt) {
         this.handleGoToTiltPosition(targetPercent100ths);
       } else if (direction === MovementDirection.Open) {
         this.handleTiltOpen();
@@ -172234,9 +172582,10 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     const timeSinceLastCommand = now - this.lastLiftCommandTime;
     this.lastLiftCommandTime = now;
     const isFirstInSequence = timeSinceLastCommand > _WindowCoveringServerBase.COMMAND_SEQUENCE_THRESHOLD_MS;
-    const debounceMs = isFirstInSequence ? _WindowCoveringServerBase.DEBOUNCE_INITIAL_MS : _WindowCoveringServerBase.DEBOUNCE_SUBSEQUENT_MS;
+    const overrideMs = this.resolveDebounceOverride(homeAssistant);
+    const debounceMs = overrideMs != null ? overrideMs : isFirstInSequence ? _WindowCoveringServerBase.DEBOUNCE_INITIAL_MS : _WindowCoveringServerBase.DEBOUNCE_SUBSEQUENT_MS;
     logger179.debug(
-      `Lift command: target=${targetPosition}%, debounce=${debounceMs}ms (${isFirstInSequence ? "initial" : "subsequent"})`
+      `Lift command: target=${targetPosition}%, debounce=${debounceMs}ms (${overrideMs != null ? "override" : isFirstInSequence ? "initial" : "subsequent"})`
     );
     if (this.liftDebounceTimer) {
       clearTimeout(this.liftDebounceTimer);
@@ -172283,9 +172632,10 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     const timeSinceLastCommand = now - this.lastTiltCommandTime;
     this.lastTiltCommandTime = now;
     const isFirstInSequence = timeSinceLastCommand > _WindowCoveringServerBase.COMMAND_SEQUENCE_THRESHOLD_MS;
-    const debounceMs = isFirstInSequence ? _WindowCoveringServerBase.DEBOUNCE_INITIAL_MS : _WindowCoveringServerBase.DEBOUNCE_SUBSEQUENT_MS;
+    const overrideMs = this.resolveDebounceOverride(homeAssistant);
+    const debounceMs = overrideMs != null ? overrideMs : isFirstInSequence ? _WindowCoveringServerBase.DEBOUNCE_INITIAL_MS : _WindowCoveringServerBase.DEBOUNCE_SUBSEQUENT_MS;
     logger179.debug(
-      `Tilt command: target=${targetPosition}%, debounce=${debounceMs}ms (${isFirstInSequence ? "initial" : "subsequent"})`
+      `Tilt command: target=${targetPosition}%, debounce=${debounceMs}ms (${overrideMs != null ? "override" : isFirstInSequence ? "initial" : "subsequent"})`
     );
     if (this.tiltDebounceTimer) {
       clearTimeout(this.tiltDebounceTimer);
@@ -172358,6 +172708,14 @@ var DEVICE_CLASS_TO_MATTER_TYPE = {
   shade: {
     type: WindowCovering3.WindowCoveringType.Rollershade,
     endProductType: WindowCovering3.EndProductType.RollerShade
+  },
+  // Velux-style motorized roof/casement windows. No Matter WindowCoveringType
+  // for "window", so map to Rollershade + RollerShade (the spec default pair).
+  // EndProductType is a FixedAttribute, and Alexa's routine picker drops
+  // devices it can't categorize - Unknown (255) lands there (#312).
+  window: {
+    type: WindowCovering3.WindowCoveringType.Rollershade,
+    endProductType: WindowCovering3.EndProductType.RollerShade
   }
 };
 var deviceClassMapping = (entity) => {
@@ -172366,12 +172724,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;
 };
@@ -172501,24 +172868,17 @@ var CoverWindowCoveringServer = WindowCoveringServer2(config5);
 
 // src/matter/endpoints/legacy/cover/index.ts
 var logger181 = Logger.get("CoverDevice");
-var DISCRETE_COVER_CLASSES = /* @__PURE__ */ new Set(["garage", "gate"]);
-var CoverDeviceType = (supportedFeatures, hasBattery, entityId, isDiscrete) => {
+var CoverDeviceType = (supportedFeatures, hasBattery, entityId) => {
   const features2 = /* @__PURE__ */ new Set();
   if (testBit(supportedFeatures, CoverSupportedFeatures.support_open)) {
     features2.add("Lift");
     features2.add("PositionAwareLift");
-    if (!isDiscrete) {
-      features2.add("AbsolutePosition");
-    }
   } else {
     logger181.warn(
       `[${entityId}] Cover has no support_open feature (supported_features=${supportedFeatures}), adding Lift anyway`
     );
     features2.add("Lift");
     features2.add("PositionAwareLift");
-    if (!isDiscrete) {
-      features2.add("AbsolutePosition");
-    }
   }
   if (testBit(supportedFeatures, CoverSupportedFeatures.support_open_tilt)) {
     features2.add("Tilt");
@@ -172527,7 +172887,6 @@ var CoverDeviceType = (supportedFeatures, hasBattery, entityId, isDiscrete) => {
       CoverSupportedFeatures.support_set_tilt_position
     )) {
       features2.add("PositionAwareTilt");
-      features2.add("AbsolutePosition");
     }
   }
   logger181.info(
@@ -172562,18 +172921,10 @@ function CoverDevice(homeAssistantEntity) {
       `[${entityId}] Creating cover without battery (batteryAttr=${hasBatteryAttr}, batteryEntity=${homeAssistantEntity.mapping?.batteryEntity ?? "none"})`
     );
   }
-  const deviceClass = attributes7.device_class;
-  const isDiscrete = typeof deviceClass === "string" && DISCRETE_COVER_CLASSES.has(deviceClass.toLowerCase());
-  if (isDiscrete) {
-    logger181.info(
-      `[${entityId}] Garage/gate cover (device_class=${deviceClass}): using discrete Open/Close mode`
-    );
-  }
   return CoverDeviceType(
     attributes7.supported_features ?? 0,
     hasBattery,
-    entityId,
-    isDiscrete
+    entityId
   ).set({
     homeAssistantEntity
   });
@@ -173640,6 +173991,9 @@ function LightDevice(homeAssistantEntity) {
   const hasPowerEntity = !!homeAssistantEntity.mapping?.powerEntity;
   const hasEnergyEntity = !!homeAssistantEntity.mapping?.energyEntity;
   let device = deviceType;
+  if (hasPowerEntity || hasEnergyEntity) {
+    device = device.with(HaPowerTopologyServer);
+  }
   if (hasPowerEntity) {
     device = device.with(HaElectricalPowerMeasurementServer);
   }
@@ -174603,7 +174957,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).
    */
@@ -174950,7 +175304,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) {
@@ -175061,7 +175415,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) {
@@ -175092,7 +175446,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;
@@ -175132,7 +175486,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) {
@@ -175165,6 +175519,10 @@ var StandalonePowerServer = class extends ElectricalPowerMeasurementServer {
 var PowerServer = StandalonePowerServer.set({
   powerMode: ElectricalPowerMeasurement3.PowerMode.Ac,
   numberOfMeasurementTypes: 1,
+  // SmartThings keeps the endpoint in a "device not yet updated" state
+  // when activePower stays null. Seed 0 so the cluster reports a value
+  // for energy/voltage/current-only sensors that never feed activePower.
+  activePower: 0,
   accuracy: [
     {
       measurementType: ElectricalPowerMeasurement3.MeasurementType.ActivePower,
@@ -175190,7 +175548,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) {
@@ -175217,6 +175575,9 @@ var StandaloneEnergyServer = class extends EnergyFeaturedBase {
   StandaloneEnergyServer2.State = State;
 })(StandaloneEnergyServer || (StandaloneEnergyServer = {}));
 var EnergyServer = StandaloneEnergyServer.set({
+  // Match the activePower=0 default so SmartThings doesn't show "- kWh"
+  // on a SolarPower endpoint whose mapped entity only carries power data.
+  cumulativeEnergyImported: { energy: 0 },
   accuracy: {
     measurementType: ElectricalPowerMeasurement3.MeasurementType.ElectricalEnergy,
     measured: true,
@@ -175235,6 +175596,7 @@ var ElectricalSensorType = SolarPowerDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
   HomeAssistantEntityBehavior,
+  HaPowerTopologyServer,
   PowerServer,
   EnergyServer
 );
@@ -175246,7 +175608,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) {
@@ -175338,7 +175700,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) {
@@ -175369,7 +175731,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;
@@ -175428,7 +175790,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) {
@@ -175512,7 +175874,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) {
@@ -175542,7 +175904,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;
@@ -175605,7 +175967,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) {
@@ -175635,7 +175997,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;
@@ -175698,7 +176060,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) {
@@ -175728,7 +176090,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;
@@ -175811,7 +176173,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) {
@@ -175841,7 +176203,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;
@@ -175959,7 +176321,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) {
@@ -176009,7 +176371,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) {
@@ -176076,7 +176438,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) {
@@ -176109,7 +176471,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;
@@ -176172,7 +176534,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) {
@@ -176204,7 +176566,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;
@@ -176276,7 +176638,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) {
@@ -176311,7 +176673,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;
@@ -176608,7 +176970,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 }
@@ -176677,6 +177039,9 @@ function SwitchDevice(homeAssistantEntity) {
   const hasPowerEntity = !!homeAssistantEntity.mapping?.powerEntity;
   const hasEnergyEntity = !!homeAssistantEntity.mapping?.energyEntity;
   let device = hasBatteryAttr || hasBatteryEntity ? SwitchWithBatteryEndpointType : SwitchEndpointType;
+  if (hasPowerEntity || hasEnergyEntity) {
+    device = device.with(HaPowerTopologyServer);
+  }
   if (hasPowerEntity) {
     device = device.with(HaElectricalPowerMeasurementServer);
   }
@@ -176695,6 +177060,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");
@@ -176709,16 +177075,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
@@ -176747,7 +177137,9 @@ function getSession(endpoint) {
       completedAreas: /* @__PURE__ */ new Set(),
       lastCurrentArea: null,
       activeAreas: [],
-      loggedShortCircuits: /* @__PURE__ */ new Set()
+      loggedShortCircuits: /* @__PURE__ */ new Set(),
+      observedCleaning: false,
+      pendingDispatches: []
     };
     cleaningSessions.set(endpoint, session);
   }
@@ -176778,17 +177170,45 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
       },
       { force: true }
     );
+    if (newMode === 1 /* Cleaning */) {
+      s.observedCleaning = true;
+    }
     if (previousMode !== newMode) {
       if (newMode === 0 /* Idle */) {
         if (s.lastCurrentArea !== null) {
           s.completedAreas.add(s.lastCurrentArea);
           s.lastCurrentArea = null;
+        }
+        if (s.pendingDispatches.length > 0 && s.observedCleaning) {
+          try {
+            const serviceArea = this.agent.get(ServiceAreaBehavior);
+            const prev = serviceArea.state.currentArea;
+            if (typeof prev === "number") {
+              s.completedAreas.add(prev);
+            }
+            const next = s.pendingDispatches.shift();
+            if (next) {
+              const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
+              homeAssistant.callAction(next.action);
+              this.trySetCurrentArea(next.areaId);
+            }
+          } catch {
+          }
+          s.loggedShortCircuits.clear();
+          return;
+        }
+        if (s.observedCleaning) {
           try {
             const serviceArea = this.agent.get(ServiceAreaBehavior);
-            serviceArea.state.currentArea = null;
+            const last = serviceArea.state.currentArea;
+            if (typeof last === "number") {
+              s.completedAreas.add(last);
+              serviceArea.state.currentArea = null;
+            }
             this.updateProgressFromTracking(serviceArea);
           } catch {
           }
+          s.observedCleaning = false;
         }
         s.loggedShortCircuits.clear();
       } else if (newMode === 1 /* Cleaning */) {
@@ -176802,6 +177222,15 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         }
       }
     }
+    if (newMode === 0 /* Idle */ && s.activeAreas.length === 0) {
+      try {
+        const serviceArea = this.agent.get(ServiceAreaBehavior);
+        if (serviceArea.state.currentArea !== null) {
+          serviceArea.state.currentArea = null;
+        }
+      } catch {
+      }
+    }
     if (newMode === 1 /* Cleaning */) {
       this.updateCurrentRoomFromSensor();
     }
@@ -176829,7 +177258,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;
       }
@@ -176842,26 +177271,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;
           }
@@ -176871,7 +177296,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;
         }
       }
@@ -176990,6 +177415,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
           s.completedAreas.clear();
           s.lastCurrentArea = null;
           s.loggedShortCircuits.clear();
+          s.pendingDispatches = [];
           this.trySetCurrentArea(s.activeAreas[0]);
           homeAssistant.callAction(this.state.config.start(void 0, this.agent));
           this.state.currentMode = newMode;
@@ -177006,6 +177432,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         s.completedAreas.clear();
         s.lastCurrentArea = null;
         s.loggedShortCircuits.clear();
+        s.pendingDispatches = [];
         this.trySetCurrentArea(areaId);
         homeAssistant.callAction(
           this.state.config.cleanRoom(newMode, this.agent)
@@ -177026,6 +177453,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
             s.completedAreas.clear();
             s.lastCurrentArea = null;
             s.loggedShortCircuits.clear();
+            s.pendingDispatches = [];
             this.trySetCurrentArea(s.activeAreas[0]);
           }
         } catch {
@@ -177039,6 +177467,8 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         s.lastCurrentArea = null;
         s.activeAreas = [];
         s.loggedShortCircuits.clear();
+        s.pendingDispatches = [];
+        s.observedCleaning = false;
         homeAssistant.callAction(
           this.state.config.returnToBase(void 0, this.agent)
         );
@@ -177615,8 +178045,8 @@ function buildSupportedModes2(attributes7, includeUnnamedRooms = false, customAr
   }
   return modes;
 }
-function handleCustomServiceAreas(selectedAreas, customAreas, homeAssistant) {
-  const matched = selectedAreas.map((areaId) => customAreas[areaId - 1]).filter(Boolean);
+function handleCustomServiceAreas(selectedAreas, customAreas, session) {
+  const matched = selectedAreas.map((areaId) => ({ areaId, area: customAreas[areaId - 1] })).filter((m) => !!m.area);
   if (matched.length === 0) {
     logger194.warn(
       `Custom service areas: no match for selected IDs ${selectedAreas.join(", ")}`
@@ -177624,17 +178054,13 @@ function handleCustomServiceAreas(selectedAreas, customAreas, homeAssistant) {
     return { action: "vacuum.start" };
   }
   logger194.info(
-    `Custom service areas: calling ${matched.length} service(s): ${matched.map((a) => `${a.service} (${a.name})`).join(", ")}`
+    `Custom service areas: ${matched.length} room(s) queued: ${matched.map(({ area }) => `${area.service} (${area.name})`).join(", ")}`
   );
-  for (let i = 1; i < matched.length; i++) {
-    const area = matched[i];
-    homeAssistant.callAction({
-      action: area.service,
-      target: area.target,
-      data: area.data
-    });
-  }
-  const first = matched[0];
+  session.pendingDispatches = matched.slice(1).map(({ areaId, area }) => ({
+    areaId,
+    action: { action: area.service, target: area.target, data: area.data }
+  }));
+  const first = matched[0].area;
   return {
     action: first.service,
     target: first.target,
@@ -177668,9 +178094,14 @@ var vacuumRvcRunModeConfig = {
     );
     return isCleaning ? 1 /* Cleaning */ : 0 /* Idle */;
   },
-  getSupportedModes: (entity) => {
+  getSupportedModes: (entity, agent) => {
     const attributes7 = entity.attributes;
-    return buildSupportedModes2(attributes7);
+    const customAreas = agent.get(HomeAssistantEntityBehavior).state.mapping?.customServiceAreas;
+    return buildSupportedModes2(
+      attributes7,
+      false,
+      customAreas && customAreas.length > 0 ? customAreas : void 0
+    );
   },
   // biome-ignore lint/suspicious/noConfusingVoidType: Required by ValueSetter<void> interface
   start: (_, agent) => {
@@ -177681,13 +178112,10 @@ var vacuumRvcRunModeConfig = {
         const homeAssistant = agent.get(HomeAssistantEntityBehavior);
         const entity = homeAssistant.entity;
         const attributes7 = entity.state.attributes;
+        const session = getSession(homeAssistant.endpoint);
         const customAreas = homeAssistant.state.mapping?.customServiceAreas;
         if (customAreas && customAreas.length > 0) {
-          return handleCustomServiceAreas(
-            selectedAreas,
-            customAreas,
-            homeAssistant
-          );
+          return handleCustomServiceAreas(selectedAreas, customAreas, session);
         }
         const cleanAreaRooms = homeAssistant.state.mapping?.cleanAreaRooms;
         if (cleanAreaRooms && cleanAreaRooms.length > 0) {
@@ -177704,28 +178132,24 @@ var vacuumRvcRunModeConfig = {
         }
         const roomEntities = homeAssistant.state.mapping?.roomEntities;
         if (roomEntities && roomEntities.length > 0) {
-          const buttonEntityIds = [];
+          const matched = [];
           for (const areaId of selectedAreas) {
-            const buttonEntityId = roomEntities.find(
-              (id) => toAreaId(id) === areaId
-            );
-            if (buttonEntityId) {
-              buttonEntityIds.push(buttonEntityId);
+            const entityId = roomEntities.find((id) => toAreaId(id) === areaId);
+            if (entityId) {
+              matched.push({ areaId, entityId });
             }
           }
-          if (buttonEntityIds.length > 0) {
+          if (matched.length > 0) {
             logger194.info(
-              `Roborock: Pressing button entities for selected rooms: ${buttonEntityIds.join(", ")}`
+              `Roborock: ${matched.length} room button(s) queued: ${matched.map((m) => m.entityId).join(", ")}`
             );
-            for (let i = 1; i < buttonEntityIds.length; i++) {
-              homeAssistant.callAction({
-                action: "button.press",
-                target: buttonEntityIds[i]
-              });
-            }
+            session.pendingDispatches = matched.slice(1).map(({ areaId, entityId }) => ({
+              areaId,
+              action: { action: "button.press", target: entityId }
+            }));
             return {
               action: "button.press",
-              target: buttonEntityIds[0]
+              target: matched[0].entityId
             };
           }
         }
@@ -178062,7 +178486,7 @@ var RvcCleanModeServerBase = class _RvcCleanModeServerBase extends RvcCleanModeS
     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) {
@@ -178081,13 +178505,17 @@ var RvcCleanModeServerBase = class _RvcCleanModeServerBase extends RvcCleanModeS
         currentMode = this.pendingMode;
       }
     }
-    applyPatchState(this.state, {
-      currentMode,
-      supportedModes: this.state.config.getSupportedModes(
-        entity.state,
-        this.agent
-      )
-    });
+    applyPatchState(
+      this.state,
+      {
+        currentMode,
+        supportedModes: this.state.config.getSupportedModes(
+          entity.state,
+          this.agent
+        )
+      },
+      { force: true }
+    );
   }
   changeToMode(request) {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
@@ -178210,33 +178638,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",
@@ -178369,17 +178788,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) {
@@ -178420,30 +178829,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);
@@ -178578,7 +178977,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;
@@ -178919,58 +179318,65 @@ function RvcOperationalStateServer2(config10) {
 var logger198 = Logger.get("VacuumRvcOperationalStateServer");
 function isCharging(entity) {
   const attrs = entity.attributes;
-  if (attrs.battery_icon?.includes("charging")) return true;
   if (attrs.is_charging === true || attrs.charging === true) return true;
+  if (attrs.is_charging === false || attrs.charging === false) return false;
+  const raw = attrs.battery_level ?? attrs.battery;
+  const level = typeof raw === "number" ? raw : Number.parseFloat(String(raw ?? ""));
+  if (Number.isFinite(level) && level >= 100) return false;
+  if (attrs.battery_icon?.includes("charging")) return true;
   if (typeof attrs.status === "string" && attrs.status.toLowerCase().includes("charg"))
     return true;
   return false;
 }
-var VacuumRvcOperationalStateServer = RvcOperationalStateServer2({
-  getOperationalState(entity) {
-    const state = entity.state;
-    const cleaningStates = [
-      VacuumState.cleaning,
-      VacuumState.segment_cleaning,
-      VacuumState.zone_cleaning,
-      VacuumState.spot_cleaning,
-      VacuumState.mop_cleaning
-    ];
-    let operationalState;
-    if (state === VacuumState.docked) {
-      if (isCharging(entity)) {
-        operationalState = RvcOperationalState3.OperationalState.Charging;
-      } else {
-        operationalState = RvcOperationalState3.OperationalState.Docked;
-      }
-    } else if (state === VacuumState.returning) {
-      operationalState = RvcOperationalState3.OperationalState.SeekingCharger;
-    } else if (cleaningStates.includes(state)) {
+function mapVacuumOperationalState(entity) {
+  const state = entity.state;
+  const cleaningStates = [
+    VacuumState.cleaning,
+    VacuumState.segment_cleaning,
+    VacuumState.zone_cleaning,
+    VacuumState.spot_cleaning,
+    VacuumState.mop_cleaning
+  ];
+  let operationalState;
+  if (state === VacuumState.docked) {
+    if (isCharging(entity)) {
+      operationalState = RvcOperationalState3.OperationalState.Charging;
+    } else {
+      operationalState = RvcOperationalState3.OperationalState.Docked;
+    }
+  } else if (state === VacuumState.returning) {
+    operationalState = RvcOperationalState3.OperationalState.SeekingCharger;
+  } else if (cleaningStates.includes(state)) {
+    operationalState = RvcOperationalState3.OperationalState.Running;
+  } else if (state === VacuumState.paused) {
+    operationalState = RvcOperationalState3.OperationalState.Paused;
+  } else if (state === VacuumState.idle) {
+    if (isCharging(entity)) {
+      operationalState = RvcOperationalState3.OperationalState.Charging;
+    } else {
+      operationalState = RvcOperationalState3.OperationalState.Stopped;
+    }
+  } else if (state === VacuumState.error || state === "unavailable") {
+    operationalState = RvcOperationalState3.OperationalState.Error;
+  } else {
+    if (state.toLowerCase().includes("clean")) {
+      logger198.info(
+        `Unknown vacuum state "${state}" contains 'clean', treating as Running`
+      );
       operationalState = RvcOperationalState3.OperationalState.Running;
-    } else if (state === VacuumState.paused) {
-      operationalState = RvcOperationalState3.OperationalState.Paused;
-    } else if (state === VacuumState.idle) {
-      if (isCharging(entity)) {
-        operationalState = RvcOperationalState3.OperationalState.Charging;
-      } else {
-        operationalState = RvcOperationalState3.OperationalState.Stopped;
-      }
-    } else if (state === VacuumState.error || state === "unavailable") {
-      operationalState = RvcOperationalState3.OperationalState.Error;
     } else {
-      if (state.toLowerCase().includes("clean")) {
-        logger198.info(
-          `Unknown vacuum state "${state}" contains 'clean', treating as Running`
-        );
-        operationalState = RvcOperationalState3.OperationalState.Running;
-      } else {
-        logger198.info(`Unknown vacuum state "${state}", treating as Stopped`);
-        operationalState = RvcOperationalState3.OperationalState.Stopped;
-      }
+      logger198.info(`Unknown vacuum state "${state}", treating as Stopped`);
+      operationalState = RvcOperationalState3.OperationalState.Stopped;
     }
-    logger198.debug(
-      `Vacuum operationalState: "${state}" -> ${RvcOperationalState3.OperationalState[operationalState]}`
-    );
-    return operationalState;
+  }
+  logger198.debug(
+    `Vacuum operationalState: "${state}" -> ${RvcOperationalState3.OperationalState[operationalState]}`
+  );
+  return operationalState;
+}
+var VacuumRvcOperationalStateServer = RvcOperationalStateServer2({
+  getOperationalState(entity) {
+    return mapVacuumOperationalState(entity);
   },
   pause: (_, agent) => {
     const supportedFeatures = agent.get(HomeAssistantEntityBehavior).entity.state.attributes.supported_features ?? 0;
@@ -180545,7 +180951,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();
@@ -180583,14 +180989,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;
@@ -180602,7 +181008,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;
       }
@@ -180702,7 +181108,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) {
@@ -180851,7 +181257,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.
    */
@@ -180997,8 +181403,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;
@@ -181156,14 +181562,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;
         }
@@ -181434,6 +181840,19 @@ init_dist();
 init_diagnostic_event_bus();
 var AUTO_FORCE_SYNC_INTERVAL_MS2 = 9e4;
 var DEAD_SESSION_TIMEOUT_MS2 = 6e4;
+var DEFAULT_SESSION_MAX_AGE_HOURS = 4;
+var SESSION_MAX_AGE_HOURS_RANGE = { min: 1, max: 168 };
+var ROTATION_CHECK_INTERVAL_MS = 5 * 60 * 1e3;
+function parseSessionMaxAgeHours(raw) {
+  if (raw == null || raw === "") return DEFAULT_SESSION_MAX_AGE_HOURS;
+  const n = Number.parseInt(raw, 10);
+  if (Number.isNaN(n) || n < 0) return null;
+  if (n === 0) return 0;
+  const { min, max } = SESSION_MAX_AGE_HOURS_RANGE;
+  if (n < min) return min;
+  if (n > max) return max;
+  return n;
+}
 var ServerModeBridge = class {
   constructor(logger207, dataProvider, endpointManager, server) {
     this.dataProvider = dataProvider;
@@ -181456,6 +181875,10 @@ var ServerModeBridge = class {
   deadSessionTimer = null;
   staleSessionTimers = /* @__PURE__ */ new Map();
   warmStartTimer = null;
+  // Tracks when each session opened, used for age-based rotation (#287).
+  sessionStartedAt = /* @__PURE__ */ new Map();
+  rotationTimer = null;
+  maxSessionAgeMs = 0;
   // Tracks the last synced state JSON per entity to avoid pushing unchanged states.
   lastSyncedState;
   // Session lifecycle diagnostic handlers (non-destructive, logging only).
@@ -181540,6 +181963,7 @@ var ServerModeBridge = class {
         });
       }
       this.wireSessionDiagnostics();
+      this.startSessionRotation();
       this.scheduleWarmStart();
       logMemoryUsage(this.log, "server mode bridge running");
       this.log.info("Server mode bridge started");
@@ -181555,6 +181979,7 @@ ${e?.toString()}`);
     }
   }
   async stop(code = BridgeStatus.Stopped, reason = "Manually stopped") {
+    this.stopSessionRotation();
     this.unwireSessionDiagnostics();
     this.cancelWarmStart();
     this.stopAutoForceSync();
@@ -181583,6 +182008,7 @@ ${e?.toString()}`);
       await this.refreshDevices();
       if (this.status.code === BridgeStatus.Running) {
         this.startAutoForceSyncIfEnabled();
+        this.startSessionRotation();
       }
     } catch (e) {
       const reason = "Failed to update server mode bridge due to error:";
@@ -181639,7 +182065,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(() => {
@@ -181672,13 +182098,14 @@ ${e?.toString()}`);
       };
       sessionManager.subscriptionsChanged.on(this.sessionDiagHandler);
       this.sessionAddedHandler = (newSession) => {
+        this.sessionStartedAt.set(newSession.id, Date.now());
         this.log.info(
           `Session opened: id=${newSession.id} peer=${newSession.peerNodeId}`
         );
         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(() => {
             });
@@ -181686,6 +182113,7 @@ ${e?.toString()}`);
         }
       };
       this.sessionDeletedHandler = (session) => {
+        this.sessionStartedAt.delete(session.id);
         const sessions = [...sessionManager.sessions];
         this.log.warn(
           `Session closed: id=${session.id} peer=${session.peerNodeId} | remaining sessions=${sessions.length}`
@@ -181777,6 +182205,85 @@ ${e?.toString()}`);
       clearTimeout(timer);
     }
     this.staleSessionTimers.clear();
+    this.sessionStartedAt.clear();
+  }
+  // Start the periodic age-based session rotation (#287).
+  startSessionRotation() {
+    this.stopSessionRotation();
+    const hours = this.readSessionMaxAgeHours();
+    if (hours === 0) {
+      this.log.info(
+        "Session rotation disabled (HAMH_MATTER_SESSION_MAX_AGE_HOURS=0)"
+      );
+      return;
+    }
+    this.maxSessionAgeMs = hours * 60 * 60 * 1e3;
+    this.rotationTimer = setInterval(
+      () => this.rotateAgedSessions(),
+      ROTATION_CHECK_INTERVAL_MS
+    );
+    this.log.info(
+      `Session rotation: max age ${hours}h, check every ${ROTATION_CHECK_INTERVAL_MS / 6e4}min`
+    );
+  }
+  stopSessionRotation() {
+    if (this.rotationTimer) {
+      clearInterval(this.rotationTimer);
+      this.rotationTimer = null;
+    }
+  }
+  // Resolve session rotation max age. Bridge config wins, then env var,
+  // then built-in default. 0 disables, otherwise clamped to range.
+  readSessionMaxAgeHours() {
+    const { min, max } = SESSION_MAX_AGE_HOURS_RANGE;
+    const fromConfig = this.dataProvider.sessionMaxAgeHours;
+    if (fromConfig != null && Number.isFinite(fromConfig) && fromConfig >= 0) {
+      if (fromConfig === 0) return 0;
+      if (fromConfig < min) return min;
+      if (fromConfig > max) return max;
+      return fromConfig;
+    }
+    const raw = process.env.HAMH_MATTER_SESSION_MAX_AGE_HOURS;
+    const parsed = parseSessionMaxAgeHours(raw);
+    if (parsed == null) {
+      this.log.warn(
+        `Invalid HAMH_MATTER_SESSION_MAX_AGE_HOURS=${raw}, falling back to ${DEFAULT_SESSION_MAX_AGE_HOURS}h`
+      );
+      return DEFAULT_SESSION_MAX_AGE_HOURS;
+    }
+    return parsed;
+  }
+  // Gracefully close sessions older than maxSessionAgeMs so controllers
+  // re-establish CASE and re-subscribe. Stale (0-sub) sessions are handled
+  // by the existing dead-session path, so only rotate ones with subscriptions.
+  rotateAgedSessions() {
+    if (this.maxSessionAgeMs === 0) return;
+    try {
+      const sessionManager = this.server.env.get(SessionManager);
+      const now = Date.now();
+      const closes = [];
+      for (const s of [...sessionManager.sessions]) {
+        const startedAt = this.sessionStartedAt.get(s.id);
+        if (startedAt == null) continue;
+        const ageMs = now - startedAt;
+        if (ageMs < this.maxSessionAgeMs || s.isClosing || s.subscriptions.size === 0) {
+          continue;
+        }
+        const ageMin = Math.round(ageMs / 6e4);
+        this.log.info(
+          `Rotating session ${s.id} (peer ${s.peerNodeId}, age ${ageMin}min, subs ${s.subscriptions.size})`
+        );
+        closes.push(
+          s.initiateClose().catch(() => {
+            return s.initiateForceClose();
+          })
+        );
+      }
+      if (closes.length > 0) {
+        Promise.allSettled(closes).then(() => this.triggerMdnsReAnnounce());
+      }
+    } catch {
+    }
   }
   stopAutoForceSync() {
     if (this.autoForceSyncTimer) {
@@ -182099,7 +182606,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,
@@ -182155,7 +182662,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.
    *
@@ -182193,6 +182700,11 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
    * unlike errorStateLabel (id 1) which requires errorStateId 128-191.
    */
   async pushKeepalive() {
+    try {
+      await this.construction.ready;
+    } catch {
+      return;
+    }
     try {
       this.keepaliveCounter++;
       const counter = this.keepaliveCounter;
@@ -182401,11 +182913,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;
     }
@@ -182795,7 +183307,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."
     );
   }
 }
@@ -182967,6 +183479,10 @@ function startOptionsBuilder(yargs2) {
     type: "number",
     description: "The refresh rate (in seconds) to detect new devices & entities or their configurations",
     default: 60
+  }).option("ha-message-timeout", {
+    type: "number",
+    description: "Timeout in milliseconds for individual Home Assistant WebSocket requests (registry fetches, action calls). Raise this if you see 'HA message ... timed out' warnings on a large or slow HA instance.",
+    default: 6e4
   }).option("http-auth-username", {
     type: "string",
     description: "Username for HTTP basic authentication (optional)"