@riddix/hamh 2.1.0-alpha.665 → 2.1.0-alpha.667

package/dist/backend/cli.js

@@ -148898,6 +148898,7 @@ function entityMappingApi(mappingStorage) {
       coverSliderDebounceMs: body.coverSliderDebounceMs,
       disableClimateOnOff: body.disableClimateOnOff,
       disableClimateFanControl: body.disableClimateFanControl,
+      climateKeepModeOnIdle: body.climateKeepModeOnIdle,
       composedEntities: body.composedEntities
     };
     const config10 = await mappingStorage.setMapping(request);
@@ -149363,7 +149364,8 @@ function configToProfileEntry(config10) {
     coverSwapOpenClose: config10.coverSwapOpenClose,
     coverSliderDebounceMs: config10.coverSliderDebounceMs,
     disableClimateOnOff: config10.disableClimateOnOff,
-    disableClimateFanControl: config10.disableClimateFanControl
+    disableClimateFanControl: config10.disableClimateFanControl,
+    climateKeepModeOnIdle: config10.climateKeepModeOnIdle
   };
 }
 function mappingProfileApi(mappingStorage) {
@@ -149487,7 +149489,8 @@ function mappingProfileApi(mappingStorage) {
           coverSwapOpenClose: entry.coverSwapOpenClose,
           coverSliderDebounceMs: entry.coverSliderDebounceMs,
           disableClimateOnOff: entry.disableClimateOnOff,
-          disableClimateFanControl: entry.disableClimateFanControl
+          disableClimateFanControl: entry.disableClimateFanControl,
+          climateKeepModeOnIdle: entry.climateKeepModeOnIdle
         });
         applied++;
       } catch (e) {
@@ -153459,9 +153462,10 @@ var EntityMappingStorage = class extends Service {
       coverSliderDebounceMs: sanitizeDebounceMs(request.coverSliderDebounceMs),
       disableClimateOnOff: request.disableClimateOnOff || void 0,
       disableClimateFanControl: request.disableClimateFanControl || void 0,
+      climateKeepModeOnIdle: request.climateKeepModeOnIdle || void 0,
       composedEntities: request.composedEntities?.filter((e) => e.entityId?.trim()) ?? void 0
     };
-    if (!config10.matterDeviceType && !config10.customName && !config10.customProductName && !config10.customVendorName && !config10.customSerialNumber && config10.customVendorId === void 0 && config10.disabled !== true && !config10.filterLifeEntity && !config10.cleaningModeEntity && !config10.temperatureEntity && !config10.humidityEntity && !config10.batteryEntity && !config10.roomEntities && !config10.disableLockPin && !config10.powerEntity && !config10.energyEntity && !config10.pressureEntity && !config10.suctionLevelEntity && !config10.mopIntensityEntity && (!config10.customServiceAreas || config10.customServiceAreas.length === 0) && (!config10.customFanSpeedTags || Object.keys(config10.customFanSpeedTags).length === 0) && !config10.currentRoomEntity && !config10.valetudoIdentifier && !config10.coverSwapOpenClose && !config10.coverSliderDebounceMs && !config10.disableClimateOnOff && !config10.disableClimateFanControl && (!config10.composedEntities || config10.composedEntities.length === 0)) {
+    if (!config10.matterDeviceType && !config10.customName && !config10.customProductName && !config10.customVendorName && !config10.customSerialNumber && config10.customVendorId === void 0 && config10.disabled !== true && !config10.filterLifeEntity && !config10.cleaningModeEntity && !config10.temperatureEntity && !config10.humidityEntity && !config10.batteryEntity && !config10.roomEntities && !config10.disableLockPin && !config10.powerEntity && !config10.energyEntity && !config10.pressureEntity && !config10.suctionLevelEntity && !config10.mopIntensityEntity && (!config10.customServiceAreas || config10.customServiceAreas.length === 0) && (!config10.customFanSpeedTags || Object.keys(config10.customFanSpeedTags).length === 0) && !config10.currentRoomEntity && !config10.valetudoIdentifier && !config10.coverSwapOpenClose && !config10.coverSliderDebounceMs && !config10.disableClimateOnOff && !config10.disableClimateFanControl && !config10.climateKeepModeOnIdle && (!config10.composedEntities || config10.composedEntities.length === 0)) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config10);
@@ -171928,6 +171932,7 @@ function isHeatCoolOnly(modes) {
   return modes.includes(ClimateHvacMode.heat_cool) && !modes.includes(ClimateHvacMode.heat) && !modes.includes(ClimateHvacMode.cool);
 }
 var lastHvacDirection = /* @__PURE__ */ new Map();
+var lastNonOffSystemMode = /* @__PURE__ */ new Map();
 function getHeatCoolOnlyDirection(entity, agent) {
   const action = attributes4(entity).hvac_action;
   const homeAssistant = agent.get(HomeAssistantEntityBehavior);
@@ -171942,6 +171947,60 @@ function getHeatCoolOnlyDirection(entity, agent) {
   }
   return lastHvacDirection.get(entityId) ?? "heating";
 }
+function computeSystemMode(entity, agent) {
+  const hvacMode = entity.state;
+  const systemMode = hvacModeToSystemMode[hvacMode] ?? Thermostat3.SystemMode.Off;
+  if (systemMode === Thermostat3.SystemMode.Auto) {
+    const modes = attributes4(entity).hvac_modes ?? [];
+    if (isHeatCoolOnly(modes)) {
+      const direction = getHeatCoolOnlyDirection(entity, agent);
+      return direction === "cooling" ? Thermostat3.SystemMode.Cool : Thermostat3.SystemMode.Heat;
+    }
+    const hasMatterAuto = modes.includes(ClimateHvacMode.heat_cool) && (modes.includes(ClimateHvacMode.heat) || modes.includes(ClimateHvacMode.cool));
+    if (hasMatterAuto) {
+      return systemMode;
+    }
+    const hasCooling = modes.some((m) => m === ClimateHvacMode.cool);
+    const hasHeating = modes.some(
+      (m) => m === ClimateHvacMode.heat || m === ClimateHvacMode.auto
+    );
+    if (hasHeating && !hasCooling) {
+      return Thermostat3.SystemMode.Heat;
+    }
+    if (hasCooling && !hasHeating) {
+      return Thermostat3.SystemMode.Cool;
+    }
+    const homeAssistant = agent.get(HomeAssistantEntityBehavior);
+    const entityId = homeAssistant.entityId;
+    const action = attributes4(entity).hvac_action;
+    if (action === ClimateHvacAction.cooling) {
+      lastHvacDirection.set(entityId, "cooling");
+      return Thermostat3.SystemMode.Cool;
+    }
+    if (action === ClimateHvacAction.heating) {
+      lastHvacDirection.set(entityId, "heating");
+      return Thermostat3.SystemMode.Heat;
+    }
+    const remembered = lastHvacDirection.get(entityId);
+    if (remembered) {
+      return remembered === "cooling" ? Thermostat3.SystemMode.Cool : Thermostat3.SystemMode.Heat;
+    }
+    const current = attributes4(entity).current_temperature;
+    const target = attributes4(entity).temperature;
+    if (typeof current === "number" && typeof target === "number") {
+      if (current > target) {
+        lastHvacDirection.set(entityId, "cooling");
+        return Thermostat3.SystemMode.Cool;
+      }
+      if (current < target) {
+        lastHvacDirection.set(entityId, "heating");
+        return Thermostat3.SystemMode.Heat;
+      }
+    }
+    return Thermostat3.SystemMode.Cool;
+  }
+  return systemMode;
+}
 var config4 = {
   // Temperature range (target_temp_low/high) only works in heat_cool mode.
   // In heat or cool mode, HA expects a single "temperature" value.
@@ -171961,58 +172020,20 @@ var config4 = {
   getTargetHeatingTemperature: (entity, agent) => getTemp(agent, entity, "target_temp_low") ?? getTemp(agent, entity, "target_temperature") ?? getTemp(agent, entity, "temperature"),
   getTargetCoolingTemperature: (entity, agent) => getTemp(agent, entity, "target_temp_high") ?? getTemp(agent, entity, "target_temperature") ?? getTemp(agent, entity, "temperature"),
   getSystemMode: (entity, agent) => {
-    const hvacMode = entity.state;
-    const systemMode = hvacModeToSystemMode[hvacMode] ?? Thermostat3.SystemMode.Off;
-    if (systemMode === Thermostat3.SystemMode.Auto) {
-      const modes = attributes4(entity).hvac_modes ?? [];
-      if (isHeatCoolOnly(modes)) {
-        const direction = getHeatCoolOnlyDirection(entity, agent);
-        return direction === "cooling" ? Thermostat3.SystemMode.Cool : Thermostat3.SystemMode.Heat;
-      }
-      const hasMatterAuto = modes.includes(ClimateHvacMode.heat_cool) && (modes.includes(ClimateHvacMode.heat) || modes.includes(ClimateHvacMode.cool));
-      if (hasMatterAuto) {
-        return systemMode;
-      }
-      const hasCooling = modes.some((m) => m === ClimateHvacMode.cool);
-      const hasHeating = modes.some(
-        (m) => m === ClimateHvacMode.heat || m === ClimateHvacMode.auto
-      );
-      if (hasHeating && !hasCooling) {
-        return Thermostat3.SystemMode.Heat;
-      }
-      if (hasCooling && !hasHeating) {
-        return Thermostat3.SystemMode.Cool;
-      }
-      const homeAssistant = agent.get(HomeAssistantEntityBehavior);
-      const entityId = homeAssistant.entityId;
-      const action = attributes4(entity).hvac_action;
-      if (action === ClimateHvacAction.cooling) {
-        lastHvacDirection.set(entityId, "cooling");
-        return Thermostat3.SystemMode.Cool;
-      }
-      if (action === ClimateHvacAction.heating) {
-        lastHvacDirection.set(entityId, "heating");
-        return Thermostat3.SystemMode.Heat;
-      }
-      const remembered = lastHvacDirection.get(entityId);
-      if (remembered) {
-        return remembered === "cooling" ? Thermostat3.SystemMode.Cool : Thermostat3.SystemMode.Heat;
-      }
-      const current = attributes4(entity).current_temperature;
-      const target = attributes4(entity).temperature;
-      if (typeof current === "number" && typeof target === "number") {
-        if (current > target) {
-          lastHvacDirection.set(entityId, "cooling");
-          return Thermostat3.SystemMode.Cool;
-        }
-        if (current < target) {
-          lastHvacDirection.set(entityId, "heating");
-          return Thermostat3.SystemMode.Heat;
-        }
+    const homeAssistant = agent.get(HomeAssistantEntityBehavior);
+    const entityId = homeAssistant.entityId;
+    const computed = computeSystemMode(entity, agent);
+    if (computed !== Thermostat3.SystemMode.Off) {
+      lastNonOffSystemMode.set(entityId, computed);
+      return computed;
+    }
+    if (homeAssistant.state.mapping?.climateKeepModeOnIdle === true && attributes4(entity).hvac_action === ClimateHvacAction.idle) {
+      const remembered = lastNonOffSystemMode.get(entityId);
+      if (remembered !== void 0) {
+        return remembered;
       }
-      return Thermostat3.SystemMode.Cool;
     }
-    return systemMode;
+    return computed;
   },
   getRunningMode: (entity) => {
     const action = attributes4(entity).hvac_action;
@@ -172376,13 +172397,10 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
       {
         type: overrideType ?? (this.features.lift && this.features.tilt ? WindowCovering3.WindowCoveringType.TiltBlindLift : this.features.tilt ? WindowCovering3.WindowCoveringType.TiltBlindTiltOnly : WindowCovering3.WindowCoveringType.Rollershade),
         endProductType: overrideEndProduct ?? (this.features.lift && this.features.tilt ? WindowCovering3.EndProductType.SheerShade : this.features.tilt ? WindowCovering3.EndProductType.TiltOnlyInteriorBlind : WindowCovering3.EndProductType.RollerShade),
-        operationalStatus: {
-          global: movementStatus,
-          ...this.features.lift ? { lift: movementStatus } : {},
-          ...this.features.tilt ? { tilt: movementStatus } : {}
-        },
-        // Target before current so Apple Home derives the right direction
-        // at the start of an externally-driven movement (#328).
+        // Target before operationalStatus so the wire order matches the
+        // certified Eve MotionBlinds (state, target, current). Patch insertion
+        // order propagates into matter.js's changeList via for-in over values
+        // (Datasource.js:414), then through attrsChanged.emit (#328).
         ...this.features.positionAwareLift ? {
           targetPositionLiftPercent100ths: inferTarget(
             currentLift100ths,
@@ -172395,6 +172413,11 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
             this.state.targetPositionTiltPercent100ths
           )
         } : {},
+        operationalStatus: {
+          global: movementStatus,
+          ...this.features.lift ? { lift: movementStatus } : {},
+          ...this.features.tilt ? { tilt: movementStatus } : {}
+        },
         ...this.features.positionAwareLift && !startedMoving ? {
           currentPositionLiftPercent100ths: currentLift100ths
         } : {},