@riddix/hamh 2.1.0-alpha.856 → 2.1.0-alpha.857

package/dist/backend/cli.js

@@ -133515,7 +133515,8 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                     fanRestoreSpeedOnPowerOn: config8.fanRestoreSpeedOnPowerOn,
                     composedEntities: config8.composedEntities,
                     disableMomentaryFlip: config8.disableMomentaryFlip,
-                    vacuumAscendingRoomOrder: config8.vacuumAscendingRoomOrder
+                    vacuumAscendingRoomOrder: config8.vacuumAscendingRoomOrder,
+                    vacuumRoomSwitches: config8.vacuumRoomSwitches
                   });
                   mappingsRestored++;
                 }
@@ -133681,7 +133682,8 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                   fanWindPresets: config8.fanWindPresets,
                   composedEntities: config8.composedEntities,
                   disableMomentaryFlip: config8.disableMomentaryFlip,
-                  vacuumAscendingRoomOrder: config8.vacuumAscendingRoomOrder
+                  vacuumAscendingRoomOrder: config8.vacuumAscendingRoomOrder,
+                  vacuumRoomSwitches: config8.vacuumRoomSwitches
                 });
                 mappingsRestored++;
               }
@@ -134533,6 +134535,7 @@ function entityMappingApi(mappingStorage, identityStorage) {
       currentRoomEntity: body.currentRoomEntity,
       cleanedAreaEntity: body.cleanedAreaEntity,
       vacuumAscendingRoomOrder: body.vacuumAscendingRoomOrder,
+      vacuumRoomSwitches: body.vacuumRoomSwitches,
       disableCustomAreaRoomModes: body.disableCustomAreaRoomModes,
       valetudoIdentifier: body.valetudoIdentifier,
       coverSwapOpenClose: body.coverSwapOpenClose,
@@ -135045,7 +135048,8 @@ function configToProfileEntry(config8) {
     climateExposeFan: config8.climateExposeFan,
     climateAutoMode: config8.climateAutoMode,
     disableMomentaryFlip: config8.disableMomentaryFlip,
-    vacuumAscendingRoomOrder: config8.vacuumAscendingRoomOrder
+    vacuumAscendingRoomOrder: config8.vacuumAscendingRoomOrder,
+    vacuumRoomSwitches: config8.vacuumRoomSwitches
   };
 }
 function mappingProfileApi(mappingStorage) {
@@ -135189,7 +135193,8 @@ function mappingProfileApi(mappingStorage) {
           climateExposeFan: entry.climateExposeFan,
           climateAutoMode: entry.climateAutoMode,
           disableMomentaryFlip: entry.disableMomentaryFlip,
-          vacuumAscendingRoomOrder: entry.vacuumAscendingRoomOrder
+          vacuumAscendingRoomOrder: entry.vacuumAscendingRoomOrder,
+          vacuumRoomSwitches: entry.vacuumRoomSwitches
         });
         applied++;
       } catch (e) {
@@ -139966,6 +139971,7 @@ var EntityMappingStorage = class extends Service {
       currentRoomEntity: request.currentRoomEntity?.trim() || void 0,
       cleanedAreaEntity: request.cleanedAreaEntity?.trim() || void 0,
       vacuumAscendingRoomOrder: request.vacuumAscendingRoomOrder || void 0,
+      vacuumRoomSwitches: request.vacuumRoomSwitches || void 0,
       disableCustomAreaRoomModes: request.disableCustomAreaRoomModes || void 0,
       valetudoIdentifier: request.valetudoIdentifier?.trim() || void 0,
       coverSwapOpenClose: request.coverSwapOpenClose || void 0,
@@ -139983,7 +139989,7 @@ var EntityMappingStorage = class extends Service {
       composedEntities: request.composedEntities?.filter((e) => e.entityId?.trim()) ?? void 0,
       disableMomentaryFlip: request.disableMomentaryFlip || void 0
     };
-    if (!config8.matterDeviceType && !config8.customName && !config8.customProductName && !config8.customVendorName && !config8.customSerialNumber && config8.customVendorId === void 0 && config8.disabled !== true && !config8.filterLifeEntity && !config8.cleaningModeEntity && !config8.temperatureEntity && !config8.humidityEntity && !config8.batteryEntity && !config8.disableBatteryMapping && !config8.chargingStateEntity && !config8.roomEntities && !config8.disableLockPin && !config8.lockUsercodeService && config8.lockUsercodeSlot === void 0 && config8.lockPinMinLength === void 0 && config8.lockPinMaxLength === void 0 && !config8.powerEntity && !config8.energyEntity && !config8.meterSerialNumber && !config8.pointOfDelivery && !config8.voltageEntity && !config8.currentEntity && !config8.batteryPowerEntity && !config8.batteryEnergyEntity && !config8.chargingSwitchEntity && !config8.currentLimitEntity && !config8.pressureEntity && !config8.suctionLevelEntity && !config8.mopIntensityEntity && (!config8.customServiceAreas || config8.customServiceAreas.length === 0) && (!config8.customFanSpeedTags || Object.keys(config8.customFanSpeedTags).length === 0) && (!config8.fanWindPresets || (config8.fanWindPresets.natural?.length ?? 0) === 0 && (config8.fanWindPresets.sleep?.length ?? 0) === 0) && !config8.fanRestoreSpeedOnPowerOn && !config8.currentRoomEntity && !config8.cleanedAreaEntity && !config8.vacuumAscendingRoomOrder && !config8.disableCustomAreaRoomModes && !config8.valetudoIdentifier && !config8.coverSwapOpenClose && !config8.coverExposeAsDimmableLight && !config8.selectExposeAsSwitch && !config8.selectSwitchOnOption && !config8.selectSwitchOffOption && !config8.coverSliderDebounceMs && !config8.updateThrottleMs && !config8.disableClimateOnOff && !config8.disableClimateFanControl && !config8.climateKeepModeOnIdle && !config8.climateExposeFan && !config8.climateAutoMode && (!config8.composedEntities || config8.composedEntities.length === 0) && !config8.disableMomentaryFlip) {
+    if (!config8.matterDeviceType && !config8.customName && !config8.customProductName && !config8.customVendorName && !config8.customSerialNumber && config8.customVendorId === void 0 && config8.disabled !== true && !config8.filterLifeEntity && !config8.cleaningModeEntity && !config8.temperatureEntity && !config8.humidityEntity && !config8.batteryEntity && !config8.disableBatteryMapping && !config8.chargingStateEntity && !config8.roomEntities && !config8.disableLockPin && !config8.lockUsercodeService && config8.lockUsercodeSlot === void 0 && config8.lockPinMinLength === void 0 && config8.lockPinMaxLength === void 0 && !config8.powerEntity && !config8.energyEntity && !config8.meterSerialNumber && !config8.pointOfDelivery && !config8.voltageEntity && !config8.currentEntity && !config8.batteryPowerEntity && !config8.batteryEnergyEntity && !config8.chargingSwitchEntity && !config8.currentLimitEntity && !config8.pressureEntity && !config8.suctionLevelEntity && !config8.mopIntensityEntity && (!config8.customServiceAreas || config8.customServiceAreas.length === 0) && (!config8.customFanSpeedTags || Object.keys(config8.customFanSpeedTags).length === 0) && (!config8.fanWindPresets || (config8.fanWindPresets.natural?.length ?? 0) === 0 && (config8.fanWindPresets.sleep?.length ?? 0) === 0) && !config8.fanRestoreSpeedOnPowerOn && !config8.currentRoomEntity && !config8.cleanedAreaEntity && !config8.vacuumAscendingRoomOrder && !config8.vacuumRoomSwitches && !config8.disableCustomAreaRoomModes && !config8.valetudoIdentifier && !config8.coverSwapOpenClose && !config8.coverExposeAsDimmableLight && !config8.selectExposeAsSwitch && !config8.selectSwitchOnOption && !config8.selectSwitchOffOption && !config8.coverSliderDebounceMs && !config8.updateThrottleMs && !config8.disableClimateOnOff && !config8.disableClimateFanControl && !config8.climateKeepModeOnIdle && !config8.climateExposeFan && !config8.climateAutoMode && (!config8.composedEntities || config8.composedEntities.length === 0) && !config8.disableMomentaryFlip) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config8);
@@ -171139,6 +171145,31 @@ function createCleanAreaServiceAreaServer(cleanAreaRooms) {
     currentArea: null
   });
 }
+function getVacuumServiceAreas(attributes9, mapping) {
+  const cleanAreaRooms = mapping?.cleanAreaRooms;
+  if (cleanAreaRooms && cleanAreaRooms.length > 0) {
+    return cleanAreaRooms.map((room) => ({
+      areaId: room.areaId,
+      name: room.name
+    }));
+  }
+  const customAreas = mapping?.customServiceAreas;
+  if (customAreas && customAreas.length > 0) {
+    return customAreas.map((area, index) => ({
+      areaId: index + 1,
+      name: area.name
+    }));
+  }
+  const roomEntities = mapping?.roomEntities;
+  const rooms = roomEntities && roomEntities.length > 0 ? buttonEntitiesToRooms(roomEntities, attributes9) : parseVacuumRooms(attributes9);
+  if (rooms.length > 0) {
+    return roomsToAreas(rooms).map((area) => ({
+      areaId: area.areaId,
+      name: area.areaInfo.locationInfo?.locationName ?? ""
+    }));
+  }
+  return [];
+}
 
 // src/matter/endpoints/legacy/vacuum/behaviors/vacuum-rvc-run-mode-server.ts
 var logger236 = Logger.get("VacuumRvcRunModeServer");
@@ -171313,6 +171344,135 @@ var cleaningStates = [
 function vacuumIsCleaning(state) {
   return state != null && cleaningStates.includes(state);
 }
+function dispatchRoomClean(attributes9, mapping, entityId, selectedAreas, seam) {
+  const customAreas = mapping?.customServiceAreas;
+  if (customAreas && customAreas.length > 0) {
+    const ephemeral = {
+      completedAreas: /* @__PURE__ */ new Set(),
+      lastCurrentArea: null,
+      activeAreas: [],
+      loggedShortCircuits: /* @__PURE__ */ new Set(),
+      observedCleaning: false,
+      pendingDispatches: [],
+      cleanedAreaBaseline: null
+    };
+    const action = handleCustomServiceAreas(
+      selectedAreas,
+      customAreas,
+      ephemeral
+    );
+    return { action, pending: ephemeral.pendingDispatches };
+  }
+  const cleanAreaRooms = mapping?.cleanAreaRooms;
+  if (cleanAreaRooms && cleanAreaRooms.length > 0) {
+    const haAreaIds = resolveCleanAreaIds(selectedAreas, cleanAreaRooms);
+    if (haAreaIds.length > 0) {
+      logger236.info(`CLEAN_AREA: cleaning HA areas: ${haAreaIds.join(", ")}`);
+      return {
+        action: {
+          action: "vacuum.clean_area",
+          data: { cleaning_area_id: haAreaIds }
+        },
+        pending: []
+      };
+    }
+  }
+  const roomEntities = mapping?.roomEntities;
+  if (roomEntities && roomEntities.length > 0) {
+    const matched = [];
+    for (const areaId of selectedAreas) {
+      const buttonId = roomEntities.find((id) => toAreaId(id) === areaId);
+      if (buttonId) {
+        matched.push({ areaId, entityId: buttonId });
+      }
+    }
+    if (matched.length > 0) {
+      logger236.info(
+        `Roborock: ${matched.length} room button(s) queued: ${matched.map((m) => m.entityId).join(", ")}`
+      );
+      return {
+        action: { action: "button.press", target: matched[0].entityId },
+        pending: matched.slice(1).map(({ areaId, entityId: buttonId }) => ({
+          areaId,
+          action: { action: "button.press", target: buttonId }
+        }))
+      };
+    }
+  }
+  if (entityId.startsWith("vacuum.valetudo_")) {
+    return {
+      action: buildValetudoSegmentAction(
+        entityId,
+        selectedAreas,
+        mapping?.valetudoIdentifier
+      ),
+      pending: []
+    };
+  }
+  const rooms = parseVacuumRooms(attributes9);
+  const roomIds = [];
+  let targetMapName;
+  for (const areaId of selectedAreas) {
+    const room = rooms.find((r) => toAreaId(r.id) === areaId);
+    if (room) {
+      roomIds.push(room.originalId ?? room.id);
+      if (room.mapName && !targetMapName) {
+        targetMapName = room.mapName;
+      }
+    }
+  }
+  if (roomIds.length > 0) {
+    logger236.info(`Starting cleaning with selected areas: ${roomIds.join(", ")}`);
+    if (isDreameVacuum(attributes9)) {
+      if (targetMapName) {
+        const vacName = entityId.replace("vacuum.", "");
+        const selectedMapEntity = `select.${vacName}_selected_map`;
+        logger236.info(
+          `Dreame multi-floor: switching to map "${targetMapName}" via ${selectedMapEntity}`
+        );
+        seam.callAction({
+          action: "select.select_option",
+          target: selectedMapEntity,
+          data: { option: targetMapName }
+        });
+      }
+      return {
+        action: {
+          action: "dreame_vacuum.vacuum_clean_segment",
+          data: { segments: roomIds.length === 1 ? roomIds[0] : roomIds }
+        },
+        pending: []
+      };
+    }
+    if (isRoborockVacuum(attributes9) || isXiaomiMiotVacuum(attributes9)) {
+      return {
+        action: {
+          action: "vacuum.send_command",
+          data: { command: "app_segment_clean", params: roomIds }
+        },
+        pending: []
+      };
+    }
+    if (isEcovacsVacuum(attributes9)) {
+      const roomIdStr = roomIds.join(",");
+      logger236.info(`Ecovacs vacuum: Using spot_area for rooms: ${roomIdStr}`);
+      return {
+        action: {
+          action: "vacuum.send_command",
+          data: {
+            command: "spot_area",
+            params: { mapID: 0, cleanings: 1, rooms: roomIdStr }
+          }
+        },
+        pending: []
+      };
+    }
+    logger236.warn(
+      `Room cleaning via send_command not supported for this vacuum type. Rooms: ${roomIds.join(", ")}. Falling back to vacuum.start`
+    );
+  }
+  return { action: { action: "vacuum.start" }, pending: [] };
+}
 var vacuumRvcRunModeConfig = {
   getCurrentMode: (entity) => {
     const isCleaning = vacuumIsCleaning(entity.state);
@@ -171339,123 +171499,19 @@ var vacuumRvcRunModeConfig = {
       const selectedAreas = [...serviceArea.state.selectedAreas];
       if (selectedAreas.length > 0) {
         const homeAssistant = agent.get(HomeAssistantEntityBehavior);
-        const entity = homeAssistant.entity;
-        const attributes9 = entity.state.attributes;
+        const effective = homeAssistant.endpoint.vacuumEffective;
+        const attributes9 = (effective?.state ?? homeAssistant.entity.state).attributes;
+        const mapping = effective ? effective.mapping : homeAssistant.state.mapping;
         const session = getSession(homeAssistant.endpoint);
-        const customAreas = homeAssistant.state.mapping?.customServiceAreas;
-        if (customAreas && customAreas.length > 0) {
-          return handleCustomServiceAreas(selectedAreas, customAreas, session);
-        }
-        const cleanAreaRooms = homeAssistant.state.mapping?.cleanAreaRooms;
-        if (cleanAreaRooms && cleanAreaRooms.length > 0) {
-          const haAreaIds = resolveCleanAreaIds(selectedAreas, cleanAreaRooms);
-          if (haAreaIds.length > 0) {
-            logger236.info(
-              `CLEAN_AREA: cleaning HA areas: ${haAreaIds.join(", ")}`
-            );
-            return {
-              action: "vacuum.clean_area",
-              data: { cleaning_area_id: haAreaIds }
-            };
-          }
-        }
-        const roomEntities = homeAssistant.state.mapping?.roomEntities;
-        if (roomEntities && roomEntities.length > 0) {
-          const matched = [];
-          for (const areaId of selectedAreas) {
-            const entityId = roomEntities.find((id) => toAreaId(id) === areaId);
-            if (entityId) {
-              matched.push({ areaId, entityId });
-            }
-          }
-          if (matched.length > 0) {
-            logger236.info(
-              `Roborock: ${matched.length} room button(s) queued: ${matched.map((m) => m.entityId).join(", ")}`
-            );
-            session.pendingDispatches = matched.slice(1).map(({ areaId, entityId }) => ({
-              areaId,
-              action: { action: "button.press", target: entityId }
-            }));
-            return {
-              action: "button.press",
-              target: matched[0].entityId
-            };
-          }
-        }
-        const vacuumEntityId = homeAssistant.entityId;
-        if (vacuumEntityId.startsWith("vacuum.valetudo_")) {
-          return buildValetudoSegmentAction(
-            vacuumEntityId,
-            selectedAreas,
-            homeAssistant.state.mapping?.valetudoIdentifier
-          );
-        }
-        const rooms = parseVacuumRooms(attributes9);
-        const roomIds = [];
-        let targetMapName;
-        for (const areaId of selectedAreas) {
-          const room = rooms.find((r) => toAreaId(r.id) === areaId);
-          if (room) {
-            roomIds.push(room.originalId ?? room.id);
-            if (room.mapName && !targetMapName) {
-              targetMapName = room.mapName;
-            }
-          }
-        }
-        if (roomIds.length > 0) {
-          logger236.info(
-            `Starting cleaning with selected areas: ${roomIds.join(", ")}`
-          );
-          if (isDreameVacuum(attributes9)) {
-            if (targetMapName) {
-              const vacName = vacuumEntityId.replace("vacuum.", "");
-              const selectedMapEntity = `select.${vacName}_selected_map`;
-              logger236.info(
-                `Dreame multi-floor: switching to map "${targetMapName}" via ${selectedMapEntity}`
-              );
-              homeAssistant.callAction({
-                action: "select.select_option",
-                target: selectedMapEntity,
-                data: { option: targetMapName }
-              });
-            }
-            return {
-              action: "dreame_vacuum.vacuum_clean_segment",
-              data: {
-                segments: roomIds.length === 1 ? roomIds[0] : roomIds
-              }
-            };
-          }
-          if (isRoborockVacuum(attributes9) || isXiaomiMiotVacuum(attributes9)) {
-            return {
-              action: "vacuum.send_command",
-              data: {
-                command: "app_segment_clean",
-                params: roomIds
-              }
-            };
-          }
-          if (isEcovacsVacuum(attributes9)) {
-            const roomIdStr = roomIds.join(",");
-            logger236.info(
-              `Ecovacs vacuum: Using spot_area for rooms: ${roomIdStr}`
-            );
-            return {
-              action: "vacuum.send_command",
-              data: {
-                command: "spot_area",
-                params: {
-                  mapID: 0,
-                  cleanings: 1,
-                  rooms: roomIdStr
-                }
-              }
-            };
-          }
-          logger236.warn(
-            `Room cleaning via send_command not supported for this vacuum type. Rooms: ${roomIds.join(", ")}. Falling back to vacuum.start`
-          );
-        }
+        const result = dispatchRoomClean(
+          attributes9,
+          mapping,
+          homeAssistant.entityId,
+          selectedAreas,
+          { callAction: (a) => homeAssistant.callAction(a) }
+        );
+        session.pendingDispatches = result.pending;
+        return result.action;
       }
     } catch {
     }
@@ -173922,6 +173978,12 @@ function asStandaloneEndpointType(type) {
 // src/matter/endpoints/legacy/legacy-endpoint.ts
 var logger245 = Logger.get("LegacyEndpoint");
 var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
+  constructor(type, entityId, customName, mappedEntityIds, throttleMs, endpointId, vacuumEffective) {
+    super(type, entityId, customName, mappedEntityIds, endpointId);
+    this.vacuumEffective = vacuumEffective;
+    this.flushUpdate = throttleMs && throttleMs > 50 ? throttleLatest(this.flushPendingUpdate.bind(this), throttleMs) : debounce6(this.flushPendingUpdate.bind(this), 50);
+  }
+  vacuumEffective;
   static async create(registry3, entityId, mapping, pluginDomainMappings, standalone = false, endpointId, identityAnchor) {
     const deviceRegistry = registry3.deviceOf(entityId);
     let state = registry3.initialState(entityId);
@@ -174295,19 +174357,17 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
     }
     const customName = effectiveMapping?.customName;
     const mappedIds = getMappedEntityIds(effectiveMapping);
+    const vacuumEffective = entityId.startsWith("vacuum.") ? { mapping: effectiveMapping, state } : void 0;
     return new _LegacyEndpoint(
       type,
       entityId,
       customName,
       mappedIds,
       effectiveMapping?.updateThrottleMs,
-      endpointId
+      endpointId,
+      vacuumEffective
     );
   }
-  constructor(type, entityId, customName, mappedEntityIds, throttleMs, endpointId) {
-    super(type, entityId, customName, mappedEntityIds, endpointId);
-    this.flushUpdate = throttleMs && throttleMs > 50 ? throttleLatest(this.flushPendingUpdate.bind(this), throttleMs) : debounce6(this.flushPendingUpdate.bind(this), 50);
-  }
   lastState;
   pendingMappedChange = false;
   flushUpdate;
@@ -174374,6 +174434,96 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
   }
 };
 
+// src/matter/endpoints/legacy/vacuum/vacuum-area-switch.ts
+init_esm();
+init_home_assistant_entity_behavior();
+var VacuumAreaSwitchEndpoint = class _VacuumAreaSwitchEndpoint extends EntityEndpoint {
+  constructor(type, entityId, endpointId, areaId, vacuumEndpointId, parentEffective) {
+    super(type, entityId, void 0, [], endpointId);
+    this.areaId = areaId;
+    this.vacuumEndpointId = vacuumEndpointId;
+    this.parentEffective = parentEffective;
+  }
+  areaId;
+  vacuumEndpointId;
+  parentEffective;
+  static create(params) {
+    const { vacuumEndpointId, entity, mapping, area, parentEffective } = params;
+    const endpointId = `${vacuumEndpointId}_roomsw_${area.areaId}`;
+    const areaId = area.areaId;
+    const switchMapping = mapping?.customSerialNumber ? { ...mapping, customSerialNumber: void 0 } : mapping;
+    const switchEntity = entity.deviceRegistry?.serial_number ? {
+      ...entity,
+      deviceRegistry: {
+        ...entity.deviceRegistry,
+        serial_number: void 0
+      }
+    } : entity;
+    const type = OnOffPlugInUnitDevice.with(
+      BasicInformationServer2,
+      IdentifyServer2,
+      HomeAssistantEntityBehavior,
+      OnOffServer2({
+        isOn: () => false,
+        // off is a no-op (momentary auto-reset only, script pattern).
+        turnOff: null,
+        turnOn: (_value, agent) => {
+          const ha = agent.get(HomeAssistantEntityBehavior);
+          const { action } = dispatchRoomClean(
+            parentEffective.state.attributes,
+            parentEffective.mapping,
+            ha.entityId,
+            [areaId],
+            { callAction: (a) => ha.callAction(a) }
+          );
+          return action;
+        }
+      })
+    ).set({
+      homeAssistantEntity: {
+        entity: switchEntity,
+        mapping: switchMapping,
+        customName: area.name,
+        // Distinct anchor so uniqueId/serial don't collide with the vacuum's,
+        // and stay frozen across HA renames.
+        identityAnchor: endpointId
+      }
+    });
+    return new _VacuumAreaSwitchEndpoint(
+      type,
+      entity.entity_id,
+      endpointId,
+      areaId,
+      vacuumEndpointId,
+      parentEffective
+    );
+  }
+  async updateStates(states) {
+    const state = states[this.entityId];
+    if (!state) return;
+    try {
+      await this.construction.ready;
+    } catch {
+      return;
+    }
+    try {
+      const current = this.stateOf(HomeAssistantEntityBehavior).entity;
+      await this.setStateOf(HomeAssistantEntityBehavior, {
+        entity: { ...current, state }
+      });
+    } catch (error) {
+      if (error instanceof TransactionDestroyedError || error instanceof DestroyedDependencyError) {
+        return;
+      }
+      const message = error instanceof Error ? error.message : String(error);
+      if (message.includes("Endpoint storage inaccessible")) {
+        return;
+      }
+      throw error;
+    }
+  }
+};
+
 // src/plugins/builtin/camera/camera-plugin.ts
 init_esm();
 
@@ -176849,8 +176999,8 @@ var BridgeEndpointManager = class extends Service {
   async isolateEntity(entityName) {
     const endpoints = this.root.parts.map((p) => p);
     const endpoint = endpoints.find(
-      (e) => e.id === entityName || e.entityId === entityName
-    );
+      (e) => !(e instanceof VacuumAreaSwitchEndpoint) && (e.id === entityName || e.entityId === entityName)
+    ) ?? endpoints.find((e) => e.id === entityName);
     if (endpoint) {
       this.log.warn(
         `Isolating entity ${endpoint.entityId} due to runtime error`
@@ -176862,6 +177012,17 @@ var BridgeEndpointManager = class extends Service {
       }
       this.pendingRemovals.delete(endpoint.entityId);
       this.mappingFingerprints.delete(endpoint.entityId);
+      if (!(endpoint instanceof VacuumAreaSwitchEndpoint)) {
+        for (const sw of endpoints) {
+          if (!(sw instanceof VacuumAreaSwitchEndpoint)) continue;
+          if (sw.vacuumEndpointId !== endpoint.id) continue;
+          try {
+            await sw.delete();
+          } catch (e) {
+            this.log.warn(`Failed to remove area switch ${sw.id}:`, e);
+          }
+        }
+      }
     }
   }
   // refreshDevices only runs on registry-fingerprint changes, which may not
@@ -176947,7 +177108,7 @@ var BridgeEndpointManager = class extends Service {
   async refreshDevices() {
     this.registry.refresh();
     this._failedEntities = [];
-    const endpoints = this.root.parts.map((p) => p);
+    const endpoints = this.root.parts.map((p) => p).filter((p) => !(p instanceof VacuumAreaSwitchEndpoint));
     this.entityIds = this.registry.entityIds;
     if (this.registry.isAutoComposedDevicesEnabled()) {
       for (const eid of this.entityIds) {
@@ -177010,6 +177171,19 @@ var BridgeEndpointManager = class extends Service {
       this.bridgeId,
       buildPresentEntityIds(fullEntities)
     );
+    for (const part of [...this.root.parts]) {
+      if (!(part instanceof VacuumAreaSwitchEndpoint)) continue;
+      const claimant = endpointIdToEntity.get(part.id);
+      if (claimant == null) continue;
+      this.log.info(
+        `Area switch ${part.id} collides with entity ${claimant}, removing the switch`
+      );
+      try {
+        await part.delete();
+      } catch (e) {
+        this.log.warn(`Failed to remove colliding area switch ${part.id}:`, e);
+      }
+    }
     const existingEndpoints = [];
     const now = Date.now();
     for (const endpoint of endpoints) {
@@ -177169,10 +177343,117 @@ var BridgeEndpointManager = class extends Service {
         }
       }
     }
+    await this.reconcileAreaSwitches();
     if (this.unsubscribe) {
       this.startObserving();
     }
   }
+  // Opt-in per-area room switches (#355). One momentary OnOffPlugInUnit sibling
+  // per configured service area, mounted alongside its vacuum with a stable
+  // derived id. Areas and mapping come from the parent's vacuumEffective, the
+  // exact config its ServiceArea cluster was built from, never from raw storage
+  // (raw can be a different id space: injected Valetudo/Roborock rooms,
+  // auto-resolved CLEAN_AREA). The vacuum's own endpoint is never touched here.
+  // Switches are kept while their parent endpoint survives with the flag on
+  // (the parent's removal grace is mirrored for free), rebuilt via close() when
+  // the parent was recreated for a mapping change so numbers survive, and
+  // deleted when the flag goes off, the area is gone, or the parent is gone.
+  async reconcileAreaSwitches() {
+    const parts = this.root.parts.map((p) => p);
+    const switches = parts.filter(
+      (p) => p instanceof VacuumAreaSwitchEndpoint
+    );
+    const vacuumById = /* @__PURE__ */ new Map();
+    for (const part of parts) {
+      if (part instanceof VacuumAreaSwitchEndpoint) continue;
+      vacuumById.set(part.id, part);
+    }
+    const isolated = new Set(
+      EntityIsolationService.getIsolatedEntities(this.bridgeId).map(
+        (f) => f.entityId
+      )
+    );
+    const parentIsolated = (parent) => isolated.has(parent.id) || parent.entityId != null && isolated.has(parent.entityId);
+    const kept = /* @__PURE__ */ new Set();
+    for (const sw of switches) {
+      const parent = vacuumById.get(sw.vacuumEndpointId);
+      const mapping = parent ? this.getEntityMapping(parent.entityId) : void 0;
+      const effective = parent instanceof LegacyEndpoint ? parent.vacuumEffective : void 0;
+      let keep = false;
+      let rebuild = false;
+      if (parent && !parentIsolated(parent) && mapping?.vacuumRoomSwitches && effective) {
+        const areas = getVacuumServiceAreas(
+          effective.state.attributes,
+          effective.mapping
+        );
+        if (areas.some((a) => a.areaId === sw.areaId)) {
+          if (sw.parentEffective === effective) {
+            keep = true;
+          } else {
+            rebuild = true;
+          }
+        }
+      }
+      if (keep) {
+        kept.add(sw.id);
+        continue;
+      }
+      try {
+        if (rebuild) {
+          await sw.close();
+        } else {
+          await sw.delete();
+        }
+      } catch (e) {
+        this.log.warn(`Failed to remove area switch ${sw.id}:`, e);
+      }
+    }
+    for (const part of vacuumById.values()) {
+      const entityId = part.entityId;
+      if (!entityId?.startsWith("vacuum.")) continue;
+      if (parentIsolated(part)) continue;
+      const mapping = this.getEntityMapping(entityId);
+      if (!mapping?.vacuumRoomSwitches) continue;
+      const effective = part instanceof LegacyEndpoint ? part.vacuumEffective : void 0;
+      if (!effective) continue;
+      const areas = getVacuumServiceAreas(
+        effective.state.attributes,
+        effective.mapping
+      );
+      const entity = {
+        entity_id: entityId,
+        state: effective.state,
+        registry: this.registry.entity(entityId),
+        deviceRegistry: this.registry.deviceOf(entityId)
+      };
+      for (const area of areas) {
+        const switchId = `${part.id}_roomsw_${area.areaId}`;
+        if (kept.has(switchId)) continue;
+        const holder = vacuumById.get(switchId);
+        if (holder) {
+          this.log.warn(
+            `Skipping area switch ${switchId} for ${entityId}: id taken by entity ${holder.entityId}`
+          );
+          continue;
+        }
+        try {
+          const endpoint = VacuumAreaSwitchEndpoint.create({
+            vacuumEndpointId: part.id,
+            entity,
+            mapping: effective.mapping,
+            area,
+            parentEffective: effective
+          });
+          await this.root.add(endpoint);
+        } catch (e) {
+          this.log.warn(
+            `Failed to add area switch ${switchId} for ${entityId}:`,
+            e
+          );
+        }
+      }
+    }
+  }
   updateInFlight;
   pendingStates;
   pendingChanged;