@riddix/hamh 2.1.0-alpha.856 → 2.1.0-alpha.858

package/dist/backend/cli.js

@@ -133321,12 +133321,93 @@ function accessLogger(logger253) {
 }
 
 // src/api/backup-api.ts
-import fs from "node:fs";
-import path from "node:path";
+import fs2 from "node:fs";
+import path2 from "node:path";
 import archiver from "archiver";
 import express from "express";
 import multer from "multer";
 import unzipper from "unzipper";
+
+// src/plugins/plugin-storage.ts
+init_esm();
+import * as fs from "node:fs";
+import * as path from "node:path";
+var logger177 = Logger.get("PluginStorage");
+var SAVE_DEBOUNCE_MS = 500;
+var safe = (s) => s.replace(/[^a-zA-Z0-9_-]/g, "_");
+function pluginStorageFilePath(storageDir, bridgeId, pluginName) {
+  return path.join(
+    storageDir,
+    `plugin-${safe(bridgeId)}-${safe(pluginName)}.json`
+  );
+}
+function pluginStateFilePath(storageDir, bridgeId) {
+  return path.join(storageDir, `plugin-state-${safe(bridgeId)}.json`);
+}
+var FilePluginStorage = class {
+  data = {};
+  dirty = false;
+  filePath;
+  saveTimer;
+  constructor(storageDir, bridgeId, pluginName) {
+    this.filePath = pluginStorageFilePath(storageDir, bridgeId, pluginName);
+    this.load();
+  }
+  async get(key, defaultValue) {
+    const value = this.data[key];
+    return value ?? defaultValue;
+  }
+  async set(key, value) {
+    this.data[key] = value;
+    this.dirty = true;
+    this.scheduleSave();
+  }
+  async delete(key) {
+    delete this.data[key];
+    this.dirty = true;
+    this.scheduleSave();
+  }
+  async keys() {
+    return Object.keys(this.data);
+  }
+  load() {
+    try {
+      if (fs.existsSync(this.filePath)) {
+        const raw = fs.readFileSync(this.filePath, "utf-8");
+        this.data = JSON.parse(raw);
+      }
+    } catch (e) {
+      logger177.warn(`Failed to load plugin storage from ${this.filePath}:`, e);
+      this.data = {};
+    }
+  }
+  scheduleSave() {
+    if (this.saveTimer) clearTimeout(this.saveTimer);
+    this.saveTimer = setTimeout(() => this.save(), SAVE_DEBOUNCE_MS);
+  }
+  save() {
+    if (!this.dirty) return;
+    if (this.saveTimer) {
+      clearTimeout(this.saveTimer);
+      this.saveTimer = void 0;
+    }
+    try {
+      const dir = path.dirname(this.filePath);
+      if (!fs.existsSync(dir)) {
+        fs.mkdirSync(dir, { recursive: true });
+      }
+      fs.writeFileSync(this.filePath, JSON.stringify(this.data, null, 2));
+      this.dirty = false;
+    } catch (e) {
+      logger177.warn(`Failed to save plugin storage to ${this.filePath}:`, e);
+    }
+  }
+  flush() {
+    this.save();
+  }
+};
+
+// src/api/backup-api.ts
 var upload = multer({ storage: multer.memoryStorage() });
 function backupApi(bridgeStorage, mappingStorage, storageLocation, backupService, settingsStorage, _bridgeService) {
   const router = express.Router();
@@ -133342,9 +133423,9 @@ function backupApi(bridgeStorage, mappingStorage, storageLocation, backupService
         }
       }
       let includesIcons = false;
-      const iconsDir = path.join(storageLocation, "bridge-icons");
-      if (includeIdentity && fs.existsSync(iconsDir)) {
-        const iconFiles = fs.readdirSync(iconsDir);
+      const iconsDir = path2.join(storageLocation, "bridge-icons");
+      if (includeIdentity && fs2.existsSync(iconsDir)) {
+        const iconFiles = fs2.readdirSync(iconsDir);
         includesIcons = iconFiles.some((iconFile) => {
           const bridgeId = iconFile.split(".")[0];
           return bridges.some((b) => b.id === bridgeId);
@@ -133381,19 +133462,25 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
 `,
         { name: "README.txt" }
       );
+      for (const bridge of bridges) {
+        const pluginState = pluginStateFilePath(storageLocation, bridge.id);
+        if (fs2.existsSync(pluginState)) {
+          archive.file(pluginState, { name: `plugin-state/${bridge.id}.json` });
+        }
+      }
       if (includeIdentity) {
         for (const bridge of bridges) {
-          const bridgeStoragePath = path.join(storageLocation, bridge.id);
-          if (fs.existsSync(bridgeStoragePath)) {
+          const bridgeStoragePath = path2.join(storageLocation, bridge.id);
+          if (fs2.existsSync(bridgeStoragePath)) {
             archive.directory(bridgeStoragePath, `identity/${bridge.id}`);
           }
         }
         if (includesIcons) {
-          const iconFiles = fs.readdirSync(iconsDir);
+          const iconFiles = fs2.readdirSync(iconsDir);
           for (const iconFile of iconFiles) {
             const bridgeId = iconFile.split(".")[0];
             if (bridges.some((b) => b.id === bridgeId)) {
-              const iconPath = path.join(iconsDir, iconFile);
+              const iconPath = path2.join(iconsDir, iconFile);
               archive.file(iconPath, { name: `bridge-icons/${iconFile}` });
             }
           }
@@ -133515,7 +133602,8 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                     fanRestoreSpeedOnPowerOn: config8.fanRestoreSpeedOnPowerOn,
                     composedEntities: config8.composedEntities,
                     disableMomentaryFlip: config8.disableMomentaryFlip,
-                    vacuumAscendingRoomOrder: config8.vacuumAscendingRoomOrder
+                    vacuumAscendingRoomOrder: config8.vacuumAscendingRoomOrder,
+                    vacuumRoomSwitches: config8.vacuumRoomSwitches
                   });
                   mappingsRestored++;
                 }
@@ -133541,6 +133629,7 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                 iconsRestored++;
               }
             }
+            await restorePluginState(zipDirectory, bridge.id, storageLocation);
           } catch (e) {
             errors.push({
               bridgeId: bridge.id,
@@ -133599,7 +133688,7 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
         "Content-Disposition",
         `attachment; filename="${req.params.filename}"`
       );
-      const stream = fs.createReadStream(filepath);
+      const stream = fs2.createReadStream(filepath);
       stream.pipe(res);
     } catch (error) {
       const message = error instanceof Error ? error.message : "Failed to download backup";
@@ -133613,7 +133702,7 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
         res.status(404).json({ error: "Backup not found" });
         return;
       }
-      const buffer = fs.readFileSync(filepath);
+      const buffer = fs2.readFileSync(filepath);
       const options = req.body || {};
       const { backupData, zipDirectory } = await extractBackupData(buffer);
       const existingIds = new Set(bridgeStorage.bridges.map((b) => b.id));
@@ -133681,7 +133770,8 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                   fanWindPresets: config8.fanWindPresets,
                   composedEntities: config8.composedEntities,
                   disableMomentaryFlip: config8.disableMomentaryFlip,
-                  vacuumAscendingRoomOrder: config8.vacuumAscendingRoomOrder
+                  vacuumAscendingRoomOrder: config8.vacuumAscendingRoomOrder,
+                  vacuumRoomSwitches: config8.vacuumRoomSwitches
                 });
                 mappingsRestored++;
               }
@@ -133707,6 +133797,7 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
               iconsRestored++;
             }
           }
+          await restorePluginState(zipDirectory, bridge.id, storageLocation);
         } catch (e) {
           errors.push({
             bridgeId: bridge.id,
@@ -133774,12 +133865,12 @@ async function extractBackupData(buffer) {
   return { backupData: data, zipDirectory: directory };
 }
 function resolveWithin(baseDir, relative) {
-  if (relative.length === 0 || path.isAbsolute(relative)) {
+  if (relative.length === 0 || path2.isAbsolute(relative)) {
     return null;
   }
-  const resolvedBase = path.resolve(baseDir);
-  const resolvedTarget = path.resolve(resolvedBase, relative);
-  if (resolvedTarget !== resolvedBase && !resolvedTarget.startsWith(resolvedBase + path.sep)) {
+  const resolvedBase = path2.resolve(baseDir);
+  const resolvedTarget = path2.resolve(resolvedBase, relative);
+  if (resolvedTarget !== resolvedBase && !resolvedTarget.startsWith(resolvedBase + path2.sep)) {
     return null;
   }
   return resolvedTarget;
@@ -133792,8 +133883,8 @@ async function restoreIdentityFiles(zipDirectory, bridgeId, storageLocation) {
   if (identityFiles.length === 0) {
     return false;
   }
-  const targetDir = path.join(storageLocation, bridgeId);
-  fs.mkdirSync(targetDir, { recursive: true });
+  const targetDir = path2.join(storageLocation, bridgeId);
+  fs2.mkdirSync(targetDir, { recursive: true });
   for (const file of identityFiles) {
     const relativePath = file.path.substring(identityPrefix.length);
     const targetPath = resolveWithin(targetDir, relativePath);
@@ -133802,13 +133893,24 @@ async function restoreIdentityFiles(zipDirectory, bridgeId, storageLocation) {
         `Refusing to restore identity file with unsafe path: ${file.path}`
       );
     }
-    const targetDirPath = path.dirname(targetPath);
-    fs.mkdirSync(targetDirPath, { recursive: true });
+    const targetDirPath = path2.dirname(targetPath);
+    fs2.mkdirSync(targetDirPath, { recursive: true });
     const content = await file.buffer();
-    fs.writeFileSync(targetPath, content);
+    fs2.writeFileSync(targetPath, content);
   }
   return true;
 }
+async function restorePluginState(zipDirectory, bridgeId, storageLocation) {
+  const entry = zipDirectory.files.find(
+    (f) => f.path === `plugin-state/${bridgeId}.json` && f.type === "File"
+  );
+  if (!entry) {
+    return false;
+  }
+  const content = await entry.buffer();
+  fs2.writeFileSync(pluginStateFilePath(storageLocation, bridgeId), content);
+  return true;
+}
 async function restoreBridgeIcon(zipDirectory, bridgeId, storageLocation) {
   const iconPrefix = "bridge-icons/";
   const iconFiles = zipDirectory.files.filter(
@@ -133817,8 +133919,8 @@ async function restoreBridgeIcon(zipDirectory, bridgeId, storageLocation) {
   if (iconFiles.length === 0) {
     return false;
   }
-  const iconsDir = path.join(storageLocation, "bridge-icons");
-  fs.mkdirSync(iconsDir, { recursive: true });
+  const iconsDir = path2.join(storageLocation, "bridge-icons");
+  fs2.mkdirSync(iconsDir, { recursive: true });
   for (const file of iconFiles) {
     const fileName = file.path.substring(iconPrefix.length);
     const targetPath = resolveWithin(iconsDir, fileName);
@@ -133828,7 +133930,7 @@ async function restoreBridgeIcon(zipDirectory, bridgeId, storageLocation) {
       );
     }
     const content = await file.buffer();
-    fs.writeFileSync(targetPath, content);
+    fs2.writeFileSync(targetPath, content);
   }
   return true;
 }
@@ -133837,7 +133939,7 @@ async function restoreBridgeIcon(zipDirectory, bridgeId, storageLocation) {
 init_dist();
 init_esm();
 import express2 from "express";
-var logger177 = Logger.get("BridgeExportApi");
+var logger178 = Logger.get("BridgeExportApi");
 function migrateFilter(legacyFilter) {
   if (!legacyFilter) {
     return { include: [], exclude: [] };
@@ -133988,7 +134090,7 @@ function bridgeExportApi(bridgeStorage) {
       res.json(result);
     } catch (e) {
       const message = e instanceof Error ? e.message : String(e);
-      logger177.warn(`Failed to import bridges: ${message}`, e);
+      logger178.warn(`Failed to import bridges: ${message}`, e);
       res.status(400).json({ error: `Failed to import bridges: ${message}` });
     }
   });
@@ -133996,16 +134098,16 @@ function bridgeExportApi(bridgeStorage) {
 }
 
 // src/api/bridge-icon-api.ts
-import fs2 from "node:fs";
-import path2 from "node:path";
+import fs3 from "node:fs";
+import path3 from "node:path";
 import express3 from "express";
 import multer2 from "multer";
 var ALLOWED_EXTENSIONS = [".png", ".jpg", ".jpeg", ".gif", ".webp", ".svg"];
 var MAX_FILE_SIZE = 5 * 1024 * 1024;
 function bridgeIconApi(storageLocation) {
-  const iconsDir = path2.join(storageLocation, "bridge-icons");
-  if (!fs2.existsSync(iconsDir)) {
-    fs2.mkdirSync(iconsDir, { recursive: true });
+  const iconsDir = path3.join(storageLocation, "bridge-icons");
+  if (!fs3.existsSync(iconsDir)) {
+    fs3.mkdirSync(iconsDir, { recursive: true });
   }
   const storage2 = multer2.diskStorage({
     destination: (_req, _file, cb) => {
@@ -134013,12 +134115,12 @@ function bridgeIconApi(storageLocation) {
     },
     filename: (req, file, cb) => {
       const bridgeId = req.params.bridgeId;
-      const ext = path2.extname(file.originalname).toLowerCase();
+      const ext = path3.extname(file.originalname).toLowerCase();
       cb(null, `${bridgeId}${ext}`);
     }
   });
   const fileFilter = (_req, file, cb) => {
-    const ext = path2.extname(file.originalname).toLowerCase();
+    const ext = path3.extname(file.originalname).toLowerCase();
     if (ALLOWED_EXTENSIONS.includes(ext)) {
       cb(null, true);
     } else {
@@ -134051,40 +134153,40 @@ function bridgeIconApi(storageLocation) {
     "/:bridgeId/exists",
     (req, res) => {
       const bridgeId = req.params.bridgeId;
-      const files = fs2.readdirSync(iconsDir);
+      const files = fs3.readdirSync(iconsDir);
       const exists = files.some((f) => f.startsWith(`${bridgeId}.`));
       res.json({ exists });
     }
   );
   router.get("/:bridgeId", (req, res) => {
     const bridgeId = req.params.bridgeId;
-    const files = fs2.readdirSync(iconsDir);
+    const files = fs3.readdirSync(iconsDir);
     const iconFile = files.find((f) => f.startsWith(`${bridgeId}.`));
     if (!iconFile) {
       res.status(404).json({ error: "Icon not found" });
       return;
     }
-    const filePath = path2.join(iconsDir, iconFile);
+    const filePath = path3.join(iconsDir, iconFile);
     res.sendFile(filePath);
   });
   router.delete("/:bridgeId", (req, res) => {
     const bridgeId = req.params.bridgeId;
-    const files = fs2.readdirSync(iconsDir);
+    const files = fs3.readdirSync(iconsDir);
     const iconFile = files.find((f) => f.startsWith(`${bridgeId}.`));
     if (!iconFile) {
       res.status(404).json({ error: "Icon not found" });
       return;
     }
-    const filePath = path2.join(iconsDir, iconFile);
-    fs2.unlinkSync(filePath);
+    const filePath = path3.join(iconsDir, iconFile);
+    fs3.unlinkSync(filePath);
     res.json({ success: true });
   });
   return router;
 }
 
 // src/api/device-image-api.ts
-import fs3 from "node:fs";
-import path3 from "node:path";
+import fs4 from "node:fs";
+import path4 from "node:path";
 import express4 from "express";
 import multer3 from "multer";
 var ALLOWED_EXTENSIONS2 = [".png", ".jpg", ".jpeg", ".gif", ".webp", ".svg"];
@@ -134095,10 +134197,10 @@ function sanitizeEntityId(entityId) {
 }
 function findCustomImage(imagesDir, entityId) {
   const sanitized = sanitizeEntityId(entityId);
-  if (!fs3.existsSync(imagesDir)) return void 0;
-  const files = fs3.readdirSync(imagesDir);
-  const imageFile = files.find((f) => path3.parse(f).name === sanitized);
-  return imageFile ? path3.join(imagesDir, imageFile) : void 0;
+  if (!fs4.existsSync(imagesDir)) return void 0;
+  const files = fs4.readdirSync(imagesDir);
+  const imageFile = files.find((f) => path4.parse(f).name === sanitized);
+  return imageFile ? path4.join(imagesDir, imageFile) : void 0;
 }
 function resolveZ2mImageUrl(haRegistry, entityId) {
   const entity = haRegistry.entities[entityId];
@@ -134108,9 +134210,9 @@ function resolveZ2mImageUrl(haRegistry, entityId) {
   return `${Z2M_IMAGE_BASE}/${encodeURIComponent(device.model)}.png`;
 }
 function deviceImageApi(storageLocation, haRegistry) {
-  const imagesDir = path3.join(storageLocation, "device-images");
-  if (!fs3.existsSync(imagesDir)) {
-    fs3.mkdirSync(imagesDir, { recursive: true });
+  const imagesDir = path4.join(storageLocation, "device-images");
+  if (!fs4.existsSync(imagesDir)) {
+    fs4.mkdirSync(imagesDir, { recursive: true });
   }
   const storage2 = multer3.diskStorage({
     destination: (_req, _file, cb) => {
@@ -134118,12 +134220,12 @@ function deviceImageApi(storageLocation, haRegistry) {
     },
     filename: (req, file, cb) => {
       const entityId = sanitizeEntityId(req.params.entityId);
-      const ext = path3.extname(file.originalname).toLowerCase();
+      const ext = path4.extname(file.originalname).toLowerCase();
       cb(null, `${entityId}${ext}`);
     }
   });
   const fileFilter = (_req, file, cb) => {
-    const ext = path3.extname(file.originalname).toLowerCase();
+    const ext = path4.extname(file.originalname).toLowerCase();
     if (ALLOWED_EXTENSIONS2.includes(ext)) {
       cb(null, true);
     } else {
@@ -134171,10 +134273,10 @@ function deviceImageApi(storageLocation, haRegistry) {
         return;
       }
       const sanitized = sanitizeEntityId(req.params.entityId);
-      const files = fs3.readdirSync(imagesDir);
+      const files = fs4.readdirSync(imagesDir);
       for (const f of files) {
-        if (path3.parse(f).name === sanitized && f !== req.file.filename) {
-          fs3.unlinkSync(path3.join(imagesDir, f));
+        if (path4.parse(f).name === sanitized && f !== req.file.filename) {
+          fs4.unlinkSync(path4.join(imagesDir, f));
         }
       }
       res.json({ success: true });
@@ -134201,7 +134303,7 @@ function deviceImageApi(storageLocation, haRegistry) {
       res.status(404).json({ error: "No custom image found" });
       return;
     }
-    fs3.unlinkSync(customImage);
+    fs4.unlinkSync(customImage);
     res.json({ success: true });
   });
   router.head("/:entityId", (req, res) => {
@@ -134533,6 +134635,7 @@ function entityMappingApi(mappingStorage, identityStorage) {
       currentRoomEntity: body.currentRoomEntity,
       cleanedAreaEntity: body.cleanedAreaEntity,
       vacuumAscendingRoomOrder: body.vacuumAscendingRoomOrder,
+      vacuumRoomSwitches: body.vacuumRoomSwitches,
       disableCustomAreaRoomModes: body.disableCustomAreaRoomModes,
       valetudoIdentifier: body.valetudoIdentifier,
       coverSwapOpenClose: body.coverSwapOpenClose,
@@ -135045,7 +135148,8 @@ function configToProfileEntry(config8) {
     climateExposeFan: config8.climateExposeFan,
     climateAutoMode: config8.climateAutoMode,
     disableMomentaryFlip: config8.disableMomentaryFlip,
-    vacuumAscendingRoomOrder: config8.vacuumAscendingRoomOrder
+    vacuumAscendingRoomOrder: config8.vacuumAscendingRoomOrder,
+    vacuumRoomSwitches: config8.vacuumRoomSwitches
   };
 }
 function mappingProfileApi(mappingStorage) {
@@ -135189,7 +135293,8 @@ function mappingProfileApi(mappingStorage) {
           climateExposeFan: entry.climateExposeFan,
           climateAutoMode: entry.climateAutoMode,
           disableMomentaryFlip: entry.disableMomentaryFlip,
-          vacuumAscendingRoomOrder: entry.vacuumAscendingRoomOrder
+          vacuumAscendingRoomOrder: entry.vacuumAscendingRoomOrder,
+          vacuumRoomSwitches: entry.vacuumRoomSwitches
         });
         applied++;
       } catch (e) {
@@ -136593,26 +136698,26 @@ var BUILTIN_PLUGIN_NAMES = ["camera", "security"];
 // src/plugins/plugin-installer.ts
 init_esm();
 import { execFile } from "node:child_process";
-import * as fs4 from "node:fs";
-import * as path4 from "node:path";
-var logger178 = Logger.get("PluginInstaller");
+import * as fs5 from "node:fs";
+import * as path5 from "node:path";
+var logger179 = Logger.get("PluginInstaller");
 var VALID_PACKAGE_RE = /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*(@[^@\s]+)?$/;
 var PluginInstaller = class {
   pluginDir;
   constructor(storageLocation) {
-    this.pluginDir = path4.join(storageLocation, "plugin-packages");
+    this.pluginDir = path5.join(storageLocation, "plugin-packages");
     this.ensurePluginDir();
   }
   get installDir() {
     return this.pluginDir;
   }
   ensurePluginDir() {
-    if (!fs4.existsSync(this.pluginDir)) {
-      fs4.mkdirSync(this.pluginDir, { recursive: true });
+    if (!fs5.existsSync(this.pluginDir)) {
+      fs5.mkdirSync(this.pluginDir, { recursive: true });
     }
-    const pkgJson = path4.join(this.pluginDir, "package.json");
-    if (!fs4.existsSync(pkgJson)) {
-      fs4.writeFileSync(
+    const pkgJson = path5.join(this.pluginDir, "package.json");
+    if (!fs5.existsSync(pkgJson)) {
+      fs5.writeFileSync(
         pkgJson,
         JSON.stringify(
           {
@@ -136635,7 +136740,7 @@ var PluginInstaller = class {
         error: `Invalid package name: "${packageName}"`
       };
     }
-    logger178.info(`Installing plugin: ${packageName}`);
+    logger179.info(`Installing plugin: ${packageName}`);
     return new Promise((resolve11) => {
       execFile(
         "npm",
@@ -136647,7 +136752,7 @@ var PluginInstaller = class {
         },
         (error, _stdout, stderr) => {
           if (error) {
-            logger178.error(
+            logger179.error(
               `Failed to install ${packageName}:`,
               stderr || error.message
             );
@@ -136659,7 +136764,7 @@ var PluginInstaller = class {
             return;
           }
           const version2 = this.getInstalledVersion(packageName);
-          logger178.info(`Installed ${packageName}@${version2 || "unknown"}`);
+          logger179.info(`Installed ${packageName}@${version2 || "unknown"}`);
           resolve11({
             success: true,
             packageName,
@@ -136677,7 +136782,7 @@ var PluginInstaller = class {
         error: `Invalid package name: "${packageName}"`
       };
     }
-    logger178.info(`Uninstalling plugin: ${packageName}`);
+    logger179.info(`Uninstalling plugin: ${packageName}`);
     return new Promise((resolve11) => {
       execFile(
         "npm",
@@ -136688,7 +136793,7 @@ var PluginInstaller = class {
         },
         (error, _stdout, stderr) => {
           if (error) {
-            logger178.error(
+            logger179.error(
               `Failed to uninstall ${packageName}:`,
               stderr || error.message
             );
@@ -136699,7 +136804,7 @@ var PluginInstaller = class {
             });
             return;
           }
-          logger178.info(`Uninstalled ${packageName}`);
+          logger179.info(`Uninstalled ${packageName}`);
           resolve11({ success: true, packageName });
         }
       );
@@ -136710,16 +136815,16 @@ var PluginInstaller = class {
    * This is used by PluginManager.loadExternal() to import the plugin.
    */
   getPluginPath(packageName) {
-    return path4.join(this.pluginDir, "node_modules", packageName);
+    return path5.join(this.pluginDir, "node_modules", packageName);
   }
   /**
    * List all installed plugin packages from the plugin directory's package.json.
    */
   listInstalled() {
     try {
-      const pkgJson = path4.join(this.pluginDir, "package.json");
-      if (!fs4.existsSync(pkgJson)) return [];
-      const pkg = JSON.parse(fs4.readFileSync(pkgJson, "utf-8"));
+      const pkgJson = path5.join(this.pluginDir, "package.json");
+      if (!fs5.existsSync(pkgJson)) return [];
+      const pkg = JSON.parse(fs5.readFileSync(pkgJson, "utf-8"));
       const deps = pkg.dependencies ?? {};
       return Object.entries(deps).map(([name, ver]) => ({
         name,
@@ -136730,9 +136835,9 @@ var PluginInstaller = class {
     }
   }
   async installFromTgz(tgzBuffer) {
-    const tgzPath = path4.join(this.pluginDir, `.upload-${Date.now()}.tgz`);
+    const tgzPath = path5.join(this.pluginDir, `.upload-${Date.now()}.tgz`);
     try {
-      fs4.writeFileSync(tgzPath, tgzBuffer);
+      fs5.writeFileSync(tgzPath, tgzBuffer);
       const depsBefore = new Set(Object.keys(this.readDeps()));
       const result = await this.installFromNpm(tgzPath);
       if (!result.success) return result;
@@ -136749,11 +136854,11 @@ var PluginInstaller = class {
       return result;
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e);
-      logger178.error("Failed to install from tgz:", msg);
+      logger179.error("Failed to install from tgz:", msg);
       return { success: false, packageName: "unknown", error: msg };
     } finally {
       try {
-        if (fs4.existsSync(tgzPath)) fs4.unlinkSync(tgzPath);
+        if (fs5.existsSync(tgzPath)) fs5.unlinkSync(tgzPath);
       } catch {
       }
     }
@@ -136772,14 +136877,14 @@ var PluginInstaller = class {
           if (error) {
             resolve11({
               success: false,
-              packageName: path4.basename(target),
+              packageName: path5.basename(target),
               error: stderr || error.message
             });
             return;
           }
           resolve11({
             success: true,
-            packageName: path4.basename(target)
+            packageName: path5.basename(target)
           });
         }
       );
@@ -136787,25 +136892,25 @@ var PluginInstaller = class {
   }
   readDeps() {
     try {
-      const pkgJson = path4.join(this.pluginDir, "package.json");
-      if (!fs4.existsSync(pkgJson)) return {};
-      const pkg = JSON.parse(fs4.readFileSync(pkgJson, "utf-8"));
+      const pkgJson = path5.join(this.pluginDir, "package.json");
+      if (!fs5.existsSync(pkgJson)) return {};
+      const pkg = JSON.parse(fs5.readFileSync(pkgJson, "utf-8"));
       return pkg.dependencies ?? {};
     } catch {
       return {};
     }
   }
   installFromLocal(localPath) {
-    const resolvedPath = path4.resolve(localPath);
-    if (!fs4.existsSync(resolvedPath)) {
+    const resolvedPath = path5.resolve(localPath);
+    if (!fs5.existsSync(resolvedPath)) {
       return {
         success: false,
         packageName: "unknown",
         error: `Path does not exist: ${resolvedPath}`
       };
     }
-    const pkgJsonPath = path4.join(resolvedPath, "package.json");
-    if (!fs4.existsSync(pkgJsonPath)) {
+    const pkgJsonPath = path5.join(resolvedPath, "package.json");
+    if (!fs5.existsSync(pkgJsonPath)) {
       return {
         success: false,
         packageName: "unknown",
@@ -136814,7 +136919,7 @@ var PluginInstaller = class {
     }
     let pkg;
     try {
-      pkg = JSON.parse(fs4.readFileSync(pkgJsonPath, "utf-8"));
+      pkg = JSON.parse(fs5.readFileSync(pkgJsonPath, "utf-8"));
     } catch {
       return {
         success: false,
@@ -136830,13 +136935,13 @@ var PluginInstaller = class {
         error: "Invalid package.json: missing 'name' field"
       };
     }
-    const targetLink = path4.join(this.pluginDir, "node_modules", packageName);
-    if (fs4.existsSync(targetLink)) {
-      fs4.rmSync(targetLink, { recursive: true, force: true });
+    const targetLink = path5.join(this.pluginDir, "node_modules", packageName);
+    if (fs5.existsSync(targetLink)) {
+      fs5.rmSync(targetLink, { recursive: true, force: true });
     }
-    fs4.mkdirSync(path4.dirname(targetLink), { recursive: true });
-    fs4.symlinkSync(resolvedPath, targetLink, "dir");
-    logger178.info(
+    fs5.mkdirSync(path5.dirname(targetLink), { recursive: true });
+    fs5.symlinkSync(resolvedPath, targetLink, "dir");
+    logger179.info(
       `Linked local plugin: ${packageName}@${pkg.version || "unknown"} \u2192 ${resolvedPath}`
     );
     return {
@@ -136847,14 +136952,14 @@ var PluginInstaller = class {
   }
   getInstalledVersion(packageName) {
     try {
-      const pkgPath = path4.join(
+      const pkgPath = path5.join(
         this.pluginDir,
         "node_modules",
         packageName,
         "package.json"
       );
-      if (fs4.existsSync(pkgPath)) {
-        const pkg = JSON.parse(fs4.readFileSync(pkgPath, "utf-8"));
+      if (fs5.existsSync(pkgPath)) {
+        const pkg = JSON.parse(fs5.readFileSync(pkgPath, "utf-8"));
         return pkg.version ?? null;
       }
     } catch {
@@ -136865,40 +136970,40 @@ var PluginInstaller = class {
 
 // src/plugins/plugin-registry.ts
 init_esm();
-import * as fs5 from "node:fs";
-import * as path5 from "node:path";
-var logger179 = Logger.get("PluginRegistry");
+import * as fs6 from "node:fs";
+import * as path6 from "node:path";
+var logger180 = Logger.get("PluginRegistry");
 var PluginRegistry = class {
   plugins = [];
   filePath;
   constructor(storageLocation) {
-    this.filePath = path5.join(storageLocation, "installed-plugins.json");
+    this.filePath = path6.join(storageLocation, "installed-plugins.json");
     this.load();
   }
   load() {
     try {
-      if (fs5.existsSync(this.filePath)) {
-        const raw = fs5.readFileSync(this.filePath, "utf-8");
+      if (fs6.existsSync(this.filePath)) {
+        const raw = fs6.readFileSync(this.filePath, "utf-8");
         this.plugins = JSON.parse(raw);
       }
     } catch (e) {
-      logger179.warn("Failed to load plugin registry:", e);
+      logger180.warn("Failed to load plugin registry:", e);
       this.plugins = [];
     }
   }
   save() {
     try {
-      const dir = path5.dirname(this.filePath);
-      if (!fs5.existsSync(dir)) {
-        fs5.mkdirSync(dir, { recursive: true });
+      const dir = path6.dirname(this.filePath);
+      if (!fs6.existsSync(dir)) {
+        fs6.mkdirSync(dir, { recursive: true });
       }
-      fs5.writeFileSync(
+      fs6.writeFileSync(
         this.filePath,
         JSON.stringify(this.plugins, null, 2),
         "utf-8"
       );
     } catch (e) {
-      logger179.error("Failed to save plugin registry:", e);
+      logger180.error("Failed to save plugin registry:", e);
     }
   }
   getAll() {
@@ -137031,19 +137136,35 @@ function pluginApi(bridgeService, storageLocation) {
     }
     return bridge;
   }
-  router.post("/:bridgeId/:pluginName/enable", (req, res) => {
+  router.post("/:bridgeId/:pluginName/enable", async (req, res) => {
     const bridge = pluginBridge(req.params.bridgeId, res);
     if (!bridge) return;
     const { pluginName } = req.params;
-    bridge.enablePlugin(pluginName);
-    res.json({ success: true, pluginName, enabled: true });
+    const metadata = await bridge.enablePlugin(pluginName);
+    if (!metadata) {
+      res.status(404).json({ error: "Plugin not found" });
+      return;
+    }
+    res.json({
+      success: metadata.enabled === true,
+      pluginName,
+      enabled: metadata.enabled
+    });
   });
-  router.post("/:bridgeId/:pluginName/disable", (req, res) => {
+  router.post("/:bridgeId/:pluginName/disable", async (req, res) => {
     const bridge = pluginBridge(req.params.bridgeId, res);
     if (!bridge) return;
     const { pluginName } = req.params;
-    bridge.disablePlugin(pluginName);
-    res.json({ success: true, pluginName, enabled: false });
+    const metadata = await bridge.disablePlugin(pluginName);
+    if (!metadata) {
+      res.status(404).json({ error: "Plugin not found" });
+      return;
+    }
+    res.json({
+      success: metadata.enabled === false,
+      pluginName,
+      enabled: metadata.enabled
+    });
   });
   router.get("/:bridgeId/:pluginName/config-schema", (req, res) => {
     const bridge = pluginBridge(req.params.bridgeId, res);
@@ -137244,7 +137365,7 @@ function pluginApi(bridgeService, storageLocation) {
 }
 
 // src/api/proxy-support.ts
-import path6 from "node:path";
+import path7 from "node:path";
 var ingressPath = "x-ingress-path";
 var forwardedPrefix = "x-forwarded-prefix";
 function supportIngress(req, _, next) {
@@ -137283,7 +137404,7 @@ function supportProxyLocation(req, res, next) {
   next();
 }
 function buildPath(...paths) {
-  let result = path6.posix.join(...paths);
+  let result = path7.posix.join(...paths);
   if (!result.startsWith("/")) {
     result = `/${result}`;
   }
@@ -137555,7 +137676,7 @@ import { promisify } from "node:util";
 import v8 from "node:v8";
 import express15 from "express";
 var execAsync = promisify(exec);
-var logger180 = Logger.get("SystemApi");
+var logger181 = Logger.get("SystemApi");
 function detectEnvironment2() {
   if (process.env.SUPERVISOR_TOKEN || process.env.HASSIO_TOKEN) {
     return "Home Assistant Add-on";
@@ -137602,7 +137723,7 @@ function systemApi(version2) {
       const data = await response.json();
       res.json(toUpdateCheckResponse(version2, data, detectEnvironment2()));
     } catch (error) {
-      logger180.error("Failed to check for updates:", error);
+      logger181.error("Failed to check for updates:", error);
       res.status(500).json({ error: "Failed to check for updates" });
     }
   });
@@ -137651,7 +137772,7 @@ function systemApi(version2) {
       };
       res.json(systemInfo);
     } catch (error) {
-      logger180.error("Failed to get system info:", error);
+      logger181.error("Failed to get system info:", error);
       res.status(500).json({ error: "Failed to get system info" });
     }
   });
@@ -137694,7 +137815,7 @@ async function getStorageInfo() {
       return await getUnixStorageInfo(pathToCheck);
     }
   } catch (error) {
-    logger180.error("Failed to get storage info:", error);
+    logger181.error("Failed to get storage info:", error);
     return { total: 0, used: 0, free: 0 };
   }
 }
@@ -137763,8 +137884,8 @@ async function getUnixStorageInfo(path14) {
 }
 
 // src/api/web-ui.ts
-import fs6 from "node:fs";
-import path7 from "node:path";
+import fs7 from "node:fs";
+import path8 from "node:path";
 import express16 from "express";
 function webUi(dist) {
   const router = express16.Router();
@@ -137783,7 +137904,7 @@ function replaceBase(dist) {
     if (!baseUrl.endsWith("/")) {
       baseUrl += "/";
     }
-    const content = fs6.readFileSync(path7.join(dist, "index.html"), "utf8").replace(
+    const content = fs7.readFileSync(path8.join(dist, "index.html"), "utf8").replace(
       /<!-- BASE -->[\s\S]*<!-- \/BASE -->/,
       `<base href='${baseUrl}' />`
     );
@@ -138379,7 +138500,7 @@ var FilteredNetwork = class extends NodeJsNetwork {
 };
 
 // src/core/app/mdns.ts
-var logger181 = Logger.get("Mdns");
+var logger182 = Logger.get("Mdns");
 function mdns(env, options) {
   if (options.stripGlobalIpv6) {
     env.set(Network, new FilteredNetwork());
@@ -138394,7 +138515,7 @@ function mdns(env, options) {
 function warnAboutAdvertising(options) {
   const choice = selectMdnsInterface(os5.networkInterfaces());
   if (choice.hasGlobalIpv6) {
-    logger181.warn(
+    logger182.warn(
       "Matter mDNS is advertising a global IPv6 address that controllers may not reach on the LAN, so devices can show No Response (#361). Set mdns-strip-global-ipv6 if devices stay unreachable."
     );
   }
@@ -138403,7 +138524,7 @@ function warnAboutAdvertising(options) {
   }
   const suggestion = choice.selected ? ` Likely LAN interface: ${choice.selected}.` : "";
   if (choice.hasThreadInterface) {
-    logger181.warn(
+    logger182.warn(
       `Matter mDNS is advertising on an OpenThread/OTBR interface (wpan/otbr) whose mesh-local address controllers cannot reach, so devices may show offline (#388). Set mdns-network-interface to your LAN interface.${suggestion}`
     );
   }
@@ -138411,16 +138532,16 @@ function warnAboutAdvertising(options) {
     return;
   }
   const list3 = choice.external.map((i) => `${i.name} (${i.ipv4[0] ?? i.ipv6[0] ?? "?"})`).join(", ");
-  logger181.warn(
+  logger182.warn(
     `Matter mDNS is advertising on several interfaces including likely Docker-internal ones, so controllers may show devices as offline (#361). Set mdns-network-interface to your LAN interface.${suggestion} Interfaces: ${list3}.`
   );
 }
 
 // src/core/app/storage.ts
 init_esm7();
-import fs7 from "node:fs";
+import fs8 from "node:fs";
 import os6 from "node:os";
-import path8 from "node:path";
+import path9 from "node:path";
 
 // src/core/app/storage/custom-storage.ts
 init_dist();
@@ -138440,7 +138561,7 @@ var CustomStorage = class extends FileStorageDriver {
 // src/core/app/storage.ts
 function storage(environment, options) {
   const location = resolveStorageLocation(options.location);
-  fs7.mkdirSync(location, { recursive: true });
+  fs8.mkdirSync(location, { recursive: true });
   environment.get(VariableService).set("storage.path", location);
   const storageService = environment.get(StorageService);
   storageService.registerDriver({
@@ -138455,7 +138576,7 @@ function storage(environment, options) {
 }
 function resolveStorageLocation(storageLocation) {
   const homedir = os6.homedir();
-  return storageLocation ? path8.resolve(storageLocation.replace(/^~\//, `${homedir}/`)) : path8.join(homedir, ".home-assistant-matter-hub");
+  return storageLocation ? path9.resolve(storageLocation.replace(/^~\//, `${homedir}/`)) : path9.join(homedir, ".home-assistant-matter-hub");
 }
 
 // src/core/app/configure-default-environment.ts
@@ -138475,7 +138596,7 @@ function configureDefaultEnvironment(options) {
 init_esm7();
 import { createRequire } from "node:module";
 import os7 from "node:os";
-import path9 from "node:path";
+import path10 from "node:path";
 function resolveAppVersion() {
   try {
     const require2 = createRequire(import.meta.url);
@@ -138545,7 +138666,7 @@ var Options = class {
   resolveStorageLocation() {
     const storageLocation = notEmpty(this.startOptions.storageLocation);
     const homedir = os7.homedir();
-    return storageLocation ? path9.resolve(storageLocation.replace(/^~\//, `${homedir}/`)) : path9.join(homedir, ".home-assistant-matter-hub");
+    return storageLocation ? path10.resolve(storageLocation.replace(/^~\//, `${homedir}/`)) : path10.join(homedir, ".home-assistant-matter-hub");
   }
   get bridgeService() {
     return {
@@ -138585,8 +138706,8 @@ init_esm7();
 
 // src/services/backup/backup-service.ts
 init_esm();
-import fs8 from "node:fs";
-import path10 from "node:path";
+import fs9 from "node:fs";
+import path11 from "node:path";
 import archiver2 from "archiver";
 var BackupService = class {
   constructor(bridgeStorage, mappingStorage, settingsStorage, props) {
@@ -138594,8 +138715,8 @@ var BackupService = class {
     this.mappingStorage = mappingStorage;
     this.settingsStorage = settingsStorage;
     this.props = props;
-    this.backupDir = path10.join(props.storageLocation, "backups");
-    fs8.mkdirSync(this.backupDir, { recursive: true });
+    this.backupDir = path11.join(props.storageLocation, "backups");
+    fs9.mkdirSync(this.backupDir, { recursive: true });
   }
   bridgeStorage;
   mappingStorage;
@@ -138609,7 +138730,7 @@ var BackupService = class {
     const dateStr = now.toISOString().replace(/T/, "_").replace(/:/g, "-").replace(/\.\d+Z$/, "");
     const prefix = auto ? "auto" : "manual";
     const filename = `hamh-${prefix}-${version2}-${dateStr}.zip`;
-    const filepath = path10.join(this.backupDir, filename);
+    const filepath = path11.join(this.backupDir, filename);
     const bridges = this.bridgeStorage.bridges;
     const entityMappings = {};
     for (const bridge of bridges) {
@@ -138619,9 +138740,9 @@ var BackupService = class {
       }
     }
     let includesIcons = false;
-    const iconsDir = path10.join(this.props.storageLocation, "bridge-icons");
-    if (fs8.existsSync(iconsDir)) {
-      const iconFiles = fs8.readdirSync(iconsDir);
+    const iconsDir = path11.join(this.props.storageLocation, "bridge-icons");
+    if (fs9.existsSync(iconsDir)) {
+      const iconFiles = fs9.readdirSync(iconsDir);
       includesIcons = iconFiles.some((f) => {
         const bridgeId = f.split(".")[0];
         return bridges.some((b) => b.id === bridgeId);
@@ -138638,7 +138759,7 @@ var BackupService = class {
       auto
     };
     await new Promise((resolve11, reject) => {
-      const output = fs8.createWriteStream(filepath);
+      const output = fs9.createWriteStream(filepath);
       const archive = archiver2("zip", { zlib: { level: 9 } });
       output.on("close", () => resolve11());
       archive.on("error", (err) => reject(err));
@@ -138662,20 +138783,27 @@ var BackupService = class {
         { name: "README.txt" }
       );
       for (const bridge of bridges) {
-        const bridgeStoragePath = path10.join(
+        const bridgeStoragePath = path11.join(
           this.props.storageLocation,
           bridge.id
         );
-        if (fs8.existsSync(bridgeStoragePath)) {
+        if (fs9.existsSync(bridgeStoragePath)) {
           archive.directory(bridgeStoragePath, `identity/${bridge.id}`);
         }
+        const pluginState = pluginStateFilePath(
+          this.props.storageLocation,
+          bridge.id
+        );
+        if (fs9.existsSync(pluginState)) {
+          archive.file(pluginState, { name: `plugin-state/${bridge.id}.json` });
+        }
       }
       if (includesIcons) {
-        const iconFiles = fs8.readdirSync(iconsDir);
+        const iconFiles = fs9.readdirSync(iconsDir);
         for (const iconFile of iconFiles) {
           const bridgeId = iconFile.split(".")[0];
           if (bridges.some((b) => b.id === bridgeId)) {
-            archive.file(path10.join(iconsDir, iconFile), {
+            archive.file(path11.join(iconsDir, iconFile), {
               name: `bridge-icons/${iconFile}`
             });
           }
@@ -138683,7 +138811,7 @@ var BackupService = class {
       }
       archive.finalize();
     });
-    const stat4 = fs8.statSync(filepath);
+    const stat4 = fs9.statSync(filepath);
     const metadata = {
       filename,
       version: version2,
@@ -138711,13 +138839,13 @@ var BackupService = class {
     }
   }
   listBackups() {
-    if (!fs8.existsSync(this.backupDir)) {
+    if (!fs9.existsSync(this.backupDir)) {
       return [];
     }
-    const files = fs8.readdirSync(this.backupDir).filter((f) => f.startsWith("hamh-") && f.endsWith(".zip"));
+    const files = fs9.readdirSync(this.backupDir).filter((f) => f.startsWith("hamh-") && f.endsWith(".zip"));
     return files.map((filename) => {
       try {
-        const stat4 = fs8.statSync(path10.join(this.backupDir, filename));
+        const stat4 = fs9.statSync(path11.join(this.backupDir, filename));
         const parsed = this.parseFilename(filename);
         return {
           filename,
@@ -138737,8 +138865,8 @@ var BackupService = class {
     if (filename.includes("..") || filename.includes("/")) {
       return null;
     }
-    const filepath = path10.join(this.backupDir, filename);
-    if (!fs8.existsSync(filepath)) {
+    const filepath = path11.join(this.backupDir, filename);
+    if (!fs9.existsSync(filepath)) {
       return null;
     }
     return filepath;
@@ -138747,7 +138875,7 @@ var BackupService = class {
     const filepath = this.getBackupPath(filename);
     if (!filepath) return false;
     try {
-      fs8.unlinkSync(filepath);
+      fs9.unlinkSync(filepath);
       this.log.info(`Backup deleted: ${filename}`);
       return true;
     } catch (e) {
@@ -139327,7 +139455,7 @@ async function getAreaRegistry(connection, timeoutMs) {
 }
 
 // src/services/home-assistant/home-assistant-registry.ts
-var logger182 = Logger.get("HomeAssistantRegistry");
+var logger183 = Logger.get("HomeAssistantRegistry");
 var HomeAssistantRegistry = class extends Service {
   constructor(client, options) {
     super("HomeAssistantRegistry");
@@ -139362,7 +139490,7 @@ var HomeAssistantRegistry = class extends Service {
     try {
       await this.reload();
     } catch (e) {
-      logger182.warn(
+      logger183.warn(
         "Initial registry fetch failed, starting empty and relying on auto-refresh:",
         e
       );
@@ -139376,7 +139504,7 @@ var HomeAssistantRegistry = class extends Service {
     let refreshing = false;
     this.autoRefresh = setInterval(async () => {
       if (refreshing) {
-        logger182.debug("Skipping registry refresh, previous tick still running");
+        logger183.debug("Skipping registry refresh, previous tick still running");
         return;
       }
       refreshing = true;
@@ -139386,7 +139514,7 @@ var HomeAssistantRegistry = class extends Service {
           await onRefresh();
         }
       } catch (e) {
-        logger182.warn("Failed to refresh registry, will retry next interval:", e);
+        logger183.warn("Failed to refresh registry, will retry next interval:", e);
       } finally {
         refreshing = false;
       }
@@ -139404,7 +139532,7 @@ var HomeAssistantRegistry = class extends Service {
       baseDelayMs: 2e3,
       maxDelayMs: 3e4,
       onRetry: (attempt, error, delayMs) => {
-        logger182.warn(
+        logger183.warn(
           `Registry fetch failed (attempt ${attempt}), retrying in ${delayMs}ms:`,
           error
         );
@@ -139417,7 +139545,7 @@ var HomeAssistantRegistry = class extends Service {
       return await this.runRegistryQueries();
     } catch (e) {
       if (!isConnectionLost(e)) throw e;
-      logger182.debug("Registry fetch hit connection drop, waiting for reconnect");
+      logger183.debug("Registry fetch hit connection drop, waiting for reconnect");
       await this.waitForConnection(6e4);
       return await this.runRegistryQueries();
     }
@@ -139425,7 +139553,7 @@ var HomeAssistantRegistry = class extends Service {
   async waitForConnection(timeoutMs) {
     const connection = this.client.connection;
     if (connection.connected) return;
-    logger182.debug("Connection not ready, waiting for reconnect...");
+    logger183.debug("Connection not ready, waiting for reconnect...");
     await new Promise((resolve11) => {
       const timeout = setTimeout(() => {
         connection.removeEventListener("ready", onReady);
@@ -139486,7 +139614,7 @@ var HomeAssistantRegistry = class extends Service {
     const fingerprint = hash2.digest("hex");
     this._states = keyBy(statesList, "entity_id");
     if (fingerprint === this.lastRegistryFingerprint) {
-      logger182.debug("Registry unchanged, skipping full refresh");
+      logger183.debug("Registry unchanged, skipping full refresh");
       return false;
     }
     this.lastRegistryFingerprint = fingerprint;
@@ -139507,10 +139635,10 @@ var HomeAssistantRegistry = class extends Service {
     const missingDevices = fromPairs(missingDeviceIds.map((d) => [d, { id: d }]));
     this._devices = { ...missingDevices, ...realDevices };
     this._entities = allEntities;
-    logger182.debug(
+    logger183.debug(
       `Loaded HA registry: ${keys(allEntities).length} entities, ${keys(realDevices).length} devices, ${keys(this._states).length} states`
     );
-    logMemoryUsage(logger182, "after HA registry load");
+    logMemoryUsage(logger183, "after HA registry load");
     this._labels = labels;
     this._areas = new Map(areas.map((a) => [a.area_id, a.name]));
     return true;
@@ -139966,6 +140094,7 @@ var EntityMappingStorage = class extends Service {
       currentRoomEntity: request.currentRoomEntity?.trim() || void 0,
       cleanedAreaEntity: request.cleanedAreaEntity?.trim() || void 0,
       vacuumAscendingRoomOrder: request.vacuumAscendingRoomOrder || void 0,
+      vacuumRoomSwitches: request.vacuumRoomSwitches || void 0,
       disableCustomAreaRoomModes: request.disableCustomAreaRoomModes || void 0,
       valetudoIdentifier: request.valetudoIdentifier?.trim() || void 0,
       coverSwapOpenClose: request.coverSwapOpenClose || void 0,
@@ -139983,7 +140112,7 @@ var EntityMappingStorage = class extends Service {
       composedEntities: request.composedEntities?.filter((e) => e.entityId?.trim()) ?? void 0,
       disableMomentaryFlip: request.disableMomentaryFlip || void 0
     };
-    if (!config8.matterDeviceType && !config8.customName && !config8.customProductName && !config8.customVendorName && !config8.customSerialNumber && config8.customVendorId === void 0 && config8.disabled !== true && !config8.filterLifeEntity && !config8.cleaningModeEntity && !config8.temperatureEntity && !config8.humidityEntity && !config8.batteryEntity && !config8.disableBatteryMapping && !config8.chargingStateEntity && !config8.roomEntities && !config8.disableLockPin && !config8.lockUsercodeService && config8.lockUsercodeSlot === void 0 && config8.lockPinMinLength === void 0 && config8.lockPinMaxLength === void 0 && !config8.powerEntity && !config8.energyEntity && !config8.meterSerialNumber && !config8.pointOfDelivery && !config8.voltageEntity && !config8.currentEntity && !config8.batteryPowerEntity && !config8.batteryEnergyEntity && !config8.chargingSwitchEntity && !config8.currentLimitEntity && !config8.pressureEntity && !config8.suctionLevelEntity && !config8.mopIntensityEntity && (!config8.customServiceAreas || config8.customServiceAreas.length === 0) && (!config8.customFanSpeedTags || Object.keys(config8.customFanSpeedTags).length === 0) && (!config8.fanWindPresets || (config8.fanWindPresets.natural?.length ?? 0) === 0 && (config8.fanWindPresets.sleep?.length ?? 0) === 0) && !config8.fanRestoreSpeedOnPowerOn && !config8.currentRoomEntity && !config8.cleanedAreaEntity && !config8.vacuumAscendingRoomOrder && !config8.disableCustomAreaRoomModes && !config8.valetudoIdentifier && !config8.coverSwapOpenClose && !config8.coverExposeAsDimmableLight && !config8.selectExposeAsSwitch && !config8.selectSwitchOnOption && !config8.selectSwitchOffOption && !config8.coverSliderDebounceMs && !config8.updateThrottleMs && !config8.disableClimateOnOff && !config8.disableClimateFanControl && !config8.climateKeepModeOnIdle && !config8.climateExposeFan && !config8.climateAutoMode && (!config8.composedEntities || config8.composedEntities.length === 0) && !config8.disableMomentaryFlip) {
+    if (!config8.matterDeviceType && !config8.customName && !config8.customProductName && !config8.customVendorName && !config8.customSerialNumber && config8.customVendorId === void 0 && config8.disabled !== true && !config8.filterLifeEntity && !config8.cleaningModeEntity && !config8.temperatureEntity && !config8.humidityEntity && !config8.batteryEntity && !config8.disableBatteryMapping && !config8.chargingStateEntity && !config8.roomEntities && !config8.disableLockPin && !config8.lockUsercodeService && config8.lockUsercodeSlot === void 0 && config8.lockPinMinLength === void 0 && config8.lockPinMaxLength === void 0 && !config8.powerEntity && !config8.energyEntity && !config8.meterSerialNumber && !config8.pointOfDelivery && !config8.voltageEntity && !config8.currentEntity && !config8.batteryPowerEntity && !config8.batteryEnergyEntity && !config8.chargingSwitchEntity && !config8.currentLimitEntity && !config8.pressureEntity && !config8.suctionLevelEntity && !config8.mopIntensityEntity && (!config8.customServiceAreas || config8.customServiceAreas.length === 0) && (!config8.customFanSpeedTags || Object.keys(config8.customFanSpeedTags).length === 0) && (!config8.fanWindPresets || (config8.fanWindPresets.natural?.length ?? 0) === 0 && (config8.fanWindPresets.sleep?.length ?? 0) === 0) && !config8.fanRestoreSpeedOnPowerOn && !config8.currentRoomEntity && !config8.cleanedAreaEntity && !config8.vacuumAscendingRoomOrder && !config8.vacuumRoomSwitches && !config8.disableCustomAreaRoomModes && !config8.valetudoIdentifier && !config8.coverSwapOpenClose && !config8.coverExposeAsDimmableLight && !config8.selectExposeAsSwitch && !config8.selectSwitchOnOption && !config8.selectSwitchOffOption && !config8.coverSliderDebounceMs && !config8.updateThrottleMs && !config8.disableClimateOnOff && !config8.disableClimateFanControl && !config8.climateKeepModeOnIdle && !config8.climateExposeFan && !config8.climateAutoMode && (!config8.composedEntities || config8.composedEntities.length === 0) && !config8.disableMomentaryFlip) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config8);
@@ -140382,7 +140511,7 @@ var __privateIn5 = (member, obj) => Object(obj) !== obj ? __typeError50('Cannot
 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 logger183 = Logger.get("ScenesManagementServer");
+var logger184 = Logger.get("ScenesManagementServer");
 var UNDEFINED_SCENE_ID = 255;
 function constraintErrorWithSceneId(groupId22, sceneId) {
   const response = { status: Status2.ConstraintError, groupId: groupId22, sceneId };
@@ -140509,11 +140638,11 @@ var ScenesManagementServer = class extends ScenesManagementBase {
         return { status: Status2.ResourceExhausted, groupId: groupId22, sceneId };
       }
       this.state.sceneTable.push(sceneData);
-      logger183.debug(`Added scene ${sceneId} in group ${groupId22} for fabric ${fabricIndex}`);
+      logger184.debug(`Added scene ${sceneId} in group ${groupId22} for fabric ${fabricIndex}`);
       this.#updateFabricSceneInfoCountsForFabric(fabricIndex);
     } else {
       this.state.sceneTable[existingSceneIndex] = sceneData;
-      logger183.debug(`Updated scene ${sceneId} in group ${groupId22} for fabric ${fabricIndex}`);
+      logger184.debug(`Updated scene ${sceneId} in group ${groupId22} for fabric ${fabricIndex}`);
     }
     return { status: Status2.Success, groupId: groupId22, sceneId };
   }
@@ -140816,20 +140945,20 @@ var ScenesManagementServer = class extends ScenesManagementBase {
       }
     }
     if (fieldCount !== 2) {
-      logger183.warn(
+      logger184.warn(
         `AttributeValuePair has invalid number (${fieldCount}) of fields (${serialize(attributeValuePair)})`
       );
       return void 0;
     }
     const value = attributeValuePair[mappedType];
     if (value === void 0) {
-      logger183.warn(
+      logger184.warn(
         `AttributeValuePair missing value for mappedType ${mappedType} (${serialize(attributeValuePair)})`
       );
       return void 0;
     }
     if (typeof value !== "number" && typeof value !== "bigint") {
-      logger183.warn(
+      logger184.warn(
         `AttributeValuePair has invalid non-numeric value for mappedType ${mappedType} (${serialize(attributeValuePair)})`
         // Should never happen
       );
@@ -140927,7 +141056,7 @@ var ScenesManagementServer = class extends ScenesManagementBase {
     } else if (schema6.schema.baseTypeMin < 0 && schema6.schema.min > schema6.schema.baseTypeMin) {
       return { attributeId, [mappedType]: schema6.schema.baseTypeMin };
     } else {
-      logger183.warn(
+      logger184.warn(
         `Cannot determine out-of-bounds value for attribute schema, returning min value of datatype schema`
       );
     }
@@ -140948,7 +141077,7 @@ var ScenesManagementServer = class extends ScenesManagementBase {
         }
       }
     });
-    logger183.debug(`Collected scene attribute values on Endpoint ${this.endpoint.id}: ${serialize(sceneValues)}`);
+    logger184.debug(`Collected scene attribute values on Endpoint ${this.endpoint.id}: ${serialize(sceneValues)}`);
     return sceneValues;
   }
   /**
@@ -140987,7 +141116,7 @@ var ScenesManagementServer = class extends ScenesManagementBase {
       }
       const attrType = attribute.primitiveBase?.name;
       if (attrType === void 0 || DataTypeToSceneAttributeDataMap[attrType] === void 0) {
-        logger183.warn(
+        logger184.warn(
           `Scene Attribute ${attribute.name} on Cluster ${clusterName} has unsupported datatype ${attrType} for scene management on Endpoint ${this.endpoint.id}`
         );
         continue;
@@ -141002,7 +141131,7 @@ var ScenesManagementServer = class extends ScenesManagementBase {
       });
     }
     if (sceneClusterDetails) {
-      logger183.info(
+      logger184.info(
         `Registered ${sceneClusterDetails.attributes.size} scene attributes for Cluster ${clusterName} on Endpoint ${this.endpoint.id}`
       );
       this.internal.endpointSceneableBehaviors.add(sceneClusterDetails);
@@ -141010,7 +141139,7 @@ var ScenesManagementServer = class extends ScenesManagementBase {
   }
   /** Apply scene attribute values in the various clusters on the endpoint. */
   #applySceneAttributeValues(sceneValues, transitionTime = null) {
-    logger183.debug(`Recalling scene on Endpoint ${this.endpoint.id} with values: ${serialize(sceneValues)}`);
+    logger184.debug(`Recalling scene on Endpoint ${this.endpoint.id} with values: ${serialize(sceneValues)}`);
     const agent = this.endpoint.agentFor(this.context);
     const promises = [];
     for (const [clusterName, clusterAttributes] of Object.entries(sceneValues)) {
@@ -141021,7 +141150,7 @@ var ScenesManagementServer = class extends ScenesManagementBase {
           promises.push(result);
         }
       } else {
-        logger183.warn(
+        logger184.warn(
           `No scenes implementation found for cluster ${clusterName} on Endpoint ${this.endpoint.id} during scene recall. Values are ignored`
         );
       }
@@ -141029,7 +141158,7 @@ var ScenesManagementServer = class extends ScenesManagementBase {
     if (promises.length) {
       return Promise.all(promises).then(
         () => void 0,
-        (error) => logger183.warn(`Error applying scene attribute values on Endpoint ${this.endpoint.id}:`, error)
+        (error) => logger184.warn(`Error applying scene attribute values on Endpoint ${this.endpoint.id}:`, error)
       );
     }
   }
@@ -141222,7 +141351,7 @@ var GroupsBehaviorConstructor = ClusterBehavior.for(Groups4);
 var GroupsBehavior = GroupsBehaviorConstructor;
 
 // ../../node_modules/.pnpm/@matter+node@0.17.9_patch_hash=e3376f1c2fdd0a0df09b8d04625a4d7af65b47d7277cc88cdb80baf7fb32bd0d/node_modules/@matter/node/dist/esm/behaviors/groups/GroupsServer.js
-var logger184 = Logger.get("GroupsServer");
+var logger185 = Logger.get("GroupsServer");
 var { commands: commands3 } = Groups4.schema;
 var addGroup = commands3.require("AddGroup");
 var addGroupIfIdentifying = commands3.require("AddGroupIfIdentifying");
@@ -141301,7 +141430,7 @@ var GroupsServer = class extends GroupsBase {
         (fabric2, gkm) => gkm.addEndpointForGroup(fabric2, groupId3, endpointNumber, groupName)
       );
     } catch (error) {
-      logger184.debug("Could not add group", error);
+      logger185.debug("Could not add group", error);
       StatusResponseError.accept(error);
       return { status: error.code, groupId: groupId3 };
     }
@@ -141978,7 +142107,7 @@ var SwitchBehavior = SwitchBehaviorConstructor;
 // ../../node_modules/.pnpm/@matter+node@0.17.9_patch_hash=e3376f1c2fdd0a0df09b8d04625a4d7af65b47d7277cc88cdb80baf7fb32bd0d/node_modules/@matter/node/dist/esm/behaviors/switch/SwitchServer.js
 var DEFAULT_MULTIPRESS_DELAY = Millis(300);
 var DEFAULT_LONG_PRESS_DELAY = Seconds(2);
-var logger185 = Logger.get("SwitchServer");
+var logger186 = Logger.get("SwitchServer");
 var SwitchServerBase = SwitchBehavior.with(
   Switch3.Feature.LatchingSwitch,
   Switch3.Feature.MomentarySwitch,
@@ -142031,7 +142160,7 @@ var SwitchBaseServer = class extends SwitchServerBase {
     this.internal.currentIsLongPress = false;
     this.internal.multiPressTimer?.stop();
     this.internal.longPressTimer?.stop();
-    logger185.info("State of Switch got reset");
+    logger186.info("State of Switch got reset");
   }
   // TODO remove when Validator logic can assess that with 1.3 introduction
   #assertPositionInRange(position) {
@@ -142269,11 +142398,11 @@ var WebRtcTransportRequestorBehaviorConstructor = ClusterBehavior.for(WebRtcTran
 var WebRtcTransportRequestorBehavior = WebRtcTransportRequestorBehaviorConstructor;
 
 // ../../node_modules/.pnpm/@matter+node@0.17.9_patch_hash=e3376f1c2fdd0a0df09b8d04625a4d7af65b47d7277cc88cdb80baf7fb32bd0d/node_modules/@matter/node/dist/esm/behaviors/web-rtc-transport-requestor/WebRtcTransportRequestorServer.js
-var logger186 = Logger.get("WebRtcTransportRequestorServer");
+var logger187 = Logger.get("WebRtcTransportRequestorServer");
 var WebRtcTransportRequestorServer = class extends WebRtcTransportRequestorBehavior {
   async initialize() {
     const node = Node.forEndpoint(this.endpoint);
-    logger186.info(
+    logger187.info(
       `WebRtcTransportRequestor initialized on endpoint=${this.endpoint.number} (id="${this.endpoint.id}")`
     );
     this.reactTo(node.lifecycle.online, this.#nodeOnline);
@@ -142339,7 +142468,7 @@ var WebRtcTransportRequestorServer = class extends WebRtcTransportRequestorBehav
    * `offer` event.
    */
   async offer(request) {
-    logger186.debug(`incoming Offer webRtcSessionId=${request.webRtcSessionId} sdpLen=${request.sdp.length}`);
+    logger187.debug(`incoming Offer webRtcSessionId=${request.webRtcSessionId} sdpLen=${request.sdp.length}`);
     const session = this.#findSessionStrict(request.webRtcSessionId);
     this.events.offer.emit(session, request);
   }
@@ -142348,7 +142477,7 @@ var WebRtcTransportRequestorServer = class extends WebRtcTransportRequestorBehav
    * `answer` event.
    */
   async answer(request) {
-    logger186.debug(`incoming Answer webRtcSessionId=${request.webRtcSessionId} sdpLen=${request.sdp.length}`);
+    logger187.debug(`incoming Answer webRtcSessionId=${request.webRtcSessionId} sdpLen=${request.sdp.length}`);
     const session = this.#findSessionStrict(request.webRtcSessionId);
     this.events.answer.emit(session, request.sdp);
   }
@@ -142356,7 +142485,7 @@ var WebRtcTransportRequestorServer = class extends WebRtcTransportRequestorBehav
    *  `iceCandidates` event.
    */
   async iceCandidates(request) {
-    logger186.debug(
+    logger187.debug(
       `incoming ICECandidates webRtcSessionId=${request.webRtcSessionId} count=${request.iceCandidates.length}`
     );
     if (request.iceCandidates.length === 0) {
@@ -142369,7 +142498,7 @@ var WebRtcTransportRequestorServer = class extends WebRtcTransportRequestorBehav
    * {@link WebRtcTransportRequestorServer.Events} `end` event.
    */
   async end(request) {
-    logger186.debug(`incoming End webRtcSessionId=${request.webRtcSessionId} reason=${request.reason}`);
+    logger187.debug(`incoming End webRtcSessionId=${request.webRtcSessionId} reason=${request.reason}`);
     const session = this.#findSessionStrict(request.webRtcSessionId);
     this.removeSession(request.webRtcSessionId);
     this.events.end.emit(session, request.reason);
@@ -142814,11 +142943,11 @@ var OccupancySensingBehaviorConstructor = ClusterBehavior.for(OccupancySensing3)
 var OccupancySensingBehavior = OccupancySensingBehaviorConstructor;
 
 // ../../node_modules/.pnpm/@matter+node@0.17.9_patch_hash=e3376f1c2fdd0a0df09b8d04625a4d7af65b47d7277cc88cdb80baf7fb32bd0d/node_modules/@matter/node/dist/esm/behaviors/occupancy-sensing/OccupancySensingServer.js
-var logger187 = Logger.get("OccupancySensingServer");
+var logger188 = Logger.get("OccupancySensingServer");
 var OccupancySensingServer = class extends OccupancySensingBehavior {
   initialize() {
     if (!Object.values(this.features).some((feature) => feature)) {
-      logger187.error(
+      logger188.error(
         `OccupancySensingServer: Since revision 5 of the cluster features need to be set based on the detector type. Currently no features are enabled.`
       );
     } else if (!Object.values(this.state.occupancySensorTypeBitmap).some((feature) => feature) || this.state.occupancySensorType === void 0) {
@@ -142845,7 +142974,7 @@ var OccupancySensingServer = class extends OccupancySensingBehavior {
         } else if (this.state.occupancySensorTypeBitmap.physicalContact) {
           this.state.occupancySensorType = OccupancySensing3.OccupancySensorType.PhysicalContact;
         }
-        logger187.debug(
+        logger188.debug(
           "Sync occupancySensorType to",
           OccupancySensing3.OccupancySensorType[this.state.occupancySensorType],
           "and occupancySensorTypeBitmap to",
@@ -142858,7 +142987,7 @@ var OccupancySensingServer = class extends OccupancySensingBehavior {
     if (this.features.occupancyEvent) {
       this.reactTo(this.events.occupancy$Changed, this.#emitOccupancyChanged);
     } else {
-      logger187.info(
+      logger188.info(
         'OccupancySensingServer: enable the OccupancyEvent feature (e.g. OccupancySensingServer.with("<DetectorType>", "OccupancyEvent")) to emit the OccupancyChanged event.'
       );
     }
@@ -145454,7 +145583,7 @@ function miredsToXy(mireds) {
 }
 
 // ../../node_modules/.pnpm/@matter+node@0.17.9_patch_hash=e3376f1c2fdd0a0df09b8d04625a4d7af65b47d7277cc88cdb80baf7fb32bd0d/node_modules/@matter/node/dist/esm/behaviors/color-control/ColorControlServer.js
-var logger188 = Logger.get("ColorControlServer");
+var logger189 = Logger.get("ColorControlServer");
 var ColorControlBase = ColorControlBehavior.with(
   ColorControl3.Feature.HueSaturation,
   ColorControl3.Feature.EnhancedHue,
@@ -146635,7 +146764,7 @@ var ColorControlBaseServer = class _ColorControlBaseServer extends ColorControlB
       switch (oldMode) {
         case ColorControl3.ColorMode.CurrentHueAndCurrentSaturation:
           if (this.state.currentHue === void 0 || this.state.currentSaturation === void 0) {
-            logger188.warn("Could not convert from hue/saturation because one of them is undefined");
+            logger189.warn("Could not convert from hue/saturation because one of them is undefined");
             break;
           }
           switch (newMode) {
@@ -146647,7 +146776,7 @@ var ColorControlBaseServer = class _ColorControlBaseServer extends ColorControlB
             case ColorControl3.ColorMode.ColorTemperatureMireds:
               const mireds = hsvToMireds(this.hue, this.saturation);
               if (mireds === void 0) {
-                logger188.warn(
+                logger189.warn(
                   `Could not convert hue/saturation (${this.hue}/${this.saturation}) to color temperature`
                 );
               } else {
@@ -146658,7 +146787,7 @@ var ColorControlBaseServer = class _ColorControlBaseServer extends ColorControlB
           break;
         case ColorControl3.ColorMode.CurrentXAndCurrentY:
           if (this.state.currentX === void 0 || this.state.currentY === void 0) {
-            logger188.warn("Could not convert from xy because one of them is undefined");
+            logger189.warn("Could not convert from xy because one of them is undefined");
             break;
           }
           switch (newMode) {
@@ -146670,7 +146799,7 @@ var ColorControlBaseServer = class _ColorControlBaseServer extends ColorControlB
             case ColorControl3.ColorMode.ColorTemperatureMireds:
               const mireds = xyToMireds(this.x, this.y);
               if (mireds === void 0) {
-                logger188.warn(`Could not convert xy ${this.x / this.y} to color temperature`);
+                logger189.warn(`Could not convert xy ${this.x / this.y} to color temperature`);
               } else {
                 this.mireds = mireds;
               }
@@ -146679,14 +146808,14 @@ var ColorControlBaseServer = class _ColorControlBaseServer extends ColorControlB
           break;
         case ColorControl3.ColorMode.ColorTemperatureMireds:
           if (this.state.colorTemperatureMireds === void 0) {
-            logger188.warn("Could not convert from color temperature because it is undefined");
+            logger189.warn("Could not convert from color temperature because it is undefined");
             break;
           }
           switch (newMode) {
             case ColorControl3.ColorMode.CurrentHueAndCurrentSaturation:
               const hsvResult = miredsToHsv(this.mireds);
               if (hsvResult === void 0) {
-                logger188.warn(`Could not convert color temperature ${this.mireds} to hue/saturation`);
+                logger189.warn(`Could not convert color temperature ${this.mireds} to hue/saturation`);
               } else {
                 const [hue, saturation] = hsvResult;
                 this.hue = hue;
@@ -146696,7 +146825,7 @@ var ColorControlBaseServer = class _ColorControlBaseServer extends ColorControlB
             case ColorControl3.ColorMode.CurrentXAndCurrentY:
               const xyResult = miredsToXy(this.mireds);
               if (xyResult === void 0) {
-                logger188.warn("Could not convert color temperature to xy");
+                logger189.warn("Could not convert color temperature to xy");
               } else {
                 const [x, y] = xyResult;
                 this.x = x;
@@ -146745,7 +146874,7 @@ var ColorControlBaseServer = class _ColorControlBaseServer extends ColorControlB
       );
       newColorTemp = tempPhysMax - tempDelta;
     }
-    logger188.debug(`Synced color temperature with level: ${level}, new color temperature: ${newColorTemp}`);
+    logger189.debug(`Synced color temperature with level: ${level}, new color temperature: ${newColorTemp}`);
     return this.moveToColorTemperatureLogic(newColorTemp, 0);
   }
   #assertRate(mode, rate) {
@@ -146949,7 +147078,7 @@ var ColorControlBaseServer = class _ColorControlBaseServer extends ColorControlB
       targetEnhancedColorMode = values4.enhancedColorMode;
     }
     if (!this.#supportsColorMode(targetEnhancedColorMode)) {
-      logger188.info(
+      logger189.info(
         `Can not apply scene with unsupported color mode: ${ColorControl3.EnhancedColorMode[targetEnhancedColorMode]} (${targetEnhancedColorMode})`
       );
     }
@@ -146991,7 +147120,7 @@ var ColorControlBaseServer = class _ColorControlBaseServer extends ColorControlB
         }
         break;
       default:
-        logger188.info(
+        logger189.info(
           `No supported color mode found to apply scene: ${ColorControl3.EnhancedColorMode[targetEnhancedColorMode]} (${targetEnhancedColorMode})`
         );
         break;
@@ -147086,7 +147215,7 @@ var LevelControlBehaviorConstructor = ClusterBehavior.for(LevelControl3);
 var LevelControlBehavior = LevelControlBehaviorConstructor;
 
 // ../../node_modules/.pnpm/@matter+node@0.17.9_patch_hash=e3376f1c2fdd0a0df09b8d04625a4d7af65b47d7277cc88cdb80baf7fb32bd0d/node_modules/@matter/node/dist/esm/behaviors/level-control/LevelControlServer.js
-var logger189 = Logger.get("LevelControlServer");
+var logger190 = Logger.get("LevelControlServer");
 var LevelControlBase = LevelControlBehavior.with(LevelControl3.Feature.OnOff, LevelControl3.Feature.Lighting);
 var LevelControlBaseServer = class _LevelControlBaseServer extends LevelControlBase {
   /** Returns the minimum level, including feature specific fallback value handling. */
@@ -147179,17 +147308,17 @@ var LevelControlBaseServer = class _LevelControlBaseServer extends LevelControlB
    */
   initializeLighting() {
     if (this.state.currentLevel === 0) {
-      logger189.warn(
+      logger190.warn(
         `The currentLevel value of ${this.state.currentLevel} is invalid according to Matter specification. The value must not be 0.`
       );
     }
     if (this.minLevel !== 1) {
-      logger189.warn(
+      logger190.warn(
         `The minLevel value of ${this.minLevel} is invalid according to Matter specification. The value should be 1.`
       );
     }
     if (this.maxLevel !== 254) {
-      logger189.warn(
+      logger190.warn(
         `The maxLevel value of ${this.maxLevel} is invalid according to Matter specification. The value should be 254.`
       );
     }
@@ -147500,7 +147629,7 @@ var LevelControlBaseServer = class _LevelControlBaseServer extends LevelControlB
     if (!onOff || this.state.onLevel === null) {
       return;
     }
-    logger189.debug(`OnOff changed to ON, setting level to onLevel value of ${this.state.onLevel}`);
+    logger190.debug(`OnOff changed to ON, setting level to onLevel value of ${this.state.onLevel}`);
     this.state.currentLevel = this.state.onLevel;
   }
   #calculateEffectiveOptions(optionsMask, optionsOverride) {
@@ -150563,7 +150692,7 @@ var ModeSelectBehaviorConstructor = ClusterBehavior.for(ModeSelect3);
 var ModeSelectBehavior = ModeSelectBehaviorConstructor;
 
 // ../../node_modules/.pnpm/@matter+node@0.17.9_patch_hash=e3376f1c2fdd0a0df09b8d04625a4d7af65b47d7277cc88cdb80baf7fb32bd0d/node_modules/@matter/node/dist/esm/behaviors/mode-select/ModeSelectServer.js
-var logger190 = Logger.get("ModeSelectServer");
+var logger191 = Logger.get("ModeSelectServer");
 var ModeSelectBase = ModeSelectBehavior.with(ModeSelect3.Feature.OnOff);
 var ModeSelectBaseServer = class extends ModeSelectBase {
   initialize() {
@@ -150580,7 +150709,7 @@ var ModeSelectBaseServer = class extends ModeSelectBase {
         }
         this.reactTo(onOffServer.events.onOff$Changed, this.#handleOnOffDependency);
       } else {
-        logger190.warn("OnOffServer not found on endpoint, but OnMode is set.");
+        logger191.warn("OnOffServer not found on endpoint, but OnMode is set.");
       }
     }
     if (!currentModeOverridden && this.state.startUpMode !== void 0 && this.state.startUpMode !== null && this.#getBootReason() !== GeneralDiagnostics3.BootReason.SoftwareUpdateCompleted) {
@@ -151781,7 +151910,7 @@ init_esm3();
 
 // ../../node_modules/.pnpm/@matter+node@0.17.9_patch_hash=e3376f1c2fdd0a0df09b8d04625a4d7af65b47d7277cc88cdb80baf7fb32bd0d/node_modules/@matter/node/dist/esm/behaviors/thermostat/AtomicWriteState.js
 init_esm();
-var logger191 = Logger.get("AtomicWriteState");
+var logger192 = Logger.get("AtomicWriteState");
 var MAXIMUM_ALLOWED_TIMEOUT = Seconds(9);
 var AtomicWriteState = class {
   peerAddress;
@@ -151816,19 +151945,19 @@ var AtomicWriteState = class {
     });
   }
   start() {
-    logger191.debug(
+    logger192.debug(
       `Starting atomic write state for peer ${this.peerAddress.toString()} on endpoint ${this.endpoint.id}`
     );
     this.#timer.start();
   }
   #timeoutTriggered() {
-    logger191.debug(
+    logger192.debug(
       `Atomic write state for peer ${this.peerAddress.toString()} on endpoint ${this.endpoint.id} timed out`
     );
     this.close();
   }
   close() {
-    logger191.debug(
+    logger192.debug(
       `Closing atomic write state for peer ${this.peerAddress.toString()} on endpoint ${this.endpoint.id}`
     );
     if (this.#timer.isRunning) {
@@ -151839,7 +151968,7 @@ var AtomicWriteState = class {
 };
 
 // ../../node_modules/.pnpm/@matter+node@0.17.9_patch_hash=e3376f1c2fdd0a0df09b8d04625a4d7af65b47d7277cc88cdb80baf7fb32bd0d/node_modules/@matter/node/dist/esm/behaviors/thermostat/AtomicWriteHandler.js
-var logger192 = Logger.get("AtomicWriteHandler");
+var logger193 = Logger.get("AtomicWriteHandler");
 var AtomicWriteHandler = class _AtomicWriteHandler {
   #observers = new ObserverGroup();
   #pendingWrites = new BasicSet();
@@ -151901,7 +152030,7 @@ var AtomicWriteHandler = class _AtomicWriteHandler {
       this.#pendingWrites.add(state);
       state.closed.on(() => void this.#pendingWrites.delete(state));
       state.start();
-      logger192.debug("Added atomic write state:", state);
+      logger193.debug("Added atomic write state:", state);
       return state;
     }
     if (existingState === void 0) {
@@ -151976,14 +152105,14 @@ var AtomicWriteHandler = class _AtomicWriteHandler {
   writeAttribute(context, endpoint, cluster2, attribute, value) {
     const state = this.#assertPendingWriteForAttributeAndPeer(context, endpoint, cluster2, attribute);
     const attributeName = state.attributeNames.get(attribute);
-    logger192.debug(`Writing pending value for attribute ${attributeName}, ${attribute} in atomic write`, value);
+    logger193.debug(`Writing pending value for attribute ${attributeName}, ${attribute} in atomic write`, value);
     endpoint.eventsOf(cluster2.id)[`${attributeName}$AtomicChanging`]?.emit(
       value,
       state.pendingAttributeValues[attribute] !== void 0 ? state.pendingAttributeValues[attribute] : state.initialValues[attribute],
       context
     );
     state.pendingAttributeValues[attribute] = value;
-    logger192.debug("Atomic write state after current write:", state);
+    logger193.debug("Atomic write state after current write:", state);
   }
   /**
    * Implements the commit logic for an atomic write.
@@ -152002,7 +152131,7 @@ var AtomicWriteHandler = class _AtomicWriteHandler {
         await context.transaction?.commit();
       } catch (error) {
         await context.transaction?.rollback();
-        logger192.info(
+        logger193.info(
           `Failed to write attribute ${attr} during atomic write commit:`,
           Diagnostic.errorMessage(asError(error))
         );
@@ -152041,7 +152170,7 @@ var AtomicWriteHandler = class _AtomicWriteHandler {
     const fabricIndex = fabric.fabricIndex;
     for (const writeState of Array.from(this.#pendingWrites)) {
       if (writeState.peerAddress.fabricIndex === fabricIndex) {
-        logger192.debug(
+        logger193.debug(
           `Closing atomic write state for peer ${writeState.peerAddress.toString()} on endpoint ${writeState.endpoint.id} due to fabric removal`
         );
         writeState.close();
@@ -152090,7 +152219,7 @@ var AtomicWriteHandler = class _AtomicWriteHandler {
     if (!PeerAddress.is(attrWriteState.peerAddress, peerAddress)) {
       return void 0;
     }
-    logger192.debug(
+    logger193.debug(
       `Found pending value for attribute ${attribute} for peer ${peerAddress.nodeId}`,
       serialize(attrWriteState.pendingAttributeValues[attribute])
     );
@@ -152131,7 +152260,7 @@ var ThermostatBehaviorConstructor = ClusterBehavior.for(Thermostat3);
 var ThermostatBehavior = ThermostatBehaviorConstructor;
 
 // ../../node_modules/.pnpm/@matter+node@0.17.9_patch_hash=e3376f1c2fdd0a0df09b8d04625a4d7af65b47d7277cc88cdb80baf7fb32bd0d/node_modules/@matter/node/dist/esm/behaviors/thermostat/ThermostatServer.js
-var logger193 = Logger.get("ThermostatServer");
+var logger194 = Logger.get("ThermostatServer");
 var ThermostatBehaviorLogicBase = ThermostatBehavior.with(
   Thermostat3.Feature.Heating,
   Thermostat3.Feature.Cooling,
@@ -152160,7 +152289,7 @@ var ThermostatBaseServer = class _ThermostatBaseServer extends ThermostatBehavio
       throw new ImplementationError("Setback feature is deprecated and not allowed to be enabled");
     }
     if (this.features.matterScheduleConfiguration) {
-      logger193.warn("MatterScheduleConfiguration feature is not yet implemented. Please do not activate it");
+      logger194.warn("MatterScheduleConfiguration feature is not yet implemented. Please do not activate it");
     }
     if (!this.features.presets && !this.features.matterScheduleConfiguration) {
       this.atomicRequest = Behavior.unimplemented;
@@ -152281,7 +152410,7 @@ var ThermostatBaseServer = class _ThermostatBaseServer extends ThermostatBehavio
         throw new StatusResponse.InvalidCommandError("Requested PresetHandle not found");
       }
     }
-    logger193.info(`Setting active preset handle to`, presetHandle);
+    logger194.info(`Setting active preset handle to`, presetHandle);
     this.state.activePresetHandle = presetHandle;
     return preset;
   }
@@ -152351,7 +152480,7 @@ var ThermostatBaseServer = class _ThermostatBaseServer extends ThermostatBehavio
       }
       if (this.state.setpointHoldExpiryTimestamp === void 0) {
       } else {
-        logger193.warn(
+        logger194.warn(
           "Handling for setpointHoldExpiryTimestamp is not yet implemented. To use this attribute you need to install the needed logic yourself"
         );
       }
@@ -152424,7 +152553,7 @@ var ThermostatBaseServer = class _ThermostatBaseServer extends ThermostatBehavio
           "RemoteSensing cannot be set to LocalTemperature when LocalTemperatureNotExposed feature is enabled"
         );
       }
-      logger193.debug("LocalTemperatureNotExposed feature is enabled, ignoring local temperature measurement");
+      logger194.debug("LocalTemperatureNotExposed feature is enabled, ignoring local temperature measurement");
       this.state.localTemperature = null;
     }
     let localTemperature = null;
@@ -152433,11 +152562,11 @@ var ThermostatBaseServer = class _ThermostatBaseServer extends ThermostatBehavio
       const endpoints = this.env.get(ServerNode).endpoints;
       const endpoint = endpoints.has(localTempEndpoint) ? endpoints.for(localTempEndpoint) : void 0;
       if (endpoint !== void 0 && endpoint.behaviors.has(TemperatureMeasurementServer)) {
-        logger193.debug(
+        logger194.debug(
           `Using existing TemperatureMeasurement cluster on endpoint #${localTempEndpoint} for local temperature measurement`
         );
         if (this.state.externalMeasuredIndoorTemperature !== void 0) {
-          logger193.warn(
+          logger194.warn(
             "Both local TemperatureMeasurement cluster and externalMeasuredIndoorTemperature state are set, using local cluster"
           );
         }
@@ -152447,19 +152576,19 @@ var ThermostatBaseServer = class _ThermostatBaseServer extends ThermostatBehavio
         );
         localTemperature = endpoint.stateOf(TemperatureMeasurementServer).measuredValue;
       } else {
-        logger193.warn(
+        logger194.warn(
           `No TemperatureMeasurement cluster found on endpoint #${localTempEndpoint}, falling back to externalMeasuredIndoorTemperature state if set`
         );
       }
     } else {
       if (this.state.externalMeasuredIndoorTemperature === void 0) {
         if (this.state.localTemperatureCalibration !== void 0) {
-          logger193.warn(
+          logger194.warn(
             "No local TemperatureMeasurement cluster available, externalMeasuredIndoorTemperature state not set but localTemperatureCalibration is used: Ensure to correctly consider the calibration when updating the localTemperature value"
           );
         }
       } else {
-        logger193.info("Using measured temperature via externalMeasuredIndoorTemperature state");
+        logger194.info("Using measured temperature via externalMeasuredIndoorTemperature state");
         localTemperature = this.state.externalMeasuredIndoorTemperature ?? null;
       }
       this.reactTo(this.events.externalMeasuredIndoorTemperature$Changed, this.#handleMeasuredTemperatureChange);
@@ -152499,28 +152628,28 @@ var ThermostatBaseServer = class _ThermostatBaseServer extends ThermostatBehavio
       const endpoints = this.env.get(ServerNode).endpoints;
       const endpoint = endpoints.has(localOccupancyEndpoint) ? endpoints.for(localOccupancyEndpoint) : void 0;
       if (endpoint !== void 0 && endpoint.behaviors.has(OccupancySensingServer)) {
-        logger193.debug(
+        logger194.debug(
           `Using existing OccupancySensing cluster on endpoint ${localOccupancyEndpoint} for local occupancy sensing`
         );
         if (this.state.externallyMeasuredOccupancy !== void 0) {
-          logger193.warn(
+          logger194.warn(
             "Both local OccupancySensing cluster and externallyMeasuredOccupancy state are set, using local cluster"
           );
         }
         this.reactTo(endpoint.eventsOf(OccupancySensingServer).occupancy$Changed, this.#handleOccupancyChange);
         currentOccupancy = !!endpoint.stateOf(OccupancySensingServer).occupancy.occupied;
       } else {
-        logger193.warn(
+        logger194.warn(
           `No OccupancySensing cluster found on endpoint ${localOccupancyEndpoint}, falling back to externallyMeasuredOccupancy state if set`
         );
       }
     } else {
       if (this.state.externallyMeasuredOccupancy === void 0) {
-        logger193.warn(
+        logger194.warn(
           "No local OccupancySensing cluster available and externallyMeasuredOccupancy state not set"
         );
       } else {
-        logger193.info("Using occupancy via externallyMeasuredOccupancy state");
+        logger194.info("Using occupancy via externallyMeasuredOccupancy state");
         currentOccupancy = this.state.externallyMeasuredOccupancy;
       }
       this.reactTo(this.events.externallyMeasuredOccupancy$Changed, this.#handleExternalOccupancyChange);
@@ -152763,7 +152892,7 @@ var ThermostatBaseServer = class _ThermostatBaseServer extends ThermostatBehavio
       max = this.state[`max${scope}`] ?? defaults.absMax,
       absMax = this.state[`absMax${scope}`] ?? defaults.absMax
     } = details;
-    logger193.debug(
+    logger194.debug(
       `Validating user setpoint limits for ${scope}: absMin=${absMin}, min=${min}, max=${max}, absMax=${absMax}`
     );
     if (absMin > min) {
@@ -152810,7 +152939,7 @@ var ThermostatBaseServer = class _ThermostatBaseServer extends ThermostatBehavio
     const limitMax = scope === "Heat" ? this.heatSetpointMaximum : this.coolSetpointMaximum;
     const result = cropValueRange(setpoint, limitMin, limitMax);
     if (result !== setpoint) {
-      logger193.debug(
+      logger194.debug(
         `${scope} setpoint (${setpoint}) is out of limits [${limitMin}, ${limitMax}], clamping to ${result}`
       );
     }
@@ -153290,7 +153419,7 @@ var ThermostatBaseServer = class _ThermostatBaseServer extends ThermostatBehavio
    */
   #handlePersistedPresetsChanged(newPresets, oldPresets) {
     if (oldPresets === void 0) {
-      logger193.debug(
+      logger194.debug(
         "Old presets is undefined, skipping some checks. This should only happen on setup of the behavior."
       );
     }
@@ -153299,7 +153428,7 @@ var ThermostatBaseServer = class _ThermostatBaseServer extends ThermostatBehavio
     const newPresetHandles = /* @__PURE__ */ new Set();
     for (const preset of newPresets) {
       if (preset.presetHandle === null) {
-        logger193.debug("Preset is missing presetHandle, generating a new one");
+        logger194.debug("Preset is missing presetHandle, generating a new one");
         preset.presetHandle = entropy.randomBytes(16);
         changed = true;
       }
@@ -153348,7 +153477,7 @@ var ThermostatBaseServer = class _ThermostatBaseServer extends ThermostatBehavio
       throw new StatusResponse.InvalidInStateError(`ActivePresetHandle references non-existing presetHandle`);
     }
     if (changed) {
-      logger193.debug("PresetHandles or BuiltIn flags were updated, updating persistedPresets");
+      logger194.debug("PresetHandles or BuiltIn flags were updated, updating persistedPresets");
       this.state.persistedPresets = newPresets;
     }
   }
@@ -154437,7 +154566,7 @@ var WindowCoveringBehaviorConstructor = ClusterBehavior.for(WindowCovering3);
 var WindowCoveringBehavior = WindowCoveringBehaviorConstructor;
 
 // ../../node_modules/.pnpm/@matter+node@0.17.9_patch_hash=e3376f1c2fdd0a0df09b8d04625a4d7af65b47d7277cc88cdb80baf7fb32bd0d/node_modules/@matter/node/dist/esm/behaviors/window-covering/WindowCoveringServer.js
-var logger194 = Logger.get("WindowCoveringServer");
+var logger195 = Logger.get("WindowCoveringServer");
 var WindowCoveringBase = WindowCoveringBehavior.with(
   WindowCovering3.Feature.Lift,
   WindowCovering3.Feature.Tilt,
@@ -154522,7 +154651,7 @@ var WindowCoveringBaseServer = class extends WindowCoveringBase {
         this.state.configStatus = configStatus;
       });
     }
-    logger194.debug(
+    logger195.debug(
       `Mode changed to ${Diagnostic.json(mode)} and config status to ${Diagnostic.json(configStatus)} and internal calibration mode to ${this.internal.calibrationMode}`
     );
   }
@@ -154530,7 +154659,7 @@ var WindowCoveringBaseServer = class extends WindowCoveringBase {
   #handleOperationalStatusChanging(operationalStatus) {
     const globalStatus = operationalStatus.lift !== WindowCovering3.MovementStatus.Stopped ? operationalStatus.lift : operationalStatus.tilt;
     operationalStatus.global = globalStatus;
-    logger194.debug(
+    logger195.debug(
       `Operational status changed to ${Diagnostic.json(operationalStatus)} with new global status ${globalStatus}`
     );
     this.state.operationalStatus = operationalStatus;
@@ -154559,10 +154688,10 @@ var WindowCoveringBaseServer = class extends WindowCoveringBase {
       this.state.currentPositionLiftPercentage = percent100ths3 === null ? percent100ths3 : Math.floor(percent100ths3 / WC_PERCENT100THS_COEFFICIENT);
       if (this.state.operationalStatus.lift !== WindowCovering3.MovementStatus.Stopped && percent100ths3 === this.state.targetPositionLiftPercent100ths) {
         this.state.operationalStatus.lift = WindowCovering3.MovementStatus.Stopped;
-        logger194.debug("Lift movement stopped, target value reached");
+        logger195.debug("Lift movement stopped, target value reached");
       }
     }
-    logger194.debug(
+    logger195.debug(
       `Syncing lift position ${this.state.currentPositionLiftPercent100ths === null ? null : (this.state.currentPositionLiftPercent100ths / 100).toFixed(2)} to ${this.state.currentPositionLiftPercentage}%`
     );
   }
@@ -154572,10 +154701,10 @@ var WindowCoveringBaseServer = class extends WindowCoveringBase {
       this.state.currentPositionTiltPercentage = percent100ths3 === null ? percent100ths3 : Math.floor(percent100ths3 / WC_PERCENT100THS_COEFFICIENT);
       if (this.state.operationalStatus.tilt !== WindowCovering3.MovementStatus.Stopped && percent100ths3 === this.state.targetPositionTiltPercent100ths) {
         this.state.operationalStatus.tilt = WindowCovering3.MovementStatus.Stopped;
-        logger194.debug("Tilt movement stopped, target value reached");
+        logger195.debug("Tilt movement stopped, target value reached");
       }
     }
-    logger194.debug(
+    logger195.debug(
       `Syncing tilt position ${this.state.currentPositionTiltPercent100ths === null ? null : (this.state.currentPositionTiltPercent100ths / 100).toFixed(2)} to ${this.state.currentPositionTiltPercentage}%`
     );
   }
@@ -154663,7 +154792,7 @@ var WindowCoveringBaseServer = class extends WindowCoveringBase {
     }
     const directionInfo = direction === 2 ? ` in direction by position` : ` in direction ${direction === 1 ? "Close" : "Open"}`;
     const targetInfo = targetPercent100ths === void 0 ? "" : ` to target position ${(targetPercent100ths / 100).toFixed(2)}`;
-    logger194.debug(
+    logger195.debug(
       `Moving the device ${type === 0 ? "Lift" : "Tilt"}${directionInfo} (reversed=${reversed})${targetInfo}`
     );
   }
@@ -154685,7 +154814,7 @@ var WindowCoveringBaseServer = class extends WindowCoveringBase {
       );
     }
     if (type === 0 && this.state.configStatus.liftMovementReversed) {
-      logger194.debug("Lift movement is reversed");
+      logger195.debug("Lift movement is reversed");
     }
     switch (type) {
       case 0:
@@ -154941,7 +155070,7 @@ function matterSubscriptionOptions() {
 }
 
 // src/matter/endpoints/server-mode-server-node.ts
-var logger195 = Logger.get("ServerModeServerNode");
+var logger196 = Logger.get("ServerModeServerNode");
 var ServerModeServerNode = class extends ServerNode {
   deviceEndpoints = /* @__PURE__ */ new Map();
   featureFlags;
@@ -155038,7 +155167,7 @@ var ServerModeServerNode = class extends ServerNode {
       await this.set({ basicInformation });
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e);
-      logger195.warn(
+      logger196.warn(
         `Failed to apply server-mode identity for ${entityId}: ${msg}`
       );
     }
@@ -155049,7 +155178,7 @@ var ServerModeServerNode = class extends ServerNode {
       await this.set({ productDescription: { deviceType } });
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e);
-      logger195.warn(`Failed to set server-mode device type: ${msg}`);
+      logger196.warn(`Failed to set server-mode device type: ${msg}`);
     }
   }
   async factoryReset() {
@@ -155069,84 +155198,6 @@ function dropUndefined(obj) {
 
 // src/plugins/builtin/camera/camera-tcp-requirement.ts
 import { readFileSync as readFileSync6 } from "node:fs";
-
-// src/plugins/plugin-storage.ts
-init_esm();
-import * as fs9 from "node:fs";
-import * as path11 from "node:path";
-var logger196 = Logger.get("PluginStorage");
-var SAVE_DEBOUNCE_MS = 500;
-function pluginStorageFilePath(storageDir, bridgeId, pluginName) {
-  const safe = (s) => s.replace(/[^a-zA-Z0-9_-]/g, "_");
-  return path11.join(
-    storageDir,
-    `plugin-${safe(bridgeId)}-${safe(pluginName)}.json`
-  );
-}
-var FilePluginStorage = class {
-  data = {};
-  dirty = false;
-  filePath;
-  saveTimer;
-  constructor(storageDir, bridgeId, pluginName) {
-    this.filePath = pluginStorageFilePath(storageDir, bridgeId, pluginName);
-    this.load();
-  }
-  async get(key, defaultValue) {
-    const value = this.data[key];
-    return value ?? defaultValue;
-  }
-  async set(key, value) {
-    this.data[key] = value;
-    this.dirty = true;
-    this.scheduleSave();
-  }
-  async delete(key) {
-    delete this.data[key];
-    this.dirty = true;
-    this.scheduleSave();
-  }
-  async keys() {
-    return Object.keys(this.data);
-  }
-  load() {
-    try {
-      if (fs9.existsSync(this.filePath)) {
-        const raw = fs9.readFileSync(this.filePath, "utf-8");
-        this.data = JSON.parse(raw);
-      }
-    } catch (e) {
-      logger196.warn(`Failed to load plugin storage from ${this.filePath}:`, e);
-      this.data = {};
-    }
-  }
-  scheduleSave() {
-    if (this.saveTimer) clearTimeout(this.saveTimer);
-    this.saveTimer = setTimeout(() => this.save(), SAVE_DEBOUNCE_MS);
-  }
-  save() {
-    if (!this.dirty) return;
-    if (this.saveTimer) {
-      clearTimeout(this.saveTimer);
-      this.saveTimer = void 0;
-    }
-    try {
-      const dir = path11.dirname(this.filePath);
-      if (!fs9.existsSync(dir)) {
-        fs9.mkdirSync(dir, { recursive: true });
-      }
-      fs9.writeFileSync(this.filePath, JSON.stringify(this.data, null, 2));
-      this.dirty = false;
-    } catch (e) {
-      logger196.warn(`Failed to save plugin storage to ${this.filePath}:`, e);
-    }
-  }
-  flush() {
-    this.save();
-  }
-};
-
-// src/plugins/builtin/camera/camera-tcp-requirement.ts
 var CAMERA_TCP_CONFIG = { incoming: true, outgoing: false };
 function parseCameraList(cameras) {
   if (typeof cameras !== "string") return [];
@@ -156830,6 +156881,28 @@ var SafePluginRunner = class {
       return void 0;
     }
   }
+  /**
+   * Run a shutdown-class hook with timeout only. An open breaker never blocks
+   * it and its failures never count toward the breaker: cleanup has to run
+   * exactly when a plugin is at its most broken, or timers and sockets leak.
+   */
+  async runCleanup(pluginName, operation, fn, timeoutMs = DEFAULT_TIMEOUT_MS) {
+    const timeout = this.createTimeout(pluginName, operation, timeoutMs);
+    try {
+      const result = await Promise.race([
+        Promise.resolve().then(fn),
+        timeout.promise
+      ]);
+      timeout.clear();
+      return result;
+    } catch (error) {
+      timeout.clear();
+      logger201.error(
+        `Plugin "${pluginName}" failed during ${operation}: ${error instanceof Error ? error.message : String(error)}`
+      );
+      return void 0;
+    }
+  }
   /**
    * Run a synchronous plugin function with try/catch + circuit breaker.
    */
@@ -156880,6 +156953,8 @@ var SafePluginRunner = class {
 var logger202 = Logger.get("PluginManager");
 var PLUGIN_API_VERSION = 1;
 var MAX_PLUGIN_DEVICE_ID_LENGTH = 100;
+var LEGACY_ENABLED_KEY = "__enabled";
+var PLUGIN_CONFIG_KEY = "config";
 function validatePluginDevice(device) {
   if (!device || typeof device !== "object") return "device must be an object";
   const d = device;
@@ -156913,18 +156988,23 @@ var PluginManager = class {
   domainMappingOwners = /* @__PURE__ */ new Map();
   storageDir;
   bridgeId;
+  stateFile;
   homeAssistant;
   runner = new SafePluginRunner();
   registry;
   /** Callback invoked when a plugin registers a new device */
   onDeviceRegistered;
-  /** Callback invoked when a plugin removes a device */
+  /**
+   * Callback invoked when a plugin removes a device. keepIdentity marks a
+   * reversible stop: the endpoint closes but keeps its persisted number.
+   */
   onDeviceUnregistered;
   /** Callback invoked when a plugin updates device state */
   onDeviceStateUpdated;
   constructor(bridgeId, storageDir, homeAssistant) {
     this.bridgeId = bridgeId;
     this.storageDir = storageDir;
+    this.stateFile = pluginStateFilePath(storageDir, bridgeId);
     this.homeAssistant = homeAssistant;
   }
   setRegistry(registry3) {
@@ -157009,35 +157089,59 @@ var PluginManager = class {
       this.bridgeId,
       plugin.name
     );
+    let enabled = this.readEnabledState()[plugin.name];
+    const legacy = await storage2.get(LEGACY_ENABLED_KEY);
+    if (typeof legacy === "boolean") {
+      if (enabled === void 0) {
+        enabled = legacy;
+        this.persistEnabled(plugin.name, legacy);
+      }
+      await storage2.delete(LEGACY_ENABLED_KEY);
+      storage2.flush();
+    }
+    if (enabled === false) {
+      metadata.enabled = false;
+      logger202.info(`Plugin "${plugin.name}" stays disabled (persisted)`);
+    }
     const devices = /* @__PURE__ */ new Map();
     const pluginLogger = Logger.get(`Plugin:${plugin.name}`);
+    const registerDeviceAt = (epoch) => async (device) => {
+      const live = this.instances.get(plugin.name);
+      if (!live || !live.metadata.enabled || live.epoch !== epoch) {
+        pluginLogger.warn(
+          `Dropped a device registration from a disabled or superseded start of "${plugin.name}"`
+        );
+        return;
+      }
+      const validationError = validatePluginDevice(device);
+      if (validationError) {
+        pluginLogger.warn(`Rejected device registration: ${validationError}`);
+        return;
+      }
+      if (devices.has(device.id)) {
+        pluginLogger.warn(
+          `Device "${device.id}" already registered, updating`
+        );
+      }
+      devices.set(device.id, device);
+      await this.onDeviceRegistered?.(plugin.name, device);
+      pluginLogger.debug(`Registered device: ${device.name} (${device.id})`);
+    };
     const context = {
       bridgeId: this.bridgeId,
       storage: storage2,
       log: pluginLogger,
       homeAssistant: this.homeAssistant,
-      registerDevice: async (device) => {
-        const validationError = validatePluginDevice(device);
-        if (validationError) {
-          pluginLogger.warn(`Rejected device registration: ${validationError}`);
-          return;
-        }
-        if (devices.has(device.id)) {
-          pluginLogger.warn(
-            `Device "${device.id}" already registered, updating`
-          );
-        }
-        devices.set(device.id, device);
-        await this.onDeviceRegistered?.(plugin.name, device);
-        pluginLogger.debug(`Registered device: ${device.name} (${device.id})`);
-      },
+      registerDevice: registerDeviceAt(0),
       unregisterDevice: async (deviceId) => {
         if (!devices.has(deviceId)) {
           pluginLogger.warn(`Device "${deviceId}" not found`);
           return;
         }
         devices.delete(deviceId);
-        await this.onDeviceUnregistered?.(plugin.name, deviceId);
+        await this.onDeviceUnregistered?.(plugin.name, deviceId, {
+          keepIdentity: this.instances.get(plugin.name)?.suspending === true
+        });
         pluginLogger.debug(`Unregistered device: ${deviceId}`);
       },
       updateDeviceState: (deviceId, clusterId3, attributes9) => {
@@ -157076,7 +157180,14 @@ var PluginManager = class {
       context,
       metadata,
       devices,
-      started: false
+      started: false,
+      queue: Promise.resolve(),
+      epoch: 0,
+      contextAt: (epoch) => ({
+        ...context,
+        registerDevice: registerDeviceAt(epoch)
+      }),
+      suspending: false
     });
     logger202.info(
       `Registered plugin: ${plugin.name} v${plugin.version} (${metadata.source})`
@@ -157087,28 +157198,42 @@ var PluginManager = class {
    */
   async startAll() {
     for (const [name, instance] of this.instances) {
-      if (!instance.metadata.enabled) continue;
-      if (this.runner.isDisabled(name)) {
-        logger202.warn(
-          `Plugin "${name}" is disabled (circuit breaker), skipping start`
-        );
-        instance.metadata.enabled = false;
-        continue;
-      }
-      logger202.info(`Starting plugin: ${name}`);
-      await this.runner.run(
-        name,
-        "onStart",
-        () => instance.plugin.onStart(instance.context)
+      await this.inTransition(instance, () => this.startPlugin(name, instance));
+    }
+  }
+  // One transition at a time per plugin: a disable during a slow start waits
+  // for the start to settle instead of interleaving with it.
+  inTransition(instance, fn) {
+    const run = instance.queue.then(fn, fn);
+    instance.queue = run.then(
+      () => void 0,
+      () => void 0
+    );
+    return run;
+  }
+  async startPlugin(name, instance) {
+    if (!instance.metadata.enabled) return;
+    if (this.runner.isDisabled(name)) {
+      logger202.warn(
+        `Plugin "${name}" is disabled (circuit breaker), skipping start`
       );
-      if (this.runner.isDisabled(name)) {
-        instance.metadata.enabled = false;
-      } else if (this.runner.getState(name).failures === 0) {
-        instance.started = true;
-      }
-      if (instance.plugin.getCurrentConfig) {
-        instance.metadata.config = instance.plugin.getCurrentConfig();
-      }
+      instance.metadata.enabled = false;
+      return;
+    }
+    logger202.info(`Starting plugin: ${name}`);
+    const epoch = ++instance.epoch;
+    await this.runner.run(
+      name,
+      "onStart",
+      () => instance.plugin.onStart(instance.contextAt(epoch))
+    );
+    if (this.runner.isDisabled(name)) {
+      instance.metadata.enabled = false;
+    } else if (this.runner.getState(name).failures === 0) {
+      instance.started = true;
+    }
+    if (instance.plugin.getCurrentConfig) {
+      instance.metadata.config = instance.plugin.getCurrentConfig();
     }
   }
   /**
@@ -157130,23 +157255,32 @@ var PluginManager = class {
     }
   }
   /**
-   * Shut down all plugins via SafePluginRunner.
+   * Shut down all plugins. Runs outside the circuit breaker: cleanup must
+   * happen even for a plugin the breaker took down.
    */
   async shutdownAll(reason) {
     for (const [name, instance] of this.instances) {
-      if (instance.started && instance.plugin.onShutdown) {
-        await this.runner.run(
-          name,
-          "onShutdown",
-          () => instance.plugin.onShutdown(reason)
-        );
-      }
-      const storage2 = instance.context.storage;
-      if (storage2 instanceof FilePluginStorage) {
-        storage2.flush();
-      }
-      instance.started = false;
-      logger202.info(`Plugin "${name}" shut down`);
+      await this.inTransition(instance, async () => {
+        instance.epoch++;
+        instance.suspending = true;
+        try {
+          if (instance.started && instance.plugin.onShutdown) {
+            await this.runner.runCleanup(
+              name,
+              "onShutdown",
+              () => instance.plugin.onShutdown(reason)
+            );
+          }
+        } finally {
+          instance.suspending = false;
+        }
+        const storage2 = instance.context.storage;
+        if (storage2 instanceof FilePluginStorage) {
+          storage2.flush();
+        }
+        instance.started = false;
+        logger202.info(`Plugin "${name}" shut down`);
+      });
     }
     this.instances.clear();
   }
@@ -157179,23 +157313,122 @@ var PluginManager = class {
       instance.metadata.enabled = true;
     }
   }
-  disablePlugin(pluginName) {
+  /**
+   * Disable a plugin: stop it, unmount its devices, and persist the choice so
+   * a bridge restart does not bring it back (#439). The shutdown runs outside
+   * the circuit breaker, a broken plugin still has to release its resources.
+   * Returns the resulting metadata, or undefined for an unknown name.
+   */
+  async disablePlugin(pluginName) {
     const instance = this.instances.get(pluginName);
-    if (instance) {
+    if (!instance) return void 0;
+    return this.inTransition(instance, async () => {
       instance.metadata.enabled = false;
-    }
-    for (const [domain, owner] of this.domainMappingOwners) {
-      if (owner === pluginName) {
-        this.domainMappings.delete(domain);
-        this.domainMappingOwners.delete(domain);
+      instance.epoch++;
+      this.persistEnabled(pluginName, false);
+      instance.suspending = true;
+      try {
+        if (instance.started && instance.plugin.onShutdown) {
+          await this.runner.runCleanup(
+            pluginName,
+            "onShutdown",
+            () => instance.plugin.onShutdown("Plugin disabled")
+          );
+        }
+        instance.started = false;
+        for (const deviceId of [...instance.devices.keys()]) {
+          instance.devices.delete(deviceId);
+          await this.onDeviceUnregistered?.(pluginName, deviceId, {
+            keepIdentity: true
+          });
+        }
+      } finally {
+        instance.suspending = false;
       }
-    }
+      for (const [domain, owner] of this.domainMappingOwners) {
+        if (owner === pluginName) {
+          this.domainMappings.delete(domain);
+          this.domainMappingOwners.delete(domain);
+        }
+      }
+      return instance.metadata;
+    });
   }
-  enablePlugin(pluginName) {
-    this.runner.resetCircuitBreaker(pluginName);
+  /**
+   * Enable a plugin, persist the choice, and start it right away so its
+   * devices come back without a bridge restart. Returns the resulting
+   * metadata, or undefined for an unknown name.
+   */
+  async enablePlugin(pluginName) {
     const instance = this.instances.get(pluginName);
-    if (instance) {
+    if (!instance) return void 0;
+    return this.inTransition(instance, async () => {
+      this.runner.resetCircuitBreaker(pluginName);
       instance.metadata.enabled = true;
+      this.persistEnabled(pluginName, true);
+      if (instance.started) return instance.metadata;
+      const pending = instance.pendingConfig;
+      if (pending) {
+        try {
+          await instance.context.storage.set(PLUGIN_CONFIG_KEY, pending);
+          await instance.context.storage.flush?.();
+          instance.metadata.config = pending;
+          instance.pendingConfig = void 0;
+        } catch (e) {
+          logger202.warn(
+            `Failed to persist the parked config for "${pluginName}", it stays parked:`,
+            e
+          );
+        }
+      }
+      logger202.info(`Starting plugin: ${pluginName}`);
+      const epoch = ++instance.epoch;
+      await this.runner.run(
+        pluginName,
+        "onStart",
+        () => instance.plugin.onStart(instance.contextAt(epoch))
+      );
+      if (this.runner.isDisabled(pluginName)) {
+        instance.metadata.enabled = false;
+        return instance.metadata;
+      }
+      if (this.runner.getState(pluginName).failures === 0) {
+        instance.started = true;
+      }
+      if (instance.plugin.getCurrentConfig) {
+        instance.metadata.config = instance.plugin.getCurrentConfig();
+      }
+      if (instance.started && instance.plugin.onConfigure) {
+        await this.runner.run(
+          pluginName,
+          "onConfigure",
+          () => instance.plugin.onConfigure()
+        );
+      }
+      return instance.metadata;
+    });
+  }
+  readEnabledState() {
+    try {
+      if (fs10.existsSync(this.stateFile)) {
+        return JSON.parse(fs10.readFileSync(this.stateFile, "utf-8"));
+      }
+    } catch (e) {
+      logger202.warn(`Failed to read the plugin state file:`, e);
+    }
+    return {};
+  }
+  persistEnabled(pluginName, enabled) {
+    try {
+      const state = this.readEnabledState();
+      state[pluginName] = enabled;
+      fs10.mkdirSync(path12.dirname(this.stateFile), { recursive: true });
+      fs10.writeFileSync(this.stateFile, JSON.stringify(state, null, 2));
+    } catch (e) {
+      logger202.warn(
+        `Failed to persist enabled=${enabled} for "${pluginName}":`,
+        e
+      );
     }
   }
   getConfigSchema(pluginName) {
@@ -157209,27 +157442,36 @@ var PluginManager = class {
   async updateConfig(pluginName, config8) {
     const instance = this.instances.get(pluginName);
     if (!instance) return false;
-    config8 = { ...config8 };
-    const schema6 = instance.plugin.getConfigSchema?.();
-    if (schema6) {
-      for (const [key, prop] of Object.entries(schema6.properties)) {
-        if (prop.secret && config8[key] === SECRET_UNCHANGED) {
-          const stored = instance.metadata.config[key];
-          if (stored == null) delete config8[key];
-          else config8[key] = stored;
+    return this.inTransition(instance, async () => {
+      config8 = { ...config8 };
+      const schema6 = instance.plugin.getConfigSchema?.();
+      if (schema6) {
+        for (const [key, prop] of Object.entries(schema6.properties)) {
+          if (prop.secret && config8[key] === SECRET_UNCHANGED) {
+            const stored = instance.metadata.config[key];
+            if (stored == null) delete config8[key];
+            else config8[key] = stored;
+          }
+        }
+      }
+      instance.metadata.config = config8;
+      this.registry?.updateConfig(pluginName, config8);
+      if (instance.plugin.onConfigChanged) {
+        if (!instance.metadata.enabled) {
+          instance.pendingConfig = config8;
+          logger202.info(
+            `Plugin "${pluginName}" is disabled, the config applies on enable`
+          );
+        } else {
+          await this.runner.run(
+            pluginName,
+            "onConfigChanged",
+            () => instance.plugin.onConfigChanged(config8)
+          );
         }
       }
-    }
-    instance.metadata.config = config8;
-    this.registry?.updateConfig(pluginName, config8);
-    if (instance.plugin.onConfigChanged) {
-      await this.runner.run(
-        pluginName,
-        "onConfigChanged",
-        () => instance.plugin.onConfigChanged(config8)
-      );
-    }
-    return true;
+      return true;
+    });
   }
 };
 
@@ -157980,11 +158222,11 @@ var Bridge = class {
   get pluginInfo() {
     return this.endpointManager.getPluginInfo();
   }
-  enablePlugin(pluginName) {
-    this.endpointManager.enablePlugin(pluginName);
+  async enablePlugin(pluginName) {
+    return await this.endpointManager.enablePlugin(pluginName);
   }
-  disablePlugin(pluginName) {
-    this.endpointManager.disablePlugin(pluginName);
+  async disablePlugin(pluginName) {
+    return await this.endpointManager.disablePlugin(pluginName);
   }
   resetPlugin(pluginName) {
     this.endpointManager.resetPlugin(pluginName);
@@ -171139,6 +171381,31 @@ function createCleanAreaServiceAreaServer(cleanAreaRooms) {
     currentArea: null
   });
 }
+function getVacuumServiceAreas(attributes9, mapping) {
+  const cleanAreaRooms = mapping?.cleanAreaRooms;
+  if (cleanAreaRooms && cleanAreaRooms.length > 0) {
+    return cleanAreaRooms.map((room) => ({
+      areaId: room.areaId,
+      name: room.name
+    }));
+  }
+  const customAreas = mapping?.customServiceAreas;
+  if (customAreas && customAreas.length > 0) {
+    return customAreas.map((area, index) => ({
+      areaId: index + 1,
+      name: area.name
+    }));
+  }
+  const roomEntities = mapping?.roomEntities;
+  const rooms = roomEntities && roomEntities.length > 0 ? buttonEntitiesToRooms(roomEntities, attributes9) : parseVacuumRooms(attributes9);
+  if (rooms.length > 0) {
+    return roomsToAreas(rooms).map((area) => ({
+      areaId: area.areaId,
+      name: area.areaInfo.locationInfo?.locationName ?? ""
+    }));
+  }
+  return [];
+}
 
 // src/matter/endpoints/legacy/vacuum/behaviors/vacuum-rvc-run-mode-server.ts
 var logger236 = Logger.get("VacuumRvcRunModeServer");
@@ -171313,6 +171580,135 @@ var cleaningStates = [
 function vacuumIsCleaning(state) {
   return state != null && cleaningStates.includes(state);
 }
+function dispatchRoomClean(attributes9, mapping, entityId, selectedAreas, seam) {
+  const customAreas = mapping?.customServiceAreas;
+  if (customAreas && customAreas.length > 0) {
+    const ephemeral = {
+      completedAreas: /* @__PURE__ */ new Set(),
+      lastCurrentArea: null,
+      activeAreas: [],
+      loggedShortCircuits: /* @__PURE__ */ new Set(),
+      observedCleaning: false,
+      pendingDispatches: [],
+      cleanedAreaBaseline: null
+    };
+    const action = handleCustomServiceAreas(
+      selectedAreas,
+      customAreas,
+      ephemeral
+    );
+    return { action, pending: ephemeral.pendingDispatches };
+  }
+  const cleanAreaRooms = mapping?.cleanAreaRooms;
+  if (cleanAreaRooms && cleanAreaRooms.length > 0) {
+    const haAreaIds = resolveCleanAreaIds(selectedAreas, cleanAreaRooms);
+    if (haAreaIds.length > 0) {
+      logger236.info(`CLEAN_AREA: cleaning HA areas: ${haAreaIds.join(", ")}`);
+      return {
+        action: {
+          action: "vacuum.clean_area",
+          data: { cleaning_area_id: haAreaIds }
+        },
+        pending: []
+      };
+    }
+  }
+  const roomEntities = mapping?.roomEntities;
+  if (roomEntities && roomEntities.length > 0) {
+    const matched = [];
+    for (const areaId of selectedAreas) {
+      const buttonId = roomEntities.find((id) => toAreaId(id) === areaId);
+      if (buttonId) {
+        matched.push({ areaId, entityId: buttonId });
+      }
+    }
+    if (matched.length > 0) {
+      logger236.info(
+        `Roborock: ${matched.length} room button(s) queued: ${matched.map((m) => m.entityId).join(", ")}`
+      );
+      return {
+        action: { action: "button.press", target: matched[0].entityId },
+        pending: matched.slice(1).map(({ areaId, entityId: buttonId }) => ({
+          areaId,
+          action: { action: "button.press", target: buttonId }
+        }))
+      };
+    }
+  }
+  if (entityId.startsWith("vacuum.valetudo_")) {
+    return {
+      action: buildValetudoSegmentAction(
+        entityId,
+        selectedAreas,
+        mapping?.valetudoIdentifier
+      ),
+      pending: []
+    };
+  }
+  const rooms = parseVacuumRooms(attributes9);
+  const roomIds = [];
+  let targetMapName;
+  for (const areaId of selectedAreas) {
+    const room = rooms.find((r) => toAreaId(r.id) === areaId);
+    if (room) {
+      roomIds.push(room.originalId ?? room.id);
+      if (room.mapName && !targetMapName) {
+        targetMapName = room.mapName;
+      }
+    }
+  }
+  if (roomIds.length > 0) {
+    logger236.info(`Starting cleaning with selected areas: ${roomIds.join(", ")}`);
+    if (isDreameVacuum(attributes9)) {
+      if (targetMapName) {
+        const vacName = entityId.replace("vacuum.", "");
+        const selectedMapEntity = `select.${vacName}_selected_map`;
+        logger236.info(
+          `Dreame multi-floor: switching to map "${targetMapName}" via ${selectedMapEntity}`
+        );
+        seam.callAction({
+          action: "select.select_option",
+          target: selectedMapEntity,
+          data: { option: targetMapName }
+        });
+      }
+      return {
+        action: {
+          action: "dreame_vacuum.vacuum_clean_segment",
+          data: { segments: roomIds.length === 1 ? roomIds[0] : roomIds }
+        },
+        pending: []
+      };
+    }
+    if (isRoborockVacuum(attributes9) || isXiaomiMiotVacuum(attributes9)) {
+      return {
+        action: {
+          action: "vacuum.send_command",
+          data: { command: "app_segment_clean", params: roomIds }
+        },
+        pending: []
+      };
+    }
+    if (isEcovacsVacuum(attributes9)) {
+      const roomIdStr = roomIds.join(",");
+      logger236.info(`Ecovacs vacuum: Using spot_area for rooms: ${roomIdStr}`);
+      return {
+        action: {
+          action: "vacuum.send_command",
+          data: {
+            command: "spot_area",
+            params: { mapID: 0, cleanings: 1, rooms: roomIdStr }
+          }
+        },
+        pending: []
+      };
+    }
+    logger236.warn(
+      `Room cleaning via send_command not supported for this vacuum type. Rooms: ${roomIds.join(", ")}. Falling back to vacuum.start`
+    );
+  }
+  return { action: { action: "vacuum.start" }, pending: [] };
+}
 var vacuumRvcRunModeConfig = {
   getCurrentMode: (entity) => {
     const isCleaning = vacuumIsCleaning(entity.state);
@@ -171339,123 +171735,19 @@ var vacuumRvcRunModeConfig = {
       const selectedAreas = [...serviceArea.state.selectedAreas];
       if (selectedAreas.length > 0) {
         const homeAssistant = agent.get(HomeAssistantEntityBehavior);
-        const entity = homeAssistant.entity;
-        const attributes9 = entity.state.attributes;
+        const effective = homeAssistant.endpoint.vacuumEffective;
+        const attributes9 = (effective?.state ?? homeAssistant.entity.state).attributes;
+        const mapping = effective ? effective.mapping : homeAssistant.state.mapping;
         const session = getSession(homeAssistant.endpoint);
-        const customAreas = homeAssistant.state.mapping?.customServiceAreas;
-        if (customAreas && customAreas.length > 0) {
-          return handleCustomServiceAreas(selectedAreas, customAreas, session);
-        }
-        const cleanAreaRooms = homeAssistant.state.mapping?.cleanAreaRooms;
-        if (cleanAreaRooms && cleanAreaRooms.length > 0) {
-          const haAreaIds = resolveCleanAreaIds(selectedAreas, cleanAreaRooms);
-          if (haAreaIds.length > 0) {
-            logger236.info(
-              `CLEAN_AREA: cleaning HA areas: ${haAreaIds.join(", ")}`
-            );
-            return {
-              action: "vacuum.clean_area",
-              data: { cleaning_area_id: haAreaIds }
-            };
-          }
-        }
-        const roomEntities = homeAssistant.state.mapping?.roomEntities;
-        if (roomEntities && roomEntities.length > 0) {
-          const matched = [];
-          for (const areaId of selectedAreas) {
-            const entityId = roomEntities.find((id) => toAreaId(id) === areaId);
-            if (entityId) {
-              matched.push({ areaId, entityId });
-            }
-          }
-          if (matched.length > 0) {
-            logger236.info(
-              `Roborock: ${matched.length} room button(s) queued: ${matched.map((m) => m.entityId).join(", ")}`
-            );
-            session.pendingDispatches = matched.slice(1).map(({ areaId, entityId }) => ({
-              areaId,
-              action: { action: "button.press", target: entityId }
-            }));
-            return {
-              action: "button.press",
-              target: matched[0].entityId
-            };
-          }
-        }
-        const vacuumEntityId = homeAssistant.entityId;
-        if (vacuumEntityId.startsWith("vacuum.valetudo_")) {
-          return buildValetudoSegmentAction(
-            vacuumEntityId,
-            selectedAreas,
-            homeAssistant.state.mapping?.valetudoIdentifier
-          );
-        }
-        const rooms = parseVacuumRooms(attributes9);
-        const roomIds = [];
-        let targetMapName;
-        for (const areaId of selectedAreas) {
-          const room = rooms.find((r) => toAreaId(r.id) === areaId);
-          if (room) {
-            roomIds.push(room.originalId ?? room.id);
-            if (room.mapName && !targetMapName) {
-              targetMapName = room.mapName;
-            }
-          }
-        }
-        if (roomIds.length > 0) {
-          logger236.info(
-            `Starting cleaning with selected areas: ${roomIds.join(", ")}`
-          );
-          if (isDreameVacuum(attributes9)) {
-            if (targetMapName) {
-              const vacName = vacuumEntityId.replace("vacuum.", "");
-              const selectedMapEntity = `select.${vacName}_selected_map`;
-              logger236.info(
-                `Dreame multi-floor: switching to map "${targetMapName}" via ${selectedMapEntity}`
-              );
-              homeAssistant.callAction({
-                action: "select.select_option",
-                target: selectedMapEntity,
-                data: { option: targetMapName }
-              });
-            }
-            return {
-              action: "dreame_vacuum.vacuum_clean_segment",
-              data: {
-                segments: roomIds.length === 1 ? roomIds[0] : roomIds
-              }
-            };
-          }
-          if (isRoborockVacuum(attributes9) || isXiaomiMiotVacuum(attributes9)) {
-            return {
-              action: "vacuum.send_command",
-              data: {
-                command: "app_segment_clean",
-                params: roomIds
-              }
-            };
-          }
-          if (isEcovacsVacuum(attributes9)) {
-            const roomIdStr = roomIds.join(",");
-            logger236.info(
-              `Ecovacs vacuum: Using spot_area for rooms: ${roomIdStr}`
-            );
-            return {
-              action: "vacuum.send_command",
-              data: {
-                command: "spot_area",
-                params: {
-                  mapID: 0,
-                  cleanings: 1,
-                  rooms: roomIdStr
-                }
-              }
-            };
-          }
-          logger236.warn(
-            `Room cleaning via send_command not supported for this vacuum type. Rooms: ${roomIds.join(", ")}. Falling back to vacuum.start`
-          );
-        }
+        const result = dispatchRoomClean(
+          attributes9,
+          mapping,
+          homeAssistant.entityId,
+          selectedAreas,
+          { callAction: (a) => homeAssistant.callAction(a) }
+        );
+        session.pendingDispatches = result.pending;
+        return result.action;
       }
     } catch {
     }
@@ -173922,6 +174214,12 @@ function asStandaloneEndpointType(type) {
 // src/matter/endpoints/legacy/legacy-endpoint.ts
 var logger245 = Logger.get("LegacyEndpoint");
 var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
+  constructor(type, entityId, customName, mappedEntityIds, throttleMs, endpointId, vacuumEffective) {
+    super(type, entityId, customName, mappedEntityIds, endpointId);
+    this.vacuumEffective = vacuumEffective;
+    this.flushUpdate = throttleMs && throttleMs > 50 ? throttleLatest(this.flushPendingUpdate.bind(this), throttleMs) : debounce6(this.flushPendingUpdate.bind(this), 50);
+  }
+  vacuumEffective;
   static async create(registry3, entityId, mapping, pluginDomainMappings, standalone = false, endpointId, identityAnchor) {
     const deviceRegistry = registry3.deviceOf(entityId);
     let state = registry3.initialState(entityId);
@@ -174295,19 +174593,17 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
     }
     const customName = effectiveMapping?.customName;
     const mappedIds = getMappedEntityIds(effectiveMapping);
+    const vacuumEffective = entityId.startsWith("vacuum.") ? { mapping: effectiveMapping, state } : void 0;
     return new _LegacyEndpoint(
       type,
       entityId,
       customName,
       mappedIds,
       effectiveMapping?.updateThrottleMs,
-      endpointId
+      endpointId,
+      vacuumEffective
     );
   }
-  constructor(type, entityId, customName, mappedEntityIds, throttleMs, endpointId) {
-    super(type, entityId, customName, mappedEntityIds, endpointId);
-    this.flushUpdate = throttleMs && throttleMs > 50 ? throttleLatest(this.flushPendingUpdate.bind(this), throttleMs) : debounce6(this.flushPendingUpdate.bind(this), 50);
-  }
   lastState;
   pendingMappedChange = false;
   flushUpdate;
@@ -174374,6 +174670,96 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
   }
 };
 
+// src/matter/endpoints/legacy/vacuum/vacuum-area-switch.ts
+init_esm();
+init_home_assistant_entity_behavior();
+var VacuumAreaSwitchEndpoint = class _VacuumAreaSwitchEndpoint extends EntityEndpoint {
+  constructor(type, entityId, endpointId, areaId, vacuumEndpointId, parentEffective) {
+    super(type, entityId, void 0, [], endpointId);
+    this.areaId = areaId;
+    this.vacuumEndpointId = vacuumEndpointId;
+    this.parentEffective = parentEffective;
+  }
+  areaId;
+  vacuumEndpointId;
+  parentEffective;
+  static create(params) {
+    const { vacuumEndpointId, entity, mapping, area, parentEffective } = params;
+    const endpointId = `${vacuumEndpointId}_roomsw_${area.areaId}`;
+    const areaId = area.areaId;
+    const switchMapping = mapping?.customSerialNumber ? { ...mapping, customSerialNumber: void 0 } : mapping;
+    const switchEntity = entity.deviceRegistry?.serial_number ? {
+      ...entity,
+      deviceRegistry: {
+        ...entity.deviceRegistry,
+        serial_number: void 0
+      }
+    } : entity;
+    const type = OnOffPlugInUnitDevice.with(
+      BasicInformationServer2,
+      IdentifyServer2,
+      HomeAssistantEntityBehavior,
+      OnOffServer2({
+        isOn: () => false,
+        // off is a no-op (momentary auto-reset only, script pattern).
+        turnOff: null,
+        turnOn: (_value, agent) => {
+          const ha = agent.get(HomeAssistantEntityBehavior);
+          const { action } = dispatchRoomClean(
+            parentEffective.state.attributes,
+            parentEffective.mapping,
+            ha.entityId,
+            [areaId],
+            { callAction: (a) => ha.callAction(a) }
+          );
+          return action;
+        }
+      })
+    ).set({
+      homeAssistantEntity: {
+        entity: switchEntity,
+        mapping: switchMapping,
+        customName: area.name,
+        // Distinct anchor so uniqueId/serial don't collide with the vacuum's,
+        // and stay frozen across HA renames.
+        identityAnchor: endpointId
+      }
+    });
+    return new _VacuumAreaSwitchEndpoint(
+      type,
+      entity.entity_id,
+      endpointId,
+      areaId,
+      vacuumEndpointId,
+      parentEffective
+    );
+  }
+  async updateStates(states) {
+    const state = states[this.entityId];
+    if (!state) return;
+    try {
+      await this.construction.ready;
+    } catch {
+      return;
+    }
+    try {
+      const current = this.stateOf(HomeAssistantEntityBehavior).entity;
+      await this.setStateOf(HomeAssistantEntityBehavior, {
+        entity: { ...current, state }
+      });
+    } catch (error) {
+      if (error instanceof TransactionDestroyedError || error instanceof DestroyedDependencyError) {
+        return;
+      }
+      const message = error instanceof Error ? error.message : String(error);
+      if (message.includes("Endpoint storage inaccessible")) {
+        return;
+      }
+      throw error;
+    }
+  }
+};
+
 // src/plugins/builtin/camera/camera-plugin.ts
 init_esm();
 
@@ -174482,10 +174868,11 @@ function unregisterRequestor(sessionId) {
     pendingDeliveries.delete(sessionId);
   }
 }
-function unregisterAllRequestors() {
-  for (const id of [...registry2.keys()]) unregisterRequestor(id);
-  for (const timer of pendingDeliveries.values()) clearTimeout(timer);
-  pendingDeliveries.clear();
+function unregisterRequestorsByOwner(owner) {
+  if (owner == null) return;
+  for (const [id, registration] of [...registry2]) {
+    if (registration.owner === owner) unregisterRequestor(id);
+  }
 }
 function deliverAnswerDeferred(sessionId, sdp, onGiveUp) {
   const prior = pendingDeliveries.get(sessionId);
@@ -174653,7 +175040,9 @@ var CameraWebRtcProviderServer = class extends WebRtcTransportProviderServer {
       registerRequestor(id, {
         session,
         requestorEndpoint,
-        env: this.env
+        env: this.env,
+        // The bridge instance scopes this session to its camera plugin.
+        owner: this.state.bridge
       });
     }
     let answerSdp;
@@ -175358,10 +175747,11 @@ var CameraPlugin = class {
       });
     }
     this.deviceIds = [];
-    await this.bridge?.close().catch(() => {
-    });
+    const bridge = this.bridge;
     this.bridge = void 0;
-    unregisterAllRequestors();
+    await bridge?.close().catch(() => {
+    });
+    if (bridge) unregisterRequestorsByOwner(bridge);
   }
 };
 
@@ -175719,6 +176109,9 @@ var SecurityPlugin = class {
   // coalesced per entity so a hung call cannot pile up work behind it.
   tasks = [];
   draining = false;
+  // Bumped on every teardown and bring-up; queued tasks from an older
+  // generation never dispatch.
+  effectGeneration = 0;
   connection;
   unsubscribeEvents;
   retryTimer;
@@ -175731,6 +176124,21 @@ var SecurityPlugin = class {
     const stored = await context.storage.get(CONFIG_KEY2);
     this.config = { ...this.config, ...stored ?? {} };
     this.applyLists();
+    if (!this.isConfigured()) {
+      this.log.info(
+        "no trigger entities configured, the security devices stay unregistered"
+      );
+      return;
+    }
+    await this.bringUp();
+  }
+  isConfigured() {
+    return this.watched.size > 0;
+  }
+  async bringUp() {
+    const context = this.context;
+    if (!context) return;
+    this.effectGeneration++;
     this.machine = new SecurityStateMachine(
       this.machineConfig(),
       this.effects()
@@ -175753,21 +176161,38 @@ var SecurityPlugin = class {
     this.pushDeviceStates();
     this.startConnection();
   }
+  async tearDown() {
+    this.machine?.shutdown();
+    this.machine = void 0;
+    this.tasks = [];
+    this.effectGeneration++;
+    await this.stopConnection();
+    for (const id of [...Object.values(MODE_DEVICE_IDS), ALARM_DEVICE_ID]) {
+      await this.context?.unregisterDevice(id).catch(() => {
+      });
+    }
+  }
   async onConfigChanged(config8) {
     this.config = config8;
     await this.context?.storage.set(CONFIG_KEY2, this.config);
     this.applyLists();
-    this.machine?.setConfig(this.machineConfig());
+    if (!this.isConfigured()) {
+      if (this.machine) {
+        this.log.info("trigger lists emptied, removing the security devices");
+        await this.tearDown();
+      }
+      return;
+    }
+    if (!this.machine) {
+      await this.bringUp();
+      return;
+    }
+    this.machine.setConfig(this.machineConfig());
     await this.stopConnection();
     this.startConnection();
   }
   async onShutdown() {
-    this.machine?.shutdown();
-    await this.stopConnection();
-    for (const id of [...Object.values(MODE_DEVICE_IDS), ALARM_DEVICE_ID]) {
-      await this.context?.unregisterDevice(id).catch(() => {
-      });
-    }
+    await this.tearDown();
   }
   getCurrentConfig() {
     return { ...this.config };
@@ -176005,6 +176430,7 @@ var SecurityPlugin = class {
     });
   }
   pushTask(task) {
+    task.gen = this.effectGeneration;
     this.tasks.push(task);
     queueMicrotask(() => void this.drain());
   }
@@ -176052,6 +176478,7 @@ var SecurityPlugin = class {
       for (; ; ) {
         const task = this.tasks.shift();
         if (!task) return;
+        if (task.gen !== this.effectGeneration) continue;
         try {
           await this.runTask(task);
         } catch (e) {
@@ -176677,7 +177104,7 @@ var BridgeEndpointManager = class extends Service {
         );
       }
     };
-    this.pluginManager.onDeviceUnregistered = async (pluginName, deviceId) => {
+    this.pluginManager.onDeviceUnregistered = async (pluginName, deviceId, options) => {
       const listeners = this.pluginListeners.get(deviceId);
       if (listeners) {
         for (const { observable, listener } of listeners) {
@@ -176691,7 +177118,11 @@ var BridgeEndpointManager = class extends Service {
       const endpoint = this.pluginEndpoints.get(deviceId);
       if (endpoint) {
         try {
-          await endpoint.delete();
+          if (options?.keepIdentity) {
+            await endpoint.close();
+          } else {
+            await endpoint.delete();
+          }
         } catch (e) {
           this.log.warn(
             `Plugin "${pluginName}": failed to remove device "${deviceId}":`,
@@ -176827,11 +177258,11 @@ var BridgeEndpointManager = class extends Service {
       circuitBreakers
     };
   }
-  enablePlugin(pluginName) {
-    this.pluginManager?.enablePlugin(pluginName);
+  async enablePlugin(pluginName) {
+    return await this.pluginManager?.enablePlugin(pluginName);
   }
-  disablePlugin(pluginName) {
-    this.pluginManager?.disablePlugin(pluginName);
+  async disablePlugin(pluginName) {
+    return await this.pluginManager?.disablePlugin(pluginName);
   }
   resetPlugin(pluginName) {
     this.pluginManager?.resetPlugin(pluginName);
@@ -176849,8 +177280,8 @@ var BridgeEndpointManager = class extends Service {
   async isolateEntity(entityName) {
     const endpoints = this.root.parts.map((p) => p);
     const endpoint = endpoints.find(
-      (e) => e.id === entityName || e.entityId === entityName
-    );
+      (e) => !(e instanceof VacuumAreaSwitchEndpoint) && (e.id === entityName || e.entityId === entityName)
+    ) ?? endpoints.find((e) => e.id === entityName);
     if (endpoint) {
       this.log.warn(
         `Isolating entity ${endpoint.entityId} due to runtime error`
@@ -176862,6 +177293,17 @@ var BridgeEndpointManager = class extends Service {
       }
       this.pendingRemovals.delete(endpoint.entityId);
       this.mappingFingerprints.delete(endpoint.entityId);
+      if (!(endpoint instanceof VacuumAreaSwitchEndpoint)) {
+        for (const sw of endpoints) {
+          if (!(sw instanceof VacuumAreaSwitchEndpoint)) continue;
+          if (sw.vacuumEndpointId !== endpoint.id) continue;
+          try {
+            await sw.delete();
+          } catch (e) {
+            this.log.warn(`Failed to remove area switch ${sw.id}:`, e);
+          }
+        }
+      }
     }
   }
   // refreshDevices only runs on registry-fingerprint changes, which may not
@@ -176947,7 +177389,7 @@ var BridgeEndpointManager = class extends Service {
   async refreshDevices() {
     this.registry.refresh();
     this._failedEntities = [];
-    const endpoints = this.root.parts.map((p) => p);
+    const endpoints = this.root.parts.map((p) => p).filter((p) => !(p instanceof VacuumAreaSwitchEndpoint));
     this.entityIds = this.registry.entityIds;
     if (this.registry.isAutoComposedDevicesEnabled()) {
       for (const eid of this.entityIds) {
@@ -177010,6 +177452,19 @@ var BridgeEndpointManager = class extends Service {
       this.bridgeId,
       buildPresentEntityIds(fullEntities)
     );
+    for (const part of [...this.root.parts]) {
+      if (!(part instanceof VacuumAreaSwitchEndpoint)) continue;
+      const claimant = endpointIdToEntity.get(part.id);
+      if (claimant == null) continue;
+      this.log.info(
+        `Area switch ${part.id} collides with entity ${claimant}, removing the switch`
+      );
+      try {
+        await part.delete();
+      } catch (e) {
+        this.log.warn(`Failed to remove colliding area switch ${part.id}:`, e);
+      }
+    }
     const existingEndpoints = [];
     const now = Date.now();
     for (const endpoint of endpoints) {
@@ -177169,10 +177624,117 @@ var BridgeEndpointManager = class extends Service {
         }
       }
     }
+    await this.reconcileAreaSwitches();
     if (this.unsubscribe) {
       this.startObserving();
     }
   }
+  // Opt-in per-area room switches (#355). One momentary OnOffPlugInUnit sibling
+  // per configured service area, mounted alongside its vacuum with a stable
+  // derived id. Areas and mapping come from the parent's vacuumEffective, the
+  // exact config its ServiceArea cluster was built from, never from raw storage
+  // (raw can be a different id space: injected Valetudo/Roborock rooms,
+  // auto-resolved CLEAN_AREA). The vacuum's own endpoint is never touched here.
+  // Switches are kept while their parent endpoint survives with the flag on
+  // (the parent's removal grace is mirrored for free), rebuilt via close() when
+  // the parent was recreated for a mapping change so numbers survive, and
+  // deleted when the flag goes off, the area is gone, or the parent is gone.
+  async reconcileAreaSwitches() {
+    const parts = this.root.parts.map((p) => p);
+    const switches = parts.filter(
+      (p) => p instanceof VacuumAreaSwitchEndpoint
+    );
+    const vacuumById = /* @__PURE__ */ new Map();
+    for (const part of parts) {
+      if (part instanceof VacuumAreaSwitchEndpoint) continue;
+      vacuumById.set(part.id, part);
+    }
+    const isolated = new Set(
+      EntityIsolationService.getIsolatedEntities(this.bridgeId).map(
+        (f) => f.entityId
+      )
+    );
+    const parentIsolated = (parent) => isolated.has(parent.id) || parent.entityId != null && isolated.has(parent.entityId);
+    const kept = /* @__PURE__ */ new Set();
+    for (const sw of switches) {
+      const parent = vacuumById.get(sw.vacuumEndpointId);
+      const mapping = parent ? this.getEntityMapping(parent.entityId) : void 0;
+      const effective = parent instanceof LegacyEndpoint ? parent.vacuumEffective : void 0;
+      let keep = false;
+      let rebuild = false;
+      if (parent && !parentIsolated(parent) && mapping?.vacuumRoomSwitches && effective) {
+        const areas = getVacuumServiceAreas(
+          effective.state.attributes,
+          effective.mapping
+        );
+        if (areas.some((a) => a.areaId === sw.areaId)) {
+          if (sw.parentEffective === effective) {
+            keep = true;
+          } else {
+            rebuild = true;
+          }
+        }
+      }
+      if (keep) {
+        kept.add(sw.id);
+        continue;
+      }
+      try {
+        if (rebuild) {
+          await sw.close();
+        } else {
+          await sw.delete();
+        }
+      } catch (e) {
+        this.log.warn(`Failed to remove area switch ${sw.id}:`, e);
+      }
+    }
+    for (const part of vacuumById.values()) {
+      const entityId = part.entityId;
+      if (!entityId?.startsWith("vacuum.")) continue;
+      if (parentIsolated(part)) continue;
+      const mapping = this.getEntityMapping(entityId);
+      if (!mapping?.vacuumRoomSwitches) continue;
+      const effective = part instanceof LegacyEndpoint ? part.vacuumEffective : void 0;
+      if (!effective) continue;
+      const areas = getVacuumServiceAreas(
+        effective.state.attributes,
+        effective.mapping
+      );
+      const entity = {
+        entity_id: entityId,
+        state: effective.state,
+        registry: this.registry.entity(entityId),
+        deviceRegistry: this.registry.deviceOf(entityId)
+      };
+      for (const area of areas) {
+        const switchId = `${part.id}_roomsw_${area.areaId}`;
+        if (kept.has(switchId)) continue;
+        const holder = vacuumById.get(switchId);
+        if (holder) {
+          this.log.warn(
+            `Skipping area switch ${switchId} for ${entityId}: id taken by entity ${holder.entityId}`
+          );
+          continue;
+        }
+        try {
+          const endpoint = VacuumAreaSwitchEndpoint.create({
+            vacuumEndpointId: part.id,
+            entity,
+            mapping: effective.mapping,
+            area,
+            parentEffective: effective
+          });
+          await this.root.add(endpoint);
+        } catch (e) {
+          this.log.warn(
+            `Failed to add area switch ${switchId} for ${entityId}:`,
+            e
+          );
+        }
+      }
+    }
+  }
   updateInFlight;
   pendingStates;
   pendingChanged;
@@ -180453,9 +181015,9 @@ function startCommand(webDist) {
 }
 
 // src/cli.ts
-var dirname7 = import.meta.dirname ?? url.fileURLToPath(new URL(".", import.meta.url));
+var dirname8 = import.meta.dirname ?? url.fileURLToPath(new URL(".", import.meta.url));
 async function cli(argv) {
-  const webDist = process.env.NODE_ENV === "development" ? void 0 : path13.join(dirname7, "../frontend");
+  const webDist = process.env.NODE_ENV === "development" ? void 0 : path13.join(dirname8, "../frontend");
   const cli2 = yargs(hideBin(argv));
   cli2.scriptName("home-assistant-matter-hub").version().strict().recommendCommands().detectLocale(false).help().command(startCommand(webDist)).demandCommand().wrap(Math.min(140, cli2.terminalWidth())).parse();
 }