@camstack/system 1.2.241 → 1.2.243

package/dist/builtins/addon-pages-aggregator/addon-pages-aggregator.addon.js

@@ -3,7 +3,7 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 const require_chunk = require("../../chunk-Cek0wNdY.js");
-const require_dist = require("../../dist-C6JIhqS6.js");
+const require_dist = require("../../dist-D6kqBW1G.js");
 const require_settle_sources = require("../../settle-sources-Bhsy57y-.js");
 let node_crypto = require("node:crypto");
 let node_path = require("node:path");

package/dist/builtins/addon-pages-aggregator/addon-pages-aggregator.addon.mjs

@@ -1,4 +1,4 @@
-import { Jt as BaseAddon, bn as EventCategory, k as addonPagesCapability, qt as errMsg } from "../../dist-BjSYm1hH.mjs";
+import { A as addonPagesCapability, Sn as EventCategory, Xt as BaseAddon, Yt as errMsg } from "../../dist-B4htkDVv.mjs";
 import { t as settleSourcesWithTimeout } from "../../settle-sources-CDtNC8ub.mjs";
 import { createHash, randomUUID } from "node:crypto";
 import * as path$1 from "node:path";

package/dist/builtins/addon-widgets-aggregator/addon-widgets-aggregator.addon.js

@@ -3,7 +3,7 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 const require_chunk = require("../../chunk-Cek0wNdY.js");
-const require_dist = require("../../dist-C6JIhqS6.js");
+const require_dist = require("../../dist-D6kqBW1G.js");
 const require_settle_sources = require("../../settle-sources-Bhsy57y-.js");
 let node_crypto = require("node:crypto");
 let node_path = require("node:path");

package/dist/builtins/addon-widgets-aggregator/addon-widgets-aggregator.addon.mjs

@@ -1,4 +1,4 @@
-import { Jt as BaseAddon, bn as EventCategory, j as addonWidgetsCapability, qt as errMsg } from "../../dist-BjSYm1hH.mjs";
+import { M as addonWidgetsCapability, Sn as EventCategory, Xt as BaseAddon, Yt as errMsg } from "../../dist-B4htkDVv.mjs";
 import { t as settleSourcesWithTimeout } from "../../settle-sources-CDtNC8ub.mjs";
 import { createHash, randomUUID } from "node:crypto";
 import * as path$1 from "node:path";

package/dist/builtins/alerts/alerts.addon.js

@@ -3,7 +3,7 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 require("../../chunk-Cek0wNdY.js");
-const require_dist = require("../../dist-C6JIhqS6.js");
+const require_dist = require("../../dist-D6kqBW1G.js");
 //#region src/builtins/alerts/prune-policy.ts
 /**
 * Ids older than `cutoffMs`, oldest first.

package/dist/builtins/alerts/alerts.addon.mjs

@@ -1,4 +1,4 @@
-import { Jt as BaseAddon, M as alertsCapability, bn as EventCategory, n as AlertSchema, qt as errMsg, sn as createEvent } from "../../dist-BjSYm1hH.mjs";
+import { N as alertsCapability, Sn as EventCategory, Xt as BaseAddon, Yt as errMsg, ln as createEvent, n as AlertSchema } from "../../dist-B4htkDVv.mjs";
 //#region src/builtins/alerts/prune-policy.ts
 /**
 * Ids older than `cutoffMs`, oldest first.

package/dist/builtins/backup-orchestrator/backup-orchestrator.addon.js

@@ -3,7 +3,7 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 const require_chunk = require("../../chunk-Cek0wNdY.js");
-const require_dist = require("../../dist-C6JIhqS6.js");
+const require_dist = require("../../dist-D6kqBW1G.js");
 let node_crypto = require("node:crypto");
 let buffer = require("buffer");
 let node_fs_promises = require("node:fs/promises");

package/dist/builtins/backup-orchestrator/backup-orchestrator.addon.mjs

@@ -1,4 +1,4 @@
-import { Bt as storageOccupancyCapability, Jt as BaseAddon, P as backupCapability, bn as EventCategory, yt as mayWriteToLocation } from "../../dist-BjSYm1hH.mjs";
+import { F as backupCapability, Ht as storageOccupancyCapability, Sn as EventCategory, Xt as BaseAddon, xt as mayWriteToLocation } from "../../dist-B4htkDVv.mjs";
 import { randomBytes, randomUUID } from "node:crypto";
 import { Buffer as Buffer$1 } from "buffer";
 import * as fsp from "node:fs/promises";

package/dist/builtins/console-logging/index.js

@@ -3,7 +3,7 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 require("../../chunk-Cek0wNdY.js");
-const require_dist = require("../../dist-C6JIhqS6.js");
+const require_dist = require("../../dist-D6kqBW1G.js");
 const require_formatter = require("../../formatter-DqAKDlvN.js");
 //#region src/builtins/console-logging/console-destination.ts
 var LEVEL_RANK = {

package/dist/builtins/console-logging/index.mjs

@@ -1,4 +1,4 @@
-import { Jt as BaseAddon, ht as logDestinationCapability } from "../../dist-BjSYm1hH.mjs";
+import { Xt as BaseAddon, _t as logDestinationCapability } from "../../dist-B4htkDVv.mjs";
 import { t as formatLogLine } from "../../formatter-B7qW8bPJ.mjs";
 //#region src/builtins/console-logging/console-destination.ts
 var LEVEL_RANK = {

package/dist/builtins/core-blocks/core-blocks.addon.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_chunk = require("../../chunk-Cek0wNdY.js");
-const require_dist = require("../../dist-C6JIhqS6.js");
+const require_dist = require("../../dist-D6kqBW1G.js");
 let node_crypto = require("node:crypto");
 let node_fs_promises = require("node:fs/promises");
 node_fs_promises = require_chunk.__toESM(node_fs_promises);

package/dist/builtins/core-blocks/core-blocks.addon.mjs

@@ -1,4 +1,4 @@
-import { B as coreBlockIdFromAddonId, Jt as BaseAddon, V as coreBlocksCapability, c as CORE_BLOCK_ADDON_PREFIX, d as DeclaredDevices, l as CoreBlockSchema, qt as errMsg, s as CORE_BLOCKS_ADDON_ID, z as coreBlockAddonId } from "../../dist-BjSYm1hH.mjs";
+import { B as coreBlockAddonId, H as coreBlocksCapability, V as coreBlockIdFromAddonId, Xt as BaseAddon, Yt as errMsg, c as CORE_BLOCK_ADDON_PREFIX, d as DeclaredDevices, l as CoreBlockSchema, s as CORE_BLOCKS_ADDON_ID } from "../../dist-B4htkDVv.mjs";
 import { randomUUID } from "node:crypto";
 import * as fs from "node:fs/promises";
 import * as path$1 from "node:path";

package/dist/builtins/device-manager/adoption-job-engine.d.ts

@@ -1,4 +1,5 @@
 import { AdoptionJob, IScopedLogger } from '@camstack/types';
+import { RemovalFence } from './removal-fence.js';
 /**
  * The slice of a `device-adoption` provider this engine drives. Structural on
  * purpose: the real provider satisfies it, and a spec can exercise the whole
@@ -25,18 +26,38 @@ export interface AdoptionJobProvider {
             name?: string;
             hiddenChildIds?: string[];
         }>;
-    }): Promise<{
-        readonly adopted: readonly {
-            readonly childNativeId: string;
-            readonly parentDeviceId: number;
-            readonly accessoryDeviceIds: readonly number[];
-        }[];
-    }>;
+    }): Promise<AdoptResult>;
+}
+/** What one `adopt` call answers. Named so the per-candidate suspension in
+ *  {@link AdoptionJobEngine} has a return type to state. */
+export interface AdoptResult {
+    readonly adopted: readonly {
+        readonly childNativeId: string;
+        readonly parentDeviceId: number;
+        readonly accessoryDeviceIds: readonly number[];
+    }[];
 }
 export interface AdoptionJobEngineDeps {
     /** Resolve the integration's adoption provider for an `addonId` pin. */
     resolveProvider(addonId: string): Promise<AdoptionJobProvider>;
     readonly logger: IScopedLogger;
+    /**
+     * The device-manager's removal fence, so an operator re-adopting hardware
+     * they just deleted is not refused for their OWN action.
+     *
+     * `removal-fence.ts` says a deliberate re-add lifts the fence, and
+     * `adoptDevice` does exactly that — but a job never went near it, so every
+     * integration driven through this engine refused a re-add for the whole
+     * 5-minute TTL. Reported on a Dreame vacuum, 2026-09-16.
+     *
+     * It has to be suspended HERE and not by the caller: `runUnfenced` is a
+     * counter held for the length of an awaited call, while `start()` hands back
+     * a jobId immediately and adopts on a detached promise. Wrapping the caller
+     * would lower the fence for the microseconds it takes to mint an id.
+     *
+     * Optional: absent means exactly the previous behaviour.
+     */
+    readonly removalFence?: RemovalFence;
     readonly now?: () => number;
     readonly newId?: () => string;
 }

package/dist/builtins/device-manager/device-manager.addon.d.ts

@@ -50,6 +50,17 @@ export declare class DeviceManagerAddon extends BaseAddon {
     private remoteNativeCaps;
     /** Background adoption jobs — lazily constructed (needs `ctx.logger`). */
     private adoptionJobEngine;
+    /**
+     * ONE removal fence for this process, shared by the provider context and the
+     * adoption-job engine.
+     *
+     * It used to be constructed inline into the context, so the job engine had
+     * no way to reach it and an operator re-adopting hardware they had just
+     * deleted was refused for the whole 5-minute TTL — their own action, denied.
+     * Two fences would be worse than one: the engine would suspend a fence that
+     * `allocateDeviceId` never consults.
+     */
+    private readonly removalFence;
     /** The runtime-state mirror, asserted present (constructed in onInitialize). */
     private get stateMirror();
     /** Build the `ProviderHost` the extracted provider-method modules

package/dist/builtins/device-manager/device-manager.addon.js

@@ -3,8 +3,8 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 require("../../chunk-Cek0wNdY.js");
-const require_dist = require("../../dist-C6JIhqS6.js");
-const require_retired_settings_keys = require("../../retired-settings-keys-C53Y2Q1C.js");
+const require_dist = require("../../dist-D6kqBW1G.js");
+const require_retired_settings_keys = require("../../retired-settings-keys-BPIyHR4_.js");
 let node_crypto = require("node:crypto");
 let _camstack_types_node = require("@camstack/types/node");
 //#region src/builtins/device-manager/adoption-job-engine.ts
@@ -228,13 +228,15 @@ var AdoptionJobEngine = class {
 		const startedAt = this.now();
 		try {
 			const per = input.perCandidate?.[childNativeId];
-			const entry = (await provider.adopt({
+			const adoptCandidate = async () => await provider.adopt({
 				integrationId: input.integrationId,
 				childNativeIds: [childNativeId],
 				...input.filter !== void 0 ? { filter: input.filter } : {},
 				...input.importLocations !== void 0 ? { importLocations: input.importLocations } : {},
 				...per !== void 0 ? { perCandidate: { [childNativeId]: per } } : {}
-			})).adopted[0];
+			});
+			const fence = this.deps.removalFence;
+			const entry = (fence === void 0 ? await adoptCandidate() : await fence.runUnfenced(adoptCandidate)).adopted[0];
 			if (!entry) {
 				job.results.push({
 					childNativeId,
@@ -3926,7 +3928,8 @@ async function runLocationBackfillAtBoot(pctx, bootRows) {
 * setLocation, setType, setIntegrationId, setLinkDeviceId,
 * setPrimaryChildEntityId, setChildLayout, setRole, setDisplay,
 * applyInitialMeta, setMetadata, setDisabled), and the location registry
-* (listLocations, addLocation, removeLocation).
+* (listLocations, addLocation, removeLocation, renameLocation) with its icon
+* map (listLocationIcons, setLocationIcon).
 *
 * EXACT ordering and side effects preserved — notably registerDevice's
 * name-precedence reconcile + field-preservation spreads, the
@@ -4978,6 +4981,83 @@ async function addLocation(pctx, input) {
 	});
 }
 /**
+* Every location that carries an icon, as `(locationKey, icon)` pairs.
+*
+* ADDITIVE beside `listLocations`, which still answers `string[]` — the
+* autocomplete, the HA adoption import and the recorder all read a list of
+* LABELS and a shape change there would break every one of them. A surface
+* that wants icons asks for them and joins on `locationIconKey`.
+*
+* Returns only what was actually stored. A location with no assignment is
+* ABSENT, never `map-pin`: the fallback belongs to the renderer
+* (`resolveLocationIcon`), and folding it in here would make "the operator
+* picked the pin" indistinguishable from "the operator picked nothing" —
+* which is the difference an icon picker has to draw.
+*/
+async function listLocationIcons(pctx) {
+	const icons = (await pctx.metaStore.readStore()).locationIcons ?? {};
+	return Object.entries(icons).map(([locationKey, icon]) => ({
+		locationKey,
+		icon
+	})).toSorted((a, b) => a.locationKey.localeCompare(b.locationKey));
+}
+/**
+* Set (or clear) the icon of a location label.
+*
+* Keyed on `locationIconKey` — trimmed + lower-cased, the equality the
+* registry matches on everywhere — so a case-only rename keeps the icon and
+* two spellings of one room can never carry two different icons.
+*
+* The label need NOT be registered: `setLocation` accepts a free-form string
+* and `listLocations` folds in whatever devices carry, so requiring
+* registration here would leave exactly the ad-hoc rooms unable to have an
+* icon. An empty label throws — there is no room to name.
+*
+* Same read-modify-write and same lock as `addLocation`: the map is one key of
+* the addon store, and `writeAddonStore` re-inserts the whole key range, so an
+* unordered write carries a stale copy of every other key.
+*/
+async function setLocationIcon(pctx, input) {
+	const trimmed = input.location.trim();
+	if (trimmed.length === 0) throw new Error("[device-manager] setLocationIcon: location must be non-empty");
+	const key = require_dist.locationIconKey(trimmed);
+	await pctx.bindingsDeps.withAddonStoreWriteLock(async () => {
+		const icons = (await pctx.metaStore.readStore()).locationIcons ?? {};
+		if (input.icon === null) {
+			if (!(key in icons)) return;
+			const { [key]: _cleared, ...kept } = icons;
+			await pctx.settings.writeAddonStore({ locationIcons: kept });
+			return;
+		}
+		if (icons[key] === input.icon) return;
+		await pctx.settings.writeAddonStore({ locationIcons: {
+			...icons,
+			[key]: input.icon
+		} });
+	});
+}
+/**
+* Move a location's icon from one key to another, for `renameLocation`.
+*
+* Returns `null` when NOTHING changes, so the caller can leave the key out of
+* its `writeAddonStore` patch instead of re-writing an identical map.
+*
+* A rename onto a room that already has an icon is a MERGE, and the surviving
+* room keeps its own: the operator renaming "Sala" into "Salone" is moving
+* devices into Salone, not restyling it. The source key is dropped either way.
+* Pure — builds a new record, mutates nothing.
+*/
+function renameLocationIcon(icons, fromKey, toKey) {
+	const moved = icons[fromKey];
+	if (moved === void 0) return null;
+	if (fromKey === toKey) return null;
+	const { [fromKey]: _dropped, ...rest } = icons;
+	return toKey in rest ? rest : {
+		...rest,
+		[toKey]: moved
+	};
+}
+/**
 * Remove a label from the curated registry. Match is
 * case-insensitive. Devices that still reference this label keep
 * their `meta.location` value (the registry is a suggestion
@@ -5008,13 +5088,19 @@ async function renameLocation(pctx, input) {
 	const fromKey = from.toLowerCase();
 	const toKey = to.toLowerCase();
 	await pctx.bindingsDeps.withAddonStoreWriteLock(async () => {
-		const current = (await pctx.metaStore.readStore()).locations ?? [];
-		if (!current.some((l) => l.trim().toLowerCase() === fromKey)) return;
+		const store = await pctx.metaStore.readStore();
+		const current = store.locations ?? [];
+		const registered = current.some((l) => l.trim().toLowerCase() === fromKey);
+		const movedIcons = renameLocationIcon(store.locationIcons ?? {}, fromKey, toKey);
+		if (!registered && movedIcons === null) return;
 		const kept = current.filter((l) => {
 			const key = l.trim().toLowerCase();
 			return key !== fromKey && key !== toKey;
 		});
-		await pctx.settings.writeAddonStore({ locations: [...kept, to] });
+		await pctx.settings.writeAddonStore({
+			...registered ? { locations: [...kept, to] } : {},
+			...movedIcons !== null ? { locationIcons: movedIcons } : {}
+		});
 	});
 	const moved = await pctx.metaStore.withMetaWriteLock(async () => {
 		const out = [];
@@ -5052,10 +5138,19 @@ async function removeLocation(pctx, input) {
 	const trimmed = input.name.trim();
 	if (trimmed.length === 0) return;
 	await pctx.bindingsDeps.withAddonStoreWriteLock(async () => {
-		const current = (await pctx.metaStore.readStore()).locations ?? [];
-		const remaining = current.filter((l) => l.toLowerCase() !== trimmed.toLowerCase());
-		if (remaining.length === current.length) return;
-		await pctx.settings.writeAddonStore({ locations: remaining });
+		const store = await pctx.metaStore.readStore();
+		const current = store.locations ?? [];
+		const key = require_dist.locationIconKey(trimmed);
+		const remaining = current.filter((l) => l.toLowerCase() !== key);
+		const droppedLabel = remaining.length !== current.length;
+		const icons = store.locationIcons ?? {};
+		const droppedIcon = key in icons;
+		if (!droppedLabel && !droppedIcon) return;
+		const { [key]: _removedIcon, ...keptIcons } = icons;
+		await pctx.settings.writeAddonStore({
+			...droppedLabel ? { locations: remaining } : {},
+			...droppedIcon ? { locationIcons: keptIcons } : {}
+		});
 	});
 	if (input.cascade !== true) return;
 	const cleared = await pctx.metaStore.withMetaWriteLock(async () => {
@@ -5157,12 +5252,35 @@ function decodeAddonStore(raw) {
 	const nextDeviceId = raw["nextDeviceId"];
 	const locations = raw["locations"];
 	const roleDisplayDefaults = raw["roleDisplayDefaults"];
+	const locationIcons = decodeLocationIcons(raw["locationIcons"]);
 	return {
 		...typeof nextDeviceId === "number" && Number.isFinite(nextDeviceId) ? { nextDeviceId } : {},
 		...Array.isArray(locations) ? { locations: locations.filter((l) => typeof l === "string") } : {},
-		...isRoleDisplayDefaults(roleDisplayDefaults) ? { roleDisplayDefaults } : {}
+		...isRoleDisplayDefaults(roleDisplayDefaults) ? { roleDisplayDefaults } : {},
+		...locationIcons !== null ? { locationIcons } : {}
 	};
 }
+/**
+* Decode the `locationIcons` map, dropping every entry whose value is not a
+* member of the closed vocabulary.
+*
+* Dropping, not passing through: the icon's whole point is that both surfaces
+* can draw it, and an id from a hand-edit or a newer hub is exactly the value
+* that draws nothing. Absent reads as "no icon chosen", which every renderer
+* already degrades to the fallback pin. Returns `null` when the key itself is
+* absent or of the wrong shape, so the field stays OMITTED rather than being
+* written back as an empty object.
+*/
+function decodeLocationIcons(raw) {
+	if (raw === null || typeof raw !== "object" || Array.isArray(raw)) return null;
+	const out = {};
+	for (const [key, value] of Object.entries(raw)) {
+		const parsed = require_dist.LocationIconIdSchema.safeParse(value);
+		if (!parsed.success) continue;
+		out[key] = parsed.data;
+	}
+	return out;
+}
 function isRoleDisplayDefaults(value) {
 	return value !== null && typeof value === "object" && !Array.isArray(value);
 }
@@ -6749,6 +6867,17 @@ var DeviceManagerAddon = class extends require_dist.BaseAddon {
 	remoteNativeCaps = /* @__PURE__ */ new Map();
 	/** Background adoption jobs — lazily constructed (needs `ctx.logger`). */
 	adoptionJobEngine = null;
+	/**
+	* ONE removal fence for this process, shared by the provider context and the
+	* adoption-job engine.
+	*
+	* It used to be constructed inline into the context, so the job engine had
+	* no way to reach it and an operator re-adopting hardware they had just
+	* deleted was refused for the whole 5-minute TTL — their own action, denied.
+	* Two fences would be worse than one: the engine would suspend a fence that
+	* `allocateDeviceId` never consults.
+	*/
+	removalFence = createRemovalFence();
 	/** The runtime-state mirror, asserted present (constructed in onInitialize). */
 	get stateMirror() {
 		if (!this.stateMirrorImpl) throw new Error("DeviceManagerAddon: state mirror accessed before onInitialize");
@@ -6786,7 +6915,8 @@ var DeviceManagerAddon = class extends require_dist.BaseAddon {
 	get adoptionJobsImpl() {
 		if (!this.adoptionJobEngine) this.adoptionJobEngine = new AdoptionJobEngine({
 			resolveProvider: async (addonId) => this.requireDeviceAdoptionProvider(addonId),
-			logger: this.ctx.logger
+			logger: this.ctx.logger,
+			removalFence: this.removalFence
 		});
 		return this.adoptionJobEngine;
 	}
@@ -6937,7 +7067,7 @@ var DeviceManagerAddon = class extends require_dist.BaseAddon {
 			registry,
 			bindingsDeps: this.bindingsDeps,
 			migrationGuard: createMigrationGuard(),
-			removalFence: createRemovalFence(),
+			removalFence: this.removalFence,
 			requireDeviceOps,
 			stampIntegrationId: stampIntegrationId$1,
 			get provider() {
@@ -6983,6 +7113,8 @@ var DeviceManagerAddon = class extends require_dist.BaseAddon {
 			addLocation: (input) => addLocation(pctx, input),
 			removeLocation: (input) => removeLocation(pctx, input),
 			renameLocation: (input) => renameLocation(pctx, input),
+			listLocationIcons: () => listLocationIcons(pctx),
+			setLocationIcon: (input) => setLocationIcon(pctx, input),
 			listPersistedByAddon: (input) => listPersistedByAddon(pctx, input),
 			listAll: (input) => listAll(pctx, input),
 			getDevice: (input) => getDevice(pctx, input),