@riddix/hamh 2.0.35 → 2.0.36

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,
@@ -147567,7 +147567,7 @@ var DiagnosticService = class {
             }
           }
         }
-        const entities = this.collectEntities(bridge.aggregator);
+        const entities = bridge.aggregator ? this.collectEntities(bridge.aggregator) : [];
         return {
           bridgeId: data.id,
           bridgeName: data.name,
@@ -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}`
       );
     });
@@ -147766,6 +147766,7 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                     disabled: config10.disabled,
                     filterLifeEntity: config10.filterLifeEntity,
                     cleaningModeEntity: config10.cleaningModeEntity,
+                    temperatureEntity: config10.temperatureEntity,
                     humidityEntity: config10.humidityEntity,
                     pressureEntity: config10.pressureEntity,
                     batteryEntity: config10.batteryEntity,
@@ -147775,7 +147776,8 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                     energyEntity: config10.energyEntity,
                     suctionLevelEntity: config10.suctionLevelEntity,
                     mopIntensityEntity: config10.mopIntensityEntity,
-                    valetudoIdentifier: config10.valetudoIdentifier
+                    valetudoIdentifier: config10.valetudoIdentifier,
+                    coverSwapOpenClose: config10.coverSwapOpenClose
                   });
                   mappingsRestored++;
                 }
@@ -148514,6 +148516,15 @@ function logsApi(_logger) {
 }
 
 // src/api/diagnostic-api.ts
+function endpointTreeNode(ep) {
+  return {
+    id: ep.id,
+    endpoint: ep.number,
+    deviceType: `0x${ep.type.deviceType.toString(16).padStart(4, "0")}`,
+    deviceTypeName: ep.type.name,
+    parts: [...ep.parts].map((p) => endpointTreeNode(p))
+  };
+}
 function detectEnvironment() {
   if (process.env.SUPERVISOR_TOKEN || process.env.HASSIO_TOKEN) {
     return "Home Assistant Add-on";
@@ -148588,7 +148599,14 @@ function diagnosticApi(bridgeService, haClient, haRegistry, version, startTime)
         failedEntities: failedEntities.map((fe) => ({
           entityId: anonymize ? anonymizeEntityId(fe.entityId) : fe.entityId,
           reason: fe.reason
-        }))
+        })),
+        endpointTree: (() => {
+          try {
+            return endpointTreeNode(b.server);
+          } catch {
+            return void 0;
+          }
+        })()
       };
     });
     const recentLogs = logBuffer.entries.slice(-logLimit).map((entry) => ({
@@ -148660,6 +148678,7 @@ function entityMappingApi(mappingStorage) {
       disabled: body.disabled,
       filterLifeEntity: body.filterLifeEntity,
       cleaningModeEntity: body.cleaningModeEntity,
+      temperatureEntity: body.temperatureEntity,
       humidityEntity: body.humidityEntity,
       pressureEntity: body.pressureEntity,
       batteryEntity: body.batteryEntity,
@@ -148671,7 +148690,9 @@ function entityMappingApi(mappingStorage) {
       mopIntensityEntity: body.mopIntensityEntity,
       customServiceAreas: body.customServiceAreas,
       customFanSpeedTags: body.customFanSpeedTags,
-      valetudoIdentifier: body.valetudoIdentifier
+      valetudoIdentifier: body.valetudoIdentifier,
+      coverSwapOpenClose: body.coverSwapOpenClose,
+      composedEntities: body.composedEntities
     };
     const config10 = await mappingStorage.setMapping(request);
     res.status(200).json(config10);
@@ -149121,6 +149142,7 @@ function configToProfileEntry(config10) {
     disabled: config10.disabled,
     filterLifeEntity: config10.filterLifeEntity,
     cleaningModeEntity: config10.cleaningModeEntity,
+    temperatureEntity: config10.temperatureEntity,
     humidityEntity: config10.humidityEntity,
     pressureEntity: config10.pressureEntity,
     batteryEntity: config10.batteryEntity,
@@ -149132,7 +149154,8 @@ function configToProfileEntry(config10) {
     mopIntensityEntity: config10.mopIntensityEntity,
     customServiceAreas: config10.customServiceAreas,
     customFanSpeedTags: config10.customFanSpeedTags,
-    valetudoIdentifier: config10.valetudoIdentifier
+    valetudoIdentifier: config10.valetudoIdentifier,
+    coverSwapOpenClose: config10.coverSwapOpenClose
   };
 }
 function mappingProfileApi(mappingStorage) {
@@ -149240,6 +149263,7 @@ function mappingProfileApi(mappingStorage) {
           disabled: entry.disabled,
           filterLifeEntity: entry.filterLifeEntity,
           cleaningModeEntity: entry.cleaningModeEntity,
+          temperatureEntity: entry.temperatureEntity,
           humidityEntity: entry.humidityEntity,
           pressureEntity: entry.pressureEntity,
           batteryEntity: entry.batteryEntity,
@@ -149251,7 +149275,8 @@ function mappingProfileApi(mappingStorage) {
           mopIntensityEntity: entry.mopIntensityEntity,
           customServiceAreas: entry.customServiceAreas,
           customFanSpeedTags: entry.customFanSpeedTags,
-          valetudoIdentifier: entry.valetudoIdentifier
+          valetudoIdentifier: entry.valetudoIdentifier,
+          coverSwapOpenClose: entry.coverSwapOpenClose
         });
         applied++;
       } catch (e) {
@@ -151087,7 +151112,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;
@@ -151098,8 +151123,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(
@@ -151537,12 +151562,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();
@@ -151568,17 +151593,17 @@ import { createRequire } from "node:module";
 import os4 from "node:os";
 import path9 from "node:path";
 function resolveAppVersion() {
-  if (process.env.APP_VERSION) {
-    return process.env.APP_VERSION;
-  }
   try {
     const require2 = createRequire(import.meta.url);
     const pkg = require2("home-assistant-matter-hub/package.json");
-    if (pkg.version) {
+    if (pkg.version && pkg.version !== "0.0.0") {
       return pkg.version;
     }
   } catch {
   }
+  if (process.env.APP_VERSION) {
+    return process.env.APP_VERSION;
+  }
   return "0.0.0-dev";
 }
 var Options = class {
@@ -152092,10 +152117,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;
@@ -152673,6 +152698,7 @@ var EntityMappingStorage = class extends Service {
       disabled: request.disabled,
       filterLifeEntity: request.filterLifeEntity?.trim() || void 0,
       cleaningModeEntity: request.cleaningModeEntity?.trim() || void 0,
+      temperatureEntity: request.temperatureEntity?.trim() || void 0,
       humidityEntity: request.humidityEntity?.trim() || void 0,
       batteryEntity: request.batteryEntity?.trim() || void 0,
       roomEntities: roomEntities.length > 0 ? roomEntities : void 0,
@@ -152686,9 +152712,11 @@ var EntityMappingStorage = class extends Service {
         (a) => a.name?.trim() && a.service?.trim()
       ) ?? void 0,
       customFanSpeedTags: request.customFanSpeedTags && Object.keys(request.customFanSpeedTags).length > 0 ? request.customFanSpeedTags : void 0,
-      valetudoIdentifier: request.valetudoIdentifier?.trim() || void 0
+      valetudoIdentifier: request.valetudoIdentifier?.trim() || 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.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) {
+    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);
@@ -166255,6 +166283,7 @@ function validatePluginDevice(device) {
 }
 var PluginManager = class {
   instances = /* @__PURE__ */ new Map();
+  domainMappings = /* @__PURE__ */ new Map();
   storageDir;
   bridgeId;
   runner = new SafePluginRunner();
@@ -166386,6 +166415,21 @@ var PluginManager = class {
           clusterId3,
           attributes7
         );
+      },
+      registerDomainMapping: (mapping) => {
+        if (!mapping.domain || typeof mapping.domain !== "string" || !mapping.matterDeviceType || typeof mapping.matterDeviceType !== "string") {
+          pluginLogger.warn("Invalid domain mapping, skipping");
+          return;
+        }
+        if (this.domainMappings.has(mapping.domain)) {
+          pluginLogger.warn(
+            `Domain "${mapping.domain}" already mapped by another plugin, overwriting`
+          );
+        }
+        this.domainMappings.set(mapping.domain, mapping);
+        pluginLogger.info(
+          `Registered domain mapping: ${mapping.domain} \u2192 ${mapping.matterDeviceType}`
+        );
       }
     };
     this.instances.set(plugin.name, {
@@ -166511,6 +166555,9 @@ var PluginManager = class {
     if (!instance) return void 0;
     return instance.plugin.getConfigSchema?.();
   }
+  getDomainMappings() {
+    return new Map(this.domainMappings);
+  }
   async updateConfig(pluginName, config10) {
     const instance = this.instances.get(pluginName);
     if (!instance) return false;
@@ -166856,11 +166903,12 @@ function ensureCommissioningConfig(server) {
 
 // src/services/bridges/bridge.ts
 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,
@@ -166878,6 +166926,8 @@ var Bridge = class {
   // (e.g. Stopped → Starting → Running).
   onStatusChange;
   autoForceSyncTimer = null;
+  deadSessionTimer = null;
+  staleSessionTimers = /* @__PURE__ */ new Map();
   // Tracks the last synced state JSON per entity to avoid pushing unchanged states.
   // Key: entity_id, Value: JSON.stringify of entity.state
   lastSyncedStates = /* @__PURE__ */ new Map();
@@ -167054,6 +167104,33 @@ ${e?.toString()}`);
           this.log.warn(
             `All subscriptions lost \u2014 ${sessions.length} session(s) still active, waiting for controller to re-subscribe`
           );
+          if (!this.deadSessionTimer) {
+            this.deadSessionTimer = setTimeout(() => {
+              this.deadSessionTimer = null;
+              this.closeDeadSessions();
+            }, DEAD_SESSION_TIMEOUT_MS);
+            this.log.info(
+              `Scheduled dead session cleanup in ${DEAD_SESSION_TIMEOUT_MS / 1e3}s`
+            );
+          }
+        } else if (totalSubs > 0 && this.deadSessionTimer) {
+          clearTimeout(this.deadSessionTimer);
+          this.deadSessionTimer = null;
+          this.log.info(
+            "Subscriptions recovered, canceled dead session cleanup"
+          );
+        }
+        if (session.subscriptions.size === 0 && !this.staleSessionTimers.has(session.id)) {
+          this.staleSessionTimers.set(
+            session.id,
+            setTimeout(() => {
+              this.staleSessionTimers.delete(session.id);
+              this.closeStaleSession(session.id);
+            }, DEAD_SESSION_TIMEOUT_MS)
+          );
+        } else if (session.subscriptions.size > 0 && this.staleSessionTimers.has(session.id)) {
+          clearTimeout(this.staleSessionTimers.get(session.id));
+          this.staleSessionTimers.delete(session.id);
         }
       };
       sessionManager.subscriptionsChanged.on(this.sessionDiagHandler);
@@ -167082,6 +167159,62 @@ ${e?.toString()}`);
     } catch {
     }
   }
+  closeStaleSession(sessionId) {
+    try {
+      const sessionManager = this.server.env.get(SessionManager);
+      for (const s of [...sessionManager.sessions]) {
+        if (s.id === sessionId && !s.isClosing && s.subscriptions.size === 0) {
+          this.log.warn(
+            `Closing stale session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS / 1e3}s)`
+          );
+          s.initiateClose().catch(() => {
+            return s.initiateForceClose();
+          }).catch(() => {
+          }).finally(() => this.triggerMdnsReAnnounce());
+          break;
+        }
+      }
+    } catch {
+    }
+  }
+  closeDeadSessions() {
+    try {
+      const sessionManager = this.server.env.get(SessionManager);
+      const sessions = [...sessionManager.sessions];
+      const closes = [];
+      for (const s of sessions) {
+        if (!s.isClosing && s.subscriptions.size === 0) {
+          this.log.warn(
+            `Closing dead session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS / 1e3}s)`
+          );
+          closes.push(
+            s.initiateClose().catch(() => {
+              return s.initiateForceClose();
+            })
+          );
+        }
+      }
+      if (closes.length > 0) {
+        Promise.allSettled(closes).then(() => this.triggerMdnsReAnnounce());
+      }
+    } catch {
+    }
+  }
+  /**
+   * Force a fresh mDNS operational advertisement after session cleanup.
+   * matter.js DeviceAdvertiser only re-announces when a subscription is
+   * canceled BY THE PEER. When the server cancels after 3 delivery
+   * timeouts, no re-announcement happens and the controller may not
+   * realize it should reconnect (#266).
+   */
+  triggerMdnsReAnnounce() {
+    try {
+      const advertiser = this.server.env.get(DeviceAdvertiser);
+      advertiser.restartAdvertisement();
+      this.log.info("Triggered mDNS re-announcement after session cleanup");
+    } catch {
+    }
+  }
   unwireSessionDiagnostics() {
     try {
       const sessionManager = this.server.env.get(SessionManager);
@@ -167099,6 +167232,14 @@ ${e?.toString()}`);
     this.sessionDiagHandler = void 0;
     this.sessionAddedHandler = void 0;
     this.sessionDeletedHandler = void 0;
+    if (this.deadSessionTimer) {
+      clearTimeout(this.deadSessionTimer);
+      this.deadSessionTimer = null;
+    }
+    for (const timer of this.staleSessionTimers.values()) {
+      clearTimeout(timer);
+    }
+    this.staleSessionTimers.clear();
   }
   stopAutoForceSync() {
     if (this.autoForceSyncTimer) {
@@ -167232,7 +167373,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();
@@ -167266,6 +167407,7 @@ function getMappedEntityIds(mapping) {
   if (!mapping) return [];
   const ids = [];
   if (mapping.batteryEntity) ids.push(mapping.batteryEntity);
+  if (mapping.temperatureEntity) ids.push(mapping.temperatureEntity);
   if (mapping.humidityEntity) ids.push(mapping.humidityEntity);
   if (mapping.pressureEntity) ids.push(mapping.pressureEntity);
   if (mapping.cleaningModeEntity) ids.push(mapping.cleaningModeEntity);
@@ -167274,6 +167416,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;
 }
 
@@ -167610,6 +167757,26 @@ function PowerSourceServer2(config10) {
     order: PowerSource3.Cluster.id
   });
 }
+var defaultBatteryConfig = {
+  getBatteryPercent: (entity, agent) => {
+    const homeAssistant = agent.get(HomeAssistantEntityBehavior);
+    const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
+    if (batteryEntity) {
+      const stateProvider = agent.env.get(EntityStateProvider);
+      const battery = stateProvider.getBatteryPercent(batteryEntity);
+      if (battery != null) {
+        return Math.max(0, Math.min(100, battery));
+      }
+    }
+    const attrs = entity.attributes;
+    const level = attrs.battery_level ?? attrs.battery;
+    if (level == null || Number.isNaN(Number(level))) {
+      return null;
+    }
+    return Number(level);
+  }
+};
+var DefaultPowerSourceServer = PowerSourceServer2(defaultBatteryConfig);
 
 // src/matter/behaviors/temperature-measurement-server.ts
 init_home_assistant_entity_behavior();
@@ -168028,12 +168195,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()
@@ -168050,11 +168218,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()
@@ -168532,35 +168701,25 @@ var FanOnOffServer = OnOffServer2({
 
 // src/matter/endpoints/composed/composed-air-purifier-endpoint.ts
 var logger169 = Logger.get("ComposedAirPurifierEndpoint");
-function createTemperatureConfig(temperatureEntityId) {
-  return {
-    getValue(_entity, agent) {
-      const stateProvider = agent.env.get(EntityStateProvider);
-      const tempState = stateProvider.getState(temperatureEntityId);
-      if (!tempState) return void 0;
-      const temperature3 = Number.parseFloat(tempState.state);
-      if (Number.isNaN(temperature3)) return void 0;
-      const fallbackUnit = agent.env.get(HomeAssistantConfig).unitSystem.temperature;
-      const attrs = tempState.attributes;
-      return Temperature.withUnit(
-        temperature3,
-        attrs.unit_of_measurement ?? fallbackUnit
-      );
-    }
-  };
-}
-function createHumidityConfig(humidityEntityId) {
-  return {
-    getValue(_entity, agent) {
-      const stateProvider = agent.env.get(EntityStateProvider);
-      const humState = stateProvider.getState(humidityEntityId);
-      if (!humState) return null;
-      const humidity = Number.parseFloat(humState.state);
-      if (Number.isNaN(humidity)) return null;
-      return humidity;
-    }
-  };
-}
+var temperatureConfig = {
+  getValue(entity, agent) {
+    const fallbackUnit = agent.env.get(HomeAssistantConfig).unitSystem.temperature;
+    const state = entity.state;
+    const attributes7 = entity.attributes;
+    const temperature3 = state == null || Number.isNaN(+state) ? null : +state;
+    if (temperature3 == null) return void 0;
+    return Temperature.withUnit(
+      temperature3,
+      attributes7.unit_of_measurement ?? fallbackUnit
+    );
+  }
+};
+var humidityConfig = {
+  getValue({ state }) {
+    if (state == null || Number.isNaN(+state)) return null;
+    return +state;
+  }
+};
 var batteryConfig = {
   getBatteryPercent: (_entity, agent) => {
     const homeAssistant = agent.get(HomeAssistantEntityBehavior);
@@ -168573,6 +168732,16 @@ var batteryConfig = {
     return null;
   }
 };
+var TemperatureSubType = TemperatureSensorDevice.with(
+  IdentifyServer2,
+  HomeAssistantEntityBehavior,
+  TemperatureMeasurementServer2(temperatureConfig)
+);
+var HumiditySubType = HumiditySensorDevice.with(
+  IdentifyServer2,
+  HomeAssistantEntityBehavior,
+  HumidityMeasurementServer(humidityConfig)
+);
 function createEndpointId2(entityId, customName) {
   const baseName = customName || entityId;
   return baseName.replace(/\./g, "_").replace(/\s+/g, "_");
@@ -168592,9 +168761,9 @@ function buildEntityPayload(registry2, entityId) {
 var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends Endpoint {
   entityId;
   mappedEntityIds;
-  trackedEntityIds;
+  subEndpoints = /* @__PURE__ */ new Map();
   lastStates = /* @__PURE__ */ new Map();
-  debouncedFlush;
+  debouncedUpdates = /* @__PURE__ */ new Map();
   static async create(config10) {
     const { registry: registry2, primaryEntityId } = config10;
     const primaryPayload = buildEntityPayload(registry2, primaryEntityId);
@@ -168622,8 +168791,7 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
     if (hasWindModes) {
       features2.add("Wind");
     }
-    let parentType = AirPurifierDevice.with(
-      BasicInformationServer2,
+    let airPurifierSubType = AirPurifierDevice.with(
       IdentifyServer2,
       HomeAssistantEntityBehavior,
       FanOnOffServer,
@@ -168631,27 +168799,23 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
     );
     const hasFilterLife = airPurifierAttributes.filter_life != null || airPurifierAttributes.filter_life_remaining != null || airPurifierAttributes.filter_life_level != null || !!config10.mapping?.filterLifeEntity;
     if (hasFilterLife) {
-      parentType = parentType.with(AirPurifierHepaFilterMonitoringServer);
-    }
-    if (config10.temperatureEntityId) {
-      parentType = parentType.with(
-        TemperatureMeasurementServer2(
-          createTemperatureConfig(config10.temperatureEntityId)
-        )
-      );
-    }
-    if (config10.humidityEntityId) {
-      parentType = parentType.with(
-        HumidityMeasurementServer(
-          createHumidityConfig(config10.humidityEntityId)
-        )
+      airPurifierSubType = airPurifierSubType.with(
+        AirPurifierHepaFilterMonitoringServer
       );
     }
-    const mapping = {
+    const airPurifierMapping = {
       entityId: primaryEntityId,
-      ...config10.batteryEntityId ? { batteryEntity: config10.batteryEntityId } : {},
       ...config10.mapping?.filterLifeEntity ? { filterLifeEntity: config10.mapping.filterLifeEntity } : {}
     };
+    let parentType = BridgedNodeEndpoint.with(
+      BasicInformationServer2,
+      IdentifyServer2,
+      HomeAssistantEntityBehavior
+    );
+    const parentMapping = {
+      entityId: primaryEntityId,
+      ...config10.batteryEntityId ? { batteryEntity: config10.batteryEntityId } : {}
+    };
     if (config10.batteryEntityId) {
       parentType = parentType.with(PowerSourceServer2(batteryConfig));
     }
@@ -168664,75 +168828,125 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
       );
     }
     const endpointId = createEndpointId2(primaryEntityId, config10.customName);
+    const parts = [];
+    const airPurifierSub = new Endpoint(
+      airPurifierSubType.set({
+        homeAssistantEntity: {
+          entity: primaryPayload,
+          mapping: airPurifierMapping
+        }
+      }),
+      { id: `${endpointId}_air_purifier` }
+    );
+    parts.push(airPurifierSub);
+    let tempSub;
+    if (config10.temperatureEntityId) {
+      const tempPayload = buildEntityPayload(
+        registry2,
+        config10.temperatureEntityId
+      );
+      if (tempPayload) {
+        tempSub = new Endpoint(
+          TemperatureSubType.set({
+            homeAssistantEntity: { entity: tempPayload }
+          }),
+          { id: `${endpointId}_temp` }
+        );
+        parts.push(tempSub);
+      }
+    }
+    let humSub;
+    if (config10.humidityEntityId) {
+      const humPayload = buildEntityPayload(registry2, config10.humidityEntityId);
+      if (humPayload) {
+        humSub = new Endpoint(
+          HumiditySubType.set({
+            homeAssistantEntity: { entity: humPayload }
+          }),
+          { id: `${endpointId}_humidity` }
+        );
+        parts.push(humSub);
+      }
+    }
     const parentTypeWithState = parentType.set({
       homeAssistantEntity: {
         entity: primaryPayload,
         customName: config10.customName,
-        mapping
+        mapping: parentMapping
       }
     });
-    const trackedEntityIds = [primaryEntityId];
-    if (config10.temperatureEntityId)
-      trackedEntityIds.push(config10.temperatureEntityId);
-    if (config10.humidityEntityId) trackedEntityIds.push(config10.humidityEntityId);
-    const mappedIds = trackedEntityIds.filter((id) => id !== primaryEntityId);
+    const mappedIds = [];
+    if (config10.temperatureEntityId) mappedIds.push(config10.temperatureEntityId);
+    if (config10.humidityEntityId) mappedIds.push(config10.humidityEntityId);
+    if (config10.mapping?.filterLifeEntity)
+      mappedIds.push(config10.mapping.filterLifeEntity);
     const endpoint = new _ComposedAirPurifierEndpoint(
       parentTypeWithState,
       primaryEntityId,
       endpointId,
-      trackedEntityIds,
+      parts,
       mappedIds
     );
+    endpoint.subEndpoints.set(primaryEntityId, airPurifierSub);
+    if (config10.temperatureEntityId && tempSub) {
+      endpoint.subEndpoints.set(config10.temperatureEntityId, tempSub);
+    }
+    if (config10.humidityEntityId && humSub) {
+      endpoint.subEndpoints.set(config10.humidityEntityId, humSub);
+    }
     const clusterLabels = [
       "AirPurifier",
       config10.temperatureEntityId ? "+Temp" : "",
       config10.humidityEntityId ? "+Hum" : "",
-      config10.batteryEntityId ? "+Bat" : ""
+      config10.batteryEntityId ? "+Bat" : "",
+      hasFilterLife ? "+HEPA" : ""
     ].filter(Boolean).join("");
-    logger169.info(`Created air purifier ${primaryEntityId}: ${clusterLabels}`);
+    logger169.info(
+      `Created composed air purifier ${primaryEntityId}: ${clusterLabels}`
+    );
     return endpoint;
   }
-  constructor(type, entityId, id, trackedEntityIds, mappedEntityIds) {
-    super(type, { id });
+  constructor(type, entityId, id, parts, mappedEntityIds) {
+    super(type, { id, parts });
     this.entityId = entityId;
-    this.trackedEntityIds = trackedEntityIds;
     this.mappedEntityIds = mappedEntityIds;
   }
   async updateStates(states) {
-    let anyChanged = false;
-    for (const entityId of this.trackedEntityIds) {
-      const state = states[entityId];
-      if (!state) continue;
-      const stateJson = JSON.stringify({
-        s: state.state,
-        a: state.attributes
-      });
-      if (this.lastStates.get(entityId) !== stateJson) {
-        this.lastStates.set(entityId, stateJson);
-        anyChanged = true;
-      }
+    this.scheduleUpdate(this, this.entityId, states);
+    for (const [entityId, sub] of this.subEndpoints) {
+      this.scheduleUpdate(sub, entityId, states);
     }
-    if (!anyChanged) return;
-    const primaryState = states[this.entityId];
-    if (!primaryState) return;
-    if (!this.debouncedFlush) {
-      this.debouncedFlush = debounce2(
-        (s) => this.flushUpdate(s),
+  }
+  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 = debounce2(
+        (ep, s) => this.flushUpdate(ep, s),
         50
       );
+      this.debouncedUpdates.set(key, debouncedFn);
     }
-    this.debouncedFlush(primaryState);
+    debouncedFn(endpoint, state);
   }
-  async flushUpdate(state) {
+  async flushUpdate(endpoint, state) {
     try {
-      await this.construction.ready;
+      await endpoint.construction.ready;
     } catch {
       return;
     }
     try {
-      const current = this.stateOf(HomeAssistantEntityBehavior).entity;
-      await this.setStateOf(HomeAssistantEntityBehavior, {
-        entity: { ...current, state: { ...state } }
+      const current = endpoint.stateOf(HomeAssistantEntityBehavior).entity;
+      await endpoint.setStateOf(HomeAssistantEntityBehavior, {
+        entity: { ...current, state }
       });
     } catch (error) {
       if (error instanceof TransactionDestroyedError || error instanceof DestroyedDependencyError) {
@@ -168748,7 +168962,9 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
     }
   }
   async delete() {
-    this.debouncedFlush?.clear();
+    for (const fn of this.debouncedUpdates.values()) {
+      fn.clear();
+    }
     await super.delete();
   }
 };
@@ -168833,7 +169049,7 @@ function PressureMeasurementServer2(config10) {
 
 // src/matter/endpoints/composed/composed-sensor-endpoint.ts
 var logger171 = Logger.get("ComposedSensorEndpoint");
-var temperatureConfig = {
+var temperatureConfig2 = {
   getValue(entity, agent) {
     const fallbackUnit = agent.env.get(HomeAssistantConfig).unitSystem.temperature;
     const state = entity.state;
@@ -168846,7 +169062,7 @@ var temperatureConfig = {
     );
   }
 };
-var humidityConfig = {
+var humidityConfig2 = {
   getValue({ state }) {
     if (state == null || Number.isNaN(+state)) return null;
     return +state;
@@ -168873,15 +169089,15 @@ var batteryConfig2 = {
     return null;
   }
 };
-var TemperatureSubType = TemperatureSensorDevice.with(
+var TemperatureSubType2 = TemperatureSensorDevice.with(
   IdentifyServer2,
   HomeAssistantEntityBehavior,
-  TemperatureMeasurementServer2(temperatureConfig)
+  TemperatureMeasurementServer2(temperatureConfig2)
 );
-var HumiditySubType = HumiditySensorDevice.with(
+var HumiditySubType2 = HumiditySensorDevice.with(
   IdentifyServer2,
   HomeAssistantEntityBehavior,
-  HumidityMeasurementServer(humidityConfig)
+  HumidityMeasurementServer(humidityConfig2)
 );
 var PressureSubType = PressureSensorDevice.with(
   IdentifyServer2,
@@ -168937,7 +169153,7 @@ var ComposedSensorEndpoint = class _ComposedSensorEndpoint extends Endpoint {
     const endpointId = createEndpointId3(primaryEntityId, config10.customName);
     const parts = [];
     const tempSub = new Endpoint(
-      TemperatureSubType.set({
+      TemperatureSubType2.set({
         homeAssistantEntity: { entity: primaryPayload }
       }),
       { id: `${endpointId}_temp` }
@@ -168948,7 +169164,7 @@ var ComposedSensorEndpoint = class _ComposedSensorEndpoint extends Endpoint {
       const humPayload = buildEntityPayload2(registry2, config10.humidityEntityId);
       if (humPayload) {
         humSub = new Endpoint(
-          HumiditySubType.set({
+          HumiditySubType2.set({
             homeAssistantEntity: { entity: humPayload }
           }),
           { id: `${endpointId}_humidity` }
@@ -169064,6 +169280,15 @@ 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/create-legacy-endpoint-type.ts
+init_esm();
+
 // src/matter/endpoints/legacy/air-purifier/index.ts
 init_dist();
 init_home_assistant_entity_behavior();
@@ -169857,7 +170082,7 @@ var ClimateFanControlServer = FanControlServer2(config3).with(
 );
 
 // src/matter/endpoints/legacy/climate/behaviors/climate-humidity-measurement-server.ts
-var humidityConfig2 = {
+var humidityConfig3 = {
   getValue(entity) {
     const attributes7 = entity.attributes;
     const humidity = attributes7.current_humidity;
@@ -169867,11 +170092,18 @@ var humidityConfig2 = {
     return +humidity;
   }
 };
-var ClimateHumidityMeasurementServer = HumidityMeasurementServer(humidityConfig2);
+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");
 
@@ -170048,7 +170280,8 @@ var ThermostatServerBase = class extends FullFeaturedBase {
     logger174.debug(
       `update: limits heat=[${minHeatLimit}, ${maxHeatLimit}], cool=[${minCoolLimit}, ${maxCoolLimit}], systemMode=${systemMode}, runningMode=${runningMode}`
     );
-    const controlSequence = config10.getControlSequence(entity.state, this.agent);
+    let controlSequence = config10.getControlSequence(entity.state, this.agent);
+    controlSequence = this.clampControlSequence(controlSequence);
     this.internal.controlSequenceOfOperation = controlSequence;
     applyPatchState(this.state, {
       ...this.features.heating ? {
@@ -170303,6 +170536,26 @@ var ThermostatServerBase = class extends FullFeaturedBase {
         }
     }
   }
+  clampControlSequence(value) {
+    const hasHeat = this.features.heating;
+    const hasCool = this.features.cooling;
+    const needsHeat = value === Thermostat3.ControlSequenceOfOperation.HeatingOnly || value === Thermostat3.ControlSequenceOfOperation.HeatingWithReheat;
+    const needsCool = value === Thermostat3.ControlSequenceOfOperation.CoolingOnly || value === Thermostat3.ControlSequenceOfOperation.CoolingWithReheat;
+    const needsBoth = value === Thermostat3.ControlSequenceOfOperation.CoolingAndHeating || value === Thermostat3.ControlSequenceOfOperation.CoolingAndHeatingWithReheat;
+    if (needsHeat && !hasHeat) {
+      return Thermostat3.ControlSequenceOfOperation.CoolingOnly;
+    }
+    if (needsCool && !hasCool) {
+      return Thermostat3.ControlSequenceOfOperation.HeatingOnly;
+    }
+    if (needsBoth && !hasHeat) {
+      return Thermostat3.ControlSequenceOfOperation.CoolingOnly;
+    }
+    if (needsBoth && !hasCool) {
+      return Thermostat3.ControlSequenceOfOperation.HeatingOnly;
+    }
+    return value;
+  }
   clampSetpoint(value, min, max, type) {
     const effectiveMin = min ?? 0;
     const effectiveMax = max ?? 5e3;
@@ -170551,7 +170804,7 @@ var config4 = {
       (m) => m === ClimateHvacMode.cool || m === ClimateHvacMode.heat_cool
     );
     const hasHeating = modes.some(
-      (m) => m === ClimateHvacMode.heat || m === ClimateHvacMode.heat_cool || m === ClimateHvacMode.auto
+      (m) => m === ClimateHvacMode.heat || m === ClimateHvacMode.heat_cool
     );
     if (hasCooling && hasHeating) {
       const hasAutoMode = modes.includes(ClimateHvacMode.heat_cool) && (modes.includes(ClimateHvacMode.heat) || modes.includes(ClimateHvacMode.cool));
@@ -170611,25 +170864,6 @@ function ClimateThermostatServer(initialState = {}, features2) {
 }
 
 // src/matter/endpoints/legacy/climate/index.ts
-var ClimatePowerSourceServer = PowerSourceServer2({
-  getBatteryPercent: (entity, agent) => {
-    const homeAssistant = agent.get(HomeAssistantEntityBehavior);
-    const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
-    if (batteryEntity) {
-      const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getBatteryPercent(batteryEntity);
-      if (battery != null) {
-        return Math.max(0, Math.min(100, battery));
-      }
-    }
-    const attrs = entity.attributes;
-    const level = attrs.battery_level ?? attrs.battery;
-    if (level == null || Number.isNaN(Number(level))) {
-      return null;
-    }
-    return Number(level);
-  }
-});
 var ClimateDeviceType = (supportsOnOff, supportsHumidity, supportsFanMode, hasBattery, features2, initialState = {}) => {
   const additionalClusters = [];
   if (supportsOnOff) {
@@ -170639,7 +170873,7 @@ var ClimateDeviceType = (supportsOnOff, supportsHumidity, supportsFanMode, hasBa
     additionalClusters.push(ClimateHumidityMeasurementServer);
   }
   if (hasBattery) {
-    additionalClusters.push(ClimatePowerSourceServer);
+    additionalClusters.push(DefaultPowerSourceServer);
   }
   const thermostatServer = ClimateThermostatServer(initialState, features2);
   if (supportsFanMode) {
@@ -170859,6 +171093,22 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     );
     const currentTilt100ths = currentTilt != null ? currentTilt * 100 : null;
     const isStopped = movementStatus === MovementStatus.Stopped;
+    const inferTarget = (current100ths, existing100ths) => {
+      if (isStopped) return current100ths;
+      if (movementStatus === MovementStatus.Opening) {
+        if (existing100ths != null && current100ths != null && existing100ths < current100ths) {
+          return existing100ths;
+        }
+        return 0;
+      }
+      if (movementStatus === MovementStatus.Closing) {
+        if (existing100ths != null && current100ths != null && existing100ths > current100ths) {
+          return existing100ths;
+        }
+        return 1e4;
+      }
+      return existing100ths ?? current100ths;
+    };
     logger175.debug(
       `Cover update for ${entity.entity_id}: state=${state.state}, lift=${currentLift}%, tilt=${currentTilt}%, movement=${MovementStatus[movementStatus]}`
     );
@@ -170885,14 +171135,18 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
         ...this.features.positionAwareLift ? {
           currentPositionLiftPercentage: currentLift,
           currentPositionLiftPercent100ths: currentLift100ths,
-          // When stopped, target MUST equal current for controllers to show correct state
-          targetPositionLiftPercent100ths: isStopped ? currentLift100ths : this.state.targetPositionLiftPercent100ths ?? currentLift100ths
+          targetPositionLiftPercent100ths: inferTarget(
+            currentLift100ths,
+            this.state.targetPositionLiftPercent100ths
+          )
         } : {},
         ...this.features.positionAwareTilt ? {
           currentPositionTiltPercentage: currentTilt,
           currentPositionTiltPercent100ths: currentTilt100ths,
-          // When stopped, target MUST equal current for controllers to show correct state
-          targetPositionTiltPercent100ths: isStopped ? currentTilt100ths : this.state.targetPositionTiltPercent100ths ?? currentTilt100ths
+          targetPositionTiltPercent100ths: inferTarget(
+            currentTilt100ths,
+            this.state.targetPositionTiltPercent100ths
+          )
         } : {}
       }
     );
@@ -171114,6 +171368,9 @@ var adjustPositionForWriting2 = (position, agent) => {
   return adjustPositionForWriting(position, featureFlags, matterSem);
 };
 var shouldSwapOpenClose = (agent) => {
+  const homeAssistant = agent.get(HomeAssistantEntityBehavior);
+  const entitySwap = homeAssistant.state.mapping?.coverSwapOpenClose;
+  if (entitySwap !== void 0) return entitySwap;
   const { featureFlags } = agent.env.get(BridgeDataProvider);
   return featureFlags?.coverSwapOpenClose === true;
 };
@@ -171210,25 +171467,6 @@ var CoverWindowCoveringServer = WindowCoveringServer2(config5);
 
 // src/matter/endpoints/legacy/cover/index.ts
 var logger177 = Logger.get("CoverDevice");
-var CoverPowerSourceServer = PowerSourceServer2({
-  getBatteryPercent: (entity, agent) => {
-    const homeAssistant = agent.get(HomeAssistantEntityBehavior);
-    const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
-    if (batteryEntity) {
-      const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getBatteryPercent(batteryEntity);
-      if (battery != null) {
-        return Math.max(0, Math.min(100, battery));
-      }
-    }
-    const attrs = entity.attributes;
-    const level = attrs.battery_level ?? attrs.battery;
-    if (level == null || Number.isNaN(Number(level))) {
-      return null;
-    }
-    return Number(level);
-  }
-});
 var CoverDeviceType = (supportedFeatures, hasBattery, entityId) => {
   const features2 = /* @__PURE__ */ new Set();
   if (testBit(supportedFeatures, CoverSupportedFeatures.support_open)) {
@@ -171263,7 +171501,10 @@ var CoverDeviceType = (supportedFeatures, hasBattery, entityId) => {
     CoverWindowCoveringServer.with(...features2)
   ];
   if (hasBattery) {
-    return WindowCoveringDevice.with(...baseBehaviors, CoverPowerSourceServer);
+    return WindowCoveringDevice.with(
+      ...baseBehaviors,
+      DefaultPowerSourceServer
+    );
   }
   return WindowCoveringDevice.with(...baseBehaviors);
 };
@@ -171384,25 +171625,6 @@ function EventDevice(homeAssistantEntity) {
 // src/matter/endpoints/legacy/fan/index.ts
 init_dist();
 init_home_assistant_entity_behavior();
-var FanPowerSourceServer = PowerSourceServer2({
-  getBatteryPercent: (entity, agent) => {
-    const homeAssistant = agent.get(HomeAssistantEntityBehavior);
-    const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
-    if (batteryEntity) {
-      const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getBatteryPercent(batteryEntity);
-      if (battery != null) {
-        return Math.max(0, Math.min(100, battery));
-      }
-    }
-    const attrs = entity.attributes;
-    const level = attrs.battery_level ?? attrs.battery;
-    if (level == null || Number.isNaN(Number(level))) {
-      return null;
-    }
-    return Number(level);
-  }
-});
 function FanDevice2(homeAssistantEntity) {
   const attributes7 = homeAssistantEntity.entity.state.attributes;
   const supportedFeatures = attributes7.supported_features ?? 0;
@@ -171422,7 +171644,7 @@ function FanDevice2(homeAssistantEntity) {
       BasicInformationServer2,
       HomeAssistantEntityBehavior,
       FanOnOffServer,
-      FanPowerSourceServer
+      DefaultPowerSourceServer
     ) : OnOffPlugInUnitDevice.with(
       IdentifyServer2,
       BasicInformationServer2,
@@ -171457,7 +171679,7 @@ function FanDevice2(homeAssistantEntity) {
     HomeAssistantEntityBehavior,
     FanOnOffServer,
     FanFanControlServer.with(...features2),
-    FanPowerSourceServer
+    DefaultPowerSourceServer
   ) : FanDevice.with(
     IdentifyServer2,
     BasicInformationServer2,
@@ -171982,25 +172204,6 @@ var ColorTemperatureLightType = ColorTemperatureLightDevice.with(
 
 // src/matter/endpoints/legacy/light/devices/dimmable-light.ts
 init_home_assistant_entity_behavior();
-var LightPowerSourceServer = PowerSourceServer2({
-  getBatteryPercent: (entity, agent) => {
-    const homeAssistant = agent.get(HomeAssistantEntityBehavior);
-    const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
-    if (batteryEntity) {
-      const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getBatteryPercent(batteryEntity);
-      if (battery != null) {
-        return Math.max(0, Math.min(100, battery));
-      }
-    }
-    const attrs = entity.attributes;
-    const level = attrs.battery_level ?? attrs.battery;
-    if (level == null || Number.isNaN(Number(level))) {
-      return null;
-    }
-    return Number(level);
-  }
-});
 var DimmableLightType = DimmableLightDevice.with(
   IdentifyServer2,
   BasicInformationServer2,
@@ -172014,30 +172217,11 @@ var DimmableLightWithBatteryType = DimmableLightDevice.with(
   HomeAssistantEntityBehavior,
   LightOnOffServer,
   LightLevelControlServer,
-  LightPowerSourceServer
+  DefaultPowerSourceServer
 );
 
 // src/matter/endpoints/legacy/light/devices/extended-color-light.ts
 init_home_assistant_entity_behavior();
-var LightPowerSourceServer2 = PowerSourceServer2({
-  getBatteryPercent: (entity, agent) => {
-    const homeAssistant = agent.get(HomeAssistantEntityBehavior);
-    const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
-    if (batteryEntity) {
-      const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getBatteryPercent(batteryEntity);
-      if (battery != null) {
-        return Math.max(0, Math.min(100, battery));
-      }
-    }
-    const attrs = entity.attributes;
-    const level = attrs.battery_level ?? attrs.battery;
-    if (level == null || Number.isNaN(Number(level))) {
-      return null;
-    }
-    return Number(level);
-  }
-});
 var ExtendedColorLightType = (supportsColorControl, supportsTemperature, hasBattery = false) => {
   const features2 = /* @__PURE__ */ new Set();
   if (supportsColorControl) {
@@ -172054,7 +172238,7 @@ var ExtendedColorLightType = (supportsColorControl, supportsTemperature, hasBatt
       LightOnOffServer,
       LightLevelControlServer,
       LightColorControlServer.with(...features2),
-      LightPowerSourceServer2
+      DefaultPowerSourceServer
     );
   }
   return ExtendedColorLightDevice.with(
@@ -172069,25 +172253,6 @@ var ExtendedColorLightType = (supportsColorControl, supportsTemperature, hasBatt
 
 // src/matter/endpoints/legacy/light/devices/on-off-light-device.ts
 init_home_assistant_entity_behavior();
-var LightPowerSourceServer3 = PowerSourceServer2({
-  getBatteryPercent: (entity, agent) => {
-    const homeAssistant = agent.get(HomeAssistantEntityBehavior);
-    const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
-    if (batteryEntity) {
-      const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getBatteryPercent(batteryEntity);
-      if (battery != null) {
-        return Math.max(0, Math.min(100, battery));
-      }
-    }
-    const attrs = entity.attributes;
-    const level = attrs.battery_level ?? attrs.battery;
-    if (level == null || Number.isNaN(Number(level))) {
-      return null;
-    }
-    return Number(level);
-  }
-});
 var OnOffLightType = OnOffLightDevice.with(
   IdentifyServer2,
   BasicInformationServer2,
@@ -172099,7 +172264,7 @@ var OnOffLightWithBatteryType = OnOffLightDevice.with(
   BasicInformationServer2,
   HomeAssistantEntityBehavior,
   LightOnOffServer,
-  LightPowerSourceServer3
+  DefaultPowerSourceServer
 );
 
 // src/matter/endpoints/legacy/light/index.ts
@@ -172790,25 +172955,6 @@ var lockServerConfig = {
   unlock: () => ({ action: "lock.unlock" }),
   unlatch: () => ({ action: "lock.open" })
 };
-var LockPowerSourceServer = PowerSourceServer2({
-  getBatteryPercent: (entity, agent) => {
-    const homeAssistant = agent.get(HomeAssistantEntityBehavior);
-    const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
-    if (batteryEntity) {
-      const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getBatteryPercent(batteryEntity);
-      if (battery != null) {
-        return Math.max(0, Math.min(100, battery));
-      }
-    }
-    const attrs = entity.attributes;
-    const level = attrs.battery_level ?? attrs.battery;
-    if (level == null || Number.isNaN(Number(level))) {
-      return null;
-    }
-    return Number(level);
-  }
-});
 var LockDeviceType = DoorLockDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
@@ -172820,7 +172966,7 @@ var LockWithBatteryDeviceType = DoorLockDevice.with(
   IdentifyServer2,
   HomeAssistantEntityBehavior,
   LockServerWithPin(lockServerConfig),
-  LockPowerSourceServer
+  DefaultPowerSourceServer
 );
 var LockWithUnlatchDeviceType = DoorLockDevice.with(
   BasicInformationServer2,
@@ -172833,7 +172979,7 @@ var LockWithUnlatchAndBatteryDeviceType = DoorLockDevice.with(
   IdentifyServer2,
   HomeAssistantEntityBehavior,
   LockServerWithPinAndUnbolt(lockServerConfig),
-  LockPowerSourceServer
+  DefaultPowerSourceServer
 );
 function LockDevice(homeAssistantEntity) {
   const attrs = homeAssistantEntity.entity.state.attributes;
@@ -173409,8 +173555,20 @@ var PumpType = PumpDevice.with(
   PumpOnOffServer,
   PumpConfigurationAndControlServer2
 );
+var PumpWithBatteryType = PumpDevice.with(
+  IdentifyServer2,
+  BasicInformationServer2,
+  HomeAssistantEntityBehavior,
+  PumpOnOffServer,
+  PumpConfigurationAndControlServer2,
+  DefaultPowerSourceServer
+);
 function PumpEndpoint(homeAssistantEntity) {
-  return PumpType.set({ homeAssistantEntity });
+  const attrs = homeAssistantEntity.entity.state.attributes;
+  const hasBatteryAttr = attrs.battery_level != null || attrs.battery != null;
+  const hasBatteryEntity = !!homeAssistantEntity.mapping?.batteryEntity;
+  const device = hasBatteryAttr || hasBatteryEntity ? PumpWithBatteryType : PumpType;
+  return device.set({ homeAssistantEntity });
 }
 
 // src/matter/endpoints/legacy/remote/index.ts
@@ -174931,7 +175089,7 @@ var Pm25SensorType = AirQualitySensorDevice.with(
 
 // src/matter/endpoints/legacy/sensor/devices/temperature-humidity-sensor.ts
 init_home_assistant_entity_behavior();
-var temperatureConfig2 = {
+var temperatureConfig3 = {
   getValue(entity, agent) {
     const fallbackUnit = agent.env.get(HomeAssistantConfig).unitSystem.temperature;
     const state = entity.state;
@@ -174946,7 +175104,7 @@ var temperatureConfig2 = {
     );
   }
 };
-var humidityConfig3 = {
+var humidityConfig4 = {
   getValue(_entity, agent) {
     const homeAssistant = agent.get(HomeAssistantEntityBehavior);
     const humidityEntity = homeAssistant.state.mapping?.humidityEntity;
@@ -174996,38 +175154,38 @@ var TemperatureHumiditySensorType = TemperatureSensorDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
   HomeAssistantEntityBehavior,
-  TemperatureMeasurementServer2(temperatureConfig2),
-  HumidityMeasurementServer(humidityConfig3)
+  TemperatureMeasurementServer2(temperatureConfig3),
+  HumidityMeasurementServer(humidityConfig4)
 );
 var TemperatureHumiditySensorWithBatteryType = TemperatureSensorDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
   HomeAssistantEntityBehavior,
-  TemperatureMeasurementServer2(temperatureConfig2),
-  HumidityMeasurementServer(humidityConfig3),
+  TemperatureMeasurementServer2(temperatureConfig3),
+  HumidityMeasurementServer(humidityConfig4),
   PowerSourceServer2(batteryConfig4)
 );
 var TemperatureHumidityPressureSensorType = TemperatureSensorDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
   HomeAssistantEntityBehavior,
-  TemperatureMeasurementServer2(temperatureConfig2),
-  HumidityMeasurementServer(humidityConfig3),
+  TemperatureMeasurementServer2(temperatureConfig3),
+  HumidityMeasurementServer(humidityConfig4),
   PressureMeasurementServer2(pressureConfig2)
 );
 var TemperatureHumidityPressureSensorWithBatteryType = TemperatureSensorDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
   HomeAssistantEntityBehavior,
-  TemperatureMeasurementServer2(temperatureConfig2),
-  HumidityMeasurementServer(humidityConfig3),
+  TemperatureMeasurementServer2(temperatureConfig3),
+  HumidityMeasurementServer(humidityConfig4),
   PressureMeasurementServer2(pressureConfig2),
   PowerSourceServer2(batteryConfig4)
 );
 
 // src/matter/endpoints/legacy/sensor/devices/temperature-pressure-sensor.ts
 init_home_assistant_entity_behavior();
-var temperatureConfig3 = {
+var temperatureConfig4 = {
   getValue(entity, agent) {
     const fallbackUnit = agent.env.get(HomeAssistantConfig).unitSystem.temperature;
     const state = entity.state;
@@ -175078,14 +175236,14 @@ var TemperaturePressureSensorType = TemperatureSensorDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
   HomeAssistantEntityBehavior,
-  TemperatureMeasurementServer2(temperatureConfig3),
+  TemperatureMeasurementServer2(temperatureConfig4),
   PressureMeasurementServer2(pressureConfig3)
 );
 var TemperaturePressureSensorWithBatteryType = TemperatureSensorDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
   HomeAssistantEntityBehavior,
-  TemperatureMeasurementServer2(temperatureConfig3),
+  TemperatureMeasurementServer2(temperatureConfig4),
   PressureMeasurementServer2(pressureConfig3),
   PowerSourceServer2(batteryConfig5)
 );
@@ -175215,25 +175373,7 @@ var SwitchWithBatteryEndpointType = OnOffPlugInUnitDevice.with(
   IdentifyServer2,
   HomeAssistantEntityBehavior,
   SwitchOnOffServer,
-  PowerSourceServer2({
-    getBatteryPercent: (entity, agent) => {
-      const homeAssistant = agent.get(HomeAssistantEntityBehavior);
-      const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
-      if (batteryEntity) {
-        const stateProvider = agent.env.get(EntityStateProvider);
-        const battery = stateProvider.getBatteryPercent(batteryEntity);
-        if (battery != null) {
-          return Math.max(0, Math.min(100, battery));
-        }
-      }
-      const attrs = entity.attributes;
-      const level = attrs.battery_level ?? attrs.battery;
-      if (level == null || Number.isNaN(Number(level))) {
-        return null;
-      }
-      return Number(level);
-    }
-  })
+  DefaultPowerSourceServer
 );
 function SwitchDevice(homeAssistantEntity) {
   const attrs = homeAssistantEntity.entity.state.attributes;
@@ -177430,8 +177570,19 @@ var ValveEndpointType = WaterValveDevice.with(
   HomeAssistantEntityBehavior,
   ValveServer
 );
+var ValveWithBatteryEndpointType = WaterValveDevice.with(
+  BasicInformationServer2,
+  IdentifyServer2,
+  HomeAssistantEntityBehavior,
+  ValveServer,
+  DefaultPowerSourceServer
+);
 function ValveDevice(homeAssistantEntity) {
-  return ValveEndpointType.set({ homeAssistantEntity });
+  const attrs = homeAssistantEntity.entity.state.attributes;
+  const hasBatteryAttr = attrs.battery_level != null || attrs.battery != null;
+  const hasBatteryEntity = !!homeAssistantEntity.mapping?.batteryEntity;
+  const device = hasBatteryAttr || hasBatteryEntity ? ValveWithBatteryEndpointType : ValveEndpointType;
+  return device.set({ homeAssistantEntity });
 }
 
 // src/matter/endpoints/legacy/water-heater/index.ts
@@ -177552,6 +177703,7 @@ function WaterHeaterDevice(homeAssistantEntity) {
 }
 
 // src/matter/endpoints/legacy/create-legacy-endpoint-type.ts
+var legacyLogger = Logger.get("LegacyEndpointType");
 function createLegacyEndpointType(entity, mapping, areaName, options) {
   const domain = entity.entity_id.split(".")[0];
   const customName = mapping?.customName;
@@ -177571,10 +177723,20 @@ function createLegacyEndpointType(entity, mapping, areaName, options) {
       );
     } else {
       const factory = deviceCtrs[domain];
-      if (!factory) {
+      if (factory) {
+        type = factory({ entity, customName, mapping });
+      } else if (options?.pluginDomainMappings?.has(domain)) {
+        const mappedType = options.pluginDomainMappings.get(domain);
+        const mappedFactory = matterDeviceTypeFactories[mappedType];
+        if (mappedFactory) {
+          legacyLogger.info(
+            `Using plugin domain mapping for "${domain}" \u2192 "${mappedType}"`
+          );
+          type = mappedFactory({ entity, customName, mapping });
+        }
+      } else {
         return void 0;
       }
-      type = factory({ entity, customName, mapping });
     }
   }
   if (!type) {
@@ -177732,10 +177894,192 @@ 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) {
+  static async create(registry2, entityId, mapping, pluginDomainMappings) {
     const deviceRegistry = registry2.deviceOf(entityId);
     let state = registry2.initialState(entityId);
     const entity = registry2.entity(entityId);
@@ -177743,25 +178087,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;
@@ -177781,7 +178125,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
               humidityEntity: humidityEntityId
             };
             registry2.markHumidityEntityUsed(humidityEntityId);
-            logger198.debug(
+            logger199.debug(
               `Auto-assigned humidity ${humidityEntityId} to ${entityId}`
             );
           }
@@ -177800,7 +178144,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
               pressureEntity: pressureEntityId
             };
             registry2.markPressureEntityUsed(pressureEntityId);
-            logger198.debug(
+            logger199.debug(
               `Auto-assigned pressure ${pressureEntityId} to ${entityId}`
             );
           }
@@ -177818,7 +178162,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             batteryEntity: batteryEntityId
           };
           registry2.markBatteryEntityUsed(batteryEntityId);
-          logger198.debug(
+          logger199.debug(
             `Auto-assigned battery ${batteryEntityId} to ${entityId}`
           );
         }
@@ -177836,7 +178180,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}`);
           }
         }
       }
@@ -177853,7 +178197,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
               energyEntity: energyEntityId
             };
             registry2.markEnergyEntityUsed(energyEntityId);
-            logger198.debug(
+            logger199.debug(
               `Auto-assigned energy ${energyEntityId} to ${entityId}`
             );
           }
@@ -177869,7 +178213,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}`
           );
         }
@@ -177879,7 +178223,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}`
           );
         }
@@ -177889,7 +178233,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}`
           );
         }
@@ -177904,7 +178248,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}`
           );
         }
@@ -177925,7 +178269,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
                 rooms: roomsObj
               }
             };
-            logger198.debug(
+            logger199.debug(
               `Auto-detected ${valetudoRooms.length} Valetudo segments for ${entityId}`
             );
           } else {
@@ -177942,7 +178286,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
                   rooms: roomsObj
                 }
               };
-              logger198.debug(
+              logger199.debug(
                 `Auto-detected ${roborockRooms.length} Roborock rooms for ${entityId}`
               );
             }
@@ -177950,6 +178294,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)) {
@@ -177966,13 +178327,9 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
         return composed;
       }
       const resolvedMatterType = mapping?.matterDeviceType ?? (entityId.startsWith("fan.") ? "fan" : void 0);
-      if (resolvedMatterType === "air_purifier" && entity.device_id) {
-        const temperatureEntityId = registry2.findTemperatureEntityForDevice(
-          entity.device_id
-        );
-        const humidityEntityId = registry2.findHumidityEntityForDevice(
-          entity.device_id
-        );
+      if (resolvedMatterType === "air_purifier") {
+        const temperatureEntityId = effectiveMapping?.temperatureEntity || (entity.device_id ? registry2.findTemperatureEntityForDevice(entity.device_id) : void 0);
+        const humidityEntityId = effectiveMapping?.humidityEntity || (entity.device_id ? registry2.findHumidityEntityForDevice(entity.device_id) : void 0);
         if (temperatureEntityId || humidityEntityId) {
           const composedAreaName = registry2.getAreaName(entityId);
           const composed = await ComposedAirPurifierEndpoint.create({
@@ -178017,7 +178374,8 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
     const areaName = registry2.getAreaName(entityId);
     const type = createLegacyEndpointType(payload, effectiveMapping, areaName, {
       vacuumOnOff: registry2.isVacuumOnOffEnabled(),
-      cleaningModeOptions
+      cleaningModeOptions,
+      pluginDomainMappings
     });
     if (!type) {
       return;
@@ -178028,7 +178386,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;
@@ -178045,11 +178403,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;
@@ -178093,7 +178451,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) {
@@ -178119,7 +178477,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 };
@@ -178189,7 +178547,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();
@@ -178254,13 +178612,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;
@@ -178271,14 +178629,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;
     }
   }
@@ -178521,6 +178879,16 @@ var BridgeEndpointManager = class extends Service {
       }
     }
   }
+  getPluginDomainMappings() {
+    if (!this.pluginManager) return void 0;
+    const mappings = this.pluginManager.getDomainMappings();
+    if (mappings.size === 0) return void 0;
+    const result = /* @__PURE__ */ new Map();
+    for (const [domain, mapping] of mappings) {
+      result.set(domain, mapping.matterDeviceType);
+    }
+    return result;
+  }
   getEntityMapping(entityId) {
     return this.mappingStorage.getMapping(this.bridgeId, entityId);
   }
@@ -178577,16 +178945,20 @@ 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);
-        if (!ent?.device_id) continue;
-        const tempId = this.registry.findTemperatureEntityForDevice(
-          ent.device_id
-        );
-        const humId = this.registry.findHumidityEntityForDevice(ent.device_id);
+        const tempId = m?.temperatureEntity || (ent?.device_id ? this.registry.findTemperatureEntityForDevice(ent.device_id) : void 0);
+        const humId = m?.humidityEntity || (ent?.device_id ? this.registry.findHumidityEntityForDevice(ent.device_id) : void 0);
         if (tempId) this.registry.markComposedSubEntityUsed(tempId);
         if (humId) this.registry.markComposedSubEntityUsed(humId);
       }
@@ -178657,6 +179029,12 @@ var BridgeEndpointManager = class extends Service {
         this.log.debug(`Skipping disabled entity: ${entityId}`);
         continue;
       }
+      if (this.registry.isAutoComposedDevicesEnabled() && this.registry.isComposedSubEntityUsed(entityId)) {
+        this.log.debug(
+          `Skipping ${entityId} \u2014 already part of a composed device`
+        );
+        continue;
+      }
       if (entityId.length > MAX_ENTITY_ID_LENGTH) {
         const reason = `Entity ID too long (${entityId.length} chars, max ${MAX_ENTITY_ID_LENGTH}). This would cause filesystem errors.`;
         this.log.warn(`Skipping entity: ${entityId}. Reason: ${reason}`);
@@ -178666,10 +179044,12 @@ var BridgeEndpointManager = class extends Service {
       let endpoint = existingEndpoints.find((e) => e.entityId === entityId);
       if (!endpoint) {
         try {
+          const domainMappings = this.getPluginDomainMappings();
           endpoint = await LegacyEndpoint.create(
             this.registry,
             entityId,
-            mapping
+            mapping,
+            domainMappings
           );
         } catch (e) {
           const reason = this.extractErrorReason(e);
@@ -179129,8 +179509,39 @@ var BridgeRegistry = class _BridgeRegistry {
         );
         return [];
       }
+      let validSegmentIds;
+      try {
+        const segmentsResponse = await this.client.connection.sendMessagePromise({
+          type: "vacuum/get_segments",
+          entity_id: entityId
+        });
+        if (Array.isArray(segmentsResponse)) {
+          validSegmentIds = new Set(segmentsResponse.map((s) => s.id));
+          _BridgeRegistry.cleanAreaLogger.debug(
+            `${entityId}: Current vacuum segments: ${[...validSegmentIds].join(", ")}`
+          );
+        }
+      } catch {
+        _BridgeRegistry.cleanAreaLogger.debug(
+          `${entityId}: vacuum/get_segments not available, skipping stale entry detection`
+        );
+      }
       const rooms = [];
       for (const haAreaId of Object.keys(areaMapping)) {
+        const segments = areaMapping[haAreaId];
+        if (!segments || segments.length === 0) {
+          _BridgeRegistry.cleanAreaLogger.debug(
+            `${entityId}: Skipping HA area ${haAreaId} \u2014 no segments mapped`
+          );
+          continue;
+        }
+        if (validSegmentIds && !segments.some((sid) => validSegmentIds.has(sid))) {
+          const areaName2 = this.registry.areas.get(haAreaId) ?? haAreaId;
+          _BridgeRegistry.cleanAreaLogger.info(
+            `${entityId}: Skipping stale HA area "${areaName2}" (${haAreaId}) \u2014 segments [${segments.join(", ")}] no longer exist on vacuum`
+          );
+          continue;
+        }
         const areaName = this.registry.areas.get(haAreaId) ?? haAreaId;
         rooms.push({
           areaId: hashAreaId(haAreaId),
@@ -179396,12 +179807,13 @@ function hashAreaId(areaId) {
 // src/services/bridges/server-mode-bridge.ts
 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 = {
@@ -179412,6 +179824,8 @@ var ServerModeBridge = class {
   // broadcast updates via WebSocket so the frontend sees every transition.
   onStatusChange;
   autoForceSyncTimer = null;
+  deadSessionTimer = null;
+  staleSessionTimers = /* @__PURE__ */ new Map();
   warmStartTimer = null;
   // Tracks the last synced state JSON per entity to avoid pushing unchanged states.
   lastSyncedState;
@@ -179593,6 +180007,33 @@ ${e?.toString()}`);
           this.log.warn(
             `All subscriptions lost \u2014 ${sessions.length} session(s) still active, waiting for controller to re-subscribe`
           );
+          if (!this.deadSessionTimer) {
+            this.deadSessionTimer = setTimeout(() => {
+              this.deadSessionTimer = null;
+              this.closeDeadSessions();
+            }, DEAD_SESSION_TIMEOUT_MS2);
+            this.log.info(
+              `Scheduled dead session cleanup in ${DEAD_SESSION_TIMEOUT_MS2 / 1e3}s`
+            );
+          }
+        } else if (totalSubs > 0 && this.deadSessionTimer) {
+          clearTimeout(this.deadSessionTimer);
+          this.deadSessionTimer = null;
+          this.log.info(
+            "Subscriptions recovered, canceled dead session cleanup"
+          );
+        }
+        if (session.subscriptions.size === 0 && !this.staleSessionTimers.has(session.id)) {
+          this.staleSessionTimers.set(
+            session.id,
+            setTimeout(() => {
+              this.staleSessionTimers.delete(session.id);
+              this.closeStaleSession(session.id);
+            }, DEAD_SESSION_TIMEOUT_MS2)
+          );
+        } else if (session.subscriptions.size > 0 && this.staleSessionTimers.has(session.id)) {
+          clearTimeout(this.staleSessionTimers.get(session.id));
+          this.staleSessionTimers.delete(session.id);
         }
       };
       sessionManager.subscriptionsChanged.on(this.sessionDiagHandler);
@@ -179621,6 +180062,62 @@ ${e?.toString()}`);
     } catch {
     }
   }
+  closeStaleSession(sessionId) {
+    try {
+      const sessionManager = this.server.env.get(SessionManager);
+      for (const s of [...sessionManager.sessions]) {
+        if (s.id === sessionId && !s.isClosing && s.subscriptions.size === 0) {
+          this.log.warn(
+            `Closing stale session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS2 / 1e3}s)`
+          );
+          s.initiateClose().catch(() => {
+            return s.initiateForceClose();
+          }).catch(() => {
+          }).finally(() => this.triggerMdnsReAnnounce());
+          break;
+        }
+      }
+    } catch {
+    }
+  }
+  closeDeadSessions() {
+    try {
+      const sessionManager = this.server.env.get(SessionManager);
+      const sessions = [...sessionManager.sessions];
+      const closes = [];
+      for (const s of sessions) {
+        if (!s.isClosing && s.subscriptions.size === 0) {
+          this.log.warn(
+            `Closing dead session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS2 / 1e3}s)`
+          );
+          closes.push(
+            s.initiateClose().catch(() => {
+              return s.initiateForceClose();
+            })
+          );
+        }
+      }
+      if (closes.length > 0) {
+        Promise.allSettled(closes).then(() => this.triggerMdnsReAnnounce());
+      }
+    } catch {
+    }
+  }
+  /**
+   * Force a fresh mDNS operational advertisement after session cleanup.
+   * matter.js DeviceAdvertiser only re-announces when a subscription is
+   * canceled BY THE PEER. When the server cancels after 3 delivery
+   * timeouts, no re-announcement happens and the controller may not
+   * realize it should reconnect (#266).
+   */
+  triggerMdnsReAnnounce() {
+    try {
+      const advertiser = this.server.env.get(DeviceAdvertiser);
+      advertiser.restartAdvertisement();
+      this.log.info("Triggered mDNS re-announcement after session cleanup");
+    } catch {
+    }
+  }
   unwireSessionDiagnostics() {
     try {
       const sessionManager = this.server.env.get(SessionManager);
@@ -179638,6 +180135,14 @@ ${e?.toString()}`);
     this.sessionDiagHandler = void 0;
     this.sessionAddedHandler = void 0;
     this.sessionDeletedHandler = void 0;
+    if (this.deadSessionTimer) {
+      clearTimeout(this.deadSessionTimer);
+      this.deadSessionTimer = null;
+    }
+    for (const timer of this.staleSessionTimers.values()) {
+      clearTimeout(timer);
+    }
+    this.staleSessionTimers.clear();
   }
   stopAutoForceSync() {
     if (this.autoForceSyncTimer) {
@@ -179753,7 +180258,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();
@@ -179817,7 +180322,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);
@@ -179827,7 +180332,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) {
@@ -179842,15 +180347,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}`
             );
           }
@@ -179865,7 +180370,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
           entityId: effectiveMapping?.entityId ?? entityId,
           cleaningModeEntity: vacuumEntities.cleaningModeEntity
         };
-        logger201.info(
+        logger202.info(
           `${entityId}: Auto-assigned cleaningMode ${vacuumEntities.cleaningModeEntity}`
         );
       }
@@ -179875,7 +180380,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
           entityId: effectiveMapping?.entityId ?? entityId,
           suctionLevelEntity: vacuumEntities.suctionLevelEntity
         };
-        logger201.info(
+        logger202.info(
           `${entityId}: Auto-assigned suctionLevel ${vacuumEntities.suctionLevelEntity}`
         );
       }
@@ -179885,7 +180390,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
           entityId: effectiveMapping?.entityId ?? entityId,
           mopIntensityEntity: vacuumEntities.mopIntensityEntity
         };
-        logger201.info(
+        logger202.info(
           `${entityId}: Auto-assigned mopIntensity ${vacuumEntities.mopIntensityEntity}`
         );
       }
@@ -179900,7 +180405,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`
         );
       }
@@ -179921,7 +180426,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
               rooms: roomsObj
             }
           };
-          logger201.info(
+          logger202.info(
             `${entityId}: Auto-detected ${valetudoRooms.length} Valetudo segments`
           );
         } else {
@@ -179938,14 +180443,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,
@@ -179995,7 +180500,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();
@@ -180009,11 +180514,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;
@@ -180427,10 +180932,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;
@@ -180443,8 +180948,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(
@@ -180461,7 +180966,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,
@@ -180469,7 +180974,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,
@@ -180505,7 +181010,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),
@@ -180531,7 +181036,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;
@@ -180545,11 +181050,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."
     );
   }
@@ -180587,8 +181092,7 @@ process.on("unhandledRejection", (reason) => {
   if (shouldSuppressError(reason)) {
     return;
   }
-  console.error("Unhandled rejection:", reason);
-  process.exit(1);
+  console.error("Unhandled rejection (process continuing):", reason);
 });
 function registerFinalErrorHandlers() {
   process.removeAllListeners("uncaughtException");
@@ -180614,8 +181118,7 @@ function registerFinalErrorHandlers() {
       console.warn("Suppressed Matter.js internal error:", reason);
       return;
     }
-    console.error("Unhandled rejection:", reason);
-    process.exit(1);
+    console.error("Unhandled rejection (process continuing):", reason);
   });
 }
 async function startHandler(startOptions, webUiDist) {