@riddix/hamh 2.1.0-alpha.726 → 2.1.0-alpha.728

package/dist/backend/cli.js

@@ -126207,6 +126207,7 @@ function entityMappingApi(mappingStorage) {
       customServiceAreas: body.customServiceAreas,
       customFanSpeedTags: body.customFanSpeedTags,
       currentRoomEntity: body.currentRoomEntity,
+      cleanedAreaEntity: body.cleanedAreaEntity,
       valetudoIdentifier: body.valetudoIdentifier,
       coverSwapOpenClose: body.coverSwapOpenClose,
       coverSliderDebounceMs: body.coverSliderDebounceMs,
@@ -130826,6 +130827,7 @@ var EntityMappingStorage = class extends Service {
       ) ?? void 0,
       customFanSpeedTags: request.customFanSpeedTags && Object.keys(request.customFanSpeedTags).length > 0 ? request.customFanSpeedTags : void 0,
       currentRoomEntity: request.currentRoomEntity?.trim() || void 0,
+      cleanedAreaEntity: request.cleanedAreaEntity?.trim() || void 0,
       valetudoIdentifier: request.valetudoIdentifier?.trim() || void 0,
       coverSwapOpenClose: request.coverSwapOpenClose || void 0,
       coverSliderDebounceMs: sanitizeDebounceMs(request.coverSliderDebounceMs),
@@ -130836,7 +130838,7 @@ var EntityMappingStorage = class extends Service {
       climateAutoMode: request.climateAutoMode || void 0,
       composedEntities: request.composedEntities?.filter((e) => e.entityId?.trim()) ?? void 0
     };
-    if (!config11.matterDeviceType && !config11.customName && !config11.customProductName && !config11.customVendorName && !config11.customSerialNumber && config11.customVendorId === void 0 && config11.disabled !== true && !config11.filterLifeEntity && !config11.cleaningModeEntity && !config11.temperatureEntity && !config11.humidityEntity && !config11.batteryEntity && !config11.roomEntities && !config11.disableLockPin && !config11.powerEntity && !config11.energyEntity && !config11.pressureEntity && !config11.suctionLevelEntity && !config11.mopIntensityEntity && (!config11.customServiceAreas || config11.customServiceAreas.length === 0) && (!config11.customFanSpeedTags || Object.keys(config11.customFanSpeedTags).length === 0) && !config11.currentRoomEntity && !config11.valetudoIdentifier && !config11.coverSwapOpenClose && !config11.coverSliderDebounceMs && !config11.disableClimateOnOff && !config11.disableClimateFanControl && !config11.climateKeepModeOnIdle && !config11.climateExposeFan && !config11.climateAutoMode && (!config11.composedEntities || config11.composedEntities.length === 0)) {
+    if (!config11.matterDeviceType && !config11.customName && !config11.customProductName && !config11.customVendorName && !config11.customSerialNumber && config11.customVendorId === void 0 && config11.disabled !== true && !config11.filterLifeEntity && !config11.cleaningModeEntity && !config11.temperatureEntity && !config11.humidityEntity && !config11.batteryEntity && !config11.roomEntities && !config11.disableLockPin && !config11.powerEntity && !config11.energyEntity && !config11.pressureEntity && !config11.suctionLevelEntity && !config11.mopIntensityEntity && (!config11.customServiceAreas || config11.customServiceAreas.length === 0) && (!config11.customFanSpeedTags || Object.keys(config11.customFanSpeedTags).length === 0) && !config11.currentRoomEntity && !config11.cleanedAreaEntity && !config11.valetudoIdentifier && !config11.coverSwapOpenClose && !config11.coverSliderDebounceMs && !config11.disableClimateOnOff && !config11.disableClimateFanControl && !config11.climateKeepModeOnIdle && !config11.climateExposeFan && !config11.climateAutoMode && (!config11.composedEntities || config11.composedEntities.length === 0)) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config11);
@@ -157462,6 +157464,27 @@ init_nodejs();
 
 // src/matter/behaviors/rvc-run-mode-server.ts
 init_home_assistant_entity_behavior();
+
+// src/matter/behaviors/infer-cleaned-area-progress.ts
+function inferCleanedAreaProgress(cleanedSqm, orderedAreas) {
+  if (orderedAreas.length === 0) {
+    return { currentArea: null, completed: [] };
+  }
+  const cleaned = Number.isFinite(cleanedSqm) ? Math.max(0, cleanedSqm) : 0;
+  let cumulative = 0;
+  const completed = [];
+  for (const area of orderedAreas) {
+    const size = Number.isFinite(area.sizeSqm) ? Math.max(0, area.sizeSqm) : 0;
+    cumulative += size;
+    if (cleaned < cumulative) {
+      return { currentArea: area.areaId, completed };
+    }
+    completed.push(area.areaId);
+  }
+  return { currentArea: null, completed };
+}
+
+// src/matter/behaviors/rvc-run-mode-server.ts
 var logger215 = Logger.get("RvcRunModeServer");
 var ROOM_MODE_BASE = 100;
 function isRoomMode(mode) {
@@ -157477,7 +157500,8 @@ function getSession(endpoint) {
       activeAreas: [],
       loggedShortCircuits: /* @__PURE__ */ new Set(),
       observedCleaning: false,
-      pendingDispatches: []
+      pendingDispatches: [],
+      cleanedAreaBaseline: null
     };
     cleaningSessions.set(endpoint, session);
   }
@@ -157570,7 +157594,12 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
       }
     }
     if (newMode === 1 /* Cleaning */) {
-      this.updateCurrentRoomFromSensor();
+      const mapping = this.agent.get(HomeAssistantEntityBehavior).state.mapping;
+      if (mapping?.currentRoomEntity) {
+        this.updateCurrentRoomFromSensor();
+      } else if (mapping?.cleanedAreaEntity) {
+        this.updateCurrentRoomFromCleanedArea();
+      }
     }
   }
   /**
@@ -157660,6 +157689,80 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
       }
     }
   }
+  /** Read the cumulative cleaned-area sensor (m2), or null if not configured. */
+  readCleanedAreaSqm() {
+    try {
+      const mapping = this.agent.get(HomeAssistantEntityBehavior).state.mapping;
+      const entityId = mapping?.cleanedAreaEntity;
+      if (!entityId) {
+        return null;
+      }
+      return this.agent.env.get(EntityStateProvider).getNumericState(entityId);
+    } catch {
+      return null;
+    }
+  }
+  /**
+   * For batch vacuums that report cumulative cleaned area but not the current
+   * room, infer currentArea + progress from the cleaned area and the per-room
+   * sizeSqm. Display-only and batch-only; skipped unless every selected area
+   * has a size. The currentRoom sensor path takes priority (#368).
+   */
+  updateCurrentRoomFromCleanedArea() {
+    try {
+      const s = getSession(this.endpoint);
+      if (s.pendingDispatches.length > 0 || s.activeAreas.length === 0) {
+        return;
+      }
+      const mapping = this.agent.get(HomeAssistantEntityBehavior).state.mapping;
+      const entityId = mapping?.cleanedAreaEntity;
+      if (!entityId) {
+        return;
+      }
+      const raw = this.agent.env.get(EntityStateProvider).getNumericState(entityId);
+      if (raw == null) {
+        this.logShortCircuitOnce(
+          "no-cleaned-area-state",
+          `cleanedArea sensor: no numeric state for ${entityId}`
+        );
+        return;
+      }
+      const customAreas = mapping?.customServiceAreas;
+      const ordered = [];
+      for (const areaId of s.activeAreas) {
+        const size = customAreas?.[areaId - 1]?.sizeSqm;
+        if (typeof size !== "number" || !Number.isFinite(size) || size <= 0) {
+          this.logShortCircuitOnce(
+            "no-sizes",
+            "cleanedArea sensor: not every selected area has a sizeSqm"
+          );
+          return;
+        }
+        ordered.push({ areaId, sizeSqm: size });
+      }
+      if (s.cleanedAreaBaseline == null || raw < s.cleanedAreaBaseline) {
+        s.cleanedAreaBaseline = raw;
+      }
+      const cleaned = Math.max(0, raw - s.cleanedAreaBaseline);
+      const { currentArea, completed } = inferCleanedAreaProgress(
+        cleaned,
+        ordered
+      );
+      for (const id of completed) {
+        s.completedAreas.add(id);
+      }
+      if (currentArea === s.lastCurrentArea) {
+        return;
+      }
+      s.lastCurrentArea = currentArea;
+      this.trySetCurrentArea(currentArea);
+    } catch (e) {
+      const msg = e instanceof Error ? e.message : String(e);
+      if (!msg.includes("No provider for") && !msg.includes("not supported")) {
+        logger215.warn(`cleanedArea room update failed: ${msg}`);
+      }
+    }
+  }
   /**
    * Safely update ServiceArea.currentArea and progress.
    * When areaId is set, marks it as Operating in progress.
@@ -157718,6 +157821,29 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
       status: s.completedAreas.has(id) ? ServiceArea3.OperationalStatus.Completed : ServiceArea3.OperationalStatus.Pending
     }));
   }
+  /**
+   * Stop before finishing: mark the areas the vacuum actually reached as
+   * Completed and the rest as Skipped (an out-of-band stop per the Matter
+   * ServiceArea spec), then clear currentArea. The old path marked every
+   * area Completed, which told Apple Home rooms were cleaned when they were
+   * not, so they got dropped from the next selection (#367).
+   */
+  finalizeProgressOnStop() {
+    const s = getSession(this.endpoint);
+    try {
+      const serviceArea = this.agent.get(ServiceAreaBehavior);
+      if (s.activeAreas.length > 0) {
+        const last = serviceArea.state.currentArea;
+        const state = serviceArea.state;
+        state.progress = s.activeAreas.map((id) => ({
+          areaId: id,
+          status: s.completedAreas.has(id) || id === last ? ServiceArea3.OperationalStatus.Completed : ServiceArea3.OperationalStatus.Skipped
+        }));
+      }
+      serviceArea.state.currentArea = null;
+    } catch {
+    }
+  }
   /**
    * Find the ServiceArea area ID that corresponds to a run mode value
    * by matching the mode label to the area location name.
@@ -157754,6 +157880,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
           s.lastCurrentArea = null;
           s.loggedShortCircuits.clear();
           s.pendingDispatches = [];
+          s.cleanedAreaBaseline = this.readCleanedAreaSqm();
           this.trySetCurrentArea(s.activeAreas[0]);
           homeAssistant.callAction(this.state.config.start(void 0, this.agent));
           this.state.currentMode = newMode;
@@ -157792,6 +157919,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
             s.lastCurrentArea = null;
             s.loggedShortCircuits.clear();
             s.pendingDispatches = [];
+            s.cleanedAreaBaseline = this.readCleanedAreaSqm();
             this.trySetCurrentArea(s.activeAreas[0]);
           }
         } catch {
@@ -157800,13 +157928,14 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         break;
       }
       case 0 /* Idle */:
-        this.trySetCurrentArea(null);
+        this.finalizeProgressOnStop();
         s.completedAreas.clear();
         s.lastCurrentArea = null;
         s.activeAreas = [];
         s.loggedShortCircuits.clear();
         s.pendingDispatches = [];
         s.observedCleaning = false;
+        s.cleanedAreaBaseline = null;
         homeAssistant.callAction(
           this.state.config.returnToBase(void 0, this.agent)
         );