@riddix/hamh 2.1.0-alpha.536 → 2.1.0-alpha.537

package/dist/backend/cli.js

@@ -147451,7 +147451,7 @@ import * as ws from "ws";
 
 // src/api/web-api.ts
 init_service();
-import express16 from "express";
+import express17 from "express";
 import basicAuth from "express-basic-auth";
 import AccessControl5 from "express-ip-access-control";
 import nocache from "nocache";
@@ -148777,7 +148777,8 @@ function healthApi(bridgeService, haClient, version, startTime) {
         connectivity: {
           totalSessions: sessionInfo.totalSessions,
           totalSubscriptions: sessionInfo.totalSubscriptions,
-          sessions: sessionInfo.sessions
+          sessions: sessionInfo.sessions,
+          fabricSummary: sessionInfo.fabrics
         }
       };
     });
@@ -150020,9 +150021,164 @@ function metricsApi(bridgeService, haClient, haRegistry, startTime) {
   return router;
 }
 
+// src/api/network-diagnostic-api.ts
+import * as os2 from "node:os";
+import express13 from "express";
+function networkDiagnosticApi(mdnsInterface, mdnsIpv4) {
+  const router = express13.Router();
+  router.get("/", (_, res) => {
+    const result = runDiagnostics(mdnsInterface, mdnsIpv4);
+    res.json(result);
+  });
+  return router;
+}
+function getNetworkInterfaces() {
+  const raw = os2.networkInterfaces();
+  const result = [];
+  for (const [name, addrs] of Object.entries(raw)) {
+    if (!addrs) continue;
+    const info = {
+      name,
+      ipv4: [],
+      ipv6: [],
+      mac: addrs[0]?.mac ?? "00:00:00:00:00:00",
+      internal: addrs[0]?.internal ?? false
+    };
+    for (const addr of addrs) {
+      if (addr.family === "IPv4") {
+        info.ipv4.push(addr.address);
+      } else if (addr.family === "IPv6") {
+        info.ipv6.push(addr.address);
+      }
+    }
+    result.push(info);
+  }
+  return result;
+}
+function runDiagnostics(mdnsInterface, mdnsIpv4) {
+  const interfaces = getNetworkInterfaces();
+  const checks = [];
+  const external = interfaces.filter((i) => !i.internal);
+  if (external.length === 0) {
+    checks.push({
+      name: "external_interface",
+      status: "fail",
+      message: "No external network interfaces found",
+      detail: "Matter requires a network interface for mDNS discovery. Check Docker network mode (host networking recommended)."
+    });
+  } else {
+    checks.push({
+      name: "external_interface",
+      status: "pass",
+      message: `${external.length} external interface(s) available`,
+      detail: external.map((i) => i.name).join(", ")
+    });
+  }
+  const ipv6Interfaces = external.filter((i) => i.ipv6.length > 0);
+  if (ipv6Interfaces.length === 0) {
+    checks.push({
+      name: "ipv6_available",
+      status: "warn",
+      message: "No IPv6 addresses found on external interfaces",
+      detail: "Matter primarily uses IPv6 for communication. Some controllers may require it. Ensure IPv6 is enabled on your network."
+    });
+  } else {
+    const linkLocal = ipv6Interfaces.filter(
+      (i) => i.ipv6.some((addr) => addr.startsWith("fe80"))
+    );
+    const ula = ipv6Interfaces.filter(
+      (i) => i.ipv6.some((addr) => addr.startsWith("fd"))
+    );
+    checks.push({
+      name: "ipv6_available",
+      status: "pass",
+      message: `IPv6 available on ${ipv6Interfaces.length} interface(s)`,
+      detail: `Link-local: ${linkLocal.length > 0 ? "yes" : "no"}, ULA (fd::): ${ula.length > 0 ? "yes" : "no"}`
+    });
+  }
+  const ipv4Interfaces = external.filter((i) => i.ipv4.length > 0);
+  if (ipv4Interfaces.length === 0) {
+    checks.push({
+      name: "ipv4_available",
+      status: "warn",
+      message: "No IPv4 addresses found on external interfaces",
+      detail: "Some controllers use IPv4 for mDNS discovery."
+    });
+  } else {
+    checks.push({
+      name: "ipv4_available",
+      status: "pass",
+      message: `IPv4 available on ${ipv4Interfaces.length} interface(s)`,
+      detail: ipv4Interfaces.flatMap((i) => i.ipv4.map((addr) => `${i.name}: ${addr}`)).join(", ")
+    });
+  }
+  if (mdnsInterface) {
+    const bound = interfaces.find((i) => i.name === mdnsInterface);
+    if (!bound) {
+      checks.push({
+        name: "mdns_interface_binding",
+        status: "fail",
+        message: `Configured interface "${mdnsInterface}" not found`,
+        detail: `Available interfaces: ${interfaces.map((i) => i.name).join(", ")}. Check the --mdns-network-interface option.`
+      });
+    } else if (bound.internal) {
+      checks.push({
+        name: "mdns_interface_binding",
+        status: "warn",
+        message: `mDNS bound to internal/loopback interface "${mdnsInterface}"`,
+        detail: "Controllers on the network cannot discover the bridge via loopback. Bind to an external interface."
+      });
+    } else {
+      checks.push({
+        name: "mdns_interface_binding",
+        status: "pass",
+        message: `mDNS bound to "${mdnsInterface}"`,
+        detail: `IPv4: ${bound.ipv4.join(", ") || "none"}, IPv6: ${bound.ipv6.join(", ") || "none"}`
+      });
+    }
+  } else {
+    checks.push({
+      name: "mdns_interface_binding",
+      status: "pass",
+      message: "mDNS bound to all interfaces (default)"
+    });
+  }
+  if (mdnsIpv4) {
+    checks.push({
+      name: "mdns_ipv4",
+      status: "pass",
+      message: "IPv4 mDNS enabled"
+    });
+  } else {
+    checks.push({
+      name: "mdns_ipv4",
+      status: "warn",
+      message: "IPv4 mDNS disabled (IPv6-only mode)",
+      detail: "Some controllers (older Alexa, Google Home) may need IPv4 mDNS for discovery. Enable with --mdns-ipv4."
+    });
+  }
+  if (external.length > 1 && !mdnsInterface) {
+    checks.push({
+      name: "multiple_interfaces",
+      status: "warn",
+      message: `${external.length} external interfaces detected without explicit binding`,
+      detail: "mDNS will broadcast on all interfaces. If controllers are on a specific VLAN, consider binding to a specific interface with --mdns-network-interface."
+    });
+  }
+  return {
+    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+    interfaces,
+    checks,
+    matterConfig: {
+      boundInterface: mdnsInterface ?? null,
+      ipv4Enabled: mdnsIpv4
+    }
+  };
+}
+
 // src/api/plugin-api.ts
 import * as nodePath from "node:path";
-import express13 from "express";
+import express14 from "express";
 
 // src/plugins/plugin-installer.ts
 init_esm();
@@ -150398,7 +150554,7 @@ var BLOCKED_PREFIXES = [
   "/root"
 ];
 function pluginApi(bridgeService, storageLocation) {
-  const router = express13.Router();
+  const router = express14.Router();
   const installer = new PluginInstaller(storageLocation);
   const registry2 = new PluginRegistry(storageLocation);
   router.get("/", (_req, res) => {
@@ -150743,10 +150899,10 @@ function settingsApi(settingsStorage, envAuth) {
 // src/api/system-api.ts
 init_esm();
 import { exec } from "node:child_process";
-import os2 from "node:os";
+import os3 from "node:os";
 import { promisify } from "node:util";
 import v8 from "node:v8";
-import express14 from "express";
+import express15 from "express";
 var execAsync = promisify(exec);
 var logger144 = Logger.get("SystemApi");
 function detectEnvironment2() {
@@ -150766,7 +150922,7 @@ function detectEnvironment2() {
   return "Standalone";
 }
 function systemApi(version) {
-  const router = express14.Router();
+  const router = express15.Router();
   router.get("/update-check", async (_req, res) => {
     try {
       const response = await fetch(
@@ -150799,22 +150955,22 @@ function systemApi(version) {
   });
   router.get("/info", async (_req, res) => {
     try {
-      const totalMem = os2.totalmem();
-      const freeMem = os2.freemem();
+      const totalMem = os3.totalmem();
+      const freeMem = os3.freemem();
       const usedMem = totalMem - freeMem;
       const storageInfo = await getStorageInfo();
-      const cpus = os2.cpus();
+      const cpus = os3.cpus();
       const memUsage = process.memoryUsage();
       const systemInfo = {
         version,
         nodeVersion: process.version,
-        hostname: os2.hostname(),
-        platform: os2.platform(),
-        arch: os2.arch(),
-        uptime: os2.uptime(),
+        hostname: os3.hostname(),
+        platform: os3.platform(),
+        arch: os3.arch(),
+        uptime: os3.uptime(),
         cpuCount: cpus.length,
         cpuModel: cpus[0]?.model || "Unknown",
-        loadAvg: os2.loadavg(),
+        loadAvg: os3.loadavg(),
         environment: detectEnvironment2(),
         memory: {
           total: totalMem,
@@ -150823,7 +150979,7 @@ function systemApi(version) {
           usagePercent: Math.round(usedMem / totalMem * 100)
         },
         network: {
-          interfaces: getNetworkInterfaces()
+          interfaces: getNetworkInterfaces2()
         },
         storage: {
           ...storageInfo,
@@ -150848,10 +151004,10 @@ function systemApi(version) {
   });
   return router;
 }
-function getNetworkInterfaces() {
+function getNetworkInterfaces2() {
   const interfaces = [];
-  const networkInterfaces2 = os2.networkInterfaces();
-  for (const [name, ifaceList] of Object.entries(networkInterfaces2)) {
+  const networkInterfaces3 = os3.networkInterfaces();
+  for (const [name, ifaceList] of Object.entries(networkInterfaces3)) {
     if (!ifaceList) continue;
     for (const iface of ifaceList) {
       const family = String(iface.family);
@@ -150879,7 +151035,7 @@ function getNetworkInterfaces() {
 async function getStorageInfo() {
   try {
     const pathToCheck = getDataPath();
-    if (os2.platform() === "win32") {
+    if (os3.platform() === "win32") {
       return await getWindowsStorageInfo(pathToCheck);
     } else {
       return await getUnixStorageInfo(pathToCheck);
@@ -150956,14 +151112,14 @@ async function getUnixStorageInfo(path14) {
 // src/api/web-ui.ts
 import fs6 from "node:fs";
 import path7 from "node:path";
-import express15 from "express";
+import express16 from "express";
 function webUi(dist) {
-  const router = express15.Router();
+  const router = express16.Router();
   if (dist) {
     const index = replaceBase(dist);
     router.get("/", index);
     router.get("/index.html", index);
-    router.use(express15.static(dist));
+    router.use(express16.static(dist));
     router.get(/.*/, index);
   }
   return router;
@@ -151144,8 +151300,8 @@ var WebApi = class extends Service {
     return this.wsApi;
   }
   async initialize() {
-    const api = express16.Router();
-    api.use(express16.json()).use(nocache()).use("/matter", matterApi(this.bridgeService, this.haRegistry)).use(
+    const api = express17.Router();
+    api.use(express17.json()).use(nocache()).use("/matter", matterApi(this.bridgeService, this.haRegistry)).use(
       "/health",
       healthApi(
         this.bridgeService,
@@ -151185,6 +151341,12 @@ var WebApi = class extends Service {
     ).use(
       "/plugins",
       pluginApi(this.bridgeService, this.props.storageLocation)
+    ).use(
+      "/network",
+      networkDiagnosticApi(
+        this.props.mdnsInterface,
+        this.props.mdnsIpv4 ?? true
+      )
     );
     const middlewares = [
       this.accessLogger,
@@ -151210,9 +151372,9 @@ var WebApi = class extends Service {
         })
       );
     }
-    const appRouter = express16.Router();
+    const appRouter = express17.Router();
     appRouter.use(...middlewares).use("/api", api).use(webUi(this.props.webUiDist));
-    this.app = express16();
+    this.app = express17();
     const basePath = this.props.basePath;
     if (basePath !== "/") {
       this.log.info(`Base path configured: ${basePath}`);
@@ -151463,7 +151625,7 @@ function mdns(env, options) {
 // src/core/app/storage.ts
 init_esm7();
 import fs8 from "node:fs";
-import os3 from "node:os";
+import os4 from "node:os";
 import path8 from "node:path";
 
 // src/core/app/storage/custom-storage.ts
@@ -151570,7 +151732,7 @@ function storage(environment, options) {
   storageService.factory = (ns) => new CustomStorage(logger204, path8.resolve(location2, ns));
 }
 function resolveStorageLocation(storageLocation) {
-  const homedir = os3.homedir();
+  const homedir = os4.homedir();
   return storageLocation ? path8.resolve(storageLocation.replace(/^~\//, `${homedir}/`)) : path8.join(homedir, ".home-assistant-matter-hub");
 }
 
@@ -151590,7 +151752,7 @@ function configureDefaultEnvironment(options) {
 // src/core/app/options.ts
 init_esm7();
 import { createRequire } from "node:module";
-import os4 from "node:os";
+import os5 from "node:os";
 import path9 from "node:path";
 function resolveAppVersion() {
   try {
@@ -151649,12 +151811,14 @@ var Options = class {
       version: resolveAppVersion(),
       storageLocation: this.resolveStorageLocation(),
       basePath: normalizeBasePath(this.startOptions.httpBasePath),
-      auth
+      auth,
+      mdnsInterface: notEmpty(this.startOptions.mdnsNetworkInterface),
+      mdnsIpv4: true
     };
   }
   resolveStorageLocation() {
     const storageLocation = notEmpty(this.startOptions.storageLocation);
-    const homedir = os4.homedir();
+    const homedir = os5.homedir();
     return storageLocation ? path9.resolve(storageLocation.replace(/^~\//, `${homedir}/`)) : path9.join(homedir, ".home-assistant-matter-hub");
   }
   get bridgeService() {
@@ -166954,25 +167118,44 @@ var Bridge = class {
       const sessionManager = this.server.env.get(SessionManager);
       const sessions = [...sessionManager.sessions];
       let totalSubscriptions = 0;
+      const fabricMap = /* @__PURE__ */ new Map();
       const sessionList = sessions.map((s) => {
         const subCount = s.subscriptions.size;
         totalSubscriptions += subCount;
+        const fi = typeof s.fabric?.fabricIndex === "number" ? s.fabric.fabricIndex : null;
+        if (fi !== null) {
+          const existing = fabricMap.get(fi) ?? {
+            sessions: 0,
+            subscriptions: 0
+          };
+          existing.sessions++;
+          existing.subscriptions += subCount;
+          fabricMap.set(fi, existing);
+        }
         return {
           id: s.id,
           peerNodeId: String(s.peerNodeId),
+          fabricIndex: fi,
           subscriptionCount: subCount
         };
       });
+      const fabrics = [...fabricMap.entries()].map(([fabricIndex, data]) => ({
+        fabricIndex,
+        sessions: data.sessions,
+        subscriptions: data.subscriptions
+      }));
       return {
         sessions: sessionList,
         totalSessions: sessions.length,
-        totalSubscriptions
+        totalSubscriptions,
+        fabrics
       };
     } catch {
       return {
         sessions: [],
         totalSessions: 0,
-        totalSubscriptions: 0
+        totalSubscriptions: 0,
+        fabrics: []
       };
     }
   }
@@ -167617,13 +167800,137 @@ function hash(maxLength, value) {
   return trimToLength(value, maxLength, suffix);
 }
 
+// src/matter/behaviors/electrical-energy-measurement-server.ts
+init_esm();
+
+// ../../node_modules/.pnpm/@matter+main@0.16.10/node_modules/@matter/main/dist/esm/clusters.js
+init_nodejs();
+init_clusters();
+
+// src/matter/behaviors/electrical-energy-measurement-server.ts
+init_home_assistant_entity_behavior();
+var logger164 = Logger.get("ElectricalEnergyMeasurementServer");
+var FeaturedBase = ElectricalEnergyMeasurementServer.with("CumulativeEnergy", "ImportedEnergy");
+var ElectricalEnergyMeasurementServerBase = class extends FeaturedBase {
+  async initialize() {
+    await super.initialize();
+    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
+    const entityId = homeAssistant.entityId;
+    const energyEntity = homeAssistant.state.mapping?.energyEntity;
+    if (energyEntity) {
+      logger164.debug(
+        `[${entityId}] ElectricalEnergyMeasurement using mapped energy entity: ${energyEntity}`
+      );
+    }
+    this.update();
+    this.reactTo(homeAssistant.onChange, this.update);
+  }
+  update() {
+    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
+    const energyEntity = homeAssistant.state.mapping?.energyEntity;
+    if (!energyEntity) return;
+    const stateProvider = this.agent.env.get(EntityStateProvider);
+    const energyKwh = stateProvider.getNumericState(energyEntity);
+    if (energyKwh == null) return;
+    const energyMwh = Math.round(energyKwh * 1e6);
+    const energyImported = { energy: energyMwh };
+    applyPatchState(this.state, {
+      cumulativeEnergyImported: energyImported
+    });
+    this.events.cumulativeEnergyMeasured?.emit(
+      { energyImported, energyExported: void 0 },
+      this.context
+    );
+  }
+};
+((ElectricalEnergyMeasurementServerBase2) => {
+  class State extends FeaturedBase.State {
+  }
+  ElectricalEnergyMeasurementServerBase2.State = State;
+})(ElectricalEnergyMeasurementServerBase || (ElectricalEnergyMeasurementServerBase = {}));
+var HaElectricalEnergyMeasurementServer = ElectricalEnergyMeasurementServerBase.set({
+  accuracy: {
+    measurementType: ElectricalPowerMeasurement3.MeasurementType.ElectricalEnergy,
+    measured: true,
+    minMeasuredValue: -1e6,
+    // -1000Wh, allows 0 and all positive values
+    maxMeasuredValue: 1e11,
+    // 100MWh in mWh
+    accuracyRanges: [
+      {
+        rangeMin: -1e6,
+        rangeMax: 1e11,
+        fixedMax: 1e3
+        // 1Wh accuracy
+      }
+    ]
+  }
+});
+
+// src/matter/behaviors/electrical-power-measurement-server.ts
+init_esm();
+init_home_assistant_entity_behavior();
+var logger165 = Logger.get("ElectricalPowerMeasurementServer");
+var ElectricalPowerMeasurementServerBase = class extends ElectricalPowerMeasurementServer {
+  async initialize() {
+    await super.initialize();
+    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
+    const entityId = homeAssistant.entityId;
+    const powerEntity = homeAssistant.state.mapping?.powerEntity;
+    if (powerEntity) {
+      logger165.debug(
+        `[${entityId}] ElectricalPowerMeasurement using mapped power entity: ${powerEntity}`
+      );
+    }
+    this.update();
+    this.reactTo(homeAssistant.onChange, this.update);
+  }
+  update() {
+    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
+    const powerEntity = homeAssistant.state.mapping?.powerEntity;
+    if (!powerEntity) return;
+    const stateProvider = this.agent.env.get(EntityStateProvider);
+    const powerWatts = stateProvider.getNumericState(powerEntity);
+    if (powerWatts == null) return;
+    const activePower = Math.round(powerWatts * 1e3);
+    applyPatchState(this.state, { activePower });
+  }
+};
+((ElectricalPowerMeasurementServerBase2) => {
+  class State extends ElectricalPowerMeasurementServer.State {
+  }
+  ElectricalPowerMeasurementServerBase2.State = State;
+})(ElectricalPowerMeasurementServerBase || (ElectricalPowerMeasurementServerBase = {}));
+var HaElectricalPowerMeasurementServer = ElectricalPowerMeasurementServerBase.set({
+  powerMode: ElectricalPowerMeasurement3.PowerMode.Ac,
+  numberOfMeasurementTypes: 1,
+  accuracy: [
+    {
+      measurementType: ElectricalPowerMeasurement3.MeasurementType.ActivePower,
+      measured: true,
+      minMeasuredValue: -1e6,
+      // -1000W, allows 0 and all positive values
+      maxMeasuredValue: 1e8,
+      // 100kW in mW
+      accuracyRanges: [
+        {
+          rangeMin: -1e6,
+          rangeMax: 1e8,
+          fixedMax: 1e3
+          // 1W accuracy
+        }
+      ]
+    }
+  ]
+});
+
 // src/matter/endpoints/composed/composed-air-purifier-endpoint.ts
 init_home_assistant_entity_behavior();
 
 // src/matter/behaviors/humidity-measurement-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger164 = Logger.get("HumidityMeasurementServer");
+var logger166 = Logger.get("HumidityMeasurementServer");
 var HumidityMeasurementServerBase = class extends RelativeHumidityMeasurementServer {
   async initialize() {
     await super.initialize();
@@ -167636,7 +167943,7 @@ var HumidityMeasurementServerBase = class extends RelativeHumidityMeasurementSer
       return;
     }
     const humidity = this.getHumidity(this.state.config, entity.state);
-    logger164.debug(
+    logger166.debug(
       `Humidity ${entity.state.entity_id} raw=${entity.state.state} measuredValue=${humidity}`
     );
     applyPatchState(this.state, {
@@ -167665,16 +167972,10 @@ function HumidityMeasurementServer(config10) {
 
 // src/matter/behaviors/power-source-server.ts
 init_esm();
-
-// ../../node_modules/.pnpm/@matter+main@0.16.10/node_modules/@matter/main/dist/esm/clusters.js
-init_nodejs();
-init_clusters();
-
-// src/matter/behaviors/power-source-server.ts
 init_home_assistant_entity_behavior();
-var logger165 = Logger.get("PowerSourceServer");
-var FeaturedBase = PowerSourceServer.with("Battery", "Rechargeable");
-var PowerSourceServerBase = class extends FeaturedBase {
+var logger167 = Logger.get("PowerSourceServer");
+var FeaturedBase2 = PowerSourceServer.with("Battery", "Rechargeable");
+var PowerSourceServerBase = class extends FeaturedBase2 {
   async initialize() {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
@@ -167684,17 +167985,17 @@ var PowerSourceServerBase = class extends FeaturedBase {
       applyPatchState(this.state, {
         endpointList: [endpointNumber]
       });
-      logger165.debug(
+      logger167.debug(
         `[${entityId}] PowerSource initialized with endpointList=[${endpointNumber}]`
       );
     } else {
-      logger165.warn(
+      logger167.warn(
         `[${entityId}] PowerSource endpoint number is null during initialize - endpointList will be empty!`
       );
     }
     const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
     if (batteryEntity) {
-      logger165.debug(
+      logger167.debug(
         `[${entityId}] PowerSource using mapped battery entity: ${batteryEntity}`
       );
     }
@@ -167745,7 +168046,7 @@ var PowerSourceServerBase = class extends FeaturedBase {
   }
 };
 ((PowerSourceServerBase2) => {
-  class State extends FeaturedBase.State {
+  class State extends FeaturedBase2.State {
     config;
   }
   PowerSourceServerBase2.State = State;
@@ -167818,8 +168119,8 @@ function TemperatureMeasurementServer2(config10) {
 
 // src/matter/behaviors/hepa-filter-monitoring-server.ts
 init_home_assistant_entity_behavior();
-var FeaturedBase2 = HepaFilterMonitoringServer.with("Condition", "Warning");
-var HepaFilterMonitoringServerBase = class extends FeaturedBase2 {
+var FeaturedBase3 = HepaFilterMonitoringServer.with("Condition", "Warning");
+var HepaFilterMonitoringServerBase = class extends FeaturedBase3 {
   async initialize() {
     this.state.condition = 100;
     this.state.degradationDirection = ResourceMonitoring3.DegradationDirection.Down;
@@ -167856,7 +168157,7 @@ var HepaFilterMonitoringServerBase = class extends FeaturedBase2 {
   }
 };
 ((HepaFilterMonitoringServerBase2) => {
-  class State extends FeaturedBase2.State {
+  class State extends FeaturedBase3.State {
     config;
   }
   HepaFilterMonitoringServerBase2.State = State;
@@ -168021,9 +168322,9 @@ var OPTIMISTIC_TOLERANCE = 5;
 function notifyLightTurnedOn(entityId) {
   lastTurnOnTimestamps.set(entityId, Date.now());
 }
-var logger166 = Logger.get("LevelControlServer");
-var FeaturedBase3 = LevelControlServer.with("OnOff", "Lighting");
-var LevelControlServerBase = class extends FeaturedBase3 {
+var logger168 = Logger.get("LevelControlServer");
+var FeaturedBase4 = LevelControlServer.with("OnOff", "Lighting");
+var LevelControlServerBase = class extends FeaturedBase4 {
   pendingTransitionTime;
   async initialize() {
     if (this.state.currentLevel == null) {
@@ -168036,12 +168337,12 @@ var LevelControlServerBase = class extends FeaturedBase3 {
       this.state.maxLevel = 254;
     }
     this.state.onLevel = null;
-    logger166.debug(`initialize: calling super.initialize()`);
+    logger168.debug(`initialize: calling super.initialize()`);
     try {
       await super.initialize();
-      logger166.debug(`initialize: super.initialize() completed successfully`);
+      logger168.debug(`initialize: super.initialize() completed successfully`);
     } catch (error) {
-      logger166.error(`initialize: super.initialize() FAILED:`, error);
+      logger168.error(`initialize: super.initialize() FAILED:`, error);
       throw error;
     }
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
@@ -168117,7 +168418,7 @@ var LevelControlServerBase = class extends FeaturedBase3 {
     const timeSinceTurnOn = lastTurnOn ? Date.now() - lastTurnOn : Infinity;
     const isMaxBrightness = level >= this.maxLevel;
     if (isMaxBrightness && timeSinceTurnOn < 200) {
-      logger166.debug(
+      logger168.debug(
         `[${entityId}] Ignoring moveToLevel(${level}) - Alexa brightness reset detected (${timeSinceTurnOn}ms after turn-on)`
       );
       return;
@@ -168147,7 +168448,7 @@ var LevelControlServerBase = class extends FeaturedBase3 {
   }
 };
 ((LevelControlServerBase2) => {
-  class State extends FeaturedBase3.State {
+  class State extends FeaturedBase4.State {
     config;
   }
   LevelControlServerBase2.State = State;
@@ -168160,7 +168461,7 @@ function LevelControlServer2(config10) {
 }
 
 // src/matter/behaviors/on-off-server.ts
-var logger167 = Logger.get("OnOffServer");
+var logger169 = Logger.get("OnOffServer");
 var optimisticOnOffState = /* @__PURE__ */ new Map();
 var OPTIMISTIC_TIMEOUT_MS2 = 3e3;
 var OnOffServerBase = class extends OnOffServer {
@@ -168200,7 +168501,7 @@ var OnOffServerBase = class extends OnOffServer {
     if (!action) {
       return;
     }
-    logger167.info(`[${homeAssistant.entityId}] Turning ON -> ${action.action}`);
+    logger169.info(`[${homeAssistant.entityId}] Turning ON -> ${action.action}`);
     notifyLightTurnedOn(homeAssistant.entityId);
     optimisticOnOffState.set(homeAssistant.entityId, {
       expectedOnOff: true,
@@ -168223,7 +168524,7 @@ var OnOffServerBase = class extends OnOffServer {
     if (!action) {
       return;
     }
-    logger167.info(`[${homeAssistant.entityId}] Turning OFF -> ${action.action}`);
+    logger169.info(`[${homeAssistant.entityId}] Turning OFF -> ${action.action}`);
     optimisticOnOffState.set(homeAssistant.entityId, {
       expectedOnOff: false,
       timestamp: Date.now()
@@ -168253,11 +168554,11 @@ function setOptimisticOnOff(entityId, expectedOnOff) {
 }
 
 // src/matter/behaviors/fan-control-server.ts
-var logger168 = Logger.get("FanControlServer");
+var logger170 = Logger.get("FanControlServer");
 var defaultStepSize = 33.33;
 var minSpeedMax = 3;
 var maxSpeedMax = 100;
-var FeaturedBase4 = FanControlServer.with(
+var FeaturedBase5 = FanControlServer.with(
   "Step",
   "MultiSpeed",
   "AirflowDirection",
@@ -168271,7 +168572,7 @@ var FeaturedBase4 = FanControlServer.with(
   rockSupport: { rockUpDown: true },
   windSupport: { naturalWind: true, sleepWind: true }
 });
-var FanControlServerBase = class extends FeaturedBase4 {
+var FanControlServerBase = class extends FeaturedBase5 {
   // Track last non-zero fan speed for restore on turn-on (#225)
   lastNonZeroPercent = 0;
   lastNonZeroSpeed = 0;
@@ -168612,7 +168913,7 @@ var FanControlServerBase = class extends FeaturedBase4 {
       const entityId = this.agent.get(HomeAssistantEntityBehavior).entity.entity_id;
       setOptimisticOnOff(entityId, on);
     } catch (e) {
-      logger168.debug(
+      logger170.debug(
         `syncOnOff(${on}) failed: ${e instanceof Error ? e.message : String(e)}`
       );
     }
@@ -168625,7 +168926,7 @@ var FanControlServerBase = class extends FeaturedBase4 {
   }
 };
 ((FanControlServerBase2) => {
-  class State extends FeaturedBase4.State {
+  class State extends FeaturedBase5.State {
     config;
   }
   FanControlServerBase2.State = State;
@@ -168700,7 +169001,7 @@ var FanOnOffServer = OnOffServer2({
 });
 
 // src/matter/endpoints/composed/composed-air-purifier-endpoint.ts
-var logger169 = Logger.get("ComposedAirPurifierEndpoint");
+var logger171 = Logger.get("ComposedAirPurifierEndpoint");
 var temperatureConfig = {
   getValue(entity, agent) {
     const fallbackUnit = agent.env.get(HomeAssistantConfig).unitSystem.temperature;
@@ -168814,11 +169115,19 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
     );
     const parentMapping = {
       entityId: primaryEntityId,
-      ...config10.batteryEntityId ? { batteryEntity: config10.batteryEntityId } : {}
+      ...config10.batteryEntityId ? { batteryEntity: config10.batteryEntityId } : {},
+      ...config10.powerEntityId ? { powerEntity: config10.powerEntityId } : {},
+      ...config10.energyEntityId ? { energyEntity: config10.energyEntityId } : {}
     };
     if (config10.batteryEntityId) {
       parentType = parentType.with(PowerSourceServer2(batteryConfig));
     }
+    if (config10.powerEntityId) {
+      parentType = parentType.with(HaElectricalPowerMeasurementServer);
+    }
+    if (config10.energyEntityId) {
+      parentType = parentType.with(HaElectricalEnergyMeasurementServer);
+    }
     if (config10.areaName) {
       const truncatedName = config10.areaName.length > 16 ? config10.areaName.substring(0, 16) : config10.areaName;
       parentType = parentType.with(
@@ -168880,6 +169189,8 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
     if (config10.humidityEntityId) mappedIds.push(config10.humidityEntityId);
     if (config10.mapping?.filterLifeEntity)
       mappedIds.push(config10.mapping.filterLifeEntity);
+    if (config10.powerEntityId) mappedIds.push(config10.powerEntityId);
+    if (config10.energyEntityId) mappedIds.push(config10.energyEntityId);
     const endpoint = new _ComposedAirPurifierEndpoint(
       parentTypeWithState,
       primaryEntityId,
@@ -168899,9 +169210,11 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
       config10.temperatureEntityId ? "+Temp" : "",
       config10.humidityEntityId ? "+Hum" : "",
       config10.batteryEntityId ? "+Bat" : "",
-      hasFilterLife ? "+HEPA" : ""
+      hasFilterLife ? "+HEPA" : "",
+      config10.powerEntityId ? "+Pwr" : "",
+      config10.energyEntityId ? "+Nrg" : ""
     ].filter(Boolean).join("");
-    logger169.info(
+    logger171.info(
       `Created composed air purifier ${primaryEntityId}: ${clusterLabels}`
     );
     return endpoint;
@@ -169001,7 +169314,7 @@ init_home_assistant_entity_behavior();
 // src/matter/behaviors/pressure-measurement-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger170 = Logger.get("PressureMeasurementServer");
+var logger172 = Logger.get("PressureMeasurementServer");
 var MIN_PRESSURE = 300;
 var MAX_PRESSURE = 1100;
 var PressureMeasurementServerBase = class extends PressureMeasurementServer {
@@ -169029,7 +169342,7 @@ var PressureMeasurementServerBase = class extends PressureMeasurementServer {
     }
     const rounded = Math.round(value);
     if (rounded < MIN_PRESSURE || rounded > MAX_PRESSURE) {
-      logger170.warn(
+      logger172.warn(
         `Pressure value ${rounded} (raw: ${value}) for ${entity.entity_id} is outside valid range [${MIN_PRESSURE}-${MAX_PRESSURE}], ignoring`
       );
       return null;
@@ -169048,7 +169361,7 @@ function PressureMeasurementServer2(config10) {
 }
 
 // src/matter/endpoints/composed/composed-sensor-endpoint.ts
-var logger171 = Logger.get("ComposedSensorEndpoint");
+var logger173 = Logger.get("ComposedSensorEndpoint");
 var temperatureConfig2 = {
   getValue(entity, agent) {
     const fallbackUnit = agent.env.get(HomeAssistantConfig).unitSystem.temperature;
@@ -169137,11 +169450,19 @@ var ComposedSensorEndpoint = class _ComposedSensorEndpoint extends Endpoint {
     );
     const mapping = {
       entityId: primaryEntityId,
-      ...config10.batteryEntityId ? { batteryEntity: config10.batteryEntityId } : {}
+      ...config10.batteryEntityId ? { batteryEntity: config10.batteryEntityId } : {},
+      ...config10.powerEntityId ? { powerEntity: config10.powerEntityId } : {},
+      ...config10.energyEntityId ? { energyEntity: config10.energyEntityId } : {}
     };
     if (config10.batteryEntityId) {
       parentType = parentType.with(PowerSourceServer2(batteryConfig2));
     }
+    if (config10.powerEntityId) {
+      parentType = parentType.with(HaElectricalPowerMeasurementServer);
+    }
+    if (config10.energyEntityId) {
+      parentType = parentType.with(HaElectricalEnergyMeasurementServer);
+    }
     if (config10.areaName) {
       const truncatedName = config10.areaName.length > 16 ? config10.areaName.substring(0, 16) : config10.areaName;
       parentType = parentType.with(
@@ -169198,6 +169519,8 @@ var ComposedSensorEndpoint = class _ComposedSensorEndpoint extends Endpoint {
     const mappedIds = [];
     if (config10.humidityEntityId) mappedIds.push(config10.humidityEntityId);
     if (config10.pressureEntityId) mappedIds.push(config10.pressureEntityId);
+    if (config10.powerEntityId) mappedIds.push(config10.powerEntityId);
+    if (config10.energyEntityId) mappedIds.push(config10.energyEntityId);
     const endpoint = new _ComposedSensorEndpoint(
       parentTypeWithState,
       primaryEntityId,
@@ -169212,8 +169535,8 @@ var ComposedSensorEndpoint = class _ComposedSensorEndpoint extends Endpoint {
     if (config10.pressureEntityId && pressSub) {
       endpoint.subEndpoints.set(config10.pressureEntityId, pressSub);
     }
-    logger171.info(
-      `Created composed sensor ${primaryEntityId} with ${parts.length} sub-endpoint(s): T${humSub ? "+H" : ""}${pressSub ? "+P" : ""}${config10.batteryEntityId ? "+Bat" : ""}`
+    logger173.info(
+      `Created composed sensor ${primaryEntityId} with ${parts.length} sub-endpoint(s): T${humSub ? "+H" : ""}${pressSub ? "+P" : ""}${config10.batteryEntityId ? "+Bat" : ""}${config10.powerEntityId ? "+Pwr" : ""}${config10.energyEntityId ? "+Nrg" : ""}`
     );
     return endpoint;
   }
@@ -169348,7 +169671,7 @@ init_home_assistant_entity_behavior();
 // src/matter/behaviors/mode-select-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger172 = Logger.get("ModeSelectServer");
+var logger174 = Logger.get("ModeSelectServer");
 var ModeSelectServerBase = class extends ModeSelectServer {
   async initialize() {
     await super.initialize();
@@ -169377,13 +169700,13 @@ var ModeSelectServerBase = class extends ModeSelectServer {
     const options = config10.getOptions(homeAssistant.entity);
     const { newMode } = request;
     if (newMode < 0 || newMode >= options.length) {
-      logger172.warn(
+      logger174.warn(
         `[${homeAssistant.entityId}] Invalid mode ${newMode}, options: [${options.join(", ")}]`
       );
       return;
     }
     const option = options[newMode];
-    logger172.info(
+    logger174.info(
       `[${homeAssistant.entityId}] changeToMode(${newMode}) -> "${option}"`
     );
     applyPatchState(this.state, { currentMode: newMode });
@@ -169896,7 +170219,7 @@ var WaterLeakDetectorType = WaterLeakDetectorDevice.with(
 );
 
 // src/matter/endpoints/legacy/binary-sensor/index.ts
-var logger173 = Logger.get("BinarySensorDevice");
+var logger175 = Logger.get("BinarySensorDevice");
 var deviceClasses = {
   [BinarySensorDeviceClass.CarbonMonoxide]: CoAlarmType,
   [BinarySensorDeviceClass.Gas]: CoAlarmType,
@@ -169947,11 +170270,11 @@ function BinarySensorDevice(homeAssistantEntity) {
   const originalTypeName = type.name;
   if (hasBattery && batteryTypes.has(type)) {
     type = batteryTypes.get(type);
-    logger173.info(
+    logger175.info(
       `[${entityId}] Using battery variant: ${originalTypeName} -> ${type.name}, batteryAttr=${hasBatteryAttr}, batteryEntity=${homeAssistantEntity.mapping?.batteryEntity ?? "none"}`
     );
   } else if (hasBattery) {
-    logger173.warn(
+    logger175.warn(
       `[${entityId}] Has battery but no variant available for ${originalTypeName}`
     );
   }
@@ -170114,7 +170437,7 @@ init_home_assistant_entity_behavior();
 // src/matter/behaviors/thermostat-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger174 = Logger.get("ThermostatServer");
+var logger176 = Logger.get("ThermostatServer");
 var SystemMode = Thermostat3.SystemMode;
 var RunningMode = Thermostat3.ThermostatRunningMode;
 var nudgingSetpoints = /* @__PURE__ */ new Set();
@@ -170172,7 +170495,7 @@ var HeatingAndCoolingFeaturedBase = ThermostatServer.with("Heating", "Cooling").
 );
 function thermostatPreInitialize(self) {
   const currentLocal = self.state.localTemperature;
-  logger174.debug(
+  logger176.debug(
     `initialize: features - heating=${self.features.heating}, cooling=${self.features.cooling}`
   );
   const localValue = typeof currentLocal === "number" && !Number.isNaN(currentLocal) ? currentLocal : currentLocal === null ? null : 2100;
@@ -170195,7 +170518,7 @@ function thermostatPreInitialize(self) {
     const coolingValue = typeof currentCooling === "number" && !Number.isNaN(currentCooling) ? currentCooling : 2400;
     self.state.occupiedCoolingSetpoint = coolingValue;
   }
-  logger174.debug(
+  logger176.debug(
     `initialize: after force-set - local=${self.state.localTemperature}`
   );
   self.state.thermostatRunningState = runningStateAllOff;
@@ -170277,7 +170600,7 @@ var ThermostatServerBase = class extends FullFeaturedBase {
       maxCoolLimit,
       "cool"
     );
-    logger174.debug(
+    logger176.debug(
       `update: limits heat=[${minHeatLimit}, ${maxHeatLimit}], cool=[${minCoolLimit}, ${maxCoolLimit}], systemMode=${systemMode}, runningMode=${runningMode}`
     );
     let controlSequence = config10.getControlSequence(entity.state, this.agent);
@@ -170350,18 +170673,18 @@ var ThermostatServerBase = class extends FullFeaturedBase {
    */
   // biome-ignore lint/correctness/noUnusedPrivateClassMembers: Called via thermostatPostInitialize + prototype copy
   heatingSetpointChanging(value, _oldValue, context) {
-    logger174.debug(
+    logger176.debug(
       `heatingSetpointChanging: value=${value}, oldValue=${_oldValue}, isOffline=${transactionIsOffline(context)}`
     );
     if (transactionIsOffline(context)) {
-      logger174.debug(
+      logger176.debug(
         "heatingSetpointChanging: skipping - transaction is offline"
       );
       return;
     }
     const next = Temperature.celsius(value / 100);
     if (!next) {
-      logger174.debug("heatingSetpointChanging: skipping - invalid temperature");
+      logger176.debug("heatingSetpointChanging: skipping - invalid temperature");
       return;
     }
     this.agent.asLocalActor(() => {
@@ -170372,7 +170695,7 @@ var ThermostatServerBase = class extends FullFeaturedBase {
         this.agent
       );
       const currentMode = this.state.systemMode;
-      logger174.debug(
+      logger176.debug(
         `heatingSetpointChanging: supportsRange=${supportsRange}, systemMode=${currentMode}, features.heating=${this.features.heating}, features.cooling=${this.features.cooling}`
       );
       if (!supportsRange) {
@@ -170382,12 +170705,12 @@ var ThermostatServerBase = class extends FullFeaturedBase {
         const isOff = currentMode === Thermostat3.SystemMode.Off;
         if (isOff && this.features.heating) {
           if (nudgingSetpoints.has(homeAssistant.entityId)) {
-            logger174.debug(
+            logger176.debug(
               `heatingSetpointChanging: skipping auto-resume - nudge write in progress`
             );
             return;
           }
-          logger174.info(
+          logger176.info(
             `heatingSetpointChanging: auto-resume - switching to Heat (was Off)`
           );
           const modeAction = config10.setSystemMode(
@@ -170396,17 +170719,17 @@ var ThermostatServerBase = class extends FullFeaturedBase {
           );
           homeAssistant.callAction(modeAction);
         } else if (!isAutoMode && !isHeatingMode) {
-          logger174.debug(
+          logger176.debug(
             `heatingSetpointChanging: skipping - not in heating/auto mode (mode=${currentMode}, haMode=${haHvacMode})`
           );
           return;
         }
-        logger174.debug(
+        logger176.debug(
           `heatingSetpointChanging: proceeding - isAutoMode=${isAutoMode}, isHeatingMode=${isHeatingMode}, isOff=${isOff}, haMode=${haHvacMode}`
         );
       }
       const coolingSetpoint = this.features.cooling ? this.state.occupiedCoolingSetpoint : value;
-      logger174.debug(
+      logger176.debug(
         `heatingSetpointChanging: calling setTemperature with heat=${next.celsius(true)}, cool=${coolingSetpoint}`
       );
       this.setTemperature(
@@ -170445,12 +170768,12 @@ var ThermostatServerBase = class extends FullFeaturedBase {
         const isOff = currentMode === Thermostat3.SystemMode.Off;
         if (isOff && !this.features.heating && this.features.cooling) {
           if (nudgingSetpoints.has(homeAssistant.entityId)) {
-            logger174.debug(
+            logger176.debug(
               `coolingSetpointChanging: skipping auto-resume - nudge write in progress`
             );
             return;
           }
-          logger174.info(
+          logger176.info(
             `coolingSetpointChanging: auto-resume - switching to Cool (was Off)`
           );
           const modeAction = config10.setSystemMode(
@@ -170459,12 +170782,12 @@ var ThermostatServerBase = class extends FullFeaturedBase {
           );
           homeAssistant.callAction(modeAction);
         } else if (!isAutoMode && !isCoolingMode) {
-          logger174.debug(
+          logger176.debug(
             `coolingSetpointChanging: skipping - not in cooling/auto mode (mode=${currentMode}, haMode=${haHvacMode})`
           );
           return;
         }
-        logger174.debug(
+        logger176.debug(
           `coolingSetpointChanging: proceeding - isAutoMode=${isAutoMode}, isCoolingMode=${isCoolingMode}, isOff=${isOff}, haMode=${haHvacMode}`
         );
       }
@@ -170561,7 +170884,7 @@ var ThermostatServerBase = class extends FullFeaturedBase {
     const effectiveMax = max ?? 5e3;
     if (value == null || Number.isNaN(value)) {
       const defaultValue = type === "heat" ? 2e3 : 2400;
-      logger174.debug(
+      logger176.debug(
         `${type} setpoint is undefined, using default: ${defaultValue}`
       );
       return Math.max(effectiveMin, Math.min(effectiveMax, defaultValue));
@@ -171006,16 +171329,16 @@ init_home_assistant_entity_behavior();
 init_esm();
 init_home_assistant_actions();
 init_home_assistant_entity_behavior();
-var logger175 = Logger.get("WindowCoveringServer");
+var logger177 = Logger.get("WindowCoveringServer");
 var MovementStatus = WindowCovering3.MovementStatus;
-var FeaturedBase5 = WindowCoveringServer.with(
+var FeaturedBase6 = WindowCoveringServer.with(
   "Lift",
   "PositionAwareLift",
   "Tilt",
   "PositionAwareTilt",
   "AbsolutePosition"
 );
-var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedBase5 {
+var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedBase6 {
   liftDebounceTimer = null;
   tiltDebounceTimer = null;
   // Track when the last command was received to implement two-phase debounce
@@ -171109,7 +171432,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
       }
       return existing100ths ?? current100ths;
     };
-    logger175.debug(
+    logger177.debug(
       `Cover update for ${entity.entity_id}: state=${state.state}, lift=${currentLift}%, tilt=${currentTilt}%, movement=${MovementStatus[movementStatus]}`
     );
     const appliedPatch = applyPatchState(
@@ -171152,9 +171475,9 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     );
     if (Object.keys(appliedPatch).length > 0) {
       const hasOperationalChange = "operationalStatus" in appliedPatch;
-      const log = hasOperationalChange ? logger175.info : logger175.debug;
+      const log = hasOperationalChange ? logger177.info : logger177.debug;
       log.call(
-        logger175,
+        logger177,
         `Cover ${entity.entity_id} state changed: ${JSON.stringify(appliedPatch)}`
       );
     }
@@ -171162,7 +171485,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
   async handleMovement(type, _, direction, targetPercent100ths) {
     const currentLift = this.state.currentPositionLiftPercent100ths ?? 0;
     const currentTilt = this.state.currentPositionTiltPercent100ths ?? 0;
-    logger175.info(
+    logger177.info(
       `handleMovement: type=${MovementType[type]}, direction=${MovementDirection[direction]}, target=${targetPercent100ths}, currentLift=${currentLift}, currentTilt=${currentTilt}, absolutePosition=${this.features.absolutePosition}`
     );
     if (type === MovementType.Lift) {
@@ -171181,7 +171504,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
       }
     } else if (type === MovementType.Tilt) {
       if (targetPercent100ths == null && this.lastLiftMovementDirection === direction && Date.now() - this.lastLiftMovementMs < 50) {
-        logger175.info(
+        logger177.info(
           `Skipping tilt ${MovementDirection[direction]} \u2014 lift already moving in same direction`
         );
         return;
@@ -171206,13 +171529,13 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
   handleLiftOpen() {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const action = this.state.config.openCoverLift(void 0, this.agent);
-    logger175.info(`handleLiftOpen: calling action=${action.action}`);
+    logger177.info(`handleLiftOpen: calling action=${action.action}`);
     homeAssistant.callAction(action);
   }
   handleLiftClose() {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const action = this.state.config.closeCoverLift(void 0, this.agent);
-    logger175.info(`handleLiftClose: calling action=${action.action}`);
+    logger177.info(`handleLiftClose: calling action=${action.action}`);
     homeAssistant.callAction(action);
   }
   handleGoToLiftPosition(targetPercent100ths) {
@@ -171233,7 +171556,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     this.lastLiftCommandTime = now;
     const isFirstInSequence = timeSinceLastCommand > _WindowCoveringServerBase.COMMAND_SEQUENCE_THRESHOLD_MS;
     const debounceMs = isFirstInSequence ? _WindowCoveringServerBase.DEBOUNCE_INITIAL_MS : _WindowCoveringServerBase.DEBOUNCE_SUBSEQUENT_MS;
-    logger175.debug(
+    logger177.debug(
       `Lift command: target=${targetPosition}%, debounce=${debounceMs}ms (${isFirstInSequence ? "initial" : "subsequent"})`
     );
     if (this.liftDebounceTimer) {
@@ -171282,7 +171605,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     this.lastTiltCommandTime = now;
     const isFirstInSequence = timeSinceLastCommand > _WindowCoveringServerBase.COMMAND_SEQUENCE_THRESHOLD_MS;
     const debounceMs = isFirstInSequence ? _WindowCoveringServerBase.DEBOUNCE_INITIAL_MS : _WindowCoveringServerBase.DEBOUNCE_SUBSEQUENT_MS;
-    logger175.debug(
+    logger177.debug(
       `Tilt command: target=${targetPosition}%, debounce=${debounceMs}ms (${isFirstInSequence ? "initial" : "subsequent"})`
     );
     if (this.tiltDebounceTimer) {
@@ -171303,7 +171626,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
   }
 };
 ((WindowCoveringServerBase2) => {
-  class State extends FeaturedBase5.State {
+  class State extends FeaturedBase6.State {
     config;
   }
   WindowCoveringServerBase2.State = State;
@@ -171341,7 +171664,7 @@ function adjustPositionForWriting(position, flags2, matterSemantics) {
 }
 
 // src/matter/endpoints/legacy/cover/behaviors/cover-window-covering-server.ts
-var logger176 = Logger.get("CoverWindowCoveringServer");
+var logger178 = Logger.get("CoverWindowCoveringServer");
 var attributes5 = (entity) => entity.attributes;
 var MATTER_SEMANTIC_PLATFORMS = [
   // Currently empty - no known platforms use Matter semantics by default
@@ -171359,7 +171682,7 @@ var adjustPositionForReading2 = (position, agent) => {
   const { featureFlags } = agent.env.get(BridgeDataProvider);
   const matterSem = usesMatterSemantics(agent);
   const result = adjustPositionForReading(position, featureFlags, matterSem);
-  logger176.debug(`adjustPositionForReading: HA=${position}%, result=${result}%`);
+  logger178.debug(`adjustPositionForReading: HA=${position}%, result=${result}%`);
   return result;
 };
 var adjustPositionForWriting2 = (position, agent) => {
@@ -171466,7 +171789,7 @@ var config5 = {
 var CoverWindowCoveringServer = WindowCoveringServer2(config5);
 
 // src/matter/endpoints/legacy/cover/index.ts
-var logger177 = Logger.get("CoverDevice");
+var logger179 = Logger.get("CoverDevice");
 var CoverDeviceType = (supportedFeatures, hasBattery, entityId) => {
   const features2 = /* @__PURE__ */ new Set();
   if (testBit(supportedFeatures, CoverSupportedFeatures.support_open)) {
@@ -171474,7 +171797,7 @@ var CoverDeviceType = (supportedFeatures, hasBattery, entityId) => {
     features2.add("PositionAwareLift");
     features2.add("AbsolutePosition");
   } else {
-    logger177.warn(
+    logger179.warn(
       `[${entityId}] Cover has no support_open feature (supported_features=${supportedFeatures}), adding Lift anyway`
     );
     features2.add("Lift");
@@ -171491,7 +171814,7 @@ var CoverDeviceType = (supportedFeatures, hasBattery, entityId) => {
       features2.add("AbsolutePosition");
     }
   }
-  logger177.info(
+  logger179.info(
     `[${entityId}] Creating WindowCovering with features: [${[...features2].join(", ")}], supported_features=${supportedFeatures}`
   );
   const baseBehaviors = [
@@ -171515,11 +171838,11 @@ function CoverDevice(homeAssistantEntity) {
   const hasBatteryEntity = !!homeAssistantEntity.mapping?.batteryEntity;
   const hasBattery = hasBatteryAttr || hasBatteryEntity;
   if (hasBattery) {
-    logger177.info(
+    logger179.info(
       `[${entityId}] Creating cover with PowerSource cluster, batteryAttr=${hasBatteryAttr}, batteryEntity=${homeAssistantEntity.mapping?.batteryEntity ?? "none"}`
     );
   } else {
-    logger177.debug(
+    logger179.debug(
       `[${entityId}] Creating cover without battery (batteryAttr=${hasBatteryAttr}, batteryEntity=${homeAssistantEntity.mapping?.batteryEntity ?? "none"})`
     );
   }
@@ -171535,18 +171858,18 @@ function CoverDevice(homeAssistantEntity) {
 // src/matter/behaviors/generic-switch-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger178 = Logger.get("GenericSwitchServer");
-var FeaturedBase6 = SwitchServer.with(
+var logger180 = Logger.get("GenericSwitchServer");
+var FeaturedBase7 = SwitchServer.with(
   "MomentarySwitch",
   "MomentarySwitchRelease",
   "MomentarySwitchMultiPress"
 );
-var GenericSwitchServerBase = class extends FeaturedBase6 {
+var GenericSwitchServerBase = class extends FeaturedBase7 {
   async initialize() {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     const entityId = homeAssistant.entityId;
-    logger178.debug(`[${entityId}] GenericSwitch initialized`);
+    logger180.debug(`[${entityId}] GenericSwitch initialized`);
     this.reactTo(homeAssistant.onChange, this.handleEventChange);
   }
   handleEventChange() {
@@ -171557,7 +171880,7 @@ var GenericSwitchServerBase = class extends FeaturedBase6 {
     const eventType = attrs.event_type;
     if (!eventType) return;
     const entityId = homeAssistant.entityId;
-    logger178.debug(`[${entityId}] Event fired: ${eventType}`);
+    logger180.debug(`[${entityId}] Event fired: ${eventType}`);
     this.triggerPress(eventType);
   }
   triggerPress(eventType) {
@@ -171600,7 +171923,7 @@ var GenericSwitchServerBase = class extends FeaturedBase6 {
   }
 };
 ((GenericSwitchServerBase2) => {
-  class State extends FeaturedBase6.State {
+  class State extends FeaturedBase7.State {
   }
   GenericSwitchServerBase2.State = State;
 })(GenericSwitchServerBase || (GenericSwitchServerBase = {}));
@@ -171852,7 +172175,7 @@ init_nodejs();
 
 // src/matter/behaviors/color-control-server.ts
 init_home_assistant_entity_behavior();
-var logger179 = Logger.get("ColorControlServer");
+var logger181 = Logger.get("ColorControlServer");
 var optimisticColorState = /* @__PURE__ */ new Map();
 var OPTIMISTIC_TIMEOUT_MS3 = 3e3;
 var OPTIMISTIC_TOLERANCE2 = 5;
@@ -171862,8 +172185,8 @@ function consumePendingColorStaging(entityId) {
   pendingColorStaging.delete(entityId);
   return data;
 }
-var FeaturedBase7 = ColorControlServer.with("ColorTemperature", "HueSaturation");
-var ColorControlServerBase = class extends FeaturedBase7 {
+var FeaturedBase8 = ColorControlServer.with("ColorTemperature", "HueSaturation");
+var ColorControlServerBase = class extends FeaturedBase8 {
   pendingTransitionTime;
   async initialize() {
     if (this.features.colorTemperature) {
@@ -171885,7 +172208,7 @@ var ColorControlServerBase = class extends FeaturedBase7 {
       if (this.state.startUpColorTemperatureMireds == null) {
         this.state.startUpColorTemperatureMireds = defaultMireds;
       }
-      logger179.debug(
+      logger181.debug(
         `initialize: set ColorTemperature defaults - min=${this.state.colorTempPhysicalMinMireds}, max=${this.state.colorTempPhysicalMaxMireds}, current=${this.state.colorTemperatureMireds}`
       );
     }
@@ -172095,7 +172418,7 @@ var ColorControlServerBase = class extends FeaturedBase7 {
   }
 };
 ((ColorControlServerBase2) => {
-  class State extends FeaturedBase7.State {
+  class State extends FeaturedBase8.State {
     config;
   }
   ColorControlServerBase2.State = State;
@@ -172269,126 +172592,6 @@ var OnOffLightWithBatteryType = OnOffLightDevice.with(
 
 // src/matter/endpoints/legacy/light/index.ts
 init_dist();
-
-// src/matter/behaviors/electrical-energy-measurement-server.ts
-init_esm();
-init_home_assistant_entity_behavior();
-var logger180 = Logger.get("ElectricalEnergyMeasurementServer");
-var FeaturedBase8 = ElectricalEnergyMeasurementServer.with("CumulativeEnergy", "ImportedEnergy");
-var ElectricalEnergyMeasurementServerBase = class extends FeaturedBase8 {
-  async initialize() {
-    await super.initialize();
-    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
-    const entityId = homeAssistant.entityId;
-    const energyEntity = homeAssistant.state.mapping?.energyEntity;
-    if (energyEntity) {
-      logger180.debug(
-        `[${entityId}] ElectricalEnergyMeasurement using mapped energy entity: ${energyEntity}`
-      );
-    }
-    this.update();
-    this.reactTo(homeAssistant.onChange, this.update);
-  }
-  update() {
-    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-    const energyEntity = homeAssistant.state.mapping?.energyEntity;
-    if (!energyEntity) return;
-    const stateProvider = this.agent.env.get(EntityStateProvider);
-    const energyKwh = stateProvider.getNumericState(energyEntity);
-    if (energyKwh == null) return;
-    const energyMwh = Math.round(energyKwh * 1e6);
-    const energyImported = { energy: energyMwh };
-    applyPatchState(this.state, {
-      cumulativeEnergyImported: energyImported
-    });
-    this.events.cumulativeEnergyMeasured?.emit(
-      { energyImported, energyExported: void 0 },
-      this.context
-    );
-  }
-};
-((ElectricalEnergyMeasurementServerBase2) => {
-  class State extends FeaturedBase8.State {
-  }
-  ElectricalEnergyMeasurementServerBase2.State = State;
-})(ElectricalEnergyMeasurementServerBase || (ElectricalEnergyMeasurementServerBase = {}));
-var HaElectricalEnergyMeasurementServer = ElectricalEnergyMeasurementServerBase.set({
-  accuracy: {
-    measurementType: ElectricalPowerMeasurement3.MeasurementType.ElectricalEnergy,
-    measured: true,
-    minMeasuredValue: -1e6,
-    // -1000Wh, allows 0 and all positive values
-    maxMeasuredValue: 1e11,
-    // 100MWh in mWh
-    accuracyRanges: [
-      {
-        rangeMin: -1e6,
-        rangeMax: 1e11,
-        fixedMax: 1e3
-        // 1Wh accuracy
-      }
-    ]
-  }
-});
-
-// src/matter/behaviors/electrical-power-measurement-server.ts
-init_esm();
-init_home_assistant_entity_behavior();
-var logger181 = Logger.get("ElectricalPowerMeasurementServer");
-var ElectricalPowerMeasurementServerBase = class extends ElectricalPowerMeasurementServer {
-  async initialize() {
-    await super.initialize();
-    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
-    const entityId = homeAssistant.entityId;
-    const powerEntity = homeAssistant.state.mapping?.powerEntity;
-    if (powerEntity) {
-      logger181.debug(
-        `[${entityId}] ElectricalPowerMeasurement using mapped power entity: ${powerEntity}`
-      );
-    }
-    this.update();
-    this.reactTo(homeAssistant.onChange, this.update);
-  }
-  update() {
-    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-    const powerEntity = homeAssistant.state.mapping?.powerEntity;
-    if (!powerEntity) return;
-    const stateProvider = this.agent.env.get(EntityStateProvider);
-    const powerWatts = stateProvider.getNumericState(powerEntity);
-    if (powerWatts == null) return;
-    const activePower = Math.round(powerWatts * 1e3);
-    applyPatchState(this.state, { activePower });
-  }
-};
-((ElectricalPowerMeasurementServerBase2) => {
-  class State extends ElectricalPowerMeasurementServer.State {
-  }
-  ElectricalPowerMeasurementServerBase2.State = State;
-})(ElectricalPowerMeasurementServerBase || (ElectricalPowerMeasurementServerBase = {}));
-var HaElectricalPowerMeasurementServer = ElectricalPowerMeasurementServerBase.set({
-  powerMode: ElectricalPowerMeasurement3.PowerMode.Ac,
-  numberOfMeasurementTypes: 1,
-  accuracy: [
-    {
-      measurementType: ElectricalPowerMeasurement3.MeasurementType.ActivePower,
-      measured: true,
-      minMeasuredValue: -1e6,
-      // -1000W, allows 0 and all positive values
-      maxMeasuredValue: 1e8,
-      // 100kW in mW
-      accuracyRanges: [
-        {
-          rangeMin: -1e6,
-          rangeMax: 1e8,
-          fixedMax: 1e3
-          // 1W accuracy
-        }
-      ]
-    }
-  ]
-});
-
-// src/matter/endpoints/legacy/light/index.ts
 var brightnessModes = Object.values(
   LightDeviceColorMode
 ).filter((mode) => mode !== LightDeviceColorMode.UNKNOWN).filter((mode) => mode !== LightDeviceColorMode.ONOFF);
@@ -175346,6 +175549,16 @@ function SensorDevice(homeAssistantEntity) {
   if (deviceClass === SensorDeviceClass.battery) {
     return BatterySensorType.set({ homeAssistantEntity });
   }
+  if (deviceClass) {
+    diagnosticEventBus.emit(
+      "entity_warning",
+      `Sensor "${homeAssistantEntity.entity.entity_id}" has unsupported device_class "${deviceClass}" \u2014 skipped`,
+      {
+        entityId: homeAssistantEntity.entity.entity_id,
+        details: { device_class: deviceClass }
+      }
+    );
+  }
   return void 0;
 }
 
@@ -178321,6 +178534,8 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
           humidityEntityId: effectiveMapping?.humidityEntity,
           pressureEntityId: effectiveMapping?.pressureEntity,
           batteryEntityId: effectiveMapping?.batteryEntity,
+          powerEntityId: effectiveMapping?.powerEntity,
+          energyEntityId: effectiveMapping?.energyEntity,
           customName: effectiveMapping?.customName,
           areaName: composedAreaName
         });
@@ -178338,6 +178553,8 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             temperatureEntityId,
             humidityEntityId,
             batteryEntityId: effectiveMapping?.batteryEntity,
+            powerEntityId: effectiveMapping?.powerEntity,
+            energyEntityId: effectiveMapping?.energyEntity,
             mapping: effectiveMapping,
             customName: effectiveMapping?.customName,
             areaName: composedAreaName
@@ -179083,16 +179300,25 @@ var BridgeEndpointManager = class extends Service {
     }
   }
   async updateStates(states) {
+    const startMs = performance.now();
     this.registry.mergeExternalStates(states);
     const endpoints = this.root.parts.map((p) => p);
     const results = await Promise.allSettled(
       endpoints.map((endpoint) => endpoint.updateStates(states))
     );
+    let failedCount = 0;
     for (const result of results) {
       if (result.status === "rejected") {
+        failedCount++;
         this.log.warn("State update failed for endpoint:", result.reason);
       }
     }
+    const latencyMs = Math.round((performance.now() - startMs) * 100) / 100;
+    if (latencyMs > 200) {
+      this.log.warn(
+        `Slow state update: ${endpoints.length} endpoints in ${latencyMs}ms` + (failedCount > 0 ? ` (${failedCount} failed)` : "")
+      );
+    }
   }
   /**
    * Log detailed behavior error information for debugging "Behaviors have errors".