@riddix/hamh 2.1.0-alpha.489 → 2.1.0-alpha.491

package/dist/backend/cli.js

@@ -146411,6 +146411,7 @@ var init_vacuum = __esm({
       VacuumDeviceFeature2[VacuumDeviceFeature2["MAP"] = 2048] = "MAP";
       VacuumDeviceFeature2[VacuumDeviceFeature2["STATE"] = 4096] = "STATE";
       VacuumDeviceFeature2[VacuumDeviceFeature2["START"] = 8192] = "START";
+      VacuumDeviceFeature2[VacuumDeviceFeature2["CLEAN_AREA"] = 16384] = "CLEAN_AREA";
     })(VacuumDeviceFeature || (VacuumDeviceFeature = {}));
     (function(VacuumFanSpeed2) {
       VacuumFanSpeed2["off"] = "off";
@@ -149283,6 +149284,9 @@ function testMatchers(matchers, device, entity, mode = "any", entityState, label
   );
 }
 function testMatcher(matcher, device, entity, entityState, labels) {
+  if (matcher.value == null) {
+    return false;
+  }
   switch (matcher.type) {
     case "domain":
       return entity.entity_id.split(".")[0] === matcher.value;
@@ -175703,6 +175707,28 @@ function createCustomServiceAreaServer(customAreas) {
     currentArea: null
   });
 }
+function createCleanAreaServiceAreaServer(cleanAreaRooms) {
+  const supportedAreas = cleanAreaRooms.map((room) => ({
+    areaId: room.areaId,
+    mapId: null,
+    areaInfo: {
+      locationInfo: {
+        locationName: room.name,
+        floorNumber: null,
+        areaType: null
+      },
+      landmarkInfo: null
+    }
+  }));
+  logger190.info(
+    `Using ${cleanAreaRooms.length} HA areas via CLEAN_AREA: ${cleanAreaRooms.map((r) => r.name).join(", ")}`
+  );
+  return ServiceAreaServer2({
+    supportedAreas,
+    selectedAreas: [],
+    currentArea: null
+  });
+}
 
 // src/matter/endpoints/legacy/vacuum/behaviors/vacuum-rvc-run-mode-server.ts
 var logger191 = Logger.get("VacuumRvcRunModeServer");
@@ -175774,6 +175800,16 @@ function handleCustomServiceAreas(selectedAreas, customAreas, homeAssistant, ser
     data: first.data
   };
 }
+function resolveCleanAreaIds(selectedAreas, cleanAreaRooms) {
+  const haAreaIds = [];
+  for (const areaId of selectedAreas) {
+    const room = cleanAreaRooms.find((r) => r.areaId === areaId);
+    if (room) {
+      haAreaIds.push(room.haAreaId);
+    }
+  }
+  return haAreaIds;
+}
 var vacuumRvcRunModeConfig = {
   getCurrentMode: (entity) => {
     const state = entity.state;
@@ -175812,6 +175848,20 @@ var vacuumRvcRunModeConfig = {
             serviceArea
           );
         }
+        const cleanAreaRooms = homeAssistant.state.mapping?.cleanAreaRooms;
+        if (cleanAreaRooms && cleanAreaRooms.length > 0) {
+          const haAreaIds = resolveCleanAreaIds(selectedAreas, cleanAreaRooms);
+          serviceArea.state.selectedAreas = [];
+          if (haAreaIds.length > 0) {
+            logger191.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 buttonEntityIds = [];
@@ -175945,6 +175995,23 @@ var vacuumRvcRunModeConfig = {
     const entity = homeAssistant.entity;
     const attributes7 = entity.state.attributes;
     logger191.info(`cleanRoom called: roomMode=${roomMode}`);
+    const cleanAreaRooms = homeAssistant.state.mapping?.cleanAreaRooms;
+    if (cleanAreaRooms && cleanAreaRooms.length > 0) {
+      const sorted = [...cleanAreaRooms].sort(
+        (a, b) => a.name.localeCompare(b.name)
+      );
+      const areaIndex = roomMode - ROOM_MODE_BASE2 - 1;
+      if (areaIndex >= 0 && areaIndex < sorted.length) {
+        const area = sorted[areaIndex];
+        logger191.info(
+          `cleanRoom: CLEAN_AREA "${area.name}" \u2192 vacuum.clean_area(${area.haAreaId})`
+        );
+        return {
+          action: "vacuum.clean_area",
+          data: { cleaning_area_id: [area.haAreaId] }
+        };
+      }
+    }
     const customAreas = homeAssistant.state.mapping?.customServiceAreas;
     if (customAreas && customAreas.length > 0) {
       const sorted = [...customAreas].sort(
@@ -176080,6 +176147,39 @@ function createVacuumRvcRunModeServer(attributes7, includeUnnamedRooms = false,
     currentMode: 0 /* Idle */
   });
 }
+function createCleanAreaRvcRunModeServer(cleanAreaRooms) {
+  const modes = [
+    {
+      label: "Idle",
+      mode: 0 /* Idle */,
+      modeTags: [{ value: RvcRunMode3.ModeTag.Idle }]
+    },
+    {
+      label: "Cleaning",
+      mode: 1 /* Cleaning */,
+      modeTags: [{ value: RvcRunMode3.ModeTag.Cleaning }]
+    }
+  ];
+  const sorted = [...cleanAreaRooms].sort(
+    (a, b) => a.name.localeCompare(b.name)
+  );
+  for (let i = 0; i < sorted.length; i++) {
+    const modeValue = ROOM_MODE_BASE2 + i + 1;
+    if (modeValue > 255) continue;
+    modes.push({
+      label: sorted[i].name,
+      mode: modeValue,
+      modeTags: [{ value: RvcRunMode3.ModeTag.Cleaning }]
+    });
+  }
+  logger191.info(
+    `Creating CLEAN_AREA RvcRunModeServer with ${cleanAreaRooms.length} HA areas, ${modes.length} total modes`
+  );
+  return RvcRunModeServer2(vacuumRvcRunModeConfig, {
+    supportedModes: modes,
+    currentMode: 0 /* Idle */
+  });
+}
 var VacuumRvcRunModeServer = RvcRunModeServer2(vacuumRvcRunModeConfig);
 
 // src/matter/endpoints/legacy/vacuum/behaviors/vacuum-on-off-server.ts
@@ -177077,8 +177177,9 @@ function VacuumDevice(homeAssistantEntity, includeOnOff = false, cleaningModeOpt
   logger196.info(
     `Creating vacuum endpoint for ${entityId}, mapping: ${JSON.stringify(homeAssistantEntity.mapping ?? "none")}`
   );
+  const cleanAreaRooms = homeAssistantEntity.mapping?.cleanAreaRooms;
   let device = VacuumEndpointType.with(
-    createVacuumRvcRunModeServer(
+    cleanAreaRooms && cleanAreaRooms.length > 0 ? createCleanAreaRvcRunModeServer(cleanAreaRooms) : createVacuumRvcRunModeServer(
       attributes7,
       false,
       customAreas && customAreas.length > 0 ? customAreas : void 0
@@ -177092,9 +177193,14 @@ function VacuumDevice(homeAssistantEntity, includeOnOff = false, cleaningModeOpt
   const roomEntities = homeAssistantEntity.mapping?.roomEntities;
   const rooms = parseVacuumRooms(attributes7);
   logger196.info(
-    `${entityId}: customAreas=${customAreas?.length ?? 0}, roomEntities=${JSON.stringify(roomEntities ?? [])}, parsedRooms=${rooms.length}`
+    `${entityId}: customAreas=${customAreas?.length ?? 0}, roomEntities=${JSON.stringify(roomEntities ?? [])}, parsedRooms=${rooms.length}, cleanAreaRooms=${cleanAreaRooms?.length ?? 0}`
   );
-  if (customAreas && customAreas.length > 0) {
+  if (cleanAreaRooms && cleanAreaRooms.length > 0) {
+    logger196.info(
+      `${entityId}: Adding ServiceArea (${cleanAreaRooms.length} HA areas via CLEAN_AREA)`
+    );
+    device = device.with(createCleanAreaServiceAreaServer(cleanAreaRooms));
+  } else if (customAreas && customAreas.length > 0) {
     logger196.info(
       `${entityId}: Adding ServiceArea (${customAreas.length} custom areas)`
     );
@@ -177653,8 +177759,23 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             `Auto-assigned mopIntensity ${vacuumEntities.mopIntensityEntity} to ${entityId}`
           );
         }
+        const supportedFeatures = state.attributes.supported_features ?? 0;
+        const cleanAreaRooms = await registry2.resolveCleanAreaRooms(
+          entityId,
+          supportedFeatures
+        );
+        if (cleanAreaRooms.length > 0) {
+          effectiveMapping = {
+            ...effectiveMapping,
+            entityId: effectiveMapping?.entityId ?? entityId,
+            cleanAreaRooms
+          };
+          logger198.debug(
+            `Using ${cleanAreaRooms.length} HA areas via CLEAN_AREA for ${entityId}`
+          );
+        }
         const vacAttrs = state.attributes;
-        if (!vacAttrs.rooms && !vacAttrs.segments && !vacAttrs.room_mapping) {
+        if (cleanAreaRooms.length === 0 && !vacAttrs.rooms && !vacAttrs.segments && !vacAttrs.room_mapping) {
           const valetudoRooms = registry2.findValetudoMapSegments(
             entity.device_id
           );
@@ -178850,6 +178971,54 @@ var BridgeRegistry = class _BridgeRegistry {
       return [];
     }
   }
+  static cleanAreaLogger = Logger.get("CleanAreaRooms");
+  /**
+   * Resolve HA areas mapped to vacuum segments via HA 2026.3 CLEAN_AREA.
+   * Fetches the full entity registry entry (including options.vacuum.area_mapping)
+   * and resolves HA area names from the area registry.
+   * Returns CleanAreaRoom[] sorted alphabetically, or empty array if
+   * CLEAN_AREA is not supported or no area_mapping is configured.
+   */
+  async resolveCleanAreaRooms(entityId, supportedFeatures) {
+    if (!this.client) return [];
+    if (!(supportedFeatures & VacuumDeviceFeature.CLEAN_AREA)) return [];
+    try {
+      const entry = await this.client.connection.sendMessagePromise({
+        type: "config/entity_registry/get",
+        entity_id: entityId
+      });
+      const vacuumOptions = entry?.options?.vacuum;
+      const areaMapping = vacuumOptions?.area_mapping;
+      if (!areaMapping || Object.keys(areaMapping).length === 0) {
+        _BridgeRegistry.cleanAreaLogger.debug(
+          `${entityId}: CLEAN_AREA supported but no area_mapping configured`
+        );
+        return [];
+      }
+      const rooms = [];
+      for (const haAreaId of Object.keys(areaMapping)) {
+        const areaName = this.registry.areas.get(haAreaId) ?? haAreaId;
+        rooms.push({
+          areaId: hashAreaId(haAreaId),
+          haAreaId,
+          name: areaName
+        });
+      }
+      rooms.sort((a, b) => a.name.localeCompare(b.name));
+      if (rooms.length > 0) {
+        _BridgeRegistry.cleanAreaLogger.info(
+          `${entityId}: Resolved ${rooms.length} HA areas via CLEAN_AREA mapping`
+        );
+      }
+      return rooms;
+    } catch (error) {
+      const msg = error instanceof Error ? error.message : typeof error === "object" && error !== null ? JSON.stringify(error) : String(error);
+      _BridgeRegistry.cleanAreaLogger.warn(
+        `${entityId}: Failed to resolve CLEAN_AREA mapping: ${msg}`
+      );
+      return [];
+    }
+  }
   /**
    * Find a pressure sensor entity that belongs to the same HA device.
    * Returns the entity_id of the pressure sensor, or undefined if none found.
@@ -179080,6 +179249,15 @@ var BridgeRegistry = class _BridgeRegistry {
     return true;
   }
 };
+function hashAreaId(areaId) {
+  let hash2 = 0;
+  for (let i = 0; i < areaId.length; i++) {
+    const char = areaId.charCodeAt(i);
+    hash2 = (hash2 << 5) - hash2 + char;
+    hash2 |= 0;
+  }
+  return Math.abs(hash2);
+}
 
 // src/services/bridges/server-mode-bridge.ts
 init_dist();
@@ -179455,17 +179633,24 @@ function ServerModeVacuumDevice(homeAssistantEntity, includeOnOff = false, clean
     return void 0;
   }
   const attributes7 = homeAssistantEntity.entity.state.attributes;
+  const cleanAreaRooms = homeAssistantEntity.mapping?.cleanAreaRooms;
+  const customAreas = homeAssistantEntity.mapping?.customServiceAreas;
   let device = ServerModeVacuumEndpointType.with(
-    createVacuumRvcRunModeServer(attributes7)
+    cleanAreaRooms && cleanAreaRooms.length > 0 ? createCleanAreaRvcRunModeServer(cleanAreaRooms) : createVacuumRvcRunModeServer(
+      attributes7,
+      false,
+      customAreas && customAreas.length > 0 ? customAreas : void 0
+    )
   ).set({ homeAssistantEntity });
   if (includeOnOff) {
     device = device.with(VacuumOnOffServer);
   }
   device = device.with(VacuumPowerSourceServer);
-  const customAreas = homeAssistantEntity.mapping?.customServiceAreas;
   const roomEntities = homeAssistantEntity.mapping?.roomEntities;
   const rooms = parseVacuumRooms(attributes7);
-  if (customAreas && customAreas.length > 0) {
+  if (cleanAreaRooms && cleanAreaRooms.length > 0) {
+    device = device.with(createCleanAreaServiceAreaServer(cleanAreaRooms));
+  } else if (customAreas && customAreas.length > 0) {
     device = device.with(createCustomServiceAreaServer(customAreas));
   } else if (rooms.length > 0 || roomEntities && roomEntities.length > 0) {
     device = device.with(
@@ -179563,8 +179748,23 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
           `${entityId}: Auto-assigned mopIntensity ${vacuumEntities.mopIntensityEntity}`
         );
       }
+      const supportedFeatures = state.attributes.supported_features ?? 0;
+      const cleanAreaRooms = await registry2.resolveCleanAreaRooms(
+        entityId,
+        supportedFeatures
+      );
+      if (cleanAreaRooms.length > 0) {
+        effectiveMapping = {
+          ...effectiveMapping,
+          entityId: effectiveMapping?.entityId ?? entityId,
+          cleanAreaRooms
+        };
+        logger201.info(
+          `${entityId}: Using ${cleanAreaRooms.length} HA areas via CLEAN_AREA`
+        );
+      }
       const vacAttrs = state.attributes;
-      if (!vacAttrs.rooms && !vacAttrs.segments && !vacAttrs.room_mapping) {
+      if (cleanAreaRooms.length === 0 && !vacAttrs.rooms && !vacAttrs.segments && !vacAttrs.room_mapping) {
         const valetudoRooms = registry2.findValetudoMapSegments(
           entity.device_id
         );