@riddix/hamh 2.1.0-alpha.556 → 2.1.0-alpha.557

package/dist/backend/cli.js

@@ -175898,7 +175898,6 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         this.trySetCurrentArea(null);
         this.completedAreas.clear();
         this.lastCurrentArea = null;
-        this.activeAreas = [];
       } else if (newMode === 1 /* Cleaning */) {
         if (this.activeAreas.length > 0 && this.lastCurrentArea === null) {
           this.trySetCurrentArea(this.activeAreas[0]);
@@ -175923,7 +175922,8 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
       if (!roomState || !roomState.state) return;
       if (this.activeAreas.length === 0) return;
       const serviceArea = this.agent.get(ServiceAreaBehavior);
-      const segmentId = roomState.attributes?.segment_id;
+      const sensorAttrs = roomState.attributes;
+      const segmentId = sensorAttrs.segment_id ?? sensorAttrs.room_id;
       const roomName = roomState.state;
       let matchedAreaId = null;
       if (segmentId != null) {
@@ -175939,7 +175939,12 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
           matchedAreaId = area.areaId;
         }
       }
-      if (matchedAreaId === null) return;
+      if (matchedAreaId === null) {
+        logger189.debug(
+          `currentRoom sensor: no match for "${roomName}" (segmentId=${segmentId}), activeAreas=[${this.activeAreas.join(", ")}]`
+        );
+        return;
+      }
       if (matchedAreaId === this.lastCurrentArea) return;
       if (this.lastCurrentArea !== null) {
         this.completedAreas.add(this.lastCurrentArea);
@@ -176063,6 +176068,9 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
       }
       case 0 /* Idle */:
         this.trySetCurrentArea(null);
+        this.completedAreas.clear();
+        this.lastCurrentArea = null;
+        this.activeAreas = [];
         homeAssistant.callAction(
           this.state.config.returnToBase(void 0, this.agent)
         );
@@ -176684,7 +176692,8 @@ var vacuumRvcRunModeConfig = {
       VacuumState.segment_cleaning,
       VacuumState.zone_cleaning,
       VacuumState.spot_cleaning,
-      VacuumState.mop_cleaning
+      VacuumState.mop_cleaning,
+      VacuumState.paused
     ];
     const isCleaning = cleaningStates.includes(state);
     logger192.debug(
@@ -177974,7 +177983,7 @@ var VacuumRvcOperationalStateServer = RvcOperationalStateServer2({
       if (isCharging(entity)) {
         operationalState = RvcOperationalState3.OperationalState.Charging;
       } else {
-        operationalState = RvcOperationalState3.OperationalState.Paused;
+        operationalState = RvcOperationalState3.OperationalState.Stopped;
       }
     } else if (state === VacuumState.error || state === "unavailable") {
       operationalState = RvcOperationalState3.OperationalState.Error;
@@ -177985,8 +177994,8 @@ var VacuumRvcOperationalStateServer = RvcOperationalStateServer2({
         );
         operationalState = RvcOperationalState3.OperationalState.Running;
       } else {
-        logger196.info(`Unknown vacuum state "${state}", treating as Paused`);
-        operationalState = RvcOperationalState3.OperationalState.Paused;
+        logger196.info(`Unknown vacuum state "${state}", treating as Stopped`);
+        operationalState = RvcOperationalState3.OperationalState.Stopped;
       }
     }
     logger196.debug(