@riddix/hamh 2.1.0-alpha.521 → 2.1.0-alpha.523

package/dist/backend/cli.js

@@ -1743,8 +1743,8 @@ var init_Cancelable = __esm({
         };
         return result;
       }
-      static set logger(logger203) {
-        this.#logger = logger203;
+      static set logger(logger204) {
+        this.#logger = logger204;
       }
       static get logger() {
         return this.#logger;
@@ -3422,13 +3422,13 @@ var init_Logger = __esm({
        *
        * @deprecated use {@link destinations}
        */
-      static addLogger(identifier, logger203, options) {
+      static addLogger(identifier, logger204, options) {
         if (identifier in this.destinations) {
           throw new ImplementationError(`Logger "${identifier}" already exists`);
         }
         const dest = LogDestination({ name: identifier });
         const legacy = adaptDestinationToLegacy(dest);
-        legacy.log = logger203;
+        legacy.log = logger204;
         if (options?.defaultLogLevel !== void 0) {
           legacy.defaultLogLevel = options.defaultLogLevel;
         }
@@ -5538,8 +5538,8 @@ function Construction(subject, initializer) {
     }
   }
   function unhandledError(...args) {
-    const logger203 = Logger.get(subject.constructor.name);
-    logger203.error(...args);
+    const logger204 = Logger.get(subject.constructor.name);
+    logger204.error(...args);
   }
   function createErrorHandler(name) {
     return (e) => {
@@ -135998,11 +135998,11 @@ var init_Api = __esm({
       }
       Api2.resourceFor = resourceFor;
       function log(level, facility, id, ...message) {
-        let logger203 = loggers.get(facility);
-        if (!logger203) {
-          loggers.set(facility, logger203 = Logger.get(facility));
+        let logger204 = loggers.get(facility);
+        if (!logger204) {
+          loggers.set(facility, logger204 = Logger.get(facility));
         }
-        logger203[level](Diagnostic.via(id || "(anon)"), message);
+        logger204[level](Diagnostic.via(id || "(anon)"), message);
       }
       Api2.log = log;
       function logRequest(facility, id, method, target) {
@@ -147221,10 +147221,10 @@ var init_home_assistant_actions = __esm({
       circuitBreakerResetMs: 3e4
     };
     HomeAssistantActions = class extends Service {
-      constructor(logger203, client, config10) {
+      constructor(logger204, client, config10) {
         super("HomeAssistantActions");
         this.client = client;
-        this.log = logger203.get(this);
+        this.log = logger204.get(this);
         this.config = { ...defaultConfig, ...config10 };
         this.circuitBreaker = new CircuitBreaker(
           this.config.circuitBreakerThreshold,
@@ -147596,10 +147596,10 @@ var DiagnosticService = class {
 };
 
 // src/api/access-log.ts
-function accessLogger(logger203) {
+function accessLogger(logger204) {
   return (req, res, next) => {
     res.on("finish", () => {
-      logger203.debug(
+      logger204.debug(
         `${req.method} ${decodeURI(req.originalUrl)} ${res.statusCode} ${res.statusMessage} from ${req.socket.remoteAddress}`
       );
     });
@@ -151095,7 +151095,7 @@ var WebSocketApi = class {
 
 // src/api/web-api.ts
 var WebApi = class extends Service {
-  constructor(logger203, bridgeService, haClient, haRegistry, bridgeStorage, mappingStorage, lockCredentialStorage, settingsStorage, backupService, props) {
+  constructor(logger204, bridgeService, haClient, haRegistry, bridgeStorage, mappingStorage, lockCredentialStorage, settingsStorage, backupService, props) {
     super("WebApi");
     this.bridgeService = bridgeService;
     this.haClient = haClient;
@@ -151106,8 +151106,8 @@ var WebApi = class extends Service {
     this.settingsStorage = settingsStorage;
     this.backupService = backupService;
     this.props = props;
-    this.logger = logger203;
-    this.log = logger203.get(this);
+    this.logger = logger204;
+    this.log = logger204.get(this);
     this.accessLogger = accessLogger(this.log.createChild("Access Log"));
     this.startTime = Date.now();
     this.wsApi = new WebSocketApi(
@@ -151545,12 +151545,12 @@ var CustomStorage = class extends StorageBackendDisk {
 
 // src/core/app/storage.ts
 function storage(environment, options) {
-  const logger203 = environment.get(LoggerService).get("CustomStorage");
+  const logger204 = environment.get(LoggerService).get("CustomStorage");
   const location2 = resolveStorageLocation(options.location);
   fs8.mkdirSync(location2, { recursive: true });
   const storageService = environment.get(StorageService);
   storageService.location = location2;
-  storageService.factory = (ns) => new CustomStorage(logger203, path8.resolve(location2, ns));
+  storageService.factory = (ns) => new CustomStorage(logger204, path8.resolve(location2, ns));
 }
 function resolveStorageLocation(storageLocation) {
   const homedir = os3.homedir();
@@ -152100,10 +152100,10 @@ import {
   getConfig
 } from "home-assistant-js-websocket";
 var HomeAssistantClient = class extends Service {
-  constructor(logger203, options) {
+  constructor(logger204, options) {
     super("HomeAssistantClient");
     this.options = options;
-    this.log = logger203.get(this);
+    this.log = logger204.get(this);
   }
   static Options = /* @__PURE__ */ Symbol.for("HomeAssistantClientProps");
   _connection;
@@ -152696,9 +152696,10 @@ var EntityMappingStorage = class extends Service {
       ) ?? void 0,
       customFanSpeedTags: request.customFanSpeedTags && Object.keys(request.customFanSpeedTags).length > 0 ? request.customFanSpeedTags : void 0,
       valetudoIdentifier: request.valetudoIdentifier?.trim() || void 0,
-      coverSwapOpenClose: request.coverSwapOpenClose || void 0
+      coverSwapOpenClose: request.coverSwapOpenClose || void 0,
+      composedEntities: request.composedEntities?.filter((e) => e.entityId?.trim()) ?? void 0
     };
-    if (!config10.matterDeviceType && !config10.customName && 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.valetudoIdentifier && !config10.coverSwapOpenClose) {
+    if (!config10.matterDeviceType && !config10.customName && 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.valetudoIdentifier && !config10.coverSwapOpenClose && (!config10.composedEntities || config10.composedEntities.length === 0)) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config10);
@@ -166868,10 +166869,10 @@ function ensureCommissioningConfig(server) {
 var AUTO_FORCE_SYNC_INTERVAL_MS = 9e4;
 var DEAD_SESSION_TIMEOUT_MS = 6e4;
 var Bridge = class {
-  constructor(env, logger203, dataProvider, endpointManager) {
+  constructor(env, logger204, dataProvider, endpointManager) {
     this.dataProvider = dataProvider;
     this.endpointManager = endpointManager;
-    this.log = logger203.get(`Bridge / ${dataProvider.id}`);
+    this.log = logger204.get(`Bridge / ${dataProvider.id}`);
     this.server = new BridgeServerNode(
       env,
       this.dataProvider,
@@ -167316,7 +167317,7 @@ var AggregatorEndpoint2 = class extends Endpoint {
 init_dist();
 init_esm();
 init_home_assistant_entity_behavior();
-import debounce4 from "debounce";
+import debounce5 from "debounce";
 
 // src/matter/endpoints/entity-endpoint.ts
 init_esm7();
@@ -167359,6 +167360,11 @@ function getMappedEntityIds(mapping) {
   if (mapping.filterLifeEntity) ids.push(mapping.filterLifeEntity);
   if (mapping.powerEntity) ids.push(mapping.powerEntity);
   if (mapping.energyEntity) ids.push(mapping.energyEntity);
+  if (mapping.composedEntities) {
+    for (const sub of mapping.composedEntities) {
+      if (sub.entityId) ids.push(sub.entityId);
+    }
+  }
   return ids;
 }
 
@@ -168113,12 +168119,13 @@ var OnOffServerBase = class extends OnOffServer {
       return;
     }
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-    const action = turnOn?.(void 0, this.agent) ?? {
-      action: "homeassistant.turn_on"
-    };
+    const action = turnOn ? turnOn(void 0, this.agent) : { action: "homeassistant.turn_on" };
+    applyPatchState(this.state, { onOff: true });
+    if (!action) {
+      return;
+    }
     logger167.info(`[${homeAssistant.entityId}] Turning ON -> ${action.action}`);
     notifyLightTurnedOn(homeAssistant.entityId);
-    applyPatchState(this.state, { onOff: true });
     optimisticOnOffState.set(homeAssistant.entityId, {
       expectedOnOff: true,
       timestamp: Date.now()
@@ -168135,11 +168142,12 @@ var OnOffServerBase = class extends OnOffServer {
       return;
     }
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-    const action = turnOff?.(void 0, this.agent) ?? {
-      action: "homeassistant.turn_off"
-    };
-    logger167.info(`[${homeAssistant.entityId}] Turning OFF -> ${action.action}`);
+    const action = turnOff ? turnOff(void 0, this.agent) : { action: "homeassistant.turn_off" };
     applyPatchState(this.state, { onOff: false });
+    if (!action) {
+      return;
+    }
+    logger167.info(`[${homeAssistant.entityId}] Turning OFF -> ${action.action}`);
     optimisticOnOffState.set(homeAssistant.entityId, {
       expectedOnOff: false,
       timestamp: Date.now()
@@ -169196,6 +169204,12 @@ var ComposedSensorEndpoint = class _ComposedSensorEndpoint extends Endpoint {
   }
 };
 
+// src/matter/endpoints/composed/user-composed-endpoint.ts
+init_esm();
+init_esm7();
+import debounce4 from "debounce";
+init_home_assistant_entity_behavior();
+
 // src/matter/endpoints/legacy/air-purifier/index.ts
 init_dist();
 init_home_assistant_entity_behavior();
@@ -170002,8 +170016,15 @@ var humidityConfig3 = {
 var ClimateHumidityMeasurementServer = HumidityMeasurementServer(humidityConfig3);
 
 // src/matter/endpoints/legacy/climate/behaviors/climate-on-off-server.ts
+init_home_assistant_entity_behavior();
 var ClimateOnOffServer = OnOffServer2({
-  turnOn: () => ({ action: "climate.turn_on" }),
+  turnOn: (_value, agent) => {
+    const entity = agent.get(HomeAssistantEntityBehavior).entity;
+    if (entity.state.state !== "off") {
+      return void 0;
+    }
+    return { action: "climate.turn_on" };
+  },
   turnOff: () => ({ action: "climate.turn_off" })
 }).with("Lighting");
 
@@ -177908,8 +177929,190 @@ var matterDeviceTypeFactories = {
   })
 };
 
+// src/matter/endpoints/composed/user-composed-endpoint.ts
+var logger198 = Logger.get("UserComposedEndpoint");
+function createEndpointId4(entityId, customName) {
+  const baseName = customName || entityId;
+  return baseName.replace(/\./g, "_").replace(/\s+/g, "_");
+}
+function buildEntityPayload3(registry2, entityId) {
+  const state = registry2.initialState(entityId);
+  if (!state) return void 0;
+  const entity = registry2.entity(entityId);
+  const deviceRegistry = registry2.deviceOf(entityId);
+  return {
+    entity_id: entityId,
+    state,
+    registry: entity,
+    deviceRegistry
+  };
+}
+var UserComposedEndpoint = class _UserComposedEndpoint extends Endpoint {
+  entityId;
+  mappedEntityIds;
+  subEndpoints = /* @__PURE__ */ new Map();
+  lastStates = /* @__PURE__ */ new Map();
+  debouncedUpdates = /* @__PURE__ */ new Map();
+  static async create(config10) {
+    const { registry: registry2, primaryEntityId, composedEntities } = config10;
+    const primaryPayload = buildEntityPayload3(registry2, primaryEntityId);
+    if (!primaryPayload) return void 0;
+    let parentType = BridgedNodeEndpoint.with(
+      BasicInformationServer2,
+      IdentifyServer2,
+      HomeAssistantEntityBehavior
+    );
+    if (config10.areaName) {
+      const truncatedName = config10.areaName.length > 16 ? config10.areaName.substring(0, 16) : config10.areaName;
+      parentType = parentType.with(
+        FixedLabelServer.set({
+          labelList: [{ label: "room", value: truncatedName }]
+        })
+      );
+    }
+    const endpointId = createEndpointId4(primaryEntityId, config10.customName);
+    const parts = [];
+    const subEndpointMap = /* @__PURE__ */ new Map();
+    const mappedIds = [];
+    const primaryType = createLegacyEndpointType(
+      primaryPayload,
+      config10.mapping,
+      void 0,
+      { vacuumOnOff: registry2.isVacuumOnOffEnabled() }
+    );
+    if (!primaryType) {
+      logger198.warn(
+        `Cannot create endpoint type for primary entity ${primaryEntityId}`
+      );
+      return void 0;
+    }
+    const primarySub = new Endpoint(primaryType, {
+      id: `${endpointId}_primary`
+    });
+    parts.push(primarySub);
+    subEndpointMap.set(primaryEntityId, primarySub);
+    for (let i = 0; i < composedEntities.length; i++) {
+      const sub = composedEntities[i];
+      if (!sub.entityId) continue;
+      const subPayload = buildEntityPayload3(registry2, sub.entityId);
+      if (!subPayload) {
+        logger198.warn(
+          `Cannot find entity state for composed sub-entity ${sub.entityId}`
+        );
+        continue;
+      }
+      const subMapping = {
+        entityId: sub.entityId,
+        matterDeviceType: sub.matterDeviceType
+      };
+      const subType = createLegacyEndpointType(subPayload, subMapping);
+      if (!subType) {
+        logger198.warn(
+          `Cannot create endpoint type for composed sub-entity ${sub.entityId}`
+        );
+        continue;
+      }
+      const subEndpoint = new Endpoint(subType, {
+        id: `${endpointId}_sub_${i}`
+      });
+      parts.push(subEndpoint);
+      subEndpointMap.set(sub.entityId, subEndpoint);
+      mappedIds.push(sub.entityId);
+    }
+    if (parts.length < 2) {
+      logger198.warn(
+        `User composed device ${primaryEntityId}: only ${parts.length} sub-endpoint(s), need at least 2 (primary + one sub-entity). Falling back to standalone.`
+      );
+      return void 0;
+    }
+    const parentTypeWithState = parentType.set({
+      homeAssistantEntity: {
+        entity: primaryPayload,
+        customName: config10.customName,
+        mapping: config10.mapping
+      }
+    });
+    const endpoint = new _UserComposedEndpoint(
+      parentTypeWithState,
+      primaryEntityId,
+      endpointId,
+      parts,
+      mappedIds
+    );
+    endpoint.subEndpoints = subEndpointMap;
+    const labels = parts.map(
+      (_, i) => i === 0 ? primaryEntityId.split(".")[0] : composedEntities[i - 1]?.entityId?.split(".")[0] ?? "?"
+    ).join("+");
+    logger198.info(
+      `Created user composed device ${primaryEntityId}: ${parts.length} sub-endpoint(s) [${labels}]`
+    );
+    return endpoint;
+  }
+  constructor(type, entityId, id, parts, mappedEntityIds) {
+    super(type, { id, parts });
+    this.entityId = entityId;
+    this.mappedEntityIds = mappedEntityIds;
+  }
+  async updateStates(states) {
+    this.scheduleUpdate(this, this.entityId, states);
+    for (const [entityId, sub] of this.subEndpoints) {
+      this.scheduleUpdate(sub, entityId, states);
+    }
+  }
+  scheduleUpdate(endpoint, entityId, states) {
+    const state = states[entityId];
+    if (!state) return;
+    const key = endpoint === this ? `_parent_:${entityId}` : entityId;
+    const stateJson = JSON.stringify({
+      s: state.state,
+      a: state.attributes
+    });
+    if (this.lastStates.get(key) === stateJson) return;
+    this.lastStates.set(key, stateJson);
+    let debouncedFn = this.debouncedUpdates.get(key);
+    if (!debouncedFn) {
+      debouncedFn = debounce4(
+        (ep, s) => this.flushUpdate(ep, s),
+        50
+      );
+      this.debouncedUpdates.set(key, debouncedFn);
+    }
+    debouncedFn(endpoint, state);
+  }
+  async flushUpdate(endpoint, state) {
+    try {
+      await endpoint.construction.ready;
+    } catch {
+      return;
+    }
+    try {
+      const current = endpoint.stateOf(HomeAssistantEntityBehavior).entity;
+      await endpoint.setStateOf(HomeAssistantEntityBehavior, {
+        entity: { ...current, state }
+      });
+    } catch (error) {
+      if (error instanceof TransactionDestroyedError || error instanceof DestroyedDependencyError) {
+        return;
+      }
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      if (errorMessage.includes(
+        "Endpoint storage inaccessible because endpoint is not a node and is not owned by another endpoint"
+      )) {
+        return;
+      }
+      throw error;
+    }
+  }
+  async delete() {
+    for (const fn of this.debouncedUpdates.values()) {
+      fn.clear();
+    }
+    await super.delete();
+  }
+};
+
 // src/matter/endpoints/legacy/legacy-endpoint.ts
-var logger198 = Logger.get("LegacyEndpoint");
+var logger199 = Logger.get("LegacyEndpoint");
 var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
   static async create(registry2, entityId, mapping) {
     const deviceRegistry = registry2.deviceOf(entityId);
@@ -177919,25 +178122,25 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
       return;
     }
     if (registry2.isAutoBatteryMappingEnabled() && registry2.isBatteryEntityUsed(entityId)) {
-      logger198.debug(
+      logger199.debug(
         `Skipping ${entityId} - already auto-assigned as battery to another device`
       );
       return;
     }
     if (registry2.isAutoHumidityMappingEnabled() && registry2.isHumidityEntityUsed(entityId)) {
-      logger198.debug(
+      logger199.debug(
         `Skipping ${entityId} - already auto-assigned as humidity to a temperature sensor`
       );
       return;
     }
     if (registry2.isAutoPressureMappingEnabled() && registry2.isPressureEntityUsed(entityId)) {
-      logger198.debug(
+      logger199.debug(
         `Skipping ${entityId} - already auto-assigned as pressure to a temperature sensor`
       );
       return;
     }
     if (registry2.isAutoComposedDevicesEnabled() && registry2.isComposedSubEntityUsed(entityId)) {
-      logger198.debug(
+      logger199.debug(
         `Skipping ${entityId} - already consumed by a composed device`
       );
       return;
@@ -177957,7 +178160,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
               humidityEntity: humidityEntityId
             };
             registry2.markHumidityEntityUsed(humidityEntityId);
-            logger198.debug(
+            logger199.debug(
               `Auto-assigned humidity ${humidityEntityId} to ${entityId}`
             );
           }
@@ -177976,7 +178179,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
               pressureEntity: pressureEntityId
             };
             registry2.markPressureEntityUsed(pressureEntityId);
-            logger198.debug(
+            logger199.debug(
               `Auto-assigned pressure ${pressureEntityId} to ${entityId}`
             );
           }
@@ -177994,7 +178197,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             batteryEntity: batteryEntityId
           };
           registry2.markBatteryEntityUsed(batteryEntityId);
-          logger198.debug(
+          logger199.debug(
             `Auto-assigned battery ${batteryEntityId} to ${entityId}`
           );
         }
@@ -178012,7 +178215,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
               powerEntity: powerEntityId
             };
             registry2.markPowerEntityUsed(powerEntityId);
-            logger198.debug(`Auto-assigned power ${powerEntityId} to ${entityId}`);
+            logger199.debug(`Auto-assigned power ${powerEntityId} to ${entityId}`);
           }
         }
       }
@@ -178029,7 +178232,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
               energyEntity: energyEntityId
             };
             registry2.markEnergyEntityUsed(energyEntityId);
-            logger198.debug(
+            logger199.debug(
               `Auto-assigned energy ${energyEntityId} to ${entityId}`
             );
           }
@@ -178045,7 +178248,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             entityId: effectiveMapping?.entityId ?? entityId,
             cleaningModeEntity: vacuumEntities.cleaningModeEntity
           };
-          logger198.debug(
+          logger199.debug(
             `Auto-assigned cleaningMode ${vacuumEntities.cleaningModeEntity} to ${entityId}`
           );
         }
@@ -178055,7 +178258,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             entityId: effectiveMapping?.entityId ?? entityId,
             suctionLevelEntity: vacuumEntities.suctionLevelEntity
           };
-          logger198.debug(
+          logger199.debug(
             `Auto-assigned suctionLevel ${vacuumEntities.suctionLevelEntity} to ${entityId}`
           );
         }
@@ -178065,7 +178268,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             entityId: effectiveMapping?.entityId ?? entityId,
             mopIntensityEntity: vacuumEntities.mopIntensityEntity
           };
-          logger198.debug(
+          logger199.debug(
             `Auto-assigned mopIntensity ${vacuumEntities.mopIntensityEntity} to ${entityId}`
           );
         }
@@ -178080,7 +178283,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             entityId: effectiveMapping?.entityId ?? entityId,
             cleanAreaRooms
           };
-          logger198.debug(
+          logger199.debug(
             `Using ${cleanAreaRooms.length} HA areas via CLEAN_AREA for ${entityId}`
           );
         }
@@ -178101,7 +178304,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
                 rooms: roomsObj
               }
             };
-            logger198.debug(
+            logger199.debug(
               `Auto-detected ${valetudoRooms.length} Valetudo segments for ${entityId}`
             );
           } else {
@@ -178118,7 +178321,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
                   rooms: roomsObj
                 }
               };
-              logger198.debug(
+              logger199.debug(
                 `Auto-detected ${roborockRooms.length} Roborock rooms for ${entityId}`
               );
             }
@@ -178126,6 +178329,23 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
         }
       }
     }
+    if (registry2.isAutoComposedDevicesEnabled() && effectiveMapping?.composedEntities && effectiveMapping.composedEntities.length > 0) {
+      const composedAreaName = registry2.getAreaName(entityId);
+      const composed = await UserComposedEndpoint.create({
+        registry: registry2,
+        primaryEntityId: entityId,
+        mapping: effectiveMapping,
+        composedEntities: effectiveMapping.composedEntities,
+        customName: effectiveMapping?.customName,
+        areaName: composedAreaName
+      });
+      if (composed) {
+        return composed;
+      }
+      logger199.warn(
+        `User composed device creation failed for ${entityId}, falling back to standalone`
+      );
+    }
     if (registry2.isAutoComposedDevicesEnabled()) {
       const attrs = state.attributes;
       if (entityId.startsWith("sensor.") && attrs.device_class === SensorDeviceClass.temperature && (effectiveMapping?.humidityEntity || effectiveMapping?.pressureEntity)) {
@@ -178200,7 +178420,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
   }
   constructor(type, entityId, customName, mappedEntityIds) {
     super(type, entityId, customName, mappedEntityIds);
-    this.flushUpdate = debounce4(this.flushPendingUpdate.bind(this), 50);
+    this.flushUpdate = debounce5(this.flushPendingUpdate.bind(this), 50);
   }
   lastState;
   pendingMappedChange = false;
@@ -178217,11 +178437,11 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
     }
     if (mappedChanged) {
       this.pendingMappedChange = true;
-      logger198.debug(
+      logger199.debug(
         `Mapped entity change detected for ${this.entityId}, forcing update`
       );
     }
-    logger198.debug(
+    logger199.debug(
       `State update received for ${this.entityId}: state=${state.state}`
     );
     this.lastState = state;
@@ -178265,7 +178485,7 @@ import {
   getCollection
 } from "home-assistant-js-websocket";
 import { atLeastHaVersion } from "home-assistant-js-websocket/dist/util.js";
-var logger199 = Logger.get("SubscribeEntities");
+var logger200 = Logger.get("SubscribeEntities");
 function processEvent(store, updates) {
   const state = { ...store.state };
   if (updates.a) {
@@ -178291,7 +178511,7 @@ function processEvent(store, updates) {
     for (const entityId in updates.c) {
       let entityState = state[entityId];
       if (!entityState) {
-        logger199.warn("Received state update for unknown entity", entityId);
+        logger200.warn("Received state update for unknown entity", entityId);
         continue;
       }
       entityState = { ...entityState };
@@ -178361,7 +178581,7 @@ var subscribeEntities = (conn, onChange, entityIds) => entitiesColl(conn, entity
 
 // src/services/bridges/entity-isolation-service.ts
 init_esm();
-var logger200 = Logger.get("EntityIsolation");
+var logger201 = Logger.get("EntityIsolation");
 var EntityIsolationServiceImpl = class {
   isolatedEntities = /* @__PURE__ */ new Map();
   isolationCallbacks = /* @__PURE__ */ new Map();
@@ -178426,13 +178646,13 @@ var EntityIsolationServiceImpl = class {
     }
     const parsed = this.parseEndpointPath(msg);
     if (!parsed) {
-      logger200.warn("Could not parse entity from error:", msg);
+      logger201.warn("Could not parse entity from error:", msg);
       return false;
     }
     const { bridgeId, entityName } = parsed;
     const callback = this.isolationCallbacks.get(bridgeId);
     if (!callback) {
-      logger200.warn(
+      logger201.warn(
         `No isolation callback registered for bridge ${bridgeId}, entity: ${entityName}`
       );
       return false;
@@ -178443,14 +178663,14 @@ var EntityIsolationServiceImpl = class {
     }
     const reason = `${classification}. Entity isolated to protect bridge stability.`;
     this.isolatedEntities.set(key, { entityId: entityName, reason });
-    logger200.warn(
+    logger201.warn(
       `Isolating entity "${entityName}" from bridge ${bridgeId} due to: ${reason}`
     );
     try {
       await callback(entityName);
       return true;
     } catch (e) {
-      logger200.error(`Failed to isolate entity ${entityName}:`, e);
+      logger201.error(`Failed to isolate entity ${entityName}:`, e);
       return false;
     }
   }
@@ -178749,8 +178969,15 @@ var BridgeEndpointManager = class extends Service {
     this.entityIds = this.registry.entityIds;
     if (this.registry.isAutoComposedDevicesEnabled()) {
       for (const eid of this.entityIds) {
-        if (!eid.startsWith("fan.")) continue;
         const m = this.getEntityMapping(eid);
+        if (m?.composedEntities) {
+          for (const sub of m.composedEntities) {
+            if (sub.entityId) {
+              this.registry.markComposedSubEntityUsed(sub.entityId);
+            }
+          }
+        }
+        if (!eid.startsWith("fan.")) continue;
         const matterType = m?.matterDeviceType ?? "fan";
         if (matterType !== "air_purifier") continue;
         const ent = this.registry.entity(eid);
@@ -179604,11 +179831,11 @@ init_dist();
 var AUTO_FORCE_SYNC_INTERVAL_MS2 = 9e4;
 var DEAD_SESSION_TIMEOUT_MS2 = 6e4;
 var ServerModeBridge = class {
-  constructor(logger203, dataProvider, endpointManager, server) {
+  constructor(logger204, dataProvider, endpointManager, server) {
     this.dataProvider = dataProvider;
     this.endpointManager = endpointManager;
     this.server = server;
-    this.log = logger203.get(`ServerModeBridge / ${dataProvider.id}`);
+    this.log = logger204.get(`ServerModeBridge / ${dataProvider.id}`);
   }
   log;
   status = {
@@ -180033,7 +180260,7 @@ init_service();
 // src/matter/endpoints/server-mode-vacuum-endpoint.ts
 init_esm();
 init_home_assistant_entity_behavior();
-import debounce5 from "debounce";
+import debounce6 from "debounce";
 
 // src/matter/endpoints/legacy/vacuum/server-mode-vacuum-device.ts
 init_home_assistant_entity_behavior();
@@ -180097,7 +180324,7 @@ function ServerModeVacuumDevice(homeAssistantEntity, includeOnOff = false, clean
 }
 
 // src/matter/endpoints/server-mode-vacuum-endpoint.ts
-var logger201 = Logger.get("ServerModeVacuumEndpoint");
+var logger202 = Logger.get("ServerModeVacuumEndpoint");
 var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEndpoint {
   static async create(registry2, entityId, mapping) {
     const deviceRegistry = registry2.deviceOf(entityId);
@@ -180107,7 +180334,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
       return void 0;
     }
     let effectiveMapping = mapping;
-    logger201.info(
+    logger202.info(
       `${entityId}: device_id=${entity.device_id}, manualBattery=${mapping?.batteryEntity ?? "none"}`
     );
     if (entity.device_id) {
@@ -180122,15 +180349,15 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
             batteryEntity: batteryEntityId
           };
           registry2.markBatteryEntityUsed(batteryEntityId);
-          logger201.info(`${entityId}: Auto-assigned battery ${batteryEntityId}`);
+          logger202.info(`${entityId}: Auto-assigned battery ${batteryEntityId}`);
         } else {
           const attrs = state.attributes;
           if (attrs.battery_level != null || attrs.battery != null) {
-            logger201.info(
+            logger202.info(
               `${entityId}: No battery entity found, using battery attribute from vacuum state`
             );
           } else {
-            logger201.warn(
+            logger202.warn(
               `${entityId}: No battery entity found for device ${entity.device_id}`
             );
           }
@@ -180145,7 +180372,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
           entityId: effectiveMapping?.entityId ?? entityId,
           cleaningModeEntity: vacuumEntities.cleaningModeEntity
         };
-        logger201.info(
+        logger202.info(
           `${entityId}: Auto-assigned cleaningMode ${vacuumEntities.cleaningModeEntity}`
         );
       }
@@ -180155,7 +180382,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
           entityId: effectiveMapping?.entityId ?? entityId,
           suctionLevelEntity: vacuumEntities.suctionLevelEntity
         };
-        logger201.info(
+        logger202.info(
           `${entityId}: Auto-assigned suctionLevel ${vacuumEntities.suctionLevelEntity}`
         );
       }
@@ -180165,7 +180392,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
           entityId: effectiveMapping?.entityId ?? entityId,
           mopIntensityEntity: vacuumEntities.mopIntensityEntity
         };
-        logger201.info(
+        logger202.info(
           `${entityId}: Auto-assigned mopIntensity ${vacuumEntities.mopIntensityEntity}`
         );
       }
@@ -180180,7 +180407,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
           entityId: effectiveMapping?.entityId ?? entityId,
           cleanAreaRooms
         };
-        logger201.info(
+        logger202.info(
           `${entityId}: Using ${cleanAreaRooms.length} HA areas via CLEAN_AREA`
         );
       }
@@ -180201,7 +180428,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
               rooms: roomsObj
             }
           };
-          logger201.info(
+          logger202.info(
             `${entityId}: Auto-detected ${valetudoRooms.length} Valetudo segments`
           );
         } else {
@@ -180218,14 +180445,14 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
                 rooms: roomsObj
               }
             };
-            logger201.info(
+            logger202.info(
               `${entityId}: Auto-detected ${roborockRooms.length} Roborock rooms`
             );
           }
         }
       }
     } else {
-      logger201.warn(`${entityId}: No device_id \u2014 cannot auto-assign battery`);
+      logger202.warn(`${entityId}: No device_id \u2014 cannot auto-assign battery`);
     }
     const payload = {
       entity_id: entityId,
@@ -180275,7 +180502,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
   flushUpdate;
   constructor(type, entityId, customName, mappedEntityIds) {
     super(type, entityId, customName, mappedEntityIds);
-    this.flushUpdate = debounce5(this.flushPendingUpdate.bind(this), 50);
+    this.flushUpdate = debounce6(this.flushPendingUpdate.bind(this), 50);
   }
   async delete() {
     this.flushUpdate.clear();
@@ -180289,11 +180516,11 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
     }
     if (mappedChanged) {
       this.pendingMappedChange = true;
-      logger201.debug(
+      logger202.debug(
         `Mapped entity change detected for ${this.entityId}, forcing update`
       );
     }
-    logger201.debug(
+    logger202.debug(
       `State update received for ${this.entityId}: state=${state.state}`
     );
     this.lastState = state;
@@ -180707,10 +180934,10 @@ var BridgeEnvironmentFactory = class extends BridgeFactory {
 // src/core/ioc/app-environment.ts
 var AppEnvironment = class _AppEnvironment extends EnvironmentBase {
   constructor(rootEnv, options) {
-    const logger203 = rootEnv.get(LoggerService);
+    const logger204 = rootEnv.get(LoggerService);
     super({
       id: "App",
-      log: logger203.get("AppContainer"),
+      log: logger204.get("AppContainer"),
       parent: rootEnv
     });
     this.options = options;
@@ -180723,8 +180950,8 @@ var AppEnvironment = class _AppEnvironment extends EnvironmentBase {
   }
   construction;
   async init() {
-    const logger203 = this.get(LoggerService);
-    this.set(LoggerService, logger203);
+    const logger204 = this.get(LoggerService);
+    this.set(LoggerService, logger204);
     this.set(AppStorage, new AppStorage(await this.load(StorageService)));
     this.set(BridgeStorage, new BridgeStorage(await this.load(AppStorage)));
     this.set(
@@ -180741,7 +180968,7 @@ var AppEnvironment = class _AppEnvironment extends EnvironmentBase {
     );
     this.set(
       HomeAssistantClient,
-      new HomeAssistantClient(logger203, this.options.homeAssistant)
+      new HomeAssistantClient(logger204, this.options.homeAssistant)
     );
     this.set(
       HomeAssistantConfig,
@@ -180749,7 +180976,7 @@ var AppEnvironment = class _AppEnvironment extends EnvironmentBase {
     );
     this.set(
       HomeAssistantActions,
-      new HomeAssistantActions(logger203, await this.load(HomeAssistantClient))
+      new HomeAssistantActions(logger204, await this.load(HomeAssistantClient))
     );
     this.set(
       HomeAssistantRegistry,
@@ -180785,7 +181012,7 @@ var AppEnvironment = class _AppEnvironment extends EnvironmentBase {
     this.set(
       WebApi,
       new WebApi(
-        logger203,
+        logger204,
         await this.load(BridgeService),
         await this.load(HomeAssistantClient),
         await this.load(HomeAssistantRegistry),
@@ -180811,7 +181038,7 @@ init_nodejs();
 init_level_control();
 
 // src/matter/patches/patch-level-control-tlv.ts
-var logger202 = Logger.get("PatchLevelControlTlv");
+var logger203 = Logger.get("PatchLevelControlTlv");
 function patchLevelControlTlv() {
   let patched = 0;
   const moveToLevelFields = LevelControl3.TlvMoveToLevelRequest.fieldDefinitions;
@@ -180825,11 +181052,11 @@ function patchLevelControlTlv() {
     patched++;
   }
   if (patched > 0) {
-    logger202.info(
+    logger203.info(
       `Patched ${patched} LevelControl TLV schema(s): transitionTime is now optional (Google Home compatibility)`
     );
   } else {
-    logger202.warn(
+    logger203.warn(
       "Failed to patch LevelControl TLV schemas \u2014 field definitions not found. Google Home brightness adjustment may not work."
     );
   }