@riddix/hamh 2.0.29 → 2.0.31

package/README.md

@@ -37,7 +37,7 @@ of port forwarding etc.
 
 | Channel | Branch | Current Version | Description |
 |---------|--------|-----------------|-------------|
-| **Stable** | `main` | v2.0.29 | Production-ready, recommended for most users |
+| **Stable** | `main` | v2.0.31 | Production-ready, recommended for most users |
 | **Alpha** | `alpha` | v2.1.0-alpha.x | Pre-release with new features, for early adopters |
 | **Testing** | `testing` | v4.1.0-testing.x | ⚠️ **Highly unstable!** Experimental features, may break |
 
@@ -52,36 +52,31 @@ of port forwarding etc.
 ## 🎉 What's New
 
 <details>
-<summary><strong>📦 Stable Features (v2.0.29)</strong> - Click to expand</summary>
+<summary><strong>📦 Stable Features (v2.0.31)</strong> - Click to expand</summary>
 
-**New in v2.0.29:**
+**New in v2.0.31:**
 
 | Feature | Description |
 |---------|-------------|
-| **💡 Light currentLevel Fix** | Retain light currentLevel when off to prevent Apple Home 100% brightness on turn-on ([#225](https://github.com/RiDDiX/home-assistant-matter-hub/issues/225)) |
-| **🖥️ Bridge Config Save Fix** | Decouple save button from RJSF schema validation errors — save works even with optional field warnings ([#232](https://github.com/RiDDiX/home-assistant-matter-hub/issues/232)) |
-| **🌀 Fan Device Feature Fix** | Correct FanDeviceFeature TURN_ON/TURN_OFF enum values to match Home Assistant |
-| **🌡️ Humidity Auto-Mapping Fix** | Correct autoHumidityMapping schema default to match runtime behavior |
+| **🎮 Controller Profiles & Area Setup** | New bridge wizard with controller-specific profiles (Apple Home, Google Home, Alexa) and area-based bridge setup |
+| **🌀 Fan Speed/Preset Fix** | Fix fan speed and preset control not working from Matter controllers ([#233](https://github.com/RiDDiX/home-assistant-matter-hub/issues/233)) |
+| **💡 Optimistic State Fix** | Prevent stale HA state from reverting optimistic brightness/color updates ([#230](https://github.com/RiDDiX/home-assistant-matter-hub/issues/230)) |
+| **🪟 Cover Target Fix** | Route boundary cover targets to open/close regardless of direction ([#240](https://github.com/RiDDiX/home-assistant-matter-hub/issues/240)) |
+| **�️ Humidity Auto-Mapping Default** | Make autoHumidityMapping default-enabled like autoPressureMapping |
 
-**Previously in v2.0.28:**
+**Previously in v2.0.30:**
 
 | Feature | Description |
 |---------|-------------|
-| **🖼️ Device Image Support** | Device cards show images from Zigbee2MQTT or custom uploads ([#221](https://github.com/RiDDiX/home-assistant-matter-hub/issues/221)) |
-| **🌀 Custom Fan Speed Mapping** | Define custom fan speed levels with named presets ([#226](https://github.com/RiDDiX/home-assistant-matter-hub/pull/226)) |
-| **📺 TV Source Selection** | MediaInput cluster added to VideoPlayerDevice for input switching ([#231](https://github.com/RiDDiX/home-assistant-matter-hub/issues/231)) |
-| **🔀 Reverse Proxy Base Path** | `--http-base-path` option for subfolder reverse proxy support ([#228](https://github.com/RiDDiX/home-assistant-matter-hub/issues/228)) |
-| **🌀 On/Off-Only Fans** | Fans without speed control correctly use OnOffPlugInUnit ([#229](https://github.com/RiDDiX/home-assistant-matter-hub/issues/229)) |
-| **💡 Light Brightness Fix** | Prevent brightness reset on turn-on by setting onLevel to null ([#225](https://github.com/RiDDiX/home-assistant-matter-hub/issues/225)) |
-| **🌀 Fan Speed Fixes** | speedMax cap raised from 10 to 100 (Matter spec max), retain speed when off ([#225](https://github.com/RiDDiX/home-assistant-matter-hub/issues/225)) |
-| **🌡️ Composed Air Purifier Fix** | Flatten to single endpoint for correct Apple Home primary tile ([#218](https://github.com/RiDDiX/home-assistant-matter-hub/issues/218)) |
+| **🔗 Mapped Entity Propagation Fix** | Propagate mapped entity changes (battery, humidity, etc.) to Matter endpoints — fixes stale sensor readings |
+| **🖥️ API Error Surfacing** | Surface API errors instead of silently swallowing them ([#232](https://github.com/RiDDiX/home-assistant-matter-hub/issues/232)) |
 
 </details>
 
 <details>
 <summary><strong>🧪 Alpha Features (v2.1.0-alpha.x)</strong> - Click to expand</summary>
 
-**Alpha is currently in sync with Stable (v2.0.29).** All alpha features have been promoted to stable. New alpha features will appear here as development continues.
+**Alpha is currently in sync with Stable (v2.0.31).** All alpha features have been promoted to stable. New alpha features will appear here as development continues.
 
 </details>
 
@@ -107,6 +102,12 @@ of port forwarding etc.
 <details>
 <summary><strong>📜 Previous Stable Versions</strong> - Click to expand</summary>
 
+### v2.0.30
+Mapped Entity Propagation Fix, API Error Surfacing
+
+### v2.0.29
+Light currentLevel Fix, Bridge Config Save Fix, Fan Device Feature Fix, Humidity Auto-Mapping Fix
+
 ### v2.0.28
 Device Image Support, Custom Fan Speed Mapping, TV Source Selection, Reverse Proxy Base Path, On/Off-Only Fans, Light Brightness Fix, Fan Speed Fixes, Composed Air Purifier Fix, Dreame Multi-Floor Fix, Optimistic State Updates, Frontend Improvements
 
@@ -445,6 +446,7 @@ Thank you to everyone who helps improve this project by reporting issues!
 | [@JRCondat](https://github.com/JRCondat) | 💎 Thank you for your generous support! |
 | Bonjon | 💎 Thank you for your generous support! |
 | TobiR | 💎 Thank you for your generous support! |
+| [@d3rby91](https://github.com/d3rby91) | 💎 Thank you for your generous support! |
 | *Anonymous supporters* | 🙏 Thank you to those who prefer not to be named - your support is equally appreciated! |
 
 ### 🌟 Original Author

package/dist/backend/cli.js

@@ -146085,6 +146085,13 @@ var init_clusters2 = __esm({
   }
 });
 
+// ../common/dist/controller-profiles.js
+var init_controller_profiles = __esm({
+  "../common/dist/controller-profiles.js"() {
+    "use strict";
+  }
+});
+
 // ../common/dist/diagnostic-event.js
 var init_diagnostic_event = __esm({
   "../common/dist/diagnostic-event.js"() {
@@ -146694,7 +146701,7 @@ var init_bridge_config_schema = __esm({
           title: "Auto Humidity Mapping",
           description: "Automatically combine humidity sensors with temperature sensors from the same Home Assistant device. When enabled, humidity sensors will be merged into temperature sensors to create combined TemperatureHumiditySensor devices.",
           type: "boolean",
-          default: false
+          default: true
         },
         autoPressureMapping: {
           title: "Auto Pressure Mapping",
@@ -146999,6 +147006,7 @@ var init_dist = __esm({
     init_bridge_export();
     init_bridge_templates();
     init_clusters2();
+    init_controller_profiles();
     init_diagnostic_event();
     init_domains();
     init_endpoint_data();
@@ -149030,7 +149038,8 @@ function matterApi(bridgeService, haRegistry) {
     const body = req.body;
     const isValid = ajv.validate(createBridgeRequestSchema, body);
     if (!isValid) {
-      res.status(400).json(ajv.errors);
+      const details = ajv.errors?.map((e) => `${e.instancePath || "/"}: ${e.message}`).join("; ") ?? "Unknown";
+      res.status(400).json({ error: `Validation failed: ${details}` });
     } else {
       try {
         const bridge = await bridgeService.create(body);
@@ -149071,7 +149080,8 @@ function matterApi(bridgeService, haRegistry) {
     const body = req.body;
     const isValid = ajv.validate(updateBridgeRequestSchema, body);
     if (!isValid) {
-      res.status(400).json(ajv.errors);
+      const details = ajv.errors?.map((e) => `${e.instancePath || "/"}: ${e.message}`).join("; ") ?? "Unknown";
+      res.status(400).json({ error: `Validation failed: ${details}` });
     } else if (bridgeId !== body.id) {
       res.status(400).send("Path variable `bridgeId` does not match `body.id`");
     } else {
@@ -149302,6 +149312,73 @@ function matterApi(bridgeService, haRegistry) {
     areas.sort((a, b) => a.name.localeCompare(b.name));
     res.status(200).json(areas);
   });
+  router.get("/areas/summary", async (_, res) => {
+    if (!haRegistry) {
+      res.status(503).json({ error: "Home Assistant registry not available" });
+      return;
+    }
+    const supportedDomains = /* @__PURE__ */ new Set([
+      "light",
+      "switch",
+      "sensor",
+      "binary_sensor",
+      "climate",
+      "cover",
+      "fan",
+      "lock",
+      "media_player",
+      "vacuum",
+      "valve",
+      "humidifier",
+      "water_heater",
+      "select",
+      "input_select",
+      "input_boolean",
+      "alarm_control_panel",
+      "event",
+      "automation",
+      "script",
+      "scene"
+    ]);
+    const entities = Object.values(haRegistry.entities);
+    const devices = haRegistry.devices;
+    const states = haRegistry.states;
+    const areaSummary = /* @__PURE__ */ new Map();
+    for (const [areaId, areaName] of haRegistry.areas) {
+      areaSummary.set(areaId, { name: areaName, entityCount: 0, domains: {} });
+    }
+    for (const entity of entities) {
+      if (entity.disabled_by != null) continue;
+      const domain = entity.entity_id.split(".")[0];
+      if (!supportedDomains.has(domain)) continue;
+      const state = states[entity.entity_id];
+      if (!state || state.state === "unavailable") continue;
+      let areaId;
+      const entityAreaId = entity.area_id;
+      if (entityAreaId && haRegistry.areas.has(entityAreaId)) {
+        areaId = entityAreaId;
+      } else {
+        const device = entity.device_id ? devices[entity.device_id] : void 0;
+        const deviceAreaId = device?.area_id;
+        if (deviceAreaId && haRegistry.areas.has(deviceAreaId)) {
+          areaId = deviceAreaId;
+        }
+      }
+      if (!areaId) continue;
+      const summary = areaSummary.get(areaId);
+      if (summary) {
+        summary.entityCount++;
+        summary.domains[domain] = (summary.domains[domain] || 0) + 1;
+      }
+    }
+    const result = [...areaSummary.entries()].map(([area_id, data]) => ({
+      area_id,
+      name: data.name,
+      entityCount: data.entityCount,
+      domains: data.domains
+    })).sort((a, b) => a.name.localeCompare(b.name));
+    res.status(200).json(result);
+  });
   router.get("/filter-values", async (_, res) => {
     if (!haRegistry) {
       res.status(503).json({ error: "Home Assistant registry not available" });
@@ -164463,15 +164540,45 @@ import debounce4 from "debounce";
 // src/matter/endpoints/entity-endpoint.ts
 init_esm7();
 var EntityEndpoint = class extends Endpoint {
-  constructor(type, entityId, customName) {
+  constructor(type, entityId, customName, mappedEntityIds) {
     super(type, { id: createEndpointId(entityId, customName) });
     this.entityId = entityId;
+    this.mappedEntityIds = mappedEntityIds ?? [];
+  }
+  mappedEntityIds;
+  lastMappedStates = {};
+  hasMappedEntityChanged(states) {
+    let changed = false;
+    for (const mappedId of this.mappedEntityIds) {
+      const mappedState = states[mappedId];
+      if (!mappedState) continue;
+      const fp = mappedState.state;
+      if (fp !== this.lastMappedStates[mappedId]) {
+        this.lastMappedStates[mappedId] = fp;
+        changed = true;
+      }
+    }
+    return changed;
   }
 };
 function createEndpointId(entityId, customName) {
   const baseName = customName || entityId;
   return baseName.replace(/\./g, "_").replace(/\s+/g, "_");
 }
+function getMappedEntityIds(mapping) {
+  if (!mapping) return [];
+  const ids = [];
+  if (mapping.batteryEntity) ids.push(mapping.batteryEntity);
+  if (mapping.humidityEntity) ids.push(mapping.humidityEntity);
+  if (mapping.pressureEntity) ids.push(mapping.pressureEntity);
+  if (mapping.cleaningModeEntity) ids.push(mapping.cleaningModeEntity);
+  if (mapping.suctionLevelEntity) ids.push(mapping.suctionLevelEntity);
+  if (mapping.mopIntensityEntity) ids.push(mapping.mopIntensityEntity);
+  if (mapping.filterLifeEntity) ids.push(mapping.filterLifeEntity);
+  if (mapping.powerEntity) ids.push(mapping.powerEntity);
+  if (mapping.energyEntity) ids.push(mapping.energyEntity);
+  return ids;
+}
 
 // src/matter/endpoints/composed/composed-air-purifier-endpoint.ts
 init_dist();
@@ -165901,12 +166008,8 @@ var FanControlServerBase = class extends FeaturedBase3 {
       return;
     }
     this.agent.asLocalActor(() => {
-      const percentSetting = Math.floor(speed / this.state.speedMax * 100);
-      this.targetPercentSettingChanged(
-        percentSetting,
-        this.state.percentSetting,
-        context
-      );
+      const percentage = Math.floor(speed / this.state.speedMax * 100);
+      this.applyPercentageAction(percentage);
     });
   }
   targetFanModeChanged(fanMode, _oldValue, context) {
@@ -165919,16 +166022,12 @@ var FanControlServerBase = class extends FeaturedBase3 {
         return;
       }
       const targetFanMode = FanMode.create(fanMode, this.state.fanModeSequence);
-      const config10 = this.state.config;
       if (targetFanMode.mode === FanControl3.FanMode.Auto) {
-        homeAssistant.callAction(config10.setAutoMode(void 0, this.agent));
-      } else {
-        const percentage = targetFanMode.speedPercent();
-        this.targetPercentSettingChanged(
-          percentage,
-          this.state.percentSetting,
-          context
+        homeAssistant.callAction(
+          this.state.config.setAutoMode(void 0, this.agent)
         );
+      } else {
+        this.applyPercentageAction(targetFanMode.speedPercent());
       }
     });
   }
@@ -165940,45 +166039,48 @@ var FanControlServerBase = class extends FeaturedBase3 {
       return;
     }
     this.agent.asLocalActor(() => {
-      const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-      if (!homeAssistant.isAvailable) {
-        return;
-      }
-      const config10 = this.state.config;
-      const supportsPercentage = config10.supportsPercentage(
+      this.applyPercentageAction(percentage);
+    });
+  }
+  applyPercentageAction(percentage) {
+    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
+    if (!homeAssistant.isAvailable) {
+      return;
+    }
+    const config10 = this.state.config;
+    const supportsPercentage = config10.supportsPercentage(
+      homeAssistant.entity.state,
+      this.agent
+    );
+    if (percentage === 0) {
+      homeAssistant.callAction(config10.turnOff(void 0, this.agent));
+    } else if (supportsPercentage) {
+      const stepSize = config10.getStepSize(
         homeAssistant.entity.state,
         this.agent
       );
-      if (percentage === 0) {
-        homeAssistant.callAction(config10.turnOff(void 0, this.agent));
-      } else if (supportsPercentage) {
-        const stepSize = config10.getStepSize(
-          homeAssistant.entity.state,
-          this.agent
-        );
-        const roundedPercentage = stepSize && stepSize > 0 ? Math.round(percentage / stepSize) * stepSize : percentage;
-        const clampedPercentage = Math.max(
-          stepSize ?? 1,
-          Math.min(100, roundedPercentage)
+      const roundedPercentage = stepSize && stepSize > 0 ? Math.round(percentage / stepSize) * stepSize : percentage;
+      const clampedPercentage = Math.max(
+        stepSize ?? 1,
+        Math.min(100, roundedPercentage)
+      );
+      homeAssistant.callAction(config10.turnOn(clampedPercentage, this.agent));
+    } else {
+      const presetModes = config10.getPresetModes(homeAssistant.entity.state, this.agent) ?? [];
+      const speedPresets = presetModes.filter(
+        (m) => m.toLowerCase() !== "auto"
+      );
+      if (speedPresets.length > 0) {
+        const presetIndex = Math.min(
+          Math.floor(percentage / 100 * speedPresets.length),
+          speedPresets.length - 1
         );
-        homeAssistant.callAction(config10.turnOn(clampedPercentage, this.agent));
-      } else {
-        const presetModes = config10.getPresetModes(homeAssistant.entity.state, this.agent) ?? [];
-        const speedPresets = presetModes.filter(
-          (m) => m.toLowerCase() !== "auto"
+        const targetPreset = speedPresets[presetIndex];
+        homeAssistant.callAction(
+          config10.setPresetMode(targetPreset, this.agent)
         );
-        if (speedPresets.length > 0) {
-          const presetIndex = Math.min(
-            Math.floor(percentage / 100 * speedPresets.length),
-            speedPresets.length - 1
-          );
-          const targetPreset = speedPresets[presetIndex];
-          homeAssistant.callAction(
-            config10.setPresetMode(targetPreset, this.agent)
-          );
-        }
       }
-    });
+    }
   }
   targetAirflowDirectionChanged(airflowDirection, _oldValue, context) {
     if (transactionIsOffline(context)) {
@@ -166118,6 +166220,8 @@ init_home_assistant_entity_behavior();
 init_esm();
 init_home_assistant_entity_behavior();
 var lastTurnOnTimestamps = /* @__PURE__ */ new Map();
+var optimisticLevelTimestamps = /* @__PURE__ */ new Map();
+var OPTIMISTIC_LEVEL_COOLDOWN_MS = 2e3;
 function notifyLightTurnedOn(entityId) {
   lastTurnOnTimestamps.set(entityId, Date.now());
 }
@@ -166162,6 +166266,11 @@ var LevelControlServerBase = class extends FeaturedBase4 {
     if (currentLevel != null) {
       currentLevel = Math.min(Math.max(minLevel, currentLevel), maxLevel);
     }
+    const lastOptimistic = optimisticLevelTimestamps.get(entity.entity_id);
+    const inCooldown = lastOptimistic != null && Date.now() - lastOptimistic < OPTIMISTIC_LEVEL_COOLDOWN_MS;
+    if (inCooldown && currentLevel != null) {
+      currentLevel = null;
+    }
     applyPatchState(this.state, {
       minLevel,
       maxLevel,
@@ -166229,6 +166338,7 @@ var LevelControlServerBase = class extends FeaturedBase4 {
       };
     }
     this.state.currentLevel = level;
+    optimisticLevelTimestamps.set(entityId, Date.now());
     homeAssistant.callAction(action);
   }
 };
@@ -168606,9 +168716,9 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
       `handleMovement: type=${MovementType[type]}, direction=${MovementDirection[direction]}, target=${targetPercent100ths}, currentLift=${currentLift}, currentTilt=${currentTilt}, absolutePosition=${this.features.absolutePosition}`
     );
     if (type === MovementType.Lift) {
-      if (direction === MovementDirection.Open && (targetPercent100ths == null || targetPercent100ths === 0)) {
+      if (targetPercent100ths === 0) {
         this.handleLiftOpen();
-      } else if (direction === MovementDirection.Close && (targetPercent100ths == null || targetPercent100ths === 1e4)) {
+      } else if (targetPercent100ths === 1e4) {
         this.handleLiftClose();
       } else if (targetPercent100ths != null && this.features.absolutePosition) {
         this.handleGoToLiftPosition(targetPercent100ths);
@@ -168618,9 +168728,9 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
         this.handleLiftClose();
       }
     } else if (type === MovementType.Tilt) {
-      if (direction === MovementDirection.Open && (targetPercent100ths == null || targetPercent100ths === 0)) {
+      if (targetPercent100ths === 0) {
         this.handleTiltOpen();
-      } else if (direction === MovementDirection.Close && (targetPercent100ths == null || targetPercent100ths === 1e4)) {
+      } else if (targetPercent100ths === 1e4) {
         this.handleTiltClose();
       } else if (targetPercent100ths != null && this.features.absolutePosition) {
         this.handleGoToTiltPosition(targetPercent100ths);
@@ -169317,6 +169427,8 @@ init_nodejs();
 // src/matter/behaviors/color-control-server.ts
 init_home_assistant_entity_behavior();
 var logger170 = Logger.get("ColorControlServer");
+var optimisticColorTimestamps = /* @__PURE__ */ new Map();
+var OPTIMISTIC_COLOR_COOLDOWN_MS = 2e3;
 var FeaturedBase7 = ColorControlServer.with("ColorTemperature", "HueSaturation");
 var ColorControlServerBase = class extends FeaturedBase7 {
   pendingTransitionTime;
@@ -169395,6 +169507,8 @@ var ColorControlServerBase = class extends FeaturedBase7 {
     const newColorMode = this.getColorModeFromFeatures(
       config10.getCurrentMode(entity.state, this.agent)
     );
+    const lastOptimistic = optimisticColorTimestamps.get(entity.entity_id);
+    const inCooldown = lastOptimistic != null && Date.now() - lastOptimistic < OPTIMISTIC_COLOR_COOLDOWN_MS;
     if (this.features.colorTemperature) {
       const existingMireds = this.state.colorTemperatureMireds;
       if (existingMireds != null) {
@@ -169419,12 +169533,12 @@ var ColorControlServerBase = class extends FeaturedBase7 {
       applyPatchState(this.state, {
         coupleColorTempToLevelMinMireds: minMireds,
         startUpColorTemperatureMireds: startUpMireds,
-        colorTemperatureMireds: effectiveMireds
+        ...inCooldown ? {} : { colorTemperatureMireds: effectiveMireds }
       });
     }
     applyPatchState(this.state, {
-      colorMode: newColorMode,
-      ...this.features.hueSaturation ? {
+      ...inCooldown ? {} : { colorMode: newColorMode },
+      ...this.features.hueSaturation && !inCooldown ? {
         currentHue: hue,
         currentSaturation: saturation
       } : {}
@@ -169451,6 +169565,7 @@ var ColorControlServerBase = class extends FeaturedBase7 {
       colorTemperatureMireds: targetMireds,
       colorMode: ColorControl3.ColorMode.ColorTemperatureMireds
     });
+    optimisticColorTimestamps.set(homeAssistant.entityId, Date.now());
     homeAssistant.callAction(action);
   }
   moveToHueLogic(targetHue) {
@@ -169481,6 +169596,7 @@ var ColorControlServerBase = class extends FeaturedBase7 {
       currentSaturation: targetSaturation,
       colorMode: ColorControl3.ColorMode.CurrentHueAndCurrentSaturation
     });
+    optimisticColorTimestamps.set(homeAssistant.entityId, Date.now());
     homeAssistant.callAction(action);
   }
   applyTransition(action) {
@@ -170784,6 +170900,8 @@ init_home_assistant_entity_behavior();
 init_esm();
 init_home_assistant_entity_behavior();
 var logger175 = Logger.get("SpeakerLevelControlServer");
+var optimisticLevelTimestamps2 = /* @__PURE__ */ new Map();
+var OPTIMISTIC_LEVEL_COOLDOWN_MS2 = 2e3;
 var FeaturedBase9 = LevelControlServer.with("OnOff");
 var SpeakerLevelControlServerBase = class extends FeaturedBase9 {
   async initialize() {
@@ -170819,10 +170937,15 @@ var SpeakerLevelControlServerBase = class extends FeaturedBase9 {
     logger175.debug(
       `[${entityId}] Volume update: HA=${currentLevelPercent != null ? Math.round(currentLevelPercent * 100) : "null"}% -> currentLevel=${currentLevel}`
     );
+    const lastOptimistic = optimisticLevelTimestamps2.get(entity.entity_id);
+    const inCooldown = lastOptimistic != null && Date.now() - lastOptimistic < OPTIMISTIC_LEVEL_COOLDOWN_MS2;
+    if (inCooldown && currentLevel != null) {
+      currentLevel = null;
+    }
     applyPatchState(this.state, {
       minLevel,
       maxLevel,
-      currentLevel
+      ...currentLevel != null ? { currentLevel } : {}
     });
   }
   async moveToLevel(request) {
@@ -170865,6 +170988,7 @@ var SpeakerLevelControlServerBase = class extends FeaturedBase9 {
       return;
     }
     this.state.currentLevel = level;
+    optimisticLevelTimestamps2.set(entityId, Date.now());
     homeAssistant.callAction(
       config10.moveToLevelPercent(levelPercent, this.agent)
     );
@@ -174790,10 +174914,11 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
       return;
     }
     const customName = effectiveMapping?.customName;
-    return new _LegacyEndpoint(type, entityId, customName);
+    const mappedIds = getMappedEntityIds(effectiveMapping);
+    return new _LegacyEndpoint(type, entityId, customName, mappedIds);
   }
-  constructor(type, entityId, customName) {
-    super(type, entityId, customName);
+  constructor(type, entityId, customName, mappedEntityIds) {
+    super(type, entityId, customName, mappedEntityIds);
     this.flushUpdate = debounce4(this.flushPendingUpdate.bind(this), 50);
   }
   lastState;
@@ -174804,9 +174929,15 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
   }
   async updateStates(states) {
     const state = states[this.entityId] ?? {};
-    if (state.state === this.lastState?.state && JSON.stringify(state.attributes) === JSON.stringify(this.lastState?.attributes)) {
+    const mappedChanged = this.hasMappedEntityChanged(states);
+    if (!mappedChanged && state.state === this.lastState?.state && JSON.stringify(state.attributes) === JSON.stringify(this.lastState?.attributes)) {
       return;
     }
+    if (mappedChanged) {
+      logger189.debug(
+        `Mapped entity change detected for ${this.entityId}, forcing update`
+      );
+    }
     logger189.debug(
       `State update received for ${this.entityId}: state=${state.state}`
     );
@@ -175105,12 +175236,26 @@ var BridgeEndpointManager = class extends Service {
     if (!this.entityIds.length) {
       return;
     }
+    const subscriptionIds = this.collectSubscriptionEntityIds();
     this.unsubscribe = subscribeEntities(
       this.client.connection,
       (e) => this.updateStates(e),
-      this.entityIds
+      subscriptionIds
     );
   }
+  collectSubscriptionEntityIds() {
+    const ids = new Set(this.entityIds);
+    const endpoints = this.root.parts.map((p) => p);
+    for (const endpoint of endpoints) {
+      const mappedIds = endpoint.mappedEntityIds;
+      if (mappedIds) {
+        for (const mappedId of mappedIds) {
+          ids.add(mappedId);
+        }
+      }
+    }
+    return [...ids];
+  }
   stopObserving() {
     this.unsubscribe?.();
     this.unsubscribe = void 0;
@@ -175235,6 +175380,7 @@ var BridgeEndpointManager = class extends Service {
     }
   }
   async updateStates(states) {
+    this.registry.mergeExternalStates(states);
     const endpoints = this.root.parts.map((p) => p);
     const results = await Promise.allSettled(
       endpoints.map((endpoint) => endpoint.updateStates(states))
@@ -175391,15 +175537,15 @@ var BridgeRegistry = class _BridgeRegistry {
   }
   /**
    * Check if auto humidity mapping is enabled for this bridge.
-   * Default: false (disabled by default, user must explicitly enable).
+   * Default: true (enabled by default).
    * When enabled, humidity sensors on the same device as a temperature sensor
    * are combined into a single TemperatureHumiditySensor endpoint.
    * Note: Apple Home does not display humidity on TemperatureSensorDevice
-   * endpoints, so users on Apple Home should keep this disabled.
+   * endpoints, so users on Apple Home should explicitly disable this.
    * See: https://github.com/RiDDiX/home-assistant-matter-hub/issues/133
    */
   isAutoHumidityMappingEnabled() {
-    return this.dataProvider.featureFlags?.autoHumidityMapping === true || this.dataProvider.featureFlags?.autoComposedDevices === true;
+    return this.dataProvider.featureFlags?.autoHumidityMapping !== false || this.dataProvider.featureFlags?.autoComposedDevices === true;
   }
   /**
    * Find a humidity sensor entity that belongs to the same HA device.
@@ -175705,6 +175851,12 @@ var BridgeRegistry = class _BridgeRegistry {
   isEnergyEntityUsed(entityId) {
     return this._usedEnergyEntities.has(entityId);
   }
+  mergeExternalStates(states) {
+    const registryStates = this.registry.states;
+    for (const entityId of Object.keys(states)) {
+      registryStates[entityId] = states[entityId];
+    }
+  }
   /**
    * Get the area name for an entity, resolving from HA area registry.
    * Priority: entity area_id > device area_id > undefined
@@ -176401,12 +176553,18 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
     if (!endpointType) {
       return void 0;
     }
-    return new _ServerModeVacuumEndpoint(endpointType, entityId, customName);
+    const mappedIds = getMappedEntityIds(effectiveMapping);
+    return new _ServerModeVacuumEndpoint(
+      endpointType,
+      entityId,
+      customName,
+      mappedIds
+    );
   }
   lastState;
   flushUpdate;
-  constructor(type, entityId, customName) {
-    super(type, entityId, customName);
+  constructor(type, entityId, customName, mappedEntityIds) {
+    super(type, entityId, customName, mappedEntityIds);
     this.flushUpdate = debounce5(this.flushPendingUpdate.bind(this), 50);
   }
   async delete() {
@@ -176415,9 +176573,15 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
   }
   async updateStates(states) {
     const state = states[this.entityId] ?? {};
-    if (state.state === this.lastState?.state && JSON.stringify(state.attributes) === JSON.stringify(this.lastState?.attributes)) {
+    const mappedChanged = this.hasMappedEntityChanged(states);
+    if (!mappedChanged && state.state === this.lastState?.state && JSON.stringify(state.attributes) === JSON.stringify(this.lastState?.attributes)) {
       return;
     }
+    if (mappedChanged) {
+      logger192.debug(
+        `Mapped entity change detected for ${this.entityId}, forcing update`
+      );
+    }
     logger192.debug(
       `State update received for ${this.entityId}: state=${state.state}`
     );
@@ -176498,12 +176662,25 @@ var ServerModeEndpointManager = class extends Service {
     if (!this.entityIds.length) {
       return;
     }
+    const subscriptionIds = this.collectSubscriptionEntityIds();
     this.unsubscribe = subscribeEntities(
       this.client.connection,
       (e) => this.updateStates(e),
-      this.entityIds
+      subscriptionIds
     );
   }
+  collectSubscriptionEntityIds() {
+    const ids = new Set(this.entityIds);
+    if (this.deviceEndpoint) {
+      const mappedIds = this.deviceEndpoint.mappedEntityIds;
+      if (mappedIds) {
+        for (const mappedId of mappedIds) {
+          ids.add(mappedId);
+        }
+      }
+    }
+    return [...ids];
+  }
   stopObserving() {
     this.unsubscribe?.();
     this.unsubscribe = void 0;
@@ -176616,6 +176793,7 @@ var ServerModeEndpointManager = class extends Service {
     }
   }
   async updateStates(states) {
+    this.registry.mergeExternalStates(states);
     if (this.deviceEndpoint) {
       try {
         await this.deviceEndpoint.updateStates(states);