@camstack/addon-provider-homeassistant 1.2.653 → 1.2.655

package/dist/addon.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_ha_broker_source = require("./ha-broker-source-DnSL-mbs.js");
+const require_ha_instance_settings = require("./ha-instance-settings-5Ms7yRju.js");
 let node_crypto = require("node:crypto");
 let node_zlib = require("node:zlib");
 //#region src/ha-admin-link.ts
@@ -72,21 +72,21 @@ function registerHaAdminLink(ctx, deviceId, brokerId, subject) {
 		});
 		return null;
 	};
-	ctx.registerNativeCap(require_ha_broker_source.deviceAdminLinkCapability, { getAdminLink: async (input) => {
+	ctx.registerNativeCap(require_ha_instance_settings.deviceAdminLinkCapability, { getAdminLink: async (input) => {
 		if (input.deviceId !== deviceId) throw new Error(`HaAdminLink: deviceId mismatch, expected ${deviceId}, got ${input.deviceId}`);
 		if (cachedBaseUrl === null) {
 			const raw = (await ctx.api.broker.getBrokerConfig.query({ id: brokerId }))?.["baseUrl"];
 			if (typeof raw !== "string" || raw.length === 0) return refuse("no-base-url");
 			cachedBaseUrl = raw;
 		}
-		const base = require_ha_broker_source.parseAdminBase(cachedBaseUrl);
+		const base = require_ha_instance_settings.parseAdminBase(cachedBaseUrl);
 		if (!base.ok) {
 			cachedBaseUrl = null;
 			return refuse("base-unusable", { baseReason: base.reason });
 		}
 		const page = pageFor(subject, base.basePath);
 		if (page === null) return refuse("empty-subject");
-		const built = require_ha_broker_source.buildDeviceAdminUrl({
+		const built = require_ha_instance_settings.buildDeviceAdminUrl({
 			host: base.host,
 			port: base.port,
 			scheme: base.scheme,
@@ -114,25 +114,25 @@ function registerHaAdminLink(ctx, deviceId, brokerId, subject) {
 * `readHaSource` (returns null) — do NOT use `z.object(haSourceSchemaFields).parse`.
 */
 var haSourceSchemaFields = {
-	system: require_ha_broker_source.literal("homeassistant").optional(),
-	brokerId: require_ha_broker_source.string(),
-	haDeviceId: require_ha_broker_source.string().optional(),
-	entityId: require_ha_broker_source.string().optional(),
-	referenceEntityId: require_ha_broker_source.string().nullable().optional(),
-	capabilities: require_ha_broker_source.array(require_ha_broker_source.string()).default([]),
-	role: require_ha_broker_source.string().optional(),
-	childDeviceIds: require_ha_broker_source.array(require_ha_broker_source.number()).default([]),
-	unitOfMeasurement: require_ha_broker_source.string().optional(),
-	deviceClass: require_ha_broker_source.string().optional(),
-	integrationId: require_ha_broker_source.string().optional(),
-	options: require_ha_broker_source.array(require_ha_broker_source.string()).optional(),
-	features: require_ha_broker_source.array(require_ha_broker_source.string()).optional(),
+	system: require_ha_instance_settings.literal("homeassistant").optional(),
+	brokerId: require_ha_instance_settings.string(),
+	haDeviceId: require_ha_instance_settings.string().optional(),
+	entityId: require_ha_instance_settings.string().optional(),
+	referenceEntityId: require_ha_instance_settings.string().nullable().optional(),
+	capabilities: require_ha_instance_settings.array(require_ha_instance_settings.string()).default([]),
+	role: require_ha_instance_settings.string().optional(),
+	childDeviceIds: require_ha_instance_settings.array(require_ha_instance_settings.number()).default([]),
+	unitOfMeasurement: require_ha_instance_settings.string().optional(),
+	deviceClass: require_ha_instance_settings.string().optional(),
+	integrationId: require_ha_instance_settings.string().optional(),
+	options: require_ha_instance_settings.array(require_ha_instance_settings.string()).optional(),
+	features: require_ha_instance_settings.array(require_ha_instance_settings.string()).optional(),
 	/** Sibling meter sensors whose readings this entity carries as `power-meter` (D951). */
-	meterEntities: require_ha_broker_source.object({
-		power: require_ha_broker_source.string().optional(),
-		energy: require_ha_broker_source.string().optional(),
-		voltage: require_ha_broker_source.string().optional(),
-		current: require_ha_broker_source.string().optional()
+	meterEntities: require_ha_instance_settings.object({
+		power: require_ha_instance_settings.string().optional(),
+		energy: require_ha_instance_settings.string().optional(),
+		voltage: require_ha_instance_settings.string().optional(),
+		current: require_ha_instance_settings.string().optional()
 	}).optional()
 };
 /** Project a persisted config blob into a typed source, or null when the
@@ -176,7 +176,7 @@ function readHaSource(config) {
 function attachAccessoriesCap(ctx, deviceId, opts) {
 	let childIds = [];
 	const hidden = new Set(opts.initialHidden);
-	ctx.registerNativeCap(require_ha_broker_source.accessoriesCapability, {
+	ctx.registerNativeCap(require_ha_instance_settings.accessoriesCapability, {
 		getStatus: async () => ({
 			childDeviceIds: childIds,
 			hiddenChildIds: [...hidden]
@@ -193,7 +193,7 @@ function attachAccessoriesCap(ctx, deviceId, opts) {
 					type: "device",
 					id: deviceId
 				},
-				category: require_ha_broker_source.EventCategory.AccessoriesChildVisibilityChanged,
+				category: require_ha_instance_settings.EventCategory.AccessoriesChildVisibilityChanged,
 				data: {
 					deviceId,
 					childDeviceId,
@@ -211,7 +211,7 @@ function attachAccessoriesCap(ctx, deviceId, opts) {
 				type: "device",
 				id: deviceId
 			},
-			category: require_ha_broker_source.EventCategory.AccessoriesChanged,
+			category: require_ha_instance_settings.EventCategory.AccessoriesChanged,
 			data: {
 				deviceId,
 				childDeviceIds: childIds,
@@ -232,23 +232,23 @@ function attachAccessoriesCap(ctx, deviceId, opts) {
 * in the materialisation factory (Phase E) where each domain becomes
 * its own DeviceType + cap set.
 */
-var HaEntityStateSchema = require_ha_broker_source.object({
-	entity_id: require_ha_broker_source.string().min(1),
+var HaEntityStateSchema = require_ha_instance_settings.object({
+	entity_id: require_ha_instance_settings.string().min(1),
 	/** Domain-specific state value (`on`/`off`/`open`/temperature
 	*  number-as-string/etc.). Always a string in HA. */
-	state: require_ha_broker_source.string(),
+	state: require_ha_instance_settings.string(),
 	/** Free-form attribute map. Domain-specific. */
-	attributes: require_ha_broker_source.record(require_ha_broker_source.string(), require_ha_broker_source.unknown()),
+	attributes: require_ha_instance_settings.record(require_ha_instance_settings.string(), require_ha_instance_settings.unknown()),
 	/** Optional context envelope (user/parent id) the HA server attaches. */
-	context: require_ha_broker_source.object({
-		id: require_ha_broker_source.string(),
-		parent_id: require_ha_broker_source.string().nullable(),
-		user_id: require_ha_broker_source.string().nullable()
+	context: require_ha_instance_settings.object({
+		id: require_ha_instance_settings.string(),
+		parent_id: require_ha_instance_settings.string().nullable(),
+		user_id: require_ha_instance_settings.string().nullable()
 	}).optional(),
 	/** ISO 8601 timestamp of the last state change. */
-	last_changed: require_ha_broker_source.string(),
+	last_changed: require_ha_instance_settings.string(),
 	/** ISO 8601 timestamp of the last update (state OR attributes). */
-	last_updated: require_ha_broker_source.string()
+	last_updated: require_ha_instance_settings.string()
 });
 /**
 * Auth strategy. Two mutually-exclusive options:
@@ -259,16 +259,16 @@ var HaEntityStateSchema = require_ha_broker_source.object({
 *    the addon config; the WS URL points at their HA instance
 *    (`ws://ha.example:8123/api/websocket` style).
 */
-var HaAuthConfigSchema = require_ha_broker_source.discriminatedUnion("kind", [require_ha_broker_source.object({
-	kind: require_ha_broker_source.literal("supervisor"),
+var HaAuthConfigSchema = require_ha_instance_settings.discriminatedUnion("kind", [require_ha_instance_settings.object({
+	kind: require_ha_instance_settings.literal("supervisor"),
 	/** Token injected by the Supervisor at runtime via env. */
-	supervisorToken: require_ha_broker_source.string().min(1).meta({ secret: true })
-}), require_ha_broker_source.object({
-	kind: require_ha_broker_source.literal("long-lived"),
+	supervisorToken: require_ha_instance_settings.string().min(1).meta({ secret: true })
+}), require_ha_instance_settings.object({
+	kind: require_ha_instance_settings.literal("long-lived"),
 	/** Origin URL of the HA instance (e.g. `https://ha.example:8123`). */
-	baseUrl: require_ha_broker_source.url(),
+	baseUrl: require_ha_instance_settings.url(),
 	/** Long-lived access token issued by the user in their HA profile. */
-	accessToken: require_ha_broker_source.string().min(1).meta({ secret: true })
+	accessToken: require_ha_instance_settings.string().min(1).meta({ secret: true })
 })]);
 /** HA's standard domain enum — supported subset; future domains added
 *  as integration coverage grows. */
@@ -306,7 +306,7 @@ var HaDomain = /* @__PURE__ */ function(HaDomain) {
 * an unknown unit is never guessed (D393, D944).
 */
 function takeReading(logger, deviceId, value, rawUnit, quantity) {
-	const result = require_ha_broker_source.ingestReading({
+	const result = require_ha_instance_settings.ingestReading({
 		value,
 		rawUnit,
 		quantity
@@ -367,7 +367,7 @@ function applyMeterReading(prev, field, value, lastFetchedAt) {
 		lastFetchedAt
 	};
 }
-var LOAD_TYPES = new Set(require_ha_broker_source.powerMeterCapability.deviceTypes.filter((type) => type !== require_ha_broker_source.DeviceType.Sensor));
+var LOAD_TYPES = new Set(require_ha_instance_settings.powerMeterCapability.deviceTypes.filter((type) => type !== require_ha_instance_settings.DeviceType.Sensor));
 function isLoad(entity) {
 	return LOAD_TYPES.has(entity.deviceType) && entity.entityCategory === void 0 && !entity.capabilities.includes("power-meter");
 }
@@ -428,7 +428,7 @@ var HaMeterCarrier = class {
 			const entityId = meters[field];
 			return entityId === void 0 ? [] : [[entityId, field]];
 		}));
-		this.ctx.registerNativeCap(require_ha_broker_source.powerMeterCapability, { getStatus: async () => this.runtimeState.getCapState("power-meter") ?? COLD_START$20 });
+		this.ctx.registerNativeCap(require_ha_instance_settings.powerMeterCapability, { getStatus: async () => this.runtimeState.getCapState("power-meter") ?? COLD_START$20 });
 		this.runtimeState.setCapState("power-meter", {
 			...COLD_START$20,
 			...this.runtimeState.getCapState("power-meter")
@@ -469,7 +469,7 @@ var HaMeterCarrier = class {
 * and carries `childDeviceIds` so parent-mode devices can host the
 * accessories cap for their entity-children.
 */
-var haChildDeviceSchema = require_ha_broker_source.object({ ...haSourceSchemaFields });
+var haChildDeviceSchema = require_ha_instance_settings.object({ ...haSourceSchemaFields });
 /**
 * Abstract base for every HA-entity-backed CamStack accessory device.
 *
@@ -490,14 +490,14 @@ var haChildDeviceSchema = require_ha_broker_source.object({ ...haSourceSchemaFie
 * own (beyond BaseDevice's auto-registered `device-status` /
 * `feature-probe`).
 */
-var DEVICE_FEATURE_VALUES = new Set(Object.values(require_ha_broker_source.DeviceFeature));
+var DEVICE_FEATURE_VALUES = new Set(Object.values(require_ha_instance_settings.DeviceFeature));
 /** Keep only strings that are valid DeviceFeature enum values (the persisted
 *  config stores them as plain strings). */
 function parseDeviceFeatures(raw) {
 	if (!Array.isArray(raw)) return [];
 	return raw.filter((f) => typeof f === "string" && DEVICE_FEATURE_VALUES.has(f));
 }
-var HaBaseChildDevice = class HaBaseChildDevice extends require_ha_broker_source.BaseDevice {
+var HaBaseChildDevice = class HaBaseChildDevice extends require_ha_instance_settings.BaseDevice {
 	/** Mapping-derived feature flags (e.g. `lock-open`), read from the persisted
 	*  config at construction. Surfaced on `device.features` (and re-published to
 	*  the device meta in `onActivate` via `refreshFeatures`) so the UI gates
@@ -639,7 +639,7 @@ var HaBaseChildDevice = class HaBaseChildDevice extends require_ha_broker_source
 			this.deviceLogger.warn("ha-child getRawState failed to read cached state", { meta: {
 				brokerId: this.brokerId,
 				entityId: this.entityId,
-				error: require_ha_broker_source.errMsg(err)
+				error: require_ha_instance_settings.errMsg(err)
 			} });
 			return null;
 		}
@@ -689,7 +689,7 @@ var HaBaseChildDevice = class HaBaseChildDevice extends require_ha_broker_source
 				entityId: this.entityId,
 				domain,
 				service,
-				error: require_ha_broker_source.errMsg(err)
+				error: require_ha_instance_settings.errMsg(err)
 			} });
 			throw err;
 		}
@@ -716,7 +716,7 @@ var HaBaseChildDevice = class HaBaseChildDevice extends require_ha_broker_source
 			this.deviceLogger.warn("ha-child failed to register broker subscription", { meta: {
 				entityId: this.entityId,
 				brokerId: this.brokerId,
-				error: require_ha_broker_source.errMsg(err)
+				error: require_ha_instance_settings.errMsg(err)
 			} });
 			return false;
 		}
@@ -757,7 +757,7 @@ var HaBaseChildDevice = class HaBaseChildDevice extends require_ha_broker_source
 			} catch (err) {
 				this.deviceLogger.warn("ha-child state-push handler error", { meta: {
 					entityId: this.entityId,
-					error: require_ha_broker_source.errMsg(err)
+					error: require_ha_instance_settings.errMsg(err)
 				} });
 			}
 		};
@@ -786,7 +786,7 @@ var HaButtonDevice = class extends HaBaseChildDevice {
 		this.registerButtonCap();
 	}
 	registerButtonCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.buttonCapability, { press: async () => {
+		this.ctx.registerNativeCap(require_ha_instance_settings.buttonCapability, { press: async () => {
 			const domain = this.entityId.split(".")[0] ?? "button";
 			if (domain === "scene") {
 				await this.callHaService("scene", "turn_on");
@@ -844,7 +844,7 @@ var HaUpdateDevice = class extends HaBaseChildDevice {
 		});
 	}
 	registerUpdateCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.updateCapability, {
+		this.ctx.registerNativeCap(require_ha_instance_settings.updateCapability, {
 			getStatus: async () => {
 				return this.runtimeState.getCapState(UPDATE_CAP) ?? COLD_START$19;
 			},
@@ -928,7 +928,7 @@ var HaSwitchDevice = class extends HaBaseChildDevice {
 		});
 	}
 	registerSwitchCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.switchCapability, {
+		this.ctx.registerNativeCap(require_ha_instance_settings.switchCapability, {
 			getStatus: async () => {
 				return this.runtimeState.getCapState("switch") ?? {
 					on: false,
@@ -1045,7 +1045,7 @@ var HaNumericSensorDevice = class extends HaBaseChildDevice {
 		const stored = this.sourceInfo.quantity;
 		if (stored !== void 0 && stored !== "device") return stored;
 		if (unitRaw === void 0) return "none";
-		const learned = require_ha_broker_source.quantityFromUnit(unitRaw);
+		const learned = require_ha_instance_settings.quantityFromUnit(unitRaw);
 		if (learned === void 0 || learned === "device") {
 			this.deviceLogger.warn("numeric reading refused", {
 				tags: { deviceId: this.id },
@@ -1071,7 +1071,7 @@ var HaNumericSensorDevice = class extends HaBaseChildDevice {
 			value: "",
 			lastFetchedAt: 0
 		};
-		this.ctx.registerNativeCap(require_ha_broker_source.enumSensorCapability, { getStatus: async () => {
+		this.ctx.registerNativeCap(require_ha_instance_settings.enumSensorCapability, { getStatus: async () => {
 			return this.runtimeState.getCapState("enum-sensor") ?? COLD_START;
 		} });
 		this.runtimeState.setCapState("enum-sensor", COLD_START);
@@ -1083,7 +1083,7 @@ var HaNumericSensorDevice = class extends HaBaseChildDevice {
 					temperature: 0,
 					lastFetchedAt: 0
 				};
-				this.ctx.registerNativeCap(require_ha_broker_source.temperatureSensorCapability, { getStatus: async () => this.readSlice(COLD_START) });
+				this.ctx.registerNativeCap(require_ha_instance_settings.temperatureSensorCapability, { getStatus: async () => this.readSlice(COLD_START) });
 				return;
 			}
 			case "humidity-sensor": {
@@ -1091,7 +1091,7 @@ var HaNumericSensorDevice = class extends HaBaseChildDevice {
 					humidity: 0,
 					lastFetchedAt: 0
 				};
-				this.ctx.registerNativeCap(require_ha_broker_source.humiditySensorCapability, { getStatus: async () => this.readSlice(COLD_START) });
+				this.ctx.registerNativeCap(require_ha_instance_settings.humiditySensorCapability, { getStatus: async () => this.readSlice(COLD_START) });
 				return;
 			}
 			case "ambient-light-sensor": {
@@ -1099,7 +1099,7 @@ var HaNumericSensorDevice = class extends HaBaseChildDevice {
 					illuminance: 0,
 					lastFetchedAt: 0
 				};
-				this.ctx.registerNativeCap(require_ha_broker_source.ambientLightSensorCapability, { getStatus: async () => this.readSlice(COLD_START) });
+				this.ctx.registerNativeCap(require_ha_instance_settings.ambientLightSensorCapability, { getStatus: async () => this.readSlice(COLD_START) });
 				return;
 			}
 			case "pressure-sensor": {
@@ -1107,7 +1107,7 @@ var HaNumericSensorDevice = class extends HaBaseChildDevice {
 					pressure: 0,
 					lastFetchedAt: 0
 				};
-				this.ctx.registerNativeCap(require_ha_broker_source.pressureSensorCapability, { getStatus: async () => this.readSlice(COLD_START) });
+				this.ctx.registerNativeCap(require_ha_instance_settings.pressureSensorCapability, { getStatus: async () => this.readSlice(COLD_START) });
 				return;
 			}
 			case "numeric-sensor": {
@@ -1115,7 +1115,7 @@ var HaNumericSensorDevice = class extends HaBaseChildDevice {
 					value: 0,
 					lastFetchedAt: 0
 				};
-				this.ctx.registerNativeCap(require_ha_broker_source.numericSensorCapability, { getStatus: async () => this.readSlice(COLD_START) });
+				this.ctx.registerNativeCap(require_ha_instance_settings.numericSensorCapability, { getStatus: async () => this.readSlice(COLD_START) });
 				return;
 			}
 		}
@@ -1207,61 +1207,61 @@ var HaBinarySensorDevice = class extends HaBaseChildDevice {
 	registerCap(name) {
 		switch (name) {
 			case "contact":
-				this.ctx.registerNativeCap(require_ha_broker_source.contactCapability, { getStatus: async () => this.readSlice({
+				this.ctx.registerNativeCap(require_ha_instance_settings.contactCapability, { getStatus: async () => this.readSlice({
 					entryOpen: false,
 					lastChangedAt: 0
 				}) });
 				return;
 			case "flood":
-				this.ctx.registerNativeCap(require_ha_broker_source.floodCapability, { getStatus: async () => this.readSlice({
+				this.ctx.registerNativeCap(require_ha_instance_settings.floodCapability, { getStatus: async () => this.readSlice({
 					flooded: false,
 					lastChangedAt: 0
 				}) });
 				return;
 			case "smoke":
-				this.ctx.registerNativeCap(require_ha_broker_source.smokeCapability, { getStatus: async () => this.readSlice({
+				this.ctx.registerNativeCap(require_ha_instance_settings.smokeCapability, { getStatus: async () => this.readSlice({
 					detected: false,
 					lastChangedAt: 0
 				}) });
 				return;
 			case "carbon-monoxide":
-				this.ctx.registerNativeCap(require_ha_broker_source.carbonMonoxideCapability, { getStatus: async () => this.readSlice({
+				this.ctx.registerNativeCap(require_ha_instance_settings.carbonMonoxideCapability, { getStatus: async () => this.readSlice({
 					detected: false,
 					lastChangedAt: 0
 				}) });
 				return;
 			case "gas":
-				this.ctx.registerNativeCap(require_ha_broker_source.gasCapability, { getStatus: async () => this.readSlice({
+				this.ctx.registerNativeCap(require_ha_instance_settings.gasCapability, { getStatus: async () => this.readSlice({
 					detected: false,
 					lastChangedAt: 0
 				}) });
 				return;
 			case "tamper":
-				this.ctx.registerNativeCap(require_ha_broker_source.tamperCapability, { getStatus: async () => this.readSlice({
+				this.ctx.registerNativeCap(require_ha_instance_settings.tamperCapability, { getStatus: async () => this.readSlice({
 					tampered: false,
 					lastChangedAt: 0
 				}) });
 				return;
 			case "vibration":
-				this.ctx.registerNativeCap(require_ha_broker_source.vibrationCapability, { getStatus: async () => this.readSlice({
+				this.ctx.registerNativeCap(require_ha_instance_settings.vibrationCapability, { getStatus: async () => this.readSlice({
 					detected: false,
 					lastChangedAt: 0
 				}) });
 				return;
 			case "connectivity":
-				this.ctx.registerNativeCap(require_ha_broker_source.connectivityCapability, { getStatus: async () => this.readSlice({
+				this.ctx.registerNativeCap(require_ha_instance_settings.connectivityCapability, { getStatus: async () => this.readSlice({
 					connected: false,
 					lastChangedAt: 0
 				}) });
 				return;
 			case "binary":
-				this.ctx.registerNativeCap(require_ha_broker_source.binaryCapability, { getStatus: async () => this.readSlice({
+				this.ctx.registerNativeCap(require_ha_instance_settings.binaryCapability, { getStatus: async () => this.readSlice({
 					on: false,
 					lastChangedAt: 0
 				}) });
 				return;
 			case "motion":
-				this.ctx.registerNativeCap(require_ha_broker_source.motionCapability, {
+				this.ctx.registerNativeCap(require_ha_instance_settings.motionCapability, {
 					getStatus: async () => this.readSlice({
 						detected: false,
 						lastDetectedAt: null,
@@ -1434,7 +1434,7 @@ var HaLightDevice = class extends HaBaseChildDevice {
 		}
 	}
 	registerSwitchCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.switchCapability, {
+		this.ctx.registerNativeCap(require_ha_instance_settings.switchCapability, {
 			getStatus: async () => {
 				return this.runtimeState.getCapState("switch") ?? {
 					on: false,
@@ -1447,7 +1447,7 @@ var HaLightDevice = class extends HaBaseChildDevice {
 		});
 	}
 	registerBrightnessCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.brightnessCapability, {
+		this.ctx.registerNativeCap(require_ha_instance_settings.brightnessCapability, {
 			getStatus: async () => {
 				return this.runtimeState.getCapState("brightness") ?? {
 					level: 0,
@@ -1460,7 +1460,7 @@ var HaLightDevice = class extends HaBaseChildDevice {
 		});
 	}
 	registerColorCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.colorCapability, {
+		this.ctx.registerNativeCap(require_ha_instance_settings.colorCapability, {
 			getStatus: async () => {
 				return this.runtimeState.getCapState("color") ?? {
 					mode: "rgb",
@@ -1590,7 +1590,7 @@ var HaCoverDevice = class extends HaBaseChildDevice {
 		});
 	}
 	registerCoverCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.coverCapability, {
+		this.ctx.registerNativeCap(require_ha_instance_settings.coverCapability, {
 			getStatus: async () => {
 				return this.runtimeState.getCapState("cover") ?? COLD_START$18;
 			},
@@ -1661,7 +1661,7 @@ var HaValveDevice = class extends HaBaseChildDevice {
 		});
 	}
 	registerValveCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.valveCapability, {
+		this.ctx.registerNativeCap(require_ha_instance_settings.valveCapability, {
 			getStatus: async () => {
 				return this.runtimeState.getCapState("valve") ?? COLD_START$17;
 			},
@@ -1735,7 +1735,7 @@ var HaLockDevice = class extends HaBaseChildDevice {
 		});
 	}
 	registerLockCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.lockControlCapability, {
+		this.ctx.registerNativeCap(require_ha_instance_settings.lockControlCapability, {
 			getStatus: async () => {
 				return this.runtimeState.getCapState("lock-control") ?? COLD_START$16;
 			},
@@ -1819,7 +1819,7 @@ var HaClimateDevice = class extends HaBaseChildDevice {
 		this.swingHorizontalModes = readStringArray$4(state.attributes, "swing_horizontal_modes");
 		const unit = readStringAttr$6(state.attributes, "temperature_unit");
 		if (unit !== null) {
-			const probe = require_ha_broker_source.ingestReading({
+			const probe = require_ha_instance_settings.ingestReading({
 				value: 0,
 				rawUnit: unit,
 				quantity: "temperature"
@@ -1836,7 +1836,7 @@ var HaClimateDevice = class extends HaBaseChildDevice {
 		this.runtimeState.setCapState("climate-control", climateSliceFromState(state));
 	}
 	registerClimateCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.climateControlCapability, {
+		this.ctx.registerNativeCap(require_ha_instance_settings.climateControlCapability, {
 			getStatus: async () => {
 				return this.runtimeState.getCapState("climate-control") ?? COLD_START$15;
 			},
@@ -1894,7 +1894,7 @@ function climateSliceFromState(state) {
 	const tempUnit = readStringAttr$6(attrs, "temperature_unit") ?? void 0;
 	const celsius = (raw) => {
 		if (raw === null) return null;
-		const result = require_ha_broker_source.ingestReading({
+		const result = require_ha_instance_settings.ingestReading({
 			value: raw,
 			rawUnit: tempUnit,
 			quantity: "temperature"
@@ -2043,7 +2043,7 @@ var HaHumidifierDevice = class extends HaBaseChildDevice {
 		});
 	}
 	registerHumidifierCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.humidifierCapability, {
+		this.ctx.registerNativeCap(require_ha_instance_settings.humidifierCapability, {
 			getStatus: async () => {
 				return this.runtimeState.getCapState("humidifier") ?? COLD_START$14;
 			},
@@ -2123,7 +2123,7 @@ var HaWaterHeaterDevice = class extends HaBaseChildDevice {
 		});
 	}
 	registerWaterHeaterCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.waterHeaterCapability, {
+		this.ctx.registerNativeCap(require_ha_instance_settings.waterHeaterCapability, {
 			getStatus: async () => {
 				return this.runtimeState.getCapState("water-heater") ?? COLD_START$13;
 			},
@@ -2206,7 +2206,7 @@ var HaFanDevice = class extends HaBaseChildDevice {
 		this.runtimeState.setCapState("fan-control", slice);
 	}
 	registerSwitchCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.switchCapability, {
+		this.ctx.registerNativeCap(require_ha_instance_settings.switchCapability, {
 			getStatus: async () => {
 				return this.runtimeState.getCapState("switch") ?? {
 					on: false,
@@ -2219,7 +2219,7 @@ var HaFanDevice = class extends HaBaseChildDevice {
 		});
 	}
 	registerFanCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.fanControlCapability, {
+		this.ctx.registerNativeCap(require_ha_instance_settings.fanControlCapability, {
 			getStatus: async () => {
 				return this.runtimeState.getCapState("fan-control") ?? FAN_COLD_START;
 			},
@@ -2287,7 +2287,7 @@ var HaVacuumDevice = class extends HaBaseChildDevice {
 		this.registerVacuumCap();
 		this.registerRunningCap();
 		this.runtimeState.setCapState("vacuum-control", COLD_START$12);
-		this.runtimeState.setCapState("running-state", require_ha_broker_source.RUNNING_STATE_COLD);
+		this.runtimeState.setCapState("running-state", require_ha_instance_settings.RUNNING_STATE_COLD);
 	}
 	handleStatePush(state) {
 		if (state.state === "unavailable" || state.state === "unknown") return;
@@ -2309,13 +2309,13 @@ var HaVacuumDevice = class extends HaBaseChildDevice {
 		});
 		const fetchedAt = Date.now();
 		const previous = this.runtimeState.getCapState("running-state");
-		this.runtimeState.setCapState("running-state", require_ha_broker_source.runningFromVacuumState(lifecycleState, previous, fetchedAt, lastChangedAt));
+		this.runtimeState.setCapState("running-state", require_ha_instance_settings.runningFromVacuumState(lifecycleState, previous, fetchedAt, lastChangedAt));
 	}
 	registerRunningCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.runningStateCapability, { getStatus: async () => this.runtimeState.getCapState("running-state") ?? require_ha_broker_source.RUNNING_STATE_COLD });
+		this.ctx.registerNativeCap(require_ha_instance_settings.runningStateCapability, { getStatus: async () => this.runtimeState.getCapState("running-state") ?? require_ha_instance_settings.RUNNING_STATE_COLD });
 	}
 	registerVacuumCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.vacuumControlCapability, {
+		this.ctx.registerNativeCap(require_ha_instance_settings.vacuumControlCapability, {
 			getStatus: async () => {
 				return this.runtimeState.getCapState("vacuum-control") ?? COLD_START$12;
 			},
@@ -2387,7 +2387,7 @@ var HaLawnMowerDevice = class extends HaBaseChildDevice {
 		this.registerLawnMowerCap();
 		this.registerRunningCap();
 		this.runtimeState.setCapState("lawn-mower-control", COLD_START$11);
-		this.runtimeState.setCapState("running-state", require_ha_broker_source.RUNNING_STATE_COLD);
+		this.runtimeState.setCapState("running-state", require_ha_instance_settings.RUNNING_STATE_COLD);
 	}
 	handleStatePush(state) {
 		if (state.state === "unavailable" || state.state === "unknown") return;
@@ -2405,13 +2405,13 @@ var HaLawnMowerDevice = class extends HaBaseChildDevice {
 		});
 		const fetchedAt = Date.now();
 		const previous = this.runtimeState.getCapState("running-state");
-		this.runtimeState.setCapState("running-state", require_ha_broker_source.runningFromLawnMower(activity, previous, fetchedAt, lastChangedAt));
+		this.runtimeState.setCapState("running-state", require_ha_instance_settings.runningFromLawnMower(activity, previous, fetchedAt, lastChangedAt));
 	}
 	registerRunningCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.runningStateCapability, { getStatus: async () => this.runtimeState.getCapState("running-state") ?? require_ha_broker_source.RUNNING_STATE_COLD });
+		this.ctx.registerNativeCap(require_ha_instance_settings.runningStateCapability, { getStatus: async () => this.runtimeState.getCapState("running-state") ?? require_ha_instance_settings.RUNNING_STATE_COLD });
 	}
 	registerLawnMowerCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.lawnMowerControlCapability, {
+		this.ctx.registerNativeCap(require_ha_instance_settings.lawnMowerControlCapability, {
 			getStatus: async () => {
 				return this.runtimeState.getCapState("lawn-mower-control") ?? COLD_START$11;
 			},
@@ -2467,7 +2467,7 @@ var HaMediaPlayerDevice = class extends HaBaseChildDevice {
 		this.registerMediaPlayerCap();
 		this.registerRunningCap();
 		this.runtimeState.setCapState("media-player", COLD_START$10);
-		this.runtimeState.setCapState("running-state", require_ha_broker_source.RUNNING_STATE_COLD);
+		this.runtimeState.setCapState("running-state", require_ha_instance_settings.RUNNING_STATE_COLD);
 	}
 	handleStatePush(state) {
 		if (state.state === "unavailable" || state.state === "unknown") return;
@@ -2492,16 +2492,38 @@ var HaMediaPlayerDevice = class extends HaBaseChildDevice {
 		this.runtimeState.setCapState("media-player", slice);
 		const fetchedAt = Date.now();
 		const previous = this.runtimeState.getCapState("running-state");
-		this.runtimeState.setCapState("running-state", require_ha_broker_source.runningFromMediaPlayer(playerState, previous, fetchedAt, lastChangedAt));
+		this.runtimeState.setCapState("running-state", require_ha_instance_settings.runningFromMediaPlayer(playerState, previous, fetchedAt, lastChangedAt));
 	}
 	registerRunningCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.runningStateCapability, { getStatus: async () => this.runtimeState.getCapState("running-state") ?? require_ha_broker_source.RUNNING_STATE_COLD });
+		this.ctx.registerNativeCap(require_ha_instance_settings.runningStateCapability, { getStatus: async () => this.runtimeState.getCapState("running-state") ?? require_ha_instance_settings.RUNNING_STATE_COLD });
+	}
+	/** One service call per step, in order: HA has no "N steps" form. */
+	async repeatHaService(service, steps) {
+		for (let step = 0; step < steps; step += 1) await this.callHaService("media_player", service);
 	}
 	registerMediaPlayerCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.mediaPlayerCapability, {
+		this.ctx.registerNativeCap(require_ha_instance_settings.mediaPlayerCapability, {
 			getStatus: async () => {
 				return this.runtimeState.getCapState("media-player") ?? COLD_START$10;
 			},
+			turnOn: async () => {
+				await this.callHaService("media_player", "turn_on");
+			},
+			turnOff: async () => {
+				await this.callHaService("media_player", "turn_off");
+			},
+			volumeUp: async ({ steps }) => {
+				await this.repeatHaService("volume_up", steps);
+			},
+			volumeDown: async ({ steps }) => {
+				await this.repeatHaService("volume_down", steps);
+			},
+			channelUp: async ({ steps }) => {
+				await this.repeatHaService("media_next_track", steps);
+			},
+			channelDown: async ({ steps }) => {
+				await this.repeatHaService("media_previous_track", steps);
+			},
 			play: async () => {
 				await this.callHaService("media_player", "media_play");
 			},
@@ -2630,7 +2652,7 @@ var HaAlarmPanelDevice = class extends HaBaseChildDevice {
 		});
 	}
 	registerAlarmCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.alarmPanelCapability, {
+		this.ctx.registerNativeCap(require_ha_instance_settings.alarmPanelCapability, {
 			getStatus: async () => {
 				return this.runtimeState.getCapState("alarm-panel") ?? COLD_START$9;
 			},
@@ -2745,7 +2767,7 @@ var HaPresenceDevice = class extends HaBaseChildDevice {
 		});
 	}
 	registerBatteryCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.batteryCapability, {
+		this.ctx.registerNativeCap(require_ha_instance_settings.batteryCapability, {
 			getStatus: async () => this.runtimeState.getCapState("battery") ?? COLD_BATTERY,
 			wakeForStream: async () => ({
 				awoke: true,
@@ -2754,7 +2776,7 @@ var HaPresenceDevice = class extends HaBaseChildDevice {
 		});
 	}
 	registerPresenceCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.presenceCapability, { getStatus: async () => {
+		this.ctx.registerNativeCap(require_ha_instance_settings.presenceCapability, { getStatus: async () => {
 			return this.runtimeState.getCapState("presence") ?? COLD_START$8;
 		} });
 	}
@@ -2822,7 +2844,7 @@ var HaControlDevice = class extends HaBaseChildDevice {
 		if (slice !== null) this.runtimeState.setCapState("control", slice);
 	}
 	registerControlCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.controlCapability, {
+		this.ctx.registerNativeCap(require_ha_instance_settings.controlCapability, {
 			getStatus: async () => {
 				return this.runtimeState.getCapState("control") ?? {
 					kind: this.kind,
@@ -2861,10 +2883,10 @@ var HaControlDevice = class extends HaBaseChildDevice {
 	/** Base-unit value → the unit the upstream entity still speaks. */
 	toUpstream(value) {
 		const quantity = this.sourceInfo.quantity;
-		const base = quantity === void 0 ? void 0 : require_ha_broker_source.baseUnitOf(quantity);
+		const base = quantity === void 0 ? void 0 : require_ha_instance_settings.baseUnitOf(quantity);
 		const upstream = this.upstreamUnit;
 		if (base === void 0 || upstream === void 0 || upstream === base) return value;
-		const converted = require_ha_broker_source.tryConvertUnit(value, base, upstream);
+		const converted = require_ha_instance_settings.tryConvertUnit(value, base, upstream);
 		if (converted !== void 0) return converted;
 		this.deviceLogger.warn("numeric reading refused", {
 			tags: { deviceId: this.id },
@@ -2965,7 +2987,7 @@ function decodeNumeric(state, lastChangedAt, decode) {
 	if (!Number.isFinite(v)) return null;
 	const rawUnit = state.attributes["unit_of_measurement"];
 	const unit = typeof rawUnit === "string" && rawUnit.length > 0 ? rawUnit : void 0;
-	const incoming = unit === void 0 ? void 0 : require_ha_broker_source.quantityFromUnit(unit);
+	const incoming = unit === void 0 ? void 0 : require_ha_instance_settings.quantityFromUnit(unit);
 	if (unit !== void 0 && (incoming === void 0 || incoming === "device")) {
 		decode.logger.warn("numeric reading refused", {
 			tags: { deviceId: decode.deviceId },
@@ -2992,7 +3014,7 @@ function decodeNumeric(state, lastChangedAt, decode) {
 	}
 	const value = takeReading(decode.logger, decode.deviceId, v, unit, quantity);
 	if (value === null) return null;
-	decode.note(quantity, unit === void 0 ? void 0 : require_ha_broker_source.normalizeUnit(unit));
+	decode.note(quantity, unit === void 0 ? void 0 : require_ha_instance_settings.normalizeUnit(unit));
 	const rawMin = state.attributes["min"];
 	const rawMax = state.attributes["max"];
 	const rawStep = state.attributes["step"];
@@ -3012,10 +3034,10 @@ function decodeNumeric(state, lastChangedAt, decode) {
 /** A step is a difference: °F's offset must not move it. */
 function convertStep(step, unit, quantity) {
 	if (step === void 0) return void 0;
-	const base = require_ha_broker_source.baseUnitOf(quantity);
-	const from = unit === void 0 ? void 0 : require_ha_broker_source.normalizeUnit(unit);
+	const base = require_ha_instance_settings.baseUnitOf(quantity);
+	const from = unit === void 0 ? void 0 : require_ha_instance_settings.normalizeUnit(unit);
 	if (base === void 0 || from === void 0 || from === base) return step;
-	return require_ha_broker_source.tryConvertDelta(step, from, base);
+	return require_ha_instance_settings.tryConvertDelta(step, from, base);
 }
 //#endregion
 //#region src/devices/ha-script-device.ts
@@ -3058,7 +3080,7 @@ var HaScriptDevice = class extends HaBaseChildDevice {
 		});
 	}
 	registerScriptCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.scriptRunnerCapability, {
+		this.ctx.registerNativeCap(require_ha_instance_settings.scriptRunnerCapability, {
 			getStatus: async () => {
 				return this.runtimeState.getCapState("script-runner") ?? COLD_START$7;
 			},
@@ -3117,7 +3139,7 @@ var HaAutomationDevice = class extends HaBaseChildDevice {
 		});
 	}
 	registerAutomationCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.automationControlCapability, {
+		this.ctx.registerNativeCap(require_ha_instance_settings.automationControlCapability, {
 			getStatus: async () => {
 				return this.runtimeState.getCapState("automation-control") ?? COLD_START$6;
 			},
@@ -3176,7 +3198,7 @@ var HaNotifierDevice = class extends HaBaseChildDevice {
 	handleStatePush(_state) {}
 	registerNotifierCap() {
 		const serviceName = this.entityId.split(".")[1] ?? "";
-		this.ctx.registerNativeCap(require_ha_broker_source.notifierCapability, {
+		this.ctx.registerNativeCap(require_ha_instance_settings.notifierCapability, {
 			getStatus: async () => {
 				return this.runtimeState.getCapState("notifier") ?? COLD_START$5;
 			},
@@ -3272,7 +3294,7 @@ var HaPowerMeterDevice = class extends HaBaseChildDevice {
 		if (update !== null) this.runtimeState.setCapState("power-meter", update);
 	}
 	registerPowerMeterCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.powerMeterCapability, { getStatus: async () => {
+		this.ctx.registerNativeCap(require_ha_instance_settings.powerMeterCapability, { getStatus: async () => {
 			return this.runtimeState.getCapState("power-meter") ?? COLD_START$4;
 		} });
 	}
@@ -3351,7 +3373,7 @@ var HaAirQualityDevice = class extends HaBaseChildDevice {
 		if (update !== null) this.runtimeState.setCapState("air-quality-sensor", update);
 	}
 	registerCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.airQualitySensorCapability, { getStatus: async () => {
+		this.ctx.registerNativeCap(require_ha_instance_settings.airQualitySensorCapability, { getStatus: async () => {
 			return this.runtimeState.getCapState("air-quality-sensor") ?? COLD_START$3;
 		} });
 	}
@@ -3426,7 +3448,7 @@ var HaEnumSensorDevice = class extends HaBaseChildDevice {
 	constructor(ctx) {
 		const persisted = ctx.persistedConfig ?? {};
 		super(ctx, persisted.role !== void 0 ? { role: persisted.role } : {});
-		const parsedFormat = require_ha_broker_source.EnumSensorDateTimeFormatSchema.safeParse(persisted.dateTimeFormat);
+		const parsedFormat = require_ha_instance_settings.EnumSensorDateTimeFormatSchema.safeParse(persisted.dateTimeFormat);
 		this.dateTimeFormat = parsedFormat.success ? parsedFormat.data : void 0;
 		if (this.dateTimeFormat !== void 0) this.updateSourceInfo({ dateTimeShape: this.dateTimeFormat });
 		this.registerCap();
@@ -3448,7 +3470,7 @@ var HaEnumSensorDevice = class extends HaBaseChildDevice {
 		});
 	}
 	registerCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.enumSensorCapability, { getStatus: async () => {
+		this.ctx.registerNativeCap(require_ha_instance_settings.enumSensorCapability, { getStatus: async () => {
 			return this.runtimeState.getCapState("enum-sensor") ?? this.coldStart();
 		} });
 	}
@@ -3547,7 +3569,7 @@ var HaEventEmitterDevice = class extends HaBaseChildDevice {
 			timestamp: Date.now(),
 			seq: ++this.#seq
 		};
-		this.ctx.eventBus.emit(require_ha_broker_source.createEvent(require_ha_broker_source.EventCategory.EventEmitted, {
+		this.ctx.eventBus.emit(require_ha_instance_settings.createEvent(require_ha_instance_settings.EventCategory.EventEmitted, {
 			type: "device",
 			id: this.stableId,
 			deviceId: this.id,
@@ -3561,7 +3583,7 @@ var HaEventEmitterDevice = class extends HaBaseChildDevice {
 		this.runtimeState.setCapState("event-emitter", slice);
 	}
 	registerEventEmitterCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.eventEmitterCapability, { getStatus: async () => this.readSlice() });
+		this.ctx.registerNativeCap(require_ha_instance_settings.eventEmitterCapability, { getStatus: async () => this.readSlice() });
 	}
 	readSlice() {
 		return this.runtimeState.getCapState("event-emitter") ?? {
@@ -3644,7 +3666,7 @@ var HaWeatherDevice = class extends HaBaseChildDevice {
 		this.runtimeState.setCapState("weather", slice);
 	}
 	registerWeatherCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.weatherCapability, { getStatus: async () => {
+		this.ctx.registerNativeCap(require_ha_instance_settings.weatherCapability, { getStatus: async () => {
 			return this.runtimeState.getCapState("weather") ?? COLD_START$1;
 		} });
 	}
@@ -3742,7 +3764,7 @@ var HaImageDevice = class extends HaBaseChildDevice {
 			this.deviceLogger.warn("ha-image: failed to build absolute image url", { meta: {
 				entityId: this.entityId,
 				brokerId: this.brokerId,
-				error: require_ha_broker_source.errMsg(err)
+				error: require_ha_instance_settings.errMsg(err)
 			} });
 			url = null;
 		}
@@ -3774,7 +3796,7 @@ var HaImageDevice = class extends HaBaseChildDevice {
 		return typeof raw === "string" && raw.length > 0 ? raw : null;
 	}
 	registerImageCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.imageCapability, { getStatus: async () => {
+		this.ctx.registerNativeCap(require_ha_instance_settings.imageCapability, { getStatus: async () => {
 			return this.runtimeState.getCapState("image") ?? COLD_START;
 		} });
 	}
@@ -3868,28 +3890,28 @@ function pickHaChildClass(capabilities) {
 //#region src/ha-container-reconcile.ts
 /** Validates a persisted Container `entities[]` blob (mirrors `haEntitySchema`
 *  in ha-container-device.ts). Returns `[]` on absent/invalid input. */
-var containerEntitySchema = require_ha_broker_source.object({
-	entityId: require_ha_broker_source.string(),
-	deviceType: require_ha_broker_source._enum(require_ha_broker_source.DeviceType),
-	capabilities: require_ha_broker_source.array(require_ha_broker_source.string()),
-	role: require_ha_broker_source.string().optional(),
-	unitOfMeasurement: require_ha_broker_source.string().optional(),
-	deviceClass: require_ha_broker_source.string().optional(),
-	options: require_ha_broker_source.array(require_ha_broker_source.string()).optional(),
-	features: require_ha_broker_source.array(require_ha_broker_source.string()).optional(),
-	name: require_ha_broker_source.string().optional(),
-	dateTimeFormat: require_ha_broker_source.EnumSensorDateTimeFormatSchema.optional(),
-	entityCategory: require_ha_broker_source._enum(["config", "diagnostic"]).optional(),
-	meterEntities: require_ha_broker_source.object({
-		power: require_ha_broker_source.string().optional(),
-		energy: require_ha_broker_source.string().optional(),
-		voltage: require_ha_broker_source.string().optional(),
-		current: require_ha_broker_source.string().optional()
+var containerEntitySchema = require_ha_instance_settings.object({
+	entityId: require_ha_instance_settings.string(),
+	deviceType: require_ha_instance_settings._enum(require_ha_instance_settings.DeviceType),
+	capabilities: require_ha_instance_settings.array(require_ha_instance_settings.string()),
+	role: require_ha_instance_settings.string().optional(),
+	unitOfMeasurement: require_ha_instance_settings.string().optional(),
+	deviceClass: require_ha_instance_settings.string().optional(),
+	options: require_ha_instance_settings.array(require_ha_instance_settings.string()).optional(),
+	features: require_ha_instance_settings.array(require_ha_instance_settings.string()).optional(),
+	name: require_ha_instance_settings.string().optional(),
+	dateTimeFormat: require_ha_instance_settings.EnumSensorDateTimeFormatSchema.optional(),
+	entityCategory: require_ha_instance_settings._enum(["config", "diagnostic"]).optional(),
+	meterEntities: require_ha_instance_settings.object({
+		power: require_ha_instance_settings.string().optional(),
+		energy: require_ha_instance_settings.string().optional(),
+		voltage: require_ha_instance_settings.string().optional(),
+		current: require_ha_instance_settings.string().optional()
 	}).optional(),
-	foldedInto: require_ha_broker_source.string().optional()
+	foldedInto: require_ha_instance_settings.string().optional()
 });
 function parseContainerEntities(raw) {
-	const result = require_ha_broker_source.array(containerEntitySchema).safeParse(raw);
+	const result = require_ha_instance_settings.array(containerEntitySchema).safeParse(raw);
 	return result.success ? result.data : [];
 }
 /**
@@ -4043,45 +4065,45 @@ function deriveChildLayout(entities) {
 }
 //#endregion
 //#region src/devices/ha-container-device.ts
-var haEntitySchema = require_ha_broker_source.object({
-	entityId: require_ha_broker_source.string(),
-	deviceType: require_ha_broker_source._enum(require_ha_broker_source.DeviceType),
-	capabilities: require_ha_broker_source.array(require_ha_broker_source.string()),
-	role: require_ha_broker_source.string().optional(),
-	unitOfMeasurement: require_ha_broker_source.string().optional(),
-	deviceClass: require_ha_broker_source.string().optional(),
+var haEntitySchema = require_ha_instance_settings.object({
+	entityId: require_ha_instance_settings.string(),
+	deviceType: require_ha_instance_settings._enum(require_ha_instance_settings.DeviceType),
+	capabilities: require_ha_instance_settings.array(require_ha_instance_settings.string()),
+	role: require_ha_instance_settings.string().optional(),
+	unitOfMeasurement: require_ha_instance_settings.string().optional(),
+	deviceClass: require_ha_instance_settings.string().optional(),
 	/** HA `options` attribute — present on select / input_select entities.
 	*  Persisted at adoption so the control slice is seeded immediately. */
-	options: require_ha_broker_source.array(require_ha_broker_source.string()).optional(),
+	options: require_ha_instance_settings.array(require_ha_instance_settings.string()).optional(),
 	/** Mapping-derived DeviceFeature flags (e.g. `lock-open`) — surfaced on the
 	*  child's `device.features` so the UI gates feature affordances. */
-	features: require_ha_broker_source.array(require_ha_broker_source.string()).optional(),
+	features: require_ha_instance_settings.array(require_ha_instance_settings.string()).optional(),
 	/** HA friendly_name — persisted so the child device name survives
 	*  a reboot without a discovery round-trip. Falls back to entityId. */
-	name: require_ha_broker_source.string().optional(),
+	name: require_ha_instance_settings.string().optional(),
 	/** Locale-render shape for a `DateTimeSensor`-role enum sensor
 	*  (`device_class=timestamp` → `'datetime'`, `date` → `'date'`). Seeded into
 	*  the enum-sensor cap slice by the child so the UI renders the ISO `value`. */
-	dateTimeFormat: require_ha_broker_source.EnumSensorDateTimeFormatSchema.optional(),
+	dateTimeFormat: require_ha_instance_settings.EnumSensorDateTimeFormatSchema.optional(),
 	/** HA `entity_category` — `config` / `diagnostic` / absent (a normal
 	*  control). Drives the accordion section the child renders in. */
-	entityCategory: require_ha_broker_source._enum(["config", "diagnostic"]).optional(),
+	entityCategory: require_ha_instance_settings._enum(["config", "diagnostic"]).optional(),
 	/** Sibling meter sensors this entity reads as its own power-meter (D951). */
-	meterEntities: require_ha_broker_source.object({
-		power: require_ha_broker_source.string().optional(),
-		energy: require_ha_broker_source.string().optional(),
-		voltage: require_ha_broker_source.string().optional(),
-		current: require_ha_broker_source.string().optional()
+	meterEntities: require_ha_instance_settings.object({
+		power: require_ha_instance_settings.string().optional(),
+		energy: require_ha_instance_settings.string().optional(),
+		voltage: require_ha_instance_settings.string().optional(),
+		current: require_ha_instance_settings.string().optional()
 	}).optional(),
 	/** Set on a meter sensor folded into another entity: sectioned as Diagnostic. */
-	foldedInto: require_ha_broker_source.string().optional()
+	foldedInto: require_ha_instance_settings.string().optional()
 });
-var haContainerSchema = require_ha_broker_source.object({
-	system: require_ha_broker_source.literal("homeassistant"),
-	brokerId: require_ha_broker_source.string(),
-	haDeviceId: require_ha_broker_source.string(),
-	integrationId: require_ha_broker_source.string().optional(),
-	entities: require_ha_broker_source.array(haEntitySchema).default([])
+var haContainerSchema = require_ha_instance_settings.object({
+	system: require_ha_instance_settings.literal("homeassistant"),
+	brokerId: require_ha_instance_settings.string(),
+	haDeviceId: require_ha_instance_settings.string(),
+	integrationId: require_ha_instance_settings.string().optional(),
+	entities: require_ha_instance_settings.array(haEntitySchema).default([])
 });
 /**
 * A container entity is a battery source when the HA domain mapping
@@ -4091,7 +4113,7 @@ var haContainerSchema = require_ha_broker_source.object({
 * device_class is the original HA attribute that drove it.
 */
 function isBatteryEntity(entity) {
-	return entity.role === require_ha_broker_source.DeviceRole.BatterySensor || entity.deviceClass === "battery";
+	return entity.role === require_ha_instance_settings.DeviceRole.BatterySensor || entity.deviceClass === "battery";
 }
 /**
 * A battery entity is BINARY when HA exposes it as a `binary_sensor`
@@ -4183,7 +4205,7 @@ function batteryEntityId(entities) {
 * persist initial config, build context, construct via factory, then
 * run the child's own probe + accessory + activate phases.
 */
-var HaContainerDevice = class HaContainerDevice extends require_ha_broker_source.BaseDevice {
+var HaContainerDevice = class HaContainerDevice extends require_ha_instance_settings.BaseDevice {
 	features;
 	brokerId;
 	integrationId;
@@ -4204,10 +4226,10 @@ var HaContainerDevice = class HaContainerDevice extends require_ha_broker_source
 	constructor(ctx) {
 		const cfg = haContainerSchema.parse(ctx.persistedConfig ?? {});
 		const batteryEntity = selectBatteryEntity(cfg.entities);
-		super(ctx, haContainerSchema, { type: require_ha_broker_source.DeviceType.Container });
+		super(ctx, haContainerSchema, { type: require_ha_instance_settings.DeviceType.Container });
 		this.brokerId = cfg.brokerId;
 		this.integrationId = cfg.integrationId;
-		this.features = batteryEntity !== null ? [require_ha_broker_source.DeviceFeature.Resyncable, require_ha_broker_source.DeviceFeature.BatteryOperated] : [require_ha_broker_source.DeviceFeature.Resyncable];
+		this.features = batteryEntity !== null ? [require_ha_instance_settings.DeviceFeature.Resyncable, require_ha_instance_settings.DeviceFeature.BatteryOperated] : [require_ha_instance_settings.DeviceFeature.Resyncable];
 		this.entityIds = new Set(cfg.entities.map((e) => e.entityId));
 		this.online = false;
 		this.batteryEntityId = batteryEntityId(cfg.entities);
@@ -4218,7 +4240,7 @@ var HaContainerDevice = class HaContainerDevice extends require_ha_broker_source
 				sleeping: false,
 				lastUpdated: 0
 			};
-			this.ctx.registerNativeCap(require_ha_broker_source.batteryCapability, {
+			this.ctx.registerNativeCap(require_ha_instance_settings.batteryCapability, {
 				getStatus: async () => this.runtimeState.getCapState("battery") ?? COLD,
 				wakeForStream: async () => ({
 					awoke: true,
@@ -4293,7 +4315,7 @@ var HaContainerDevice = class HaContainerDevice extends require_ha_broker_source
 			} catch (err) {
 				this.ctx.logger.warn("ha-container failed to subscribe entities for availability", { meta: {
 					brokerId: this.brokerId,
-					error: require_ha_broker_source.errMsg(err)
+					error: require_ha_instance_settings.errMsg(err)
 				} });
 			}
 		}
@@ -4334,7 +4356,7 @@ var HaContainerDevice = class HaContainerDevice extends require_ha_broker_source
 		} catch (err) {
 			this.ctx.logger.warn("ha-container failed to persist childLayout", { meta: {
 				haDeviceId: this.config.values.haDeviceId,
-				error: require_ha_broker_source.errMsg(err)
+				error: require_ha_instance_settings.errMsg(err)
 			} });
 		}
 	}
@@ -4413,10 +4435,10 @@ var HaContainerDevice = class HaContainerDevice extends require_ha_broker_source
 * entity-backed (no `entityId`), so it does NOT extend the HA child base
 * device — it is a thin standalone `BaseDevice` subclass.
 */
-var haEventBusDeviceSchema = require_ha_broker_source.object({
-	system: require_ha_broker_source.literal("homeassistant"),
-	brokerId: require_ha_broker_source.string(),
-	kind: require_ha_broker_source.literal("event-bus")
+var haEventBusDeviceSchema = require_ha_instance_settings.object({
+	system: require_ha_instance_settings.literal("homeassistant"),
+	brokerId: require_ha_instance_settings.string(),
+	kind: require_ha_instance_settings.literal("event-bus")
 });
 /**
 * Case 2 — generic per-broker HA bus-event aggregator.
@@ -4437,7 +4459,7 @@ var haEventBusDeviceSchema = require_ha_broker_source.object({
 * directly via {@link handleBusEvent} (the integration manager subscribes
 * to the curated bus event types and threads each fire through the addon).
 */
-var HaEventBusDevice = class extends require_ha_broker_source.BaseDevice {
+var HaEventBusDevice = class extends require_ha_instance_settings.BaseDevice {
 	features = [];
 	/** Monotonic sequence — two identical events still produce distinct slice
 	*  writes / bus emissions. */
@@ -4476,7 +4498,7 @@ var HaEventBusDevice = class extends require_ha_broker_source.BaseDevice {
 			timestamp: Date.now(),
 			seq: ++this.#seq
 		};
-		this.ctx.eventBus.emit(require_ha_broker_source.createEvent(require_ha_broker_source.EventCategory.EventEmitted, {
+		this.ctx.eventBus.emit(require_ha_instance_settings.createEvent(require_ha_instance_settings.EventCategory.EventEmitted, {
 			type: "device",
 			id: this.stableId,
 			deviceId: this.id,
@@ -4490,7 +4512,7 @@ var HaEventBusDevice = class extends require_ha_broker_source.BaseDevice {
 		this.runtimeState.setCapState("event-emitter", slice);
 	}
 	registerEventEmitterCap() {
-		this.ctx.registerNativeCap(require_ha_broker_source.eventEmitterCapability, { getStatus: async () => this.readSlice() });
+		this.ctx.registerNativeCap(require_ha_instance_settings.eventEmitterCapability, { getStatus: async () => this.readSlice() });
 	}
 	readSlice() {
 		return this.runtimeState.getCapState("event-emitter") ?? {
@@ -4525,7 +4547,7 @@ async function cascadeRemoveDevicesForBroker(input) {
 				tags: { deviceId: d.id },
 				meta: {
 					brokerId,
-					error: require_ha_broker_source.errMsg(err)
+					error: require_ha_instance_settings.errMsg(err)
 				}
 			});
 		}
@@ -5431,7 +5453,7 @@ var HaIntegrationManager = class HaIntegrationManager {
 					} catch (err) {
 						this.opts.logger.warn("ha-broker onConnected handler threw", { meta: {
 							brokerId: this.opts.id,
-							error: require_ha_broker_source.errMsg(err)
+							error: require_ha_instance_settings.errMsg(err)
 						} });
 					}
 				},
@@ -5446,12 +5468,12 @@ var HaIntegrationManager = class HaIntegrationManager {
 					} catch (err) {
 						this.opts.logger.warn("ha-broker onDisconnected handler threw", { meta: {
 							brokerId: this.opts.id,
-							error: require_ha_broker_source.errMsg(err)
+							error: require_ha_instance_settings.errMsg(err)
 						} });
 					}
 				},
 				onReconnectError: (err, nextDelayMs) => {
-					this.lastError = require_ha_broker_source.errMsg(err);
+					this.lastError = require_ha_instance_settings.errMsg(err);
 					this.opts.logger.warn("ha-broker reconnect attempt failed", { meta: {
 						brokerId: this.opts.id,
 						error: this.lastError,
@@ -5632,7 +5654,7 @@ var HaIntegrationManager = class HaIntegrationManager {
 			this.opts.logger.warn("ha-broker bus-event subscribe failed", { meta: {
 				brokerId: this.opts.id,
 				eventType,
-				error: require_ha_broker_source.errMsg(err)
+				error: require_ha_instance_settings.errMsg(err)
 			} });
 		}
 	}
@@ -5668,7 +5690,7 @@ var HaIntegrationManager = class HaIntegrationManager {
 		return false;
 	}
 	emitBrokerMessage(subscriptionId, entityId, state) {
-		this.opts.eventBus.emit(require_ha_broker_source.createEvent("broker.message", {
+		this.opts.eventBus.emit(require_ha_instance_settings.createEvent("broker.message", {
 			type: "addon",
 			id: this.opts.id
 		}, {
@@ -5690,7 +5712,7 @@ var HaIntegrationManager = class HaIntegrationManager {
 		} catch (err) {
 			this.opts.logger.debug("ha get_config probe failed", { meta: {
 				brokerId: this.opts.id,
-				error: require_ha_broker_source.errMsg(err)
+				error: require_ha_instance_settings.errMsg(err)
 			} });
 		}
 	}
@@ -5698,7 +5720,7 @@ var HaIntegrationManager = class HaIntegrationManager {
 		if (this.status === next) return;
 		this.status = next;
 		this.lastCheckedAt = Date.now();
-		this.opts.eventBus.emit(require_ha_broker_source.createEvent("broker.status-changed", {
+		this.opts.eventBus.emit(require_ha_instance_settings.createEvent("broker.status-changed", {
 			type: "addon",
 			id: this.opts.id
 		}, {
@@ -5719,7 +5741,7 @@ var HaIntegrationManager = class HaIntegrationManager {
 			this.lastError = "Home Assistant host / URL is required";
 			this.setStatus("unreachable");
 		} else {
-			this.lastError = require_ha_broker_source.errMsg(err);
+			this.lastError = require_ha_instance_settings.errMsg(err);
 			this.setStatus("error");
 		}
 	}
@@ -5740,25 +5762,19 @@ var TEST_HANDSHAKE_TIMEOUT_MS = 8e3;
 * `dataDir` being protected by filesystem permissions. (MQTT broker
 * encrypts at rest; HA broker does not yet — TODO for hardening.)
 */
-var HaBrokerEntrySchema = require_ha_broker_source.object({
-	id: require_ha_broker_source.string(),
-	name: require_ha_broker_source.string(),
-	/** Either Supervisor (token from env) or long-lived (persisted). */
-	auth: require_ha_broker_source.discriminatedUnion("kind", [require_ha_broker_source.object({
-		kind: require_ha_broker_source.literal("supervisor"),
-		supervisorToken: require_ha_broker_source.string().meta({ secret: true })
-	}), require_ha_broker_source.object({
-		kind: require_ha_broker_source.literal("long-lived"),
-		baseUrl: require_ha_broker_source.string(),
-		accessToken: require_ha_broker_source.string().meta({ secret: true })
-	})]),
-	/** Optional FK to the integration record that spawned this broker.
-	*  Populated when the wizard's "+ New Integration" flow created the
-	*  broker; null when the operator added it via the Settings panel
-	*  directly. Used by the integration listener to keep the broker
-	*  list in sync with the integrations table (cascade-delete on
-	*  integration removal). */
-	integrationId: require_ha_broker_source.string().optional()
+var HaBrokerEntrySchema = require_ha_instance_settings.object({
+	id: require_ha_instance_settings.string(),
+	name: require_ha_instance_settings.string(),
+	/** Supervisor (token from env) or long-lived (persisted); picks which fields below are used. */
+	authKind: require_ha_instance_settings._enum(["long-lived", "supervisor"]),
+	/** Origin URL of the HA instance; long-lived only. */
+	baseUrl: require_ha_instance_settings.string().optional(),
+	accessToken: require_ha_instance_settings.string().optional().meta({ secret: true }),
+	supervisorToken: require_ha_instance_settings.string().optional().meta({ secret: true }),
+	/** Optional FK to the integration record that spawned this broker. */
+	integrationId: require_ha_instance_settings.string().optional(),
+	/** The instance's own switch (D996); absent means on. */
+	enabled: require_ha_instance_settings.boolean().optional()
 });
 /**
 * Validates a `broker.add` `settings` payload for the HA kind. Accepts:
@@ -5767,10 +5783,10 @@ var HaBrokerEntrySchema = require_ha_broker_source.object({
 *    persisting allows the addon to keep working after the env var
 *    rotates out of scope)
 */
-var HaAddSettingsSchema = require_ha_broker_source.union([require_ha_broker_source.object({
-	baseUrl: require_ha_broker_source.url(),
-	accessToken: require_ha_broker_source.string().min(1).meta({ secret: true })
-}), require_ha_broker_source.object({ supervisorToken: require_ha_broker_source.string().min(1).meta({ secret: true }) })]);
+var HaAddSettingsSchema = require_ha_instance_settings.union([require_ha_instance_settings.object({
+	baseUrl: require_ha_instance_settings.url(),
+	accessToken: require_ha_instance_settings.string().min(1).meta({ secret: true })
+}), require_ha_instance_settings.object({ supervisorToken: require_ha_instance_settings.string().min(1).meta({ secret: true }) })]);
 function settingsToAuth(settings) {
 	const parsed = HaAddSettingsSchema.parse(settings);
 	if ("supervisorToken" in parsed) return {
@@ -5783,6 +5799,34 @@ function settingsToAuth(settings) {
 		accessToken: parsed.accessToken
 	};
 }
+/** The flat entry fields of an auth config: the one place the two shapes meet. */
+function authToEntryFields(auth) {
+	return auth.kind === "supervisor" ? {
+		authKind: "supervisor",
+		supervisorToken: auth.supervisorToken
+	} : {
+		authKind: "long-lived",
+		baseUrl: auth.baseUrl,
+		accessToken: auth.accessToken
+	};
+}
+/** The auth config an entry stands for; null while the entry is not filled in. */
+function haAuthOf(entry) {
+	const parsed = HaAuthConfigSchema.safeParse(entry.authKind === "supervisor" ? {
+		kind: "supervisor",
+		supervisorToken: entry.supervisorToken ?? ""
+	} : {
+		kind: "long-lived",
+		baseUrl: entry.baseUrl ?? "",
+		accessToken: entry.accessToken ?? ""
+	});
+	return parsed.success ? parsed.data : null;
+}
+/** The flat settings payload (`settingsToAuth` shape) of an entry; null while it is not filled in. */
+function entryToSettings(entry) {
+	const auth = haAuthOf(entry);
+	return auth === null ? null : authToSettings(auth);
+}
 function authToSettings(auth) {
 	if (auth.kind === "supervisor") return { supervisorToken: auth.supervisorToken };
 	return {
@@ -5845,13 +5889,13 @@ var HaBrokerRegistry = class {
 	*  started concurrently; transient errors don't block bootstrap. */
 	async restore(entries) {
 		this.seedCounterFromEntries(entries);
-		await Promise.all(entries.map(async (entry) => {
+		await Promise.all(entries.filter((entry) => entry.enabled !== false && haAuthOf(entry) !== null).map(async (entry) => {
 			try {
 				await this.startManagerForEntry(entry);
 			} catch (err) {
 				this.logger.warn("ha-broker bootstrap failed", { meta: {
 					brokerId: entry.id,
-					error: require_ha_broker_source.errMsg(err)
+					error: require_ha_instance_settings.errMsg(err)
 				} });
 			}
 		}));
@@ -5906,7 +5950,7 @@ var HaBrokerRegistry = class {
 		const entry = {
 			id: options.id !== void 0 ? this.adoptId(options.id) : this.allocateId(),
 			name,
-			auth,
+			...authToEntryFields(auth),
 			...options.integrationId !== void 0 ? { integrationId: options.integrationId } : {}
 		};
 		await this.startManagerForEntry(entry);
@@ -5927,7 +5971,7 @@ var HaBrokerRegistry = class {
 		return {
 			id,
 			name: existing.getInfo().name,
-			auth
+			...authToEntryFields(auth)
 		};
 	}
 	/**
@@ -5945,7 +5989,7 @@ var HaBrokerRegistry = class {
 		} catch (err) {
 			return {
 				ok: false,
-				error: require_ha_broker_source.errMsg(err)
+				error: require_ha_instance_settings.errMsg(err)
 			};
 		}
 		const startedAt = Date.now();
@@ -5983,7 +6027,7 @@ var HaBrokerRegistry = class {
 						client?.stop();
 						resolve({
 							ok: false,
-							error: require_ha_broker_source.errMsg(err)
+							error: require_ha_instance_settings.errMsg(err)
 						});
 					}
 				}
@@ -5995,7 +6039,7 @@ var HaBrokerRegistry = class {
 				client?.stop();
 				resolve({
 					ok: false,
-					error: require_ha_broker_source.errMsg(err)
+					error: require_ha_instance_settings.errMsg(err)
 				});
 			});
 		});
@@ -6110,10 +6154,12 @@ var HaBrokerRegistry = class {
 			this.logger.debug("ha-broker already active — reusing existing connection", { meta: { brokerId: entry.id } });
 			return;
 		}
+		const auth = haAuthOf(entry);
+		if (auth === null) throw new Error(`ha-broker '${entry.id}' has no complete credentials`);
 		const manager = new HaIntegrationManager({
 			id: entry.id,
 			name: entry.name,
-			auth: entry.auth,
+			auth,
 			logger: this.logger,
 			eventBus: this.eventBus,
 			onConnected: (brokerId) => this.onBrokerConnected?.(brokerId),
@@ -6190,27 +6236,27 @@ function mapHaEntityToCamStack(input) {
 	const { domain, deviceClass, attributes } = input;
 	switch (domain) {
 		case "switch": return {
-			deviceType: require_ha_broker_source.DeviceType.Switch,
-			role: deviceClass === "outlet" ? require_ha_broker_source.DeviceRole.Outlet : null,
+			deviceType: require_ha_instance_settings.DeviceType.Switch,
+			role: deviceClass === "outlet" ? require_ha_instance_settings.DeviceRole.Outlet : null,
 			capabilities: ["switch"]
 		};
 		case "input_boolean": return {
-			deviceType: require_ha_broker_source.DeviceType.Switch,
-			role: require_ha_broker_source.DeviceRole.BinaryHelper,
+			deviceType: require_ha_instance_settings.DeviceType.Switch,
+			role: require_ha_instance_settings.DeviceRole.BinaryHelper,
 			capabilities: ["switch"]
 		};
 		case "remote": return {
-			deviceType: require_ha_broker_source.DeviceType.Switch,
+			deviceType: require_ha_instance_settings.DeviceType.Switch,
 			role: null,
 			capabilities: ["switch"]
 		};
 		case "siren": return {
-			deviceType: require_ha_broker_source.DeviceType.Siren,
+			deviceType: require_ha_instance_settings.DeviceType.Siren,
 			role: null,
 			capabilities: ["switch"]
 		};
 		case "update": return {
-			deviceType: require_ha_broker_source.DeviceType.Update,
+			deviceType: require_ha_instance_settings.DeviceType.Update,
 			role: null,
 			capabilities: ["update"]
 		};
@@ -6228,7 +6274,7 @@ function mapHaEntityToCamStack(input) {
 		case "alarm_control_panel": return mapAlarmPanel(attributes);
 		case "person":
 		case "device_tracker": return {
-			deviceType: require_ha_broker_source.DeviceType.Presence,
+			deviceType: require_ha_instance_settings.DeviceType.Presence,
 			role: null,
 			capabilities: ["presence"]
 		};
@@ -6237,49 +6283,49 @@ function mapHaEntityToCamStack(input) {
 		case "camera": return mapImage(attributes);
 		case "number":
 		case "input_number": return {
-			deviceType: require_ha_broker_source.DeviceType.Control,
-			role: require_ha_broker_source.DeviceRole.NumericControl,
+			deviceType: require_ha_instance_settings.DeviceType.Control,
+			role: require_ha_instance_settings.DeviceRole.NumericControl,
 			capabilities: ["control"]
 		};
 		case "select":
 		case "input_select": return {
-			deviceType: require_ha_broker_source.DeviceType.Control,
-			role: require_ha_broker_source.DeviceRole.SelectControl,
+			deviceType: require_ha_instance_settings.DeviceType.Control,
+			role: require_ha_instance_settings.DeviceRole.SelectControl,
 			capabilities: ["control"]
 		};
 		case "text":
 		case "input_text": return {
-			deviceType: require_ha_broker_source.DeviceType.Control,
-			role: require_ha_broker_source.DeviceRole.TextControl,
+			deviceType: require_ha_instance_settings.DeviceType.Control,
+			role: require_ha_instance_settings.DeviceRole.TextControl,
 			capabilities: ["control"]
 		};
 		case "input_datetime":
 		case "date":
 		case "time":
 		case "datetime": return {
-			deviceType: require_ha_broker_source.DeviceType.Control,
-			role: require_ha_broker_source.DeviceRole.DateTimeControl,
+			deviceType: require_ha_instance_settings.DeviceType.Control,
+			role: require_ha_instance_settings.DeviceRole.DateTimeControl,
 			capabilities: ["control"]
 		};
 		case "button":
 		case "input_button":
 		case "scene": return {
-			deviceType: require_ha_broker_source.DeviceType.Button,
+			deviceType: require_ha_instance_settings.DeviceType.Button,
 			role: null,
 			capabilities: ["button"]
 		};
 		case "event": return {
-			deviceType: require_ha_broker_source.DeviceType.EventEmitter,
+			deviceType: require_ha_instance_settings.DeviceType.EventEmitter,
 			role: null,
 			capabilities: ["event-emitter"]
 		};
 		case "script": return {
-			deviceType: require_ha_broker_source.DeviceType.Script,
+			deviceType: require_ha_instance_settings.DeviceType.Script,
 			role: null,
 			capabilities: ["script-runner"]
 		};
 		case "automation": return {
-			deviceType: require_ha_broker_source.DeviceType.Automation,
+			deviceType: require_ha_instance_settings.DeviceType.Automation,
 			role: null,
 			capabilities: ["automation-control"]
 		};
@@ -6305,12 +6351,12 @@ function mapLight(attributes) {
 	const hasMired = modes.some((m) => m === "color_temp");
 	if (hasRgb || hasMired) {
 		capabilities.push("color");
-		if (modes.includes("rgb") || modes.includes("rgbw") || modes.includes("rgbww") || modes.includes("xy")) features.push(require_ha_broker_source.DeviceFeature.LightColorRgb);
-		if (modes.includes("hs")) features.push(require_ha_broker_source.DeviceFeature.LightColorHsv);
-		if (hasMired) features.push(require_ha_broker_source.DeviceFeature.LightColorMired);
+		if (modes.includes("rgb") || modes.includes("rgbw") || modes.includes("rgbww") || modes.includes("xy")) features.push(require_ha_instance_settings.DeviceFeature.LightColorRgb);
+		if (modes.includes("hs")) features.push(require_ha_instance_settings.DeviceFeature.LightColorHsv);
+		if (hasMired) features.push(require_ha_instance_settings.DeviceFeature.LightColorMired);
 	}
 	return {
-		deviceType: require_ha_broker_source.DeviceType.Light,
+		deviceType: require_ha_instance_settings.DeviceType.Light,
 		role: null,
 		capabilities,
 		features
@@ -6318,11 +6364,11 @@ function mapLight(attributes) {
 }
 function mapLock(attributes) {
 	const features = [];
-	if (attributes["code_format"] !== void 0 && attributes["code_format"] !== null) features.push(require_ha_broker_source.DeviceFeature.LockPinRequired);
+	if (attributes["code_format"] !== void 0 && attributes["code_format"] !== null) features.push(require_ha_instance_settings.DeviceFeature.LockPinRequired);
 	const sf = readNumericAttr(attributes, "supported_features");
-	if (sf !== null && (sf & 1) !== 0) features.push(require_ha_broker_source.DeviceFeature.LockOpen);
+	if (sf !== null && (sf & 1) !== 0) features.push(require_ha_instance_settings.DeviceFeature.LockOpen);
 	return {
-		deviceType: require_ha_broker_source.DeviceType.Lock,
+		deviceType: require_ha_instance_settings.DeviceType.Lock,
 		role: null,
 		capabilities: ["lock-control"],
 		features
@@ -6331,11 +6377,11 @@ function mapLock(attributes) {
 function mapCover(attributes, deviceClass) {
 	const features = [];
 	const sf = readNumericAttr(attributes, "supported_features");
-	if (sf !== null && (sf & 4) !== 0) features.push(require_ha_broker_source.DeviceFeature.CoverPositionable);
-	if (sf !== null && (sf & 8) !== 0) features.push(require_ha_broker_source.DeviceFeature.CoverStoppable);
-	if (sf !== null && (sf & 128) !== 0) features.push(require_ha_broker_source.DeviceFeature.CoverTilt);
+	if (sf !== null && (sf & 4) !== 0) features.push(require_ha_instance_settings.DeviceFeature.CoverPositionable);
+	if (sf !== null && (sf & 8) !== 0) features.push(require_ha_instance_settings.DeviceFeature.CoverStoppable);
+	if (sf !== null && (sf & 128) !== 0) features.push(require_ha_instance_settings.DeviceFeature.CoverTilt);
 	return {
-		deviceType: require_ha_broker_source.DeviceType.Cover,
+		deviceType: require_ha_instance_settings.DeviceType.Cover,
 		role: coverRoleFor(deviceClass),
 		capabilities: ["cover"],
 		features
@@ -6345,23 +6391,23 @@ function mapCover(attributes, deviceClass) {
 function coverRoleFor(deviceClass) {
 	switch (deviceClass) {
 		case "blind":
-		case "shade": return require_ha_broker_source.DeviceRole.CoverBlind;
-		case "shutter": return require_ha_broker_source.DeviceRole.CoverShutter;
-		case "awning": return require_ha_broker_source.DeviceRole.CoverAwning;
-		case "curtain": return require_ha_broker_source.DeviceRole.CoverCurtain;
-		case "garage": return require_ha_broker_source.DeviceRole.CoverGarage;
-		case "gate": return require_ha_broker_source.DeviceRole.CoverGate;
-		case "door": return require_ha_broker_source.DeviceRole.CoverDoor;
-		case "window": return require_ha_broker_source.DeviceRole.CoverWindow;
+		case "shade": return require_ha_instance_settings.DeviceRole.CoverBlind;
+		case "shutter": return require_ha_instance_settings.DeviceRole.CoverShutter;
+		case "awning": return require_ha_instance_settings.DeviceRole.CoverAwning;
+		case "curtain": return require_ha_instance_settings.DeviceRole.CoverCurtain;
+		case "garage": return require_ha_instance_settings.DeviceRole.CoverGarage;
+		case "gate": return require_ha_instance_settings.DeviceRole.CoverGate;
+		case "door": return require_ha_instance_settings.DeviceRole.CoverDoor;
+		case "window": return require_ha_instance_settings.DeviceRole.CoverWindow;
 		default: return null;
 	}
 }
 function mapValve(attributes, _deviceClass) {
 	const features = [];
 	const sf = readNumericAttr(attributes, "supported_features");
-	if (sf !== null && (sf & 4) !== 0) features.push(require_ha_broker_source.DeviceFeature.ValvePositionable);
+	if (sf !== null && (sf & 4) !== 0) features.push(require_ha_instance_settings.DeviceFeature.ValvePositionable);
 	return {
-		deviceType: require_ha_broker_source.DeviceType.Valve,
+		deviceType: require_ha_instance_settings.DeviceType.Valve,
 		role: null,
 		capabilities: ["valve"],
 		features
@@ -6369,7 +6415,7 @@ function mapValve(attributes, _deviceClass) {
 }
 function mapHumidifier(_attributes, _deviceClass) {
 	return {
-		deviceType: require_ha_broker_source.DeviceType.Humidifier,
+		deviceType: require_ha_instance_settings.DeviceType.Humidifier,
 		role: null,
 		capabilities: ["humidifier"],
 		features: []
@@ -6377,7 +6423,7 @@ function mapHumidifier(_attributes, _deviceClass) {
 }
 function mapWaterHeater(_attributes, _deviceClass) {
 	return {
-		deviceType: require_ha_broker_source.DeviceType.WaterHeater,
+		deviceType: require_ha_instance_settings.DeviceType.WaterHeater,
 		role: null,
 		capabilities: ["water-heater"],
 		features: []
@@ -6387,13 +6433,13 @@ function mapFan(attributes) {
 	const features = [];
 	const sf = readNumericAttr(attributes, "supported_features");
 	if (sf !== null) {
-		if ((sf & 1) !== 0) features.push(require_ha_broker_source.DeviceFeature.FanSpeed);
-		if ((sf & 2) !== 0) features.push(require_ha_broker_source.DeviceFeature.FanOscillating);
-		if ((sf & 4) !== 0) features.push(require_ha_broker_source.DeviceFeature.FanDirection);
-		if ((sf & 8) !== 0) features.push(require_ha_broker_source.DeviceFeature.FanPreset);
+		if ((sf & 1) !== 0) features.push(require_ha_instance_settings.DeviceFeature.FanSpeed);
+		if ((sf & 2) !== 0) features.push(require_ha_instance_settings.DeviceFeature.FanOscillating);
+		if ((sf & 4) !== 0) features.push(require_ha_instance_settings.DeviceFeature.FanDirection);
+		if ((sf & 8) !== 0) features.push(require_ha_instance_settings.DeviceFeature.FanPreset);
 	}
 	return {
-		deviceType: require_ha_broker_source.DeviceType.Fan,
+		deviceType: require_ha_instance_settings.DeviceType.Fan,
 		role: null,
 		capabilities: ["switch", "fan-control"],
 		features
@@ -6401,7 +6447,7 @@ function mapFan(attributes) {
 }
 function mapVacuum(_attributes) {
 	return {
-		deviceType: require_ha_broker_source.DeviceType.Vacuum,
+		deviceType: require_ha_instance_settings.DeviceType.Vacuum,
 		role: null,
 		capabilities: ["vacuum-control"],
 		features: []
@@ -6409,7 +6455,7 @@ function mapVacuum(_attributes) {
 }
 function mapLawnMower(_attributes) {
 	return {
-		deviceType: require_ha_broker_source.DeviceType.LawnMower,
+		deviceType: require_ha_instance_settings.DeviceType.LawnMower,
 		role: null,
 		capabilities: ["lawn-mower-control"],
 		features: []
@@ -6419,13 +6465,13 @@ function mapClimate(attributes) {
 	const features = [];
 	const sf = readNumericAttr(attributes, "supported_features");
 	if (sf !== null) {
-		if ((sf & 2) !== 0) features.push(require_ha_broker_source.DeviceFeature.ClimateDualSetpoint);
-		if ((sf & 4) !== 0) features.push(require_ha_broker_source.DeviceFeature.ClimateHumidity);
-		if ((sf & 8) !== 0) features.push(require_ha_broker_source.DeviceFeature.ClimateFanMode);
-		if ((sf & 16) !== 0) features.push(require_ha_broker_source.DeviceFeature.ClimatePreset);
+		if ((sf & 2) !== 0) features.push(require_ha_instance_settings.DeviceFeature.ClimateDualSetpoint);
+		if ((sf & 4) !== 0) features.push(require_ha_instance_settings.DeviceFeature.ClimateHumidity);
+		if ((sf & 8) !== 0) features.push(require_ha_instance_settings.DeviceFeature.ClimateFanMode);
+		if ((sf & 16) !== 0) features.push(require_ha_instance_settings.DeviceFeature.ClimatePreset);
 	}
 	return {
-		deviceType: require_ha_broker_source.DeviceType.Thermostat,
+		deviceType: require_ha_instance_settings.DeviceType.Thermostat,
 		role: null,
 		capabilities: ["climate-control"],
 		features
@@ -6435,19 +6481,21 @@ function mapMediaPlayer(attributes) {
 	const features = [];
 	const sf = readNumericAttr(attributes, "supported_features");
 	if (sf !== null) {
-		if ((sf & 2) !== 0) features.push(require_ha_broker_source.DeviceFeature.MediaPlayerSeek);
-		if ((sf & 4) !== 0) features.push(require_ha_broker_source.DeviceFeature.MediaPlayerVolume);
-		if ((sf & 8) !== 0) features.push(require_ha_broker_source.DeviceFeature.MediaPlayerMute);
-		if ((sf & 16) !== 0) features.push(require_ha_broker_source.DeviceFeature.MediaPlayerPrevious);
-		if ((sf & 32) !== 0) features.push(require_ha_broker_source.DeviceFeature.MediaPlayerNext);
-		if ((sf & 512) !== 0) features.push(require_ha_broker_source.DeviceFeature.MediaPlayerPlayMedia);
-		if ((sf & 2048) !== 0) features.push(require_ha_broker_source.DeviceFeature.MediaPlayerSelectSource);
-		if ((sf & 4096) !== 0) features.push(require_ha_broker_source.DeviceFeature.MediaPlayerStop);
-		if ((sf & 32768) !== 0) features.push(require_ha_broker_source.DeviceFeature.MediaPlayerShuffle);
-		if ((sf & 262144) !== 0) features.push(require_ha_broker_source.DeviceFeature.MediaPlayerRepeat);
+		if ((sf & 2) !== 0) features.push(require_ha_instance_settings.DeviceFeature.MediaPlayerSeek);
+		if ((sf & 4) !== 0) features.push(require_ha_instance_settings.DeviceFeature.MediaPlayerVolume);
+		if ((sf & 8) !== 0) features.push(require_ha_instance_settings.DeviceFeature.MediaPlayerMute);
+		if ((sf & 16) !== 0) features.push(require_ha_instance_settings.DeviceFeature.MediaPlayerPrevious);
+		if ((sf & 32) !== 0) features.push(require_ha_instance_settings.DeviceFeature.MediaPlayerNext);
+		if ((sf & 384) === 384) features.push(require_ha_instance_settings.DeviceFeature.MediaPlayerPower);
+		if ((sf & 1024) !== 0) features.push(require_ha_instance_settings.DeviceFeature.MediaPlayerVolumeStep);
+		if ((sf & 512) !== 0) features.push(require_ha_instance_settings.DeviceFeature.MediaPlayerPlayMedia);
+		if ((sf & 2048) !== 0) features.push(require_ha_instance_settings.DeviceFeature.MediaPlayerSelectSource);
+		if ((sf & 4096) !== 0) features.push(require_ha_instance_settings.DeviceFeature.MediaPlayerStop);
+		if ((sf & 32768) !== 0) features.push(require_ha_instance_settings.DeviceFeature.MediaPlayerShuffle);
+		if ((sf & 262144) !== 0) features.push(require_ha_instance_settings.DeviceFeature.MediaPlayerRepeat);
 	}
 	return {
-		deviceType: require_ha_broker_source.DeviceType.MediaPlayer,
+		deviceType: require_ha_instance_settings.DeviceType.MediaPlayer,
 		role: null,
 		capabilities: ["media-player"],
 		features
@@ -6455,9 +6503,9 @@ function mapMediaPlayer(attributes) {
 }
 function mapAlarmPanel(attributes) {
 	const features = [];
-	if (attributes["code_format"] !== void 0 && attributes["code_format"] !== null) features.push(require_ha_broker_source.DeviceFeature.AlarmPinRequired);
+	if (attributes["code_format"] !== void 0 && attributes["code_format"] !== null) features.push(require_ha_instance_settings.DeviceFeature.AlarmPinRequired);
 	return {
-		deviceType: require_ha_broker_source.DeviceType.AlarmPanel,
+		deviceType: require_ha_instance_settings.DeviceType.AlarmPanel,
 		role: null,
 		capabilities: ["alarm-panel"],
 		features
@@ -6465,21 +6513,21 @@ function mapAlarmPanel(attributes) {
 }
 function mapNotifier(_attributes) {
 	return {
-		deviceType: require_ha_broker_source.DeviceType.Notifier,
-		role: require_ha_broker_source.DeviceRole.GenericNotifier,
+		deviceType: require_ha_instance_settings.DeviceType.Notifier,
+		role: require_ha_instance_settings.DeviceRole.GenericNotifier,
 		capabilities: ["notifier"]
 	};
 }
 function mapWeather(_attributes) {
 	return {
-		deviceType: require_ha_broker_source.DeviceType.Weather,
+		deviceType: require_ha_instance_settings.DeviceType.Weather,
 		role: null,
 		capabilities: ["weather"]
 	};
 }
 function mapImage(_attributes) {
 	return {
-		deviceType: require_ha_broker_source.DeviceType.Image,
+		deviceType: require_ha_instance_settings.DeviceType.Image,
 		role: null,
 		capabilities: ["image"]
 	};
@@ -6493,60 +6541,60 @@ function isTemperatureUnit(unit) {
 function mapNumericSensor(deviceClass, _attributes) {
 	switch (deviceClass) {
 		case "temperature": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.TemperatureSensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.TemperatureSensor,
 			capabilities: ["temperature-sensor"]
 		};
 		case "humidity": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.HumiditySensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.HumiditySensor,
 			capabilities: ["humidity-sensor"]
 		};
 		case "illuminance": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.AmbientLightSensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.AmbientLightSensor,
 			capabilities: ["ambient-light-sensor"]
 		};
 		case "pressure":
 		case "atmospheric_pressure": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.PressureSensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.PressureSensor,
 			capabilities: ["pressure-sensor"]
 		};
 		case "wind_speed": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.WindSensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.WindSensor,
 			capabilities: ["numeric-sensor"]
 		};
 		case "precipitation":
 		case "precipitation_intensity": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.RainSensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.RainSensor,
 			capabilities: ["numeric-sensor"]
 		};
 		case "irradiance": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.SolarRadiationSensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.SolarRadiationSensor,
 			capabilities: ["numeric-sensor"]
 		};
 		case "power": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.PowerSensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.PowerSensor,
 			capabilities: ["power-meter"]
 		};
 		case "energy": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.EnergySensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.EnergySensor,
 			capabilities: ["power-meter"]
 		};
 		case "voltage": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.VoltageSensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.VoltageSensor,
 			capabilities: ["power-meter"]
 		};
 		case "current": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.CurrentSensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.CurrentSensor,
 			capabilities: ["power-meter"]
 		};
 		case "pm1":
@@ -6559,46 +6607,46 @@ function mapNumericSensor(deviceClass, _attributes) {
 		case "sulphur_dioxide":
 		case "volatile_organic_compounds":
 		case "aqi": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.AirQualitySensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.AirQualitySensor,
 			capabilities: ["air-quality-sensor"]
 		};
 		case "battery": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.BatterySensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.BatterySensor,
 			capabilities: ["numeric-sensor"]
 		};
 		case "enum": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.EnumSensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.EnumSensor,
 			capabilities: ["enum-sensor"]
 		};
 		case "timestamp": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.DateTimeSensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.DateTimeSensor,
 			capabilities: ["enum-sensor"],
 			dateTimeFormat: "datetime"
 		};
 		case "date": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.DateTimeSensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.DateTimeSensor,
 			capabilities: ["enum-sensor"],
 			dateTimeFormat: "date"
 		};
 		case null:
 			if (isTemperatureUnit(_attributes["unit_of_measurement"])) return {
-				deviceType: require_ha_broker_source.DeviceType.Sensor,
-				role: require_ha_broker_source.DeviceRole.TemperatureSensor,
+				deviceType: require_ha_instance_settings.DeviceType.Sensor,
+				role: require_ha_instance_settings.DeviceRole.TemperatureSensor,
 				capabilities: ["temperature-sensor"]
 			};
 			return {
-				deviceType: require_ha_broker_source.DeviceType.Sensor,
-				role: require_ha_broker_source.DeviceRole.EnumSensor,
+				deviceType: require_ha_instance_settings.DeviceType.Sensor,
+				role: require_ha_instance_settings.DeviceRole.EnumSensor,
 				capabilities: ["enum-sensor"]
 			};
 		default: return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.NumericSensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.NumericSensor,
 			capabilities: ["numeric-sensor"]
 		};
 	}
@@ -6609,67 +6657,67 @@ function mapBinarySensor(deviceClass) {
 		case "occupancy":
 		case "presence":
 		case "moving": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.MotionSensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.MotionSensor,
 			capabilities: ["motion"]
 		};
 		case "door":
 		case "window":
 		case "garage_door":
 		case "opening": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.ContactSensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.ContactSensor,
 			capabilities: ["contact"]
 		};
 		case "moisture": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.LeakSensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.LeakSensor,
 			capabilities: ["flood"]
 		};
 		case "smoke": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.SmokeSensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.SmokeSensor,
 			capabilities: ["smoke"]
 		};
 		case "carbon_monoxide": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.COSensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.COSensor,
 			capabilities: ["carbon-monoxide"]
 		};
 		case "gas": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.GasSensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.GasSensor,
 			capabilities: ["gas"]
 		};
 		case "tamper":
 		case "safety": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.TamperSensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.TamperSensor,
 			capabilities: ["tamper"]
 		};
 		case "vibration": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.VibrationSensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.VibrationSensor,
 			capabilities: ["vibration"]
 		};
 		case "connectivity": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.ConnectivitySensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.ConnectivitySensor,
 			capabilities: ["connectivity"]
 		};
 		case "sound": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.SoundSensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.SoundSensor,
 			capabilities: ["binary"]
 		};
 		case "battery": return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.BatterySensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.BatterySensor,
 			capabilities: ["binary"]
 		};
 		default: return {
-			deviceType: require_ha_broker_source.DeviceType.Sensor,
-			role: require_ha_broker_source.DeviceRole.BinarySensor,
+			deviceType: require_ha_instance_settings.DeviceType.Sensor,
+			role: require_ha_instance_settings.DeviceRole.BinarySensor,
 			capabilities: ["binary"]
 		};
 	}
@@ -6692,40 +6740,40 @@ function readNumericAttr(attributes, key) {
 * Sensor; an HA-tracked light with motion sensor becomes Light).
 */
 var PARENT_TYPE_PRIORITY = [
-	require_ha_broker_source.DeviceType.MediaPlayer,
-	require_ha_broker_source.DeviceType.AlarmPanel,
-	require_ha_broker_source.DeviceType.Thermostat,
-	require_ha_broker_source.DeviceType.Climate,
-	require_ha_broker_source.DeviceType.Humidifier,
-	require_ha_broker_source.DeviceType.WaterHeater,
-	require_ha_broker_source.DeviceType.Lock,
-	require_ha_broker_source.DeviceType.Cover,
-	require_ha_broker_source.DeviceType.Valve,
-	require_ha_broker_source.DeviceType.Fan,
-	require_ha_broker_source.DeviceType.Vacuum,
-	require_ha_broker_source.DeviceType.LawnMower,
-	require_ha_broker_source.DeviceType.Washer,
-	require_ha_broker_source.DeviceType.Dryer,
-	require_ha_broker_source.DeviceType.Dishwasher,
-	require_ha_broker_source.DeviceType.Light,
-	require_ha_broker_source.DeviceType.Switch,
-	require_ha_broker_source.DeviceType.Siren,
-	require_ha_broker_source.DeviceType.Button,
-	require_ha_broker_source.DeviceType.Control,
-	require_ha_broker_source.DeviceType.Notifier,
-	require_ha_broker_source.DeviceType.Script,
-	require_ha_broker_source.DeviceType.Automation,
-	require_ha_broker_source.DeviceType.Update,
-	require_ha_broker_source.DeviceType.Presence,
-	require_ha_broker_source.DeviceType.Weather,
-	require_ha_broker_source.DeviceType.Image,
-	require_ha_broker_source.DeviceType.Sensor
+	require_ha_instance_settings.DeviceType.MediaPlayer,
+	require_ha_instance_settings.DeviceType.AlarmPanel,
+	require_ha_instance_settings.DeviceType.Thermostat,
+	require_ha_instance_settings.DeviceType.Climate,
+	require_ha_instance_settings.DeviceType.Humidifier,
+	require_ha_instance_settings.DeviceType.WaterHeater,
+	require_ha_instance_settings.DeviceType.Lock,
+	require_ha_instance_settings.DeviceType.Cover,
+	require_ha_instance_settings.DeviceType.Valve,
+	require_ha_instance_settings.DeviceType.Fan,
+	require_ha_instance_settings.DeviceType.Vacuum,
+	require_ha_instance_settings.DeviceType.LawnMower,
+	require_ha_instance_settings.DeviceType.Washer,
+	require_ha_instance_settings.DeviceType.Dryer,
+	require_ha_instance_settings.DeviceType.Dishwasher,
+	require_ha_instance_settings.DeviceType.Light,
+	require_ha_instance_settings.DeviceType.Switch,
+	require_ha_instance_settings.DeviceType.Siren,
+	require_ha_instance_settings.DeviceType.Button,
+	require_ha_instance_settings.DeviceType.Control,
+	require_ha_instance_settings.DeviceType.Notifier,
+	require_ha_instance_settings.DeviceType.Script,
+	require_ha_instance_settings.DeviceType.Automation,
+	require_ha_instance_settings.DeviceType.Update,
+	require_ha_instance_settings.DeviceType.Presence,
+	require_ha_instance_settings.DeviceType.Weather,
+	require_ha_instance_settings.DeviceType.Image,
+	require_ha_instance_settings.DeviceType.Sensor
 ];
 function inferParentDeviceType(mappings) {
 	const set = /* @__PURE__ */ new Set();
 	for (const m of mappings) if (m) set.add(m.deviceType);
 	for (const dt of PARENT_TYPE_PRIORITY) if (set.has(dt)) return dt;
-	return require_ha_broker_source.DeviceType.Generic;
+	return require_ha_instance_settings.DeviceType.Generic;
 }
 //#endregion
 //#region src/ha-candidate-mapper.ts
@@ -6747,7 +6795,7 @@ function haDeviceToCandidate(dev) {
 		return {
 			childNativeId: e.entityId,
 			name: e.name,
-			type: e.mappedTo?.deviceType ?? require_ha_broker_source.DeviceType.Generic,
+			type: e.mappedTo?.deviceType ?? require_ha_instance_settings.DeviceType.Generic,
 			status: entityStatus$1(e.state),
 			metadata: e.area !== null ? { externalLocation: e.area } : {},
 			alreadyAdopted: e.alreadyAdopted,
@@ -6894,7 +6942,7 @@ function buildDiscoveryCandidates(input) {
 		};
 		candidates.push({
 			stableId,
-			type: require_ha_broker_source.DeviceType.Container,
+			type: require_ha_instance_settings.DeviceType.Container,
 			suggestedName,
 			prefilledConfig,
 			sourceInfo
@@ -6922,52 +6970,52 @@ function buildDiscoveryCandidates(input) {
 * shown as a Devices-tab candidate.
 */
 var HA_ORPHAN_ENTITIES_DEVICE_ID = "__ha_orphan_entities__";
-var HaEntityMappingSchema = require_ha_broker_source.object({
+var HaEntityMappingSchema = require_ha_instance_settings.object({
 	/** CamStack DeviceType for the accessory child. */
-	deviceType: require_ha_broker_source._enum(require_ha_broker_source.DeviceType),
+	deviceType: require_ha_instance_settings._enum(require_ha_instance_settings.DeviceType),
 	/** Optional CamStack DeviceRole sub-role (e.g. `ContactSensor` for
 	*  a binary_sensor with `device_class: door`). */
-	role: require_ha_broker_source._enum(require_ha_broker_source.DeviceRole).nullable(),
+	role: require_ha_instance_settings._enum(require_ha_instance_settings.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_ha_broker_source.array(require_ha_broker_source.string()).readonly(),
+	capabilities: require_ha_instance_settings.array(require_ha_instance_settings.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_ha_broker_source.array(require_ha_broker_source.string()).readonly().optional(),
+	features: require_ha_instance_settings.array(require_ha_instance_settings.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_ha_broker_source.EnumSensorDateTimeFormatSchema.optional()
+	dateTimeFormat: require_ha_instance_settings.EnumSensorDateTimeFormatSchema.optional()
 }).nullable();
-var HaDiscoveredEntitySchema = require_ha_broker_source.object({
+var HaDiscoveredEntitySchema = require_ha_instance_settings.object({
 	/** Fully-qualified HA entity id (`switch.kitchen`). */
-	entityId: require_ha_broker_source.string(),
+	entityId: require_ha_instance_settings.string(),
 	/** HA domain — first segment of entity_id (`switch` / `light` /
 	*  `sensor` / `binary_sensor` / `cover` / …). */
-	domain: require_ha_broker_source.string(),
+	domain: require_ha_instance_settings.string(),
 	/** Operator-visible friendly name (HA `friendly_name` attribute or
 	*  the entity_id when missing). */
-	name: require_ha_broker_source.string(),
+	name: require_ha_instance_settings.string(),
 	/** Current state value (e.g. `'on'`, `'21.5'`, `'open'`). */
-	state: require_ha_broker_source.string(),
+	state: require_ha_instance_settings.string(),
 	/** HA `device_class` attribute when present — drives the role +
 	*  cap mapping for sensors / binary_sensors / covers. */
-	deviceClass: require_ha_broker_source.string().nullable(),
+	deviceClass: require_ha_instance_settings.string().nullable(),
 	/** HA `unit_of_measurement` attribute when present. */
-	unitOfMeasurement: require_ha_broker_source.string().nullable(),
+	unitOfMeasurement: require_ha_instance_settings.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_ha_broker_source.string().nullable().default(null),
+	area: require_ha_instance_settings.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_ha_broker_source.array(require_ha_broker_source.string()).nullable().default(null),
+	options: require_ha_instance_settings.array(require_ha_instance_settings.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_ha_broker_source._enum(["config", "diagnostic"]).nullable().default(null),
+	entityCategory: require_ha_instance_settings._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). */
@@ -6975,48 +7023,48 @@ var HaDiscoveredEntitySchema = require_ha_broker_source.object({
 	/** 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_ha_broker_source.boolean(),
+	alreadyAdopted: require_ha_instance_settings.boolean(),
 	/** When `alreadyAdopted === true`, the kernel-assigned accessory
 	*  child id. */
-	adoptedCamDeviceId: require_ha_broker_source.number().int().nonnegative().nullable()
+	adoptedCamDeviceId: require_ha_instance_settings.number().int().nonnegative().nullable()
 });
-require_ha_broker_source.object({
+require_ha_instance_settings.object({
 	/** Stable HA `device_registry` id — survives renames + restarts. */
-	haDeviceId: require_ha_broker_source.string(),
+	haDeviceId: require_ha_instance_settings.string(),
 	/** Operator-visible name (HA device `name` or first entity's
 	*  friendly_name when device has none). */
-	name: require_ha_broker_source.string(),
+	name: require_ha_instance_settings.string(),
 	/** Area name from HA `area_registry` join. Null when unassigned. */
-	area: require_ha_broker_source.string().nullable(),
-	manufacturer: require_ha_broker_source.string().nullable(),
-	model: require_ha_broker_source.string().nullable(),
-	swVersion: require_ha_broker_source.string().nullable(),
+	area: require_ha_instance_settings.string().nullable(),
+	manufacturer: require_ha_instance_settings.string().nullable(),
+	model: require_ha_instance_settings.string().nullable(),
+	swVersion: require_ha_instance_settings.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_ha_broker_source.string().nullable().default(null),
+	integration: require_ha_instance_settings.string().nullable().default(null),
 	/** Convenience field — count of `entities[]`. */
-	entityCount: require_ha_broker_source.number().int().nonnegative(),
+	entityCount: require_ha_instance_settings.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_ha_broker_source.array(HaDiscoveredEntitySchema).readonly(),
+	entities: require_ha_instance_settings.array(HaDiscoveredEntitySchema).readonly(),
 	/** Whether this HA device has an active CamStack adoption. */
-	alreadyAdopted: require_ha_broker_source.boolean(),
+	alreadyAdopted: require_ha_instance_settings.boolean(),
 	/** When `alreadyAdopted === true`, the kernel-assigned parent id. */
-	adoptedCamDeviceId: require_ha_broker_source.number().int().nonnegative().nullable()
+	adoptedCamDeviceId: require_ha_instance_settings.number().int().nonnegative().nullable()
 });
-require_ha_broker_source.object({
+require_ha_instance_settings.object({
 	/** Last refresh timestamp (ms epoch) — null when never refreshed. */
-	lastDiscoveryAt: require_ha_broker_source.number().int().nonnegative().nullable(),
+	lastDiscoveryAt: require_ha_instance_settings.number().int().nonnegative().nullable(),
 	/** Count of HA devices in the discovery cache (across all brokers). */
-	deviceCount: require_ha_broker_source.number().int().nonnegative(),
+	deviceCount: require_ha_instance_settings.number().int().nonnegative(),
 	/** Count of HA devices currently materialised as CamStack parent
 	*  devices. */
-	adoptedCount: require_ha_broker_source.number().int().nonnegative(),
+	adoptedCount: require_ha_instance_settings.number().int().nonnegative(),
 	/** Last error message from a refresh attempt. */
-	lastError: require_ha_broker_source.string().nullable()
+	lastError: require_ha_instance_settings.string().nullable()
 });
 //#endregion
 //#region src/ha-integration-domain.ts
@@ -7155,7 +7203,7 @@ function negotiateEncoding(acceptEncoding) {
 }
 /** Build the `addon-routes` provider that serves the bundled Home Assistant icon. */
 function createHaIconRouteProvider() {
-	return require_ha_broker_source.buildAddonRouteProvider(HA_ROUTE_ID, [{
+	return require_ha_instance_settings.buildAddonRouteProvider(HA_ROUTE_ID, [{
 		method: "GET",
 		path: `/icons/${HA_ICON_KIND}`,
 		access: "public",
@@ -7172,16 +7220,24 @@ function createHaIconRouteProvider() {
 //#region src/broker-record-kinds.ts
 /**
 * Broker entry kind (B2): credentials live in records; integrations keep brokerId.
+*
+* The body is FLAT (planning#408 P3): the form the instances page edits is the stored shape,
+* with the two tokens at the top level where the records door keeps them in the keychain.
 */
 var HA_BROKERS_KIND = "brokers";
-var HaBrokerBodySchema = require_ha_broker_source.entryBody({
-	auth: HaBrokerEntrySchema.shape.auth,
-	integrationId: require_ha_broker_source.string().optional()
+var HaBrokerBodySchema = require_ha_instance_settings.entryBody({
+	authKind: HaBrokerEntrySchema.shape.authKind,
+	baseUrl: HaBrokerEntrySchema.shape.baseUrl,
+	accessToken: HaBrokerEntrySchema.shape.accessToken,
+	supervisorToken: HaBrokerEntrySchema.shape.supervisorToken,
+	integrationId: HaBrokerEntrySchema.shape.integrationId,
+	enabled: HaBrokerEntrySchema.shape.enabled
 });
-var haBrokersEntryKind = require_ha_broker_source.defineEntryKind(HA_BROKERS_KIND, {
+var haBrokersEntryKind = require_ha_instance_settings.defineEntryKind(HA_BROKERS_KIND, {
 	title: "Home Assistant brokers",
 	schema: HaBrokerBodySchema,
-	writeTrigger: "an operator adds, edits or removes a Home Assistant broker connection"
+	writeTrigger: "an operator adds, edits or removes a Home Assistant broker connection",
+	retiredSecretPaths: ["auth.accessToken", "auth.supervisorToken"]
 });
 //#endregion
 //#region src/record-kinds.ts
@@ -7192,8 +7248,8 @@ var haBrokersEntryKind = require_ha_broker_source.defineEntryKind(HA_BROKERS_KIN
 * credential — delivery reuses the broker WebSocket connection (the token
 * lives in the broker config, not in the target).
 */
-var HaTargetBodySchema = require_ha_broker_source.TargetSchema.omit({ id: true });
-var haRecordKinds = require_ha_broker_source.defineRecordKinds({ 
+var HaTargetBodySchema = require_ha_instance_settings.TargetSchema.omit({ id: true });
+var haRecordKinds = require_ha_instance_settings.defineRecordKinds({ 
 /**
 * One row per configured Home Assistant push target. Operator-managed via the
 * notification-output cap CRUD; no TTL.
@@ -7259,7 +7315,7 @@ function haConfigSchema() {
 			labelKey: "provider-homeassistant:haConfig.s_connection.brokerId.label",
 			description: "The Home Assistant connection the notification goes through.",
 			descriptionKey: "provider-homeassistant:haConfig.s_connection.brokerId.description",
-			brokerKind: require_ha_broker_source.HA_BROKER_KIND
+			brokerKind: require_ha_instance_settings.HA_BROKER_KIND
 		}, {
 			type: "select",
 			key: "service",
@@ -7499,7 +7555,7 @@ var HaTargetStore = class HaTargetStore {
 		const page = await this.kind.query({ limit: 1e3 });
 		const out = [];
 		for (const record of page.records) {
-			const parsed = require_ha_broker_source.TargetSchema.safeParse({
+			const parsed = require_ha_instance_settings.TargetSchema.safeParse({
 				id: record.id,
 				...record.data
 			});
@@ -7510,7 +7566,7 @@ var HaTargetStore = class HaTargetStore {
 	async getById(id) {
 		const row = await this.kind.get(id);
 		if (row === null) return null;
-		const parsed = require_ha_broker_source.TargetSchema.safeParse({
+		const parsed = require_ha_instance_settings.TargetSchema.safeParse({
 			id: row.id,
 			...row.data
 		});
@@ -7571,12 +7627,12 @@ function createHaNotificationOutputProvider(deps) {
 	}
 	/** Degrade → build → publish. NEVER throws through the cap. */
 	async function dispatch(target, raw) {
-		const notification = deps.readPublicEndpoint === void 0 ? raw : await require_ha_broker_source.resolveAttachmentUrls({
+		const notification = deps.readPublicEndpoint === void 0 ? raw : await require_ha_instance_settings.resolveAttachmentUrls({
 			notification: raw,
 			readPublicEndpoint: deps.readPublicEndpoint,
 			...logger !== void 0 ? { logger } : {}
 		});
-		const prepared = require_ha_broker_source.prepareNotification(descriptor.caps, notification);
+		const prepared = require_ha_instance_settings.prepareNotification(descriptor.caps, notification);
 		const service = readService(target.config);
 		if (!service) return {
 			success: false,
@@ -7600,11 +7656,11 @@ function createHaNotificationOutputProvider(deps) {
 			logger?.warn("ha notify publish failed", { meta: {
 				brokerId,
 				service,
-				error: require_ha_broker_source.errMsg(err)
+				error: require_ha_instance_settings.errMsg(err)
 			} });
 			return {
 				success: false,
-				error: require_ha_broker_source.errMsg(err),
+				error: require_ha_instance_settings.errMsg(err),
 				renderedAs: prepared.renderedAs
 			};
 		}
@@ -7643,7 +7699,7 @@ function createHaNotificationOutputProvider(deps) {
 				} catch (err) {
 					logger?.warn("ha device registry read failed; naming services from their ids", { meta: {
 						brokerId,
-						error: require_ha_broker_source.errMsg(err)
+						error: require_ha_instance_settings.errMsg(err)
 					} });
 					return /* @__PURE__ */ new Map();
 				}
@@ -7657,7 +7713,7 @@ function createHaNotificationOutputProvider(deps) {
 			} catch (err) {
 				logger?.warn("ha get_services discovery failed", { meta: {
 					brokerId,
-					error: require_ha_broker_source.errMsg(err)
+					error: require_ha_instance_settings.errMsg(err)
 				} });
 			}
 			return out;
@@ -7713,8 +7769,12 @@ function rowToEntry(id, data) {
 	const parsed = HaBrokerEntrySchema.safeParse({
 		id,
 		name: data.name,
-		auth: data.auth,
-		integrationId: data.integrationId
+		authKind: data.authKind,
+		baseUrl: data.baseUrl,
+		accessToken: data.accessToken,
+		supervisorToken: data.supervisorToken,
+		integrationId: data.integrationId,
+		enabled: data.enabled
 	});
 	return parsed.success ? parsed.data : null;
 }
@@ -7735,7 +7795,7 @@ var HaBrokerStore = class HaBrokerStore {
 				const resolved = await this.kind.getResolved(record.id);
 				if (resolved !== null) data = resolved.data;
 			} catch (err) {
-				if (!(err instanceof require_ha_broker_source.RecordSecretUnavailableError)) throw err;
+				if (!(err instanceof require_ha_instance_settings.RecordSecretUnavailableError)) throw err;
 			}
 			const entry = rowToEntry(record.id, data);
 			if (entry !== null) out.push(entry);
@@ -7748,15 +7808,14 @@ var HaBrokerStore = class HaBrokerStore {
 			if (row === null) return null;
 			return rowToEntry(row.id, row.data);
 		} catch (err) {
-			if (err instanceof require_ha_broker_source.RecordSecretUnavailableError) return null;
+			if (err instanceof require_ha_instance_settings.RecordSecretUnavailableError) return null;
 			throw err;
 		}
 	}
 	async upsert(entry) {
-		const { id, name, auth, integrationId } = entry;
+		const { id, integrationId, ...fields } = entry;
 		const body = {
-			name,
-			auth,
+			...Object.fromEntries(Object.entries(fields).filter(([, v]) => v !== void 0)),
 			...integrationId === void 0 ? {} : { integrationId }
 		};
 		const parsed = haBrokersEntryKind.schema.safeParse(body);
@@ -7777,6 +7836,97 @@ var HaBrokerStore = class HaBrokerStore {
 	}
 };
 //#endregion
+//#region src/ha-instances.ts
+/**
+* The Home Assistant connections as `integration-instances` (planning#408 P3): one instance per
+* `brokers` record, over the SAME records and ids (`ha_NNN`) the `broker` cap serves. The body is
+* flat, so the form the instances page edits is the stored shape.
+*/
+var HA_INSTANCE_KIND = "home-assistant";
+function isHaBodyConfigured(body) {
+	return body.authKind === "supervisor" ? (body.supervisorToken ?? "").length > 0 : (body.baseUrl ?? "").length > 0 && (body.accessToken ?? "").length > 0;
+}
+function statusOf(info) {
+	if (info === null) return {
+		state: "unknown",
+		label: "Not connected"
+	};
+	if (info.status === "connected") return {
+		state: "ok",
+		label: "Connected"
+	};
+	if (info.status === "connecting") return {
+		state: "unknown",
+		label: "Connecting"
+	};
+	return {
+		state: "error",
+		label: info.status,
+		...info.error !== null ? { detail: info.error } : {}
+	};
+}
+function buildHaInstances(records, deps) {
+	return new require_ha_instance_settings.RecordIntegrationInstances(records, haBrokersEntryKind, {
+		description: {
+			instanceMode: "multiple",
+			kind: "connection",
+			canTest: true,
+			kinds: [{
+				id: HA_INSTANCE_KIND,
+				label: "Home Assistant"
+			}],
+			allowRestoreId: true
+		},
+		formSchema: () => haBrokerSettingsSchema,
+		initialBody: (name) => ({
+			name,
+			authKind: "long-lived"
+		}),
+		mintId: () => deps.mintId(),
+		kindOf: () => HA_INSTANCE_KIND,
+		health: (_body, id) => {
+			const info = deps.infoOf(id);
+			return {
+				status: statusOf(info),
+				...info?.lastCheckedAt != null ? { lastCheckedAt: info.lastCheckedAt } : {}
+			};
+		},
+		configured: isHaBodyConfigured,
+		onChanged: deps.onChanged,
+		test: async ({ id, values }) => {
+			if (["accessToken", "supervisorToken"].some((key) => {
+				const v = values[key];
+				return typeof v === "string" && v.length > 0 && v !== "__camstack_redacted__";
+			})) {
+				const r = await deps.probe(values);
+				return r.ok ? {
+					success: true,
+					status: "validated",
+					...r.latencyMs !== void 0 ? { latencyMs: r.latencyMs } : {}
+				} : {
+					success: false,
+					status: "rejected",
+					error: r.error ?? "Home Assistant rejected the connection"
+				};
+			}
+			const info = id === null ? null : deps.infoOf(id);
+			if (info === null) return {
+				success: false,
+				status: "inconclusive",
+				error: "Not connected: save the connection first"
+			};
+			return info.status === "connected" ? {
+				success: true,
+				status: "validated"
+			} : {
+				success: false,
+				status: "rejected",
+				error: info.error ?? `status: ${info.status}`
+			};
+		}
+	});
+}
+//#endregion
 //#region src/ha-board-key-source.ts
 /**
 * `board-key-source` for Home Assistant: reads an ESPHome board's API
@@ -7799,19 +7949,19 @@ var HaBrokerStore = class HaBrokerStore {
 */
 var INGRESS_PREFIX = "/api/hassio_ingress/";
 var ESPHOME_SERVICE = "esphome";
-var DiscoverySchema = require_ha_broker_source.object({ discovery: require_ha_broker_source.array(require_ha_broker_source.object({
-	addon: require_ha_broker_source.string(),
-	service: require_ha_broker_source.string()
+var DiscoverySchema = require_ha_instance_settings.object({ discovery: require_ha_instance_settings.array(require_ha_instance_settings.object({
+	addon: require_ha_instance_settings.string(),
+	service: require_ha_instance_settings.string()
 })) });
-var AddonInfoSchema = require_ha_broker_source.object({ ingress_url: require_ha_broker_source.string().nullable().optional() });
-var SessionSchema = require_ha_broker_source.object({ session: require_ha_broker_source.string().min(1) });
-var DevicesSchema = require_ha_broker_source.object({ configured: require_ha_broker_source.array(require_ha_broker_source.object({
-	name: require_ha_broker_source.string(),
-	configuration: require_ha_broker_source.string(),
-	address: require_ha_broker_source.string().nullable().optional()
+var AddonInfoSchema = require_ha_instance_settings.object({ ingress_url: require_ha_instance_settings.string().nullable().optional() });
+var SessionSchema = require_ha_instance_settings.object({ session: require_ha_instance_settings.string().min(1) });
+var DevicesSchema = require_ha_instance_settings.object({ configured: require_ha_instance_settings.array(require_ha_instance_settings.object({
+	name: require_ha_instance_settings.string(),
+	configuration: require_ha_instance_settings.string(),
+	address: require_ha_instance_settings.string().nullable().optional()
 })) });
 /** The ONLY part of `json-config` that is read; every other field is dropped by the parse. */
-var KeyConfigSchema = require_ha_broker_source.object({ api: require_ha_broker_source.object({ encryption: require_ha_broker_source.object({ key: require_ha_broker_source.string().min(1) }).optional() }).optional() });
+var KeyConfigSchema = require_ha_instance_settings.object({ api: require_ha_instance_settings.object({ encryption: require_ha_instance_settings.object({ key: require_ha_instance_settings.string().min(1) }).optional() }).optional() });
 var ADMIN_CODES = new Set([
 	"unauthorized",
 	"forbidden",
@@ -7877,7 +8027,7 @@ var HaBoardKeySource = class {
 		}
 	}
 	fail(sourceId, op, err) {
-		const failure = err instanceof SourceFailure ? err : new SourceFailure("unreachable", require_ha_broker_source.errMsg(err));
+		const failure = err instanceof SourceFailure ? err : new SourceFailure("unreachable", require_ha_instance_settings.errMsg(err));
 		this.deps.logger.warn(`board-key-source ${op} refused`, { meta: {
 			sourceId,
 			reason: failure.reason
@@ -7901,7 +8051,7 @@ var HaBoardKeySource = class {
 		} catch (err) {
 			const code = errorCode(err);
 			if (code !== null && ADMIN_CODES.has(code)) throw new SourceFailure("not-admin", "the Home Assistant token is not an administrator");
-			throw new SourceFailure("unreachable", require_ha_broker_source.errMsg(err));
+			throw new SourceFailure("unreachable", require_ha_instance_settings.errMsg(err));
 		}
 	}
 	async openIngress(sourceId) {
@@ -7929,7 +8079,7 @@ var HaBoardKeySource = class {
 				Accept: "application/json"
 			} });
 		} catch (err) {
-			throw new SourceFailure("unreachable", require_ha_broker_source.errMsg(err));
+			throw new SourceFailure("unreachable", require_ha_instance_settings.errMsg(err));
 		}
 		if (response.status === 404 && configuration !== void 0) throw new SourceFailure("unknown-board", configuration);
 		if (response.status === 401 || response.status === 403) throw new SourceFailure("not-admin", `the builder answered ${response.status}`);
@@ -7950,6 +8100,178 @@ function createHaBoardKeyProvider(source) {
 	};
 }
 //#endregion
+//#region src/migrations/flatten-broker-records.ts
+/**
+* The Home Assistant broker records keep their connection flat (planning#408 P3): the nested
+* `auth` object (`{ kind, baseUrl, accessToken }` or `{ kind, supervisorToken }`) becomes the top
+* level `authKind`, `baseUrl`, `accessToken` and `supervisorToken`, under the SAME record id, so
+* the devices that carry `ha_NNN` keep their broker. The work is `flattenNestedRecords`: every
+* secret is read before anything is written, read back from its new keychain ref before the
+* nested object goes, and the old refs are deleted last.
+*/
+var FLATTEN_BROKER_RECORDS_ID = "provider-homeassistant/2026-11-04-flatten-broker-records";
+function text(value) {
+	return typeof value === "string" ? value : void 0;
+}
+async function flattenBrokerRecords(ports) {
+	return require_ha_instance_settings.flattenNestedRecords(ports, {
+		legacyKey: "auth",
+		flatSecretKeys: ["accessToken", "supervisorToken"],
+		toFlat: (legacy) => {
+			const kind = legacy["kind"] === "supervisor" ? "supervisor" : "long-lived";
+			const baseUrl = text(legacy["baseUrl"]);
+			const accessToken = text(legacy["accessToken"]);
+			const supervisorToken = text(legacy["supervisorToken"]);
+			return {
+				authKind: kind,
+				...baseUrl !== void 0 ? { baseUrl } : {},
+				...accessToken !== void 0 ? { accessToken } : {},
+				...supervisorToken !== void 0 ? { supervisorToken } : {}
+			};
+		}
+	});
+}
+//#endregion
+//#region src/migrations/calendar-ids-to-integration.ts
+/**
+* The HA calendars an instance imports are a fact of THAT instance (D985): each Home Assistant
+* integration carries its own `calendarIds` in its settings, and the addon-level `calendarIds`
+* setting (one set of `calendar.*` entity ids for every broker) goes away.
+*
+* Two migrations, in this order:
+*
+* 1. `calendar-ids-to-integration` (procedure) copies the shared set to EVERY integration that
+*    has no `calendarIds` yet. An integration that already has one is never overwritten; one
+*    deleted meanwhile is skipped, never recreated; a stored value that is not a list of strings
+*    is an ambiguity and throws (nothing is guessed).
+* 2. `drop-shared-calendar-ids` (plan) deletes the shared setting after a read-back: every
+*    integration must show its own set. When one holds a set that differs from the shared one,
+*    the shared value is the loser and stays PARKED in place, never deleted.
+*
+* Both are idempotent.
+*/
+var HA_PROVIDER_ID = "provider-homeassistant";
+/** The canonical settings table: one row per key, id `<addonId>.<key>`. */
+var ADDON_SETTINGS_TABLE = "addon-settings";
+var SHARED_CALENDAR_IDS_KEY = "calendarIds";
+async function readSharedSet(ports) {
+	const answer = await ports.readStored(SHARED_CALENDAR_IDS_KEY);
+	if (answer.kind === "unreadable") throw new Error(`provider-homeassistant: the shared calendarIds cannot be read (${answer.reason})`);
+	if (answer.kind === "absent") return null;
+	const value = answer.value;
+	if (!Array.isArray(value) || !value.every((item) => typeof item === "string")) throw new Error("provider-homeassistant: the shared calendarIds is not a list of entity ids — nothing copied");
+	return value;
+}
+async function copyCalendarIdsToIntegrations(ports) {
+	const shared = await readSharedSet(ports);
+	if (shared === null) return {
+		outcome: "already-done",
+		summary: { reason: "no-shared-set" }
+	};
+	let copied = 0;
+	let kept = 0;
+	let gone = 0;
+	for (const instance of await ports.listInstances()) {
+		if ("calendarIds" in instance.settings) {
+			kept += 1;
+			continue;
+		}
+		if (await ports.patchInstanceSettings(instance.integrationId, { calendarIds: [...shared] })) copied += 1;
+		else gone += 1;
+	}
+	return {
+		outcome: copied === 0 ? "already-done" : "done",
+		summary: {
+			copied,
+			kept,
+			gone
+		}
+	};
+}
+var asIds = (value) => Array.isArray(value) && value.every((item) => typeof item === "string") ? value : null;
+var sameSet = (a, b) => {
+	const left = new Set(a);
+	const right = new Set(b);
+	return left.size === right.size && [...left].every((id) => right.has(id));
+};
+async function planDropSharedCalendarIds(ports) {
+	const shared = await readSharedSet(ports);
+	if (shared === null) return { edits: [] };
+	const instances = await ports.listInstances();
+	if (instances.length === 0) return { edits: [] };
+	const own = instances.map((instance) => ({
+		integrationId: instance.integrationId,
+		ids: asIds(instance.settings[SHARED_CALENDAR_IDS_KEY])
+	}));
+	const missing = own.filter((entry) => entry.ids === null);
+	if (missing.length > 0) throw new Error(`provider-homeassistant: the shared calendarIds is not dropped, ${missing.map((m) => m.integrationId).join(", ")} has no set of its own`);
+	if (!own.every((entry) => sameSet(entry.ids ?? [], shared))) return { edits: [] };
+	const rowId = `${HA_PROVIDER_ID}.${SHARED_CALENDAR_IDS_KEY}`;
+	return { edits: [{
+		op: "deleteKeys",
+		scope: ADDON_SETTINGS_TABLE,
+		keys: [rowId],
+		precondition: require_ha_instance_settings.preconditionOf({ [rowId]: {
+			addonId: HA_PROVIDER_ID,
+			key: SHARED_CALENDAR_IDS_KEY,
+			value: shared
+		} })
+	}] };
+}
+//#endregion
+//#region src/migrations/index.ts
+/** The `provider-homeassistant` catalogue (D987): offered to the engine when the addon initialises. */
+var ADDON_MIGRATIONS = [
+	{
+		meta: {
+			id: "provider-homeassistant/2026-11-03-calendar-ids-to-integration",
+			owner: "provider-homeassistant",
+			level: "addon-state",
+			seq: 1,
+			dependsOn: [],
+			store: "settings",
+			scope: "cluster",
+			onFailure: "tolerate",
+			bodyKind: "procedure",
+			description: "Copy the shared calendar set to the settings of every Home Assistant integration that has none",
+			fixtureMark: "the broker link stored beside the calendars of an integration"
+		},
+		procedure: copyCalendarIdsToIntegrations
+	},
+	{
+		meta: {
+			id: "provider-homeassistant/2026-11-03-drop-shared-calendar-ids",
+			owner: "provider-homeassistant",
+			level: "addon-state",
+			seq: 2,
+			dependsOn: ["provider-homeassistant/2026-11-03-calendar-ids-to-integration"],
+			store: "settings",
+			scope: "cluster",
+			onFailure: "tolerate",
+			bodyKind: "plan",
+			description: "Delete the shared calendar set once every integration shows its own",
+			fixtureMark: "the shared set parked when an integration holds a different one"
+		},
+		plan: planDropSharedCalendarIds
+	},
+	{
+		meta: {
+			id: FLATTEN_BROKER_RECORDS_ID,
+			owner: "provider-homeassistant",
+			level: "addon-state",
+			seq: 3,
+			dependsOn: [],
+			store: "settings",
+			scope: "cluster",
+			onFailure: "block-owner",
+			bodyKind: "procedure",
+			description: "Flatten the nested auth of every Home Assistant broker record under its own id, moving each token to a top-level keychain secret",
+			fixtureMark: "a non-secret field stored beside the auth of a broker record"
+		},
+		procedure: flattenBrokerRecords
+	}
+];
+//#endregion
 //#region src/ha-calendar-source.ts
 function isCalendarEntity(entityId) {
 	return entityId.startsWith("calendar.");
@@ -8060,9 +8382,9 @@ function isSelected(entityId, selected) {
 function createHaCalendarSource(deps) {
 	return {
 		listCalendars: async () => {
-			const selected = deps.selectedCalendarIds();
 			const out = [];
-			for (const { manager } of deps.brokers.listManagers()) {
+			for (const { brokerId, manager } of deps.brokers.listManagers()) {
+				const selected = deps.selectedCalendarIds(brokerId);
 				const states = manager.snapshotAllStates();
 				for (const [entityId, raw] of Object.entries(states)) {
 					if (!isCalendarEntity(entityId)) continue;
@@ -8082,10 +8404,10 @@ function createHaCalendarSource(deps) {
 		listEvents: async (input) => {
 			const startIso = new Date(input.startMs).toISOString();
 			const endIso = new Date(input.endMs).toISOString();
-			const selected = deps.selectedCalendarIds();
 			const wanted = input.calendarIds !== void 0 && input.calendarIds.length > 0 ? new Set(input.calendarIds) : null;
 			const out = [];
 			for (const { brokerId, manager } of deps.brokers.listManagers()) {
+				const selected = deps.selectedCalendarIds(brokerId);
 				const states = manager.snapshotAllStates();
 				const entityIds = Object.keys(states).filter((id) => {
 					if (!isCalendarEntity(id)) return false;
@@ -8109,10 +8431,11 @@ function createHaCalendarSource(deps) {
 	};
 }
 /** Discover every HA calendar entity (ignores the import filter) — for settings catalog. */
-function listHaCalendarCatalog(brokers) {
+function listHaCalendarCatalog(brokers, onlyBrokerId) {
 	const out = [];
 	const seen = /* @__PURE__ */ new Set();
-	for (const { manager } of brokers.listManagers()) {
+	for (const { brokerId, manager } of brokers.listManagers()) {
+		if (onlyBrokerId !== void 0 && brokerId !== onlyBrokerId) continue;
 		const states = manager.snapshotAllStates();
 		for (const [entityId, raw] of Object.entries(states)) {
 			if (!isCalendarEntity(entityId) || seen.has(entityId)) continue;
@@ -8283,7 +8606,7 @@ function entityToStandaloneCandidate(entity, alreadyAdopted) {
 	return {
 		childNativeId: entity.entityId,
 		name: entity.name,
-		type: entity.mappedTo?.deviceType ?? require_ha_broker_source.DeviceType.Generic,
+		type: entity.mappedTo?.deviceType ?? require_ha_instance_settings.DeviceType.Generic,
 		status: entityStatus(entity.state),
 		metadata: entity.area !== null ? { externalLocation: entity.area } : {},
 		alreadyAdopted,
@@ -8418,7 +8741,7 @@ function readPersistedStandaloneSpec(device) {
 *  adoption-proof source field), so it is projected directly here, mirroring the
 *  Container's `EnumSensorDateTimeFormatSchema.safeParse` guard. */
 function readDateTimeFormat(config) {
-	const parsed = require_ha_broker_source.EnumSensorDateTimeFormatSchema.safeParse(config["dateTimeFormat"]);
+	const parsed = require_ha_instance_settings.EnumSensorDateTimeFormatSchema.safeParse(config["dateTimeFormat"]);
 	return parsed.success ? parsed.data : void 0;
 }
 /** Flatten a live device's config into a plain blob for `readHaSource`. */
@@ -8561,10 +8884,7 @@ function planStandaloneReconcile(devices, freshById, brokerId) {
 var ADOPTION_FILTER_DEVICES = "devices";
 var ADOPTION_FILTER_ENTITIES = "entities";
 var HA_KIND = "home-assistant";
-var DEFAULT_CONFIG = {
-	brokers: [],
-	calendarIds: []
-};
+var DEFAULT_CONFIG = { calendarIds: [] };
 /**
 * Home Assistant provider addon.
 *
@@ -8585,12 +8905,12 @@ var DEFAULT_CONFIG = {
 * …) and route HA state pushes into runtime-state slices + cap
 * mutations into HA call_service.
 */
-var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.BaseDeviceProvider {
+var HaProviderAddon = class HaProviderAddon extends require_ha_instance_settings.BaseDeviceProvider {
 	addonId = "provider-homeassistant";
 	providerName = "Home Assistant";
 	deviceClasses = {
-		[require_ha_broker_source.DeviceType.Container]: HaContainerDevice,
-		[require_ha_broker_source.DeviceType.EventEmitter]: HaEventBusDevice
+		[require_ha_instance_settings.DeviceType.Container]: HaContainerDevice,
+		[require_ha_instance_settings.DeviceType.EventEmitter]: HaEventBusDevice
 	};
 	async onGetCreationSchema(_type) {
 		return null;
@@ -8611,6 +8931,7 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 	}
 	registry = null;
 	brokerStore = null;
+	instances = null;
 	/** Runtime broker rows (records when B2 is live, else settings). */
 	activeBrokers = [];
 	/** Periodic re-sync sweep handle (cleared on shutdown). */
@@ -8625,11 +8946,26 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 	constructor() {
 		super({ ...DEFAULT_CONFIG });
 	}
+	flattenPorts(records) {
+		if (this.ctx.secrets === void 0) throw new Error("provider-homeassistant: ctx.secrets is required");
+		return {
+			readStored: (key) => this.readStoredGlobalKey(key),
+			...require_ha_instance_settings.haInstanceSettingsPortsOver(this.ctx.api.integrations),
+			...require_ha_instance_settings.flattenPortsOver(records.kind(haBrokersEntryKind))
+		};
+	}
 	async onInitialize() {
 		const records = this.ctx.records;
 		if (records === void 0) throw new Error("provider-homeassistant: ctx.records is required (hub-only addon)");
 		await records.declare(haAllRecordKinds);
 		this.brokerStore = HaBrokerStore.of(records);
+		this.instances = buildHaInstances(records, {
+			mintId: () => this.requireRegistry().allocateId(),
+			infoOf: (id) => this.registry?.get(id) ?? null,
+			onChanged: (id) => this.syncBrokerRuntime(id),
+			probe: (settings) => this.requireRegistry().testSettings(settings)
+		});
+		await this.runMigrations(require_ha_instance_settings.defineAddonMigrations(ADDON_MIGRATIONS.filter((m) => m.meta.id === FLATTEN_BROKER_RECORDS_ID), this.flattenPorts(records)));
 		this.activeBrokers = await this.loadPersistedBrokers();
 		this.registry = new HaBrokerRegistry(this.ctx.logger, this.ctx.eventBus);
 		this.registry.setOnBrokerConnected((brokerId) => {
@@ -8646,35 +8982,40 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 			this.reconcileAllConnectedBrokers();
 		}, HaProviderAddon.RESYNC_INTERVAL_MS);
 		this.ctx.logger.info("ha provider initialised", { meta: { brokerCount: this.activeBrokers.length } });
+		await this.runMigrations(require_ha_instance_settings.defineAddonMigrations(ADDON_MIGRATIONS.filter((m) => m.meta.id !== FLATTEN_BROKER_RECORDS_ID), this.flattenPorts(records)));
 		await this.reconcileIntegrationsToBrokers();
 		this.subscribeIntegrationLifecycle();
 		return [
 			{
-				capability: require_ha_broker_source.brokerCapability,
+				capability: require_ha_instance_settings.brokerCapability,
 				provider: this.buildBrokerProvider()
 			},
 			{
-				capability: require_ha_broker_source.deviceAdoptionCapability,
+				capability: require_ha_instance_settings.integrationInstancesCapability,
+				provider: this.requireInstances().toProvider()
+			},
+			{
+				capability: require_ha_instance_settings.deviceAdoptionCapability,
 				provider: this.buildAdoptionProvider()
 			},
 			{
-				capability: require_ha_broker_source.notificationOutputCapability,
+				capability: require_ha_instance_settings.notificationOutputCapability,
 				provider: await this.buildNotificationOutputProvider()
 			},
 			{
-				capability: require_ha_broker_source.addonRoutesCapability,
+				capability: require_ha_instance_settings.addonRoutesCapability,
 				provider: createHaIconRouteProvider()
 			},
 			{
-				capability: require_ha_broker_source.boardKeySourceCapability,
+				capability: require_ha_instance_settings.boardKeySourceCapability,
 				provider: this.buildBoardKeyProvider()
 			},
 			{
-				capability: require_ha_broker_source.calendarSourceCapability,
+				capability: require_ha_instance_settings.calendarSourceCapability,
 				provider: createHaCalendarSource({
 					brokers: this.requireRegistry(),
 					logger: this.ctx.logger.child("calendar-source"),
-					selectedCalendarIds: () => new Set(this.config.calendarIds ?? [])
+					selectedCalendarIds: (brokerId) => this.calendarIdsOf(brokerId)
 				})
 			}
 		];
@@ -8722,7 +9063,7 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 				return manager.sendMessage({ type: "config/device_registry/list" });
 			},
 			listBrokerIds: () => this.activeBrokers.map((b) => b.id),
-			readPublicEndpoint: require_ha_broker_source.publicEndpointReaderFrom(this.ctx.api.localNetwork),
+			readPublicEndpoint: require_ha_instance_settings.publicEndpointReaderFrom(this.ctx.api.localNetwork),
 			logger: this.ctx.logger.child("notification-output")
 		});
 	}
@@ -8772,6 +9113,20 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 	*
 	* Idempotent — runs on boot + on every integration.* event.
 	*/
+	/**
+	* Calendars to import, per broker (D985): the integration's own selection, filled by the
+	* reconcile that already reads each integration's settings. A broker whose integration has no
+	* selection yet (the move has not run) uses the legacy shared set, so a boot mid-move never
+	* changes what is imported.
+	*/
+	calendarIdsByBroker = /* @__PURE__ */ new Map();
+	noteInstanceCalendars(brokerId, raw) {
+		if (Array.isArray(raw) && raw.every((id) => typeof id === "string")) this.calendarIdsByBroker.set(brokerId, new Set(raw));
+		else this.calendarIdsByBroker.delete(brokerId);
+	}
+	calendarIdsOf(brokerId) {
+		return this.calendarIdsByBroker.get(brokerId) ?? new Set(this.config.calendarIds ?? []);
+	}
 	async reconcileIntegrationsToBrokers() {
 		const api = this.ctx.api;
 		if (!api.integrations?.list?.query || !api.integrations.getSettings?.query) return;
@@ -8783,6 +9138,7 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 				const settings = await api.integrations.getSettings.query({ id: integration.id });
 				const brokerId = typeof settings["brokerId"] === "string" ? settings["brokerId"] : null;
 				if (!brokerId) continue;
+				this.noteInstanceCalendars(brokerId, settings["calendarIds"]);
 				if (!this.activeBrokers.find((b) => b.id === brokerId)) {
 					this.ctx.logger.warn("integration→broker: linked broker not found", { meta: {
 						integrationId: integration.id,
@@ -8809,7 +9165,7 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 				integrationCount: haIntegrations.length
 			} });
 		} catch (err) {
-			this.ctx.logger.warn("integration→broker reconcile failed", { meta: { error: require_ha_broker_source.errMsg(err) } });
+			this.ctx.logger.warn("integration→broker reconcile failed", { meta: { error: require_ha_instance_settings.errMsg(err) } });
 		}
 	}
 	subscribeIntegrationLifecycle() {
@@ -8822,23 +9178,7 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 		eb.subscribe({ category: "integration.disabled" }, handler);
 		eb.subscribe({ category: "integration.deleted" }, handler);
 	}
-	globalSettingsSchema(cap) {
-		if (cap === "calendar-source") return this.schema({ sections: [{
-			id: "ha-calendars-import",
-			title: "Calendars to import",
-			titleKey: "provider-homeassistant:globalSettings.s_ha-calendars-import.title",
-			columns: 1,
-			fields: [{
-				type: "multiselect",
-				key: "calendarIds",
-				label: "Calendars",
-				labelKey: "provider-homeassistant:globalSettings.s_ha-calendars-import.calendarIds.label",
-				options: [],
-				optionsFrom: "_calendarCatalog",
-				description: "Discovered from connected HA brokers. Select at least one to import; leave empty to import none.",
-				descriptionKey: "provider-homeassistant:globalSettings.s_ha-calendars-import.calendarIds.description"
-			}]
-		}] });
+	globalSettingsSchema(_cap) {
 		return this.schema({ sections: [{
 			id: "ha-broker",
 			title: "Home Assistant broker",
@@ -8853,14 +9193,39 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 			}]
 		}] });
 	}
-	async getGlobalSettings(overlay, cap, nodeId) {
-		if (cap !== "calendar-source") return super.getGlobalSettings(overlay, cap, nodeId);
-		const catalog = this.registry ? listHaCalendarCatalog(this.registry) : [];
-		return super.getGlobalSettings({
-			...overlay,
-			calendarIds: this.config.calendarIds ?? [],
-			...catalog.length > 0 ? { _calendarCatalog: catalog } : {}
-		}, cap, nodeId);
+	/**
+	* The calendars of ONE Home Assistant instance (D985): picked on its integration, offered from
+	* that broker's own `calendar.*` entities.
+	*/
+	async integrationSettingsSchema(instance) {
+		if (instance.integrationId === null || !this.registry) return null;
+		let brokerId;
+		try {
+			brokerId = (await this.ctx.api.integrations.getSettings.query({ id: instance.integrationId }))["brokerId"];
+		} catch (err) {
+			this.ctx.logger.warn("HA integration form: instance lookup failed — broker form shown", { meta: {
+				integrationId: instance.integrationId,
+				error: require_ha_instance_settings.errMsg(err)
+			} });
+			return null;
+		}
+		if (typeof brokerId !== "string") return null;
+		const options = listHaCalendarCatalog(this.registry, brokerId);
+		return this.schema({ sections: [{
+			id: "ha-calendars-import",
+			title: "Calendars to import",
+			titleKey: "provider-homeassistant:globalSettings.s_ha-calendars-import.title",
+			columns: 1,
+			fields: [{
+				type: "multiselect",
+				key: "calendarIds",
+				label: "Calendars",
+				labelKey: "provider-homeassistant:globalSettings.s_ha-calendars-import.calendarIds.label",
+				options,
+				description: "Discovered from this Home Assistant instance. Select at least one to import; leave empty to import none.",
+				descriptionKey: "provider-homeassistant:globalSettings.s_ha-calendars-import.calendarIds.description"
+			}]
+		}] });
 	}
 	async onShutdown() {
 		if (this.resyncTimer) {
@@ -8870,7 +9235,7 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 		try {
 			await this.registry?.shutdown();
 		} catch (err) {
-			this.ctx.logger.warn("ha provider shutdown error", { meta: { error: require_ha_broker_source.errMsg(err) } });
+			this.ctx.logger.warn("ha provider shutdown error", { meta: { error: require_ha_instance_settings.errMsg(err) } });
 		}
 		this.registry = null;
 		await super.onShutdown();
@@ -8902,30 +9267,25 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 		} catch (err) {
 			this.ctx.logger.warn("ha onConfigChanged: removeEntry failed", { meta: {
 				brokerId: liveId,
-				error: require_ha_broker_source.errMsg(err)
+				error: require_ha_instance_settings.errMsg(err)
 			} });
 		}
 		for (const entry of persisted) {
 			if (entry.id && liveIds.has(entry.id)) {
 				try {
-					const settings = entry.auth.kind === "supervisor" ? { supervisorToken: entry.auth.supervisorToken } : {
-						baseUrl: entry.auth.baseUrl,
-						accessToken: entry.auth.accessToken
-					};
-					await reg.updateEntry(entry.id, settings);
+					const settings = entryToSettings(entry);
+					if (settings !== null) await reg.updateEntry(entry.id, settings);
 				} catch (err) {
 					this.ctx.logger.warn("ha onConfigChanged: updateEntry failed", { meta: {
 						brokerId: entry.id,
-						error: require_ha_broker_source.errMsg(err)
+						error: require_ha_instance_settings.errMsg(err)
 					} });
 				}
 				continue;
 			}
 			try {
-				const settings = entry.auth.kind === "supervisor" ? { supervisorToken: entry.auth.supervisorToken } : {
-					baseUrl: entry.auth.baseUrl,
-					accessToken: entry.auth.accessToken
-				};
+				const settings = entryToSettings(entry);
+				if (settings === null) continue;
 				const created = await reg.createEntry(entry.name, settings);
 				if (created.id !== entry.id) {
 					const next = persisted.map((b) => b === entry ? {
@@ -8937,27 +9297,65 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 			} catch (err) {
 				this.ctx.logger.warn("ha onConfigChanged: failed to start new broker", { meta: {
 					brokerName: entry.name,
-					error: require_ha_broker_source.errMsg(err)
+					error: require_ha_instance_settings.errMsg(err)
 				} });
 			}
 		}
 	}
 	async loadPersistedBrokers() {
-		const store = this.brokerStore;
-		if (store !== null) {
-			const fromRecords = await store.listResolved();
-			if (fromRecords.length > 0) return fromRecords;
+		return this.requireBrokerStore().listResolved();
+	}
+	requireInstances() {
+		if (this.instances === null) throw new Error("provider-homeassistant: instances not ready");
+		return this.instances;
+	}
+	/**
+	* After an instance changed (created, edited, switched, deleted) the runtime follows the record:
+	* a missing record removes the manager and its adopted devices, an off or unfilled one stops the
+	* manager but keeps the devices, a filled one starts or re-authenticates it.
+	*/
+	async syncBrokerRuntime(id) {
+		const reg = this.requireRegistry();
+		const entry = await this.requireBrokerStore().getById(id);
+		this.activeBrokers = await this.loadPersistedBrokers();
+		if (entry === null) {
+			await reg.removeEntry(id);
+			const deviceRegistry = this.ctx.kernel.deviceRegistry;
+			const devices = this.ctx.kernel.devices;
+			if (deviceRegistry && devices) await cascadeRemoveDevicesForBroker({
+				reg: deviceRegistry,
+				devices,
+				addonId: this.ctx.id,
+				brokerId: id,
+				logger: this.ctx.logger
+			});
+			return;
+		}
+		const settings = entry.enabled === false ? null : entryToSettings(entry);
+		if (settings === null) {
+			await reg.removeEntry(id);
+			return;
 		}
-		return this.config.brokers;
+		try {
+			if (reg.get(id) !== null) await reg.updateEntry(id, settings);
+			else await reg.createEntry(entry.name, settings, {
+				id,
+				...entry.integrationId !== void 0 ? { integrationId: entry.integrationId } : {}
+			});
+		} catch (err) {
+			this.ctx.logger.warn("ha instance: could not start the broker", { meta: {
+				brokerId: id,
+				error: require_ha_instance_settings.errMsg(err)
+			} });
+		}
+	}
+	requireBrokerStore() {
+		if (this.brokerStore === null) throw new Error("provider-homeassistant: broker store not ready");
+		return this.brokerStore;
 	}
 	async persistBrokerEntries(entries) {
 		this.activeBrokers = [...entries];
-		const store = this.brokerStore;
-		if (store !== null) {
-			await store.replaceAll(entries);
-			return;
-		}
-		await this.updateGlobalSettings({ brokers: entries });
+		await this.requireBrokerStore().replaceAll(entries);
 	}
 	buildBrokerProvider() {
 		const ownerAddonId = this.ctx.id;
@@ -9031,7 +9429,7 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 			getSettings: async ({ id }) => {
 				const entry = this.activeBrokers.find((b) => b.id === id);
 				if (!entry) return null;
-				return authToSettings(entry.auth);
+				return entryToSettings(entry);
 			},
 			setSettings: async ({ id, settings }) => {
 				if (!owns(id)) return;
@@ -9042,7 +9440,7 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 			getBrokerConfig: async ({ id }) => {
 				const entry = this.activeBrokers.find((b) => b.id === id);
 				if (!entry) return null;
-				return authToSettings(entry.auth);
+				return entryToSettings(entry);
 			},
 			getSettingsSchema: async ({ kind }) => {
 				if (kind !== HA_KIND) return null;
@@ -9087,7 +9485,7 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 					const refreshedAt = Date.now();
 					if (lastDiscoveryAt === null || refreshedAt > lastDiscoveryAt) lastDiscoveryAt = refreshedAt;
 				} catch (err) {
-					lastError = require_ha_broker_source.errMsg(err);
+					lastError = require_ha_instance_settings.errMsg(err);
 				}
 				const adoptedCount = (await this.ctx.kernel.devices.getAll()).filter((d) => d.parentDeviceId === null && String(d.config.get("system") ?? "") === "homeassistant").length;
 				return {
@@ -9233,7 +9631,7 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 						name: deviceName
 					};
 					const summary = await this.createDevice({
-						type: require_ha_broker_source.DeviceType.Container,
+						type: require_ha_instance_settings.DeviceType.Container,
 						config: containerConfig
 					});
 					const accessoryDeviceIds = (await this.ctx.kernel.devices.getChildren(summary.id)).map((c) => c.id);
@@ -9263,7 +9661,7 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 						meta: {
 							brokerId,
 							haDeviceId,
-							error: require_ha_broker_source.errMsg(err)
+							error: require_ha_instance_settings.errMsg(err)
 						}
 					});
 				}
@@ -9410,7 +9808,7 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 				meta: {
 					brokerId,
 					entityId,
-					error: require_ha_broker_source.errMsg(err)
+					error: require_ha_instance_settings.errMsg(err)
 				}
 			});
 		}
@@ -9431,7 +9829,7 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 	*/
 	async assignImportedLocation(deviceId, externalLocation, knownLocations) {
 		try {
-			const match = require_ha_broker_source.bestLocationMatch(externalLocation, knownLocations);
+			const match = require_ha_instance_settings.bestLocationMatch(externalLocation, knownLocations);
 			const name = match ?? externalLocation;
 			let locations = knownLocations;
 			if (match === null) {
@@ -9447,7 +9845,7 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 			this.ctx.logger.warn("ha-adoption: location import failed (non-fatal)", { meta: {
 				deviceId,
 				externalLocation,
-				error: require_ha_broker_source.errMsg(err)
+				error: require_ha_instance_settings.errMsg(err)
 			} });
 			return knownLocations;
 		}
@@ -9648,7 +10046,7 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 		} catch (err) {
 			this.ctx.logger.warn("ha bus-event aggregator ensure failed", { meta: {
 				brokerId,
-				error: require_ha_broker_source.errMsg(err)
+				error: require_ha_instance_settings.errMsg(err)
 			} });
 		}
 		await reconcileBroker(brokerId, {
@@ -9658,7 +10056,7 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 			onFetchError: (id, error) => {
 				this.ctx.logger.warn("ha re-sync: inventory fetch failed", { meta: {
 					brokerId: id,
-					error: require_ha_broker_source.errMsg(error)
+					error: require_ha_instance_settings.errMsg(error)
 				} });
 			}
 		});
@@ -9696,7 +10094,7 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 					meta: {
 						brokerId,
 						haDeviceId,
-						error: require_ha_broker_source.errMsg(err)
+						error: require_ha_instance_settings.errMsg(err)
 					}
 				});
 			}
@@ -9741,7 +10139,7 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 				tags: { deviceId: action.deviceId },
 				meta: {
 					brokerId,
-					error: require_ha_broker_source.errMsg(err)
+					error: require_ha_instance_settings.errMsg(err)
 				}
 			});
 		}
@@ -9822,7 +10220,7 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 				brokerId,
 				kind: "event-bus"
 			}, null, {
-				type: require_ha_broker_source.DeviceType.EventEmitter,
+				type: require_ha_instance_settings.DeviceType.EventEmitter,
 				name: "Home Assistant Events"
 			});
 			this.eventBusDeviceIds.set(brokerId, device.id);
@@ -9852,7 +10250,7 @@ var HaProviderAddon = class HaProviderAddon extends require_ha_broker_source.Bas
 			this.ctx.logger.debug("ha bus-event dropped — aggregator not ready", { meta: {
 				brokerId,
 				eventType: ev.eventType,
-				error: require_ha_broker_source.errMsg(err)
+				error: require_ha_instance_settings.errMsg(err)
 			} });
 			return;
 		}