@riddix/hamh 2.1.0-alpha.547 → 2.1.0-alpha.549

package/dist/backend/cli.js

@@ -167613,6 +167613,7 @@ function getMappedEntityIds(mapping) {
   if (mapping.filterLifeEntity) ids.push(mapping.filterLifeEntity);
   if (mapping.powerEntity) ids.push(mapping.powerEntity);
   if (mapping.energyEntity) ids.push(mapping.energyEntity);
+  if (mapping.currentRoomEntity) ids.push(mapping.currentRoomEntity);
   if (mapping.composedEntities) {
     for (const sub of mapping.composedEntities) {
       if (sub.entityId) ids.push(sub.entityId);
@@ -175685,6 +175686,10 @@ function isRoomMode(mode) {
   return mode >= ROOM_MODE_BASE;
 }
 var RvcRunModeServerBase = class extends RvcRunModeServer {
+  /** Areas that the vacuum has already finished cleaning in this session */
+  completedAreas = /* @__PURE__ */ new Set();
+  /** Last known currentArea — used to detect room transitions */
+  lastCurrentArea = null;
   async initialize() {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
@@ -175706,6 +175711,8 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
     });
     if (previousMode !== newMode) {
       if (newMode === 0 /* Idle */) {
+        this.completedAreas.clear();
+        this.lastCurrentArea = null;
         this.trySetCurrentArea(null);
       } else if (newMode === 1 /* Cleaning */) {
         try {
@@ -175717,6 +175724,53 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         }
       }
     }
+    if (newMode === 1 /* Cleaning */) {
+      this.updateCurrentRoomFromSensor();
+    }
+  }
+  /**
+   * Read the currentRoomEntity sensor and update currentArea + progress
+   * to reflect which room the vacuum is actually in right now.
+   */
+  updateCurrentRoomFromSensor() {
+    try {
+      const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
+      const currentRoomEntityId = homeAssistant.state.mapping?.currentRoomEntity;
+      if (!currentRoomEntityId) return;
+      const stateProvider = this.agent.env.get(EntityStateProvider);
+      const roomState = stateProvider.getState(currentRoomEntityId);
+      if (!roomState || !roomState.state) return;
+      const serviceArea = this.agent.get(ServiceAreaBehavior);
+      const selectedAreas = serviceArea.state.selectedAreas;
+      if (!selectedAreas || selectedAreas.length === 0) return;
+      const segmentId = roomState.attributes?.segment_id;
+      const roomName = roomState.state;
+      let matchedAreaId = null;
+      if (segmentId != null) {
+        if (selectedAreas.includes(segmentId)) {
+          matchedAreaId = segmentId;
+        }
+      }
+      if (matchedAreaId === null && roomName) {
+        const area = serviceArea.state.supportedAreas.find(
+          (a) => a.areaInfo.locationInfo?.locationName?.toLowerCase() === roomName.toLowerCase()
+        );
+        if (area && selectedAreas.includes(area.areaId)) {
+          matchedAreaId = area.areaId;
+        }
+      }
+      if (matchedAreaId === null) return;
+      if (matchedAreaId === this.lastCurrentArea) return;
+      if (this.lastCurrentArea !== null) {
+        this.completedAreas.add(this.lastCurrentArea);
+      }
+      this.lastCurrentArea = matchedAreaId;
+      logger189.debug(
+        `currentRoom sensor: area ${matchedAreaId} ("${roomName}"), completed: [${[...this.completedAreas].join(", ")}]`
+      );
+      this.trySetCurrentArea(matchedAreaId);
+    } catch {
+    }
   }
   /**
    * Safely update ServiceArea.currentArea and progress.
@@ -175737,24 +175791,27 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
   }
   /**
    * Update progress entries to reflect the current operating area.
-   * - null: mark all Operating/Pending entries as Completed (cleaning done)
-   * - areaId: mark that area as Operating
+   * - null: mark all areas as Completed (cleaning done)
+   * - areaId: mark that area as Operating, others as Pending
    *
-   * Note: progress is available because our ServiceAreaServerBase enables
-   * ProgressReporting, but the base ServiceAreaBehavior type doesn't expose it.
+   * Rebuilds progress from selectedAreas (plain number array) instead of
+   * reading managed state progress entries, which avoids infinite recursion
+   * in matter.js property getters during transaction pre-commit.
    */
   updateProgress(serviceArea, areaId) {
     const state = serviceArea.state;
-    const progress = state.progress;
-    if (!progress || progress.length === 0) return;
+    const selectedAreas = serviceArea.state.selectedAreas;
+    if (!selectedAreas || selectedAreas.length === 0) return;
     if (areaId === null) {
-      state.progress = progress.map(
-        (p) => p.status === ServiceArea3.OperationalStatus.Operating || p.status === ServiceArea3.OperationalStatus.Pending ? { ...p, status: ServiceArea3.OperationalStatus.Completed } : p
-      );
+      state.progress = selectedAreas.map((id) => ({
+        areaId: id,
+        status: ServiceArea3.OperationalStatus.Completed
+      }));
     } else {
-      state.progress = progress.map(
-        (p) => p.areaId === areaId && p.status === ServiceArea3.OperationalStatus.Pending ? { ...p, status: ServiceArea3.OperationalStatus.Operating } : p
-      );
+      state.progress = selectedAreas.map((id) => ({
+        areaId: id,
+        status: id === areaId ? ServiceArea3.OperationalStatus.Operating : this.completedAreas.has(id) ? ServiceArea3.OperationalStatus.Completed : ServiceArea3.OperationalStatus.Pending
+      }));
     }
   }
   /**
@@ -178587,6 +178644,16 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             `Auto-assigned mopIntensity ${vacuumEntities.mopIntensityEntity} to ${entityId}`
           );
         }
+        if (!effectiveMapping?.currentRoomEntity && vacuumEntities.currentRoomEntity) {
+          effectiveMapping = {
+            ...effectiveMapping,
+            entityId: effectiveMapping?.entityId ?? entityId,
+            currentRoomEntity: vacuumEntities.currentRoomEntity
+          };
+          logger200.debug(
+            `Auto-assigned currentRoom ${vacuumEntities.currentRoomEntity} to ${entityId}`
+          );
+        }
         const supportedFeatures = state.attributes.supported_features ?? 0;
         const cleanAreaRooms = await registry2.resolveCleanAreaRooms(
           entityId,
@@ -179765,7 +179832,22 @@ var BridgeRegistry = class _BridgeRegistry {
         mopIntensityEntity = entity.entity_id;
       }
     }
-    return { cleaningModeEntity, suctionLevelEntity, mopIntensityEntity };
+    let currentRoomEntity;
+    const sameDeviceSensors = entities.filter(
+      (e) => e.device_id === deviceId && e.entity_id.startsWith("sensor.")
+    );
+    for (const entity of sameDeviceSensors) {
+      if (entity.entity_id.toLowerCase().endsWith("_current_room")) {
+        currentRoomEntity = entity.entity_id;
+        break;
+      }
+    }
+    return {
+      cleaningModeEntity,
+      suctionLevelEntity,
+      mopIntensityEntity,
+      currentRoomEntity
+    };
   }
   static valetudoLogger = Logger.get("ValetudoRooms");
   /**
@@ -180762,6 +180844,16 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
           `${entityId}: Auto-assigned mopIntensity ${vacuumEntities.mopIntensityEntity}`
         );
       }
+      if (!effectiveMapping?.currentRoomEntity && vacuumEntities.currentRoomEntity) {
+        effectiveMapping = {
+          ...effectiveMapping,
+          entityId: effectiveMapping?.entityId ?? entityId,
+          currentRoomEntity: vacuumEntities.currentRoomEntity
+        };
+        logger203.info(
+          `${entityId}: Auto-assigned currentRoom ${vacuumEntities.currentRoomEntity}`
+        );
+      }
       const supportedFeatures = state.attributes.supported_features ?? 0;
       const cleanAreaRooms = await registry2.resolveCleanAreaRooms(
         entityId,