@riddix/hamh 2.1.0-alpha.586 → 2.1.0-alpha.588

package/dist/backend/cli.js

@@ -174258,6 +174258,9 @@ var AirQualitySensorServerImpl = class extends AirQualityServerWithFeatures {
     this.reactTo(homeAssistant.onChange, this.update);
   }
   update(entity) {
+    if (!entity.state || !entity.state.attributes) {
+      return;
+    }
     const state = entity.state.state;
     const attributes7 = entity.state.attributes;
     const deviceClass = attributes7.device_class;
@@ -174437,6 +174440,9 @@ var StandalonePowerServer = class extends ElectricalPowerMeasurementServer {
     this.reactTo(homeAssistant.onChange, this.update);
   }
   update(entity) {
+    if (!entity.state || !entity.state.attributes) {
+      return;
+    }
     const state = entity.state.state;
     if (state == null || Number.isNaN(+state)) return;
     const attrs = entity.state.attributes;
@@ -174492,6 +174498,9 @@ var StandaloneEnergyServer = class extends EnergyFeaturedBase {
     this.reactTo(homeAssistant.onChange, this.update);
   }
   update(entity) {
+    if (!entity.state || !entity.state.attributes) {
+      return;
+    }
     const attrs = entity.state.attributes;
     if (attrs.device_class !== SensorDeviceClass.energy) return;
     const state = entity.state.state;
@@ -175308,6 +175317,9 @@ var TvocAirQualityServer = class extends TvocAirQualityServerBase {
     this.reactTo(homeAssistant.onChange, this.update);
   }
   update(entity) {
+    if (!entity.state || !entity.state.attributes) {
+      return;
+    }
     const state = entity.state.state;
     const attributes7 = entity.state.attributes;
     const deviceClass = attributes7.device_class;
@@ -176067,13 +176079,25 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
     );
     if (previousMode !== newMode) {
       if (newMode === 0 /* Idle */) {
-        this.trySetCurrentArea(null);
-        s.completedAreas.clear();
-        s.lastCurrentArea = null;
+        if (s.lastCurrentArea !== null) {
+          s.completedAreas.add(s.lastCurrentArea);
+          s.lastCurrentArea = null;
+          try {
+            const serviceArea = this.agent.get(ServiceAreaBehavior);
+            serviceArea.state.currentArea = null;
+            this.updateProgressFromTracking(serviceArea);
+          } catch {
+          }
+        }
         s.loggedShortCircuits.clear();
       } else if (newMode === 1 /* Cleaning */) {
         if (s.activeAreas.length > 0 && s.lastCurrentArea === null) {
-          this.trySetCurrentArea(s.activeAreas[0]);
+          const firstPending = s.activeAreas.find(
+            (id) => !s.completedAreas.has(id)
+          );
+          if (firstPending !== void 0) {
+            this.trySetCurrentArea(firstPending);
+          }
         }
       }
     }
@@ -176214,6 +176238,22 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
       }));
     }
   }
+  /**
+   * Update progress entries from tracking state without any area
+   * operating. Used on mid-session transitions (e.g. vacuum-then-mop
+   * tool swap) where the vacuum is temporarily idle but the session
+   * is not finished: completed areas stay Completed, remaining areas
+   * stay Pending.
+   */
+  updateProgressFromTracking(serviceArea) {
+    const s = getSession(this.endpoint);
+    if (s.activeAreas.length === 0) return;
+    const state = serviceArea.state;
+    state.progress = s.activeAreas.map((id) => ({
+      areaId: id,
+      status: s.completedAreas.has(id) ? ServiceArea3.OperationalStatus.Completed : ServiceArea3.OperationalStatus.Pending
+    }));
+  }
   /**
    * Find the ServiceArea area ID that corresponds to a run mode value
    * by matching the mode label to the area location name.
@@ -176246,6 +176286,9 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         const serviceArea = this.agent.get(ServiceAreaBehavior);
         if (serviceArea.state.selectedAreas?.length > 0) {
           s.activeAreas = [...serviceArea.state.selectedAreas];
+          s.completedAreas.clear();
+          s.lastCurrentArea = null;
+          s.loggedShortCircuits.clear();
           this.trySetCurrentArea(s.activeAreas[0]);
           homeAssistant.callAction(this.state.config.start(void 0, this.agent));
           this.state.currentMode = newMode;
@@ -176259,6 +176302,9 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
       if (this.state.config.cleanRoom) {
         const areaId = this.findAreaIdForMode(newMode);
         s.activeAreas = areaId !== null ? [areaId] : [];
+        s.completedAreas.clear();
+        s.lastCurrentArea = null;
+        s.loggedShortCircuits.clear();
         this.trySetCurrentArea(areaId);
         homeAssistant.callAction(
           this.state.config.cleanRoom(newMode, this.agent)
@@ -176276,6 +176322,9 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
           const serviceArea = this.agent.get(ServiceAreaBehavior);
           if (serviceArea.state.selectedAreas?.length > 0) {
             s.activeAreas = [...serviceArea.state.selectedAreas];
+            s.completedAreas.clear();
+            s.lastCurrentArea = null;
+            s.loggedShortCircuits.clear();
             this.trySetCurrentArea(s.activeAreas[0]);
           }
         } catch {
@@ -176288,6 +176337,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         s.completedAreas.clear();
         s.lastCurrentArea = null;
         s.activeAreas = [];
+        s.loggedShortCircuits.clear();
         homeAssistant.callAction(
           this.state.config.returnToBase(void 0, this.agent)
         );