@camstack/addon-post-analysis 1.2.629 → 1.2.630

package/dist/pipeline-analytics/index.js

@@ -2,7 +2,7 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_clip_model_registry = require("../clip-model-registry-M_QM7l6j.js");
+const require_clip_model_registry = require("../clip-model-registry-DB0TSd14.js");
 let node_fs = require("node:fs");
 node_fs = require_clip_model_registry.__toESM(node_fs, 1);
 let node_path = require("node:path");
@@ -9026,27 +9026,13 @@ var en_default = {
 	"system.device-consumable-low.title": "Consumable low — {{deviceName}}",
 	"system.device-consumable-low.body": "{{item}} on {{deviceName}} is at {{percentage}}%",
 	"system.device-consumable-low.body.unmeasured": "{{item}} on {{deviceName}} needs replacing",
+	"system.device-consumable-low.body.tank": "{{item}} on {{deviceName}} is nearly empty",
+	"system.device-consumable-low.body.tank-full": "{{item}} on {{deviceName}} is full",
+	"system.device-consumable-low.body.product": "{{item}} on {{deviceName}} is running out",
+	"system.device-consumable-low.body.bin": "{{item}} on {{deviceName}} is full",
 	"system.device-consumable-normal.title": "Consumable replaced — {{deviceName}}",
 	"system.device-consumable-normal.body": "{{item}} on {{deviceName}} is back to {{percentage}}%",
 	"system.device-consumable-normal.body.unmeasured": "{{item}} on {{deviceName}} is OK again",
-	"system.device-tank-low.title": "Tank low — {{deviceName}}",
-	"system.device-tank-full.title": "Tank full — {{deviceName}}",
-	"system.device-tank-normal.title": "Tank OK — {{deviceName}}",
-	"system.device-tank-low.body.cleanWater": "The clean water tank on {{deviceName}} is running low",
-	"system.device-tank-full.body.cleanWater": "The clean water tank on {{deviceName}} is full",
-	"system.device-tank-normal.body.cleanWater": "The clean water tank on {{deviceName}} is OK again",
-	"system.device-tank-low.body.dirtyWater": "The dirty water tank on {{deviceName}} is running low",
-	"system.device-tank-full.body.dirtyWater": "The dirty water tank on {{deviceName}} is full",
-	"system.device-tank-normal.body.dirtyWater": "The dirty water tank on {{deviceName}} is OK again",
-	"system.device-tank-low.body.detergent": "The detergent tank on {{deviceName}} is running low",
-	"system.device-tank-full.body.detergent": "The detergent tank on {{deviceName}} is full",
-	"system.device-tank-normal.body.detergent": "The detergent tank on {{deviceName}} is OK again",
-	"system.device-tank-low.body.dustBin": "The dust bin on {{deviceName}} is running low",
-	"system.device-tank-full.body.dustBin": "The dust bin on {{deviceName}} is full",
-	"system.device-tank-normal.body.dustBin": "The dust bin on {{deviceName}} is OK again",
-	"system.device-tank-low.body.item": "{{item}} on {{deviceName}} is running low",
-	"system.device-tank-full.body.item": "{{item}} on {{deviceName}} is full",
-	"system.device-tank-normal.body.item": "{{item}} on {{deviceName}} is OK again",
 	"system.camera-online.title": "Device online",
 	"system.camera-online.body": "Device {{deviceName}} is online",
 	"system.camera-offline.title": "Device offline",
@@ -9201,8 +9187,7 @@ var en_default = {
 	"summary.section.device-state": "Offline or off",
 	"summary.section.streams": "Streams offline",
 	"summary.section.battery": "Low batteries",
-	"summary.section.consumables": "Consumables to replace",
-	"summary.section.tanks": "Tanks low",
+	"summary.section.consumables": "Consumables",
 	"summary.section.detection-blind": "Detecting nothing",
 	"summary.section.nodes": "Nodes with problems",
 	"summary.section.addons": "Addons stopped",
@@ -9220,7 +9205,12 @@ var en_default = {
 	"summary.line.addon-crash-loop": "{{nodeId}} — {{addons}} stopped after repeated crashes (since {{since}})",
 	"summary.line.update": "{{packageName}} {{currentVersion}} → {{latestVersion}}",
 	"summary.line.wrapper-update": "Container {{currentVersion}} → {{latestVersion}}",
-	"summary.line.tank-unread": "{{deviceName}} — the {{tank}} tank needs attention",
+	"summary.line.consumable.part": "{{item}} {{percentage}}%",
+	"summary.line.consumable.part.unmeasured": "{{item}} needs replacing",
+	"summary.line.consumable.tank": "{{item}} nearly empty",
+	"summary.line.consumable.tank-full": "{{item}} full",
+	"summary.line.consumable.product": "{{item}} running out",
+	"summary.line.consumable.bin": "{{item}} full",
 	"calendar-events.title": "{{rule}}: {{count}} upcoming",
 	"calendar-events.empty": "No events in the next {{horizonDays}} day(s).",
 	"calendar-events.day.today": "Today — {{date}}",
@@ -9432,27 +9422,13 @@ var it_default = {
 	"system.device-consumable-low.title": "Consumabile basso — {{deviceName}}",
 	"system.device-consumable-low.body": "{{item}} su {{deviceName}} è al {{percentage}}%",
 	"system.device-consumable-low.body.unmeasured": "{{item}} su {{deviceName}} va sostituito",
+	"system.device-consumable-low.body.tank": "{{item}} di {{deviceName}} è quasi vuota",
+	"system.device-consumable-low.body.tank-full": "{{item}} di {{deviceName}} è piena",
+	"system.device-consumable-low.body.product": "{{item}} di {{deviceName}} è in esaurimento",
+	"system.device-consumable-low.body.bin": "{{item}} di {{deviceName}} è pieno",
 	"system.device-consumable-normal.title": "Consumabile sostituito — {{deviceName}}",
 	"system.device-consumable-normal.body": "{{item}} su {{deviceName}} è tornato al {{percentage}}%",
 	"system.device-consumable-normal.body.unmeasured": "{{item}} su {{deviceName}} è di nuovo a posto",
-	"system.device-tank-low.title": "Serbatoio quasi vuoto — {{deviceName}}",
-	"system.device-tank-full.title": "Serbatoio pieno — {{deviceName}}",
-	"system.device-tank-normal.title": "Serbatoio a posto — {{deviceName}}",
-	"system.device-tank-low.body.cleanWater": "Il serbatoio dell'acqua pulita di {{deviceName}} è quasi vuoto",
-	"system.device-tank-full.body.cleanWater": "Il serbatoio dell'acqua pulita di {{deviceName}} è pieno",
-	"system.device-tank-normal.body.cleanWater": "Il serbatoio dell'acqua pulita di {{deviceName}} è di nuovo a posto",
-	"system.device-tank-low.body.dirtyWater": "Il serbatoio dell'acqua sporca di {{deviceName}} è quasi vuoto",
-	"system.device-tank-full.body.dirtyWater": "Il serbatoio dell'acqua sporca di {{deviceName}} è pieno",
-	"system.device-tank-normal.body.dirtyWater": "Il serbatoio dell'acqua sporca di {{deviceName}} è di nuovo a posto",
-	"system.device-tank-low.body.detergent": "Il serbatoio del detergente di {{deviceName}} è quasi vuoto",
-	"system.device-tank-full.body.detergent": "Il serbatoio del detergente di {{deviceName}} è pieno",
-	"system.device-tank-normal.body.detergent": "Il serbatoio del detergente di {{deviceName}} è di nuovo a posto",
-	"system.device-tank-low.body.dustBin": "Il contenitore della polvere di {{deviceName}} è quasi vuoto",
-	"system.device-tank-full.body.dustBin": "Il contenitore della polvere di {{deviceName}} è pieno",
-	"system.device-tank-normal.body.dustBin": "Il contenitore della polvere di {{deviceName}} è di nuovo a posto",
-	"system.device-tank-low.body.item": "{{item}} di {{deviceName}} sta finendo",
-	"system.device-tank-full.body.item": "{{item}} di {{deviceName}} è pieno",
-	"system.device-tank-normal.body.item": "{{item}} di {{deviceName}} è di nuovo a posto",
 	"system.camera-online.title": "Dispositivo online",
 	"system.camera-online.body": "Il dispositivo {{deviceName}} è online",
 	"system.camera-offline.title": "Dispositivo offline",
@@ -9607,8 +9583,7 @@ var it_default = {
 	"summary.section.device-state": "Offline o spenti",
 	"summary.section.streams": "Stream offline",
 	"summary.section.battery": "Batterie scariche",
-	"summary.section.consumables": "Consumabili da sostituire",
-	"summary.section.tanks": "Serbatoi bassi",
+	"summary.section.consumables": "Consumabili",
 	"summary.section.detection-blind": "Senza detection",
 	"summary.section.nodes": "Nodi con problemi",
 	"summary.section.addons": "Addon fermati",
@@ -9626,7 +9601,12 @@ var it_default = {
 	"summary.line.addon-crash-loop": "{{nodeId}} — {{addons}} fermati dopo crash ripetuti (da {{since}})",
 	"summary.line.update": "{{packageName}} {{currentVersion}} → {{latestVersion}}",
 	"summary.line.wrapper-update": "Container {{currentVersion}} → {{latestVersion}}",
-	"summary.line.tank-unread": "{{deviceName}} — il serbatoio {{tank}} richiede attenzione",
+	"summary.line.consumable.part": "{{item}} {{percentage}}%",
+	"summary.line.consumable.part.unmeasured": "{{item}} da sostituire",
+	"summary.line.consumable.tank": "{{item}} quasi vuota",
+	"summary.line.consumable.tank-full": "{{item}} piena",
+	"summary.line.consumable.product": "{{item}} in esaurimento",
+	"summary.line.consumable.bin": "{{item}} pieno",
 	"calendar-events.title": "{{rule}}: {{count}} in arrivo",
 	"calendar-events.empty": "Nessun evento nei prossimi {{horizonDays}} giorno/i.",
 	"calendar-events.day.today": "Oggi — {{date}}",
@@ -11908,9 +11888,9 @@ function systemEventKeys(kind) {
 		titleKey: `system.${kind}.title`,
 		bodyKey: `system.${kind}.body.ignored`
 	};
-	if (require_clip_model_registry.NC_TANK_SYSTEM_EVENT_KINDS.includes(kind)) return {
+	if (kind === "device-consumable-low") return {
 		titleKey: `system.${kind}.title`,
-		bodyKey: `system.${kind}.body.cleanWater`
+		bodyKey: "system.device-consumable-low.body.tank"
 	};
 	if (kind === "rule-broken") return {
 		titleKey: `system.${kind}.title`,
@@ -71570,6 +71550,25 @@ Object.freeze({
 		"path": "reason",
 		"valueType": "string"
 	}],
+	"running-state": [
+		{
+			"path": "running",
+			"valueType": "boolean"
+		},
+		{
+			"path": "since",
+			"valueType": "number"
+		},
+		{
+			"path": "source",
+			"valueType": "enum",
+			"enumValues": ["native", "assigned"]
+		},
+		{
+			"path": "phase",
+			"valueType": "string"
+		}
+	],
 	"script-runner": [
 		{
 			"path": "isRunning",
@@ -81077,83 +81076,6 @@ function deriveConsumableBand(input) {
 	return value <= input.thresholdPercent ? "low" : "normal";
 }
 //#endregion
-//#region src/notification-center/alerts/tank-band.ts
-/**
-* A TANK reduced to the only thing worth storing: its band (D642).
-*
-* A tank is a `supply` or `waste` item of a device's `consumables` slice
-* (D915 — before it, the four vacuum tanks lived on `vacuum-control`): a
-* vacuum's clean water, dirty water, detergent and dust bin, a dishwasher's
-* salt and rinse aid. `consumable-routing.ts` narrows the item's status to the
-* band vocabulary below. The operator asked for them to notify like
-* consumables: a supply running low, a waste tank full.
-*
-* ## The verdict is the provider's
-*
-* A tank's `status` is the device's own sensor (`ok` | `low` | `full`),
-* and it is the ONLY thing judged. The hub has no threshold for a tank level:
-* the rule for thresholds is that they belong to whoever generates the event,
-* and a tank that says `low` has already decided. A tank that reports only a
-* `level` is therefore not judged at all (`null`) rather than judged against a
-* number the hub would have to invent.
-*
-* ## `null` is the third answer, and it is not `normal`
-*
-* An unknown status says nothing — it neither opens nor closes an episode, for
-* the reason `battery-band.ts` gives: a reading nobody took is not evidence
-* that anything changed.
-*
-* Pure. No clock, no I/O.
-*/
-/**
-* The tanks with a sentence of their own (`system.device-tank-*.body.<key>`),
-* by their item key — the four a vacuum reports. Any other tank (salt, rinse
-* aid, …) is worded by its label (`body.item`).
-*/
-var NC_TANK_KEYS = [
-	"cleanWater",
-	"dirtyWater",
-	"detergent",
-	"dustBin"
-];
-function isNamedTankKey(key) {
-	return NC_TANK_KEYS.some((k) => k === key);
-}
-/**
-* How long a tank change must HOLD before it counts (D642 review M2).
-*
-* A float switch sloshing at the edge of `low` / `full` flips its status back
-* and forth while the robot moves; each flip is a durable transition, and
-* without a hold each one is a raise and a recovery on the operator's phone.
-* One minute is two reload ticks: long enough to outlast a slosh, short enough
-* that a genuinely full dust bin is said within a minute and a half.
-*/
-var NC_TANK_HOLD_MS = 6e4;
-function deriveTankBand(reading) {
-	switch (reading.status) {
-		case "low": return "low";
-		case "full": return "full";
-		case "ok": return "normal";
-		case null: return null;
-	}
-}
-/** `tank:<deviceId>:<key>` — the subject of one tank's episode. */
-function tankSubject(deviceId, key) {
-	return `tank:${String(deviceId)}:${key}`;
-}
-/** The parts of a tank subject, or `null` when it is not one. */
-function parseTankSubject(subject) {
-	const match = /^tank:(\d+):(.+)$/.exec(subject);
-	if (match === null) return null;
-	const deviceId = Number(match[1]);
-	const key = match[2];
-	if (!Number.isSafeInteger(deviceId) || key === void 0) return null;
-	return {
-		deviceId,
-		key
-	};
-}
-//#endregion
 //#region src/notification-center/device-directory.ts
 /**
 * WHO a device id is — the mirrored directory the system-event intake reads.
@@ -81915,6 +81837,7 @@ function incomingFromConsumableBand(input) {
 		textParams: {
 			...deviceTextParams(input.deviceId, input.identity),
 			item: input.item.label,
+			form: "part",
 			...percentage !== null ? { percentage: String(percentage) } : {}
 		},
 		deviceId: input.deviceId,
@@ -81922,29 +81845,33 @@ function incomingFromConsumableBand(input) {
 		...input.identity !== void 0 ? { deviceType: input.identity.type } : {}
 	});
 }
+/** Instant body keys for a consumable form (D934). */
+function consumableLowBodyKey(form, attention, measured) {
+	if (form === "part") return measured ? "system.device-consumable-low.body" : "system.device-consumable-low.body.unmeasured";
+	if (form === "tank") return attention === "full" ? "system.device-consumable-low.body.tank-full" : "system.device-consumable-low.body.tank";
+	if (form === "product") return "system.device-consumable-low.body.product";
+	return "system.device-consumable-low.body.bin";
+}
 /**
-* A TANK band, as a system-event subject (D642, D915).
+* A supply / waste item judged on the provider's verdict (D934).
 *
-* Built like {@link incomingFromConsumableBand}: `tank:<deviceId>:<tank>` is
-* one subject per tank (the dust bin's alert must not cancel the clean water's),
-* and the recovery keeps it. For the four named vacuum tanks the BODY VARIANT
-* names the tank in the reader's language — the params are frozen before the
-* language is known, so the tank's name cannot be a param; `tank` carries the
-* stable token for a custom template. Any other tank (a dishwasher's salt, …)
-* is worded by the provider's label through `body.item`.
+* Subject `consumable:<deviceId>:<key>` — no `consumableLowPercent` so rules
+* at 15 % still hear salt and water.
 */
-function incomingFromTankBand(input) {
-	const kind = input.band === "low" ? "device-tank-low" : input.band === "full" ? "device-tank-full" : "device-tank-normal";
+function incomingFromProviderConsumableBand(input) {
+	const kind = input.band === "low" ? "device-consumable-low" : "device-consumable-normal";
+	const bodyKey = input.band === "low" ? consumableLowBodyKey(input.item.form, input.attention, false) : "system.device-consumable-normal.body.unmeasured";
 	return systemSubject({
 		facts: input.facts,
 		kind,
-		subject: tankSubject(input.deviceId, input.tank),
+		subject: legacyConsumableSubject(input.deviceId, input.item.key),
 		titleKey: `system.${kind}.title`,
-		bodyKey: isNamedTankKey(input.tank) ? `system.${kind}.body.${input.tank}` : `system.${kind}.body.item`,
+		bodyKey,
 		textParams: {
 			...deviceTextParams(input.deviceId, input.identity),
-			tank: input.tank,
-			item: input.label ?? input.tank
+			item: input.item.label,
+			form: input.item.form,
+			attention: input.attention
 		},
 		deviceId: input.deviceId,
 		...input.identity !== void 0 ? { deviceType: input.identity.type } : {}
@@ -82829,13 +82756,43 @@ function deliveryForKind(kind) {
 	return kind;
 }
 //#endregion
-//#region src/notification-center/alerts/open-alert.ts
+//#region src/notification-center/alerts/tank-band.ts
 /**
-* The raise of an episode whose reading has not arrived since the restart —
-* worded with what the row KNOWS: no invented percentage (the binary battery
-* sentence), the item key as its name, and a tank kind that only the filters
-* read (the summary words an unmeasured tank without a band).
+* How long a tank change must HOLD before it counts (D642 review M2).
+*
+* A float switch sloshing at the edge of `low` / `full` flips its status back
+* and forth while the robot moves; each flip is a durable transition, and
+* without a hold each one is a raise and a recovery on the operator's phone.
+* One minute is two reload ticks: long enough to outlast a slosh, short enough
+* that a genuinely full dust bin is said within a minute and a half.
 */
+var NC_TANK_HOLD_MS = 6e4;
+function deriveTankBand(reading) {
+	switch (reading.status) {
+		case "low": return "low";
+		case "full": return "full";
+		case "ok": return "normal";
+		case null: return null;
+	}
+}
+/** `tank:<deviceId>:<key>` — the subject of one tank's episode. */
+function tankSubject(deviceId, key) {
+	return `tank:${String(deviceId)}:${key}`;
+}
+/** The parts of a tank subject, or `null` when it is not one. */
+function parseTankSubject(subject) {
+	const match = /^tank:(\d+):(.+)$/.exec(subject);
+	if (match === null) return null;
+	const deviceId = Number(match[1]);
+	const key = match[2];
+	if (!Number.isSafeInteger(deviceId) || key === void 0) return null;
+	return {
+		deviceId,
+		key
+	};
+}
+//#endregion
+//#region src/notification-center/alerts/open-alert.ts
 function unmeasuredEpisode(input) {
 	const deviceId = alertSubjectDeviceId(input.subject);
 	if (deviceId === void 0) return null;
@@ -82853,7 +82810,23 @@ function unmeasuredEpisode(input) {
 		identity
 	});
 	const parts = parseConsumableSubject(input.subject);
-	if (input.family === "consumable" && parts !== null) return incomingFromConsumableBand({
+	if (parts !== null && parts.legacy) {
+		const attention = input.detail === "full" ? "full" : "low";
+		const form = providerFormFromDetail(input.detail);
+		return incomingFromProviderConsumableBand({
+			facts,
+			deviceId,
+			band: "low",
+			item: {
+				key: parts.key,
+				label: parts.key,
+				form
+			},
+			attention,
+			identity
+		});
+	}
+	if (parts !== null) return incomingFromConsumableBand({
 		facts,
 		deviceId,
 		band: "low",
@@ -82867,25 +82840,30 @@ function unmeasuredEpisode(input) {
 		identity
 	});
 	const tank = parseTankSubject(input.subject);
-	if (tank === null || tank.deviceId !== deviceId) return null;
-	return incomingFromTankBand({
-		facts,
-		deviceId,
-		band: input.detail === "full" ? "full" : "low",
-		tank: tank.key,
-		identity
-	});
+	if (tank !== null && tank.deviceId === deviceId) {
+		const attention = input.detail === "full" ? "full" : "low";
+		return incomingFromProviderConsumableBand({
+			facts,
+			deviceId,
+			band: "low",
+			item: {
+				key: tank.key,
+				label: tank.key,
+				form: "tank"
+			},
+			attention,
+			identity
+		});
+	}
+	return null;
+}
+function providerFormFromDetail(detail) {
+	if (detail === "full") return "bin";
+	return "tank";
 }
-/**
-* One alerting row as an open episode, or `null` when it cannot be worded (the
-* caller logs it). A legacy consumable row is skipped: it is adopted or
-* retired first. A tank whose band the row remembers is worded by it
-* (review M6), even without a reading.
-*/
 function openAlertOf(row, input) {
 	const parts = parseConsumableSubject(row.subject);
-	if (parts?.legacy === true) return null;
-	const family = parts !== null ? "consumable" : row.subject.startsWith("tank:") ? "tank" : "battery";
+	const family = parts !== null || row.subject.startsWith("tank:") ? "consumable" : "battery";
 	const subject = (input.restated ?? unmeasuredEpisode({
 		subject: row.subject,
 		family,
@@ -82894,7 +82872,7 @@ function openAlertOf(row, input) {
 		...row.detail !== void 0 ? { detail: row.detail } : {}
 	}))?.subject.systemEvent;
 	if (subject === void 0) return null;
-	const measured = input.restated !== null || family === "tank" && row.detail !== void 0;
+	const measured = input.restated !== null || row.detail !== void 0 || parts !== null && !parts.legacy && subject.textParams?.["percentage"] !== void 0;
 	return {
 		family,
 		since: row.since,
@@ -83010,8 +82988,8 @@ var NcDeviceAlerts = class {
 	* reminder sweep and for judging a threshold a rule gains later (D642).
 	*/
 	lastConsumable = /* @__PURE__ */ new Map();
-	/** The last reading per tank SUBJECT, for the reminder sweep. */
-	lastTank = /* @__PURE__ */ new Map();
+	/** Provider-judged items, keyed by episode subject (`consumable:<id>:<key>`). */
+	lastProvider = /* @__PURE__ */ new Map();
 	/**
 	* Tank changes on HOLD (review M2): a band that would move the episode,
 	* first seen at `since`. It counts once it has held for `NC_TANK_HOLD_MS`,
@@ -83083,6 +83061,15 @@ var NcDeviceAlerts = class {
 	* genuine `replace` would then read as a transition out of a state nobody
 	* observed.
 	*/
+	/** One item from the consumables slice — every form (D934). */
+	observeConsumableItem(deviceId, sliceItem) {
+		this.closeLegacyTankEpisode(deviceId, sliceItem.key);
+		if (sliceItem.wear !== null) {
+			this.observeConsumable(deviceId, sliceItem.wear);
+			return;
+		}
+		this.observeProviderConsumable(deviceId, sliceItem);
+	}
 	observeConsumable(deviceId, item) {
 		this.lastConsumable.set(itemKeyOf(deviceId, item.key), {
 			deviceId,
@@ -83099,31 +83086,51 @@ var NcDeviceAlerts = class {
 		const settings = this.deps.settings();
 		for (const thresholdPercent of thresholds) this.judgeConsumable(deviceId, item, thresholdPercent, settings);
 	}
-	/**
-	* ONE tank — a `supply` / `waste` item of a device's `consumables` slice
-	* (D642; read from `consumables` since D915, `consumable-routing.ts`).
-	*
-	* The provider's verdict is the band (`tank-band.ts`); an unknown status
-	* leaves everything untouched, an open episode included.
-	*/
-	observeTank(deviceId, tank) {
-		const band = deriveTankBand(tank);
+	/** A supply / waste / tank-form item — provider verdict only (D934). */
+	observeProviderConsumable(deviceId, sliceItem) {
+		const band = deriveTankBand(providerTankReading(sliceItem));
 		if (band === null) return;
-		const subject = tankSubject(deviceId, tank.key);
-		this.lastTank.set(subject, {
+		const subject = legacyConsumableSubject(deviceId, sliceItem.key);
+		const attention = band === "full" ? "full" : "low";
+		this.lastProvider.set(subject, {
 			deviceId,
-			tank
+			item: sliceItem,
+			attention
 		});
 		if (!this.tankChangeHeld(subject, deviceId, band)) return;
-		this.apply(subject, band !== "normal", this.deps.settings(), (facts, alerting) => incomingFromTankBand({
+		this.apply(subject, band !== "normal", this.deps.settings(), (facts, alerting) => incomingFromProviderConsumableBand({
 			facts,
 			deviceId,
-			band: alerting ? band : "normal",
-			tank: tank.key,
-			...tank.label !== void 0 ? { label: tank.label } : {},
+			band: alerting ? "low" : "normal",
+			item: {
+				key: sliceItem.key,
+				label: sliceItem.label,
+				form: sliceItem.form
+			},
+			attention,
 			identity: this.deps.lookup(deviceId)
 		}), band === "normal" ? void 0 : band);
 	}
+	/** A leftover `tank:<deviceId>:<key>` row is closed silently when the item is seen as a consumable. */
+	closeLegacyTankEpisode(deviceId, key) {
+		const subject = tankSubject(deviceId, key);
+		const row = this.deps.rows.get(subject);
+		if (row === void 0 || !row.alerting) return;
+		this.logger()?.info("legacy tank episode closed — the consumables cap owns this item now (D934)", {
+			tags: { deviceId },
+			meta: {
+				subject,
+				key
+			}
+		});
+		this.deps.rows.put({
+			...row,
+			alerting: false
+		});
+		this.lastProvider.delete(legacyConsumableSubject(deviceId, key));
+		this.tankHold.delete(subject);
+		this.tankHold.delete(legacyConsumableSubject(deviceId, key));
+	}
 	/**
 	* Has this tank band held long enough to move its episode? A band that
 	* would not move it (a repeat, or low ⇄ full inside one open episode) passes
@@ -83164,12 +83171,12 @@ var NcDeviceAlerts = class {
 		const nowMs = this.now();
 		for (const [subject, held] of [...this.tankHold]) {
 			if (nowMs - held.since < NC_TANK_HOLD_MS) continue;
-			const reading = this.lastTank.get(subject);
+			const reading = this.lastProvider.get(subject);
 			if (reading === void 0) {
 				this.tankHold.delete(subject);
 				continue;
 			}
-			this.observeTank(reading.deviceId, reading.tank);
+			this.observeProviderConsumable(reading.deviceId, reading.item);
 		}
 	}
 	/** One item against ONE threshold: its own episode, its own hysteresis. */
@@ -83293,14 +83300,14 @@ var NcDeviceAlerts = class {
 		const subjects = this.deps.rows.all().map((row) => row.subject).filter((subject) => alertSubjectDeviceId(subject) === deviceId);
 		for (const subject of subjects) {
 			this.lastReading.delete(subject);
-			this.lastTank.delete(subject);
+			this.lastProvider.delete(subject);
 			this.offeredAt.delete(subject);
 			await this.deps.rows.remove(subject);
 		}
 		this.lastReading.delete(`battery:${deviceId}`);
 		for (const [key, reading] of this.lastConsumable) if (reading.deviceId === deviceId) this.lastConsumable.delete(key);
 		for (const subject of this.tankHold.keys()) if (alertSubjectDeviceId(subject) === deviceId) this.tankHold.delete(subject);
-		for (const subject of this.lastTank.keys()) if (alertSubjectDeviceId(subject) === deviceId) this.lastTank.delete(subject);
+		for (const subject of this.lastProvider.keys()) if (alertSubjectDeviceId(subject) === deviceId) this.lastProvider.delete(subject);
 		return subjects.length;
 	}
 	/**
@@ -83377,8 +83384,23 @@ var NcDeviceAlerts = class {
 	/** How to re-word a subject's alert from the last reading, or `null`. */
 	restatementOf(subject) {
 		const parts = parseConsumableSubject(subject);
+		if (parts !== null && parts.legacy) {
+			const provider = this.lastProvider.get(subject);
+			if (provider !== void 0) return (facts) => incomingFromProviderConsumableBand({
+				facts,
+				deviceId: provider.deviceId,
+				band: "low",
+				item: {
+					key: provider.item.key,
+					label: provider.item.label,
+					form: provider.item.form
+				},
+				attention: provider.attention,
+				identity: this.deps.lookup(provider.deviceId)
+			});
+		}
 		const consumable = parts === null || parts.legacy ? void 0 : this.lastConsumable.get(itemKeyOf(parts.deviceId, parts.key));
-		if (parts !== null && consumable !== void 0) return (facts) => incomingFromConsumableBand({
+		if (parts !== null && !parts.legacy && consumable !== void 0) return (facts) => incomingFromConsumableBand({
 			facts,
 			deviceId: consumable.deviceId,
 			band: "low",
@@ -83386,16 +83408,6 @@ var NcDeviceAlerts = class {
 			thresholdPercent: parts.thresholdPercent,
 			identity: this.deps.lookup(consumable.deviceId)
 		});
-		const tank = this.lastTank.get(subject);
-		const tankBand = tank === void 0 ? null : deriveTankBand(tank.tank);
-		if (tank !== void 0 && (tankBand === "low" || tankBand === "full")) return (facts) => incomingFromTankBand({
-			facts,
-			deviceId: tank.deviceId,
-			band: tankBand,
-			tank: tank.tank.key,
-			...tank.tank.label !== void 0 ? { label: tank.tank.label } : {},
-			identity: this.deps.lookup(tank.deviceId)
-		});
 		const battery = this.lastReading.get(subject);
 		if (battery !== void 0) return (facts) => incomingFromBatteryBand({
 			facts,
@@ -83528,8 +83540,52 @@ function tagsOf(subject) {
 	const deviceId = alertSubjectDeviceId(subject);
 	return deviceId !== void 0 ? { tags: { deviceId } } : {};
 }
+function providerTankReading(item) {
+	const base = {
+		key: item.key,
+		label: item.label,
+		level: item.level,
+		status: null
+	};
+	const status = item.status;
+	if (item.kind === "supply") switch (status) {
+		case "low":
+		case "empty":
+		case "replace": return {
+			...base,
+			status: "low"
+		};
+		case "ok":
+		case "full": return {
+			...base,
+			status: "ok"
+		};
+		default: return base;
+	}
+	if (item.kind === "waste") switch (status) {
+		case "full":
+		case "replace": return {
+			...base,
+			status: "full"
+		};
+		case "ok":
+		case "low":
+		case "empty": return {
+			...base,
+			status: "ok"
+		};
+		default: return base;
+	}
+	return base;
+}
 //#endregion
 //#region src/notification-center/alerts/consumable-routing.ts
+/**
+* The `consumables` slice — one vocabulary for every form (D934).
+*
+* Every item is a consumable reading: wear parts judged at the rule's threshold,
+* supply and waste judged on the provider's verdict (held like a float switch).
+*/
 function wearStatus(status) {
 	switch (status) {
 		case "replace":
@@ -83539,59 +83595,44 @@ function wearStatus(status) {
 		default: return null;
 	}
 }
-function supplyStatus(status) {
-	switch (status) {
-		case "low":
-		case "empty":
-		case "replace": return "low";
-		case "ok":
-		case "full": return "ok";
-		default: return null;
-	}
+function consumableKindOf(raw) {
+	return typeof raw.kind === "string" ? raw.kind : void 0;
 }
-function wasteStatus(status) {
-	switch (status) {
-		case "full":
-		case "replace": return "full";
-		case "ok":
-		case "low":
-		case "empty": return "ok";
-		default: return null;
-	}
+function consumableFormOfRaw(raw) {
+	const kind = consumableKindOf(raw);
+	const formField = typeof raw.form === "string" ? raw.form : void 0;
+	return require_clip_model_registry.consumableFormOf({
+		...kind === "wear" || kind === "supply" || kind === "waste" ? { kind } : {},
+		...formField === "part" || formField === "tank" || formField === "product" || formField === "bin" ? { form: formField } : {}
+	});
 }
-/** Which family judges this item, and the reading that family reads. */
-function routeConsumableItem(raw) {
-	const { key, label, level } = raw;
-	if (raw.kind === "supply" || raw.kind === "waste") return {
-		family: "tank",
-		tank: {
-			key,
-			label,
-			level,
-			status: raw.kind === "supply" ? supplyStatus(raw.status) : wasteStatus(raw.status)
-		}
-	};
+/** Parse one slice entry into the unified consumable item shape. */
+function parseConsumableSliceItem(raw) {
+	const kind = consumableKindOf(raw);
+	const form = consumableFormOfRaw(raw);
+	const status = typeof raw.status === "string" ? raw.status : null;
+	const wear = kind === void 0 || kind === "wear" ? {
+		key: raw.key,
+		label: raw.label,
+		level: raw.level,
+		status: wearStatus(status)
+	} : null;
 	return {
-		family: "consumable",
-		item: {
-			key,
-			label,
-			level,
-			status: wearStatus(raw.status)
-		}
+		key: raw.key,
+		label: raw.label,
+		level: raw.level,
+		status,
+		kind,
+		form,
+		wear
 	};
 }
 function isRecord$1(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 /**
-* A `device.state-changed` carrying a `consumables` slice, routed by family;
-* `null` for any other event, a malformed slice or an empty list.
-*
-* An item is kept only when it carries a usable `key` — the subject is built
-* from it. `level` and `status` are each optional; an item with NEITHER is
-* still returned, because deciding that it has told us nothing belongs to the
-* band derivation and not to a parser (D393: absent is not zero).
+* A `device.state-changed` carrying a `consumables` slice; `null` for any other
+* event, a malformed slice or an empty list.
 */
 function consumablesSliceOf(event) {
 	if (event.category !== "device.state-changed") return null;
@@ -83602,8 +83643,7 @@ function consumablesSliceOf(event) {
 	if (typeof deviceId !== "number" || !isRecord$1(slice)) return null;
 	const rawItems = slice["items"];
 	if (!Array.isArray(rawItems)) return null;
-	const consumables = [];
-	const tanks = [];
+	const items = [];
 	for (const entry of rawItems) {
 		if (!isRecord$1(entry)) continue;
 		const key = entry["key"];
@@ -83612,21 +83652,20 @@ function consumablesSliceOf(event) {
 		const level = entry["level"];
 		const status = entry["status"];
 		const kind = entry["kind"];
-		const routed = routeConsumableItem({
+		const form = entry["form"];
+		items.push(parseConsumableSliceItem({
 			key,
 			label: typeof label === "string" && label.length > 0 ? label : key,
 			level: typeof level === "number" && Number.isFinite(level) ? level : null,
 			status: typeof status === "string" ? status : null,
-			kind: typeof kind === "string" ? kind : void 0
-		});
-		if (routed.family === "tank") tanks.push(routed.tank);
-		else consumables.push(routed.item);
+			kind: typeof kind === "string" ? kind : void 0,
+			form: typeof form === "string" ? form : void 0
+		}));
 	}
-	if (consumables.length === 0 && tanks.length === 0) return null;
+	if (items.length === 0) return null;
 	return {
 		deviceId,
-		consumables,
-		tanks
+		items
 	};
 }
 //#endregion
@@ -85274,12 +85313,10 @@ var NcDeviceStateCache = class {
 * a job that COMPLETED, and the state it leaves behind is not a condition that
 * is still true. The ADR records why it is excluded rather than approximated.
 */
-/** One source: the cap's Zod enum (D698 LOW-6). */
-var NC_STATE_SUMMARY_SECTION_IDS = require_clip_model_registry.NcStateSummarySectionIdSchema.options;
 /** The kind groups that have no section, and why — said on the preview. */
 var NC_STATE_SUMMARY_EXCLUDED_GROUPS = { "backups-exports": "a backup or an export is a completed job, not a state that is still true" };
 function isStateSectionId(value) {
-	return NC_STATE_SUMMARY_SECTION_IDS.some((id) => id === value);
+	return require_clip_model_registry.NC_STATE_SUMMARY_SECTION_IDS.some((id) => id === value);
 }
 /** The template variable that carries one section's lines (`template-vars.ts`). */
 var NC_STATE_SECTION_VAR = {
@@ -85287,7 +85324,6 @@ var NC_STATE_SECTION_VAR = {
 	streams: "summaryStreams",
 	battery: "summaryBattery",
 	consumables: "summaryConsumables",
-	tanks: "summaryTanks",
 	"detection-blind": "summaryDetection",
 	nodes: "summaryNodes",
 	addons: "summaryAddons",
@@ -85305,11 +85341,13 @@ function sectionKinds(section) {
 * direction, only the event did.
 */
 function sectionsOfRule(condition) {
-	return NC_STATE_SUMMARY_SECTION_IDS.filter((section) => sectionKinds(section).some((kind) => condition.kinds.includes(kind)));
+	const kinds = condition.kinds;
+	return require_clip_model_registry.NC_STATE_SUMMARY_SECTION_IDS.filter((section) => sectionKinds(section).some((kind) => kinds.includes(kind)));
 }
 /** The kind groups the rule selected that have no section. */
 function excludedGroupsOfRule(condition) {
-	return require_clip_model_registry.NC_SYSTEM_EVENT_KIND_GROUP_SPECS.filter((group) => NC_STATE_SUMMARY_EXCLUDED_GROUPS[group.id] !== void 0 && group.kinds.some((kind) => condition.kinds.includes(kind))).map((group) => group.id);
+	const kinds = condition.kinds;
+	return require_clip_model_registry.NC_SYSTEM_EVENT_KIND_GROUP_SPECS.filter((group) => NC_STATE_SUMMARY_EXCLUDED_GROUPS[group.id] !== void 0 && group.kinds.some((kind) => kinds.includes(kind))).map((group) => group.id);
 }
 /**
 * The condition the summary judges its items with: the rule's own, with its
@@ -90056,6 +90094,12 @@ function classCounts(members) {
 * params go last because they are the row's own truth about a system event and
 * outrank the live vocabulary for exactly those names.
 */
+/** Intake-only keys for body variant selection — not operator template vars (D934). */
+function systemEventParamsForTemplate(params) {
+	if (params === void 0) return {};
+	const { form: _form, attention: _attention, ...rest } = params;
+	return rest;
+}
 function buildTemplateVars(texts, entry, deviceName, zoneLabels, timeZone) {
 	const subject = entry.payload.subject;
 	const occupancy = subject.occupancy;
@@ -90103,7 +90147,7 @@ function buildTemplateVars(texts, entry, deviceName, zoneLabels, timeZone) {
 		latestVersion: typeof systemEvent?.data["latestVersion"] === "string" ? systemEvent.data["latestVersion"] : "",
 		...systemEvent?.deviceId !== void 0 ? { deviceName: String(systemEvent.deviceId) } : {},
 		...systemEvent?.nodeId !== void 0 && (systemEvent.kind === "node-online" || systemEvent.kind === "node-offline") ? { nodeName: systemEvent.nodeId } : {},
-		...systemEvent?.textParams
+		...systemEventParamsForTemplate(systemEvent?.textParams)
 	};
 }
 /**
@@ -99566,15 +99610,30 @@ function deviceParams(deviceId, identity) {
 		deviceName: name.length > 0 ? name : String(deviceId)
 	};
 }
-function alertItem(section, open) {
+function consumableSummaryLineKey(params, measured) {
+	const form = params["form"] ?? "part";
+	if (form === "part") return measured && params["percentage"] !== void 0 ? "summary.line.consumable.part" : "summary.line.consumable.part.unmeasured";
+	if (form === "tank") return params["attention"] === "full" ? "summary.line.consumable.tank-full" : "summary.line.consumable.tank";
+	if (form === "product") return "summary.line.consumable.product";
+	return "summary.line.consumable.bin";
+}
+function alertItem(section, open, lookup) {
 	const params = open.subject.textParams ?? {};
-	const unreadTank = open.family === "tank" && !open.measured;
+	const lineKey = section === "consumables" ? consumableSummaryLineKey(params, open.measured) : open.subject.bodyKey ?? "";
+	const lineParams = section === "consumables" ? (({ deviceName: _deviceName, ...rest }) => rest)(params) : params;
+	const deviceId = open.subject.deviceId;
+	const identity = deviceId !== void 0 ? lookup(deviceId) : void 0;
+	const deviceName = params["deviceName"] ?? (identity !== void 0 && identity.name.length > 0 ? identity.name : deviceId !== void 0 ? String(deviceId) : void 0);
 	return {
 		section,
 		subject: open.subject,
-		lineKey: unreadTank ? "summary.line.tank-unread" : open.subject.bodyKey ?? "",
-		params,
-		since: open.since
+		lineKey,
+		params: lineParams,
+		since: open.since,
+		...section === "consumables" && deviceId !== void 0 && deviceName !== void 0 ? { device: {
+			id: deviceId,
+			name: deviceName
+		} } : {}
 	};
 }
 function livenessItem(row, lookup) {
@@ -99703,7 +99762,7 @@ function stateItem(row, lookup, nodes) {
 * (`parentDeviceId` set) still owns those alerts — filtering every accessory
 * here dropped every tank line of the 2026-10-05 evening summary for
 * deviceId 4385 while the episode was open and the instant path had already
-* held `device-tank-low` for that rule.
+* held a legacy tank kind for that rule.
 */
 function stillTrue(item, ports) {
 	const deviceId = item.subject.deviceId;
@@ -99743,16 +99802,16 @@ function readSection(section, ports, nowMs) {
 }
 /** Which ports a section needs, and why each one is unavailable. */
 function readRaw(section, ports, nowMs) {
-	if (section === "battery" || section === "consumables" || section === "tanks") {
+	if (section === "battery" || section === "consumables") {
 		const alerts = ports.alerts();
 		if (alerts === null) return {
 			answered: false,
 			reason: UNREAD_ALERTS
 		};
-		const family = section === "battery" ? "battery" : section === "tanks" ? "tank" : "consumable";
+		const family = section === "battery" ? "battery" : "consumable";
 		return {
 			answered: true,
-			items: alerts.filter((open) => open.family === family).map((open) => alertItem(section, open))
+			items: alerts.filter((open) => open.family === family).map((open) => alertItem(section, open, ports.lookup))
 		};
 	}
 	const state = ports.state();
@@ -99912,11 +99971,12 @@ function wordsOf(input, section) {
 /** One bullet per item; an item with a `node` is listed under its node's heading (D708). */
 function linesOf(input, items) {
 	const bullet = (item) => `• ${lineOf(input, item)}`;
-	if (!items.some((item) => item.node !== void 0)) return items.map(bullet).join("\n");
-	return groupByNode(items, input.texts.language).flatMap((group) => [input.texts.text({
+	if (items.some((item) => item.node !== void 0)) return groupByNode(items, input.texts.language).flatMap((group) => [input.texts.text({
 		key: "summary.node.heading",
 		vars: { node: group.node.name }
 	}), ...group.items.map(bullet)]).join("\n");
+	if (items.some((item) => item.device !== void 0)) return groupByDevice(items, input.texts.language).flatMap((group) => [`${group.device.name}:`, ...group.items.map(bullet)]).join("\n");
+	return items.map(bullet).join("\n");
 }
 /**
 * The items cut per node, in a STABLE order: the hub first, then by name, then
@@ -99941,6 +100001,21 @@ var HUB_HEADING = {
 	name: "hub",
 	isHub: true
 };
+/** Consumables items under each device, devices ordered by name (D934). */
+function groupByDevice(items, language) {
+	const groups = /* @__PURE__ */ new Map();
+	for (const item of items) {
+		const device = item.device;
+		if (device === void 0) continue;
+		const group = groups.get(device.id);
+		if (group === void 0) groups.set(device.id, {
+			device,
+			items: [item]
+		});
+		else group.items.push(item);
+	}
+	return [...groups.values()].toSorted((a, b) => a.device.name.localeCompare(b.device.name, language));
+}
 function stateSummaryText(input) {
 	const sectionVars = {};
 	const sections = [];
@@ -104007,8 +104082,7 @@ var NotificationCenter = class {
 		}
 		const consumables = consumablesSliceOf(event);
 		if (consumables !== null) {
-			for (const item of consumables.consumables) this.deviceAlerts.observeConsumable(consumables.deviceId, item);
-			for (const tank of consumables.tanks) this.deviceAlerts.observeTank(consumables.deviceId, tank);
+			for (const item of consumables.items) this.deviceAlerts.observeConsumableItem(consumables.deviceId, item);
 			return;
 		}
 		const lookup = this.deviceDirectory.lookup();