@riddix/hamh 2.1.0-alpha.404 → 2.1.0-alpha.406

package/dist/backend/cli.js

@@ -168013,6 +168013,21 @@ var hvacModeToSystemMode = {
 function isHeatCoolOnly(modes) {
   return modes.includes(ClimateHvacMode.heat_cool) && !modes.includes(ClimateHvacMode.heat) && !modes.includes(ClimateHvacMode.cool);
 }
+var lastHvacDirection = /* @__PURE__ */ new Map();
+function getHeatCoolOnlyDirection(entity, agent) {
+  const action = attributes4(entity).hvac_action;
+  const homeAssistant = agent.get(HomeAssistantEntityBehavior);
+  const entityId = homeAssistant.entityId;
+  if (action === ClimateHvacAction.heating || action === ClimateHvacAction.preheating || action === ClimateHvacAction.defrosting || action === ClimateHvacAction.drying) {
+    lastHvacDirection.set(entityId, "heating");
+    return "heating";
+  }
+  if (action === ClimateHvacAction.cooling) {
+    lastHvacDirection.set(entityId, "cooling");
+    return "cooling";
+  }
+  return lastHvacDirection.get(entityId) ?? "heating";
+}
 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.
@@ -168031,13 +168046,14 @@ var config4 = {
   getCurrentTemperature: (entity, agent) => getTemp(agent, entity, "current_temperature"),
   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) => {
+  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)) {
-        return Thermostat3.SystemMode.Heat;
+        const direction = getHeatCoolOnlyDirection(entity, agent);
+        return direction === "cooling" ? Thermostat3.SystemMode.Cool : Thermostat3.SystemMode.Heat;
       }
       const hasHeatCool = modes.includes(ClimateHvacMode.heat_cool);
       if (hasHeatCool) {
@@ -168066,16 +168082,13 @@ var config4 = {
     if (!action) {
       return Thermostat3.ThermostatRunningMode.Off;
     }
-    const runningMode = hvacActionToRunningMode[action] ?? Thermostat3.ThermostatRunningMode.Off;
-    if (runningMode === Thermostat3.ThermostatRunningMode.Cool && isHeatCoolOnly(attributes4(entity).hvac_modes ?? [])) {
-      return Thermostat3.ThermostatRunningMode.Heat;
-    }
-    return runningMode;
+    return hvacActionToRunningMode[action] ?? Thermostat3.ThermostatRunningMode.Off;
   },
-  getControlSequence: (entity) => {
+  getControlSequence: (entity, agent) => {
     const modes = attributes4(entity).hvac_modes ?? [];
     if (isHeatCoolOnly(modes)) {
-      return Thermostat3.ControlSequenceOfOperation.HeatingOnly;
+      const direction = getHeatCoolOnlyDirection(entity, agent);
+      return direction === "cooling" ? Thermostat3.ControlSequenceOfOperation.CoolingOnly : Thermostat3.ControlSequenceOfOperation.HeatingOnly;
     }
     const hasCooling = modes.some(
       (m) => m === ClimateHvacMode.cool || m === ClimateHvacMode.heat_cool
@@ -168202,8 +168215,9 @@ function ClimateDevice(homeAssistantEntity) {
   const hasBatteryAttr = attributes7.battery_level != null || attributes7.battery != null;
   const hasBatteryEntity = !!homeAssistantEntity.mapping?.batteryEntity;
   const hasBattery = hasBatteryAttr || hasBatteryEntity;
-  const heatCoolOnly = attributes7.hvac_modes.includes(ClimateHvacMode.heat_cool) && !attributes7.hvac_modes.includes(ClimateHvacMode.heat) && !attributes7.hvac_modes.includes(ClimateHvacMode.cool);
-  const supportsCooling = heatCoolOnly ? false : coolingModes.some((mode) => attributes7.hvac_modes.includes(mode));
+  const supportsCooling = coolingModes.some(
+    (mode) => attributes7.hvac_modes.includes(mode)
+  );
   const hasExplicitHeating = heatingModes.some(
     (mode) => attributes7.hvac_modes.includes(mode)
   );
@@ -172142,6 +172156,7 @@ function parseRoomData(roomsData) {
           const nestedRooms = parseRoomData(value);
           const floorIndex = floorCounter++;
           for (const room of nestedRooms) {
+            room.mapName = key;
             if (typeof room.id === "number") {
               room.originalId = room.id;
               room.id = floorIndex * 1e4 + room.id;
@@ -172329,6 +172344,63 @@ function ServiceAreaServer2(initialState) {
     currentArea: initialState.currentArea ?? null
   });
 }
+var ServiceAreaWithMaps = ServiceAreaBehavior.with(ServiceArea3.Feature.Maps);
+var ServiceAreaServerWithMapsBase = class extends ServiceAreaWithMaps {
+  selectAreas(request) {
+    const { newAreas } = request;
+    logger179.info(
+      `ServiceArea selectAreas called with: ${JSON.stringify(newAreas)}`
+    );
+    const uniqueAreas = [...new Set(newAreas)];
+    const supportedAreaIds = this.state.supportedAreas.map((a) => a.areaId);
+    const invalidAreas = uniqueAreas.filter(
+      (id) => !supportedAreaIds.includes(id)
+    );
+    if (invalidAreas.length > 0) {
+      logger179.warn(`Invalid area IDs requested: ${invalidAreas.join(", ")}`);
+      return {
+        status: ServiceArea3.SelectAreasStatus.UnsupportedArea,
+        statusText: `Invalid area IDs: ${invalidAreas.join(", ")}`
+      };
+    }
+    this.state.selectedAreas = uniqueAreas;
+    logger179.info(
+      `ServiceArea: Stored ${uniqueAreas.length} areas for cleaning: ${uniqueAreas.join(", ")}`
+    );
+    return {
+      status: ServiceArea3.SelectAreasStatus.Success,
+      statusText: "Areas selected for cleaning"
+    };
+  }
+  skipArea(_request) {
+    return {
+      status: ServiceArea3.SkipAreaStatus.InvalidInMode,
+      statusText: "Skip area not supported"
+    };
+  }
+};
+((ServiceAreaServerWithMapsBase2) => {
+  class State extends ServiceAreaWithMaps.State {
+  }
+  ServiceAreaServerWithMapsBase2.State = State;
+})(ServiceAreaServerWithMapsBase || (ServiceAreaServerWithMapsBase = {}));
+function ServiceAreaServerWithMaps(initialState) {
+  logger179.info(
+    `Creating ServiceAreaServer with Maps: ${initialState.supportedAreas.length} areas, ${initialState.supportedMaps.length} maps`
+  );
+  for (const map of initialState.supportedMaps) {
+    const areaCount = initialState.supportedAreas.filter(
+      (a) => a.mapId === map.mapId
+    ).length;
+    logger179.info(`  Map ${map.mapId}: "${map.name}" (${areaCount} areas)`);
+  }
+  return ServiceAreaServerWithMapsBase.set({
+    supportedAreas: initialState.supportedAreas,
+    supportedMaps: initialState.supportedMaps,
+    selectedAreas: initialState.selectedAreas ?? [],
+    currentArea: initialState.currentArea ?? null
+  });
+}
 
 // src/matter/endpoints/legacy/vacuum/behaviors/vacuum-service-area-server.ts
 var logger180 = Logger.get("VacuumServiceAreaServer");
@@ -172344,10 +172416,23 @@ function toAreaId(roomId) {
   }
   return Math.abs(hash2);
 }
-function roomsToAreas(rooms) {
+function extractMaps(rooms) {
+  const seen = /* @__PURE__ */ new Map();
+  for (const room of rooms) {
+    if (room.mapName && !seen.has(room.mapName)) {
+      seen.set(room.mapName, seen.size + 1);
+    }
+  }
+  return Array.from(seen.entries()).map(([name, mapId]) => ({ mapId, name }));
+}
+function roomsToAreas(rooms, maps = []) {
+  const mapLookup = /* @__PURE__ */ new Map();
+  for (const m of maps) {
+    mapLookup.set(m.name, m.mapId);
+  }
   return rooms.map((room) => ({
     areaId: toAreaId(room.id),
-    mapId: null,
+    mapId: room.mapName ? mapLookup.get(room.mapName) ?? null : null,
     areaInfo: {
       locationInfo: {
         locationName: room.name,
@@ -172408,7 +172493,16 @@ function createVacuumServiceAreaServer(attributes7, roomEntities, includeUnnamed
       );
     }
   }
-  const supportedAreas = roomsToAreas(rooms);
+  const maps = extractMaps(rooms);
+  const supportedAreas = roomsToAreas(rooms, maps);
+  if (maps.length > 0) {
+    return ServiceAreaServerWithMaps({
+      supportedAreas,
+      supportedMaps: maps,
+      selectedAreas: [],
+      currentArea: null
+    });
+  }
   return ServiceAreaServer2({
     supportedAreas,
     selectedAreas: [],