@camstack/ui-library 1.2.348 → 1.2.350

package/dist/index.cjs

@@ -1706,6 +1706,19 @@ var EllipsisVertical = require_createLucideIcon.createLucideIcon("ellipsis-verti
 * This source code is licensed under the ISC license.
 * See the LICENSE file in the root directory of this source tree.
 */
+var Eraser = require_createLucideIcon.createLucideIcon("eraser", [["path", {
+	d: "M21 21H8a2 2 0 0 1-1.42-.587l-3.994-3.999a2 2 0 0 1 0-2.828l10-10a2 2 0 0 1 2.829 0l5.999 6a2 2 0 0 1 0 2.828L12.834 21",
+	key: "g5wo59"
+}], ["path", {
+	d: "m5.082 11.09 8.828 8.828",
+	key: "1wx5vj"
+}]]);
+/**
+* @license lucide-react v0.576.0 - ISC
+*
+* This source code is licensed under the ISC license.
+* See the LICENSE file in the root directory of this source tree.
+*/
 var ExternalLink = require_createLucideIcon.createLucideIcon("external-link", [
 	["path", {
 		d: "M15 3h6v6",
@@ -5400,6 +5413,11 @@ var DEVICE_TYPE_META = {
 		labelKey: "uiLibrary.deviceMeta.type.petFeeder",
 		labelFallback: "Pet feeder"
 	},
+	[_camstack_types.DeviceType.PetFountain]: {
+		icon: Droplets,
+		labelKey: "uiLibrary.deviceMeta.type.petFountain",
+		labelFallback: "Pet fountain"
+	},
 	[_camstack_types.DeviceType.Dishwasher]: {
 		icon: Waves,
 		labelKey: "uiLibrary.deviceMeta.type.dishwasher",
@@ -5900,7 +5918,7 @@ function lucideExportName(key) {
 function loadIconGlyphs() {
 	if (fullTable !== void 0) return Promise.resolve();
 	if (failure$1 !== void 0) return Promise.reject(failure$1);
-	pending ??= Promise.resolve().then(() => require("./icons-CWmwnulO.cjs")).then((module) => {
+	pending ??= Promise.resolve().then(() => require("./icons-BJpFQcLH.cjs")).then((module) => {
 		fullTable = module;
 		publish();
 	}, (error) => {
@@ -11026,6 +11044,14 @@ var useDeviceExportListExposedDevices = trpc.deviceExport.listExposedDevices.use
 var useDeviceExportExposeDevice = trpc.deviceExport.exposeDevice.useMutation;
 /** Generated alias around `trpc.deviceExport.unexposeDevice.useMutation`. */
 var useDeviceExportUnexposeDevice = trpc.deviceExport.unexposeDevice.useMutation;
+/** Generated alias around `trpc.deviceExport.listSupportedEntityKinds.useQuery`. */
+var useDeviceExportListSupportedEntityKinds = trpc.deviceExport.listSupportedEntityKinds.useQuery;
+/** Generated alias around `trpc.deviceExport.listExposedEntities.useQuery`. */
+var useDeviceExportListExposedEntities = trpc.deviceExport.listExposedEntities.useQuery;
+/** Generated alias around `trpc.deviceExport.exposeEntity.useMutation`. */
+var useDeviceExportExposeEntity = trpc.deviceExport.exposeEntity.useMutation;
+/** Generated alias around `trpc.deviceExport.unexposeEntity.useMutation`. */
+var useDeviceExportUnexposeEntity = trpc.deviceExport.unexposeEntity.useMutation;
 /** Generated alias around `trpc.deviceExport.getDeviceSettingsContribution.useQuery`. */
 var useDeviceExportGetDeviceSettingsContribution = trpc.deviceExport.getDeviceSettingsContribution.useQuery;
 /** Generated alias around `trpc.deviceExport.getDeviceLiveContribution.useQuery`. */
@@ -11928,6 +11954,18 @@ var usePetFeederSetFeedSound = trpc.petFeeder.setFeedSound.useMutation;
 var usePetFeederSetVolume = trpc.petFeeder.setVolume.useMutation;
 /** Generated alias around `trpc.petFeeder.getStatus.useQuery`. */
 var usePetFeederGetStatus = trpc.petFeeder.getStatus.useQuery;
+/** Generated alias around `trpc.petFountain.setPump.useMutation`. */
+var usePetFountainSetPump = trpc.petFountain.setPump.useMutation;
+/** Generated alias around `trpc.petFountain.setPumpInterval.useMutation`. */
+var usePetFountainSetPumpInterval = trpc.petFountain.setPumpInterval.useMutation;
+/** Generated alias around `trpc.petFountain.setPumpOnMinutes.useMutation`. */
+var usePetFountainSetPumpOnMinutes = trpc.petFountain.setPumpOnMinutes.useMutation;
+/** Generated alias around `trpc.petFountain.setPumpOffMinutes.useMutation`. */
+var usePetFountainSetPumpOffMinutes = trpc.petFountain.setPumpOffMinutes.useMutation;
+/** Generated alias around `trpc.petFountain.resetDailyConsumption.useMutation`. */
+var usePetFountainResetDailyConsumption = trpc.petFountain.resetDailyConsumption.useMutation;
+/** Generated alias around `trpc.petFountain.getStatus.useQuery`. */
+var usePetFountainGetStatus = trpc.petFountain.getStatus.useQuery;
 /** Generated alias around `trpc.pipelineAnalytics.getActiveTracks.useQuery`. */
 var usePipelineAnalyticsGetActiveTracks = trpc.pipelineAnalytics.getActiveTracks.useQuery;
 /** Generated alias around `trpc.pipelineAnalytics.getTrack.useQuery`. */
@@ -48791,6 +48829,7 @@ var CONTROL_CAP_NAMES = [
 	"media-player",
 	"control",
 	"pet-feeder",
+	"pet-fountain",
 	"dishwasher"
 ];
 //#endregion
@@ -53081,6 +53120,10 @@ var HOLD_DELAY_MS = 350;
 var HOLD_INTERVAL_MS = 70;
 var HOLD_ACCEL_AFTER = 8;
 var HOLD_FAST_STEP = 5;
+/** The slice stores the bowl as a mass in kilograms (D944); the card draws grams. */
+function bowlGrams(kilograms) {
+	return kilograms === null ? null : Math.round(kilograms * 1e3);
+}
 function clampPortion(grams) {
 	return Math.min(_camstack_types.PET_FEEDER_MANUAL_FEED_MAX, Math.max(_camstack_types.PET_FEEDER_MANUAL_FEED_MIN, grams));
 }
@@ -53132,7 +53175,7 @@ function PetFeederPanel({ trpc, deviceId, layout, optimistic }) {
 				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(UtensilsCrossed, {
 					className: "h-3.5 w-3.5",
 					"aria-hidden": true
-				}), display.bowlFood ?? "—"]
+				}), bowlGrams(display.bowlFood) ?? "—"]
 			}),
 			onMains && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 				className: "inline-flex items-center gap-0.5 text-xs text-foreground-subtle",
@@ -53178,7 +53221,7 @@ function PetFeederPanel({ trpc, deviceId, layout, optimistic }) {
 			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "flex items-center gap-4 rounded-lg border border-border/50 bg-surface-subtle/40 p-3",
 				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(BowlGauge, {
-					grams: display.bowlFood,
+					grams: bowlGrams(display.bowlFood),
 					low: display.lowFood,
 					eating: display.eating
 				}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -53188,7 +53231,7 @@ function PetFeederPanel({ trpc, deviceId, layout, optimistic }) {
 						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 							className: "text-3xl font-bold leading-none tabular-nums",
 							style: { color: display.lowFood ? KIBBLE_LOW : KIBBLE },
-							children: display.bowlFood ?? "—"
+							children: bowlGrams(display.bowlFood) ?? "—"
 						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 							className: "text-sm text-foreground-subtle",
 							children: t("uiLibrary.petFeeder.inBowl", "in bowl")
@@ -53625,6 +53668,367 @@ function PetFeederHeroCard({ trpc, deviceId, features, optimistic }) {
 	});
 }
 //#endregion
+//#region src/composites/device-controls/pet-fountain-panel.tsx
+/**
+* Pet-fountain controls for a `DeviceType.PetFountain` device.
+*
+* Reads the `pet-fountain` cap status slice (water level and volume, empty,
+* pump and its duty cycle, the water drunk) and renders:
+*   - PetFountainInlineControl (device-list row): the tank level and a pump
+*     on/off toggle.
+*   - PetFountainHeroCard (device-detail hero): the tank gauge with the level
+*     and the volume first, what the pet drank today / in 24 h / this hour /
+*     last time, the pump switch, its duty-cycle switch and the run / rest
+*     minutes. The filter is a consumable: the page's Consumables section
+*     draws it, never this card (D915).
+*
+* Every reading may be unknown (`null`) and is drawn as a dash, never as
+* zero. Stored volumes are litres and durations seconds (D944); the card
+* shows millilitres and minutes. Actions are gated on `available`.
+*/
+var LITRES_TO_ML = 1e3;
+var SECONDS_PER_MINUTE = 60;
+var MAX_PUMP_MINUTES = 240;
+function millilitres(litres) {
+	return litres === null ? "—" : `${Math.round(litres * LITRES_TO_ML)} mL`;
+}
+function minutesOf(seconds) {
+	return seconds === null ? null : Math.round(seconds / SECONDS_PER_MINUTE);
+}
+function PetFountainPanel({ trpc, deviceId, layout, optimistic }) {
+	const t = useUiText();
+	const { cap, slice, available } = useDeviceCapability({
+		trpc,
+		deviceId,
+		cap: (d) => d.petFountain,
+		slice: (d) => d.state.petFountain
+	});
+	const { display, applyOptimistic } = useOptimisticSlice(slice, { enabled: optimistic ?? true });
+	if (cap === void 0 || display === void 0) return null;
+	const busy = !available;
+	const fault = display.error !== null && display.error !== "no_error" ? display.error : null;
+	const pumpOn = display.pumpRunning === true;
+	const level = display.waterLevel;
+	const setPump = (on) => {
+		applyOptimistic({ pumpRunning: on });
+		cap.setPump({ on });
+	};
+	if (layout === "compact") return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+		className: "inline-flex items-center gap-2",
+		children: [
+			(fault !== null || display.empty === true) && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(TriangleAlert, {
+				className: "h-3.5 w-3.5 text-danger",
+				"aria-label": fault ?? t("uiLibrary.petFountain.empty", "Tank empty")
+			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+				className: cn("inline-flex items-center gap-1 text-xs font-medium tabular-nums", display.empty === true ? "text-danger" : "text-foreground"),
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Droplet, {
+					className: "h-3.5 w-3.5",
+					"aria-hidden": true
+				}), level === null ? "—" : `${Math.round(level)}%`]
+			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+				onClick: (e) => e.stopPropagation(),
+				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Switch, {
+					checked: pumpOn,
+					disabled: busy,
+					"aria-label": t("uiLibrary.petFountain.pump", "Pump"),
+					onCheckedChange: setPump
+				})
+			})
+		]
+	});
+	const intervalOn = display.pumpIntervalEnabled === true;
+	const onMinutes = minutesOf(display.pumpOnTime);
+	const offMinutes = minutesOf(display.pumpOffTime);
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+		className: "flex flex-col items-stretch gap-3 rounded-lg border border-border bg-surface p-4",
+		children: [
+			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				className: "flex items-center gap-4 rounded-lg border border-border-subtle bg-background-elevated p-3",
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(TankGauge, {
+					level,
+					empty: display.empty === true
+				}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+					className: "flex min-w-0 flex-1 flex-col gap-1.5",
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "flex items-baseline gap-2",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: cn("text-3xl font-bold leading-none tabular-nums", display.empty === true ? "text-danger" : "text-info"),
+							children: level === null ? "—" : `${Math.round(level)}%`
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: "text-sm tabular-nums text-foreground-muted",
+							children: millilitres(display.waterVolume)
+						})]
+					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(StatusLine, {
+						empty: display.empty,
+						pumpRunning: display.pumpRunning
+					})]
+				})]
+			}),
+			fault !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				className: "flex items-start gap-2 rounded-lg border border-danger/40 bg-danger/10 px-3 py-2 text-xs font-medium text-danger",
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(TriangleAlert, {
+					className: "mt-px h-4 w-4 shrink-0",
+					"aria-hidden": true
+				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+					className: "min-w-0 break-words",
+					children: fault
+				})]
+			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Section$1, {
+				label: t("uiLibrary.petFountain.consumption", "Water drunk"),
+				children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+					className: "grid grid-cols-2 gap-2 sm:grid-cols-4",
+					children: [
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Stat, {
+							label: t("uiLibrary.petFountain.today", "Today"),
+							value: display.todayDrink
+						}),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Stat, {
+							label: t("uiLibrary.petFountain.last24h", "Last 24 h"),
+							value: display.last24hDrink
+						}),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Stat, {
+							label: t("uiLibrary.petFountain.thisHour", "This hour"),
+							value: display.currentHourDrink
+						}),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Stat, {
+							label: t("uiLibrary.petFountain.lastDrink", "Last drink"),
+							value: display.lastDrink
+						})
+					]
+				})
+			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Section$1, {
+				label: t("uiLibrary.petFountain.pumpSection", "Controls"),
+				children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+					className: "flex flex-col gap-2",
+					children: [
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(SwitchRow, {
+							icon: pumpOn ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Play, { className: "h-4 w-4" }) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Pause, { className: "h-4 w-4" }),
+							label: t("uiLibrary.petFountain.pump", "Pump"),
+							checked: pumpOn,
+							disabled: busy,
+							onChange: setPump
+						}),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(SwitchRow, {
+							icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Timer, { className: "h-4 w-4" }),
+							label: t("uiLibrary.petFountain.cycle", "On / off cycle"),
+							checked: intervalOn,
+							disabled: busy,
+							onChange: (on) => {
+								applyOptimistic({ pumpIntervalEnabled: on });
+								cap.setPumpInterval({ on });
+							}
+						}),
+						intervalOn && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							className: "flex flex-col gap-2",
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(MinutesStepper, {
+								label: t("uiLibrary.petFountain.runMinutes", "Runs for"),
+								minutes: onMinutes,
+								disabled: busy,
+								onChange: (minutes) => {
+									applyOptimistic({ pumpOnTime: minutes * SECONDS_PER_MINUTE });
+									cap.setPumpOnMinutes({ minutes });
+								}
+							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(MinutesStepper, {
+								label: t("uiLibrary.petFountain.restMinutes", "Rests for"),
+								minutes: offMinutes,
+								disabled: busy,
+								onChange: (minutes) => {
+									applyOptimistic({ pumpOffTime: minutes * SECONDS_PER_MINUTE });
+									cap.setPumpOffMinutes({ minutes });
+								}
+							})]
+						})
+					]
+				})
+			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Button, {
+				variant: "outline",
+				size: "sm",
+				disabled: busy,
+				onClick: () => void cap.resetDailyConsumption({}),
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Eraser, {
+					className: "h-4 w-4",
+					"aria-hidden": true
+				}), t("uiLibrary.petFountain.clearDaily", "Clear daily count")]
+			})
+		]
+	});
+}
+/** A tank outline whose water rises with the level; danger-coloured when empty. */
+function TankGauge({ level, empty }) {
+	const t = useUiText();
+	const top = 58 - Math.min(1, Math.max(0, (level ?? 0) / 100)) * 40;
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("svg", {
+		width: 72,
+		height: 72,
+		viewBox: "0 0 72 72",
+		role: "img",
+		"aria-label": level === null ? t("uiLibrary.petFountain.levelUnknown", "Water level unknown") : t("uiLibrary.petFountain.levelPercent", "{{percent}}% water", { percent: Math.round(level) }),
+		className: "shrink-0",
+		children: [
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("defs", { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("clipPath", {
+				id: "pfn-tank-clip",
+				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("rect", {
+					x: "18",
+					y: "14",
+					width: "36",
+					height: "46",
+					rx: "6"
+				})
+			}) }),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("g", {
+				clipPath: "url(#pfn-tank-clip)",
+				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("rect", {
+					x: "18",
+					y: top,
+					width: "36",
+					height: "46",
+					className: empty ? "fill-danger" : "fill-info",
+					opacity: .75
+				})
+			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("rect", {
+				x: "18",
+				y: "14",
+				width: "36",
+				height: "46",
+				rx: "6",
+				fill: "none",
+				strokeWidth: "2.5",
+				className: "stroke-border"
+			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("rect", {
+				x: "28",
+				y: "8",
+				width: "16",
+				height: "6",
+				rx: "2",
+				className: "fill-border"
+			})
+		]
+	});
+}
+function StatusLine({ empty, pumpRunning }) {
+	const t = useUiText();
+	if (empty === true) return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+		className: "inline-flex items-center gap-1 text-xs font-medium text-danger",
+		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Droplet, {
+			className: "h-3.5 w-3.5",
+			"aria-hidden": true
+		}), t("uiLibrary.petFountain.empty", "Tank empty")]
+	});
+	if (pumpRunning === true) return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+		className: "inline-flex items-center gap-1 text-xs font-medium text-info",
+		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Droplets, {
+			className: "h-3.5 w-3.5",
+			"aria-hidden": true
+		}), t("uiLibrary.petFountain.pumpRunning", "Pump running")]
+	});
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+		className: "inline-flex items-center gap-1 text-xs text-foreground-subtle",
+		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Pause, {
+			className: "h-3.5 w-3.5",
+			"aria-hidden": true
+		}), pumpRunning === false ? t("uiLibrary.petFountain.pumpIdle", "Pump idle") : t("uiLibrary.petFountain.pumpUnknown", "Pump state unknown")]
+	});
+}
+function Section$1({ label, children }) {
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+		className: "flex flex-col gap-1",
+		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+			className: "text-[10px] font-semibold uppercase tracking-wider text-foreground-subtle",
+			children: label
+		}), children]
+	});
+}
+function Stat({ label, value }) {
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+		className: "flex flex-col rounded-lg border border-border-subtle bg-background-elevated px-3 py-2",
+		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+			className: "text-[11px] text-foreground-subtle",
+			children: label
+		}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+			className: "text-sm font-semibold tabular-nums text-foreground",
+			children: millilitres(value)
+		})]
+	});
+}
+function SwitchRow({ icon, label, checked, disabled, onChange }) {
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+		className: "flex items-center justify-between gap-3 rounded-lg border border-border-subtle bg-background-elevated px-3 py-2",
+		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+			className: "inline-flex items-center gap-2 text-sm text-foreground",
+			children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+				className: "text-foreground-subtle",
+				children: icon
+			}), label]
+		}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Switch, {
+			checked,
+			disabled,
+			"aria-label": label,
+			onCheckedChange: onChange
+		})]
+	});
+}
+function MinutesStepper({ label, minutes, disabled, onChange }) {
+	const t = useUiText();
+	const current = minutes ?? 0;
+	const step = (delta) => onChange(Math.min(MAX_PUMP_MINUTES, Math.max(0, current + delta)));
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+		className: "flex items-center justify-between gap-2 rounded-lg border border-border-subtle bg-background-elevated px-3 py-2",
+		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+			className: "text-sm text-foreground",
+			children: label
+		}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+			className: "flex items-center gap-2",
+			children: [
+				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+					variant: "outline",
+					size: "sm",
+					"aria-label": t("uiLibrary.petFountain.decrease", "Decrease {{label}}", { label }),
+					disabled: disabled || minutes === null || current <= 0,
+					onClick: () => step(-1),
+					children: "−"
+				}),
+				/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+					className: "w-14 text-center text-sm font-semibold tabular-nums text-foreground",
+					children: minutes === null ? "—" : t("uiLibrary.petFountain.minutes", "{{count}} min", { count: current })
+				}),
+				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+					variant: "outline",
+					size: "sm",
+					"aria-label": t("uiLibrary.petFountain.increase", "Increase {{label}}", { label }),
+					disabled: disabled || minutes === null || current >= MAX_PUMP_MINUTES,
+					onClick: () => step(1),
+					children: "+"
+				})
+			]
+		})]
+	});
+}
+function PetFountainInlineControl({ trpc, deviceId, features, optimistic }) {
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(PetFountainPanel, {
+		trpc,
+		deviceId,
+		features,
+		layout: "compact",
+		optimistic
+	});
+}
+function PetFountainHeroCard({ trpc, deviceId, features, optimistic }) {
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(PetFountainPanel, {
+		trpc,
+		deviceId,
+		features,
+		layout: "full",
+		optimistic
+	});
+}
+//#endregion
 //#region src/composites/device-controls/dishwasher-control.tsx
 /**
 * Dishwasher controls for a `DeviceType.Dishwasher` device.
@@ -56747,6 +57151,10 @@ var CONTROL_KIND_COMPONENTS = {
 		InlineControl: PetFeederInlineControl,
 		HeroCard: PetFeederHeroCard
 	},
+	"pet-fountain": {
+		InlineControl: PetFountainInlineControl,
+		HeroCard: PetFountainHeroCard
+	},
 	dishwasher: {
 		InlineControl: DishwasherInlineControl,
 		HeroCard: DishwasherHeroCard
@@ -56828,6 +57236,7 @@ var CONTROL_FILLS = {
 	[_camstack_types.DeviceType.Container]: false,
 	[_camstack_types.DeviceType.Image]: false,
 	[_camstack_types.DeviceType.PetFeeder]: false,
+	[_camstack_types.DeviceType.PetFountain]: false,
 	[_camstack_types.DeviceType.Dishwasher]: false,
 	[_camstack_types.DeviceType.Washer]: false,
 	[_camstack_types.DeviceType.Dryer]: false
@@ -60835,6 +61244,88 @@ function deselectShown(current, shown) {
 	return new Set([...current].filter((id) => !drop.has(id)));
 }
 //#endregion
+//#region src/composites/export-entity-rows.ts
+/**
+* The action and notification-target rows of the device export table (D968).
+*
+* An action and a notifier are list entries, never devices (D954): they are
+* merged into the SAME table as extra rows, built only from the kinds the
+* exporter answered. A kinds list that was not answered is UNKNOWN, not
+* "supports nothing" (D315) — it yields devices only and no filter entry, and
+* says nothing about what the exporter cannot do.
+*
+* Pure functions, so the rules are pinned without a DOM.
+*/
+/** The type-filter ids of the entity kinds, apart from every device type. */
+var ENTITY_FILTER_IDS = {
+	action: "entity:action",
+	notifier: "entity:notifier"
+};
+var KindsSchema = zod.z.array(_camstack_types.ExportEntityKindSchema);
+var NamedSchema = zod.z.array(zod.z.object({
+	id: zod.z.string(),
+	name: zod.z.string()
+}));
+var ExposedSchema = zod.z.array(_camstack_types.ExposedEntitySchema);
+/**
+* The non-device kinds the exporter answered, or null when it did not answer
+* (unknown — never an empty set).
+*/
+function supportedEntityKinds(data) {
+	const parsed = KindsSchema.safeParse(data);
+	if (!parsed.success) return null;
+	const kinds = /* @__PURE__ */ new Set();
+	for (const kind of parsed.data) if (kind === "action" || kind === "notifier") kinds.add(kind);
+	return kinds;
+}
+function buildEntityRows(input) {
+	const { kinds } = input;
+	if (kinds === null) return [];
+	const exposed = ExposedSchema.safeParse(input.exposed);
+	const exposedActions = /* @__PURE__ */ new Set();
+	const exposedTargets = /* @__PURE__ */ new Set();
+	if (exposed.success) {
+		for (const row of exposed.data) if (row.entity.kind === "action") exposedActions.add(row.entity.actionId);
+		else if (row.entity.kind === "notifier") exposedTargets.add(row.entity.targetId);
+	}
+	const rows = [];
+	if (kinds.has("action")) {
+		const actions = NamedSchema.safeParse(input.actions);
+		for (const a of actions.success ? actions.data : []) rows.push({
+			kind: "action",
+			key: `action:${a.id}`,
+			ref: {
+				kind: "action",
+				actionId: a.id
+			},
+			name: a.name,
+			exposed: exposedActions.has(a.id)
+		});
+	}
+	if (kinds.has("notifier")) {
+		const targets = NamedSchema.safeParse(input.targets);
+		for (const t of targets.success ? targets.data : []) rows.push({
+			kind: "notifier",
+			key: `notifier:${t.id}`,
+			ref: {
+				kind: "notifier",
+				targetId: t.id
+			},
+			name: t.name,
+			exposed: exposedTargets.has(t.id)
+		});
+	}
+	return rows;
+}
+/** The type-filter ids to add beside the device types: one per SUPPORTED kind. */
+function entityFilterOptionIds(kinds) {
+	if (kinds === null) return [];
+	const ids = [];
+	if (kinds.has("action")) ids.push(ENTITY_FILTER_IDS.action);
+	if (kinds.has("notifier")) ids.push(ENTITY_FILTER_IDS.notifier);
+	return ids;
+}
+//#endregion
 //#region src/composites/device-export-panel.tsx
 /**
 * DeviceExportPanel — generic, addon-agnostic surface for the
@@ -61054,19 +61545,28 @@ function ExportSelectCell({ device, checked, onToggle }) {
 * of these live in one table, and "Expose" alone names none of them.
 */
 function ExportRowToggle({ addonId, device, exposed, busy, onToggle }) {
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ExposeToggleButton, {
+		addonId,
+		label: useDeviceLabel(device, "compact"),
+		exposed,
+		busy,
+		onToggle: (action) => onToggle(device, action)
+	});
+}
+/** The Expose / Exposed button every row kind (device, action, notifier) shares. */
+function ExposeToggleButton({ addonId, label, exposed, busy, onToggle }) {
 	const t = useUiText();
-	const deviceLabel = useDeviceLabel(device, "compact");
 	const handleClick = (e) => {
 		e.stopPropagation();
 		if (busy) return;
-		onToggle(device, exposed ? "unexpose" : "expose");
+		onToggle(exposed ? "unexpose" : "expose");
 	};
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
 		size: "sm",
 		variant: exposed ? "ghost" : "primary",
 		disabled: busy,
 		onClick: handleClick,
-		"aria-label": exposed ? t("uiLibrary.deviceExport.unexposeDevice", "Unexpose {{name}}", { name: deviceLabel }) : t("uiLibrary.deviceExport.exposeDevice", "Expose {{name}}", { name: deviceLabel }),
+		"aria-label": exposed ? t("uiLibrary.deviceExport.unexposeDevice", "Unexpose {{name}}", { name: label }) : t("uiLibrary.deviceExport.exposeDevice", "Expose {{name}}", { name: label }),
 		title: exposed ? t("uiLibrary.deviceExport.stopTitle", "Stop exposing to \"{{addon}}\"", { addon: addonId }) : t("uiLibrary.deviceExport.exposeTitle", "Expose to \"{{addon}}\"", { addon: addonId }),
 		children: exposed ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Unlink2, { className: "mr-1 h-3.5 w-3.5" }), t("uiLibrary.deviceExport.exposed", "Exposed")] }) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Share2, { className: "mr-1 h-3.5 w-3.5" }), t("uiLibrary.deviceExport.expose", "Expose")] })
 	});
@@ -61147,11 +61647,34 @@ function DeviceExportPanel({ addonId, onOpenDevice, showSetup = true }) {
 		addonId
 	}, { retry: false });
 	const devicesQuery = useDeviceManagerListAll({ projection: "slim" }, { refetchInterval: FLEET_POLL_INTERVAL_MS });
+	const entityKindsQuery = useDeviceExportListSupportedEntityKinds({
+		nodeId: "hub",
+		addonId
+	}, { retry: false });
+	const entityKinds = (0, react$1.useMemo)(() => supportedEntityKinds(entityKindsQuery.data), [entityKindsQuery.data]);
+	const exposedEntitiesQuery = useDeviceExportListExposedEntities({
+		nodeId: "hub",
+		addonId
+	}, {
+		refetchInterval: STATUS_POLL_INTERVAL_MS,
+		retry: false,
+		enabled: entityKinds !== null
+	});
+	const actionsQuery = useActionsList({}, {
+		refetchInterval: FLEET_POLL_INTERVAL_MS,
+		enabled: entityKinds?.has("action") === true
+	});
+	const targetsQuery = useNotificationOutputListTargets({}, {
+		refetchInterval: FLEET_POLL_INTERVAL_MS,
+		enabled: entityKinds?.has("notifier") === true
+	});
 	const invalidate = (0, react$1.useCallback)(() => {
 		queryClient.invalidateQueries({ queryKey: [["deviceExport"]] });
 	}, [queryClient]);
 	const exposeMutation = useDeviceExportExposeDevice({ onSuccess: invalidate });
 	const unexposeMutation = useDeviceExportUnexposeDevice({ onSuccess: invalidate });
+	const exposeEntityMutation = useDeviceExportExposeEntity({ onSuccess: invalidate });
+	const unexposeEntityMutation = useDeviceExportUnexposeEntity({ onSuccess: invalidate });
 	const status = (0, react$1.useMemo)(() => parseStatus(statusQuery.data), [statusQuery.data]);
 	const exposed = (0, react$1.useMemo)(() => {
 		const parsed = ExposedDeviceArraySchema.safeParse(exposedQuery.data);
@@ -61181,10 +61704,37 @@ function DeviceExportPanel({ addonId, onOpenDevice, showSetup = true }) {
 		}
 		return rows;
 	}, [devicesQuery.data, supportedKinds]);
+	const entityRows = (0, react$1.useMemo)(() => buildEntityRows({
+		kinds: entityKinds,
+		actions: actionsQuery.data,
+		targets: targetsQuery.data,
+		exposed: exposedEntitiesQuery.data
+	}), [
+		entityKinds,
+		actionsQuery.data,
+		targetsQuery.data,
+		exposedEntitiesQuery.data
+	]);
+	const typeFilterOptions = (0, react$1.useMemo)(() => {
+		const entityOptions = entityFilterOptionIds(entityKinds).map((id) => id === ENTITY_FILTER_IDS.action ? {
+			id,
+			label: t("uiLibrary.deviceExport.typeAction", "Action"),
+			icon: Play
+		} : {
+			id,
+			label: t("uiLibrary.deviceExport.typeNotifier", "Notifier"),
+			icon: Bell
+		});
+		return [...supportedTypeOptions, ...entityOptions];
+	}, [
+		supportedTypeOptions,
+		entityKinds,
+		t
+	]);
 	const linkState = status?.linkState ?? "unlinked";
-	const loading = statusQuery.isLoading || exposedQuery.isLoading || kindsQuery.isLoading || devicesQuery.isLoading;
+	const loading = statusQuery.isLoading || exposedQuery.isLoading || kindsQuery.isLoading || devicesQuery.isLoading || entityKindsQuery.isLoading;
 	const exposedCount = status?.exposedDeviceCount ?? exposedIds.size;
-	const busy = exposeMutation.isPending || unexposeMutation.isPending;
+	const busy = exposeMutation.isPending || unexposeMutation.isPending || exposeEntityMutation.isPending || unexposeEntityMutation.isPending;
 	const [selectedIds, setSelectedIds] = (0, react$1.useState)(() => /* @__PURE__ */ new Set());
 	const [outcome, setOutcome] = (0, react$1.useState)(null);
 	const [running, setRunning] = (0, react$1.useState)(false);
@@ -61251,10 +61801,71 @@ function DeviceExportPanel({ addonId, onOpenDevice, showSetup = true }) {
 		labelFor,
 		running
 	]);
+	/**
+	* Expose / unexpose ONE action or notification target. Same contract as the
+	* device runner: the result is recorded either way and a refusal is named on
+	* screen, with the entity (it has no device id to tag).
+	*/
+	const runEntityExport = (0, react$1.useCallback)(async (action, row) => {
+		if (running) return;
+		setRunning(true);
+		setOutcome(null);
+		const mutation = action === "expose" ? exposeEntityMutation : unexposeEntityMutation;
+		const succeeded = [];
+		const failed = [];
+		try {
+			await mutation.mutateAsync({
+				entity: row.ref,
+				nodeId: "hub",
+				addonId
+			});
+			succeeded.push(row.name);
+		} catch (err) {
+			const message = err instanceof Error ? err.message : String(err);
+			console.error(`[device-export] ${action} ${row.kind} failed`, {
+				tags: row.ref.kind === "action" ? { actionId: row.ref.actionId } : { targetId: row.ref.targetId },
+				addonId,
+				error: message
+			});
+			failed.push({
+				label: row.name,
+				message
+			});
+		}
+		setOutcome({
+			action,
+			total: 1,
+			succeeded,
+			failed
+		});
+		setRunning(false);
+	}, [
+		addonId,
+		exposeEntityMutation,
+		unexposeEntityMutation,
+		running
+	]);
 	const [bulkFilters, setBulkFilters] = (0, react$1.useState)(NO_EXPORT_FILTERS);
 	const roleOptions = (0, react$1.useMemo)(() => roleFilterOptions(candidateDevices), [candidateDevices]);
 	const providerOptions = (0, react$1.useMemo)(() => providerFilterOptions(candidateDevices), [candidateDevices]);
 	const shownDevices = (0, react$1.useMemo)(() => applyExportFilters(candidateDevices, bulkFilters), [candidateDevices, bulkFilters]);
+	const shownRows = (0, react$1.useMemo)(() => {
+		const deviceRows = shownDevices.map((device) => ({
+			kind: "device",
+			key: String(device.id),
+			device
+		}));
+		const entities = bulkFilters.roles.length > 0 || bulkFilters.providers.length > 0 ? [] : entityRows.map((entity) => ({
+			kind: "entity",
+			key: entity.key,
+			entity
+		}));
+		return [...deviceRows, ...entities];
+	}, [
+		shownDevices,
+		entityRows,
+		bulkFilters
+	]);
 	const setRoleFilter = (0, react$1.useCallback)((roles) => setBulkFilters((f) => ({
 		...f,
 		roles
@@ -61273,27 +61884,35 @@ function DeviceExportPanel({ addonId, onOpenDevice, showSetup = true }) {
 	const onRowToggle = (0, react$1.useCallback)((device, action) => {
 		runExport(action, [String(device.id)]);
 	}, [runExport]);
-	const onRowClick = (0, react$1.useCallback)((device) => onOpenDevice?.(String(device.id)), [onOpenDevice]);
-	const getKey = (0, react$1.useCallback)((device) => String(device.id), []);
-	const getSearchText = (0, react$1.useCallback)((device) => `${device.name} ${device.stableId}`, []);
-	const getFilterType = (0, react$1.useCallback)((device) => device.type, []);
+	const onRowClick = (0, react$1.useCallback)((row) => {
+		if (row.kind === "device") onOpenDevice?.(String(row.device.id));
+	}, [onOpenDevice]);
+	const getKey = (0, react$1.useCallback)((row) => row.key, []);
+	const getSearchText = (0, react$1.useCallback)((row) => row.kind === "device" ? `${row.device.name} ${row.device.stableId}` : row.entity.name, []);
+	const getFilterType = (0, react$1.useCallback)((row) => row.kind === "device" ? row.device.type : ENTITY_FILTER_IDS[row.entity.kind], []);
 	const columns = (0, react$1.useMemo)(() => [
 		{
 			key: "select",
 			header: "",
 			headerClassName: "w-8",
-			cell: (device) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ExportSelectCell, {
-				device,
-				checked: selectedIds.has(String(device.id)),
-				onToggle: () => toggleSelection(String(device.id))
-			})
+			cell: (row) => row.kind === "device" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ExportSelectCell, {
+				device: row.device,
+				checked: selectedIds.has(String(row.device.id)),
+				onToggle: () => toggleSelection(String(row.device.id))
+			}) : null
 		},
 		{
 			key: "type",
 			header: t("uiLibrary.deviceExport.colType", "Type"),
 			headerClassName: "w-32",
-			cell: (device) => {
-				const meta = deviceTypeMetaOf(device.type, t);
+			cell: (row) => {
+				const meta = row.kind === "device" ? deviceTypeMetaOf(row.device.type, t) : row.entity.kind === "action" ? {
+					label: t("uiLibrary.deviceExport.typeAction", "Action"),
+					icon: Play
+				} : {
+					label: t("uiLibrary.deviceExport.typeNotifier", "Notifier"),
+					icon: Bell
+				};
 				const TypeIcon = meta.icon;
 				return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 					className: "inline-flex items-center gap-1.5 text-[11px] text-foreground-subtle",
@@ -61304,10 +61923,13 @@ function DeviceExportPanel({ addonId, onOpenDevice, showSetup = true }) {
 		{
 			key: "name",
 			header: t("uiLibrary.deviceExport.colName", "Name"),
-			cell: (device) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(DeviceName, {
-				device,
+			cell: (row) => row.kind === "device" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(DeviceName, {
+				device: row.device,
 				form: "compact",
 				className: "text-xs font-medium text-foreground"
+			}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+				className: "text-xs font-medium text-foreground",
+				children: row.entity.name
 			})
 		},
 		{
@@ -61315,12 +61937,18 @@ function DeviceExportPanel({ addonId, onOpenDevice, showSetup = true }) {
 			header: t("uiLibrary.deviceExport.colExport", "Export"),
 			headerClassName: "w-32 text-right",
 			cellClassName: "text-right",
-			cell: (device) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ExportRowToggle, {
+			cell: (row) => row.kind === "device" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ExportRowToggle, {
 				addonId,
-				device,
-				exposed: exposedIds.has(String(device.id)),
+				device: row.device,
+				exposed: exposedIds.has(String(row.device.id)),
 				busy,
 				onToggle: onRowToggle
+			}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ExposeToggleButton, {
+				addonId,
+				label: row.entity.name,
+				exposed: row.entity.exposed,
+				busy,
+				onToggle: (action) => void runEntityExport(action, row.entity)
 			})
 		}
 	], [
@@ -61328,67 +61956,71 @@ function DeviceExportPanel({ addonId, onOpenDevice, showSetup = true }) {
 		busy,
 		exposedIds,
 		onRowToggle,
+		runEntityExport,
 		selectedIds,
 		toggleSelection,
 		t
 	]);
-	const renderToolbar = (0, react$1.useCallback)(({ filtered }) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-		className: "inline-flex flex-wrap items-center gap-1.5",
-		children: [
-			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(MultiSelectDropdown, {
-				label: t("uiLibrary.deviceExport.filterRole", "Role"),
-				options: roleOptions,
-				selected: bulkFilters.roles,
-				onChange: setRoleFilter
-			}),
-			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(MultiSelectDropdown, {
-				label: t("uiLibrary.deviceExport.filterProvider", "Provider"),
-				options: providerOptions,
-				selected: bulkFilters.providers,
-				onChange: setProviderFilter
-			}),
-			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
-				size: "sm",
-				variant: "secondary",
-				disabled: filtered.length === 0,
-				onClick: () => setSelectedIds((current) => selectShown(current, filtered)),
-				children: t("uiLibrary.deviceExport.selectShown", "Select {{count}} shown", { count: filtered.length })
-			}),
-			selectedIds.size > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
-				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
-					size: "sm",
-					variant: "ghost",
-					onClick: () => setSelectedIds((current) => deselectShown(current, filtered)),
-					children: t("uiLibrary.deviceExport.deselectShown", "Deselect shown")
-				}),
-				/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-					"data-testid": "export-selection-count",
-					className: "text-[11px] text-foreground-subtle",
-					children: t("uiLibrary.deviceExport.selected", "{{count}} selected", { count: selectedIds.size })
+	const renderToolbar = (0, react$1.useCallback)(({ filtered: filteredRows }) => {
+		const filtered = filteredRows.flatMap((row) => row.kind === "device" ? [row.device] : []);
+		return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+			className: "inline-flex flex-wrap items-center gap-1.5",
+			children: [
+				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(MultiSelectDropdown, {
+					label: t("uiLibrary.deviceExport.filterRole", "Role"),
+					options: roleOptions,
+					selected: bulkFilters.roles,
+					onChange: setRoleFilter
 				}),
-				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
-					size: "sm",
-					variant: "primary",
-					disabled: busy,
-					onClick: exposeSelected,
-					children: t("uiLibrary.deviceExport.exposeN", "Expose {{count}}", { count: selectedIds.size })
+				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(MultiSelectDropdown, {
+					label: t("uiLibrary.deviceExport.filterProvider", "Provider"),
+					options: providerOptions,
+					selected: bulkFilters.providers,
+					onChange: setProviderFilter
 				}),
 				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
 					size: "sm",
 					variant: "secondary",
-					disabled: busy,
-					onClick: unexposeSelected,
-					children: t("uiLibrary.deviceExport.unexposeN", "Unexpose {{count}}", { count: selectedIds.size })
+					disabled: filtered.length === 0,
+					onClick: () => setSelectedIds((current) => selectShown(current, filtered)),
+					children: t("uiLibrary.deviceExport.selectShown", "Select {{count}} shown", { count: filtered.length })
 				}),
-				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
-					size: "sm",
-					variant: "ghost",
-					onClick: clearSelection,
-					children: t("uiLibrary.deviceExport.clear", "Clear")
-				})
-			] })
-		]
-	}), [
+				selectedIds.size > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+						size: "sm",
+						variant: "ghost",
+						onClick: () => setSelectedIds((current) => deselectShown(current, filtered)),
+						children: t("uiLibrary.deviceExport.deselectShown", "Deselect shown")
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						"data-testid": "export-selection-count",
+						className: "text-[11px] text-foreground-subtle",
+						children: t("uiLibrary.deviceExport.selected", "{{count}} selected", { count: selectedIds.size })
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+						size: "sm",
+						variant: "primary",
+						disabled: busy,
+						onClick: exposeSelected,
+						children: t("uiLibrary.deviceExport.exposeN", "Expose {{count}}", { count: selectedIds.size })
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+						size: "sm",
+						variant: "secondary",
+						disabled: busy,
+						onClick: unexposeSelected,
+						children: t("uiLibrary.deviceExport.unexposeN", "Unexpose {{count}}", { count: selectedIds.size })
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Button, {
+						size: "sm",
+						variant: "ghost",
+						onClick: clearSelection,
+						children: t("uiLibrary.deviceExport.clear", "Clear")
+					})
+				] })
+			]
+		});
+	}, [
 		t,
 		roleOptions,
 		providerOptions,
@@ -61437,16 +62069,16 @@ function DeviceExportPanel({ addonId, onOpenDevice, showSetup = true }) {
 			}),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 				className: "p-2 sm:p-3",
-				children: loading && candidateDevices.length === 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				children: loading && candidateDevices.length === 0 && entityRows.length === 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 					className: "flex items-center gap-2 px-1 py-6 text-xs text-foreground-subtle",
 					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(LoaderCircle, { className: "h-3.5 w-3.5 animate-spin" }), t("uiLibrary.deviceExport.loading", "Loading exportable devices…")]
-				}) : hasSupportedKinds && candidateDevices.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(DeviceList, {
+				}) : hasSupportedKinds && candidateDevices.length > 0 || entityRows.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(DeviceList, {
 					mode: "generic",
-					items: shownDevices,
+					items: shownRows,
 					getKey,
 					getSearchText,
 					getFilterType,
-					filterOptions: supportedTypeOptions,
+					filterOptions: typeFilterOptions,
 					columns,
 					onRowClick: onOpenDevice ? onRowClick : void 0,
 					toolbar: renderToolbar,
@@ -63590,7 +64222,8 @@ function SectionedPage({ icon, title, subtitle, actions, sections, defaultSectio
 		tabKey: activeId,
 		fill,
 		children: fill ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-			className: "flex min-h-0 flex-1 flex-col",
+			className: "flex min-h-0 flex-1 flex-col overflow-y-auto",
+			"data-testid": "sectioned-page-body",
 			children: active?.content
 		}) : active?.content
 	});
@@ -71030,6 +71663,90 @@ function useDeviceCapSlice(trpc, deviceId, capName) {
 	return useDeviceStateSlice(handleRef.current);
 }
 //#endregion
+//#region src/hooks/merge-detections.ts
+/** Minimum IoU between an enriched root and a raw root to call them one subject
+*  when no trackId pairs them. */
+var EXTRA_MATCH_IOU_THRESHOLD = .3;
+function iou(a, b) {
+	const x1 = Math.max(a.x, b.x);
+	const y1 = Math.max(a.y, b.y);
+	const x2 = Math.min(a.x + a.width, b.x + b.width);
+	const y2 = Math.min(a.y + a.height, b.y + b.height);
+	const inter = Math.max(0, x2 - x1) * Math.max(0, y2 - y1);
+	const union = a.width * a.height + b.width * b.height - inter;
+	return union > 0 ? inter / union : 0;
+}
+function isRoot(d) {
+	return d.kind !== "detail";
+}
+function scaleBox(b, sx, sy) {
+	return {
+		x: b.x * sx,
+		y: b.y * sy,
+		width: b.width * sx,
+		height: b.height * sy
+	};
+}
+/** The raw root an enriched root describes: same trackId, else best IoU. */
+function matchRawRoot(enrichedRoot, rawRoots, sx, sy) {
+	const trackId = enrichedRoot.track?.trackId;
+	if (trackId !== void 0) {
+		const byTrack = rawRoots.find((r) => r.track?.trackId === trackId);
+		if (byTrack) return byTrack;
+	}
+	const scaled = scaleBox(enrichedRoot.bbox, sx, sy);
+	let best = null;
+	let bestIou = EXTRA_MATCH_IOU_THRESHOLD;
+	for (const r of rawRoots) {
+		const v = iou(scaled, r.bbox);
+		if (v >= bestIou) {
+			best = r;
+			bestIou = v;
+		}
+	}
+	return best;
+}
+function mergeDetections(raw, extras) {
+	if (!extras) return raw;
+	const frameWidth = raw?.frameWidth ?? extras.frameWidth;
+	const frameHeight = raw?.frameHeight ?? extras.frameHeight;
+	const sx = extras.frameWidth > 0 ? frameWidth / extras.frameWidth : 1;
+	const sy = extras.frameHeight > 0 ? frameHeight / extras.frameHeight : 1;
+	const rawDets = raw?.detections ?? [];
+	const rawRoots = rawDets.filter(isRoot);
+	const rawRootFor = /* @__PURE__ */ new Map();
+	const extraLabels = /* @__PURE__ */ new Map();
+	for (const root of extras.detections.filter(isRoot)) {
+		const match = matchRawRoot(root, rawRoots, sx, sy);
+		rawRootFor.set(root.id, match);
+		if (match && root.labels.length > 0) extraLabels.set(match, [...extraLabels.get(match) ?? [], ...root.labels]);
+	}
+	const out = rawDets.map((d) => {
+		const add = extraLabels.get(d);
+		if (!add) return d;
+		const have = new Set(d.labels.map((l) => l.label));
+		const fresh = add.filter((l) => !have.has(l.label));
+		return fresh.length > 0 ? {
+			...d,
+			labels: [...d.labels, ...fresh]
+		} : d;
+	});
+	for (const d of extras.detections) {
+		if (isRoot(d)) continue;
+		const parent = d.parentId !== void 0 ? rawRootFor.get(d.parentId) : void 0;
+		out.push({
+			...d,
+			bbox: scaleBox(d.bbox, sx, sy),
+			...parent ? { parentId: parent.id } : {}
+		});
+	}
+	return {
+		detections: out,
+		frameWidth,
+		frameHeight
+	};
+}
+//#endregion
 //#region src/hooks/use-device-detections.ts
 /**
 * useDeviceDetections — subscribes to motion, raw motion, and detection events for a device.
@@ -71038,12 +71755,18 @@ function useDeviceCapSlice(trpc, deviceId, capName) {
 * admin-ui (BackendClient.trpc) and addon pages (AddonPageProps.trpc).
 */
 var MOTION_FADE_MS = 500;
-/** Detection overlay fade — ALSO the raw-fallback suppression window: while an
-*  enriched frame-tracked event arrived within this window, raw detection.result
-*  frames are ignored (post-analysis is the richer source; raw remains the
-*  fallback when post-analysis is absent). Keeping the two equal means raw
-*  resumes exactly when the enriched display fades — no blank gap. */
+/** Fade of each detection source (raw roots, enriched extras), counted from the
+*  frame's capture time so a late frame is not kept for the full window. */
 var DETECTION_FADE_MS = 800;
+/** A frame older than this at arrival is replayed pre-roll and never drawn.
+*  Same meaning as the server's OVERLAY_MAX_FRAME_AGE_MS. */
+var OVERLAY_MAX_FRAME_AGE_MS = 1e3;
+/**
+* The most of a frame's age (arrival minus its capture timestamp) the fade
+* deducts. Bounded so a skewed server/browser clock can never make boxes vanish
+* on arrival.
+*/
+var MAX_FRAME_AGE_FADE_DEDUCTION_MS = DETECTION_FADE_MS / 2;
 /** Helper: subscribe to live.onEvent without optional chaining on subscribe() */
 function safeSubscribe(trpc, category, onData) {
 	try {
@@ -71066,8 +71789,26 @@ function useDeviceDetections(trpc, deviceId) {
 	const [phase, setPhase] = (0, react$1.useState)("watching");
 	const motionTimer = (0, react$1.useRef)(void 0);
 	const motionRawTimer = (0, react$1.useRef)(void 0);
-	const detectionTimer = (0, react$1.useRef)(void 0);
-	const lastEnrichedAt = (0, react$1.useRef)(0);
+	const rawTimer = (0, react$1.useRef)(void 0);
+	const extrasTimer = (0, react$1.useRef)(void 0);
+	/** Live part of each source: raw roots and enriched extras fade independently. */
+	const rawPart = (0, react$1.useRef)(null);
+	const extrasPart = (0, react$1.useRef)(null);
+	/** Capture timestamp of the newest frame shown, per source; older arrivals are dropped. */
+	const lastRawTs = (0, react$1.useRef)(0);
+	const lastExtrasTs = (0, react$1.useRef)(0);
+	const publish = (0, react$1.useCallback)(() => {
+		setDetection(mergeDetections(rawPart.current, extrasPart.current));
+	}, []);
+	/** Admit a frame: null = rejected (stale or out of order), else its fade in ms. */
+	const admit = (0, react$1.useCallback)((frameTs, lastTs) => {
+		if (frameTs !== null) {
+			if (Date.now() - frameTs > OVERLAY_MAX_FRAME_AGE_MS) return null;
+			if (frameTs < lastTs.current) return null;
+			lastTs.current = frameTs;
+		}
+		return DETECTION_FADE_MS - (frameTs === null ? 0 : Math.min(Math.max(Date.now() - frameTs, 0), MAX_FRAME_AGE_FADE_DEDUCTION_MS));
+	}, []);
 	(0, react$1.useEffect)(() => {
 		if (deviceId === null) return;
 		const sub = safeSubscribe(trpc, "detection.motion-analysis", (event) => {
@@ -71116,48 +71857,72 @@ function useDeviceDetections(trpc, deviceId) {
 		};
 	}, [trpc, deviceId]);
 	(0, react$1.useEffect)(() => {
-		lastEnrichedAt.current = 0;
+		extrasPart.current = null;
+		rawPart.current = null;
+		lastExtrasTs.current = 0;
+		lastRawTs.current = 0;
+		setDetection(null);
 		if (deviceId === null) return;
 		const sub = safeSubscribe(trpc, "pipeline-analytics.frame-tracked", (event) => {
 			const data = event?.data;
 			if (!data || data.deviceId !== deviceId) return;
 			if (!data.detections?.length) return;
 			if (typeof data.detections[0]?.kind !== "string") return;
-			lastEnrichedAt.current = Date.now();
-			setDetection({
+			const fadeInMs = admit(typeof data.timestamp === "number" ? data.timestamp : null, lastExtrasTs);
+			if (fadeInMs === null) return;
+			extrasPart.current = {
 				detections: data.detections,
 				frameWidth: data.frameWidth,
 				frameHeight: data.frameHeight
-			});
-			if (detectionTimer.current) clearTimeout(detectionTimer.current);
-			detectionTimer.current = setTimeout(() => setDetection(null), DETECTION_FADE_MS);
+			};
+			publish();
+			if (extrasTimer.current) clearTimeout(extrasTimer.current);
+			extrasTimer.current = setTimeout(() => {
+				extrasPart.current = null;
+				publish();
+			}, fadeInMs);
 		});
 		return () => {
 			sub?.unsubscribe();
-			if (detectionTimer.current) clearTimeout(detectionTimer.current);
+			if (extrasTimer.current) clearTimeout(extrasTimer.current);
 		};
-	}, [trpc, deviceId]);
+	}, [
+		trpc,
+		deviceId,
+		admit,
+		publish
+	]);
 	(0, react$1.useEffect)(() => {
 		if (deviceId === null) return;
 		const sub = safeSubscribe(trpc, "detection.result", (event) => {
 			const e = event;
 			if (!matchesDevice(e?.source, deviceId)) return;
-			if (Date.now() - lastEnrichedAt.current < DETECTION_FADE_MS) return;
 			const frame = e.data?.frame;
 			if (!frame?.detections?.length) return;
-			setDetection({
+			const fadeInMs = admit(typeof frame.timestamp === "number" ? frame.timestamp : null, lastRawTs);
+			if (fadeInMs === null) return;
+			rawPart.current = {
 				detections: frame.detections,
 				frameWidth: frame.width,
 				frameHeight: frame.height
-			});
-			if (detectionTimer.current) clearTimeout(detectionTimer.current);
-			detectionTimer.current = setTimeout(() => setDetection(null), DETECTION_FADE_MS);
+			};
+			publish();
+			if (rawTimer.current) clearTimeout(rawTimer.current);
+			rawTimer.current = setTimeout(() => {
+				rawPart.current = null;
+				publish();
+			}, fadeInMs);
 		});
 		return () => {
 			sub?.unsubscribe();
-			if (detectionTimer.current) clearTimeout(detectionTimer.current);
+			if (rawTimer.current) clearTimeout(rawTimer.current);
 		};
-	}, [trpc, deviceId]);
+	}, [
+		trpc,
+		deviceId,
+		admit,
+		publish
+	]);
 	(0, react$1.useEffect)(() => {
 		if (deviceId === null) return;
 		const sub = safeSubscribe(trpc, "detection.phase-transition", (event) => {
@@ -71826,6 +72591,7 @@ exports.EmptyState = EmptyState;
 exports.EndpointResultsCard = EndpointResultsCard;
 exports.EndpointTestCard = EndpointTestCard;
 exports.EntryJsonSchemaForm = EntryJsonSchemaForm;
+exports.Eraser = Eraser;
 exports.ErrorBox = ErrorBox;
 exports.EventKindGlyph = EventKindGlyph;
 exports.EventStream = EventStream;
@@ -72842,12 +73608,16 @@ exports.useDeviceDiscoveryRefreshDiscovery = useDeviceDiscoveryRefreshDiscovery;
 exports.useDeviceDiscoveryReleaseDevice = useDeviceDiscoveryReleaseDevice;
 exports.useDeviceExportApplyDeviceSettingsPatch = useDeviceExportApplyDeviceSettingsPatch;
 exports.useDeviceExportExposeDevice = useDeviceExportExposeDevice;
+exports.useDeviceExportExposeEntity = useDeviceExportExposeEntity;
 exports.useDeviceExportGetDeviceLiveContribution = useDeviceExportGetDeviceLiveContribution;
 exports.useDeviceExportGetDeviceSettingsContribution = useDeviceExportGetDeviceSettingsContribution;
 exports.useDeviceExportGetStatus = useDeviceExportGetStatus;
 exports.useDeviceExportListExposedDevices = useDeviceExportListExposedDevices;
+exports.useDeviceExportListExposedEntities = useDeviceExportListExposedEntities;
 exports.useDeviceExportListSupportedDeviceKinds = useDeviceExportListSupportedDeviceKinds;
+exports.useDeviceExportListSupportedEntityKinds = useDeviceExportListSupportedEntityKinds;
 exports.useDeviceExportUnexposeDevice = useDeviceExportUnexposeDevice;
+exports.useDeviceExportUnexposeEntity = useDeviceExportUnexposeEntity;
 exports.useDeviceExtensionListCandidates = useDeviceExtensionListCandidates;
 exports.useDeviceExtensionListSlots = useDeviceExtensionListSlots;
 exports.useDeviceExtensionListSources = useDeviceExtensionListSources;
@@ -73338,6 +74108,12 @@ exports.usePetFeederSetChildLock = usePetFeederSetChildLock;
 exports.usePetFeederSetFeedSound = usePetFeederSetFeedSound;
 exports.usePetFeederSetIndicatorLight = usePetFeederSetIndicatorLight;
 exports.usePetFeederSetVolume = usePetFeederSetVolume;
+exports.usePetFountainGetStatus = usePetFountainGetStatus;
+exports.usePetFountainResetDailyConsumption = usePetFountainResetDailyConsumption;
+exports.usePetFountainSetPump = usePetFountainSetPump;
+exports.usePetFountainSetPumpInterval = usePetFountainSetPumpInterval;
+exports.usePetFountainSetPumpOffMinutes = usePetFountainSetPumpOffMinutes;
+exports.usePetFountainSetPumpOnMinutes = usePetFountainSetPumpOnMinutes;
 exports.usePickerSiteZones = usePickerSiteZones;
 exports.usePipelineAnalyticsAddRetrainFrameFromRecording = usePipelineAnalyticsAddRetrainFrameFromRecording;
 exports.usePipelineAnalyticsAddRetrainFramesToCollection = usePipelineAnalyticsAddRetrainFramesToCollection;