@camstack/addon-provider-homeassistant 1.2.630 → 1.2.632

package/dist/addon.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_dist = require("./dist-Dcmr-Isu.js");
+const require_dist = require("./dist-D0ZiJUPy.js");
 let node_crypto = require("node:crypto");
 let node_zlib = require("node:zlib");
 //#region src/ha-admin-link.ts
@@ -126,7 +126,14 @@ var haSourceSchemaFields = {
 	deviceClass: require_dist.string().optional(),
 	integrationId: require_dist.string().optional(),
 	options: require_dist.array(require_dist.string()).optional(),
-	features: require_dist.array(require_dist.string()).optional()
+	features: require_dist.array(require_dist.string()).optional(),
+	/** Sibling meter sensors whose readings this entity carries as `power-meter` (D951). */
+	meterEntities: require_dist.object({
+		watts: require_dist.string().optional(),
+		kwhTotal: require_dist.string().optional(),
+		volts: require_dist.string().optional(),
+		amps: require_dist.string().optional()
+	}).optional()
 };
 /** Project a persisted config blob into a typed source, or null when the
 *  blob is not an HA-adopted device (no brokerId). */
@@ -292,6 +299,168 @@ var HaDomain = /* @__PURE__ */ function(HaDomain) {
 	return HaDomain;
 }({});
 //#endregion
+//#region src/ha-reading.ts
+/**
+* Convert one sample into the quantity's base unit. A refusal publishes
+* nothing (the caller stores null) and is logged with the device id —
+* an unknown unit is never guessed (D393, D944).
+*/
+function takeReading(logger, deviceId, value, rawUnit, quantity) {
+	const result = require_dist.ingestReading({
+		value,
+		rawUnit,
+		quantity
+	});
+	if (result.ok) return result.value;
+	logger.warn("numeric reading refused", {
+		tags: { deviceId },
+		meta: {
+			quantity,
+			unit: rawUnit ?? "",
+			reason: result.reason
+		}
+	});
+	return null;
+}
+//#endregion
+//#region src/ha-meter-fold.ts
+/**
+* Power and energy are a feature of the electrical device itself (D951). A
+* metered plug is exposed by Home Assistant as a switch plus separate
+* power / energy / voltage / current sensors; the switch carries the readings
+* and the sensors stay as children (D865), flagged `foldedInto`.
+*/
+/** The `power-meter` status field a reading lands in. */
+var METER_FIELDS = [
+	"watts",
+	"kwhTotal",
+	"volts",
+	"amps"
+];
+var METER_BY_DEVICE_CLASS = {
+	power: {
+		field: "watts",
+		quantity: "power"
+	},
+	energy: {
+		field: "kwhTotal",
+		quantity: "energy"
+	},
+	voltage: {
+		field: "volts",
+		quantity: "voltage"
+	},
+	current: {
+		field: "amps",
+		quantity: "current"
+	}
+};
+/** The meter field and quantity an HA `device_class` feeds; undefined for any other class. */
+function meterKindForDeviceClass(deviceClass) {
+	return deviceClass === null || deviceClass === void 0 ? void 0 : METER_BY_DEVICE_CLASS[deviceClass];
+}
+/** Status with one reading applied; the clock moves with it. */
+function applyMeterReading(prev, field, value, lastFetchedAt) {
+	return {
+		...prev,
+		[field]: value,
+		lastFetchedAt
+	};
+}
+var LOAD_TYPES = new Set(require_dist.powerMeterCapability.deviceTypes.filter((type) => type !== require_dist.DeviceType.Sensor));
+function isLoad(entity) {
+	return LOAD_TYPES.has(entity.deviceType) && entity.entityCategory === void 0 && !entity.capabilities.includes("power-meter");
+}
+function meterFieldOf(entity) {
+	if (!entity.capabilities.includes("power-meter")) return void 0;
+	return meterKindForDeviceClass(entity.deviceClass)?.field;
+}
+/**
+* Fold the device's meter sensors into its electrical load: the first normal
+* control of a load type gains `power-meter` and the entity ids it reads; each
+* sensor it reads is flagged `foldedInto`. A device with no load, or no meter,
+* comes back unchanged.
+*/
+function foldMeterEntities(entities) {
+	const primary = entities.find(isLoad);
+	if (primary === void 0) return [...entities];
+	const meters = {};
+	for (const entity of entities) {
+		const field = meterFieldOf(entity);
+		if (field !== void 0 && meters[field] === void 0) meters[field] = entity.entityId;
+	}
+	const folded = new Set(Object.values(meters));
+	if (folded.size === 0) return [...entities];
+	return entities.map((entity) => {
+		if (entity.entityId === primary.entityId) return {
+			...entity,
+			capabilities: [...entity.capabilities, "power-meter"],
+			meterEntities: meters
+		};
+		return folded.has(entity.entityId) ? {
+			...entity,
+			foldedInto: primary.entityId
+		} : entity;
+	});
+}
+//#endregion
+//#region src/ha-meter-carrier.ts
+var COLD_START$20 = { lastFetchedAt: 0 };
+/**
+* The `power-meter` of a device whose power / energy readings come from sibling
+* HA sensors (D951). It registers the cap, names the entities the owner must
+* subscribe to, and turns each of their pushes into one field of the slice.
+* The owner is any HA child that is an electrical load (switch, light, fan, ...);
+* none of them knows how a reading is converted.
+*/
+var HaMeterCarrier = class {
+	ctx;
+	runtimeState;
+	logger;
+	deviceId;
+	fieldByEntity;
+	constructor(ctx, runtimeState, logger, deviceId, meters) {
+		this.ctx = ctx;
+		this.runtimeState = runtimeState;
+		this.logger = logger;
+		this.deviceId = deviceId;
+		this.fieldByEntity = new Map(METER_FIELDS.flatMap((field) => {
+			const entityId = meters[field];
+			return entityId === void 0 ? [] : [[entityId, field]];
+		}));
+		this.ctx.registerNativeCap(require_dist.powerMeterCapability, { getStatus: async () => this.runtimeState.getCapState("power-meter") ?? COLD_START$20 });
+		this.runtimeState.setCapState("power-meter", {
+			...COLD_START$20,
+			...this.runtimeState.getCapState("power-meter")
+		});
+	}
+	/** The meter entities the owner must subscribe to, beside its own. */
+	entityIds() {
+		return [...this.fieldByEntity.keys()];
+	}
+	/** Whether a push belongs to one of the meter entities. */
+	carries(entityId) {
+		return this.fieldByEntity.has(entityId);
+	}
+	/** Apply one meter push; an unavailable or unreadable sample changes nothing. */
+	push(entityId, state) {
+		const field = this.fieldByEntity.get(entityId);
+		if (field === void 0) return;
+		if (state.state === "unavailable" || state.state === "unknown") return;
+		const value = Number(state.state);
+		if (!Number.isFinite(value)) return;
+		const deviceClass = state.attributes["device_class"];
+		const kind = meterKindForDeviceClass(typeof deviceClass === "string" ? deviceClass : null);
+		if (kind === void 0 || kind.field !== field) return;
+		const unit = state.attributes["unit_of_measurement"];
+		const stored = takeReading(this.logger, this.deviceId, value, typeof unit === "string" ? unit : void 0, kind.quantity);
+		if (stored === null) return;
+		const prev = this.runtimeState.getCapState("power-meter") ?? COLD_START$20;
+		const lastFetchedAt = Date.parse(state.last_updated) || Date.now();
+		this.runtimeState.setCapState("power-meter", applyMeterReading(prev, field, stored, lastFetchedAt));
+	}
+};
+//#endregion
 //#region src/ha-base-child-device.ts
 /**
 * Persisted config shared by every per-domain HA child device class.
@@ -357,6 +526,9 @@ var HaBaseChildDevice = class HaBaseChildDevice extends require_dist.BaseDevice
 	/** Handle to the accessories cap when this device acts as a parent
 	*  that hosts entity-children. Null for plain child devices. */
 	accessories = null;
+	/** The power-meter this device carries for its sibling meter sensors (D951);
+	*  null for a device that is not metered through other entities. */
+	meterCarrier;
 	constructor(ctx, options = {}) {
 		const persisted = ctx.persistedConfig ?? {};
 		const brokerId = persisted.brokerId;
@@ -372,6 +544,7 @@ var HaBaseChildDevice = class HaBaseChildDevice extends require_dist.BaseDevice
 		this.features = parseDeviceFeatures(persisted.features);
 		this.deviceLogger = ctx.deviceMeta.integrationId !== void 0 ? ctx.logger.withTags({ integrationId: ctx.deviceMeta.integrationId }) ?? ctx.logger : ctx.logger;
 		this.online = true;
+		this.meterCarrier = persisted.meterEntities !== void 0 ? new HaMeterCarrier(this.ctx, this.runtimeState, this.deviceLogger, this.id, persisted.meterEntities) : null;
 		this.attachEventBusListener();
 		const childIds = Array.isArray(persisted.childDeviceIds) ? persisted.childDeviceIds : [];
 		if (childIds.length > 0) {
@@ -535,7 +708,7 @@ var HaBaseChildDevice = class HaBaseChildDevice extends require_dist.BaseDevice
 		try {
 			const result = await this.ctx.api.broker.subscribe.mutate({
 				brokerId: this.brokerId,
-				filter: { entityIds: [this.entityId] }
+				filter: { entityIds: [this.entityId, ...this.meterCarrier?.entityIds() ?? []] }
 			});
 			this.brokerSubscriptionId = result.subscriptionId;
 			return true;
@@ -554,8 +727,12 @@ var HaBaseChildDevice = class HaBaseChildDevice extends require_dist.BaseDevice
 			const data = event.data;
 			if (!data) return;
 			if (data.brokerId !== this.brokerId) return;
-			if (data.key !== this.entityId) return;
 			const state = data.payload;
+			if (data.key !== void 0 && this.meterCarrier?.carries(data.key) === true) {
+				if (state) this.meterCarrier.push(data.key, state);
+				return;
+			}
+			if (data.key !== this.entityId) return;
 			if (!state) return;
 			if (state.state !== this.lastLoggedState) {
 				this.deviceLogger.debug("HA→device value change", { meta: {
@@ -766,30 +943,6 @@ var HaSwitchDevice = class extends HaBaseChildDevice {
 	}
 };
 //#endregion
-//#region src/ha-reading.ts
-/**
-* Convert one sample into the quantity's base unit. A refusal publishes
-* nothing (the caller stores null) and is logged with the device id —
-* an unknown unit is never guessed (D393, D944).
-*/
-function takeReading(logger, deviceId, value, rawUnit, quantity) {
-	const result = require_dist.ingestReading({
-		value,
-		rawUnit,
-		quantity
-	});
-	if (result.ok) return result.value;
-	logger.warn("numeric reading refused", {
-		tags: { deviceId },
-		meta: {
-			quantity,
-			unit: rawUnit ?? "",
-			reason: result.reason
-		}
-	});
-	return null;
-}
-//#endregion
 //#region src/devices/ha-numeric-sensor-device.ts
 var SUPPORTED_CAP_NAMES$1 = [
 	"temperature-sensor",
@@ -3699,7 +3852,14 @@ var containerEntitySchema = require_dist.object({
 	features: require_dist.array(require_dist.string()).optional(),
 	name: require_dist.string().optional(),
 	dateTimeFormat: require_dist.EnumSensorDateTimeFormatSchema.optional(),
-	entityCategory: require_dist._enum(["config", "diagnostic"]).optional()
+	entityCategory: require_dist._enum(["config", "diagnostic"]).optional(),
+	meterEntities: require_dist.object({
+		watts: require_dist.string().optional(),
+		kwhTotal: require_dist.string().optional(),
+		volts: require_dist.string().optional(),
+		amps: require_dist.string().optional()
+	}).optional(),
+	foldedInto: require_dist.string().optional()
 });
 function parseContainerEntities(raw) {
 	const result = require_dist.array(containerEntitySchema).safeParse(raw);
@@ -3712,6 +3872,9 @@ function parseContainerEntities(raw) {
 * skipped (the adoption path skips them too).
 */
 function buildContainerEntities(haDevice) {
+	return foldMeterEntities(mapContainerEntities(haDevice));
+}
+function mapContainerEntities(haDevice) {
 	const out = [];
 	for (const ent of haDevice.entities) {
 		if (ent.mappedTo === null) continue;
@@ -3742,7 +3905,8 @@ function derivedKey(e) {
 		deviceClass: e.deviceClass ?? null,
 		options: e.options ?? null,
 		features: e.features ?? null,
-		dateTimeFormat: e.dateTimeFormat ?? null
+		dateTimeFormat: e.dateTimeFormat ?? null,
+		meterEntities: e.meterEntities ?? null
 	});
 }
 /** Stable key over the FULL entry incl. name + entityId + the layout-affecting
@@ -3755,6 +3919,7 @@ function fullKey(e) {
 		entityId: e.entityId,
 		name: e.name ?? null,
 		entityCategory: e.entityCategory ?? null,
+		foldedInto: e.foldedInto ?? null,
 		derived: derivedKey(e)
 	});
 }
@@ -3766,6 +3931,7 @@ function childConfigPatch(e) {
 		...e.options !== void 0 ? { options: e.options } : {},
 		...e.features !== void 0 ? { features: e.features } : {},
 		...e.dateTimeFormat !== void 0 ? { dateTimeFormat: e.dateTimeFormat } : {},
+		...e.meterEntities !== void 0 ? { meterEntities: e.meterEntities } : {},
 		...e.role !== void 0 ? { role: e.role } : {}
 	};
 }
@@ -3819,7 +3985,7 @@ var SECTION_RANK = {
 *  normal control). */
 function sectionForEntity(e) {
 	if (e.entityCategory === "config") return SECTION_CONFIGURATION;
-	if (e.entityCategory === "diagnostic") return SECTION_DIAGNOSTIC;
+	if (e.entityCategory === "diagnostic" || e.foldedInto !== void 0) return SECTION_DIAGNOSTIC;
 	return SECTION_CONTROLS;
 }
 /**
@@ -3872,7 +4038,16 @@ var haEntitySchema = require_dist.object({
 	dateTimeFormat: require_dist.EnumSensorDateTimeFormatSchema.optional(),
 	/** HA `entity_category` — `config` / `diagnostic` / absent (a normal
 	*  control). Drives the accordion section the child renders in. */
-	entityCategory: require_dist._enum(["config", "diagnostic"]).optional()
+	entityCategory: require_dist._enum(["config", "diagnostic"]).optional(),
+	/** Sibling meter sensors this entity reads as its own power-meter (D951). */
+	meterEntities: require_dist.object({
+		watts: require_dist.string().optional(),
+		kwhTotal: require_dist.string().optional(),
+		volts: require_dist.string().optional(),
+		amps: require_dist.string().optional()
+	}).optional(),
+	/** Set on a meter sensor folded into another entity: sectioned as Diagnostic. */
+	foldedInto: require_dist.string().optional()
 });
 var haContainerSchema = require_dist.object({
 	system: require_dist.literal("homeassistant"),
@@ -4187,6 +4362,7 @@ var HaContainerDevice = class HaContainerDevice extends require_dist.BaseDevice
 				...e.options !== void 0 ? { options: e.options } : {},
 				...e.features !== void 0 ? { features: e.features } : {},
 				...e.dateTimeFormat !== void 0 ? { dateTimeFormat: e.dateTimeFormat } : {},
+				...e.meterEntities !== void 0 ? { meterEntities: e.meterEntities } : {},
 				...e.role !== void 0 ? { role: e.role } : {}
 			};
 			const factory = (childCtx) => {

package/dist/addon.mjs

@@ -1,4 +1,4 @@
-import { $ as lawnMowerControlCapability, $t as union, A as buttonCapability, At as weatherCapability, B as coverCapability, Bt as defineRecordKinds, C as batteryCapability, Ct as tryConvertDelta, D as brokerCapability, Dt as valveCapability, E as brightnessCapability, Et as vacuumControlCapability, F as connectivityCapability, G as eventEmitterCapability, Gt as array, H as deviceAdoptionCapability, It as RecordSecretUnavailableError, J as gasCapability, Jt as literal, K as fanControlCapability, Kt as boolean, Lt as baseUnitOf, M as carbonMonoxideCapability, Mt as DeviceRole, N as climateControlCapability, Nt as DeviceType, O as buildAddonRouteProvider, Ot as vibrationCapability, P as colorCapability, Pt as errMsg, Q as ingestReading, Qt as string, R as contactCapability, Rt as createEvent, S as automationControlCapability, St as temperatureSensorCapability, T as binaryCapability, Tt as updateCapability, V as deviceAdminLinkCapability, Vt as entryBody, W as enumSensorCapability, Wt as _enum, X as humiditySensorCapability, Xt as object, Y as humidifierCapability, Yt as number, Z as imageCapability, Zt as record, _ as accessoriesCapability, _t as runningStateCapability, at as notifierCapability, b as alarmPanelCapability, bt as switchCapability, ct as parseAdminBase, dt as presenceCapability, en as unknown, et as lockControlCapability, ft as pressureSensorCapability, g as TargetSchema, gt as runningFromVacuumState, h as RUNNING_STATE_COLD, ht as runningFromMediaPlayer, it as notificationOutputCapability, j as calendarSourceCapability, jt as DeviceFeature, k as buildDeviceAdminUrl, kt as waterHeaterCapability, lt as powerMeterCapability, mt as runningFromLawnMower, n as BaseDevice, nn as EventCategory, nt as motionCapability, ot as numericSensorCapability, pt as quantityFromUnit, q as floodCapability, qt as discriminatedUnion, r as BaseDeviceProvider, rt as normalizeUnit, tn as url, tt as mediaPlayerCapability, u as EnumSensorDateTimeFormatSchema, ut as prepareNotification, v as addonRoutesCapability, vt as scriptRunnerCapability, w as bestLocationMatch, wt as tryConvertUnit, x as ambientLightSensorCapability, xt as tamperCapability, y as airQualitySensorCapability, yt as smokeCapability, z as controlCapability, zt as defineEntryKind } from "./dist-CT3sP-p0.mjs";
+import { $ as lawnMowerControlCapability, $t as union, A as buttonCapability, At as weatherCapability, B as coverCapability, Bt as defineRecordKinds, C as batteryCapability, Ct as tryConvertDelta, D as brokerCapability, Dt as valveCapability, E as brightnessCapability, Et as vacuumControlCapability, F as connectivityCapability, G as eventEmitterCapability, Gt as array, H as deviceAdoptionCapability, It as RecordSecretUnavailableError, J as gasCapability, Jt as literal, K as fanControlCapability, Kt as boolean, Lt as baseUnitOf, M as carbonMonoxideCapability, Mt as DeviceRole, N as climateControlCapability, Nt as DeviceType, O as buildAddonRouteProvider, Ot as vibrationCapability, P as colorCapability, Pt as errMsg, Q as ingestReading, Qt as string, R as contactCapability, Rt as createEvent, S as automationControlCapability, St as temperatureSensorCapability, T as binaryCapability, Tt as updateCapability, V as deviceAdminLinkCapability, Vt as entryBody, W as enumSensorCapability, Wt as _enum, X as humiditySensorCapability, Xt as object, Y as humidifierCapability, Yt as number, Z as imageCapability, Zt as record, _ as accessoriesCapability, _t as runningStateCapability, at as notifierCapability, b as alarmPanelCapability, bt as switchCapability, ct as parseAdminBase, dt as presenceCapability, en as unknown, et as lockControlCapability, ft as pressureSensorCapability, g as TargetSchema, gt as runningFromVacuumState, h as RUNNING_STATE_COLD, ht as runningFromMediaPlayer, it as notificationOutputCapability, j as calendarSourceCapability, jt as DeviceFeature, k as buildDeviceAdminUrl, kt as waterHeaterCapability, lt as powerMeterCapability, mt as runningFromLawnMower, n as BaseDevice, nn as EventCategory, nt as motionCapability, ot as numericSensorCapability, pt as quantityFromUnit, q as floodCapability, qt as discriminatedUnion, r as BaseDeviceProvider, rt as normalizeUnit, tn as url, tt as mediaPlayerCapability, u as EnumSensorDateTimeFormatSchema, ut as prepareNotification, v as addonRoutesCapability, vt as scriptRunnerCapability, w as bestLocationMatch, wt as tryConvertUnit, x as ambientLightSensorCapability, xt as tamperCapability, y as airQualitySensorCapability, yt as smokeCapability, z as controlCapability, zt as defineEntryKind } from "./dist-CPkvghX8.mjs";
 import { randomUUID } from "node:crypto";
 import { brotliCompressSync, deflateSync, gzipSync } from "node:zlib";
 //#region src/ha-admin-link.ts
@@ -125,7 +125,14 @@ var haSourceSchemaFields = {
 	deviceClass: string().optional(),
 	integrationId: string().optional(),
 	options: array(string()).optional(),
-	features: array(string()).optional()
+	features: array(string()).optional(),
+	/** Sibling meter sensors whose readings this entity carries as `power-meter` (D951). */
+	meterEntities: object({
+		watts: string().optional(),
+		kwhTotal: string().optional(),
+		volts: string().optional(),
+		amps: string().optional()
+	}).optional()
 };
 /** Project a persisted config blob into a typed source, or null when the
 *  blob is not an HA-adopted device (no brokerId). */
@@ -291,6 +298,168 @@ var HaDomain = /* @__PURE__ */ function(HaDomain) {
 	return HaDomain;
 }({});
 //#endregion
+//#region src/ha-reading.ts
+/**
+* Convert one sample into the quantity's base unit. A refusal publishes
+* nothing (the caller stores null) and is logged with the device id —
+* an unknown unit is never guessed (D393, D944).
+*/
+function takeReading(logger, deviceId, value, rawUnit, quantity) {
+	const result = ingestReading({
+		value,
+		rawUnit,
+		quantity
+	});
+	if (result.ok) return result.value;
+	logger.warn("numeric reading refused", {
+		tags: { deviceId },
+		meta: {
+			quantity,
+			unit: rawUnit ?? "",
+			reason: result.reason
+		}
+	});
+	return null;
+}
+//#endregion
+//#region src/ha-meter-fold.ts
+/**
+* Power and energy are a feature of the electrical device itself (D951). A
+* metered plug is exposed by Home Assistant as a switch plus separate
+* power / energy / voltage / current sensors; the switch carries the readings
+* and the sensors stay as children (D865), flagged `foldedInto`.
+*/
+/** The `power-meter` status field a reading lands in. */
+var METER_FIELDS = [
+	"watts",
+	"kwhTotal",
+	"volts",
+	"amps"
+];
+var METER_BY_DEVICE_CLASS = {
+	power: {
+		field: "watts",
+		quantity: "power"
+	},
+	energy: {
+		field: "kwhTotal",
+		quantity: "energy"
+	},
+	voltage: {
+		field: "volts",
+		quantity: "voltage"
+	},
+	current: {
+		field: "amps",
+		quantity: "current"
+	}
+};
+/** The meter field and quantity an HA `device_class` feeds; undefined for any other class. */
+function meterKindForDeviceClass(deviceClass) {
+	return deviceClass === null || deviceClass === void 0 ? void 0 : METER_BY_DEVICE_CLASS[deviceClass];
+}
+/** Status with one reading applied; the clock moves with it. */
+function applyMeterReading(prev, field, value, lastFetchedAt) {
+	return {
+		...prev,
+		[field]: value,
+		lastFetchedAt
+	};
+}
+var LOAD_TYPES = new Set(powerMeterCapability.deviceTypes.filter((type) => type !== DeviceType.Sensor));
+function isLoad(entity) {
+	return LOAD_TYPES.has(entity.deviceType) && entity.entityCategory === void 0 && !entity.capabilities.includes("power-meter");
+}
+function meterFieldOf(entity) {
+	if (!entity.capabilities.includes("power-meter")) return void 0;
+	return meterKindForDeviceClass(entity.deviceClass)?.field;
+}
+/**
+* Fold the device's meter sensors into its electrical load: the first normal
+* control of a load type gains `power-meter` and the entity ids it reads; each
+* sensor it reads is flagged `foldedInto`. A device with no load, or no meter,
+* comes back unchanged.
+*/
+function foldMeterEntities(entities) {
+	const primary = entities.find(isLoad);
+	if (primary === void 0) return [...entities];
+	const meters = {};
+	for (const entity of entities) {
+		const field = meterFieldOf(entity);
+		if (field !== void 0 && meters[field] === void 0) meters[field] = entity.entityId;
+	}
+	const folded = new Set(Object.values(meters));
+	if (folded.size === 0) return [...entities];
+	return entities.map((entity) => {
+		if (entity.entityId === primary.entityId) return {
+			...entity,
+			capabilities: [...entity.capabilities, "power-meter"],
+			meterEntities: meters
+		};
+		return folded.has(entity.entityId) ? {
+			...entity,
+			foldedInto: primary.entityId
+		} : entity;
+	});
+}
+//#endregion
+//#region src/ha-meter-carrier.ts
+var COLD_START$20 = { lastFetchedAt: 0 };
+/**
+* The `power-meter` of a device whose power / energy readings come from sibling
+* HA sensors (D951). It registers the cap, names the entities the owner must
+* subscribe to, and turns each of their pushes into one field of the slice.
+* The owner is any HA child that is an electrical load (switch, light, fan, ...);
+* none of them knows how a reading is converted.
+*/
+var HaMeterCarrier = class {
+	ctx;
+	runtimeState;
+	logger;
+	deviceId;
+	fieldByEntity;
+	constructor(ctx, runtimeState, logger, deviceId, meters) {
+		this.ctx = ctx;
+		this.runtimeState = runtimeState;
+		this.logger = logger;
+		this.deviceId = deviceId;
+		this.fieldByEntity = new Map(METER_FIELDS.flatMap((field) => {
+			const entityId = meters[field];
+			return entityId === void 0 ? [] : [[entityId, field]];
+		}));
+		this.ctx.registerNativeCap(powerMeterCapability, { getStatus: async () => this.runtimeState.getCapState("power-meter") ?? COLD_START$20 });
+		this.runtimeState.setCapState("power-meter", {
+			...COLD_START$20,
+			...this.runtimeState.getCapState("power-meter")
+		});
+	}
+	/** The meter entities the owner must subscribe to, beside its own. */
+	entityIds() {
+		return [...this.fieldByEntity.keys()];
+	}
+	/** Whether a push belongs to one of the meter entities. */
+	carries(entityId) {
+		return this.fieldByEntity.has(entityId);
+	}
+	/** Apply one meter push; an unavailable or unreadable sample changes nothing. */
+	push(entityId, state) {
+		const field = this.fieldByEntity.get(entityId);
+		if (field === void 0) return;
+		if (state.state === "unavailable" || state.state === "unknown") return;
+		const value = Number(state.state);
+		if (!Number.isFinite(value)) return;
+		const deviceClass = state.attributes["device_class"];
+		const kind = meterKindForDeviceClass(typeof deviceClass === "string" ? deviceClass : null);
+		if (kind === void 0 || kind.field !== field) return;
+		const unit = state.attributes["unit_of_measurement"];
+		const stored = takeReading(this.logger, this.deviceId, value, typeof unit === "string" ? unit : void 0, kind.quantity);
+		if (stored === null) return;
+		const prev = this.runtimeState.getCapState("power-meter") ?? COLD_START$20;
+		const lastFetchedAt = Date.parse(state.last_updated) || Date.now();
+		this.runtimeState.setCapState("power-meter", applyMeterReading(prev, field, stored, lastFetchedAt));
+	}
+};
+//#endregion
 //#region src/ha-base-child-device.ts
 /**
 * Persisted config shared by every per-domain HA child device class.
@@ -356,6 +525,9 @@ var HaBaseChildDevice = class HaBaseChildDevice extends BaseDevice {
 	/** Handle to the accessories cap when this device acts as a parent
 	*  that hosts entity-children. Null for plain child devices. */
 	accessories = null;
+	/** The power-meter this device carries for its sibling meter sensors (D951);
+	*  null for a device that is not metered through other entities. */
+	meterCarrier;
 	constructor(ctx, options = {}) {
 		const persisted = ctx.persistedConfig ?? {};
 		const brokerId = persisted.brokerId;
@@ -371,6 +543,7 @@ var HaBaseChildDevice = class HaBaseChildDevice extends BaseDevice {
 		this.features = parseDeviceFeatures(persisted.features);
 		this.deviceLogger = ctx.deviceMeta.integrationId !== void 0 ? ctx.logger.withTags({ integrationId: ctx.deviceMeta.integrationId }) ?? ctx.logger : ctx.logger;
 		this.online = true;
+		this.meterCarrier = persisted.meterEntities !== void 0 ? new HaMeterCarrier(this.ctx, this.runtimeState, this.deviceLogger, this.id, persisted.meterEntities) : null;
 		this.attachEventBusListener();
 		const childIds = Array.isArray(persisted.childDeviceIds) ? persisted.childDeviceIds : [];
 		if (childIds.length > 0) {
@@ -534,7 +707,7 @@ var HaBaseChildDevice = class HaBaseChildDevice extends BaseDevice {
 		try {
 			const result = await this.ctx.api.broker.subscribe.mutate({
 				brokerId: this.brokerId,
-				filter: { entityIds: [this.entityId] }
+				filter: { entityIds: [this.entityId, ...this.meterCarrier?.entityIds() ?? []] }
 			});
 			this.brokerSubscriptionId = result.subscriptionId;
 			return true;
@@ -553,8 +726,12 @@ var HaBaseChildDevice = class HaBaseChildDevice extends BaseDevice {
 			const data = event.data;
 			if (!data) return;
 			if (data.brokerId !== this.brokerId) return;
-			if (data.key !== this.entityId) return;
 			const state = data.payload;
+			if (data.key !== void 0 && this.meterCarrier?.carries(data.key) === true) {
+				if (state) this.meterCarrier.push(data.key, state);
+				return;
+			}
+			if (data.key !== this.entityId) return;
 			if (!state) return;
 			if (state.state !== this.lastLoggedState) {
 				this.deviceLogger.debug("HA→device value change", { meta: {
@@ -765,30 +942,6 @@ var HaSwitchDevice = class extends HaBaseChildDevice {
 	}
 };
 //#endregion
-//#region src/ha-reading.ts
-/**
-* Convert one sample into the quantity's base unit. A refusal publishes
-* nothing (the caller stores null) and is logged with the device id —
-* an unknown unit is never guessed (D393, D944).
-*/
-function takeReading(logger, deviceId, value, rawUnit, quantity) {
-	const result = ingestReading({
-		value,
-		rawUnit,
-		quantity
-	});
-	if (result.ok) return result.value;
-	logger.warn("numeric reading refused", {
-		tags: { deviceId },
-		meta: {
-			quantity,
-			unit: rawUnit ?? "",
-			reason: result.reason
-		}
-	});
-	return null;
-}
-//#endregion
 //#region src/devices/ha-numeric-sensor-device.ts
 var SUPPORTED_CAP_NAMES$1 = [
 	"temperature-sensor",
@@ -3698,7 +3851,14 @@ var containerEntitySchema = object({
 	features: array(string()).optional(),
 	name: string().optional(),
 	dateTimeFormat: EnumSensorDateTimeFormatSchema.optional(),
-	entityCategory: _enum(["config", "diagnostic"]).optional()
+	entityCategory: _enum(["config", "diagnostic"]).optional(),
+	meterEntities: object({
+		watts: string().optional(),
+		kwhTotal: string().optional(),
+		volts: string().optional(),
+		amps: string().optional()
+	}).optional(),
+	foldedInto: string().optional()
 });
 function parseContainerEntities(raw) {
 	const result = array(containerEntitySchema).safeParse(raw);
@@ -3711,6 +3871,9 @@ function parseContainerEntities(raw) {
 * skipped (the adoption path skips them too).
 */
 function buildContainerEntities(haDevice) {
+	return foldMeterEntities(mapContainerEntities(haDevice));
+}
+function mapContainerEntities(haDevice) {
 	const out = [];
 	for (const ent of haDevice.entities) {
 		if (ent.mappedTo === null) continue;
@@ -3741,7 +3904,8 @@ function derivedKey(e) {
 		deviceClass: e.deviceClass ?? null,
 		options: e.options ?? null,
 		features: e.features ?? null,
-		dateTimeFormat: e.dateTimeFormat ?? null
+		dateTimeFormat: e.dateTimeFormat ?? null,
+		meterEntities: e.meterEntities ?? null
 	});
 }
 /** Stable key over the FULL entry incl. name + entityId + the layout-affecting
@@ -3754,6 +3918,7 @@ function fullKey(e) {
 		entityId: e.entityId,
 		name: e.name ?? null,
 		entityCategory: e.entityCategory ?? null,
+		foldedInto: e.foldedInto ?? null,
 		derived: derivedKey(e)
 	});
 }
@@ -3765,6 +3930,7 @@ function childConfigPatch(e) {
 		...e.options !== void 0 ? { options: e.options } : {},
 		...e.features !== void 0 ? { features: e.features } : {},
 		...e.dateTimeFormat !== void 0 ? { dateTimeFormat: e.dateTimeFormat } : {},
+		...e.meterEntities !== void 0 ? { meterEntities: e.meterEntities } : {},
 		...e.role !== void 0 ? { role: e.role } : {}
 	};
 }
@@ -3818,7 +3984,7 @@ var SECTION_RANK = {
 *  normal control). */
 function sectionForEntity(e) {
 	if (e.entityCategory === "config") return SECTION_CONFIGURATION;
-	if (e.entityCategory === "diagnostic") return SECTION_DIAGNOSTIC;
+	if (e.entityCategory === "diagnostic" || e.foldedInto !== void 0) return SECTION_DIAGNOSTIC;
 	return SECTION_CONTROLS;
 }
 /**
@@ -3871,7 +4037,16 @@ var haEntitySchema = object({
 	dateTimeFormat: EnumSensorDateTimeFormatSchema.optional(),
 	/** HA `entity_category` — `config` / `diagnostic` / absent (a normal
 	*  control). Drives the accordion section the child renders in. */
-	entityCategory: _enum(["config", "diagnostic"]).optional()
+	entityCategory: _enum(["config", "diagnostic"]).optional(),
+	/** Sibling meter sensors this entity reads as its own power-meter (D951). */
+	meterEntities: object({
+		watts: string().optional(),
+		kwhTotal: string().optional(),
+		volts: string().optional(),
+		amps: string().optional()
+	}).optional(),
+	/** Set on a meter sensor folded into another entity: sectioned as Diagnostic. */
+	foldedInto: string().optional()
 });
 var haContainerSchema = object({
 	system: literal("homeassistant"),
@@ -4186,6 +4361,7 @@ var HaContainerDevice = class HaContainerDevice extends BaseDevice {
 				...e.options !== void 0 ? { options: e.options } : {},
 				...e.features !== void 0 ? { features: e.features } : {},
 				...e.dateTimeFormat !== void 0 ? { dateTimeFormat: e.dateTimeFormat } : {},
+				...e.meterEntities !== void 0 ? { meterEntities: e.meterEntities } : {},
 				...e.role !== void 0 ? { role: e.role } : {}
 			};
 			const factory = (childCtx) => {