@switchbot/homebridge-switchbot 5.0.0-beta.110 → 5.0.0-beta.111

package/src/homebridge-ui/public/js/modals.ts

@@ -1,6 +1,173 @@
 import { DEVICE_TYPES } from './constants.js'
 import { uiLog } from './logger.js'
 
+export async function importDiscoveredDevice(device: any): Promise<{ configDeviceName: string, configDeviceType: string, address?: string } | null> {
+  return new Promise((resolve) => {
+    const div = document.createElement('div')
+    div.style.position = 'fixed'
+    div.style.top = '0'
+    div.style.left = '0'
+    div.style.width = '100%'
+    div.style.height = '100%'
+    div.style.background = 'rgba(0,0,0,0.7)'
+    div.style.display = 'flex'
+    div.style.alignItems = 'center'
+    div.style.justifyContent = 'center'
+    div.style.zIndex = '9999'
+
+    const modal = document.createElement('div')
+    modal.style.background = getComputedStyle(document.body).backgroundColor
+    modal.style.color = getComputedStyle(document.body).color
+    modal.style.padding = '0'
+    modal.style.borderRadius = '10px'
+    modal.style.minWidth = '440px'
+    modal.style.maxWidth = '90vw'
+    modal.style.boxShadow = '0 8px 32px rgba(0,0,0,0.35)'
+    modal.style.overflow = 'hidden'
+    modal.style.borderTop = '3px solid var(--switchbot-red, #ef4444)'
+
+    const title = document.createElement('h3')
+    title.textContent = 'Import Discovered Device'
+    title.style.marginTop = '0'
+    title.style.marginBottom = '16px'
+    title.style.padding = '20px 20px 0'
+    title.style.fontSize = '18px'
+    title.style.fontWeight = '600'
+    title.style.color = 'var(--switchbot-red, #ef4444)'
+    title.style.letterSpacing = '-0.02em'
+
+    const contentDiv = document.createElement('div')
+    contentDiv.style.padding = '0 20px 20px'
+
+    const nameLabel = document.createElement('label')
+    nameLabel.textContent = 'Device Name'
+    nameLabel.style.display = 'block'
+    nameLabel.style.marginBottom = '6px'
+    nameLabel.style.fontWeight = '500'
+    nameLabel.style.fontSize = '12px'
+    nameLabel.style.color = '#6b7280'
+
+    const nameInput = document.createElement('input')
+    nameInput.type = 'text'
+    nameInput.value = device.name || device.id || ''
+    nameInput.style.width = '100%'
+    nameInput.style.marginBottom = '12px'
+    nameInput.style.padding = '8px 10px'
+    nameInput.style.borderRadius = '6px'
+    nameInput.style.fontSize = '14px'
+    nameInput.style.boxSizing = 'border-box'
+
+    const typeLabel = document.createElement('label')
+    typeLabel.textContent = 'Config Device Type'
+    typeLabel.style.display = 'block'
+    typeLabel.style.marginBottom = '6px'
+    typeLabel.style.fontWeight = '500'
+    typeLabel.style.fontSize = '12px'
+    typeLabel.style.color = '#6b7280'
+
+    const typeSelect = document.createElement('select')
+    typeSelect.style.width = '100%'
+    typeSelect.style.padding = '8px 10px'
+    typeSelect.style.marginBottom = '12px'
+    typeSelect.style.borderRadius = '6px'
+    typeSelect.style.fontSize = '14px'
+    typeSelect.style.background = getComputedStyle(nameInput).background
+    typeSelect.style.color = getComputedStyle(nameInput).color
+    typeSelect.style.border = getComputedStyle(nameInput).border
+    typeSelect.style.boxSizing = 'border-box'
+
+    Object.keys(DEVICE_TYPES).forEach((categoryName) => {
+      const optgroup = document.createElement('optgroup')
+      optgroup.label = categoryName
+
+      DEVICE_TYPES[categoryName as keyof typeof DEVICE_TYPES].forEach((deviceType) => {
+        const opt = document.createElement('option')
+        opt.value = deviceType
+        opt.text = deviceType
+        const detectedType = (device.type || '').toLowerCase()
+        opt.selected = deviceType.toLowerCase() === detectedType
+        optgroup.appendChild(opt)
+      })
+
+      typeSelect.appendChild(optgroup)
+    })
+
+    const macLabel = document.createElement('label')
+    macLabel.textContent = 'BLE MAC Address (optional)'
+    macLabel.style.display = 'block'
+    macLabel.style.marginBottom = '6px'
+    macLabel.style.fontWeight = '500'
+    macLabel.style.fontSize = '12px'
+    macLabel.style.color = '#6b7280'
+
+    const macInput = document.createElement('input')
+    macInput.type = 'text'
+    macInput.value = device.address || ''
+    macInput.placeholder = 'AA:BB:CC:DD:EE:FF'
+    macInput.style.width = '100%'
+    macInput.style.marginBottom = '12px'
+    macInput.style.padding = '8px 10px'
+    macInput.style.borderRadius = '6px'
+    macInput.style.fontSize = '14px'
+    macInput.style.boxSizing = 'border-box'
+
+    const buttons = document.createElement('div')
+    buttons.style.display = 'flex'
+    buttons.style.gap = '10px'
+    buttons.style.justifyContent = 'flex-end'
+    buttons.style.marginTop = '18px'
+    buttons.style.paddingTop = '18px'
+    buttons.style.borderTop = '1px solid rgba(0, 0, 0, 0.08)'
+
+    const cancelBtn = document.createElement('button')
+    cancelBtn.textContent = 'Cancel'
+    cancelBtn.className = 'secondary'
+    cancelBtn.style.background = '#6b7280'
+    cancelBtn.style.padding = '8px 16px'
+    cancelBtn.style.fontSize = '13px'
+
+    const importBtn = document.createElement('button')
+    importBtn.textContent = 'Add to Config'
+    importBtn.style.background = 'var(--switchbot-red, #ef4444)'
+    importBtn.style.padding = '8px 20px'
+    importBtn.style.fontSize = '13px'
+
+    const cleanup = (result: { configDeviceName: string, configDeviceType: string, address?: string } | null) => {
+      div.remove()
+      resolve(result)
+    }
+
+    cancelBtn.onclick = () => cleanup(null)
+    importBtn.onclick = () => cleanup({
+      configDeviceName: nameInput.value || device.name || device.id,
+      configDeviceType: typeSelect.value || device.type,
+      address: macInput.value || undefined,
+    })
+
+    div.addEventListener('click', (event) => {
+      if (event.target === div) {
+        cleanup(null)
+      }
+    })
+
+    buttons.appendChild(cancelBtn)
+    buttons.appendChild(importBtn)
+    contentDiv.appendChild(nameLabel)
+    contentDiv.appendChild(nameInput)
+    contentDiv.appendChild(typeLabel)
+    contentDiv.appendChild(typeSelect)
+    contentDiv.appendChild(macLabel)
+    contentDiv.appendChild(macInput)
+    contentDiv.appendChild(buttons)
+
+    modal.appendChild(title)
+    modal.appendChild(contentDiv)
+    div.appendChild(modal)
+    document.body.appendChild(div)
+    nameInput.focus()
+  })
+}
+
 export async function editDevice(device: any): Promise<void> {
   // Create modal dialog for editing
   const div = document.createElement('div')

package/src/homebridge-ui/public/js/render.ts

@@ -154,7 +154,32 @@ export function renderIRBadge(): HTMLElement {
   )
 }
 
-export async function renderDiscoveredDevices(devices: any[]): Promise<HTMLElement> {
+function normalizeId(value: any): string {
+  return String(value ?? '').trim().toLowerCase()
+}
+
+function scrollToConfiguredDevice(deviceId: string): void {
+  const normalizedId = normalizeId(deviceId)
+  const target = document.querySelector(`[data-device-id="${normalizedId}"]`) as HTMLElement | null
+  if (!target) {
+    return
+  }
+
+  target.scrollIntoView({ behavior: 'smooth', block: 'center' })
+  const originalOutline = target.style.outline
+  const originalBackground = target.style.background
+  target.style.outline = '2px solid var(--switchbot-red, #ef4444)'
+  target.style.background = 'rgba(239, 68, 68, 0.08)'
+  setTimeout(() => {
+    target.style.outline = originalOutline
+    target.style.background = originalBackground
+  }, 1800)
+}
+
+export async function renderDiscoveredDevices(
+  devices: any[],
+  options: { configuredIds?: Set<string> } = {},
+): Promise<HTMLElement> {
   const ul = document.createElement('ul')
   ul.style.maxHeight = '400px'
   ul.style.overflowY = 'auto'
@@ -163,8 +188,13 @@ export async function renderDiscoveredDevices(devices: any[]): Promise<HTMLEleme
   ul.style.listStyle = 'none'
 
   const { addDeviceToConfig } = await import('./discovery.js')
+  const { loadConfiguredDevices } = await import('./devices.js')
+  const configuredIds = options.configuredIds ?? new Set<string>()
 
   for (const d of devices) {
+    const deviceId = normalizeId(d.id)
+    const alreadyAdded = configuredIds.has(deviceId)
+
     const li = document.createElement('li')
     li.className = 'device-item'
     li.style.display = 'flex'
@@ -192,6 +222,13 @@ export async function renderDiscoveredDevices(devices: any[]): Promise<HTMLEleme
 
     nameContainer.appendChild(name)
 
+    const duplicateBadge = document.createElement('span')
+    duplicateBadge.textContent = alreadyAdded ? '✓ Already Added' : '➕ New Device'
+    duplicateBadge.style.cssText = alreadyAdded
+      ? 'background: #16a34a; color: white; padding: 2px 6px; border-radius: 3px; font-size: 10px; font-weight: 600;'
+      : 'background: #2563eb; color: white; padding: 2px 6px; border-radius: 3px; font-size: 10px; font-weight: 600;'
+    nameContainer.appendChild(duplicateBadge)
+
     // Add connection type badge
     if (d.connectionType) {
       const badge = renderConnectionBadge(d.connectionType)
@@ -224,16 +261,47 @@ export async function renderDiscoveredDevices(devices: any[]): Promise<HTMLEleme
     info.appendChild(details)
 
     const addBtn = document.createElement('button')
-    addBtn.textContent = '+ Add'
+    addBtn.textContent = alreadyAdded ? 'Already Added' : 'Add to Config'
     addBtn.style.marginLeft = '8px'
     addBtn.style.padding = '6px 14px'
     addBtn.style.fontSize = '12px'
     addBtn.style.whiteSpace = 'nowrap'
     addBtn.style.flexShrink = '0'
+    addBtn.disabled = alreadyAdded
+    if (alreadyAdded) {
+      addBtn.style.opacity = '0.65'
+      addBtn.style.cursor = 'not-allowed'
+      addBtn.style.background = '#6b7280'
+    }
     addBtn.onclick = async () => {
+      if (alreadyAdded) {
+        return
+      }
       await addDeviceToConfig(d)
     }
 
+    if (alreadyAdded) {
+      const viewBtn = document.createElement('button')
+      viewBtn.textContent = 'View in Config'
+      viewBtn.className = 'secondary'
+      viewBtn.style.marginLeft = '8px'
+      viewBtn.style.padding = '6px 12px'
+      viewBtn.style.fontSize = '12px'
+      viewBtn.onclick = async () => {
+        await loadConfiguredDevices()
+        scrollToConfiguredDevice(d.id)
+      }
+      li.appendChild(info)
+      const actions = document.createElement('div')
+      actions.style.display = 'flex'
+      actions.style.alignItems = 'center'
+      actions.appendChild(viewBtn)
+      actions.appendChild(addBtn)
+      li.appendChild(actions)
+      ul.appendChild(li)
+      continue
+    }
+
     li.appendChild(info)
     li.appendChild(addBtn)
     ul.appendChild(li)
@@ -416,6 +484,7 @@ export function renderDeviceList(list: any[]): void {
   for (const d of list) {
     const li = document.createElement('li')
     li.className = 'device-item'
+    li.setAttribute('data-device-id', normalizeId(d.id))
 
     const info = document.createElement('div')
     info.style.flex = '1'

package/src/platform.ts

@@ -97,7 +97,9 @@ const DEVICE_MATTER_CLUSTERS: Record<string, any> = {
   }, // Switch in HAP, RobotVacuumCleaner in Matter
   curtain: {
     windowCovering: {
-      type: 4, // Drapery - safe default for LF conformance
+      // Use a lift-only/non-tilt covering type to satisfy Matter conformance rules.
+      // Drapery (4) can fail validation in some stacks when TL (tilt) is not present.
+      type: 0, // Rollershade
     },
   }, // WindowCovering → WindowCovering (includes curtain3, rollershade variants via normalization)
   blindtilt: {
@@ -226,6 +228,76 @@ const DEVICE_MATTER_DEVICE_TYPE_KEYS: Record<string, string> = {
   waterdetector: 'LeakSensor',
 }
 
+function normalizeTypeForMatter(typeValue: string | undefined | null): string {
+  const raw = String(typeValue || '').trim().toLowerCase()
+  if (!raw) {
+    return 'unknown'
+  }
+
+  // Vacuum variants
+  if (['wosweeper', 'wosweepermini', 'wosweeperminipro', 'k10+', 'k10+ pro'].includes(raw)) {
+    return 'vacuum'
+  }
+
+  // Window covering variants
+  if (['blindtilt', 'blind tilt', 'curtain3', 'rollershade', 'roller shade', 'worollershade', 'wo rollershade'].includes(raw)) {
+    return 'curtain'
+  }
+
+  // Plug variants
+  if (['plug mini (jp)', 'plug mini (us)', 'plug mini (eu)'].includes(raw)) {
+    return 'plug'
+  }
+
+  // Meter variants
+  if (['meterplus', 'meter plus', 'meter plus (jp)', 'meterpro', 'meter pro', 'meterpro(co2)', 'meter pro (co2)'].includes(raw)) {
+    return 'meter'
+  }
+
+  // Relay switch variants
+  if (['relay switch 1', 'relay switch 1pm'].includes(raw)) {
+    return 'relay'
+  }
+
+  // Water detector variants
+  if (['water detector', 'waterdetector'].includes(raw)) {
+    return 'waterdetector'
+  }
+
+  // Fan variants
+  if (['smart fan', 'circulator fan', 'battery circulator fan', 'standing circulator fan'].includes(raw)) {
+    return 'fan'
+  }
+
+  // Light variants
+  if (['strip light', 'strip light 3', 'rgbic neon rope light', 'rgbic neon wire rope light', 'rgbicww floor lamp', 'rgbicww strip light'].includes(raw)) {
+    return 'lightstrip'
+  }
+  if (['color bulb', 'ceiling light', 'ceiling light pro', 'candle warmer lamp', 'floor lamp'].includes(raw)) {
+    return 'light'
+  }
+
+  // Sensor variants
+  if (raw === 'motion sensor') {
+    return 'motion'
+  }
+  if (['contact sensor', 'presence sensor'].includes(raw)) {
+    return 'contact'
+  }
+
+  // Lock variants
+  if (['smart lock', 'smart lock pro', 'smart lock ultra', 'lock lite', 'keypad', 'keypad touch', 'keypad vision', 'keypad vision pro', 'lock vision pro'].includes(raw)) {
+    return 'lock'
+  }
+
+  // Climate variant
+  if (raw === 'humidifier2') {
+    return 'humidifier'
+  }
+
+  return raw
+}
+
 // Factory function to create Matter handlers with Homebridge logger integration
 function createMatterHandlers(log: Logger, deviceId: string, type: string, client: any): any {
   const lowerType = type.toLowerCase()
@@ -1030,40 +1102,7 @@ export class SwitchBotHAPPlatform {
         _raw: raw,
       }
 
-      let type: string = d.type
-      // Normalize device type variants for consistent Matter cluster lookup
-      // Vacuum variants
-      if (['wosweeper', 'wosweepermini', 'wosweeperminipro', 'k10+', 'k10+ pro'].includes((type || '').toLowerCase())) {
-        type = 'vacuum'
-      }
-      // Window covering variants
-      if (['blindtilt', 'blind tilt', 'curtain3', 'rollershade', 'roller shade', 'worollershade', 'wo rollershade'].includes((type || '').toLowerCase())) {
-        type = 'curtain'
-      }
-      // Plug variants
-      if (['plug mini (jp)', 'plug mini (us)'].includes((type || '').toLowerCase())) {
-        type = 'plug'
-      }
-      // Meter variants
-      if (['meterplus', 'meter plus (jp)', 'meterpro', 'meterpro(co2)'].includes((type || '').toLowerCase())) {
-        type = 'meter'
-      }
-      // Relay switch variants
-      if (['relay switch 1', 'relay switch 1pm'].includes((type || '').toLowerCase())) {
-        type = 'relay'
-      }
-      // Water detector variants
-      if (['water detector'].includes((type || '').toLowerCase())) {
-        type = 'waterdetector'
-      }
-      // Fan variants
-      if (['smart fan'].includes((type || '').toLowerCase())) {
-        type = 'fan'
-      }
-      // Light variants
-      if (['strip light'].includes((type || '').toLowerCase())) {
-        type = 'lightstrip'
-      }
+      const type: string = normalizeTypeForMatter(d.type)
 
       const matterSupported = !!DEVICE_MATTER_SUPPORTED[(type || '').toLowerCase()]
       // Auto-detect Matter from Homebridge API, allow manual override via config
@@ -1307,40 +1346,7 @@ export class SwitchBotMatterPlatform {
         _raw: raw,
       }
 
-      let type: string = d.type
-      // Normalize device type variants for consistent Matter cluster lookup
-      // Vacuum variants
-      if (['wosweeper', 'wosweepermini', 'wosweeperminipro', 'k10+', 'k10+ pro'].includes((type || '').toLowerCase())) {
-        type = 'vacuum'
-      }
-      // Window covering variants
-      if (['blindtilt', 'blind tilt', 'curtain3', 'rollershade', 'roller shade', 'worollershade', 'wo rollershade'].includes((type || '').toLowerCase())) {
-        type = 'curtain'
-      }
-      // Plug variants
-      if (['plug mini (jp)', 'plug mini (us)'].includes((type || '').toLowerCase())) {
-        type = 'plug'
-      }
-      // Meter variants
-      if (['meterplus', 'meter plus (jp)', 'meterpro', 'meterpro(co2)'].includes((type || '').toLowerCase())) {
-        type = 'meter'
-      }
-      // Relay switch variants
-      if (['relay switch 1', 'relay switch 1pm'].includes((type || '').toLowerCase())) {
-        type = 'relay'
-      }
-      // Water detector variants
-      if (['water detector'].includes((type || '').toLowerCase())) {
-        type = 'waterdetector'
-      }
-      // Fan variants
-      if (['smart fan'].includes((type || '').toLowerCase())) {
-        type = 'fan'
-      }
-      // Light variants
-      if (['strip light'].includes((type || '').toLowerCase())) {
-        type = 'lightstrip'
-      }
+      const type: string = normalizeTypeForMatter(d.type)
 
       const matterSupported = !!DEVICE_MATTER_SUPPORTED[(type || '').toLowerCase()]
       // Auto-detect Matter from Homebridge API, allow manual override via config
@@ -1439,40 +1445,7 @@ export class SwitchBotMatterPlatform {
         continue
       }
 
-      let type: string = d.type
-      // Normalize device type variants for consistent Matter cluster lookup
-      // Vacuum variants
-      if (['wosweeper', 'wosweepermini', 'wosweeperminipro', 'k10+', 'k10+ pro'].includes((type || '').toLowerCase())) {
-        type = 'vacuum'
-      }
-      // Window covering variants
-      if (['blindtilt', 'blind tilt', 'curtain3', 'rollershade', 'roller shade', 'worollershade', 'wo rollershade'].includes((type || '').toLowerCase())) {
-        type = 'curtain'
-      }
-      // Plug variants
-      if (['plug mini (jp)', 'plug mini (us)'].includes((type || '').toLowerCase())) {
-        type = 'plug'
-      }
-      // Meter variants
-      if (['meterplus', 'meter plus (jp)', 'meterpro', 'meterpro(co2)'].includes((type || '').toLowerCase())) {
-        type = 'meter'
-      }
-      // Relay switch variants
-      if (['relay switch 1', 'relay switch 1pm'].includes((type || '').toLowerCase())) {
-        type = 'relay'
-      }
-      // Water detector variants
-      if (['water detector'].includes((type || '').toLowerCase())) {
-        type = 'waterdetector'
-      }
-      // Fan variants
-      if (['smart fan'].includes((type || '').toLowerCase())) {
-        type = 'fan'
-      }
-      // Light variants
-      if (['strip light'].includes((type || '').toLowerCase())) {
-        type = 'lightstrip'
-      }
+      const type: string = normalizeTypeForMatter(d.type)
 
       const matterSupported = !!DEVICE_MATTER_SUPPORTED[(type || '').toLowerCase()]
       const useMatter = matterEnabled && matterSupported

package/src/utils.ts

@@ -36,8 +36,9 @@ export function createPlatformProxy(HAPPlatform: any, MatterPlatform: any): any
       const cfg = normalizeConfig(config)
       const preferMatter = cfg.preferMatter ?? true
       const enableMatter = cfg.enableMatter ?? true
+      const matterAvailable = !!(api?.isMatterAvailable?.() && api?.isMatterEnabled?.())
 
-      if (enableMatter && preferMatter && MatterPlatform) {
+      if (enableMatter && preferMatter && MatterPlatform && matterAvailable) {
         this.impl = new MatterPlatform(log, cfg, api)
         return this.impl
       }

package/test/matter-childbridge.spec.ts

@@ -31,7 +31,11 @@ describe('platform integration (Matter)', () => {
 
     // Create proxy that would choose the fake matter platform when preferred
     const Proxy = createPlatformProxy(function HAP() {}, FakeMatterPlatform)
-    const platform = new (Proxy as any)(console, { preferMatter: true, enableMatter: true }, {})
+    const matterApi = {
+      isMatterAvailable: () => true,
+      isMatterEnabled: () => true,
+    }
+    const platform = new (Proxy as any)(console, { preferMatter: true, enableMatter: true }, matterApi)
 
     // Make a small device descriptor to load
     const device = { id: 'dev-m-1', type: 'light', name: 'MatterLight' }

package/test/matter-integration.spec.ts

@@ -6,6 +6,47 @@ import SwitchBotHAPPlatform, { SwitchBotMatterPlatform } from '../src/platform'
 // Expanded Matter integration harness tests
 
 describe('Matter integration harness', () => {
+  it('normalizes Color Bulb and Motion Sensor to Matter-supported categories', async () => {
+    const matterApi = makeFakeMatterApi()
+    const api = makeFakeApiWithMatter(matterApi)
+
+    const platform = new SwitchBotMatterPlatform(console as any, {
+      devices: [
+        { id: 'cb-1', type: 'Color Bulb', name: 'Color Bulb 1' },
+        { id: 'ms-1', type: 'Motion Sensor', name: 'Motion Sensor 1' },
+      ],
+      enableMatter: true,
+      preferMatter: true,
+    } as any, api as any)
+
+    await (platform as any).registerMatterAccessories()
+
+    const regs = matterApi.getRegistered()
+    expect(regs.length).toBeGreaterThanOrEqual(2)
+    const ids = regs.map((r: any) => r?.context?.deviceId)
+    expect(ids).toContain('cb-1')
+    expect(ids).toContain('ms-1')
+  })
+
+  it('uses conformant window covering type for curtain Matter registration', async () => {
+    const matterApi = makeFakeMatterApi()
+    const api = makeFakeApiWithMatter(matterApi)
+
+    const platform = new SwitchBotMatterPlatform(console as any, {
+      devices: [{ id: 'curtain-1', type: 'curtain', name: 'Curtain 1' }],
+      enableMatter: true,
+      preferMatter: true,
+    } as any, api as any)
+
+    await (platform as any).registerMatterAccessories()
+
+    const regs = matterApi.getRegistered()
+    expect(regs.length).toBeGreaterThanOrEqual(1)
+    const wcType = regs[0]?.clusters?.windowCovering?.type
+    expect(wcType).toBe(0)
+    expect(wcType).not.toBe(4)
+  })
+
   it('registers Matter accessories when Matter API available', async () => {
     // Instantiate the real Matter platform directly to test its registration path
     const matterApi = makeFakeMatterApi()

package/test/utils.spec.ts

@@ -2,11 +2,15 @@ import { describe, it, expect } from 'vitest'
 import { createPlatformProxy } from '../src/utils'
 
 describe('createPlatformProxy', () => {
-  it('returns Matter platform when preferMatter and enabled', () => {
+  it('returns Matter platform when preferMatter, enabled, and Matter API is available', () => {
     class HAP {}
     class Matter {}
     const ProxyCtor: any = createPlatformProxy(HAP, Matter)
-    const impl = new (ProxyCtor as any)(console, { preferMatter: true, enableMatter: true }, undefined)
+    const api = {
+      isMatterAvailable: () => true,
+      isMatterEnabled: () => true,
+    }
+    const impl = new (ProxyCtor as any)(console, { preferMatter: true, enableMatter: true }, api)
     expect(impl).toBeInstanceOf(Matter)
   })
 
@@ -17,4 +21,16 @@ describe('createPlatformProxy', () => {
     const impl = new (ProxyCtor as any)(console, { preferMatter: false, enableMatter: true }, undefined)
     expect(impl).toBeInstanceOf(HAP)
   })
+
+  it('returns HAP platform when Matter API is unavailable', () => {
+    class HAP {}
+    class Matter {}
+    const ProxyCtor: any = createPlatformProxy(HAP, Matter)
+    const api = {
+      isMatterAvailable: () => false,
+      isMatterEnabled: () => false,
+    }
+    const impl = new (ProxyCtor as any)(console, { preferMatter: true, enableMatter: true }, api)
+    expect(impl).toBeInstanceOf(HAP)
+  })
 })

package/todo/COMPLETED.md

@@ -23,6 +23,17 @@ This file tracks all completed features and improvements for the SwitchBot Homeb
 
 ## Bug Fixes
 
+### Matter Window Covering Conformance ✅ COMPLETED
+
+- [x] **Fix Matter window covering Drapery enum validation error**
+  - [x] **Issue:** Matter accessory registration failed for Curtain devices
+  - [x] **Error:** `Conformance "LF & !TL": Matter does not allow enum value Drapery (ID 4) here`
+  - [x] **Related Runtime Failure:** `[Matter/Server] Failed to register Matter accessory ... [endpoint-behaviors] Behaviors have errors` with rollback from Matter transaction initialization
+  - [x] **Root Cause:** `windowCovering.type` used `Drapery` for lift-only curtain mappings
+  - [x] **Fix:** Updated curtain Matter default to a compliant lift-only covering enum and added regression coverage
+
+  **Status:** Curtain-type Matter accessories now register without the Drapery conformance failure.
+
 ### Invalid Device Type Validation ✅ COMPLETED
 
 - [x] **Fix invalid device type in config schema validation**
@@ -137,6 +148,35 @@ This file tracks all completed features and improvements for the SwitchBot Homeb
 - Real-time search box
 - All preferences saved and restored on next discovery
 
+### One-Click Device Import ✅ COMPLETED
+
+- [x] Added "Add to Config" button for each discovered device
+- [x] Added auto-populated import modal with discovered name/type defaults
+- [x] Added BLE MAC pre-fill in import flow and persistence to config on single add
+- [x] Added confirmation toast/status messaging on successful import
+
+**Implementation:**
+- Updated discovery row action in `render.ts` to use explicit "Add to Config" CTA
+- Added `importDiscoveredDevice()` modal in `modals.ts` for prefilled import settings
+- Extended single-add client payload in `api.ts` to include optional `address`, `model`, and `rssi`
+- Extended `/add-device` endpoint in `devices.ts` to persist discovered metadata (MAC/model/RSSI)
+
+**Status:** One-click import now supports prefilled configuration and BLE MAC carry-through for direct connection setup.
+
+### Duplicate Detection ✅ COMPLETED
+
+- [x] Check if discovered device ID already exists in config
+- [x] Show badge: "✓ Already Added" (green) or "➕ New Device" (blue)
+- [x] Disable/hide "Add" button for already-added devices
+- [x] Add "View in Config" link for existing devices
+
+**Implementation:**
+- Discovery view now fetches configured device IDs and tags discovered rows as existing/new
+- Existing devices show `Already Added` state with disabled add action
+- Existing devices include a `View in Config` action that scrolls and highlights the configured entry
+
+**Status:** Duplicate devices are clearly identified at discovery time, preventing accidental re-adds and improving navigation to existing config entries.
+
 ---
 
 ## Bug Fixes & Technical Debt