@switchbot/homebridge-switchbot 5.0.0-beta.153 → 5.0.0-beta.155

package/dist/homebridge-ui/public/js/app.js

@@ -76,15 +76,21 @@ var init_modal = __esm({
 // src/homebridge-ui/public/js/toast.ts
 function showToast(method, message, title = "SwitchBot") {
   try {
-    const toast = homebridge?.toast;
-    const fn = toast?.[method];
-    if (typeof fn === "function") {
-      fn(message, title);
-      return;
+    const hb = typeof window !== "undefined" ? window.homebridge : void 0;
+    const toast = hb && typeof hb.toast === "object" ? hb.toast : void 0;
+    const fn = toast && typeof toast[method] === "function" ? toast[method] : void 0;
+    if (fn) {
+      try {
+        fn(message, title);
+        return;
+      } catch (err) {
+        uiLog.warn(`Toast ${method} threw:`, err);
+      }
     }
     uiLog.info(`[Toast:${method}] ${title} - ${message}`);
   } catch (e) {
-    uiLog.warn(`Toast ${method} failed:`, e);
+    uiLog.warn(`Toast ${method} outer error:`, e);
+    uiLog.info(`[Toast:${method}] ${title} - ${message}`);
   }
 }
 function toastSuccess(message, title) {
@@ -107,7 +113,7 @@ var init_toast = __esm({
   }
 });
 
-// src/device-types.ts
+// src/device-types.js
 function getValidDeviceTypes() {
   const validTypes = /* @__PURE__ */ new Set();
   for (const category of Object.values(DEVICE_TYPES)) {
@@ -142,7 +148,7 @@ function isValidDeviceType(deviceType) {
 }
 var DEVICE_TYPES, DEVICE_TYPE_NORMALIZATION_MAP;
 var init_device_types = __esm({
-  "src/device-types.ts"() {
+  "src/device-types.js"() {
     "use strict";
     DEVICE_TYPES = {
       "Window Coverings": ["Blind Tilt", "Curtain", "Curtain3", "Roller Shade"],
@@ -240,11 +246,10 @@ var init_device_types = __esm({
       "Other Devices": ["AI Art Frame", "Bot", "Home Climate Panel", "Remote", "remote with screen"]
     };
     DEVICE_TYPE_NORMALIZATION_MAP = {
-      // --- node-switchbot beta new types normalization additions ---
+      // --- node-switchbot v4 normalization additions ---
       "hub mini": "Hub Mini",
       "hub 3": "Hub 3",
       "keypad": "Keypad",
-      // node-switchbot beta
       "plug mini": "Plug Mini (US)",
       // fallback to US if region not specified
       "art frame": "AI Art Frame",
@@ -253,13 +258,11 @@ var init_device_types = __esm({
       // alias for new lock vision
       "lock pro": "Smart Lock Pro",
       "lock lite": "Lock Lite",
-      // node-switchbot beta
       "circulator fan": "Circulator Fan",
-      // node-switchbot beta
       "smart thermostat radiator": "Smart Radiator Thermostat",
       "climate panel": "Home Climate Panel",
       "evaporative humidifier": "Humidifier",
-      // --- end node-switchbot beta additions ---
+      // --- end node-switchbot v4 additions ---
       // Only keep the last occurrence for each key, all values canonical
       "air purifier pm2.5": "Air Purifier PM2.5",
       "pan/tilt cam plus 3k": "Pan/Tilt Cam Plus 3K",
@@ -298,7 +301,6 @@ var init_device_types = __esm({
       "rgbicww strip light": "RGBICWW Strip Light",
       "strip light": "Strip Light",
       "strip light 3": "Strip Light 3",
-      // node-switchbot beta
       // Vacuum conversions
       "robot vacuum cleaner s1": "Robot Vacuum Cleaner S1",
       "robot vacuum cleaner s1 plus": "Robot Vacuum Cleaner S1 Plus",
@@ -331,7 +333,7 @@ var init_device_types = __esm({
       // Migration mappings for invalid/legacy device types
       "lock vision pro": "Lock Vision Pro",
       // Valid alias; map to canonical
-      // 'lock vision': 'Keypad Vision', // Invalid type (removed, now node-switchbot beta alias above)
+      // 'lock vision': 'Keypad Vision', // Invalid type (removed, now alias above)
       "lock touch": "Keypad Touch",
       // Invalid type
       // Additional normalization for new/unknown types from logs
@@ -414,11 +416,6 @@ async function syncParentPluginConfigFromDisk(autoSave = false) {
       uiLog.warn("Parent config sync API not available");
       return false;
     }
-    const diskResp = await homebridge.request("/platform-config", {});
-    if (!diskResp || diskResp.success === false || !diskResp.data) {
-      uiLog.warn("Failed to fetch fresh platform config from disk");
-      return false;
-    }
     const pluginConfigBlocks = await homebridge.getPluginConfig();
     if (!Array.isArray(pluginConfigBlocks) || !pluginConfigBlocks.length) {
       uiLog.warn("No plugin config blocks returned from Homebridge");
@@ -429,12 +426,11 @@ async function syncParentPluginConfigFromDisk(autoSave = false) {
       uiLog.warn("SwitchBot platform block not found in Homebridge plugin config");
       return false;
     }
-    const errors = validateAndFixDeviceTypes(diskResp.data.devices || []);
+    const errors = validateAndFixDeviceTypes(pluginConfigBlocks[index].devices || []);
     if (errors.length > 0) {
       toastError(`Invalid device types found: ${errors.map((e) => `${e.name} (${e.type})`).join(", ")}`);
       return false;
     }
-    pluginConfigBlocks[index] = diskResp.data;
     await homebridge.updatePluginConfig(pluginConfigBlocks);
     if (autoSave && typeof homebridge.savePluginConfig === "function") {
       uiLog.info("Auto-saving config to disk...");
@@ -600,6 +596,7 @@ async function deleteDevice(deviceId) {
   const normalizedDeviceId = String(deviceId).trim().toLowerCase();
   const before = config.devices.length;
   config.devices = config.devices.filter((d) => String(d.deviceId ?? d.id ?? "").trim().toLowerCase() !== normalizedDeviceId);
+  config.devices = config.devices.filter((d) => d && typeof d === "object" && d.deviceId && d.configDeviceType);
   if (config.devices.length === before) {
     throw new Error("Device not found in config");
   }
@@ -614,16 +611,24 @@ async function deleteAllDevices() {
     throw new TypeError("Homebridge UI API not available");
   }
   const configArr = await homebridge.getPluginConfig();
-  const idx = Array.isArray(configArr) ? configArr.findIndex(isSwitchBotPlatformConfig) : -1;
+  let idx = Array.isArray(configArr) ? configArr.findIndex(isSwitchBotPlatformConfig) : -1;
   if (idx === -1) {
-    throw new Error("SwitchBot config not found");
+    const newBlock = { platform: "SwitchBot", devices: [] };
+    configArr.push(newBlock);
+    idx = configArr.length - 1;
   }
   const config = configArr[idx];
   if (!Array.isArray(config.devices)) {
-    throw new TypeError("No devices array in config");
+    config.devices = [];
   }
   const deletedCount = config.devices.length;
   config.devices = [];
+  if (!config.platform) {
+    config.platform = "SwitchBot";
+  }
+  if (!config.name) {
+    config.name = "SwitchBot";
+  }
   await homebridge.updatePluginConfig(configArr);
   if (typeof homebridge.savePluginConfig === "function") {
     await homebridge.savePluginConfig();
@@ -647,42 +652,6 @@ __export(discovery_exports, {
   discoverDevices: () => discoverDevices2,
   initializeDiscoverySettings: () => initializeDiscoverySettings
 });
-async function batchSetDeviceEnabled(selectedIds, enabled) {
-  const resp = await homebridge.request("/platform-config", {});
-  if (!resp || resp.success === false || !resp.data) {
-    throw new Error("Failed to load config");
-  }
-  const config = resp.data;
-  const configArr = Array.isArray(config) ? config : [config];
-  const platformIdx = configArr.findIndex((c) => (c.platform || c.name || "").toLowerCase().includes("switchbot"));
-  if (platformIdx === -1) {
-    throw new Error("SwitchBot platform config not found");
-  }
-  const platformConfig = configArr[platformIdx];
-  if (!Array.isArray(platformConfig.devices)) {
-    throw new TypeError("No devices array in config");
-  }
-  let changed = false;
-  for (const dev of platformConfig.devices) {
-    const id = String(dev.deviceId || dev.id || "").trim().toLowerCase();
-    if (selectedIds.has(id)) {
-      if (dev.enabled !== enabled) {
-        dev.enabled = enabled;
-        changed = true;
-      }
-    }
-  }
-  if (changed) {
-    if (typeof homebridge.updatePluginConfig === "function") {
-      await homebridge.updatePluginConfig(configArr);
-    } else {
-      throw new TypeError("homebridge.updatePluginConfig is not available");
-    }
-    if (typeof homebridge.savePluginConfig === "function") {
-      await homebridge.savePluginConfig();
-    }
-  }
-}
 function normalizeId(value) {
   return String(value ?? "").trim().toLowerCase();
 }
@@ -936,9 +905,9 @@ function getDiscoveryGroupByPreference() {
     if (stored === "hub" || stored === "type") {
       return stored;
     }
-    return "connection";
+    return "type";
   } catch (_e) {
-    return "connection";
+    return "type";
   }
 }
 function setDiscoveryGroupByPreference(groupBy) {
@@ -1042,19 +1011,17 @@ async function discoverDevices2() {
   const preferences = getDiscoveryPreferences();
   let groupBy = getDiscoveryGroupByPreference();
   let hideAdded = getDiscoveryHideAddedPreference();
-  let controlsInitialized = false;
   if (!window._discoverySelectedIds) {
     window._discoverySelectedIds = /* @__PURE__ */ new Set();
   }
   const selectedIds = window._discoverySelectedIds;
-  async function batchSetDeviceEnabled2(selectedIds2, enabled) {
-    const resp = await homebridge.request("/platform-config", {});
-    if (!resp || resp.success === false || !resp.data) {
-      throw new Error("Failed to load config");
-    }
-    const config = resp.data;
-    const configArr = Array.isArray(config) ? config : [config];
-    const platformIdx = configArr.findIndex((c) => (c.platform || c.name || "").toLowerCase().includes("switchbot"));
+  let controlsInitialized = false;
+  async function batchSetDeviceEnabled(selectedIds2, enabled) {
+    if (typeof homebridge.getPluginConfig !== "function") {
+      throw new TypeError("homebridge.getPluginConfig is not available");
+    }
+    const configArr = await homebridge.getPluginConfig();
+    const platformIdx = Array.isArray(configArr) ? configArr.findIndex((c) => (c.platform || c.name || "").toLowerCase().includes("switchbot")) : -1;
     if (platformIdx === -1) {
       throw new Error("SwitchBot platform config not found");
     }
@@ -1084,13 +1051,48 @@ async function discoverDevices2() {
     }
   }
   const ensureDiscoveryControls = async () => {
+    const selectAllBtn = document.createElement("button");
+    selectAllBtn.textContent = "Select All";
+    selectAllBtn.style.fontSize = "13px";
+    selectAllBtn.style.padding = "6px 18px";
+    selectAllBtn.style.borderRadius = "6px";
+    selectAllBtn.style.background = "#f3f4f6";
+    selectAllBtn.style.color = "#1d4ed8";
+    selectAllBtn.style.border = "1px solid #d1d5db";
+    selectAllBtn.style.cursor = "pointer";
+    selectAllBtn.style.marginRight = "8px";
+    selectAllBtn.onclick = () => {
+      for (const d of discoveredDevices) {
+        selectedIds.add(normalizeId(d.id));
+      }
+      window.dispatchEvent(new Event("discovery-selection-changed"));
+      void updateDiscoveryView(discoveredDevices, preferences, groupBy, hideAdded, selectedIds);
+    };
+    const deselectAllBtn = document.createElement("button");
+    deselectAllBtn.textContent = "Deselect All";
+    deselectAllBtn.style.fontSize = "13px";
+    deselectAllBtn.style.padding = "6px 18px";
+    deselectAllBtn.style.borderRadius = "6px";
+    deselectAllBtn.style.background = "#f3f4f6";
+    deselectAllBtn.style.color = "#ef4444";
+    deselectAllBtn.style.border = "1px solid #d1d5db";
+    deselectAllBtn.style.cursor = "pointer";
+    deselectAllBtn.onclick = () => {
+      for (const d of discoveredDevices) {
+        selectedIds.delete(normalizeId(d.id));
+      }
+      window.dispatchEvent(new Event("discovery-selection-changed"));
+      void updateDiscoveryView(discoveredDevices, preferences, groupBy, hideAdded, selectedIds);
+    };
+    const selectControlsRow = document.createElement("div");
+    selectControlsRow.style.display = "flex";
+    selectControlsRow.style.gap = "10px";
+    selectControlsRow.style.margin = "0 0 10px 0";
+    selectControlsRow.appendChild(selectAllBtn);
+    selectControlsRow.appendChild(deselectAllBtn);
     if (controlsInitialized) {
       return;
     }
-    if (!window._discoverySelectedIds) {
-      window._discoverySelectedIds = /* @__PURE__ */ new Set();
-    }
-    const selectedIds2 = window._discoverySelectedIds;
     const controlsDiv = document.createElement("div");
     controlsDiv.style.cssText = "margin-bottom: 12px; display: flex; gap: 12px; flex-wrap: wrap; align-items: center;";
     const filterLabel = document.createElement("label");
@@ -1120,7 +1122,7 @@ async function discoverDevices2() {
       filterBtn.onclick = () => {
         preferences.connectionType = option.value;
         setDiscoveryPreferences(preferences);
-        void updateDiscoveryView(discoveredDevices, preferences, groupBy, hideAdded, selectedIds2);
+        void updateDiscoveryView(discoveredDevices, preferences, groupBy, hideAdded, selectedIds);
         Array.prototype.forEach.call(filterGroup.querySelectorAll("button"), (b) => {
           b.style.border = "1px solid #ccc";
           b.style.backgroundColor = "#fff";
@@ -1157,18 +1159,27 @@ async function discoverDevices2() {
     sortSelect.onchange = () => {
       preferences.sortBy = sortSelect.value;
       setDiscoveryPreferences(preferences);
-      void updateDiscoveryView(discoveredDevices, preferences, groupBy, hideAdded, selectedIds2);
+      void updateDiscoveryView(discoveredDevices, preferences, groupBy, hideAdded, selectedIds);
     };
-    const groupLabel = document.createElement("label");
-    groupLabel.style.fontSize = "12px";
-    groupLabel.style.fontWeight = "500";
-    groupLabel.style.marginLeft = "8px";
-    groupLabel.textContent = "Group:";
     const groupSelect = document.createElement("select");
     groupSelect.style.fontSize = "11px";
     groupSelect.style.padding = "4px 8px";
     groupSelect.style.borderRadius = "3px";
-    groupSelect.value = groupBy;
+    if (!localStorage.getItem(DISCOVERY_GROUP_BY_KEY)) {
+      groupSelect.value = "type";
+    } else {
+      groupSelect.value = groupBy;
+    }
+    const groupLabel = document.createElement("label");
+    groupLabel.style.fontSize = "12px";
+    groupLabel.style.fontWeight = "500";
+    groupLabel.style.marginLeft = "8px";
+    const groupLabelTextMap = {
+      connection: "Connection",
+      hub: "Hub",
+      type: "Device Type"
+    };
+    groupLabel.textContent = `Group: ${groupLabelTextMap[groupSelect.value] || "Connection"}`;
     const groupOptions = [
       { label: "Connection", value: "connection" },
       { label: "Hub", value: "hub" },
@@ -1183,7 +1194,8 @@ async function discoverDevices2() {
     groupSelect.onchange = () => {
       groupBy = groupSelect.value;
       setDiscoveryGroupByPreference(groupBy);
-      void updateDiscoveryView(discoveredDevices, preferences, groupBy, hideAdded, selectedIds2);
+      groupLabel.textContent = `Group: ${groupLabelTextMap[groupSelect.value] || "Connection"}`;
+      void updateDiscoveryView(discoveredDevices, preferences, groupBy, hideAdded, selectedIds);
     };
     const hideAddedLabel = document.createElement("label");
     hideAddedLabel.style.display = "inline-flex";
@@ -1203,7 +1215,7 @@ async function discoverDevices2() {
     hideAddedCheckbox.onchange = () => {
       hideAdded = hideAddedCheckbox.checked;
       setDiscoveryHideAddedPreference(hideAdded);
-      void updateDiscoveryView(discoveredDevices, preferences, groupBy, hideAdded, selectedIds2);
+      void updateDiscoveryView(discoveredDevices, preferences, groupBy, hideAdded, selectedIds);
     };
     const searchInput = document.createElement("input");
     searchInput.type = "text";
@@ -1223,7 +1235,7 @@ async function discoverDevices2() {
       searchTimeout = setTimeout(() => {
         preferences.searchQuery = searchInput.value;
         setDiscoveryPreferences(preferences);
-        void updateDiscoveryView(discoveredDevices, preferences, groupBy, hideAdded, selectedIds2);
+        void updateDiscoveryView(discoveredDevices, preferences, groupBy, hideAdded, selectedIds);
       }, 300);
     };
     const actionBtnStyle = {
@@ -1248,14 +1260,14 @@ async function discoverDevices2() {
     Object.assign(addSelectedBtn.style, actionBtnStyle);
     addSelectedBtn.disabled = true;
     addSelectedBtn.onclick = async () => {
-      if (!selectedIds2.size) {
+      if (!selectedIds.size) {
         return;
       }
       addSelectedBtn.disabled = true;
       addSelectedBtn.textContent = "Adding...";
       try {
         showBusyUi();
-        const selectedDevices = discoveredDevices.filter((d) => selectedIds2.has(normalizeId(d.id)));
+        const selectedDevices = discoveredDevices.filter((d) => selectedIds.has(normalizeId(d.id)));
         const bulkResult = await addDevicesInBulk(selectedDevices.map((d) => ({
           deviceId: d.id,
           name: d.name,
@@ -1272,10 +1284,10 @@ async function discoverDevices2() {
         const skippedCount = bulkResult?.skippedCount ?? bulkResult?.data?.skippedCount ?? 0;
         toastSuccess(`Added ${addedCount} device(s)${skippedCount > 0 ? ` (${skippedCount} skipped)` : ""}`);
         await loadConfiguredDevices();
-        selectedIds2.clear();
+        selectedIds.clear();
         addSelectedBtn.disabled = true;
         addSelectedBtn.textContent = "Add Selected";
-        await updateDiscoveryView(discoveredDevices, preferences, groupBy, hideAdded, selectedIds2);
+        await updateDiscoveryView(discoveredDevices, preferences, groupBy, hideAdded, selectedIds);
       } catch (e) {
         uiLog.error("Batch add error:", e);
         toastError(e instanceof Error ? e.message : "Failed to add devices");
@@ -1290,19 +1302,19 @@ async function discoverDevices2() {
     Object.assign(enableSelectedBtn.style, actionBtnStyle);
     enableSelectedBtn.disabled = true;
     enableSelectedBtn.onclick = async () => {
-      if (!selectedIds2.size) {
+      if (!selectedIds.size) {
         return;
       }
       enableSelectedBtn.disabled = true;
       enableSelectedBtn.textContent = "Enabling...";
       try {
         showBusyUi();
-        await batchSetDeviceEnabled2(selectedIds2, true);
+        await batchSetDeviceEnabled(selectedIds, true);
         toastSuccess("Selected devices enabled");
         await loadConfiguredDevices();
         enableSelectedBtn.disabled = true;
         enableSelectedBtn.textContent = "Enable Selected";
-        await updateDiscoveryView(discoveredDevices, preferences, groupBy, hideAdded, selectedIds2);
+        await updateDiscoveryView(discoveredDevices, preferences, groupBy, hideAdded, selectedIds);
       } catch (e) {
         uiLog.error("Batch enable error:", e);
         toastError(e instanceof Error ? e.message : "Failed to enable devices");
@@ -1317,19 +1329,19 @@ async function discoverDevices2() {
     Object.assign(disableSelectedBtn.style, actionBtnStyle);
     disableSelectedBtn.disabled = true;
     disableSelectedBtn.onclick = async () => {
-      if (!selectedIds2.size) {
+      if (!selectedIds.size) {
         return;
       }
       disableSelectedBtn.disabled = true;
       disableSelectedBtn.textContent = "Disabling...";
       try {
         showBusyUi();
-        await batchSetDeviceEnabled2(selectedIds2, false);
+        await batchSetDeviceEnabled(selectedIds, false);
         toastSuccess("Selected devices disabled");
         await loadConfiguredDevices();
         disableSelectedBtn.disabled = true;
         disableSelectedBtn.textContent = "Disable Selected";
-        await updateDiscoveryView(discoveredDevices, preferences, groupBy, hideAdded, selectedIds2);
+        await updateDiscoveryView(discoveredDevices, preferences, groupBy, hideAdded, selectedIds);
       } catch (e) {
         uiLog.error("Batch disable error:", e);
         toastError(e instanceof Error ? e.message : "Failed to disable devices");
@@ -1356,6 +1368,7 @@ async function discoverDevices2() {
     topActionRow.appendChild(enableSelectedBtn);
     topActionRow.appendChild(disableSelectedBtn);
     list.innerHTML = "";
+    list.appendChild(selectControlsRow);
     list.appendChild(topActionRow);
     list.appendChild(controlsDiv);
     let deviceListContainer = document.getElementById("discoveredDevices");
@@ -1372,7 +1385,7 @@ async function discoverDevices2() {
     list.style.display = "block";
     controlsInitialized = true;
     const updateActionButtons = () => {
-      const hasSelection = selectedIds2.size > 0;
+      const hasSelection = selectedIds.size > 0;
       addSelectedBtn.disabled = !hasSelection;
       enableSelectedBtn.disabled = !hasSelection;
       disableSelectedBtn.disabled = !hasSelection;
@@ -1690,21 +1703,10 @@ async function updateDiscoveryView(allDevices, preferences, groupBy, hideAdded,
       toastError("Discovery UI error: device list container missing. Please reload the page.");
     }
   }
-  const legacyAddSelectedBtns = [];
-  const allBtns = document.querySelectorAll("button");
-  for (let i = 0; i < allBtns.length; i++) {
-    const btn = allBtns[i];
-    if (btn.textContent && btn.textContent.trim() === "Add Selected") {
-      legacyAddSelectedBtns.push(btn);
-    }
-  }
-  for (let i = 0; i < legacyAddSelectedBtns.length; i++) {
-    legacyAddSelectedBtns[i].remove();
-  }
   function updateBatchButtonStates() {
     const addSelectedBtn = document.getElementById("addSelectedBtn");
-    const enableSelectedBtn = document.querySelector("button")?.parentElement?.querySelector('button[aria-label="Enable Selected"]');
-    const disableSelectedBtn = document.querySelector("button")?.parentElement?.querySelector('button[aria-label="Disable Selected"]');
+    const enableSelectedBtn = document.getElementById("enableSelectedBtn");
+    const disableSelectedBtn = document.getElementById("disableSelectedBtn");
     const hasSelection = selectedIds.size > 0;
     if (addSelectedBtn) {
       addSelectedBtn.disabled = !hasSelection;
@@ -1718,161 +1720,7 @@ async function updateDiscoveryView(allDevices, preferences, groupBy, hideAdded,
   }
   window.removeEventListener("discovery-selection-changed", updateBatchButtonStates);
   window.addEventListener("discovery-selection-changed", updateBatchButtonStates);
-  let batchControls = document.getElementById("batchImportControls");
-  if (!batchControls) {
-    batchControls = document.createElement("div");
-    batchControls.id = "batchImportControls";
-    batchControls.style.display = "flex";
-    batchControls.style.flexWrap = "wrap";
-    batchControls.style.alignItems = "center";
-    batchControls.style.gap = "18px";
-    batchControls.style.margin = "8px 0 18px 0";
-    batchControls.style.width = "100%";
-    const buttonRow = document.createElement("div");
-    buttonRow.style.display = "flex";
-    buttonRow.style.flexWrap = "nowrap";
-    buttonRow.style.alignItems = "center";
-    buttonRow.style.justifyContent = "center";
-    buttonRow.style.gap = "16px";
-    buttonRow.style.width = "100%";
-    const addSelectedBtn = document.createElement("button");
-    addSelectedBtn.id = "addSelectedBtn";
-    addSelectedBtn.textContent = "Add Selected to Config";
-    addSelectedBtn.disabled = selectedIds.size === 0;
-    addSelectedBtn.style.fontWeight = "600";
-    const redButtonStyle = {
-      width: "220px",
-      padding: "12px 0",
-      fontSize: "17px",
-      marginBottom: "0",
-      boxShadow: "0 2px 8px 0 rgba(220,38,38,0.10)",
-      borderRadius: "8px"
-    };
-    Object.assign(addSelectedBtn.style, redButtonStyle);
-    addSelectedBtn.style.background = "#ef4444";
-    addSelectedBtn.style.color = "white";
-    addSelectedBtn.style.transition = "background 0.2s, box-shadow 0.2s";
-    addSelectedBtn.onmouseenter = function() {
-      addSelectedBtn.style.background = "#dc2626";
-    };
-    addSelectedBtn.onmouseleave = function() {
-      addSelectedBtn.style.background = "#ef4444";
-    };
-    addSelectedBtn.onclick = async () => {
-      if (!selectedIds.size) {
-        return;
-      }
-      addSelectedBtn.disabled = true;
-      addSelectedBtn.textContent = "Adding...";
-      try {
-        const selectedDevices = visibleDevices.filter((d) => selectedIds.has(normalizeId(d.id)));
-        const bulkResult = await addDevicesInBulk(selectedDevices.map((d) => ({
-          deviceId: d.id,
-          name: d.name,
-          type: d.type,
-          rssi: d.rssi,
-          address: d.address,
-          model: d.model
-        })));
-        uiLog.info("Batch add response:", bulkResult);
-        if (!bulkResult || bulkResult.success === false) {
-          throw new Error(bulkResult?.data?.message || "Batch add failed");
-        }
-        const addedCount = bulkResult?.addedCount ?? bulkResult?.data?.addedCount ?? 0;
-        const skippedCount = bulkResult?.skippedCount ?? bulkResult?.data?.skippedCount ?? 0;
-        toastSuccess(`Added ${addedCount} device(s)${skippedCount > 0 ? ` (${skippedCount} skipped)` : ""}`);
-        await loadConfiguredDevices();
-        selectedIds.clear();
-        addSelectedBtn.disabled = true;
-        addSelectedBtn.textContent = "Add Selected to Config";
-        await updateDiscoveryView(allDevices, preferences, groupBy, hideAdded, selectedIds);
-      } catch (e) {
-        uiLog.error("Batch add error:", e);
-        toastError(e instanceof Error ? e.message : "Failed to add devices");
-        addSelectedBtn.disabled = false;
-        addSelectedBtn.textContent = "Add Selected to Config";
-      }
-    };
-    const enableSelectedBtn = document.createElement("button");
-    enableSelectedBtn.textContent = "Enable Selected";
-    enableSelectedBtn.style.fontWeight = "600";
-    Object.assign(enableSelectedBtn.style, redButtonStyle);
-    enableSelectedBtn.style.background = "#ef4444";
-    enableSelectedBtn.style.color = "white";
-    enableSelectedBtn.style.transition = "background 0.2s, box-shadow 0.2s";
-    enableSelectedBtn.onmouseenter = function() {
-      enableSelectedBtn.style.background = "#dc2626";
-    };
-    enableSelectedBtn.onmouseleave = function() {
-      enableSelectedBtn.style.background = "#ef4444";
-    };
-    enableSelectedBtn.disabled = selectedIds.size === 0;
-    enableSelectedBtn.onclick = async () => {
-      if (!selectedIds.size) {
-        return;
-      }
-      enableSelectedBtn.disabled = true;
-      try {
-        showBusyUi();
-        await batchSetDeviceEnabled(selectedIds, true);
-        toastSuccess("Selected devices enabled");
-        await loadConfiguredDevices();
-        await updateDiscoveryView(allDevices, preferences, groupBy, hideAdded, selectedIds);
-      } catch (e) {
-        uiLog.error("Batch enable error:", e);
-        toastError(e instanceof Error ? e.message : "Failed to enable devices");
-      } finally {
-        hideBusyUi();
-        enableSelectedBtn.disabled = false;
-      }
-    };
-    const disableSelectedBtn = document.createElement("button");
-    disableSelectedBtn.textContent = "Disable Selected";
-    disableSelectedBtn.style.fontWeight = "600";
-    Object.assign(disableSelectedBtn.style, redButtonStyle);
-    disableSelectedBtn.style.background = "#ef4444";
-    disableSelectedBtn.style.color = "white";
-    disableSelectedBtn.style.transition = "background 0.2s, box-shadow 0.2s";
-    disableSelectedBtn.onmouseenter = function() {
-      disableSelectedBtn.style.background = "#dc2626";
-    };
-    disableSelectedBtn.onmouseleave = function() {
-      disableSelectedBtn.style.background = "#ef4444";
-    };
-    disableSelectedBtn.disabled = selectedIds.size === 0;
-    disableSelectedBtn.onclick = async () => {
-      if (!selectedIds.size) {
-        return;
-      }
-      disableSelectedBtn.disabled = true;
-      try {
-        showBusyUi();
-        await batchSetDeviceEnabled(selectedIds, false);
-        toastSuccess("Selected devices disabled");
-        await loadConfiguredDevices();
-        await updateDiscoveryView(allDevices, preferences, groupBy, hideAdded, selectedIds);
-      } catch (e) {
-        uiLog.error("Batch disable error:", e);
-        toastError(e instanceof Error ? e.message : "Failed to disable devices");
-      } finally {
-        hideBusyUi();
-        disableSelectedBtn.disabled = false;
-      }
-    };
-    buttonRow.appendChild(addSelectedBtn);
-    buttonRow.appendChild(enableSelectedBtn);
-    buttonRow.appendChild(disableSelectedBtn);
-    batchControls.appendChild(buttonRow);
-    const listContainer = document.getElementById("discoveredList");
-    if (listContainer) {
-      listContainer.insertBefore(batchControls, listContainer.firstChild);
-    }
-  } else {
-    const addSelectedBtn = document.getElementById("addSelectedBtn");
-    if (addSelectedBtn) {
-      addSelectedBtn.disabled = selectedIds.size === 0;
-    }
-  }
+  updateBatchButtonStates();
   const status = document.getElementById("discoverStatus");
   if (status) {
     const totalCount = allDevices.length;
@@ -3020,6 +2868,7 @@ function renderDeviceDetailsPanel(device) {
     }
   }
   const rows = [
+    { label: "Name", value: String(device?.name || device?.configDeviceName || "N/A") },
     { label: "Device ID", value: String(device?.id || device?.deviceId || "N/A"), copyable: !!(device?.id || device?.deviceId) },
     { label: "MAC Address", value: String(device?.address || "N/A"), copyable: !!device?.address },
     { label: "Device Type", value: String(device?.type || device?.configDeviceType || "N/A") },
@@ -3641,7 +3490,7 @@ function renderDeviceList(list) {
     deleteBtn.style.background = "#ef4444";
     deleteBtn.onclick = async () => {
       const { deleteDeviceFromConfig: deleteDeviceFromConfig2 } = await Promise.resolve().then(() => (init_devices_delete(), devices_delete_exports));
-      await deleteDeviceFromConfig2(d.id, d.name || d.id);
+      await deleteDeviceFromConfig2(d.id || d.deviceId, d.name || d.id || d.deviceId);
     };
     buttons.appendChild(editBtn);
     buttons.appendChild(copyBtn);
@@ -3717,6 +3566,7 @@ async function addDeviceToConfig2(device, options = {}) {
       }
     }
     if (refresh) {
+      await syncParentPluginConfigFromDisk(true);
       await loadConfiguredDevices();
     }
     return { added: !alreadyExists };