@glasshome/sync-layer 0.9.0 → 0.9.1

package/dist/index.js

@@ -1,6 +1,5 @@
-import { A as isDemoMode, B as extractDomain, C as setManagerConnection, D as fetchForecastData, E as fetchForecast, F as createDemoFixtures, G as setState, I as demoAssetUrl, K as state, L as demoEnergyPreferences, M as startDemoEnergyTicker, N as stopDemoEnergyTicker, O as fetchForecasts, P as unloadDemoData, R as isEnergyEntity, S as registerEntity, U as privilegedConn, V as forceResubscribeCalendars, W as setPrivilegedConn, _ as toggle, a as getAreaView, b as updateEntity, c as entityViewEquals, d as getEntityViews, f as numericSensorHistory, g as sendCommand, h as callService, i as buildDeviceView, j as loadDemoData, k as applyDemoServiceCall, l as getAllEntityViews, m as batchServiceCalls, n as normalizeStatisticTime, o as getAreaViews, p as batchEntityUpdates, r as buildAreaView, s as buildEntityView, t as fetchStatisticsDuringPeriod, u as getEntityView, v as turnOff, w as setResubscribeHandler, x as forceResubscribe, y as turnOn, z as synthesizeEnergyHistory } from "./statistics-C5j1DLGM.js";
-import { t as runHaBridgeWorker } from "./worker-main-DamaVb7B.js";
-import "home-assistant-js-websocket";
+import { A as buildDeviceView, B as registerEntity, C as unloadDemoData, D as isEnergyEntity, E as demoEnergyPreferences, F as getAllEntityViews, G as setState, H as setResubscribeHandler, I as getEntityView, K as state, L as getEntityViews, M as getAreaViews, N as buildEntityView, O as synthesizeEnergyHistory, P as entityViewEquals, R as extractDomain, S as stopDemoEnergyTicker, T as demoAssetUrl, U as privilegedConn, V as setManagerConnection, W as setPrivilegedConn, _ as updateEntity, a as fetchForecastData, b as loadDemoData, c as normalizeStatisticTime, d as batchServiceCalls, f as callService, g as turnOn, h as turnOff, i as fetchForecast, j as getAreaView, k as buildAreaView, l as numericSensorHistory, m as toggle, o as fetchForecasts, p as sendCommand, s as fetchStatisticsDuringPeriod, t as forceResubscribeCalendars, u as batchEntityUpdates, v as applyDemoServiceCall, w as createDemoFixtures, x as startDemoEnergyTicker, y as isDemoMode, z as forceResubscribe } from "./track-IkwP6XmO.js";
+import { t as runHaBridgeWorker } from "./worker-main-B6eeHPDQ.js";
 import { produce } from "solid-js/store";
 //#region src/core/reducers.ts
 /**
@@ -136,640 +135,370 @@ function updateStatisticsMetadata(metadata) {
 	}));
 }
 //#endregion
-//#region src/history/constants.ts
+//#region src/connection/manager.ts
 /**
-* History Constants
-*
-* Constants and utilities for history fetching and processing.
-* Based on Home Assistant frontend implementation.
-*
-* @packageDocumentation
+* Disconnect from Home Assistant
 */
-const DOMAINS_USE_LAST_UPDATED = [
-	"climate",
-	"humidifier",
-	"water_heater"
-];
-const NEED_ATTRIBUTE_DOMAINS = [
-	"climate",
-	"humidifier",
-	"input_datetime",
-	"water_heater",
-	"person",
-	"device_tracker"
-];
-const LINE_ATTRIBUTES_TO_KEEP = [
-	"temperature",
-	"current_temperature",
-	"target_temp_low",
-	"target_temp_high",
-	"hvac_action",
-	"humidity",
-	"mode",
-	"action",
-	"current_humidity"
-];
+function disconnect() {
+	setState(produce((s) => {
+		setPrivilegedConn(null);
+		s.connectionState = "disconnected";
+	}));
+}
 /**
-* Check if an entity needs attributes in history response
+* Check if currently connected
 */
-function entityIdHistoryNeedsAttributes(entityId) {
-	const domain = extractDomain(entityId);
-	if (!state.entities[entityId]) return NEED_ATTRIBUTE_DOMAINS.includes(domain);
-	return NEED_ATTRIBUTE_DOMAINS.includes(domain);
+function isConnected() {
+	return state.connectionState === "connected";
+}
+/**
+* Get the connection's connected flag, for a connection indicator in the UI.
+*/
+function getConnectionState() {
+	return state.connectionState === "connected";
+}
+async function loadInitialData(conn) {
+	try {
+		const [states, entityRegistry, deviceRegistry, areaRegistry, floorRegistry, labelRegistry, config] = await Promise.all([
+			conn.sendMessagePromise({ type: "get_states" }),
+			conn.sendMessagePromise({ type: "config/entity_registry/list" }),
+			conn.sendMessagePromise({ type: "config/device_registry/list" }),
+			conn.sendMessagePromise({ type: "config/area_registry/list" }),
+			conn.sendMessagePromise({ type: "config/floor_registry/list" }),
+			conn.sendMessagePromise({ type: "config/label_registry/list" }),
+			conn.sendMessagePromise({ type: "get_config" })
+		]);
+		bulkUpdateEntities(states);
+		bulkUpdateEntityRegistry(entityRegistry);
+		setState("config", config);
+		setState(produce((s) => {
+			for (const device of deviceRegistry) s.devices[device.id] = device;
+			for (const areaApi of areaRegistry) {
+				const area = {
+					id: (areaApi.area_id || areaApi.id) ?? "",
+					name: areaApi.name,
+					normalized_name: areaApi.normalized_name || areaApi.name.toLowerCase().replace(/\s+/g, "_"),
+					aliases: Array.isArray(areaApi.aliases) ? areaApi.aliases : [],
+					floor_id: areaApi.floor_id ?? null,
+					humidity_entity_id: areaApi.humidity_entity_id ?? null,
+					icon: areaApi.icon ?? null,
+					labels: Array.isArray(areaApi.labels) ? areaApi.labels : [],
+					picture: areaApi.picture ?? null,
+					temperature_entity_id: areaApi.temperature_entity_id ?? null,
+					created_at: typeof areaApi.created_at === "number" ? (/* @__PURE__ */ new Date(areaApi.created_at * 1e3)).toISOString() : areaApi.created_at,
+					modified_at: typeof areaApi.modified_at === "number" ? (/* @__PURE__ */ new Date(areaApi.modified_at * 1e3)).toISOString() : areaApi.modified_at
+				};
+				s.areas[area.id] = area;
+			}
+			for (const floor of floorRegistry) s.floors[floor.floor_id] = floor;
+			for (const label of labelRegistry) s.labels[label.label_id] = label;
+		}));
+	} catch (error) {
+		console.error("Error loading initial data:", error);
+		throw error;
+	}
 }
 //#endregion
-//#region src/history/fetch.ts
+//#region src/query/projections.ts
 /**
-* History Fetching
+* Project entities to IDs only
 *
-* @packageDocumentation
+* @param entities - Array of entity views
+* @returns Array of entity IDs
 */
+function projectToIds(entities) {
+	return entities.map((e) => e.id);
+}
 /**
-* Fetch history for entities during a time period
+* Pick specific fields from entities
+*
+* @param entities - Array of entity views
+* @param keys - Array of field names to include
+* @returns Array of objects with only specified fields
 */
-async function fetchHistory(options) {
-	const { startTime, endTime, entityIds = [], includeStartTimeState = true, significantChangesOnly = true, minimalResponse = true, noAttributes: noAttributesOverride } = options;
-	if (isDemoMode()) {
-		const endMs = (endTime ?? /* @__PURE__ */ new Date()).getTime();
+function projectPick(entities, keys) {
+	return entities.map((entity) => {
 		const result = {};
-		for (const id of entityIds) {
-			const points = isEnergyEntity(id) ? synthesizeEnergyHistory(id, startTime.getTime(), endMs) : numericSensorHistory(id, startTime.getTime(), endMs);
-			if (!points) continue;
-			result[id] = points.map((p) => ({
-				s: p.s,
-				a: {},
-				lu: p.lu
-			}));
-		}
+		for (const key of keys) result[key] = entity[key];
 		return result;
-	}
-	const startTimeStr = startTime.toISOString();
-	const endTimeStr = endTime?.toISOString();
-	const params = {
-		type: "history/history_during_period",
-		start_time: startTimeStr,
-		minimal_response: minimalResponse,
-		no_attributes: noAttributesOverride ?? (entityIds.length === 0 ? false : !entityIds.some((entityId) => entityIdHistoryNeedsAttributes(entityId))),
-		include_start_time_state: includeStartTimeState,
-		significant_changes_only: significantChangesOnly
-	};
-	if (endTimeStr) params.end_time = endTimeStr;
-	if (entityIds.length !== 0) params.entity_ids = entityIds;
-	return await sendCommand(params) ?? {};
+	});
 }
 /**
-* Fetch history for a single entity
+* Pluck a single field from entities
+*
+* Supports dot-notation for nested fields (e.g., "attributes.brightness")
+*
+* @param entities - Array of entity views
+* @param key - Field name or dot-path to extract
+* @returns Array of field values
 */
-async function fetchEntityHistory(entityId, options) {
-	const { startTime, endTime, includeStartTimeState = true, significantChangesOnly = true, minimalResponse = false, noAttributes = false } = options;
-	try {
-		const entityHistory = (await fetchHistory({
-			startTime,
-			endTime,
-			entityIds: [entityId],
-			includeStartTimeState,
-			significantChangesOnly,
-			minimalResponse,
-			noAttributes
-		}))[entityId] ?? [];
-		return {
-			entityId,
-			timeline: entityHistory.map((s) => ({
-				timestamp: s.lu,
-				state: s.s,
-				attributes: s.a,
-				lastChanged: s.lc,
-				lastUpdated: s.lu
-			})),
-			entityHistory,
-			loading: false,
-			error: null,
-			lastFetched: Date.now()
-		};
-	} catch (error) {
-		return {
-			entityId,
-			timeline: [],
-			entityHistory: [],
-			loading: false,
-			error: error instanceof Error ? error : new Error(String(error)),
-			lastFetched: null
-		};
-	}
+function projectPluck(entities, key) {
+	return entities.map((entity) => getNestedValue(entity, key));
 }
 /**
-* Convert compressed history state to timeline state
+* Map entities using a custom function
+*
+* @param entities - Array of entity views
+* @param mapper - Function to transform each entity
+* @returns Array of mapped values
 */
-function historyStateToTimeline(s) {
-	return {
-		timestamp: s.lu,
-		state: s.s,
-		attributes: s.a,
-		lastChanged: s.lc,
-		lastUpdated: s.lu
-	};
-}
-//#endregion
-//#region src/history/query.ts
-/** Hard cap on retained points per entity timeline. */
-const MAX_HISTORY_POINTS = 5760;
-/** Live tracker count per entity. Ref-counted because a timeline is shared: two
-*  widgets on the same entity must not let the first unmount delete the store
-*  data the second is still rendering (appendHistoryPoint would then silently
-*  drop every update and the survivor's chart would freeze). */
-const trackedEntities = /* @__PURE__ */ new Map();
-/** Check if an entity has active history tracking. */
-function isHistoryTracked(entityId) {
-	return trackedEntities.has(entityId);
-}
-/** Start tracking history for an entity. Fetches initial backfill. */
-async function trackEntityHistory(entityId, options) {
-	trackedEntities.set(entityId, (trackedEntities.get(entityId) ?? 0) + 1);
-	const historyData = await fetchEntityHistory(entityId, options);
-	setState(produce((s) => {
-		s.history[entityId] = historyData;
-	}));
-	return historyData;
-}
-/** Release one tracker. The entity's data is cleared only when the last one goes. */
-function untrackEntityHistory(entityId) {
-	const remaining = (trackedEntities.get(entityId) ?? 0) - 1;
-	if (remaining > 0) {
-		trackedEntities.set(entityId, remaining);
-		return;
-	}
-	trackedEntities.delete(entityId);
-	setState(produce((s) => {
-		delete s.history[entityId];
-	}));
+function projectMap(entities, mapper) {
+	return entities.map(mapper);
 }
 /**
-* Append a state change to an entity's history.
-* Called by the entity subscription handler when a tracked entity changes.
+* Get nested value from object using dot-notation
+*
+* @param obj - Object to extract value from
+* @param path - Dot-notation path (e.g., "attributes.brightness")
+* @returns Value at path or undefined
+*
+* @example
+* ```typescript
+* const entity = { attributes: { brightness: 255 } };
+* getNestedValue(entity, "attributes.brightness"); // 255
+* ```
 */
-function appendHistoryPoint(entityId, stateValue, attributes, lastUpdated, lastChanged) {
-	setState(produce((s) => {
-		const history = s.history[entityId];
-		if (!history) return;
-		const point = {
-			s: stateValue,
-			a: attributes,
-			lu: lastUpdated,
-			lc: lastChanged
+function getNestedValue(obj, path) {
+	const parts = path.split(".");
+	let current = obj;
+	for (const part of parts) {
+		if (current === null || current === void 0) return;
+		current = current[part];
+	}
+	return current;
+}
+//#endregion
+//#region src/query/area-builder.ts
+var AreaQueryBuilderImpl = class AreaQueryBuilderImpl {
+	queryState;
+	constructor(initialState) {
+		this.queryState = initialState ?? {
+			filters: [],
+			sorts: []
 		};
-		history.entityHistory.push(point);
-		history.timeline.push({
-			timestamp: lastUpdated,
-			state: stateValue,
-			attributes,
-			lastChanged,
-			lastUpdated
+	}
+	byFloor(floorId) {
+		return this.clone({ filters: [...this.queryState.filters, {
+			type: "floor",
+			value: floorId
+		}] });
+	}
+	byLabel(labelId) {
+		return this.clone({ filters: [...this.queryState.filters, {
+			type: "label",
+			value: labelId
+		}] });
+	}
+	where(predicate) {
+		return this.clone({ filters: [...this.queryState.filters, {
+			type: "predicate",
+			value: predicate
+		}] });
+	}
+	orderBy(key, direction = "asc") {
+		return this.clone({ sorts: [...this.queryState.sorts, {
+			key,
+			direction
+		}] });
+	}
+	get() {
+		return this.execute();
+	}
+	first() {
+		return this.execute()[0];
+	}
+	subscribe(callback) {
+		callback(this.get());
+		return () => {};
+	}
+	clone(updates) {
+		return new AreaQueryBuilderImpl({
+			...this.queryState,
+			...updates
 		});
-	}));
+	}
+	execute() {
+		let areas = getAreaViews();
+		for (const filter of this.queryState.filters) if (filter.type === "floor") areas = areas.filter((area) => area.floorId === filter.value);
+		else if (filter.type === "label") areas = areas.filter((area) => area.labels.includes(filter.value));
+		else if (filter.type === "predicate") areas = areas.filter(filter.value);
+		if (this.queryState.sorts.length > 0) areas = this.sortAreas(areas);
+		return areas;
+	}
+	sortAreas(areas) {
+		return [...areas].sort((a, b) => {
+			for (const sort of this.queryState.sorts) {
+				const aValue = getNestedValue(a, sort.key);
+				const bValue = getNestedValue(b, sort.key);
+				let comparison = 0;
+				if (aValue < bValue) comparison = -1;
+				else if (aValue > bValue) comparison = 1;
+				if (comparison !== 0) return sort.direction === "asc" ? comparison : -comparison;
+			}
+			return 0;
+		});
+	}
+};
+/**
+* Create a query builder for areas
+*/
+function areas() {
+	return new AreaQueryBuilderImpl();
 }
 /**
-* Append multiple history points in a single setState(produce(...)).
-* Called by the rAF-batched subscription flush.
+* Create a query for a single area
 */
-function bulkAppendHistoryPoints(points) {
-	if (points.length === 0) return;
-	setState(produce((s) => {
-		const touched = /* @__PURE__ */ new Set();
-		for (const { entityId, stateValue, attributes, lastUpdated, lastChanged } of points) {
-			const history = s.history[entityId];
-			if (!history) continue;
-			history.entityHistory.push({
-				s: stateValue,
-				a: attributes,
-				lu: lastUpdated,
-				lc: lastChanged
-			});
-			history.timeline.push({
-				timestamp: lastUpdated,
-				state: stateValue,
-				attributes,
-				lastChanged,
-				lastUpdated
-			});
-			touched.add(entityId);
-		}
-		for (const entityId of touched) {
-			const history = s.history[entityId];
-			if (!history) continue;
-			if (history.entityHistory.length > 5760) history.entityHistory.splice(0, history.entityHistory.length - MAX_HISTORY_POINTS);
-			if (history.timeline.length > 5760) history.timeline.splice(0, history.timeline.length - MAX_HISTORY_POINTS);
-		}
-	}));
+function area(areaId) {
+	return getAreaView(areaId);
 }
 //#endregion
-//#region src/connection/subscriptions.ts
-/** Registry subscription cleanup functions (entity sub managed by subscription-manager) */
-let registrySubscriptions = [];
-/** Buffered messages waiting for next animation frame */
-let messageBuffer = [];
-let rafScheduled = false;
-function bufferMessage(message) {
-	messageBuffer.push(message);
-	if (!rafScheduled) {
-		rafScheduled = true;
-		(typeof requestAnimationFrame === "function" ? requestAnimationFrame : queueMicrotask)(flushMessageBuffer);
-	}
+//#region src/entities/index.ts
+/**
+* Entity Index Queries
+*
+* Provides utilities for querying entities by various criteria.
+* In the SolidJS port, indices are NOT stored in state -- they are
+* computed on the fly here (and will be derived reactively in Plan 03).
+*
+* @packageDocumentation
+*/
+/**
+* Get all entity IDs
+*/
+function getAllEntityIds() {
+	return Object.keys(state.entities);
 }
-function flushMessageBuffer() {
-	rafScheduled = false;
-	const messages = messageBuffer;
-	messageBuffer = [];
-	if (messages.length === 0) return;
-	setState(produce((s) => {
-		for (const message of messages) {
-			if (message.a) for (const [entityId, compressedState] of Object.entries(message.a)) applyCompressedState(s, entityId, compressedState);
-			if (message.c) for (const [entityId, diff] of Object.entries(message.c)) applyStateDiff(s, entityId, diff);
-			if (message.r) for (const entityId of message.r) delete s.entities[entityId];
-		}
-	}));
-	const historyPoints = [];
-	for (const message of messages) {
-		if (message.a) for (const [entityId, compressedState] of Object.entries(message.a)) collectHistoryFromCompressed(historyPoints, entityId, compressedState);
-		if (message.c) {
-			for (const [entityId, diff] of Object.entries(message.c)) if (diff["+"]) collectHistoryFromDiff(historyPoints, entityId, diff["+"]);
-		}
-	}
-	if (historyPoints.length > 0) bulkAppendHistoryPoints(historyPoints);
+/**
+* Get entities by domain
+*/
+function getEntitiesByDomain(domain) {
+	return Object.keys(state.entities).filter((id) => extractDomain(id) === domain);
 }
 /**
-* Subscribe to entity state updates with an entity_ids filter.
-* Called by the subscription manager on flush.
+* Get entities via devices in area
+*
+* Only includes entities that inherit area from device (entity.area_id is null).
 */
-async function subscribeEntities(connection, entityIds) {
-	const subscribeMsg = { type: "subscribe_entities" };
-	if (entityIds.length > 0) subscribeMsg.entity_ids = entityIds;
-	return await connection.subscribeMessage((message) => {
-		bufferMessage(message);
-	}, subscribeMsg);
+function getEntitiesViaDevices(areaId) {
+	const devicesInArea = Object.values(state.devices).filter((device) => device.area_id === areaId);
+	const entityIds = [];
+	for (const device of devicesInArea) {
+		const deviceEntities = getEntitiesByDevice(device.id);
+		for (const entityId of deviceEntities) if (!state.entityRegistry[entityId]?.area_id) entityIds.push(entityId);
+	}
+	return entityIds;
 }
 /**
-* Subscribe to all relevant events from Home Assistant
+* Get entities by area
+*
+* Returns entities with direct area_id assignments and entities that inherit their area from devices.
 */
-async function subscribeToUpdates(conn) {
-	await cleanupSubscriptions();
-	setManagerConnection(conn);
-	setResubscribeHandler(subscribeEntities);
-	const registryUpdatedSub = await conn.subscribeEvents((event) => {
-		handleRegistryUpdate(event);
-	}, "entity_registry_updated");
-	registrySubscriptions.push(() => registryUpdatedSub());
-	const deviceRegistrySub = await conn.subscribeEvents((event) => {
-		handleDeviceRegistryUpdate(event);
-	}, "device_registry_updated");
-	registrySubscriptions.push(() => deviceRegistrySub());
-	const areaRegistrySub = await conn.subscribeEvents((event) => {
-		handleAreaRegistryUpdate(event);
-	}, "area_registry_updated");
-	registrySubscriptions.push(() => areaRegistrySub());
-	const floorRegistrySub = await conn.subscribeEvents((event) => {
-		handleFloorRegistryUpdate(event);
-	}, "floor_registry_updated");
-	registrySubscriptions.push(() => floorRegistrySub());
-	const labelRegistrySub = await conn.subscribeEvents((event) => {
-		handleLabelRegistryUpdate(event);
-	}, "label_registry_updated");
-	registrySubscriptions.push(() => labelRegistrySub());
-	const statisticsSub = await conn.subscribeEvents((event) => {
-		handleStatisticsUpdate(event);
-	}, "recorder_5min_statistics_generated");
-	registrySubscriptions.push(() => statisticsSub());
-	const coreConfigSub = await conn.subscribeEvents(() => {
-		handleCoreConfigUpdate();
-	}, "core_config_updated");
-	registrySubscriptions.push(() => coreConfigSub());
+function getEntitiesByArea(areaId) {
+	const directEntityIds = [];
+	for (const [entityId, entry] of Object.entries(state.entityRegistry)) if (entry.area_id === areaId) directEntityIds.push(entityId);
+	const deviceEntityIds = getEntitiesViaDevices(areaId);
+	return Array.from(/* @__PURE__ */ new Set([...directEntityIds, ...deviceEntityIds]));
 }
 /**
-* Clean up all active subscriptions
+* Get entities by device
 */
-async function cleanupSubscriptions() {
-	const subscriptions = [...registrySubscriptions];
-	for (const unsub of subscriptions) await unsub();
-	registrySubscriptions = [];
+function getEntitiesByDevice(deviceId) {
+	const entityIds = [];
+	for (const [entityId, entry] of Object.entries(state.entityRegistry)) if (entry.device_id === deviceId) entityIds.push(entityId);
+	return entityIds;
 }
-async function handleCoreConfigUpdate() {
-	const conn = privilegedConn();
-	if (!conn) return;
-	try {
-		const config = await conn.sendMessagePromise({ type: "get_config" });
-		if (config) setState("config", config);
-	} catch (error) {
-		console.error("Error refreshing core config:", error);
-	}
-}
-async function handleRegistryUpdate(event) {
-	const { action, entity_id } = event.data;
-	if (action === "create" || action === "update") {
-		const conn = privilegedConn();
-		if (!conn) return;
-		try {
-			const entry = await conn.sendMessagePromise({
-				type: "config/entity_registry/get",
-				entity_id
-			});
-			if (entry) updateEntityRegistry(entry);
-		} catch (error) {
-			console.error("Error fetching registry entry:", error);
-		}
-	} else if (action === "remove") removeEntityRegistry(entity_id);
-}
-async function handleDeviceRegistryUpdate(event) {
-	const { action, device_id } = event.data;
-	if (action === "create" || action === "update") {
-		const conn = privilegedConn();
-		if (!conn) return;
-		try {
-			const device = (await conn.sendMessagePromise({ type: "config/device_registry/list" })).find((d) => d.id === device_id);
-			if (device) updateDevice(device);
-		} catch (error) {
-			console.error("Error fetching device:", error);
-		}
-	} else if (action === "remove") removeDevice(device_id);
-}
-async function handleAreaRegistryUpdate(event) {
-	const { action, area_id } = event.data;
-	if (action === "create" || action === "update") {
-		const conn = privilegedConn();
-		if (!conn) return;
-		try {
-			const area = (await conn.sendMessagePromise({ type: "config/area_registry/list" })).find((a) => a.id === area_id);
-			if (area) updateArea(area);
-		} catch (error) {
-			console.error("Error fetching area:", error);
-		}
-	} else if (action === "remove") removeArea(area_id);
-}
-async function handleFloorRegistryUpdate(event) {
-	const { action, floor_id } = event.data;
-	if (action === "create" || action === "update") {
-		const conn = privilegedConn();
-		if (!conn) return;
-		try {
-			const floor = (await conn.sendMessagePromise({ type: "config/floor_registry/list" })).find((f) => f.floor_id === floor_id);
-			if (floor) updateFloor(floor);
-		} catch (error) {
-			console.error("Error fetching floor:", error);
-		}
-	} else if (action === "remove") removeFloor(floor_id);
-}
-async function handleLabelRegistryUpdate(event) {
-	const { action, label_id } = event.data;
-	if (action === "create" || action === "update") {
-		const conn = privilegedConn();
-		if (!conn) return;
-		try {
-			const label = (await conn.sendMessagePromise({ type: "config/label_registry/list" })).find((l) => l.label_id === label_id);
-			if (label) updateLabel(label);
-		} catch (error) {
-			console.error("Error fetching label:", error);
-		}
-	} else if (action === "remove") removeLabel(label_id);
-}
-async function handleStatisticsUpdate(event) {
-	const { statistic_ids } = event.data;
-	if (!statistic_ids || statistic_ids.length === 0) return;
-	const conn = privilegedConn();
-	if (!conn) return;
-	try {
-		const metadata = await conn.sendMessagePromise({
-			type: "recorder/get_statistics_metadata",
-			statistic_ids
-		});
-		if (metadata && Array.isArray(metadata)) updateStatisticsMetadata(metadata);
-	} catch (error) {
-		console.error("Error fetching statistics metadata:", error);
-	}
-}
-function timestampToIso(timestamp) {
-	if (timestamp === void 0) return (/* @__PURE__ */ new Date()).toISOString();
-	if (typeof timestamp === "string") return timestamp;
-	return (/* @__PURE__ */ new Date(timestamp * 1e3)).toISOString();
-}
-function collectHistoryFromCompressed(points, entityId, compressed) {
-	if (!isHistoryTracked(entityId)) return;
-	const stateVal = compressed.s ?? compressed.state ?? "unknown";
-	const attributes = compressed.a ?? compressed.attributes ?? {};
-	const lu = compressed.lu ?? (compressed.last_updated ? new Date(compressed.last_updated).getTime() / 1e3 : Date.now() / 1e3);
-	const lc = compressed.lc ?? (compressed.last_changed ? new Date(compressed.last_changed).getTime() / 1e3 : void 0);
-	points.push({
-		entityId,
-		stateValue: stateVal,
-		attributes,
-		lastUpdated: lu,
-		lastChanged: lc
-	});
-}
-function collectHistoryFromDiff(points, entityId, additions) {
-	if (!isHistoryTracked(entityId)) return;
-	const stateVal = additions.s ?? additions.state;
-	if (stateVal === void 0) return;
-	const lu = additions.lu ?? Date.now() / 1e3;
-	const lc = additions.lc;
-	const attributes = additions.a ?? additions.attributes ?? {};
-	points.push({
-		entityId,
-		stateValue: stateVal,
-		attributes,
-		lastUpdated: lu,
-		lastChanged: lc
-	});
-}
-function shallowEqualAttributes(existing, incoming) {
-	const incomingKeys = Object.keys(incoming);
-	for (const key of incomingKeys) if (existing[key] !== incoming[key]) return false;
-	return true;
-}
-function applyCompressedState(s, entityId, compressed) {
-	const stateVal = compressed.s ?? compressed.state ?? "unknown";
-	const attributes = compressed.a ?? compressed.attributes ?? {};
-	const context = compressed.c ?? compressed.context ?? {
-		id: "",
-		parent_id: null,
-		user_id: null
-	};
-	const lastChanged = timestampToIso(compressed.lc ?? compressed.last_changed);
-	const lastUpdated = timestampToIso(compressed.lu ?? compressed.last_updated);
-	const existing = s.entities[entityId];
-	if (existing) {
-		const stateChanged = existing.state !== stateVal;
-		const changedAt = existing.last_changed !== lastChanged;
-		if (stateChanged) existing.state = stateVal;
-		if (changedAt) existing.last_changed = lastChanged;
-		if (stateChanged || changedAt) existing.last_updated = lastUpdated;
-		if (!shallowEqualAttributes(existing.attributes, attributes)) Object.assign(existing.attributes, attributes);
-		if (existing.context.id !== context.id) existing.context = context;
-	} else s.entities[entityId] = {
-		entity_id: entityId,
-		state: stateVal,
-		attributes,
-		last_changed: lastChanged,
-		last_updated: lastUpdated,
-		context
-	};
-}
-function applyStateDiff(s, entityId, diff) {
-	const existing = s.entities[entityId];
-	if (!existing) return;
-	const additions = diff["+"];
-	if (additions) {
-		let stateChanged = false;
-		if (additions.s !== void 0 && existing.state !== additions.s) {
-			existing.state = additions.s;
-			stateChanged = true;
-		}
-		if (additions.a) {
-			for (const [key, value] of Object.entries(additions.a)) if (existing.attributes[key] !== value) {
-				existing.attributes[key] = value;
-				stateChanged = true;
-			}
-		}
-		if (additions.lc !== void 0) {
-			const lcIso = timestampToIso(additions.lc);
-			if (existing.last_changed !== lcIso) {
-				existing.last_changed = lcIso;
-				stateChanged = true;
-			}
-		}
-		if (additions.lu !== void 0 && stateChanged) existing.last_updated = timestampToIso(additions.lu);
-		if (additions.c && existing.context.id !== additions.c.id) existing.context = additions.c;
-	}
-	const removals = diff["-"];
-	if (removals?.a) for (const key of removals.a) delete existing.attributes[key];
-}
-//#endregion
-//#region src/connection/manager.ts
-let activeConn = null;
-let heartbeatInterval = null;
-let suspendTimeout = null;
-let visiblePromiseResolve = null;
-let visibilityHandler = null;
-let pageshowHandler = null;
-function clearSuspendTimeout() {
-	if (suspendTimeout !== null) {
-		clearTimeout(suspendTimeout);
-		suspendTimeout = null;
-	}
-}
-function resolveVisiblePromise() {
-	if (visiblePromiseResolve) {
-		visiblePromiseResolve();
-		visiblePromiseResolve = null;
-	}
-}
-function stopHeartbeat() {
-	if (heartbeatInterval !== null) {
-		clearInterval(heartbeatInterval);
-		heartbeatInterval = null;
+/**
+* Get entities by floor
+*/
+function getEntitiesByFloor(floorId) {
+	const entityIds = [];
+	const areasOnFloor = Object.values(state.areas).filter((area) => area.floor_id === floorId);
+	for (const area of areasOnFloor) {
+		const areaEntities = getEntitiesByArea(area.id);
+		entityIds.push(...areaEntities);
 	}
-}
-function teardownLifecycleListeners() {
-	if (typeof document !== "undefined" && visibilityHandler) document.removeEventListener("visibilitychange", visibilityHandler);
-	if (typeof window !== "undefined" && pageshowHandler) window.removeEventListener("pageshow", pageshowHandler);
-	visibilityHandler = null;
-	pageshowHandler = null;
-	clearSuspendTimeout();
-	resolveVisiblePromise();
+	return entityIds;
 }
 /**
-* Disconnect from Home Assistant
+* Get entities by label
 */
-function disconnect() {
-	stopHeartbeat();
-	teardownLifecycleListeners();
-	activeConn?.close();
-	activeConn = null;
-	setState(produce((s) => {
-		setPrivilegedConn(null);
-		s.connectionState = "disconnected";
-	}));
+function getEntitiesByLabel(labelId) {
+	const entityIds = [];
+	for (const [entityId, entry] of Object.entries(state.entityRegistry)) if (entry.labels?.includes(labelId)) entityIds.push(entityId);
+	return entityIds;
 }
+//#endregion
+//#region src/query/memoization.ts
 /**
-* Check if currently connected
+* Build a unique signature for a query
 */
-function isConnected() {
-	return state.connectionState === "connected";
+function buildQuerySignature(query) {
+	const sig = {
+		index: query.indexFilters.map((f) => `${f.type}:${f.value}`).join(","),
+		predicates: query.predicateFilters.length,
+		sorts: query.sorts.map((s) => `${s.key}:${s.direction}`).join(","),
+		projection: query.projection ? JSON.stringify(query.projection) : null
+	};
+	return JSON.stringify(sig);
 }
 /**
-* Get the underlying socket's connected flag.
-*
-* Exposed so apps can render a connection indicator in the UI. Distinct from
-* `isConnected()` which reflects the manager's internal lifecycle state.
+* Execute query (no caching -- SolidJS createMemo handles this in Plan 03)
 */
-function getConnectionState() {
-	return activeConn ? activeConn.connected : state.connectionState === "connected";
-}
-async function loadInitialData(conn) {
-	try {
-		const [states, entityRegistry, deviceRegistry, areaRegistry, floorRegistry, labelRegistry, config] = await Promise.all([
-			conn.sendMessagePromise({ type: "get_states" }),
-			conn.sendMessagePromise({ type: "config/entity_registry/list" }),
-			conn.sendMessagePromise({ type: "config/device_registry/list" }),
-			conn.sendMessagePromise({ type: "config/area_registry/list" }),
-			conn.sendMessagePromise({ type: "config/floor_registry/list" }),
-			conn.sendMessagePromise({ type: "config/label_registry/list" }),
-			conn.sendMessagePromise({ type: "get_config" })
-		]);
-		bulkUpdateEntities(states);
-		bulkUpdateEntityRegistry(entityRegistry);
-		setState("config", config);
-		setState(produce((s) => {
-			for (const device of deviceRegistry) s.devices[device.id] = device;
-			for (const areaApi of areaRegistry) {
-				const area = {
-					id: areaApi.area_id || areaApi.id,
-					name: areaApi.name,
-					normalized_name: areaApi.normalized_name || areaApi.name.toLowerCase().replace(/\s+/g, "_"),
-					aliases: Array.isArray(areaApi.aliases) ? areaApi.aliases : [],
-					floor_id: areaApi.floor_id ?? null,
-					humidity_entity_id: areaApi.humidity_entity_id ?? null,
-					icon: areaApi.icon ?? null,
-					labels: Array.isArray(areaApi.labels) ? areaApi.labels : [],
-					picture: areaApi.picture ?? null,
-					temperature_entity_id: areaApi.temperature_entity_id ?? null,
-					created_at: typeof areaApi.created_at === "number" ? (/* @__PURE__ */ new Date(areaApi.created_at * 1e3)).toISOString() : areaApi.created_at,
-					modified_at: typeof areaApi.modified_at === "number" ? (/* @__PURE__ */ new Date(areaApi.modified_at * 1e3)).toISOString() : areaApi.modified_at
-				};
-				s.areas[area.id] = area;
-			}
-			for (const floor of floorRegistry) s.floors[floor.floor_id] = floor;
-			for (const label of labelRegistry) s.labels[label.label_id] = label;
-		}));
-	} catch (error) {
-		console.error("Error loading initial data:", error);
-		throw error;
-	}
+function memoizedExecute(_signature, compute) {
+	return compute();
 }
 //#endregion
-//#region src/query/area-builder.ts
-var AreaQueryBuilderImpl = class AreaQueryBuilderImpl {
+//#region src/query/builder.ts
+var EntitiesQueryBuilderImpl = class EntitiesQueryBuilderImpl {
 	queryState;
 	constructor(initialState) {
 		this.queryState = initialState ?? {
-			filters: [],
-			sorts: []
+			indexFilters: [],
+			predicateFilters: [],
+			sorts: [],
+			projection: void 0,
+			searchText: void 0,
+			take: void 0,
+			skip: void 0,
+			distinct: void 0
 		};
 	}
+	byArea(areaId) {
+		return this.clone({ indexFilters: [...this.queryState.indexFilters, {
+			type: "area",
+			value: areaId
+		}] });
+	}
+	byDomain(domain) {
+		return this.clone({ indexFilters: [...this.queryState.indexFilters, {
+			type: "domain",
+			value: domain
+		}] });
+	}
+	byDevice(deviceId) {
+		return this.clone({ indexFilters: [...this.queryState.indexFilters, {
+			type: "device",
+			value: deviceId
+		}] });
+	}
 	byFloor(floorId) {
-		return this.clone({ filters: [...this.queryState.filters, {
+		return this.clone({ indexFilters: [...this.queryState.indexFilters, {
 			type: "floor",
 			value: floorId
 		}] });
 	}
 	byLabel(labelId) {
-		return this.clone({ filters: [...this.queryState.filters, {
+		return this.clone({ indexFilters: [...this.queryState.indexFilters, {
 			type: "label",
 			value: labelId
 		}] });
 	}
 	where(predicate) {
-		return this.clone({ filters: [...this.queryState.filters, {
-			type: "predicate",
-			value: predicate
-		}] });
+		return this.clone({ predicateFilters: [...this.queryState.predicateFilters, predicate] });
+	}
+	search(searchText) {
+		const searchLower = searchText.toLowerCase();
+		return this.where((e) => e.id.toLowerCase().includes(searchLower) || e.name.toLowerCase().includes(searchLower) || e.friendlyName.toLowerCase().includes(searchLower));
 	}
 	orderBy(key, direction = "asc") {
 		return this.clone({ sorts: [...this.queryState.sorts, {
@@ -777,519 +506,559 @@ var AreaQueryBuilderImpl = class AreaQueryBuilderImpl {
 			direction
 		}] });
 	}
+	ids() {
+		return this.clone({ projection: { type: "ids" } });
+	}
+	pick(keys) {
+		return this.clone({ projection: {
+			type: "pick",
+			keys
+		} });
+	}
+	pluck(key) {
+		return this.clone({ projection: {
+			type: "pluck",
+			key
+		} });
+	}
+	map(mapper) {
+		return this.clone({ projection: {
+			type: "map",
+			mapper
+		} });
+	}
+	take(limit) {
+		return this.clone({ take: limit });
+	}
+	skip(count) {
+		return this.clone({ skip: count });
+	}
+	distinct(key) {
+		return this.clone({ distinct: key });
+	}
 	get() {
-		return this.execute();
+		return memoizedExecute(buildQuerySignature(this.queryState), () => this.execute());
 	}
 	first() {
-		return this.execute()[0];
+		return this.get()[0];
 	}
 	subscribe(callback) {
 		callback(this.get());
 		return () => {};
 	}
 	clone(updates) {
-		return new AreaQueryBuilderImpl({
+		return new EntitiesQueryBuilderImpl({
 			...this.queryState,
 			...updates
 		});
 	}
 	execute() {
-		let areas = getAreaViews();
-		for (const filter of this.queryState.filters) if (filter.type === "floor") areas = areas.filter((area) => area.floorId === filter.value);
-		else if (filter.type === "label") areas = areas.filter((area) => area.labels.includes(filter.value));
-		else if (filter.type === "predicate") areas = areas.filter(filter.value);
-		if (this.queryState.sorts.length > 0) areas = this.sortAreas(areas);
-		return areas;
+		const entityIds = this.getEntityIdsFromIndices();
+		let entities = getEntityViews(entityIds);
+		for (const filter of this.queryState.predicateFilters) entities = entities.filter(filter);
+		if (this.queryState.sorts.length > 0) entities = this.sortEntities(entities);
+		if (this.queryState.distinct) entities = this.applyDistinct(entities);
+		if (this.queryState.skip !== void 0) entities = entities.slice(this.queryState.skip);
+		if (this.queryState.take !== void 0) entities = entities.slice(0, this.queryState.take);
+		if (this.queryState.projection) return this.applyProjection(entities);
+		return entities;
 	}
-	sortAreas(areas) {
-		return [...areas].sort((a, b) => {
+	getEntityIdsFromIndices() {
+		if (this.queryState.indexFilters.length === 0) return getAllEntityIds();
+		const idSets = this.queryState.indexFilters.map((filter) => this.getIdsForFilter(filter));
+		return this.intersectArrays(idSets);
+	}
+	getIdsForFilter(filter) {
+		switch (filter.type) {
+			case "domain": return getEntitiesByDomain(filter.value);
+			case "area": return getEntitiesByArea(filter.value);
+			case "device": return getEntitiesByDevice(filter.value);
+			case "floor": return getEntitiesByFloor(filter.value);
+			case "label": return getEntitiesByLabel(filter.value);
+			default: return [];
+		}
+	}
+	intersectArrays(arrays) {
+		if (arrays.length === 0) return [];
+		if (arrays.length === 1) return arrays[0] ?? [];
+		let result = arrays[0] ?? [];
+		for (let i = 1; i < arrays.length; i++) {
+			const set = new Set(arrays[i]);
+			result = result.filter((item) => set.has(item));
+		}
+		return result;
+	}
+	sortEntities(entities) {
+		const sorted = [...entities];
+		sorted.sort((a, b) => {
 			for (const sort of this.queryState.sorts) {
-				const aValue = this.getNestedValue(a, sort.key);
-				const bValue = this.getNestedValue(b, sort.key);
-				let comparison = 0;
-				if (aValue < bValue) comparison = -1;
-				else if (aValue > bValue) comparison = 1;
+				const aVal = getNestedValue(a, sort.key);
+				const bVal = getNestedValue(b, sort.key);
+				const comparison = this.compareValues(aVal, bVal);
 				if (comparison !== 0) return sort.direction === "asc" ? comparison : -comparison;
 			}
 			return 0;
 		});
+		return sorted;
+	}
+	compareValues(a, b) {
+		if (a === b) return 0;
+		if (a === null || a === void 0) return 1;
+		if (b === null || b === void 0) return -1;
+		if (typeof a === "string" && typeof b === "string") return a.localeCompare(b);
+		if (typeof a === "number" && typeof b === "number") return a - b;
+		return String(a).localeCompare(String(b));
+	}
+	applyProjection(entities) {
+		if (!this.queryState.projection) return entities;
+		switch (this.queryState.projection.type) {
+			case "ids": return projectToIds(entities);
+			case "pick": return projectPick(entities, this.queryState.projection.keys);
+			case "pluck": return projectPluck(entities, this.queryState.projection.key);
+			case "map": return projectMap(entities, this.queryState.projection.mapper);
+			default: return entities;
+		}
+	}
+	applyDistinct(entities) {
+		if (!this.queryState.distinct) return entities;
+		const seen = /* @__PURE__ */ new Set();
+		const result = [];
+		for (const entity of entities) {
+			const value = getNestedValue(entity, this.queryState.distinct);
+			const key = JSON.stringify(value);
+			if (!seen.has(key)) {
+				seen.add(key);
+				result.push(entity);
+			}
+		}
+		return result;
 	}
-	getNestedValue(obj, key) {
-		if (key in obj) return obj[key];
-		const parts = String(key).split(".");
-		let value = obj;
-		for (const part of parts) value = value?.[part];
-		return value;
+};
+var EntityQueryBuilderImpl = class {
+	entityId;
+	constructor(entityId) {
+		this.entityId = entityId;
+	}
+	get() {
+		return getEntityView(this.entityId);
+	}
+	pluck(key) {
+		const view = this.get();
+		return view ? view[key] : void 0;
+	}
+	subscribe(callback) {
+		callback(this.get());
+		return () => {};
 	}
 };
 /**
-* Create a query builder for areas
+* Create a query builder for multiple entities
 */
-function areas() {
-	return new AreaQueryBuilderImpl();
+function entities() {
+	return new EntitiesQueryBuilderImpl();
 }
 /**
-* Create a query for a single area
+* Create a query builder for a single entity
 */
-function area(areaId) {
-	return getAreaView(areaId);
+function entity(entityId) {
+	return new EntityQueryBuilderImpl(entityId);
 }
 //#endregion
-//#region src/entities/index.ts
-/**
-* Entity Index Queries
-*
-* Provides utilities for querying entities by various criteria.
-* In the SolidJS port, indices are NOT stored in state -- they are
-* computed on the fly here (and will be derived reactively in Plan 03).
-*
-* @packageDocumentation
-*/
+//#region src/query/helpers.ts
 /**
-* Get all entity IDs
+* Create a search query builder
 */
-function getAllEntityIds() {
-	return Object.keys(state.entities);
+function searchEntities(searchText) {
+	const searchLower = searchText.toLowerCase();
+	return entities().where((e) => e.id.toLowerCase().includes(searchLower) || e.name.toLowerCase().includes(searchLower) || e.friendlyName.toLowerCase().includes(searchLower));
 }
 /**
-* Get entities by domain
+* Create a query for entities in an area by domain
 */
-function getEntitiesByDomain(domain) {
-	return Object.keys(state.entities).filter((id) => extractDomain(id) === domain);
+function entitiesByAreaAndDomain(areaId, domain) {
+	return entities().byArea(areaId).byDomain(domain);
 }
 /**
-* Get entities via devices in area
-*
-* Only includes entities that inherit area from device (entity.area_id is null).
+* Create a query for entities matching a predicate
 */
-function getEntitiesViaDevices(areaId) {
-	const devicesInArea = Object.values(state.devices).filter((device) => device.area_id === areaId);
-	const entityIds = [];
-	for (const device of devicesInArea) {
-		const deviceEntities = getEntitiesByDevice(device.id);
-		for (const entityId of deviceEntities) if (!state.entityRegistry[entityId]?.area_id) entityIds.push(entityId);
-	}
-	return entityIds;
+function entitiesWhere(predicate) {
+	return entities().where(predicate);
 }
+//#endregion
+//#region src/camera/fetch.ts
 /**
-* Get entities by area
+* Camera Stream Fetching
 *
-* Returns entities with direct area_id assignments and entities that inherit their area from devices.
+* @packageDocumentation
 */
-function getEntitiesByArea(areaId) {
-	const directEntityIds = [];
-	for (const [entityId, entry] of Object.entries(state.entityRegistry)) if (entry.area_id === areaId) directEntityIds.push(entityId);
-	const deviceEntityIds = getEntitiesViaDevices(areaId);
-	return Array.from(/* @__PURE__ */ new Set([...directEntityIds, ...deviceEntityIds]));
-}
+/** The demo's front door feed, served by the dashboard itself so the demo never reaches a third party. */
+const DEMO_HLS_STREAM = "/demo/camera/front-door.m3u8";
 /**
-* Get entities by device
+* Fetch stream for a camera entity.
+* Returns the dashboard's own demo HLS feed in demo mode.
 */
-function getEntitiesByDevice(deviceId) {
-	const entityIds = [];
-	for (const [entityId, entry] of Object.entries(state.entityRegistry)) if (entry.device_id === deviceId) entityIds.push(entityId);
-	return entityIds;
+async function fetchStream(entityId, format = "hls") {
+	if (isDemoMode()) return format === "hls" ? demoAssetUrl(DEMO_HLS_STREAM) : null;
+	if (!privilegedConn()) return null;
+	return (await sendCommand({
+		type: "camera/stream",
+		entity_id: entityId,
+		format
+	}))?.url ?? null;
 }
 /**
-* Get entities by floor
+* Transform relative stream URL to absolute URL
 */
-function getEntitiesByFloor(floorId) {
-	const entityIds = [];
-	const areasOnFloor = Object.values(state.areas).filter((area) => area.floor_id === floorId);
-	for (const area of areasOnFloor) {
-		const areaEntities = getEntitiesByArea(area.id);
-		entityIds.push(...areaEntities);
+function transformStreamUrl(streamUrl) {
+	if (!streamUrl) return null;
+	if (streamUrl.startsWith("http://") || streamUrl.startsWith("https://")) return streamUrl;
+	if (streamUrl.startsWith("/")) {
+		const hassUrl = state.hassUrl;
+		if (!hassUrl) {
+			console.warn("[fetchStreamData] No Home Assistant URL available to resolve relative stream URL");
+			return streamUrl;
+		}
+		return `${hassUrl.replace(/\/$/, "")}${streamUrl}`;
 	}
-	return entityIds;
+	return streamUrl;
 }
 /**
-* Get entities by label
+* Fetch stream data for a camera entity
 */
-function getEntitiesByLabel(labelId) {
-	const entityIds = [];
-	for (const [entityId, entry] of Object.entries(state.entityRegistry)) if (entry.labels?.includes(labelId)) entityIds.push(entityId);
-	return entityIds;
+async function fetchStreamData(entityId, options = {}) {
+	const { format = "hls" } = options;
+	try {
+		return {
+			entityId,
+			stream: {
+				url: transformStreamUrl(await fetchStream(entityId, format)),
+				loading: false,
+				error: null,
+				lastFetched: Date.now(),
+				format,
+				expiresAt: null
+			},
+			loading: false,
+			error: null,
+			lastFetched: Date.now()
+		};
+	} catch (error) {
+		return {
+			entityId,
+			stream: {
+				url: null,
+				loading: false,
+				error: error instanceof Error ? error : new Error(String(error)),
+				lastFetched: null,
+				format,
+				expiresAt: null
+			},
+			loading: false,
+			error: error instanceof Error ? error : new Error(String(error)),
+			lastFetched: null
+		};
+	}
 }
 //#endregion
-//#region src/query/memoization.ts
+//#region src/camera/query.ts
 /**
-* Build a unique signature for a query
+* Camera Stream Query Builder
+*
+* @packageDocumentation
 */
-function buildQuerySignature(query) {
-	const sig = {
-		index: query.indexFilters.map((f) => `${f.type}:${f.value}`).join(","),
-		predicates: query.predicateFilters.length,
-		sorts: query.sorts.map((s) => `${s.key}:${s.direction}`).join(","),
-		projection: query.projection ? JSON.stringify(query.projection) : null
-	};
-	return JSON.stringify(sig);
+const DEFAULT_REFRESH_INTERVAL = 24e4;
+function needsStreamRefresh(streamData, refreshInterval = DEFAULT_REFRESH_INTERVAL) {
+	if (!streamData || !streamData.lastFetched) return true;
+	return Date.now() - streamData.lastFetched >= refreshInterval;
 }
 /**
-* Execute query (no caching -- SolidJS createMemo handles this in Plan 03)
+* Get stream for a camera entity
 */
-function memoizedExecute(_signature, compute) {
-	return compute();
+async function getStream(entityId, options = {}) {
+	const { format = "hls", autoRefresh = true, refreshInterval } = options;
+	const cached = state.streams[entityId];
+	if (cached && cached.stream.format === format) {
+		if (autoRefresh && needsStreamRefresh(cached, refreshInterval)) fetchStreamData(entityId, {
+			format,
+			autoRefresh,
+			refreshInterval
+		}).then((streamData) => {
+			setState(produce((s) => {
+				s.streams[entityId] = streamData;
+			}));
+		});
+		return cached;
+	}
+	const streamData = await fetchStreamData(entityId, {
+		format,
+		autoRefresh,
+		refreshInterval
+	});
+	setState(produce((s) => {
+		s.streams[entityId] = streamData;
+	}));
+	return streamData;
 }
-//#endregion
-//#region src/query/projections.ts
 /**
-* Project entities to IDs only
-*
-* @param entities - Array of entity views
-* @returns Array of entity IDs
+* Refresh stream for a camera entity
 */
-function projectToIds(entities) {
-	return entities.map((e) => e.id);
+async function refreshStream(entityId, format = "hls") {
+	setState(produce((s) => {
+		delete s.streams[entityId];
+	}));
+	return getStream(entityId, { format });
+}
+//#endregion
+//#region src/energy/prefs.ts
+function isRecord(value) {
+	return typeof value === "object" && value !== null;
 }
 /**
-* Pick specific fields from entities
+* Fetch the HA energy dashboard preferences.
 *
-* @param entities - Array of entity views
-* @param keys - Array of field names to include
-* @returns Array of objects with only specified fields
+* Returns `null` when no energy dashboard is configured (HA raises an error
+* for `energy/get_prefs` in that case); callers treat `null` as "not
+* configured".
 */
-function projectPick(entities, keys) {
-	return entities.map((entity) => {
-		const result = {};
-		for (const key of keys) result[key] = entity[key];
-		return result;
-	});
+async function fetchEnergyPreferences(connection) {
+	if (isDemoMode()) {
+		const prefs = demoEnergyPreferences();
+		return {
+			...prefs,
+			energy_sources: prefs.energy_sources,
+			device_consumption: prefs.device_consumption
+		};
+	}
+	let response;
+	try {
+		response = await connection.sendMessagePromise({ type: "energy/get_prefs" });
+	} catch {
+		return null;
+	}
+	if (!isRecord(response)) return null;
+	const sources = Array.isArray(response.energy_sources) ? response.energy_sources.filter(isRecord) : [];
+	const devices = Array.isArray(response.device_consumption) ? response.device_consumption.filter(isRecord) : [];
+	return {
+		...response,
+		energy_sources: sources,
+		device_consumption: devices
+	};
 }
+//#endregion
+//#region src/media/url.ts
 /**
-* Pluck a single field from entities
+* Resolve an HA media reference (e.g. an entity's `entity_picture`, a camera
+* proxy path) to a URL the page can actually load.
 *
-* Supports dot-notation for nested fields (e.g., "attributes.brightness")
+* HA gives these as origin-relative paths (`/api/media_player_proxy/...?token=`)
+* carrying their own signed token. A bare `<img src>` would resolve them against
+* the dash origin and 404. When the host set `mediaProxyBase`, route through the
+* same-origin media proxy so the page CSP (`img-src 'self'`) covers it in every
+* mode, LAN and remote. Otherwise fall back to prefixing `hassUrl` directly
+* (the LAN-only path, used until a transport sets the proxy base).
 *
-* @param entities - Array of entity views
-* @param key - Field name or dot-path to extract
-* @returns Array of field values
+* Absolute URLs and non-path values pass through untouched.
 */
-function projectPluck(entities, key) {
-	return entities.map((entity) => getNestedValue(entity, key));
+function hassMediaUrl(path) {
+	if (!path) return void 0;
+	if (/^https?:\/\//i.test(path)) return path;
+	if (!path.startsWith("/")) return path;
+	const base = state.mediaProxyBase;
+	if (base) return `${base}?path=${encodeURIComponent(path)}`;
+	return state.hassUrl ? `${state.hassUrl}${path}` : path;
 }
+//#endregion
+//#region src/camera/webrtc.ts
 /**
-* Map entities using a custom function
-*
-* @param entities - Array of entity views
-* @param mapper - Function to transform each entity
-* @returns Array of mapped values
+* Get WebRTC client configuration (STUN/TURN servers) from HA
 */
-function projectMap(entities, mapper) {
-	return entities.map(mapper);
+async function getWebRtcClientConfig(entityId) {
+	const conn = privilegedConn();
+	if (!conn) throw new Error("No connection available");
+	return conn.sendMessagePromise({
+		type: "camera/webrtc/get_client_config",
+		entity_id: entityId
+	});
 }
 /**
-* Get nested value from object using dot-notation
-*
-* @param obj - Object to extract value from
-* @param path - Dot-notation path (e.g., "attributes.brightness")
-* @returns Value at path or undefined
-*
-* @example
-* ```typescript
-* const entity = { attributes: { brightness: 255 } };
-* getNestedValue(entity, "attributes.brightness"); // 255
-* ```
+* Start WebRTC session with HA.
+* Returns a promise that resolves when the answer SDP is received.
+* ICE candidates from HA are forwarded to the provided callback.
+* Local ICE candidates should be sent via sendWebRtcCandidate().
 */
-function getNestedValue(obj, path) {
-	const parts = path.split(".");
-	let current = obj;
-	for (const part of parts) {
-		if (current === null || current === void 0) return;
-		current = current[part];
-	}
-	return current;
-}
-//#endregion
-//#region src/query/builder.ts
-var EntitiesQueryBuilderImpl = class EntitiesQueryBuilderImpl {
-	queryState;
-	constructor(initialState) {
-		this.queryState = initialState ?? {
-			indexFilters: [],
-			predicateFilters: [],
-			sorts: [],
-			projection: void 0,
-			searchText: void 0,
-			take: void 0,
-			skip: void 0,
-			distinct: void 0
+function startWebRtcSession(entityId, sdpOffer, onCandidate) {
+	const conn = privilegedConn();
+	if (!conn) return Promise.reject(/* @__PURE__ */ new Error("Not connected"));
+	return new Promise((resolve, reject) => {
+		const session = {
+			sessionId: null,
+			unsubscribe: null
 		};
-	}
-	byArea(areaId) {
-		return this.clone({ indexFilters: [...this.queryState.indexFilters, {
-			type: "area",
-			value: areaId
-		}] });
-	}
-	byDomain(domain) {
-		return this.clone({ indexFilters: [...this.queryState.indexFilters, {
-			type: "domain",
-			value: domain
-		}] });
-	}
-	byDevice(deviceId) {
-		return this.clone({ indexFilters: [...this.queryState.indexFilters, {
-			type: "device",
-			value: deviceId
-		}] });
-	}
-	byFloor(floorId) {
-		return this.clone({ indexFilters: [...this.queryState.indexFilters, {
-			type: "floor",
-			value: floorId
-		}] });
-	}
-	byLabel(labelId) {
-		return this.clone({ indexFilters: [...this.queryState.indexFilters, {
-			type: "label",
-			value: labelId
-		}] });
-	}
-	where(predicate) {
-		return this.clone({ predicateFilters: [...this.queryState.predicateFilters, predicate] });
-	}
-	search(searchText) {
-		const searchLower = searchText.toLowerCase();
-		return this.where((e) => e.id.toLowerCase().includes(searchLower) || e.name.toLowerCase().includes(searchLower) || e.friendlyName.toLowerCase().includes(searchLower));
-	}
-	orderBy(key, direction = "asc") {
-		return this.clone({ sorts: [...this.queryState.sorts, {
-			key,
-			direction
-		}] });
-	}
-	ids() {
-		return this.clone({ projection: { type: "ids" } });
-	}
-	pick(keys) {
-		return this.clone({ projection: {
-			type: "pick",
-			keys
-		} });
-	}
-	pluck(key) {
-		return this.clone({ projection: {
-			type: "pluck",
-			key
-		} });
-	}
-	map(mapper) {
-		return this.clone({ projection: {
-			type: "map",
-			mapper
-		} });
-	}
-	take(limit) {
-		return this.clone({ take: limit });
-	}
-	skip(count) {
-		return this.clone({ skip: count });
-	}
-	distinct(key) {
-		return this.clone({ distinct: key });
-	}
-	get() {
-		return memoizedExecute(buildQuerySignature(this.queryState), () => this.execute());
-	}
-	first() {
-		return this.get()[0];
-	}
-	subscribe(callback) {
-		callback(this.get());
-		return () => {};
-	}
-	clone(updates) {
-		return new EntitiesQueryBuilderImpl({
-			...this.queryState,
-			...updates
-		});
-	}
-	execute() {
-		const entityIds = this.getEntityIdsFromIndices();
-		let entities = getEntityViews(entityIds);
-		for (const filter of this.queryState.predicateFilters) entities = entities.filter(filter);
-		if (this.queryState.sorts.length > 0) entities = this.sortEntities(entities);
-		if (this.queryState.distinct) entities = this.applyDistinct(entities);
-		if (this.queryState.skip !== void 0) entities = entities.slice(this.queryState.skip);
-		if (this.queryState.take !== void 0) entities = entities.slice(0, this.queryState.take);
-		if (this.queryState.projection) return this.applyProjection(entities);
-		return entities;
-	}
-	getEntityIdsFromIndices() {
-		if (this.queryState.indexFilters.length === 0) return getAllEntityIds();
-		const idSets = this.queryState.indexFilters.map((filter) => this.getIdsForFilter(filter));
-		return this.intersectArrays(idSets);
-	}
-	getIdsForFilter(filter) {
-		switch (filter.type) {
-			case "domain": return getEntitiesByDomain(filter.value);
-			case "area": return getEntitiesByArea(filter.value);
-			case "device": return getEntitiesByDevice(filter.value);
-			case "floor": return getEntitiesByFloor(filter.value);
-			case "label": return getEntitiesByLabel(filter.value);
-			default: return [];
-		}
-	}
-	intersectArrays(arrays) {
-		if (arrays.length === 0) return [];
-		if (arrays.length === 1) return arrays[0] ?? [];
-		let result = arrays[0] ?? [];
-		for (let i = 1; i < arrays.length; i++) {
-			const set = new Set(arrays[i]);
-			result = result.filter((item) => set.has(item));
-		}
-		return result;
-	}
-	sortEntities(entities) {
-		const sorted = [...entities];
-		sorted.sort((a, b) => {
-			for (const sort of this.queryState.sorts) {
-				const aVal = getNestedValue(a, sort.key);
-				const bVal = getNestedValue(b, sort.key);
-				const comparison = this.compareValues(aVal, bVal);
-				if (comparison !== 0) return sort.direction === "asc" ? comparison : -comparison;
+		let answered = false;
+		const timeout = setTimeout(() => {
+			if (!answered) {
+				session.unsubscribe?.().catch(logUnsubscribeError);
+				reject(/* @__PURE__ */ new Error("WebRTC offer timed out"));
 			}
-			return 0;
-		});
-		return sorted;
-	}
-	compareValues(a, b) {
-		if (a === b) return 0;
-		if (a === null || a === void 0) return 1;
-		if (b === null || b === void 0) return -1;
-		if (typeof a === "string" && typeof b === "string") return a.localeCompare(b);
-		if (typeof a === "number" && typeof b === "number") return a - b;
-		return String(a).localeCompare(String(b));
-	}
-	applyProjection(entities) {
-		if (!this.queryState.projection) return entities;
-		switch (this.queryState.projection.type) {
-			case "ids": return projectToIds(entities);
-			case "pick": return projectPick(entities, this.queryState.projection.keys);
-			case "pluck": return projectPluck(entities, this.queryState.projection.key);
-			case "map": return projectMap(entities, this.queryState.projection.mapper);
-			default: return entities;
-		}
-	}
-	applyDistinct(entities) {
-		if (!this.queryState.distinct) return entities;
-		const seen = /* @__PURE__ */ new Set();
-		const result = [];
-		for (const entity of entities) {
-			const value = getNestedValue(entity, this.queryState.distinct);
-			const key = JSON.stringify(value);
-			if (!seen.has(key)) {
-				seen.add(key);
-				result.push(entity);
+		}, 15e3);
+		conn.subscribeMessage((event) => {
+			switch (event.type) {
+				case "session":
+					session.sessionId = event.session_id ?? null;
+					break;
+				case "answer":
+					if (event.answer) {
+						answered = true;
+						clearTimeout(timeout);
+						resolve({
+							answer: event.answer,
+							session
+						});
+					}
+					break;
+				case "candidate":
+					if (event.candidate) onCandidate(event.candidate);
+					break;
+				case "error":
+					clearTimeout(timeout);
+					session.unsubscribe?.().catch(logUnsubscribeError);
+					reject(new Error(event.message || event.code || "WebRTC offer failed"));
 			}
-		}
-		return result;
-	}
-};
-var EntityQueryBuilderImpl = class {
-	entityId;
-	constructor(entityId) {
-		this.entityId = entityId;
-	}
-	get() {
-		return getEntityView(this.entityId);
-	}
-	pluck(key) {
-		const view = this.get();
-		return view ? view[key] : void 0;
-	}
-	subscribe(callback) {
-		callback(this.get());
-		return () => {};
-	}
-};
-/**
-* Create a query builder for multiple entities
-*/
-function entities() {
-	return new EntitiesQueryBuilderImpl();
+		}, {
+			type: "camera/webrtc/offer",
+			entity_id: entityId,
+			offer: sdpOffer
+		}).then((unsub) => {
+			session.unsubscribe = unsub;
+		}).catch((err) => {
+			clearTimeout(timeout);
+			reject(err);
+		});
+	});
 }
 /**
-* Create a query builder for a single entity
+* Send a local ICE candidate to HA
 */
-function entity(entityId) {
-	return new EntityQueryBuilderImpl(entityId);
+async function sendWebRtcCandidate(entityId, sessionId, candidate) {
+	const conn = privilegedConn();
+	if (!conn) throw new Error("Not connected");
+	await conn.sendMessagePromise({
+		type: "camera/webrtc/candidate",
+		entity_id: entityId,
+		session_id: sessionId,
+		candidate
+	});
+}
+function logUnsubscribeError(error) {
+	console.error("[@glasshome/sync-layer] WebRTC unsubscribe failed:", error);
 }
 //#endregion
-//#region src/query/helpers.ts
+//#region src/history/constants.ts
 /**
-* Create a search query builder
-*/
-function searchEntities(searchText) {
-	const searchLower = searchText.toLowerCase();
-	return entities().where((e) => e.id.toLowerCase().includes(searchLower) || e.name.toLowerCase().includes(searchLower) || e.friendlyName.toLowerCase().includes(searchLower));
-}
-/**
-* Create a query for entities in an area by domain
+* History Constants
+*
+* Constants and utilities for history fetching and processing.
+* Based on Home Assistant frontend implementation.
+*
+* @packageDocumentation
 */
-function entitiesByAreaAndDomain(areaId, domain) {
-	return entities().byArea(areaId).byDomain(domain);
-}
+const DOMAINS_USE_LAST_UPDATED = [
+	"climate",
+	"humidifier",
+	"water_heater"
+];
+const NEED_ATTRIBUTE_DOMAINS = [
+	"climate",
+	"humidifier",
+	"input_datetime",
+	"water_heater",
+	"person",
+	"device_tracker"
+];
+const LINE_ATTRIBUTES_TO_KEEP = [
+	"temperature",
+	"current_temperature",
+	"target_temp_low",
+	"target_temp_high",
+	"hvac_action",
+	"humidity",
+	"mode",
+	"action",
+	"current_humidity"
+];
 /**
-* Create a query for entities matching a predicate
+* Check if an entity needs attributes in history response
 */
-function entitiesWhere(predicate) {
-	return entities().where(predicate);
+function entityIdHistoryNeedsAttributes(entityId) {
+	const domain = extractDomain(entityId);
+	if (!state.entities[entityId]) return NEED_ATTRIBUTE_DOMAINS.includes(domain);
+	return NEED_ATTRIBUTE_DOMAINS.includes(domain);
 }
 //#endregion
-//#region src/camera/fetch.ts
+//#region src/history/fetch.ts
 /**
-* Camera Stream Fetching
+* History Fetching
 *
 * @packageDocumentation
 */
-/** The demo's front door feed, served by the dashboard itself so the demo never reaches a third party. */
-const DEMO_HLS_STREAM = "/demo/camera/front-door.m3u8";
-/**
-* Fetch stream for a camera entity.
-* Returns the dashboard's own demo HLS feed in demo mode.
-*/
-async function fetchStream(entityId, format = "hls") {
-	if (isDemoMode()) return format === "hls" ? demoAssetUrl(DEMO_HLS_STREAM) : null;
-	if (!privilegedConn()) return null;
-	return (await sendCommand({
-		type: "camera/stream",
-		entity_id: entityId,
-		format
-	}))?.url ?? null;
-}
 /**
-* Transform relative stream URL to absolute URL
+* Fetch history for entities during a time period
 */
-function transformStreamUrl(streamUrl) {
-	if (!streamUrl) return null;
-	if (streamUrl.startsWith("http://") || streamUrl.startsWith("https://")) return streamUrl;
-	if (streamUrl.startsWith("/")) {
-		const hassUrl = state.hassUrl;
-		if (!hassUrl) {
-			console.warn("[fetchStreamData] No Home Assistant URL available to resolve relative stream URL");
-			return streamUrl;
+async function fetchHistory(options) {
+	const { startTime, endTime, entityIds = [], includeStartTimeState = true, significantChangesOnly = true, minimalResponse = true, noAttributes: noAttributesOverride } = options;
+	if (isDemoMode()) {
+		const endMs = (endTime ?? /* @__PURE__ */ new Date()).getTime();
+		const result = {};
+		for (const id of entityIds) {
+			const points = isEnergyEntity(id) ? synthesizeEnergyHistory(id, startTime.getTime(), endMs) : numericSensorHistory(id, startTime.getTime(), endMs);
+			if (!points) continue;
+			result[id] = points.map((p) => ({
+				s: p.s,
+				a: {},
+				lu: p.lu
+			}));
 		}
-		return `${hassUrl.replace(/\/$/, "")}${streamUrl}`;
+		return result;
 	}
-	return streamUrl;
+	const startTimeStr = startTime.toISOString();
+	const endTimeStr = endTime?.toISOString();
+	const params = {
+		type: "history/history_during_period",
+		start_time: startTimeStr,
+		minimal_response: minimalResponse,
+		no_attributes: noAttributesOverride ?? (entityIds.length === 0 ? false : !entityIds.some((entityId) => entityIdHistoryNeedsAttributes(entityId))),
+		include_start_time_state: includeStartTimeState,
+		significant_changes_only: significantChangesOnly
+	};
+	if (endTimeStr) params.end_time = endTimeStr;
+	if (entityIds.length !== 0) params.entity_ids = entityIds;
+	return await sendCommand(params) ?? {};
 }
 /**
-* Fetch stream data for a camera entity
+* Fetch history for a single entity
 */
-async function fetchStreamData(entityId, options = {}) {
-	const { format = "hls" } = options;
+async function fetchEntityHistory(entityId, options) {
+	const { startTime, endTime, includeStartTimeState = true, significantChangesOnly = true, minimalResponse = false, noAttributes = false } = options;
 	try {
+		const entityHistory = (await fetchHistory({
+			startTime,
+			endTime,
+			entityIds: [entityId],
+			includeStartTimeState,
+			significantChangesOnly,
+			minimalResponse,
+			noAttributes
+		}))[entityId] ?? [];
 		return {
 			entityId,
-			stream: {
-				url: transformStreamUrl(await fetchStream(entityId, format)),
-				loading: false,
-				error: null,
-				lastFetched: Date.now(),
-				format,
-				expiresAt: null
-			},
+			timeline: entityHistory.map((s) => ({
+				timestamp: s.lu,
+				state: s.s,
+				attributes: s.a,
+				lastChanged: s.lc,
+				lastUpdated: s.lu
+			})),
+			entityHistory,
 			loading: false,
 			error: null,
 			lastFetched: Date.now()
@@ -1297,209 +1066,117 @@ async function fetchStreamData(entityId, options = {}) {
 	} catch (error) {
 		return {
 			entityId,
-			stream: {
-				url: null,
-				loading: false,
-				error: error instanceof Error ? error : new Error(String(error)),
-				lastFetched: null,
-				format,
-				expiresAt: null
-			},
+			timeline: [],
+			entityHistory: [],
 			loading: false,
 			error: error instanceof Error ? error : new Error(String(error)),
 			lastFetched: null
 		};
 	}
 }
-//#endregion
-//#region src/camera/query.ts
 /**
-* Camera Stream Query Builder
-*
-* @packageDocumentation
+* Convert compressed history state to timeline state
 */
-const DEFAULT_REFRESH_INTERVAL = 24e4;
-function needsStreamRefresh(streamData, refreshInterval = DEFAULT_REFRESH_INTERVAL) {
-	if (!streamData || !streamData.lastFetched) return true;
-	return Date.now() - streamData.lastFetched >= refreshInterval;
+function historyStateToTimeline(s) {
+	return {
+		timestamp: s.lu,
+		state: s.s,
+		attributes: s.a,
+		lastChanged: s.lc,
+		lastUpdated: s.lu
+	};
 }
-/**
-* Get stream for a camera entity
-*/
-async function getStream(entityId, options = {}) {
-	const { format = "hls", autoRefresh = true, refreshInterval } = options;
-	const cached = state.streams[entityId];
-	if (cached && cached.stream.format === format) {
-		if (autoRefresh && needsStreamRefresh(cached, refreshInterval)) fetchStreamData(entityId, {
-			format,
-			autoRefresh,
-			refreshInterval
-		}).then((streamData) => {
-			setState(produce((s) => {
-				s.streams[entityId] = streamData;
-			}));
-		});
-		return cached;
+//#endregion
+//#region src/history/query.ts
+/** Hard cap on retained points per entity timeline. */
+const MAX_HISTORY_POINTS = 5760;
+/** Live tracker count per entity. Ref-counted because a timeline is shared: two
+*  widgets on the same entity must not let the first unmount delete the store
+*  data the second is still rendering (appendHistoryPoint would then silently
+*  drop every update and the survivor's chart would freeze). */
+const trackedEntities = /* @__PURE__ */ new Map();
+/** Check if an entity has active history tracking. */
+function isHistoryTracked(entityId) {
+	return trackedEntities.has(entityId);
+}
+/** Start tracking history for an entity. Fetches initial backfill. */
+async function trackEntityHistory(entityId, options) {
+	trackedEntities.set(entityId, (trackedEntities.get(entityId) ?? 0) + 1);
+	const historyData = await fetchEntityHistory(entityId, options);
+	setState(produce((s) => {
+		s.history[entityId] = historyData;
+	}));
+	return historyData;
+}
+/** Release one tracker. The entity's data is cleared only when the last one goes. */
+function untrackEntityHistory(entityId) {
+	const remaining = (trackedEntities.get(entityId) ?? 0) - 1;
+	if (remaining > 0) {
+		trackedEntities.set(entityId, remaining);
+		return;
 	}
-	const streamData = await fetchStreamData(entityId, {
-		format,
-		autoRefresh,
-		refreshInterval
-	});
+	trackedEntities.delete(entityId);
 	setState(produce((s) => {
-		s.streams[entityId] = streamData;
+		delete s.history[entityId];
 	}));
-	return streamData;
 }
 /**
-* Refresh stream for a camera entity
+* Append a state change to an entity's history.
+* Called by the entity subscription handler when a tracked entity changes.
 */
-async function refreshStream(entityId, format = "hls") {
+function appendHistoryPoint(entityId, stateValue, attributes, lastUpdated, lastChanged) {
 	setState(produce((s) => {
-		delete s.streams[entityId];
+		const history = s.history[entityId];
+		if (!history) return;
+		const point = {
+			s: stateValue,
+			a: attributes,
+			lu: lastUpdated,
+			lc: lastChanged
+		};
+		history.entityHistory.push(point);
+		history.timeline.push({
+			timestamp: lastUpdated,
+			state: stateValue,
+			attributes,
+			lastChanged,
+			lastUpdated
+		});
 	}));
-	return getStream(entityId, { format });
-}
-//#endregion
-//#region src/energy/prefs.ts
-function isRecord(value) {
-	return typeof value === "object" && value !== null;
 }
 /**
-* Fetch the HA energy dashboard preferences.
-*
-* Returns `null` when no energy dashboard is configured (HA raises an error
-* for `energy/get_prefs` in that case); callers treat `null` as "not
-* configured".
+* Append multiple history points in a single setState(produce(...)).
+* Called by the rAF-batched subscription flush.
 */
-async function fetchEnergyPreferences(connection) {
-	if (isDemoMode()) {
-		const prefs = demoEnergyPreferences();
-		return {
-			...prefs,
-			energy_sources: prefs.energy_sources,
-			device_consumption: prefs.device_consumption
-		};
-	}
-	let response;
-	try {
-		response = await connection.sendMessagePromise({ type: "energy/get_prefs" });
-	} catch {
-		return null;
-	}
-	if (!isRecord(response)) return null;
-	const sources = Array.isArray(response.energy_sources) ? response.energy_sources.filter(isRecord) : [];
-	const devices = Array.isArray(response.device_consumption) ? response.device_consumption.filter(isRecord) : [];
-	return {
-		...response,
-		energy_sources: sources,
-		device_consumption: devices
-	};
-}
-//#endregion
-//#region src/media/url.ts
-/**
-* Resolve an HA media reference (e.g. an entity's `entity_picture`, a camera
-* proxy path) to a URL the page can actually load.
-*
-* HA gives these as origin-relative paths (`/api/media_player_proxy/...?token=`)
-* carrying their own signed token. A bare `<img src>` would resolve them against
-* the dash origin and 404. When the host set `mediaProxyBase`, route through the
-* same-origin media proxy so the page CSP (`img-src 'self'`) covers it in every
-* mode, LAN and remote. Otherwise fall back to prefixing `hassUrl` directly
-* (the LAN-only path, used until a transport sets the proxy base).
-*
-* Absolute URLs and non-path values pass through untouched.
-*/
-function hassMediaUrl(path) {
-	if (!path) return void 0;
-	if (/^https?:\/\//i.test(path)) return path;
-	if (!path.startsWith("/")) return path;
-	const base = state.mediaProxyBase;
-	if (base) return `${base}?path=${encodeURIComponent(path)}`;
-	return state.hassUrl ? `${state.hassUrl}${path}` : path;
-}
-//#endregion
-//#region src/camera/webrtc.ts
-/**
-* Get WebRTC client configuration (STUN/TURN servers) from HA
-*/
-async function getWebRtcClientConfig(entityId) {
-	const conn = privilegedConn();
-	if (!conn) throw new Error("No connection available");
-	return conn.sendMessagePromise({
-		type: "camera/webrtc/get_client_config",
-		entity_id: entityId
-	});
-}
-/**
-* Start WebRTC session with HA.
-* Returns a promise that resolves when the answer SDP is received.
-* ICE candidates from HA are forwarded to the provided callback.
-* Local ICE candidates should be sent via sendWebRtcCandidate().
-*/
-function startWebRtcSession(entityId, sdpOffer, onCandidate) {
-	const conn = privilegedConn();
-	if (!conn) return Promise.reject(/* @__PURE__ */ new Error("Not connected"));
-	return new Promise((resolve, reject) => {
-		const session = {
-			sessionId: null,
-			unsubscribe: null
-		};
-		let answered = false;
-		const timeout = setTimeout(() => {
-			if (!answered) {
-				session.unsubscribe?.();
-				reject(/* @__PURE__ */ new Error("WebRTC offer timed out"));
-			}
-		}, 15e3);
-		conn.subscribeMessage((event) => {
-			switch (event.type) {
-				case "session":
-					session.sessionId = event.session_id ?? null;
-					break;
-				case "answer":
-					if (event.answer) {
-						answered = true;
-						clearTimeout(timeout);
-						resolve({
-							answer: event.answer,
-							session
-						});
-					}
-					break;
-				case "candidate":
-					if (event.candidate) onCandidate(event.candidate);
-					break;
-				case "error":
-					clearTimeout(timeout);
-					session.unsubscribe?.();
-					reject(new Error(event.message || event.code || "WebRTC offer failed"));
-			}
-		}, {
-			type: "camera/webrtc/offer",
-			entity_id: entityId,
-			offer: sdpOffer
-		}).then((unsub) => {
-			session.unsubscribe = unsub;
-		}).catch((err) => {
-			clearTimeout(timeout);
-			reject(err);
-		});
-	});
-}
-/**
-* Send a local ICE candidate to HA
-*/
-async function sendWebRtcCandidate(entityId, sessionId, candidate) {
-	const conn = privilegedConn();
-	if (!conn) throw new Error("Not connected");
-	await conn.sendMessagePromise({
-		type: "camera/webrtc/candidate",
-		entity_id: entityId,
-		session_id: sessionId,
-		candidate
-	});
+function bulkAppendHistoryPoints(points) {
+	if (points.length === 0) return;
+	setState(produce((s) => {
+		const touched = /* @__PURE__ */ new Set();
+		for (const { entityId, stateValue, attributes, lastUpdated, lastChanged } of points) {
+			const history = s.history[entityId];
+			if (!history) continue;
+			history.entityHistory.push({
+				s: stateValue,
+				a: attributes,
+				lu: lastUpdated,
+				lc: lastChanged
+			});
+			history.timeline.push({
+				timestamp: lastUpdated,
+				state: stateValue,
+				attributes,
+				lastChanged,
+				lastUpdated
+			});
+			touched.add(entityId);
+		}
+		for (const entityId of touched) {
+			const history = s.history[entityId];
+			if (!history) continue;
+			if (history.entityHistory.length > 5760) history.entityHistory.splice(0, history.entityHistory.length - MAX_HISTORY_POINTS);
+			if (history.timeline.length > 5760) history.timeline.splice(0, history.timeline.length - MAX_HISTORY_POINTS);
+		}
+	}));
 }
 //#endregion
 //#region src/weather/query.ts
@@ -1513,10 +1190,11 @@ async function sendWebRtcCandidate(entityId, sessionId, candidate) {
 */
 async function getForecast(entityId, type) {
 	const cached = state.forecasts[entityId];
-	if (cached?.forecasts[type] && cached.lastFetched[type]) return {
+	const cachedForecast = cached?.forecasts[type];
+	if (cached && cachedForecast && cached.lastFetched[type]) return {
 		entityId,
 		type,
-		forecast: cached.forecasts[type],
+		forecast: cachedForecast,
 		loading: cached.loading[type] ?? false,
 		error: cached.errors[type] ?? null,
 		lastFetched: cached.lastFetched[type] ?? null
@@ -1544,15 +1222,18 @@ async function getForecasts(entityId, types) {
 	const cachedData = {};
 	const typesToFetch = [];
 	const forecastsRecord = state.forecasts[entityId];
-	for (const type of types) if (forecastsRecord?.forecasts[type] && forecastsRecord.lastFetched[type]) cachedData[type] = {
-		entityId,
-		type,
-		forecast: forecastsRecord.forecasts[type],
-		loading: forecastsRecord.loading[type] ?? false,
-		error: forecastsRecord.errors[type] ?? null,
-		lastFetched: forecastsRecord.lastFetched[type] ?? null
-	};
-	else typesToFetch.push(type);
+	for (const type of types) {
+		const cachedForecast = forecastsRecord?.forecasts[type];
+		if (forecastsRecord && cachedForecast && forecastsRecord.lastFetched[type]) cachedData[type] = {
+			entityId,
+			type,
+			forecast: cachedForecast,
+			loading: forecastsRecord.loading[type] ?? false,
+			error: forecastsRecord.errors[type] ?? null,
+			lastFetched: forecastsRecord.lastFetched[type] ?? null
+		};
+		else typesToFetch.push(type);
+	}
 	let fetchedData;
 	if (typesToFetch.length > 0) {
 		fetchedData = await fetchForecasts(entityId, typesToFetch);
@@ -1571,11 +1252,14 @@ async function getForecasts(entityId, types) {
 				s.forecasts[entityId].lastFetched[type] = fetchedData.lastFetched[type] ?? null;
 			}
 		}));
-		for (const type of types) if (cachedData[type]) {
-			fetchedData.forecasts[type] = cachedData[type].forecast;
-			fetchedData.loading[type] = cachedData[type].loading;
-			fetchedData.errors[type] = cachedData[type].error;
-			fetchedData.lastFetched[type] = cachedData[type].lastFetched;
+		for (const type of types) {
+			const cached = cachedData[type];
+			if (cached) {
+				fetchedData.forecasts[type] = cached.forecast;
+				fetchedData.loading[type] = cached.loading;
+				fetchedData.errors[type] = cached.error;
+				fetchedData.lastFetched[type] = cached.lastFetched;
+			}
 		}
 	} else {
 		fetchedData = {
@@ -1587,6 +1271,7 @@ async function getForecasts(entityId, types) {
 		};
 		for (const type of types) {
 			const cached = cachedData[type];
+			if (!cached) continue;
 			fetchedData.forecasts[type] = cached.forecast;
 			fetchedData.loading[type] = cached.loading;
 			fetchedData.errors[type] = cached.error;
@@ -1782,6 +1467,285 @@ function createHaBridge(worker, events = {}) {
 	};
 }
 //#endregion
+//#region src/connection/subscriptions.ts
+/** Registry subscription cleanup functions (entity sub managed by subscription-manager) */
+let registrySubscriptions = [];
+/** Buffered messages waiting for next animation frame */
+let messageBuffer = [];
+let rafScheduled = false;
+function bufferMessage(message) {
+	messageBuffer.push(message);
+	if (!rafScheduled) {
+		rafScheduled = true;
+		(typeof requestAnimationFrame === "function" ? requestAnimationFrame : queueMicrotask)(flushMessageBuffer);
+	}
+}
+function flushMessageBuffer() {
+	rafScheduled = false;
+	const messages = messageBuffer;
+	messageBuffer = [];
+	if (messages.length === 0) return;
+	setState(produce((s) => {
+		for (const message of messages) {
+			if (message.a) for (const [entityId, compressedState] of Object.entries(message.a)) applyCompressedState(s, entityId, compressedState);
+			if (message.c) for (const [entityId, diff] of Object.entries(message.c)) applyStateDiff(s, entityId, diff);
+			if (message.r) for (const entityId of message.r) delete s.entities[entityId];
+		}
+	}));
+	const historyPoints = [];
+	for (const message of messages) {
+		if (message.a) for (const [entityId, compressedState] of Object.entries(message.a)) collectHistoryFromCompressed(historyPoints, entityId, compressedState);
+		if (message.c) {
+			for (const [entityId, diff] of Object.entries(message.c)) if (diff["+"]) collectHistoryFromDiff(historyPoints, entityId, diff["+"]);
+		}
+	}
+	if (historyPoints.length > 0) bulkAppendHistoryPoints(historyPoints);
+}
+/**
+* Subscribe to entity state updates with an entity_ids filter.
+* Called by the subscription manager on flush.
+*/
+async function subscribeEntities(connection, entityIds) {
+	const subscribeMsg = { type: "subscribe_entities" };
+	if (entityIds.length > 0) subscribeMsg.entity_ids = entityIds;
+	return await connection.subscribeMessage((message) => {
+		bufferMessage(message);
+	}, subscribeMsg);
+}
+/**
+* Subscribe to all relevant events from Home Assistant
+*/
+async function subscribeToUpdates(conn) {
+	await cleanupSubscriptions();
+	setManagerConnection(conn);
+	setResubscribeHandler(subscribeEntities);
+	const registryUpdatedSub = await conn.subscribeEvents((event) => {
+		handleRegistryUpdate(event);
+	}, "entity_registry_updated");
+	registrySubscriptions.push(() => registryUpdatedSub());
+	const deviceRegistrySub = await conn.subscribeEvents((event) => {
+		handleDeviceRegistryUpdate(event);
+	}, "device_registry_updated");
+	registrySubscriptions.push(() => deviceRegistrySub());
+	const areaRegistrySub = await conn.subscribeEvents((event) => {
+		handleAreaRegistryUpdate(event);
+	}, "area_registry_updated");
+	registrySubscriptions.push(() => areaRegistrySub());
+	const floorRegistrySub = await conn.subscribeEvents((event) => {
+		handleFloorRegistryUpdate(event);
+	}, "floor_registry_updated");
+	registrySubscriptions.push(() => floorRegistrySub());
+	const labelRegistrySub = await conn.subscribeEvents((event) => {
+		handleLabelRegistryUpdate(event);
+	}, "label_registry_updated");
+	registrySubscriptions.push(() => labelRegistrySub());
+	const statisticsSub = await conn.subscribeEvents((event) => {
+		handleStatisticsUpdate(event);
+	}, "recorder_5min_statistics_generated");
+	registrySubscriptions.push(() => statisticsSub());
+	const coreConfigSub = await conn.subscribeEvents(() => {
+		handleCoreConfigUpdate();
+	}, "core_config_updated");
+	registrySubscriptions.push(() => coreConfigSub());
+}
+/**
+* Clean up all active subscriptions
+*/
+async function cleanupSubscriptions() {
+	const subscriptions = [...registrySubscriptions];
+	for (const unsub of subscriptions) await unsub();
+	registrySubscriptions = [];
+}
+async function handleCoreConfigUpdate() {
+	const conn = privilegedConn();
+	if (!conn) return;
+	try {
+		const config = await conn.sendMessagePromise({ type: "get_config" });
+		if (config) setState("config", config);
+	} catch (error) {
+		console.error("Error refreshing core config:", error);
+	}
+}
+async function handleRegistryUpdate(event) {
+	const { action, entity_id } = event.data;
+	if (action === "create" || action === "update") {
+		const conn = privilegedConn();
+		if (!conn) return;
+		try {
+			const entry = await conn.sendMessagePromise({
+				type: "config/entity_registry/get",
+				entity_id
+			});
+			if (entry) updateEntityRegistry(entry);
+		} catch (error) {
+			console.error("Error fetching registry entry:", error);
+		}
+	} else if (action === "remove") removeEntityRegistry(entity_id);
+}
+async function handleDeviceRegistryUpdate(event) {
+	const { action, device_id } = event.data;
+	if (action === "create" || action === "update") {
+		const conn = privilegedConn();
+		if (!conn) return;
+		try {
+			const device = (await conn.sendMessagePromise({ type: "config/device_registry/list" })).find((d) => d.id === device_id);
+			if (device) updateDevice(device);
+		} catch (error) {
+			console.error("Error fetching device:", error);
+		}
+	} else if (action === "remove") removeDevice(device_id);
+}
+async function handleAreaRegistryUpdate(event) {
+	const { action, area_id } = event.data;
+	if (action === "create" || action === "update") {
+		const conn = privilegedConn();
+		if (!conn) return;
+		try {
+			const area = (await conn.sendMessagePromise({ type: "config/area_registry/list" })).find((a) => a.id === area_id);
+			if (area) updateArea(area);
+		} catch (error) {
+			console.error("Error fetching area:", error);
+		}
+	} else if (action === "remove") removeArea(area_id);
+}
+async function handleFloorRegistryUpdate(event) {
+	const { action, floor_id } = event.data;
+	if (action === "create" || action === "update") {
+		const conn = privilegedConn();
+		if (!conn) return;
+		try {
+			const floor = (await conn.sendMessagePromise({ type: "config/floor_registry/list" })).find((f) => f.floor_id === floor_id);
+			if (floor) updateFloor(floor);
+		} catch (error) {
+			console.error("Error fetching floor:", error);
+		}
+	} else if (action === "remove") removeFloor(floor_id);
+}
+async function handleLabelRegistryUpdate(event) {
+	const { action, label_id } = event.data;
+	if (action === "create" || action === "update") {
+		const conn = privilegedConn();
+		if (!conn) return;
+		try {
+			const label = (await conn.sendMessagePromise({ type: "config/label_registry/list" })).find((l) => l.label_id === label_id);
+			if (label) updateLabel(label);
+		} catch (error) {
+			console.error("Error fetching label:", error);
+		}
+	} else if (action === "remove") removeLabel(label_id);
+}
+async function handleStatisticsUpdate(event) {
+	const { statistic_ids } = event.data;
+	if (!statistic_ids || statistic_ids.length === 0) return;
+	const conn = privilegedConn();
+	if (!conn) return;
+	try {
+		const metadata = await conn.sendMessagePromise({
+			type: "recorder/get_statistics_metadata",
+			statistic_ids
+		});
+		if (metadata && Array.isArray(metadata)) updateStatisticsMetadata(metadata);
+	} catch (error) {
+		console.error("Error fetching statistics metadata:", error);
+	}
+}
+function timestampToIso(timestamp) {
+	if (timestamp === void 0) return (/* @__PURE__ */ new Date()).toISOString();
+	if (typeof timestamp === "string") return timestamp;
+	return (/* @__PURE__ */ new Date(timestamp * 1e3)).toISOString();
+}
+function collectHistoryFromCompressed(points, entityId, compressed) {
+	if (!isHistoryTracked(entityId)) return;
+	const stateVal = compressed.s ?? compressed.state ?? "unknown";
+	const attributes = compressed.a ?? compressed.attributes ?? {};
+	const lu = compressed.lu ?? (compressed.last_updated ? new Date(compressed.last_updated).getTime() / 1e3 : Date.now() / 1e3);
+	const lc = compressed.lc ?? (compressed.last_changed ? new Date(compressed.last_changed).getTime() / 1e3 : void 0);
+	points.push({
+		entityId,
+		stateValue: stateVal,
+		attributes,
+		lastUpdated: lu,
+		lastChanged: lc
+	});
+}
+function collectHistoryFromDiff(points, entityId, additions) {
+	if (!isHistoryTracked(entityId)) return;
+	const stateVal = additions.s ?? additions.state;
+	if (stateVal === void 0) return;
+	const lu = additions.lu ?? Date.now() / 1e3;
+	const lc = additions.lc;
+	const attributes = additions.a ?? additions.attributes ?? {};
+	points.push({
+		entityId,
+		stateValue: stateVal,
+		attributes,
+		lastUpdated: lu,
+		lastChanged: lc
+	});
+}
+function shallowEqualAttributes(existing, incoming) {
+	const incomingKeys = Object.keys(incoming);
+	for (const key of incomingKeys) if (existing[key] !== incoming[key]) return false;
+	return true;
+}
+function applyCompressedState(s, entityId, compressed) {
+	const stateVal = compressed.s ?? compressed.state ?? "unknown";
+	const attributes = compressed.a ?? compressed.attributes ?? {};
+	const context = compressed.c ?? compressed.context ?? {
+		id: "",
+		parent_id: null,
+		user_id: null
+	};
+	const lastChanged = timestampToIso(compressed.lc ?? compressed.last_changed);
+	const lastUpdated = timestampToIso(compressed.lu ?? compressed.last_updated);
+	const existing = s.entities[entityId];
+	if (existing) {
+		const stateChanged = existing.state !== stateVal;
+		const changedAt = existing.last_changed !== lastChanged;
+		if (stateChanged) existing.state = stateVal;
+		if (changedAt) existing.last_changed = lastChanged;
+		if (stateChanged || changedAt) existing.last_updated = lastUpdated;
+		if (!shallowEqualAttributes(existing.attributes, attributes)) Object.assign(existing.attributes, attributes);
+		if (existing.context.id !== context.id) existing.context = context;
+	} else s.entities[entityId] = {
+		entity_id: entityId,
+		state: stateVal,
+		attributes,
+		last_changed: lastChanged,
+		last_updated: lastUpdated,
+		context
+	};
+}
+function applyStateDiff(s, entityId, diff) {
+	const existing = s.entities[entityId];
+	if (!existing) return;
+	const additions = diff["+"];
+	if (additions) {
+		let stateChanged = false;
+		if (additions.s !== void 0 && existing.state !== additions.s) {
+			existing.state = additions.s;
+			stateChanged = true;
+		}
+		if (additions.a) {
+			for (const [key, value] of Object.entries(additions.a)) if (existing.attributes[key] !== value) {
+				existing.attributes[key] = value;
+				stateChanged = true;
+			}
+		}
+		if (additions.lc !== void 0) {
+			const lcIso = timestampToIso(additions.lc);
+			if (existing.last_changed !== lcIso) {
+				existing.last_changed = lcIso;
+				stateChanged = true;
+			}
+		}
+		if (additions.lu !== void 0 && stateChanged) existing.last_updated = timestampToIso(additions.lu);
+		if (additions.c && existing.context.id !== additions.c.id) existing.context = additions.c;
+	}
+	const removals = diff["-"];
+	if (removals?.a) for (const key of removals.a) delete existing.attributes[key];
+}
+//#endregion
 //#region src/connection/bridged.ts
 /**
 * Wire an HA bridge (worker-backed connection) into the store. The bridge's