@camstack/addon-provider-bosch 0.1.16 → 0.1.18

package/dist/{account-integration-offline-BTvqsjjH.js → account-integration-offline-CZ4N26Oy.js}

@@ -1,4 +1,4 @@
-const require_dist = require("./dist-BUFPeAeI.js");
+const require_dist = require("./dist-8MDf5Iki.js");
 //#region src/shared/oauth-callback.ts
 /** A code on its own: no scheme, no query, no separators. */
 var BARE_CODE = /^[A-Za-z0-9._~-]+$/;

package/dist/{account-integration-offline-ASUhiSjp.mjs → account-integration-offline-vL6b7aqA.mjs}

@@ -1,4 +1,4 @@
-import { b as errMsg } from "./dist-PdvgOyAy.mjs";
+import { x as errMsg } from "./dist-Cj3fyC1J.mjs";
 //#region src/shared/oauth-callback.ts
 /** A code on its own: no scheme, no query, no separators. */
 var BARE_CODE = /^[A-Za-z0-9._~-]+$/;

package/dist/{dist-BUFPeAeI.js → dist-8MDf5Iki.js}

@@ -5431,7 +5431,7 @@ var ZodIssueCode = {
 var ZodFirstPartyTypeKind;
 ZodFirstPartyTypeKind || (ZodFirstPartyTypeKind = {});
 //#endregion
-//#region ../types/dist/sleep-DJFUfKvA.mjs
+//#region ../types/dist/sleep-CUp20JkO.mjs
 /**
 * The audio chunk plane's byte format, and the ONE expansion from a coded
 * window to float samples (D455).
@@ -8327,7 +8327,11 @@ var ContributionSectionSchema = object({
 		literal(4)
 	]).optional(),
 	tab: string().optional(),
-	location: _enum(["settings", "top-tab"]).optional(),
+	location: _enum([
+		"settings",
+		"top-tab",
+		"hero"
+	]).optional(),
 	order: number().optional(),
 	fields: array(any())
 });
@@ -13282,7 +13286,11 @@ var ConfigSectionWithValuesSchema = object({
 		literal(4)
 	]).optional(),
 	tab: string().optional(),
-	location: _enum(["settings", "top-tab"]).optional(),
+	location: _enum([
+		"settings",
+		"top-tab",
+		"hero"
+	]).optional(),
 	order: number().optional(),
 	fields: array(any())
 });
@@ -17162,6 +17170,52 @@ var TierStatusSchema = object({
 	countedAt: number().nullable()
 });
 /** Operator/diagnostic view: rows per tier, last runs, refusals and drops since boot. */
+/**
+* Why a series is orphan. `device-gone`: its device is absent from the
+* successful device listings (the departure clock). `undeclared`: its `cap:`
+* key is declared by no capability any more (a field a cap removed).
+*/
+var DeviceHistoryOrphanReasonSchema = _enum(["device-gone", "undeclared"]);
+/** Rows held per stored tier. */
+var TierRowsSchema = object({
+	raw: number().int(),
+	"5m": number().int(),
+	"1h": number().int(),
+	"1d": number().int()
+});
+var OrphanSeriesSchema = object({
+	seriesId: number().int(),
+	deviceId: number().int(),
+	key: string(),
+	scope: string(),
+	/** The metric's display name; `null` when its metric row is gone too. */
+	displayName: string().nullable(),
+	reason: DeviceHistoryOrphanReasonSchema,
+	/** `device-gone`: since when the device has been absent; `null` otherwise. */
+	missingSince: number().nullable(),
+	firstTs: number(),
+	lastTs: number(),
+	rows: TierRowsSchema
+});
+var DeviceHistoryOrphanDeleteRefusalSchema = _enum([
+	"not-found",
+	"not-orphan",
+	"failed"
+]);
+var OrphanDeleteEntrySchema = discriminatedUnion("ok", [object({
+	seriesId: number().int(),
+	ok: literal(true),
+	deleted: TierRowsSchema
+}), object({
+	seriesId: number().int(),
+	ok: literal(false),
+	reason: DeviceHistoryOrphanDeleteRefusalSchema
+})]);
+var OrphanListSchema = object({
+	series: array(OrphanSeriesSchema).readonly(),
+	/** More orphans exist than {@link DEVICE_HISTORY_ORPHAN_LIST_MAX}. */
+	truncated: boolean()
+});
 var DeviceHistoryStatusSchema = object({
 	startedAt: number(),
 	/** The store is declared, series loaded and the first reconcile has answered. */
@@ -17259,7 +17313,10 @@ method(object({ deviceId: number().int() }), array(SeriesInfoSchema).readonly())
 }), object({ enabled: boolean() }), {
 	kind: "mutation",
 	auth: "admin"
-}), method(object({}), DeviceHistoryStatusSchema, { auth: "admin" });
+}), method(object({}), DeviceHistoryStatusSchema, { auth: "admin" }), method(object({}), OrphanListSchema, { auth: "admin" }), method(object({ seriesIds: array(number().int()).min(1).max(50) }), object({ results: array(OrphanDeleteEntrySchema).readonly() }), {
+	kind: "mutation",
+	auth: "admin"
+});
 var DeviceCaStatusSchema = discriminatedUnion("state", [
 	object({ state: literal("absent") }),
 	object({
@@ -47987,7 +48044,6 @@ var RecommendationReasonSchema = discriminatedUnion("kind", [
 		modelId: string()
 	}),
 	object({ kind: literal("cpu-device") }),
-	object({ kind: literal("coral-untouched") }),
 	object({ kind: literal("device-disabled") }),
 	object({ kind: literal("device-unavailable") }),
 	object({ kind: literal("node-offline") }),
@@ -48085,11 +48141,6 @@ var AutoTuneWarningSchema = discriminatedUnion("kind", [
 		kind: literal("detector-store-unreadable"),
 		error: string()
 	}),
-	object({
-		kind: literal("coral-enabled"),
-		nodeId: string(),
-		deviceKey: string()
-	}),
 	object({
 		kind: literal("custom-pin-kept"),
 		nodeId: string(),
@@ -55133,17 +55184,69 @@ var connectivityCapability = {
 	volatileStateFields: ["lastChangedAt"]
 };
 /**
-* Generic device-consumables capability — surfaces a device's
-* maintenance items (vacuum filters/brushes, replaceable cartridges,
-* descaling cycles, …) with their remaining life and an optional
-* "Replaced" reset action. Device-agnostic: any provider that knows its
-* device tracks consumables can register it; the cap declares no
-* vocabulary of its own — the provider names each item verbatim.
+* Generic device-consumables capability — the ONE place a device reports what
+* it uses up or fills: wear parts (vacuum filters/brushes, cartridges,
+* descaling cycles), supplies it draws from (a vacuum's clean-water tank and
+* detergent, a dishwasher's salt and rinse aid) and waste it collects (a dirty
+* water tank, a dust bin). Each item carries its remaining life or fill and an
+* optional "Replaced" reset action. Device-agnostic: any provider that knows
+* its device tracks consumables registers it; the provider names each item
+* verbatim and says which `kind` it is.
+*
+* The admin UI renders it as ONE collapsible section directly under the
+* device page's hero card (`placement: 'hero'`), for every device bound to
+* this cap — never drawn by a device type's hero card itself (D915).
 *
 * Like `childLayout`, the cap is INERT until a provider sets items: no
 * provider populates it by guessing (no HA inference). The UI renders a
 * "No consumables reported" placeholder when `items` is empty.
 */
+/**
+* What an item IS, which decides which direction is bad:
+*  - `wear`   — a part that wears out (a brush, a filter); low life is bad.
+*  - `supply` — something the device draws from (clean water, detergent,
+*    salt, rinse aid); low or empty is bad.
+*  - `waste`  — something the device fills (dirty water, a dust bin); full is
+*    bad.
+* Absent = `wear`.
+*/
+var ConsumableKindSchema = _enum([
+	"wear",
+	"supply",
+	"waste"
+]);
+/**
+* What an item LOOKS like, which decides how a client draws it — independent
+* of `kind`, which decides which direction is bad:
+*  - `part`    — a part that wears (a brush, a filter, a mop pad): a wear bar,
+*    remaining time and a reset.
+*  - `tank`    — a container of liquid (clean water, dirty water): a fill gauge.
+*  - `product` — something bought and refilled (detergent, salt, rinse aid):
+*    a stepped level and "refill".
+*  - `bin`     — a container that collects waste (a dust bin): a fill gauge
+*    that warns when full.
+* Absent = derived from the kind ({@link consumableFormOf}).
+*/
+var ConsumableFormSchema = _enum([
+	"part",
+	"tank",
+	"product",
+	"bin"
+]);
+/** The provider's own discrete verdict on an item. */
+var ConsumableStatusSchema = _enum([
+	"ok",
+	"low",
+	"empty",
+	"full",
+	"replace"
+]);
+_enum([
+	"ok",
+	"low",
+	"empty",
+	"full"
+]);
 /** Units a remaining-life counter is reported in. Closed: the panel renders
 *  each. */
 var ConsumableRemainingUnitSchema = _enum([
@@ -55158,18 +55261,23 @@ var ConsumableRemainingSchema = object({
 	unit: ConsumableRemainingUnitSchema
 });
 /** A single consumable item. Either a continuous `level` (remaining
-*  life %) or a discrete `status` may be known — both may be null when a
-*  provider only knows the item exists. `level` and `status` are not
-*  mutually exclusive; a provider may report both. */
+*  life %, or fill % for a `supply` / `waste` item) or a discrete `status`
+*  may be known — both may be null when a provider only knows the item
+*  exists. `level` and `status` are not mutually exclusive; a provider may
+*  report both. */
 var ConsumableItemSchema = object({
 	/** Stable id, e.g. 'main-brush'. */
 	key: string().min(1),
 	/** Display name. */
 	label: string().min(1),
-	/** Remaining life % when known (0..100). */
+	/** Remaining life % (`wear`) or fill % (`supply`, `waste`) when known (0..100). */
 	level: number().min(0).max(100).nullable(),
-	/** Discrete state when known (binary mode). */
-	status: _enum(["ok", "replace"]).nullable(),
+	/** The provider's discrete verdict when known (binary mode). */
+	status: ConsumableStatusSchema.nullable(),
+	/** What the item is — decides whether low or full is bad. Absent = `wear`. */
+	kind: ConsumableKindSchema.optional(),
+	/** How the item is drawn (part, tank, product, bin). Absent = derived from `kind`. */
+	form: ConsumableFormSchema.optional(),
 	/** Ms epoch of the last replace, when known. */
 	lastResetAt: number().nullable(),
 	/** Whether `reset()` is meaningful for this item. */
@@ -55192,7 +55300,7 @@ var consumablesCapability = {
 		kind: "widget",
 		widgetId: "host/consumables-panel",
 		tab: "consumables",
-		topTab: true,
+		placement: "hero",
 		label: "Consumables",
 		order: 5
 	} },
@@ -55253,9 +55361,37 @@ reset: method(object({
 	*/
 	durability: "restored",
 	/**
-	* History (D850): none — `items` is an array keyed by runtime ids; a history path never enters it.
+	* History (D850, D917): one series per (item field, item `key`) — the item key
+	* is the series scope, the item `label` names it. A vacuum tank's fill, a
+	* brush's remaining life and a dishwasher's salt are each recorded the moment
+	* their provider reports them; an item that appears later gets its series.
 	*/
-	history: "none",
+	history: {
+		fields: {},
+		items: {
+			path: "items",
+			key: "key",
+			label: "label",
+			fields: {
+				level: {
+					kind: "gauge",
+					unit: "%",
+					deadband: 2,
+					displayName: "Level"
+				},
+				status: {
+					kind: "enum",
+					displayName: "Status"
+				},
+				"remaining.value": {
+					kind: "gauge",
+					unitFrom: "remaining.unit",
+					deadband: 1,
+					displayName: "Remaining"
+				}
+			}
+		}
+	},
 	/** Clocks, not content: a re-read that changed no item costs no commit. */
 	volatileStateFields: ["lastChangedAt", "lastFetchedAt"]
 };
@@ -55670,8 +55806,9 @@ onStatusChanged: { data: object({
 	volatileStateFields: ["lastChangedAt"]
 };
 /**
-* Smart-dishwasher cap — program lifecycle, door / remote-start gates,
-* consumable levels (salt, rinse aid) and common program options.
+* Smart-dishwasher cap — program lifecycle, door / remote-start gates and
+* common program options. Salt and rinse aid are NOT here: they are items of
+* the device's `consumables` cap, like every other device's (D915).
 *
 * Sources: native Bosch Home Connect (`dishwasher` device type). Reusable
 * by any integration that exposes the same program / option surface.
@@ -55719,11 +55856,6 @@ var DishwasherAvailabilitySchema = _enum([
 	"offline",
 	"description-missing"
 ]);
-var DishwasherConsumableLevelSchema = _enum([
-	"ok",
-	"low",
-	"empty"
-]);
 var DishwasherStatusSchema = object({
 	availability: DishwasherAvailabilitySchema,
 	/** Coarse state for compact surfaces; `unavailable` whenever the appliance state is not known. */
@@ -55756,8 +55888,6 @@ var DishwasherStatusSchema = object({
 	powerOn: boolean().nullable(),
 	/** The raw power state (`On`, `Off`, `Standby`, …); null when not known. */
 	powerState: string().nullable(),
-	saltLevel: DishwasherConsumableLevelSchema.nullable(),
-	rinseAidLevel: DishwasherConsumableLevelSchema.nullable(),
 	/**
 	* True while the appliance asks for its filter to be cleaned (smart-filter, filter-system or
 	* combined care-and-filter reminder raised); false when every such reminder reads clear; null
@@ -64573,60 +64703,17 @@ method(_void(), array(UserSummarySchema), { auth: "admin" }), method(CreateUserI
 	auth: "admin",
 	access: "delete"
 });
-/**
-* Robot-vacuum cap. Models HA `vacuum.*` entities — anything with a
-* cleaning lifecycle plus a return-to-base / locate surface and an
-* optional fan-speed selector.
-*
-* State follows HA's canonical vacuum lifecycle: `idle` / `cleaning` /
-* `paused` / `returning` / `docked` / `error`. `batteryLevel`
-* (0..100) is nullable — some vacuums don't report a battery
-* percentage. `fanSpeed` is the current speed token (provider-verbatim,
-* e.g. `'standard'` / `'turbo'`) and `availableFanSpeeds` lists the
-* tokens the hardware accepts so the UI renders only supported choices.
-*
-* The `setFanSpeed` method takes the bare `speed` token — the provider
-* validates it against the vacuum's own list. `locate` triggers the
-* find-me chirp; `returnToBase` sends it home.
-*
-* Consumable / waste tanks: `cleanWater` / `dirtyWater` / `detergent` /
-* `dustBin` each carry a nullable `{ level (0..100 %), status ('ok' |
-* 'low' | 'full') }` reading. Native providers (e.g. Dreame, Roborock)
-* SHOULD populate whichever tanks the hardware has — leave a field `null`
-* only when the device has no such tank at all, and use a `TankStatus`
-* with both inner fields `null` when the tank exists but its level is
-* currently unknown. HA `vacuum.*` entities expose no per-tank telemetry,
-* so the HA provider leaves all four `null`.
-*/
-var VacuumStateSchema = _enum([
-	"idle",
-	"cleaning",
-	"paused",
-	"returning",
-	"docked",
-	"drying",
-	"error"
-]);
-/**
-* One consumable / waste tank on a robot vacuum (clean-water, dirty-water,
-* detergent or dust-bin). A tank can report a numeric fill `level` (0..100),
-* a discrete `status` (binary-style hardware), or both. Both `null` means the
-* level is currently unknown; the OWNING field being `null` means the
-* hardware has no such tank at all.
-*/
-var TankStatusSchema = object({
-	/** Numeric fill 0..100 when the hardware reports a percentage; null otherwise. */
-	level: number().min(0).max(100).nullable(),
-	/** Discrete state when the hardware is binary-mode; null otherwise. */
-	status: _enum([
-		"ok",
-		"low",
-		"full"
-	]).nullable()
-});
 var VacuumControlStatusSchema = object({
 	/** Lifecycle state of the vacuum. */
-	state: VacuumStateSchema,
+	state: _enum([
+		"idle",
+		"cleaning",
+		"paused",
+		"returning",
+		"docked",
+		"drying",
+		"error"
+	]),
 	/** 0..100 battery percentage. Null when the device has no battery
 	*  reading. */
 	batteryLevel: number().min(0).max(100).nullable(),
@@ -64635,14 +64722,6 @@ var VacuumControlStatusSchema = object({
 	fanSpeed: string().nullable(),
 	/** Speed tokens the hardware accepts — drives the UI selector. */
 	availableFanSpeeds: array(string()),
-	/** Clean-water (mop) tank. Null when the hardware has no clean-water tank. */
-	cleanWater: TankStatusSchema.nullable(),
-	/** Dirty-water (recovery) tank. Null when the hardware has no dirty-water tank. */
-	dirtyWater: TankStatusSchema.nullable(),
-	/** Detergent tank. Null when the hardware has no detergent tank. */
-	detergent: TankStatusSchema.nullable(),
-	/** Dust bin. Null when the hardware has no dust bin. */
-	dustBin: TankStatusSchema.nullable(),
 	/** 0..100 cleaning-completion percentage of the current task, or null. */
 	progressPercent: number().min(0).max(100).nullable(),
 	/** Current error code (0 / null = no error). */
@@ -64704,35 +64783,14 @@ var vacuumControlCapability = {
 	*/
 	durability: "session",
 	/**
-	* History (D850): recorded series. Tank levels are fixed-object paths (`cleanWater.level`, ...).
+	* History (D850): recorded series. The tanks moved to `consumables` (D915), whose
+	* items are keyed by runtime ids and record no history.
 	*/
-	history: { fields: {
-		batteryLevel: {
-			kind: "gauge",
-			unit: "%",
-			deadband: 2
-		},
-		"cleanWater.level": {
-			kind: "gauge",
-			unit: "%",
-			deadband: 2
-		},
-		"dirtyWater.level": {
-			kind: "gauge",
-			unit: "%",
-			deadband: 2
-		},
-		"detergent.level": {
-			kind: "gauge",
-			unit: "%",
-			deadband: 2
-		},
-		"dustBin.level": {
-			kind: "gauge",
-			unit: "%",
-			deadband: 2
-		}
-	} }
+	history: { fields: { batteryLevel: {
+		kind: "gauge",
+		unit: "%",
+		deadband: 2
+	} } }
 };
 var ValveStatusSchema = object({
 	/** Lifecycle state of the valve. */
@@ -69126,6 +69184,12 @@ Object.freeze({
 		addonId: null,
 		access: "create"
 	},
+	"deviceHistory.deleteOrphanSeries": {
+		capName: "device-history",
+		capScope: "system",
+		addonId: null,
+		access: "delete"
+	},
 	"deviceHistory.getDeviceEnabled": {
 		capName: "device-history",
 		capScope: "system",
@@ -69144,6 +69208,12 @@ Object.freeze({
 		addonId: null,
 		access: "view"
 	},
+	"deviceHistory.listOrphanSeries": {
+		capName: "device-history",
+		capScope: "system",
+		addonId: null,
+		access: "view"
+	},
 	"deviceHistory.listSeries": {
 		capName: "device-history",
 		capScope: "system",
@@ -79149,7 +79219,7 @@ var STATE_SUMMARY_VARS = [
 	([...RULE_TEXT], [...COMBINED_ALARM]),
 	([...RULE_TEXT], [...DEVICE_EVENTS]),
 	([...RULE_TEXT], [...BATTERY, ...CONSUMABLE]),
-	([...RULE_TEXT], [...CONSUMABLE]),
+	([...RULE_TEXT], [...CONSUMABLE, ...TANK]),
 	([...RULE_TEXT], [...TANK]),
 	[...RULE_TEXT],
 	([...RULE_TEXT], [...UPDATES, ...ALERT_EPISODE]),
@@ -79919,6 +79989,12 @@ Object.defineProperty(exports, "connectionTestCapability", {
 		return connectionTestCapability;
 	}
 });
+Object.defineProperty(exports, "consumablesCapability", {
+	enumerable: true,
+	get: function() {
+		return consumablesCapability;
+	}
+});
 Object.defineProperty(exports, "createEvent", {
 	enumerable: true,
 	get: function() {

package/dist/{dist-PdvgOyAy.mjs → dist-Cj3fyC1J.mjs}

@@ -5431,7 +5431,7 @@ var ZodIssueCode = {
 var ZodFirstPartyTypeKind;
 ZodFirstPartyTypeKind || (ZodFirstPartyTypeKind = {});
 //#endregion
-//#region ../types/dist/sleep-DJFUfKvA.mjs
+//#region ../types/dist/sleep-CUp20JkO.mjs
 /**
 * The audio chunk plane's byte format, and the ONE expansion from a coded
 * window to float samples (D455).
@@ -8327,7 +8327,11 @@ var ContributionSectionSchema = object({
 		literal(4)
 	]).optional(),
 	tab: string().optional(),
-	location: _enum(["settings", "top-tab"]).optional(),
+	location: _enum([
+		"settings",
+		"top-tab",
+		"hero"
+	]).optional(),
 	order: number().optional(),
 	fields: array(any())
 });
@@ -13282,7 +13286,11 @@ var ConfigSectionWithValuesSchema = object({
 		literal(4)
 	]).optional(),
 	tab: string().optional(),
-	location: _enum(["settings", "top-tab"]).optional(),
+	location: _enum([
+		"settings",
+		"top-tab",
+		"hero"
+	]).optional(),
 	order: number().optional(),
 	fields: array(any())
 });
@@ -17162,6 +17170,52 @@ var TierStatusSchema = object({
 	countedAt: number().nullable()
 });
 /** Operator/diagnostic view: rows per tier, last runs, refusals and drops since boot. */
+/**
+* Why a series is orphan. `device-gone`: its device is absent from the
+* successful device listings (the departure clock). `undeclared`: its `cap:`
+* key is declared by no capability any more (a field a cap removed).
+*/
+var DeviceHistoryOrphanReasonSchema = _enum(["device-gone", "undeclared"]);
+/** Rows held per stored tier. */
+var TierRowsSchema = object({
+	raw: number().int(),
+	"5m": number().int(),
+	"1h": number().int(),
+	"1d": number().int()
+});
+var OrphanSeriesSchema = object({
+	seriesId: number().int(),
+	deviceId: number().int(),
+	key: string(),
+	scope: string(),
+	/** The metric's display name; `null` when its metric row is gone too. */
+	displayName: string().nullable(),
+	reason: DeviceHistoryOrphanReasonSchema,
+	/** `device-gone`: since when the device has been absent; `null` otherwise. */
+	missingSince: number().nullable(),
+	firstTs: number(),
+	lastTs: number(),
+	rows: TierRowsSchema
+});
+var DeviceHistoryOrphanDeleteRefusalSchema = _enum([
+	"not-found",
+	"not-orphan",
+	"failed"
+]);
+var OrphanDeleteEntrySchema = discriminatedUnion("ok", [object({
+	seriesId: number().int(),
+	ok: literal(true),
+	deleted: TierRowsSchema
+}), object({
+	seriesId: number().int(),
+	ok: literal(false),
+	reason: DeviceHistoryOrphanDeleteRefusalSchema
+})]);
+var OrphanListSchema = object({
+	series: array(OrphanSeriesSchema).readonly(),
+	/** More orphans exist than {@link DEVICE_HISTORY_ORPHAN_LIST_MAX}. */
+	truncated: boolean()
+});
 var DeviceHistoryStatusSchema = object({
 	startedAt: number(),
 	/** The store is declared, series loaded and the first reconcile has answered. */
@@ -17259,7 +17313,10 @@ method(object({ deviceId: number().int() }), array(SeriesInfoSchema).readonly())
 }), object({ enabled: boolean() }), {
 	kind: "mutation",
 	auth: "admin"
-}), method(object({}), DeviceHistoryStatusSchema, { auth: "admin" });
+}), method(object({}), DeviceHistoryStatusSchema, { auth: "admin" }), method(object({}), OrphanListSchema, { auth: "admin" }), method(object({ seriesIds: array(number().int()).min(1).max(50) }), object({ results: array(OrphanDeleteEntrySchema).readonly() }), {
+	kind: "mutation",
+	auth: "admin"
+});
 var DeviceCaStatusSchema = discriminatedUnion("state", [
 	object({ state: literal("absent") }),
 	object({
@@ -47987,7 +48044,6 @@ var RecommendationReasonSchema = discriminatedUnion("kind", [
 		modelId: string()
 	}),
 	object({ kind: literal("cpu-device") }),
-	object({ kind: literal("coral-untouched") }),
 	object({ kind: literal("device-disabled") }),
 	object({ kind: literal("device-unavailable") }),
 	object({ kind: literal("node-offline") }),
@@ -48085,11 +48141,6 @@ var AutoTuneWarningSchema = discriminatedUnion("kind", [
 		kind: literal("detector-store-unreadable"),
 		error: string()
 	}),
-	object({
-		kind: literal("coral-enabled"),
-		nodeId: string(),
-		deviceKey: string()
-	}),
 	object({
 		kind: literal("custom-pin-kept"),
 		nodeId: string(),
@@ -55133,17 +55184,69 @@ var connectivityCapability = {
 	volatileStateFields: ["lastChangedAt"]
 };
 /**
-* Generic device-consumables capability — surfaces a device's
-* maintenance items (vacuum filters/brushes, replaceable cartridges,
-* descaling cycles, …) with their remaining life and an optional
-* "Replaced" reset action. Device-agnostic: any provider that knows its
-* device tracks consumables can register it; the cap declares no
-* vocabulary of its own — the provider names each item verbatim.
+* Generic device-consumables capability — the ONE place a device reports what
+* it uses up or fills: wear parts (vacuum filters/brushes, cartridges,
+* descaling cycles), supplies it draws from (a vacuum's clean-water tank and
+* detergent, a dishwasher's salt and rinse aid) and waste it collects (a dirty
+* water tank, a dust bin). Each item carries its remaining life or fill and an
+* optional "Replaced" reset action. Device-agnostic: any provider that knows
+* its device tracks consumables registers it; the provider names each item
+* verbatim and says which `kind` it is.
+*
+* The admin UI renders it as ONE collapsible section directly under the
+* device page's hero card (`placement: 'hero'`), for every device bound to
+* this cap — never drawn by a device type's hero card itself (D915).
 *
 * Like `childLayout`, the cap is INERT until a provider sets items: no
 * provider populates it by guessing (no HA inference). The UI renders a
 * "No consumables reported" placeholder when `items` is empty.
 */
+/**
+* What an item IS, which decides which direction is bad:
+*  - `wear`   — a part that wears out (a brush, a filter); low life is bad.
+*  - `supply` — something the device draws from (clean water, detergent,
+*    salt, rinse aid); low or empty is bad.
+*  - `waste`  — something the device fills (dirty water, a dust bin); full is
+*    bad.
+* Absent = `wear`.
+*/
+var ConsumableKindSchema = _enum([
+	"wear",
+	"supply",
+	"waste"
+]);
+/**
+* What an item LOOKS like, which decides how a client draws it — independent
+* of `kind`, which decides which direction is bad:
+*  - `part`    — a part that wears (a brush, a filter, a mop pad): a wear bar,
+*    remaining time and a reset.
+*  - `tank`    — a container of liquid (clean water, dirty water): a fill gauge.
+*  - `product` — something bought and refilled (detergent, salt, rinse aid):
+*    a stepped level and "refill".
+*  - `bin`     — a container that collects waste (a dust bin): a fill gauge
+*    that warns when full.
+* Absent = derived from the kind ({@link consumableFormOf}).
+*/
+var ConsumableFormSchema = _enum([
+	"part",
+	"tank",
+	"product",
+	"bin"
+]);
+/** The provider's own discrete verdict on an item. */
+var ConsumableStatusSchema = _enum([
+	"ok",
+	"low",
+	"empty",
+	"full",
+	"replace"
+]);
+_enum([
+	"ok",
+	"low",
+	"empty",
+	"full"
+]);
 /** Units a remaining-life counter is reported in. Closed: the panel renders
 *  each. */
 var ConsumableRemainingUnitSchema = _enum([
@@ -55158,18 +55261,23 @@ var ConsumableRemainingSchema = object({
 	unit: ConsumableRemainingUnitSchema
 });
 /** A single consumable item. Either a continuous `level` (remaining
-*  life %) or a discrete `status` may be known — both may be null when a
-*  provider only knows the item exists. `level` and `status` are not
-*  mutually exclusive; a provider may report both. */
+*  life %, or fill % for a `supply` / `waste` item) or a discrete `status`
+*  may be known — both may be null when a provider only knows the item
+*  exists. `level` and `status` are not mutually exclusive; a provider may
+*  report both. */
 var ConsumableItemSchema = object({
 	/** Stable id, e.g. 'main-brush'. */
 	key: string().min(1),
 	/** Display name. */
 	label: string().min(1),
-	/** Remaining life % when known (0..100). */
+	/** Remaining life % (`wear`) or fill % (`supply`, `waste`) when known (0..100). */
 	level: number().min(0).max(100).nullable(),
-	/** Discrete state when known (binary mode). */
-	status: _enum(["ok", "replace"]).nullable(),
+	/** The provider's discrete verdict when known (binary mode). */
+	status: ConsumableStatusSchema.nullable(),
+	/** What the item is — decides whether low or full is bad. Absent = `wear`. */
+	kind: ConsumableKindSchema.optional(),
+	/** How the item is drawn (part, tank, product, bin). Absent = derived from `kind`. */
+	form: ConsumableFormSchema.optional(),
 	/** Ms epoch of the last replace, when known. */
 	lastResetAt: number().nullable(),
 	/** Whether `reset()` is meaningful for this item. */
@@ -55192,7 +55300,7 @@ var consumablesCapability = {
 		kind: "widget",
 		widgetId: "host/consumables-panel",
 		tab: "consumables",
-		topTab: true,
+		placement: "hero",
 		label: "Consumables",
 		order: 5
 	} },
@@ -55253,9 +55361,37 @@ reset: method(object({
 	*/
 	durability: "restored",
 	/**
-	* History (D850): none — `items` is an array keyed by runtime ids; a history path never enters it.
+	* History (D850, D917): one series per (item field, item `key`) — the item key
+	* is the series scope, the item `label` names it. A vacuum tank's fill, a
+	* brush's remaining life and a dishwasher's salt are each recorded the moment
+	* their provider reports them; an item that appears later gets its series.
 	*/
-	history: "none",
+	history: {
+		fields: {},
+		items: {
+			path: "items",
+			key: "key",
+			label: "label",
+			fields: {
+				level: {
+					kind: "gauge",
+					unit: "%",
+					deadband: 2,
+					displayName: "Level"
+				},
+				status: {
+					kind: "enum",
+					displayName: "Status"
+				},
+				"remaining.value": {
+					kind: "gauge",
+					unitFrom: "remaining.unit",
+					deadband: 1,
+					displayName: "Remaining"
+				}
+			}
+		}
+	},
 	/** Clocks, not content: a re-read that changed no item costs no commit. */
 	volatileStateFields: ["lastChangedAt", "lastFetchedAt"]
 };
@@ -55670,8 +55806,9 @@ onStatusChanged: { data: object({
 	volatileStateFields: ["lastChangedAt"]
 };
 /**
-* Smart-dishwasher cap — program lifecycle, door / remote-start gates,
-* consumable levels (salt, rinse aid) and common program options.
+* Smart-dishwasher cap — program lifecycle, door / remote-start gates and
+* common program options. Salt and rinse aid are NOT here: they are items of
+* the device's `consumables` cap, like every other device's (D915).
 *
 * Sources: native Bosch Home Connect (`dishwasher` device type). Reusable
 * by any integration that exposes the same program / option surface.
@@ -55719,11 +55856,6 @@ var DishwasherAvailabilitySchema = _enum([
 	"offline",
 	"description-missing"
 ]);
-var DishwasherConsumableLevelSchema = _enum([
-	"ok",
-	"low",
-	"empty"
-]);
 var DishwasherStatusSchema = object({
 	availability: DishwasherAvailabilitySchema,
 	/** Coarse state for compact surfaces; `unavailable` whenever the appliance state is not known. */
@@ -55756,8 +55888,6 @@ var DishwasherStatusSchema = object({
 	powerOn: boolean().nullable(),
 	/** The raw power state (`On`, `Off`, `Standby`, …); null when not known. */
 	powerState: string().nullable(),
-	saltLevel: DishwasherConsumableLevelSchema.nullable(),
-	rinseAidLevel: DishwasherConsumableLevelSchema.nullable(),
 	/**
 	* True while the appliance asks for its filter to be cleaned (smart-filter, filter-system or
 	* combined care-and-filter reminder raised); false when every such reminder reads clear; null
@@ -64573,60 +64703,17 @@ method(_void(), array(UserSummarySchema), { auth: "admin" }), method(CreateUserI
 	auth: "admin",
 	access: "delete"
 });
-/**
-* Robot-vacuum cap. Models HA `vacuum.*` entities — anything with a
-* cleaning lifecycle plus a return-to-base / locate surface and an
-* optional fan-speed selector.
-*
-* State follows HA's canonical vacuum lifecycle: `idle` / `cleaning` /
-* `paused` / `returning` / `docked` / `error`. `batteryLevel`
-* (0..100) is nullable — some vacuums don't report a battery
-* percentage. `fanSpeed` is the current speed token (provider-verbatim,
-* e.g. `'standard'` / `'turbo'`) and `availableFanSpeeds` lists the
-* tokens the hardware accepts so the UI renders only supported choices.
-*
-* The `setFanSpeed` method takes the bare `speed` token — the provider
-* validates it against the vacuum's own list. `locate` triggers the
-* find-me chirp; `returnToBase` sends it home.
-*
-* Consumable / waste tanks: `cleanWater` / `dirtyWater` / `detergent` /
-* `dustBin` each carry a nullable `{ level (0..100 %), status ('ok' |
-* 'low' | 'full') }` reading. Native providers (e.g. Dreame, Roborock)
-* SHOULD populate whichever tanks the hardware has — leave a field `null`
-* only when the device has no such tank at all, and use a `TankStatus`
-* with both inner fields `null` when the tank exists but its level is
-* currently unknown. HA `vacuum.*` entities expose no per-tank telemetry,
-* so the HA provider leaves all four `null`.
-*/
-var VacuumStateSchema = _enum([
-	"idle",
-	"cleaning",
-	"paused",
-	"returning",
-	"docked",
-	"drying",
-	"error"
-]);
-/**
-* One consumable / waste tank on a robot vacuum (clean-water, dirty-water,
-* detergent or dust-bin). A tank can report a numeric fill `level` (0..100),
-* a discrete `status` (binary-style hardware), or both. Both `null` means the
-* level is currently unknown; the OWNING field being `null` means the
-* hardware has no such tank at all.
-*/
-var TankStatusSchema = object({
-	/** Numeric fill 0..100 when the hardware reports a percentage; null otherwise. */
-	level: number().min(0).max(100).nullable(),
-	/** Discrete state when the hardware is binary-mode; null otherwise. */
-	status: _enum([
-		"ok",
-		"low",
-		"full"
-	]).nullable()
-});
 var VacuumControlStatusSchema = object({
 	/** Lifecycle state of the vacuum. */
-	state: VacuumStateSchema,
+	state: _enum([
+		"idle",
+		"cleaning",
+		"paused",
+		"returning",
+		"docked",
+		"drying",
+		"error"
+	]),
 	/** 0..100 battery percentage. Null when the device has no battery
 	*  reading. */
 	batteryLevel: number().min(0).max(100).nullable(),
@@ -64635,14 +64722,6 @@ var VacuumControlStatusSchema = object({
 	fanSpeed: string().nullable(),
 	/** Speed tokens the hardware accepts — drives the UI selector. */
 	availableFanSpeeds: array(string()),
-	/** Clean-water (mop) tank. Null when the hardware has no clean-water tank. */
-	cleanWater: TankStatusSchema.nullable(),
-	/** Dirty-water (recovery) tank. Null when the hardware has no dirty-water tank. */
-	dirtyWater: TankStatusSchema.nullable(),
-	/** Detergent tank. Null when the hardware has no detergent tank. */
-	detergent: TankStatusSchema.nullable(),
-	/** Dust bin. Null when the hardware has no dust bin. */
-	dustBin: TankStatusSchema.nullable(),
 	/** 0..100 cleaning-completion percentage of the current task, or null. */
 	progressPercent: number().min(0).max(100).nullable(),
 	/** Current error code (0 / null = no error). */
@@ -64704,35 +64783,14 @@ var vacuumControlCapability = {
 	*/
 	durability: "session",
 	/**
-	* History (D850): recorded series. Tank levels are fixed-object paths (`cleanWater.level`, ...).
+	* History (D850): recorded series. The tanks moved to `consumables` (D915), whose
+	* items are keyed by runtime ids and record no history.
 	*/
-	history: { fields: {
-		batteryLevel: {
-			kind: "gauge",
-			unit: "%",
-			deadband: 2
-		},
-		"cleanWater.level": {
-			kind: "gauge",
-			unit: "%",
-			deadband: 2
-		},
-		"dirtyWater.level": {
-			kind: "gauge",
-			unit: "%",
-			deadband: 2
-		},
-		"detergent.level": {
-			kind: "gauge",
-			unit: "%",
-			deadband: 2
-		},
-		"dustBin.level": {
-			kind: "gauge",
-			unit: "%",
-			deadband: 2
-		}
-	} }
+	history: { fields: { batteryLevel: {
+		kind: "gauge",
+		unit: "%",
+		deadband: 2
+	} } }
 };
 var ValveStatusSchema = object({
 	/** Lifecycle state of the valve. */
@@ -69126,6 +69184,12 @@ Object.freeze({
 		addonId: null,
 		access: "create"
 	},
+	"deviceHistory.deleteOrphanSeries": {
+		capName: "device-history",
+		capScope: "system",
+		addonId: null,
+		access: "delete"
+	},
 	"deviceHistory.getDeviceEnabled": {
 		capName: "device-history",
 		capScope: "system",
@@ -69144,6 +69208,12 @@ Object.freeze({
 		addonId: null,
 		access: "view"
 	},
+	"deviceHistory.listOrphanSeries": {
+		capName: "device-history",
+		capScope: "system",
+		addonId: null,
+		access: "view"
+	},
 	"deviceHistory.listSeries": {
 		capName: "device-history",
 		capScope: "system",
@@ -79149,7 +79219,7 @@ var STATE_SUMMARY_VARS = [
 	([...RULE_TEXT], [...COMBINED_ALARM]),
 	([...RULE_TEXT], [...DEVICE_EVENTS]),
 	([...RULE_TEXT], [...BATTERY, ...CONSUMABLE]),
-	([...RULE_TEXT], [...CONSUMABLE]),
+	([...RULE_TEXT], [...CONSUMABLE, ...TANK]),
 	([...RULE_TEXT], [...TANK]),
 	[...RULE_TEXT],
 	([...RULE_TEXT], [...UPDATES, ...ALERT_EPISODE]),
@@ -79847,4 +79917,4 @@ DEFAULT_NATIVE_LEASE_SETTINGS.admission;
 var MB = 1024 * 1024;
 1024 * MB, 3072 * MB;
 //#endregion
-export { object as A, defineCustomActions as C, array as D, _enum as E, EventCategory as F, string as M, union as N, literal as O, unknown as P, customAction as S, isSecretMarkerLike as T, waterHeaterCapability as _, binaryCapability as a, errMsg as b, deviceAdoptionCapability as c, eventEmitterCapability as d, heatingValveCapability as f, temperatureSensorCapability as g, switchCapability as h, batteryCapability as i, record as j, number as k, dishwasherCapability as l, powerMeterCapability as m, BaseDeviceProvider as n, climateControlCapability as o, numericSensorCapability as p, DishwasherOperationStateSchema as r, connectionTestCapability as s, BaseDevice as t, enumSensorCapability as u, DeviceRole as v, isSecretMarker as w, createEvent as x, DeviceType as y };
+export { number as A, customAction as C, _enum as D, isSecretMarkerLike as E, unknown as F, EventCategory as I, record as M, string as N, array as O, union as P, createEvent as S, isSecretMarker as T, temperatureSensorCapability as _, binaryCapability as a, DeviceType as b, consumablesCapability as c, enumSensorCapability as d, eventEmitterCapability as f, switchCapability as g, powerMeterCapability as h, batteryCapability as i, object as j, literal as k, deviceAdoptionCapability as l, numericSensorCapability as m, BaseDeviceProvider as n, climateControlCapability as o, heatingValveCapability as p, DishwasherOperationStateSchema as r, connectionTestCapability as s, BaseDevice as t, dishwasherCapability as u, waterHeaterCapability as v, defineCustomActions as w, errMsg as x, DeviceRole as y };

package/dist/home-connect/addon.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_dist = require("../dist-BUFPeAeI.js");
-const require_account_integration_offline = require("../account-integration-offline-BTvqsjjH.js");
+const require_dist = require("../dist-8MDf5Iki.js");
+const require_account_integration_offline = require("../account-integration-offline-CZ4N26Oy.js");
 let node_crypto = require("node:crypto");
 let node_tls = require("node:tls");
 let node_zlib = require("node:zlib");
@@ -3826,8 +3826,6 @@ var COLD_DISHWASHER_STATUS = {
 	localControlActive: null,
 	powerOn: null,
 	powerState: null,
-	saltLevel: null,
-	rinseAidLevel: null,
 	filterCleaningDue: null,
 	machineCareDue: null,
 	machineCareRemainingRuns: null,
@@ -3885,8 +3883,6 @@ function dishwasherStatusFromFeatures(input) {
 		localControlActive: boolOf(valueOf(input, findEntity(description, ["status"], ["LocalControlActive"]))),
 		powerOn: powerRaw === null ? null : powerRaw === "On",
 		powerState: powerRaw,
-		saltLevel: consumableFromEvents(input, ["SaltNearlyEmpty"], ["SaltEmpty", "SaltLack"]),
-		rinseAidLevel: consumableFromEvents(input, ["RinseAidNearlyEmpty"], ["RinseAidEmpty", "RinseAidLack"]),
 		filterCleaningDue: reminderDue(input, [
 			"SmartFilterCleaningReminder",
 			"CheckFilterSystem",
@@ -3987,6 +3983,44 @@ function dishwasherOptionsFromDescription(input) {
 var HC_COMMAND_PAUSE = "PauseProgram";
 var HC_COMMAND_RESUME = "ResumeProgram";
 var HC_COMMAND_STOP = "AbortProgram";
+/** The dishwasher supplies, by the events that report them. */
+var DISHWASHER_SUPPLIES = [{
+	key: "salt",
+	label: "Salt",
+	nearlyEmpty: ["SaltNearlyEmpty"],
+	empty: ["SaltEmpty", "SaltLack"]
+}, {
+	key: "rinseAid",
+	label: "Rinse aid",
+	nearlyEmpty: ["RinseAidNearlyEmpty"],
+	empty: ["RinseAidEmpty", "RinseAidLack"]
+}];
+/**
+* The dishwasher's `consumables` items (D915): salt and rinse aid as `supply`
+* items, for each the appliance's description lists an event for. Their
+* status comes from those events (`consumableFromEvents`); none reported is
+* `null` (unknown), never `ok`. Neither is resettable — refilling is the reset.
+*
+* `null` while the appliance is offline or undescribed: nothing is known NOW,
+* and the `consumables` slice is restored — the last observation stays rather
+* than being overwritten with unknowns. Pure.
+*/
+function dishwasherConsumablesFromFeatures(view) {
+	if (availabilityOf(view) !== "available") return null;
+	return DISHWASHER_SUPPLIES.flatMap(({ key, label, nearlyEmpty, empty }) => {
+		if (eventStates(view, [...nearlyEmpty, ...empty]).length === 0) return [];
+		return [{
+			key,
+			label,
+			level: null,
+			status: consumableFromEvents(view, nearlyEmpty, empty),
+			kind: "supply",
+			form: "product",
+			lastResetAt: null,
+			resettable: false
+		}];
+	});
+}
 //#endregion
 //#region src/home-connect/home-connect-child-bindings.ts
 /** The capability a bound child registers. */
@@ -4577,6 +4611,15 @@ var homeConnectDishwasherSchema = require_dist.object({
 	integrationId: require_dist.string().optional()
 });
 var DISH_CAP = "dishwasher";
+var CONSUMABLES_CAP = "consumables";
+var CONSUMABLES_EMPTY = {
+	items: [],
+	lastChangedAt: 0,
+	lastFetchedAt: 0
+};
+function sameItems(a, b) {
+	return JSON.stringify(a) === JSON.stringify(b);
+}
 /** The option short names of the boolean setters, in the spellings an appliance uses. */
 var OPTION_NAMES = {
 	halfLoad: ["HalfLoad"],
@@ -4603,6 +4646,7 @@ var HomeConnectDishwasherDevice = class extends require_dist.BaseDevice {
 	async onActivate() {
 		await super.onActivate();
 		this.registerDishwasherCap();
+		this.registerConsumablesCap();
 		this.runtimeState.setCapState(DISH_CAP, COLD_DISHWASHER_STATUS);
 		this.markOnline(false);
 		this.#unwatch = homeConnectConnections.watch(this.#brokerId, this.#haId, (event) => this.recomputeSlice(event));
@@ -4627,13 +4671,41 @@ var HomeConnectDishwasherDevice = class extends require_dist.BaseDevice {
 	recomputeSlice(event) {
 		const previous = this.runtimeState.getCapState(DISH_CAP);
 		const lastValueAt = event.kind === "feature" && !event.key.startsWith("HomeConnect.Info.") && !event.key.startsWith("HomeConnect.Network.") ? Date.now() : previous?.lastFetchedAt ?? 0;
+		const view = this.view();
 		const slice = dishwasherStatusFromFeatures({
-			...this.view(),
+			...view,
 			lastValueAt
 		});
 		this.runtimeState.setCapState(DISH_CAP, slice);
+		this.writeConsumables(dishwasherConsumablesFromFeatures(view));
 		this.markOnline(slice.availability !== "offline");
 	}
+	/**
+	* Salt and rinse aid, as `consumables` items (D915). Written only when they
+	* changed; `null` (offline / undescribed) and an empty list write nothing —
+	* the slice is restored, and "nothing known now" must not erase the last
+	* observation.
+	*/
+	writeConsumables(items) {
+		if (items === null || items.length === 0) return;
+		const previous = this.runtimeState.getCapState(CONSUMABLES_CAP);
+		if (previous !== void 0 && sameItems(previous.items, items)) return;
+		const now = Date.now();
+		const next = {
+			items,
+			lastChangedAt: now,
+			lastFetchedAt: now
+		};
+		this.runtimeState.setCapState(CONSUMABLES_CAP, next);
+	}
+	registerConsumablesCap() {
+		this.ctx.registerNativeCap(require_dist.consumablesCapability, {
+			getStatus: async () => this.runtimeState.getCapState(CONSUMABLES_CAP) ?? CONSUMABLES_EMPTY,
+			reset: async ({ key }) => {
+				throw new Error(`"${key}" has no reset on a dishwasher — refilling it is the reset`);
+			}
+		});
+	}
 	requireClient() {
 		const client = this.client();
 		if (!client) throw new Error("Home Connect client unavailable — the integration is not connected");

package/dist/home-connect/addon.mjs

@@ -1,5 +1,5 @@
-import { A as object, C as defineCustomActions, D as array, E as _enum, F as EventCategory, M as string, N as union, O as literal, P as unknown, S as customAction, T as isSecretMarkerLike, a as binaryCapability, b as errMsg, c as deviceAdoptionCapability, d as eventEmitterCapability, j as record, l as dishwasherCapability, m as powerMeterCapability, n as BaseDeviceProvider, p as numericSensorCapability, r as DishwasherOperationStateSchema, s as connectionTestCapability, t as BaseDevice, u as enumSensorCapability, v as DeviceRole, w as isSecretMarker, x as createEvent, y as DeviceType } from "../dist-PdvgOyAy.mjs";
-import { n as cascadeRemoveDevicesForIntegration, r as parseOAuthCallback, t as setIntegrationDevicesOnline } from "../account-integration-offline-ASUhiSjp.mjs";
+import { C as customAction, D as _enum, E as isSecretMarkerLike, F as unknown, I as EventCategory, M as record, N as string, O as array, P as union, S as createEvent, T as isSecretMarker, a as binaryCapability, b as DeviceType, c as consumablesCapability, d as enumSensorCapability, f as eventEmitterCapability, h as powerMeterCapability, j as object, k as literal, l as deviceAdoptionCapability, m as numericSensorCapability, n as BaseDeviceProvider, r as DishwasherOperationStateSchema, s as connectionTestCapability, t as BaseDevice, u as dishwasherCapability, w as defineCustomActions, x as errMsg, y as DeviceRole } from "../dist-Cj3fyC1J.mjs";
+import { n as cascadeRemoveDevicesForIntegration, r as parseOAuthCallback, t as setIntegrationDevicesOnline } from "../account-integration-offline-vL6b7aqA.mjs";
 import { createHash, randomBytes } from "node:crypto";
 import { connect } from "node:tls";
 import { inflateRawSync } from "node:zlib";
@@ -3825,8 +3825,6 @@ var COLD_DISHWASHER_STATUS = {
 	localControlActive: null,
 	powerOn: null,
 	powerState: null,
-	saltLevel: null,
-	rinseAidLevel: null,
 	filterCleaningDue: null,
 	machineCareDue: null,
 	machineCareRemainingRuns: null,
@@ -3884,8 +3882,6 @@ function dishwasherStatusFromFeatures(input) {
 		localControlActive: boolOf(valueOf(input, findEntity(description, ["status"], ["LocalControlActive"]))),
 		powerOn: powerRaw === null ? null : powerRaw === "On",
 		powerState: powerRaw,
-		saltLevel: consumableFromEvents(input, ["SaltNearlyEmpty"], ["SaltEmpty", "SaltLack"]),
-		rinseAidLevel: consumableFromEvents(input, ["RinseAidNearlyEmpty"], ["RinseAidEmpty", "RinseAidLack"]),
 		filterCleaningDue: reminderDue(input, [
 			"SmartFilterCleaningReminder",
 			"CheckFilterSystem",
@@ -3986,6 +3982,44 @@ function dishwasherOptionsFromDescription(input) {
 var HC_COMMAND_PAUSE = "PauseProgram";
 var HC_COMMAND_RESUME = "ResumeProgram";
 var HC_COMMAND_STOP = "AbortProgram";
+/** The dishwasher supplies, by the events that report them. */
+var DISHWASHER_SUPPLIES = [{
+	key: "salt",
+	label: "Salt",
+	nearlyEmpty: ["SaltNearlyEmpty"],
+	empty: ["SaltEmpty", "SaltLack"]
+}, {
+	key: "rinseAid",
+	label: "Rinse aid",
+	nearlyEmpty: ["RinseAidNearlyEmpty"],
+	empty: ["RinseAidEmpty", "RinseAidLack"]
+}];
+/**
+* The dishwasher's `consumables` items (D915): salt and rinse aid as `supply`
+* items, for each the appliance's description lists an event for. Their
+* status comes from those events (`consumableFromEvents`); none reported is
+* `null` (unknown), never `ok`. Neither is resettable — refilling is the reset.
+*
+* `null` while the appliance is offline or undescribed: nothing is known NOW,
+* and the `consumables` slice is restored — the last observation stays rather
+* than being overwritten with unknowns. Pure.
+*/
+function dishwasherConsumablesFromFeatures(view) {
+	if (availabilityOf(view) !== "available") return null;
+	return DISHWASHER_SUPPLIES.flatMap(({ key, label, nearlyEmpty, empty }) => {
+		if (eventStates(view, [...nearlyEmpty, ...empty]).length === 0) return [];
+		return [{
+			key,
+			label,
+			level: null,
+			status: consumableFromEvents(view, nearlyEmpty, empty),
+			kind: "supply",
+			form: "product",
+			lastResetAt: null,
+			resettable: false
+		}];
+	});
+}
 //#endregion
 //#region src/home-connect/home-connect-child-bindings.ts
 /** The capability a bound child registers. */
@@ -4576,6 +4610,15 @@ var homeConnectDishwasherSchema = object({
 	integrationId: string().optional()
 });
 var DISH_CAP = "dishwasher";
+var CONSUMABLES_CAP = "consumables";
+var CONSUMABLES_EMPTY = {
+	items: [],
+	lastChangedAt: 0,
+	lastFetchedAt: 0
+};
+function sameItems(a, b) {
+	return JSON.stringify(a) === JSON.stringify(b);
+}
 /** The option short names of the boolean setters, in the spellings an appliance uses. */
 var OPTION_NAMES = {
 	halfLoad: ["HalfLoad"],
@@ -4602,6 +4645,7 @@ var HomeConnectDishwasherDevice = class extends BaseDevice {
 	async onActivate() {
 		await super.onActivate();
 		this.registerDishwasherCap();
+		this.registerConsumablesCap();
 		this.runtimeState.setCapState(DISH_CAP, COLD_DISHWASHER_STATUS);
 		this.markOnline(false);
 		this.#unwatch = homeConnectConnections.watch(this.#brokerId, this.#haId, (event) => this.recomputeSlice(event));
@@ -4626,13 +4670,41 @@ var HomeConnectDishwasherDevice = class extends BaseDevice {
 	recomputeSlice(event) {
 		const previous = this.runtimeState.getCapState(DISH_CAP);
 		const lastValueAt = event.kind === "feature" && !event.key.startsWith("HomeConnect.Info.") && !event.key.startsWith("HomeConnect.Network.") ? Date.now() : previous?.lastFetchedAt ?? 0;
+		const view = this.view();
 		const slice = dishwasherStatusFromFeatures({
-			...this.view(),
+			...view,
 			lastValueAt
 		});
 		this.runtimeState.setCapState(DISH_CAP, slice);
+		this.writeConsumables(dishwasherConsumablesFromFeatures(view));
 		this.markOnline(slice.availability !== "offline");
 	}
+	/**
+	* Salt and rinse aid, as `consumables` items (D915). Written only when they
+	* changed; `null` (offline / undescribed) and an empty list write nothing —
+	* the slice is restored, and "nothing known now" must not erase the last
+	* observation.
+	*/
+	writeConsumables(items) {
+		if (items === null || items.length === 0) return;
+		const previous = this.runtimeState.getCapState(CONSUMABLES_CAP);
+		if (previous !== void 0 && sameItems(previous.items, items)) return;
+		const now = Date.now();
+		const next = {
+			items,
+			lastChangedAt: now,
+			lastFetchedAt: now
+		};
+		this.runtimeState.setCapState(CONSUMABLES_CAP, next);
+	}
+	registerConsumablesCap() {
+		this.ctx.registerNativeCap(consumablesCapability, {
+			getStatus: async () => this.runtimeState.getCapState(CONSUMABLES_CAP) ?? CONSUMABLES_EMPTY,
+			reset: async ({ key }) => {
+				throw new Error(`"${key}" has no reset on a dishwasher — refilling it is the reset`);
+			}
+		});
+	}
 	requireClient() {
 		const client = this.client();
 		if (!client) throw new Error("Home Connect client unavailable — the integration is not connected");

package/dist/homecom/addon.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_dist = require("../dist-BUFPeAeI.js");
-const require_account_integration_offline = require("../account-integration-offline-BTvqsjjH.js");
+const require_dist = require("../dist-8MDf5Iki.js");
+const require_account_integration_offline = require("../account-integration-offline-CZ4N26Oy.js");
 let node_crypto = require("node:crypto");
 //#region src/homecom/custom-actions.ts
 var homeComActions = require_dist.defineCustomActions({

package/dist/homecom/addon.mjs

@@ -1,5 +1,5 @@
-import { A as object, C as defineCustomActions, E as _enum, F as EventCategory, M as string, O as literal, S as customAction, T as isSecretMarkerLike, _ as waterHeaterCapability, b as errMsg, c as deviceAdoptionCapability, n as BaseDeviceProvider, o as climateControlCapability, s as connectionTestCapability, t as BaseDevice, w as isSecretMarker, y as DeviceType } from "../dist-PdvgOyAy.mjs";
-import { n as cascadeRemoveDevicesForIntegration, r as parseOAuthCallback, t as setIntegrationDevicesOnline } from "../account-integration-offline-ASUhiSjp.mjs";
+import { C as customAction, D as _enum, E as isSecretMarkerLike, I as EventCategory, N as string, T as isSecretMarker, b as DeviceType, j as object, k as literal, l as deviceAdoptionCapability, n as BaseDeviceProvider, o as climateControlCapability, s as connectionTestCapability, t as BaseDevice, v as waterHeaterCapability, w as defineCustomActions, x as errMsg } from "../dist-Cj3fyC1J.mjs";
+import { n as cascadeRemoveDevicesForIntegration, r as parseOAuthCallback, t as setIntegrationDevicesOnline } from "../account-integration-offline-vL6b7aqA.mjs";
 import { createHash, randomBytes } from "node:crypto";
 //#region src/homecom/custom-actions.ts
 var homeComActions = defineCustomActions({

package/dist/shc/addon.js

@@ -2,7 +2,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 //#region \0rolldown/runtime.js
 var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
 //#endregion
-const require_dist = require("../dist-BUFPeAeI.js");
+const require_dist = require("../dist-8MDf5Iki.js");
 let node_crypto = require("node:crypto");
 let node_https = require("node:https");
 let node_child_process = require("node:child_process");

package/dist/shc/addon.mjs

@@ -1,4 +1,4 @@
-import { A as object, C as defineCustomActions, D as array, E as _enum, F as EventCategory, M as string, O as literal, S as customAction, b as errMsg, c as deviceAdoptionCapability, f as heatingValveCapability, g as temperatureSensorCapability, h as switchCapability, i as batteryCapability, k as number, n as BaseDeviceProvider, o as climateControlCapability, s as connectionTestCapability, t as BaseDevice, y as DeviceType } from "../dist-PdvgOyAy.mjs";
+import { A as number, C as customAction, D as _enum, I as EventCategory, N as string, O as array, _ as temperatureSensorCapability, b as DeviceType, g as switchCapability, i as batteryCapability, j as object, k as literal, l as deviceAdoptionCapability, n as BaseDeviceProvider, o as climateControlCapability, p as heatingValveCapability, s as connectionTestCapability, t as BaseDevice, w as defineCustomActions, x as errMsg } from "../dist-Cj3fyC1J.mjs";
 import { createRequire } from "node:module";
 import { randomUUID } from "node:crypto";
 import { request } from "node:https";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-provider-bosch",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "Bosch smart-home device-provider addons for CamStack — SHC, Home Connect, and HomeCom cloud integrations (scaffold)",
   "keywords": [
     "camstack",
@@ -81,6 +81,9 @@
           },
           {
             "name": "dishwasher"
+          },
+          {
+            "name": "consumables"
           }
         ]
       },