@camstack/types 1.2.434 → 1.2.436

package/dist/index.js

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_sleep = require("./sleep-CO61AfwW.js");
+const require_sleep = require("./sleep-DHitF_e4.js");
 const require_event_category = require("./event-category-E17zaHjN.js");
-const require_composition = require("./composition-CpAc0YfQ.js");
+const require_composition = require("./composition-WNkEpwkF.js");
 const require_node_color = require("./node-color.js");
 const require_err_msg = require("./err-msg-U7lLUMNz.js");
 const require_enums = require("./enums.js");
@@ -14905,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(),
@@ -15574,12 +15574,13 @@ var CHANGED = {
 	expr: "now"
 };
 function numeric(input) {
+	const { alsoFrom, ...base } = input;
 	return {
-		...input,
+		...base,
 		family: "numeric",
 		deviceType: require_err_msg.DeviceType.Sensor,
 		memberDeviceType: require_err_msg.DeviceType.Sensor,
-		memberDeviceTypes: [require_err_msg.DeviceType.Sensor],
+		memberDeviceTypes: [require_err_msg.DeviceType.Sensor, ...alsoFrom?.deviceTypes ?? []],
 		activeWhen: void 0,
 		commandCaps: [],
 		baseUnit: require_sleep.baseUnitOf(input.quantity),
@@ -15587,9 +15588,10 @@ function numeric(input) {
 		accept: [{
 			cap: input.outputCap,
 			fieldPath: input.outputField
-		}]
+		}, ...alsoFrom === void 0 ? [] : [alsoFrom.accept]]
 	};
 }
+var CLIMATE_DEVICES = [require_err_msg.DeviceType.Thermostat, require_err_msg.DeviceType.Climate];
 function binary(input) {
 	return {
 		...input,
@@ -15611,29 +15613,43 @@ 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",
-		companions: [NOW$2]
+		companions: [NOW$2],
+		alsoFrom: {
+			deviceTypes: CLIMATE_DEVICES,
+			accept: {
+				cap: "climate-control",
+				fieldPath: "currentTemp"
+			}
+		}
 	}),
 	numeric({
 		id: "humidity",
 		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",
-		companions: [NOW$2]
+		companions: [NOW$2],
+		alsoFrom: {
+			deviceTypes: CLIMATE_DEVICES,
+			accept: {
+				cap: "climate-control",
+				fieldPath: "currentHumidity"
+			}
+		}
 	}),
 	numeric({
 		id: "pressure",
 		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",
@@ -15644,7 +15660,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",
@@ -15655,7 +15671,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",
@@ -15666,7 +15682,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",
@@ -15677,7 +15693,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",
@@ -16131,17 +16147,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
@@ -16177,24 +16193,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
@@ -16236,7 +16252,7 @@ var HISTORY_CATALOG = {
 	} },
 	"device-status": { "online": { kind: "boolean" } },
 	"dishwasher": {
-		"progressPercent": {
+		"progress": {
 			kind: "gauge",
 			unit: "%",
 			deadband: 2
@@ -16266,7 +16282,7 @@ var HISTORY_CATALOG = {
 				"Aborting"
 			]
 		},
-		"remainingSeconds": {
+		"remaining": {
 			kind: "gauge",
 			unit: "s",
 			minIntervalMs: 6e4
@@ -16279,7 +16295,7 @@ var HISTORY_CATALOG = {
 		skipWhenSet: "timestamp"
 	} },
 	"fan-control": {
-		"percentage": {
+		"speed": {
 			kind: "gauge",
 			unit: "%",
 			minIntervalMs: 0
@@ -16301,7 +16317,7 @@ var HISTORY_CATALOG = {
 		},
 		"on": { kind: "boolean" }
 	},
-	"humidity-sensor": { "percent": {
+	"humidity-sensor": { "humidity": {
 		kind: "gauge",
 		unit: "%",
 		deadband: .5
@@ -16339,13 +16355,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,
@@ -16372,31 +16388,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,
@@ -16409,12 +16425,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
@@ -16441,7 +16452,7 @@ var HISTORY_CATALOG = {
 	},
 	"switch": { "on": { kind: "boolean" } },
 	"tamper": { "tampered": { kind: "boolean" } },
-	"temperature-sensor": { "celsius": {
+	"temperature-sensor": { "temperature": {
 		kind: "gauge",
 		unit: "°C",
 		deadband: .1
@@ -16549,6 +16560,7 @@ var HISTORY_NONE_CAPS = [
 	"native-object-detection",
 	"navigation",
 	"notifier",
+	"presence",
 	"privacy-mask",
 	"ptz-autotrack",
 	"recording-onboard",
@@ -16686,10 +16698,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";
@@ -16698,7 +16710,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
@@ -16957,9 +16969,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);
@@ -17000,7 +17012,7 @@ function compileAppliance(spec) {
 			kind: "fields",
 			cap: "power-meter",
 			fields: {
-				watts: read,
+				power: read,
 				lastFetchedAt: clock
 			}
 		}]
@@ -19226,8 +19238,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([
@@ -46324,6 +46336,43 @@ var NotificationActionSchema = zod.z.object({
 	*/
 	mode: zod.z.enum(["navigate", "background"]).optional()
 });
+/** A delivery parameter value: what a notifier declared it takes. */
+var DeliveryParamValueSchema = zod.z.union([
+	zod.z.string(),
+	zod.z.number(),
+	zod.z.boolean()
+]);
+/**
+* One extra delivery parameter a notifier KIND declares (D938). A rule that
+* addresses a target of that kind may set it; a kind that declares nothing is
+* never handed one. The admin UI derives its control from this descriptor —
+* no editor knows a service by name.
+*
+* Optional fields are `.optional()`, never `.default()` (a Zod default does not
+* run on the addon cap path).
+*/
+var DeliveryParamSchema = zod.z.object({
+	key: zod.z.string().min(1),
+	label: zod.z.string(),
+	/** i18n key of the label, resolved by the declaring addon's namespace. */
+	labelKey: zod.z.string().optional(),
+	type: zod.z.enum([
+		"enum",
+		"number",
+		"boolean",
+		"string"
+	]),
+	/** `enum` only: the closed set of accepted values. */
+	options: zod.z.array(zod.z.object({
+		value: zod.z.string(),
+		label: zod.z.string()
+	})).optional(),
+	/** `number` only. */
+	min: zod.z.number().optional(),
+	max: zod.z.number().optional(),
+	/** What the notifier does when the rule sets nothing; shown as the placeholder. */
+	default: DeliveryParamValueSchema.optional()
+});
 /**
 * The canonical notification. `body` is the only hard field (Apprise model).
 * `priority` is a 5-level ORDINAL (1=lowest … 3=normal(default) … 5=urgent),
@@ -46346,7 +46395,13 @@ var NotificationSchema = zod.z.object({
 	tag: zod.z.string().optional(),
 	deviceId: zod.z.number().optional(),
 	eventId: zod.z.string().optional(),
-	metadata: zod.z.record(zod.z.string(), zod.z.unknown()).optional()
+	metadata: zod.z.record(zod.z.string(), zod.z.unknown()).optional(),
+	/**
+	* Values for the parameters the target's kind DECLARES in
+	* {@link TargetKindSchema} `deliveryParams`. Already validated against the
+	* declaration by the sender; a notifier reads only the keys it declared.
+	*/
+	delivery: zod.z.record(zod.z.string(), DeliveryParamValueSchema).optional()
 });
 /** One declared native severity/priority level for a kind. */
 var TargetKindLevelSchema = zod.z.object({
@@ -46454,6 +46509,11 @@ var TargetKindSchema = zod.z.object({
 	*/
 	destinationKeys: zod.z.array(zod.z.string()).optional(),
 	supportsDiscovery: zod.z.boolean(),
+	/**
+	* Extra delivery parameters a rule may set for a target of this kind (D938).
+	* Absent = none; the rule editor then offers nothing.
+	*/
+	deliveryParams: zod.z.array(DeliveryParamSchema).optional(),
 	caps: TargetKindCapsSchema
 });
 /**
@@ -63691,7 +63751,9 @@ var ManifestShapeSchema = zod.z.object({
 		icon: zod.z.string().optional()
 	}).optional(),
 	protected: zod.z.boolean().optional(),
-	removable: zod.z.boolean().optional()
+	removable: zod.z.boolean().optional(),
+	/** Declared Integrations-page block (mirror of `AddonDeclaration.integrationSection`). */
+	integrationSection: zod.z.enum(["system", "providers"]).optional()
 });
 var AddonProcessSchema = zod.z.object({
 	pid: zod.z.number().optional(),
@@ -64266,9 +64328,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³. */
@@ -64301,12 +64363,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
@@ -64339,7 +64401,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"
 	})),
@@ -64368,7 +64430,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,
@@ -64764,7 +64826,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
@@ -64774,7 +64836,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.
 	*/
@@ -64798,7 +64860,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
@@ -64832,7 +64894,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.
 	*/
@@ -64852,15 +64914,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"],
@@ -64954,7 +65016,7 @@ onStatusChanged: { data: zod.z.object({
 		schema: BatteryStatusSchema,
 		kind: "push",
 		empty: {
-			percentage: null,
+			level: null,
 			charging: "unknown",
 			sleeping: false,
 			lastUpdated: 0
@@ -64981,11 +65043,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"
 		}
@@ -65049,14 +65111,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()
 });
@@ -65068,7 +65130,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"
@@ -65081,7 +65143,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: {
@@ -65104,7 +65166,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
@@ -65848,11 +65910,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",
@@ -65864,7 +65926,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()
 });
@@ -65900,7 +65962,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: {
@@ -66933,11 +66995,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. */
@@ -67156,14 +67218,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
@@ -67816,7 +67878,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")),
@@ -67843,7 +67905,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"
@@ -67876,7 +67938,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,
 	/**
@@ -67890,7 +67952,7 @@ var fanControlCapability = {
 	* History (D850): recorded series. Actuator tier: speed keeps every change.
 	*/
 	history: { fields: {
-		percentage: {
+		speed: {
 			kind: "gauge",
 			unit: "%",
 			minIntervalMs: 0
@@ -68360,7 +68422,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"
 	})),
@@ -68389,7 +68451,7 @@ var humiditySensorCapability = {
 	/**
 	* History (D850): recorded series.
 	*/
-	history: { fields: { percent: {
+	history: { fields: { humidity: {
 		kind: "gauge",
 		unit: "%",
 		deadband: .5
@@ -69057,7 +69119,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")),
@@ -69754,7 +69816,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.
@@ -69850,10 +69912,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(),
@@ -69892,7 +69954,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"
@@ -69964,7 +70026,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: {
@@ -71189,9 +71251,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. */
@@ -71200,7 +71262,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
 };
 /**
@@ -71217,9 +71279,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",
@@ -71270,13 +71332,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,
@@ -73639,16 +73701,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. */
@@ -73706,14 +73768,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 = {
@@ -73729,41 +73791,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,
@@ -73815,9 +73877,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()
 });
@@ -73846,14 +73905,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"]
@@ -73870,7 +73922,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()
 });
@@ -73896,7 +73948,7 @@ var pressureSensorCapability = {
 	/**
 	* History (D850): recorded series.
 	*/
-	history: { fields: { hpa: {
+	history: { fields: { pressure: {
 		kind: "gauge",
 		unit: "hPa",
 		deadband: .1
@@ -79123,7 +79175,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"
 	})),
@@ -79152,7 +79204,7 @@ var temperatureSensorCapability = {
 	/**
 	* History (D850): recorded series.
 	*/
-	history: { fields: { celsius: {
+	history: { fields: { temperature: {
 		kind: "gauge",
 		unit: "°C",
 		deadband: .1
@@ -79520,7 +79572,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. */
@@ -81411,6 +81463,7 @@ function evaluateAggregate(input) {
 function sourcePickForTemplate(template) {
 	const valueKind = template.family === "numeric" ? "number" : template.activeWhen === void 0 ? "boolean" : "state";
 	return {
+		fieldChoice: template.family === "numeric" ? "first-match" : "operator",
 		purpose: "member",
 		multiple: true,
 		max: 64,
@@ -81430,6 +81483,7 @@ function sourcePickForTemplate(template) {
 /** A statistic or integral reads one field that declares history. */
 function sourcePickForHistory(kind) {
 	return {
+		fieldChoice: "operator",
 		purpose: "historised",
 		multiple: false,
 		max: 1,
@@ -81469,6 +81523,7 @@ function sourcePickForMath(kind) {
 	const multiple = kind === "sum" || kind === "expression";
 	const max = kind === "difference" || kind === "ratio" ? 2 : multiple ? 64 : 1;
 	return {
+		fieldChoice: "operator",
 		purpose: "reading",
 		multiple: multiple || max > 1,
 		max,
@@ -82170,7 +82225,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");
@@ -82185,7 +82240,7 @@ function roomCompositionExample(input) {
 			kind: "fields",
 			cap: "temperature-sensor",
 			fields: {
-				celsius: {
+				temperature: {
 					kind: "expression",
 					expr: `round(avg(${Object.keys(t).join(", ")}), 1)`,
 					bindings: t
@@ -82231,7 +82286,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).
 */
@@ -82300,7 +82355,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") }
@@ -82368,10 +82423,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) {
@@ -82558,7 +82613,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 	"battery": {
 		version: 1,
 		targets: [{
-			id: "percentage",
+			id: "level",
 			cardinality: "scalar",
 			deviceTypes: [
 				require_err_msg.DeviceType.Camera,
@@ -82572,7 +82627,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 			],
 			apply: "add",
 			vocabularyCap: "battery",
-			vocabularyStateField: "percentage",
+			vocabularyStateField: "level",
 			sources: [{
 				kind: "field",
 				valueKinds: ["number", "string"],
@@ -82587,7 +82642,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 			}],
 			sourceReport: { status: "assignment-status" },
 			advancedExpression: true,
-			path: "percentage",
+			path: "level",
 			valueKind: "number",
 			nullable: true,
 			companions: [
@@ -82822,7 +82877,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 		version: 1,
 		targets: [
 			{
-				id: "watts",
+				id: "power",
 				cardinality: "scalar",
 				deviceTypes: [
 					require_err_msg.DeviceType.Switch,
@@ -82842,7 +82897,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 				],
 				apply: "add",
 				vocabularyCap: "power-meter",
-				vocabularyStateField: "watts",
+				vocabularyStateField: "power",
 				sources: [{
 					kind: "numeric",
 					requiredUnit: "W",
@@ -82851,7 +82906,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 				}],
 				sourceReport: { status: "assignment-status" },
 				advancedExpression: true,
-				path: "watts",
+				path: "power",
 				valueKind: "number",
 				nullable: false,
 				companions: [{
@@ -82861,7 +82916,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 				}]
 			},
 			{
-				id: "kwhTotal",
+				id: "energy",
 				cardinality: "scalar",
 				deviceTypes: [
 					require_err_msg.DeviceType.Switch,
@@ -82881,7 +82936,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 				],
 				apply: "add",
 				vocabularyCap: "power-meter",
-				vocabularyStateField: "kwhTotal",
+				vocabularyStateField: "energy",
 				sources: [{
 					kind: "numeric",
 					requiredUnit: "kWh",
@@ -82890,7 +82945,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 				}],
 				sourceReport: { status: "assignment-status" },
 				advancedExpression: true,
-				path: "kwhTotal",
+				path: "energy",
 				valueKind: "number",
 				nullable: false,
 				companions: [{
@@ -82900,7 +82955,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 				}]
 			},
 			{
-				id: "volts",
+				id: "voltage",
 				cardinality: "scalar",
 				deviceTypes: [
 					require_err_msg.DeviceType.Switch,
@@ -82920,7 +82975,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 				],
 				apply: "add",
 				vocabularyCap: "power-meter",
-				vocabularyStateField: "volts",
+				vocabularyStateField: "voltage",
 				sources: [{
 					kind: "numeric",
 					requiredUnit: "V",
@@ -82929,7 +82984,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 				}],
 				sourceReport: { status: "assignment-status" },
 				advancedExpression: true,
-				path: "volts",
+				path: "voltage",
 				valueKind: "number",
 				nullable: false,
 				companions: [{
@@ -82939,7 +82994,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 				}]
 			},
 			{
-				id: "amps",
+				id: "current",
 				cardinality: "scalar",
 				deviceTypes: [
 					require_err_msg.DeviceType.Switch,
@@ -82959,7 +83014,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 				],
 				apply: "add",
 				vocabularyCap: "power-meter",
-				vocabularyStateField: "amps",
+				vocabularyStateField: "current",
 				sources: [{
 					kind: "numeric",
 					requiredUnit: "A",
@@ -82968,7 +83023,7 @@ var CAP_CUSTOMIZE_CATALOG = {
 				}],
 				sourceReport: { status: "assignment-status" },
 				advancedExpression: true,
-				path: "amps",
+				path: "current",
 				valueKind: "number",
 				nullable: false,
 				companions: [{
@@ -83069,19 +83124,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
@@ -85200,7 +85255,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
@@ -85240,7 +85295,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', { … })`.
 	*
@@ -87205,17 +87260,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": {
@@ -97673,7 +97728,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",
@@ -97681,7 +97736,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",
@@ -97689,16 +97744,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",
@@ -97712,13 +97767,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",
@@ -97732,7 +97787,7 @@ var ACTUATOR_CAP_VOCABULARY = {
 				icon: "sun",
 				args: { color: {
 					mode: "mired",
-					mireds: 370
+					colorTemperature: 370
 				} }
 			},
 			{
@@ -97743,7 +97798,7 @@ var ACTUATOR_CAP_VOCABULARY = {
 				icon: "snowflake",
 				args: { color: {
 					mode: "mired",
-					mireds: 200
+					colorTemperature: 200
 				} }
 			},
 			{
@@ -98357,7 +98412,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",
@@ -98365,16 +98420,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",
@@ -98436,7 +98491,7 @@ var ACTUATOR_CAP_VOCABULARY = {
 		],
 		state: [{
 			kind: "numeric",
-			field: "percentage",
+			field: "speed",
 			quantity: t("the speed", "la velocità"),
 			label: t("Speed", "Velocità"),
 			unit: "%",
@@ -99236,7 +99291,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: "%",
@@ -99594,10 +99649,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",
@@ -100650,7 +100705,7 @@ var SENSOR_CAP_VOCABULARY = {
 		state: [
 			{
 				kind: "numeric",
-				field: "co2Ppm",
+				field: "co2",
 				quantity: t("the CO₂", "la CO₂"),
 				label: t("CO₂", "CO₂"),
 				unit: "ppm",
@@ -100658,7 +100713,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",
@@ -100694,7 +100749,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",
@@ -100897,7 +100952,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: "%",
@@ -100945,7 +101000,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",
@@ -100953,7 +101008,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",
@@ -100961,7 +101016,7 @@ var SENSOR_CAP_VOCABULARY = {
 			},
 			{
 				kind: "numeric",
-				field: "volts",
+				field: "voltage",
 				quantity: t("the voltage", "la tensione"),
 				label: t("Voltage", "Tensione"),
 				unit: "V",
@@ -100969,7 +101024,7 @@ var SENSOR_CAP_VOCABULARY = {
 			},
 			{
 				kind: "numeric",
-				field: "amps",
+				field: "current",
 				quantity: t("the current", "la corrente"),
 				label: t("Current", "Corrente"),
 				unit: "A",
@@ -100986,13 +101041,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": {
@@ -101000,7 +101048,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",
@@ -101036,7 +101084,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",
@@ -101107,7 +101155,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: "%",
@@ -101149,7 +101197,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"),
@@ -101167,7 +101215,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: "%",
@@ -109900,6 +109948,46 @@ function prepareNotification(caps, n) {
 	};
 }
 //#endregion
+//#region src/notification/delivery-params.ts
+function valueFor(param, raw) {
+	switch (param.type) {
+		case "enum": return typeof raw === "string" && (param.options ?? []).some((o) => o.value === raw) ? raw : void 0;
+		case "number": {
+			if (typeof raw !== "number" || !Number.isFinite(raw)) return void 0;
+			const floor = param.min ?? Number.NEGATIVE_INFINITY;
+			const ceil = param.max ?? Number.POSITIVE_INFINITY;
+			return Math.min(ceil, Math.max(floor, raw));
+		}
+		case "boolean": return typeof raw === "boolean" ? raw : void 0;
+		case "string": return typeof raw === "string" && raw.length > 0 ? raw : void 0;
+	}
+}
+/**
+* The values a rule target's `params` contribute for a kind: only declared
+* keys, only valid values. `undefined` when nothing survives — a notifier that
+* declared nothing is never handed a `delivery` block.
+*/
+function resolveDeliveryParams(declared, params) {
+	if (declared === void 0 || params === void 0) return void 0;
+	const out = {};
+	for (const param of declared) {
+		const value = valueFor(param, params[param.key]);
+		if (value !== void 0) out[param.key] = value;
+	}
+	return Object.keys(out).length > 0 ? out : void 0;
+}
+/** The union of several kinds' declarations; the first declaration of a key wins. */
+function deliveryParamsDeclaredBy(perKind) {
+	const seen = /* @__PURE__ */ new Set();
+	const out = [];
+	for (const declared of perKind) for (const param of declared ?? []) {
+		if (seen.has(param.key)) continue;
+		seen.add(param.key);
+		out.push(param);
+	}
+	return out;
+}
+//#endregion
 //#region src/notification/system-event-filters.ts
 /**
 * WHICH narrowing filter speaks about WHICH system-event kind — one predicate,
@@ -118210,6 +118298,29 @@ function rewriteReferer(referer, route) {
 	if (upstream === void 0) return null;
 	return `${upstream.scheme}://${upstream.host}${rest?.[2] ?? "/"}${url.search}`;
 }
+function decodeFormComponent(raw) {
+	try {
+		return decodeURIComponent(raw.replace(/\+/g, " "));
+	} catch {
+		return null;
+	}
+}
+/**
+* An `application/x-www-form-urlencoded` body whose field VALUES that are proxy URLs of
+* this attempt (absolute or root-relative) are turned back into the vendor URL they stand
+* for — the page's hidden inputs were rewritten on the way out (`rewriteBody`), and the
+* vendor must get its own URL back. Field order and every untouched pair stay byte-identical.
+*/
+function rewriteFormBody(body, route) {
+	return body.split("&").map((pair) => {
+		const eq = pair.indexOf("=");
+		if (eq === -1) return pair;
+		const value = decodeFormComponent(pair.slice(eq + 1));
+		if (value === null || !/^(?:https?:\/\/|\/)/i.test(value)) return pair;
+		const back = rewriteReferer(value, route);
+		return back === null ? pair : `${pair.slice(0, eq + 1)}${encodeURIComponent(back)}`;
+	}).join("&");
+}
 /** Cookies the browser holds for the hub itself must never reach a vendor. */
 function filterForwardedCookies(cookieHeader) {
 	return cookieHeader.split(";").map((part) => part.trim()).filter((part) => part.length > 0 && !part.toLowerCase().startsWith("camstack_")).join("; ");
@@ -118270,6 +118381,9 @@ function bodyKindOf(contentType) {
 	if (type.startsWith("text/") || type.includes("javascript") || type.includes("json") || type.includes("xml")) return "other";
 	return null;
 }
+function isFormEncoded(contentType) {
+	return (firstHeader(contentType) ?? "").toLowerCase().startsWith("application/x-www-form-urlencoded");
+}
 function firstHeader(value) {
 	return Array.isArray(value) ? value[0] : value;
 }
@@ -118400,7 +118514,7 @@ var VendorLoginProxy = class {
 				sendPlain(res, 413, "Request too large");
 				return;
 			}
-			body = read;
+			body = isFormEncoded(req.headers["content-type"]) ? Buffer.from(rewriteFormBody(read.toString("utf8"), route), "utf8") : read;
 		}
 		const headers = this.#requestHeaders(req, route, upstream);
 		const upstreamRes = await this.#fetch(target, {
@@ -118414,9 +118528,10 @@ var VendorLoginProxy = class {
 		const kind = bodyKindOf(upstreamRes.headers.get("content-type") ?? "");
 		const declaredLength = Number(upstreamRes.headers.get("content-length") ?? "0");
 		const text = kind !== null && !(declaredLength > MAX_TEXT_BODY_BYTES) && method !== "HEAD" ? await upstreamRes.text() : null;
-		this.#logger.debug("vendor login proxy: upstream answered", { meta: {
+		this.#logger.info("vendor login proxy: upstream answered", { meta: {
 			addonId: this.#addonId,
 			host: upstream.host,
+			path: target.pathname,
 			status: upstreamRes.status,
 			method
 		} });
@@ -120107,6 +120222,8 @@ exports.DeclareKindResultSchema = DeclareKindResultSchema;
 exports.DeclaredDevices = DeclaredDevices;
 exports.DecodedAudioChunkSchema = require_sleep.DecodedAudioChunkSchema;
 exports.DeleteIntegrationResultSchema = DeleteIntegrationResultSchema;
+exports.DeliveryParamSchema = DeliveryParamSchema;
+exports.DeliveryParamValueSchema = DeliveryParamValueSchema;
 exports.DerivativeHelperSpecSchema = require_composition.DerivativeHelperSpecSchema;
 exports.DetailCropConventionSchema = DetailCropConventionSchema;
 exports.DetectionCatalogClassMapSchema = DetectionCatalogClassMapSchema;
@@ -121904,6 +122021,7 @@ exports.defineRecordKinds = require_sleep.defineRecordKinds;
 exports.dehydrateConfigField = require_sleep.dehydrateConfigField;
 exports.dehydrateSchema = require_sleep.dehydrateSchema;
 exports.deleteAlarmProfile = deleteAlarmProfile;
+exports.deliveryParamsDeclaredBy = deliveryParamsDeclaredBy;
 exports.derivativeDraft = derivativeDraft;
 exports.derivativeUnitLabel = derivativeUnitLabel;
 exports.deriveBatteryPresence = deriveBatteryPresence;
@@ -122462,6 +122580,7 @@ exports.resolveContainerPrimaryChild = resolveContainerPrimaryChild;
 exports.resolveCoreBlockEntry = resolveCoreBlockEntry;
 exports.resolveCoreBlockFiles = resolveCoreBlockFiles;
 exports.resolveCreateExportSubject = resolveCreateExportSubject;
+exports.resolveDeliveryParams = resolveDeliveryParams;
 exports.resolveDeviceControlKind = resolveDeviceControlKind;
 exports.resolveDeviceProfile = resolveDeviceProfile;
 exports.resolveDeviceTarget = resolveDeviceTarget;