@camstack/addon-provider-homeassistant 1.2.155 → 1.2.157

package/dist/addon.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_dist = require("./dist-CERTsNmo.js");
+const require_dist = require("./dist-M6hP_tw3.js");
 let node_crypto = require("node:crypto");
 let node_zlib = require("node:zlib");
 //#region src/ha-admin-link.ts
@@ -730,12 +730,16 @@ var HaSwitchDevice = class extends HaBaseChildDevice {
 	constructor(ctx) {
 		super(ctx);
 		this.registerSwitchCap();
+		const stored = this.runtimeState.getCapState("switch");
+		const seededOn = typeof stored?.on === "boolean" ? stored.on : false;
+		const seededChangedAt = typeof stored?.lastChangedAt === "number" && Number.isFinite(stored.lastChangedAt) && stored.lastChangedAt > 0 ? stored.lastChangedAt : 0;
 		this.runtimeState.setCapState("switch", {
-			on: false,
-			lastChangedAt: 0
+			on: seededOn,
+			lastChangedAt: seededChangedAt
 		});
 	}
 	handleStatePush(state) {
+		if (state.state === "unavailable" || state.state === "unknown") return;
 		const on = state.state === "on";
 		const lastChangedAt = Date.parse(state.last_changed) || Date.now();
 		const previous = this.runtimeState.getCapState("switch");
@@ -5138,7 +5142,7 @@ var HaIntegrationManager = class HaIntegrationManager {
 			service: target.service
 		};
 		const targetEnvelope = {};
-		if (target.entityId) targetEnvelope["entity_id"] = target.entityId;
+		if (target.entityId !== void 0) targetEnvelope["entity_id"] = Array.isArray(target.entityId) ? [...target.entityId] : target.entityId;
 		if (target.areaId) targetEnvelope["area_id"] = target.areaId;
 		if (target.deviceId) targetEnvelope["device_id"] = target.deviceId;
 		if (Object.keys(targetEnvelope).length > 0) message["target"] = targetEnvelope;
@@ -6041,6 +6045,12 @@ function mapImage(_attributes) {
 		capabilities: ["image"]
 	};
 }
+/** True when HA `unit_of_measurement` clearly means temperature (°C / °F). */
+function isTemperatureUnit(unit) {
+	if (typeof unit !== "string") return false;
+	const n = unit.trim().toLowerCase().replace(/\s+/g, "");
+	return n === "°c" || n === "°f" || n === "℃" || n === "℉" || n === "c" || n === "f" || n === "celsius" || n === "fahrenheit";
+}
 function mapNumericSensor(deviceClass, _attributes) {
 	switch (deviceClass) {
 		case "temperature": return {
@@ -6136,11 +6146,17 @@ function mapNumericSensor(deviceClass, _attributes) {
 			capabilities: ["enum-sensor"],
 			dateTimeFormat: "date"
 		};
-		case null: return {
-			deviceType: require_dist.DeviceType.Sensor,
-			role: require_dist.DeviceRole.EnumSensor,
-			capabilities: ["enum-sensor"]
-		};
+		case null:
+			if (isTemperatureUnit(_attributes["unit_of_measurement"])) return {
+				deviceType: require_dist.DeviceType.Sensor,
+				role: require_dist.DeviceRole.TemperatureSensor,
+				capabilities: ["temperature-sensor"]
+			};
+			return {
+				deviceType: require_dist.DeviceType.Sensor,
+				role: require_dist.DeviceRole.EnumSensor,
+				capabilities: ["enum-sensor"]
+			};
 		default: return {
 			deviceType: require_dist.DeviceType.Sensor,
 			role: require_dist.DeviceRole.NumericSensor,
@@ -6445,6 +6461,122 @@ function buildDiscoveryCandidates(input) {
 	return candidates;
 }
 //#endregion
+//#region src/ha-discovery-types.ts
+/**
+* HA-specific discovery data types — addon-internal.
+*
+* These shapes were formerly the `ha-discovery` cap's data schemas.
+* That cap was removed in favour of the generic `device-adoption`
+* cap, so these types are no longer a public cap surface — they live
+* here as the HA addon's own discovery model. The `HaDiscoveryService`
+* produces them and `haDeviceToCandidate` adapts an `HaDiscoveredDevice`
+* onto the shared `DiscoveredChildDevice` the `device-adoption` cap
+* surfaces.
+*/
+/**
+* Synthetic `haDeviceId` bucket for `entity_registry` rows with
+* `device_id === null` (helpers, template sensors, `daily` statistics, …).
+* Flattened into the Entities adoption tab / standalone reconcile; never
+* shown as a Devices-tab candidate.
+*/
+var HA_ORPHAN_ENTITIES_DEVICE_ID = "__ha_orphan_entities__";
+var HaEntityMappingSchema = require_dist.object({
+	/** CamStack DeviceType for the accessory child. */
+	deviceType: require_dist._enum(require_dist.DeviceType),
+	/** Optional CamStack DeviceRole sub-role (e.g. `ContactSensor` for
+	*  a binary_sensor with `device_class: door`). */
+	role: require_dist._enum(require_dist.DeviceRole).nullable(),
+	/** Capability names the accessory child will register
+	*  (`switch` / `temperature-sensor` / …). UI may render the cap
+	*  badges to help the operator decide what to hide. */
+	capabilities: require_dist.array(require_dist.string()).readonly(),
+	/** Mapping-derived DeviceFeature flags (e.g. `lock-open`). Persisted onto
+	*  the child's `device.features` so the UI gates feature affordances. */
+	features: require_dist.array(require_dist.string()).readonly().optional(),
+	/** Locale-render shape for a `DateTimeSensor`-role enum sensor
+	*  (`device_class=timestamp` → `'datetime'`, `date` → `'date'`). Threaded
+	*  onto the child config so the enum-sensor device seeds it into the cap
+	*  slice. Absent for every non-DateTimeSensor mapping. */
+	dateTimeFormat: require_dist.EnumSensorDateTimeFormatSchema.optional()
+}).nullable();
+var HaDiscoveredEntitySchema = require_dist.object({
+	/** Fully-qualified HA entity id (`switch.kitchen`). */
+	entityId: require_dist.string(),
+	/** HA domain — first segment of entity_id (`switch` / `light` /
+	*  `sensor` / `binary_sensor` / `cover` / …). */
+	domain: require_dist.string(),
+	/** Operator-visible friendly name (HA `friendly_name` attribute or
+	*  the entity_id when missing). */
+	name: require_dist.string(),
+	/** Current state value (e.g. `'on'`, `'21.5'`, `'open'`). */
+	state: require_dist.string(),
+	/** HA `device_class` attribute when present — drives the role +
+	*  cap mapping for sensors / binary_sensors / covers. */
+	deviceClass: require_dist.string().nullable(),
+	/** HA `unit_of_measurement` attribute when present. */
+	unitOfMeasurement: require_dist.string().nullable(),
+	/** Area name for this entity — the entity's own HA area if set, else its
+	*  parent device's area. Null when neither is assigned. */
+	area: require_dist.string().nullable().default(null),
+	/** HA `options` attribute — present on `select` / `input_select` entities.
+	*  Captured at discovery so the adopt handler can persist them alongside
+	*  other entity config fields. Absent on non-select entities. */
+	options: require_dist.array(require_dist.string()).nullable().default(null),
+	/** HA `entity_category` — `config` / `diagnostic` / null (a normal control).
+	*  Drives the accordion section the adopted child renders in. Null/absent for
+	*  the common control case. */
+	entityCategory: require_dist._enum(["config", "diagnostic"]).nullable().default(null),
+	/** Pre-computed CamStack mapping. `null` when the entity's domain
+	*  has no supported mapping (the operator may still adopt the
+	*  parent — the entity will be skipped or surfaced as a fallback). */
+	mappedTo: HaEntityMappingSchema,
+	/** When `true`, the entity was already materialised as a CamStack
+	*  accessory child under a prior adoption — surfaced so the UI can
+	*  highlight existing wiring. */
+	alreadyAdopted: require_dist.boolean(),
+	/** When `alreadyAdopted === true`, the kernel-assigned accessory
+	*  child id. */
+	adoptedCamDeviceId: require_dist.number().int().nonnegative().nullable()
+});
+require_dist.object({
+	/** Stable HA `device_registry` id — survives renames + restarts. */
+	haDeviceId: require_dist.string(),
+	/** Operator-visible name (HA device `name` or first entity's
+	*  friendly_name when device has none). */
+	name: require_dist.string(),
+	/** Area name from HA `area_registry` join. Null when unassigned. */
+	area: require_dist.string().nullable(),
+	manufacturer: require_dist.string().nullable(),
+	model: require_dist.string().nullable(),
+	swVersion: require_dist.string().nullable(),
+	/** Dominant integration / platform domain for this device, derived from its
+	*  entities' HA `entity_registry.platform` (e.g. `dreame_vacuum`). Generic /
+	*  helper platforms (`unifi` / `hacs` / `hassio`) are excluded when a real
+	*  platform is available. Null when the device has no entities. */
+	integration: require_dist.string().nullable().default(null),
+	/** Convenience field — count of `entities[]`. */
+	entityCount: require_dist.number().int().nonnegative(),
+	/** Every entity HA's `entity_registry` links to this device. The
+	*  list survives row collapse — full devices are returned so
+	*  accordion expansion is a no-roundtrip render. */
+	entities: require_dist.array(HaDiscoveredEntitySchema).readonly(),
+	/** Whether this HA device has an active CamStack adoption. */
+	alreadyAdopted: require_dist.boolean(),
+	/** When `alreadyAdopted === true`, the kernel-assigned parent id. */
+	adoptedCamDeviceId: require_dist.number().int().nonnegative().nullable()
+});
+require_dist.object({
+	/** Last refresh timestamp (ms epoch) — null when never refreshed. */
+	lastDiscoveryAt: require_dist.number().int().nonnegative().nullable(),
+	/** Count of HA devices in the discovery cache (across all brokers). */
+	deviceCount: require_dist.number().int().nonnegative(),
+	/** Count of HA devices currently materialised as CamStack parent
+	*  devices. */
+	adoptedCount: require_dist.number().int().nonnegative(),
+	/** Last error message from a refresh attempt. */
+	lastError: require_dist.string().nullable()
+});
+//#endregion
 //#region src/ha-integration-domain.ts
 /**
 * Derive the dominant integration / platform domain for an HA device from
@@ -7047,6 +7179,11 @@ function createHaNotificationOutputProvider(deps) {
 			}
 			return out;
 		},
+		probeTargetConfig: async ({ kind }) => ({
+			ok: false,
+			resolvedUrl: "",
+			error: `Kind '${kind}' does not support credential probing`
+		}),
 		send: async ({ targetId, notification }) => {
 			const target = await store.getById(targetId);
 			if (!target) return {
@@ -7094,9 +7231,29 @@ function calendarName(state) {
 	if (typeof friendly === "string" && friendly.trim().length > 0) return friendly.trim();
 	return state.entity_id.replace(/^calendar\./, "").replace(/_/g, " ");
 }
+/** HA errors from `sendMessagePromise` are plain objects, not `Error`. */
+function formatHaError(err) {
+	if (err instanceof Error) return err.message;
+	if (typeof err === "string") return err;
+	if (typeof err === "object" && err !== null) {
+		const rec = err;
+		const message = rec["message"];
+		if (typeof message === "string" && message.length > 0) {
+			const code = rec["code"];
+			return typeof code === "string" || typeof code === "number" ? `${String(code)}: ${message}` : message;
+		}
+		try {
+			return JSON.stringify(err);
+		} catch {
+			return Object.prototype.toString.call(err);
+		}
+	}
+	return String(err);
+}
 function parseHaDate(value) {
 	if (typeof value !== "string" || value.length === 0) return null;
-	const ms = Date.parse(value.length === 10 ? `${value}T00:00:00` : value);
+	const normalised = value.length === 10 ? `${value}T00:00:00` : value.includes("T") ? value : value.replace(" ", "T");
+	const ms = Date.parse(normalised);
 	return Number.isFinite(ms) ? ms : null;
 }
 function isRecord(x) {
@@ -7107,17 +7264,17 @@ function asEntityState(raw) {
 	return parsed.success ? parsed.data : null;
 }
 /**
-* HA's `calendar.list_events` response shape (return_response):
-* `{ response: { [entity_id]: { events: [...] } } }` or a flat
-* `{ events: [...] }` depending on target width.
+* HA's `calendar.get_events` response shape (return_response):
+* `{ response: { [entity_id]: { events: [...] } } }` — also tolerates a
+* bare `{ [entity_id]: { events } }` or a legacy flat `{ events: [...] }`.
 */
 function extractEvents(result, entityId) {
 	if (!isRecord(result)) return [];
-	const response = result["response"];
+	const response = isRecord(result["response"]) ? result["response"] : result;
 	if (isRecord(response)) {
 		const forEntity = response[entityId];
 		if (isRecord(forEntity) && Array.isArray(forEntity["events"])) return forEntity["events"].filter(isRecord);
-		for (const value of Object.values(response)) if (isRecord(value) && Array.isArray(value["events"])) return value["events"].filter(isRecord);
+		if (entityId in response) return [];
 	}
 	if (Array.isArray(result["events"])) return result["events"].filter(isRecord);
 	return [];
@@ -7145,6 +7302,29 @@ function mapEvent(entityId, raw, index) {
 		...typeof location === "string" && location.length > 0 ? { location } : {}
 	};
 }
+/** One `get_events` call can target many calendars (HA keys the response). */
+async function fetchEventsForEntities(manager, entityIds, startIso, endIso) {
+	if (entityIds.length === 0) return [];
+	const target = {
+		domain: "calendar",
+		service: "get_events",
+		entityId: entityIds.length === 1 ? entityIds[0] : entityIds,
+		returnResponse: true
+	};
+	const result = await manager.publish(target, {
+		start_date_time: startIso,
+		end_date_time: endIso
+	});
+	const out = [];
+	for (const entityId of entityIds) {
+		const rawEvents = extractEvents(result, entityId);
+		for (let i = 0; i < rawEvents.length; i += 1) {
+			const mapped = mapEvent(entityId, rawEvents[i], i);
+			if (mapped !== null) out.push(mapped);
+		}
+	}
+	return out;
+}
 function createHaCalendarSource(deps) {
 	return {
 		listCalendars: async () => {
@@ -7173,26 +7353,15 @@ function createHaCalendarSource(deps) {
 			for (const { brokerId, manager } of deps.brokers.listManagers()) {
 				const states = manager.snapshotAllStates();
 				const entityIds = Object.keys(states).filter((id) => isCalendarEntity(id) && (wanted === null || wanted.has(id)));
-				for (const entityId of entityIds) try {
-					const target = {
-						domain: "calendar",
-						service: "list_events",
-						entityId,
-						returnResponse: true
-					};
-					const rawEvents = extractEvents(await manager.publish(target, {
-						start_date_time: startIso,
-						end_date_time: endIso
-					}), entityId);
-					for (let i = 0; i < rawEvents.length; i += 1) {
-						const mapped = mapEvent(entityId, rawEvents[i], i);
-						if (mapped !== null) out.push(mapped);
-					}
+				if (entityIds.length === 0) continue;
+				try {
+					const events = await fetchEventsForEntities(manager, entityIds, startIso, endIso);
+					for (const ev of events) out.push(ev);
 				} catch (err) {
-					deps.logger.warn("HA calendar.list_events failed", { meta: {
-						entityId,
+					deps.logger.warn("HA calendar.get_events failed", { meta: {
+						entityIds,
 						brokerId,
-						error: err instanceof Error ? err.message : String(err)
+						error: formatHaError(err)
 					} });
 				}
 			}
@@ -8075,7 +8244,7 @@ var HaProviderAddon = class HaProviderAddon extends require_dist.BaseDeviceProvi
 				let lastError = null;
 				for (const { brokerId } of managers) try {
 					const devices = await this.fetchHaDiscoveredDevices(brokerId);
-					candidateCount += devices.length;
+					candidateCount += devices.filter((d) => d.haDeviceId !== HA_ORPHAN_ENTITIES_DEVICE_ID).length;
 					const refreshedAt = Date.now();
 					if (lastDiscoveryAt === null || refreshedAt > lastDiscoveryAt) lastDiscoveryAt = refreshedAt;
 				} catch (err) {
@@ -8095,7 +8264,7 @@ var HaProviderAddon = class HaProviderAddon extends require_dist.BaseDeviceProvi
 				const adoptedCount = (await this.ctx.kernel.devices.getAll()).filter((d) => d.parentDeviceId === null && String(d.config.get("system") ?? "") === "homeassistant").length;
 				return {
 					lastDiscoveryAt: Date.now(),
-					candidateCount: devices.length,
+					candidateCount: devices.filter((d) => d.haDeviceId !== HA_ORPHAN_ENTITIES_DEVICE_ID).length,
 					adoptedCount,
 					lastError: null
 				};
@@ -8124,6 +8293,7 @@ var HaProviderAddon = class HaProviderAddon extends require_dist.BaseDeviceProvi
 					if (typeof haDeviceId === "string") adoptedHaDeviceIds.add(haDeviceId);
 				}
 				let haDevices = await this.fetchHaDiscoveredDevices(brokerId);
+				haDevices = haDevices.filter((d) => d.haDeviceId !== HA_ORPHAN_ENTITIES_DEVICE_ID);
 				haDevices = haDevices.map((dev) => ({
 					...dev,
 					alreadyAdopted: adoptedHaDeviceIds.has(dev.haDeviceId)
@@ -8160,7 +8330,9 @@ var HaProviderAddon = class HaProviderAddon extends require_dist.BaseDeviceProvi
 					const haDeviceId = d.config.get("haDeviceId");
 					if (typeof haDeviceId === "string") adoptedHaDeviceIds.add(haDeviceId);
 				}
-				const found = (await this.fetchHaDiscoveredDevices(brokerId)).find((d) => d.haDeviceId === childNativeId) ?? null;
+				const haDevices = await this.fetchHaDiscoveredDevices(brokerId);
+				if (childNativeId === "__ha_orphan_entities__") return null;
+				const found = haDevices.find((d) => d.haDeviceId === childNativeId) ?? null;
 				if (!found) return null;
 				return haDeviceToCandidate({
 					...found,
@@ -8188,6 +8360,7 @@ var HaProviderAddon = class HaProviderAddon extends require_dist.BaseDeviceProvi
 				let failures = 0;
 				let reused = 0;
 				for (const haDeviceId of childNativeIds) try {
+					if (haDeviceId === "__ha_orphan_entities__") throw new Error("orphan entity bucket is not adoptable as a device — use the Entities tab");
 					const haDevice = haDeviceMap.get(haDeviceId);
 					const deviceName = (perCandidate?.[haDeviceId])?.name ?? haDevice?.name ?? haDeviceId;
 					const existing = existingByStableId.get(`ha:${brokerId}:dev:${haDeviceId}`);
@@ -8445,6 +8618,11 @@ var HaProviderAddon = class HaProviderAddon extends require_dist.BaseDeviceProvi
 	* it to the addon-internal `HaDiscoveredDevice[]` shape. Shared between
 	* `discoverDevices` (device-provider) and the `device-adoption` handlers.
 	*
+	* Entities with `device_id === null` (helpers / template / daily stats) are
+	* collected under a synthetic {@link HA_ORPHAN_ENTITIES_DEVICE_ID} bucket so
+	* the Entities adoption tab + standalone reconcile can see them. Callers on
+	* the Devices path must filter that bucket out.
+	*
 	* Unlike the old `HaDiscoveryService`, this is stateless — every call
 	* goes to the live WS; caching is intentionally omitted to keep the
 	* adoption path simple (the modal fetches once per session).
@@ -8465,15 +8643,59 @@ var HaProviderAddon = class HaProviderAddon extends require_dist.BaseDeviceProvi
 			if (areaId && name) areaById.set(areaId, name);
 		}
 		const entitiesByDevice = /* @__PURE__ */ new Map();
+		const orphanRaws = [];
 		for (const raw of rawEntities) {
 			const entityId = typeof raw["entity_id"] === "string" ? raw["entity_id"] : null;
 			const deviceId = typeof raw["device_id"] === "string" ? raw["device_id"] : null;
 			const disabledBy = raw["disabled_by"] !== null && raw["disabled_by"] !== void 0 ? String(raw["disabled_by"]) : null;
-			if (!entityId || !deviceId || disabledBy !== null) continue;
+			if (!entityId || disabledBy !== null) continue;
+			if (!deviceId) {
+				orphanRaws.push(raw);
+				continue;
+			}
 			const bucket = entitiesByDevice.get(deviceId);
 			if (bucket) bucket.push(raw);
 			else entitiesByDevice.set(deviceId, [raw]);
 		}
+		const mapRawEntity = (raw, deviceAreaName) => {
+			const entityId = raw["entity_id"];
+			const domain = entityId.split(".")[0] ?? entityId;
+			const stateEntry = stateSnapshot[entityId];
+			const attributes = stateEntry?.attributes ?? {};
+			const deviceClass = typeof raw["device_class"] === "string" ? raw["device_class"] : typeof raw["original_device_class"] === "string" ? raw["original_device_class"] : typeof attributes["device_class"] === "string" ? attributes["device_class"] : null;
+			const unit = typeof attributes["unit_of_measurement"] === "string" ? attributes["unit_of_measurement"] : null;
+			const rawOptions = attributes["options"];
+			const options = Array.isArray(rawOptions) && rawOptions.length > 0 ? rawOptions.filter((x) => typeof x === "string") : null;
+			const entityAreaId = typeof raw["area_id"] === "string" ? raw["area_id"] : null;
+			const entityArea = entityAreaId ? areaById.get(entityAreaId) ?? deviceAreaName : deviceAreaName;
+			const rawCategory = raw["entity_category"];
+			const entityCategory = rawCategory === "config" || rawCategory === "diagnostic" ? rawCategory : null;
+			const mapping = mapHaEntityToCamStack({
+				domain,
+				deviceClass,
+				attributes
+			});
+			return {
+				entityId,
+				domain,
+				name: typeof raw["name"] === "string" && raw["name"] ? raw["name"] : typeof raw["original_name"] === "string" && raw["original_name"] ? raw["original_name"] : (typeof attributes["friendly_name"] === "string" ? attributes["friendly_name"] : null) ?? entityId,
+				state: stateEntry?.state ?? "unknown",
+				deviceClass,
+				unitOfMeasurement: unit,
+				area: entityArea,
+				options,
+				entityCategory,
+				mappedTo: mapping ? {
+					deviceType: mapping.deviceType,
+					role: mapping.role,
+					capabilities: [...mapping.capabilities],
+					features: mapping.features ? [...mapping.features] : [],
+					...mapping.dateTimeFormat !== void 0 ? { dateTimeFormat: mapping.dateTimeFormat } : {}
+				} : null,
+				alreadyAdopted: false,
+				adoptedCamDeviceId: null
+			};
+		};
 		const out = [];
 		for (const rawDev of rawDevices) {
 			const devId = typeof rawDev["id"] === "string" ? rawDev["id"] : null;
@@ -8482,45 +8704,7 @@ var HaProviderAddon = class HaProviderAddon extends require_dist.BaseDeviceProvi
 			const areaIdRaw = typeof rawDev["area_id"] === "string" ? rawDev["area_id"] : null;
 			const deviceAreaName = areaIdRaw ? areaById.get(areaIdRaw) ?? null : null;
 			const entBucket = entitiesByDevice.get(devId) ?? [];
-			const entities = entBucket.map((raw) => {
-				const entityId = raw["entity_id"];
-				const domain = entityId.split(".")[0] ?? entityId;
-				const stateEntry = stateSnapshot[entityId];
-				const attributes = stateEntry?.attributes ?? {};
-				const deviceClass = typeof raw["device_class"] === "string" ? raw["device_class"] : typeof raw["original_device_class"] === "string" ? raw["original_device_class"] : typeof attributes["device_class"] === "string" ? attributes["device_class"] : null;
-				const unit = typeof attributes["unit_of_measurement"] === "string" ? attributes["unit_of_measurement"] : null;
-				const rawOptions = attributes["options"];
-				const options = Array.isArray(rawOptions) && rawOptions.length > 0 ? rawOptions.filter((x) => typeof x === "string") : null;
-				const entityAreaId = typeof raw["area_id"] === "string" ? raw["area_id"] : null;
-				const entityArea = entityAreaId ? areaById.get(entityAreaId) ?? deviceAreaName : deviceAreaName;
-				const rawCategory = raw["entity_category"];
-				const entityCategory = rawCategory === "config" || rawCategory === "diagnostic" ? rawCategory : null;
-				const mapping = mapHaEntityToCamStack({
-					domain,
-					deviceClass,
-					attributes
-				});
-				return {
-					entityId,
-					domain,
-					name: typeof raw["name"] === "string" && raw["name"] ? raw["name"] : typeof raw["original_name"] === "string" && raw["original_name"] ? raw["original_name"] : (typeof attributes["friendly_name"] === "string" ? attributes["friendly_name"] : null) ?? entityId,
-					state: stateEntry?.state ?? "unknown",
-					deviceClass,
-					unitOfMeasurement: unit,
-					area: entityArea,
-					options,
-					entityCategory,
-					mappedTo: mapping ? {
-						deviceType: mapping.deviceType,
-						role: mapping.role,
-						capabilities: [...mapping.capabilities],
-						features: mapping.features ? [...mapping.features] : [],
-						...mapping.dateTimeFormat !== void 0 ? { dateTimeFormat: mapping.dateTimeFormat } : {}
-					} : null,
-					alreadyAdopted: false,
-					adoptedCamDeviceId: null
-				};
-			});
+			const entities = entBucket.map((raw) => mapRawEntity(raw, deviceAreaName));
 			const devName = typeof rawDev["name_by_user"] === "string" && rawDev["name_by_user"] ? rawDev["name_by_user"] : typeof rawDev["name"] === "string" && rawDev["name"] ? rawDev["name"] : entBucket[0] ? String(entBucket[0]["name"] ?? entBucket[0]["original_name"] ?? devId) : devId;
 			const integration = deriveIntegrationDomain(entBucket.map((raw) => typeof raw["platform"] === "string" ? raw["platform"] : null));
 			out.push({
@@ -8537,6 +8721,23 @@ var HaProviderAddon = class HaProviderAddon extends require_dist.BaseDeviceProvi
 				adoptedCamDeviceId: null
 			});
 		}
+		if (orphanRaws.length > 0) {
+			const entities = orphanRaws.map((raw) => mapRawEntity(raw, null));
+			const entityPlatforms = orphanRaws.map((raw) => typeof raw["platform"] === "string" ? raw["platform"] : null);
+			out.push({
+				haDeviceId: HA_ORPHAN_ENTITIES_DEVICE_ID,
+				name: "Standalone entities",
+				area: null,
+				manufacturer: null,
+				model: null,
+				swVersion: null,
+				integration: deriveIntegrationDomain(entityPlatforms),
+				entityCount: entities.length,
+				entities,
+				alreadyAdopted: false,
+				adoptedCamDeviceId: null
+			});
+		}
 		return out;
 	}
 	/**