@camstack/addon-provider-homeassistant 1.2.631 → 1.2.633

package/CHANGELOG.md

@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.2.633] - 2026-10-27
+
+### Changed
+
+- Shown as "Home Assistant" (was "Home Assistant Provider").
+
+## [1.2.632] - 2026-10-27
+
 ### Added
 
-- Package README and changelog, included in the published files list.
+- Home Assistant: Home Assistant device provider addon for CamStack.
+- Provides the addons Home Assistant, Home Assistant Export.

package/README.md

@@ -1,22 +1,42 @@
-# @camstack/addon-provider-homeassistant
+# Home Assistant
 
-Home Assistant device provider addon for CamStack
+Home Assistant device provider addon for CamStack. Device provider (import) + native entity export (push). Two addons, one bundle, separate processes.
 
-## What it does
+<!-- readme:generated:start (derived from the manifest; edit outside this block) -->
 
-- **Home Assistant Provider** (`provider-homeassistant`): Adopt Home Assistant devices into CamStack via WebSocket
-  - Node placement: `hub-only`.
+Package `@camstack/addon-provider-homeassistant` on npm.
+
+## What it provides
+
+- **Home Assistant** (`provider-homeassistant`): Adopt Home Assistant devices into CamStack via WebSocket. Category: messaging.
   - Capabilities: `broker`, `device-adoption`, `vacuum-control`, `lawn-mower-control`, `running-state`, `valve`, `humidifier`, `water-heater`, `weather`, `image`, `update`, `notification-output`, `addon-routes`, `calendar-source`.
-- **Home Assistant Export** (`homeassistant-export`): Pushes CamStack entities to the CamStack Home Assistant custom component over HTTP. Chooses which devices reach which Home Assistant instance; Home Assistant never polls the hub for a value.
-  - Node placement: `hub-only`.
+- **Home Assistant Export** (`homeassistant-export`): Pushes CamStack entities to the CamStack Home Assistant custom component over HTTP. Chooses which devices reach which Home Assistant instance; Home Assistant never polls the hub for a value. Category: exports.
   - Capabilities: `device-export`, `addon-routes`, `oauth-integration`.
 
-## Settings
+## Configuration
+
+Edit these from System, Addons, this addon, Settings (a device's own settings are on its device page). A password field is stored in the keychain.
+
+**Addon settings**
 
-Settings this addon exposes are edited from System → Addons → this addon → Settings when they apply to the whole cluster, and from the device page when they belong to one device. A password field is stored in the keychain.
+- Calendars to import: Calendars
+- Home Assistant broker: Brokers are managed separately
+- Home Assistant connection: Auth mode, HA base URL, Long-lived access token, Supervisor token
+- Home Assistant instances: No brokers
+- Connection: Hub URL Home Assistant can reach
+- Advanced: Reconcile interval (s)
 
 ## Requirements
 
-- Peer packages already on the node: `@camstack/types`.
-- A CamStack hub. An agent is used only when the placement above allows it.
+- Placement: hub-only.
+- A CamStack hub. An agent is used only where the placement above allows it.
+
+## Documentation
+
+- [docs/addons/addon-provider-homeassistant.md](https://github.com/camstack/server/blob/main/docs/addons/addon-provider-homeassistant.md)
+- [docs/architecture/device-model.md](https://github.com/camstack/server/blob/main/docs/architecture/device-model.md)
+- [packages/addon-provider-homeassistant/AGENTS.md](https://github.com/camstack/server/blob/main/packages/addon-provider-homeassistant/AGENTS.md)
+
+See [CHANGELOG.md](./CHANGELOG.md) for what changed in each version.
 
+<!-- readme:generated:end -->

package/dist/addon.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_dist = require("./dist-DV8KQcWd.js");
+const require_dist = require("./dist-DVkAN1CW.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-CdqN_VJZ.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-BVojc0hA.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) => {

package/dist/{dist-CdqN_VJZ.mjs → dist-BVojc0hA.mjs}

@@ -17613,7 +17613,22 @@ var BrokerProviderInfoSchema = object({
 		*/
 		interactiveConnectPath: string().min(1).optional(),
 		/** Relative hub path to disconnect the linked account (same popup pattern). */
-		interactiveDisconnectPath: string().min(1).optional()
+		interactiveDisconnectPath: string().min(1).optional(),
+		/**
+		* The kind signs in through a server-held interactive session instead of
+		* (or before) typed credentials. `basePath` is a hub-relative route set
+		* served by the owning addon (`/addon/<id>/...`) speaking the sign-in
+		* contract: `POST {basePath}/start` (body: the form's settings) answers
+		* `{ sessionId, loginUrl }`; `GET {basePath}/status?sessionId=` answers
+		* `{ phase: 'starting' | 'awaiting-login' | 'captured' | 'error' |
+		* 'cancelled', loginUrl, error }`; `POST {basePath}/commit`
+		* (`{ sessionId, name, brokerId? }`) stores the credentials on a new or
+		* existing broker and answers `{ brokerId }`; `POST {basePath}/cancel`
+		* (`{ sessionId }`) drops the session. The dialog that edits a broker
+		* offers it as the default path; the fields the session fills are
+		* marked `filledBySignIn` in the kind's settings schema.
+		*/
+		signIn: object({ basePath: string().min(1) }).optional()
 	}))
 });
 var ListInputSchema = object({ 
@@ -44857,7 +44872,7 @@ var NetworkAccessStatusSchema = object({
 });
 /**
 * Optional, richer endpoint shape returned by providers that expose
-* MORE than one ingress concurrently (Tailscale Ingress with mixed
+* MORE than one ingress concurrently (Tailscale Funnel with mixed
 * serve+funnel rules, future ngrok multi-tunnel, …). Each entry carries
 * the originating provider config (mode + sourcePort) so the
 * orchestrator UI can label rows distinctly. Providers that expose only
@@ -58387,7 +58402,8 @@ var BATTERY_DEVICE_TYPES = [
 	DeviceType.Switch,
 	DeviceType.PetFeeder,
 	DeviceType.Container,
-	DeviceType.Thermostat
+	DeviceType.Thermostat,
+	DeviceType.EventEmitter
 ];
 /** Generic Customize target for the percentage reading (D936). */
 var batteryCustomize = {
@@ -65272,9 +65288,9 @@ var PowerMeterStatusSchema = object({
 	/** Cumulative energy in kilowatt-hours since the meter was reset. */
 	kwhTotal: number().optional().meta(readingMeta("energy", { label: "Energy" })),
 	/** Voltage in volts. */
-	volts: number().optional().meta(readingMeta("voltage")),
+	volts: number().optional().meta(readingMeta("voltage", { label: "Voltage" })),
 	/** Current in amperes. */
-	amps: number().optional().meta(readingMeta("current")),
+	amps: number().optional().meta(readingMeta("current", { label: "Current" })),
 	/** Apparent power in volt-amperes. */
 	va: number().optional().meta(readingMeta("apparent-power")),
 	/** Power factor (0..1) if reported. */
@@ -65282,17 +65298,74 @@ var PowerMeterStatusSchema = object({
 	/** Ms epoch when the slice was last updated. */
 	lastFetchedAt: number()
 });
+/**
+* Loads that draw metered mains power (D951). The reading is a feature of the
+* device itself — a plug, a lamp, a fan, an air conditioner, a boiler, a
+* vacuum dock — not a separate sensor beside it. A `Sensor` stays: a clamp
+* meter or a standalone energy monitor IS the device. Cover, lock, valve,
+* camera and the like are left out: their draw is not what anyone meters.
+*/
+var POWER_METER_DEVICE_TYPES = [
+	DeviceType.Sensor,
+	DeviceType.Switch,
+	DeviceType.Light,
+	DeviceType.Fan,
+	DeviceType.Climate,
+	DeviceType.Thermostat,
+	DeviceType.Humidifier,
+	DeviceType.WaterHeater,
+	DeviceType.MediaPlayer,
+	DeviceType.Washer,
+	DeviceType.Dryer,
+	DeviceType.Dishwasher,
+	DeviceType.Vacuum,
+	DeviceType.LawnMower,
+	DeviceType.PetFeeder
+];
+/** Everything but a bare `Sensor`: a sensor that takes its reading from another sensor adds nothing. */
+var POWER_METER_CUSTOMIZE_DEVICE_TYPES = POWER_METER_DEVICE_TYPES.filter((type) => type !== DeviceType.Sensor);
+/** One scalar target per reading; each is sourced from a device of its own (D951). */
+function powerTarget(id, unit) {
+	return {
+		id,
+		cardinality: "scalar",
+		vocabulary: {
+			cap: "power-meter",
+			stateField: id
+		},
+		deviceTypes: POWER_METER_CUSTOMIZE_DEVICE_TYPES,
+		apply: "add",
+		path: id,
+		sources: [{
+			kind: "numeric",
+			requiredUnit: unit,
+			transforms: [{ kind: "identity" }]
+		}],
+		companions: [{
+			kind: "clock",
+			path: "lastFetchedAt",
+			when: "always"
+		}],
+		sourceReport: { status: "assignment-status" },
+		advancedExpression: true
+	};
+}
+/** "Power and energy" extension: watts, energy, voltage and current from other devices (D951). */
+var powerMeterCustomize = {
+	version: 1,
+	targets: [
+		powerTarget("watts", "W"),
+		powerTarget("kwhTotal", "kWh"),
+		powerTarget("volts", "V"),
+		powerTarget("amps", "A")
+	]
+};
 var powerMeterCapability = {
 	name: "power-meter",
 	scope: "device",
 	deviceNative: true,
 	mode: "singleton",
-	deviceTypes: [
-		DeviceType.Sensor,
-		DeviceType.Washer,
-		DeviceType.Dryer,
-		DeviceType.Dishwasher
-	],
+	deviceTypes: POWER_METER_DEVICE_TYPES,
 	methods: {},
 	status: {
 		schema: PowerMeterStatusSchema,
@@ -65349,7 +65422,8 @@ var powerMeterCapability = {
 	} },
 	/** Clock fields: written, but excluded from the compare that decides
 	*  whether persisting is worth a SQLite commit. */
-	volatileStateFields: ["lastFetchedAt"]
+	volatileStateFields: ["lastFetchedAt"],
+	customize: powerMeterCustomize
 };
 /**
 * Presence cap. Models HA `person.*` and `device_tracker.*` entities
@@ -71180,7 +71254,7 @@ function tryConvertDelta(value, from, to) {
 	return shifted - origin;
 }
 SOURCE_CAPS.filter((cap) => cap !== "switch" && cap !== "motion");
-DeviceType.Camera, DeviceType.Sensor, DeviceType.Button, DeviceType.Switch, DeviceType.PetFeeder, DeviceType.Container, DeviceType.Thermostat, DeviceType.Camera, DeviceType.Hub, DeviceType.Light, DeviceType.Siren, DeviceType.Switch, DeviceType.Sensor, DeviceType.Thermostat, DeviceType.Climate, DeviceType.Button, DeviceType.EventEmitter, DeviceType.Update, DeviceType.Generic, DeviceType.Notifier, DeviceType.Script, DeviceType.Automation, DeviceType.Lock, DeviceType.Cover, DeviceType.Valve, DeviceType.Humidifier, DeviceType.WaterHeater, DeviceType.Fan, DeviceType.MediaPlayer, DeviceType.AlarmPanel, DeviceType.Control, DeviceType.Presence, DeviceType.Weather, DeviceType.Vacuum, DeviceType.LawnMower, DeviceType.Container, DeviceType.Image, DeviceType.PetFeeder, DeviceType.Dishwasher, DeviceType.Washer, DeviceType.Dryer, DeviceType.Camera, DeviceType.Camera, DeviceType.Washer, DeviceType.Dryer, DeviceType.Dishwasher, DeviceType.Vacuum, DeviceType.LawnMower, DeviceType.MediaPlayer, DeviceType.WaterHeater, DeviceType.Humidifier, DeviceType.Fan, DeviceType.Climate, DeviceType.Thermostat, DeviceType.PetFeeder;
+DeviceType.Camera, DeviceType.Sensor, DeviceType.Button, DeviceType.Switch, DeviceType.PetFeeder, DeviceType.Container, DeviceType.Thermostat, DeviceType.EventEmitter, DeviceType.Camera, DeviceType.Hub, DeviceType.Light, DeviceType.Siren, DeviceType.Switch, DeviceType.Sensor, DeviceType.Thermostat, DeviceType.Climate, DeviceType.Button, DeviceType.EventEmitter, DeviceType.Update, DeviceType.Generic, DeviceType.Notifier, DeviceType.Script, DeviceType.Automation, DeviceType.Lock, DeviceType.Cover, DeviceType.Valve, DeviceType.Humidifier, DeviceType.WaterHeater, DeviceType.Fan, DeviceType.MediaPlayer, DeviceType.AlarmPanel, DeviceType.Control, DeviceType.Presence, DeviceType.Weather, DeviceType.Vacuum, DeviceType.LawnMower, DeviceType.Container, DeviceType.Image, DeviceType.PetFeeder, DeviceType.Dishwasher, DeviceType.Washer, DeviceType.Dryer, DeviceType.Camera, DeviceType.Camera, DeviceType.Switch, DeviceType.Light, DeviceType.Fan, DeviceType.Climate, DeviceType.Thermostat, DeviceType.Humidifier, DeviceType.WaterHeater, DeviceType.MediaPlayer, DeviceType.Washer, DeviceType.Dryer, DeviceType.Dishwasher, DeviceType.Vacuum, DeviceType.LawnMower, DeviceType.PetFeeder, DeviceType.Switch, DeviceType.Light, DeviceType.Fan, DeviceType.Climate, DeviceType.Thermostat, DeviceType.Humidifier, DeviceType.WaterHeater, DeviceType.MediaPlayer, DeviceType.Washer, DeviceType.Dryer, DeviceType.Dishwasher, DeviceType.Vacuum, DeviceType.LawnMower, DeviceType.PetFeeder, DeviceType.Switch, DeviceType.Light, DeviceType.Fan, DeviceType.Climate, DeviceType.Thermostat, DeviceType.Humidifier, DeviceType.WaterHeater, DeviceType.MediaPlayer, DeviceType.Washer, DeviceType.Dryer, DeviceType.Dishwasher, DeviceType.Vacuum, DeviceType.LawnMower, DeviceType.PetFeeder, DeviceType.Switch, DeviceType.Light, DeviceType.Fan, DeviceType.Climate, DeviceType.Thermostat, DeviceType.Humidifier, DeviceType.WaterHeater, DeviceType.MediaPlayer, DeviceType.Washer, DeviceType.Dryer, DeviceType.Dishwasher, DeviceType.Vacuum, DeviceType.LawnMower, DeviceType.PetFeeder, DeviceType.Washer, DeviceType.Dryer, DeviceType.Dishwasher, DeviceType.Vacuum, DeviceType.LawnMower, DeviceType.MediaPlayer, DeviceType.WaterHeater, DeviceType.Humidifier, DeviceType.Fan, DeviceType.Climate, DeviceType.Thermostat, DeviceType.PetFeeder;
 String.raw`rose\(active(\d+), changed(\d+), (\d+(?:\.\d+)?)\)`;
 DeviceRole.BinarySensor, DeviceRole.MotionSensor;
 new Set(CAP_NAMES);

package/dist/{dist-DV8KQcWd.js → dist-DVkAN1CW.js}

@@ -17614,7 +17614,22 @@ var BrokerProviderInfoSchema = object({
 		*/
 		interactiveConnectPath: string().min(1).optional(),
 		/** Relative hub path to disconnect the linked account (same popup pattern). */
-		interactiveDisconnectPath: string().min(1).optional()
+		interactiveDisconnectPath: string().min(1).optional(),
+		/**
+		* The kind signs in through a server-held interactive session instead of
+		* (or before) typed credentials. `basePath` is a hub-relative route set
+		* served by the owning addon (`/addon/<id>/...`) speaking the sign-in
+		* contract: `POST {basePath}/start` (body: the form's settings) answers
+		* `{ sessionId, loginUrl }`; `GET {basePath}/status?sessionId=` answers
+		* `{ phase: 'starting' | 'awaiting-login' | 'captured' | 'error' |
+		* 'cancelled', loginUrl, error }`; `POST {basePath}/commit`
+		* (`{ sessionId, name, brokerId? }`) stores the credentials on a new or
+		* existing broker and answers `{ brokerId }`; `POST {basePath}/cancel`
+		* (`{ sessionId }`) drops the session. The dialog that edits a broker
+		* offers it as the default path; the fields the session fills are
+		* marked `filledBySignIn` in the kind's settings schema.
+		*/
+		signIn: object({ basePath: string().min(1) }).optional()
 	}))
 });
 var ListInputSchema = object({ 
@@ -44858,7 +44873,7 @@ var NetworkAccessStatusSchema = object({
 });
 /**
 * Optional, richer endpoint shape returned by providers that expose
-* MORE than one ingress concurrently (Tailscale Ingress with mixed
+* MORE than one ingress concurrently (Tailscale Funnel with mixed
 * serve+funnel rules, future ngrok multi-tunnel, …). Each entry carries
 * the originating provider config (mode + sourcePort) so the
 * orchestrator UI can label rows distinctly. Providers that expose only
@@ -58388,7 +58403,8 @@ var BATTERY_DEVICE_TYPES = [
 	DeviceType.Switch,
 	DeviceType.PetFeeder,
 	DeviceType.Container,
-	DeviceType.Thermostat
+	DeviceType.Thermostat,
+	DeviceType.EventEmitter
 ];
 /** Generic Customize target for the percentage reading (D936). */
 var batteryCustomize = {
@@ -65273,9 +65289,9 @@ var PowerMeterStatusSchema = object({
 	/** Cumulative energy in kilowatt-hours since the meter was reset. */
 	kwhTotal: number().optional().meta(readingMeta("energy", { label: "Energy" })),
 	/** Voltage in volts. */
-	volts: number().optional().meta(readingMeta("voltage")),
+	volts: number().optional().meta(readingMeta("voltage", { label: "Voltage" })),
 	/** Current in amperes. */
-	amps: number().optional().meta(readingMeta("current")),
+	amps: number().optional().meta(readingMeta("current", { label: "Current" })),
 	/** Apparent power in volt-amperes. */
 	va: number().optional().meta(readingMeta("apparent-power")),
 	/** Power factor (0..1) if reported. */
@@ -65283,17 +65299,74 @@ var PowerMeterStatusSchema = object({
 	/** Ms epoch when the slice was last updated. */
 	lastFetchedAt: number()
 });
+/**
+* Loads that draw metered mains power (D951). The reading is a feature of the
+* device itself — a plug, a lamp, a fan, an air conditioner, a boiler, a
+* vacuum dock — not a separate sensor beside it. A `Sensor` stays: a clamp
+* meter or a standalone energy monitor IS the device. Cover, lock, valve,
+* camera and the like are left out: their draw is not what anyone meters.
+*/
+var POWER_METER_DEVICE_TYPES = [
+	DeviceType.Sensor,
+	DeviceType.Switch,
+	DeviceType.Light,
+	DeviceType.Fan,
+	DeviceType.Climate,
+	DeviceType.Thermostat,
+	DeviceType.Humidifier,
+	DeviceType.WaterHeater,
+	DeviceType.MediaPlayer,
+	DeviceType.Washer,
+	DeviceType.Dryer,
+	DeviceType.Dishwasher,
+	DeviceType.Vacuum,
+	DeviceType.LawnMower,
+	DeviceType.PetFeeder
+];
+/** Everything but a bare `Sensor`: a sensor that takes its reading from another sensor adds nothing. */
+var POWER_METER_CUSTOMIZE_DEVICE_TYPES = POWER_METER_DEVICE_TYPES.filter((type) => type !== DeviceType.Sensor);
+/** One scalar target per reading; each is sourced from a device of its own (D951). */
+function powerTarget(id, unit) {
+	return {
+		id,
+		cardinality: "scalar",
+		vocabulary: {
+			cap: "power-meter",
+			stateField: id
+		},
+		deviceTypes: POWER_METER_CUSTOMIZE_DEVICE_TYPES,
+		apply: "add",
+		path: id,
+		sources: [{
+			kind: "numeric",
+			requiredUnit: unit,
+			transforms: [{ kind: "identity" }]
+		}],
+		companions: [{
+			kind: "clock",
+			path: "lastFetchedAt",
+			when: "always"
+		}],
+		sourceReport: { status: "assignment-status" },
+		advancedExpression: true
+	};
+}
+/** "Power and energy" extension: watts, energy, voltage and current from other devices (D951). */
+var powerMeterCustomize = {
+	version: 1,
+	targets: [
+		powerTarget("watts", "W"),
+		powerTarget("kwhTotal", "kWh"),
+		powerTarget("volts", "V"),
+		powerTarget("amps", "A")
+	]
+};
 var powerMeterCapability = {
 	name: "power-meter",
 	scope: "device",
 	deviceNative: true,
 	mode: "singleton",
-	deviceTypes: [
-		DeviceType.Sensor,
-		DeviceType.Washer,
-		DeviceType.Dryer,
-		DeviceType.Dishwasher
-	],
+	deviceTypes: POWER_METER_DEVICE_TYPES,
 	methods: {},
 	status: {
 		schema: PowerMeterStatusSchema,
@@ -65350,7 +65423,8 @@ var powerMeterCapability = {
 	} },
 	/** Clock fields: written, but excluded from the compare that decides
 	*  whether persisting is worth a SQLite commit. */
-	volatileStateFields: ["lastFetchedAt"]
+	volatileStateFields: ["lastFetchedAt"],
+	customize: powerMeterCustomize
 };
 /**
 * Presence cap. Models HA `person.*` and `device_tracker.*` entities
@@ -71181,7 +71255,7 @@ function tryConvertDelta(value, from, to) {
 	return shifted - origin;
 }
 SOURCE_CAPS.filter((cap) => cap !== "switch" && cap !== "motion");
-DeviceType.Camera, DeviceType.Sensor, DeviceType.Button, DeviceType.Switch, DeviceType.PetFeeder, DeviceType.Container, DeviceType.Thermostat, DeviceType.Camera, DeviceType.Hub, DeviceType.Light, DeviceType.Siren, DeviceType.Switch, DeviceType.Sensor, DeviceType.Thermostat, DeviceType.Climate, DeviceType.Button, DeviceType.EventEmitter, DeviceType.Update, DeviceType.Generic, DeviceType.Notifier, DeviceType.Script, DeviceType.Automation, DeviceType.Lock, DeviceType.Cover, DeviceType.Valve, DeviceType.Humidifier, DeviceType.WaterHeater, DeviceType.Fan, DeviceType.MediaPlayer, DeviceType.AlarmPanel, DeviceType.Control, DeviceType.Presence, DeviceType.Weather, DeviceType.Vacuum, DeviceType.LawnMower, DeviceType.Container, DeviceType.Image, DeviceType.PetFeeder, DeviceType.Dishwasher, DeviceType.Washer, DeviceType.Dryer, DeviceType.Camera, DeviceType.Camera, DeviceType.Washer, DeviceType.Dryer, DeviceType.Dishwasher, DeviceType.Vacuum, DeviceType.LawnMower, DeviceType.MediaPlayer, DeviceType.WaterHeater, DeviceType.Humidifier, DeviceType.Fan, DeviceType.Climate, DeviceType.Thermostat, DeviceType.PetFeeder;
+DeviceType.Camera, DeviceType.Sensor, DeviceType.Button, DeviceType.Switch, DeviceType.PetFeeder, DeviceType.Container, DeviceType.Thermostat, DeviceType.EventEmitter, DeviceType.Camera, DeviceType.Hub, DeviceType.Light, DeviceType.Siren, DeviceType.Switch, DeviceType.Sensor, DeviceType.Thermostat, DeviceType.Climate, DeviceType.Button, DeviceType.EventEmitter, DeviceType.Update, DeviceType.Generic, DeviceType.Notifier, DeviceType.Script, DeviceType.Automation, DeviceType.Lock, DeviceType.Cover, DeviceType.Valve, DeviceType.Humidifier, DeviceType.WaterHeater, DeviceType.Fan, DeviceType.MediaPlayer, DeviceType.AlarmPanel, DeviceType.Control, DeviceType.Presence, DeviceType.Weather, DeviceType.Vacuum, DeviceType.LawnMower, DeviceType.Container, DeviceType.Image, DeviceType.PetFeeder, DeviceType.Dishwasher, DeviceType.Washer, DeviceType.Dryer, DeviceType.Camera, DeviceType.Camera, DeviceType.Switch, DeviceType.Light, DeviceType.Fan, DeviceType.Climate, DeviceType.Thermostat, DeviceType.Humidifier, DeviceType.WaterHeater, DeviceType.MediaPlayer, DeviceType.Washer, DeviceType.Dryer, DeviceType.Dishwasher, DeviceType.Vacuum, DeviceType.LawnMower, DeviceType.PetFeeder, DeviceType.Switch, DeviceType.Light, DeviceType.Fan, DeviceType.Climate, DeviceType.Thermostat, DeviceType.Humidifier, DeviceType.WaterHeater, DeviceType.MediaPlayer, DeviceType.Washer, DeviceType.Dryer, DeviceType.Dishwasher, DeviceType.Vacuum, DeviceType.LawnMower, DeviceType.PetFeeder, DeviceType.Switch, DeviceType.Light, DeviceType.Fan, DeviceType.Climate, DeviceType.Thermostat, DeviceType.Humidifier, DeviceType.WaterHeater, DeviceType.MediaPlayer, DeviceType.Washer, DeviceType.Dryer, DeviceType.Dishwasher, DeviceType.Vacuum, DeviceType.LawnMower, DeviceType.PetFeeder, DeviceType.Switch, DeviceType.Light, DeviceType.Fan, DeviceType.Climate, DeviceType.Thermostat, DeviceType.Humidifier, DeviceType.WaterHeater, DeviceType.MediaPlayer, DeviceType.Washer, DeviceType.Dryer, DeviceType.Dishwasher, DeviceType.Vacuum, DeviceType.LawnMower, DeviceType.PetFeeder, DeviceType.Washer, DeviceType.Dryer, DeviceType.Dishwasher, DeviceType.Vacuum, DeviceType.LawnMower, DeviceType.MediaPlayer, DeviceType.WaterHeater, DeviceType.Humidifier, DeviceType.Fan, DeviceType.Climate, DeviceType.Thermostat, DeviceType.PetFeeder;
 String.raw`rose\(active(\d+), changed(\d+), (\d+(?:\.\d+)?)\)`;
 DeviceRole.BinarySensor, DeviceRole.MotionSensor;
 new Set(CAP_NAMES);

package/dist/ha-export/ha-export.addon.js

@@ -24,7 +24,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	enumerable: true
 }) : target, mod));
 //#endregion
-const require_dist = require("../dist-DV8KQcWd.js");
+const require_dist = require("../dist-DVkAN1CW.js");
 let node_crypto = require("node:crypto");
 require("node:zlib");
 let node_fs = require("node:fs");

package/dist/ha-export/ha-export.addon.mjs

@@ -1,4 +1,4 @@
-import { Ft as BaseAddon, Gt as array, Ht as isReadingQuantity, I as consumableFormOf, L as consumableKindOf, Lt as baseUnitOf, O as buildAddonRouteProvider, Qt as string, U as deviceExportCapability, Ut as nodePin, Xt as object, a as COCO_TO_MACRO, c as ConsumableItemSchema, d as FanDirectionSchema, en as unknown, f as HvacModeSchema, i as CAMERA_SWITCH_ORDER, l as ConsumableStatusSchema, m as PLUG_APPLIANCE_TYPES, nn as EventCategory, o as CameraSwitchIdSchema, p as MediaPlayerRepeatSchema, s as ConsumableFormSchema, st as oauthIntegrationCapability, t as AlarmArmModeSchema, v as addonRoutesCapability } from "../dist-CdqN_VJZ.mjs";
+import { Ft as BaseAddon, Gt as array, Ht as isReadingQuantity, I as consumableFormOf, L as consumableKindOf, Lt as baseUnitOf, O as buildAddonRouteProvider, Qt as string, U as deviceExportCapability, Ut as nodePin, Xt as object, a as COCO_TO_MACRO, c as ConsumableItemSchema, d as FanDirectionSchema, en as unknown, f as HvacModeSchema, i as CAMERA_SWITCH_ORDER, l as ConsumableStatusSchema, m as PLUG_APPLIANCE_TYPES, nn as EventCategory, o as CameraSwitchIdSchema, p as MediaPlayerRepeatSchema, s as ConsumableFormSchema, st as oauthIntegrationCapability, t as AlarmArmModeSchema, v as addonRoutesCapability } from "../dist-BVojc0hA.mjs";
 import { createHmac, timingSafeEqual } from "node:crypto";
 import "node:zlib";
 import "node:fs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-provider-homeassistant",
-  "version": "1.2.631",
+  "version": "1.2.633",
   "description": "Home Assistant device provider addon for CamStack",
   "keywords": [
     "camstack",
@@ -39,7 +39,7 @@
       {
         "id": "provider-homeassistant",
         "category": "messaging",
-        "name": "Home Assistant Provider",
+        "name": "Home Assistant",
         "version": "0.1.0",
         "description": "Adopt Home Assistant devices into CamStack via WebSocket",
         "entry": "./dist/addon.js",