@camstack/types 1.2.433 → 1.2.435

package/dist/index.js

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_sleep = require("./sleep-5zRztaHa.js");
-const require_event_category = require("./event-category-BhzwWQCH.js");
-const require_composition = require("./composition-CpAc0YfQ.js");
+const require_sleep = require("./sleep-DHitF_e4.js");
+const require_event_category = require("./event-category-E17zaHjN.js");
+const require_composition = require("./composition-BZf_gqG7.js");
 const require_node_color = require("./node-color.js");
 const require_err_msg = require("./err-msg-U7lLUMNz.js");
 const require_enums = require("./enums.js");
@@ -8074,10 +8074,10 @@ var ExpressionSourceSchema = zod.z.object({
 *
 * Three vocabularies, each salvaged rather than invented:
 *
-*  - **Triggers** — the only genuinely new surface. Six members, none of which
+*  - **Triggers** — the only genuinely new surface. Seven members, none of which
 *    touches notification delivery. The NC keeps its four *pipeline* triggers;
 *    these are device/time triggers and the two sets do not overlap.
-*  - **Conditions** — `ALL`/`ANY`/`NOT` over two leaf kinds, bounded. The
+*  - **Conditions** — `ALL`/`ANY`/`NOT` over three leaf kinds, bounded. The
 *    expression leaf is the bounded engine at `../expression/`, which is where
 *    arithmetic between two device fields lives and the only place it lives.
 *  - **Actions** — `NcRuleActionSchema`'s two steps, plus the `{kind:'code'}`
@@ -8124,6 +8124,14 @@ var AutomationConditionLeafSchema = zod.z.object({
 		zod.z.array(zod.z.union([zod.z.string(), zod.z.number()]))
 	])
 });
+var AutomationConditionStationaryPresentSchema = zod.z.object({
+	kind: zod.z.literal("stationary-present"),
+	deviceId: zod.z.number().int().nonnegative(),
+	/** Class names; a macro class matches every raw class that maps to it. */
+	classes: zod.z.array(zod.z.string().min(1)).min(1).optional(),
+	/** The parked object must be in at least one of these zones. */
+	zones: zod.z.array(zod.z.string().min(1)).min(1).optional()
+});
 /**
 * The expression leaf, declared as a plain object rather than an intersection
 * with {@link ExpressionSourceSchema}: a discriminated union has to be able to
@@ -8157,7 +8165,8 @@ var AutomationConditionSchema = zod.z.lazy(() => zod.z.discriminatedUnion("kind"
 		child: AutomationConditionSchema
 	}),
 	AutomationConditionLeafSchema,
-	AutomationConditionExpressionSchema
+	AutomationConditionExpressionSchema,
+	AutomationConditionStationaryPresentSchema
 ]));
 /**
 * What starts a run.
@@ -8211,6 +8220,17 @@ var AutomationTriggerSchema = zod.z.discriminatedUnion("kind", [
 		/** Best-so-far confidence the track must reach. */
 		minScore: zod.z.number().min(0).max(1).optional()
 	}),
+	zod.z.object({
+		kind: zod.z.literal("stationary"),
+		deviceIds: zod.z.array(zod.z.number().int().nonnegative()).min(1),
+		/** Class names; a macro class matches like the detection trigger. */
+		classes: zod.z.array(zod.z.string().min(1)).min(1).optional(),
+		/** The parked object must be in at least one of these zones. */
+		zones: zod.z.array(zod.z.string().min(1)).min(1).optional(),
+		/** `appeared`: it became parked. `departed`: the registry retired it.
+		*  The vocabulary of `PipelineAnalyticsStationaryChanged`. */
+		phase: zod.z.enum(["appeared", "departed"])
+	}),
 	zod.z.object({
 		kind: zod.z.literal("interval"),
 		minutes: zod.z.number().int().min(1).max(1440)
@@ -8323,9 +8343,12 @@ var AutomationRecipeSchema = zod.z.object({
 	/** How many run traces the automation keeps (default {@link DEFAULT_TRACE_KEEP}). */
 	keepTraces: zod.z.number().int().min(1).max(100).optional()
 });
+function isLeaf(cond) {
+	return cond.kind === "condition" || cond.kind === "expression" || cond.kind === "stationary-present";
+}
 /** Depth of a tree, root container = 1. A bare leaf is depth 1. */
 function conditionDepth(cond) {
-	if (cond.kind === "condition" || cond.kind === "expression") return 1;
+	if (isLeaf(cond)) return 1;
 	if (cond.kind === "not") return 1 + conditionDepth(cond.child);
 	const children = cond.children;
 	if (children.length === 0) return 1;
@@ -8338,14 +8361,14 @@ function conditionDepth(cond) {
 }
 /** Leaves only — containers do not count toward the leaf budget. */
 function countConditionLeaves(cond) {
-	if (cond.kind === "condition" || cond.kind === "expression") return 1;
+	if (isLeaf(cond)) return 1;
 	if (cond.kind === "not") return countConditionLeaves(cond.child);
 	let total = 0;
 	for (const child of cond.children) total += countConditionLeaves(child);
 	return total;
 }
 function findEmptyContainer(cond) {
-	if (cond.kind === "condition" || cond.kind === "expression") return false;
+	if (isLeaf(cond)) return false;
 	if (cond.kind === "not") return findEmptyContainer(cond.child);
 	if (cond.children.length === 0) return true;
 	return cond.children.some(findEmptyContainer);
@@ -8504,6 +8527,32 @@ function emitTrigger(trigger, index) {
         },
       ),
     )
+  }`;
+		case "stationary": return `  // trigger ${index}: stationary — a parked object appeared / departed. Stateless:
+  // the registry emits one event per transition. A dropped event only misses a fire;
+  // the stationary-present CONDITION reads the registry, not this event.
+  {
+    const trigger = ${j(trigger)} as const
+    disposers.push(
+      ctx.eventBus.subscribe(
+        { category: EventCategory.PipelineAnalyticsStationaryChanged },
+        (event) => {
+          const decision = evaluateStationaryTrigger(trigger, event.data)
+          if (decision.kind === 'ignore') return
+          if (decision.kind === 'reject') {
+            ctx.logger.debug('stationary trigger rejected an event', {
+              tags: { deviceId: decision.vars.deviceId },
+              reason: decision.reason,
+            })
+          }
+          void run(
+            { kind: 'stationary', at: Date.now(), ...decision.vars },
+            decision.reason,
+            decision.kind === 'fire',
+          )
+        },
+      ),
+    )
   }`;
 	}
 }
@@ -8570,6 +8619,7 @@ import {
   collectMirrorSources,
   coreBlockIdFromAddonId,
   evaluateConditionTree,
+  evaluateStationaryTrigger,
   isSkippedTrace,
   mergeSkipTraces,
   resolveDeviceTarget,
@@ -9064,310 +9114,6 @@ ${recipe.triggers.map((t, i) => emitTrigger(t, i)).join("\n\n")}
 `;
 }
 //#endregion
-//#region src/automation/condition-eval.ts
-/**
-* Evaluating an automation's condition tree against the ConditionMirror.
-*
-* D49: a trigger is a one-shot event, so its gate must never hang on a read
-* that can fail. Every field a condition leaf names is therefore kept in
-* memory — filled at start, updated off device state-changed events, reconciled
-* on a timer — and evaluation reads that memory ONLY. A value the mirror does
-* not hold is UNKNOWN, which is `fail` with a reason, never a throw and never a
-* `pass`. A failed refresh changes nothing: the previous value stays.
-*
-* The evaluator returns a node per tree position (containers, leaves, and the
-* ones a short-circuit never reached) with a stable path and a human reason, so
-* the editor can paint each block.
-*/
-function collectInto(cond, out) {
-	switch (cond.kind) {
-		case "all":
-		case "any":
-			for (const child of cond.children) collectInto(child, out);
-			return;
-		case "not":
-			collectInto(cond.child, out);
-			return;
-		case "condition":
-			out.push({
-				kind: "device",
-				deviceId: cond.deviceId,
-				cap: cond.cap
-			});
-			return;
-		case "expression":
-			for (const binding of Object.values(cond.bindings)) if (binding.kind === "global") out.push({
-				kind: "stable",
-				stableId: binding.sourceStableId,
-				cap: binding.cap
-			});
-			return;
-	}
-}
-/** Every (device, cap) a tree reads, deduplicated. */
-function collectMirrorSources(cond) {
-	if (cond === void 0) return [];
-	const all = [];
-	collectInto(cond, all);
-	const seen = /* @__PURE__ */ new Set();
-	return all.filter((s) => {
-		const key = s.kind === "device" ? `d|${s.deviceId}|${s.cap}` : `s|${s.stableId}|${s.cap}`;
-		if (seen.has(key)) return false;
-		seen.add(key);
-		return true;
-	});
-}
-function sliceKey(deviceId, cap) {
-	return `${deviceId}|${cap}`;
-}
-function pick$1(slice, fieldPath) {
-	let cursor = slice;
-	for (const part of fieldPath.split(".")) {
-		if (cursor === null || typeof cursor !== "object") return void 0;
-		cursor = Reflect.get(cursor, part);
-	}
-	return cursor;
-}
-function isSliceObject(value) {
-	return typeof value === "object" && value !== null;
-}
-var ConditionMirror = class {
-	sources;
-	slices = /* @__PURE__ */ new Map();
-	stableIds = /* @__PURE__ */ new Map();
-	watched;
-	constructor(sources) {
-		this.sources = sources;
-		this.watched = new Set(sources.filter((s) => s.kind === "device").map((s) => sliceKey(s.deviceId, s.cap)));
-	}
-	/** A `device.state-changed` event. Slices nobody reads are ignored. */
-	apply(deviceId, cap, slice) {
-		const key = sliceKey(deviceId, cap);
-		if (!isSliceObject(slice)) return;
-		if (!this.watched.has(key) && !this.isStableTarget(deviceId, cap)) return;
-		this.slices.set(key, slice);
-	}
-	isStableTarget(deviceId, cap) {
-		for (const s of this.sources) if (s.kind === "stable" && s.cap === cap && this.stableIds.get(s.stableId) === deviceId) return true;
-		return false;
-	}
-	read(deviceId, cap, fieldPath) {
-		const slice = this.slices.get(sliceKey(deviceId, cap));
-		return slice === void 0 ? void 0 : pick$1(slice, fieldPath);
-	}
-	readStable(stableId, cap, fieldPath) {
-		const deviceId = this.stableIds.get(stableId);
-		return deviceId === void 0 ? void 0 : this.read(deviceId, cap, fieldPath);
-	}
-	/** Fill / reconcile. A read that fails or answers nothing keeps the old value. */
-	async refresh(fetchers) {
-		let updated = 0;
-		let kept = 0;
-		if (this.sources.some((s) => s.kind === "stable")) try {
-			this.stableIds = await fetchers.fetchStableIds();
-		} catch {}
-		const targets = /* @__PURE__ */ new Map();
-		for (const s of this.sources) {
-			const deviceId = s.kind === "device" ? s.deviceId : this.stableIds.get(s.stableId);
-			if (deviceId === void 0) {
-				kept += 1;
-				continue;
-			}
-			targets.set(sliceKey(deviceId, s.cap), {
-				deviceId,
-				cap: s.cap
-			});
-		}
-		for (const [key, target] of targets) try {
-			const slice = await fetchers.fetchSlice(target.deviceId, target.cap);
-			if (isSliceObject(slice)) {
-				this.slices.set(key, slice);
-				updated += 1;
-			} else kept += 1;
-		} catch {
-			kept += 1;
-		}
-		return {
-			updated,
-			kept
-		};
-	}
-};
-var OPERATOR_SYMBOL = {
-	eq: "=",
-	ne: "≠",
-	gt: ">",
-	gte: "≥",
-	lt: "<",
-	lte: "≤",
-	contains: "contains",
-	in: "in"
-};
-function compare(actual, operator, expected) {
-	switch (operator) {
-		case "eq": return actual === expected;
-		case "ne": return actual !== expected;
-		case "gt": return typeof actual === "number" && typeof expected === "number" && actual > expected;
-		case "gte": return typeof actual === "number" && typeof expected === "number" && actual >= expected;
-		case "lt": return typeof actual === "number" && typeof expected === "number" && actual < expected;
-		case "lte": return typeof actual === "number" && typeof expected === "number" && actual <= expected;
-		case "contains": return typeof actual === "string" && typeof expected === "string" && actual.includes(expected);
-		case "in": return Array.isArray(expected) && expected.some((v) => v === actual);
-	}
-}
-function toTraceValue(value) {
-	if (value === void 0 || value === null) return null;
-	if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") return value;
-	if (Array.isArray(value) && value.every((v) => typeof v === "string" || typeof v === "number")) return value;
-	return JSON.stringify(value);
-}
-function show(value) {
-	return Array.isArray(value) ? `[${value.join(", ")}]` : String(value);
-}
-function markSkipped(cond, path, why, out) {
-	out.push({
-		path,
-		kind: cond.kind,
-		outcome: "not-evaluated",
-		reason: why
-	});
-	if (cond.kind === "all" || cond.kind === "any") cond.children.forEach((c, i) => {
-		markSkipped(c, `${path}.${i}`, why, out);
-	});
-	else if (cond.kind === "not") markSkipped(cond.child, `${path}.0`, why, out);
-}
-function evalNode(cond, path, reader, now, out) {
-	switch (cond.kind) {
-		case "condition": {
-			const observed = reader.read(cond.deviceId, cond.cap, cond.fieldPath);
-			const base = {
-				path,
-				kind: cond.kind,
-				deviceId: cond.deviceId,
-				cap: cond.cap,
-				fieldPath: cond.fieldPath,
-				operator: cond.operator,
-				expected: toTraceValue(cond.value),
-				observed: toTraceValue(observed)
-			};
-			if (observed === void 0) {
-				out.push({
-					...base,
-					outcome: "fail",
-					reason: `${cond.fieldPath} value unknown → fail`
-				});
-				return false;
-			}
-			const ok = compare(observed, cond.operator, cond.value);
-			out.push({
-				...base,
-				outcome: ok ? "pass" : "fail",
-				reason: `${cond.fieldPath} ${show(observed)}, expected ${OPERATOR_SYMBOL[cond.operator]} ${show(cond.value)} → ${ok ? "pass" : "fail"}`
-			});
-			return ok;
-		}
-		case "expression": {
-			const values = {};
-			for (const [alias, binding] of Object.entries(cond.bindings)) {
-				if (binding.kind === "literal") {
-					values[alias] = require_composition.toExpressionValue(binding.value) ?? null;
-					continue;
-				}
-				const raw = binding.kind === "global" ? reader.readStable(binding.sourceStableId, binding.cap, binding.fieldPath) : void 0;
-				if (raw === void 0) {
-					out.push({
-						path,
-						kind: cond.kind,
-						outcome: "fail",
-						reason: `${alias} value unknown → fail`
-					});
-					return false;
-				}
-				values[alias] = require_composition.toExpressionValue(raw) ?? null;
-			}
-			const result = require_composition.evaluateExpressionSource(cond.expr, values, now);
-			if (!result.ok) {
-				out.push({
-					path,
-					kind: cond.kind,
-					outcome: "fail",
-					reason: `${cond.expr}: ${result.error} → fail`
-				});
-				return false;
-			}
-			const ok = result.value === true;
-			out.push({
-				path,
-				kind: cond.kind,
-				outcome: ok ? "pass" : "fail",
-				reason: `${cond.expr} with ${JSON.stringify(values)} → ${ok ? "pass" : "fail"}`
-			});
-			return ok;
-		}
-		case "not": {
-			const at = out.length;
-			out.push({
-				path,
-				kind: "not",
-				outcome: "not-evaluated",
-				reason: ""
-			});
-			const inner = evalNode(cond.child, `${path}.0`, reader, now, out);
-			const ok = !inner;
-			out.splice(at, 1, {
-				path,
-				kind: "not",
-				outcome: ok ? "pass" : "fail",
-				reason: `not (${inner ? "pass" : "fail"}) → ${ok ? "pass" : "fail"}`
-			});
-			return ok;
-		}
-		case "all":
-		case "any": {
-			const isAll = cond.kind === "all";
-			const at = out.length;
-			out.push({
-				path,
-				kind: cond.kind,
-				outcome: "not-evaluated",
-				reason: ""
-			});
-			let decided = null;
-			for (let i = 0; i < cond.children.length; i += 1) {
-				const child = cond.children[i];
-				if (child === void 0) continue;
-				if (decided !== null) {
-					markSkipped(child, `${path}.${i}`, `short-circuited by ${path}.${decided}`, out);
-					continue;
-				}
-				const ok = evalNode(child, `${path}.${i}`, reader, now, out);
-				if (isAll ? !ok : ok) decided = i;
-			}
-			const ok = isAll ? decided === null : decided !== null;
-			const reason = isAll ? ok ? `all ${cond.children.length} passed → pass` : `${path}.${decided} failed → fail` : ok ? `${path}.${decided} passed → pass` : `none of ${cond.children.length} passed → fail`;
-			out.splice(at, 1, {
-				path,
-				kind: cond.kind,
-				outcome: ok ? "pass" : "fail",
-				reason
-			});
-			return ok;
-		}
-	}
-}
-/** No condition tree is a pass with no nodes. */
-function evaluateConditionTree(cond, reader, now) {
-	if (cond === void 0) return {
-		pass: true,
-		nodes: []
-	};
-	const nodes = [];
-	return {
-		pass: evalNode(cond, "conditions", reader, now, nodes),
-		nodes
-	};
-}
-//#endregion
 //#region src/catalogs/coco-classmap.ts
 var COCO_80_LABELS = [
 	{
@@ -9770,7 +9516,7 @@ function detectionClassMatches(wanted, actual) {
 	if (w === a) return true;
 	return MACRO_NAMES.has(w) && macroOf(a) === w;
 }
-function isPhase(value) {
+function isPhase$1(value) {
 	return value === "start" || value === "update" || value === "end";
 }
 var DetectionTriggerFilter = class {
@@ -9785,7 +9531,7 @@ var DetectionTriggerFilter = class {
 	}
 	evaluate(event, now) {
 		const { deviceId, trackId, phase } = event;
-		if (typeof deviceId !== "number" || typeof trackId !== "string" || !isPhase(phase)) return {
+		if (typeof deviceId !== "number" || typeof trackId !== "string" || !isPhase$1(phase)) return {
 			kind: "ignore",
 			why: "malformed track-lifecycle event"
 		};
@@ -9856,6 +9602,433 @@ var DetectionTriggerFilter = class {
 	}
 };
 //#endregion
+//#region src/automation/condition-eval.ts
+/**
+* Evaluating an automation's condition tree against the ConditionMirror.
+*
+* D49: a trigger is a one-shot event, so its gate must never hang on a read
+* that can fail. Every field a condition leaf names is therefore kept in
+* memory — filled at start, updated off device state-changed events, reconciled
+* on a timer — and evaluation reads that memory ONLY. A value the mirror does
+* not hold is UNKNOWN, which is `fail` with a reason, never a throw and never a
+* `pass`. A failed refresh changes nothing: the previous value stays.
+*
+* The evaluator returns a node per tree position (containers, leaves, and the
+* ones a short-circuit never reached) with a stable path and a human reason, so
+* the editor can paint each block.
+*/
+/** The cap whose runtime-state slice IS the occupancy snapshot, parked objects included. */
+var ZONE_ANALYTICS_CAP = "zone-analytics";
+function collectInto(cond, out) {
+	switch (cond.kind) {
+		case "all":
+		case "any":
+			for (const child of cond.children) collectInto(child, out);
+			return;
+		case "not":
+			collectInto(cond.child, out);
+			return;
+		case "condition":
+			out.push({
+				kind: "device",
+				deviceId: cond.deviceId,
+				cap: cond.cap
+			});
+			return;
+		case "stationary-present":
+			out.push({
+				kind: "device",
+				deviceId: cond.deviceId,
+				cap: ZONE_ANALYTICS_CAP
+			});
+			return;
+		case "expression":
+			for (const binding of Object.values(cond.bindings)) if (binding.kind === "global") out.push({
+				kind: "stable",
+				stableId: binding.sourceStableId,
+				cap: binding.cap
+			});
+			return;
+	}
+}
+/** Every (device, cap) a tree reads, deduplicated. */
+function collectMirrorSources(cond) {
+	if (cond === void 0) return [];
+	const all = [];
+	collectInto(cond, all);
+	const seen = /* @__PURE__ */ new Set();
+	return all.filter((s) => {
+		const key = s.kind === "device" ? `d|${s.deviceId}|${s.cap}` : `s|${s.stableId}|${s.cap}`;
+		if (seen.has(key)) return false;
+		seen.add(key);
+		return true;
+	});
+}
+function sliceKey(deviceId, cap) {
+	return `${deviceId}|${cap}`;
+}
+function pick$1(slice, fieldPath) {
+	let cursor = slice;
+	for (const part of fieldPath.split(".")) {
+		if (cursor === null || typeof cursor !== "object") return void 0;
+		cursor = Reflect.get(cursor, part);
+	}
+	return cursor;
+}
+function isSliceObject(value) {
+	return typeof value === "object" && value !== null;
+}
+var ConditionMirror = class {
+	sources;
+	slices = /* @__PURE__ */ new Map();
+	stableIds = /* @__PURE__ */ new Map();
+	watched;
+	constructor(sources) {
+		this.sources = sources;
+		this.watched = new Set(sources.filter((s) => s.kind === "device").map((s) => sliceKey(s.deviceId, s.cap)));
+	}
+	/** A `device.state-changed` event. Slices nobody reads are ignored. */
+	apply(deviceId, cap, slice) {
+		const key = sliceKey(deviceId, cap);
+		if (!isSliceObject(slice)) return;
+		if (!this.watched.has(key) && !this.isStableTarget(deviceId, cap)) return;
+		this.slices.set(key, slice);
+	}
+	isStableTarget(deviceId, cap) {
+		for (const s of this.sources) if (s.kind === "stable" && s.cap === cap && this.stableIds.get(s.stableId) === deviceId) return true;
+		return false;
+	}
+	read(deviceId, cap, fieldPath) {
+		const slice = this.slices.get(sliceKey(deviceId, cap));
+		return slice === void 0 ? void 0 : pick$1(slice, fieldPath);
+	}
+	readStable(stableId, cap, fieldPath) {
+		const deviceId = this.stableIds.get(stableId);
+		return deviceId === void 0 ? void 0 : this.read(deviceId, cap, fieldPath);
+	}
+	/** Fill / reconcile. A read that fails or answers nothing keeps the old value. */
+	async refresh(fetchers) {
+		let updated = 0;
+		let kept = 0;
+		if (this.sources.some((s) => s.kind === "stable")) try {
+			this.stableIds = await fetchers.fetchStableIds();
+		} catch {}
+		const targets = /* @__PURE__ */ new Map();
+		for (const s of this.sources) {
+			const deviceId = s.kind === "device" ? s.deviceId : this.stableIds.get(s.stableId);
+			if (deviceId === void 0) {
+				kept += 1;
+				continue;
+			}
+			targets.set(sliceKey(deviceId, s.cap), {
+				deviceId,
+				cap: s.cap
+			});
+		}
+		for (const [key, target] of targets) try {
+			const slice = await fetchers.fetchSlice(target.deviceId, target.cap);
+			if (isSliceObject(slice)) {
+				this.slices.set(key, slice);
+				updated += 1;
+			} else kept += 1;
+		} catch {
+			kept += 1;
+		}
+		return {
+			updated,
+			kept
+		};
+	}
+};
+var OPERATOR_SYMBOL = {
+	eq: "=",
+	ne: "≠",
+	gt: ">",
+	gte: "≥",
+	lt: "<",
+	lte: "≤",
+	contains: "contains",
+	in: "in"
+};
+function compare(actual, operator, expected) {
+	switch (operator) {
+		case "eq": return actual === expected;
+		case "ne": return actual !== expected;
+		case "gt": return typeof actual === "number" && typeof expected === "number" && actual > expected;
+		case "gte": return typeof actual === "number" && typeof expected === "number" && actual >= expected;
+		case "lt": return typeof actual === "number" && typeof expected === "number" && actual < expected;
+		case "lte": return typeof actual === "number" && typeof expected === "number" && actual <= expected;
+		case "contains": return typeof actual === "string" && typeof expected === "string" && actual.includes(expected);
+		case "in": return Array.isArray(expected) && expected.some((v) => v === actual);
+	}
+}
+function toTraceValue(value) {
+	if (value === void 0 || value === null) return null;
+	if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") return value;
+	if (Array.isArray(value) && value.every((v) => typeof v === "string" || typeof v === "number")) return value;
+	return JSON.stringify(value);
+}
+function show(value) {
+	return Array.isArray(value) ? `[${value.join(", ")}]` : String(value);
+}
+function markSkipped(cond, path, why, out) {
+	out.push({
+		path,
+		kind: cond.kind,
+		outcome: "not-evaluated",
+		reason: why
+	});
+	if (cond.kind === "all" || cond.kind === "any") cond.children.forEach((c, i) => {
+		markSkipped(c, `${path}.${i}`, why, out);
+	});
+	else if (cond.kind === "not") markSkipped(cond.child, `${path}.0`, why, out);
+}
+function parkedObjectsOf(value) {
+	if (!Array.isArray(value)) return [];
+	const rows = [];
+	for (const item of value) {
+		const id = Reflect.get(Object(item), "id");
+		const className = Reflect.get(Object(item), "className");
+		if (typeof id === "string" && typeof className === "string") rows.push({
+			id,
+			className
+		});
+	}
+	return rows;
+}
+/** `zoneId`s whose `trackIds` list the parked object (`stationary:<id>`, as the snapshot builds it). */
+function zonesOfParked(zones, parkedId) {
+	if (!Array.isArray(zones)) return [];
+	const out = [];
+	for (const zone of zones) {
+		const zoneId = Reflect.get(Object(zone), "zoneId");
+		const trackIds = Reflect.get(Object(zone), "trackIds");
+		if (typeof zoneId === "string" && Array.isArray(trackIds) && trackIds.includes(`stationary:${parkedId}`)) out.push(zoneId);
+	}
+	return out;
+}
+/**
+* Is a matching parked object there NOW? Read off the mirrored zone-analytics
+* snapshot: `frame` is always present in a snapshot, so its absence means the
+* slice was never read (UNKNOWN, a fail that says so), while a snapshot without
+* `stationaryObjects` is a definite "nothing parked" (the provider omits an
+* empty list).
+*/
+function judgeStationaryPresent(cond, reader) {
+	if (reader.read(cond.deviceId, ZONE_ANALYTICS_CAP, "frame") === void 0) return {
+		pass: false,
+		why: `device ${cond.deviceId} occupancy snapshot unknown`
+	};
+	const parked = parkedObjectsOf(reader.read(cond.deviceId, ZONE_ANALYTICS_CAP, "stationaryObjects"));
+	if (parked.length === 0) return {
+		pass: false,
+		why: `no parked objects on device ${cond.deviceId}`
+	};
+	const zones = reader.read(cond.deviceId, ZONE_ANALYTICS_CAP, "zones");
+	for (const obj of parked) {
+		if (cond.classes !== void 0 && !cond.classes.some((c) => detectionClassMatches(c, obj.className))) continue;
+		if (cond.zones !== void 0) {
+			const inZones = zonesOfParked(zones, obj.id);
+			if (!cond.zones.some((z) => inZones.includes(z))) continue;
+		}
+		return {
+			pass: true,
+			why: `parked ${obj.className} (${obj.id}) on device ${cond.deviceId}`
+		};
+	}
+	return {
+		pass: false,
+		why: `${parked.length} parked on device ${cond.deviceId}, none matching the class/zone filter`
+	};
+}
+function evalNode(cond, path, reader, now, out) {
+	switch (cond.kind) {
+		case "condition": {
+			const observed = reader.read(cond.deviceId, cond.cap, cond.fieldPath);
+			const base = {
+				path,
+				kind: cond.kind,
+				deviceId: cond.deviceId,
+				cap: cond.cap,
+				fieldPath: cond.fieldPath,
+				operator: cond.operator,
+				expected: toTraceValue(cond.value),
+				observed: toTraceValue(observed)
+			};
+			if (observed === void 0) {
+				out.push({
+					...base,
+					outcome: "fail",
+					reason: `${cond.fieldPath} value unknown → fail`
+				});
+				return false;
+			}
+			const ok = compare(observed, cond.operator, cond.value);
+			out.push({
+				...base,
+				outcome: ok ? "pass" : "fail",
+				reason: `${cond.fieldPath} ${show(observed)}, expected ${OPERATOR_SYMBOL[cond.operator]} ${show(cond.value)} → ${ok ? "pass" : "fail"}`
+			});
+			return ok;
+		}
+		case "stationary-present": {
+			const verdict = judgeStationaryPresent(cond, reader);
+			out.push({
+				path,
+				kind: cond.kind,
+				outcome: verdict.pass ? "pass" : "fail",
+				reason: `${verdict.why} → ${verdict.pass ? "pass" : "fail"}`,
+				deviceId: cond.deviceId,
+				cap: ZONE_ANALYTICS_CAP
+			});
+			return verdict.pass;
+		}
+		case "expression": {
+			const values = {};
+			for (const [alias, binding] of Object.entries(cond.bindings)) {
+				if (binding.kind === "literal") {
+					values[alias] = require_composition.toExpressionValue(binding.value) ?? null;
+					continue;
+				}
+				const raw = binding.kind === "global" ? reader.readStable(binding.sourceStableId, binding.cap, binding.fieldPath) : void 0;
+				if (raw === void 0) {
+					out.push({
+						path,
+						kind: cond.kind,
+						outcome: "fail",
+						reason: `${alias} value unknown → fail`
+					});
+					return false;
+				}
+				values[alias] = require_composition.toExpressionValue(raw) ?? null;
+			}
+			const result = require_composition.evaluateExpressionSource(cond.expr, values, now);
+			if (!result.ok) {
+				out.push({
+					path,
+					kind: cond.kind,
+					outcome: "fail",
+					reason: `${cond.expr}: ${result.error} → fail`
+				});
+				return false;
+			}
+			const ok = result.value === true;
+			out.push({
+				path,
+				kind: cond.kind,
+				outcome: ok ? "pass" : "fail",
+				reason: `${cond.expr} with ${JSON.stringify(values)} → ${ok ? "pass" : "fail"}`
+			});
+			return ok;
+		}
+		case "not": {
+			const at = out.length;
+			out.push({
+				path,
+				kind: "not",
+				outcome: "not-evaluated",
+				reason: ""
+			});
+			const inner = evalNode(cond.child, `${path}.0`, reader, now, out);
+			const ok = !inner;
+			out.splice(at, 1, {
+				path,
+				kind: "not",
+				outcome: ok ? "pass" : "fail",
+				reason: `not (${inner ? "pass" : "fail"}) → ${ok ? "pass" : "fail"}`
+			});
+			return ok;
+		}
+		case "all":
+		case "any": {
+			const isAll = cond.kind === "all";
+			const at = out.length;
+			out.push({
+				path,
+				kind: cond.kind,
+				outcome: "not-evaluated",
+				reason: ""
+			});
+			let decided = null;
+			for (let i = 0; i < cond.children.length; i += 1) {
+				const child = cond.children[i];
+				if (child === void 0) continue;
+				if (decided !== null) {
+					markSkipped(child, `${path}.${i}`, `short-circuited by ${path}.${decided}`, out);
+					continue;
+				}
+				const ok = evalNode(child, `${path}.${i}`, reader, now, out);
+				if (isAll ? !ok : ok) decided = i;
+			}
+			const ok = isAll ? decided === null : decided !== null;
+			const reason = isAll ? ok ? `all ${cond.children.length} passed → pass` : `${path}.${decided} failed → fail` : ok ? `${path}.${decided} passed → pass` : `none of ${cond.children.length} passed → fail`;
+			out.splice(at, 1, {
+				path,
+				kind: cond.kind,
+				outcome: ok ? "pass" : "fail",
+				reason
+			});
+			return ok;
+		}
+	}
+}
+/** No condition tree is a pass with no nodes. */
+function evaluateConditionTree(cond, reader, now) {
+	if (cond === void 0) return {
+		pass: true,
+		nodes: []
+	};
+	const nodes = [];
+	return {
+		pass: evalNode(cond, "conditions", reader, now, nodes),
+		nodes
+	};
+}
+//#endregion
+//#region src/automation/stationary-trigger.ts
+function isPhase(value) {
+	return value === "appeared" || value === "departed";
+}
+function evaluateStationaryTrigger(trigger, event) {
+	const { deviceId, entryId, phase } = event;
+	if (typeof deviceId !== "number" || typeof entryId !== "string" || !isPhase(phase)) return {
+		kind: "ignore",
+		why: "malformed stationary-changed event"
+	};
+	if (!trigger.deviceIds.includes(deviceId)) return {
+		kind: "ignore",
+		why: `device ${deviceId} is not one of the trigger's devices`
+	};
+	if (phase !== trigger.phase) return {
+		kind: "ignore",
+		why: `phase ${phase}, the trigger wants ${trigger.phase}`
+	};
+	const className = typeof event.className === "string" ? event.className : "";
+	const zones = Array.isArray(event.zones) ? event.zones.filter((z) => typeof z === "string") : [];
+	const vars = {
+		deviceId,
+		className,
+		zones,
+		phase,
+		entryId
+	};
+	if (trigger.classes !== void 0 && !trigger.classes.some((c) => detectionClassMatches(c, className))) return {
+		kind: "reject",
+		reason: `class ${className || "unknown"} not in [${trigger.classes.join(", ")}]`,
+		vars
+	};
+	if (trigger.zones !== void 0 && !trigger.zones.some((z) => zones.includes(z))) return {
+		kind: "reject",
+		reason: `zone mismatch: in [${zones.join(", ")}], wanted [${trigger.zones.join(", ")}]`,
+		vars
+	};
+	return {
+		kind: "fire",
+		reason: `${className} ${phase} on device ${deviceId}`,
+		vars
+	};
+}
+//#endregion
 //#region src/automation/run-gate.ts
 var MINUTE_MS$1 = 6e4;
 function minutes(ms) {
@@ -10032,7 +10205,8 @@ var AutomationConditionTraceNodeSchema = zod.z.object({
 		"any",
 		"not",
 		"condition",
-		"expression"
+		"expression",
+		"stationary-present"
 	]),
 	outcome: TraceNodeOutcomeSchema,
 	reason: zod.z.string(),
@@ -10159,7 +10333,7 @@ function appendTrace(ring, trace, keep) {
 }
 /**
 * The trigger stage of a trace from the bag a trigger handed to `run()`:
-* primitives only (a device-state `to` that is an object is left out), minus the
+* primitives and short lists of them (a device-state `to` that is an object is left out), minus the
 * bookkeeping keys `kind` and `at`.
 */
 function buildTriggerTrace(trigger, outcome, reason) {
@@ -10167,6 +10341,7 @@ function buildTriggerTrace(trigger, outcome, reason) {
 	for (const [key, value] of Object.entries(trigger)) {
 		if (key === "kind" || key === "at") continue;
 		if (typeof value === "string" || typeof value === "number" || typeof value === "boolean" || value === null) vars[key] = value;
+		else if (Array.isArray(value) && value.every((v) => typeof v === "string" || typeof v === "number")) vars[key] = value;
 	}
 	return {
 		kind: typeof trigger["kind"] === "string" ? trigger["kind"] : "unknown",
@@ -14730,7 +14905,7 @@ var CompositionProblemCodeSchema = zod.z.enum([
 	"member-constraint",
 	"retention"
 ]);
-/** One refusal, named (D391). `path` points into the composition, e.g. `features[0].fields.celsius`. */
+/** One refusal, named (D391). `path` points into the composition, e.g. `features[0].fields.temperature`. */
 var CompositionProblemSchema = zod.z.object({
 	code: CompositionProblemCodeSchema,
 	path: zod.z.string(),
@@ -15436,7 +15611,7 @@ var GROUP_TEMPLATES = [
 		summary: "Mean, median, min, max or sum of temperatures. Offline and unknown members are left out, never read as 0 °C.",
 		role: require_err_msg.DeviceRole.TemperatureSensor,
 		outputCap: "temperature-sensor",
-		outputField: "celsius",
+		outputField: "temperature",
 		quantity: "temperature",
 		defaultAggregate: "mean",
 		empty: "null",
@@ -15447,7 +15622,7 @@ var GROUP_TEMPLATES = [
 		summary: "Humidity in percent. Offline and unknown members are left out, never read as 0 %.",
 		role: require_err_msg.DeviceRole.HumiditySensor,
 		outputCap: "humidity-sensor",
-		outputField: "percent",
+		outputField: "humidity",
 		quantity: "humidity",
 		defaultAggregate: "mean",
 		empty: "null",
@@ -15458,7 +15633,7 @@ var GROUP_TEMPLATES = [
 		summary: "Pressure in hectopascals. Offline and unknown members are left out, never read as 0 hPa.",
 		role: require_err_msg.DeviceRole.PressureSensor,
 		outputCap: "pressure-sensor",
-		outputField: "hpa",
+		outputField: "pressure",
 		quantity: "pressure",
 		defaultAggregate: "mean",
 		empty: "null",
@@ -15469,7 +15644,7 @@ var GROUP_TEMPLATES = [
 		summary: "Illuminance in lux. Offline and unknown members are left out, never read as 0 lx.",
 		role: require_err_msg.DeviceRole.AmbientLightSensor,
 		outputCap: "ambient-light-sensor",
-		outputField: "lux",
+		outputField: "illuminance",
 		quantity: "illuminance",
 		defaultAggregate: "mean",
 		empty: "null",
@@ -15480,7 +15655,7 @@ var GROUP_TEMPLATES = [
 		summary: "Power in watts, summed by default. Nobody reporting omits the key rather than writing 0 W.",
 		role: require_err_msg.DeviceRole.PowerSensor,
 		outputCap: "power-meter",
-		outputField: "watts",
+		outputField: "power",
 		quantity: "power",
 		defaultAggregate: "sum",
 		empty: "omit",
@@ -15491,7 +15666,7 @@ var GROUP_TEMPLATES = [
 		summary: "Energy in kilowatt-hours, summed by default. Nobody reporting omits the key rather than writing 0 kWh.",
 		role: require_err_msg.DeviceRole.EnergySensor,
 		outputCap: "power-meter",
-		outputField: "kwhTotal",
+		outputField: "energy",
 		quantity: "energy",
 		defaultAggregate: "sum",
 		empty: "omit",
@@ -15502,7 +15677,7 @@ var GROUP_TEMPLATES = [
 		summary: "Battery charge in percent. Offline and unknown members are left out, never read as 0 %.",
 		role: require_err_msg.DeviceRole.BatterySensor,
 		outputCap: "battery",
-		outputField: "percentage",
+		outputField: "level",
 		quantity: "percentage",
 		defaultAggregate: "mean",
 		empty: "null",
@@ -15956,17 +16131,17 @@ async function runFanOut(calls, invoke) {
 //#region src/generated/history-catalog.ts
 /**
 * Cap history catalog, projected from every `*.cap.ts` `history` block.
-* 42 caps with series (77 series), 33 caps answered `'none'`.
+* 41 caps with series (76 series), 34 caps answered `'none'`.
 * Field keys are `runtimeState` paths (`a.b` into fixed objects only).
 */
 var HISTORY_CATALOG = {
 	"air-quality-sensor": {
-		"co2Ppm": {
+		"co2": {
 			kind: "gauge",
 			unit: "ppm",
 			deadband: 5
 		},
-		"vocPpb": {
+		"voc": {
 			kind: "gauge",
 			unit: "ppb",
 			deadband: 5
@@ -16002,24 +16177,24 @@ var HISTORY_CATALOG = {
 			"triggered"
 		]
 	} },
-	"ambient-light-sensor": { "lux": {
+	"ambient-light-sensor": { "illuminance": {
 		kind: "gauge",
 		unit: "lx",
 		deadbandPct: 10,
 		minIntervalMs: 6e4
 	} },
 	"battery": {
-		"percentage": {
+		"level": {
 			kind: "gauge",
 			unit: "%"
 		},
-		"volts": {
+		"voltage": {
 			kind: "gauge",
 			unit: "V"
 		}
 	},
 	"binary": { "on": { kind: "boolean" } },
-	"brightness": { "percentage": {
+	"brightness": { "level": {
 		kind: "gauge",
 		unit: "%",
 		minIntervalMs: 0
@@ -16061,7 +16236,7 @@ var HISTORY_CATALOG = {
 	} },
 	"device-status": { "online": { kind: "boolean" } },
 	"dishwasher": {
-		"progressPercent": {
+		"progress": {
 			kind: "gauge",
 			unit: "%",
 			deadband: 2
@@ -16091,7 +16266,7 @@ var HISTORY_CATALOG = {
 				"Aborting"
 			]
 		},
-		"remainingSeconds": {
+		"remaining": {
 			kind: "gauge",
 			unit: "s",
 			minIntervalMs: 6e4
@@ -16104,7 +16279,7 @@ var HISTORY_CATALOG = {
 		skipWhenSet: "timestamp"
 	} },
 	"fan-control": {
-		"percentage": {
+		"speed": {
 			kind: "gauge",
 			unit: "%",
 			minIntervalMs: 0
@@ -16126,7 +16301,7 @@ var HISTORY_CATALOG = {
 		},
 		"on": { kind: "boolean" }
 	},
-	"humidity-sensor": { "percent": {
+	"humidity-sensor": { "humidity": {
 		kind: "gauge",
 		unit: "%",
 		deadband: .5
@@ -16164,13 +16339,13 @@ var HISTORY_CATALOG = {
 		excludeDeviceTypes: [require_err_msg.DeviceType.Camera]
 	} },
 	"network-link": {
-		"signalPercent": {
+		"signal": {
 			kind: "gauge",
 			unit: "%",
 			deadband: 3,
 			minIntervalMs: 6e4
 		},
-		"rssiDbm": {
+		"rssi": {
 			kind: "gauge",
 			unit: "dBm",
 			deadband: 2,
@@ -16197,31 +16372,31 @@ var HISTORY_CATALOG = {
 		}
 	},
 	"power-meter": {
-		"watts": {
+		"power": {
 			kind: "gauge",
 			unit: "W",
 			deadband: 1,
 			minIntervalMs: 3e4
 		},
-		"kwhTotal": {
+		"energy": {
 			kind: "counter",
 			unit: "kWh",
 			deadband: .01,
 			minIntervalMs: 6e4
 		},
-		"volts": {
+		"voltage": {
 			kind: "gauge",
 			unit: "V",
 			deadband: 1,
 			minIntervalMs: 3e4
 		},
-		"amps": {
+		"current": {
 			kind: "gauge",
 			unit: "A",
 			deadband: .05,
 			minIntervalMs: 3e4
 		},
-		"va": {
+		"apparentPower": {
 			kind: "gauge",
 			unit: "VA",
 			deadband: 1,
@@ -16234,12 +16409,7 @@ var HISTORY_CATALOG = {
 			minIntervalMs: 6e4
 		}
 	},
-	"presence": { "batteryPercent": {
-		kind: "gauge",
-		unit: "%",
-		deadband: 1
-	} },
-	"pressure-sensor": { "hpa": {
+	"pressure-sensor": { "pressure": {
 		kind: "gauge",
 		unit: "hPa",
 		deadband: .1
@@ -16266,7 +16436,7 @@ var HISTORY_CATALOG = {
 	},
 	"switch": { "on": { kind: "boolean" } },
 	"tamper": { "tampered": { kind: "boolean" } },
-	"temperature-sensor": { "celsius": {
+	"temperature-sensor": { "temperature": {
 		kind: "gauge",
 		unit: "°C",
 		deadband: .1
@@ -16374,6 +16544,7 @@ var HISTORY_NONE_CAPS = [
 	"native-object-detection",
 	"navigation",
 	"notifier",
+	"presence",
 	"privacy-mask",
 	"ptz-autotrack",
 	"recording-onboard",
@@ -16511,10 +16682,10 @@ function derivativeDraft(spec, retention = require_composition.DEFAULT_HISTORY_R
 function integralDraft(spec, retention = require_composition.DEFAULT_HISTORY_RETENTION) {
 	const problems = [...historyProblems(spec.source)];
 	const kind = declaredSeriesKind(spec.source);
-	const watts = spec.source.cap === "power-meter" && spec.source.fieldPath === "watts";
+	const isPower = spec.source.cap === "power-meter" && spec.source.fieldPath === "power";
 	if (kind === "counter" || kind === "boolean" || kind === "enum") problems.push(problem("kind-mismatch", "helper.source", "an integral reads an instantaneous gauge, not a counter or a state"));
-	if (spec.output === "energy" && !watts) problems.push(problem("kind-mismatch", "helper.output", "energy is the integral of power-meter.watts; another reading uses the meter"));
-	if (spec.output === "meter" && watts) problems.push(problem("kind-mismatch", "helper.output", "power integrates to power-meter.kwhTotal, which energy dashboards already read"));
+	if (spec.output === "energy" && !isPower) problems.push(problem("kind-mismatch", "helper.output", "energy is the integral of power-meter.power; another reading uses the meter"));
+	if (spec.output === "meter" && isPower) problems.push(problem("kind-mismatch", "helper.output", "power integrates to power-meter.energy, which energy dashboards already read"));
 	const tier = require_composition.planResetTier(spec.reset, retention);
 	if (!tier.ok) problems.push(problem("retention", "helper.reset", tier.reason));
 	const energy = spec.output === "energy";
@@ -16523,7 +16694,7 @@ function integralDraft(spec, retention = require_composition.DEFAULT_HISTORY_RET
 		draft: draft({
 			role: energy ? require_err_msg.DeviceRole.EnergySensor : require_err_msg.DeviceRole.NumericSensor,
 			cap: energy ? "power-meter" : "meter",
-			field: energy ? "kwhTotal" : "value",
+			field: energy ? "energy" : "value",
 			empty: "offline",
 			spec,
 			member: spec.source
@@ -16782,9 +16953,9 @@ function expressionSource(expr, bindings = {}) {
 }
 function compileAppliance(spec) {
 	const member = spec.member;
-	if (member.cap !== "power-meter" || member.fieldPath !== "watts") return {
+	if (member.cap !== "power-meter" || member.fieldPath !== "power") return {
 		ok: false,
-		problems: [problem("member-constraint", "helper.member", "an appliance helper reads power-meter.watts")]
+		problems: [problem("member-constraint", "helper.member", "an appliance helper reads power-meter.power")]
 	};
 	const threshold = unsignedToken(spec.thresholdWatts);
 	const start = unsignedToken(spec.startDwellMs);
@@ -16825,7 +16996,7 @@ function compileAppliance(spec) {
 			kind: "fields",
 			cap: "power-meter",
 			fields: {
-				watts: read,
+				power: read,
 				lastFetchedAt: clock
 			}
 		}]
@@ -19051,8 +19222,8 @@ var DeviceHistoryProducerKindSchema = zod.z.enum([
 /**
 * A key computed at READ time from stored series of the same device, never
 * stored itself. Energy (kWh per bucket) comes from the power meter's
-* `kwhTotal` counter when the device has one, else from integrating its
-* `watts` gauge over time.
+* `energy` counter when the device has one, else from integrating its
+* `power` gauge over time.
 */
 var DEVICE_HISTORY_ENERGY_KEY = "derived:energy.kwh";
 var DeviceHistoryResolutionSchema = zod.z.enum([
@@ -64091,9 +64262,9 @@ var addonsCapability = {
 */
 var AirQualitySensorStatusSchema = zod.z.object({
 	/** Carbon dioxide concentration in ppm. */
-	co2Ppm: zod.z.number().min(0).optional().meta(require_sleep.readingMeta("concentration-volume")),
+	co2: zod.z.number().min(0).optional().meta(require_sleep.readingMeta("concentration-volume")),
 	/** Total volatile organic compounds in ppb. */
-	vocPpb: zod.z.number().min(0).optional().meta(require_sleep.readingMeta("concentration-ppb")),
+	voc: zod.z.number().min(0).optional().meta(require_sleep.readingMeta("concentration-ppb")),
 	/** Particulate matter ≤ 2.5 μm in µg/m³. */
 	pm25: zod.z.number().min(0).optional().meta(require_sleep.readingMeta("concentration-mass")),
 	/** Particulate matter ≤ 10 μm in µg/m³. */
@@ -64126,12 +64297,12 @@ var airQualitySensorCapability = {
 	* History (D850): recorded series.
 	*/
 	history: { fields: {
-		co2Ppm: {
+		co2: {
 			kind: "gauge",
 			unit: "ppm",
 			deadband: 5
 		},
-		vocPpb: {
+		voc: {
 			kind: "gauge",
 			unit: "ppb",
 			deadband: 5
@@ -64164,7 +64335,7 @@ var airQualitySensorCapability = {
 */
 var AmbientLightSensorStatusSchema = zod.z.object({
 	/** Current illuminance in lux (lx). `null` when the sample was refused (D393). */
-	lux: zod.z.number().min(0).nullable().meta(require_sleep.readingMeta("illuminance", {
+	illuminance: zod.z.number().min(0).nullable().meta(require_sleep.readingMeta("illuminance", {
 		precision: 0,
 		label: "Illuminance"
 	})),
@@ -64193,7 +64364,7 @@ var ambientLightSensorCapability = {
 	/**
 	* History (D850): recorded series. Wide range, so a RELATIVE deadband (10 %).
 	*/
-	history: { fields: { lux: {
+	history: { fields: { illuminance: {
 		kind: "gauge",
 		unit: "lx",
 		deadbandPct: 10,
@@ -64589,7 +64760,7 @@ var BatteryStatusSchema = zod.z.object({
 	* Consumers must SKIP a null rather than coerce it — `battery-band` already
 	* declines to band a non-finite reading, which is the correct shape.
 	*/
-	percentage: zod.z.number().min(0).max(100).nullable().meta(require_sleep.readingMeta("percentage", { label: "Charge" })),
+	level: zod.z.number().min(0).max(100).nullable().meta(require_sleep.readingMeta("percentage", { label: "Charge" })),
 	/**
 	* Charging source. `'dc'` covers wall/USB adapters; `'solar'` is
 	* Reolink-specific for the Solar Panel 2 accessory (will become
@@ -64599,7 +64770,7 @@ var BatteryStatusSchema = zod.z.object({
 	* `'unknown'` is the absence of an answer: the provider has not read the
 	* power fields yet, or the firmware reported neither. Before it existed,
 	* two unreadable fields produced `'none'`, and a camera nobody had reached
-	* was drawn "on battery alone" — the same D315 defect `percentage` closed
+	* was drawn "on battery alone" — the same D315 defect `level` closed
 	* by going nullable. Consumers SKIP it (no charger state published, no
 	* glyph, no HomeKit ChargingState) rather than coerce it either way.
 	*/
@@ -64623,7 +64794,7 @@ var BatteryStatusSchema = zod.z.object({
 	* that only report charge. A second reading on this cap, not a second
 	* `numeric-sensor` on the same device.
 	*/
-	volts: zod.z.number().nullable().optional().meta(require_sleep.readingMeta("voltage", { label: "Voltage" })),
+	voltage: zod.z.number().nullable().optional().meta(require_sleep.readingMeta("voltage", { label: "Voltage" })),
 	/**
 	* Ms epoch of the last time the device PROVED it was reachable — a
 	* completed firmware round-trip, an observed wake, or an inbound push
@@ -64657,7 +64828,7 @@ var BatteryStatusSchema = zod.z.object({
 	/**
 	* True when the source is a BINARY low-battery indicator (HA
 	* `binary_sensor` device_class=battery / `LOW_BAT`) that has no real
-	* charge level — `percentage` is then a coarse stand-in (100 = normal,
+	* charge level — `level` is then a coarse stand-in (100 = normal,
 	* sub-threshold = low). UI MUST render "Normal"/"Low" instead of a
 	* misleading exact percentage. Absent/false → genuine 0–100 % reading.
 	*/
@@ -64677,15 +64848,15 @@ var BATTERY_DEVICE_TYPES = [
 var batteryCustomize = {
 	version: 1,
 	targets: [{
-		id: "percentage",
+		id: "level",
 		cardinality: "scalar",
 		vocabulary: {
 			cap: "battery",
-			stateField: "percentage"
+			stateField: "level"
 		},
 		deviceTypes: BATTERY_DEVICE_TYPES,
 		apply: "add",
-		path: "percentage",
+		path: "level",
 		sources: [{
 			kind: "field",
 			valueKinds: ["number", "string"],
@@ -64779,7 +64950,7 @@ onStatusChanged: { data: zod.z.object({
 		schema: BatteryStatusSchema,
 		kind: "push",
 		empty: {
-			percentage: null,
+			level: null,
 			charging: "unknown",
 			sleeping: false,
 			lastUpdated: 0
@@ -64806,11 +64977,11 @@ onStatusChanged: { data: zod.z.object({
 	* History (D850): recorded series. The generic capture replaces the `battery` series of `pipeline-analytics:stats-5m`.
 	*/
 	history: { fields: {
-		percentage: {
+		level: {
 			kind: "gauge",
 			unit: "%"
 		},
-		volts: {
+		voltage: {
 			kind: "gauge",
 			unit: "V"
 		}
@@ -64874,14 +65045,14 @@ var binaryCapability = {
 * controls to this single-method surface.
 *
 * The cap is intentionally minimal: a single `setBrightness({deviceId,
-* percentage})` mutation plus the auto-injected `getStatus`. Drivers
+* level})` mutation plus the auto-injected `getStatus`. Drivers
 * that expose richer controls (color temperature, scenes, schedules)
 * should surface those via the device's `getSettingsUISchema()`
 * instead of bloating this cap.
 */
 var BrightnessStatusSchema = zod.z.object({
 	/** Current level as 0..100 inclusive. Firmware-reported. */
-	percentage: zod.z.number().min(0).max(100).meta(require_sleep.readingMeta("percentage")),
+	level: zod.z.number().min(0).max(100).meta(require_sleep.readingMeta("percentage")),
 	/** Ms epoch of the last operator-driven change. Useful for UI freshness. */
 	lastChangedAt: zod.z.number()
 });
@@ -64893,7 +65064,7 @@ var brightnessCapability = {
 	deviceTypes: [require_err_msg.DeviceType.Light],
 	methods: { setBrightness: require_sleep.method(zod.z.object({
 		deviceId: zod.z.number().int().nonnegative(),
-		percentage: zod.z.number().min(0).max(100)
+		level: zod.z.number().min(0).max(100)
 	}), zod.z.void(), {
 		kind: "mutation",
 		auth: "protected"
@@ -64906,7 +65077,7 @@ var brightnessCapability = {
 	*/
 onBrightnessChanged: { data: zod.z.object({
 		deviceId: zod.z.number(),
-		percentage: zod.z.number().min(0).max(100),
+		level: zod.z.number().min(0).max(100),
 		lastChangedAt: zod.z.number()
 	}) } },
 	status: {
@@ -64929,7 +65100,7 @@ onBrightnessChanged: { data: zod.z.object({
 	/**
 	* History (D850): recorded series. Actuator tier: level keeps every change.
 	*/
-	history: { fields: { percentage: {
+	history: { fields: { level: {
 		kind: "gauge",
 		unit: "%",
 		minIntervalMs: 0
@@ -65673,11 +65844,11 @@ var ColorInputSchema = zod.z.discriminatedUnion("mode", [
 	}),
 	zod.z.object({
 		mode: zod.z.literal("mired"),
-		mireds: zod.z.number().int().min(50).max(1e3)
+		colorTemperature: zod.z.number().int().min(50).max(1e3)
 	})
 ]);
 var ColorStatusSchema = zod.z.object({
-	/** Active color mode — which of `rgb` / `hsv` / `mireds` reflects
+	/** Active color mode — which of `rgb` / `hsv` / `colorTemperature` reflects
 	*  the bulb's current state. */
 	mode: zod.z.enum([
 		"rgb",
@@ -65689,7 +65860,7 @@ var ColorStatusSchema = zod.z.object({
 	/** Populated when `mode === 'hsv'`. */
 	hsv: HsvTripletSchema.optional(),
 	/** Populated when `mode === 'mired'`. */
-	mireds: zod.z.number().int().optional().meta(require_sleep.readingMeta("colour-temperature")),
+	colorTemperature: zod.z.number().int().optional().meta(require_sleep.readingMeta("colour-temperature")),
 	/** Ms epoch of the last operator-driven change. */
 	lastChangedAt: zod.z.number()
 });
@@ -65725,7 +65896,7 @@ onColorChanged: { data: zod.z.object({
 		]),
 		rgb: RgbTripletSchema.optional(),
 		hsv: HsvTripletSchema.optional(),
-		mireds: zod.z.number().int().optional(),
+		colorTemperature: zod.z.number().int().optional(),
 		lastChangedAt: zod.z.number()
 	}) } },
 	status: {
@@ -66758,11 +66929,11 @@ var DishwasherStatusSchema = zod.z.object({
 	/** Feature keys of the programs the appliance currently offers — drives the UI selector. */
 	availablePrograms: zod.z.array(zod.z.string()),
 	/** Seconds remaining on the active cycle, or null when not running / not known. */
-	remainingSeconds: zod.z.number().int().nonnegative().nullable().meta(require_sleep.readingMeta("duration")),
+	remaining: zod.z.number().int().nonnegative().nullable().meta(require_sleep.readingMeta("duration")),
 	/** Seconds the delayed start is set to (time until the cycle starts), or null. */
-	delayedStartSeconds: zod.z.number().int().nonnegative().nullable().meta(require_sleep.readingMeta("duration")),
+	delayedStart: zod.z.number().int().nonnegative().nullable().meta(require_sleep.readingMeta("duration")),
 	/** Cycle completion 0..100, or null when not applicable. */
-	progressPercent: zod.z.number().min(0).max(100).nullable().meta(require_sleep.readingMeta("percentage")),
+	progress: zod.z.number().min(0).max(100).nullable().meta(require_sleep.readingMeta("percentage")),
 	/** True when the door is reported open; null when the door state is not known. */
 	doorOpen: zod.z.boolean().nullable(),
 	/** True when the door is latched (locked) during a cycle; null when not reported. */
@@ -66981,14 +67152,14 @@ var dishwasherCapability = {
 	runtimeState: DishwasherStatusSchema,
 	durability: "session",
 	history: { fields: {
-		progressPercent: {
+		progress: {
 			kind: "gauge",
 			unit: "%",
 			deadband: 2
 		},
 		state: { kind: "enum" },
 		operationState: { kind: "enum" },
-		remainingSeconds: {
+		remaining: {
 			kind: "gauge",
 			unit: "s",
 			minIntervalMs: 6e4
@@ -67641,7 +67812,7 @@ var FanDirectionSchema = zod.z.enum(["forward", "reverse"]);
 var FanControlStatusSchema = zod.z.object({
 	/** Active speed as 0..100 inclusive. Null when the device has no
 	*  speed surface (single-speed fan). */
-	percentage: zod.z.number().min(0).max(100).nullable().meta(require_sleep.readingMeta("percentage")),
+	speed: zod.z.number().min(0).max(100).nullable().meta(require_sleep.readingMeta("percentage")),
 	/** Speed granularity the device accepts (HA `percentage_step`, e.g. 25 for
 	*  a 4-speed fan). Absent when unknown — the UI then falls back to step 1. */
 	percentageStep: zod.z.number().positive().optional().meta(require_sleep.readingMeta("percentage")),
@@ -67668,7 +67839,7 @@ var fanControlCapability = {
 	methods: {
 		setPercentage: require_sleep.method(zod.z.object({
 			deviceId: zod.z.number().int().nonnegative(),
-			percentage: zod.z.number().min(0).max(100)
+			speed: zod.z.number().min(0).max(100)
 		}), zod.z.void(), {
 			kind: "mutation",
 			auth: "protected"
@@ -67701,7 +67872,7 @@ var fanControlCapability = {
 	},
 	/**
 	* Runtime-state slice — mirrored by the kernel. UI fan speed
-	* sliders read `percentage` for live updates.
+	* sliders read `speed` for live updates.
 	*/
 	runtimeState: FanControlStatusSchema,
 	/**
@@ -67715,7 +67886,7 @@ var fanControlCapability = {
 	* History (D850): recorded series. Actuator tier: speed keeps every change.
 	*/
 	history: { fields: {
-		percentage: {
+		speed: {
 			kind: "gauge",
 			unit: "%",
 			minIntervalMs: 0
@@ -68185,7 +68356,7 @@ var humidifierCapability = {
 */
 var HumiditySensorStatusSchema = zod.z.object({
 	/** Current relative humidity, 0..100. `null` when the sample was refused (D393). */
-	percent: zod.z.number().min(0).max(100).nullable().meta(require_sleep.readingMeta("humidity", {
+	humidity: zod.z.number().min(0).max(100).nullable().meta(require_sleep.readingMeta("humidity", {
 		precision: 0,
 		label: "Humidity"
 	})),
@@ -68214,7 +68385,7 @@ var humiditySensorCapability = {
 	/**
 	* History (D850): recorded series.
 	*/
-	history: { fields: { percent: {
+	history: { fields: { humidity: {
 		kind: "gauge",
 		unit: "%",
 		deadband: .5
@@ -68882,7 +69053,7 @@ var LawnMowerControlStatusSchema = zod.z.object({
 	batteryLevel: zod.z.number().min(0).max(100).nullable().meta(require_sleep.readingMeta("percentage")),
 	/** 0..100 mowing-completion percentage of the current task, or null when no
 	*  task is active / progress is unavailable. */
-	progressPercent: zod.z.number().min(0).max(100).nullable().meta(require_sleep.readingMeta("percentage")),
+	progress: zod.z.number().min(0).max(100).nullable().meta(require_sleep.readingMeta("percentage")),
 	/** Current device/event code (dynamic — mostly status, sometimes an error),
 	*  or null when unknown. */
 	currentCode: zod.z.number().nullable().meta(require_sleep.readingMeta("none")),
@@ -69579,7 +69750,7 @@ var lockControlCapability = {
 //#endregion
 //#region src/capabilities/meter.cap.ts
 /**
-* A monotonic total between resets (D944). Energy uses `power-meter.kwhTotal`
+* A monotonic total between resets (D944). Energy uses `power-meter.energy`
 * so dashboards keep one series; every other instantaneous reading lands here.
 * `value` is the time integral in the source quantity's accumulated base
 * (base-unit seconds, or kWh on the power meter). `null` is a gap, never zero.
@@ -69675,10 +69846,10 @@ var MediaPlayerStatusSchema = zod.z.object({
 	currentMedia: MediaInfoSchema.nullable(),
 	/** Current playback position in ms. Null when not seekable or
 	*  nothing is playing. Pair with `DeviceFeature.MediaPlayerSeek`. */
-	positionMs: zod.z.number().int().nonnegative().nullable().meta(require_sleep.readingMeta("duration-ms")),
+	position: zod.z.number().int().nonnegative().nullable().meta(require_sleep.readingMeta("duration-ms")),
 	/** Total duration of the current media in ms. Null when unknown
 	*  (live stream) or nothing is playing. */
-	durationMs: zod.z.number().int().nonnegative().nullable().meta(require_sleep.readingMeta("duration-ms")),
+	duration: zod.z.number().int().nonnegative().nullable().meta(require_sleep.readingMeta("duration-ms")),
 	/** Shuffle toggle. Null when no shuffle surface.
 	*  Pair with `DeviceFeature.MediaPlayerShuffle`. */
 	shuffle: zod.z.boolean().nullable(),
@@ -69717,7 +69888,7 @@ var mediaPlayerCapability = {
 		}),
 		seek: require_sleep.method(zod.z.object({
 			deviceId: zod.z.number().int().nonnegative(),
-			positionMs: zod.z.number().int().nonnegative()
+			position: zod.z.number().int().nonnegative()
 		}), zod.z.void(), {
 			kind: "mutation",
 			auth: "protected"
@@ -69789,7 +69960,7 @@ var mediaPlayerCapability = {
 	/**
 	* History (D850): volume (a level an operator or an automation sets; the
 	* default 10 s floor folds a slider drag into its end value) and mute.
-	* `positionMs` is not recorded: it moves continuously while playing.
+	* `position` is not recorded: it moves continuously while playing.
 	*/
 	history: { fields: {
 		volumeLevel: {
@@ -71014,9 +71185,9 @@ var NetworkLinkStatusSchema = zod.z.object({
 	* one whose reading has not landed must not be drawn at 0 %. Consumers
 	* SKIP a null rather than coerce it.
 	*/
-	signalPercent: zod.z.number().min(0).max(100).nullable().meta(require_sleep.readingMeta("percentage")),
+	signal: zod.z.number().min(0).max(100).nullable().meta(require_sleep.readingMeta("percentage")),
 	/** Raw received signal strength in dBm, when the firmware reports one. */
-	rssiDbm: zod.z.number().optional().meta(require_sleep.readingMeta("signal-level")),
+	rssi: zod.z.number().optional().meta(require_sleep.readingMeta("signal-level")),
 	/** Network name of a wireless link, when the firmware reports it. */
 	ssid: zod.z.string().optional(),
 	/** Ms epoch of the last observation. Lets consumers reason about freshness. */
@@ -71025,7 +71196,7 @@ var NetworkLinkStatusSchema = zod.z.object({
 /** The slice a provider seeds before its first read: nothing is known yet. */
 var NETWORK_LINK_UNKNOWN = {
 	type: "unknown",
-	signalPercent: null,
+	signal: null,
 	lastUpdated: 0
 };
 /**
@@ -71042,9 +71213,9 @@ function signalPercentFromBars(bars, maxBars) {
 * below is 0 %, -50 dBm and above is 100 %, linear between. Non-finite or
 * positive input is not an RSSI: `null`.
 */
-function signalPercentFromRssi(rssiDbm) {
-	if (rssiDbm === void 0 || !Number.isFinite(rssiDbm) || rssiDbm > 0) return null;
-	return Math.round((Math.min(-50, Math.max(-100, rssiDbm)) + 100) * 2);
+function signalPercentFromRssi(rssi) {
+	if (rssi === void 0 || !Number.isFinite(rssi) || rssi > 0) return null;
+	return Math.round((Math.min(-50, Math.max(-100, rssi)) + 100) * 2);
 }
 var networkLinkCapability = {
 	name: "network-link",
@@ -71095,13 +71266,13 @@ onStatusChanged: { data: zod.z.object({
 	* History (D850): recorded series.
 	*/
 	history: { fields: {
-		signalPercent: {
+		signal: {
 			kind: "gauge",
 			unit: "%",
 			deadband: 3,
 			minIntervalMs: 6e4
 		},
-		rssiDbm: {
+		rssi: {
 			kind: "gauge",
 			unit: "dBm",
 			deadband: 2,
@@ -73464,16 +73635,16 @@ var platformProbeCapability = {
 * in real-world devices.
 */
 var PowerMeterStatusSchema = zod.z.object({
-	/** Instantaneous power draw in watts. */
-	watts: zod.z.number().optional().meta(require_sleep.readingMeta("power", { label: "Power" })),
+	/** Instantaneous power draw (watts). */
+	power: zod.z.number().optional().meta(require_sleep.readingMeta("power", { label: "Power" })),
 	/** Cumulative energy in kilowatt-hours since the meter was reset. */
-	kwhTotal: zod.z.number().optional().meta(require_sleep.readingMeta("energy", { label: "Energy" })),
-	/** Voltage in volts. */
-	volts: zod.z.number().optional().meta(require_sleep.readingMeta("voltage", { label: "Voltage" })),
+	energy: zod.z.number().optional().meta(require_sleep.readingMeta("energy", { label: "Energy" })),
+	/** Voltage (volts). */
+	voltage: zod.z.number().optional().meta(require_sleep.readingMeta("voltage", { label: "Voltage" })),
 	/** Current in amperes. */
-	amps: zod.z.number().optional().meta(require_sleep.readingMeta("current", { label: "Current" })),
+	current: zod.z.number().optional().meta(require_sleep.readingMeta("current", { label: "Current" })),
 	/** Apparent power in volt-amperes. */
-	va: zod.z.number().optional().meta(require_sleep.readingMeta("apparent-power")),
+	apparentPower: zod.z.number().optional().meta(require_sleep.readingMeta("apparent-power")),
 	/** Power factor (0..1) if reported. */
 	powerFactor: zod.z.number().min(0).max(1).optional().meta(require_sleep.readingMeta("ratio")),
 	/** Ms epoch when the slice was last updated. */
@@ -73531,14 +73702,14 @@ function powerTarget(id, unit) {
 		advancedExpression: true
 	};
 }
-/** "Power and energy" extension: watts, energy, voltage and current from other devices (D951). */
+/** "Power and energy" extension: power, energy, voltage and current from other devices (D951). */
 var powerMeterCustomize = {
 	version: 1,
 	targets: [
-		powerTarget("watts", "W"),
-		powerTarget("kwhTotal", "kWh"),
-		powerTarget("volts", "V"),
-		powerTarget("amps", "A")
+		powerTarget("power", "W"),
+		powerTarget("energy", "kWh"),
+		powerTarget("voltage", "V"),
+		powerTarget("current", "A")
 	]
 };
 var powerMeterCapability = {
@@ -73554,41 +73725,41 @@ var powerMeterCapability = {
 	},
 	runtimeState: PowerMeterStatusSchema,
 	/**
-	* Runtime-state durability: **restored** — as `numeric-sensor`; `kwhTotal` is an accumulator whose restored value is the baseline.
+	* Runtime-state durability: **restored** — as `numeric-sensor`; `energy` is an accumulator whose restored value is the baseline.
 	*
 	* See `RuntimeStateDurability`. Enforced by
 	* `scripts/check-runtime-state-durability.ts`.
 	*/
 	durability: "restored",
 	/**
-	* History (D850): recorded series. Gauges are floored at 30 s; `kwhTotal` is the one monotonic meter (counter).
+	* History (D850): recorded series. Gauges are floored at 30 s; `energy` is the one monotonic meter (counter).
 	*/
 	history: { fields: {
-		watts: {
+		power: {
 			kind: "gauge",
 			unit: "W",
 			deadband: 1,
 			minIntervalMs: 3e4
 		},
-		kwhTotal: {
+		energy: {
 			kind: "counter",
 			unit: "kWh",
 			deadband: .01,
 			minIntervalMs: 6e4
 		},
-		volts: {
+		voltage: {
 			kind: "gauge",
 			unit: "V",
 			deadband: 1,
 			minIntervalMs: 3e4
 		},
-		amps: {
+		current: {
 			kind: "gauge",
 			unit: "A",
 			deadband: .05,
 			minIntervalMs: 3e4
 		},
-		va: {
+		apparentPower: {
 			kind: "gauge",
 			unit: "VA",
 			deadband: 1,
@@ -73640,9 +73811,6 @@ var PresenceStatusSchema = zod.z.object({
 	location: zod.z.string().nullable(),
 	/** GPS coordinates when available. Null otherwise. */
 	gps: GpsLocationSchema.nullable(),
-	/** Optional battery level of the tracking device (0..100). Null
-	*  when not reported. */
-	batteryPercent: zod.z.number().min(0).max(100).nullable().meta(require_sleep.readingMeta("percentage")),
 	/** Ms epoch when the slice was last updated. */
 	lastChangedAt: zod.z.number()
 });
@@ -73671,14 +73839,7 @@ var presenceCapability = {
 	* `scripts/check-runtime-state-durability.ts`.
 	*/
 	durability: "restored",
-	/**
-	* History (D850): recorded series.
-	*/
-	history: { fields: { batteryPercent: {
-		kind: "gauge",
-		unit: "%",
-		deadband: 1
-	} } },
+	history: "none",
 	/** Clock fields: written, but excluded from the compare that decides
 	*  whether persisting is worth a SQLite commit. */
 	volatileStateFields: ["lastChangedAt"]
@@ -73695,7 +73856,7 @@ var presenceCapability = {
 */
 var PressureSensorStatusSchema = zod.z.object({
 	/** Current pressure in hPa. `null` when the sample was refused (D393). */
-	hpa: zod.z.number().nullable().meta(require_sleep.readingMeta("pressure", { precision: 0 })),
+	pressure: zod.z.number().nullable().meta(require_sleep.readingMeta("pressure", { precision: 0 })),
 	/** Ms epoch when the slice was last updated. */
 	lastFetchedAt: zod.z.number()
 });
@@ -73721,7 +73882,7 @@ var pressureSensorCapability = {
 	/**
 	* History (D850): recorded series.
 	*/
-	history: { fields: { hpa: {
+	history: { fields: { pressure: {
 		kind: "gauge",
 		unit: "hPa",
 		deadband: .1
@@ -78948,7 +79109,7 @@ var tamperCapability = {
 */
 var TemperatureSensorStatusSchema = zod.z.object({
 	/** Current temperature in Celsius. `null` when the sample was refused (D393). */
-	celsius: zod.z.number().nullable().meta(require_sleep.readingMeta("temperature", {
+	temperature: zod.z.number().nullable().meta(require_sleep.readingMeta("temperature", {
 		precision: 1,
 		label: "Temperature"
 	})),
@@ -78977,7 +79138,7 @@ var temperatureSensorCapability = {
 	/**
 	* History (D850): recorded series.
 	*/
-	history: { fields: { celsius: {
+	history: { fields: { temperature: {
 		kind: "gauge",
 		unit: "°C",
 		deadband: .1
@@ -79345,7 +79506,7 @@ var VacuumControlStatusSchema = zod.z.object({
 	/** Speed tokens the hardware accepts — drives the UI selector. */
 	availableFanSpeeds: zod.z.array(zod.z.string()),
 	/** 0..100 cleaning-completion percentage of the current task, or null. */
-	progressPercent: zod.z.number().min(0).max(100).nullable().meta(require_sleep.readingMeta("percentage")),
+	progress: zod.z.number().min(0).max(100).nullable().meta(require_sleep.readingMeta("percentage")),
 	/** Current error code (0 / null = no error). */
 	errorCode: zod.z.number().nullable().meta(require_sleep.readingMeta("none")),
 	/** Human label for {@link errorCode}, or null when none / undecodable. */
@@ -81995,7 +82156,7 @@ function named(prefix, sources, cap, fieldPath) {
 	return Object.fromEntries(sources.map((s, i) => [`${prefix}${i + 1}`, from(s, cap, fieldPath)]));
 }
 function roomCompositionExample(input) {
-	const t = named("t", input.temperatureSources, "temperature-sensor", "celsius");
+	const t = named("t", input.temperatureSources, "temperature-sensor", "temperature");
 	const f = named("f", input.temperatureSources, "temperature-sensor", "lastFetchedAt");
 	const d = named("d", input.motionSources, "motion", "detected");
 	const m = named("m", input.motionSources, "motion", "lastDetectedAt");
@@ -82010,7 +82171,7 @@ function roomCompositionExample(input) {
 			kind: "fields",
 			cap: "temperature-sensor",
 			fields: {
-				celsius: {
+				temperature: {
 					kind: "expression",
 					expr: `round(avg(${Object.keys(t).join(", ")}), 1)`,
 					bindings: t
@@ -82056,7 +82217,7 @@ function roomCompositionExample(input) {
 * an `enum-sensor` whose `value` is the raw STRING state — `number(d)` reads it,
 * and anything that is not a number is `null`, never 0 (D393). The battery
 * status sensor is an `enum-sensor` too (`unavailable` keeps its cold `''`, so
-* `percentage` is `null`). `charging` maps `battery_charging` off to
+* `level` is `null`). `charging` maps `battery_charging` off to
 * `'unknown'`, never `'none'`: off does not prove "on battery alone" (the
 * operator confirms the real semantics live).
 */
@@ -82125,7 +82286,7 @@ function feederCustomizationExample(sources) {
 			kind: "fields",
 			cap: "battery",
 			fields: {
-				percentage: {
+				level: {
 					kind: "expression",
 					expr: "s == \"low\" ? 15 : (s == \"normal\" ? 100 : null)",
 					bindings: { s: from(sources.batteryStatus, "enum-sensor", "value") }
@@ -82193,10 +82354,10 @@ function unitConstant(to) {
 /** Primary numeric field that also publishes the cap's `unit` string. */
 var UNIT_COMPANION_FIELD = {
 	"numeric-sensor": "value",
-	"temperature-sensor": "celsius",
-	"humidity-sensor": "percent",
-	"pressure-sensor": "hpa",
-	"ambient-light-sensor": "lux"
+	"temperature-sensor": "temperature",
+	"humidity-sensor": "humidity",
+	"pressure-sensor": "pressure",
+	"ambient-light-sensor": "illuminance"
 };
 /** `unit` when converting that cap's primary numeric field; otherwise none. */
 function unitCompanionField(cap, fieldPath) {
@@ -82383,7 +82544,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 	"battery": {
 		version: 1,
 		targets: [{
-			id: "percentage",
+			id: "level",
 			cardinality: "scalar",
 			deviceTypes: [
 				require_err_msg.DeviceType.Camera,
@@ -82397,7 +82558,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 			],
 			apply: "add",
 			vocabularyCap: "battery",
-			vocabularyStateField: "percentage",
+			vocabularyStateField: "level",
 			sources: [{
 				kind: "field",
 				valueKinds: ["number", "string"],
@@ -82412,7 +82573,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 			}],
 			sourceReport: { status: "assignment-status" },
 			advancedExpression: true,
-			path: "percentage",
+			path: "level",
 			valueKind: "number",
 			nullable: true,
 			companions: [
@@ -82647,7 +82808,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 		version: 1,
 		targets: [
 			{
-				id: "watts",
+				id: "power",
 				cardinality: "scalar",
 				deviceTypes: [
 					require_err_msg.DeviceType.Switch,
@@ -82667,7 +82828,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 				],
 				apply: "add",
 				vocabularyCap: "power-meter",
-				vocabularyStateField: "watts",
+				vocabularyStateField: "power",
 				sources: [{
 					kind: "numeric",
 					requiredUnit: "W",
@@ -82676,7 +82837,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 				}],
 				sourceReport: { status: "assignment-status" },
 				advancedExpression: true,
-				path: "watts",
+				path: "power",
 				valueKind: "number",
 				nullable: false,
 				companions: [{
@@ -82686,7 +82847,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 				}]
 			},
 			{
-				id: "kwhTotal",
+				id: "energy",
 				cardinality: "scalar",
 				deviceTypes: [
 					require_err_msg.DeviceType.Switch,
@@ -82706,7 +82867,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 				],
 				apply: "add",
 				vocabularyCap: "power-meter",
-				vocabularyStateField: "kwhTotal",
+				vocabularyStateField: "energy",
 				sources: [{
 					kind: "numeric",
 					requiredUnit: "kWh",
@@ -82715,7 +82876,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 				}],
 				sourceReport: { status: "assignment-status" },
 				advancedExpression: true,
-				path: "kwhTotal",
+				path: "energy",
 				valueKind: "number",
 				nullable: false,
 				companions: [{
@@ -82725,7 +82886,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 				}]
 			},
 			{
-				id: "volts",
+				id: "voltage",
 				cardinality: "scalar",
 				deviceTypes: [
 					require_err_msg.DeviceType.Switch,
@@ -82745,7 +82906,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 				],
 				apply: "add",
 				vocabularyCap: "power-meter",
-				vocabularyStateField: "volts",
+				vocabularyStateField: "voltage",
 				sources: [{
 					kind: "numeric",
 					requiredUnit: "V",
@@ -82754,7 +82915,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 				}],
 				sourceReport: { status: "assignment-status" },
 				advancedExpression: true,
-				path: "volts",
+				path: "voltage",
 				valueKind: "number",
 				nullable: false,
 				companions: [{
@@ -82764,7 +82925,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 				}]
 			},
 			{
-				id: "amps",
+				id: "current",
 				cardinality: "scalar",
 				deviceTypes: [
 					require_err_msg.DeviceType.Switch,
@@ -82784,7 +82945,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 				],
 				apply: "add",
 				vocabularyCap: "power-meter",
-				vocabularyStateField: "amps",
+				vocabularyStateField: "current",
 				sources: [{
 					kind: "numeric",
 					requiredUnit: "A",
@@ -82793,7 +82954,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 				}],
 				sourceReport: { status: "assignment-status" },
 				advancedExpression: true,
-				path: "amps",
+				path: "current",
 				valueKind: "number",
 				nullable: false,
 				companions: [{
@@ -82894,19 +83055,19 @@ var CAP_CUSTOMIZE_CATALOG = {
 * it is not an override list (D944).
 */
 var CAP_RUNTIME_FIELD_UNITS = {
-	"ambient-light-sensor": { lux: "lx" },
+	"ambient-light-sensor": { illuminance: "lx" },
 	"battery": {
-		percentage: "%",
-		volts: "V"
+		level: "%",
+		voltage: "V"
 	},
-	"humidity-sensor": { percent: "%" },
+	"humidity-sensor": { humidity: "%" },
 	"power-meter": {
-		watts: "W",
-		kwhTotal: "kWh",
-		volts: "V",
-		amps: "A"
+		power: "W",
+		energy: "kWh",
+		voltage: "V",
+		current: "A"
 	},
-	"temperature-sensor": { celsius: "°C" }
+	"temperature-sensor": { temperature: "°C" }
 };
 //#endregion
 //#region src/composition/customize/field-source.ts
@@ -85025,7 +85186,7 @@ var BaseDevice = class {
 	* `device-local-state.ts`. Drivers access via:
 	*
 	*   `this.state.battery.sleeping = true`        // patches the battery slice
-	*   `const pct = this.state.battery.percentage` // reads the battery slice
+	*   `const pct = this.state.battery.level` // reads the battery slice
 	*   `this.state.deviceStatus.online = true`     // mirrors `markOnline(true)`
 	*
 	* Adding a new cap with `runtimeState:` automatically extends this
@@ -85065,7 +85226,7 @@ var BaseDevice = class {
 	* shape; drivers don't redeclare it, they just write through.
 	*
 	* Read: `this.runtimeState.getCapState('battery')` →
-	*   `{percentage, charging, sleeping, lastUpdated}` for any
+	*   `{level, charging, sleeping, lastUpdated}` for any
 	*   provider that registers `batteryCapability`.
 	* Write: `this.runtimeState.setCapState('battery', { … })`.
 	*
@@ -87030,17 +87191,17 @@ function pickAccessoryControl(device) {
 var SENSOR_MAP = {
 	"temperature-sensor": {
 		capKey: "temperatureSensor",
-		field: "celsius",
+		field: "temperature",
 		fallbackUnit: "°C"
 	},
 	"humidity-sensor": {
 		capKey: "humiditySensor",
-		field: "percent",
+		field: "humidity",
 		fallbackUnit: "%"
 	},
 	"ambient-light-sensor": {
 		capKey: "ambientLightSensor",
-		field: "lux",
+		field: "illuminance",
 		fallbackUnit: "lx"
 	},
 	"numeric-sensor": {
@@ -97498,7 +97659,7 @@ var ACTUATOR_CAP_VOCABULARY = {
 				label: t("Full brightness", "Luminosità massima"),
 				phrase: t("Set {device} to full brightness", "Porta {device} alla massima luminosità"),
 				icon: "sun",
-				args: { percentage: 100 }
+				args: { level: 100 }
 			},
 			{
 				id: "brightness.half",
@@ -97506,7 +97667,7 @@ var ACTUATOR_CAP_VOCABULARY = {
 				label: t("Half brightness", "Luminosità a metà"),
 				phrase: t("Dim {device} to half", "Abbassa {device} a metà luminosità"),
 				icon: "sun-dim",
-				args: { percentage: 50 }
+				args: { level: 50 }
 			},
 			{
 				id: "brightness.off",
@@ -97514,16 +97675,16 @@ var ACTUATOR_CAP_VOCABULARY = {
 				label: t("Brightness off", "Luminosità a zero"),
 				phrase: t("Dim {device} to zero", "Abbassa {device} a zero"),
 				icon: "lightbulb-off",
-				args: { percentage: 0 }
+				args: { level: 0 }
 			},
 			{
 				id: "brightness.set",
 				method: "setBrightness",
 				label: t("Set brightness", "Imposta la luminosità"),
-				phrase: t("Set the brightness of {device} to {percentage}", "Imposta la luminosità di {device} a {percentage}"),
+				phrase: t("Set the brightness of {device} to {level}", "Imposta la luminosità di {device} a {level}"),
 				icon: "sun-medium",
 				openArgs: [{
-					key: "percentage",
+					key: "level",
 					label: PERCENT,
 					offer: {
 						kind: "number",
@@ -97537,13 +97698,13 @@ var ACTUATOR_CAP_VOCABULARY = {
 		],
 		state: [{
 			kind: "numeric",
-			field: "percentage",
+			field: "level",
 			quantity: t("the brightness", "la luminosità"),
 			label: t("Brightness", "Luminosità"),
 			unit: "%",
 			icon: "sun"
 		}],
-		events: { onBrightnessChanged: { notOperatorFacing: "the `percentage` state trigger reads the same change" } }
+		events: { onBrightnessChanged: { notOperatorFacing: "the `level` state trigger reads the same change" } }
 	},
 	color: {
 		scope: "device",
@@ -97557,7 +97718,7 @@ var ACTUATOR_CAP_VOCABULARY = {
 				icon: "sun",
 				args: { color: {
 					mode: "mired",
-					mireds: 370
+					colorTemperature: 370
 				} }
 			},
 			{
@@ -97568,7 +97729,7 @@ var ACTUATOR_CAP_VOCABULARY = {
 				icon: "snowflake",
 				args: { color: {
 					mode: "mired",
-					mireds: 200
+					colorTemperature: 200
 				} }
 			},
 			{
@@ -98182,7 +98343,7 @@ var ACTUATOR_CAP_VOCABULARY = {
 				label: t("Fan off", "Ventilatore spento"),
 				phrase: t("Stop {device}", "Ferma {device}"),
 				icon: "power-off",
-				args: { percentage: 0 }
+				args: { speed: 0 }
 			},
 			{
 				id: "fan.full",
@@ -98190,16 +98351,16 @@ var ACTUATOR_CAP_VOCABULARY = {
 				label: t("Fan full", "Ventilatore al massimo"),
 				phrase: t("Run {device} at full speed", "Porta {device} alla massima velocità"),
 				icon: "fan",
-				args: { percentage: 100 }
+				args: { speed: 100 }
 			},
 			{
 				id: "fan.speed",
 				method: "setPercentage",
 				label: t("Set speed", "Imposta la velocità"),
-				phrase: t("Set the speed of {device} to {percentage}", "Imposta la velocità di {device} al {percentage}"),
+				phrase: t("Set the speed of {device} to {speed}", "Imposta la velocità di {device} al {speed}"),
 				icon: "fan",
 				openArgs: [{
-					key: "percentage",
+					key: "speed",
 					label: t("Speed", "Velocità"),
 					offer: {
 						kind: "number",
@@ -98261,7 +98422,7 @@ var ACTUATOR_CAP_VOCABULARY = {
 		],
 		state: [{
 			kind: "numeric",
-			field: "percentage",
+			field: "speed",
 			quantity: t("the speed", "la velocità"),
 			label: t("Speed", "Velocità"),
 			unit: "%",
@@ -99061,7 +99222,7 @@ var APPLIANCE_CAP_VOCABULARY = {
 			},
 			{
 				kind: "numeric",
-				field: "progressPercent",
+				field: "progress",
 				quantity: t("the cycle progress", "l’avanzamento del lavaggio"),
 				label: t("Progress", "Avanzamento"),
 				unit: "%",
@@ -99419,10 +99580,10 @@ var APPLIANCE_CAP_VOCABULARY = {
 				id: "media.seek",
 				method: "seek",
 				label: t("Seek", "Vai al punto"),
-				phrase: t("Move {device} to {positionMs}", "Porta {device} al punto {positionMs}"),
+				phrase: t("Move {device} to {position}", "Porta {device} al punto {position}"),
 				icon: "fast-forward",
 				openArgs: [{
-					key: "positionMs",
+					key: "position",
 					label: t("Position", "Posizione"),
 					offer: {
 						kind: "number",
@@ -100475,7 +100636,7 @@ var SENSOR_CAP_VOCABULARY = {
 		state: [
 			{
 				kind: "numeric",
-				field: "co2Ppm",
+				field: "co2",
 				quantity: t("the CO₂", "la CO₂"),
 				label: t("CO₂", "CO₂"),
 				unit: "ppm",
@@ -100483,7 +100644,7 @@ var SENSOR_CAP_VOCABULARY = {
 			},
 			{
 				kind: "numeric",
-				field: "vocPpb",
+				field: "voc",
 				quantity: t("the VOC level", "il livello di COV"),
 				label: t("VOC", "COV"),
 				unit: "ppb",
@@ -100519,7 +100680,7 @@ var SENSOR_CAP_VOCABULARY = {
 		noun: t("Light level", "Luminosità ambiente"),
 		state: [{
 			kind: "numeric",
-			field: "lux",
+			field: "illuminance",
 			quantity: t("the light level", "la luminosità"),
 			label: t("Illuminance", "Illuminamento"),
 			unit: "lx",
@@ -100722,7 +100883,7 @@ var SENSOR_CAP_VOCABULARY = {
 		noun: t("Humidity", "Umidità"),
 		state: [{
 			kind: "numeric",
-			field: "percent",
+			field: "humidity",
 			quantity: t("the humidity", "l’umidità"),
 			label: t("Humidity", "Umidità"),
 			unit: "%",
@@ -100770,7 +100931,7 @@ var SENSOR_CAP_VOCABULARY = {
 		state: [
 			{
 				kind: "numeric",
-				field: "watts",
+				field: "power",
 				quantity: t("the power draw", "il consumo"),
 				label: t("Power", "Potenza"),
 				unit: "W",
@@ -100778,7 +100939,7 @@ var SENSOR_CAP_VOCABULARY = {
 			},
 			{
 				kind: "numeric",
-				field: "kwhTotal",
+				field: "energy",
 				quantity: t("the energy used", "l’energia consumata"),
 				label: t("Energy", "Energia"),
 				unit: "kWh",
@@ -100786,7 +100947,7 @@ var SENSOR_CAP_VOCABULARY = {
 			},
 			{
 				kind: "numeric",
-				field: "volts",
+				field: "voltage",
 				quantity: t("the voltage", "la tensione"),
 				label: t("Voltage", "Tensione"),
 				unit: "V",
@@ -100794,7 +100955,7 @@ var SENSOR_CAP_VOCABULARY = {
 			},
 			{
 				kind: "numeric",
-				field: "amps",
+				field: "current",
 				quantity: t("the current", "la corrente"),
 				label: t("Current", "Corrente"),
 				unit: "A",
@@ -100811,13 +100972,6 @@ var SENSOR_CAP_VOCABULARY = {
 			label: t("Where", "Posizione"),
 			phrase: t("When {device} is at {value}", "Quando {device} è in {value}"),
 			icon: "map-pin"
-		}, {
-			kind: "numeric",
-			field: "batteryPercent",
-			quantity: t("the phone battery", "la batteria del telefono"),
-			label: t("Battery", "Batteria"),
-			unit: "%",
-			icon: "battery"
 		}]
 	},
 	"pressure-sensor": {
@@ -100825,7 +100979,7 @@ var SENSOR_CAP_VOCABULARY = {
 		noun: t("Pressure", "Pressione"),
 		state: [{
 			kind: "numeric",
-			field: "hpa",
+			field: "pressure",
 			quantity: t("the pressure", "la pressione"),
 			label: t("Pressure", "Pressione"),
 			unit: "hPa",
@@ -100861,7 +101015,7 @@ var SENSOR_CAP_VOCABULARY = {
 		noun: t("Temperature", "Temperatura"),
 		state: [{
 			kind: "numeric",
-			field: "celsius",
+			field: "temperature",
 			quantity: t("the temperature", "la temperatura"),
 			label: t("Temperature", "Temperatura"),
 			unit: "°C",
@@ -100932,7 +101086,7 @@ var SENSOR_CAP_VOCABULARY = {
 		state: [
 			{
 				kind: "numeric",
-				field: "percentage",
+				field: "level",
 				quantity: t("the battery level", "il livello della batteria"),
 				label: t("Battery", "Batteria"),
 				unit: "%",
@@ -100974,7 +101128,7 @@ var SENSOR_CAP_VOCABULARY = {
 				icon: "battery-charging"
 			}
 		],
-		events: { onStatusChanged: { notOperatorFacing: "the percentage / sleeping / charging state triggers each read one field of this change" } },
+		events: { onStatusChanged: { notOperatorFacing: "the level / sleeping / charging state triggers each read one field of this change" } },
 		extraEvents: [{
 			category: require_event_category.EventCategory.DeviceAwake,
 			label: t("Woke up", "Risvegliato"),
@@ -100992,7 +101146,7 @@ var SENSOR_CAP_VOCABULARY = {
 		noun: t("Network link", "Collegamento di rete"),
 		state: [{
 			kind: "numeric",
-			field: "signalPercent",
+			field: "signal",
 			quantity: t("the signal strength", "l’intensità del segnale"),
 			label: t("Signal", "Segnale"),
 			unit: "%",
@@ -121821,6 +121975,7 @@ exports.evaluateRose = require_composition.evaluateRose;
 exports.evaluateSensorEdge = require_composition.evaluateSensorEdge;
 exports.evaluateSensorLevelEdge = require_composition.evaluateSensorLevelEdge;
 exports.evaluateStatefulExpressionCall = require_composition.evaluateStatefulExpressionCall;
+exports.evaluateStationaryTrigger = evaluateStationaryTrigger;
 exports.evaluateStatistic = require_composition.evaluateStatistic;
 exports.evaluateZoneRules = evaluateZoneRules;
 exports.event = require_sleep.event;