@riddix/hamh 2.1.0-alpha.372 → 2.1.0-alpha.373

package/dist/backend/cli.js

@@ -172466,7 +172466,18 @@ function isFanSpeedMode(mode) {
 function isMopIntensityMode(mode) {
   return mode >= MOP_INTENSITY_MODE_BASE;
 }
-function buildSupportedModes3(fanSpeedList, mopIntensityList, includeCleanTypes = true) {
+function resolveCleanTypes(cleaningModeOptions) {
+  if (!cleaningModeOptions || cleaningModeOptions.length === 0) {
+    return /* @__PURE__ */ new Set();
+  }
+  const types = /* @__PURE__ */ new Set();
+  for (const option of cleaningModeOptions) {
+    types.add(parseCleanType(option));
+  }
+  return types;
+}
+function buildSupportedModes3(fanSpeedList, mopIntensityList, cleaningModeOptions) {
+  const cleanTypes = resolveCleanTypes(cleaningModeOptions);
   const modes = [
     {
       label: "Vacuum",
@@ -172474,30 +172485,31 @@ function buildSupportedModes3(fanSpeedList, mopIntensityList, includeCleanTypes
       modeTags: [{ value: RvcCleanMode3.ModeTag.Vacuum }]
     }
   ];
-  if (includeCleanTypes) {
-    modes.push(
-      {
-        label: "Vacuum & Mop",
-        mode: MODE_VACUUM_AND_MOP,
-        modeTags: [
-          { value: RvcCleanMode3.ModeTag.Vacuum },
-          { value: RvcCleanMode3.ModeTag.Mop }
-        ]
-      },
-      {
-        label: "Mop",
-        mode: MODE_MOP,
-        modeTags: [{ value: RvcCleanMode3.ModeTag.Mop }]
-      }
-    );
+  if (cleanTypes.has(2 /* SweepingAndMopping */)) {
+    modes.push({
+      label: "Vacuum & Mop",
+      mode: MODE_VACUUM_AND_MOP,
+      modeTags: [
+        { value: RvcCleanMode3.ModeTag.Vacuum },
+        { value: RvcCleanMode3.ModeTag.Mop }
+      ]
+    });
+  }
+  if (cleanTypes.has(1 /* Mopping */)) {
+    modes.push({
+      label: "Mop",
+      mode: MODE_MOP,
+      modeTags: [{ value: RvcCleanMode3.ModeTag.Mop }]
+    });
   }
   if (fanSpeedList && fanSpeedList.length > 0) {
     modes.push(...buildFanSpeedModes(fanSpeedList));
   }
-  if (includeCleanTypes && mopIntensityList && mopIntensityList.length > 0) {
+  const hasMopping = cleanTypes.has(1 /* Mopping */) || cleanTypes.has(2 /* SweepingAndMopping */);
+  if (hasMopping && mopIntensityList && mopIntensityList.length > 0) {
     modes.push(...buildMopIntensityModes(mopIntensityList));
   }
-  if (includeCleanTypes) {
+  if (cleanTypes.has(3 /* MoppingAfterSweeping */)) {
     modes.push({
       label: "Vacuum Then Mop",
       mode: MODE_VACUUM_THEN_MOP,
@@ -172799,12 +172811,13 @@ function readSelectEntity(entityId, agent) {
     options: attrs?.options
   };
 }
-function createCleanModeConfig(fanSpeedList, mopIntensityList, includeCleanTypes = true) {
+function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptions) {
+  const hasCleanTypes = !!cleaningModeOptions && cleaningModeOptions.length > 0;
   return {
     getCurrentMode: (entity, agent) => {
       const attributes7 = entity.attributes;
       let cleanType = 0 /* Sweeping */;
-      if (includeCleanTypes) {
+      if (hasCleanTypes) {
         if (attributes7.cleaning_mode) {
           cleanType = parseCleanType(attributes7.cleaning_mode);
         } else {
@@ -172863,7 +172876,7 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, includeCleanTypes
       }
       return cleanTypeToModeId(cleanType);
     },
-    getSupportedModes: () => buildSupportedModes3(fanSpeedList, mopIntensityList, includeCleanTypes),
+    getSupportedModes: () => buildSupportedModes3(fanSpeedList, mopIntensityList, cleaningModeOptions),
     setCleanMode: (mode, agent) => {
       const homeAssistant = agent.get(HomeAssistantEntityBehavior);
       const vacuumEntityId = homeAssistant.entityId;
@@ -172878,7 +172891,7 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, includeCleanTypes
           logger182.warn(`Invalid mop intensity mode index: ${mopIndex}`);
           return void 0;
         }
-        if (includeCleanTypes) {
+        if (hasCleanTypes) {
           homeAssistant.callAction(
             buildCleaningModeAction(1 /* Mopping */, agent)
           );
@@ -172926,7 +172939,7 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, includeCleanTypes
           return void 0;
         }
         if (mapping?.suctionLevelEntity) {
-          if (includeCleanTypes) {
+          if (hasCleanTypes) {
             homeAssistant.callAction(
               buildCleaningModeAction(0 /* Sweeping */, agent)
             );
@@ -172960,7 +172973,7 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, includeCleanTypes
           );
           return void 0;
         }
-        if (includeCleanTypes) {
+        if (hasCleanTypes) {
           homeAssistant.callAction(
             buildCleaningModeAction(0 /* Sweeping */, agent)
           );
@@ -172974,7 +172987,7 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, includeCleanTypes
           target: vacuumEntityId
         };
       }
-      if (!includeCleanTypes) {
+      if (!hasCleanTypes) {
         logger182.debug(
           `Ignoring cleaning type change (mode=${mode}): no cleaning mode entity`
         );
@@ -172998,14 +173011,14 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, includeCleanTypes
     }
   };
 }
-function createVacuumRvcCleanModeServer(_attributes, fanSpeedList, mopIntensityList, includeCleanTypes = true) {
+function createVacuumRvcCleanModeServer(_attributes, fanSpeedList, mopIntensityList, cleaningModeOptions) {
   const supportedModes = buildSupportedModes3(
     fanSpeedList,
     mopIntensityList,
-    includeCleanTypes
+    cleaningModeOptions
   );
   logger182.info(
-    `Creating VacuumRvcCleanModeServer with ${supportedModes.length} modes (fanSpeedList=${JSON.stringify(fanSpeedList ?? [])}, mopIntensityList=${JSON.stringify(mopIntensityList ?? [])}, includeCleanTypes=${includeCleanTypes})`
+    `Creating VacuumRvcCleanModeServer with ${supportedModes.length} modes (fanSpeedList=${JSON.stringify(fanSpeedList ?? [])}, mopIntensityList=${JSON.stringify(mopIntensityList ?? [])}, cleaningModeOptions=${JSON.stringify(cleaningModeOptions ?? [])})`
   );
   logger182.info(
     `Modes: ${supportedModes.map((m) => `${m.mode}:${m.label}[${m.modeTags.map((t) => t.value).join(",")}]`).join(", ")}`
@@ -173015,7 +173028,7 @@ function createVacuumRvcCleanModeServer(_attributes, fanSpeedList, mopIntensityL
     currentMode: MODE_VACUUM
   };
   return RvcCleanModeServer2(
-    createCleanModeConfig(fanSpeedList, mopIntensityList, includeCleanTypes),
+    createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptions),
     initialState
   );
 }
@@ -173260,7 +173273,7 @@ var VacuumEndpointType = RoboticVacuumCleanerDevice.with(
   HomeAssistantEntityBehavior,
   VacuumRvcOperationalStateServer
 );
-function VacuumDevice(homeAssistantEntity, includeOnOff = false, minimalClusters = false) {
+function VacuumDevice(homeAssistantEntity, includeOnOff = false, minimalClusters = false, cleaningModeOptions) {
   if (homeAssistantEntity.entity.state === void 0) {
     return void 0;
   }
@@ -173301,7 +173314,6 @@ function VacuumDevice(homeAssistantEntity, includeOnOff = false, minimalClusters
   } else {
     logger185.info(`${entityId}: Skipping ServiceArea (minimal clusters mode)`);
   }
-  const hasCleaningModeEntity = !!homeAssistantEntity.mapping?.cleaningModeEntity;
   const fanSpeedList = resolveFanSpeedList(
     attributes7,
     homeAssistantEntity.mapping?.suctionLevelEntity
@@ -173309,17 +173321,16 @@ function VacuumDevice(homeAssistantEntity, includeOnOff = false, minimalClusters
   const mopIntensityList = resolveMopIntensityList(
     homeAssistantEntity.mapping?.mopIntensityEntity
   );
-  const hasCleanTypes = supportsCleaningModes(attributes7) || hasCleaningModeEntity;
-  if (hasCleanTypes || fanSpeedList || mopIntensityList) {
+  if (cleaningModeOptions || fanSpeedList || mopIntensityList) {
     logger185.info(
-      `${entityId}: Adding RvcCleanMode (multi-mode, hasCleanTypes=${hasCleanTypes}, fanSpeedList=${JSON.stringify(fanSpeedList ?? [])}, mopIntensityList=${JSON.stringify(mopIntensityList ?? [])})`
+      `${entityId}: Adding RvcCleanMode (multi-mode, cleaningModeOptions=${JSON.stringify(cleaningModeOptions ?? [])}, fanSpeedList=${JSON.stringify(fanSpeedList ?? [])}, mopIntensityList=${JSON.stringify(mopIntensityList ?? [])})`
     );
     device = device.with(
       createVacuumRvcCleanModeServer(
         attributes7,
         fanSpeedList,
         mopIntensityList,
-        hasCleanTypes
+        cleaningModeOptions
       )
     );
   } else {
@@ -173530,7 +173541,8 @@ function createLegacyEndpointType(entity, mapping, areaName, options) {
       type = VacuumDevice(
         { entity, customName, mapping },
         options?.vacuumOnOff,
-        options?.vacuumMinimalClusters
+        options?.vacuumMinimalClusters,
+        options?.cleaningModeOptions
       );
     } else {
       const factory = deviceCtrs[domain];
@@ -173870,10 +173882,27 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
       registry: entity,
       deviceRegistry
     };
+    let cleaningModeOptions;
+    if (entityId.startsWith("vacuum.")) {
+      if (effectiveMapping?.cleaningModeEntity) {
+        const cmState = registry2.initialState(
+          effectiveMapping.cleaningModeEntity
+        );
+        cleaningModeOptions = cmState?.attributes?.options;
+      } else if (supportsCleaningModes(state.attributes)) {
+        cleaningModeOptions = [
+          "vacuum",
+          "mop",
+          "vacuum_and_mop",
+          "vacuum_then_mop"
+        ];
+      }
+    }
     const areaName = registry2.getAreaName(entityId);
     const type = createLegacyEndpointType(payload, effectiveMapping, areaName, {
       vacuumOnOff: registry2.isVacuumOnOffEnabled(),
-      vacuumMinimalClusters: registry2.isVacuumMinimalClustersEnabled()
+      vacuumMinimalClusters: registry2.isVacuumMinimalClustersEnabled(),
+      cleaningModeOptions
     });
     if (!type) {
       return;
@@ -175196,7 +175225,7 @@ var ServerModeVacuumEndpointType = RoboticVacuumCleanerDevice.with(
   HomeAssistantEntityBehavior,
   VacuumRvcOperationalStateServer
 );
-function ServerModeVacuumDevice(homeAssistantEntity, includeOnOff = false, minimalClusters = false) {
+function ServerModeVacuumDevice(homeAssistantEntity, includeOnOff = false, minimalClusters = false, cleaningModeOptions) {
   if (homeAssistantEntity.entity.state === void 0) {
     return void 0;
   }
@@ -175222,7 +175251,6 @@ function ServerModeVacuumDevice(homeAssistantEntity, includeOnOff = false, minim
   } else if (!minimalClusters) {
     device = device.with(createDefaultServiceAreaServer());
   }
-  const hasCleaningModeEntity = !!homeAssistantEntity.mapping?.cleaningModeEntity;
   const fanSpeedList = resolveFanSpeedList(
     attributes7,
     homeAssistantEntity.mapping?.suctionLevelEntity
@@ -175230,14 +175258,13 @@ function ServerModeVacuumDevice(homeAssistantEntity, includeOnOff = false, minim
   const mopIntensityList = resolveMopIntensityList(
     homeAssistantEntity.mapping?.mopIntensityEntity
   );
-  const hasCleanTypes = supportsCleaningModes(attributes7) || hasCleaningModeEntity;
-  if (hasCleanTypes || fanSpeedList || mopIntensityList) {
+  if (cleaningModeOptions || fanSpeedList || mopIntensityList) {
     device = device.with(
       createVacuumRvcCleanModeServer(
         attributes7,
         fanSpeedList,
         mopIntensityList,
-        hasCleanTypes
+        cleaningModeOptions
       )
     );
   } else {
@@ -175361,6 +175388,21 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
       registry: entity,
       deviceRegistry
     };
+    const vacAttrsForClean = state.attributes;
+    let cleaningModeOptions;
+    if (effectiveMapping?.cleaningModeEntity) {
+      const cmState = registry2.initialState(
+        effectiveMapping.cleaningModeEntity
+      );
+      cleaningModeOptions = cmState?.attributes?.options;
+    } else if (supportsCleaningModes(vacAttrsForClean)) {
+      cleaningModeOptions = [
+        "vacuum",
+        "mop",
+        "vacuum_and_mop",
+        "vacuum_then_mop"
+      ];
+    }
     const customName = effectiveMapping?.customName;
     const endpointType = ServerModeVacuumDevice(
       {
@@ -175369,7 +175411,8 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
         mapping: effectiveMapping
       },
       registry2.isServerModeVacuumOnOffEnabled(),
-      registry2.isVacuumMinimalClustersEnabled()
+      registry2.isVacuumMinimalClustersEnabled(),
+      cleaningModeOptions
     );
     if (!endpointType) {
       return void 0;