@riddix/hamh 2.0.57 → 2.0.58

package/dist/backend/cli.js

@@ -3358,8 +3358,8 @@ var init_Logger = __esm({
        * @param maskChar character to mask with
        * @param unmaskedLength number of characters to show unmasked in the beginning
        */
-      static maskString(str, maskChar = "*", unmaskedLength) {
-        return str.substring(0, unmaskedLength ?? 0) + str.substring(unmaskedLength ?? 0).replace(/./g, maskChar);
+      static maskString(str2, maskChar = "*", unmaskedLength) {
+        return str2.substring(0, unmaskedLength ?? 0) + str2.substring(unmaskedLength ?? 0).replace(/./g, maskChar);
       }
       /**
        * Perform operations in a nested logging context.  Messages will be
@@ -15172,12 +15172,12 @@ var init_HttpSharedEndpoint = __esm({
             }
           }
         };
-        target.ws = async (request, connect) => {
+        target.ws = async (request, connect2) => {
           let connected = false;
           for (const instance of this.#instances) {
             await instance.ws?.(request, async () => {
               connected = true;
-              return connect();
+              return connect2();
             });
             if (connected) {
               break;
@@ -63789,9 +63789,9 @@ var init_SecureSession = __esm({
       isSecure = true;
     };
     ((SecureSession2) => {
-      function assert(session, errorText) {
+      function assert(session, errorText2) {
         if (!session?.isSecure) {
-          throw new MatterFlowError(errorText ?? "Unsecured session in secure context");
+          throw new MatterFlowError(errorText2 ?? "Unsecured session in secure context");
         }
       }
       SecureSession2.assert = assert;
@@ -64116,9 +64116,9 @@ var init_NodeSession = __esm({
       }
     };
     ((NodeSession2) => {
-      function assert(session, errorText) {
+      function assert(session, errorText2) {
         if (!is(session)) {
-          throw new MatterFlowError(errorText ?? "Unsecured session in secure context");
+          throw new MatterFlowError(errorText2 ?? "Unsecured session in secure context");
         }
       }
       NodeSession2.assert = assert;
@@ -66890,9 +66890,9 @@ var init_FabricManager = __esm({
           fabric = this.#fabrics.get("fabricIndex", identifier);
         }
         if (fabric === void 0 || fabric.isDeleting) {
-          const str = typeof identifier === "bigint" ? GlobalFabricId.strOf(identifier) : `#${identifier}`;
+          const str2 = typeof identifier === "bigint" ? GlobalFabricId.strOf(identifier) : `#${identifier}`;
           throw new FabricNotFoundError(
-            `Fabric index ${str} ${fabric === void 0 ? "does not exist" : "is deleted"}`
+            `Fabric index ${str2} ${fabric === void 0 ? "does not exist" : "is deleted"}`
           );
         }
         return fabric;
@@ -67384,9 +67384,9 @@ var init_GroupSession = __esm({
       }
     };
     ((GroupSession2) => {
-      function assert(session, errorText) {
+      function assert(session, errorText2) {
         if (!is(session)) {
-          throw new MatterFlowError(errorText ?? "Unsecured session in secure context");
+          throw new MatterFlowError(errorText2 ?? "Unsecured session in secure context");
         }
       }
       GroupSession2.assert = assert;
@@ -72480,11 +72480,11 @@ var init_errors5 = __esm({
     };
     DatatypeError = class extends ValidateError {
       constructor(path14, type, value, code) {
-        let str = `${value}`;
-        if (str.length > 60) {
-          str = `${str.substring(60)}\u2026`;
+        let str2 = `${value}`;
+        if (str2.length > 60) {
+          str2 = `${str2.substring(60)}\u2026`;
         }
-        super(path14, `Value "${str}" is not ${type}`, code);
+        super(path14, `Value "${str2}" is not ${type}`, code);
       }
     };
     ConstraintError = class extends ValidateError {
@@ -85817,23 +85817,23 @@ var init_CommissioningConnectionPool = __esm({
       addDevices(devices) {
         const devicesByKey = /* @__PURE__ */ new Map();
         for (const device of devices) {
-          const deviceKey = device.deviceIdentifier;
-          if (this.#invalidCredentialDevices.has(deviceKey)) {
+          const deviceKey2 = device.deviceIdentifier;
+          if (this.#invalidCredentialDevices.has(deviceKey2)) {
             continue;
           }
-          const existing = devicesByKey.get(deviceKey);
+          const existing = devicesByKey.get(deviceKey2);
           if (existing === void 0) {
-            devicesByKey.set(deviceKey, { ...device, addresses: [...device.addresses] });
+            devicesByKey.set(deviceKey2, { ...device, addresses: [...device.addresses] });
           } else {
             existing.addresses = [...existing.addresses, ...device.addresses];
-            devicesByKey.set(deviceKey, { ...existing, ...device, addresses: existing.addresses });
+            devicesByKey.set(deviceKey2, { ...existing, ...device, addresses: existing.addresses });
           }
         }
-        for (const [deviceKey, device] of devicesByKey.entries()) {
-          let state = this.#devices.get(deviceKey);
+        for (const [deviceKey2, device] of devicesByKey.entries()) {
+          let state = this.#devices.get(deviceKey2);
           if (state === void 0) {
             state = { device, addresses: /* @__PURE__ */ new Map() };
-            this.#devices.set(deviceKey, state);
+            this.#devices.set(deviceKey2, state);
           } else {
             state.device = { ...state.device, ...device, addresses: device.addresses };
           }
@@ -85847,9 +85847,9 @@ var init_CommissioningConnectionPool = __esm({
        * Permanently drop a device whose passcode is wrong.  All its addresses are already in-flight and will
        * receive the per-device abort signal; new attempts for this device will be skipped.
        */
-      markInvalidCredentials(deviceKey) {
-        this.#invalidCredentialDevices.add(deviceKey);
-        this.#devices.delete(deviceKey);
+      markInvalidCredentials(deviceKey2) {
+        this.#invalidCredentialDevices.add(deviceKey2);
+        this.#devices.delete(deviceKey2);
       }
       /**
        * Returns all viable (device, address) pairs, optionally excluding attempt keys already in-flight.
@@ -85858,11 +85858,11 @@ var init_CommissioningConnectionPool = __esm({
        */
       availableCandidates(inFlight) {
         const result = [];
-        for (const [deviceKey, state] of this.#devices) {
+        for (const [deviceKey2, state] of this.#devices) {
           for (const [addressUrl, address] of state.addresses) {
-            const attemptKey = `${deviceKey}:${addressUrl}`;
+            const attemptKey = `${deviceKey2}:${addressUrl}`;
             if (inFlight?.has(attemptKey)) continue;
-            result.push({ attemptKey, deviceKey, device: state.device, address });
+            result.push({ attemptKey, deviceKey: deviceKey2, device: state.device, address });
           }
         }
         return result;
@@ -85883,11 +85883,11 @@ async function CommissioningConnection(options) {
     const inFlight = /* @__PURE__ */ new Set();
     const pending2 = /* @__PURE__ */ new Set();
     const deviceAborts = /* @__PURE__ */ new Map();
-    const getDeviceAbort = (deviceKey) => {
-      let ac = deviceAborts.get(deviceKey);
+    const getDeviceAbort = (deviceKey2) => {
+      let ac = deviceAborts.get(deviceKey2);
       if (ac === void 0) {
         ac = new AbortController();
-        deviceAborts.set(deviceKey, ac);
+        deviceAborts.set(deviceKey2, ac);
       }
       return ac;
     };
@@ -88120,10 +88120,10 @@ var init_NetworkProfile = __esm({
         for (const key of Object.keys(options)) {
           const override = options[key];
           if (override !== void 0) {
-            const { connect, probeAddress, ...rest } = override;
+            const { connect: connect2, probeAddress, ...rest } = override;
             const merged = merge(base[key], rest);
-            if (connect !== void 0) {
-              merged.connect = merge(base[key].connect ?? {}, connect);
+            if (connect2 !== void 0) {
+              merged.connect = merge(base[key].connect ?? {}, connect2);
             }
             if (probeAddress !== void 0) {
               merged.probeAddress = merge(
@@ -88574,7 +88574,7 @@ async function PeerConnection(peer, context, options) {
       }
       const addressAbort = new Abort({ abort: overallAbort });
       lastAttemptAt = Time.nowMs;
-      const finished2 = connect(address, addressAbort).finally(() => {
+      const finished2 = connect2(address, addressAbort).finally(() => {
         try {
           if (attempts.get(address)?.finished === finished2) {
             attempts.delete(address);
@@ -88757,7 +88757,7 @@ async function PeerConnection(peer, context, options) {
         __callDispose28(_stack2, _error2, _hasError2);
       }
     }
-    async function connect(address, addressAbort) {
+    async function connect2(address, addressAbort) {
       var _stack2 = [];
       try {
         const addrNo = ++addrsAttempted;
@@ -92204,9 +92204,9 @@ var init_Agent = __esm({
       /**
        * Create a new {@link Agent} that supports the specified behaviors.
        */
-      static for(type, behaviors) {
+      static for(type, behaviors2) {
         const props = {};
-        Object.values(behaviors).forEach((behavior) => {
+        Object.values(behaviors2).forEach((behavior) => {
           props[behavior.id] = {
             get() {
               return this.get(behavior);
@@ -101287,7 +101287,7 @@ var init_IcdManagementServer = __esm({
     __typeError34 = (msg) => {
       throw TypeError(msg);
     };
-    __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+    __defNormalProp = (obj2, key, value) => key in obj2 ? __defProp2(obj2, key, { enumerable: true, configurable: true, writable: true, value }) : obj2[key] = value;
     __name = (target, value) => __defProp2(target, "name", { value, configurable: true });
     __decoratorStart = (base) => [, , , __create(base?.[__knownSymbol34("metadata")] ?? null)];
     __decoratorStrings = ["class", "method", "getter", "setter", "accessor", "field", "value", "get", "set"];
@@ -101322,12 +101322,12 @@ var init_IcdManagementServer = __esm({
       }
       return k || __decoratorMetadata(array, target), desc && __defProp2(target, name, desc), p ? k ^ 4 ? extra : desc : target;
     };
-    __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-    __accessCheck = (obj, member, msg) => member.has(obj) || __typeError34("Cannot " + msg);
-    __privateIn = (member, obj) => Object(obj) !== obj ? __typeError34('Cannot use the "in" operator on this value') : member.has(obj);
-    __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-    __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
-    __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
+    __publicField = (obj2, key, value) => __defNormalProp(obj2, typeof key !== "symbol" ? key + "" : key, value);
+    __accessCheck = (obj2, member, msg) => member.has(obj2) || __typeError34("Cannot " + msg);
+    __privateIn = (member, obj2) => Object(obj2) !== obj2 ? __typeError34('Cannot use the "in" operator on this value') : member.has(obj2);
+    __privateGet = (obj2, member, getter) => (__accessCheck(obj2, member, "read from private field"), getter ? getter.call(obj2) : member.get(obj2));
+    __privateSet = (obj2, member, value, setter) => (__accessCheck(obj2, member, "write to private field"), setter ? setter.call(obj2, value) : member.set(obj2, value), value);
+    __privateMethod = (obj2, member, method) => (__accessCheck(obj2, member, "access private method"), method);
     __using34 = (stack, value, async) => {
       if (value != null) {
         if (typeof value !== "object" && typeof value !== "function") __typeError34("Object expected");
@@ -102024,7 +102024,7 @@ var init_NetworkServer = __esm({
     __typeError35 = (msg) => {
       throw TypeError(msg);
     };
-    __defNormalProp2 = (obj, key, value) => key in obj ? __defProp3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+    __defNormalProp2 = (obj2, key, value) => key in obj2 ? __defProp3(obj2, key, { enumerable: true, configurable: true, writable: true, value }) : obj2[key] = value;
     __name2 = (target, value) => __defProp3(target, "name", { value, configurable: true });
     __decoratorStart2 = (base) => [, , , __create2(base?.[__knownSymbol35("metadata")] ?? null)];
     __decoratorStrings2 = ["class", "method", "getter", "setter", "accessor", "field", "value", "get", "set"];
@@ -102059,12 +102059,12 @@ var init_NetworkServer = __esm({
       }
       return k || __decoratorMetadata2(array, target), desc && __defProp3(target, name, desc), p ? k ^ 4 ? extra : desc : target;
     };
-    __publicField2 = (obj, key, value) => __defNormalProp2(obj, typeof key !== "symbol" ? key + "" : key, value);
-    __accessCheck2 = (obj, member, msg) => member.has(obj) || __typeError35("Cannot " + msg);
-    __privateIn2 = (member, obj) => Object(obj) !== obj ? __typeError35('Cannot use the "in" operator on this value') : member.has(obj);
-    __privateGet2 = (obj, member, getter) => (__accessCheck2(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-    __privateSet2 = (obj, member, value, setter) => (__accessCheck2(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
-    __privateMethod2 = (obj, member, method) => (__accessCheck2(obj, member, "access private method"), method);
+    __publicField2 = (obj2, key, value) => __defNormalProp2(obj2, typeof key !== "symbol" ? key + "" : key, value);
+    __accessCheck2 = (obj2, member, msg) => member.has(obj2) || __typeError35("Cannot " + msg);
+    __privateIn2 = (member, obj2) => Object(obj2) !== obj2 ? __typeError35('Cannot use the "in" operator on this value') : member.has(obj2);
+    __privateGet2 = (obj2, member, getter) => (__accessCheck2(obj2, member, "read from private field"), getter ? getter.call(obj2) : member.get(obj2));
+    __privateSet2 = (obj2, member, value, setter) => (__accessCheck2(obj2, member, "write to private field"), setter ? setter.call(obj2, value) : member.set(obj2, value), value);
+    __privateMethod2 = (obj2, member, method) => (__accessCheck2(obj2, member, "access private method"), method);
     logger117 = Logger.get("NetworkingServer");
     NetworkServer = class extends NetworkBehavior {
       initialize() {
@@ -102608,7 +102608,7 @@ var init_CommissioningServer = __esm({
                 throw new ImplementationError("pairingCodes read before commissioning was initialized");
               }
               const bi = endpoint.stateOf(BasicInformationBehavior);
-              const net = endpoint.stateOf(NetworkServer);
+              const net2 = endpoint.stateOf(NetworkServer);
               const qrPairingCode = QrPairingCodeCodec.encode([
                 {
                   version: 0,
@@ -102617,7 +102617,7 @@ var init_CommissioningServer = __esm({
                   flowType: comm.flowType,
                   discriminator: comm.discriminator,
                   passcode: comm.passcode,
-                  discoveryCapabilities: DiscoveryCapabilitiesSchema.encode(net.discoveryCapabilities)
+                  discoveryCapabilities: DiscoveryCapabilitiesSchema.encode(net2.discoveryCapabilities)
                 }
               ]);
               return {
@@ -106420,10 +106420,10 @@ function MutableEndpoint(options) {
       }
       return this.with(...newBehaviors);
     },
-    with(...behaviors) {
+    with(...behaviors2) {
       const serverArgs = [];
       const clientArgs = [];
-      for (const b of behaviors) {
+      for (const b of behaviors2) {
         if (isClientBehavior(b)) {
           clientArgs.push(b);
         } else {
@@ -106436,10 +106436,10 @@ function MutableEndpoint(options) {
         clientClusters: clientArgs.length ? SupportedClientClusters.extend(this.clientClusters, clientArgs) : this.clientClusters
       });
     },
-    withBehaviors(...behaviors) {
+    withBehaviors(...behaviors2) {
       return MutableEndpoint({
         ...options,
-        behaviors: SupportedBehaviors.extend(this.behaviors, behaviors),
+        behaviors: SupportedBehaviors.extend(this.behaviors, behaviors2),
         clientClusters: this.clientClusters
       });
     },
@@ -109204,7 +109204,7 @@ var init_IcdClient = __esm({
     __typeError40 = (msg) => {
       throw TypeError(msg);
     };
-    __defNormalProp3 = (obj, key, value) => key in obj ? __defProp4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+    __defNormalProp3 = (obj2, key, value) => key in obj2 ? __defProp4(obj2, key, { enumerable: true, configurable: true, writable: true, value }) : obj2[key] = value;
     __name3 = (target, value) => __defProp4(target, "name", { value, configurable: true });
     __decoratorStart3 = (base) => [, , , __create3(base?.[__knownSymbol40("metadata")] ?? null)];
     __decoratorStrings3 = ["class", "method", "getter", "setter", "accessor", "field", "value", "get", "set"];
@@ -109239,12 +109239,12 @@ var init_IcdClient = __esm({
       }
       return k || __decoratorMetadata3(array, target), desc && __defProp4(target, name, desc), p ? k ^ 4 ? extra : desc : target;
     };
-    __publicField3 = (obj, key, value) => __defNormalProp3(obj, typeof key !== "symbol" ? key + "" : key, value);
-    __accessCheck3 = (obj, member, msg) => member.has(obj) || __typeError40("Cannot " + msg);
-    __privateIn3 = (member, obj) => Object(obj) !== obj ? __typeError40('Cannot use the "in" operator on this value') : member.has(obj);
-    __privateGet3 = (obj, member, getter) => (__accessCheck3(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-    __privateSet3 = (obj, member, value, setter) => (__accessCheck3(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
-    __privateMethod3 = (obj, member, method) => (__accessCheck3(obj, member, "access private method"), method);
+    __publicField3 = (obj2, key, value) => __defNormalProp3(obj2, typeof key !== "symbol" ? key + "" : key, value);
+    __accessCheck3 = (obj2, member, msg) => member.has(obj2) || __typeError40("Cannot " + msg);
+    __privateIn3 = (member, obj2) => Object(obj2) !== obj2 ? __typeError40('Cannot use the "in" operator on this value') : member.has(obj2);
+    __privateGet3 = (obj2, member, getter) => (__accessCheck3(obj2, member, "read from private field"), getter ? getter.call(obj2) : member.get(obj2));
+    __privateSet3 = (obj2, member, value, setter) => (__accessCheck3(obj2, member, "write to private field"), setter ? setter.call(obj2, value) : member.set(obj2, value), value);
+    __privateMethod3 = (obj2, member, method) => (__accessCheck3(obj2, member, "access private method"), method);
     logger132 = Logger.get("IcdClient");
     IcdClient = class _IcdClient extends Behavior {
       static early = true;
@@ -115752,7 +115752,7 @@ var init_CommissioningClient = __esm({
     __typeError42 = (msg) => {
       throw TypeError(msg);
     };
-    __defNormalProp4 = (obj, key, value) => key in obj ? __defProp5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+    __defNormalProp4 = (obj2, key, value) => key in obj2 ? __defProp5(obj2, key, { enumerable: true, configurable: true, writable: true, value }) : obj2[key] = value;
     __name4 = (target, value) => __defProp5(target, "name", { value, configurable: true });
     __decoratorStart4 = (base) => [, , , __create4(base?.[__knownSymbol42("metadata")] ?? null)];
     __decoratorStrings4 = ["class", "method", "getter", "setter", "accessor", "field", "value", "get", "set"];
@@ -115787,12 +115787,12 @@ var init_CommissioningClient = __esm({
       }
       return k || __decoratorMetadata4(array, target), desc && __defProp5(target, name, desc), p ? k ^ 4 ? extra : desc : target;
     };
-    __publicField4 = (obj, key, value) => __defNormalProp4(obj, typeof key !== "symbol" ? key + "" : key, value);
-    __accessCheck4 = (obj, member, msg) => member.has(obj) || __typeError42("Cannot " + msg);
-    __privateIn4 = (member, obj) => Object(obj) !== obj ? __typeError42('Cannot use the "in" operator on this value') : member.has(obj);
-    __privateGet4 = (obj, member, getter) => (__accessCheck4(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-    __privateSet4 = (obj, member, value, setter) => (__accessCheck4(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
-    __privateMethod4 = (obj, member, method) => (__accessCheck4(obj, member, "access private method"), method);
+    __publicField4 = (obj2, key, value) => __defNormalProp4(obj2, typeof key !== "symbol" ? key + "" : key, value);
+    __accessCheck4 = (obj2, member, msg) => member.has(obj2) || __typeError42("Cannot " + msg);
+    __privateIn4 = (member, obj2) => Object(obj2) !== obj2 ? __typeError42('Cannot use the "in" operator on this value') : member.has(obj2);
+    __privateGet4 = (obj2, member, getter) => (__accessCheck4(obj2, member, "read from private field"), getter ? getter.call(obj2) : member.get(obj2));
+    __privateSet4 = (obj2, member, value, setter) => (__accessCheck4(obj2, member, "write to private field"), setter ? setter.call(obj2, value) : member.set(obj2, value), value);
+    __privateMethod4 = (obj2, member, method) => (__accessCheck4(obj2, member, "access private method"), method);
     logger144 = Logger.get("CommissioningClient");
     CommissioningClient = class _CommissioningClient extends Behavior {
       static early = true;
@@ -131474,140 +131474,197 @@ var init_controller_compat = __esm({
       // 0x6006 Google Home
       4631: "alexa",
       // 0x1217 Amazon Alexa
-      4448: "alexa",
-      // 0x1160 Amazon (some Alexa ecosystems)
-      4447: "aqara"
+      4447: "aqara",
       // 0x115F Aqara Home
+      4362: "smartthings"
+      // 0x110A SmartThings
     };
     deviceTypeIdSupport = {
-      43: {
-        apple: "no",
-        google: "yes",
-        alexa: "yes",
-        aqara: "yes",
-        note: "Apple Home has no standalone fan."
-      },
-      45: {
-        apple: "no",
-        google: "yes",
-        alexa: "yes",
-        aqara: "yes",
-        note: "Apple Home does not list air purifiers."
-      },
+      // speaker
       34: {
         apple: "no",
         google: "yes",
         alexa: "no",
         aqara: "yes",
-        note: "Google Home and Aqara show Matter speakers."
+        smartthings: "yes",
+        note: "Apple and Alexa do not show Matter speakers."
       },
+      // basic video player
       40: {
         apple: "no",
         google: "no",
         alexa: "no",
         aqara: "yes",
-        note: "TV/media types only show in Aqara Home here."
+        smartthings: "yes",
+        note: "TV/media types only show in Aqara Home and SmartThings."
       },
+      // pressure sensor
       773: {
         apple: "no",
         google: "yes",
         alexa: "no",
         aqara: "yes",
-        note: "Google Home and Aqara show pressure sensors."
+        smartthings: "yes",
+        note: "Google Home, Aqara and SmartThings show pressure sensors."
       },
+      // flow sensor
       774: {
         apple: "no",
         google: "yes",
         alexa: "no",
-        aqara: "unknown",
-        note: "Only Google Home shows flow sensors."
-      },
-      44: {
-        apple: "no",
-        google: "yes",
-        alexa: "yes",
         aqara: "yes",
-        note: "Apple Home does not show air quality."
+        smartthings: "yes",
+        note: "Google Home, Aqara and SmartThings show flow sensors."
       },
+      // solar power
       23: {
         apple: "no",
         google: "no",
         alexa: "unknown",
-        aqara: "unknown",
-        note: "SolarPower is only rendered standalone by SmartThings today."
+        aqara: "yes",
+        smartthings: "yes",
+        note: "SolarPower is only shown standalone by Aqara and SmartThings."
       },
+      // electrical meter
       1300: {
         apple: "no",
         google: "yes",
         alexa: "no",
         aqara: "unknown",
-        note: "ElectricalMeter shows in Google Home and SmartThings; Apple and Alexa do not surface standalone power/energy."
+        smartthings: "unknown",
+        note: "ElectricalMeter shows in Google Home; Apple and Alexa do not show standalone power/energy."
+      },
+      // electrical utility meter
+      1297: {
+        apple: "no",
+        google: "yes",
+        alexa: "no",
+        aqara: "unknown",
+        smartthings: "unknown",
+        note: "ElectricalUtilityMeter shows in Google Home only."
       },
+      // battery storage
       24: {
         apple: "no",
         google: "no",
         alexa: "no",
         aqara: "yes",
-        note: "Aqara lists battery storage; others show battery inside a device."
+        smartthings: "yes",
+        note: "Aqara and SmartThings list battery storage; others show battery inside a device."
       },
+      // EVSE
       1292: {
         apple: "no",
         google: "no",
         alexa: "no",
         aqara: "yes",
-        note: "HA and Aqara render EnergyEvse; SmartThings announced support, unconfirmed (it sets the limit via EnableCharging and addresses modes by list position). Bridged EVSE can break Alexa device recognition, keep it off Alexa bridges."
+        smartthings: "yes",
+        note: "HA, Aqara and SmartThings render EnergyEvse (SmartThings sets the limit via EnableCharging and addresses modes by list position). Bridged EVSE can break Alexa device recognition, keep it off Alexa bridges."
       },
+      // water heater
+      1295: {
+        apple: "no",
+        google: "no",
+        alexa: "unknown",
+        aqara: "yes",
+        smartthings: "yes",
+        note: "Matter 1.4 Water Heater, only Aqara and SmartThings list it."
+      },
+      // mode select
       39: {
         apple: "no",
         google: "no",
         alexa: "no",
-        aqara: "unknown",
+        aqara: "no",
+        smartthings: "unknown",
         note: "Mode Select is not supported here (Google #356)."
       },
-      66: { apple: "no", google: "no", alexa: "no", aqara: "yes" },
+      // water valve
+      66: {
+        apple: "no",
+        google: "no",
+        alexa: "no",
+        aqara: "yes",
+        smartthings: "yes"
+      },
+      // pump
       771: {
         apple: "no",
         google: "yes",
         alexa: "no",
         aqara: "yes",
-        note: "Google Home and Aqara show pumps."
+        smartthings: "yes",
+        note: "Google Home, Aqara and SmartThings show pumps."
       },
+      // rain sensor
       68: {
         apple: "no",
         google: "no",
         alexa: "no",
         aqara: "yes",
+        smartthings: "yes",
         note: "Newer Matter detector, thin support; Alexa may reject it (#365)."
       },
+      // water freeze detector
       65: {
         apple: "no",
         google: "no",
         alexa: "no",
         aqara: "yes",
+        smartthings: "yes",
         note: "Newer Matter detector, thin support; Alexa may reject it (#365)."
       },
+      // water leak detector
       67: {
         apple: "yes",
         google: "no",
-        alexa: "yes",
+        alexa: "no",
         aqara: "yes",
-        note: "Newer Matter detector, can be risky on Alexa bridges (#365)."
+        smartthings: "yes",
+        note: "Alexa has no capability for it and it can take an Alexa bridge offline (#365)."
       },
-      118: { apple: "yes", google: "no", alexa: "yes", aqara: "yes" },
-      117: {
-        apple: "no",
+      // laundry washer
+      115: {
+        apple: "unknown",
+        google: "yes",
+        alexa: "no",
+        aqara: "yes",
+        smartthings: "yes",
+        note: "iOS 27 knows the type, but it's not confirmed that Apple Home shows it."
+      },
+      // laundry dryer
+      124: {
+        apple: "unknown",
         google: "no",
-        alexa: "unknown",
-        aqara: "unknown",
-        note: "Appliance types have little controller support."
+        alexa: "no",
+        aqara: "yes",
+        smartthings: "yes",
+        note: "iOS 27 knows the type, but it's not confirmed that Apple Home shows it."
       },
-      15: { apple: "partial", google: "no", alexa: "yes", aqara: "unknown" }
+      // doorbell
+      328: {
+        apple: "no",
+        google: "yes",
+        alexa: "no",
+        aqara: "no",
+        smartthings: "unknown",
+        note: "Google Home lists the Matter 1.4 Doorbell; others fall back to the plain Switch cluster, if they show it at all."
+      },
+      // generic switch
+      15: {
+        apple: "partial",
+        google: "no",
+        alexa: "yes",
+        aqara: "yes",
+        smartthings: "yes"
+      }
     };
     controllerLabels = {
       apple: "Apple Home",
       google: "Google Home",
       alexa: "Alexa",
-      aqara: "Aqara Home"
+      aqara: "Aqara Home",
+      smartthings: "SmartThings"
     };
   }
 });
@@ -132849,10 +132906,7 @@ var init_debounce_context = __esm({
           this.getBuffer(key).push(payload);
           bufferedFn();
         };
-        return Object.assign(debouncer, {
-          get isPending() {
-            return bufferedFn.isPending;
-          },
+        const fn = Object.assign(debouncer, {
           clear: () => bufferedFn.clear(),
           flush: () => bufferedFn.flush(),
           trigger: () => bufferedFn.trigger(),
@@ -132860,6 +132914,13 @@ var init_debounce_context = __esm({
             this.unregister(key);
           }
         });
+        Object.defineProperty(fn, "isPending", {
+          get: () => bufferedFn.isPending
+        });
+        return fn;
+      }
+      isPending(key) {
+        return (this.buffers.get(key)?.length ?? 0) > 0;
       }
       unregisterAll() {
         for (const key of [...this.debouncers.keys()]) {
@@ -132994,16 +133055,18 @@ var init_send_ha_message = __esm({
 });
 
 // src/services/home-assistant/home-assistant-actions.ts
-var TARGET_FAILURE_THRESHOLD, defaultConfig, HomeAssistantActions;
+var TARGET_FAILURE_THRESHOLD, RECENT_CHANGE_MS, defaultConfig, HomeAssistantActions;
 var init_home_assistant_actions = __esm({
   "src/services/home-assistant/home-assistant-actions.ts"() {
     "use strict";
+    init_esm();
     init_service();
     init_debounce_context();
     init_retry();
     init_send_ha_message();
     init_diagnostic_event_bus();
     TARGET_FAILURE_THRESHOLD = 3;
+    RECENT_CHANGE_MS = 2e3;
     defaultConfig = {
       retryAttempts: 3,
       retryBaseDelayMs: 100,
@@ -133030,6 +133093,9 @@ var init_home_assistant_actions = __esm({
       get available() {
         return this.client.haRunning;
       }
+      // #446: the issuing entity of a call that failed after its retries. The
+      // command already returned success, so its endpoint rolls back to HA state.
+      failed = Observable();
       log;
       debounceContext = new DebounceContext(
         this.processAction.bind(this)
@@ -133059,7 +133125,13 @@ var init_home_assistant_actions = __esm({
           blockedUntil: count >= TARGET_FAILURE_THRESHOLD ? Date.now() + this.config.circuitBreakerResetMs : 0
         });
       }
-      processAction(_key, calls) {
+      // bare Ons that may start an on-then-level pair (#491)
+      leadingOn = /* @__PURE__ */ new Set();
+      lastChangeAt = /* @__PURE__ */ new Map();
+      // calls per issuing entity, only the latest one may roll back (#446)
+      callSeq = /* @__PURE__ */ new Map();
+      processAction(key, calls) {
+        this.leadingOn.delete(key);
         const skipTarget = calls[0].target === false;
         const entity_id = skipTarget ? void 0 : calls[0].target || calls[0].entityId;
         const action = calls[0].action;
@@ -133067,12 +133139,22 @@ var init_home_assistant_actions = __esm({
         const [domain, actionName] = action.split(".");
         const target = entity_id ? { entity_id } : {};
         const origin = calls[0].entityId;
+        const seq = calls.reduce(
+          (max, c) => c.entityId === origin ? Math.max(max, c.seq) : max,
+          0
+        );
         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}`
           );
+          if (this.callSeq.get(origin) !== seq) return;
+          try {
+            this.failed.emit(origin);
+          } catch (e) {
+            this.log.debug(`Rollback for '${origin}' failed: ${e}`);
+          }
         });
         diagnosticEventBus.emit(
           "command_received",
@@ -133091,9 +133173,23 @@ var init_home_assistant_actions = __esm({
       }
       call(action, entityId) {
         const target = action.target === false ? entityId : action.target ?? entityId;
-        const intent = Object.keys(action.data ?? {}).length ? "adjust" : "command";
-        const key = `${target}-${action.action}-${intent}`;
-        this.debounceContext.get(key, 100)({ ...action, entityId });
+        const base = `${target}-${action.action}`;
+        const hasData = Object.keys(action.data ?? {}).length > 0;
+        const key = `${base}-${hasData ? "adjust" : "command"}`;
+        if (action.action === "light.turn_on") {
+          const commandKey = `${base}-command`;
+          if (hasData) {
+            this.lastChangeAt.set(base, Date.now());
+            if (this.leadingOn.delete(commandKey)) {
+              this.debounceContext.get(commandKey, 100).unregister();
+            }
+          } else if (Date.now() - (this.lastChangeAt.get(base) ?? Number.NEGATIVE_INFINITY) >= RECENT_CHANGE_MS && !this.debounceContext.isPending(commandKey)) {
+            this.leadingOn.add(commandKey);
+          }
+        }
+        const seq = (this.callSeq.get(entityId) ?? 0) + 1;
+        this.callSeq.set(entityId, seq);
+        this.debounceContext.get(key, 100)({ ...action, entityId, seq });
       }
       async callAction(domain, action, data, target, returnResponse) {
         const actionKey = `${domain}.${action}`;
@@ -133228,6 +133324,88 @@ var init_transaction_is_offline = __esm({
   }
 });
 
+// src/matter/endpoints/update-entity-state.ts
+function isDetachedEndpointError(error) {
+  if (error instanceof TransactionDestroyedError || error instanceof DestroyedDependencyError) {
+    return true;
+  }
+  const message = error instanceof Error ? error.message : String(error);
+  return message.includes("Endpoint storage inaccessible") || message.includes("is not present on this endpoint");
+}
+function updateEntityState(endpoint, state) {
+  const next = (chains.get(endpoint) ?? Promise.resolve()).then(
+    () => writeState(endpoint, state)
+  );
+  chains.set(
+    endpoint,
+    next.catch(() => {
+    })
+  );
+  return next;
+}
+function updateEntityRegistry(endpoint, registry3, deviceRegistry) {
+  const next = (chains.get(endpoint) ?? Promise.resolve()).then(
+    () => writeRegistry(endpoint, registry3, deviceRegistry)
+  );
+  chains.set(
+    endpoint,
+    next.catch(() => {
+    })
+  );
+  return next;
+}
+async function writeRegistry(endpoint, registry3, deviceRegistry) {
+  try {
+    await endpoint.construction.ready;
+  } catch {
+    return;
+  }
+  try {
+    const current = endpoint.stateOf(HomeAssistantEntityBehavior).entity;
+    if (JSON.stringify(current.registry) === JSON.stringify(registry3) && JSON.stringify(current.deviceRegistry) === JSON.stringify(deviceRegistry)) {
+      return;
+    }
+    await endpoint.setStateOf(HomeAssistantEntityBehavior, {
+      entity: { ...current, registry: registry3, deviceRegistry }
+    });
+  } catch (error) {
+    if (isDetachedEndpointError(error)) return;
+    throw error;
+  }
+}
+async function writeState(endpoint, state) {
+  try {
+    await endpoint.construction.ready;
+  } catch {
+    return;
+  }
+  try {
+    const current = endpoint.stateOf(HomeAssistantEntityBehavior).entity;
+    await endpoint.setStateOf(HomeAssistantEntityBehavior, {
+      entity: {
+        ...current,
+        // a re-push needs a new last_updated, setStateOf drops equal values
+        state: state ?? {
+          ...current.state,
+          last_updated: (/* @__PURE__ */ new Date()).toISOString()
+        }
+      }
+    });
+  } catch (error) {
+    if (isDetachedEndpointError(error)) return;
+    throw error;
+  }
+}
+var chains;
+var init_update_entity_state = __esm({
+  "src/matter/endpoints/update-entity-state.ts"() {
+    "use strict";
+    init_esm();
+    init_home_assistant_entity_behavior();
+    chains = /* @__PURE__ */ new WeakMap();
+  }
+});
+
 // src/matter/behaviors/home-assistant-entity-behavior.ts
 var home_assistant_entity_behavior_exports = {};
 __export(home_assistant_entity_behavior_exports, {
@@ -133238,11 +133416,13 @@ var init_home_assistant_entity_behavior = __esm({
   "src/matter/behaviors/home-assistant-entity-behavior.ts"() {
     "use strict";
     init_dist();
+    init_esm();
     init_esm7();
     init_types2();
     init_home_assistant_actions();
     init_async_observable();
     init_transaction_is_offline();
+    init_update_entity_state();
     HomeAssistantEntityBehavior = class extends Behavior {
       static id = ClusterId2.homeAssistantEntity;
       get entityId() {
@@ -133259,6 +133439,21 @@ var init_home_assistant_entity_behavior = __esm({
       get isAvailable() {
         return this.entity.state.state !== "unavailable" && this.entity.state.state !== "unknown";
       }
+      initialize() {
+        const failed = this.env.maybeGet(HomeAssistantActions)?.failed;
+        if (failed) {
+          this.reactTo(failed, this.rollback);
+        }
+      }
+      // #446: the command already returned success, only assertAvailable can
+      // still fail it. Drop the optimistic holds and re-apply the HA state so the
+      // subscription shows the truth.
+      rollback(entityId) {
+        if (entityId !== this.entityId) return;
+        this.events.actionFailed.emit();
+        updateEntityState(this.endpoint).catch(() => {
+        });
+      }
       // #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".
@@ -133304,6 +133499,8 @@ var init_home_assistant_entity_behavior = __esm({
       HomeAssistantEntityBehavior2.State = State;
       class Events2 extends EventEmitter {
         entity$Changed = AsyncObservable2();
+        // an HA call this entity issued failed, see rollback()
+        actionFailed = Observable();
       }
       HomeAssistantEntityBehavior2.Events = Events2;
     })(HomeAssistantEntityBehavior || (HomeAssistantEntityBehavior = {}));
@@ -133974,8 +134171,25 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
   });
   router.put("/settings", async (req, res) => {
     try {
-      const body = req.body;
-      await settingsStorage.setBackupSettings(body);
+      const { autoBackup, backupRetentionCount } = req.body ?? {};
+      const next = {};
+      if (autoBackup !== void 0) {
+        if (typeof autoBackup !== "boolean") {
+          res.status(400).json({ error: "autoBackup must be a boolean" });
+          return;
+        }
+        next.autoBackup = autoBackup;
+      }
+      if (backupRetentionCount !== void 0) {
+        if (typeof backupRetentionCount !== "number" || !Number.isInteger(backupRetentionCount) || backupRetentionCount < 1 || backupRetentionCount > 100) {
+          res.status(400).json({
+            error: "backupRetentionCount must be an integer between 1 and 100"
+          });
+          return;
+        }
+        next.backupRetentionCount = backupRetentionCount;
+      }
+      await settingsStorage.setBackupSettings(next);
       res.json(settingsStorage.backupSettings);
     } catch (error) {
       const message = error instanceof Error ? error.message : "Failed to update settings";
@@ -134570,6 +134784,7 @@ function logsApi(_logger) {
 }
 
 // src/api/network-diagnostic-api.ts
+import * as net from "node:net";
 import * as os2 from "node:os";
 import express6 from "express";
 
@@ -134633,8 +134848,8 @@ function selectMdnsInterface(raw) {
 // src/api/network-diagnostic-api.ts
 function networkDiagnosticApi(mdnsInterface, mdnsIpv4) {
   const router = express6.Router();
-  router.get("/", (_, res) => {
-    const result = runDiagnostics(mdnsInterface, mdnsIpv4);
+  router.get("/", async (_, res) => {
+    const result = await runDiagnostics(mdnsInterface, mdnsIpv4);
     res.json(result);
   });
   return router;
@@ -134662,7 +134877,20 @@ function getNetworkInterfaces() {
   }
   return result;
 }
-function runDiagnostics(mdnsInterface, mdnsIpv4) {
+async function isPort80Taken(host) {
+  return new Promise((resolve12) => {
+    const socket = net.connect({ host, port: 80 });
+    const done = (taken) => {
+      socket.destroy();
+      resolve12(taken);
+    };
+    socket.setTimeout(500);
+    socket.once("connect", () => done(true));
+    socket.once("timeout", () => done(false));
+    socket.once("error", () => done(false));
+  });
+}
+async function runDiagnostics(mdnsInterface, mdnsIpv4) {
   const interfaces = getNetworkInterfaces();
   const checks = [];
   const external = interfaces.filter((i) => !i.internal);
@@ -134777,6 +135005,20 @@ function runDiagnostics(mdnsInterface, mdnsIpv4) {
       });
     }
   }
+  const probeHosts = [
+    "127.0.0.1",
+    ...(mdnsInterface ? interfaces.find((i) => i.name === mdnsInterface)?.ipv4 ?? [] : external.find((i) => i.ipv4.length > 0)?.ipv4 ?? []).slice(0, 1)
+  ].filter((h, i, all) => all.indexOf(h) === i);
+  const taken = await Promise.all(probeHosts.map(isPort80Taken));
+  const busy = probeHosts.filter((_, i) => taken[i]);
+  if (busy.length > 0) {
+    checks.push({
+      name: "port_80_in_use",
+      status: "warn",
+      message: "Port 80 is in use on this host",
+      detail: `Answering on ${busy.join(", ")}. That is fine on its own. Two users could only pair Alexa after freeing port 80 (#449, #478), nobody knows why yet. If Alexa won't pair, stop whatever holds it while pairing, then turn it back on.`
+    });
+  }
   return {
     timestamp: (/* @__PURE__ */ new Date()).toISOString(),
     interfaces,
@@ -134815,10 +135057,10 @@ function anonymizeEntityId(entityId) {
   const hash2 = simpleHash(name).toString(16).substring(0, 6);
   return `${domain}.${prefix}***${hash2}`;
 }
-function simpleHash(str) {
+function simpleHash(str2) {
   let hash2 = 0;
-  for (let i = 0; i < str.length; i++) {
-    const char = str.charCodeAt(i);
+  for (let i = 0; i < str2.length; i++) {
+    const char = str2.charCodeAt(i);
     hash2 = (hash2 << 5) - hash2 + char;
     hash2 |= 0;
   }
@@ -134875,7 +135117,7 @@ function anonymizeNetwork(result) {
 }
 function diagnosticApi(bridgeService, haClient, haRegistry, version2, startTime, logger257, mdnsInterface, mdnsIpv4) {
   const router = express7.Router();
-  router.get("/export", (req, res) => {
+  router.get("/export", async (req, res) => {
     const anonymize = req.query.anonymize !== "false";
     const logLimit = Math.min(
       500,
@@ -134884,7 +135126,7 @@ function diagnosticApi(bridgeService, haClient, haRegistry, version2, startTime,
     const memUsage = process.memoryUsage();
     const bridges = bridgeService.bridges;
     const haConnected = haClient.connection?.connected ?? false;
-    const network = runDiagnostics(mdnsInterface, mdnsIpv4);
+    const network = await runDiagnostics(mdnsInterface, mdnsIpv4);
     const bridgeDetails = bridges.map((b) => {
       const data = b.data;
       const fabrics = data.commissioning?.fabrics ?? [];
@@ -135961,6 +136203,7 @@ function getMappedEntityIds(mapping) {
   if (mapping.currentLimitEntity) ids.push(mapping.currentLimitEntity);
   if (mapping.currentRoomEntity) ids.push(mapping.currentRoomEntity);
   if (mapping.cleanedAreaEntity) ids.push(mapping.cleanedAreaEntity);
+  if (mapping.operationalStateEntity) ids.push(mapping.operationalStateEntity);
   if (mapping.composedEntities) {
     for (const sub of mapping.composedEntities) {
       if (sub.entityId) ids.push(sub.entityId);
@@ -136888,7 +137131,11 @@ import * as nodePath from "node:path";
 import express14 from "express";
 
 // src/plugins/builtin/names.ts
-var BUILTIN_PLUGIN_NAMES = ["camera", "security"];
+var BUILTIN_PLUGIN_NAMES = [
+  "camera",
+  "security",
+  "vesync"
+];
 
 // src/plugins/plugin-installer.ts
 init_esm();
@@ -138926,6 +139173,12 @@ var BackupService = class {
     this.props = props;
     this.backupDir = path11.join(props.storageLocation, "backups");
     fs9.mkdirSync(this.backupDir, { recursive: true });
+    for (const file of fs9.readdirSync(this.backupDir)) {
+      if (file.endsWith(".part")) {
+        fs9.unlinkSync(path11.join(this.backupDir, file));
+      }
+    }
+    this.enforceRetention();
   }
   bridgeStorage;
   mappingStorage;
@@ -138940,6 +139193,7 @@ var BackupService = class {
     const prefix = auto ? "auto" : "manual";
     const filename = `hamh-${prefix}-${version2}-${dateStr}.zip`;
     const filepath = path11.join(this.backupDir, filename);
+    const tmpPath = `${filepath}.part`;
     const bridges = this.bridgeStorage.bridges;
     const entityMappings = {};
     for (const bridge of bridges) {
@@ -138968,9 +139222,10 @@ var BackupService = class {
       auto
     };
     await new Promise((resolve12, reject) => {
-      const output = fs9.createWriteStream(filepath);
+      const output = fs9.createWriteStream(tmpPath);
       const archive = archiver2("zip", { zlib: { level: 9 } });
       output.on("close", () => resolve12());
+      output.on("error", (err) => reject(err));
       archive.on("error", (err) => reject(err));
       archive.pipe(output);
       archive.append(JSON.stringify(backupData, null, 2), {
@@ -139019,7 +139274,11 @@ var BackupService = class {
         }
       }
       archive.finalize();
+    }).catch((e) => {
+      fs9.rmSync(tmpPath, { force: true });
+      throw e;
     });
+    fs9.renameSync(tmpPath, filepath);
     const stat4 = fs9.statSync(filepath);
     const metadata = {
       filename,
@@ -139031,7 +139290,7 @@ var BackupService = class {
     this.log.info(
       `Backup created: ${filename} (${Math.round(stat4.size / 1024)} KB)`
     );
-    await this.enforceRetention();
+    this.enforceRetention();
     return metadata;
   }
   async createAutoBackup() {
@@ -139092,10 +139351,10 @@ var BackupService = class {
       return false;
     }
   }
-  async enforceRetention() {
+  enforceRetention() {
     const settings = this.settingsStorage.backupSettings;
     const maxCount = settings.backupRetentionCount;
-    if (maxCount <= 0) return;
+    if (!Number.isInteger(maxCount) || maxCount <= 0) return;
     const backups = this.listBackups();
     if (backups.length <= maxCount) return;
     const toDelete = backups.slice(maxCount);
@@ -140806,7 +141065,7 @@ var __knownSymbol50 = (name, symbol) => (symbol = Symbol[name]) ? symbol : /* @_
 var __typeError50 = (msg) => {
   throw TypeError(msg);
 };
-var __defNormalProp5 = (obj, key, value) => key in obj ? __defProp6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp5 = (obj2, key, value) => key in obj2 ? __defProp6(obj2, key, { enumerable: true, configurable: true, writable: true, value }) : obj2[key] = value;
 var __name5 = (target, value) => __defProp6(target, "name", { value, configurable: true });
 var __decoratorStart5 = (base) => [, , , __create5(base?.[__knownSymbol50("metadata")] ?? null)];
 var __decoratorStrings5 = ["class", "method", "getter", "setter", "accessor", "field", "value", "get", "set"];
@@ -140841,12 +141100,12 @@ var __decorateElement5 = (array, flags2, name, decorators, target, extra) => {
   }
   return k || __decoratorMetadata5(array, target), desc && __defProp6(target, name, desc), p ? k ^ 4 ? extra : desc : target;
 };
-var __publicField5 = (obj, key, value) => __defNormalProp5(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __accessCheck5 = (obj, member, msg) => member.has(obj) || __typeError50("Cannot " + msg);
-var __privateIn5 = (member, obj) => Object(obj) !== obj ? __typeError50('Cannot use the "in" operator on this value') : member.has(obj);
-var __privateGet5 = (obj, member, getter) => (__accessCheck5(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateSet5 = (obj, member, value, setter) => (__accessCheck5(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
-var __privateMethod5 = (obj, member, method) => (__accessCheck5(obj, member, "access private method"), method);
+var __publicField5 = (obj2, key, value) => __defNormalProp5(obj2, typeof key !== "symbol" ? key + "" : key, value);
+var __accessCheck5 = (obj2, member, msg) => member.has(obj2) || __typeError50("Cannot " + msg);
+var __privateIn5 = (member, obj2) => Object(obj2) !== obj2 ? __typeError50('Cannot use the "in" operator on this value') : member.has(obj2);
+var __privateGet5 = (obj2, member, getter) => (__accessCheck5(obj2, member, "read from private field"), getter ? getter.call(obj2) : member.get(obj2));
+var __privateSet5 = (obj2, member, value, setter) => (__accessCheck5(obj2, member, "write to private field"), setter ? setter.call(obj2, value) : member.set(obj2, value), value);
+var __privateMethod5 = (obj2, member, method) => (__accessCheck5(obj2, member, "access private method"), method);
 var logger185 = Logger.get("ScenesManagementServer");
 var UNDEFINED_SCENE_ID = 255;
 function constraintErrorWithSceneId(groupId22, sceneId) {
@@ -142057,17 +142316,17 @@ var OnOffBaseServer = class extends OnOffLogicBase {
   /** Apply Scene values when requested from ScenesManagement cluster */
   #applySceneValues(values4, transitionTime) {
     this.#clearDelayedSceneApplyData();
-    const onOff = values4.onOff;
-    if (typeof onOff !== "boolean" || this.state.onOff === onOff) {
+    const onOff2 = values4.onOff;
+    if (typeof onOff2 !== "boolean" || this.state.onOff === onOff2) {
       return;
     }
     if (transitionTime === 0) {
-      if (onOff) {
+      if (onOff2) {
         return this.on();
       }
       return this.off();
     }
-    this.internal.applyScenePendingOnOff = onOff;
+    this.internal.applyScenePendingOnOff = onOff2;
     this.internal.applySceneDelayTimer = Time.getTimer(
       "delayed scene apply",
       Millis(transitionTime),
@@ -142082,12 +142341,12 @@ var OnOffBaseServer = class extends OnOffLogicBase {
     this.internal.applyScenePendingOnOff = void 0;
   }
   #applyDelayedSceneOnOffValue() {
-    const onOff = this.internal.applyScenePendingOnOff;
+    const onOff2 = this.internal.applyScenePendingOnOff;
     this.#clearDelayedSceneApplyData();
-    if (onOff === void 0) {
+    if (onOff2 === void 0) {
       return;
     }
-    if (onOff) {
+    if (onOff2) {
       this.delayedPromises.add(this.on());
     } else {
       this.delayedPromises.add(this.off());
@@ -147905,9 +148164,9 @@ var LevelControlBaseServer = class _LevelControlBaseServer extends LevelControlB
         this.context.transaction.addParticipants({
           preCommit: () => {
             if (this.currentLevel === this.minLevel) {
-              const onOff = this.agent.get(OnOffServer);
-              if (onOff.state.onOff) {
-                onOff.state.onOff = false;
+              const onOff2 = this.agent.get(OnOffServer);
+              if (onOff2.state.onOff) {
+                onOff2.state.onOff = false;
                 return true;
               }
             }
@@ -147915,9 +148174,9 @@ var LevelControlBaseServer = class _LevelControlBaseServer extends LevelControlB
           }
         });
       } else {
-        const onOff = this.agent.get(OnOffServer);
-        if (!onOff.state.onOff) {
-          onOff.state.onOff = true;
+        const onOff2 = this.agent.get(OnOffServer);
+        if (!onOff2.state.onOff) {
+          onOff2.state.onOff = true;
           if (this.state.onLevel !== null) {
             result = this.handleOnOffChange(true);
             this.internal.blockOnOffCouplingOnce = true;
@@ -147957,12 +148216,12 @@ var LevelControlBaseServer = class _LevelControlBaseServer extends LevelControlB
    *
    * @param onOff The new onOff state
    */
-  handleOnOffChange(onOff) {
+  handleOnOffChange(onOff2) {
     if (this.internal.blockOnOffCouplingOnce) {
       this.internal.blockOnOffCouplingOnce = false;
       return;
     }
-    if (!onOff || this.state.onLevel === null) {
+    if (!onOff2 || this.state.onLevel === null) {
       return;
     }
     logger191.debug(`OnOff changed to ON, setting level to onLevel value of ${this.state.onLevel}`);
@@ -148739,7 +148998,7 @@ var __knownSymbol51 = (name, symbol) => (symbol = Symbol[name]) ? symbol : /* @_
 var __typeError51 = (msg) => {
   throw TypeError(msg);
 };
-var __defNormalProp6 = (obj, key, value) => key in obj ? __defProp7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp6 = (obj2, key, value) => key in obj2 ? __defProp7(obj2, key, { enumerable: true, configurable: true, writable: true, value }) : obj2[key] = value;
 var __name6 = (target, value) => __defProp7(target, "name", { value, configurable: true });
 var __decoratorStart6 = (base) => [, , , __create6(base?.[__knownSymbol51("metadata")] ?? null)];
 var __decoratorStrings6 = ["class", "method", "getter", "setter", "accessor", "field", "value", "get", "set"];
@@ -148774,12 +149033,12 @@ var __decorateElement6 = (array, flags2, name, decorators, target, extra) => {
   }
   return k || __decoratorMetadata6(array, target), desc && __defProp7(target, name, desc), p ? k ^ 4 ? extra : desc : target;
 };
-var __publicField6 = (obj, key, value) => __defNormalProp6(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __accessCheck6 = (obj, member, msg) => member.has(obj) || __typeError51("Cannot " + msg);
-var __privateIn6 = (member, obj) => Object(obj) !== obj ? __typeError51('Cannot use the "in" operator on this value') : member.has(obj);
-var __privateGet6 = (obj, member, getter) => (__accessCheck6(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateSet6 = (obj, member, value, setter) => (__accessCheck6(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
-var __privateMethod6 = (obj, member, method) => (__accessCheck6(obj, member, "access private method"), method);
+var __publicField6 = (obj2, key, value) => __defNormalProp6(obj2, typeof key !== "symbol" ? key + "" : key, value);
+var __accessCheck6 = (obj2, member, msg) => member.has(obj2) || __typeError51("Cannot " + msg);
+var __privateIn6 = (member, obj2) => Object(obj2) !== obj2 ? __typeError51('Cannot use the "in" operator on this value') : member.has(obj2);
+var __privateGet6 = (obj2, member, getter) => (__accessCheck6(obj2, member, "read from private field"), getter ? getter.call(obj2) : member.get(obj2));
+var __privateSet6 = (obj2, member, value, setter) => (__accessCheck6(obj2, member, "write to private field"), setter ? setter.call(obj2, value) : member.set(obj2, value), value);
+var __privateMethod6 = (obj2, member, method) => (__accessCheck6(obj2, member, "access private method"), method);
 var CredentialType = DoorLock3.CredentialType;
 var LockDataType = DoorLock3.LockDataType;
 var LockAuth;
@@ -148993,7 +149252,7 @@ var __knownSymbol52 = (name, symbol) => (symbol = Symbol[name]) ? symbol : /* @_
 var __typeError52 = (msg) => {
   throw TypeError(msg);
 };
-var __defNormalProp7 = (obj, key, value) => key in obj ? __defProp8(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp7 = (obj2, key, value) => key in obj2 ? __defProp8(obj2, key, { enumerable: true, configurable: true, writable: true, value }) : obj2[key] = value;
 var __name7 = (target, value) => __defProp8(target, "name", { value, configurable: true });
 var __decoratorStart7 = (base) => [, , , __create7(base?.[__knownSymbol52("metadata")] ?? null)];
 var __decoratorStrings7 = ["class", "method", "getter", "setter", "accessor", "field", "value", "get", "set"];
@@ -149028,12 +149287,12 @@ var __decorateElement7 = (array, flags2, name, decorators, target, extra) => {
   }
   return k || __decoratorMetadata7(array, target), desc && __defProp8(target, name, desc), p ? k ^ 4 ? extra : desc : target;
 };
-var __publicField7 = (obj, key, value) => __defNormalProp7(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __accessCheck7 = (obj, member, msg) => member.has(obj) || __typeError52("Cannot " + msg);
-var __privateIn7 = (member, obj) => Object(obj) !== obj ? __typeError52('Cannot use the "in" operator on this value') : member.has(obj);
-var __privateGet7 = (obj, member, getter) => (__accessCheck7(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateSet7 = (obj, member, value, setter) => (__accessCheck7(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
-var __privateMethod7 = (obj, member, method) => (__accessCheck7(obj, member, "access private method"), method);
+var __publicField7 = (obj2, key, value) => __defNormalProp7(obj2, typeof key !== "symbol" ? key + "" : key, value);
+var __accessCheck7 = (obj2, member, msg) => member.has(obj2) || __typeError52("Cannot " + msg);
+var __privateIn7 = (member, obj2) => Object(obj2) !== obj2 ? __typeError52('Cannot use the "in" operator on this value') : member.has(obj2);
+var __privateGet7 = (obj2, member, getter) => (__accessCheck7(obj2, member, "read from private field"), getter ? getter.call(obj2) : member.get(obj2));
+var __privateSet7 = (obj2, member, value, setter) => (__accessCheck7(obj2, member, "write to private field"), setter ? setter.call(obj2, value) : member.set(obj2, value), value);
+var __privateMethod7 = (obj2, member, method) => (__accessCheck7(obj2, member, "access private method"), method);
 var LockSchedule;
 ((LockSchedule2) => {
   var _endMinute_dec, _endHour_dec, _startMinute_dec, _startHour_dec, _daysMask_dec, _userIndex_dec, _weekDayIndex_dec, _init, _localEndTime_dec, _localStartTime_dec, _userIndex_dec2, _yearDayIndex_dec, _init2, _operatingMode_dec, _localEndTime_dec2, _localStartTime_dec2, _holidayIndex_dec, _init3;
@@ -149101,7 +149360,7 @@ var __knownSymbol53 = (name, symbol) => (symbol = Symbol[name]) ? symbol : /* @_
 var __typeError53 = (msg) => {
   throw TypeError(msg);
 };
-var __defNormalProp8 = (obj, key, value) => key in obj ? __defProp9(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp8 = (obj2, key, value) => key in obj2 ? __defProp9(obj2, key, { enumerable: true, configurable: true, writable: true, value }) : obj2[key] = value;
 var __name8 = (target, value) => __defProp9(target, "name", { value, configurable: true });
 var __decoratorStart8 = (base) => [, , , __create8(base?.[__knownSymbol53("metadata")] ?? null)];
 var __decoratorStrings8 = ["class", "method", "getter", "setter", "accessor", "field", "value", "get", "set"];
@@ -149136,12 +149395,12 @@ var __decorateElement8 = (array, flags2, name, decorators, target, extra) => {
   }
   return k || __decoratorMetadata8(array, target), desc && __defProp9(target, name, desc), p ? k ^ 4 ? extra : desc : target;
 };
-var __publicField8 = (obj, key, value) => __defNormalProp8(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __accessCheck8 = (obj, member, msg) => member.has(obj) || __typeError53("Cannot " + msg);
-var __privateIn8 = (member, obj) => Object(obj) !== obj ? __typeError53('Cannot use the "in" operator on this value') : member.has(obj);
-var __privateGet8 = (obj, member, getter) => (__accessCheck8(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateSet8 = (obj, member, value, setter) => (__accessCheck8(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
-var __privateMethod8 = (obj, member, method) => (__accessCheck8(obj, member, "access private method"), method);
+var __publicField8 = (obj2, key, value) => __defNormalProp8(obj2, typeof key !== "symbol" ? key + "" : key, value);
+var __accessCheck8 = (obj2, member, msg) => member.has(obj2) || __typeError53("Cannot " + msg);
+var __privateIn8 = (member, obj2) => Object(obj2) !== obj2 ? __typeError53('Cannot use the "in" operator on this value') : member.has(obj2);
+var __privateGet8 = (obj2, member, getter) => (__accessCheck8(obj2, member, "read from private field"), getter ? getter.call(obj2) : member.get(obj2));
+var __privateSet8 = (obj2, member, value, setter) => (__accessCheck8(obj2, member, "write to private field"), setter ? setter.call(obj2, value) : member.set(obj2, value), value);
+var __privateMethod8 = (obj2, member, method) => (__accessCheck8(obj2, member, "access private method"), method);
 var AlarmCode = DoorLock3.AlarmCode;
 var CredentialRule = DoorLock3.CredentialRule;
 var CredentialType2 = DoorLock3.CredentialType;
@@ -150823,6 +151082,7 @@ var LaundryDryerDeviceDefinition = MutableEndpoint({
   behaviors: SupportedBehaviors(LaundryDryerRequirements.server.mandatory.OperationalState)
 });
 Object.freeze(LaundryDryerDeviceDefinition);
+var LaundryDryerDevice = LaundryDryerDeviceDefinition;
 
 // ../../node_modules/.pnpm/@matter+node@0.17.9_patch_hash=36b92ac82ac22a042f8521224156076e8f31f149bd4a87aa14d87af50ce802af/node_modules/@matter/node/dist/esm/devices/laundry-washer.js
 init_IdentifyServer();
@@ -150871,6 +151131,7 @@ var LaundryWasherDeviceDefinition = MutableEndpoint({
   behaviors: SupportedBehaviors(LaundryWasherRequirements.server.mandatory.OperationalState)
 });
 Object.freeze(LaundryWasherDeviceDefinition);
+var LaundryWasherDevice = LaundryWasherDeviceDefinition;
 
 // ../../node_modules/.pnpm/@matter+node@0.17.9_patch_hash=36b92ac82ac22a042f8521224156076e8f31f149bd4a87aa14d87af50ce802af/node_modules/@matter/node/dist/esm/devices/light-sensor.js
 init_IdentifyServer();
@@ -156922,11 +157183,11 @@ var ServerModeServerNode = class extends ServerNode {
     await this.erase();
   }
 };
-function dropUndefined(obj) {
+function dropUndefined(obj2) {
   const result = {};
-  for (const key in obj) {
-    if (obj[key] !== void 0) {
-      result[key] = obj[key];
+  for (const key in obj2) {
+    if (obj2[key] !== void 0) {
+      result[key] = obj2[key];
     }
   }
   return result;
@@ -157362,6 +157623,11 @@ var deviceTypeMap = {
     PluginBasicInformationServer,
     PluginDeviceBehavior
   ),
+  air_purifier: () => AirPurifierDevice.with(
+    IdentifyServer2,
+    PluginBasicInformationServer,
+    PluginDeviceBehavior
+  ),
   window_covering: () => WindowCoveringDevice.with(
     IdentifyServer2,
     PluginBasicInformationServer,
@@ -157701,6 +157967,9 @@ var PluginManager = class {
     if (enabled === false) {
       metadata.enabled = false;
       logger205.info(`Plugin "${plugin.name}" stays disabled (persisted)`);
+      if (metadata.source === "builtin") {
+        metadata.config = await storage2.get(PLUGIN_CONFIG_KEY) ?? metadata.config;
+      }
     }
     const devices = /* @__PURE__ */ new Map();
     const pluginLogger = Logger.get(`Plugin:${plugin.name}`);
@@ -158391,74 +158660,8 @@ var BridgeServerNode = class extends ServerNode {
   }
 };
 
-// src/matter/endpoints/update-entity-state.ts
-init_esm();
-init_home_assistant_entity_behavior();
-var chains = /* @__PURE__ */ new WeakMap();
-function isDetachedEndpointError(error) {
-  if (error instanceof TransactionDestroyedError || error instanceof DestroyedDependencyError) {
-    return true;
-  }
-  const message = error instanceof Error ? error.message : String(error);
-  return message.includes("Endpoint storage inaccessible") || message.includes("is not present on this endpoint");
-}
-function updateEntityState(endpoint, state) {
-  const next = (chains.get(endpoint) ?? Promise.resolve()).then(
-    () => writeState(endpoint, state)
-  );
-  chains.set(
-    endpoint,
-    next.catch(() => {
-    })
-  );
-  return next;
-}
-function updateEntityRegistry(endpoint, registry3, deviceRegistry) {
-  const next = (chains.get(endpoint) ?? Promise.resolve()).then(
-    () => writeRegistry(endpoint, registry3, deviceRegistry)
-  );
-  chains.set(
-    endpoint,
-    next.catch(() => {
-    })
-  );
-  return next;
-}
-async function writeRegistry(endpoint, registry3, deviceRegistry) {
-  try {
-    await endpoint.construction.ready;
-  } catch {
-    return;
-  }
-  try {
-    const current = endpoint.stateOf(HomeAssistantEntityBehavior).entity;
-    if (JSON.stringify(current.registry) === JSON.stringify(registry3) && JSON.stringify(current.deviceRegistry) === JSON.stringify(deviceRegistry)) {
-      return;
-    }
-    await endpoint.setStateOf(HomeAssistantEntityBehavior, {
-      entity: { ...current, registry: registry3, deviceRegistry }
-    });
-  } catch (error) {
-    if (isDetachedEndpointError(error)) return;
-    throw error;
-  }
-}
-async function writeState(endpoint, state) {
-  try {
-    await endpoint.construction.ready;
-  } catch {
-    return;
-  }
-  try {
-    const current = endpoint.stateOf(HomeAssistantEntityBehavior).entity;
-    await endpoint.setStateOf(HomeAssistantEntityBehavior, {
-      entity: { ...current, state }
-    });
-  } catch (error) {
-    if (isDetachedEndpointError(error)) return;
-    throw error;
-  }
-}
+// src/services/bridges/bridge.ts
+init_update_entity_state();
 
 // src/utils/ensure-commissioning-config.ts
 init_protocol3();
@@ -159174,6 +159377,7 @@ var SessionSupervisor = class {
           const type = message?.payloadHeader?.messageType;
           if (type === MessageType.SubscribeRequest) {
             this.pushWedgeRing(this.subscribeTimesMs, session, now);
+            this.armSubscribeWatchdog(session);
           } else if (type != null && commandMessageTypes.includes(type)) {
             this.lastCommandImAt.set(session, now);
           }
@@ -159230,6 +159434,20 @@ var SessionSupervisor = class {
       );
     });
   }
+  // A subscription that dies before its first report never joins the session,
+  // so no event fires to reap the session (#487).
+  armSubscribeWatchdog(session) {
+    const sessionId = session.id;
+    if (typeof sessionId !== "number") return;
+    if (this.staleSessionTimers.has(sessionId)) return;
+    this.staleSessionTimers.set(
+      sessionId,
+      setTimeout(() => {
+        this.staleSessionTimers.delete(sessionId);
+        this.closeStaleSession(sessionId, PRIMING_GRACE_MS);
+      }, replacedSessionTimeoutMs(this.dataProvider.featureFlags))
+    );
+  }
   closeStaleSession(sessionId, minQuietMs = 0) {
     try {
       const sessionManager = this.server.env.get(SessionManager);
@@ -161222,6 +161440,12 @@ var LevelControlServerBase = class extends FeaturedBase5 {
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
     this.reactTo(homeAssistant.onChange, this.update, { lock: true });
+    this.reactTo(homeAssistant.events.actionFailed, this.dropOptimistic);
+  }
+  dropOptimistic() {
+    optimisticLevelState.delete(
+      this.agent.get(HomeAssistantEntityBehavior).entityId
+    );
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -161417,25 +161641,31 @@ var OnOffServerBase = class extends OnOffServer {
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
     this.reactTo(homeAssistant.onChange, this.update, { lock: true });
+    this.reactTo(homeAssistant.events.actionFailed, this.dropOptimistic);
+  }
+  dropOptimistic() {
+    optimisticOnOffState.delete(
+      this.agent.get(HomeAssistantEntityBehavior).entityId
+    );
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
       return;
     }
     const { state } = entity;
-    const onOff = this.isOn(state);
+    const onOff2 = this.isOn(state);
     const entityId = this.agent.get(HomeAssistantEntityBehavior).entity.entity_id;
     const optimistic = optimisticOnOffState.get(entityId);
     if (optimistic != null) {
       if (Date.now() - optimistic.timestamp > OPTIMISTIC_TIMEOUT_MS2) {
         optimisticOnOffState.delete(entityId);
-      } else if (onOff === optimistic.expectedOnOff) {
+      } else if (onOff2 === optimistic.expectedOnOff) {
         optimisticOnOffState.delete(entityId);
       } else {
         return;
       }
     }
-    applyPatchState(this.state, { onOff });
+    applyPatchState(this.state, { onOff: onOff2 });
   }
   isOn(entity) {
     return this.state.config?.isOn?.(entity, this.agent) ?? (this.agent.get(HomeAssistantEntityBehavior).isAvailable && entity.state !== "off");
@@ -161521,6 +161751,13 @@ function setOptimisticOnOff(entityId, expectedOnOff) {
 
 // src/matter/behaviors/fan-control-server.ts
 var logger214 = Logger.get("FanControlServer");
+function lockResource(behavior) {
+  let resource = behavior;
+  while (resource[Transaction.Resource.reference]) {
+    resource = resource[Transaction.Resource.reference];
+  }
+  return resource;
+}
 var defaultStepSize = 33.33;
 var minSpeedMax = 3;
 var maxSpeedMax = 100;
@@ -161608,7 +161845,10 @@ var FanControlServerBase = class extends FeaturedBase6 {
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
     this.reactTo(homeAssistant.onChange, this.update, {
-      lock: this.agent.has(FanSpeedMemoryBehavior) ? [this, this.agent.get(FanSpeedMemoryBehavior)] : true
+      lock: this.agent.has(FanSpeedMemoryBehavior) ? [
+        lockResource(this),
+        lockResource(this.agent.get(FanSpeedMemoryBehavior))
+      ] : true
     });
     this.reactTo(
       this.events.percentSetting$Changed,
@@ -162016,12 +162256,12 @@ var FanControlServerBase = class extends FeaturedBase6 {
   // Cross-cluster: restore fan speed on controller-initiated turn-on.
   // When a controller sends OnOff.on() and percentSetting is 0, Apple Home
   // may default to 100%. Restoring the last non-zero value avoids this (#225).
-  onOffChanged(onOff, _oldValue, context) {
+  onOffChanged(onOff2, _oldValue, context) {
     if (transactionIsOffline(context)) {
       return;
     }
     const remembered = this.remembered();
-    if (onOff && remembered.percent > 0) {
+    if (onOff2 && remembered.percent > 0) {
       this.agent.asLocalActor(() => {
         try {
           applyPatchState(this.state, {
@@ -162198,6 +162438,7 @@ var FanOnOffServer = OnOffServer2({
 });
 
 // src/matter/endpoints/composed/composed-air-purifier-endpoint.ts
+init_update_entity_state();
 var logger215 = Logger.get("ComposedAirPurifierEndpoint");
 var temperatureConfig = {
   getValue(entity, agent) {
@@ -163861,6 +164102,7 @@ function ClimateDevice(homeAssistantEntity, includeBasicInformation = true) {
 }
 
 // src/matter/endpoints/composed/composed-climate-fan-endpoint.ts
+init_update_entity_state();
 var logger218 = Logger.get("ComposedClimateFanEndpoint");
 function createEndpointId3(entityId, customName) {
   const baseName = customName || entityId;
@@ -164080,6 +164322,7 @@ function PressureMeasurementServer2(config8) {
 }
 
 // src/matter/endpoints/composed/composed-sensor-endpoint.ts
+init_update_entity_state();
 var logger220 = Logger.get("ComposedSensorEndpoint");
 var temperatureConfig2 = {
   getValue(entity, agent) {
@@ -164572,6 +164815,179 @@ function AlarmControlPanelDevice(homeAssistantEntity) {
   });
 }
 
+// ../../node_modules/.pnpm/@matter+main@0.17.9/node_modules/@matter/main/dist/esm/forwards/behaviors/operational-state.js
+init_nodejs();
+
+// ../../node_modules/.pnpm/@matter+main@0.17.9/node_modules/@matter/main/dist/esm/forwards/clusters/operational-state.js
+init_nodejs();
+
+// src/matter/endpoints/legacy/appliance/index.ts
+init_home_assistant_entity_behavior();
+var Op = OperationalState3.OperationalStateEnum;
+var haStateToOperationalState = {
+  off: Op.Stopped,
+  idle: Op.Stopped,
+  standby: Op.Stopped,
+  on: Op.Running,
+  running: Op.Running,
+  active: Op.Running,
+  drying: Op.Running,
+  washing: Op.Running,
+  paused: Op.Paused,
+  complete: Op.Stopped,
+  finished: Op.Stopped,
+  inactive: Op.Stopped,
+  ready: Op.Stopped,
+  delayedstart: Op.Stopped,
+  run: Op.Running,
+  pause: Op.Paused,
+  // waiting for the user
+  actionrequired: Op.Paused,
+  aborting: Op.Running,
+  error: Op.Error,
+  stop: Op.Stopped,
+  // Miele
+  in_use: Op.Running,
+  programmed: Op.Stopped,
+  waiting_to_start: Op.Stopped,
+  program_ended: Op.Stopped,
+  program_interrupted: Op.Stopped,
+  rinse_hold: Op.Paused,
+  failure: Op.Error,
+  // LG ThinQ
+  detecting: Op.Running,
+  prewash: Op.Running,
+  soaking: Op.Running,
+  add_drain: Op.Running,
+  dispensing: Op.Running,
+  rinsing: Op.Running,
+  softening: Op.Running,
+  steam_softening: Op.Running,
+  spinning: Op.Running,
+  refreshing: Op.Running,
+  cooling: Op.Running,
+  cool_down: Op.Running,
+  night_dry: Op.Running,
+  end: Op.Stopped,
+  running_end: Op.Stopped,
+  done: Op.Stopped,
+  initial: Op.Stopped,
+  power_off: Op.Stopped,
+  reserved: Op.Stopped,
+  power_fail: Op.Error
+};
+var cycleStates = /* @__PURE__ */ new Set([Op.Running, Op.Paused]);
+var ApplianceOperationalStateServer = class extends OperationalStateServer.enable({
+  events: { operationCompletion: true }
+}) {
+  async initialize() {
+    this.state.operationalStateList = [
+      { operationalStateId: Op.Stopped },
+      { operationalStateId: Op.Running },
+      { operationalStateId: Op.Paused },
+      { operationalStateId: Op.Error }
+    ];
+    this.state.operationalState = Op.Stopped;
+    this.state.operationalError = {
+      errorStateId: OperationalState3.ErrorState.NoError
+    };
+    await super.initialize();
+    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
+    this.update(homeAssistant.entity);
+    this.reactTo(homeAssistant.onChange, this.update, { lock: true });
+  }
+  update(entity) {
+    if (!entity.state) {
+      return;
+    }
+    const stateEntity = this.agent.get(HomeAssistantEntityBehavior).state.mapping?.operationalStateEntity;
+    const raw = stateEntity ? this.agent.env.get(EntityStateProvider).getState(stateEntity)?.state : entity.state.state;
+    if (raw === "unavailable" || raw === "unknown") {
+      return;
+    }
+    let haState = raw?.toLowerCase() ?? "off";
+    if (stateEntity && haState === "on") {
+      haState = "idle";
+    }
+    const mapped = haStateToOperationalState[haState];
+    if (stateEntity && (raw === void 0 || mapped === void 0)) {
+      return;
+    }
+    const newState = mapped ?? Op.Stopped;
+    const previous = this.state.operationalState;
+    const errorStateId = newState === Op.Error ? OperationalState3.ErrorState.UnableToCompleteOperation : OperationalState3.ErrorState.NoError;
+    applyPatchState(this.state, {
+      operationalState: newState,
+      operationalError: { errorStateId }
+    });
+    if (cycleStates.has(previous) && !cycleStates.has(newState)) {
+      this.events.operationCompletion.emit(
+        {
+          completionErrorCode: errorStateId,
+          totalOperationalTime: null,
+          pausedTime: null
+        },
+        this.context
+      );
+    }
+  }
+  pause() {
+    return {
+      commandResponseState: {
+        errorStateId: OperationalState3.ErrorState.CommandInvalidInState
+      }
+    };
+  }
+  stop() {
+    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
+    homeAssistant.callAction({ action: "homeassistant.turn_off" });
+    return {
+      commandResponseState: {
+        errorStateId: OperationalState3.ErrorState.NoError
+      }
+    };
+  }
+  start() {
+    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
+    homeAssistant.callAction({ action: "homeassistant.turn_on" });
+    return {
+      commandResponseState: {
+        errorStateId: OperationalState3.ErrorState.NoError
+      }
+    };
+  }
+  resume() {
+    return this.start();
+  }
+};
+var ApplianceOnOffServer = OnOffServer2({
+  turnOn: () => ({
+    action: "homeassistant.turn_on"
+  }),
+  turnOff: () => ({
+    action: "homeassistant.turn_off"
+  })
+}).with("DeadFrontBehavior");
+var behaviors = [
+  BasicInformationServer2,
+  IdentifyServer2,
+  HomeAssistantEntityBehavior,
+  ApplianceOperationalStateServer,
+  ApplianceOnOffServer
+];
+var DishwasherType = DishwasherDevice.with(...behaviors);
+var LaundryWasherType = LaundryWasherDevice.with(...behaviors);
+var LaundryDryerType = LaundryDryerDevice.with(...behaviors);
+function DishwasherEndpoint(homeAssistantEntity) {
+  return DishwasherType.set({ homeAssistantEntity });
+}
+function LaundryWasherEndpoint(homeAssistantEntity) {
+  return LaundryWasherType.set({ homeAssistantEntity });
+}
+function LaundryDryerEndpoint(homeAssistantEntity) {
+  return LaundryDryerType.set({ homeAssistantEntity });
+}
+
 // src/matter/endpoints/legacy/automation/index.ts
 init_home_assistant_entity_behavior();
 var AutomationOnOffServer = OnOffServer2({
@@ -165277,6 +165693,15 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
     this.reactTo(homeAssistant.onChange, this.update, { lock: true });
+    this.reactTo(homeAssistant.events.actionFailed, this.dropOptimistic);
+  }
+  // The HA call failed, so the move never started. Without this the re-applied
+  // HA state would keep the optimistic Opening/Closing until the timeout (#446).
+  dropOptimistic() {
+    const optimistic = coverOptimistic.get(this.endpoint);
+    if (!optimistic) return;
+    clearOptimisticAxis(optimistic, "lift");
+    clearOptimisticAxis(optimistic, "tilt");
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -166153,105 +166578,6 @@ function CoverDevice(homeAssistantEntity) {
   });
 }
 
-// ../../node_modules/.pnpm/@matter+main@0.17.9/node_modules/@matter/main/dist/esm/forwards/behaviors/operational-state.js
-init_nodejs();
-
-// ../../node_modules/.pnpm/@matter+main@0.17.9/node_modules/@matter/main/dist/esm/forwards/clusters/operational-state.js
-init_nodejs();
-
-// src/matter/endpoints/legacy/dishwasher/index.ts
-init_home_assistant_entity_behavior();
-var haStateToDishwasherState = {
-  off: OperationalState3.OperationalStateEnum.Stopped,
-  idle: OperationalState3.OperationalStateEnum.Stopped,
-  standby: OperationalState3.OperationalStateEnum.Stopped,
-  on: OperationalState3.OperationalStateEnum.Running,
-  running: OperationalState3.OperationalStateEnum.Running,
-  active: OperationalState3.OperationalStateEnum.Running,
-  drying: OperationalState3.OperationalStateEnum.Running,
-  washing: OperationalState3.OperationalStateEnum.Running,
-  paused: OperationalState3.OperationalStateEnum.Paused,
-  complete: OperationalState3.OperationalStateEnum.Stopped,
-  finished: OperationalState3.OperationalStateEnum.Stopped
-};
-var DishwasherOperationalStateServer = class extends OperationalStateServer {
-  async initialize() {
-    this.state.operationalStateList = [
-      { operationalStateId: OperationalState3.OperationalStateEnum.Stopped },
-      { operationalStateId: OperationalState3.OperationalStateEnum.Running },
-      { operationalStateId: OperationalState3.OperationalStateEnum.Paused },
-      { operationalStateId: OperationalState3.OperationalStateEnum.Error }
-    ];
-    this.state.operationalState = OperationalState3.OperationalStateEnum.Stopped;
-    this.state.operationalError = {
-      errorStateId: OperationalState3.ErrorState.NoError
-    };
-    await super.initialize();
-    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
-    this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update, { lock: true });
-  }
-  update(entity) {
-    if (!entity.state) {
-      return;
-    }
-    const haState = entity.state.state?.toLowerCase() ?? "off";
-    const newState = haStateToDishwasherState[haState] ?? OperationalState3.OperationalStateEnum.Stopped;
-    applyPatchState(this.state, {
-      operationalState: newState,
-      operationalError: {
-        errorStateId: OperationalState3.ErrorState.NoError
-      }
-    });
-  }
-  pause() {
-    return {
-      commandResponseState: {
-        errorStateId: OperationalState3.ErrorState.CommandInvalidInState
-      }
-    };
-  }
-  stop() {
-    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-    homeAssistant.callAction({ action: "homeassistant.turn_off" });
-    return {
-      commandResponseState: {
-        errorStateId: OperationalState3.ErrorState.NoError
-      }
-    };
-  }
-  start() {
-    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-    homeAssistant.callAction({ action: "homeassistant.turn_on" });
-    return {
-      commandResponseState: {
-        errorStateId: OperationalState3.ErrorState.NoError
-      }
-    };
-  }
-  resume() {
-    return this.start();
-  }
-};
-var DishwasherOnOffServer = OnOffServer2({
-  turnOn: () => ({
-    action: "homeassistant.turn_on"
-  }),
-  turnOff: () => ({
-    action: "homeassistant.turn_off"
-  })
-});
-var DishwasherDeviceType = DishwasherDevice.with(
-  BasicInformationServer2,
-  IdentifyServer2,
-  HomeAssistantEntityBehavior,
-  DishwasherOperationalStateServer,
-  DishwasherOnOffServer
-);
-function DishwasherEndpoint(homeAssistantEntity) {
-  return DishwasherDeviceType.set({ homeAssistantEntity });
-}
-
 // src/matter/behaviors/generic-switch-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
@@ -166778,8 +167104,10 @@ var ErrorState = RvcOperationalState4.ErrorState;
 var logger227 = Logger.get("RvcOperationalStateServer");
 var activeStates = /* @__PURE__ */ new Set([
   OperationalState4.Running,
-  OperationalState4.SeekingCharger
+  OperationalState4.SeekingCharger,
+  OperationalState4.Paused
 ]);
+var haStates = /* @__PURE__ */ new WeakMap();
 var advertisedOperationalStates = [
   OperationalState4.Stopped,
   OperationalState4.Running,
@@ -166795,7 +167123,9 @@ function makeRvcOperationalError(errorStateId) {
   }
   return { errorStateId, errorStateDetails: ErrorState[errorStateId] };
 }
-var RvcOperationalStateServerBase = class extends RvcOperationalStateServer {
+var RvcOperationalStateServerBase = class extends RvcOperationalStateServer.enable({
+  events: { operationCompletion: true }
+}) {
   async initialize() {
     this.state.operationalStateList = advertisedOperationalStates.map((id) => ({
       operationalStateId: id
@@ -166818,7 +167148,8 @@ var RvcOperationalStateServerBase = class extends RvcOperationalStateServer {
       entity.state,
       this.agent
     );
-    const previousState = this.state.operationalState;
+    const previousState = haStates.get(this.endpoint);
+    haStates.set(this.endpoint, newState);
     const errorStateId = newState === OperationalState4.Error ? ErrorState.Stuck : ErrorState.NoError;
     const operationalError = makeRvcOperationalError(errorStateId);
     applyPatchState(
@@ -166829,7 +167160,8 @@ var RvcOperationalStateServerBase = class extends RvcOperationalStateServer {
       },
       { force: true }
     );
-    if (activeStates.has(previousState) && !activeStates.has(newState)) {
+    const offline = entity.state.state === "unavailable" || entity.state.state === "unknown";
+    if (!offline && previousState !== void 0 && activeStates.has(previousState) && !activeStates.has(newState)) {
       logger227.info(
         `Operation completed: ${OperationalState4[previousState]} -> ${OperationalState4[newState]}`
       );
@@ -166974,6 +167306,11 @@ function isRoomMode(mode) {
   return mode >= ROOM_MODE_BASE;
 }
 var cleaningSessions = /* @__PURE__ */ new WeakMap();
+var idleOperationalStates = /* @__PURE__ */ new Set([
+  RvcOperationalState4.OperationalState.Stopped,
+  RvcOperationalState4.OperationalState.Charging,
+  RvcOperationalState4.OperationalState.Docked
+]);
 function getSession(endpoint) {
   let session = cleaningSessions.get(endpoint);
   if (!session) {
@@ -166984,7 +167321,9 @@ function getSession(endpoint) {
       loggedShortCircuits: /* @__PURE__ */ new Set(),
       observedCleaning: false,
       pendingDispatches: [],
-      cleanedAreaBaseline: null
+      cleanedAreaBaseline: null,
+      parkedAreas: [],
+      haCleaning: false
     };
     cleaningSessions.set(endpoint, session);
   }
@@ -167018,9 +167357,14 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
       },
       { force: true }
     );
+    if (!["unavailable", "unknown"].includes(entity.state.state)) {
+      this.renameAreas(entity.state);
+    }
     if (newMode === 1 /* Cleaning */) {
       s.observedCleaning = true;
     }
+    const wasHaCleaning = s.haCleaning;
+    s.haCleaning = newMode === 1 /* Cleaning */;
     if (previousMode !== newMode) {
       if (newMode === 0 /* Idle */) {
         if (s.lastCurrentArea !== null) {
@@ -167057,6 +167401,13 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
           } catch {
           }
           s.observedCleaning = false;
+          if (s.activeAreas.every((id) => s.completedAreas.has(id))) {
+            s.activeAreas = [];
+            s.completedAreas.clear();
+            s.lastCurrentArea = null;
+            s.cleanedAreaBaseline = null;
+          }
+          this.restoreParkedAreas();
         }
         s.loggedShortCircuits.clear();
       } else if (newMode === 1 /* Cleaning */) {
@@ -167067,6 +167418,8 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
           if (firstPending !== void 0) {
             this.trySetCurrentArea(firstPending);
           }
+        } else if (s.activeAreas.length === 0 && !wasHaCleaning) {
+          this.parkSelectedAreas();
         }
       }
     }
@@ -167088,6 +167441,41 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
       }
     }
   }
+  /**
+   * A room renamed in HA keeps its id, so relabel the area in place. A
+   * rebuild would cost the controller its selection and progress (#501).
+   */
+  renameAreas(state) {
+    const getAreaNames = this.state.config.getAreaNames;
+    if (!getAreaNames) return;
+    try {
+      const names = new Map(
+        getAreaNames(state, this.agent).map((a) => [a.areaId, a.name])
+      );
+      const serviceArea = this.agent.get(ServiceAreaBehavior);
+      let renamed = false;
+      const areas = serviceArea.state.supportedAreas.map((area) => {
+        const name = names.get(area.areaId);
+        const info = area.areaInfo.locationInfo;
+        if (!name || !info || info.locationName === name) return area;
+        renamed = true;
+        return {
+          ...area,
+          areaInfo: {
+            ...area.areaInfo,
+            locationInfo: { ...info, locationName: name }
+          }
+        };
+      });
+      if (renamed) {
+        serviceArea.state.supportedAreas = areas;
+        logger229.info(
+          `Renamed service areas: ${areas.map((a) => `${a.areaId}:${a.areaInfo.locationInfo?.locationName}`).join(", ")}`
+        );
+      }
+    } catch {
+    }
+  }
   /**
    * Emit a diagnostic INFO log exactly once per cleaning session for a
    * given short-circuit reason. Prevents log flooding while still
@@ -167125,41 +167513,55 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         return;
       }
       const serviceArea = this.agent.get(ServiceAreaBehavior);
-      const externalSession = s.activeAreas.length === 0;
       const supportedAreaIds = serviceArea.state.supportedAreas.map(
         (a) => a.areaId
       );
-      const isAllowedArea = (id) => externalSession ? supportedAreaIds.includes(id) : s.activeAreas.includes(id);
       const sensorAttrs = roomState.attributes;
       const segmentId = sensorAttrs.segment_id ?? sensorAttrs.room_id;
       const roomName = roomState.state;
-      let matchedAreaId = null;
-      if (segmentId != null && isAllowedArea(segmentId)) {
-        matchedAreaId = segmentId;
-      }
-      if (matchedAreaId === null && segmentId != null) {
-        for (const area of serviceArea.state.supportedAreas) {
-          if (isAllowedArea(area.areaId) && area.areaId % 1e4 === segmentId) {
-            matchedAreaId = area.areaId;
-            break;
+      const findArea = (isAllowedArea) => {
+        if (segmentId != null && isAllowedArea(segmentId)) {
+          return segmentId;
+        }
+        if (segmentId != null) {
+          for (const area of serviceArea.state.supportedAreas) {
+            if (isAllowedArea(area.areaId) && area.areaId % 1e4 === segmentId) {
+              return area.areaId;
+            }
           }
         }
-      }
-      if (matchedAreaId === null && roomName) {
-        const area = serviceArea.state.supportedAreas.find(
-          (a) => a.areaInfo.locationInfo?.locationName?.toLowerCase() === roomName.toLowerCase()
-        );
-        if (area && isAllowedArea(area.areaId)) {
-          matchedAreaId = area.areaId;
+        if (roomName) {
+          const area = serviceArea.state.supportedAreas.find(
+            (a) => a.areaInfo.locationInfo?.locationName?.toLowerCase() === roomName.toLowerCase()
+          );
+          if (area && isAllowedArea(area.areaId)) {
+            return area.areaId;
+          }
         }
-      }
+        return null;
+      };
+      const matchedAreaId = findArea((id) => s.activeAreas.includes(id)) ?? findArea((id) => supportedAreaIds.includes(id));
       if (matchedAreaId === null) {
         logger229.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;
       }
-      if (matchedAreaId === s.lastCurrentArea) return;
+      if (s.activeAreas.length > 0 && !s.activeAreas.includes(matchedAreaId)) {
+        if (serviceArea.state.currentArea !== matchedAreaId) {
+          serviceArea.state.currentArea = matchedAreaId;
+          logger229.info(
+            `currentRoom sensor: passing through area ${matchedAreaId} ("${roomName}")`
+          );
+        }
+        return;
+      }
+      if (matchedAreaId === s.lastCurrentArea) {
+        if (serviceArea.state.currentArea !== matchedAreaId) {
+          this.trySetCurrentArea(matchedAreaId);
+        }
+        return;
+      }
       if (s.lastCurrentArea !== null) {
         s.completedAreas.add(s.lastCurrentArea);
       }
@@ -167343,13 +167745,64 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         const state = serviceArea.state;
         state.progress = s.activeAreas.map((id) => ({
           areaId: id,
-          status: s.completedAreas.has(id) || id === last ? ServiceArea3.OperationalStatus.Completed : ServiceArea3.OperationalStatus.Skipped
+          status: s.completedAreas.has(id) || id === last || id === s.lastCurrentArea ? ServiceArea3.OperationalStatus.Completed : ServiceArea3.OperationalStatus.Skipped
         }));
       }
       serviceArea.state.currentArea = null;
     } catch {
     }
   }
+  /**
+   * A clean started from HA, the vendor app, Alexa on/off or a room switch
+   * is not the last controller job. Keeping that job's rooms made
+   * Apple Home show "cleaning 3 rooms" for a one room clean (#492).
+   */
+  parkSelectedAreas() {
+    const s = getSession(this.endpoint);
+    try {
+      const serviceArea = this.agent.get(ServiceAreaBehavior);
+      const state = serviceArea.state;
+      if (state.selectedAreas.length > 0) {
+        s.parkedAreas = [...state.selectedAreas];
+        state.selectedAreas = [];
+      }
+      if (state.progress?.length) {
+        state.progress = [];
+      }
+    } catch {
+    }
+  }
+  /**
+   * Put the parked selection back once the outside clean is over. Apple
+   * Home does not re-send a selection it thinks is still set (#317).
+   * A newer controller selection wins.
+   */
+  restoreParkedAreas() {
+    const s = getSession(this.endpoint);
+    if (s.parkedAreas.length === 0) return;
+    try {
+      const serviceArea = this.agent.get(ServiceAreaBehavior);
+      if (serviceArea.state.selectedAreas.length === 0) {
+        serviceArea.state.selectedAreas = s.parkedAreas;
+      }
+    } catch {
+    }
+    s.parkedAreas = [];
+  }
+  /**
+   * HA can take 15 s to report cleaning after a start. Apple Home drops its
+   * own "Vacuuming" after about 10 s and shows Cleaning + Docked as "Ready,
+   * Resume Cleaning Later" until then (#496). The next HA update corrects it.
+   */
+  showRunning() {
+    try {
+      const opState = this.agent.get(RvcOperationalStateBehavior);
+      if (idleOperationalStates.has(opState.state.operationalState)) {
+        opState.state.operationalState = RvcOperationalState4.OperationalState.Running;
+      }
+    } catch {
+    }
+  }
   /**
    * Find the ServiceArea area ID that corresponds to a run mode value
    * by matching the mode label to the area location name.
@@ -167377,6 +167830,10 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         statusText: `Unsupported mode: ${newMode}`
       };
     }
+    if (newMode !== 0 /* Idle */) {
+      this.restoreParkedAreas();
+      s.haCleaning = true;
+    }
     if (isRoomMode(newMode)) {
       try {
         const serviceArea = this.agent.get(ServiceAreaBehavior);
@@ -167392,6 +167849,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
           s.cleanedAreaBaseline = this.readCleanedAreaSqm();
           this.trySetCurrentArea(s.activeAreas[0]);
           homeAssistant.callAction(this.state.config.start(void 0, this.agent));
+          this.showRunning();
           this.state.currentMode = newMode;
           return {
             status: ModeBase3.ModeChangeStatus.Success,
@@ -167411,6 +167869,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         homeAssistant.callAction(
           this.state.config.cleanRoom(newMode, this.agent)
         );
+        this.showRunning();
         this.state.currentMode = newMode;
         return {
           status: ModeBase3.ModeChangeStatus.Success,
@@ -167437,10 +167896,12 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         } catch {
         }
         homeAssistant.callAction(this.state.config.start(void 0, this.agent));
+        this.showRunning();
         break;
       }
       case 0 /* Idle */:
         this.finalizeProgressOnStop();
+        this.restoreParkedAreas();
         s.completedAreas.clear();
         s.lastCurrentArea = null;
         s.activeAreas = [];
@@ -167637,6 +168098,12 @@ var ColorControlServerBase = class extends FeaturedBase8 {
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
     this.reactTo(homeAssistant.onChange, this.update, { lock: true });
+    this.reactTo(homeAssistant.events.actionFailed, this.dropOptimistic);
+  }
+  dropOptimistic() {
+    optimisticColorState.delete(
+      this.agent.get(HomeAssistantEntityBehavior).entityId
+    );
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -169356,6 +169823,12 @@ var SpeakerLevelControlServerBase = class extends FeaturedBase9 {
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
     this.reactTo(homeAssistant.onChange, this.update, { lock: true });
+    this.reactTo(homeAssistant.events.actionFailed, this.dropOptimistic);
+  }
+  dropOptimistic() {
+    optimisticLevelState2.delete(
+      this.agent.get(HomeAssistantEntityBehavior).entityId
+    );
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -172402,6 +172875,7 @@ var ServiceAreaServerBase = class extends ServiceAreaWithProgress {
       };
     }
     this.state.selectedAreas = uniqueAreas;
+    getSession(this.endpoint).parkedAreas = [];
     this.state.progress = uniqueAreas.map((areaId) => ({
       areaId,
       status: ServiceArea3.OperationalStatus.Pending
@@ -172461,6 +172935,7 @@ var ServiceAreaServerWithMapsBase = class extends ServiceAreaWithMapsAndProgress
       };
     }
     this.state.selectedAreas = uniqueAreas;
+    getSession(this.endpoint).parkedAreas = [];
     this.state.progress = uniqueAreas.map((areaId) => ({
       areaId,
       status: ServiceArea3.OperationalStatus.Pending
@@ -172676,6 +173151,17 @@ function createCleanAreaServiceAreaServer(cleanAreaRooms) {
     currentArea: null
   });
 }
+function withResolvedRooms(state, effective) {
+  const rooms = effective?.state.attributes?.rooms;
+  const live = state.attributes;
+  if (!rooms || !live || live.rooms || live.segments || live.room_mapping) {
+    return state;
+  }
+  return {
+    ...state,
+    attributes: { ...state.attributes, rooms }
+  };
+}
 function getVacuumServiceAreas(attributes9, mapping) {
   const cleanAreaRooms = mapping?.cleanAreaRooms;
   if (cleanAreaRooms && cleanAreaRooms.length > 0) {
@@ -172885,7 +173371,9 @@ function dispatchRoomClean(attributes9, mapping, entityId, selectedAreas, seam)
       loggedShortCircuits: /* @__PURE__ */ new Set(),
       observedCleaning: false,
       pendingDispatches: [],
-      cleanedAreaBaseline: null
+      cleanedAreaBaseline: null,
+      parkedAreas: [],
+      haCleaning: false
     };
     const action = handleCustomServiceAreas(
       selectedAreas,
@@ -173015,6 +173503,9 @@ var vacuumRvcRunModeConfig = {
   getSupportedModes: (entity, agent) => {
     const attributes9 = entity.attributes;
     const mapping = agent.get(HomeAssistantEntityBehavior).state.mapping;
+    if (mapping?.cleanAreaRooms?.length) {
+      return buildCleanAreaModes(mapping.cleanAreaRooms);
+    }
     const customAreas = mapping?.customServiceAreas;
     return buildSupportedModes2(
       attributes9,
@@ -173023,6 +173514,10 @@ var vacuumRvcRunModeConfig = {
       mapping?.disableCustomAreaRoomModes
     );
   },
+  getAreaNames: (entity, agent) => getVacuumServiceAreas(
+    entity.attributes,
+    agent.get(HomeAssistantEntityBehavior).state.mapping
+  ),
   // biome-ignore lint/suspicious/noConfusingVoidType: Required by ValueSetter<void> interface
   start: (_, agent) => {
     try {
@@ -173205,7 +173700,7 @@ function createVacuumRvcRunModeServer(attributes9, includeUnnamedRooms = false,
     currentMode: 0 /* Idle */
   });
 }
-function createCleanAreaRvcRunModeServer(cleanAreaRooms) {
+function buildCleanAreaModes(cleanAreaRooms) {
   const modes = [
     {
       label: "Idle",
@@ -173230,6 +173725,10 @@ function createCleanAreaRvcRunModeServer(cleanAreaRooms) {
       modeTags: [{ value: RvcRunMode3.ModeTag.Cleaning }]
     });
   }
+  return modes;
+}
+function createCleanAreaRvcRunModeServer(cleanAreaRooms) {
+  const modes = buildCleanAreaModes(cleanAreaRooms);
   logger241.info(
     `Creating CLEAN_AREA RvcRunModeServer with ${cleanAreaRooms.length} HA areas, ${modes.length} total modes`
   );
@@ -175206,6 +175705,8 @@ var matterDeviceTypeFactories = {
     return SwitchDevice(ha);
   },
   dishwasher: DishwasherEndpoint,
+  laundry_washer: LaundryWasherEndpoint,
+  laundry_dryer: LaundryDryerEndpoint,
   dimmable_plugin_unit: (ha) => DimmablePlugInUnitType.set({ homeAssistantEntity: ha }),
   // Expose as On/Off Light (0x0100, an OnOff server) so controllers show a
   // switch instead of a plug. Plain SwitchDevice is 0x010A (a plug), so the
@@ -175269,11 +175770,12 @@ var matterDeviceTypeFactories = {
 };
 
 // src/matter/endpoints/composed/user-composed-endpoint.ts
+init_update_entity_state();
 var logger249 = Logger.get("UserComposedEndpoint");
 function stripBasicInformation(type) {
-  const behaviors = { ...type.behaviors };
-  delete behaviors.bridgedDeviceBasicInformation;
-  return { ...type, behaviors };
+  const behaviors2 = { ...type.behaviors };
+  delete behaviors2.bridgedDeviceBasicInformation;
+  return { ...type, behaviors: behaviors2 };
 }
 function createEndpointId5(entityId, customName) {
   const baseName = customName || entityId;
@@ -175502,11 +176004,11 @@ var UserComposedEndpoint = class _UserComposedEndpoint extends Endpoint {
 init_esm7();
 var BRIDGED_INFO_ID = "bridgedDeviceBasicInformation";
 function asStandaloneEndpointType(type) {
-  const behaviors = type.behaviors;
-  if (!(BRIDGED_INFO_ID in behaviors)) {
+  const behaviors2 = type.behaviors;
+  if (!(BRIDGED_INFO_ID in behaviors2)) {
     return type;
   }
-  const kept = Object.entries(behaviors).filter(([id]) => id !== BRIDGED_INFO_ID).map(([, behavior]) => behavior);
+  const kept = Object.entries(behaviors2).filter(([id]) => id !== BRIDGED_INFO_ID).map(([, behavior]) => behavior);
   return MutableEndpoint({
     name: type.name,
     deviceType: type.deviceType,
@@ -175518,7 +176020,13 @@ function asStandaloneEndpointType(type) {
 }
 
 // src/matter/endpoints/legacy/legacy-endpoint.ts
+init_update_entity_state();
 var logger250 = Logger.get("LegacyEndpoint");
+var applianceTypes = /* @__PURE__ */ new Set([
+  "dishwasher",
+  "laundry_washer",
+  "laundry_dryer"
+]);
 var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
   constructor(type, entityId, customName, mappedEntityIds, throttleMs, endpointId, vacuumEffective) {
     super(type, entityId, customName, mappedEntityIds, endpointId);
@@ -175644,11 +176152,27 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
           logger250.debug(`Auto-assigned fault ${faultEntityId} to ${entityId}`);
         }
       }
+      if (mapping?.matterDeviceType && applianceTypes.has(mapping.matterDeviceType) && !mapping.operationalStateEntity) {
+        const stateEntityId = registry3.findOperationalStateEntityForDevice(
+          entity.device_id
+        );
+        if (stateEntityId && stateEntityId !== entityId) {
+          effectiveMapping = {
+            ...effectiveMapping,
+            entityId: effectiveMapping?.entityId ?? entityId,
+            operationalStateEntity: stateEntityId
+          };
+          logger250.debug(
+            `Auto-assigned operational state ${stateEntityId} to ${entityId}`
+          );
+        }
+      }
       if (!mapping?.powerEntity) {
         const domain = entityId.split(".")[0];
         if (domain === "switch") {
           const powerEntityId = registry3.findPowerEntityForDevice(
-            entity.device_id
+            entity.device_id,
+            entityId
           );
           if (powerEntityId && powerEntityId !== entityId) {
             effectiveMapping = {
@@ -175665,7 +176189,8 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
         const domain = entityId.split(".")[0];
         if (domain === "switch") {
           const energyEntityId = registry3.findEnergyEntityForDevice(
-            entity.device_id
+            entity.device_id,
+            entityId
           );
           if (energyEntityId && energyEntityId !== entityId) {
             effectiveMapping = {
@@ -175958,10 +176483,13 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
     this.flushUpdate(state);
   }
   async flushPendingUpdate(state) {
-    let effectiveState = state;
+    let effectiveState = withResolvedRooms(state, this.vacuumEffective);
     if (this.pendingMappedChange) {
       this.pendingMappedChange = false;
-      effectiveState = { ...state, last_updated: (/* @__PURE__ */ new Date()).toISOString() };
+      effectiveState = {
+        ...effectiveState,
+        last_updated: (/* @__PURE__ */ new Date()).toISOString()
+      };
     }
     await updateEntityState(this, effectiveState);
   }
@@ -175969,6 +176497,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
 
 // src/matter/endpoints/legacy/vacuum/vacuum-area-switch.ts
 init_home_assistant_entity_behavior();
+init_update_entity_state();
 var VacuumAreaSwitchEndpoint = class _VacuumAreaSwitchEndpoint extends EntityEndpoint {
   constructor(type, entityId, endpointId, areaId, vacuumEndpointId, parentEffective) {
     super(type, entityId, void 0, [], endpointId);
@@ -176037,6 +176566,9 @@ var VacuumAreaSwitchEndpoint = class _VacuumAreaSwitchEndpoint extends EntityEnd
   }
 };
 
+// src/services/bridges/bridge-endpoint-manager.ts
+init_update_entity_state();
+
 // src/plugins/builtin/camera/camera-plugin.ts
 init_esm();
 
@@ -178216,10 +178748,1170 @@ var SecurityPlugin = class {
   }
 };
 
+// src/plugins/builtin/vesync/vesync-plugin.ts
+import { createHash as createHash3 } from "node:crypto";
+
+// src/plugins/builtin/vesync/vesync-client.ts
+import { createHash as createHash2, randomUUID } from "node:crypto";
+var APP_VERSION = "5.6.60";
+var CLIENT_VERSION = `VeSync ${APP_VERSION}`;
+var PHONE_BRAND = "pyvesync";
+var PHONE_OS = "Android";
+var APP_ID = "eldodkfj";
+var CLIENT_TYPE = "vesyncApp";
+var LANGUAGE = "en";
+var HEADERS = {
+  "Content-Type": "application/json; charset=UTF-8",
+  "User-Agent": "okhttp/3.12.1"
+};
+var HOSTS = {
+  US: "https://smartapi.vesync.com",
+  EU: "https://smartapi.vesync.eu"
+};
+var US_COUNTRIES = ["US", "CA", "MX", "JP"];
+var TIME_ZONE = Intl.DateTimeFormat().resolvedOptions().timeZone;
+var TIMEOUT_MS = 15e3;
+var PAGE_SIZE = 100;
+var AUTH_PATH = "/globalPlatform/api/accountAuth/v1/authByPWDOrOTM";
+var LOGIN_PATH = "/user/api/accountManage/v1/loginByAuthorizeCode4Vesync";
+var DEVICES_PATH = "/cloud/v1/deviceManaged/devices";
+var V1_PATH = "/cloud/v1/deviceManaged/";
+var V2_PATH = "/cloud/v2/deviceManaged/bypassV2";
+var CROSS_REGION_CODES = [-11260022, -11261022];
+var MFA_CODE = -11257129;
+var OFFLINE_CODES = [11, 4041004];
+var OFFLINE_GROUPS = [-113e5, -11302e3];
+var QUOTA_GROUPS = [-16906e3, -11003e3];
+var CREDENTIAL_GROUPS = [-11201e3, -11202e3, -112e5, -11e6];
+var TOKEN_STATUSES = [401, 419];
+var DESCRIPTIONS = {
+  credentials: "wrong email or password",
+  mfa: "two-factor sign-in is not supported",
+  quota: "daily request quota used up",
+  token: "session token rejected",
+  offline: "device offline",
+  network: "cloud unreachable",
+  api: "request failed"
+};
+var VeSyncError = class extends Error {
+  constructor(kind, message, code) {
+    super(message);
+    this.kind = kind;
+    this.code = code;
+    this.name = "VeSyncError";
+  }
+  kind;
+  code;
+};
+function obj(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : {};
+}
+function str(value) {
+  return typeof value === "string" && value !== "" ? value : void 0;
+}
+function errorFor(raw, op, login) {
+  const code = Number(raw);
+  if (!Number.isFinite(code)) {
+    return new VeSyncError("api", `VeSync ${op}: ${DESCRIPTIONS.api}`);
+  }
+  const group = Math.trunc(code / 1e3) * 1e3;
+  let kind = "api";
+  if (code === MFA_CODE) kind = "mfa";
+  else if (OFFLINE_CODES.includes(code) || OFFLINE_GROUPS.includes(group))
+    kind = "offline";
+  else if (group === -11001e3) kind = "token";
+  else if (QUOTA_GROUPS.includes(group)) kind = "quota";
+  else if (login && CREDENTIAL_GROUPS.includes(group)) kind = "credentials";
+  return new VeSyncError(
+    kind,
+    `VeSync ${op}: ${DESCRIPTIONS[kind]} (code ${code})`,
+    code
+  );
+}
+function networkError(op, reason) {
+  return new VeSyncError(
+    "network",
+    `VeSync ${op}: ${DESCRIPTIONS.network} (${reason})`
+  );
+}
+function toDevice(row) {
+  const prop = obj(row.deviceProp);
+  const cid = str(row.cid) ?? str(row.uuid) ?? str(prop.wifiMac) ?? str(row.macID);
+  const deviceType = str(row.deviceType);
+  if (!cid || !deviceType) return void 0;
+  return {
+    cid,
+    uuid: str(row.uuid),
+    name: str(row.deviceName) ?? deviceType,
+    deviceType,
+    configModule: str(row.configModule) ?? "",
+    subDeviceNo: typeof row.subDeviceNo === "number" ? row.subDeviceNo : void 0,
+    online: (row.connectionStatus ?? prop.connectionStatus) === "online"
+  };
+}
+function generateTerminalId() {
+  return `2${randomUUID().replaceAll("-", "")}`;
+}
+var VeSyncClient = class {
+  #email;
+  #passwordHash;
+  #terminalId;
+  #fetch;
+  #onSession;
+  #session;
+  #region;
+  #countryCode;
+  #pendingLogin;
+  #calls = 0;
+  constructor(options) {
+    this.#email = options.email;
+    this.#passwordHash = createHash2("md5").update(options.password, "utf8").digest("hex");
+    this.#terminalId = options.terminalId;
+    this.#fetch = options.fetch;
+    this.#onSession = options.onSession;
+    this.#session = options.session;
+    this.#region = options.session?.region ?? "US";
+    this.#countryCode = options.session?.countryCode ?? "US";
+  }
+  // concurrent callers share one sign-in
+  login() {
+    if (this.#session) return Promise.resolve(this.#session);
+    this.#pendingLogin ??= this.#signIn().finally(() => {
+      this.#pendingLogin = void 0;
+    });
+    return this.#pendingLogin;
+  }
+  async devices() {
+    const devices = [];
+    for (let pageNo = 1; ; pageNo++) {
+      const result = await this.#request("devices", DEVICES_PATH, (s) => ({
+        token: s.token,
+        accountID: s.accountId,
+        timeZone: TIME_ZONE,
+        method: "devices",
+        pageNo,
+        pageSize: PAGE_SIZE,
+        appVersion: APP_VERSION,
+        phoneBrand: PHONE_BRAND,
+        phoneOS: PHONE_OS,
+        acceptLanguage: LANGUAGE,
+        traceId: this.#traceId()
+      }));
+      const list3 = Array.isArray(result.list) ? result.list : [];
+      for (const row of list3) {
+        const device = toDevice(obj(row));
+        if (device) devices.push(device);
+      }
+      const total = Number(result.total) || 0;
+      if (list3.length === 0 || pageNo * PAGE_SIZE >= total) return devices;
+    }
+  }
+  async bypassV2(device, method, data = {}, options = {}) {
+    const op = `bypassV2 ${method}`;
+    const sub = options.subDevice ? { subDeviceNo: 0, subDeviceType: "" } : {};
+    const outer = await this.#request(op, V2_PATH, (s) => ({
+      ...this.#deviceBody(s, device, "bypassV2"),
+      ...sub,
+      payload: { method, source: "APP", data, ...sub }
+    }));
+    if (outer.code !== 0) throw errorFor(outer.code, op, false);
+    return obj(outer.result);
+  }
+  bypassV1(device, endpoint, extra = {}) {
+    return this.#request(endpoint, V1_PATH + endpoint, (s) => ({
+      ...this.#deviceBody(s, device, endpoint),
+      uuid: device.uuid,
+      ...extra
+    }));
+  }
+  async #signIn() {
+    let region = this.#region;
+    let countryCode = this.#countryCode;
+    for (let attempt = 0; ; attempt++) {
+      const auth = await this.#post(
+        region,
+        AUTH_PATH,
+        "login",
+        this.#authBody(countryCode)
+      );
+      const authorizeCode = str(obj(auth.result).authorizeCode);
+      if (auth.code !== 0 || !authorizeCode) {
+        if (attempt === 0 && CROSS_REGION_CODES.includes(Number(auth.code))) {
+          region = region === "US" ? "EU" : "US";
+          continue;
+        }
+        throw errorFor(auth.code, "login", true);
+      }
+      let res = await this.#post(
+        region,
+        LOGIN_PATH,
+        "login",
+        this.#loginBody(authorizeCode, countryCode)
+      );
+      if (attempt === 0 && CROSS_REGION_CODES.includes(Number(res.code))) {
+        const cross = obj(res.result);
+        countryCode = str(cross.countryCode) ?? countryCode;
+        const bizToken = str(cross.bizToken);
+        if (!bizToken) {
+          region = region === "US" ? "EU" : "US";
+          continue;
+        }
+        region = cross.currentRegion === "US" || cross.currentRegion === "EU" ? cross.currentRegion : US_COUNTRIES.includes(countryCode.toUpperCase()) ? "US" : "EU";
+        res = await this.#post(
+          region,
+          LOGIN_PATH,
+          "login",
+          this.#loginBody(authorizeCode, countryCode, bizToken)
+        );
+      }
+      const result = obj(res.result);
+      const token = str(result.token);
+      if (res.code !== 0 || !token || result.accountID == null) {
+        throw errorFor(res.code, "login", true);
+      }
+      const session = {
+        token,
+        accountId: String(result.accountID),
+        countryCode: str(result.countryCode) ?? countryCode,
+        region
+      };
+      this.#session = session;
+      this.#region = region;
+      this.#countryCode = session.countryCode;
+      this.#onSession?.(session);
+      return session;
+    }
+  }
+  // a rejected token is dropped here and login() runs once more
+  async #request(op, path14, body) {
+    const run = async (session2) => {
+      const res = await this.#post(session2.region, path14, op, body(session2));
+      if (res.code !== 0) throw errorFor(res.code, op, false);
+      return obj(res.result);
+    };
+    const session = await this.login();
+    try {
+      return await run(session);
+    } catch (err) {
+      if (!(err instanceof VeSyncError && err.kind === "token")) throw err;
+    }
+    if (this.#session === session) {
+      this.#session = void 0;
+      this.#onSession?.(void 0);
+    }
+    return run(await this.login());
+  }
+  async #post(region, path14, op, body) {
+    let res;
+    try {
+      res = await (this.#fetch ?? fetch)(HOSTS[region] + path14, {
+        method: "POST",
+        headers: HEADERS,
+        body: JSON.stringify(body),
+        signal: AbortSignal.timeout(TIMEOUT_MS)
+      });
+    } catch (err) {
+      throw networkError(op, err instanceof Error ? err.message : String(err));
+    }
+    if (TOKEN_STATUSES.includes(res.status)) {
+      throw new VeSyncError(
+        "token",
+        `VeSync ${op}: ${DESCRIPTIONS.token} (HTTP ${res.status})`
+      );
+    }
+    if (res.status >= 400) throw networkError(op, `HTTP ${res.status}`);
+    const json = await res.json().catch(() => void 0);
+    if (typeof json !== "object" || json === null) {
+      throw networkError(op, "invalid response");
+    }
+    return json;
+  }
+  #deviceBody(session, device, method) {
+    return {
+      acceptLanguage: LANGUAGE,
+      accountID: session.accountId,
+      appVersion: APP_VERSION,
+      cid: device.cid,
+      configModule: device.configModule,
+      debugMode: false,
+      method,
+      phoneBrand: PHONE_BRAND,
+      phoneOS: PHONE_OS,
+      traceId: this.#traceId(),
+      timeZone: TIME_ZONE,
+      token: session.token,
+      userCountryCode: session.countryCode,
+      deviceId: device.cid,
+      configModel: device.configModule
+    };
+  }
+  #authBody(countryCode) {
+    return {
+      email: this.#email,
+      method: "authByPWDOrOTM",
+      password: this.#passwordHash,
+      acceptLanguage: LANGUAGE,
+      accountID: "",
+      authProtocolType: "generic",
+      clientInfo: PHONE_BRAND,
+      clientType: CLIENT_TYPE,
+      clientVersion: CLIENT_VERSION,
+      debugMode: false,
+      osInfo: PHONE_OS,
+      terminalId: this.#terminalId,
+      timeZone: TIME_ZONE,
+      token: "",
+      userCountryCode: countryCode,
+      appID: APP_ID,
+      sourceAppID: APP_ID,
+      traceId: this.#traceId()
+    };
+  }
+  #loginBody(authorizeCode, countryCode, bizToken) {
+    return {
+      method: "loginByAuthorizeCode4Vesync",
+      authorizeCode,
+      acceptLanguage: LANGUAGE,
+      accountID: "",
+      clientInfo: PHONE_BRAND,
+      clientType: CLIENT_TYPE,
+      clientVersion: CLIENT_VERSION,
+      debugMode: false,
+      emailSubscriptions: false,
+      osInfo: PHONE_OS,
+      terminalId: this.#terminalId,
+      timeZone: TIME_ZONE,
+      token: "",
+      ...bizToken ? { bizToken, regionChange: "lastRegion" } : {},
+      userCountryCode: countryCode,
+      traceId: this.#traceId()
+    };
+  }
+  #traceId() {
+    this.#calls++;
+    const seconds = Math.floor(Date.now() / 1e3);
+    return `APP${this.#terminalId.slice(-5, -1)}${seconds}-${String(this.#calls).padStart(5, "0")}`;
+  }
+};
+
+// src/plugins/builtin/vesync/vesync-devices.ts
+var plugUnit = () => ({
+  key: "",
+  label: "",
+  deviceType: "on_off_plugin_unit"
+});
+var onOff = (on) => [
+  { clusterId: "onOff", attributes: { onOff: on } }
+];
+var switchData = (camel, on) => camel ? { powerSwitch: on ? 1 : 0, switchIdx: 0 } : { enabled: on, id: 0 };
+function onOffWrite(set, canStart = true) {
+  return async (client, device, unitKey, clusterId3, attribute, value) => {
+    if (clusterId3 !== "onOff" || attribute !== "onOff") return true;
+    if (typeof value !== "boolean") return true;
+    if (value && !canStart) return false;
+    await set(client, device, value, unitKey);
+    return true;
+  };
+}
+function plug(id, label, read, set) {
+  return {
+    id,
+    label,
+    units: () => [plugUnit()],
+    initial: () => ({ "": onOff(false) }),
+    read: async (client, device) => ({ "": onOff(await read(client, device)) }),
+    write: onOffWrite(set)
+  };
+}
+var setSwitchEnabled = (client, device, on) => client.bypassV2(device, "setSwitch", switchData(false, on));
+var whogPlug = plug(
+  "outlet-v2",
+  "Smart plug",
+  async (client, device) => Boolean((await client.bypassV2(device, "getOutletStatus")).enabled),
+  setSwitchEnabled
+);
+var esw10Plug = plug(
+  "outlet-v2",
+  "Smart plug",
+  async (client, device) => Boolean((await client.bypassV2(device, "getSwitch", { id: 0 })).enabled),
+  setSwitchEnabled
+);
+var BSDOG_PROPERTIES = [
+  "powerSwitch_1",
+  "realTimeVoltage",
+  "realTimePower",
+  "electricalEnergy",
+  "protectionStatus",
+  "voltageUpperThreshold",
+  "currentUpperThreshold",
+  "scheduleNum"
+];
+var propertyPlug = plug(
+  "outlet-prop",
+  "Smart plug",
+  async (client, device) => {
+    const r = await client.bypassV2(device, "getProperty", {
+      properties: BSDOG_PROPERTIES
+    });
+    return Boolean(r.powerSwitch_1);
+  },
+  (client, device, on) => client.bypassV2(
+    device,
+    "setProperty",
+    { powerSwitch_1: on ? 1 : 0 },
+    { subDevice: true }
+  )
+);
+var readV1 = async (client, device) => {
+  const r = await client.bypassV1(device, "deviceDetail");
+  if (r.connectionStatus !== void 0 && r.connectionStatus !== "online") {
+    throw new VeSyncError("offline", "VeSync deviceDetail: device offline");
+  }
+  return r.deviceStatus === "on";
+};
+var v1Outlet = plug(
+  "outlet-v1",
+  "Smart plug",
+  readV1,
+  (client, device, on) => client.bypassV1(device, "deviceStatus", { status: on ? "on" : "off" })
+);
+var wallSwitch = plug(
+  "outlet-v1",
+  "Wall switch",
+  readV1,
+  (client, device, on) => client.bypassV1(device, "deviceStatus", {
+    status: on ? "on" : "off",
+    switchNo: 0
+  })
+);
+var cooking = (status3) => typeof status3 === "string" && !["standby", "cookend"].includes(status3.toLowerCase());
+var dualStatus = /* @__PURE__ */ new Map();
+var fryerDual = {
+  id: "fryer-dual",
+  label: "Air fryer (two baskets)",
+  units: () => [
+    { key: "left", label: "Left", deviceType: "on_off_plugin_unit" },
+    { key: "right", label: "Right", deviceType: "on_off_plugin_unit" }
+  ],
+  initial: () => ({ left: onOff(false), right: onOff(false) }),
+  async read(client, device) {
+    const r = await client.bypassV2(
+      device,
+      "getAirfryerMultiStatus",
+      {},
+      { subDevice: true }
+    );
+    dualStatus.set(device.cid, r);
+    const list3 = Array.isArray(r.statusList) ? r.statusList : [];
+    const on = (chamber) => list3.some(
+      (item) => (item.chamber === chamber || item.chamber === 3) && cooking(item.cookStatus)
+    );
+    return { left: onOff(on(1)), right: onOff(on(2)) };
+  },
+  write: onOffWrite((client, device, _on, unitKey) => {
+    const last = dualStatus.get(device.cid);
+    let chamber = unitKey === "right" ? 2 : 1;
+    if (last?.workChamber === 3) chamber = 3;
+    if (last?.syncType === 2) chamber = 4;
+    return client.bypassV2(device, "endCook", { chamber }, { subDevice: true });
+  }, false)
+};
+var fryerSingle = {
+  id: "fryer-single",
+  label: "Air fryer",
+  units: () => [plugUnit()],
+  initial: () => ({ "": onOff(false) }),
+  async read(client, device) {
+    const r = await client.bypassV2(
+      device,
+      "getAirfryerStatus",
+      {},
+      { subDevice: true }
+    );
+    return { "": onOff(cooking(r.cookStatus)) };
+  },
+  write: onOffWrite(
+    (client, device) => client.bypassV2(device, "endCook", {}, { subDevice: true }),
+    false
+  )
+};
+function fanState(on, level, levels) {
+  const percent3 = on ? Math.floor(level * 100 / levels) : 0;
+  const fanMode = on ? Math.max(1, Math.ceil(level * 3 / levels)) : 0;
+  return [
+    {
+      clusterId: "fanControl",
+      attributes: { fanMode, percentSetting: percent3, percentCurrent: percent3 }
+    }
+  ];
+}
+function fanFamily(id, deviceType, status3, camel, levels) {
+  const powered = /* @__PURE__ */ new Map();
+  return {
+    id,
+    label: deviceType === "fan" ? "Fan" : "Air purifier",
+    units: () => [{ key: "", label: "", deviceType }],
+    initial: () => ({ "": fanState(false, 0, levels) }),
+    async read(client, device) {
+      const r = await client.bypassV2(device, status3);
+      const on = Boolean(camel ? r.powerSwitch : r.enabled);
+      powered.set(device.cid, on);
+      const speed = (value) => {
+        const n = Number(value) || 0;
+        return n === 255 ? 0 : Math.min(n, levels);
+      };
+      const level = speed(camel ? r.fanSpeedLevel : r.level) || speed(r.manualSpeedLevel) || 1;
+      return { "": fanState(on, level, levels) };
+    },
+    async write(client, device, _unitKey, clusterId3, attribute, value) {
+      if (clusterId3 !== "fanControl" || typeof value !== "number") return true;
+      const turn = async (on) => {
+        await client.bypassV2(device, "setSwitch", switchData(camel, on));
+        powered.set(device.cid, on);
+      };
+      const ensureOn = async () => {
+        if (powered.get(device.cid) !== true) await turn(true);
+      };
+      const setLevel = async (level) => {
+        await ensureOn();
+        await client.bypassV2(
+          device,
+          "setLevel",
+          camel ? { levelIdx: 0, manualSpeedLevel: level, levelType: "wind" } : { id: 0, level, type: "wind" }
+        );
+      };
+      if (attribute === "percentSetting") {
+        if (value <= 0) await turn(false);
+        else await setLevel(Math.ceil(value * levels / 100));
+      } else if (attribute === "fanMode") {
+        if (value === 0) await turn(false);
+        else if (value === 1 || value === 2 || value === 3)
+          await setLevel(Math.floor(value * levels / 3));
+        else if (value === 4) await ensureOn();
+      }
+      return true;
+    }
+  };
+}
+function humidifier(camel) {
+  const state = (on, humidity) => ({
+    "": onOff(on),
+    humidity: [
+      {
+        clusterId: "relativeHumidityMeasurement",
+        attributes: {
+          // relativeHumidityMeasurement is hundredths of a percent
+          measuredValue: typeof humidity === "number" && humidity >= 0 && humidity <= 100 ? Math.round(humidity * 100) : null
+        }
+      }
+    ]
+  });
+  return {
+    id: "humidifier",
+    label: "Humidifier",
+    units: () => [
+      plugUnit(),
+      { key: "humidity", label: "Humidity", deviceType: "humidity_sensor" }
+    ],
+    initial: () => state(false, null),
+    async read(client, device) {
+      const r = await client.bypassV2(device, "getHumidifierStatus");
+      return state(Boolean(camel ? r.powerSwitch : r.enabled), r.humidity);
+    },
+    write: onOffWrite(
+      (client, device, on) => client.bypassV2(device, "setSwitch", switchData(camel, on))
+    )
+  };
+}
+var PURIFIER = "getPurifierStatus";
+var core3 = fanFamily("purifier-core", "air_purifier", PURIFIER, false, 3);
+var core4 = fanFamily("purifier-core", "air_purifier", PURIFIER, false, 4);
+var snakeHumidifier = humidifier(false);
+var camelHumidifier = humidifier(true);
+var MODELS = [
+  [["ESW10-USA", "ESW10-EU"], esw10Plug],
+  [["ESW01-EU", "ESW01-USA", "ESW03-USA", "ESW03-EU", "ESW15-USA"], v1Outlet],
+  [["WHOGPLUG"], whogPlug],
+  [
+    [
+      "BSDOG01",
+      "BSDOG02",
+      "WYSMTOD16A",
+      "WM-PLUG",
+      "JXUK13APLUG",
+      "WYZYOGMINIPLUG",
+      "HWPLUG16A",
+      "FY-PLUG",
+      "HWPLUG16",
+      "WYLDR16A1081"
+    ],
+    propertyPlug
+  ],
+  [["ESWL01", "ESWL03"], wallSwitch],
+  [
+    ["LTF-F422S-KEU", "LTF-F422S-WUSR", "LTF-F422S-WJP", "LTF-F422S-WUS"],
+    fanFamily("fan", "fan", "getTowerFanStatus", true, 12)
+  ],
+  [
+    ["LPF-R432S-AEU", "LPF-R432S-AUS"],
+    fanFamily("fan", "fan", "getFanStatus", true, 12)
+  ],
+  [
+    ["Core200S", "LAP-C201S-AUSR", "LAP-C202S-WUSR"],
+    fanFamily("purifier-core", "air_purifier", PURIFIER, false, 3)
+  ],
+  [
+    [
+      "Core300S",
+      "LAP-C301S-WJP",
+      "LAP-C302S-WUSB",
+      "LAP-C301S-WAAA",
+      "LAP-C302S-WGC"
+    ],
+    core3
+  ],
+  [["Core400S", "LAP-C401S-WJP", "LAP-C401S-WUSR", "LAP-C401S-WAAA"], core4],
+  [["Core600S", "LAP-C601S-WUS", "LAP-C601S-WUSR", "LAP-C601S-WEU"], core4],
+  [["LV-RH131S-WM", "LV-RH131S"], core3],
+  [
+    [
+      "LAP-V102S-AASR",
+      "LAP-V102S-WUS",
+      "LAP-V102S-WEU",
+      "LAP-V102S-AUSR",
+      "LAP-V102S-WJP",
+      "LAP-V102S-AJPR",
+      "LAP-V102S-AEUR",
+      "LAP-V201S-AASR",
+      "LAP-V201S-WJP",
+      "LAP-V201S-WEU",
+      "LAP-V201S-WUS",
+      "LAP-V201-AUSR",
+      "LAP-V201S-AUSR",
+      "LAP-V201S-AEUR"
+    ],
+    fanFamily("purifier-v2", "air_purifier", PURIFIER, true, 4)
+  ],
+  [
+    [
+      "LAP-EL551S-AUS",
+      "LAP-EL551S-AEUR",
+      "LAP-EL551S-WEU",
+      "LAP-EL551S-WUS",
+      "LAP-B851S-WEU",
+      "LAP-B851S-WNA",
+      "LAP-B851S-AEUR",
+      "LAP-B851S-AUS",
+      "LAP-B851S-WUS",
+      "LAP-BAY-MAX01S"
+    ],
+    fanFamily("purifier-v2", "air_purifier", PURIFIER, true, 3)
+  ],
+  [
+    [
+      "Classic300S",
+      "LUH-A601S-WUSB",
+      "LUH-A601S-AUSW",
+      "Classic200S",
+      "Dual200S",
+      "LUH-D301S-WUSR",
+      "LUH-D301S-WJP",
+      "LUH-D301S-WEU",
+      "LUH-D301S-KEUR",
+      "LUH-A602S-WUSR",
+      "LUH-A602S-WUS",
+      "LUH-A602S-WEUR",
+      "LUH-A602S-WEU",
+      "LUH-A602S-WJP",
+      "LUH-A602S-WUSC"
+    ],
+    snakeHumidifier
+  ],
+  [["LUH-A603S-WUS"], camelHumidifier],
+  [
+    [
+      "LUH-O451S-WEU",
+      "LUH-O451S-WUS",
+      "LUH-O451S-WUSR",
+      "LUH-O601S-WUS",
+      "LUH-O601S-KUS"
+    ],
+    snakeHumidifier
+  ],
+  [
+    [
+      "LUH-M101S-WUS",
+      "LUH-M101S-WUSR",
+      "LUH-M101S-WEUR",
+      "LEH-S601S-WUS",
+      "LEH-S601S-WUSR",
+      "LEH-S601S-WEUR",
+      "LEH-S602S-WUS",
+      "LEH-B381S-WUS",
+      "LEH-B381S-WEU"
+    ],
+    camelHumidifier
+  ]
+];
+var FRYERS = [
+  ["CAF-TF10", fryerDual],
+  ["CAF-P583S", fryerSingle],
+  ["CAF-DC601S", fryerSingle]
+];
+function familyFor(deviceType) {
+  const upper = deviceType.toUpperCase();
+  const fryer = FRYERS.find(([prefix]) => upper.startsWith(prefix));
+  if (fryer) return fryer[1];
+  const exact = MODELS.find(([types]) => types.includes(deviceType));
+  if (exact) return exact[1];
+  const parts = deviceType.split("-");
+  if (parts.length < 3) return void 0;
+  const base = parts.slice(0, -1).join("-").toLowerCase();
+  return MODELS.find(
+    ([types]) => types.some((t) => t.toLowerCase().includes(base))
+  )?.[1];
+}
+
+// src/plugins/builtin/vesync/vesync-plugin.ts
+var CONFIG_KEY3 = "config";
+var SESSION_KEY = "session";
+var TERMINAL_KEY = "terminalId";
+var DEVICES_KEY = "devices";
+var ACCOUNT_KEY = "account";
+var REACHABLE = "bridgedDeviceBasicInformation";
+var LIST_REFRESH_MS = 15 * 6e4;
+var RETRY_BASE_MS2 = 1e4;
+var RETRY_MAX_MS2 = 3e5;
+var QUOTA_RETRY_MS = 36e5;
+var EARLY_POLL_MS = 2e3;
+var ACCOUNT_ERRORS = ["credentials", "mfa", "quota", "token"];
+var accountLoad = /* @__PURE__ */ new Map();
+var deviceKey = (device) => (device.subDeviceNo === void 0 ? device.cid : `${device.cid}_${device.subDeviceNo}`).replace(/[^A-Za-z0-9_-]/g, "_");
+var same = (a, b) => a === b || JSON.stringify(a) === JSON.stringify(b);
+var errorText = (e) => e instanceof Error ? e.message : String(e);
+var VeSyncPlugin = class {
+  constructor(deps = {}) {
+    this.deps = deps;
+  }
+  deps;
+  name = "vesync";
+  version = "0.1.0";
+  context;
+  config = {};
+  terminalId = "";
+  client;
+  devices = [];
+  mounted = /* @__PURE__ */ new Map();
+  failures = /* @__PURE__ */ new Map();
+  status = "not configured";
+  // Bumped on start, config save and shutdown; work from an older
+  // generation is dropped after every await.
+  generation = 0;
+  timer;
+  earlyPolls = /* @__PURE__ */ new Map();
+  busy = false;
+  again = false;
+  stopped = false;
+  backoffMs = RETRY_BASE_MS2;
+  listAt;
+  queue = Promise.resolve();
+  async onStart(context) {
+    this.context = context;
+    this.generation++;
+    this.mounted = /* @__PURE__ */ new Map();
+    this.config = await context.storage.get(CONFIG_KEY3) ?? {};
+    await this.forgetOtherAccount(context);
+    const session = await context.storage.get(SESSION_KEY);
+    let terminalId = await context.storage.get(TERMINAL_KEY);
+    if (!terminalId) {
+      terminalId = generateTerminalId();
+      await context.storage.set(TERMINAL_KEY, terminalId);
+    }
+    this.terminalId = terminalId;
+    this.devices = await context.storage.get(DEVICES_KEY) ?? [];
+    this.stopped = false;
+    this.backoffMs = RETRY_BASE_MS2;
+    this.listAt = void 0;
+    if (!this.configured()) {
+      this.status = "not configured";
+      context.log.info("no VeSync account configured, no devices exposed");
+      return;
+    }
+    this.status = "signing in";
+    this.client = this.newClient(session);
+    await this.reconcile();
+    this.schedule(0);
+  }
+  async onConfigChanged(config8) {
+    this.config = config8;
+    const context = this.context;
+    if (!context) return;
+    await context.storage.set(CONFIG_KEY3, config8);
+    this.generation++;
+    this.clearTimers();
+    this.leaveAccountLoad();
+    this.stopped = false;
+    this.backoffMs = RETRY_BASE_MS2;
+    this.listAt = void 0;
+    if (await this.forgetOtherAccount(context)) this.client = void 0;
+    if (this.configured()) {
+      this.client ??= this.newClient();
+      this.status = "signing in";
+    } else {
+      this.client = void 0;
+      this.status = "not configured";
+    }
+    await this.reconcile();
+    if (this.client) this.schedule(0);
+  }
+  async onShutdown() {
+    this.generation++;
+    this.clearTimers();
+    this.leaveAccountLoad();
+    this.again = false;
+    this.client = void 0;
+    await this.reconcile();
+  }
+  getCurrentConfig() {
+    return { ...this.config };
+  }
+  getConfigSchema() {
+    const properties = {
+      email: {
+        type: "string",
+        title: "Email",
+        description: "The account you use in the VeSync app."
+      },
+      password: { type: "string", title: "Password", secret: true },
+      pollInterval: {
+        type: "number",
+        title: "Poll interval (seconds)",
+        description: "30 to 3600. Raised on its own when many devices would use up the daily VeSync request quota, which every bridge and app on the account shares.",
+        default: 60
+      }
+    };
+    const unsupported = [];
+    for (const device of this.devices) {
+      const family = familyFor(device.deviceType);
+      if (!family) {
+        unsupported.push(`${device.name} (${device.deviceType})`);
+        continue;
+      }
+      properties[`expose_${deviceKey(device)}`] = {
+        type: "boolean",
+        title: device.name,
+        description: `${family.label}, ${device.deviceType}`,
+        default: false
+      };
+    }
+    let description = `Status: ${this.status}.`;
+    if (unsupported.length > 0) {
+      description += ` Not supported yet: ${unsupported.join(", ")}.`;
+    }
+    return { title: "VeSync", description, properties };
+  }
+  configured() {
+    const { email, password } = this.config;
+    return typeof email === "string" && email.trim() !== "" && typeof password === "string" && password !== "";
+  }
+  // leftover session and list from another account would be reused
+  async forgetOtherAccount(context) {
+    const { email, password } = this.config;
+    const account = createHash3("sha256").update(`${String(email ?? "").trim()}\0${String(password ?? "")}`).digest("hex");
+    if (await context.storage.get(ACCOUNT_KEY) === account) {
+      return false;
+    }
+    this.devices = [];
+    await context.storage.delete(SESSION_KEY);
+    await context.storage.set(DEVICES_KEY, []);
+    await context.storage.set(ACCOUNT_KEY, account);
+    return true;
+  }
+  leaveAccountLoad() {
+    for (const [account, load2] of accountLoad) {
+      load2.delete(this);
+      if (load2.size === 0) accountLoad.delete(account);
+    }
+  }
+  newClient(session) {
+    const client = new VeSyncClient({
+      email: String(this.config.email).trim(),
+      password: String(this.config.password),
+      terminalId: this.terminalId,
+      session,
+      fetch: this.deps.fetch,
+      onSession: (next) => {
+        if (this.client !== client) return;
+        const storage2 = this.context?.storage;
+        (next ? storage2?.set(SESSION_KEY, next) : storage2?.delete(SESSION_KEY))?.catch(() => this.warn("could not store the VeSync session"));
+      }
+    });
+    return client;
+  }
+  pollSeconds() {
+    const seconds = Number(this.config.pollInterval);
+    return Number.isFinite(seconds) ? Math.min(3600, Math.max(30, seconds)) : 60;
+  }
+  warn(message) {
+    this.context?.log.warn(message);
+  }
+  // Registrations run one at a time, a shutdown queues behind a running one.
+  reconcile() {
+    const run = this.queue.then(() => this.applyExposed());
+    this.queue = run.catch(() => {
+    });
+    return run;
+  }
+  async applyExposed() {
+    const context = this.context;
+    if (!context) return;
+    const wanted = /* @__PURE__ */ new Map();
+    for (const device of this.client ? this.devices : []) {
+      const family = familyFor(device.deviceType);
+      const key = deviceKey(device);
+      if (!family || this.config[`expose_${key}`] !== true) continue;
+      for (const unit of family.units(device)) {
+        const id = unit.key ? `vesync_${key}_${unit.key}` : `vesync_${key}`;
+        wanted.set(id, { id, key, device, family, unit });
+      }
+    }
+    for (const id of [...this.mounted.keys()]) {
+      if (wanted.has(id)) continue;
+      this.mounted.delete(id);
+      await context.unregisterDevice(id).catch(() => {
+      });
+    }
+    for (const [id, want] of wanted) {
+      const have = this.mounted.get(id);
+      if (have) {
+        have.device = want.device;
+        continue;
+      }
+      const clusters = want.family.initial(want.device)[want.unit.key] ?? [];
+      const initial = clusters.map((c) => [
+        c.clusterId,
+        { ...c.attributes }
+      ]);
+      const mounted = {
+        ...want,
+        pushed: new Map([[REACHABLE, { reachable: true }], ...initial]),
+        real: new Map(initial),
+        writes: 0
+      };
+      this.mounted.set(id, mounted);
+      await context.registerDevice({
+        id,
+        name: want.unit.label ? `${want.device.name} ${want.unit.label}` : want.device.name,
+        deviceType: want.unit.deviceType,
+        // fanModeSequence is mandatory without a default, the endpoint does
+        // not mount without it
+        clusters: clusters.map(
+          (c) => c.clusterId === "fanControl" ? { ...c, attributes: { fanModeSequence: 0, ...c.attributes } } : c
+        ),
+        onAttributeWrite: (clusterId3, attribute, value) => this.onWrite(id, clusterId3, attribute, value)
+      });
+    }
+    for (const mounted of this.mounted.values()) {
+      this.push(mounted, REACHABLE, { reachable: mounted.device.online });
+    }
+  }
+  push(mounted, clusterId3, attributes9) {
+    const last = mounted.pushed.get(clusterId3);
+    if (last && Object.entries(attributes9).every(([k, v]) => same(last[k], v)))
+      return;
+    mounted.pushed.set(clusterId3, { ...last, ...attributes9 });
+    this.context?.updateDeviceState(mounted.id, clusterId3, attributes9);
+  }
+  // Runs after matter.js committed the change, so a refused or failed write
+  // can only be undone by pushing the real state back.
+  async onWrite(id, clusterId3, attribute, value) {
+    const mounted = this.mounted.get(id);
+    const last = mounted?.pushed.get(clusterId3);
+    if (!mounted || !last || !(attribute in last)) return;
+    if (same(last[attribute], value)) return;
+    mounted.pushed.set(clusterId3, { ...last, [attribute]: value });
+    mounted.writes++;
+    const client = this.client;
+    let ok2 = false;
+    if (client && !this.stopped) {
+      try {
+        ok2 = await mounted.family.write(
+          client,
+          mounted.device,
+          mounted.unit.key,
+          clusterId3,
+          attribute,
+          value
+        );
+      } catch (e) {
+        this.warn(`${mounted.device.name}: write failed: ${errorText(e)}`);
+      }
+    }
+    if (this.mounted.get(id) !== mounted) return;
+    if (this.client && !this.stopped) this.pollSoon(mounted.key);
+    const real = mounted.real.get(clusterId3);
+    if (ok2) {
+      mounted.real.set(clusterId3, { ...real, [attribute]: value });
+      return;
+    }
+    const now = mounted.pushed.get(clusterId3);
+    if (!now || !same(now[attribute], value)) return;
+    if (real) this.push(mounted, clusterId3, real);
+  }
+  pollSoon(key) {
+    clearTimeout(this.earlyPolls.get(key));
+    const generation = this.generation;
+    const timer = setTimeout(() => {
+      this.earlyPolls.delete(key);
+      this.poll(key, generation).catch(
+        (e) => this.warn(`status read failed: ${errorText(e)}`)
+      );
+    }, EARLY_POLL_MS);
+    timer.unref?.();
+    this.earlyPolls.set(key, timer);
+  }
+  schedule(delayMs) {
+    clearTimeout(this.timer);
+    this.timer = setTimeout(() => {
+      this.timer = void 0;
+      void this.cycle();
+    }, delayMs);
+    this.timer.unref?.();
+  }
+  clearTimers() {
+    clearTimeout(this.timer);
+    this.timer = void 0;
+    for (const timer of this.earlyPolls.values()) clearTimeout(timer);
+    this.earlyPolls.clear();
+  }
+  // Single flight: a kick during a running cycle runs once it is done.
+  async cycle() {
+    if (this.busy) {
+      this.again = true;
+      return;
+    }
+    this.busy = true;
+    this.again = false;
+    const generation = this.generation;
+    let next;
+    try {
+      next = await this.step(generation);
+    } catch (e) {
+      if (generation === this.generation) next = this.failed(e);
+    } finally {
+      this.busy = false;
+    }
+    if (this.again) this.schedule(0);
+    else if (next !== void 0 && generation === this.generation)
+      this.schedule(next);
+  }
+  async step(generation) {
+    const client = this.client;
+    const context = this.context;
+    if (!client || !context) return void 0;
+    await client.login();
+    if (generation !== this.generation) return void 0;
+    const now = Date.now();
+    if (this.listAt === void 0 || now - this.listAt >= LIST_REFRESH_MS) {
+      const devices = await client.devices();
+      if (generation !== this.generation) return void 0;
+      this.devices = devices;
+      this.listAt = now;
+      await context.storage.set(DEVICES_KEY, devices);
+      await this.reconcile();
+      if (generation !== this.generation) return void 0;
+    }
+    const n = this.devices.length;
+    this.status = `signed in, ${n} device${n === 1 ? "" : "s"} found`;
+    const keys3 = [...new Set([...this.mounted.values()].map((m) => m.key))];
+    let lost;
+    let reached = keys3.length === 0;
+    for (const key of keys3) {
+      const error = await this.poll(key, generation);
+      if (generation !== this.generation) return void 0;
+      if (error) lost ??= error;
+      else reached = true;
+    }
+    if (!reached) throw lost;
+    this.backoffMs = RETRY_BASE_MS2;
+    const account = String(this.config.email).trim().toLowerCase();
+    const load2 = accountLoad.get(account) ?? /* @__PURE__ */ new Map();
+    load2.set(this, keys3);
+    accountLoad.set(account, load2);
+    const polled = [...load2.values()];
+    const total = polled.reduce((sum, k) => sum + k.length, 0);
+    const owned = new Set(polled.flat()).size;
+    const floor2 = Math.ceil(86400 * total / (0.8 * (3200 + 1500 * owned)));
+    return Math.max(this.pollSeconds(), floor2) * 1e3;
+  }
+  failed(e) {
+    this.warn(errorText(e));
+    const kind = e instanceof VeSyncError ? e.kind : void 0;
+    if (kind === "credentials" || kind === "mfa") {
+      this.stopped = true;
+      for (const m of this.mounted.values()) {
+        this.push(m, REACHABLE, { reachable: false });
+      }
+      this.status = kind === "mfa" ? "this account uses two-factor sign-in, which is not supported" : "sign-in failed: wrong email or password";
+      return void 0;
+    }
+    if (kind === "quota") {
+      this.status = "daily request quota used up, retrying later";
+      return QUOTA_RETRY_MS;
+    }
+    this.status = "cloud unreachable, retrying";
+    const delay = this.backoffMs;
+    this.backoffMs = Math.min(delay * 2, RETRY_MAX_MS2);
+    return delay;
+  }
+  // network comes back so the cycle can fail when every device is unreachable
+  async poll(key, generation) {
+    const units = [...this.mounted.values()].filter((m) => m.key === key);
+    const client = this.client;
+    if (generation !== this.generation || this.stopped) return;
+    if (units.length === 0 || !client) return;
+    const { device, family } = units[0];
+    const writes = units.map((m) => m.writes);
+    let state;
+    try {
+      state = await family.read(client, device);
+    } catch (e) {
+      if (generation !== this.generation) return;
+      const kind = e instanceof VeSyncError ? e.kind : void 0;
+      if (kind && ACCOUNT_ERRORS.includes(kind)) throw e;
+      if (kind === "offline") {
+        for (const m of units) this.push(m, REACHABLE, { reachable: false });
+        return;
+      }
+      const message = errorText(e);
+      if (this.failures.get(key) !== message) {
+        this.warn(`${device.name}: status read failed: ${message}`);
+      }
+      this.failures.set(key, message);
+      return kind === "network" ? e : void 0;
+    }
+    if (generation !== this.generation) return;
+    this.failures.delete(key);
+    for (const [i, m] of units.entries()) {
+      if (this.mounted.get(m.id) !== m) continue;
+      const fresh = m.writes === writes[i];
+      for (const c of fresh ? state[m.unit.key] ?? [] : []) {
+        m.real.set(c.clusterId, {
+          ...m.real.get(c.clusterId),
+          ...c.attributes
+        });
+        this.push(m, c.clusterId, c.attributes);
+      }
+      this.push(m, REACHABLE, { reachable: true });
+    }
+  }
+};
+
 // src/plugins/builtin/index.ts
 var BUILTIN_PLUGINS = [
   CameraPlugin,
-  SecurityPlugin
+  SecurityPlugin,
+  VeSyncPlugin
 ];
 
 // src/services/bridges/bridge-endpoint-manager.ts
@@ -178350,6 +180042,30 @@ init_esm();
 init_send_ha_message();
 import { callService as callService2 } from "home-assistant-js-websocket";
 import { keys as keys2, pickBy, values as values3 } from "lodash-es";
+
+// src/utils/trailing-index.ts
+function trailingIndex(value) {
+  const match = /(\d+)$/.exec(value);
+  return match ? Number.parseInt(match[1], 10) : void 0;
+}
+function isDigit(char) {
+  return char != null && char >= "0" && char <= "9";
+}
+function withoutDomain(entityId) {
+  return entityId.slice(entityId.indexOf(".") + 1);
+}
+function pairingIndex(entityId, otherId) {
+  const a = withoutDomain(entityId);
+  const b = withoutDomain(otherId);
+  let i = 0;
+  while (i < a.length && i < b.length && a[i] === b[i]) i++;
+  if (isDigit(a[i]) && isDigit(b[i])) {
+    while (i > 0 && isDigit(a[i - 1])) i--;
+  }
+  return trailingIndex(a.slice(i));
+}
+
+// src/services/bridges/bridge-registry.ts
 function fingerprintBattery(fingerprint) {
   try {
     const parsed = JSON.parse(fingerprint);
@@ -178432,9 +180148,7 @@ var BridgeRegistry = class _BridgeRegistry {
    */
   batteryFingerprintFor(entityId, mapping) {
     if (mapping?.batteryEntity || mapping?.disableBatteryMapping) return "";
-    if (entityId.startsWith("sensor.") || entityId.startsWith("binary_sensor.")) {
-      return "";
-    }
+    if (entityId.startsWith("binary_sensor.")) return "";
     if (!this.isAutoBatteryMappingEnabled() && !entityId.startsWith("vacuum.")) {
       return "";
     }
@@ -178506,6 +180220,20 @@ var BridgeRegistry = class _BridgeRegistry {
   isBatteryEntityUsed(entityId) {
     return this._usedBatteryEntities.has(entityId);
   }
+  // An enum with a running and a paused state: run (Home Connect, SmartThings),
+  // in_use (Miele), running (LG) (#486).
+  findOperationalStateEntityForDevice(deviceId) {
+    for (const entity of values3(this.registry.entities)) {
+      if (entity.device_id !== deviceId) continue;
+      if (!entity.entity_id.startsWith("sensor.")) continue;
+      const attrs = this.registry.states[entity.entity_id]?.attributes;
+      const options = Array.isArray(attrs?.options) ? attrs.options : [];
+      if (attrs?.device_class === "enum" && ["run", "running", "in_use"].some((o) => options.includes(o)) && ["pause", "paused"].some((o) => options.includes(o))) {
+        return entity.entity_id;
+      }
+    }
+    return void 0;
+  }
   /**
    * Find a problem/safety binary sensor on the same HA device, so a smoke/CO
    * alarm can drive hardwareFaultAlert from it. Prefers device_class=problem
@@ -178953,38 +180681,51 @@ var BridgeRegistry = class _BridgeRegistry {
     return this._usedPressureEntities.has(entityId);
   }
   /**
-   * Find a power sensor entity (device_class: power) on the same HA device.
+   * Sensor with this device_class on the same HA device.
+   * Pair by index (`switch_2` -> `power_2`) when a strip has one
+   * sensor per outlet. Otherwise the first match (#488).
    */
-  findPowerEntityForDevice(deviceId) {
-    const entities = values3(this.registry.entities);
-    for (const entity of entities) {
+  findSensorEntityForDevice(deviceId, deviceClass, forEntityId) {
+    const candidates = [];
+    for (const entity of values3(this.registry.entities)) {
       if (entity.device_id !== deviceId) continue;
       if (!entity.entity_id.startsWith("sensor.")) continue;
       const state = this.registry.states[entity.entity_id];
       if (!state) continue;
       const attrs = state.attributes;
-      if (attrs.device_class === SensorDeviceClass.power) {
-        return entity.entity_id;
+      if (attrs.device_class === deviceClass) {
+        candidates.push(entity.entity_id);
       }
     }
-    return void 0;
+    if (candidates.length <= 1) return candidates[0];
+    if (forEntityId != null) {
+      const matched = candidates.filter((id) => {
+        const wanted = pairingIndex(forEntityId, id);
+        return wanted != null && pairingIndex(id, forEntityId) === wanted;
+      });
+      if (matched.length === 1) return matched[0];
+    }
+    return candidates[0];
+  }
+  /**
+   * Find a power sensor entity (device_class: power) on the same HA device.
+   */
+  findPowerEntityForDevice(deviceId, forEntityId) {
+    return this.findSensorEntityForDevice(
+      deviceId,
+      SensorDeviceClass.power,
+      forEntityId
+    );
   }
   /**
    * Find an energy sensor entity (device_class: energy) on the same HA device.
    */
-  findEnergyEntityForDevice(deviceId) {
-    const entities = values3(this.registry.entities);
-    for (const entity of entities) {
-      if (entity.device_id !== deviceId) continue;
-      if (!entity.entity_id.startsWith("sensor.")) continue;
-      const state = this.registry.states[entity.entity_id];
-      if (!state) continue;
-      const attrs = state.attributes;
-      if (attrs.device_class === SensorDeviceClass.energy) {
-        return entity.entity_id;
-      }
-    }
-    return void 0;
+  findEnergyEntityForDevice(deviceId, forEntityId) {
+    return this.findSensorEntityForDevice(
+      deviceId,
+      SensorDeviceClass.energy,
+      forEntityId
+    );
   }
   markPowerEntityUsed(entityId) {
     this._usedPowerEntities.add(entityId);
@@ -179093,13 +180834,19 @@ var BridgeRegistry = class _BridgeRegistry {
       if (!entity.device_id) continue;
       const domain = entity.entity_id.split(".")[0];
       if (domain !== "switch" && domain !== "light") continue;
-      const powerEntityId = this.findPowerEntityForDevice(entity.device_id);
+      const powerEntityId = this.findPowerEntityForDevice(
+        entity.device_id,
+        entity.entity_id
+      );
       if (powerEntityId && powerEntityId !== entity.entity_id) {
         if (!this._usedPowerEntities.has(powerEntityId)) {
           this._usedPowerEntities.add(powerEntityId);
         }
       }
-      const energyEntityId = this.findEnergyEntityForDevice(entity.device_id);
+      const energyEntityId = this.findEnergyEntityForDevice(
+        entity.device_id,
+        entity.entity_id
+      );
       if (energyEntityId && energyEntityId !== entity.entity_id) {
         if (!this._usedEnergyEntities.has(energyEntityId)) {
           this._usedEnergyEntities.add(energyEntityId);
@@ -179195,12 +180942,13 @@ var EntityMappingSync = class {
   // battery, bounds the per-state-batch check to a map hit
   candidates = /* @__PURE__ */ new Map();
   // Only endpoints the auto-mapping applies to belong in the candidates: a
-  // manual or disabled mapping, or a sensor endpoint sharing the device,
-  // must not claim the slot (last writer would win) and stall the recovery.
+  // manual or disabled mapping, or the battery sensor's own endpoint, must
+  // not claim the slot (last writer would win) and stall the recovery.
   eligible(entityId) {
     const mapping = this.getMapping(entityId);
     if (mapping?.batteryEntity || mapping?.disableBatteryMapping) return false;
-    if (entityId.startsWith("sensor.") || entityId.startsWith("binary_sensor.")) {
+    if (entityId.startsWith("binary_sensor.")) return false;
+    if (entityId.startsWith("sensor.") && this.registry.initialState(entityId)?.attributes?.device_class === "battery") {
       return false;
     }
     return entityId.startsWith("vacuum.") || !!this.registry.isAutoBatteryMappingEnabled?.();
@@ -179242,7 +180990,12 @@ var EntityMappingSync = class {
       if (fingerprintBattery(fingerprint) != null) continue;
       if (!this.eligible(entityId)) continue;
       const deviceId = this.registry.entity(entityId)?.device_id;
-      if (deviceId) this.candidates.set(deviceId, entityId);
+      if (!deviceId) continue;
+      const owner = this.candidates.get(deviceId);
+      if (owner && !owner.startsWith("sensor.") && entityId.startsWith("sensor.")) {
+        continue;
+      }
+      this.candidates.set(deviceId, entityId);
     }
   }
   // battery-less auto-map endpoints watch their device's sensors, an
@@ -179757,6 +181510,11 @@ var BridgeEndpointManager = class extends Service {
     }
     return result;
   }
+  // battery, humidity and pressure skips from LegacyEndpoint.create
+  isAutoAssigned(entityId) {
+    const r = this.registry;
+    return r.isAutoBatteryMappingEnabled() && r.isBatteryEntityUsed(entityId) || r.isAutoHumidityMappingEnabled() && r.isHumidityEntityUsed(entityId) || r.isAutoPressureMappingEnabled() && r.isPressureEntityUsed(entityId);
+  }
   getEntityMapping(entityId) {
     return this.mappingStorage.getMapping(this.bridgeId, entityId);
   }
@@ -179911,6 +181669,17 @@ var BridgeEndpointManager = class extends Service {
     const existingEndpoints = [];
     const registryPushes = [];
     const now = Date.now();
+    const carriedElsewhere = new Set(
+      endpoints.flatMap(
+        (e) => [
+          ...e.mappedEntityIds ?? [],
+          this.registry.batteryFingerprintFor(
+            e.entityId,
+            this.getEntityMapping(e.entityId)
+          )
+        ].filter((id) => id && id !== e.entityId)
+      )
+    );
     for (const endpoint of endpoints) {
       const present = this.entityIds.includes(endpoint.entityId);
       const claimant = endpointIdToEntity.get(endpoint.id);
@@ -179987,6 +181756,19 @@ var BridgeEndpointManager = class extends Service {
           );
         }
         this.mappingFingerprints.delete(endpoint.entityId);
+      } else if (carriedElsewhere.has(endpoint.entityId) && this.isAutoAssigned(endpoint.entityId)) {
+        this.log.info(
+          `Removing standalone endpoint ${endpoint.entityId}, auto-mapped onto another device`
+        );
+        try {
+          await endpoint.close();
+        } catch (e) {
+          this.log.warn(
+            `Failed to remove auto-mapped endpoint ${endpoint.entityId}:`,
+            e
+          );
+        }
+        this.mappingFingerprints.delete(endpoint.entityId);
       } else {
         const currentMapping = this.getEntityMapping(endpoint.entityId);
         const storedFp = this.mappingFingerprints.get(endpoint.entityId) ?? "";
@@ -180355,6 +182137,7 @@ var BridgeEndpointManager = class extends Service {
 // src/services/bridges/server-mode-bridge.ts
 init_dist();
 init_protocol3();
+init_update_entity_state();
 init_diagnostic_event_bus();
 var AUTO_FORCE_SYNC_INTERVAL_MS2 = 9e4;
 function makeWarmStartState(state, now = (/* @__PURE__ */ new Date()).toISOString()) {
@@ -180756,8 +182539,15 @@ function ServerModeVacuumDevice(homeAssistantEntity, includeOnOff = false, clean
 }
 
 // src/matter/endpoints/server-mode-vacuum-endpoint.ts
+init_update_entity_state();
 var logger255 = Logger.get("ServerModeVacuumEndpoint");
 var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEndpoint {
+  constructor(type, entityId, customName, mappedEntityIds, endpointId, vacuumEffective) {
+    super(type, entityId, customName, mappedEntityIds, endpointId);
+    this.vacuumEffective = vacuumEffective;
+    this.flushUpdate = debounce7(this.flushPendingUpdate.bind(this), 50);
+  }
+  vacuumEffective;
   static async create(registry3, entityId, mapping, endpointId) {
     const deviceRegistry = registry3.deviceOf(entityId);
     let state = registry3.initialState(entityId);
@@ -180955,16 +182745,13 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
       entityId,
       customName,
       mappedIds,
-      endpointId
+      endpointId,
+      { mapping: effectiveMapping, state }
     );
   }
   lastState;
   pendingMappedChange = false;
   flushUpdate;
-  constructor(type, entityId, customName, mappedEntityIds, endpointId) {
-    super(type, entityId, customName, mappedEntityIds, endpointId);
-    this.flushUpdate = debounce7(this.flushPendingUpdate.bind(this), 50);
-  }
   clearTimers() {
     this.flushUpdate.clear();
   }
@@ -180996,10 +182783,13 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
     this.flushUpdate(state);
   }
   async flushPendingUpdate(state) {
-    let effectiveState = state;
+    let effectiveState = withResolvedRooms(state, this.vacuumEffective);
     if (this.pendingMappedChange) {
       this.pendingMappedChange = false;
-      effectiveState = { ...state, last_updated: (/* @__PURE__ */ new Date()).toISOString() };
+      effectiveState = {
+        ...effectiveState,
+        last_updated: (/* @__PURE__ */ new Date()).toISOString()
+      };
     }
     await updateEntityState(this, effectiveState);
   }
@@ -181943,12 +183733,12 @@ function formatPatchError(action, error) {
 function extractErrorMessage(error) {
   if (error instanceof Error) return error.message;
   if (typeof error === "object" && error !== null) {
-    const obj = error;
-    if (typeof obj.error === "object" && obj.error !== null) {
-      const inner = obj.error;
+    const obj2 = error;
+    if (typeof obj2.error === "object" && obj2.error !== null) {
+      const inner = obj2.error;
       if (typeof inner.message === "string") return inner.message;
     }
-    if (typeof obj.message === "string") return obj.message;
+    if (typeof obj2.message === "string") return obj2.message;
   }
   return String(error);
 }
@@ -184298,10 +186088,10 @@ export {
 @matter/node/dist/esm/endpoints/index.js:
 @matter/main/dist/esm/endpoints.js:
 @matter/main/dist/esm/forwards/clusters/level-control.js:
-@matter/main/dist/esm/forwards/behaviors/boolean-state.js:
-@matter/main/dist/esm/forwards/behaviors/smoke-co-alarm.js:
 @matter/main/dist/esm/forwards/behaviors/operational-state.js:
 @matter/main/dist/esm/forwards/clusters/operational-state.js:
+@matter/main/dist/esm/forwards/behaviors/boolean-state.js:
+@matter/main/dist/esm/forwards/behaviors/smoke-co-alarm.js:
 @matter/main/dist/esm/forwards/behaviors/rvc-operational-state.js:
 @matter/main/dist/esm/forwards/clusters/rvc-operational-state.js:
 @matter/main/dist/esm/forwards/clusters/mode-base.js: