@riddix/hamh 2.0.54 → 2.0.55

package/dist/backend/cli.js

@@ -1767,8 +1767,8 @@ var init_Cancelable = __esm({
         };
         return result;
       }
-      static set logger(logger253) {
-        this.#logger = logger253;
+      static set logger(logger255) {
+        this.#logger = logger255;
       }
       static get logger() {
         return this.#logger;
@@ -3475,13 +3475,13 @@ var init_Logger = __esm({
        *
        * @deprecated use {@link destinations}
        */
-      static addLogger(identifier, logger253, options) {
+      static addLogger(identifier, logger255, options) {
         if (identifier in this.destinations) {
           throw new ImplementationError(`Logger "${identifier}" already exists`);
         }
         const dest = LogDestination({ name: identifier });
         const legacy = adaptDestinationToLegacy(dest);
-        legacy.log = logger253;
+        legacy.log = logger255;
         if (options?.defaultLogLevel !== void 0) {
           legacy.defaultLogLevel = options.defaultLogLevel;
         }
@@ -5687,8 +5687,8 @@ var init_Construction = __esm({
           }
         }
         #unhandledError(...args) {
-          const logger253 = Logger.get(this.#subject.constructor.name);
-          logger253.error(...args);
+          const logger255 = Logger.get(this.#subject.constructor.name);
+          logger255.error(...args);
         }
         #createErrorHandler(name) {
           return (e) => {
@@ -64126,8 +64126,8 @@ var init_NodeSession = __esm({
         return session?.type === SessionType.Unicast;
       }
       NodeSession2.is = is;
-      function logNew(logger253, operation, session, messenger, fabric, peerNodeId) {
-        logger253.info(
+      function logNew(logger255, operation, session, messenger, fabric, peerNodeId) {
+        logger255.info(
           session.via,
           `${operation} session with`,
           Diagnostic.strong(PeerAddress({ fabricIndex: fabric.fabricIndex, nodeId: peerNodeId }).toString()),
@@ -118041,11 +118041,11 @@ var init_Api = __esm({
       }
       Api2.resourceFor = resourceFor;
       function log(level, facility, id, ...message) {
-        let logger253 = loggers.get(facility);
-        if (!logger253) {
-          loggers.set(facility, logger253 = Logger.get(facility));
+        let logger255 = loggers.get(facility);
+        if (!logger255) {
+          loggers.set(facility, logger255 = Logger.get(facility));
         }
-        logger253[level](Diagnostic.via(id || "(anon)"), message);
+        logger255[level](Diagnostic.via(id || "(anon)"), message);
       }
       Api2.log = log;
       function logRequest(facility, id, method, target) {
@@ -132383,6 +132383,14 @@ var init_bridge_config_schema = __esm({
           maximum: 5e3,
           default: 0
         },
+        fanSliderDebounceMs: {
+          title: "Fan Slider Debounce (ms)",
+          description: "Wait this long after the last inbound fan-speed write before sending it to Home Assistant. Controllers stream percentSetting while the user is still dragging - one Google Home drag was measured emitting nine writes in eight seconds - and on IR or UART bridged air conditioners every write is a device frame that makes the unit beep. 0 (the default) sends every write immediately, matching previous behaviour. Try 1000-2000 ms for bridged ACs. A per-entity override on a single fan or climate wins over this flag.",
+          type: "number",
+          minimum: 0,
+          maximum: 1e4,
+          default: 0
+        },
         fastSessionRecovery: {
           title: "Fast Session Recovery (Google offline workaround)",
           description: "When a controller drops all subscriptions, clean up the dead session and re-announce after 5 seconds instead of 60. Opt-in for Google Home users whose devices go offline after a cancelled subscription (#386). It shortens the offline window but cannot stop the controller from rejecting the subscription. Default off.",
@@ -132763,6 +132771,14 @@ var init_esm7 = __esm({
   }
 });
 
+// ../../node_modules/.pnpm/@matter+main@0.17.9/node_modules/@matter/main/dist/esm/protocol.js
+var init_protocol3 = __esm({
+  "../../node_modules/.pnpm/@matter+main@0.17.9/node_modules/@matter/main/dist/esm/protocol.js"() {
+    init_nodejs();
+    init_esm4();
+  }
+});
+
 // src/utils/debounce-context.ts
 import debounce from "debounce";
 var DebounceContext;
@@ -132842,7 +132858,7 @@ async function withRetry(fn, options = {}) {
       return await fn();
     } catch (error) {
       lastError = error;
-      if (attempt === opts.maxAttempts) {
+      if (attempt === opts.maxAttempts || options.shouldRetry?.(error) === false) {
         break;
       }
       const delayMs = Math.min(
@@ -132906,6 +132922,12 @@ var init_retry = __esm({
       get isOpen() {
         return this.state === "open";
       }
+      // Open AND still inside the reset window. Callers that pre-check
+      // availability must use this, not isOpen, or the half-open probe never
+      // happens and the breaker stays latched forever (#446).
+      get isBlocking() {
+        return this.state === "open" && Date.now() - this.lastFailureTime < this.resetTimeoutMs;
+      }
       reset() {
         this.failures = 0;
         this.state = "closed";
@@ -132942,8 +132964,7 @@ var init_send_ha_message = __esm({
 });
 
 // src/services/home-assistant/home-assistant-actions.ts
-import { callService } from "home-assistant-js-websocket";
-var defaultConfig, HomeAssistantActions;
+var TARGET_FAILURE_THRESHOLD, defaultConfig, HomeAssistantActions;
 var init_home_assistant_actions = __esm({
   "src/services/home-assistant/home-assistant-actions.ts"() {
     "use strict";
@@ -132952,6 +132973,7 @@ var init_home_assistant_actions = __esm({
     init_retry();
     init_send_ha_message();
     init_diagnostic_event_bus();
+    TARGET_FAILURE_THRESHOLD = 3;
     defaultConfig = {
       retryAttempts: 3,
       retryBaseDelayMs: 100,
@@ -132960,10 +132982,10 @@ var init_home_assistant_actions = __esm({
       circuitBreakerResetMs: 3e4
     };
     HomeAssistantActions = class extends Service {
-      constructor(logger253, client, config8) {
+      constructor(logger255, client, config8) {
         super("HomeAssistantActions");
         this.client = client;
-        this.log = logger253.get(this);
+        this.log = logger255.get(this);
         this.config = { ...defaultConfig, ...config8 };
         this.circuitBreaker = new CircuitBreaker(
           this.config.circuitBreakerThreshold,
@@ -132971,6 +132993,13 @@ var init_home_assistant_actions = __esm({
         );
       }
       client;
+      // #446: a Matter command must not report success while HA cannot take the
+      // call. Only the transport counts here: the breaker is app-wide, so ten
+      // failures from one broken entity would otherwise make every device on
+      // every bridge fail.
+      get available() {
+        return this.client.haRunning;
+      }
       log;
       debounceContext = new DebounceContext(
         this.processAction.bind(this)
@@ -132979,6 +133008,27 @@ var init_home_assistant_actions = __esm({
       config;
       consecutiveFailures = 0;
       lastSuccessTime = Date.now();
+      // Per entity, not app wide: the shared breaker would let one broken entity
+      // make every device on every bridge fail (#446).
+      targetFailures = /* @__PURE__ */ new Map();
+      // A target that just failed repeatedly is reported as unavailable, so the
+      // controller sees the failure on that device instead of a false success.
+      isTargetBlocked(entityId) {
+        const entry = this.targetFailures.get(entityId);
+        return entry != null && Date.now() < entry.blockedUntil;
+      }
+      recordTargetResult(entityId, failed) {
+        if (!entityId) return;
+        if (!failed) {
+          this.targetFailures.delete(entityId);
+          return;
+        }
+        const count = (this.targetFailures.get(entityId)?.count ?? 0) + 1;
+        this.targetFailures.set(entityId, {
+          count,
+          blockedUntil: count >= TARGET_FAILURE_THRESHOLD ? Date.now() + this.config.circuitBreakerResetMs : 0
+        });
+      }
       processAction(_key, calls) {
         const skipTarget = calls[0].target === false;
         const entity_id = skipTarget ? void 0 : calls[0].target || calls[0].entityId;
@@ -132986,7 +133036,9 @@ var init_home_assistant_actions = __esm({
         const data = Object.assign({}, ...calls.map((c) => c.data));
         const [domain, actionName] = action.split(".");
         const target = entity_id ? { entity_id } : {};
-        this.callAction(domain, actionName, data, target, false).catch((error) => {
+        const origin = calls[0].entityId;
+        this.callAction(domain, actionName, data, target, false).then(() => this.recordTargetResult(origin, false)).catch((error) => {
+          this.recordTargetResult(origin, true);
           const errorMsg = this.formatError(error);
           this.log.error(
             `Failed to call action '${action}' for entity '${entity_id ?? "(no target)"}': ${errorMsg}`
@@ -133022,13 +133074,17 @@ var init_home_assistant_actions = __esm({
           const result = await this.circuitBreaker.execute(
             () => withRetry(
               async () => {
-                const res = await callService(
+                const res = await sendHaMessage(
                   this.client.connection,
-                  domain,
-                  action,
-                  data,
-                  target,
-                  returnResponse
+                  {
+                    type: "call_service",
+                    domain,
+                    service: action,
+                    service_data: data,
+                    target,
+                    return_response: returnResponse
+                  },
+                  this.client.messageTimeoutMs
                 );
                 return res;
               },
@@ -133036,6 +133092,9 @@ var init_home_assistant_actions = __esm({
                 maxAttempts: this.config.retryAttempts,
                 baseDelayMs: this.config.retryBaseDelayMs,
                 maxDelayMs: this.config.retryMaxDelayMs,
+                // A timeout does not mean HA ignored the call, it may have run it.
+                // Repeating a button press or a script would be worse than failing.
+                shouldRetry: (error) => !(error instanceof Error && error.message.includes("timed out")),
                 onRetry: (attempt, error, delayMs) => {
                   const errorMsg = this.formatError(error);
                   this.log.warn(
@@ -133109,6 +133168,14 @@ var init_home_assistant_actions = __esm({
   }
 });
 
+// ../../node_modules/.pnpm/@matter+main@0.17.9/node_modules/@matter/main/dist/esm/types.js
+var init_types2 = __esm({
+  "../../node_modules/.pnpm/@matter+main@0.17.9/node_modules/@matter/main/dist/esm/types.js"() {
+    init_nodejs();
+    init_esm3();
+  }
+});
+
 // src/utils/async-observable.ts
 var AsyncObservable2;
 var init_async_observable = __esm({
@@ -133119,6 +133186,17 @@ var init_async_observable = __esm({
   }
 });
 
+// src/utils/transaction-is-offline.ts
+function transactionIsOffline(context) {
+  return !context || hasLocalActor(context);
+}
+var init_transaction_is_offline = __esm({
+  "src/utils/transaction-is-offline.ts"() {
+    "use strict";
+    init_protocol3();
+  }
+});
+
 // src/matter/behaviors/home-assistant-entity-behavior.ts
 var home_assistant_entity_behavior_exports = {};
 __export(home_assistant_entity_behavior_exports, {
@@ -133130,8 +133208,10 @@ var init_home_assistant_entity_behavior = __esm({
     "use strict";
     init_dist();
     init_esm7();
+    init_types2();
     init_home_assistant_actions();
     init_async_observable();
+    init_transaction_is_offline();
     HomeAssistantEntityBehavior = class extends Behavior {
       static id = ClusterId2.homeAssistantEntity;
       get entityId() {
@@ -133146,7 +133226,24 @@ var init_home_assistant_entity_behavior = __esm({
       get isAvailable() {
         return this.entity.state.state !== "unavailable" && this.entity.state.state !== "unknown";
       }
+      // #446: fail the command instead of telling the controller it worked while
+      // the call never reaches HA. `=== false` on purpose: test stubs do not
+      // define `available`, and undefined must read as "no opinion".
+      // ponytail: commands only. Attribute writes that fan and thermostat handle
+      // in reactors run as a local actor, so they still go through and rely on HA
+      // state to correct them. Plumb it there too if that shows up in reports.
+      assertAvailable() {
+        const actions = this.env.get(HomeAssistantActions);
+        const blocked = actions.available === false || actions.isTargetBlocked?.(this.entityId) === true;
+        if (blocked && !transactionIsOffline(this.context)) {
+          throw new StatusResponseError(
+            "Home Assistant is not reachable",
+            StatusCode.Failure
+          );
+        }
+      }
       callAction(action) {
+        this.assertAvailable();
         const actions = this.env.get(HomeAssistantActions);
         actions.call(action, this.entityId);
       }
@@ -133309,10 +133406,10 @@ var DiagnosticService = class {
 };
 
 // src/api/access-log.ts
-function accessLogger(logger253) {
+function accessLogger(logger255) {
   return (req, res, next) => {
     res.on("finish", () => {
-      logger253.debug(
+      logger255.debug(
         `${req.method} ${decodeURI(req.originalUrl)} ${res.statusCode} ${res.statusMessage} from ${req.socket.remoteAddress}`
       );
     });
@@ -133593,6 +133690,7 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                     valetudoIdentifier: config8.valetudoIdentifier,
                     coverSwapOpenClose: config8.coverSwapOpenClose,
                     coverSliderDebounceMs: config8.coverSliderDebounceMs,
+                    fanSliderDebounceMs: config8.fanSliderDebounceMs,
                     disableClimateOnOff: config8.disableClimateOnOff,
                     disableClimateFanControl: config8.disableClimateFanControl,
                     climateAutoMode: config8.climateAutoMode,
@@ -133762,6 +133860,7 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                   valetudoIdentifier: config8.valetudoIdentifier,
                   coverSwapOpenClose: config8.coverSwapOpenClose,
                   coverSliderDebounceMs: config8.coverSliderDebounceMs,
+                  fanSliderDebounceMs: config8.fanSliderDebounceMs,
                   disableClimateOnOff: config8.disableClimateOnOff,
                   disableClimateFanControl: config8.disableClimateFanControl,
                   climateAutoMode: config8.climateAutoMode,
@@ -134644,6 +134743,7 @@ function entityMappingApi(mappingStorage, identityStorage) {
       selectSwitchOnOption: body.selectSwitchOnOption,
       selectSwitchOffOption: body.selectSwitchOffOption,
       coverSliderDebounceMs: body.coverSliderDebounceMs,
+      fanSliderDebounceMs: body.fanSliderDebounceMs,
       updateThrottleMs: body.updateThrottleMs,
       disableClimateOnOff: body.disableClimateOnOff,
       disableClimateFanControl: body.disableClimateFanControl,
@@ -135142,6 +135242,7 @@ function configToProfileEntry(config8) {
     valetudoIdentifier: config8.valetudoIdentifier,
     coverSwapOpenClose: config8.coverSwapOpenClose,
     coverSliderDebounceMs: config8.coverSliderDebounceMs,
+    fanSliderDebounceMs: config8.fanSliderDebounceMs,
     disableClimateOnOff: config8.disableClimateOnOff,
     disableClimateFanControl: config8.disableClimateFanControl,
     climateKeepModeOnIdle: config8.climateKeepModeOnIdle,
@@ -135287,6 +135388,7 @@ function mappingProfileApi(mappingStorage) {
           valetudoIdentifier: entry.valetudoIdentifier,
           coverSwapOpenClose: entry.coverSwapOpenClose,
           coverSliderDebounceMs: entry.coverSliderDebounceMs,
+          fanSliderDebounceMs: entry.fanSliderDebounceMs,
           disableClimateOnOff: entry.disableClimateOnOff,
           disableClimateFanControl: entry.disableClimateFanControl,
           climateKeepModeOnIdle: entry.climateKeepModeOnIdle,
@@ -138045,7 +138147,7 @@ var WebSocketApi = class {
 
 // src/api/web-api.ts
 var WebApi = class extends Service {
-  constructor(logger253, bridgeService, haClient, haRegistry, bridgeStorage, mappingStorage, identityStorage, lockCredentialStorage, settingsStorage, backupService, props) {
+  constructor(logger255, bridgeService, haClient, haRegistry, bridgeStorage, mappingStorage, identityStorage, lockCredentialStorage, settingsStorage, backupService, props) {
     super("WebApi");
     this.bridgeService = bridgeService;
     this.haClient = haClient;
@@ -138057,8 +138159,8 @@ var WebApi = class extends Service {
     this.settingsStorage = settingsStorage;
     this.backupService = backupService;
     this.props = props;
-    this.logger = logger253;
-    this.log = logger253.get(this);
+    this.logger = logger255;
+    this.log = logger255.get(this);
     this.accessLogger = accessLogger(this.log.createChild("Access Log"));
     this.startTime = Date.now();
     this.wsApi = new WebSocketApi(
@@ -138479,12 +138581,9 @@ var BetterLogger = class _BetterLogger extends Logger {
 // src/core/app/mdns.ts
 init_esm();
 init_esm7();
+init_protocol3();
 import * as os5 from "node:os";
 
-// ../../node_modules/.pnpm/@matter+main@0.17.9/node_modules/@matter/main/dist/esm/protocol.js
-init_nodejs();
-init_esm4();
-
 // src/core/app/filtered-network.ts
 init_esm6();
 function filterAdvertisedIpv6(ipV6) {
@@ -139234,6 +139333,7 @@ init_home_assistant_actions();
 // src/services/home-assistant/home-assistant-client.ts
 init_service();
 init_retry();
+init_send_ha_message();
 import {
   createConnection as createConnection2,
   createLongLivedTokenAuth,
@@ -139259,30 +139359,92 @@ function isTransientConnectError(reason) {
   return msg.includes("socket hang up") || msg.includes("tls") || msg.includes("TLS");
 }
 var HomeAssistantClient = class extends Service {
-  constructor(logger253, options) {
+  constructor(logger255, options) {
     super("HomeAssistantClient");
     this.options = options;
-    this.log = logger253.get(this);
+    this.log = logger255.get(this);
   }
   options;
   static Options = /* @__PURE__ */ Symbol.for("HomeAssistantClientProps");
   _connection;
   log;
+  _haRunning = false;
+  _runningSince = 0;
+  runningPollGeneration = 0;
   get connection() {
     return this._connection;
   }
+  // False during HA's own startup and after any WS drop, true only once
+  // getConfig reports RUNNING again. Endpoint managers use this to not trust
+  // partial registry snapshots (#438).
+  get haRunning() {
+    return this._haRunning;
+  }
+  // When HA last reached RUNNING. The removal grace has to outlast HA's own
+  // start, so it counts from here, not from wall time (#438).
+  get runningSince() {
+    return this._runningSince;
+  }
   get baseUrl() {
     return this.options.url;
   }
   get accessToken() {
     return this.options.accessToken;
   }
+  get messageTimeoutMs() {
+    return this.options.messageTimeoutMs;
+  }
   async initialize() {
     this._connection = await this.createConnection(this.options);
+    this.watchRunningState(this._connection);
+    this.setRunning(this._connection.connected ?? true);
+  }
+  setRunning(running) {
+    if (running && !this._haRunning) {
+      this._runningSince = Date.now();
+    }
+    this._haRunning = running;
   }
   async dispose() {
+    this.runningPollGeneration++;
     this.connection?.close();
   }
+  // The websocket library reconnects on its own after a drop and nothing
+  // re-checks HA's lifecycle state, so a core restart resumed registry reads
+  // mid-boot (#438). Force false on every drop and only flip back once a
+  // fresh getConfig poll sees RUNNING. The generation counter kills stale
+  // polls from an older reconnect.
+  watchRunningState(connection) {
+    connection.addEventListener("disconnected", () => {
+      this.runningPollGeneration++;
+      this.setRunning(false);
+    });
+    connection.addEventListener("ready", () => {
+      const generation = ++this.runningPollGeneration;
+      this.setRunning(false);
+      this.confirmRunning(connection, generation).catch((e) => {
+        this.log.warnCtx("HA running state check failed", {
+          reason: e instanceof Error ? e.message : String(e)
+        });
+      });
+    });
+  }
+  async confirmRunning(connection, generation) {
+    while (this.runningPollGeneration === generation) {
+      const config8 = await sendHaMessage(
+        connection,
+        { type: "get_config" },
+        this.options.messageTimeoutMs
+      ).catch(() => void 0);
+      if (this.runningPollGeneration !== generation) return;
+      if (config8?.state === "RUNNING") {
+        this.setRunning(true);
+        this.log.infoCtx("Home Assistant is up and running again", {});
+        return;
+      }
+      await new Promise((resolve11) => setTimeout(resolve11, 5e3));
+    }
+  }
   async createConnection(props) {
     const maxConnectAttempts = 60;
     for (let attempt = 1; attempt <= maxConnectAttempts; attempt++) {
@@ -139466,6 +139628,16 @@ var HomeAssistantRegistry = class extends Service {
   options;
   autoRefresh;
   lastRegistryFingerprint = "";
+  // Bumped on every successful reload, even an unchanged one. Endpoint
+  // removal requires a bump between stamp and delete, so a stale cached
+  // snapshot can never confirm a removal (#438).
+  _snapshotGeneration = 0;
+  get snapshotGeneration() {
+    return this._snapshotGeneration;
+  }
+  // Last HA uptime stamp the auto-refresh saw, so a restart between ticks
+  // still drives one reconcile (#438).
+  lastRunningSince = 0;
   _devices = {};
   get devices() {
     return this._devices;
@@ -139509,8 +139681,11 @@ var HomeAssistantRegistry = class extends Service {
       }
       refreshing = true;
       try {
+        const runningSince = this.client.runningSince;
+        const restarted = runningSince !== this.lastRunningSince;
         const changed = await this.reload();
-        if (changed) {
+        this.lastRunningSince = runningSince;
+        if (changed || restarted) {
           await onRefresh();
         }
       } catch (e) {
@@ -139573,6 +139748,7 @@ var HomeAssistantRegistry = class extends Service {
     });
   }
   async runRegistryQueries() {
+    const trustedAtStart = this.client.haRunning;
     const connection = this.client.connection;
     const timeoutMs = this.options.messageTimeoutMs;
     const [entityRegistry, statesList, deviceRegistry, labels, areas] = await Promise.all([
@@ -139612,6 +139788,12 @@ var HomeAssistantRegistry = class extends Service {
     for (const a of areas) hash2.update(`${a.area_id}\0${a.name}
 `);
     const fingerprint = hash2.digest("hex");
+    if (!trustedAtStart || !this.client.haRunning) {
+      logger183.debug("Discarding registry snapshot, HA was not running");
+      this.lastRegistryFingerprint = "";
+      return false;
+    }
+    this._snapshotGeneration++;
     this._states = keyBy(statesList, "entity_id");
     if (fingerprint === this.lastRegistryFingerprint) {
       logger183.debug("Registry unchanged, skipping full refresh");
@@ -140103,6 +140285,7 @@ var EntityMappingStorage = class extends Service {
       selectSwitchOnOption: request.selectSwitchOnOption || void 0,
       selectSwitchOffOption: request.selectSwitchOffOption || void 0,
       coverSliderDebounceMs: sanitizeDebounceMs(request.coverSliderDebounceMs),
+      fanSliderDebounceMs: sanitizeDebounceMs(request.fanSliderDebounceMs),
       updateThrottleMs: sanitizeThrottleMs(request.updateThrottleMs),
       disableClimateOnOff: request.disableClimateOnOff || void 0,
       disableClimateFanControl: request.disableClimateFanControl || void 0,
@@ -140112,7 +140295,7 @@ var EntityMappingStorage = class extends Service {
       composedEntities: request.composedEntities?.filter((e) => e.entityId?.trim()) ?? void 0,
       disableMomentaryFlip: request.disableMomentaryFlip || void 0
     };
-    if (!config8.matterDeviceType && !config8.customName && !config8.customProductName && !config8.customVendorName && !config8.customSerialNumber && config8.customVendorId === void 0 && config8.disabled !== true && !config8.filterLifeEntity && !config8.cleaningModeEntity && !config8.temperatureEntity && !config8.humidityEntity && !config8.batteryEntity && !config8.disableBatteryMapping && !config8.chargingStateEntity && !config8.roomEntities && !config8.disableLockPin && !config8.lockUsercodeService && config8.lockUsercodeSlot === void 0 && config8.lockPinMinLength === void 0 && config8.lockPinMaxLength === void 0 && !config8.powerEntity && !config8.energyEntity && !config8.meterSerialNumber && !config8.pointOfDelivery && !config8.voltageEntity && !config8.currentEntity && !config8.batteryPowerEntity && !config8.batteryEnergyEntity && !config8.chargingSwitchEntity && !config8.currentLimitEntity && !config8.pressureEntity && !config8.suctionLevelEntity && !config8.mopIntensityEntity && (!config8.customServiceAreas || config8.customServiceAreas.length === 0) && (!config8.customFanSpeedTags || Object.keys(config8.customFanSpeedTags).length === 0) && (!config8.fanWindPresets || (config8.fanWindPresets.natural?.length ?? 0) === 0 && (config8.fanWindPresets.sleep?.length ?? 0) === 0) && !config8.fanRestoreSpeedOnPowerOn && !config8.currentRoomEntity && !config8.cleanedAreaEntity && !config8.vacuumAscendingRoomOrder && !config8.vacuumRoomSwitches && !config8.disableCustomAreaRoomModes && !config8.valetudoIdentifier && !config8.coverSwapOpenClose && !config8.coverExposeAsDimmableLight && !config8.selectExposeAsSwitch && !config8.selectSwitchOnOption && !config8.selectSwitchOffOption && !config8.coverSliderDebounceMs && !config8.updateThrottleMs && !config8.disableClimateOnOff && !config8.disableClimateFanControl && !config8.climateKeepModeOnIdle && !config8.climateExposeFan && !config8.climateAutoMode && (!config8.composedEntities || config8.composedEntities.length === 0) && !config8.disableMomentaryFlip) {
+    if (!config8.matterDeviceType && !config8.customName && !config8.customProductName && !config8.customVendorName && !config8.customSerialNumber && config8.customVendorId === void 0 && config8.disabled !== true && !config8.filterLifeEntity && !config8.cleaningModeEntity && !config8.temperatureEntity && !config8.humidityEntity && !config8.batteryEntity && !config8.disableBatteryMapping && !config8.chargingStateEntity && !config8.roomEntities && !config8.disableLockPin && !config8.lockUsercodeService && config8.lockUsercodeSlot === void 0 && config8.lockPinMinLength === void 0 && config8.lockPinMaxLength === void 0 && !config8.powerEntity && !config8.energyEntity && !config8.meterSerialNumber && !config8.pointOfDelivery && !config8.voltageEntity && !config8.currentEntity && !config8.batteryPowerEntity && !config8.batteryEnergyEntity && !config8.chargingSwitchEntity && !config8.currentLimitEntity && !config8.pressureEntity && !config8.suctionLevelEntity && !config8.mopIntensityEntity && (!config8.customServiceAreas || config8.customServiceAreas.length === 0) && (!config8.customFanSpeedTags || Object.keys(config8.customFanSpeedTags).length === 0) && (!config8.fanWindPresets || (config8.fanWindPresets.natural?.length ?? 0) === 0 && (config8.fanWindPresets.sleep?.length ?? 0) === 0) && !config8.fanRestoreSpeedOnPowerOn && !config8.currentRoomEntity && !config8.cleanedAreaEntity && !config8.vacuumAscendingRoomOrder && !config8.vacuumRoomSwitches && !config8.disableCustomAreaRoomModes && !config8.valetudoIdentifier && !config8.coverSwapOpenClose && !config8.coverExposeAsDimmableLight && !config8.selectExposeAsSwitch && !config8.selectSwitchOnOption && !config8.selectSwitchOffOption && !config8.coverSliderDebounceMs && !config8.fanSliderDebounceMs && !config8.updateThrottleMs && !config8.disableClimateOnOff && !config8.disableClimateFanControl && !config8.climateKeepModeOnIdle && !config8.climateExposeFan && !config8.climateAutoMode && (!config8.composedEntities || config8.composedEntities.length === 0) && !config8.disableMomentaryFlip) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config8);
@@ -155038,9 +155221,8 @@ var WindowCoveringDevice = WindowCoveringDeviceDefinition;
 init_nodejs();
 init_esm5();
 
-// ../../node_modules/.pnpm/@matter+main@0.17.9/node_modules/@matter/main/dist/esm/types.js
-init_nodejs();
-init_esm3();
+// src/matter/endpoints/server-mode-server-node.ts
+init_types2();
 
 // src/utils/sanitize-matter-string.ts
 function sanitizeMatterString(value) {
@@ -155224,6 +155406,9 @@ import * as path12 from "node:path";
 // src/plugins/plugin-device-factory.ts
 init_esm();
 
+// src/matter/behaviors/identify-server.ts
+init_esm();
+
 // ../../node_modules/.pnpm/@matter+main@0.17.9/node_modules/@matter/main/dist/esm/behaviors.js
 init_nodejs();
 
@@ -156419,14 +156604,138 @@ init_wi_fi_network_diagnostics2();
 init_ClientBehavior();
 var WiFiNetworkManagementClientConstructor = ClientBehavior(WiFiNetworkManagement3);
 
+// ../../node_modules/.pnpm/@matter+main@0.17.9/node_modules/@matter/main/dist/esm/clusters.js
+init_nodejs();
+
+// ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/index.js
+init_access_control();
+init_actions();
+init_administrator_commissioning();
+
+// ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/alarm-base.js
+init_ClusterType();
+init_esm2();
+var AlarmBase3 = ClusterType(AlarmBase2);
+
+// ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/index.js
+init_basic_information();
+init_binding();
+init_bridged_device_basic_information();
+init_commissioner_control();
+
+// ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/concentration-measurement.js
+init_ClusterType();
+init_esm2();
+var ConcentrationMeasurement3 = ClusterType(ConcentrationMeasurement2);
+
+// ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/index.js
+init_descriptor();
+init_diagnostic_logs();
+init_ethernet_network_diagnostics();
+init_general_commissioning();
+init_general_diagnostics();
+init_group_key_management();
+init_groupcast();
+init_icd_management();
+init_identify();
+
+// ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/label.js
+init_ClusterType();
+init_esm2();
+var Label3 = ClusterType(Label2);
+
+// ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/index.js
+init_localization_configuration();
+init_network_commissioning();
+init_operational_credentials();
+init_ota_software_update_provider();
+init_ota_software_update_requestor();
+init_power_source();
+init_power_source_configuration();
+
+// ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/resource-monitoring.js
+init_ClusterType();
+init_esm2();
+var ResourceMonitoring3 = ClusterType(ResourceMonitoring2);
+
+// ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/index.js
+init_software_diagnostics();
+init_thread_network_diagnostics();
+init_time_format_localization();
+init_time_synchronization();
+init_tls_certificate_management();
+init_tls_client_management();
+init_unit_localization();
+
+// ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/web-rtc-transport-definitions.js
+init_ClusterType();
+init_esm2();
+var WebRtcTransportDefinitions3 = ClusterType(WebRtcTransportDefinitions2);
+
+// ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/index.js
+init_wi_fi_network_diagnostics();
+
 // src/matter/behaviors/identify-server.ts
+init_home_assistant_entity_behavior();
+var logger198 = Logger.get("IdentifyServer");
+var IDENTIFY_BUTTON_SUFFIXES = ["_identify", "_locate", "_find_me"];
 var IdentifyServer2 = class extends IdentifyServer {
+  identify(request) {
+    if (request.identifyTime > 0) {
+      this.identifyInHomeAssistant("identify");
+    }
+    return super.identify(request);
+  }
+  triggerEffect(effect) {
+    if (effect.effectIdentifier !== Identify3.EffectIdentifier.StopEffect && effect.effectIdentifier !== Identify3.EffectIdentifier.FinishEffect) {
+      this.identifyInHomeAssistant("triggerEffect");
+    }
+    return super.triggerEffect(effect);
+  }
+  identifyInHomeAssistant(source) {
+    if (!this.agent.has(HomeAssistantEntityBehavior)) return;
+    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
+    const target = this.findIdentifyEntity(homeAssistant);
+    if (!target) {
+      logger198.debug(
+        `${source} for ${homeAssistant.entityId}, no identify entity on this device`
+      );
+      return;
+    }
+    logger198.info(
+      `${source} \u2192 button.press ${target} for ${homeAssistant.entityId}`
+    );
+    homeAssistant.callAction({ action: "button.press", target });
+  }
+  // Searches the FULL registry: an identify button rarely matches the bridge
+  // filter, same reason the battery and problem lookups do it.
+  findIdentifyEntity(homeAssistant) {
+    const deviceId = homeAssistant.entity.registry?.device_id;
+    if (!deviceId) return void 0;
+    const registry3 = this.env.maybeGet(HomeAssistantRegistry);
+    if (!registry3) return void 0;
+    let byName;
+    for (const entity of Object.values(registry3.entities)) {
+      if (entity.device_id !== deviceId) continue;
+      if (entity.disabled_by != null) continue;
+      if (!entity.entity_id.startsWith("button.")) continue;
+      const deviceClass = registry3.states[entity.entity_id]?.attributes?.device_class;
+      if (deviceClass === "identify") return entity.entity_id;
+      const uniqueId = entity.unique_id ?? "";
+      if (byName == null && IDENTIFY_BUTTON_SUFFIXES.some(
+        (s) => entity.entity_id.endsWith(s) || uniqueId.endsWith(s)
+      )) {
+        byName = entity.entity_id;
+      }
+    }
+    return byName;
+  }
 };
 
 // src/matter/endpoints/validate-endpoint-type.ts
 init_esm();
 init_esm7();
-var logger198 = Logger.get("EndpointValidation");
+var logger199 = Logger.get("EndpointValidation");
 function toCamelCase(name) {
   return name.charAt(0).toLowerCase() + name.slice(1);
 }
@@ -156456,12 +156765,12 @@ function validateEndpointType(endpointType, entityId) {
   }
   const prefix = entityId ? `[${entityId}] ` : "";
   if (missingMandatory.length > 0) {
-    logger198.warn(
+    logger199.warn(
       `${prefix}${deviceTypeModel.name} (0x${endpointType.deviceType.toString(16)}): missing mandatory clusters: ${missingMandatory.join(", ")}`
     );
   }
   if (availableOptional.length > 0) {
-    logger198.debug(
+    logger199.debug(
       `${prefix}${deviceTypeModel.name} (0x${endpointType.deviceType.toString(16)}): optional clusters not used: ${availableOptional.join(", ")}`
     );
   }
@@ -156585,7 +156894,7 @@ var BridgeDataProvider = class extends Service {
 
 // src/utils/apply-patch-state.ts
 init_esm();
-var logger199 = Logger.get("ApplyPatchState");
+var logger200 = Logger.get("ApplyPatchState");
 function applyPatchState(state, patch, options) {
   return applyPatch(state, patch, options?.force);
 }
@@ -156612,23 +156921,23 @@ function applyPatch(state, patch, force = false) {
       if (errorMessage.includes(
         "Endpoint storage inaccessible because endpoint is not a node and is not owned by another endpoint"
       )) {
-        logger199.debug(
+        logger200.debug(
           `Suppressed endpoint storage error, patch not applied: ${JSON.stringify(actualPatch)}`
         );
         return actualPatch;
       }
       if (errorMessage.includes("synchronous-transaction-conflict")) {
-        logger199.warn(
+        logger200.warn(
           `Transaction conflict, state update DROPPED: ${JSON.stringify(actualPatch)}`
         );
         return actualPatch;
       }
       failedKeys.push(key);
-      logger199.warn(`Failed to set property '${key}': ${errorMessage}`);
+      logger200.warn(`Failed to set property '${key}': ${errorMessage}`);
     }
   }
   if (failedKeys.length > 0) {
-    logger199.warn(
+    logger200.warn(
       `${failedKeys.length} properties failed to update: [${failedKeys.join(", ")}]`
     );
   }
@@ -156698,7 +157007,7 @@ function truncate(maxLength, value) {
 }
 
 // src/plugins/plugin-device-factory.ts
-var logger200 = Logger.get("PluginDeviceFactory");
+var logger201 = Logger.get("PluginDeviceFactory");
 var deviceTypeMap = {
   on_off_light: () => OnOffLightDevice.with(
     IdentifyServer2,
@@ -156804,7 +157113,7 @@ var deviceTypeMap = {
 function createPluginEndpointType(deviceType) {
   const factory = deviceTypeMap[deviceType];
   if (!factory) {
-    logger200.warn(`Unsupported plugin device type: "${deviceType}"`);
+    logger201.warn(`Unsupported plugin device type: "${deviceType}"`);
     return void 0;
   }
   const endpoint = factory();
@@ -156817,7 +157126,7 @@ function getSupportedPluginDeviceTypes() {
 
 // src/plugins/safe-plugin-runner.ts
 init_esm();
-var logger201 = Logger.get("SafePluginRunner");
+var logger202 = Logger.get("SafePluginRunner");
 var DEFAULT_TIMEOUT_MS = 1e4;
 var CIRCUIT_BREAKER_THRESHOLD = 3;
 var SafePluginRunner = class {
@@ -156850,7 +157159,7 @@ var SafePluginRunner = class {
   async run(pluginName, operation, fn, timeoutMs = DEFAULT_TIMEOUT_MS) {
     const state = this.getState(pluginName);
     if (state.disabled) {
-      logger201.debug(
+      logger202.debug(
         `Plugin "${pluginName}" is disabled (circuit breaker open), skipping ${operation}`
       );
       return void 0;
@@ -156868,13 +157177,13 @@ var SafePluginRunner = class {
       timeout.clear();
       state.failures++;
       state.lastError = error instanceof Error ? error.message : String(error);
-      logger201.error(
+      logger202.error(
         `Plugin "${pluginName}" failed during ${operation} (failure ${state.failures}/${CIRCUIT_BREAKER_THRESHOLD}): ${state.lastError}`
       );
       if (state.failures >= CIRCUIT_BREAKER_THRESHOLD) {
         state.disabled = true;
         state.disabledAt = Date.now();
-        logger201.error(
+        logger202.error(
           `Plugin "${pluginName}" DISABLED after ${CIRCUIT_BREAKER_THRESHOLD} consecutive failures. Last error: ${state.lastError}`
         );
       }
@@ -156897,7 +157206,7 @@ var SafePluginRunner = class {
       return result;
     } catch (error) {
       timeout.clear();
-      logger201.error(
+      logger202.error(
         `Plugin "${pluginName}" failed during ${operation}: ${error instanceof Error ? error.message : String(error)}`
       );
       return void 0;
@@ -156918,13 +157227,13 @@ var SafePluginRunner = class {
     } catch (error) {
       state.failures++;
       state.lastError = error instanceof Error ? error.message : String(error);
-      logger201.error(
+      logger202.error(
         `Plugin "${pluginName}" failed during ${operation} (sync, failure ${state.failures}/${CIRCUIT_BREAKER_THRESHOLD}): ${state.lastError}`
       );
       if (state.failures >= CIRCUIT_BREAKER_THRESHOLD) {
         state.disabled = true;
         state.disabledAt = Date.now();
-        logger201.error(
+        logger202.error(
           `Plugin "${pluginName}" DISABLED after ${CIRCUIT_BREAKER_THRESHOLD} consecutive failures.`
         );
       }
@@ -156950,7 +157259,7 @@ var SafePluginRunner = class {
 };
 
 // src/plugins/plugin-manager.ts
-var logger202 = Logger.get("PluginManager");
+var logger203 = Logger.get("PluginManager");
 var PLUGIN_API_VERSION = 1;
 var MAX_PLUGIN_DEVICE_ID_LENGTH = 100;
 var LEGACY_ENABLED_KEY = "__enabled";
@@ -157045,7 +157354,7 @@ var PluginManager = class {
         throw new Error(`Plugin at ${packagePath} package.json missing "main"`);
       }
       if (manifest.hamhPluginApiVersion != null && manifest.hamhPluginApiVersion !== PLUGIN_API_VERSION) {
-        logger202.warn(
+        logger203.warn(
           `Plugin "${manifest.name}" declares API version ${manifest.hamhPluginApiVersion}, current is ${PLUGIN_API_VERSION}. It may not work correctly.`
         );
       }
@@ -157076,7 +157385,7 @@ var PluginManager = class {
       };
       await this.register(plugin, metadata);
     } catch (e) {
-      logger202.error(`Failed to load external plugin from ${packagePath}:`, e);
+      logger203.error(`Failed to load external plugin from ${packagePath}:`, e);
       throw e;
     }
   }
@@ -157101,7 +157410,7 @@ var PluginManager = class {
     }
     if (enabled === false) {
       metadata.enabled = false;
-      logger202.info(`Plugin "${plugin.name}" stays disabled (persisted)`);
+      logger203.info(`Plugin "${plugin.name}" stays disabled (persisted)`);
     }
     const devices = /* @__PURE__ */ new Map();
     const pluginLogger = Logger.get(`Plugin:${plugin.name}`);
@@ -157140,7 +157449,7 @@ var PluginManager = class {
         }
         devices.delete(deviceId);
         await this.onDeviceUnregistered?.(plugin.name, deviceId, {
-          keepIdentity: this.instances.get(plugin.name)?.suspending === true
+          keepIdentity: true
         });
         pluginLogger.debug(`Unregistered device: ${deviceId}`);
       },
@@ -157189,7 +157498,7 @@ var PluginManager = class {
       }),
       suspending: false
     });
-    logger202.info(
+    logger203.info(
       `Registered plugin: ${plugin.name} v${plugin.version} (${metadata.source})`
     );
   }
@@ -157214,13 +157523,13 @@ var PluginManager = class {
   async startPlugin(name, instance) {
     if (!instance.metadata.enabled) return;
     if (this.runner.isDisabled(name)) {
-      logger202.warn(
+      logger203.warn(
         `Plugin "${name}" is disabled (circuit breaker), skipping start`
       );
       instance.metadata.enabled = false;
       return;
     }
-    logger202.info(`Starting plugin: ${name}`);
+    logger203.info(`Starting plugin: ${name}`);
     const epoch = ++instance.epoch;
     await this.runner.run(
       name,
@@ -157279,7 +157588,7 @@ var PluginManager = class {
           storage2.flush();
         }
         instance.started = false;
-        logger202.info(`Plugin "${name}" shut down`);
+        logger203.info(`Plugin "${name}" shut down`);
       });
     }
     this.instances.clear();
@@ -157375,13 +157684,13 @@ var PluginManager = class {
           instance.metadata.config = pending;
           instance.pendingConfig = void 0;
         } catch (e) {
-          logger202.warn(
+          logger203.warn(
             `Failed to persist the parked config for "${pluginName}", it stays parked:`,
             e
           );
         }
       }
-      logger202.info(`Starting plugin: ${pluginName}`);
+      logger203.info(`Starting plugin: ${pluginName}`);
       const epoch = ++instance.epoch;
       await this.runner.run(
         pluginName,
@@ -157414,7 +157723,7 @@ var PluginManager = class {
         return JSON.parse(fs10.readFileSync(this.stateFile, "utf-8"));
       }
     } catch (e) {
-      logger202.warn(`Failed to read the plugin state file:`, e);
+      logger203.warn(`Failed to read the plugin state file:`, e);
     }
     return {};
   }
@@ -157425,7 +157734,7 @@ var PluginManager = class {
       fs10.mkdirSync(path12.dirname(this.stateFile), { recursive: true });
       fs10.writeFileSync(this.stateFile, JSON.stringify(state, null, 2));
     } catch (e) {
-      logger202.warn(
+      logger203.warn(
         `Failed to persist enabled=${enabled} for "${pluginName}":`,
         e
       );
@@ -157459,7 +157768,7 @@ var PluginManager = class {
       if (instance.plugin.onConfigChanged) {
         if (!instance.metadata.enabled) {
           instance.pendingConfig = config8;
-          logger202.info(
+          logger203.info(
             `Plugin "${pluginName}" is disabled, the config applies on enable`
           );
         } else {
@@ -157479,6 +157788,7 @@ var PluginManager = class {
 init_dist();
 init_esm7();
 import * as os9 from "node:os";
+init_protocol3();
 
 // src/utils/json/create-bridge-server-config.ts
 import crypto5 from "node:crypto";
@@ -157735,6 +158045,7 @@ var SecondaryNetworkInterfaceEndpointDefinition = MutableEndpoint({
 Object.freeze(SecondaryNetworkInterfaceEndpointDefinition);
 
 // src/utils/json/create-bridge-server-config.ts
+init_types2();
 function createBridgeServerConfig(data, options) {
   return {
     type: ServerNode.RootEndpoint,
@@ -157831,6 +158142,7 @@ async function runMdnsAddressWatchTick(deps) {
 }
 
 // src/utils/ensure-commissioning-config.ts
+init_protocol3();
 var ServerNodeConfigProvider = class extends CommissioningConfigProvider {
   #node;
   constructor(node) {
@@ -157878,6 +158190,10 @@ function deadSessionTimeoutMs(flags2) {
   return flags2?.fastSessionRecovery ? FAST_DEAD_SESSION_TIMEOUT_MS : DEAD_SESSION_TIMEOUT_MS;
 }
 var STALE_SESSION_QUIET_WINDOW_MS = 5 * 60 * 1e3;
+var PRIMING_GRACE_MS = 3e4;
+function replacedSessionTimeoutMs(flags2) {
+  return Math.max(deadSessionTimeoutMs(flags2), PRIMING_GRACE_MS);
+}
 function staleSessionQuietWindowMs(flags2) {
   return flags2?.fastSessionRecovery ? 0 : STALE_SESSION_QUIET_WINDOW_MS;
 }
@@ -158024,11 +158340,11 @@ var AUTO_FORCE_SYNC_INTERVAL_MS = 9e4;
 var SHUTDOWN_SESSION_CLOSE_TIMEOUT_MS = 2500;
 var MDNS_ADDRESS_CHECK_INTERVAL_MS = 6e4;
 var Bridge = class {
-  constructor(env, logger253, dataProvider, endpointManager, serverOptions) {
+  constructor(env, logger255, dataProvider, endpointManager, serverOptions) {
     this.dataProvider = dataProvider;
     this.endpointManager = endpointManager;
     this.serverOptions = serverOptions;
-    this.log = logger253.get(`Bridge / ${dataProvider.id}`);
+    this.log = logger255.get(`Bridge / ${dataProvider.id}`);
     this.server = new BridgeServerNode(
       env,
       this.dataProvider,
@@ -158486,12 +158802,18 @@ ${e?.toString()}`);
         for (const s of [...sessionManager.sessions]) {
           if (s !== newSession && !s.isClosing && s.peerNodeId === newSession.peerNodeId && s.fabric?.fabricIndex === newSession.fabric?.fabricIndex && s.subscriptions.size === 0) {
             this.log.info(
-              `Closing stale session ${s.id} (peer ${s.peerNodeId}, 0 subs), replaced by session ${newSession.id}`
+              `Session ${s.id} (peer ${s.peerNodeId}, 0 subs) replaced by session ${newSession.id}, closing it once it goes quiet`
+            );
+            const staleId = s.id;
+            const armed = this.staleSessionTimers.get(staleId);
+            if (armed) clearTimeout(armed);
+            this.staleSessionTimers.set(
+              staleId,
+              setTimeout(() => {
+                this.staleSessionTimers.delete(staleId);
+                this.closeStaleSession(staleId, PRIMING_GRACE_MS);
+              }, replacedSessionTimeoutMs(this.dataProvider.featureFlags))
             );
-            s.initiateForceClose({
-              cause: new Error("stale session replaced by new session")
-            }).catch(() => {
-            });
           }
         }
         const quietWindowMs = staleSessionQuietWindowMs(
@@ -158527,6 +158849,11 @@ ${e?.toString()}`);
       };
       this.sessionDeletedHandler = (session) => {
         this.sessionStartedAt.delete(session.id);
+        const armed = this.staleSessionTimers.get(session.id);
+        if (armed) {
+          clearTimeout(armed);
+          this.staleSessionTimers.delete(session.id);
+        }
         const sessions = [...sessionManager.sessions];
         this.log.warn(
           `Session closed: id=${session.id} peer=${session.peerNodeId} | remaining sessions=${sessions.length}`
@@ -158625,7 +158952,7 @@ ${e?.toString()}`);
       );
     });
   }
-  closeStaleSession(sessionId) {
+  closeStaleSession(sessionId, minQuietMs = 0) {
     try {
       const sessionManager = this.server.env.get(SessionManager);
       for (const s of [...sessionManager.sessions]) {
@@ -158635,7 +158962,10 @@ ${e?.toString()}`);
         const idleSec = Math.round((Date.now() - s.timestamp) / 1e3);
         if (!staleSessionShouldClose(
           s,
-          staleSessionQuietWindowMs(this.dataProvider.featureFlags)
+          Math.max(
+            staleSessionQuietWindowMs(this.dataProvider.featureFlags),
+            minQuietMs
+          )
         )) {
           this.log.info(
             `Keeping session ${s.id} (peer ${s.peerNodeId}, 0 subs, last traffic ${idleSec}s ago)`
@@ -158644,7 +158974,7 @@ ${e?.toString()}`);
             sessionId,
             setTimeout(() => {
               this.staleSessionTimers.delete(sessionId);
-              this.closeStaleSession(sessionId);
+              this.closeStaleSession(sessionId, minQuietMs);
             }, deadSessionTimeoutMs(this.dataProvider.featureFlags))
           );
           break;
@@ -158673,6 +159003,9 @@ ${e?.toString()}`);
         if (s.isClosing || s.subscriptions.size > 0) {
           continue;
         }
+        if (this.staleSessionTimers.has(s.id)) {
+          continue;
+        }
         const idleSec = Math.round((Date.now() - s.timestamp) / 1e3);
         if (!staleSessionShouldClose(
           s,
@@ -159315,77 +159648,6 @@ var EntityStateProvider = class extends Service {
   }
 };
 
-// ../../node_modules/.pnpm/@matter+main@0.17.9/node_modules/@matter/main/dist/esm/clusters.js
-init_nodejs();
-
-// ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/index.js
-init_access_control();
-init_actions();
-init_administrator_commissioning();
-
-// ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/alarm-base.js
-init_ClusterType();
-init_esm2();
-var AlarmBase3 = ClusterType(AlarmBase2);
-
-// ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/index.js
-init_basic_information();
-init_binding();
-init_bridged_device_basic_information();
-init_commissioner_control();
-
-// ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/concentration-measurement.js
-init_ClusterType();
-init_esm2();
-var ConcentrationMeasurement3 = ClusterType(ConcentrationMeasurement2);
-
-// ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/index.js
-init_descriptor();
-init_diagnostic_logs();
-init_ethernet_network_diagnostics();
-init_general_commissioning();
-init_general_diagnostics();
-init_group_key_management();
-init_groupcast();
-init_icd_management();
-init_identify();
-
-// ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/label.js
-init_ClusterType();
-init_esm2();
-var Label3 = ClusterType(Label2);
-
-// ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/index.js
-init_localization_configuration();
-init_network_commissioning();
-init_operational_credentials();
-init_ota_software_update_provider();
-init_ota_software_update_requestor();
-init_power_source();
-init_power_source_configuration();
-
-// ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/resource-monitoring.js
-init_ClusterType();
-init_esm2();
-var ResourceMonitoring3 = ClusterType(ResourceMonitoring2);
-
-// ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/index.js
-init_software_diagnostics();
-init_thread_network_diagnostics();
-init_time_format_localization();
-init_time_synchronization();
-init_tls_certificate_management();
-init_tls_client_management();
-init_unit_localization();
-
-// ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/web-rtc-transport-definitions.js
-init_ClusterType();
-init_esm2();
-var WebRtcTransportDefinitions3 = ClusterType(WebRtcTransportDefinitions2);
-
-// ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/index.js
-init_wi_fi_network_diagnostics();
-
 // src/utils/converters/fan-mode.ts
 var FanMode = class _FanMode {
   constructor(mode, sequence) {
@@ -159574,7 +159836,7 @@ init_esm();
 init_esm7();
 import crypto6 from "node:crypto";
 init_home_assistant_entity_behavior();
-var logger203 = Logger.get("BasicInformationServer");
+var logger204 = Logger.get("BasicInformationServer");
 var appliedUniqueIds = /* @__PURE__ */ new Map();
 var BasicInformationServer2 = class extends BridgedDeviceBasicInformationServer {
   async initialize() {
@@ -159620,7 +159882,7 @@ var BasicInformationServer2 = class extends BridgedDeviceBasicInformationServer
       // records keyed on it can be shed (#385).
       uniqueId: this.frozenUniqueId(anchor)
     });
-    logger203.debug(
+    logger204.debug(
       `[${entity.entity_id}] basicInfo vendor=${this.state.vendorName} product=${this.state.productName} label=${this.state.productLabel} serial=${this.state.serialNumber} node=${this.state.nodeLabel} uniqueId=${this.state.uniqueId}`
     );
   }
@@ -159650,7 +159912,7 @@ function isValidVendorId(value) {
 // src/matter/behaviors/electrical-energy-measurement-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger204 = Logger.get("ElectricalEnergyMeasurementServer");
+var logger205 = Logger.get("ElectricalEnergyMeasurementServer");
 var FeaturedBase = ElectricalEnergyMeasurementServer.with("CumulativeEnergy", "ImportedEnergy");
 var ElectricalEnergyMeasurementServerBase = class extends FeaturedBase {
   async initialize() {
@@ -159659,7 +159921,7 @@ var ElectricalEnergyMeasurementServerBase = class extends FeaturedBase {
     const entityId = homeAssistant.entityId;
     const energyEntity = homeAssistant.state.mapping?.energyEntity;
     if (energyEntity) {
-      logger204.debug(
+      logger205.debug(
         `[${entityId}] ElectricalEnergyMeasurement using mapped energy entity: ${energyEntity}`
       );
     }
@@ -159715,7 +159977,7 @@ var HaElectricalEnergyMeasurementServer = ElectricalEnergyMeasurementServerBase.
 // src/matter/behaviors/electrical-power-measurement-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger205 = Logger.get("ElectricalPowerMeasurementServer");
+var logger206 = Logger.get("ElectricalPowerMeasurementServer");
 var FeaturedBase2 = ElectricalPowerMeasurementServer.with("AlternatingCurrent");
 var ElectricalPowerMeasurementServerBase = class extends FeaturedBase2 {
   async initialize() {
@@ -159724,7 +159986,7 @@ var ElectricalPowerMeasurementServerBase = class extends FeaturedBase2 {
     const entityId = homeAssistant.entityId;
     const powerEntity = homeAssistant.state.mapping?.powerEntity;
     if (powerEntity) {
-      logger205.debug(
+      logger206.debug(
         `[${entityId}] ElectricalPowerMeasurement using mapped power entity: ${powerEntity}`
       );
     }
@@ -159863,7 +160125,7 @@ init_home_assistant_entity_behavior();
 // src/matter/behaviors/humidity-measurement-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger206 = Logger.get("HumidityMeasurementServer");
+var logger207 = Logger.get("HumidityMeasurementServer");
 var HumidityMeasurementServerBase = class extends RelativeHumidityMeasurementServer {
   async initialize() {
     await super.initialize();
@@ -159876,7 +160138,7 @@ var HumidityMeasurementServerBase = class extends RelativeHumidityMeasurementSer
       return;
     }
     const humidity = this.getHumidity(this.state.config, entity.state);
-    logger206.debug(
+    logger207.debug(
       `Humidity ${entity.state.entity_id} raw=${entity.state.state} measuredValue=${humidity}`
     );
     applyPatchState(this.state, {
@@ -159906,7 +160168,7 @@ function HumidityMeasurementServer(config8) {
 // src/matter/behaviors/power-source-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger207 = Logger.get("PowerSourceServer");
+var logger208 = Logger.get("PowerSourceServer");
 var FeaturedBase3 = PowerSourceServer.with("Battery", "Rechargeable");
 var PowerSourceServerBase = class extends FeaturedBase3 {
   async initialize() {
@@ -159918,17 +160180,17 @@ var PowerSourceServerBase = class extends FeaturedBase3 {
       applyPatchState(this.state, {
         endpointList: [endpointNumber]
       });
-      logger207.debug(
+      logger208.debug(
         `[${entityId}] PowerSource initialized with endpointList=[${endpointNumber}]`
       );
     } else {
-      logger207.warn(
+      logger208.warn(
         `[${entityId}] PowerSource endpoint number is null during initialize - endpointList will be empty!`
       );
     }
     const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
     if (batteryEntity) {
-      logger207.debug(
+      logger208.debug(
         `[${entityId}] PowerSource using mapped battery entity: ${batteryEntity}`
       );
     }
@@ -160143,6 +160405,7 @@ init_dist();
 
 // src/matter/behaviors/fan-control-server.ts
 init_esm();
+init_home_assistant_actions();
 
 // src/utils/converters/fan-mode-order.ts
 var SPEED_RANK = {
@@ -160181,26 +160444,36 @@ var SPEED_RANK = {
   boost: 7,
   jet: 7
 };
-function rankOf(token) {
-  const key = token.toLowerCase().replace(/[ _-]/g, "");
-  if (key in SPEED_RANK) {
-    return SPEED_RANK[key];
-  }
+function speedTokenKey(token) {
+  return token.toLowerCase().replace(/[ _-]/g, "");
+}
+function speedNumericValue(token) {
+  const key = speedTokenKey(token).replace(/%$/, "");
   const level = key.match(/^level(\d+)$/);
   if (level) {
     return Number(level[1]);
   }
-  if (/^\d+$/.test(key)) {
-    return Number(key);
-  }
-  return void 0;
+  return /^\d+$/.test(key) ? Number(key) : void 0;
+}
+function rankOf(token) {
+  return SPEED_RANK[speedTokenKey(token)];
+}
+function sortByRank(presets, ranks) {
+  return presets.map((value, index) => ({ value, index, rank: ranks[index] })).sort((a, b) => a.rank - b.rank || a.index - b.index).map((entry) => entry.value);
 }
 function toAscendingSpeedPresets(presets) {
+  const numerics = presets.map(speedNumericValue);
+  if (numerics.every((value) => value !== void 0)) {
+    return sortByRank(presets, numerics);
+  }
+  if (numerics.some((value) => value !== void 0)) {
+    return presets.slice();
+  }
   const ranks = presets.map(rankOf);
   if (ranks.some((rank) => rank === void 0)) {
     return presets.slice();
   }
-  return presets.map((value, index) => ({ value, index, rank: ranks[index] })).sort((a, b) => a.rank - b.rank || a.index - b.index).map((entry) => entry.value);
+  return sortByRank(presets, ranks);
 }
 function percentToPresetIndex(percentage, count) {
   if (count <= 0) {
@@ -160238,12 +160511,8 @@ var FanSpeed = class _FanSpeed {
   }
 };
 
-// src/utils/transaction-is-offline.ts
-function transactionIsOffline(context) {
-  return !context || hasLocalActor(context);
-}
-
 // src/matter/behaviors/fan-control-server.ts
+init_transaction_is_offline();
 init_home_assistant_entity_behavior();
 
 // src/matter/behaviors/on-off-server.ts
@@ -160297,7 +160566,7 @@ function notifyLightTurnedOff(entityId, haLastChanged) {
   sweepLastTurnOff(now);
   lastTurnOffTimestamps.set(entityId, { ts: now, haLastChanged });
 }
-var logger208 = Logger.get("LevelControlServer");
+var logger209 = Logger.get("LevelControlServer");
 var FeaturedBase5 = LevelControlServer.with("OnOff", "Lighting");
 var LevelControlServerBase = class extends FeaturedBase5 {
   pendingTransitionTime;
@@ -160315,7 +160584,7 @@ var LevelControlServerBase = class extends FeaturedBase5 {
     try {
       await super.initialize();
     } catch (error) {
-      logger208.error("super.initialize() failed:", error);
+      logger209.error("super.initialize() failed:", error);
       throw error;
     }
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
@@ -160433,7 +160702,7 @@ var LevelControlServerBase = class extends FeaturedBase5 {
         expectedLevel: remembered,
         timestamp: now2
       });
-      logger208.debug(
+      logger209.debug(
         `[${entityId}] Storing level ${level} without calling HA - moveToLevel arrived ${sinceTurnOff}ms after a Matter off while still off (#434)`
       );
       return;
@@ -160444,7 +160713,7 @@ var LevelControlServerBase = class extends FeaturedBase5 {
       const lastTurnOn = lastTurnOnTimestamps.get(entityId);
       const timeSinceTurnOn = lastTurnOn ? Date.now() - lastTurnOn : Infinity;
       if (level >= this.maxLevel && timeSinceTurnOn < 200) {
-        logger208.debug(
+        logger209.debug(
           `[${entityId}] Ignoring moveToLevel(${level}) - Alexa brightness reset detected (${timeSinceTurnOn}ms after turn-on)`
         );
         return;
@@ -160490,7 +160759,7 @@ function LevelControlServer2(config8) {
 }
 
 // src/matter/behaviors/on-off-server.ts
-var logger209 = Logger.get("OnOffServer");
+var logger210 = Logger.get("OnOffServer");
 var optimisticOnOffState = /* @__PURE__ */ new Map();
 var OPTIMISTIC_TIMEOUT_MS2 = 3e3;
 function sweepOptimisticOnOff(now) {
@@ -160554,7 +160823,7 @@ var OnOffServerBase = class extends OnOffServer {
     if (!action) {
       return;
     }
-    logger209.info(`[${homeAssistant.entityId}] Turning ON -> ${action.action}`);
+    logger210.info(`[${homeAssistant.entityId}] Turning ON -> ${action.action}`);
     notifyLightTurnedOn(homeAssistant.entityId);
     if (!skipMomentaryFlip) {
       const now = Date.now();
@@ -160585,7 +160854,7 @@ var OnOffServerBase = class extends OnOffServer {
     if (!action) {
       return;
     }
-    logger209.info(`[${homeAssistant.entityId}] Turning OFF -> ${action.action}`);
+    logger210.info(`[${homeAssistant.entityId}] Turning OFF -> ${action.action}`);
     const now = Date.now();
     sweepOptimisticOnOff(now);
     optimisticOnOffState.set(homeAssistant.entityId, {
@@ -160619,10 +160888,26 @@ function setOptimisticOnOff(entityId, expectedOnOff) {
 }
 
 // src/matter/behaviors/fan-control-server.ts
-var logger210 = Logger.get("FanControlServer");
+var logger211 = Logger.get("FanControlServer");
 var defaultStepSize = 33.33;
 var minSpeedMax = 3;
 var maxSpeedMax = 100;
+var fanDebounce = /* @__PURE__ */ new WeakMap();
+function getFanDebounce(endpoint) {
+  let st = fanDebounce.get(endpoint);
+  if (!st) {
+    st = { timer: null, pending: null };
+    fanDebounce.set(endpoint, st);
+  }
+  return st;
+}
+function clearFanDebounce(st) {
+  if (st.timer) {
+    clearTimeout(st.timer);
+    st.timer = null;
+  }
+  st.pending = null;
+}
 var FeaturedBase6 = FanControlServer.with(
   "Step",
   "MultiSpeed",
@@ -160653,6 +160938,14 @@ var FanControlServerBase = class extends FeaturedBase6 {
       auto: this.lastIsAutoMode
     };
   }
+  async [Symbol.asyncDispose]() {
+    const st = fanDebounce.get(this.endpoint);
+    if (st) {
+      clearFanDebounce(st);
+      fanDebounce.delete(this.endpoint);
+    }
+    await super[Symbol.asyncDispose]();
+  }
   async initialize() {
     if (this.state.fanModeSequence == null) {
       this.state.fanModeSequence = this.features.auto ? FanControl3.FanModeSequence.OffLowMedHighAuto : FanControl3.FanModeSequence.OffLowMedHigh;
@@ -160814,7 +161107,7 @@ var FanControlServerBase = class extends FeaturedBase6 {
     if (!homeAssistant.isAvailable) {
       return;
     }
-    this.syncOnOff(percentSetting !== 0);
+    this.syncOnOffFromSpeed(percentSetting !== 0);
     if (percentSetting === 0) {
       homeAssistant.callAction(this.state.config.turnOff(void 0, this.agent));
     } else {
@@ -160859,7 +161152,7 @@ var FanControlServerBase = class extends FeaturedBase6 {
       }
       const targetFanMode = FanMode.create(fanMode, this.state.fanModeSequence);
       if (targetFanMode.mode === FanControl3.FanMode.Auto) {
-        this.syncOnOff(true);
+        this.syncOnOffFromSpeed(true);
         homeAssistant.callAction(
           this.state.config.setAutoMode(void 0, this.agent)
         );
@@ -160879,6 +161172,53 @@ var FanControlServerBase = class extends FeaturedBase6 {
       this.applyPercentageAction(percentage);
     });
   }
+  // Per-entity override wins over the per-bridge flag; both must be > 0 to
+  // count. Mirrors WindowCoveringServerBase.resolveDebounceOverride.
+  resolveFanDebounceMs(homeAssistant) {
+    const fromEntity = homeAssistant.state.mapping?.fanSliderDebounceMs;
+    if (typeof fromEntity === "number" && fromEntity > 0) {
+      return fromEntity;
+    }
+    const fromBridge = this.env.get(BridgeDataProvider).featureFlags?.fanSliderDebounceMs;
+    if (typeof fromBridge === "number" && fromBridge > 0) {
+      return fromBridge;
+    }
+    return null;
+  }
+  // Send a speed-derived action, or park it in the debounce window so only the
+  // last write of a burst reaches HA. Cluster state was already updated per
+  // write, so the controller sees immediate feedback either way. With no
+  // window configured this is a plain callAction, the historic path.
+  dispatchSpeedAction(homeAssistant, action) {
+    const debounceMs = this.resolveFanDebounceMs(homeAssistant);
+    if (debounceMs == null) {
+      homeAssistant.callAction(action);
+      return;
+    }
+    homeAssistant.assertAvailable();
+    const entityId = homeAssistant.entityId;
+    const actions = this.env.get(HomeAssistantActions);
+    const st = getFanDebounce(this.endpoint);
+    st.pending = { action, entityId, actions };
+    if (st.timer) {
+      clearTimeout(st.timer);
+    }
+    st.timer = setTimeout(() => {
+      st.timer = null;
+      const pending = st.pending;
+      st.pending = null;
+      if (pending) {
+        pending.actions.call(pending.action, pending.entityId);
+      }
+    }, debounceMs);
+  }
+  // Devices whose fan cannot stop (air conditioners) opt out of driving OnOff
+  // from speed: speed zero is a speed change, not a power change (#442).
+  syncOnOffFromSpeed(on) {
+    if (this.state.config.syncOnOffWithSpeed !== false) {
+      this.syncOnOff(on);
+    }
+  }
   applyPercentageAction(percentage) {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     if (!homeAssistant.isAvailable) {
@@ -160888,7 +161228,7 @@ var FanControlServerBase = class extends FeaturedBase6 {
     const wasOff = homeAssistant.entity.state?.state === "off" || this.agent.has(OnOffBehavior) && !this.agent.get(OnOffBehavior).state.onOff;
     const remembered = this.remembered();
     if (wasOff) {
-      logger210.debug(
+      logger211.debug(
         `[${homeAssistant.entityId}] power-on write ${percentage}%: restore flag=${restoreOnPowerOn}, last speed=${remembered.percent}`
       );
     }
@@ -160911,9 +161251,12 @@ var FanControlServerBase = class extends FeaturedBase6 {
       homeAssistant.entity.state,
       this.agent
     );
-    this.syncOnOff(percentage !== 0);
+    this.syncOnOffFromSpeed(percentage !== 0);
     if (percentage === 0) {
-      homeAssistant.callAction(config8.turnOff(void 0, this.agent));
+      this.dispatchSpeedAction(
+        homeAssistant,
+        config8.turnOff(void 0, this.agent)
+      );
     } else if (supportsPercentage) {
       const stepSize = config8.getStepSize(
         homeAssistant.entity.state,
@@ -160924,7 +161267,10 @@ var FanControlServerBase = class extends FeaturedBase6 {
         stepSize ?? 1,
         Math.min(100, roundedPercentage)
       );
-      homeAssistant.callAction(config8.turnOn(clampedPercentage, this.agent));
+      this.dispatchSpeedAction(
+        homeAssistant,
+        config8.turnOn(clampedPercentage, this.agent)
+      );
       this.rememberSpeed(clampedPercentage);
     } else {
       const presetModes = config8.getPresetModes(homeAssistant.entity.state, this.agent) ?? [];
@@ -160937,7 +161283,8 @@ var FanControlServerBase = class extends FeaturedBase6 {
           speedPresets.length
         );
         const targetPreset = speedPresets[presetIndex];
-        homeAssistant.callAction(
+        this.dispatchSpeedAction(
+          homeAssistant,
           config8.setPresetMode(targetPreset, this.agent)
         );
         this.rememberSpeed(percentage);
@@ -161074,7 +161421,7 @@ var FanControlServerBase = class extends FeaturedBase6 {
       const entityId = this.agent.get(HomeAssistantEntityBehavior).entity.entity_id;
       setOptimisticOnOff(entityId, on);
     } catch (e) {
-      logger210.debug(
+      logger211.debug(
         `syncOnOff(${on}) failed: ${e instanceof Error ? e.message : String(e)}`
       );
     }
@@ -161217,7 +161564,7 @@ var FanOnOffServer = OnOffServer2({
 });
 
 // src/matter/endpoints/composed/composed-air-purifier-endpoint.ts
-var logger211 = Logger.get("ComposedAirPurifierEndpoint");
+var logger212 = Logger.get("ComposedAirPurifierEndpoint");
 var temperatureConfig = {
   getValue(entity, agent) {
     const fallbackUnit = agent.env.get(HomeAssistantConfig).unitSystem.temperature;
@@ -161435,7 +161782,7 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
       config8.powerEntityId ? "+Pwr" : "",
       config8.energyEntityId ? "+Nrg" : ""
     ].filter(Boolean).join("");
-    logger211.info(
+    logger212.info(
       `Created composed air purifier ${primaryEntityId}: ${clusterLabels}`
     );
     return endpoint;
@@ -161608,6 +161955,19 @@ function rockSettingToSwingMode(setting) {
   }
   return "off";
 }
+function climateFanOffMode(fanModes) {
+  const modes = fanModes ?? [];
+  const declaredOff = modes.find(
+    (mode) => ["off", "none", "stop"].includes(mode.trim().toLowerCase())
+  );
+  if (declaredOff) {
+    return declaredOff;
+  }
+  const speeds = toAscendingSpeedPresets(
+    modes.filter((mode) => mode.toLowerCase() !== "auto")
+  );
+  return speeds[0] ?? "off";
+}
 var climateFanControlConfig = {
   getPercentage: () => void 0,
   getStepSize: () => void 0,
@@ -161623,16 +161983,33 @@ var climateFanControlConfig = {
     return attributes4(entity).fan_mode ?? void 0;
   },
   supportsPercentage: () => false,
+  // An AC's fan cannot stop while the compressor runs, so speed zero must not
+  // report the unit as powered off. Without this the Matter OnOff cluster flips
+  // false at zero, the controller shows the AC off, HA reports it still on, and
+  // the tile flaps back. Power stays with the OnOff cluster's own commands.
+  syncOnOffWithSpeed: false,
   isOscillating: (entity) => attributes4(entity).swing_mode?.toLowerCase() !== "off" && attributes4(entity).swing_mode != null,
   supportsOscillation: (entity) => (attributes4(entity).swing_modes?.length ?? 0) > 0,
   getRockSetting: (entity) => swingModeToRockSetting(attributes4(entity).swing_mode),
   // Climate devices don't typically support wind modes
   getWindMode: () => void 0,
   supportsWind: () => false,
-  turnOff: () => ({
-    action: "climate.set_fan_mode",
-    data: { fan_mode: "off" }
-  }),
+  // A controller writing percentSetting 0 lands here. An air conditioner's fan
+  // cannot stop independently of the compressor, and HA climate entities almost
+  // never declare an "off" fan mode - sending the literal "off" just fails the
+  // service call, so the slider's bottom position silently does nothing.
+  // Clamp to the slowest real speed instead, unless the entity genuinely offers
+  // an off-like mode, in which case use its own spelling (HA fan mode names are
+  // case-sensitive). Power stays with the OnOff cluster, which is where a
+  // controller's actual "off" belongs.
+  turnOff: (_, agent) => {
+    const entityState = agent.get(HomeAssistantEntityBehavior).state.entity.state;
+    const fanMode = climateFanOffMode(attributes4(entityState).fan_modes);
+    return {
+      action: "climate.set_fan_mode",
+      data: { fan_mode: fanMode }
+    };
+  },
   turnOn: () => ({
     action: "climate.set_fan_mode",
     data: { fan_mode: "on" }
@@ -161721,11 +162098,16 @@ var humidityConfig2 = {
 var ClimateHumidityMeasurementServer = HumidityMeasurementServer(humidityConfig2);
 
 // src/matter/endpoints/legacy/climate/behaviors/climate-on-off-server.ts
+init_esm();
 init_home_assistant_entity_behavior();
+var logger213 = Logger.get("ClimateOnOffServer");
 var ClimateOnOffServer = OnOffServer2({
   turnOn: (_value, agent) => {
     const entity = agent.get(HomeAssistantEntityBehavior).entity;
-    if (entity.state.state !== "off") {
+    if (entity.state.state !== "off" && agent.get(OnOffServer).state.onOff) {
+      logger213.debug(
+        `[${entity.entity_id}] Skipping redundant OnOff.on(), cached state "${entity.state.state}"`
+      );
       return void 0;
     }
     return { action: "climate.turn_on" };
@@ -161757,7 +162139,8 @@ init_home_assistant_entity_behavior();
 // src/matter/behaviors/thermostat-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger212 = Logger.get("ThermostatServer");
+init_transaction_is_offline();
+var logger214 = Logger.get("ThermostatServer");
 var SystemMode = Thermostat3.SystemMode;
 var RunningMode = Thermostat3.ThermostatRunningMode;
 var nudgingSetpoints = /* @__PURE__ */ new Set();
@@ -161836,7 +162219,7 @@ function clearInactiveSetpointState(self, scope) {
 }
 function thermostatPreInitialize(self) {
   const currentLocal = self.state.localTemperature;
-  logger212.debug(
+  logger214.debug(
     `initialize: features - heating=${self.features.heating}, cooling=${self.features.cooling}`
   );
   const localValue = typeof currentLocal === "number" && !Number.isNaN(currentLocal) ? currentLocal : currentLocal === null ? null : 2100;
@@ -161883,7 +162266,7 @@ function thermostatPreInitialize(self) {
   } else {
     clearInactiveSetpointState(self, "Cool");
   }
-  logger212.debug(
+  logger214.debug(
     `initialize: after force-set - local=${self.state.localTemperature}`
   );
   self.state.thermostatRunningState = runningStateAllOff;
@@ -161976,7 +162359,7 @@ var ThermostatServerBase = class extends FullFeaturedBase {
       maxCoolLimit,
       "cool"
     );
-    logger212.debug(
+    logger214.debug(
       `update: limits heat=[${minHeatLimit}, ${maxHeatLimit}], cool=[${minCoolLimit}, ${maxCoolLimit}], systemMode=${systemMode}, runningMode=${runningMode}`
     );
     let controlSequence = config8.getControlSequence(entity.state, this.agent);
@@ -162049,18 +162432,18 @@ var ThermostatServerBase = class extends FullFeaturedBase {
    */
   // biome-ignore lint/correctness/noUnusedPrivateClassMembers: Called via thermostatPostInitialize + prototype copy
   heatingSetpointChanging(value, _oldValue, context) {
-    logger212.debug(
+    logger214.debug(
       `heatingSetpointChanging: value=${value}, oldValue=${_oldValue}, isOffline=${transactionIsOffline(context)}`
     );
     if (transactionIsOffline(context)) {
-      logger212.debug(
+      logger214.debug(
         "heatingSetpointChanging: skipping - transaction is offline"
       );
       return;
     }
     const next = Temperature.celsius(value / 100);
     if (!next) {
-      logger212.debug("heatingSetpointChanging: skipping - invalid temperature");
+      logger214.debug("heatingSetpointChanging: skipping - invalid temperature");
       return;
     }
     this.agent.asLocalActor(() => {
@@ -162071,7 +162454,7 @@ var ThermostatServerBase = class extends FullFeaturedBase {
         this.agent
       );
       const currentMode2 = this.state.systemMode;
-      logger212.debug(
+      logger214.debug(
         `heatingSetpointChanging: supportsRange=${supportsRange}, systemMode=${currentMode2}, features.heating=${this.features.heating}, features.cooling=${this.features.cooling}`
       );
       if (!supportsRange) {
@@ -162081,12 +162464,12 @@ var ThermostatServerBase = class extends FullFeaturedBase {
         const isOff = currentMode2 === Thermostat3.SystemMode.Off;
         if (isOff && this.features.heating) {
           if (nudgingSetpoints.has(homeAssistant.entityId)) {
-            logger212.debug(
+            logger214.debug(
               `heatingSetpointChanging: skipping auto-resume - nudge write in progress`
             );
             return;
           }
-          logger212.info(
+          logger214.info(
             `heatingSetpointChanging: auto-resume - switching to Heat (was Off)`
           );
           const modeAction = config8.setSystemMode(
@@ -162095,17 +162478,17 @@ var ThermostatServerBase = class extends FullFeaturedBase {
           );
           homeAssistant.callAction(modeAction);
         } else if (!isAutoMode && !isHeatingMode) {
-          logger212.debug(
+          logger214.debug(
             `heatingSetpointChanging: skipping - not in heating/auto mode (mode=${currentMode2}, haMode=${haHvacMode})`
           );
           return;
         }
-        logger212.debug(
+        logger214.debug(
           `heatingSetpointChanging: proceeding - isAutoMode=${isAutoMode}, isHeatingMode=${isHeatingMode}, isOff=${isOff}, haMode=${haHvacMode}`
         );
       }
       const coolingSetpoint = this.features.cooling ? this.state.occupiedCoolingSetpoint : value;
-      logger212.debug(
+      logger214.debug(
         `heatingSetpointChanging: calling setTemperature with heat=${next.celsius(true)}, cool=${coolingSetpoint}`
       );
       this.setTemperature(
@@ -162144,12 +162527,12 @@ var ThermostatServerBase = class extends FullFeaturedBase {
         const isOff = currentMode2 === Thermostat3.SystemMode.Off;
         if (isOff && !this.features.heating && this.features.cooling) {
           if (nudgingSetpoints.has(homeAssistant.entityId)) {
-            logger212.debug(
+            logger214.debug(
               `coolingSetpointChanging: skipping auto-resume - nudge write in progress`
             );
             return;
           }
-          logger212.info(
+          logger214.info(
             `coolingSetpointChanging: auto-resume - switching to Cool (was Off)`
           );
           const modeAction = config8.setSystemMode(
@@ -162158,12 +162541,12 @@ var ThermostatServerBase = class extends FullFeaturedBase {
           );
           homeAssistant.callAction(modeAction);
         } else if (!isAutoMode && !isCoolingMode) {
-          logger212.debug(
+          logger214.debug(
             `coolingSetpointChanging: skipping - not in cooling/auto mode (mode=${currentMode2}, haMode=${haHvacMode})`
           );
           return;
         }
-        logger212.debug(
+        logger214.debug(
           `coolingSetpointChanging: proceeding - isAutoMode=${isAutoMode}, isCoolingMode=${isCoolingMode}, isOff=${isOff}, haMode=${haHvacMode}`
         );
       }
@@ -162277,7 +162660,7 @@ var ThermostatServerBase = class extends FullFeaturedBase {
     const effectiveMax = max ?? 5e3;
     if (value == null || Number.isNaN(value)) {
       const defaultValue = type === "heat" ? 2e3 : 2400;
-      logger212.debug(
+      logger214.debug(
         `${type} setpoint is undefined, using default: ${defaultValue}`
       );
       return Math.max(effectiveMin, Math.min(effectiveMax, defaultValue));
@@ -162855,7 +163238,7 @@ function ClimateDevice(homeAssistantEntity, includeBasicInformation = true) {
 }
 
 // src/matter/endpoints/composed/composed-climate-fan-endpoint.ts
-var logger213 = Logger.get("ComposedClimateFanEndpoint");
+var logger215 = Logger.get("ComposedClimateFanEndpoint");
 function createEndpointId3(entityId, customName) {
   const baseName = customName || entityId;
   return baseName.replace(/\./g, "_").replace(/\s+/g, "_");
@@ -162893,7 +163276,7 @@ var ComposedClimateFanEndpoint = class _ComposedClimateFanEndpoint extends Endpo
       climateSub = new Endpoint(climateType, { id: `${endpointId}_climate` });
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      logger213.warn(
+      logger215.warn(
         `Companion fan: climate sub build failed for ${primaryEntityId}: ${message}`
       );
       return void 0;
@@ -162937,7 +163320,7 @@ var ComposedClimateFanEndpoint = class _ComposedClimateFanEndpoint extends Endpo
       endpointId,
       [climateSub, fanSub]
     );
-    logger213.info(`Created composed climate+fan endpoint ${primaryEntityId}`);
+    logger215.info(`Created composed climate+fan endpoint ${primaryEntityId}`);
     return endpoint;
   }
   constructor(type, entityId, id, parts) {
@@ -163032,7 +163415,7 @@ init_home_assistant_entity_behavior();
 // src/matter/behaviors/pressure-measurement-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger214 = Logger.get("PressureMeasurementServer");
+var logger216 = Logger.get("PressureMeasurementServer");
 var MIN_PRESSURE = 300;
 var MAX_PRESSURE = 1100;
 var PressureMeasurementServerBase = class extends PressureMeasurementServer {
@@ -163060,7 +163443,7 @@ var PressureMeasurementServerBase = class extends PressureMeasurementServer {
     }
     const rounded = Math.round(value);
     if (rounded < MIN_PRESSURE || rounded > MAX_PRESSURE) {
-      logger214.warn(
+      logger216.warn(
         `Pressure value ${rounded} (raw: ${value}) for ${entity.entity_id} is outside valid range [${MIN_PRESSURE}-${MAX_PRESSURE}], ignoring`
       );
       return null;
@@ -163079,7 +163462,7 @@ function PressureMeasurementServer2(config8) {
 }
 
 // src/matter/endpoints/composed/composed-sensor-endpoint.ts
-var logger215 = Logger.get("ComposedSensorEndpoint");
+var logger217 = Logger.get("ComposedSensorEndpoint");
 var temperatureConfig2 = {
   getValue(entity, agent) {
     const fallbackUnit = agent.env.get(HomeAssistantConfig).unitSystem.temperature;
@@ -163257,7 +163640,7 @@ var ComposedSensorEndpoint = class _ComposedSensorEndpoint extends Endpoint {
     if (config8.pressureEntityId && pressSub) {
       endpoint.subEndpoints.set(config8.pressureEntityId, pressSub);
     }
-    logger215.info(
+    logger217.info(
       `Created composed sensor ${primaryEntityId} with ${parts.length} sub-endpoint(s): T${humSub ? "+H" : ""}${pressSub ? "+P" : ""}${config8.batteryEntityId ? "+Bat" : ""}${config8.powerEntityId ? "+Pwr" : ""}${config8.energyEntityId ? "+Nrg" : ""}`
     );
     return endpoint;
@@ -163394,7 +163777,7 @@ init_home_assistant_entity_behavior();
 // src/matter/behaviors/mode-select-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger216 = Logger.get("ModeSelectServer");
+var logger218 = Logger.get("ModeSelectServer");
 function buildSupportedModes(options) {
   return options.map((label, index) => ({
     label: label.length > 64 ? label.substring(0, 64) : label,
@@ -163431,13 +163814,13 @@ var ModeSelectServerBase = class extends ModeSelectServer {
     const options = config8.getOptions(homeAssistant.entity);
     const { newMode } = request;
     if (newMode < 0 || newMode >= options.length) {
-      logger216.warn(
+      logger218.warn(
         `[${homeAssistant.entityId}] Invalid mode ${newMode}, options: [${options.join(", ")}]`
       );
       return;
     }
     const option = options[newMode];
-    logger216.info(
+    logger218.info(
       `[${homeAssistant.entityId}] changeToMode(${newMode}) -> "${option}"`
     );
     applyPatchState(this.state, { currentMode: newMode });
@@ -163988,7 +164371,7 @@ var CoAlarmWithBatteryType = SmokeCoAlarmDevice.with(
 );
 
 // src/matter/endpoints/legacy/binary-sensor/index.ts
-var logger217 = Logger.get("BinarySensorDevice");
+var logger219 = Logger.get("BinarySensorDevice");
 var deviceClasses = {
   [BinarySensorDeviceClass.CarbonMonoxide]: CoAlarmType,
   [BinarySensorDeviceClass.Gas]: CoAlarmType,
@@ -164039,11 +164422,11 @@ function BinarySensorDevice(homeAssistantEntity) {
   const originalTypeName = type.name;
   if (hasBattery && batteryTypes.has(type)) {
     type = batteryTypes.get(type);
-    logger217.info(
+    logger219.info(
       `[${entityId}] Using battery variant: ${originalTypeName} -> ${type.name}, batteryAttr=${hasBatteryAttr}, batteryEntity=${homeAssistantEntity.mapping?.batteryEntity ?? "none"}`
     );
   } else if (hasBattery) {
-    logger217.warn(
+    logger219.warn(
       `[${entityId}] Has battery but no variant available for ${originalTypeName}`
     );
   }
@@ -164130,7 +164513,7 @@ init_home_assistant_entity_behavior();
 init_esm();
 init_home_assistant_actions();
 init_home_assistant_entity_behavior();
-var logger218 = Logger.get("WindowCoveringServer");
+var logger220 = Logger.get("WindowCoveringServer");
 var MovementStatus = WindowCovering3.MovementStatus;
 var FeaturedBase7 = WindowCoveringServer.with(
   "Lift",
@@ -164341,7 +164724,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
       }
       return existing100ths ?? current100ths;
     };
-    logger218.debug(
+    logger220.debug(
       `Cover update for ${entity.entity_id}: state=${state.state}, lift=${currentLift}%, tilt=${currentTilt}%, ha=${MovementStatus[movementStatus]}, effective=${MovementStatus[globalStatus]}`
     );
     const overrideType = config8.getCoverType?.(state, this.agent);
@@ -164386,9 +164769,9 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     );
     if (Object.keys(appliedPatch).length > 0) {
       const hasOperationalChange = "operationalStatus" in appliedPatch;
-      const log = hasOperationalChange ? logger218.info : logger218.debug;
+      const log = hasOperationalChange ? logger220.info : logger220.debug;
       log.call(
-        logger218,
+        logger220,
         `Cover ${entity.entity_id} state changed: ${JSON.stringify(appliedPatch)}`
       );
     }
@@ -164497,7 +164880,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
             }
           });
         } catch (error) {
-          logger218.debug(
+          logger220.debug(
             `Optimistic ${axis} timeout write failed (endpoint may be closing): ${error}`
           );
         }
@@ -164507,12 +164890,32 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     optimistic[axis] = { status: status3, startedAt, timer, expectedRestEnd };
     this.writeOperationalStatus({ [axis]: status3 });
   }
+  // matter.js runs handleMovement as a worker, so a throw in there cannot fail
+  // the command. The commands that start movement check up front instead, and
+  // the HA call is deferred past the debounce anyway, outside the transaction
+  // where a rollback could not undo the optimistic target (#446).
+  async upOrOpen() {
+    this.agent.get(HomeAssistantEntityBehavior).assertAvailable();
+    return super.upOrOpen();
+  }
+  async downOrClose() {
+    this.agent.get(HomeAssistantEntityBehavior).assertAvailable();
+    return super.downOrClose();
+  }
+  async goToLiftPercentage(request) {
+    this.agent.get(HomeAssistantEntityBehavior).assertAvailable();
+    return super.goToLiftPercentage(request);
+  }
+  async goToTiltPercentage(request) {
+    this.agent.get(HomeAssistantEntityBehavior).assertAvailable();
+    return super.goToTiltPercentage(request);
+  }
   async handleMovement(type, _, direction, targetPercent100ths) {
     const currentLift = this.state.currentPositionLiftPercent100ths ?? 0;
     const currentTilt = this.state.currentPositionTiltPercent100ths ?? 0;
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const flags2 = this.state.config.getDiagnosticFlags?.(this.agent);
-    logger218.info(
+    logger220.info(
       `handleMovement ${homeAssistant.entityId}: type=${MovementType[type]}, direction=${MovementDirection[direction]}, target=${targetPercent100ths}, currentLift=${currentLift}, currentTilt=${currentTilt}${flags2 ? `, ${flags2}` : ""}`
     );
     if (type === MovementType.Lift) {
@@ -164531,7 +164934,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
       }
     } else if (type === MovementType.Tilt) {
       if (targetPercent100ths == null && this.lastLiftMovementDirection === direction && Date.now() - this.lastLiftMovementMs < 50) {
-        logger218.info(
+        logger220.info(
           `Skipping tilt ${MovementDirection[direction]}, lift already moving in same direction`
         );
         return;
@@ -164576,7 +164979,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     } else {
       this.startOptimisticMovement("lift", MovementStatus.Opening, end);
     }
-    logger218.info(
+    logger220.info(
       `handleLiftOpen ${homeAssistant.entityId}: calling action=${action.action}, atRest=${atRest}, ${this.state.config.getDiagnosticFlags?.(this.agent) ?? ""}`
     );
     homeAssistant.callAction(action);
@@ -164592,7 +164995,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     } else {
       this.startOptimisticMovement("lift", MovementStatus.Closing, end);
     }
-    logger218.info(
+    logger220.info(
       `handleLiftClose ${homeAssistant.entityId}: calling action=${action.action}, atRest=${atRest}, ${this.state.config.getDiagnosticFlags?.(this.agent) ?? ""}`
     );
     homeAssistant.callAction(action);
@@ -164622,7 +165025,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     const isFirstInSequence = timeSinceLastCommand > _WindowCoveringServerBase.COMMAND_SEQUENCE_THRESHOLD_MS;
     const overrideMs = this.resolveDebounceOverride(homeAssistant);
     const debounceMs = overrideMs != null ? overrideMs : isFirstInSequence ? _WindowCoveringServerBase.DEBOUNCE_INITIAL_MS : _WindowCoveringServerBase.DEBOUNCE_SUBSEQUENT_MS;
-    logger218.debug(
+    logger220.debug(
       `Lift command: target=${targetPosition}%, debounce=${debounceMs}ms (${overrideMs != null ? "override" : isFirstInSequence ? "initial" : "subsequent"})`
     );
     if (st.liftTimer) {
@@ -164654,7 +165057,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
       this.startOptimisticMovement("tilt", MovementStatus.Opening, end);
     }
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-    logger218.info(
+    logger220.info(
       `handleTiltOpen ${homeAssistant.entityId}: calling action=${action.action}, atRest=${atRest}, ${this.state.config.getDiagnosticFlags?.(this.agent) ?? ""}`
     );
     homeAssistant.callAction(action);
@@ -164672,7 +165075,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
       this.startOptimisticMovement("tilt", MovementStatus.Closing, end);
     }
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-    logger218.info(
+    logger220.info(
       `handleTiltClose ${homeAssistant.entityId}: calling action=${action.action}, atRest=${atRest}, ${this.state.config.getDiagnosticFlags?.(this.agent) ?? ""}`
     );
     homeAssistant.callAction(action);
@@ -164702,7 +165105,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     const isFirstInSequence = timeSinceLastCommand > _WindowCoveringServerBase.COMMAND_SEQUENCE_THRESHOLD_MS;
     const overrideMs = this.resolveDebounceOverride(homeAssistant);
     const debounceMs = overrideMs != null ? overrideMs : isFirstInSequence ? _WindowCoveringServerBase.DEBOUNCE_INITIAL_MS : _WindowCoveringServerBase.DEBOUNCE_SUBSEQUENT_MS;
-    logger218.debug(
+    logger220.debug(
       `Tilt command: target=${targetPosition}%, debounce=${debounceMs}ms (${overrideMs != null ? "override" : isFirstInSequence ? "initial" : "subsequent"})`
     );
     if (st.tiltTimer) {
@@ -164754,7 +165157,7 @@ function adjustPositionForWriting(position, flags2, matterSemantics) {
 }
 
 // src/matter/endpoints/legacy/cover/behaviors/cover-window-covering-server.ts
-var logger219 = Logger.get("CoverWindowCoveringServer");
+var logger221 = Logger.get("CoverWindowCoveringServer");
 var attributes6 = (entity) => entity.attributes;
 var DEVICE_CLASS_TO_MATTER_TYPE = {
   curtain: {
@@ -164826,7 +165229,7 @@ var adjustPositionForReading2 = (position, agent) => {
   const { featureFlags } = agent.env.get(BridgeDataProvider);
   const matterSem = usesMatterSemantics(agent);
   const result = adjustPositionForReading(position, featureFlags, matterSem);
-  logger219.debug(`adjustPositionForReading: HA=${position}%, result=${result}%`);
+  logger221.debug(`adjustPositionForReading: HA=${position}%, result=${result}%`);
   return result;
 };
 var adjustPositionForWriting2 = (position, agent) => {
@@ -165051,14 +165454,14 @@ var CoverAsDimmableLightWithBatteryType = DimmableLightDevice.with(
 );
 
 // src/matter/endpoints/legacy/cover/index.ts
-var logger220 = Logger.get("CoverDevice");
+var logger222 = Logger.get("CoverDevice");
 var CoverDeviceType = (supportedFeatures, hasBattery, entityId) => {
   const features = /* @__PURE__ */ new Set();
   if (testBit(supportedFeatures, CoverSupportedFeatures.support_open)) {
     features.add("Lift");
     features.add("PositionAwareLift");
   } else {
-    logger220.warn(
+    logger222.warn(
       `[${entityId}] Cover has no support_open feature (supported_features=${supportedFeatures}), adding Lift anyway`
     );
     features.add("Lift");
@@ -165073,7 +165476,7 @@ var CoverDeviceType = (supportedFeatures, hasBattery, entityId) => {
       features.add("PositionAwareTilt");
     }
   }
-  logger220.info(
+  logger222.info(
     `[${entityId}] Creating WindowCovering with features: [${[...features].join(", ")}], supported_features=${supportedFeatures}`
   );
   const baseBehaviors2 = [
@@ -165097,16 +165500,16 @@ function CoverDevice(homeAssistantEntity) {
   const hasBatteryEntity = !!homeAssistantEntity.mapping?.batteryEntity;
   const hasBattery = hasBatteryAttr || hasBatteryEntity;
   if (hasBattery) {
-    logger220.info(
+    logger222.info(
       `[${entityId}] Creating cover with PowerSource cluster, batteryAttr=${hasBatteryAttr}, batteryEntity=${homeAssistantEntity.mapping?.batteryEntity ?? "none"}`
     );
   } else {
-    logger220.debug(
+    logger222.debug(
       `[${entityId}] Creating cover without battery (batteryAttr=${hasBatteryAttr}, batteryEntity=${homeAssistantEntity.mapping?.batteryEntity ?? "none"})`
     );
   }
   if (homeAssistantEntity.mapping?.coverExposeAsDimmableLight) {
-    logger220.info(`[${entityId}] Exposing cover as a Dimmable Light (#372)`);
+    logger222.info(`[${entityId}] Exposing cover as a Dimmable Light (#372)`);
     const type = hasBattery ? CoverAsDimmableLightWithBatteryType : CoverAsDimmableLightType;
     return type.set({ homeAssistantEntity });
   }
@@ -165221,7 +165624,7 @@ function DishwasherEndpoint(homeAssistantEntity) {
 // src/matter/behaviors/generic-switch-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger221 = Logger.get("GenericSwitchServer");
+var logger223 = Logger.get("GenericSwitchServer");
 var SimpleBase = SwitchServer.with(
   "MomentarySwitch",
   "MomentarySwitchRelease",
@@ -165263,7 +165666,7 @@ var HaGenericSwitchServerBase = class extends SimpleBase {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     const entityId = homeAssistant.entityId;
-    logger221.debug(`[${entityId}] GenericSwitch initialized (simple)`);
+    logger223.debug(`[${entityId}] GenericSwitch initialized (simple)`);
     this.reactTo(homeAssistant.onChange, this.handleEventChange);
   }
   handleEventChange() {
@@ -165274,7 +165677,7 @@ var HaGenericSwitchServerBase = class extends SimpleBase {
     const eventType = attrs.event_type;
     if (!eventType) return;
     const entityId = homeAssistant.entityId;
-    logger221.debug(`[${entityId}] Event fired: ${eventType}`);
+    logger223.debug(`[${entityId}] Event fired: ${eventType}`);
     this.triggerPress(eventType);
   }
   triggerPress(eventType) {
@@ -165320,7 +165723,7 @@ var HaGenericSwitchServerMultiBase = class extends FullBase {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     const entityId = homeAssistant.entityId;
-    logger221.debug(`[${entityId}] GenericSwitch initialized (multi)`);
+    logger223.debug(`[${entityId}] GenericSwitch initialized (multi)`);
     this.reactTo(homeAssistant.onChange, this.handleEventChange);
   }
   handleEventChange() {
@@ -165331,7 +165734,7 @@ var HaGenericSwitchServerMultiBase = class extends FullBase {
     const eventType = attrs.event_type;
     if (!eventType) return;
     const entityId = homeAssistant.entityId;
-    logger221.debug(`[${entityId}] Event fired: ${eventType}`);
+    logger223.debug(`[${entityId}] Event fired: ${eventType}`);
     this.triggerPress(eventType);
   }
   triggerPress(eventType) {
@@ -165708,7 +166111,7 @@ init_nodejs();
 init_home_assistant_entity_behavior();
 var OperationalState4 = RvcOperationalState4.OperationalState;
 var ErrorState = RvcOperationalState4.ErrorState;
-var logger222 = Logger.get("RvcOperationalStateServer");
+var logger224 = Logger.get("RvcOperationalStateServer");
 var activeStates = /* @__PURE__ */ new Set([
   OperationalState4.Running,
   OperationalState4.SeekingCharger
@@ -165760,7 +166163,7 @@ var RvcOperationalStateServerBase = class extends RvcOperationalStateServer {
       { force: true }
     );
     if (activeStates.has(previousState) && !activeStates.has(newState)) {
-      logger222.info(
+      logger224.info(
         `Operation completed: ${OperationalState4[previousState]} -> ${OperationalState4[newState]}`
       );
       try {
@@ -165773,7 +166176,7 @@ var RvcOperationalStateServerBase = class extends RvcOperationalStateServer {
           this.context
         );
       } catch (e) {
-        logger222.debug("Failed to emit operationCompletion event:", e);
+        logger224.debug("Failed to emit operationCompletion event:", e);
       }
     }
   }
@@ -165808,7 +166211,7 @@ var RvcOperationalStateServerBase = class extends RvcOperationalStateServer {
       const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
       homeAssistant.callAction(goHomeAction(void 0, this.agent));
     } else {
-      logger222.warn("GoHome command received but no goHome action configured");
+      logger224.warn("GoHome command received but no goHome action configured");
     }
     return {
       commandResponseState: {
@@ -165828,7 +166231,7 @@ function RvcOperationalStateServer2(config8) {
 }
 
 // src/matter/endpoints/legacy/lawn-mower/behaviors/lawn-mower-rvc-operational-state-server.ts
-var logger223 = Logger.get("LawnMowerRvcOperationalStateServer");
+var logger225 = Logger.get("LawnMowerRvcOperationalStateServer");
 function mapLawnMowerOperationalState(entity) {
   const state = entity.state;
   switch (state) {
@@ -165844,7 +166247,7 @@ function mapLawnMowerOperationalState(entity) {
     case "unavailable":
       return RvcOperationalState4.OperationalState.Error;
     default:
-      logger223.info(`Unknown lawn_mower state "${state}", treating as Stopped`);
+      logger225.info(`Unknown lawn_mower state "${state}", treating as Stopped`);
       return RvcOperationalState4.OperationalState.Stopped;
   }
 }
@@ -165898,7 +166301,7 @@ function inferCleanedAreaProgress(cleanedSqm, orderedAreas) {
 }
 
 // src/matter/behaviors/rvc-run-mode-server.ts
-var logger224 = Logger.get("RvcRunModeServer");
+var logger226 = Logger.get("RvcRunModeServer");
 var ROOM_MODE_BASE = 100;
 function isRoomMode(mode) {
   return mode >= ROOM_MODE_BASE;
@@ -166024,7 +166427,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
     const s = getSession(this.endpoint);
     if (s.loggedShortCircuits.has(reason)) return;
     s.loggedShortCircuits.add(reason);
-    logger224.info(message);
+    logger226.info(message);
   }
   /**
    * Read the currentRoomEntity sensor and update currentArea + progress
@@ -166081,7 +166484,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         }
       }
       if (matchedAreaId === null) {
-        logger224.info(
+        logger226.info(
           `currentRoom sensor: no match for "${roomName}" (segmentId=${segmentId}), activeAreas=[${s.activeAreas.join(", ")}], supportedAreas=[${serviceArea.state.supportedAreas.map((a) => `${a.areaId}:${a.areaInfo.locationInfo?.locationName}`).join(", ")}]`
         );
         return;
@@ -166091,14 +166494,14 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         s.completedAreas.add(s.lastCurrentArea);
       }
       s.lastCurrentArea = matchedAreaId;
-      logger224.info(
+      logger226.info(
         `currentRoom sensor: transition to area ${matchedAreaId} ("${roomName}"), completed: [${[...s.completedAreas].join(", ")}]`
       );
       this.trySetCurrentArea(matchedAreaId);
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e);
       if (!msg.includes("No provider for") && !msg.includes("not supported")) {
-        logger224.warn(`currentRoom sensor update failed: ${msg}`);
+        logger226.warn(`currentRoom sensor update failed: ${msg}`);
       }
     }
   }
@@ -166178,7 +166581,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         cleaned,
         ordered
       );
-      logger224.debug(
+      logger226.debug(
         `cleanedArea: raw=${raw} baseline=${s.cleanedAreaBaseline} cleaned=${cleaned} sizes=[${ordered.map((o) => `${o.areaId}:${o.sizeSqm}`).join(",")}] -> current=${currentArea} completed=[${completed.join(",")}]`
       );
       for (const id of completed) {
@@ -166192,7 +166595,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e);
       if (!msg.includes("No provider for") && !msg.includes("not supported")) {
-        logger224.warn(`cleanedArea room update failed: ${msg}`);
+        logger226.warn(`cleanedArea room update failed: ${msg}`);
       }
     }
   }
@@ -166207,7 +166610,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
       const serviceArea = this.agent.get(ServiceAreaBehavior);
       if (serviceArea.state.currentArea !== areaId) {
         serviceArea.state.currentArea = areaId;
-        logger224.debug(`currentArea set to ${areaId}`);
+        logger226.debug(`currentArea set to ${areaId}`);
       }
       this.updateProgress(serviceArea, areaId);
     } catch {
@@ -166490,7 +166893,7 @@ init_nodejs();
 
 // src/matter/behaviors/color-control-server.ts
 init_home_assistant_entity_behavior();
-var logger225 = Logger.get("ColorControlServer");
+var logger227 = Logger.get("ColorControlServer");
 var optimisticColorState = /* @__PURE__ */ new Map();
 var OPTIMISTIC_TIMEOUT_MS3 = 3e3;
 var OPTIMISTIC_TOLERANCE2 = 5;
@@ -166529,7 +166932,7 @@ var ColorControlServerBase = class extends FeaturedBase8 {
       if (this.state.startUpColorTemperatureMireds == null) {
         this.state.startUpColorTemperatureMireds = defaultMireds;
       }
-      logger225.debug(
+      logger227.debug(
         `initialize: set ColorTemperature defaults - min=${this.state.colorTempPhysicalMinMireds}, max=${this.state.colorTempPhysicalMaxMireds}, current=${this.state.colorTemperatureMireds}`
       );
     }
@@ -167083,8 +167486,9 @@ init_home_assistant_entity_behavior();
 
 // src/matter/behaviors/lock-server.ts
 init_esm();
+init_types2();
 init_home_assistant_entity_behavior();
-var logger226 = Logger.get("LockServer");
+var logger228 = Logger.get("LockServer");
 var SUPPORTED_SLOT = 1;
 function normalizeSupportedIndex(index) {
   if (index === 0 || index === SUPPORTED_SLOT) {
@@ -167425,7 +167829,7 @@ var LockServerWithPinBase = class extends PinCredentialBase {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const action = this.state.config.lock(void 0, this.agent);
     const hasPinProvided = !!request.pinCode;
-    logger226.debug(
+    logger228.debug(
       `lockDoor called for ${homeAssistant.entityId}, PIN provided: ${hasPinProvided}`
     );
     if (request.pinCode) {
@@ -167438,12 +167842,12 @@ var LockServerWithPinBase = class extends PinCredentialBase {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const action = this.state.config.unlock(void 0, this.agent);
     const hasPinProvided = !!request.pinCode;
-    logger226.debug(
+    logger228.debug(
       `unlockDoor called for ${homeAssistant.entityId}, PIN provided: ${hasPinProvided}, requirePin: ${this.state.requirePinForRemoteOperation}`
     );
     if (this.state.requirePinForRemoteOperation) {
       if (!request.pinCode) {
-        logger226.info(
+        logger228.info(
           `unlockDoor REJECTED for ${homeAssistant.entityId} - no PIN provided`
         );
         throw new StatusResponseError(
@@ -167453,12 +167857,12 @@ var LockServerWithPinBase = class extends PinCredentialBase {
       }
       const providedPin = new TextDecoder().decode(request.pinCode);
       if (!verifyStoredPinHelper(this.env, homeAssistant.entityId, providedPin)) {
-        logger226.info(
+        logger228.info(
           `unlockDoor REJECTED for ${homeAssistant.entityId} - invalid PIN`
         );
         throw new StatusResponseError("Invalid PIN code", StatusCode.Failure);
       }
-      logger226.debug(`unlockDoor PIN verified for ${homeAssistant.entityId}`);
+      logger228.debug(`unlockDoor PIN verified for ${homeAssistant.entityId}`);
       action.data = { ...action.data, code: providedPin };
     }
     homeAssistant.callAction(action);
@@ -167600,7 +168004,7 @@ var LockServerWithPinAndUnboltBase = class extends PinCredentialUnboltBase {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const action = this.state.config.lock(void 0, this.agent);
     const hasPinProvided = !!request.pinCode;
-    logger226.debug(
+    logger228.debug(
       `lockDoor called for ${homeAssistant.entityId}, PIN provided: ${hasPinProvided}`
     );
     if (request.pinCode) {
@@ -167614,12 +168018,12 @@ var LockServerWithPinAndUnboltBase = class extends PinCredentialUnboltBase {
     const unlatchConfig = this.state.config.unlatch;
     const action = unlatchConfig ? unlatchConfig(void 0, this.agent) : this.state.config.unlock(void 0, this.agent);
     const hasPinProvided = !!request.pinCode;
-    logger226.debug(
+    logger228.debug(
       `unlockDoor called for ${homeAssistant.entityId}, PIN provided: ${hasPinProvided}, requirePin: ${this.state.requirePinForRemoteOperation}, usingUnlatch: ${!!unlatchConfig}`
     );
     if (this.state.requirePinForRemoteOperation) {
       if (!request.pinCode) {
-        logger226.info(
+        logger228.info(
           `unlockDoor REJECTED for ${homeAssistant.entityId} - no PIN provided`
         );
         throw new StatusResponseError(
@@ -167629,12 +168033,12 @@ var LockServerWithPinAndUnboltBase = class extends PinCredentialUnboltBase {
       }
       const providedPin = new TextDecoder().decode(request.pinCode);
       if (!verifyStoredPinHelper(this.env, homeAssistant.entityId, providedPin)) {
-        logger226.info(
+        logger228.info(
           `unlockDoor REJECTED for ${homeAssistant.entityId} - invalid PIN`
         );
         throw new StatusResponseError("Invalid PIN code", StatusCode.Failure);
       }
-      logger226.debug(`unlockDoor PIN verified for ${homeAssistant.entityId}`);
+      logger228.debug(`unlockDoor PIN verified for ${homeAssistant.entityId}`);
       action.data = { ...action.data, code: providedPin };
     }
     homeAssistant.callAction(action);
@@ -167643,12 +168047,12 @@ var LockServerWithPinAndUnboltBase = class extends PinCredentialUnboltBase {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const action = this.state.config.unlock(void 0, this.agent);
     const hasPinProvided = !!request.pinCode;
-    logger226.debug(
+    logger228.debug(
       `unboltDoor called for ${homeAssistant.entityId}, PIN provided: ${hasPinProvided}, requirePin: ${this.state.requirePinForRemoteOperation}`
     );
     if (this.state.requirePinForRemoteOperation) {
       if (!request.pinCode) {
-        logger226.info(
+        logger228.info(
           `unboltDoor REJECTED for ${homeAssistant.entityId} - no PIN provided`
         );
         throw new StatusResponseError(
@@ -167658,12 +168062,12 @@ var LockServerWithPinAndUnboltBase = class extends PinCredentialUnboltBase {
       }
       const providedPin = new TextDecoder().decode(request.pinCode);
       if (!verifyStoredPinHelper(this.env, homeAssistant.entityId, providedPin)) {
-        logger226.info(
+        logger228.info(
           `unboltDoor REJECTED for ${homeAssistant.entityId} - invalid PIN`
         );
         throw new StatusResponseError("Invalid PIN code", StatusCode.Failure);
       }
-      logger226.debug(`unboltDoor PIN verified for ${homeAssistant.entityId}`);
+      logger228.debug(`unboltDoor PIN verified for ${homeAssistant.entityId}`);
       action.data = { ...action.data, code: providedPin };
     }
     homeAssistant.callAction(action);
@@ -167802,7 +168206,7 @@ init_home_assistant_entity_behavior();
 init_dist();
 init_esm();
 init_home_assistant_entity_behavior();
-var logger227 = Logger.get("MediaPlayerKeypadInputServer");
+var logger229 = Logger.get("MediaPlayerKeypadInputServer");
 var MediaPlayerKeypadInputServer = class extends KeypadInputServer {
   sendKey(request) {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
@@ -167813,12 +168217,12 @@ var MediaPlayerKeypadInputServer = class extends KeypadInputServer {
     const features = attributes9.supported_features ?? 0;
     const action = this.mapKeyToAction(request.keyCode, features);
     if (!action) {
-      logger227.debug(
+      logger229.debug(
         `Unsupported key code ${request.keyCode} for ${homeAssistant.entityId}`
       );
       return { status: KeypadInput3.Status.UnsupportedKey };
     }
-    logger227.debug(
+    logger229.debug(
       `sendKey(${request.keyCode}) \u2192 ${action} for ${homeAssistant.entityId}`
     );
     homeAssistant.callAction({ action });
@@ -168097,7 +168501,7 @@ init_home_assistant_entity_behavior();
 // src/matter/behaviors/speaker-level-control-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger228 = Logger.get("SpeakerLevelControlServer");
+var logger230 = Logger.get("SpeakerLevelControlServer");
 var optimisticLevelState2 = /* @__PURE__ */ new Map();
 var OPTIMISTIC_TIMEOUT_MS4 = 3e3;
 var OPTIMISTIC_TOLERANCE3 = 5;
@@ -168140,7 +168544,7 @@ var SpeakerLevelControlServerBase = class extends FeaturedBase9 {
       currentLevel = Math.min(Math.max(minLevel, currentLevel), maxLevel);
     }
     const entityId = this.agent.get(HomeAssistantEntityBehavior).entity.entity_id;
-    logger228.debug(
+    logger230.debug(
       `[${entityId}] Volume update: HA=${currentLevelPercent != null ? Math.round(currentLevelPercent * 100) : "null"}% -> currentLevel=${currentLevel}`
     );
     const optimistic = optimisticLevelState2.get(entity.entity_id);
@@ -168188,7 +168592,7 @@ var SpeakerLevelControlServerBase = class extends FeaturedBase9 {
     const config8 = this.state.config;
     const entityId = homeAssistant.entity.entity_id;
     const levelPercent = level / 254;
-    logger228.debug(
+    logger230.debug(
       `[${entityId}] Volume command: level=${level} -> HA volume_level=${levelPercent}`
     );
     const current = config8.getValuePercent(
@@ -169075,6 +169479,7 @@ var ElectricalUtilityMeterType = ElectricalUtilityMeterDevice.with(
 
 // src/matter/endpoints/legacy/sensor/devices/energy-evse.ts
 init_esm();
+init_types2();
 init_home_assistant_actions();
 init_home_assistant_entity_behavior();
 
@@ -169132,7 +169537,7 @@ function mapEvseStatus(rawState, chargingSwitchOn) {
 }
 
 // src/matter/endpoints/legacy/sensor/devices/energy-evse.ts
-var logger229 = Logger.get("EnergyEvse");
+var logger231 = Logger.get("EnergyEvse");
 var MIN_CHARGE_CURRENT_MA = 6e3;
 var MAX_CHARGE_CURRENT_MA = 32e3;
 var CIRCUIT_CAPACITY_MA = 32e3;
@@ -169216,7 +169621,7 @@ var EvseStatusServer = class _EvseStatusServer extends EnergyEvseServer {
       dispatched = true;
     }
     if (!dispatched) {
-      logger229.debug(
+      logger231.debug(
         `enableCharging ignored for ${homeAssistant.entityId}: no charging switch or current limit mapped`
       );
       return;
@@ -169256,7 +169661,7 @@ var EvseStatusServer = class _EvseStatusServer extends EnergyEvseServer {
                 chargingEnabledUntil: null
               });
             } catch (error) {
-              logger229.debug(
+              logger231.debug(
                 `EVSE charge-window expiry write failed (endpoint may be closing): ${error}`
               );
             } finally {
@@ -169287,7 +169692,7 @@ var EvseStatusServer = class _EvseStatusServer extends EnergyEvseServer {
         chargingEnabledUntil: null
       });
     } else {
-      logger229.debug(
+      logger231.debug(
         `disable ignored for ${homeAssistant.entityId}: no charging switch mapped`
       );
     }
@@ -170092,7 +170497,7 @@ var TvocConcentrationMeasurementServer = class extends TvocConcentrationMeasurem
 };
 
 // src/matter/endpoints/legacy/sensor/devices/tvoc-sensor.ts
-var logger230 = Logger.get("TvocSensor");
+var logger232 = Logger.get("TvocSensor");
 function airQualityFromUgm3(value) {
   if (value <= 300) return AirQuality3.AirQualityEnum.Good;
   if (value <= 1e3) return AirQuality3.AirQualityEnum.Fair;
@@ -170133,17 +170538,17 @@ var TvocAirQualityServer = class extends TvocAirQualityServerBase {
     const attributes9 = entity.state.attributes;
     const deviceClass = attributes9.device_class;
     let airQuality = AirQuality3.AirQualityEnum.Unknown;
-    logger230.debug(
+    logger232.debug(
       `[${entity.entity_id}] TVOC update: state="${state}", device_class="${deviceClass}"`
     );
     if (state != null && !Number.isNaN(+state)) {
       const value = +state;
       airQuality = deviceClass === SensorDeviceClass.volatile_organic_compounds ? airQualityFromUgm3(value) : airQualityFromPpb(value);
-      logger230.debug(
+      logger232.debug(
         `[${entity.entity_id}] TVOC value=${value} (${deviceClass}) -> airQuality=${AirQuality3.AirQualityEnum[airQuality]}`
       );
     } else {
-      logger230.warn(
+      logger232.warn(
         `[${entity.entity_id}] TVOC state not a valid number: "${state}"`
       );
     }
@@ -170160,6 +170565,7 @@ var TvocSensorType = AirQualitySensorDevice.with(
 
 // src/matter/endpoints/legacy/sensor/index.ts
 init_dist();
+init_types2();
 init_diagnostic_event_bus();
 
 // src/matter/behaviors/carbon-dioxide-concentration-measurement-server.ts
@@ -170357,7 +170763,7 @@ init_home_assistant_entity_behavior();
 // src/matter/behaviors/pm25-concentration-measurement-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger231 = Logger.get("Pm25ConcentrationMeasurementServer");
+var logger233 = Logger.get("Pm25ConcentrationMeasurementServer");
 var Pm25ConcentrationMeasurementServerBase = Pm25ConcentrationMeasurementServer.with(
   ConcentrationMeasurement3.Feature.NumericMeasurement
 );
@@ -170381,11 +170787,11 @@ var Pm25ConcentrationMeasurementServer2 = class extends Pm25ConcentrationMeasure
     if (this.state.measurementMedium === void 0) {
       this.state.measurementMedium = ConcentrationMeasurement3.MeasurementMedium.Air;
     }
-    logger231.debug(
+    logger233.debug(
       "Pm25ConcentrationMeasurementServer: before super.initialize()"
     );
     await super.initialize();
-    logger231.debug(
+    logger233.debug(
       "Pm25ConcentrationMeasurementServer: after super.initialize()"
     );
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
@@ -170408,7 +170814,7 @@ var Pm25ConcentrationMeasurementServer2 = class extends Pm25ConcentrationMeasure
 };
 
 // src/matter/endpoints/legacy/sensor/devices/pm25-sensor.ts
-var logger232 = Logger.get("Pm25AirQualityServer");
+var logger234 = Logger.get("Pm25AirQualityServer");
 var Pm25AirQualityServerBase = AirQualityServer.with(
   AirQuality3.Feature.Fair,
   AirQuality3.Feature.Moderate,
@@ -170420,9 +170826,9 @@ var Pm25AirQualityServer = class extends Pm25AirQualityServerBase {
     if (this.state.airQuality === void 0) {
       this.state.airQuality = AirQuality3.AirQualityEnum.Unknown;
     }
-    logger232.debug("Pm25AirQualityServer: before super.initialize()");
+    logger234.debug("Pm25AirQualityServer: before super.initialize()");
     await super.initialize();
-    logger232.debug("Pm25AirQualityServer: after super.initialize()");
+    logger234.debug("Pm25AirQualityServer: after super.initialize()");
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
     this.reactTo(homeAssistant.onChange, this.update, { offline: true });
@@ -170847,56 +171253,25 @@ init_home_assistant_entity_behavior();
 init_dist();
 init_esm();
 init_home_assistant_entity_behavior();
-var logger233 = Logger.get("VacuumIdentifyServer");
-var IDENTIFY_BUTTON_SUFFIXES = ["_identify", "_locate", "_find_me"];
+var logger235 = Logger.get("VacuumIdentifyServer");
 var VacuumIdentifyServer = class extends IdentifyServer2 {
-  triggerEffect(effect) {
-    this.#locate("triggerEffect");
-    return super.triggerEffect(effect);
-  }
-  identify(request) {
-    if (request.identifyTime > 0) {
-      this.#locate("identify");
-    }
-    return super.identify(request);
-  }
-  #locate(source) {
+  identifyInHomeAssistant(source) {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const features = homeAssistant.entity.state.attributes.supported_features ?? 0;
     if (testBit(features, VacuumDeviceFeature.LOCATE)) {
-      logger233.info(`${source} \u2192 vacuum.locate for ${homeAssistant.entityId}`);
+      logger235.info(`${source} \u2192 vacuum.locate for ${homeAssistant.entityId}`);
       homeAssistant.callAction({ action: "vacuum.locate" });
       return;
     }
-    const sibling = this.#findIdentifyButton(homeAssistant);
-    if (sibling) {
-      logger233.info(
-        `${source} \u2192 button.press ${sibling} for ${homeAssistant.entityId}`
-      );
-      homeAssistant.callAction({ action: "button.press", target: sibling });
+    if (this.findIdentifyEntity(homeAssistant)) {
+      super.identifyInHomeAssistant(source);
       return;
     }
-    logger233.warn(
+    logger235.warn(
       `${source} for ${homeAssistant.entityId}, LOCATE not in supported_features (${features}), trying vacuum.locate anyway`
     );
     homeAssistant.callAction({ action: "vacuum.locate" });
   }
-  #findIdentifyButton(homeAssistant) {
-    const deviceId = homeAssistant.entity.registry?.device_id;
-    if (!deviceId) return void 0;
-    const registry3 = this.env.get(HomeAssistantRegistry);
-    for (const entity of Object.values(registry3.entities)) {
-      if (entity.device_id !== deviceId) continue;
-      if (!entity.entity_id.startsWith("button.")) continue;
-      const uniqueId = entity.unique_id ?? "";
-      if (IDENTIFY_BUTTON_SUFFIXES.some(
-        (s) => entity.entity_id.endsWith(s) || uniqueId.endsWith(s)
-      )) {
-        return entity.entity_id;
-      }
-    }
-    return void 0;
-  }
 };
 
 // src/matter/endpoints/legacy/vacuum/behaviors/vacuum-rvc-run-mode-server.ts
@@ -171076,7 +171451,7 @@ init_esm();
 // src/matter/behaviors/service-area-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger234 = Logger.get("ServiceAreaServer");
+var logger236 = Logger.get("ServiceAreaServer");
 function orderSelection(areas, agent) {
   try {
     const ascending = agent?.get(HomeAssistantEntityBehavior).state.mapping?.vacuumAscendingRoomOrder === true;
@@ -171091,7 +171466,7 @@ var ServiceAreaWithProgress = ServiceAreaBehavior.with(
 var ServiceAreaServerBase = class extends ServiceAreaWithProgress {
   selectAreas(request) {
     const { newAreas } = request;
-    logger234.info(
+    logger236.info(
       `ServiceArea selectAreas called with: ${JSON.stringify(newAreas)}`
     );
     const uniqueAreas = orderSelection([...new Set(newAreas)], this.agent);
@@ -171100,7 +171475,7 @@ var ServiceAreaServerBase = class extends ServiceAreaWithProgress {
       (id) => !supportedAreaIds.includes(id)
     );
     if (invalidAreas.length > 0) {
-      logger234.warn(`Invalid area IDs requested: ${invalidAreas.join(", ")}`);
+      logger236.warn(`Invalid area IDs requested: ${invalidAreas.join(", ")}`);
       return {
         status: ServiceArea3.SelectAreasStatus.UnsupportedArea,
         statusText: `Invalid area IDs: ${invalidAreas.join(", ")}`
@@ -171112,7 +171487,7 @@ var ServiceAreaServerBase = class extends ServiceAreaWithProgress {
       status: ServiceArea3.OperationalStatus.Pending
     }));
     this.state.currentArea = null;
-    logger234.info(
+    logger236.info(
       `ServiceArea: Stored ${uniqueAreas.length} areas for cleaning: ${uniqueAreas.join(", ")}`
     );
     return {
@@ -171133,7 +171508,7 @@ var ServiceAreaServerBase = class extends ServiceAreaWithProgress {
   ServiceAreaServerBase2.State = State;
 })(ServiceAreaServerBase || (ServiceAreaServerBase = {}));
 function ServiceAreaServer2(initialState) {
-  logger234.info(
+  logger236.info(
     `Creating ServiceAreaServer with ${initialState.supportedAreas.length} areas`
   );
   return ServiceAreaServerBase.set({
@@ -171150,7 +171525,7 @@ var ServiceAreaWithMapsAndProgress = ServiceAreaBehavior.with(
 var ServiceAreaServerWithMapsBase = class extends ServiceAreaWithMapsAndProgress {
   selectAreas(request) {
     const { newAreas } = request;
-    logger234.info(
+    logger236.info(
       `ServiceArea selectAreas called with: ${JSON.stringify(newAreas)}`
     );
     const uniqueAreas = orderSelection([...new Set(newAreas)], this.agent);
@@ -171159,7 +171534,7 @@ var ServiceAreaServerWithMapsBase = class extends ServiceAreaWithMapsAndProgress
       (id) => !supportedAreaIds.includes(id)
     );
     if (invalidAreas.length > 0) {
-      logger234.warn(`Invalid area IDs requested: ${invalidAreas.join(", ")}`);
+      logger236.warn(`Invalid area IDs requested: ${invalidAreas.join(", ")}`);
       return {
         status: ServiceArea3.SelectAreasStatus.UnsupportedArea,
         statusText: `Invalid area IDs: ${invalidAreas.join(", ")}`
@@ -171171,7 +171546,7 @@ var ServiceAreaServerWithMapsBase = class extends ServiceAreaWithMapsAndProgress
       status: ServiceArea3.OperationalStatus.Pending
     }));
     this.state.currentArea = null;
-    logger234.info(
+    logger236.info(
       `ServiceArea: Stored ${uniqueAreas.length} areas for cleaning: ${uniqueAreas.join(", ")}`
     );
     return {
@@ -171192,14 +171567,14 @@ var ServiceAreaServerWithMapsBase = class extends ServiceAreaWithMapsAndProgress
   ServiceAreaServerWithMapsBase2.State = State;
 })(ServiceAreaServerWithMapsBase || (ServiceAreaServerWithMapsBase = {}));
 function ServiceAreaServerWithMaps(initialState) {
-  logger234.info(
+  logger236.info(
     `Creating ServiceAreaServer with Maps: ${initialState.supportedAreas.length} areas, ${initialState.supportedMaps.length} maps`
   );
   for (const map of initialState.supportedMaps) {
     const areaCount = initialState.supportedAreas.filter(
       (a) => a.mapId === map.mapId
     ).length;
-    logger234.info(`  Map ${map.mapId}: "${map.name}" (${areaCount} areas)`);
+    logger236.info(`  Map ${map.mapId}: "${map.name}" (${areaCount} areas)`);
   }
   return ServiceAreaServerWithMapsBase.set({
     supportedAreas: initialState.supportedAreas,
@@ -171211,7 +171586,7 @@ function ServiceAreaServerWithMaps(initialState) {
 }
 
 // src/matter/endpoints/legacy/vacuum/behaviors/vacuum-service-area-server.ts
-var logger235 = Logger.get("VacuumServiceAreaServer");
+var logger237 = Logger.get("VacuumServiceAreaServer");
 function toAreaId(roomId) {
   if (typeof roomId === "number") {
     return roomId;
@@ -171290,13 +171665,13 @@ function createVacuumServiceAreaServer(attributes9, roomEntities, includeUnnamed
   let rooms;
   if (roomEntities && roomEntities.length > 0) {
     rooms = buttonEntitiesToRooms(roomEntities, attributes9);
-    logger235.info(
+    logger237.info(
       `Using ${rooms.length} button entities as rooms: ${rooms.map((r) => r.name).join(", ")}`
     );
   } else {
     rooms = parseVacuumRooms(attributes9, includeUnnamedRooms);
     if (rooms.length > 0) {
-      logger235.info(
+      logger237.info(
         `Using ${rooms.length} rooms from attributes: ${rooms.map((r) => r.name).join(", ")}`
       );
     }
@@ -171350,7 +171725,7 @@ function createCustomServiceAreaServer(customAreas) {
       landmarkInfo: null
     }
   }));
-  logger235.info(
+  logger237.info(
     `Using ${customAreas.length} custom service areas: ${customAreas.map((a) => a.name).join(", ")}`
   );
   return ServiceAreaServer2({
@@ -171372,7 +171747,7 @@ function createCleanAreaServiceAreaServer(cleanAreaRooms) {
       landmarkInfo: null
     }
   }));
-  logger235.info(
+  logger237.info(
     `Using ${cleanAreaRooms.length} HA areas via CLEAN_AREA: ${cleanAreaRooms.map((r) => r.name).join(", ")}`
   );
   return ServiceAreaServer2({
@@ -171408,11 +171783,11 @@ function getVacuumServiceAreas(attributes9, mapping) {
 }
 
 // src/matter/endpoints/legacy/vacuum/behaviors/vacuum-rvc-run-mode-server.ts
-var logger236 = Logger.get("VacuumRvcRunModeServer");
+var logger238 = Logger.get("VacuumRvcRunModeServer");
 function buildValetudoSegmentAction(vacuumEntityId, segmentIds, valetudoIdentifier) {
   const identifier = valetudoIdentifier || vacuumEntityId.replace(/^vacuum\.valetudo_/, "");
   const topic = `valetudo/${identifier}/MapSegmentationCapability/clean/set`;
-  logger236.info(
+  logger238.info(
     `Valetudo: mqtt.publish to ${topic}, segments: ${segmentIds.join(", ")}`
   );
   return {
@@ -171517,14 +171892,14 @@ function mergeBatchData(areas) {
 function handleCustomServiceAreas(selectedAreas, customAreas, session) {
   const matched = selectedAreas.map((areaId) => ({ areaId, area: customAreas[areaId - 1] })).filter((m) => !!m.area);
   if (matched.length === 0) {
-    logger236.warn(
+    logger238.warn(
       `Custom service areas: no match for selected IDs ${selectedAreas.join(", ")}`
     );
     return { action: "vacuum.start" };
   }
   const batchArea = matched.find(({ area }) => area.batchDispatch === true);
   if (batchArea) {
-    logger236.info(
+    logger238.info(
       `Custom service areas (batch): single call for ${matched.length} room(s): ${matched.map(({ area }) => area.name).join(", ")}`
     );
     session.pendingDispatches = [];
@@ -171545,7 +171920,7 @@ function handleCustomServiceAreas(selectedAreas, customAreas, session) {
       }
     };
   }
-  logger236.info(
+  logger238.info(
     `Custom service areas: ${matched.length} room(s) queued: ${matched.map(({ area }) => `${area.service} (${area.name})`).join(", ")}`
   );
   session.pendingDispatches = matched.slice(1).map(({ areaId, area }) => ({
@@ -171603,7 +171978,7 @@ function dispatchRoomClean(attributes9, mapping, entityId, selectedAreas, seam)
   if (cleanAreaRooms && cleanAreaRooms.length > 0) {
     const haAreaIds = resolveCleanAreaIds(selectedAreas, cleanAreaRooms);
     if (haAreaIds.length > 0) {
-      logger236.info(`CLEAN_AREA: cleaning HA areas: ${haAreaIds.join(", ")}`);
+      logger238.info(`CLEAN_AREA: cleaning HA areas: ${haAreaIds.join(", ")}`);
       return {
         action: {
           action: "vacuum.clean_area",
@@ -171623,7 +171998,7 @@ function dispatchRoomClean(attributes9, mapping, entityId, selectedAreas, seam)
       }
     }
     if (matched.length > 0) {
-      logger236.info(
+      logger238.info(
         `Roborock: ${matched.length} room button(s) queued: ${matched.map((m) => m.entityId).join(", ")}`
       );
       return {
@@ -171658,12 +172033,12 @@ function dispatchRoomClean(attributes9, mapping, entityId, selectedAreas, seam)
     }
   }
   if (roomIds.length > 0) {
-    logger236.info(`Starting cleaning with selected areas: ${roomIds.join(", ")}`);
+    logger238.info(`Starting cleaning with selected areas: ${roomIds.join(", ")}`);
     if (isDreameVacuum(attributes9)) {
       if (targetMapName) {
         const vacName = entityId.replace("vacuum.", "");
         const selectedMapEntity = `select.${vacName}_selected_map`;
-        logger236.info(
+        logger238.info(
           `Dreame multi-floor: switching to map "${targetMapName}" via ${selectedMapEntity}`
         );
         seam.callAction({
@@ -171691,7 +172066,7 @@ function dispatchRoomClean(attributes9, mapping, entityId, selectedAreas, seam)
     }
     if (isEcovacsVacuum(attributes9)) {
       const roomIdStr = roomIds.join(",");
-      logger236.info(`Ecovacs vacuum: Using spot_area for rooms: ${roomIdStr}`);
+      logger238.info(`Ecovacs vacuum: Using spot_area for rooms: ${roomIdStr}`);
       return {
         action: {
           action: "vacuum.send_command",
@@ -171703,7 +172078,7 @@ function dispatchRoomClean(attributes9, mapping, entityId, selectedAreas, seam)
         pending: []
       };
     }
-    logger236.warn(
+    logger238.warn(
       `Room cleaning via send_command not supported for this vacuum type. Rooms: ${roomIds.join(", ")}. Falling back to vacuum.start`
     );
   }
@@ -171712,7 +172087,7 @@ function dispatchRoomClean(attributes9, mapping, entityId, selectedAreas, seam)
 var vacuumRvcRunModeConfig = {
   getCurrentMode: (entity) => {
     const isCleaning = vacuumIsCleaning(entity.state);
-    logger236.debug(
+    logger238.debug(
       `Vacuum state: "${entity.state}", isCleaning: ${isCleaning}, currentMode: ${isCleaning ? "Cleaning" : "Idle"}`
     );
     return isCleaning ? 1 /* Cleaning */ : 0 /* Idle */;
@@ -171751,7 +172126,7 @@ var vacuumRvcRunModeConfig = {
       }
     } catch {
     }
-    logger236.info("Starting regular cleaning (no areas selected)");
+    logger238.info("Starting regular cleaning (no areas selected)");
     return { action: "vacuum.start" };
   },
   returnToBase: () => ({ action: "vacuum.return_to_base" }),
@@ -171766,7 +172141,7 @@ var vacuumRvcRunModeConfig = {
     const homeAssistant = agent.get(HomeAssistantEntityBehavior);
     const entity = homeAssistant.entity;
     const attributes9 = entity.state.attributes;
-    logger236.info(`cleanRoom called: roomMode=${roomMode}`);
+    logger238.info(`cleanRoom called: roomMode=${roomMode}`);
     const cleanAreaRooms = homeAssistant.state.mapping?.cleanAreaRooms;
     if (cleanAreaRooms && cleanAreaRooms.length > 0) {
       const sorted = [...cleanAreaRooms].sort(
@@ -171775,7 +172150,7 @@ var vacuumRvcRunModeConfig = {
       const areaIndex = roomMode - ROOM_MODE_BASE2 - 1;
       if (areaIndex >= 0 && areaIndex < sorted.length) {
         const area = sorted[areaIndex];
-        logger236.info(
+        logger238.info(
           `cleanRoom: CLEAN_AREA "${area.name}" \u2192 vacuum.clean_area(${area.haAreaId})`
         );
         return {
@@ -171792,7 +172167,7 @@ var vacuumRvcRunModeConfig = {
       const areaIndex = roomMode - ROOM_MODE_BASE2 - 1;
       if (areaIndex >= 0 && areaIndex < sorted.length) {
         const area = sorted[areaIndex];
-        logger236.info(
+        logger238.info(
           `cleanRoom: custom service area "${area.name}" \u2192 ${area.service}`
         );
         return {
@@ -171813,7 +172188,7 @@ var vacuumRvcRunModeConfig = {
     }
     const rooms = parseVacuumRooms(attributes9);
     const numericIdFromMode = getRoomIdFromMode(roomMode);
-    logger236.info(
+    logger238.info(
       `cleanRoom: numericIdFromMode=${numericIdFromMode}, available rooms: ${JSON.stringify(rooms.map((r) => ({ id: r.id, name: r.name, modeValue: getRoomModeValue(r) })))}`
     );
     const room = rooms.find((r) => getRoomModeValue(r) === roomMode);
@@ -171823,7 +172198,7 @@ var vacuumRvcRunModeConfig = {
         if (room.mapName) {
           const vacuumName = vacuumEntityId.replace("vacuum.", "");
           const selectedMapEntity = `select.${vacuumName}_selected_map`;
-          logger236.info(
+          logger238.info(
             `Dreame multi-floor: switching to map "${room.mapName}" via ${selectedMapEntity}`
           );
           homeAssistant.callAction({
@@ -171832,7 +172207,7 @@ var vacuumRvcRunModeConfig = {
             data: { option: room.mapName }
           });
         }
-        logger236.debug(
+        logger238.debug(
           `Dreame vacuum detected, using dreame_vacuum.vacuum_clean_segment for room ${room.name} (commandId: ${commandId3}, id: ${room.id})`
         );
         return {
@@ -171843,7 +172218,7 @@ var vacuumRvcRunModeConfig = {
         };
       }
       if (isRoborockVacuum(attributes9) || isXiaomiMiotVacuum(attributes9)) {
-        logger236.debug(
+        logger238.debug(
           `Using vacuum.send_command with app_segment_clean for room ${room.name} (commandId: ${commandId3}, id: ${room.id})`
         );
         return {
@@ -171856,7 +172231,7 @@ var vacuumRvcRunModeConfig = {
       }
       if (isEcovacsVacuum(attributes9)) {
         const roomIdStr = String(commandId3);
-        logger236.info(
+        logger238.info(
           `Ecovacs vacuum: Using spot_area for room ${room.name} (id: ${roomIdStr})`
         );
         return {
@@ -171871,7 +172246,7 @@ var vacuumRvcRunModeConfig = {
           }
         };
       }
-      logger236.warn(
+      logger238.warn(
         `Room cleaning via send_command not supported for this vacuum type. Room: ${room.name} (id=${commandId3}). Falling back to vacuum.start`
       );
     }
@@ -171888,20 +172263,20 @@ function createVacuumRvcRunModeServer(attributes9, includeUnnamedRooms = false,
     customAreas,
     disableRoomModes
   );
-  logger236.info(
+  logger238.info(
     `Creating VacuumRvcRunModeServer with ${rooms.length} rooms, ${supportedModes2.length} total modes`
   );
   if (rooms.length > 0) {
-    logger236.info(`Rooms found: ${rooms.map((r) => r.name).join(", ")}`);
+    logger238.info(`Rooms found: ${rooms.map((r) => r.name).join(", ")}`);
   }
   if (filteredCount > 0) {
     const filtered = allRooms.filter((r) => !rooms.some((x) => x.id === r.id));
-    logger236.info(
+    logger238.info(
       `Filtered out ${filteredCount} unnamed room(s): ${filtered.map((r) => r.name).join(", ")}`
     );
   }
   if (allRooms.length === 0) {
-    logger236.debug(
+    logger238.debug(
       `No rooms found. Attributes: rooms=${JSON.stringify(attributes9.rooms)}, segments=${JSON.stringify(attributes9.segments)}, room_list=${attributes9.room_list}`
     );
   }
@@ -171935,7 +172310,7 @@ function createCleanAreaRvcRunModeServer(cleanAreaRooms) {
       modeTags: [{ value: RvcRunMode3.ModeTag.Cleaning }]
     });
   }
-  logger236.info(
+  logger238.info(
     `Creating CLEAN_AREA RvcRunModeServer with ${cleanAreaRooms.length} HA areas, ${modes.length} total modes`
   );
   return RvcRunModeServer2(vacuumRvcRunModeConfig, {
@@ -172025,7 +172400,7 @@ init_nodejs();
 
 // src/matter/behaviors/rvc-clean-mode-server.ts
 init_home_assistant_entity_behavior();
-var logger237 = Logger.get("RvcCleanModeServerBase");
+var logger239 = Logger.get("RvcCleanModeServerBase");
 var RvcCleanModeServerBase = class _RvcCleanModeServerBase extends RvcCleanModeServer {
   // Pending mode from a recent changeToMode command.
   // Prevents stale HA state (from a different entity like select.xxx)
@@ -172072,14 +172447,14 @@ var RvcCleanModeServerBase = class _RvcCleanModeServerBase extends RvcCleanModeS
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const { newMode } = request;
     if (newMode !== this.state.currentMode && !this.state.supportedModes.some((m) => m.mode === newMode)) {
-      logger237.warn(`changeToMode(${newMode}) rejected: unsupported mode`);
+      logger239.warn(`changeToMode(${newMode}) rejected: unsupported mode`);
       return {
         status: ModeBase3.ModeChangeStatus.UnsupportedMode,
         statusText: `Unsupported mode: ${newMode}`
       };
     }
     const modeLabel = this.state.supportedModes.find((m) => m.mode === newMode);
-    logger237.info(
+    logger239.info(
       `changeToMode(${newMode}) "${modeLabel?.label ?? "unknown"}" for ${homeAssistant.entityId}`
     );
     this.pendingMode = newMode;
@@ -172087,7 +172462,7 @@ var RvcCleanModeServerBase = class _RvcCleanModeServerBase extends RvcCleanModeS
     this.state.currentMode = newMode;
     const action = this.state.config.setCleanMode(newMode, this.agent);
     if (action) {
-      logger237.info(
+      logger239.info(
         `changeToMode: dispatching action ${action.action} \u2192 ${action.target ?? homeAssistant.entityId}`
       );
       homeAssistant.callAction(action);
@@ -172120,7 +172495,7 @@ function RvcCleanModeServer2(config8, initialState) {
 }
 
 // src/matter/endpoints/legacy/vacuum/behaviors/vacuum-rvc-clean-mode-server.ts
-var logger238 = Logger.get("VacuumRvcCleanModeServer");
+var logger240 = Logger.get("VacuumRvcCleanModeServer");
 var MODE_VACUUM = 0;
 var MODE_VACUUM_AND_MOP = 1;
 var MODE_MOP = 2;
@@ -172390,7 +172765,7 @@ function findMatchingCleanOption(ct, availableOptions) {
     const match = availableOptions.find((o) => classifyCleanOption(o) === type);
     if (match) return match;
   }
-  logger238.warn(
+  logger240.warn(
     `No match for ${CLEAN_TYPE_LABELS[ct]} in [${availableOptions.join(", ")}]`
   );
   return availableOptions[0];
@@ -172399,7 +172774,7 @@ function buildCleaningModeAction(targetCleanType, agent) {
   const selectEntityId = getCleaningModeSelectEntity(agent);
   const { options } = readSelectEntity(selectEntityId, agent);
   const optionToUse = findMatchingCleanOption(targetCleanType, options);
-  logger238.info(
+  logger240.info(
     `Switching cleaning mode to: ${optionToUse} via ${selectEntityId}`
   );
   return {
@@ -172488,7 +172863,7 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
           }
         }
         if (speedMode !== void 0) {
-          logger238.debug(
+          logger240.debug(
             `Current mode: Vacuum + fan_speed="${speedState}" -> mode ${speedMode}`
           );
           return speedMode;
@@ -172509,7 +172884,7 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
           }
         }
         if (mopMode !== void 0) {
-          logger238.debug(
+          logger240.debug(
             `Current mode: Mop + intensity="${state}" -> mode ${mopMode}`
           );
           return mopMode;
@@ -172527,14 +172902,14 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
       const homeAssistant = agent.get(HomeAssistantEntityBehavior);
       const vacuumEntityId = homeAssistant.entityId;
       const mapping = homeAssistant.state.mapping;
-      logger238.info(
+      logger240.info(
         `setCleanMode(${mode}) for ${vacuumEntityId}, suctionEntity=${mapping?.suctionLevelEntity ?? "none"}, mopEntity=${mapping?.mopIntensityEntity ?? "none"}, fanSpeedList=${JSON.stringify(fanSpeedList ?? [])}, mopIntensityList=${JSON.stringify(mopIntensityList ?? [])}, customTags=${JSON.stringify(customFanSpeedTags ?? {})}`
       );
       if (mopIntensityList && mopIntensityList.length > 0 && isMopIntensityMode(mode)) {
         const mopIndex = mode - MOP_INTENSITY_MODE_BASE;
         const mopName = mopIntensityList[mopIndex];
         if (!mopName) {
-          logger238.warn(`Invalid mop intensity mode index: ${mopIndex}`);
+          logger240.warn(`Invalid mop intensity mode index: ${mopIndex}`);
           return void 0;
         }
         if (hasCleanTypes) {
@@ -172547,18 +172922,18 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
             mapping.mopIntensityEntity,
             agent
           );
-          logger238.info(
+          logger240.info(
             `Mop intensity entity ${mapping.mopIntensityEntity}: current="${state}", options=${JSON.stringify(options ?? [])}`
           );
           let option = matchMopIntensityOption(mopName, options);
           if (!option && options && mopIndex < options.length) {
             option = options[mopIndex];
-            logger238.info(
+            logger240.info(
               `Positional match for mop "${mopName}" -> "${option}" (index ${mopIndex})`
             );
           }
           if (option) {
-            logger238.info(
+            logger240.info(
               `Setting mop intensity to: ${option} via ${mapping.mopIntensityEntity}`
             );
             return {
@@ -172567,11 +172942,11 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
               target: mapping.mopIntensityEntity
             };
           }
-          logger238.warn(
+          logger240.warn(
             `No match for mop intensity "${mopName}" in options: [${(options ?? []).join(", ")}]`
           );
         } else {
-          logger238.warn(
+          logger240.warn(
             `Mop intensity mode ${mode} requested but no mopIntensityEntity configured`
           );
         }
@@ -172581,7 +172956,7 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
         const fanSpeedIndex = mode - FAN_SPEED_MODE_BASE;
         const fanSpeedName = fanSpeedList[fanSpeedIndex];
         if (!fanSpeedName) {
-          logger238.warn(`Invalid fan speed mode index: ${fanSpeedIndex}`);
+          logger240.warn(`Invalid fan speed mode index: ${fanSpeedIndex}`);
           return void 0;
         }
         if (mapping?.suctionLevelEntity) {
@@ -172594,7 +172969,7 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
             mapping.suctionLevelEntity,
             agent
           );
-          logger238.info(
+          logger240.info(
             `Suction entity ${mapping.suctionLevelEntity}: current="${state}", options=${JSON.stringify(options ?? [])}`
           );
           let option = matchFanSpeedOption(
@@ -172604,12 +172979,12 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
           );
           if (!option && options && fanSpeedIndex < options.length) {
             option = options[fanSpeedIndex];
-            logger238.info(
+            logger240.info(
               `Positional match for fan "${fanSpeedName}" -> "${option}" (index ${fanSpeedIndex})`
             );
           }
           if (option) {
-            logger238.info(
+            logger240.info(
               `Setting suction to: ${option} via ${mapping.suctionLevelEntity}`
             );
             return {
@@ -172618,7 +172993,7 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
               target: mapping.suctionLevelEntity
             };
           }
-          logger238.warn(
+          logger240.warn(
             `No match for fan speed "${fanSpeedName}" in suction options: [${(options ?? []).join(", ")}]`
           );
           return void 0;
@@ -172628,7 +173003,7 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
             buildCleaningModeAction(0 /* Sweeping */, agent)
           );
         }
-        logger238.info(
+        logger240.info(
           `Setting fan speed to: ${fanSpeedName} via vacuum.set_fan_speed`
         );
         return {
@@ -172638,7 +173013,7 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
         };
       }
       if (!hasCleanTypes) {
-        logger238.debug(
+        logger240.debug(
           `Ignoring cleaning type change (mode=${mode}): no cleaning mode entity`
         );
         return void 0;
@@ -172650,7 +173025,7 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
         agent
       );
       const optionToUse = findMatchingCleanOption(cleanType, availableOptions);
-      logger238.info(
+      logger240.info(
         `Setting cleaning mode to: ${optionToUse} (mode=${mode}) via ${selectEntityId}`
       );
       return {
@@ -172668,10 +173043,10 @@ function createVacuumRvcCleanModeServer(_attributes, fanSpeedList, mopIntensityL
     cleaningModeOptions,
     customFanSpeedTags
   );
-  logger238.info(
+  logger240.info(
     `Creating VacuumRvcCleanModeServer with ${supportedModes2.length} modes (fanSpeedList=${JSON.stringify(fanSpeedList ?? [])}, mopIntensityList=${JSON.stringify(mopIntensityList ?? [])}, cleaningModeOptions=${JSON.stringify(cleaningModeOptions ?? [])}, customTags=${JSON.stringify(customFanSpeedTags ?? {})})`
   );
-  logger238.info(
+  logger240.info(
     `Modes: ${supportedModes2.map((m) => `${m.mode}:${m.label}[${m.modeTags.map((t) => t.value).join(",")}]`).join(", ")}`
   );
   const initialState = {
@@ -172734,7 +173109,7 @@ function resolveMopIntensityList(mopIntensityEntity) {
 init_dist();
 init_esm();
 init_home_assistant_entity_behavior();
-var logger239 = Logger.get("VacuumRvcOperationalStateServer");
+var logger241 = Logger.get("VacuumRvcOperationalStateServer");
 function batteryFromAttributes(attrs) {
   const raw = attrs.battery_level ?? attrs.battery;
   if (raw == null) return null;
@@ -172785,16 +173160,16 @@ function mapVacuumOperationalState(entity, batteryPercent = batteryFromAttribute
     operationalState = RvcOperationalState4.OperationalState.Error;
   } else {
     if (state.toLowerCase().includes("clean")) {
-      logger239.info(
+      logger241.info(
         `Unknown vacuum state "${state}" contains 'clean', treating as Running`
       );
       operationalState = RvcOperationalState4.OperationalState.Running;
     } else {
-      logger239.info(`Unknown vacuum state "${state}", treating as Stopped`);
+      logger241.info(`Unknown vacuum state "${state}", treating as Stopped`);
       operationalState = RvcOperationalState4.OperationalState.Stopped;
     }
   }
-  logger239.debug(
+  logger241.debug(
     `Vacuum operationalState: "${state}" -> ${RvcOperationalState4.OperationalState[operationalState]}`
   );
   return operationalState;
@@ -172823,7 +173198,7 @@ var VacuumRvcOperationalStateServer = RvcOperationalStateServer2({
 });
 
 // src/matter/endpoints/legacy/vacuum/index.ts
-var logger240 = Logger.get("VacuumDevice");
+var logger242 = Logger.get("VacuumDevice");
 var VacuumEndpointType = RoboticVacuumCleanerDevice.with(
   BasicInformationServer2,
   VacuumIdentifyServer,
@@ -172837,7 +173212,7 @@ function VacuumDevice(homeAssistantEntity, includeOnOff = false, cleaningModeOpt
   const entityId = homeAssistantEntity.entity.entity_id;
   const attributes9 = homeAssistantEntity.entity.state.attributes;
   const customAreas = homeAssistantEntity.mapping?.customServiceAreas;
-  logger240.info(
+  logger242.info(
     `Creating vacuum endpoint for ${entityId}, mapping: ${JSON.stringify(homeAssistantEntity.mapping ?? "none")}`
   );
   const cleanAreaRooms = homeAssistantEntity.mapping?.cleanAreaRooms;
@@ -172850,32 +173225,32 @@ function VacuumDevice(homeAssistantEntity, includeOnOff = false, cleaningModeOpt
     )
   ).set({ homeAssistantEntity });
   if (includeOnOff) {
-    logger240.info(`${entityId}: Adding OnOff cluster (vacuumOnOff flag enabled)`);
+    logger242.info(`${entityId}: Adding OnOff cluster (vacuumOnOff flag enabled)`);
     device = device.with(VacuumOnOffServer);
   }
   device = device.with(VacuumPowerSourceServer);
   const roomEntities = homeAssistantEntity.mapping?.roomEntities;
   const rooms = parseVacuumRooms(attributes9);
-  logger240.info(
+  logger242.info(
     `${entityId}: customAreas=${customAreas?.length ?? 0}, roomEntities=${JSON.stringify(roomEntities ?? [])}, parsedRooms=${rooms.length}, cleanAreaRooms=${cleanAreaRooms?.length ?? 0}`
   );
   if (cleanAreaRooms && cleanAreaRooms.length > 0) {
-    logger240.info(
+    logger242.info(
       `${entityId}: Adding ServiceArea (${cleanAreaRooms.length} HA areas via CLEAN_AREA)`
     );
     device = device.with(createCleanAreaServiceAreaServer(cleanAreaRooms));
   } else if (customAreas && customAreas.length > 0) {
-    logger240.info(
+    logger242.info(
       `${entityId}: Adding ServiceArea (${customAreas.length} custom areas)`
     );
     device = device.with(createCustomServiceAreaServer(customAreas));
   } else if (rooms.length > 0 || roomEntities && roomEntities.length > 0) {
-    logger240.info(`${entityId}: Adding ServiceArea (${rooms.length} rooms)`);
+    logger242.info(`${entityId}: Adding ServiceArea (${rooms.length} rooms)`);
     device = device.with(
       createVacuumServiceAreaServer(attributes9, roomEntities)
     );
   } else {
-    logger240.info(`${entityId}: Adding ServiceArea (default single-area)`);
+    logger242.info(`${entityId}: Adding ServiceArea (default single-area)`);
     device = device.with(createDefaultServiceAreaServer());
   }
   const fanSpeedList = resolveFanSpeedList(
@@ -172886,7 +173261,7 @@ function VacuumDevice(homeAssistantEntity, includeOnOff = false, cleaningModeOpt
     homeAssistantEntity.mapping?.mopIntensityEntity
   );
   if (cleaningModeOptions || fanSpeedList || mopIntensityList) {
-    logger240.info(
+    logger242.info(
       `${entityId}: Adding RvcCleanMode (multi-mode, cleaningModeOptions=${JSON.stringify(cleaningModeOptions ?? [])}, fanSpeedList=${JSON.stringify(fanSpeedList ?? [])}, mopIntensityList=${JSON.stringify(mopIntensityList ?? [])})`
     );
     device = device.with(
@@ -172899,7 +173274,7 @@ function VacuumDevice(homeAssistantEntity, includeOnOff = false, cleaningModeOpt
       )
     );
   } else {
-    logger240.info(`${entityId}: Adding RvcCleanMode (default single-mode)`);
+    logger242.info(`${entityId}: Adding RvcCleanMode (default single-mode)`);
     device = device.with(createDefaultRvcCleanModeServer());
   }
   return device;
@@ -173065,7 +173440,7 @@ var WaterHeaterThermostatServer = ThermostatServer2(
 );
 
 // src/matter/endpoints/legacy/water-heater/index.ts
-var logger241 = Logger.get("WaterHeaterDevice");
+var logger243 = Logger.get("WaterHeaterDevice");
 var WaterHeaterDeviceType = ThermostatDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
@@ -173081,7 +173456,7 @@ function toMatterTemp2(value) {
 }
 function WaterHeaterDevice2(homeAssistantEntity) {
   const attributes9 = homeAssistantEntity.entity.state.attributes;
-  logger241.debug(
+  logger243.debug(
     `Creating device for ${homeAssistantEntity.entity.entity_id}, min_temp=${attributes9.min_temp}, max_temp=${attributes9.max_temp}`
   );
   const minLimit = toMatterTemp2(attributes9.min_temp) ?? 0;
@@ -173167,6 +173542,7 @@ var WaterHeaterBoostMemoryBehavior = class extends Behavior {
 // src/matter/endpoints/legacy/water-heater/behaviors/water-heater-management-server.ts
 init_dist();
 init_esm();
+init_types2();
 init_home_assistant_entity_behavior();
 
 // src/matter/endpoints/legacy/water-heater/water-heater-modes.ts
@@ -173323,7 +173699,7 @@ function activeHeatSource(attributes9) {
 }
 
 // src/matter/endpoints/legacy/water-heater/behaviors/water-heater-management-server.ts
-var logger242 = Logger.get("WaterHeaterManagementServer");
+var logger244 = Logger.get("WaterHeaterManagementServer");
 var MAX_TIMER_MS2 = 2147483647;
 var boostSessions = /* @__PURE__ */ new WeakMap();
 function clearBoostTimer(endpoint) {
@@ -173569,7 +173945,7 @@ var WaterHeaterManagementServerBase = class _WaterHeaterManagementServerBase ext
   armBoostTimer(durationSeconds) {
     const delay = durationSeconds * 1e3;
     if (!Number.isFinite(delay) || delay <= 0 || delay > MAX_TIMER_MS2) {
-      logger242.debug(
+      logger244.debug(
         `Boost duration ${durationSeconds}s outside the timer range, boost stays active until CancelBoost`
       );
       return;
@@ -173583,7 +173959,7 @@ var WaterHeaterManagementServerBase = class _WaterHeaterManagementServerBase ext
             agent.get(_WaterHeaterManagementServerBase).endBoost({ restoreMode: true });
           });
         } catch (error) {
-          logger242.debug(
+          logger244.debug(
             `Boost expiry failed (endpoint may be closing): ${error}`
           );
         }
@@ -173686,13 +174062,13 @@ function WaterHeaterModeServer2(mapping, initialMode) {
 }
 
 // src/matter/endpoints/legacy/water-heater/water-heater-management-device.ts
-var logger243 = Logger.get("WaterHeaterManagementDevice");
+var logger245 = Logger.get("WaterHeaterManagementDevice");
 function WaterHeaterManagementDevice(homeAssistantEntity) {
   const entityState = homeAssistantEntity.entity.state;
   const attributes9 = entityState.attributes;
   const modeMapping = buildModeMapping(attributes9);
   const initialMode = currentMode(modeMapping, entityState.state, attributes9);
-  logger243.debug(
+  logger245.debug(
     `Creating Matter 1.4 water heater for ${homeAssistantEntity.entity.entity_id}, modes=[${modeMapping.supportedModes.map((m) => `${m.mode}:${m.label}`).join(", ")}], boostMode=${modeMapping.boostOperationMode ?? "none"}`
   );
   const minLimit = toMatterTemp2(attributes9.min_temp) ?? 0;
@@ -173963,7 +174339,7 @@ var matterDeviceTypeFactories = {
 };
 
 // src/matter/endpoints/composed/user-composed-endpoint.ts
-var logger244 = Logger.get("UserComposedEndpoint");
+var logger246 = Logger.get("UserComposedEndpoint");
 function stripBasicInformation(type) {
   const behaviors = { ...type.behaviors };
   delete behaviors.bridgedDeviceBasicInformation;
@@ -174039,7 +174415,7 @@ var UserComposedEndpoint = class _UserComposedEndpoint extends Endpoint {
       { vacuumOnOff: registry3.isVacuumOnOffEnabled() }
     );
     if (!primaryType) {
-      logger244.warn(
+      logger246.warn(
         `Cannot create endpoint type for primary entity ${primaryEntityId}`
       );
       return void 0;
@@ -174054,7 +174430,7 @@ var UserComposedEndpoint = class _UserComposedEndpoint extends Endpoint {
       if (!sub.entityId) continue;
       const subPayload = buildEntityPayload4(registry3, sub.entityId);
       if (!subPayload) {
-        logger244.warn(
+        logger246.warn(
           `Cannot find state for composed sub-entity ${sub.entityId}, it does not exist in Home Assistant (removed or renamed?)`
         );
         continue;
@@ -174069,7 +174445,7 @@ var UserComposedEndpoint = class _UserComposedEndpoint extends Endpoint {
         config8.areaName
       );
       if (!subType) {
-        logger244.warn(
+        logger246.warn(
           `Cannot create endpoint type for composed sub-entity ${sub.entityId}`
         );
         continue;
@@ -174082,7 +174458,7 @@ var UserComposedEndpoint = class _UserComposedEndpoint extends Endpoint {
       mappedIds.push(sub.entityId);
     }
     if (parts.length < 2) {
-      logger244.warn(
+      logger246.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;
@@ -174106,7 +174482,7 @@ var UserComposedEndpoint = class _UserComposedEndpoint extends Endpoint {
     const labels = parts.map(
       (_, i) => i === 0 ? primaryEntityId.split(".")[0] : composedEntities[i - 1]?.entityId?.split(".")[0] ?? "?"
     ).join("+");
-    logger244.info(
+    logger246.info(
       `Created user composed device ${primaryEntityId}: ${parts.length} sub-endpoint(s) [${labels}]`
     );
     return endpoint;
@@ -174212,7 +174588,7 @@ function asStandaloneEndpointType(type) {
 }
 
 // src/matter/endpoints/legacy/legacy-endpoint.ts
-var logger245 = Logger.get("LegacyEndpoint");
+var logger247 = Logger.get("LegacyEndpoint");
 var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
   constructor(type, entityId, customName, mappedEntityIds, throttleMs, endpointId, vacuumEffective) {
     super(type, entityId, customName, mappedEntityIds, endpointId);
@@ -174228,25 +174604,25 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
       return;
     }
     if (registry3.isAutoBatteryMappingEnabled() && registry3.isBatteryEntityUsed(entityId)) {
-      logger245.debug(
+      logger247.debug(
         `Skipping ${entityId} - already auto-assigned as battery to another device`
       );
       return;
     }
     if (registry3.isAutoHumidityMappingEnabled() && registry3.isHumidityEntityUsed(entityId)) {
-      logger245.debug(
+      logger247.debug(
         `Skipping ${entityId} - already auto-assigned as humidity to a temperature sensor`
       );
       return;
     }
     if (registry3.isAutoPressureMappingEnabled() && registry3.isPressureEntityUsed(entityId)) {
-      logger245.debug(
+      logger247.debug(
         `Skipping ${entityId} - already auto-assigned as pressure to a temperature sensor`
       );
       return;
     }
     if (registry3.isAutoComposedDevicesEnabled() && registry3.isComposedSubEntityUsed(entityId)) {
-      logger245.debug(
+      logger247.debug(
         `Skipping ${entityId} - already consumed by a composed device`
       );
       return;
@@ -174266,7 +174642,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
               humidityEntity: humidityEntityId
             };
             registry3.markHumidityEntityUsed(humidityEntityId);
-            logger245.debug(
+            logger247.debug(
               `Auto-assigned humidity ${humidityEntityId} to ${entityId}`
             );
           }
@@ -174285,7 +174661,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
               pressureEntity: pressureEntityId
             };
             registry3.markPressureEntityUsed(pressureEntityId);
-            logger245.debug(
+            logger247.debug(
               `Auto-assigned pressure ${pressureEntityId} to ${entityId}`
             );
           }
@@ -174303,7 +174679,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             batteryEntity: batteryEntityId
           };
           registry3.markBatteryEntityUsed(batteryEntityId);
-          logger245.debug(
+          logger247.debug(
             `Auto-assigned battery ${batteryEntityId} to ${entityId}`
           );
         }
@@ -174320,7 +174696,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             entityId: effectiveMapping?.entityId ?? entityId,
             faultEntity: faultEntityId
           };
-          logger245.debug(`Auto-assigned fault ${faultEntityId} to ${entityId}`);
+          logger247.debug(`Auto-assigned fault ${faultEntityId} to ${entityId}`);
         }
       }
       if (!mapping?.powerEntity) {
@@ -174336,7 +174712,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
               powerEntity: powerEntityId
             };
             registry3.markPowerEntityUsed(powerEntityId);
-            logger245.debug(`Auto-assigned power ${powerEntityId} to ${entityId}`);
+            logger247.debug(`Auto-assigned power ${powerEntityId} to ${entityId}`);
           }
         }
       }
@@ -174353,7 +174729,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
               energyEntity: energyEntityId
             };
             registry3.markEnergyEntityUsed(energyEntityId);
-            logger245.debug(
+            logger247.debug(
               `Auto-assigned energy ${energyEntityId} to ${entityId}`
             );
           }
@@ -174369,7 +174745,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             entityId: effectiveMapping?.entityId ?? entityId,
             cleaningModeEntity: vacuumEntities.cleaningModeEntity
           };
-          logger245.info(
+          logger247.info(
             `Auto-assigned cleaningMode ${vacuumEntities.cleaningModeEntity} to ${entityId}`
           );
         }
@@ -174379,7 +174755,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             entityId: effectiveMapping?.entityId ?? entityId,
             suctionLevelEntity: vacuumEntities.suctionLevelEntity
           };
-          logger245.info(
+          logger247.info(
             `Auto-assigned suctionLevel ${vacuumEntities.suctionLevelEntity} to ${entityId}`
           );
         }
@@ -174389,7 +174765,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             entityId: effectiveMapping?.entityId ?? entityId,
             mopIntensityEntity: vacuumEntities.mopIntensityEntity
           };
-          logger245.info(
+          logger247.info(
             `Auto-assigned mopIntensity ${vacuumEntities.mopIntensityEntity} to ${entityId}`
           );
         }
@@ -174399,7 +174775,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             entityId: effectiveMapping?.entityId ?? entityId,
             currentRoomEntity: vacuumEntities.currentRoomEntity
           };
-          logger245.info(
+          logger247.info(
             `Auto-assigned currentRoom ${vacuumEntities.currentRoomEntity} to ${entityId}`
           );
         }
@@ -174414,7 +174790,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             entityId: effectiveMapping?.entityId ?? entityId,
             cleanAreaRooms
           };
-          logger245.info(
+          logger247.info(
             `Using ${cleanAreaRooms.length} HA areas via CLEAN_AREA for ${entityId}`
           );
         }
@@ -174435,7 +174811,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
                 rooms: roomsObj
               }
             };
-            logger245.debug(
+            logger247.debug(
               `Auto-detected ${valetudoRooms.length} Valetudo segments for ${entityId}`
             );
           } else {
@@ -174452,7 +174828,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
                   rooms: roomsObj
                 }
               };
-              logger245.debug(
+              logger247.debug(
                 `Auto-detected ${roborockRooms.length} Roborock rooms for ${entityId}`
               );
             }
@@ -174461,7 +174837,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
       }
     }
     if (standalone && ((effectiveMapping?.composedEntities?.length ?? 0) > 0 || effectiveMapping?.climateExposeFan === true)) {
-      logger245.warn(
+      logger247.warn(
         `Composed mappings are not supported in server mode, exposing ${entityId} as a flat standalone endpoint`
       );
     }
@@ -174480,7 +174856,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
       if (composed) {
         return composed;
       }
-      logger245.warn(
+      logger247.warn(
         `User composed device creation failed for ${entityId}, falling back to standalone`
       );
     }
@@ -174545,7 +174921,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
         if (composed) {
           return composed;
         }
-        logger245.warn(
+        logger247.warn(
           `Companion fan creation failed for ${entityId}, falling back to standalone`
         );
       }
@@ -174623,11 +174999,11 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
     }
     if (mappedChanged) {
       this.pendingMappedChange = true;
-      logger245.debug(
+      logger247.debug(
         `Mapped entity change detected for ${this.entityId}, forcing update`
       );
     }
-    logger245.debug(
+    logger247.debug(
       `State update received for ${this.entityId}: state=${state.state}`
     );
     this.lastState = state;
@@ -174848,12 +175224,14 @@ var CameraAvStreamServer = class extends Base4 {
 // src/plugins/builtin/camera/webrtc-provider-server.ts
 init_esm();
 init_esm7();
+init_types2();
 init_esm3();
 
 // src/plugins/builtin/camera/requestor-client.ts
 init_esm();
+init_types2();
 init_esm4();
-var logger246 = Logger.get("CameraWebRtcRequestor");
+var logger248 = Logger.get("CameraWebRtcRequestor");
 var registry2 = /* @__PURE__ */ new Map();
 var pendingDeliveries = /* @__PURE__ */ new Map();
 var invokeTransport = defaultInvoke;
@@ -174887,19 +175265,19 @@ function deliverAnswerDeferred(sessionId, sdp, onGiveUp) {
             return;
           }
           if (await sendAnswer(sessionId, sdp)) {
-            logger246.info(`answer delivered for session ${sessionId}`);
+            logger248.info(`answer delivered for session ${sessionId}`);
             return;
           }
         }
         if (registry2.get(sessionId) !== owner || pendingDeliveries.get(sessionId) !== timer) {
           return;
         }
-        logger246.info(
+        logger248.info(
           `answer delivery failed for session ${sessionId}, giving up`
         );
         await onGiveUp();
       } catch (err) {
-        logger246.info(
+        logger248.info(
           `answer delivery for session ${sessionId} threw: ${errText(err)}`
         );
       } finally {
@@ -174924,11 +175302,11 @@ function sendAnswer(sessionId, sdp) {
 async function invokeRequestor(sessionId, command, fields) {
   const registration = registry2.get(sessionId);
   if (!registration) {
-    logger246.info(`requestor ${command}: no session ${sessionId} registered`);
+    logger248.info(`requestor ${command}: no session ${sessionId} registered`);
     return false;
   }
   if (registration.session.isClosed) {
-    logger246.info(`requestor ${command}: session ${sessionId} already closed`);
+    logger248.info(`requestor ${command}: session ${sessionId} already closed`);
     return false;
   }
   const request = {
@@ -174940,7 +175318,7 @@ async function invokeRequestor(sessionId, command, fields) {
   try {
     return await invokeTransport({ registration, request });
   } catch (err) {
-    logger246.info(
+    logger248.info(
       `requestor ${command} failed for session ${sessionId}: ${errText(err)}`
     );
     return false;
@@ -174975,7 +175353,7 @@ async function defaultInvoke({
       for (const entry of chunk) {
         if (entry.kind === "cmd-status") {
           if (entry.status !== Status2.Success) {
-            logger246.info(
+            logger248.info(
               `requestor ${request.command} status ${entry.status} for session ${String(request.fields.webRtcSessionId)}`
             );
             return false;
@@ -174995,7 +175373,7 @@ function errText(err) {
 }
 
 // src/plugins/builtin/camera/webrtc-provider-server.ts
-var logger247 = Logger.get("CameraWebRtc");
+var logger249 = Logger.get("CameraWebRtc");
 var nextGlobalSessionId = 0;
 function mintSessionId() {
   for (let i = 0; i <= 65534; i++) {
@@ -175009,14 +175387,14 @@ var CameraWebRtcProviderServer = class extends WebRtcTransportProviderServer {
   solicitOffer(request) {
     const id = mintSessionId();
     this.trackSession(id, request.streamUsage, request.originatingEndpointId);
-    logger247.info(
+    logger249.info(
       `solicitOffer session=${id} (${this.state.entityId}), deferred offer`
     );
     void this.state.bridge.startSession(id, this.state.entityId, {
       iceServers: request.iceServers,
       iceTransportPolicy: request.iceTransportPolicy
     }).catch(
-      (err) => logger247.info(
+      (err) => logger249.info(
         `solicitOffer startSession failed for ${this.state.entityId}: ${errText2(err)}`
       )
     );
@@ -175024,7 +175402,7 @@ var CameraWebRtcProviderServer = class extends WebRtcTransportProviderServer {
   }
   async provideOffer(request) {
     const id = request.webRtcSessionId ?? mintSessionId();
-    logger247.info(
+    logger249.info(
       `provideOffer entry: entityId=${this.state.entityId} session=${id} (sdp ${request.sdp.length} chars)`
     );
     if (request.webRtcSessionId == null) {
@@ -175058,7 +175436,7 @@ var CameraWebRtcProviderServer = class extends WebRtcTransportProviderServer {
       );
     } catch (err) {
       const message = errText2(err);
-      logger247.info(
+      logger249.info(
         `provideOffer failed for ${this.state.entityId} session=${id}: ${message}`
       );
       unregisterRequestor(id);
@@ -175070,7 +175448,7 @@ var CameraWebRtcProviderServer = class extends WebRtcTransportProviderServer {
         StatusCode.Failure
       );
     }
-    logger247.info(
+    logger249.info(
       `provideOffer answer computed for ${this.state.entityId} session=${id} (${answerSdp.length} chars); delivering via requestor`
     );
     const bridge = this.state.bridge;
@@ -175089,7 +175467,7 @@ var CameraWebRtcProviderServer = class extends WebRtcTransportProviderServer {
     return { webRtcSessionId: id };
   }
   provideAnswer(request) {
-    logger247.info(
+    logger249.info(
       `provideAnswer session=${request.webRtcSessionId} (sdp ${request.sdp.length} chars, ${this.state.entityId})`
     );
     return this.state.bridge.acceptControllerAnswer(
@@ -175098,7 +175476,7 @@ var CameraWebRtcProviderServer = class extends WebRtcTransportProviderServer {
     );
   }
   async provideIceCandidates(request) {
-    logger247.info(
+    logger249.info(
       `provideIceCandidates session=${request.webRtcSessionId}: ${request.iceCandidates.length} candidate(s) (${this.state.entityId})`
     );
     for (const c of request.iceCandidates) {
@@ -175111,7 +175489,7 @@ var CameraWebRtcProviderServer = class extends WebRtcTransportProviderServer {
     }
   }
   async endSession(request) {
-    logger247.info(
+    logger249.info(
       `endSession session=${request.webRtcSessionId} (${this.state.entityId})`
     );
     await this.state.bridge.endSession(request.webRtcSessionId);
@@ -175232,7 +175610,7 @@ import {
   createLongLivedTokenAuth as createLongLivedTokenAuth2
 } from "home-assistant-js-websocket";
 import { RTCPeerConnection } from "werift";
-var logger248 = Logger.get("CameraWebRtc");
+var logger250 = Logger.get("CameraWebRtc");
 var DEFAULT_HA_WEBRTC_TIMEOUT_MS = 15e3;
 var haWebRtcTimeoutMs = DEFAULT_HA_WEBRTC_TIMEOUT_MS;
 var WebRtcBridge = class {
@@ -175279,7 +175657,7 @@ var WebRtcBridge = class {
       const haOffer = await haPeer.createOffer();
       await haPeer.setLocalDescription(haOffer);
       const haOfferSdp = this.localSdp(haPeer);
-      logger248.info(`HA offer sent for ${entityId} (${haOfferSdp.length} chars)`);
+      logger250.info(`HA offer sent for ${entityId} (${haOfferSdp.length} chars)`);
       const { answer, sessionId, unsubscribe } = await this.requestHaWebRtc(
         entityId,
         haOfferSdp,
@@ -175302,12 +175680,12 @@ var WebRtcBridge = class {
       const controllerOffer = await controllerPeer.createOffer();
       await controllerPeer.setLocalDescription(controllerOffer);
       const sdp = this.localSdp(controllerPeer);
-      logger248.info(
+      logger250.info(
         `controller offer created for ${entityId} (${sdp.length} chars)`
       );
       return { sdp, iceCandidates };
     } catch (err) {
-      logger248.info(`startSession failed for ${entityId}: ${errText3(err)}`);
+      logger250.info(`startSession failed for ${entityId}: ${errText3(err)}`);
       await this.endSession(matterSessionId);
       throw err;
     }
@@ -175337,7 +175715,7 @@ var WebRtcBridge = class {
       const haOffer = await haPeer.createOffer();
       await haPeer.setLocalDescription(haOffer);
       const haOfferSdp = this.localSdp(haPeer);
-      logger248.info(`HA offer sent for ${entityId} (${haOfferSdp.length} chars)`);
+      logger250.info(`HA offer sent for ${entityId} (${haOfferSdp.length} chars)`);
       const { answer, sessionId, unsubscribe } = await this.requestHaWebRtc(
         entityId,
         haOfferSdp,
@@ -175356,12 +175734,12 @@ var WebRtcBridge = class {
       const controllerAnswer = await controllerPeer.createAnswer();
       await controllerPeer.setLocalDescription(controllerAnswer);
       const answerSdp = this.localSdp(controllerPeer);
-      logger248.info(
+      logger250.info(
         `controller answer created for ${entityId} (${answerSdp.length} chars)`
       );
       return answerSdp;
     } catch (err) {
-      logger248.info(
+      logger250.info(
         `acceptControllerOffer failed for ${entityId}: ${errText3(err)}`
       );
       await this.endSession(matterSessionId);
@@ -175372,14 +175750,14 @@ var WebRtcBridge = class {
   async acceptControllerAnswer(matterSessionId, sdp) {
     const session = this.sessions.get(matterSessionId);
     if (!session) return;
-    logger248.debug(`controller answer applied for ${session.entityId}`);
+    logger250.debug(`controller answer applied for ${session.entityId}`);
     await session.controllerPeer.setRemoteDescription({ type: "answer", sdp });
   }
   /** Add a remote ICE candidate from the Matter controller. */
   async addControllerIceCandidate(matterSessionId, candidate, sdpMid, sdpMLineIndex) {
     const session = this.sessions.get(matterSessionId);
     if (!session) return;
-    logger248.debug(
+    logger250.debug(
       `controller ICE candidate for ${session.entityId}: ${candidate}`
     );
     await session.controllerPeer.addIceCandidate({
@@ -175393,12 +175771,12 @@ var WebRtcBridge = class {
   async closeExistingPeers(matterSessionId) {
     const prior = this.sessions.get(matterSessionId);
     if (!prior) return;
-    logger248.info(
+    logger250.info(
       `replacing session ${matterSessionId} (${prior.entityId}), closing prior peers`
     );
     if (prior.haUnsubscribe) {
       await Promise.resolve(prior.haUnsubscribe()).catch(
-        (err) => logger248.debug(`HA unsubscribe failed: ${errText3(err)}`)
+        (err) => logger250.debug(`HA unsubscribe failed: ${errText3(err)}`)
       );
     }
     await prior.haPeer.close().catch(() => {
@@ -175411,11 +175789,11 @@ var WebRtcBridge = class {
   async endSession(matterSessionId) {
     const session = this.sessions.get(matterSessionId);
     if (!session) return;
-    logger248.info(`ending session ${matterSessionId} (${session.entityId})`);
+    logger250.info(`ending session ${matterSessionId} (${session.entityId})`);
     this.sessions.delete(matterSessionId);
     if (session.haUnsubscribe) {
       await Promise.resolve(session.haUnsubscribe()).catch(
-        (err) => logger248.debug(`HA unsubscribe failed: ${errText3(err)}`)
+        (err) => logger250.debug(`HA unsubscribe failed: ${errText3(err)}`)
       );
     }
     await session.haPeer.close().catch(() => {
@@ -175445,11 +175823,11 @@ var WebRtcBridge = class {
         headers: { Authorization: `Bearer ${this.config.haToken}` }
       });
     } catch (err) {
-      logger248.info(`snapshot fetch failed for ${entityId}: ${errText3(err)}`);
+      logger250.info(`snapshot fetch failed for ${entityId}: ${errText3(err)}`);
       throw err;
     }
     if (!res.ok) {
-      logger248.info(
+      logger250.info(
         `snapshot fetch failed for ${entityId}: camera_proxy ${res.status}`
       );
       throw new Error(`HA camera_proxy ${entityId}: ${res.status}`);
@@ -175466,10 +175844,10 @@ var WebRtcBridge = class {
   // Forward every track HA sends into the matching pre-added controller sender.
   forwardHaTracks(haPeer, senders, entityId) {
     haPeer.onTrack.subscribe((track) => {
-      logger248.info(`onTrack ${track.kind} from HA (${entityId})`);
+      logger250.info(`onTrack ${track.kind} from HA (${entityId})`);
       const transceiver = senders.get(track.kind);
       if (!transceiver) {
-        logger248.info(
+        logger250.info(
           `no controller transceiver for ${track.kind} (${entityId})`
         );
         return;
@@ -175478,7 +175856,7 @@ var WebRtcBridge = class {
       track.onReceiveRtp.subscribe((rtp) => {
         if (!firstLogged) {
           firstLogged = true;
-          logger248.info(`first RTP forwarded for ${track.kind} (${entityId})`);
+          logger250.info(`first RTP forwarded for ${track.kind} (${entityId})`);
         }
         transceiver.sender.sendRtp(rtp);
       });
@@ -175487,10 +175865,10 @@ var WebRtcBridge = class {
   // Log connection/ice state transitions (these events fire on change only).
   wireStateLogging(peer, label, entityId) {
     peer.connectionStateChange.subscribe(
-      (s) => logger248.info(`${label} connectionState=${s} (${entityId})`)
+      (s) => logger250.info(`${label} connectionState=${s} (${entityId})`)
     );
     peer.iceConnectionStateChange.subscribe(
-      (s) => logger248.info(`${label} iceConnectionState=${s} (${entityId})`)
+      (s) => logger250.info(`${label} iceConnectionState=${s} (${entityId})`)
     );
   }
   // Map the Matter ICE struct onto werift's config. Only the controller peer
@@ -175504,11 +175882,11 @@ var WebRtcBridge = class {
       }))
     );
     if (iceServers.length === 0) {
-      logger248.info(`controller peer using default ICE servers (${entityId})`);
+      logger250.info(`controller peer using default ICE servers (${entityId})`);
       return void 0;
     }
     const policy = ice?.iceTransportPolicy === "relay" || ice?.iceTransportPolicy === "all" ? ice.iceTransportPolicy : void 0;
-    logger248.info(
+    logger250.info(
       `controller peer using ${iceServers.length} controller ICE server(s)${policy ? ` policy=${policy}` : ""} (${entityId})`
     );
     return policy ? { iceServers, iceTransportPolicy: policy } : { iceServers };
@@ -175522,13 +175900,13 @@ var WebRtcBridge = class {
   feedHaCandidate(entityId, haPeer, candidate) {
     const value = candidate?.candidate;
     if (!value) return;
-    logger248.debug(`HA ICE candidate for ${entityId}: ${value}`);
+    logger250.debug(`HA ICE candidate for ${entityId}: ${value}`);
     void haPeer.addIceCandidate({
       candidate: value,
       sdpMid: candidate?.sdpMid ?? void 0,
       sdpMLineIndex: candidate?.sdpMLineIndex ?? void 0
     }).catch(
-      (e) => logger248.debug(
+      (e) => logger250.debug(
         `HA addIceCandidate failed for ${entityId}: ${errText3(e)}`
       )
     );
@@ -175557,7 +175935,7 @@ var WebRtcBridge = class {
         reject(err);
       });
       timer = setTimeout(() => {
-        logger248.info(
+        logger250.info(
           `HA WebRTC timed out after ${haWebRtcTimeoutMs}ms for ${entityId}`
         );
         fail(
@@ -175575,7 +175953,7 @@ var WebRtcBridge = class {
                 if (msg.session_id) sessionId = msg.session_id;
                 const ans = msg.answer;
                 settle(() => {
-                  logger248.info(
+                  logger250.info(
                     `HA answer received for ${entityId} (${ans.length} chars)`
                   );
                   resolve11(ans);
@@ -175584,7 +175962,7 @@ var WebRtcBridge = class {
               break;
             case "error": {
               const detail = msg.message ?? msg.code ?? "unknown error";
-              logger248.info(`HA WebRTC error for ${entityId}: ${detail}`);
+              logger250.info(`HA WebRTC error for ${entityId}: ${detail}`);
               fail(new Error(`HA WebRTC error: ${detail}`));
               break;
             }
@@ -175758,7 +176136,7 @@ var CameraPlugin = class {
 // src/plugins/builtin/security/security-plugin.ts
 init_esm();
 import {
-  callService as callService2,
+  callService,
   createConnection as createConnection4,
   createLongLivedTokenAuth as createLongLivedTokenAuth3
 } from "home-assistant-js-websocket";
@@ -176610,7 +176988,7 @@ var SecurityPlugin = class {
     let timer;
     try {
       await Promise.race([
-        callService2(connection, domain, service, void 0, {
+        callService(connection, domain, service, void 0, {
           entity_id: entityId
         }),
         new Promise((_, reject) => {
@@ -176741,7 +177119,7 @@ import {
   getCollection
 } from "home-assistant-js-websocket";
 import { atLeastHaVersion } from "home-assistant-js-websocket/dist/util.js";
-var logger249 = Logger.get("SubscribeEntities");
+var logger251 = Logger.get("SubscribeEntities");
 function processEvent(store, updates) {
   const state = { ...store.state };
   if (updates.a) {
@@ -176767,7 +177145,7 @@ function processEvent(store, updates) {
     for (const entityId in updates.c) {
       let entityState = state[entityId];
       if (!entityState) {
-        logger249.warn("Received state update for unknown entity", entityId);
+        logger251.warn("Received state update for unknown entity", entityId);
         continue;
       }
       entityState = { ...entityState };
@@ -176856,7 +177234,7 @@ var subscribeEntities = (conn, onChange, entityIds) => {
 // src/services/bridges/entity-isolation-service.ts
 init_esm();
 init_diagnostic_event_bus();
-var logger250 = Logger.get("EntityIsolation");
+var logger252 = Logger.get("EntityIsolation");
 var EntityIsolationServiceImpl = class {
   isolatedEntities = /* @__PURE__ */ new Map();
   isolationCallbacks = /* @__PURE__ */ new Map();
@@ -176924,13 +177302,13 @@ var EntityIsolationServiceImpl = class {
     }
     const parsed = this.parseEndpointPath(msg);
     if (!parsed) {
-      logger250.warn("Could not parse entity from error:", msg);
+      logger252.warn("Could not parse entity from error:", msg);
       return false;
     }
     const { bridgeId, entityName } = parsed;
     const callback = this.isolationCallbacks.get(bridgeId);
     if (!callback) {
-      logger250.warn(
+      logger252.warn(
         `No isolation callback registered for bridge ${bridgeId}, entity: ${entityName}`
       );
       return false;
@@ -176945,7 +177323,7 @@ var EntityIsolationServiceImpl = class {
       reason,
       failedAt: (/* @__PURE__ */ new Date()).toISOString()
     });
-    logger250.warn(
+    logger252.warn(
       `Isolating entity "${entityName}" from bridge ${bridgeId} due to: ${reason}`
     );
     diagnosticEventBus.emit("entity_error", `Entity isolated: ${entityName}`, {
@@ -176957,7 +177335,7 @@ var EntityIsolationServiceImpl = class {
       await callback(entityName);
       return true;
     } catch (e) {
-      logger250.error(`Failed to isolate entity ${entityName}:`, e);
+      logger252.error(`Failed to isolate entity ${entityName}:`, e);
       return false;
     }
   }
@@ -176988,7 +177366,13 @@ var EntityIsolationService = new EntityIsolationServiceImpl();
 
 // src/services/bridges/bridge-endpoint-manager.ts
 var MAX_ENTITY_ID_LENGTH = 150;
-var ENDPOINT_REMOVAL_GRACE_MS = 6e4;
+var ENDPOINT_REMOVAL_GRACE_MS = 3e5;
+function isEntityPart(p) {
+  return typeof p.updateStates === "function";
+}
+function hasEntityIdentity(p) {
+  return typeof p.entityId === "string";
+}
 var BridgeEndpointManager = class extends Service {
   constructor(client, registry3, mappingStorage, identityStorage, bridgeId, log, pluginManager, pluginRegistry, pluginInstaller) {
     super("BridgeEndpointManager");
@@ -177026,11 +177410,15 @@ var BridgeEndpointManager = class extends Service {
   root;
   entityIds = [];
   unsubscribe;
+  observingRequested = false;
   _failedEntities = [];
   mappingFingerprints = /* @__PURE__ */ new Map();
-  // entityId -> first time it went missing from the registry (grace window)
+  // entityId -> first absence stamp (grace window)
   pendingRemovals = /* @__PURE__ */ new Map();
   removalRecheckTimer = null;
+  // Bumped on every stop, so a refresh that was already running cannot arm a
+  // timer on a bridge that has since stopped (#438).
+  lifecycle = 0;
   pluginEndpoints = /* @__PURE__ */ new Map();
   pluginStateUpdating = /* @__PURE__ */ new Set();
   pluginListeners = /* @__PURE__ */ new Map();
@@ -177063,11 +177451,36 @@ var BridgeEndpointManager = class extends Service {
           );
           return;
         }
+        const supplied = device.endpointType;
         const initialState = {};
         for (const cluster2 of device.clusters) {
+          if (cluster2.clusterId === "pluginDevice" && supplied.behaviors?.pluginDevice == null && supplied.behaviors?.bridgedDeviceBasicInformation == null) {
+            this.log.warn(
+              `Plugin "${pluginName}": device "${device.id}" declares a "pluginDevice" cluster without owning that behavior, ignoring it`
+            );
+            continue;
+          }
           initialState[cluster2.clusterId] = cluster2.attributes;
         }
-        const base = device.endpointType;
+        const hasOwnIdentity = supplied.behaviors?.bridgedDeviceBasicInformation != null;
+        const ownsPluginDevice = supplied.behaviors?.pluginDevice != null;
+        const mutable = typeof supplied.with === "function" && typeof supplied.set === "function";
+        if (!mutable && Object.keys(initialState).length > 0) {
+          this.log.warn(
+            `Plugin "${pluginName}": endpointType for device "${device.id}" cannot take its cluster config, skipping it`
+          );
+          return;
+        }
+        if (!hasOwnIdentity && (!mutable || ownsPluginDevice)) {
+          this.log.warn(
+            `Plugin "${pluginName}": device "${device.id}" mounts without BridgedDeviceBasicInformation, controllers may not show it`
+          );
+        }
+        let base = device.endpointType;
+        if (mutable && !hasOwnIdentity && !ownsPluginDevice) {
+          base = base.with(PluginBasicInformationServer, PluginDeviceBehavior);
+          initialState.pluginDevice = { device, pluginName };
+        }
         endpoint = new Endpoint(
           Object.keys(initialState).length > 0 ? base.set(initialState) : base,
           { id: `plugin_${device.id}` }
@@ -177236,9 +177649,9 @@ var BridgeEndpointManager = class extends Service {
     await this.pluginManager.shutdownAll("Bridge stopping");
     for (const [id, endpoint] of this.pluginEndpoints) {
       try {
-        await endpoint.delete();
+        await endpoint.close();
       } catch (e) {
-        this.log.warn(`Failed to delete plugin endpoint ${id}:`, e);
+        this.log.warn(`Failed to close plugin endpoint ${id}:`, e);
       }
     }
     this.pluginEndpoints.clear();
@@ -177278,7 +177691,7 @@ var BridgeEndpointManager = class extends Service {
    * Called by EntityIsolationService when a runtime error is detected.
    */
   async isolateEntity(entityName) {
-    const endpoints = this.root.parts.map((p) => p);
+    const endpoints = [...this.root.parts].filter(hasEntityIdentity);
     const endpoint = endpoints.find(
       (e) => !(e instanceof VacuumAreaSwitchEndpoint) && (e.id === entityName || e.entityId === entityName)
     ) ?? endpoints.find((e) => e.id === entityName);
@@ -177287,9 +177700,9 @@ var BridgeEndpointManager = class extends Service {
         `Isolating entity ${endpoint.entityId} due to runtime error`
       );
       try {
-        await endpoint.delete();
+        await endpoint.close();
       } catch (e) {
-        this.log.error(`Failed to delete isolated endpoint:`, e);
+        this.log.error(`Failed to close isolated endpoint:`, e);
       }
       this.pendingRemovals.delete(endpoint.entityId);
       this.mappingFingerprints.delete(endpoint.entityId);
@@ -177298,7 +177711,7 @@ var BridgeEndpointManager = class extends Service {
           if (!(sw instanceof VacuumAreaSwitchEndpoint)) continue;
           if (sw.vacuumEndpointId !== endpoint.id) continue;
           try {
-            await sw.delete();
+            await sw.close();
           } catch (e) {
             this.log.warn(`Failed to remove area switch ${sw.id}:`, e);
           }
@@ -177315,11 +177728,13 @@ var BridgeEndpointManager = class extends Service {
       this.removalRecheckTimer = null;
     }
     if (this.pendingRemovals.size === 0) return;
+    const lifecycle = this.lifecycle;
     this.removalRecheckTimer = setTimeout(() => {
       this.removalRecheckTimer = null;
-      this.refreshDevices().catch(
-        (e) => this.log.warn("Endpoint removal recheck failed:", e)
-      );
+      this.refreshDevices().catch((e) => {
+        this.log.warn("Endpoint removal recheck failed:", e);
+        if (lifecycle === this.lifecycle) this.scheduleRemovalRecheck();
+      });
     }, ENDPOINT_REMOVAL_GRACE_MS + 5e3);
   }
   getPluginDomainMappings() {
@@ -177358,7 +177773,8 @@ var BridgeEndpointManager = class extends Service {
     }
   }
   async startObserving() {
-    this.stopObserving();
+    this.clearSubscription();
+    this.observingRequested = true;
     if (!this.entityIds.length) {
       return;
     }
@@ -177382,14 +177798,32 @@ var BridgeEndpointManager = class extends Service {
     }
     return [...ids];
   }
-  stopObserving() {
+  clearSubscription() {
     this.unsubscribe?.();
     this.unsubscribe = void 0;
   }
+  stopObserving() {
+    this.observingRequested = false;
+    this.lifecycle++;
+    this.clearSubscription();
+    if (this.removalRecheckTimer) {
+      clearTimeout(this.removalRecheckTimer);
+      this.removalRecheckTimer = null;
+    }
+  }
   async refreshDevices() {
     this.registry.refresh();
+    const lifecycle = this.lifecycle;
+    const endpoints = [...this.root.parts].filter(hasEntityIdentity).filter((p) => !(p instanceof VacuumAreaSwitchEndpoint));
+    const fullEntities = this.registry.fullEntities;
+    if (!this.client.haRunning || Object.keys(fullEntities).length === 0) {
+      this.pendingRemovals.clear();
+      this.log.warn(
+        `HA not running or registry empty, deferring reconcile of ${endpoints.length} endpoints`
+      );
+      return;
+    }
     this._failedEntities = [];
-    const endpoints = this.root.parts.map((p) => p).filter((p) => !(p instanceof VacuumAreaSwitchEndpoint));
     this.entityIds = this.registry.entityIds;
     if (this.registry.isAutoComposedDevicesEnabled()) {
       for (const eid of this.entityIds) {
@@ -177441,7 +177875,6 @@ var BridgeEndpointManager = class extends Service {
         this.mappingFingerprints.set(entityId, fp);
       }
     }
-    const fullEntities = this.registry.fullEntities;
     stampIdentityPresence(
       this.identityStorage,
       this.bridgeId,
@@ -177490,13 +177923,16 @@ var BridgeEndpointManager = class extends Service {
         this.pendingRemovals.delete(endpoint.entityId);
       }
       if (!present) {
-        const since = this.pendingRemovals.get(endpoint.entityId);
-        if (since == null) {
-          this.pendingRemovals.set(endpoint.entityId, now);
+        const entry = this.pendingRemovals.get(endpoint.entityId);
+        if (entry == null) {
+          this.pendingRemovals.set(endpoint.entityId, {
+            since: now,
+            generation: this.registry.snapshotGeneration
+          });
           existingEndpoints.push(endpoint);
           continue;
         }
-        if (now - since < ENDPOINT_REMOVAL_GRACE_MS) {
+        if (now - entry.since < ENDPOINT_REMOVAL_GRACE_MS || now - this.client.runningSince < ENDPOINT_REMOVAL_GRACE_MS || this.registry.snapshotGeneration <= entry.generation) {
           existingEndpoints.push(endpoint);
           continue;
         }
@@ -177512,13 +177948,13 @@ var BridgeEndpointManager = class extends Service {
         this.pendingRemovals.delete(endpoint.entityId);
       } else if (this.registry.isAutoComposedDevicesEnabled() && this.registry.isComposedSubEntityUsed(endpoint.entityId)) {
         this.log.info(
-          `Deleting standalone endpoint ${endpoint.entityId}, consumed by composed device`
+          `Removing standalone endpoint ${endpoint.entityId}, consumed by composed device`
         );
         try {
-          await endpoint.delete();
+          await endpoint.close();
         } catch (e) {
           this.log.warn(
-            `Failed to delete composed sub-entity endpoint ${endpoint.entityId}:`,
+            `Failed to remove composed sub-entity endpoint ${endpoint.entityId}:`,
             e
           );
         }
@@ -177551,7 +177987,9 @@ var BridgeEndpointManager = class extends Service {
         }
       }
     }
-    this.scheduleRemovalRecheck();
+    if (lifecycle === this.lifecycle) {
+      this.scheduleRemovalRecheck();
+    }
     let memoryLimitReached = false;
     for (const entityId of this.entityIds) {
       if (!memoryLimitReached && isHeapUnderPressure()) {
@@ -177625,7 +178063,7 @@ var BridgeEndpointManager = class extends Service {
       }
     }
     await this.reconcileAreaSwitches();
-    if (this.unsubscribe) {
+    if (this.observingRequested) {
       this.startObserving();
     }
   }
@@ -177757,10 +178195,10 @@ var BridgeEndpointManager = class extends Service {
       this.pendingStates = void 0;
       this.pendingChanged = void 0;
       if (queued) {
-        void this.updateStates(
+        this.updateStates(
           queued,
           queuedChanged === void 0 ? null : queuedChanged
-        );
+        ).catch((e) => this.log.warn("Queued state update failed:", e));
       }
     });
     return this.updateInFlight;
@@ -177768,9 +178206,9 @@ var BridgeEndpointManager = class extends Service {
   async runUpdateStates(states, changed) {
     const startMs = performance.now();
     this.registry.mergeExternalStates(states);
-    const allEndpoints = this.root.parts.map((p) => p);
+    const allEndpoints = [...this.root.parts].filter(isEntityPart);
     const endpoints = changed === null ? allEndpoints : allEndpoints.filter(
-      (e) => changed.has(e.entityId) || e.mappedEntityIds.some((id) => changed.has(id))
+      (e) => changed.has(e.entityId) || (e.mappedEntityIds ?? []).some((id) => changed.has(id))
     );
     if (endpoints.length === 0) return;
     const results = await Promise.allSettled(
@@ -177850,7 +178288,7 @@ var BridgeEndpointManager = class extends Service {
 init_dist();
 init_esm();
 init_send_ha_message();
-import { callService as callService3 } from "home-assistant-js-websocket";
+import { callService as callService2 } from "home-assistant-js-websocket";
 import { keys as keys2, pickBy, values as values3 } from "lodash-es";
 var BridgeRegistry = class _BridgeRegistry {
   constructor(registry3, dataProvider, client) {
@@ -177899,6 +178337,10 @@ var BridgeRegistry = class _BridgeRegistry {
   get fullEntities() {
     return this.registry.entities;
   }
+  // Successful-reload counter, see HomeAssistantRegistry (#438).
+  get snapshotGeneration() {
+    return this.registry.snapshotGeneration;
+  }
   // composed sub-entities may sit outside the bridge filter (#408), so these
   // fall back to the full HA registry. keep them separate from the strict
   // accessors above, every other caller must stay filtered.
@@ -178236,7 +178678,7 @@ var BridgeRegistry = class _BridgeRegistry {
   async resolveRoborockRooms(entityId) {
     if (!this.client) return [];
     try {
-      const raw = await callService3(
+      const raw = await callService2(
         this.client.connection,
         "roborock",
         "get_maps",
@@ -178615,6 +179057,7 @@ function hashAreaId(areaId) {
 init_dist();
 init_esm7();
 import * as os10 from "node:os";
+init_protocol3();
 init_diagnostic_event_bus();
 var imWrapMarker2 = /* @__PURE__ */ Symbol("hamh.wedgeImWrap");
 var commandMessageTypes2 = [
@@ -178630,11 +179073,11 @@ function makeWarmStartState(state, now = (/* @__PURE__ */ new Date()).toISOStrin
   return { ...state, last_updated: now };
 }
 var ServerModeBridge = class {
-  constructor(logger253, dataProvider, endpointManager, server) {
+  constructor(logger255, dataProvider, endpointManager, server) {
     this.dataProvider = dataProvider;
     this.endpointManager = endpointManager;
     this.server = server;
-    this.log = logger253.get(`ServerModeBridge / ${dataProvider.id}`);
+    this.log = logger255.get(`ServerModeBridge / ${dataProvider.id}`);
   }
   dataProvider;
   endpointManager;
@@ -179014,12 +179457,18 @@ ${e?.toString()}`);
         for (const s of [...sessionManager.sessions]) {
           if (s !== newSession && !s.isClosing && s.peerNodeId === newSession.peerNodeId && s.fabric?.fabricIndex === newSession.fabric?.fabricIndex && s.subscriptions.size === 0) {
             this.log.info(
-              `Closing stale session ${s.id} (peer ${s.peerNodeId}, 0 subs), replaced by session ${newSession.id}`
+              `Session ${s.id} (peer ${s.peerNodeId}, 0 subs) replaced by session ${newSession.id}, closing it once it goes quiet`
+            );
+            const staleId = s.id;
+            const armed = this.staleSessionTimers.get(staleId);
+            if (armed) clearTimeout(armed);
+            this.staleSessionTimers.set(
+              staleId,
+              setTimeout(() => {
+                this.staleSessionTimers.delete(staleId);
+                this.closeStaleSession(staleId, PRIMING_GRACE_MS);
+              }, replacedSessionTimeoutMs(this.dataProvider.featureFlags))
             );
-            s.initiateForceClose({
-              cause: new Error("stale session replaced by new session")
-            }).catch(() => {
-            });
           }
         }
         const quietWindowMs = staleSessionQuietWindowMs(
@@ -179055,6 +179504,11 @@ ${e?.toString()}`);
       };
       this.sessionDeletedHandler = (session) => {
         this.sessionStartedAt.delete(session.id);
+        const armed = this.staleSessionTimers.get(session.id);
+        if (armed) {
+          clearTimeout(armed);
+          this.staleSessionTimers.delete(session.id);
+        }
         const sessions = [...sessionManager.sessions];
         this.log.warn(
           `Session closed: id=${session.id} peer=${session.peerNodeId} | remaining sessions=${sessions.length}`
@@ -179163,7 +179617,7 @@ ${e?.toString()}`);
       );
     });
   }
-  closeStaleSession(sessionId) {
+  closeStaleSession(sessionId, minQuietMs = 0) {
     try {
       const sessionManager = this.server.env.get(SessionManager);
       for (const s of [...sessionManager.sessions]) {
@@ -179173,7 +179627,10 @@ ${e?.toString()}`);
         const idleSec = Math.round((Date.now() - s.timestamp) / 1e3);
         if (!staleSessionShouldClose(
           s,
-          staleSessionQuietWindowMs(this.dataProvider.featureFlags)
+          Math.max(
+            staleSessionQuietWindowMs(this.dataProvider.featureFlags),
+            minQuietMs
+          )
         )) {
           this.log.info(
             `Keeping session ${s.id} (peer ${s.peerNodeId}, 0 subs, last traffic ${idleSec}s ago)`
@@ -179182,7 +179639,7 @@ ${e?.toString()}`);
             sessionId,
             setTimeout(() => {
               this.staleSessionTimers.delete(sessionId);
-              this.closeStaleSession(sessionId);
+              this.closeStaleSession(sessionId, minQuietMs);
             }, deadSessionTimeoutMs(this.dataProvider.featureFlags))
           );
           break;
@@ -179211,6 +179668,9 @@ ${e?.toString()}`);
         if (s.isClosing || s.subscriptions.size > 0) {
           continue;
         }
+        if (this.staleSessionTimers.has(s.id)) {
+          continue;
+        }
         const idleSec = Math.round((Date.now() - s.timestamp) / 1e3);
         if (!staleSessionShouldClose(
           s,
@@ -179776,7 +180236,7 @@ function ServerModeVacuumDevice(homeAssistantEntity, includeOnOff = false, clean
 }
 
 // src/matter/endpoints/server-mode-vacuum-endpoint.ts
-var logger251 = Logger.get("ServerModeVacuumEndpoint");
+var logger253 = Logger.get("ServerModeVacuumEndpoint");
 var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEndpoint {
   static async create(registry3, entityId, mapping, endpointId) {
     const deviceRegistry = registry3.deviceOf(entityId);
@@ -179789,7 +180249,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
     if (mapping?.disableBatteryMapping && mapping.batteryEntity) {
       effectiveMapping = { ...mapping, batteryEntity: void 0 };
     }
-    logger251.info(
+    logger253.info(
       `${entityId}: device_id=${entity.device_id}, manualBattery=${mapping?.batteryEntity ?? "none"}`
     );
     if (entity.device_id) {
@@ -179804,15 +180264,15 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
             batteryEntity: batteryEntityId
           };
           registry3.markBatteryEntityUsed(batteryEntityId);
-          logger251.info(`${entityId}: Auto-assigned battery ${batteryEntityId}`);
+          logger253.info(`${entityId}: Auto-assigned battery ${batteryEntityId}`);
         } else {
           const attrs = state.attributes;
           if (attrs.battery_level != null || attrs.battery != null) {
-            logger251.info(
+            logger253.info(
               `${entityId}: No battery entity found, using battery attribute from vacuum state`
             );
           } else {
-            logger251.warn(
+            logger253.warn(
               `${entityId}: No battery entity found for device ${entity.device_id}`
             );
           }
@@ -179827,7 +180287,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
           entityId: effectiveMapping?.entityId ?? entityId,
           cleaningModeEntity: vacuumEntities.cleaningModeEntity
         };
-        logger251.info(
+        logger253.info(
           `${entityId}: Auto-assigned cleaningMode ${vacuumEntities.cleaningModeEntity}`
         );
       }
@@ -179837,7 +180297,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
           entityId: effectiveMapping?.entityId ?? entityId,
           suctionLevelEntity: vacuumEntities.suctionLevelEntity
         };
-        logger251.info(
+        logger253.info(
           `${entityId}: Auto-assigned suctionLevel ${vacuumEntities.suctionLevelEntity}`
         );
       }
@@ -179847,7 +180307,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
           entityId: effectiveMapping?.entityId ?? entityId,
           mopIntensityEntity: vacuumEntities.mopIntensityEntity
         };
-        logger251.info(
+        logger253.info(
           `${entityId}: Auto-assigned mopIntensity ${vacuumEntities.mopIntensityEntity}`
         );
       }
@@ -179857,7 +180317,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
           entityId: effectiveMapping?.entityId ?? entityId,
           currentRoomEntity: vacuumEntities.currentRoomEntity
         };
-        logger251.info(
+        logger253.info(
           `${entityId}: Auto-assigned currentRoom ${vacuumEntities.currentRoomEntity}`
         );
       }
@@ -179872,7 +180332,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
           entityId: effectiveMapping?.entityId ?? entityId,
           cleanAreaRooms
         };
-        logger251.info(
+        logger253.info(
           `${entityId}: Using ${cleanAreaRooms.length} HA areas via CLEAN_AREA`
         );
       }
@@ -179893,7 +180353,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
               rooms: roomsObj
             }
           };
-          logger251.info(
+          logger253.info(
             `${entityId}: Auto-detected ${valetudoRooms.length} Valetudo segments`
           );
         } else {
@@ -179910,14 +180370,14 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
                 rooms: roomsObj
               }
             };
-            logger251.info(
+            logger253.info(
               `${entityId}: Auto-detected ${roborockRooms.length} Roborock rooms`
             );
           }
         }
       }
     } else {
-      logger251.warn(`${entityId}: No device_id, cannot auto-assign battery`);
+      logger253.warn(`${entityId}: No device_id, cannot auto-assign battery`);
     }
     const payload = {
       entity_id: entityId,
@@ -179990,11 +180450,11 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
     }
     if (mappedChanged) {
       this.pendingMappedChange = true;
-      logger251.debug(
+      logger253.debug(
         `Mapped entity change detected for ${this.entityId}, forcing update`
       );
     }
-    logger251.debug(
+    logger253.debug(
       `State update received for ${this.entityId}: state=${state.state}`
     );
     this.lastState = state;
@@ -180057,8 +180517,20 @@ var ServerModeEndpointManager = class extends Service {
   log;
   entityIds = [];
   unsubscribe;
+  observingRequested = false;
   _failedEntities = [];
   endpoints = /* @__PURE__ */ new Map();
+  // Same grace as the aggregator manager: server mode deleted on the FIRST
+  // refresh an entity was absent, so one partial HA snapshot re-minted the
+  // device (#438).
+  pendingRemovals = /* @__PURE__ */ new Map();
+  removalRecheckTimer = null;
+  // endpoint id -> entity that closed but may come back (disable). Its number
+  // is still parked, so nobody else may mount on that id (#438).
+  parkedEndpointIds = /* @__PURE__ */ new Map();
+  // Bumped on every stop, so a refresh that was already running cannot arm a
+  // timer on a bridge that has since stopped.
+  lifecycle = 0;
   get failedEntities() {
     return this._failedEntities;
   }
@@ -180076,6 +180548,11 @@ var ServerModeEndpointManager = class extends Service {
   }
   async dispose() {
     this.stopObserving();
+    if (this.removalRecheckTimer) {
+      clearTimeout(this.removalRecheckTimer);
+      this.removalRecheckTimer = null;
+    }
+    this.pendingRemovals.clear();
     for (const [entityId, entry] of this.endpoints) {
       try {
         await entry.endpoint.close();
@@ -180089,7 +180566,8 @@ var ServerModeEndpointManager = class extends Service {
     this.endpoints.clear();
   }
   async startObserving() {
-    this.stopObserving();
+    this.clearSubscription();
+    this.observingRequested = true;
     if (!this.entityIds.length) {
       return;
     }
@@ -180109,10 +180587,19 @@ var ServerModeEndpointManager = class extends Service {
     }
     return [...ids];
   }
-  stopObserving() {
+  clearSubscription() {
     this.unsubscribe?.();
     this.unsubscribe = void 0;
   }
+  stopObserving() {
+    this.observingRequested = false;
+    this.lifecycle++;
+    this.clearSubscription();
+    if (this.removalRecheckTimer) {
+      clearTimeout(this.removalRecheckTimer);
+      this.removalRecheckTimer = null;
+    }
+  }
   /** Primary first (the entity the first include matcher tests true for). */
   orderEntityIds(ids) {
     const firstMatcher = this.dataProvider.filter?.include?.[0];
@@ -180135,6 +180622,44 @@ var ServerModeEndpointManager = class extends Service {
       this.endpoints.delete(entityId);
     }
   }
+  // Absence-driven removals wait out the grace window AND a fresh successful
+  // HA reload, so restarts and stale snapshots never erase numbers (#438).
+  // Returns the ids whose absence is confirmed, ready for removeEndpoints.
+  removableAfterGrace(entityIds) {
+    const now = Date.now();
+    const generation = this.registry.snapshotGeneration;
+    const ready = [];
+    for (const entityId of entityIds) {
+      const entry = this.pendingRemovals.get(entityId);
+      if (entry == null) {
+        this.pendingRemovals.set(entityId, { since: now, generation });
+        continue;
+      }
+      if (now - entry.since < ENDPOINT_REMOVAL_GRACE_MS || now - this.client.runningSince < ENDPOINT_REMOVAL_GRACE_MS || generation <= entry.generation) {
+        continue;
+      }
+      ready.push(entityId);
+      this.pendingRemovals.delete(entityId);
+    }
+    return ready;
+  }
+  // refreshDevices only runs on registry-fingerprint changes, which may not
+  // recur, so drive held removals to completion ourselves after the grace.
+  scheduleRemovalRecheck() {
+    if (this.removalRecheckTimer) {
+      clearTimeout(this.removalRecheckTimer);
+      this.removalRecheckTimer = null;
+    }
+    if (this.pendingRemovals.size === 0) return;
+    const lifecycle = this.lifecycle;
+    this.removalRecheckTimer = setTimeout(() => {
+      this.removalRecheckTimer = null;
+      this.refreshDevices().catch((e) => {
+        this.log.warn("Endpoint removal recheck failed:", e);
+        if (lifecycle === this.lifecycle) this.scheduleRemovalRecheck();
+      });
+    }, ENDPOINT_REMOVAL_GRACE_MS + 5e3);
+  }
   // Like removeEndpoints but close() keeps the persisted number pre-allocated,
   // so a same-id recreate reuses it. Used on rename and same-id recreates (#404).
   async closeEndpoint(entityId) {
@@ -180144,29 +180669,40 @@ var ServerModeEndpointManager = class extends Service {
       await entry.endpoint.close();
     } catch (e) {
       this.log.warn(`Failed to close endpoint ${entityId}:`, e);
+      return;
     }
     this.serverNode.forgetDevice(entry.endpoint);
     this.endpoints.delete(entityId);
   }
   async refreshDevices() {
     this.registry.refresh();
-    this._failedEntities = [];
-    this.entityIds = this.registry.entityIds;
+    const lifecycle = this.lifecycle;
     const fullEntities = this.registry.fullEntities;
-    stampIdentityPresence(
-      this.identityStorage,
-      this.dataProvider.id,
-      buildPresentIdentityKeys(fullEntities)
-    );
-    stampMappingPresence(
-      this.mappingStorage,
-      this.dataProvider.id,
-      buildPresentEntityIds(fullEntities)
-    );
     try {
+      if (!this.client.haRunning || Object.keys(fullEntities).length === 0) {
+        this.pendingRemovals.clear();
+        this.log.warn(
+          "HA not running or registry empty, deferring server mode reconcile"
+        );
+        return;
+      }
+      this._failedEntities = [];
+      this.entityIds = this.registry.entityIds;
+      stampIdentityPresence(
+        this.identityStorage,
+        this.dataProvider.id,
+        buildPresentIdentityKeys(fullEntities)
+      );
+      stampMappingPresence(
+        this.mappingStorage,
+        this.dataProvider.id,
+        buildPresentEntityIds(fullEntities)
+      );
       if (this.entityIds.length === 0) {
         this.log.warn("Server mode bridge has no entities configured");
-        await this.removeEndpoints([...this.endpoints.keys()]);
+        await this.removeEndpoints(
+          this.removableAfterGrace([...this.endpoints.keys()])
+        );
         this._failedEntities.push({
           entityId: this.dataProvider.filter?.include?.[0]?.value ?? "(no entity configured)",
           reason: "No Home Assistant entity matched this bridge's filter. Check for typos or renamed/removed entities."
@@ -180212,19 +180748,35 @@ var ServerModeEndpointManager = class extends Service {
         endpointIdToEntity.set(resolved.endpointId, entityId);
       }
       const keep = new Set(orderedIds);
+      for (const id of keep) {
+        this.pendingRemovals.delete(id);
+      }
       const removed = [...this.endpoints.keys()].filter((id) => !keep.has(id));
-      let structureChanged = removed.length > 0;
       const genuinelyRemoved = [];
       for (const oldId of removed) {
         const entry = this.endpoints.get(oldId);
         const claimant = entry ? endpointIdToEntity.get(entry.endpoint.id) : void 0;
         if (entry && claimant != null && claimant !== oldId) {
           await this.closeEndpoint(oldId);
+          this.pendingRemovals.delete(oldId);
         } else {
           genuinelyRemoved.push(oldId);
         }
       }
-      await this.removeEndpoints(genuinelyRemoved);
+      const confirmedRemoved = this.removableAfterGrace(genuinelyRemoved);
+      let structureChanged = removed.length > genuinelyRemoved.length || confirmedRemoved.length > 0;
+      await this.removeEndpoints(confirmedRemoved);
+      for (const entityId of orderedIds) {
+        const mapping = this.getEntityMapping(entityId);
+        if (!mapping?.disabled) continue;
+        for (const [id, owner] of this.parkedEndpointIds) {
+          if (owner === entityId) this.parkedEndpointIds.delete(id);
+        }
+        this.parkedEndpointIds.set(
+          this.endpoints.get(entityId)?.endpoint.id ?? resolvedByEntity.get(entityId)?.endpointId ?? createEndpointId(entityId, mapping.customName),
+          entityId
+        );
+      }
       for (const entityId of orderedIds) {
         const mapping = this.getEntityMapping(entityId);
         if (mapping?.disabled) {
@@ -180232,7 +180784,7 @@ var ServerModeEndpointManager = class extends Service {
             `Entity in server mode bridge is disabled: ${entityId}`
           );
           if (this.endpoints.has(entityId)) {
-            await this.removeEndpoints([entityId]);
+            await this.closeEndpoint(entityId);
             structureChanged = true;
           }
           this._failedEntities.push({
@@ -180271,10 +180823,11 @@ var ServerModeEndpointManager = class extends Service {
         const collision = [...this.endpoints.entries()].find(
           ([, entry]) => entry.endpoint.id === endpointId
         );
-        if (collision) {
+        const parkedBy = this.parkedEndpointIds.get(endpointId);
+        if (collision || parkedBy != null && parkedBy !== entityId) {
           this._failedEntities.push({
             entityId,
-            reason: `Endpoint id collides with ${collision[0]}. Set distinct custom names.`
+            reason: `Endpoint id collides with ${collision?.[0] ?? parkedBy}. Set distinct custom names.`
           });
           continue;
         }
@@ -180312,6 +180865,11 @@ var ServerModeEndpointManager = class extends Service {
           }
           await this.serverNode.addDevice(endpoint);
           this.endpoints.set(entityId, { endpoint, fingerprint });
+          for (const [id, owner] of this.parkedEndpointIds) {
+            if (id === endpointId || owner === entityId) {
+              this.parkedEndpointIds.delete(id);
+            }
+          }
           structureChanged = true;
           this.log.info(`Server mode: Added device ${entityId}`);
         } catch (e) {
@@ -180331,7 +180889,10 @@ var ServerModeEndpointManager = class extends Service {
         }
       }
     } finally {
-      if (this.unsubscribe) {
+      if (lifecycle === this.lifecycle) {
+        this.scheduleRemovalRecheck();
+      }
+      if (this.observingRequested) {
         this.startObserving();
       }
     }
@@ -180572,10 +181133,10 @@ var BridgeEnvironmentFactory = class extends BridgeFactory {
 // src/core/ioc/app-environment.ts
 var AppEnvironment = class _AppEnvironment extends EnvironmentBase {
   constructor(rootEnv, options) {
-    const logger253 = rootEnv.get(LoggerService);
+    const logger255 = rootEnv.get(LoggerService);
     super({
       id: "App",
-      log: logger253.get("AppContainer"),
+      log: logger255.get("AppContainer"),
       parent: rootEnv
     });
     this.options = options;
@@ -180589,8 +181150,8 @@ var AppEnvironment = class _AppEnvironment extends EnvironmentBase {
   }
   construction;
   async init() {
-    const logger253 = this.get(LoggerService);
-    this.set(LoggerService, logger253);
+    const logger255 = this.get(LoggerService);
+    this.set(LoggerService, logger255);
     this.set(AppStorage, new AppStorage(await this.load(StorageService)));
     this.set(BridgeStorage, new BridgeStorage(await this.load(AppStorage)));
     this.set(
@@ -180611,7 +181172,7 @@ var AppEnvironment = class _AppEnvironment extends EnvironmentBase {
     );
     this.set(
       HomeAssistantClient,
-      new HomeAssistantClient(logger253, this.options.homeAssistant)
+      new HomeAssistantClient(logger255, this.options.homeAssistant)
     );
     this.set(
       HomeAssistantConfig,
@@ -180619,7 +181180,7 @@ var AppEnvironment = class _AppEnvironment extends EnvironmentBase {
     );
     this.set(
       HomeAssistantActions,
-      new HomeAssistantActions(logger253, await this.load(HomeAssistantClient))
+      new HomeAssistantActions(logger255, await this.load(HomeAssistantClient))
     );
     this.set(
       HomeAssistantRegistry,
@@ -180655,7 +181216,7 @@ var AppEnvironment = class _AppEnvironment extends EnvironmentBase {
     this.set(
       WebApi,
       new WebApi(
-        logger253,
+        logger255,
         await this.load(BridgeService),
         await this.load(HomeAssistantClient),
         await this.load(HomeAssistantRegistry),
@@ -180676,7 +181237,7 @@ var AppEnvironment = class _AppEnvironment extends EnvironmentBase {
 
 // src/matter/patches/patch-level-control-tlv.ts
 init_esm();
-var logger252 = Logger.get("PatchLevelControlTlv");
+var logger254 = Logger.get("PatchLevelControlTlv");
 var optionalFieldModels = /* @__PURE__ */ new WeakSet();
 var fieldModelMandatoryGetterPatched = false;
 function patchLevelControlTlv() {
@@ -180732,11 +181293,11 @@ function patchLevelControlTlv() {
     patched++;
   }
   if (patched > 0) {
-    logger252.info(
+    logger254.info(
       `Patched ${patched} LevelControl TLV schema(s): transitionTime is now optional (Google Home compatibility)`
     );
   } else {
-    logger252.warn(
+    logger254.warn(
       "Failed to patch LevelControl TLV schemas, field definitions not found. Google Home brightness adjustment may not work.",
       {
         moveToLevel: describeFields(
@@ -182478,6 +183039,7 @@ export {
 @matter/main/dist/esm/version.js:
 @matter/main/dist/esm/index.js:
 @matter/main/dist/esm/protocol.js:
+@matter/main/dist/esm/types.js:
 @matter/types/dist/esm/clusters/fan-control.js:
 @matter/node/dist/esm/behaviors/fan-control/FanControlBehavior.js:
 @matter/node/dist/esm/behaviors/fan-control/FanControlServer.js:
@@ -182908,7 +183470,6 @@ export {
 @matter/node/dist/esm/devices/index.js:
 @matter/main/dist/esm/devices.js:
 @matter/main/dist/esm/node.js:
-@matter/main/dist/esm/types.js:
 @matter/node/dist/esm/behaviors/account-login/index.js:
 @matter/node/dist/esm/behaviors/actions/ActionsClient.js:
 @matter/node/dist/esm/behaviors/actions/index.js:
@@ -183133,6 +183694,13 @@ export {
 @matter/node/dist/esm/behaviors/zone-management/index.js:
 @matter/node/dist/esm/behaviors/index.js:
 @matter/main/dist/esm/behaviors.js:
+@matter/types/dist/esm/clusters/alarm-base.js:
+@matter/types/dist/esm/clusters/concentration-measurement.js:
+@matter/types/dist/esm/clusters/label.js:
+@matter/types/dist/esm/clusters/resource-monitoring.js:
+@matter/types/dist/esm/clusters/web-rtc-transport-definitions.js:
+@matter/types/dist/esm/clusters/index.js:
+@matter/main/dist/esm/clusters.js:
 @matter/node/dist/esm/endpoints/base.js:
 @matter/node/dist/esm/endpoints/bridged-node.js:
 @matter/node/dist/esm/endpoints/device-energy-management.js:
@@ -183144,13 +183712,6 @@ export {
 @matter/node/dist/esm/endpoints/secondary-network-interface.js:
 @matter/node/dist/esm/endpoints/index.js:
 @matter/main/dist/esm/endpoints.js:
-@matter/types/dist/esm/clusters/alarm-base.js:
-@matter/types/dist/esm/clusters/concentration-measurement.js:
-@matter/types/dist/esm/clusters/label.js:
-@matter/types/dist/esm/clusters/resource-monitoring.js:
-@matter/types/dist/esm/clusters/web-rtc-transport-definitions.js:
-@matter/types/dist/esm/clusters/index.js:
-@matter/main/dist/esm/clusters.js:
 @matter/main/dist/esm/model.js:
 @matter/main/dist/esm/forwards/clusters/level-control.js:
 @matter/main/dist/esm/forwards/behaviors/boolean-state.js: