@camstack/addon-provider-homeassistant 1.1.15 → 1.1.16

package/dist/addon.js

@@ -8475,7 +8475,13 @@ onStatusChanged: { data: object({
 	}) } },
 	status: {
 		schema: BatteryStatusSchema,
-		kind: "push"
+		kind: "push",
+		empty: {
+			percentage: 0,
+			charging: "none",
+			sleeping: false,
+			lastUpdated: 0
+		}
 	},
 	/**
 	* Runtime-state slice — every provider that registers this cap
@@ -9418,21 +9424,38 @@ var connectivityCapability = {
 	},
 	runtimeState: ConnectivityStatusSchema
 };
+/**
+* Generic device-consumables capability — surfaces a device's
+* maintenance items (vacuum filters/brushes, replaceable cartridges,
+* descaling cycles, …) with their remaining life and an optional
+* "Replaced" reset action. Device-agnostic: any provider that knows its
+* device tracks consumables can register it; the cap declares no
+* vocabulary of its own — the provider names each item verbatim.
+*
+* Like `childLayout`, the cap is INERT until a provider sets items: no
+* provider populates it by guessing (no HA inference). The UI renders a
+* "No consumables reported" placeholder when `items` is empty.
+*/
+/** A single consumable item. Either a continuous `level` (remaining
+*  life %) or a discrete `status` may be known — both may be null when a
+*  provider only knows the item exists. `level` and `status` are not
+*  mutually exclusive; a provider may report both. */
+var ConsumableItemSchema = object({
+	/** Stable id, e.g. 'main-brush'. */
+	key: string().min(1),
+	/** Display name. */
+	label: string().min(1),
+	/** Remaining life % when known (0..100). */
+	level: number().min(0).max(100).nullable(),
+	/** Discrete state when known (binary mode). */
+	status: _enum(["ok", "replace"]).nullable(),
+	/** Ms epoch of the last replace, when known. */
+	lastResetAt: number().nullable(),
+	/** Whether `reset()` is meaningful for this item. */
+	resettable: boolean()
+});
 var ConsumablesStatusSchema = object({
-	items: array(object({
-		/** Stable id, e.g. 'main-brush'. */
-		key: string().min(1),
-		/** Display name. */
-		label: string().min(1),
-		/** Remaining life % when known (0..100). */
-		level: number().min(0).max(100).nullable(),
-		/** Discrete state when known (binary mode). */
-		status: _enum(["ok", "replace"]).nullable(),
-		/** Ms epoch of the last replace, when known. */
-		lastResetAt: number().nullable(),
-		/** Whether `reset()` is meaningful for this item. */
-		resettable: boolean()
-	})),
+	items: array(ConsumableItemSchema),
 	lastChangedAt: number()
 });
 var consumablesCapability = {
@@ -9491,7 +9514,25 @@ reset: method(object({
 	}) },
 	status: {
 		schema: ConsumablesStatusSchema,
-		kind: "push"
+		kind: "push",
+		empty: {
+			items: [],
+			lastChangedAt: 0
+		},
+		itemArray: {
+			path: "items",
+			keyField: "key",
+			labelField: "label",
+			itemSchema: ConsumableItemSchema,
+			emptyItem: {
+				key: "",
+				label: "",
+				level: null,
+				status: null,
+				lastResetAt: null,
+				resettable: false
+			}
+		}
 	},
 	runtimeState: ConsumablesStatusSchema.extend({ lastFetchedAt: number() })
 };
@@ -11267,6 +11308,31 @@ var ReportMotionInputSchema = object({
 	regions: array(MotionRegionSchema).readonly().optional()
 });
 /**
+* Where a runner gets a camera's decoded frames (cross-node Phase 2,
+* restream-owner model — P2c).
+*
+* - `local-broker` (DEFAULT): today's path — subscribe to the co-located
+*   stream-broker's shm frame plane. Every pre-P2c attach payload (no
+*   `frameSource` key) parses to this, so the field is additive with zero
+*   behavior change.
+* - `remote-restream`: the detect node is NOT the camera's source-owner.
+*   The runner acquires the owner's COMPRESSED passthrough restream
+*   (`streamBroker.getStreamWithCodec({video:'copy'})` — refcounted, the
+*   double-pull guard) and decodes LOCALLY via a satellite frame plane +
+*   pull-mode decoder session pinned to its own node. The shm ring stays
+*   node-local; only H.264/H.265 packets cross the wire.
+*   `hubHostnameOverride` mirrors the recorder's `recordingHubHostname`:
+*   when set it overrides the `CAMSTACK_HUB_URL`-derived host the runner
+*   dials for the owner's restream.
+*/
+var RunnerFrameSourceSchema = discriminatedUnion("kind", [object({ kind: literal("local-broker") }), object({
+	kind: literal("remote-restream"),
+	/** The camera's source-owner node (slice 1: always the hub). */
+	ownerNodeId: string(),
+	/** Operator override for the owner host the runner dials. */
+	hubHostnameOverride: string().optional()
+})]).describe("Per-camera frame-source mode for the runner (P2c)");
+/**
 * Camera assignment payload sent by `addon-pipeline-orchestrator` to a
 * specific runner instance via `attachCamera`. Carries everything the
 * runner needs to subscribe to the local broker and execute inference.
@@ -11364,7 +11430,15 @@ var RunnerCameraConfigSchema = object({
 	*/
 	onboardMotionDrivesAnalyzer: boolean().default(true),
 	occupancyRecheckSec: number().min(occupancyRecheckSecField.min).max(occupancyRecheckSecField.max).default(occupancyRecheckSecField.default),
-	occupancyRecheckFrames: number().min(occupancyRecheckFramesField.min).max(occupancyRecheckFramesField.max).default(occupancyRecheckFramesField.default)
+	occupancyRecheckFrames: number().min(occupancyRecheckFramesField.min).max(occupancyRecheckFramesField.max).default(occupancyRecheckFramesField.default),
+	/**
+	* Where this runner gets the camera's decoded frames (P2c). Defaulted so
+	* every existing payload behaves as `local-broker` — the pre-Phase-2 path.
+	* Populated with `remote-restream` by the orchestrator ONLY when the
+	* camera's detect node differs from its source-owner (P2d, gated by the
+	* `remoteSourcingNodes` rollout setting).
+	*/
+	frameSource: RunnerFrameSourceSchema.default({ kind: "local-broker" })
 });
 motionFpsField.min, motionFpsField.max, motionFpsField.step, motionFpsField.default, detectionFpsField.min, detectionFpsField.max, detectionFpsField.step, detectionFpsField.default, motionCooldownMsField.min, motionCooldownMsField.max, motionCooldownMsField.step, motionCooldownMsField.default, occupancyRecheckSecField.min, occupancyRecheckSecField.max, occupancyRecheckSecField.step, occupancyRecheckSecField.default, occupancyRecheckFramesField.min, occupancyRecheckFramesField.max, occupancyRecheckFramesField.step, occupancyRecheckFramesField.default;
 /**
@@ -15502,14 +15576,36 @@ var ChildLayoutEntrySchema = object({
 	collapsed: boolean().optional()
 });
 /** Cap-wire shape of a DeviceLink — structurally mirrors `DeviceLink` in
-*  `device-management.ts`. */
+*  `device-management.ts`. Source is a union: a FIELD source copies a sibling
+*  accessory's status field (`kind` optional/absent for wire compat); a
+*  LITERAL source carries a per-device constant (no sibling is read); a
+*  GLOBAL source (P2e) copies ANY device's status field, addressed by the
+*  source device's full re-sync-stable `stableId`. */
 var DeviceLinkSchema = object({
 	id: string(),
-	source: object({
-		sourceKey: string(),
-		cap: string(),
-		fieldPath: string()
-	}),
+	source: union([
+		object({
+			kind: literal("field").optional(),
+			sourceKey: string(),
+			cap: string(),
+			fieldPath: string()
+		}),
+		object({
+			kind: literal("literal"),
+			value: union([
+				string(),
+				number(),
+				boolean(),
+				_null()
+			])
+		}),
+		object({
+			kind: literal("global"),
+			sourceStableId: string(),
+			cap: string(),
+			fieldPath: string()
+		})
+	]),
 	target: object({
 		cap: string(),
 		fieldPath: string(),
@@ -15752,7 +15848,10 @@ method(object({
 }), _void(), {
 	kind: "mutation",
 	auth: "admin"
-}), method(object({ deviceId: number() }), object({ caps: array(object({
+}), method(object({
+	deviceId: number(),
+	includeSynthesizable: boolean().optional()
+}), object({ caps: array(object({
 	cap: string(),
 	fields: array(object({
 		path: string(),
@@ -15762,8 +15861,13 @@ method(object({
 			"boolean",
 			"enum"
 		]),
-		enumValues: array(string()).optional()
-	})).readonly()
+		enumValues: array(string()).optional(),
+		item: boolean().optional()
+	})).readonly(),
+	itemArray: object({
+		path: string(),
+		keyField: string()
+	}).optional()
 })).readonly() }), { kind: "query" }), method(object({
 	deviceId: number(),
 	role: string().nullable()
@@ -15833,7 +15937,11 @@ method(object({
 	deviceId: number(),
 	entries: array(object({
 		capName: string(),
-		kind: _enum(["native", "wrapped"]),
+		kind: _enum([
+			"native",
+			"wrapped",
+			"linked"
+		]),
 		providerAddonId: string(),
 		providerNodeId: string(),
 		nativeAddonId: string()
@@ -15842,7 +15950,11 @@ method(object({
 	deviceId: number(),
 	entries: array(object({
 		capName: string(),
-		kind: _enum(["native", "wrapped"]),
+		kind: _enum([
+			"native",
+			"wrapped",
+			"linked"
+		]),
 		providerAddonId: string(),
 		providerNodeId: string(),
 		nativeAddonId: string()
@@ -19872,6 +19984,16 @@ DeviceType.Camera, DeviceType.Sensor, DeviceType.Switch, method(object({ deviceI
 	kind: "mutation",
 	auth: "admin"
 });
+/**
+* `recording` cap — footage availability + HLS playback manifests + per-device
+* recording config. NOTE on events (source of truth, R5/C3): this cap carries
+* NO event surface — `getPlaybackManifest` returns playlist URLs only. Timeline
+* events (motion/object/audio) come from `pipelineAnalytics` (durable SQLite
+* rows); the recorder's internal EventMap markers are ephemeral in-RAM
+* annotations that are not exposed here and must not be treated as an event
+* feed. Event<->footage joins are by time, padded with the shared `EVENT_PAD_MS`
+* (`interfaces/recording-config.ts`).
+*/
 var RecordingStatusSchema = object({
 	deviceId: number(),
 	enabled: boolean(),
@@ -28217,20 +28339,86 @@ function selectBatteryEntity(entities) {
 *  fires — but not 0 % (the cell isn't dead, it just needs replacing). */
 var BINARY_BATTERY_NORMAL_PCT = 100;
 var BINARY_BATTERY_LOW_PCT = 15;
-/** Parse an HA battery state string (`"42"`) into a clamped 0–100 percentage.
-*  Returns `null` for non-numeric states (`unavailable` / `unknown`). */
-function parseBatteryPercentage(raw) {
-	const value = Number(raw);
-	if (!Number.isFinite(value)) return null;
-	return Math.max(0, Math.min(100, value));
-}
-/** Map a BINARY battery state (`LOW_BAT`) to a percentage. HA convention:
-*  `on` / `true` = LOW, `off` / `false` = normal. Unknown states → `null`. */
-function parseBinaryBatteryPercentage(raw) {
-	const s = raw.trim().toLowerCase();
-	if (s === "on" || s === "true" || s === "low") return BINARY_BATTERY_LOW_PCT;
-	if (s === "off" || s === "false" || s === "normal" || s === "ok") return BINARY_BATTERY_NORMAL_PCT;
-	return null;
+/**
+* Derive the container's device-level `battery` wiring from its entities as
+* auto-authored `DeviceLink`s. The battery cap on the container is SYNTHESIZED
+* by the generic device-link machinery (cap `status.empty` + these links) —
+* no native battery provider is registered on the container.
+*
+* - NUMERIC battery sensor (real 0–100 %): field link `numeric-sensor.value →
+*   battery.percentage` with a `linear 1x+0 clamp [0,100]` transform (preserves
+*   the historical `parseBatteryPercentage` clamping so an out-of-range
+*   firmware value can never fail the whole synthesized status), plus
+*   `lastFetchedAt → lastUpdated`.
+* - BINARY `LOW_BAT` indicator: `binary.on → battery.percentage` through an
+*   `enum-map` (`on`/low → 15 %, `off`/normal → 100 % — the historical
+*   `parseBinaryBatteryPercentage` mapping), `lastChangedAt → lastUpdated`,
+*   plus a LITERAL `binary: true` flag so the UI renders "Normal"/"Low"
+*   instead of a misleading exact percentage.
+* - Numeric is preferred over binary when a device exposes both
+*   (`selectBatteryEntity`); no battery entity → no links (cap absent).
+*
+* `sourceKey` is the battery child's accessory `stableIdSuffix` (its
+* `entityId` — see `getAccessoryChildren`), so links survive a re-sync.
+*/
+function buildBatteryLinks(entities) {
+	const battery = selectBatteryEntity(entities);
+	if (!battery) return [];
+	const binary = isBinaryBattery(battery);
+	const cap = binary ? "binary" : "numeric-sensor";
+	const percentage = {
+		id: "battery-percentage",
+		source: {
+			sourceKey: battery.entityId,
+			cap,
+			fieldPath: binary ? "on" : "value"
+		},
+		target: {
+			cap: "battery",
+			fieldPath: "percentage"
+		},
+		transform: binary ? {
+			kind: "enum-map",
+			mapping: {
+				true: BINARY_BATTERY_LOW_PCT,
+				false: BINARY_BATTERY_NORMAL_PCT
+			}
+		} : {
+			kind: "linear",
+			scale: 1,
+			offset: 0,
+			clamp: [0, 100]
+		}
+	};
+	const lastUpdated = {
+		id: "battery-lastUpdated",
+		source: {
+			sourceKey: battery.entityId,
+			cap,
+			fieldPath: binary ? "lastChangedAt" : "lastFetchedAt"
+		},
+		target: {
+			cap: "battery",
+			fieldPath: "lastUpdated"
+		},
+		transform: { kind: "identity" }
+	};
+	if (!binary) return [percentage, lastUpdated];
+	return [
+		percentage,
+		lastUpdated,
+		{
+			id: "battery-binary",
+			source: {
+				kind: "literal",
+				value: true
+			},
+			target: {
+				cap: "battery",
+				fieldPath: "binary"
+			}
+		}
+	];
 }
 /**
 * Parent container device for a single HA physical device. Owns no
@@ -28253,17 +28441,6 @@ var HaContainerDevice = class HaContainerDevice extends BaseDevice {
 	features;
 	brokerId;
 	integrationId;
-	/** entityId of the battery entity (if any) on this physical device. The
-	*  device-level `battery` cap mirrors this entity's live percentage. */
-	batteryEntityId;
-	/** True when the battery entity is a binary `LOW_BAT` indicator (no real
-	*  percentage) rather than a numeric sensor — drives the state decode. */
-	batteryIsBinary;
-	/** Disposer for the cap event-bus listener that decodes battery pushes. */
-	batteryEventUnsub = null;
-	/** Upstream broker subscription id for the battery entity — released in
-	*  `removeDevice`. Null until `onActivate` subscribes. */
-	batterySubscriptionId = null;
 	/** Set of this device's entity ids (the physical HA device's entities). The
 	*  container's `online` is derived as "any of these entities reachable" (A3). */
 	entityIds;
@@ -28284,76 +28461,11 @@ var HaContainerDevice = class HaContainerDevice extends BaseDevice {
 		super(ctx, haContainerSchema, { type: DeviceType.Container });
 		this.brokerId = cfg.brokerId;
 		this.integrationId = cfg.integrationId;
-		this.batteryEntityId = batteryEntity?.entityId ?? null;
-		this.batteryIsBinary = batteryEntity !== null && isBinaryBattery(batteryEntity);
 		this.features = batteryEntity !== null ? [DeviceFeature.Resyncable, DeviceFeature.BatteryOperated] : [DeviceFeature.Resyncable];
 		this.entityIds = new Set(cfg.entities.map((e) => e.entityId));
 		this.online = false;
 	}
 	/**
-	* Register the device-level `battery` cap on the container, backed by
-	* the runtime-state slice. The UI battery badge gates on the presence
-	* of this slice (the `useDeviceBattery` hook reads `device.state.battery`),
-	* so registering the cap + seeding the slice is what surfaces the badge
-	* on the physical device — the per-entity numeric-sensor child stays.
-	*
-	* The slice is fed from the battery entity's live HA state via the same
-	* `broker.message` event-bus mechanism the per-domain children use; the
-	* listener is attached here so the integration manager's immediate
-	* cache-replay (triggered by the broker subscription in `onActivate`)
-	* lands after the cap schema is installed.
-	*/
-	registerBatteryCap() {
-		const COLD_START = {
-			percentage: this.batteryIsBinary ? BINARY_BATTERY_NORMAL_PCT : 0,
-			charging: "none",
-			sleeping: false,
-			lastUpdated: 0,
-			binary: this.batteryIsBinary
-		};
-		this.ctx.registerNativeCap(batteryCapability, {
-			getStatus: async ({ deviceId }) => {
-				if (deviceId !== this.id) throw new Error(`HaContainerDevice: battery deviceId mismatch, expected ${this.id}, got ${deviceId}`);
-				return this.runtimeState.getCapState("battery") ?? COLD_START;
-			},
-			wakeForStream: async () => ({
-				awoke: true,
-				durationMs: 0
-			})
-		});
-		this.runtimeState.setCapState("battery", COLD_START);
-		this.attachBatteryEventListener();
-	}
-	/** Subscribe to `broker.message` events and decode the battery entity's
-	*  percentage into the `battery` slice on every matching push. */
-	attachBatteryEventListener() {
-		const handler = (event) => {
-			const data = event.data;
-			if (!data) return;
-			if (data.brokerId !== this.brokerId) return;
-			if (data.key !== this.batteryEntityId) return;
-			const state = data.payload;
-			if (!state) return;
-			this.applyBatteryState(state);
-		};
-		const unsub = this.ctx.eventBus.subscribe({ category: HaContainerDevice.BROKER_MSG_CATEGORY }, handler);
-		this.batteryEventUnsub = typeof unsub === "function" ? unsub : null;
-	}
-	/** Decode an HA entity state into the battery slice. Non-numeric states
-	*  (`unavailable` / `unknown`) leave the last known value untouched. */
-	applyBatteryState(state) {
-		const percentage = this.batteryIsBinary ? parseBinaryBatteryPercentage(state.state) : parseBatteryPercentage(state.state);
-		if (percentage === null) return;
-		const next = {
-			percentage,
-			charging: "none",
-			sleeping: false,
-			lastUpdated: Date.parse(state.last_updated) || Date.now(),
-			binary: this.batteryIsBinary
-		};
-		this.runtimeState.setCapState("battery", next);
-	}
-	/**
 	* Subscribe to `broker.message` events for every one of this device's
 	* entities and derive the container's `online` from their aggregate
 	* availability (A3): `online = any entity reachable`. A child entity is
@@ -28412,21 +28524,7 @@ var HaContainerDevice = class HaContainerDevice extends BaseDevice {
 			}
 		}
 		await this.persistChildLayout();
-		if (this.batteryEntityId === null) return;
-		this.registerBatteryCap();
-		try {
-			const result = await this.ctx.api.broker.subscribe.mutate({
-				brokerId: this.brokerId,
-				filter: { entityIds: [this.batteryEntityId] }
-			});
-			this.batterySubscriptionId = result.subscriptionId;
-		} catch (err) {
-			this.ctx.logger.warn("ha-container failed to subscribe battery entity", { meta: {
-				entityId: this.batteryEntityId,
-				brokerId: this.brokerId,
-				error: errMsg(err)
-			} });
-		}
+		await this.persistBatteryLinks();
 	}
 	async removeDevice() {
 		if (this.availabilityEventUnsub) {
@@ -28444,21 +28542,6 @@ var HaContainerDevice = class HaContainerDevice extends BaseDevice {
 			} catch {}
 			this.availabilitySubscriptionId = null;
 		}
-		if (this.batteryEventUnsub) {
-			try {
-				this.batteryEventUnsub();
-			} catch {}
-			this.batteryEventUnsub = null;
-		}
-		if (this.batterySubscriptionId !== null) {
-			try {
-				await this.ctx.api.broker.unsubscribe.mutate({
-					brokerId: this.brokerId,
-					subscriptionId: this.batterySubscriptionId
-				});
-			} catch {}
-			this.batterySubscriptionId = null;
-		}
 	}
 	/**
 	* Derive this container's `childLayout` from its LIVE entities and persist it
@@ -28483,6 +28566,33 @@ var HaContainerDevice = class HaContainerDevice extends BaseDevice {
 		}
 	}
 	/**
+	* Derive this container's device-level battery wiring from its LIVE entities
+	* (`buildBatteryLinks`) and persist it via `deviceManager.setDeviceLinks`,
+	* PRESERVING any operator-authored links that target other caps (the
+	* mutation replaces the device's whole `deviceLinks` array, so we merge:
+	* foreign-target links kept, battery-target links replaced by the derived
+	* set). Churn-free: skips the mutation when the persisted links already
+	* match. Idempotent + best-effort (mirrors `persistChildLayout`): a failure
+	* is logged and swallowed so it never breaks activation or reconcile.
+	*/
+	async persistBatteryLinks() {
+		try {
+			const built = buildBatteryLinks(this.config.values.entities);
+			const current = (await this.ctx.api.deviceManager.getDevice.query({ deviceId: this.id }))?.deviceLinks ?? [];
+			const next = [...current.filter((l) => l.target.cap !== "battery"), ...built];
+			if (JSON.stringify(next) === JSON.stringify(current)) return;
+			await this.ctx.api.deviceManager.setDeviceLinks.mutate({
+				deviceId: this.id,
+				deviceLinks: next
+			});
+		} catch (err) {
+			this.ctx.logger.warn("ha-container failed to persist battery device-links", { meta: {
+				haDeviceId: this.config.values.haDeviceId,
+				error: errMsg(err)
+			} });
+		}
+	}
+	/**
 	* Device-level RAW upstream state for the physical HA device. HA has no
 	* single device-level state blob — a device's truth lives in its entities —
 	* so we aggregate every linked entity's raw `{ state, attributes }` (the
@@ -32912,7 +33022,10 @@ var HaProviderAddon = class HaProviderAddon extends BaseDeviceProvider {
 			}
 		}
 		if (plan.membershipChanged && container instanceof HaContainerDevice) await container.reprobe();
-		if (container instanceof HaContainerDevice) await container.persistChildLayout();
+		if (container instanceof HaContainerDevice) {
+			await container.persistChildLayout();
+			await container.persistBatteryLinks();
+		}
 		const integrationId = container.config.get("integrationId");
 		this.ctx.logger.info("ha re-sync: container reconciled", {
 			tags: {

package/dist/addon.mjs

@@ -8474,7 +8474,13 @@ onStatusChanged: { data: object({
 	}) } },
 	status: {
 		schema: BatteryStatusSchema,
-		kind: "push"
+		kind: "push",
+		empty: {
+			percentage: 0,
+			charging: "none",
+			sleeping: false,
+			lastUpdated: 0
+		}
 	},
 	/**
 	* Runtime-state slice — every provider that registers this cap
@@ -9417,21 +9423,38 @@ var connectivityCapability = {
 	},
 	runtimeState: ConnectivityStatusSchema
 };
+/**
+* Generic device-consumables capability — surfaces a device's
+* maintenance items (vacuum filters/brushes, replaceable cartridges,
+* descaling cycles, …) with their remaining life and an optional
+* "Replaced" reset action. Device-agnostic: any provider that knows its
+* device tracks consumables can register it; the cap declares no
+* vocabulary of its own — the provider names each item verbatim.
+*
+* Like `childLayout`, the cap is INERT until a provider sets items: no
+* provider populates it by guessing (no HA inference). The UI renders a
+* "No consumables reported" placeholder when `items` is empty.
+*/
+/** A single consumable item. Either a continuous `level` (remaining
+*  life %) or a discrete `status` may be known — both may be null when a
+*  provider only knows the item exists. `level` and `status` are not
+*  mutually exclusive; a provider may report both. */
+var ConsumableItemSchema = object({
+	/** Stable id, e.g. 'main-brush'. */
+	key: string().min(1),
+	/** Display name. */
+	label: string().min(1),
+	/** Remaining life % when known (0..100). */
+	level: number().min(0).max(100).nullable(),
+	/** Discrete state when known (binary mode). */
+	status: _enum(["ok", "replace"]).nullable(),
+	/** Ms epoch of the last replace, when known. */
+	lastResetAt: number().nullable(),
+	/** Whether `reset()` is meaningful for this item. */
+	resettable: boolean()
+});
 var ConsumablesStatusSchema = object({
-	items: array(object({
-		/** Stable id, e.g. 'main-brush'. */
-		key: string().min(1),
-		/** Display name. */
-		label: string().min(1),
-		/** Remaining life % when known (0..100). */
-		level: number().min(0).max(100).nullable(),
-		/** Discrete state when known (binary mode). */
-		status: _enum(["ok", "replace"]).nullable(),
-		/** Ms epoch of the last replace, when known. */
-		lastResetAt: number().nullable(),
-		/** Whether `reset()` is meaningful for this item. */
-		resettable: boolean()
-	})),
+	items: array(ConsumableItemSchema),
 	lastChangedAt: number()
 });
 var consumablesCapability = {
@@ -9490,7 +9513,25 @@ reset: method(object({
 	}) },
 	status: {
 		schema: ConsumablesStatusSchema,
-		kind: "push"
+		kind: "push",
+		empty: {
+			items: [],
+			lastChangedAt: 0
+		},
+		itemArray: {
+			path: "items",
+			keyField: "key",
+			labelField: "label",
+			itemSchema: ConsumableItemSchema,
+			emptyItem: {
+				key: "",
+				label: "",
+				level: null,
+				status: null,
+				lastResetAt: null,
+				resettable: false
+			}
+		}
 	},
 	runtimeState: ConsumablesStatusSchema.extend({ lastFetchedAt: number() })
 };
@@ -11266,6 +11307,31 @@ var ReportMotionInputSchema = object({
 	regions: array(MotionRegionSchema).readonly().optional()
 });
 /**
+* Where a runner gets a camera's decoded frames (cross-node Phase 2,
+* restream-owner model — P2c).
+*
+* - `local-broker` (DEFAULT): today's path — subscribe to the co-located
+*   stream-broker's shm frame plane. Every pre-P2c attach payload (no
+*   `frameSource` key) parses to this, so the field is additive with zero
+*   behavior change.
+* - `remote-restream`: the detect node is NOT the camera's source-owner.
+*   The runner acquires the owner's COMPRESSED passthrough restream
+*   (`streamBroker.getStreamWithCodec({video:'copy'})` — refcounted, the
+*   double-pull guard) and decodes LOCALLY via a satellite frame plane +
+*   pull-mode decoder session pinned to its own node. The shm ring stays
+*   node-local; only H.264/H.265 packets cross the wire.
+*   `hubHostnameOverride` mirrors the recorder's `recordingHubHostname`:
+*   when set it overrides the `CAMSTACK_HUB_URL`-derived host the runner
+*   dials for the owner's restream.
+*/
+var RunnerFrameSourceSchema = discriminatedUnion("kind", [object({ kind: literal("local-broker") }), object({
+	kind: literal("remote-restream"),
+	/** The camera's source-owner node (slice 1: always the hub). */
+	ownerNodeId: string(),
+	/** Operator override for the owner host the runner dials. */
+	hubHostnameOverride: string().optional()
+})]).describe("Per-camera frame-source mode for the runner (P2c)");
+/**
 * Camera assignment payload sent by `addon-pipeline-orchestrator` to a
 * specific runner instance via `attachCamera`. Carries everything the
 * runner needs to subscribe to the local broker and execute inference.
@@ -11363,7 +11429,15 @@ var RunnerCameraConfigSchema = object({
 	*/
 	onboardMotionDrivesAnalyzer: boolean().default(true),
 	occupancyRecheckSec: number().min(occupancyRecheckSecField.min).max(occupancyRecheckSecField.max).default(occupancyRecheckSecField.default),
-	occupancyRecheckFrames: number().min(occupancyRecheckFramesField.min).max(occupancyRecheckFramesField.max).default(occupancyRecheckFramesField.default)
+	occupancyRecheckFrames: number().min(occupancyRecheckFramesField.min).max(occupancyRecheckFramesField.max).default(occupancyRecheckFramesField.default),
+	/**
+	* Where this runner gets the camera's decoded frames (P2c). Defaulted so
+	* every existing payload behaves as `local-broker` — the pre-Phase-2 path.
+	* Populated with `remote-restream` by the orchestrator ONLY when the
+	* camera's detect node differs from its source-owner (P2d, gated by the
+	* `remoteSourcingNodes` rollout setting).
+	*/
+	frameSource: RunnerFrameSourceSchema.default({ kind: "local-broker" })
 });
 motionFpsField.min, motionFpsField.max, motionFpsField.step, motionFpsField.default, detectionFpsField.min, detectionFpsField.max, detectionFpsField.step, detectionFpsField.default, motionCooldownMsField.min, motionCooldownMsField.max, motionCooldownMsField.step, motionCooldownMsField.default, occupancyRecheckSecField.min, occupancyRecheckSecField.max, occupancyRecheckSecField.step, occupancyRecheckSecField.default, occupancyRecheckFramesField.min, occupancyRecheckFramesField.max, occupancyRecheckFramesField.step, occupancyRecheckFramesField.default;
 /**
@@ -15501,14 +15575,36 @@ var ChildLayoutEntrySchema = object({
 	collapsed: boolean().optional()
 });
 /** Cap-wire shape of a DeviceLink — structurally mirrors `DeviceLink` in
-*  `device-management.ts`. */
+*  `device-management.ts`. Source is a union: a FIELD source copies a sibling
+*  accessory's status field (`kind` optional/absent for wire compat); a
+*  LITERAL source carries a per-device constant (no sibling is read); a
+*  GLOBAL source (P2e) copies ANY device's status field, addressed by the
+*  source device's full re-sync-stable `stableId`. */
 var DeviceLinkSchema = object({
 	id: string(),
-	source: object({
-		sourceKey: string(),
-		cap: string(),
-		fieldPath: string()
-	}),
+	source: union([
+		object({
+			kind: literal("field").optional(),
+			sourceKey: string(),
+			cap: string(),
+			fieldPath: string()
+		}),
+		object({
+			kind: literal("literal"),
+			value: union([
+				string(),
+				number(),
+				boolean(),
+				_null()
+			])
+		}),
+		object({
+			kind: literal("global"),
+			sourceStableId: string(),
+			cap: string(),
+			fieldPath: string()
+		})
+	]),
 	target: object({
 		cap: string(),
 		fieldPath: string(),
@@ -15751,7 +15847,10 @@ method(object({
 }), _void(), {
 	kind: "mutation",
 	auth: "admin"
-}), method(object({ deviceId: number() }), object({ caps: array(object({
+}), method(object({
+	deviceId: number(),
+	includeSynthesizable: boolean().optional()
+}), object({ caps: array(object({
 	cap: string(),
 	fields: array(object({
 		path: string(),
@@ -15761,8 +15860,13 @@ method(object({
 			"boolean",
 			"enum"
 		]),
-		enumValues: array(string()).optional()
-	})).readonly()
+		enumValues: array(string()).optional(),
+		item: boolean().optional()
+	})).readonly(),
+	itemArray: object({
+		path: string(),
+		keyField: string()
+	}).optional()
 })).readonly() }), { kind: "query" }), method(object({
 	deviceId: number(),
 	role: string().nullable()
@@ -15832,7 +15936,11 @@ method(object({
 	deviceId: number(),
 	entries: array(object({
 		capName: string(),
-		kind: _enum(["native", "wrapped"]),
+		kind: _enum([
+			"native",
+			"wrapped",
+			"linked"
+		]),
 		providerAddonId: string(),
 		providerNodeId: string(),
 		nativeAddonId: string()
@@ -15841,7 +15949,11 @@ method(object({
 	deviceId: number(),
 	entries: array(object({
 		capName: string(),
-		kind: _enum(["native", "wrapped"]),
+		kind: _enum([
+			"native",
+			"wrapped",
+			"linked"
+		]),
 		providerAddonId: string(),
 		providerNodeId: string(),
 		nativeAddonId: string()
@@ -19871,6 +19983,16 @@ DeviceType.Camera, DeviceType.Sensor, DeviceType.Switch, method(object({ deviceI
 	kind: "mutation",
 	auth: "admin"
 });
+/**
+* `recording` cap — footage availability + HLS playback manifests + per-device
+* recording config. NOTE on events (source of truth, R5/C3): this cap carries
+* NO event surface — `getPlaybackManifest` returns playlist URLs only. Timeline
+* events (motion/object/audio) come from `pipelineAnalytics` (durable SQLite
+* rows); the recorder's internal EventMap markers are ephemeral in-RAM
+* annotations that are not exposed here and must not be treated as an event
+* feed. Event<->footage joins are by time, padded with the shared `EVENT_PAD_MS`
+* (`interfaces/recording-config.ts`).
+*/
 var RecordingStatusSchema = object({
 	deviceId: number(),
 	enabled: boolean(),
@@ -28216,20 +28338,86 @@ function selectBatteryEntity(entities) {
 *  fires — but not 0 % (the cell isn't dead, it just needs replacing). */
 var BINARY_BATTERY_NORMAL_PCT = 100;
 var BINARY_BATTERY_LOW_PCT = 15;
-/** Parse an HA battery state string (`"42"`) into a clamped 0–100 percentage.
-*  Returns `null` for non-numeric states (`unavailable` / `unknown`). */
-function parseBatteryPercentage(raw) {
-	const value = Number(raw);
-	if (!Number.isFinite(value)) return null;
-	return Math.max(0, Math.min(100, value));
-}
-/** Map a BINARY battery state (`LOW_BAT`) to a percentage. HA convention:
-*  `on` / `true` = LOW, `off` / `false` = normal. Unknown states → `null`. */
-function parseBinaryBatteryPercentage(raw) {
-	const s = raw.trim().toLowerCase();
-	if (s === "on" || s === "true" || s === "low") return BINARY_BATTERY_LOW_PCT;
-	if (s === "off" || s === "false" || s === "normal" || s === "ok") return BINARY_BATTERY_NORMAL_PCT;
-	return null;
+/**
+* Derive the container's device-level `battery` wiring from its entities as
+* auto-authored `DeviceLink`s. The battery cap on the container is SYNTHESIZED
+* by the generic device-link machinery (cap `status.empty` + these links) —
+* no native battery provider is registered on the container.
+*
+* - NUMERIC battery sensor (real 0–100 %): field link `numeric-sensor.value →
+*   battery.percentage` with a `linear 1x+0 clamp [0,100]` transform (preserves
+*   the historical `parseBatteryPercentage` clamping so an out-of-range
+*   firmware value can never fail the whole synthesized status), plus
+*   `lastFetchedAt → lastUpdated`.
+* - BINARY `LOW_BAT` indicator: `binary.on → battery.percentage` through an
+*   `enum-map` (`on`/low → 15 %, `off`/normal → 100 % — the historical
+*   `parseBinaryBatteryPercentage` mapping), `lastChangedAt → lastUpdated`,
+*   plus a LITERAL `binary: true` flag so the UI renders "Normal"/"Low"
+*   instead of a misleading exact percentage.
+* - Numeric is preferred over binary when a device exposes both
+*   (`selectBatteryEntity`); no battery entity → no links (cap absent).
+*
+* `sourceKey` is the battery child's accessory `stableIdSuffix` (its
+* `entityId` — see `getAccessoryChildren`), so links survive a re-sync.
+*/
+function buildBatteryLinks(entities) {
+	const battery = selectBatteryEntity(entities);
+	if (!battery) return [];
+	const binary = isBinaryBattery(battery);
+	const cap = binary ? "binary" : "numeric-sensor";
+	const percentage = {
+		id: "battery-percentage",
+		source: {
+			sourceKey: battery.entityId,
+			cap,
+			fieldPath: binary ? "on" : "value"
+		},
+		target: {
+			cap: "battery",
+			fieldPath: "percentage"
+		},
+		transform: binary ? {
+			kind: "enum-map",
+			mapping: {
+				true: BINARY_BATTERY_LOW_PCT,
+				false: BINARY_BATTERY_NORMAL_PCT
+			}
+		} : {
+			kind: "linear",
+			scale: 1,
+			offset: 0,
+			clamp: [0, 100]
+		}
+	};
+	const lastUpdated = {
+		id: "battery-lastUpdated",
+		source: {
+			sourceKey: battery.entityId,
+			cap,
+			fieldPath: binary ? "lastChangedAt" : "lastFetchedAt"
+		},
+		target: {
+			cap: "battery",
+			fieldPath: "lastUpdated"
+		},
+		transform: { kind: "identity" }
+	};
+	if (!binary) return [percentage, lastUpdated];
+	return [
+		percentage,
+		lastUpdated,
+		{
+			id: "battery-binary",
+			source: {
+				kind: "literal",
+				value: true
+			},
+			target: {
+				cap: "battery",
+				fieldPath: "binary"
+			}
+		}
+	];
 }
 /**
 * Parent container device for a single HA physical device. Owns no
@@ -28252,17 +28440,6 @@ var HaContainerDevice = class HaContainerDevice extends BaseDevice {
 	features;
 	brokerId;
 	integrationId;
-	/** entityId of the battery entity (if any) on this physical device. The
-	*  device-level `battery` cap mirrors this entity's live percentage. */
-	batteryEntityId;
-	/** True when the battery entity is a binary `LOW_BAT` indicator (no real
-	*  percentage) rather than a numeric sensor — drives the state decode. */
-	batteryIsBinary;
-	/** Disposer for the cap event-bus listener that decodes battery pushes. */
-	batteryEventUnsub = null;
-	/** Upstream broker subscription id for the battery entity — released in
-	*  `removeDevice`. Null until `onActivate` subscribes. */
-	batterySubscriptionId = null;
 	/** Set of this device's entity ids (the physical HA device's entities). The
 	*  container's `online` is derived as "any of these entities reachable" (A3). */
 	entityIds;
@@ -28283,76 +28460,11 @@ var HaContainerDevice = class HaContainerDevice extends BaseDevice {
 		super(ctx, haContainerSchema, { type: DeviceType.Container });
 		this.brokerId = cfg.brokerId;
 		this.integrationId = cfg.integrationId;
-		this.batteryEntityId = batteryEntity?.entityId ?? null;
-		this.batteryIsBinary = batteryEntity !== null && isBinaryBattery(batteryEntity);
 		this.features = batteryEntity !== null ? [DeviceFeature.Resyncable, DeviceFeature.BatteryOperated] : [DeviceFeature.Resyncable];
 		this.entityIds = new Set(cfg.entities.map((e) => e.entityId));
 		this.online = false;
 	}
 	/**
-	* Register the device-level `battery` cap on the container, backed by
-	* the runtime-state slice. The UI battery badge gates on the presence
-	* of this slice (the `useDeviceBattery` hook reads `device.state.battery`),
-	* so registering the cap + seeding the slice is what surfaces the badge
-	* on the physical device — the per-entity numeric-sensor child stays.
-	*
-	* The slice is fed from the battery entity's live HA state via the same
-	* `broker.message` event-bus mechanism the per-domain children use; the
-	* listener is attached here so the integration manager's immediate
-	* cache-replay (triggered by the broker subscription in `onActivate`)
-	* lands after the cap schema is installed.
-	*/
-	registerBatteryCap() {
-		const COLD_START = {
-			percentage: this.batteryIsBinary ? BINARY_BATTERY_NORMAL_PCT : 0,
-			charging: "none",
-			sleeping: false,
-			lastUpdated: 0,
-			binary: this.batteryIsBinary
-		};
-		this.ctx.registerNativeCap(batteryCapability, {
-			getStatus: async ({ deviceId }) => {
-				if (deviceId !== this.id) throw new Error(`HaContainerDevice: battery deviceId mismatch, expected ${this.id}, got ${deviceId}`);
-				return this.runtimeState.getCapState("battery") ?? COLD_START;
-			},
-			wakeForStream: async () => ({
-				awoke: true,
-				durationMs: 0
-			})
-		});
-		this.runtimeState.setCapState("battery", COLD_START);
-		this.attachBatteryEventListener();
-	}
-	/** Subscribe to `broker.message` events and decode the battery entity's
-	*  percentage into the `battery` slice on every matching push. */
-	attachBatteryEventListener() {
-		const handler = (event) => {
-			const data = event.data;
-			if (!data) return;
-			if (data.brokerId !== this.brokerId) return;
-			if (data.key !== this.batteryEntityId) return;
-			const state = data.payload;
-			if (!state) return;
-			this.applyBatteryState(state);
-		};
-		const unsub = this.ctx.eventBus.subscribe({ category: HaContainerDevice.BROKER_MSG_CATEGORY }, handler);
-		this.batteryEventUnsub = typeof unsub === "function" ? unsub : null;
-	}
-	/** Decode an HA entity state into the battery slice. Non-numeric states
-	*  (`unavailable` / `unknown`) leave the last known value untouched. */
-	applyBatteryState(state) {
-		const percentage = this.batteryIsBinary ? parseBinaryBatteryPercentage(state.state) : parseBatteryPercentage(state.state);
-		if (percentage === null) return;
-		const next = {
-			percentage,
-			charging: "none",
-			sleeping: false,
-			lastUpdated: Date.parse(state.last_updated) || Date.now(),
-			binary: this.batteryIsBinary
-		};
-		this.runtimeState.setCapState("battery", next);
-	}
-	/**
 	* Subscribe to `broker.message` events for every one of this device's
 	* entities and derive the container's `online` from their aggregate
 	* availability (A3): `online = any entity reachable`. A child entity is
@@ -28411,21 +28523,7 @@ var HaContainerDevice = class HaContainerDevice extends BaseDevice {
 			}
 		}
 		await this.persistChildLayout();
-		if (this.batteryEntityId === null) return;
-		this.registerBatteryCap();
-		try {
-			const result = await this.ctx.api.broker.subscribe.mutate({
-				brokerId: this.brokerId,
-				filter: { entityIds: [this.batteryEntityId] }
-			});
-			this.batterySubscriptionId = result.subscriptionId;
-		} catch (err) {
-			this.ctx.logger.warn("ha-container failed to subscribe battery entity", { meta: {
-				entityId: this.batteryEntityId,
-				brokerId: this.brokerId,
-				error: errMsg(err)
-			} });
-		}
+		await this.persistBatteryLinks();
 	}
 	async removeDevice() {
 		if (this.availabilityEventUnsub) {
@@ -28443,21 +28541,6 @@ var HaContainerDevice = class HaContainerDevice extends BaseDevice {
 			} catch {}
 			this.availabilitySubscriptionId = null;
 		}
-		if (this.batteryEventUnsub) {
-			try {
-				this.batteryEventUnsub();
-			} catch {}
-			this.batteryEventUnsub = null;
-		}
-		if (this.batterySubscriptionId !== null) {
-			try {
-				await this.ctx.api.broker.unsubscribe.mutate({
-					brokerId: this.brokerId,
-					subscriptionId: this.batterySubscriptionId
-				});
-			} catch {}
-			this.batterySubscriptionId = null;
-		}
 	}
 	/**
 	* Derive this container's `childLayout` from its LIVE entities and persist it
@@ -28482,6 +28565,33 @@ var HaContainerDevice = class HaContainerDevice extends BaseDevice {
 		}
 	}
 	/**
+	* Derive this container's device-level battery wiring from its LIVE entities
+	* (`buildBatteryLinks`) and persist it via `deviceManager.setDeviceLinks`,
+	* PRESERVING any operator-authored links that target other caps (the
+	* mutation replaces the device's whole `deviceLinks` array, so we merge:
+	* foreign-target links kept, battery-target links replaced by the derived
+	* set). Churn-free: skips the mutation when the persisted links already
+	* match. Idempotent + best-effort (mirrors `persistChildLayout`): a failure
+	* is logged and swallowed so it never breaks activation or reconcile.
+	*/
+	async persistBatteryLinks() {
+		try {
+			const built = buildBatteryLinks(this.config.values.entities);
+			const current = (await this.ctx.api.deviceManager.getDevice.query({ deviceId: this.id }))?.deviceLinks ?? [];
+			const next = [...current.filter((l) => l.target.cap !== "battery"), ...built];
+			if (JSON.stringify(next) === JSON.stringify(current)) return;
+			await this.ctx.api.deviceManager.setDeviceLinks.mutate({
+				deviceId: this.id,
+				deviceLinks: next
+			});
+		} catch (err) {
+			this.ctx.logger.warn("ha-container failed to persist battery device-links", { meta: {
+				haDeviceId: this.config.values.haDeviceId,
+				error: errMsg(err)
+			} });
+		}
+	}
+	/**
 	* Device-level RAW upstream state for the physical HA device. HA has no
 	* single device-level state blob — a device's truth lives in its entities —
 	* so we aggregate every linked entity's raw `{ state, attributes }` (the
@@ -32911,7 +33021,10 @@ var HaProviderAddon = class HaProviderAddon extends BaseDeviceProvider {
 			}
 		}
 		if (plan.membershipChanged && container instanceof HaContainerDevice) await container.reprobe();
-		if (container instanceof HaContainerDevice) await container.persistChildLayout();
+		if (container instanceof HaContainerDevice) {
+			await container.persistChildLayout();
+			await container.persistBatteryLinks();
+		}
 		const integrationId = container.config.get("integrationId");
 		this.ctx.logger.info("ha re-sync: container reconciled", {
 			tags: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-provider-homeassistant",
-  "version": "1.1.15",
+  "version": "1.1.16",
   "description": "Home Assistant device provider addon for CamStack",
   "keywords": [
     "camstack",