@camstack/system 1.1.10 → 1.1.11

package/dist/addon-runner.js

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-Cek0wNdY.js");
-const require_manifest_python_deps = require("./manifest-python-deps-Ba_eOEPT.js");
+const require_manifest_python_deps = require("./manifest-python-deps-Cro19O4u.js");
 const require_custom_action_registry = require("./custom-action-registry-vLYEFTtv.js");
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);

package/dist/addon-runner.mjs

@@ -1,4 +1,4 @@
-import { $ as setWorkerNativeCapsChangeListener, A as createUdsLoggerWithControl, X as getWorkerNativeCapProvider, Z as getWorkerNativeCapSnapshot, i as createUdsAddonContext, j as LocalChildClient, mt as resolveAddonClass, pt as installManifestNativeDeps, t as installManifestPythonDeps, tt as validateProviderRegistrations } from "./manifest-python-deps-BqId8WrC.mjs";
+import { $ as setWorkerNativeCapsChangeListener, A as createUdsLoggerWithControl, X as getWorkerNativeCapProvider, Z as getWorkerNativeCapSnapshot, i as createUdsAddonContext, j as LocalChildClient, mt as resolveAddonClass, pt as installManifestNativeDeps, t as installManifestPythonDeps, tt as validateProviderRegistrations } from "./manifest-python-deps-1zTy3vXe.mjs";
 import { t as CustomActionRegistry } from "./custom-action-registry-BEXwC-oo.mjs";
 import { register } from "node:module";
 import * as fs from "node:fs";

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

@@ -239,7 +239,8 @@ function buildLinkIndexes(entries) {
 *
 *   Addon store layout:
 *     deviceIndex  → Record<addonId, stableId[]>          (which devices exist per addon)
-*     deviceMeta   → Record<"addonId:stableId", DeviceMeta> (type, name, parentDeviceId, id)
+*     deviceMeta   → Record<numericId, DeviceMeta>        (keyed by numeric device id;
+*                                                          addonId + stableId are FIELDS on the record)
 *
 *   Device store (per-device config):
 *     readDeviceStore(numericDeviceId)  → config blob
@@ -282,9 +283,6 @@ function shallowEqual(a, b) {
 	for (const k of ak) if (a[k] !== b[k]) return false;
 	return true;
 }
-function deviceKey(addonId, stableId) {
-	return `${addonId}:${stableId}`;
-}
 /** Returns true when `x` is a non-null, non-array plain object. */
 function isRecord(x) {
 	return x !== null && typeof x === "object" && !Array.isArray(x);
@@ -777,12 +775,7 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 	* numeric deviceId; this helper is display-only.
 	*/
 	async lookupPersistedStableId(deviceId) {
-		const meta = (await this.ctx.settings.readAddonStore()).deviceMeta ?? {};
-		for (const [key, m] of Object.entries(meta)) if (m.id === deviceId) {
-			const sep = key.indexOf(":");
-			if (sep < 0) continue;
-			return key.slice(sep + 1);
-		}
+		return ((await this.ctx.settings.readAddonStore()).deviceMeta ?? {})[String(deviceId)]?.stableId;
 	}
 	async getDeviceAggregate(deviceId, kind) {
 		const registry = this.capabilityRegistry;
@@ -1474,28 +1467,32 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 		* Returns null when no device with that id is known to the hub.
 		*/
 		const resolvePersistedById = async (deviceId) => {
+			const m = (await readMeta())[String(deviceId)];
+			if (!m) return null;
+			return {
+				addonId: m.addonId,
+				stableId: m.stableId,
+				meta: m
+			};
+		};
+		/** Direct children of a device: the union of the live registry's children
+		*  and the persisted-meta scan (`parentDeviceId === parentId`), deduplicated
+		*  and excluding self. Shared by the `remove` cascade and the `resetToSource`
+		*  resync purge (#19). */
+		const directChildIds = async (parentId) => {
+			const ids = /* @__PURE__ */ new Set();
+			if (registry) for (const c of registry.getChildren(parentId)) ids.add(c.id);
 			const meta = await readMeta();
-			for (const [key, m] of Object.entries(meta)) if (m.id === deviceId) {
-				const sep = key.indexOf(":");
-				if (sep < 0) continue;
-				return {
-					addonId: key.slice(0, sep),
-					stableId: key.slice(sep + 1),
-					meta: m
-				};
-			}
-			return null;
+			for (const m of Object.values(meta)) if (m.parentDeviceId === parentId) ids.add(m.id);
+			ids.delete(parentId);
+			return [...ids];
 		};
 		/** Resolve a link's `sourceKey` to a live device id: the sibling accessory
 		*  whose stableId is `${parentStableId}-${sourceKey}`. Null when absent.
 		*  Pure over a pre-read meta map so a multi-link resolve reads the store once. */
 		const resolveSourceDeviceId = (parentStableId, sourceKey, meta) => {
 			const wanted = `${parentStableId}-${sourceKey}`;
-			for (const [key, m] of Object.entries(meta)) {
-				const sep = key.indexOf(":");
-				if (sep < 0) continue;
-				if (key.slice(sep + 1) === wanted) return m.id;
-			}
+			for (const m of Object.values(meta)) if (m.stableId === wanted) return m.id;
 			return null;
 		};
 		/** Rebuild the `linkTargets` / `linkDependents` reverse-index maps from the
@@ -1513,12 +1510,9 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 			const allMeta = await readMeta();
 			const stableIdById = /* @__PURE__ */ new Map();
 			const idByStableId = /* @__PURE__ */ new Map();
-			for (const [key, m] of Object.entries(allMeta)) {
-				const sep = key.indexOf(":");
-				if (sep < 0) continue;
-				const sid = key.slice(sep + 1);
-				stableIdById.set(m.id, sid);
-				idByStableId.set(sid, m.id);
+			for (const m of Object.values(allMeta)) {
+				stableIdById.set(m.id, m.stableId);
+				idByStableId.set(m.stableId, m.id);
 			}
 			const entries = [];
 			const expectedSources = /* @__PURE__ */ new Set();
@@ -1546,10 +1540,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 		const idToAddonId = /* @__PURE__ */ new Map();
 		{
 			const meta = await readMeta();
-			for (const [key, m] of Object.entries(meta)) {
-				const sep = key.indexOf(":");
-				if (sep < 0) continue;
-				idToAddonId.set(m.id, key.slice(0, sep));
+			for (const m of Object.values(meta)) {
+				idToAddonId.set(m.id, m.addonId);
 				if (Array.isArray(m.deviceLinks) && m.deviceLinks.length > 0) this.devicesWithLinks.add(m.id);
 			}
 		}
@@ -1563,8 +1555,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 			await withMetaWriteLock(async () => {
 				const persisted = await resolvePersistedById(deviceId);
 				if (!persisted) throw new Error(`[device-manager] stampIntegrationId: unknown device id=${deviceId}`);
-				const { addonId: aid, stableId, meta: m } = persisted;
-				const key = deviceKey(aid, stableId);
+				const { meta: m } = persisted;
+				const key = String(deviceId);
 				const allMeta = await readMeta();
 				await settings.writeAddonStore({ deviceMeta: {
 					...allMeta,
@@ -1645,10 +1637,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 				let containerStableId = persisted.stableId;
 				const parentId = persisted.meta.parentDeviceId;
 				if (parentId !== null) {
-					for (const [key, m] of Object.entries(allMeta)) if (m.id === parentId) {
-						containerStableId = key.slice(key.indexOf(":") + 1);
-						break;
-					}
+					const parentMeta = allMeta[String(parentId)];
+					if (parentMeta) containerStableId = parentMeta.stableId;
 				}
 				const resolved = [];
 				for (const link of links) {
@@ -1688,15 +1678,16 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 			*  `registerDevice` completes. */
 			allocateDeviceId: async (input) => {
 				const { addonId, stableId } = input;
-				const key = deviceKey(addonId, stableId);
 				return await withMetaWriteLock(async () => {
 					const meta = await readMeta();
-					const existing = meta[key];
+					const existing = Object.values(meta).find((m) => m.addonId === addonId && m.stableId === stableId);
 					if (existing) return { id: existing.id };
 					const id = await allocateNextDeviceId();
 					await settings.writeAddonStore({ deviceMeta: {
 						...meta,
-						[key]: {
+						[String(id)]: {
+							addonId,
+							stableId,
 							type: "generic",
 							name: stableId,
 							location: null,
@@ -1710,7 +1701,7 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 			},
 			registerDevice: async (input) => {
 				const { addonId, stableId, id, type, name, parentDeviceId, features, config } = input;
-				const key = deviceKey(addonId, stableId);
+				const key = String(id);
 				const featuresArr = Array.isArray(features) ? [...features] : [];
 				const { isFirstRegistration, exportFingerprint, fingerprintChanged } = await withMetaWriteLock(async () => {
 					const index = await readIndex();
@@ -1722,6 +1713,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 					} });
 					const meta = await readMeta();
 					const existingMeta = meta[key];
+					const wasUserNamed = existingMeta?.userNamed ?? (existingMeta !== void 0 && existingMeta.name !== stableId);
+					const resolvedName = wasUserNamed && existingMeta !== void 0 ? existingMeta.name : name;
 					const isFirst = !existingMeta || !wasInIndex;
 					const fingerprint = (0, _camstack_types_node.canonicalDeviceFingerprint)({
 						deviceId: id,
@@ -1731,8 +1724,11 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 					await settings.writeAddonStore({ deviceMeta: {
 						...meta,
 						[key]: {
+							addonId,
+							stableId,
 							type,
-							name: existingMeta && existingMeta.name !== stableId ? existingMeta.name : name,
+							name: resolvedName,
+							userNamed: wasUserNamed,
 							location: existingMeta?.location ?? null,
 							disabled: existingMeta?.disabled ?? false,
 							...existingMeta?.integrationId !== void 0 ? { integrationId: existingMeta.integrationId } : {},
@@ -1807,7 +1803,7 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 				const persisted = await resolvePersistedById(deviceId);
 				if (!persisted) return;
 				const { addonId, stableId, meta: persistedMeta } = persisted;
-				const key = deviceKey(addonId, stableId);
+				const key = String(deviceId);
 				const deviceName = persistedMeta.name;
 				await withMetaWriteLock(async () => {
 					const index = await readIndex();
@@ -1888,7 +1884,7 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 				const persisted = await resolvePersistedById(deviceId);
 				if (!persisted) return null;
 				const { addonId, stableId, meta: m } = persisted;
-				const key = deviceKey(addonId, stableId);
+				const key = String(deviceId);
 				const metadata = (await readMetadataMap())[key] ?? null;
 				return {
 					id: m.id,
@@ -1917,14 +1913,15 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 				await withMetaWriteLock(async () => {
 					const persisted = await resolvePersistedById(deviceId);
 					if (!persisted) throw new Error(`[device-manager] setName: unknown device id=${deviceId}`);
-					const { addonId, stableId, meta: m } = persisted;
-					const key = deviceKey(addonId, stableId);
+					const { meta: m } = persisted;
+					const key = String(deviceId);
 					const allMeta = await readMeta();
 					await settings.writeAddonStore({ deviceMeta: {
 						...allMeta,
 						[key]: {
 							...m,
-							name
+							name,
+							userNamed: true
 						}
 					} });
 				});
@@ -1954,8 +1951,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 				await withMetaWriteLock(async () => {
 					const persisted = await resolvePersistedById(deviceId);
 					if (!persisted) throw new Error(`[device-manager] setLocation: unknown device id=${deviceId}`);
-					const { addonId, stableId, meta: m } = persisted;
-					const key = deviceKey(addonId, stableId);
+					const { meta: m } = persisted;
+					const key = String(deviceId);
 					const allMeta = await readMeta();
 					await settings.writeAddonStore({ deviceMeta: {
 						...allMeta,
@@ -1992,8 +1989,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 				await withMetaWriteLock(async () => {
 					const persisted = await resolvePersistedById(deviceId);
 					if (!persisted) throw new Error(`[device-manager] setType: unknown device id=${deviceId}`);
-					const { addonId, stableId, meta: m } = persisted;
-					const key = deviceKey(addonId, stableId);
+					const { meta: m } = persisted;
+					const key = String(deviceId);
 					const allMeta = await readMeta();
 					await settings.writeAddonStore({ deviceMeta: {
 						...allMeta,
@@ -2038,8 +2035,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 				await withMetaWriteLock(async () => {
 					const persisted = await resolvePersistedById(deviceId);
 					if (!persisted) throw new Error(`[device-manager] setLinkDeviceId: unknown device id=${deviceId}`);
-					const { addonId: aid, stableId, meta: m } = persisted;
-					const key = deviceKey(aid, stableId);
+					const { meta: m } = persisted;
+					const key = String(deviceId);
 					const allMeta = await readMeta();
 					await settings.writeAddonStore({ deviceMeta: {
 						...allMeta,
@@ -2076,8 +2073,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 				await withMetaWriteLock(async () => {
 					const persisted = await resolvePersistedById(deviceId);
 					if (!persisted) throw new Error(`[device-manager] setPrimaryChildEntityId: unknown device id=${deviceId}`);
-					const { addonId: aid, stableId, meta: m } = persisted;
-					const key = deviceKey(aid, stableId);
+					const { meta: m } = persisted;
+					const key = String(deviceId);
 					const allMeta = await readMeta();
 					await settings.writeAddonStore({ deviceMeta: {
 						...allMeta,
@@ -2113,8 +2110,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 				await withMetaWriteLock(async () => {
 					const persisted = await resolvePersistedById(deviceId);
 					if (!persisted) throw new Error(`[device-manager] setChildLayout: unknown device id=${deviceId}`);
-					const { addonId: aid, stableId, meta: m } = persisted;
-					const key = deviceKey(aid, stableId);
+					const { meta: m } = persisted;
+					const key = String(deviceId);
 					const allMeta = await readMeta();
 					await settings.writeAddonStore({ deviceMeta: {
 						...allMeta,
@@ -2151,8 +2148,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 				await withMetaWriteLock(async () => {
 					const persisted = await resolvePersistedById(deviceId);
 					if (!persisted) throw new Error(`[device-manager] setDeviceLinks: unknown device id=${deviceId}`);
-					const { addonId: aid, stableId, meta: m } = persisted;
-					const key = deviceKey(aid, stableId);
+					const { meta: m } = persisted;
+					const key = String(deviceId);
 					const allMeta = await readMeta();
 					await settings.writeAddonStore({ deviceMeta: {
 						...allMeta,
@@ -2191,8 +2188,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 				await withMetaWriteLock(async () => {
 					const persisted = await resolvePersistedById(deviceId);
 					if (!persisted) throw new Error(`[device-manager] setRole: unknown device id=${deviceId}`);
-					const { addonId: aid, stableId, meta: m } = persisted;
-					const key = deviceKey(aid, stableId);
+					const { meta: m } = persisted;
+					const key = String(deviceId);
 					const allMeta = await readMeta();
 					await settings.writeAddonStore({ deviceMeta: {
 						...allMeta,
@@ -2238,8 +2235,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 				await withMetaWriteLock(async () => {
 					const persisted = await resolvePersistedById(deviceId);
 					if (!persisted) throw new Error(`[device-manager] applyInitialMeta: unknown device id=${deviceId}`);
-					const { addonId: aid, stableId, meta: m } = persisted;
-					const key = deviceKey(aid, stableId);
+					const { meta: m } = persisted;
+					const key = String(deviceId);
 					const allMeta = await readMeta();
 					const merged = {
 						...m,
@@ -2289,10 +2286,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 			setMetadata: async (input) => {
 				const { deviceId, patch } = input;
 				const result = await withMetaWriteLock(async () => {
-					const persisted = await resolvePersistedById(deviceId);
-					if (!persisted) throw new Error(`[device-manager] setMetadata: unknown device id=${deviceId}`);
-					const { addonId, stableId } = persisted;
-					const key = deviceKey(addonId, stableId);
+					if (!await resolvePersistedById(deviceId)) throw new Error(`[device-manager] setMetadata: unknown device id=${deviceId}`);
+					const key = String(deviceId);
 					const map = await readMetadataMap();
 					const next = { ...map[key] ?? {} };
 					let changed = false;
@@ -2343,8 +2338,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 				await withMetaWriteLock(async () => {
 					const persisted = await resolvePersistedById(deviceId);
 					if (!persisted) throw new Error(`[device-manager] setDisabled: unknown device id=${deviceId}`);
-					const { addonId, stableId, meta: m } = persisted;
-					const key = deviceKey(addonId, stableId);
+					const { meta: m } = persisted;
+					const key = String(deviceId);
 					const allMeta = await readMeta();
 					await settings.writeAddonStore({ deviceMeta: {
 						...allMeta,
@@ -2461,8 +2456,11 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 			listPersistedByAddon: async (input) => {
 				const { addonId } = input;
 				const [index, meta] = await Promise.all([readIndex(), readMeta()]);
-				return (index[addonId] ?? []).map((stableId) => {
-					const m = meta[deviceKey(addonId, stableId)];
+				const stableIds = index[addonId] ?? [];
+				const byStableId = /* @__PURE__ */ new Map();
+				for (const m of Object.values(meta)) if (m.addonId === addonId) byStableId.set(m.stableId, m);
+				return stableIds.map((stableId) => {
+					const m = byStableId.get(stableId);
 					return {
 						id: m.id,
 						stableId,
@@ -2486,7 +2484,7 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 						device
 					})) : registry.getAllWithAddonId();
 					for (const { addonId: aid, device } of liveEntries) {
-						const key = deviceKey(aid, device.stableId);
+						const key = String(device.id);
 						const metadata = metadataMap[key] ?? null;
 						const metaRow = meta[key] ?? null;
 						results.push(toDeviceInfo(aid, device, metadata, metaRow));
@@ -2494,11 +2492,13 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 					}
 				}
 				const index = await readIndex();
+				const metaByAddonStable = /* @__PURE__ */ new Map();
+				for (const m of Object.values(meta)) metaByAddonStable.set(`${m.addonId}${m.stableId}`, m);
 				const targetAddons = addonId ? [addonId] : Object.keys(index);
 				for (const aid of targetAddons) for (const stableId of index[aid] ?? []) {
-					const key = deviceKey(aid, stableId);
+					const m = metaByAddonStable.get(`${aid}${stableId}`);
+					const key = String(m.id);
 					if (seen.has(key)) continue;
-					const m = meta[key];
 					const persistedType = m.type;
 					const persistedConfig = await settings.readDeviceStore(m.id);
 					const metadata = metadataMap[key] ?? null;
@@ -2536,7 +2536,7 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 				if (registry) {
 					const found = resolveDeviceById(registry, deviceId);
 					if (found) {
-						const key = deviceKey(found.addonId, found.device.stableId);
+						const key = String(found.device.id);
 						const [map, metaMap] = await Promise.all([readMetadataMap(), readMeta()]);
 						const metadata = map[key] ?? null;
 						const metaRow = metaMap[key] ?? null;
@@ -2547,7 +2547,7 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 				if (!persisted) return null;
 				const { addonId: aid, stableId, meta: m } = persisted;
 				const persistedConfig = await settings.readDeviceStore(m.id);
-				const key = deviceKey(aid, stableId);
+				const key = String(deviceId);
 				const metadata = (await readMetadataMap())[key] ?? null;
 				const sourceInfoGetDevice = buildSourceInfoFromConfig(persistedConfig ?? {}, stableId, aid);
 				return {
@@ -2595,18 +2595,20 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 				if (registry) {
 					const liveChildren = registry.getChildren(parentDeviceId);
 					for (const device of liveChildren) {
-						const key = deviceKey(ownerAddonId, device.stableId);
+						const key = String(device.id);
 						const metadata = metadataMap[key] ?? null;
 						const metaRow = meta[key] ?? null;
 						results.push(toDeviceInfo(ownerAddonId, device, metadata, metaRow));
 						seen.add(key);
 					}
 				}
-				const persistedChildren = (index[ownerAddonId] ?? []).filter((sid) => meta[deviceKey(ownerAddonId, sid)]?.parentDeviceId === parentDeviceId);
+				const ownerMetaByStableId = /* @__PURE__ */ new Map();
+				for (const m of Object.values(meta)) if (m.addonId === ownerAddonId) ownerMetaByStableId.set(m.stableId, m);
+				const persistedChildren = (index[ownerAddonId] ?? []).filter((sid) => ownerMetaByStableId.get(sid)?.parentDeviceId === parentDeviceId);
 				for (const childStableId of persistedChildren) {
-					const key = deviceKey(ownerAddonId, childStableId);
+					const m = ownerMetaByStableId.get(childStableId);
+					const key = String(m.id);
 					if (seen.has(key)) continue;
-					const m = meta[key];
 					const persistedConfig = await settings.readDeviceStore(m.id);
 					const metadata = metadataMap[key] ?? null;
 					const sourceInfoChild = buildSourceInfoFromConfig(persistedConfig ?? {}, childStableId, ownerAddonId);
@@ -2712,14 +2714,6 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 			},
 			remove: async (input) => {
 				const { deviceId } = input;
-				const directChildIds = async (parentId) => {
-					const ids = /* @__PURE__ */ new Set();
-					if (registry) for (const c of registry.getChildren(parentId)) ids.add(c.id);
-					const meta = await readMeta();
-					for (const m of Object.values(meta)) if (m.parentDeviceId === parentId) ids.add(m.id);
-					ids.delete(parentId);
-					return [...ids];
-				};
 				const removeOne = async (id) => {
 					if (registry) {
 						const live = resolveDeviceById(registry, id);
@@ -2910,11 +2904,29 @@ var DeviceManagerAddon = class DeviceManagerAddon extends _camstack_types.BaseAd
 			adoptionRelease: async ({ addonId, ...rest }) => {
 				return (await this.requireDeviceAdoptionProvider(addonId)).release(rest);
 			},
-			adoptionResync: async ({ camDeviceId }) => {
+			adoptionResync: async ({ camDeviceId, resetToSource }) => {
 				let owningAddonId = registry?.getAddonId(camDeviceId) ?? null;
 				if (!owningAddonId) owningAddonId = (await resolvePersistedById(camDeviceId))?.addonId ?? null;
 				if (!owningAddonId) throw new Error(`adoptionResync: device ${camDeviceId} not found`);
-				return (await this.requireDeviceAdoptionProvider(owningAddonId)).resync({ camDeviceId });
+				let removedChildren = 0;
+				if (resetToSource === true) {
+					const childIds = await directChildIds(camDeviceId);
+					for (const childId of childIds) {
+						await provider.remove({ deviceId: childId });
+						removedChildren += 1;
+					}
+					this.ctx.logger.info("resetToSource purge before resync", { tags: {
+						deviceId: camDeviceId,
+						removedChildren
+					} });
+				}
+				return {
+					...await (await this.requireDeviceAdoptionProvider(owningAddonId)).resync({
+						camDeviceId,
+						resetToSource
+					}),
+					removedChildren
+				};
 			},
 			testField: async (input) => {
 				const { deviceId } = input;

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

@@ -234,7 +234,8 @@ function buildLinkIndexes(entries) {
 *
 *   Addon store layout:
 *     deviceIndex  → Record<addonId, stableId[]>          (which devices exist per addon)
-*     deviceMeta   → Record<"addonId:stableId", DeviceMeta> (type, name, parentDeviceId, id)
+*     deviceMeta   → Record<numericId, DeviceMeta>        (keyed by numeric device id;
+*                                                          addonId + stableId are FIELDS on the record)
 *
 *   Device store (per-device config):
 *     readDeviceStore(numericDeviceId)  → config blob
@@ -277,9 +278,6 @@ function shallowEqual(a, b) {
 	for (const k of ak) if (a[k] !== b[k]) return false;
 	return true;
 }
-function deviceKey(addonId, stableId) {
-	return `${addonId}:${stableId}`;
-}
 /** Returns true when `x` is a non-null, non-array plain object. */
 function isRecord(x) {
 	return x !== null && typeof x === "object" && !Array.isArray(x);
@@ -772,12 +770,7 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 	* numeric deviceId; this helper is display-only.
 	*/
 	async lookupPersistedStableId(deviceId) {
-		const meta = (await this.ctx.settings.readAddonStore()).deviceMeta ?? {};
-		for (const [key, m] of Object.entries(meta)) if (m.id === deviceId) {
-			const sep = key.indexOf(":");
-			if (sep < 0) continue;
-			return key.slice(sep + 1);
-		}
+		return ((await this.ctx.settings.readAddonStore()).deviceMeta ?? {})[String(deviceId)]?.stableId;
 	}
 	async getDeviceAggregate(deviceId, kind) {
 		const registry = this.capabilityRegistry;
@@ -1469,28 +1462,32 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 		* Returns null when no device with that id is known to the hub.
 		*/
 		const resolvePersistedById = async (deviceId) => {
+			const m = (await readMeta())[String(deviceId)];
+			if (!m) return null;
+			return {
+				addonId: m.addonId,
+				stableId: m.stableId,
+				meta: m
+			};
+		};
+		/** Direct children of a device: the union of the live registry's children
+		*  and the persisted-meta scan (`parentDeviceId === parentId`), deduplicated
+		*  and excluding self. Shared by the `remove` cascade and the `resetToSource`
+		*  resync purge (#19). */
+		const directChildIds = async (parentId) => {
+			const ids = /* @__PURE__ */ new Set();
+			if (registry) for (const c of registry.getChildren(parentId)) ids.add(c.id);
 			const meta = await readMeta();
-			for (const [key, m] of Object.entries(meta)) if (m.id === deviceId) {
-				const sep = key.indexOf(":");
-				if (sep < 0) continue;
-				return {
-					addonId: key.slice(0, sep),
-					stableId: key.slice(sep + 1),
-					meta: m
-				};
-			}
-			return null;
+			for (const m of Object.values(meta)) if (m.parentDeviceId === parentId) ids.add(m.id);
+			ids.delete(parentId);
+			return [...ids];
 		};
 		/** Resolve a link's `sourceKey` to a live device id: the sibling accessory
 		*  whose stableId is `${parentStableId}-${sourceKey}`. Null when absent.
 		*  Pure over a pre-read meta map so a multi-link resolve reads the store once. */
 		const resolveSourceDeviceId = (parentStableId, sourceKey, meta) => {
 			const wanted = `${parentStableId}-${sourceKey}`;
-			for (const [key, m] of Object.entries(meta)) {
-				const sep = key.indexOf(":");
-				if (sep < 0) continue;
-				if (key.slice(sep + 1) === wanted) return m.id;
-			}
+			for (const m of Object.values(meta)) if (m.stableId === wanted) return m.id;
 			return null;
 		};
 		/** Rebuild the `linkTargets` / `linkDependents` reverse-index maps from the
@@ -1508,12 +1505,9 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 			const allMeta = await readMeta();
 			const stableIdById = /* @__PURE__ */ new Map();
 			const idByStableId = /* @__PURE__ */ new Map();
-			for (const [key, m] of Object.entries(allMeta)) {
-				const sep = key.indexOf(":");
-				if (sep < 0) continue;
-				const sid = key.slice(sep + 1);
-				stableIdById.set(m.id, sid);
-				idByStableId.set(sid, m.id);
+			for (const m of Object.values(allMeta)) {
+				stableIdById.set(m.id, m.stableId);
+				idByStableId.set(m.stableId, m.id);
 			}
 			const entries = [];
 			const expectedSources = /* @__PURE__ */ new Set();
@@ -1541,10 +1535,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 		const idToAddonId = /* @__PURE__ */ new Map();
 		{
 			const meta = await readMeta();
-			for (const [key, m] of Object.entries(meta)) {
-				const sep = key.indexOf(":");
-				if (sep < 0) continue;
-				idToAddonId.set(m.id, key.slice(0, sep));
+			for (const m of Object.values(meta)) {
+				idToAddonId.set(m.id, m.addonId);
 				if (Array.isArray(m.deviceLinks) && m.deviceLinks.length > 0) this.devicesWithLinks.add(m.id);
 			}
 		}
@@ -1558,8 +1550,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 			await withMetaWriteLock(async () => {
 				const persisted = await resolvePersistedById(deviceId);
 				if (!persisted) throw new Error(`[device-manager] stampIntegrationId: unknown device id=${deviceId}`);
-				const { addonId: aid, stableId, meta: m } = persisted;
-				const key = deviceKey(aid, stableId);
+				const { meta: m } = persisted;
+				const key = String(deviceId);
 				const allMeta = await readMeta();
 				await settings.writeAddonStore({ deviceMeta: {
 					...allMeta,
@@ -1640,10 +1632,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 				let containerStableId = persisted.stableId;
 				const parentId = persisted.meta.parentDeviceId;
 				if (parentId !== null) {
-					for (const [key, m] of Object.entries(allMeta)) if (m.id === parentId) {
-						containerStableId = key.slice(key.indexOf(":") + 1);
-						break;
-					}
+					const parentMeta = allMeta[String(parentId)];
+					if (parentMeta) containerStableId = parentMeta.stableId;
 				}
 				const resolved = [];
 				for (const link of links) {
@@ -1683,15 +1673,16 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 			*  `registerDevice` completes. */
 			allocateDeviceId: async (input) => {
 				const { addonId, stableId } = input;
-				const key = deviceKey(addonId, stableId);
 				return await withMetaWriteLock(async () => {
 					const meta = await readMeta();
-					const existing = meta[key];
+					const existing = Object.values(meta).find((m) => m.addonId === addonId && m.stableId === stableId);
 					if (existing) return { id: existing.id };
 					const id = await allocateNextDeviceId();
 					await settings.writeAddonStore({ deviceMeta: {
 						...meta,
-						[key]: {
+						[String(id)]: {
+							addonId,
+							stableId,
 							type: "generic",
 							name: stableId,
 							location: null,
@@ -1705,7 +1696,7 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 			},
 			registerDevice: async (input) => {
 				const { addonId, stableId, id, type, name, parentDeviceId, features, config } = input;
-				const key = deviceKey(addonId, stableId);
+				const key = String(id);
 				const featuresArr = Array.isArray(features) ? [...features] : [];
 				const { isFirstRegistration, exportFingerprint, fingerprintChanged } = await withMetaWriteLock(async () => {
 					const index = await readIndex();
@@ -1717,6 +1708,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 					} });
 					const meta = await readMeta();
 					const existingMeta = meta[key];
+					const wasUserNamed = existingMeta?.userNamed ?? (existingMeta !== void 0 && existingMeta.name !== stableId);
+					const resolvedName = wasUserNamed && existingMeta !== void 0 ? existingMeta.name : name;
 					const isFirst = !existingMeta || !wasInIndex;
 					const fingerprint = canonicalDeviceFingerprint({
 						deviceId: id,
@@ -1726,8 +1719,11 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 					await settings.writeAddonStore({ deviceMeta: {
 						...meta,
 						[key]: {
+							addonId,
+							stableId,
 							type,
-							name: existingMeta && existingMeta.name !== stableId ? existingMeta.name : name,
+							name: resolvedName,
+							userNamed: wasUserNamed,
 							location: existingMeta?.location ?? null,
 							disabled: existingMeta?.disabled ?? false,
 							...existingMeta?.integrationId !== void 0 ? { integrationId: existingMeta.integrationId } : {},
@@ -1802,7 +1798,7 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 				const persisted = await resolvePersistedById(deviceId);
 				if (!persisted) return;
 				const { addonId, stableId, meta: persistedMeta } = persisted;
-				const key = deviceKey(addonId, stableId);
+				const key = String(deviceId);
 				const deviceName = persistedMeta.name;
 				await withMetaWriteLock(async () => {
 					const index = await readIndex();
@@ -1883,7 +1879,7 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 				const persisted = await resolvePersistedById(deviceId);
 				if (!persisted) return null;
 				const { addonId, stableId, meta: m } = persisted;
-				const key = deviceKey(addonId, stableId);
+				const key = String(deviceId);
 				const metadata = (await readMetadataMap())[key] ?? null;
 				return {
 					id: m.id,
@@ -1912,14 +1908,15 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 				await withMetaWriteLock(async () => {
 					const persisted = await resolvePersistedById(deviceId);
 					if (!persisted) throw new Error(`[device-manager] setName: unknown device id=${deviceId}`);
-					const { addonId, stableId, meta: m } = persisted;
-					const key = deviceKey(addonId, stableId);
+					const { meta: m } = persisted;
+					const key = String(deviceId);
 					const allMeta = await readMeta();
 					await settings.writeAddonStore({ deviceMeta: {
 						...allMeta,
 						[key]: {
 							...m,
-							name
+							name,
+							userNamed: true
 						}
 					} });
 				});
@@ -1949,8 +1946,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 				await withMetaWriteLock(async () => {
 					const persisted = await resolvePersistedById(deviceId);
 					if (!persisted) throw new Error(`[device-manager] setLocation: unknown device id=${deviceId}`);
-					const { addonId, stableId, meta: m } = persisted;
-					const key = deviceKey(addonId, stableId);
+					const { meta: m } = persisted;
+					const key = String(deviceId);
 					const allMeta = await readMeta();
 					await settings.writeAddonStore({ deviceMeta: {
 						...allMeta,
@@ -1987,8 +1984,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 				await withMetaWriteLock(async () => {
 					const persisted = await resolvePersistedById(deviceId);
 					if (!persisted) throw new Error(`[device-manager] setType: unknown device id=${deviceId}`);
-					const { addonId, stableId, meta: m } = persisted;
-					const key = deviceKey(addonId, stableId);
+					const { meta: m } = persisted;
+					const key = String(deviceId);
 					const allMeta = await readMeta();
 					await settings.writeAddonStore({ deviceMeta: {
 						...allMeta,
@@ -2033,8 +2030,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 				await withMetaWriteLock(async () => {
 					const persisted = await resolvePersistedById(deviceId);
 					if (!persisted) throw new Error(`[device-manager] setLinkDeviceId: unknown device id=${deviceId}`);
-					const { addonId: aid, stableId, meta: m } = persisted;
-					const key = deviceKey(aid, stableId);
+					const { meta: m } = persisted;
+					const key = String(deviceId);
 					const allMeta = await readMeta();
 					await settings.writeAddonStore({ deviceMeta: {
 						...allMeta,
@@ -2071,8 +2068,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 				await withMetaWriteLock(async () => {
 					const persisted = await resolvePersistedById(deviceId);
 					if (!persisted) throw new Error(`[device-manager] setPrimaryChildEntityId: unknown device id=${deviceId}`);
-					const { addonId: aid, stableId, meta: m } = persisted;
-					const key = deviceKey(aid, stableId);
+					const { meta: m } = persisted;
+					const key = String(deviceId);
 					const allMeta = await readMeta();
 					await settings.writeAddonStore({ deviceMeta: {
 						...allMeta,
@@ -2108,8 +2105,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 				await withMetaWriteLock(async () => {
 					const persisted = await resolvePersistedById(deviceId);
 					if (!persisted) throw new Error(`[device-manager] setChildLayout: unknown device id=${deviceId}`);
-					const { addonId: aid, stableId, meta: m } = persisted;
-					const key = deviceKey(aid, stableId);
+					const { meta: m } = persisted;
+					const key = String(deviceId);
 					const allMeta = await readMeta();
 					await settings.writeAddonStore({ deviceMeta: {
 						...allMeta,
@@ -2146,8 +2143,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 				await withMetaWriteLock(async () => {
 					const persisted = await resolvePersistedById(deviceId);
 					if (!persisted) throw new Error(`[device-manager] setDeviceLinks: unknown device id=${deviceId}`);
-					const { addonId: aid, stableId, meta: m } = persisted;
-					const key = deviceKey(aid, stableId);
+					const { meta: m } = persisted;
+					const key = String(deviceId);
 					const allMeta = await readMeta();
 					await settings.writeAddonStore({ deviceMeta: {
 						...allMeta,
@@ -2186,8 +2183,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 				await withMetaWriteLock(async () => {
 					const persisted = await resolvePersistedById(deviceId);
 					if (!persisted) throw new Error(`[device-manager] setRole: unknown device id=${deviceId}`);
-					const { addonId: aid, stableId, meta: m } = persisted;
-					const key = deviceKey(aid, stableId);
+					const { meta: m } = persisted;
+					const key = String(deviceId);
 					const allMeta = await readMeta();
 					await settings.writeAddonStore({ deviceMeta: {
 						...allMeta,
@@ -2233,8 +2230,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 				await withMetaWriteLock(async () => {
 					const persisted = await resolvePersistedById(deviceId);
 					if (!persisted) throw new Error(`[device-manager] applyInitialMeta: unknown device id=${deviceId}`);
-					const { addonId: aid, stableId, meta: m } = persisted;
-					const key = deviceKey(aid, stableId);
+					const { meta: m } = persisted;
+					const key = String(deviceId);
 					const allMeta = await readMeta();
 					const merged = {
 						...m,
@@ -2284,10 +2281,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 			setMetadata: async (input) => {
 				const { deviceId, patch } = input;
 				const result = await withMetaWriteLock(async () => {
-					const persisted = await resolvePersistedById(deviceId);
-					if (!persisted) throw new Error(`[device-manager] setMetadata: unknown device id=${deviceId}`);
-					const { addonId, stableId } = persisted;
-					const key = deviceKey(addonId, stableId);
+					if (!await resolvePersistedById(deviceId)) throw new Error(`[device-manager] setMetadata: unknown device id=${deviceId}`);
+					const key = String(deviceId);
 					const map = await readMetadataMap();
 					const next = { ...map[key] ?? {} };
 					let changed = false;
@@ -2338,8 +2333,8 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 				await withMetaWriteLock(async () => {
 					const persisted = await resolvePersistedById(deviceId);
 					if (!persisted) throw new Error(`[device-manager] setDisabled: unknown device id=${deviceId}`);
-					const { addonId, stableId, meta: m } = persisted;
-					const key = deviceKey(addonId, stableId);
+					const { meta: m } = persisted;
+					const key = String(deviceId);
 					const allMeta = await readMeta();
 					await settings.writeAddonStore({ deviceMeta: {
 						...allMeta,
@@ -2456,8 +2451,11 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 			listPersistedByAddon: async (input) => {
 				const { addonId } = input;
 				const [index, meta] = await Promise.all([readIndex(), readMeta()]);
-				return (index[addonId] ?? []).map((stableId) => {
-					const m = meta[deviceKey(addonId, stableId)];
+				const stableIds = index[addonId] ?? [];
+				const byStableId = /* @__PURE__ */ new Map();
+				for (const m of Object.values(meta)) if (m.addonId === addonId) byStableId.set(m.stableId, m);
+				return stableIds.map((stableId) => {
+					const m = byStableId.get(stableId);
 					return {
 						id: m.id,
 						stableId,
@@ -2481,7 +2479,7 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 						device
 					})) : registry.getAllWithAddonId();
 					for (const { addonId: aid, device } of liveEntries) {
-						const key = deviceKey(aid, device.stableId);
+						const key = String(device.id);
 						const metadata = metadataMap[key] ?? null;
 						const metaRow = meta[key] ?? null;
 						results.push(toDeviceInfo(aid, device, metadata, metaRow));
@@ -2489,11 +2487,13 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 					}
 				}
 				const index = await readIndex();
+				const metaByAddonStable = /* @__PURE__ */ new Map();
+				for (const m of Object.values(meta)) metaByAddonStable.set(`${m.addonId}${m.stableId}`, m);
 				const targetAddons = addonId ? [addonId] : Object.keys(index);
 				for (const aid of targetAddons) for (const stableId of index[aid] ?? []) {
-					const key = deviceKey(aid, stableId);
+					const m = metaByAddonStable.get(`${aid}${stableId}`);
+					const key = String(m.id);
 					if (seen.has(key)) continue;
-					const m = meta[key];
 					const persistedType = m.type;
 					const persistedConfig = await settings.readDeviceStore(m.id);
 					const metadata = metadataMap[key] ?? null;
@@ -2531,7 +2531,7 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 				if (registry) {
 					const found = resolveDeviceById(registry, deviceId);
 					if (found) {
-						const key = deviceKey(found.addonId, found.device.stableId);
+						const key = String(found.device.id);
 						const [map, metaMap] = await Promise.all([readMetadataMap(), readMeta()]);
 						const metadata = map[key] ?? null;
 						const metaRow = metaMap[key] ?? null;
@@ -2542,7 +2542,7 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 				if (!persisted) return null;
 				const { addonId: aid, stableId, meta: m } = persisted;
 				const persistedConfig = await settings.readDeviceStore(m.id);
-				const key = deviceKey(aid, stableId);
+				const key = String(deviceId);
 				const metadata = (await readMetadataMap())[key] ?? null;
 				const sourceInfoGetDevice = buildSourceInfoFromConfig(persistedConfig ?? {}, stableId, aid);
 				return {
@@ -2590,18 +2590,20 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 				if (registry) {
 					const liveChildren = registry.getChildren(parentDeviceId);
 					for (const device of liveChildren) {
-						const key = deviceKey(ownerAddonId, device.stableId);
+						const key = String(device.id);
 						const metadata = metadataMap[key] ?? null;
 						const metaRow = meta[key] ?? null;
 						results.push(toDeviceInfo(ownerAddonId, device, metadata, metaRow));
 						seen.add(key);
 					}
 				}
-				const persistedChildren = (index[ownerAddonId] ?? []).filter((sid) => meta[deviceKey(ownerAddonId, sid)]?.parentDeviceId === parentDeviceId);
+				const ownerMetaByStableId = /* @__PURE__ */ new Map();
+				for (const m of Object.values(meta)) if (m.addonId === ownerAddonId) ownerMetaByStableId.set(m.stableId, m);
+				const persistedChildren = (index[ownerAddonId] ?? []).filter((sid) => ownerMetaByStableId.get(sid)?.parentDeviceId === parentDeviceId);
 				for (const childStableId of persistedChildren) {
-					const key = deviceKey(ownerAddonId, childStableId);
+					const m = ownerMetaByStableId.get(childStableId);
+					const key = String(m.id);
 					if (seen.has(key)) continue;
-					const m = meta[key];
 					const persistedConfig = await settings.readDeviceStore(m.id);
 					const metadata = metadataMap[key] ?? null;
 					const sourceInfoChild = buildSourceInfoFromConfig(persistedConfig ?? {}, childStableId, ownerAddonId);
@@ -2707,14 +2709,6 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 			},
 			remove: async (input) => {
 				const { deviceId } = input;
-				const directChildIds = async (parentId) => {
-					const ids = /* @__PURE__ */ new Set();
-					if (registry) for (const c of registry.getChildren(parentId)) ids.add(c.id);
-					const meta = await readMeta();
-					for (const m of Object.values(meta)) if (m.parentDeviceId === parentId) ids.add(m.id);
-					ids.delete(parentId);
-					return [...ids];
-				};
 				const removeOne = async (id) => {
 					if (registry) {
 						const live = resolveDeviceById(registry, id);
@@ -2905,11 +2899,29 @@ var DeviceManagerAddon = class DeviceManagerAddon extends BaseAddon {
 			adoptionRelease: async ({ addonId, ...rest }) => {
 				return (await this.requireDeviceAdoptionProvider(addonId)).release(rest);
 			},
-			adoptionResync: async ({ camDeviceId }) => {
+			adoptionResync: async ({ camDeviceId, resetToSource }) => {
 				let owningAddonId = registry?.getAddonId(camDeviceId) ?? null;
 				if (!owningAddonId) owningAddonId = (await resolvePersistedById(camDeviceId))?.addonId ?? null;
 				if (!owningAddonId) throw new Error(`adoptionResync: device ${camDeviceId} not found`);
-				return (await this.requireDeviceAdoptionProvider(owningAddonId)).resync({ camDeviceId });
+				let removedChildren = 0;
+				if (resetToSource === true) {
+					const childIds = await directChildIds(camDeviceId);
+					for (const childId of childIds) {
+						await provider.remove({ deviceId: childId });
+						removedChildren += 1;
+					}
+					this.ctx.logger.info("resetToSource purge before resync", { tags: {
+						deviceId: camDeviceId,
+						removedChildren
+					} });
+				}
+				return {
+					...await (await this.requireDeviceAdoptionProvider(owningAddonId)).resync({
+						camDeviceId,
+						resetToSource
+					}),
+					removedChildren
+				};
 			},
 			testField: async (input) => {
 				const { deviceId } = input;

package/dist/index.js

@@ -20,7 +20,7 @@ const require_builtins_local_auth_local_auth_addon = require("./builtins/local-a
 require("./builtins/local-auth/index.js");
 const require_builtins_device_manager_device_manager_addon = require("./builtins/device-manager/device-manager.addon.js");
 require("./builtins/device-manager/index.js");
-const require_manifest_python_deps = require("./manifest-python-deps-Ba_eOEPT.js");
+const require_manifest_python_deps = require("./manifest-python-deps-Cro19O4u.js");
 const require_custom_action_registry = require("./custom-action-registry-vLYEFTtv.js");
 let _camstack_types_node = require("@camstack/types/node");
 let node_http = require("node:http");

package/dist/index.mjs

@@ -18,7 +18,7 @@ import { LocalAuthAddon, a as require_ms, c as __esmMin, d as __toCommonJS, f as
 import "./builtins/local-auth/index.mjs";
 import { DeviceManagerAddon } from "./builtins/device-manager/device-manager.addon.mjs";
 import "./builtins/device-manager/index.mjs";
-import { A as createUdsLoggerWithControl, B as createLocalTransport, C as ipcParentLink, D as createUdsEventBus, E as createUdsEventBridge, F as AGENT_CAP_FWD_SERVICE, G as FrameDecoder, H as UdsLocalTransportServer, I as CapRouteResolver, J as buildUdsNativeCapProxy, K as encodeFrame, L as CapRouteError, M as LocalChildRegistry, N as UDS_NO_ROUTE_PREFIX, O as udsChildLogToWorkerEntry, P as AGENT_CAP_FWD_ACTION, Q as mountNativeCapService, R as classifyCapRoute, S as ipcChildLink, T as createParentUnownedCallHandler, U as SocketChannel, V as UdsLocalTransportClient, W as localEndpointPath, Y as createBrokerDeviceManagerApi, _ as __resetCapUsageRegistryForTests, a as getWorkerDeviceRegistry, at as capBareAction, b as brokerTransportLink, c as setHubConnected, ct as deserializeTypedArrays, d as registerEventBusService, dt as CapabilityHandle, et as createAddonService, f as AddonDepsManager, ft as CapabilityUnavailableError, g as CapUsageRegistry, h as createHwAccelService, i as createUdsAddonContext, it as capActionSuffix, j as LocalChildClient, k as createUdsLogger, l as EVENT_TOPIC_PREFIX, lt as serializeTypedArrays, m as resolveHwAccel, mt as resolveAddonClass, n as adaptBrokerToCluster, nt as NATIVE_PROVIDER_SERVICE_INFIX, o as getOrInitReadinessRegistry, ot as capServiceName, p as createKernelHwAccel, pt as installManifestNativeDeps, q as buildNativeCapProxy, r as createAddonContext, rt as capActionName, s as getOrInitReadinessRegistryForClient, st as parseCapAction, t as installManifestPythonDeps, tt as validateProviderRegistrations, u as getBrokerEventBus, ut as DeviceRegistry, v as getCapUsageRegistry, w as localProviderLink, x as buildLinkChain, y as brokerCallForCap, z as callWithServiceDiscovery } from "./manifest-python-deps-BqId8WrC.mjs";
+import { A as createUdsLoggerWithControl, B as createLocalTransport, C as ipcParentLink, D as createUdsEventBus, E as createUdsEventBridge, F as AGENT_CAP_FWD_SERVICE, G as FrameDecoder, H as UdsLocalTransportServer, I as CapRouteResolver, J as buildUdsNativeCapProxy, K as encodeFrame, L as CapRouteError, M as LocalChildRegistry, N as UDS_NO_ROUTE_PREFIX, O as udsChildLogToWorkerEntry, P as AGENT_CAP_FWD_ACTION, Q as mountNativeCapService, R as classifyCapRoute, S as ipcChildLink, T as createParentUnownedCallHandler, U as SocketChannel, V as UdsLocalTransportClient, W as localEndpointPath, Y as createBrokerDeviceManagerApi, _ as __resetCapUsageRegistryForTests, a as getWorkerDeviceRegistry, at as capBareAction, b as brokerTransportLink, c as setHubConnected, ct as deserializeTypedArrays, d as registerEventBusService, dt as CapabilityHandle, et as createAddonService, f as AddonDepsManager, ft as CapabilityUnavailableError, g as CapUsageRegistry, h as createHwAccelService, i as createUdsAddonContext, it as capActionSuffix, j as LocalChildClient, k as createUdsLogger, l as EVENT_TOPIC_PREFIX, lt as serializeTypedArrays, m as resolveHwAccel, mt as resolveAddonClass, n as adaptBrokerToCluster, nt as NATIVE_PROVIDER_SERVICE_INFIX, o as getOrInitReadinessRegistry, ot as capServiceName, p as createKernelHwAccel, pt as installManifestNativeDeps, q as buildNativeCapProxy, r as createAddonContext, rt as capActionName, s as getOrInitReadinessRegistryForClient, st as parseCapAction, t as installManifestPythonDeps, tt as validateProviderRegistrations, u as getBrokerEventBus, ut as DeviceRegistry, v as getCapUsageRegistry, w as localProviderLink, x as buildLinkChain, y as brokerCallForCap, z as callWithServiceDiscovery } from "./manifest-python-deps-1zTy3vXe.mjs";
 import { t as CustomActionRegistry } from "./custom-action-registry-BEXwC-oo.mjs";
 import { PYTHON_VERSION, buildBinaryPath, downloadBinary, ensureBinary, ensureFfmpeg, ensurePython, findInPath, getFfmpegDownloadUrl, getPlatformInfo, getPythonDownloadUrl, installPythonPackages, installPythonRequirements } from "@camstack/types/node";
 import { request } from "node:http";

package/dist/{manifest-python-deps-BqId8WrC.mjs → manifest-python-deps-1zTy3vXe.mjs}

@@ -1288,11 +1288,19 @@ function createBrokerDeviceManagerApi(opts) {
 			deviceId: id,
 			data: spec.config
 		}).catch(() => {});
-		const [initialRuntimeState, persistedConfig, deviceMeta] = await Promise.all([
+		const [initialRuntimeState, loadedConfig, deviceMeta] = await Promise.all([
 			callDeviceManager(api, "loadRuntimeState", { deviceId: id }).catch(() => empty),
 			callDeviceManager(api, "loadConfig", { deviceId: id }).catch(() => empty),
 			callDeviceManager(api, "loadMeta", { deviceId: id }).catch(() => null)
 		]);
+		let persistedConfig = loadedConfig;
+		if (!isFirstSpawn && Object.keys(loadedConfig).length === 0 && Object.keys(spec.config).length > 0) {
+			await callDeviceManager(api, "persistConfig", {
+				deviceId: id,
+				data: spec.config
+			}).catch(() => {});
+			persistedConfig = spec.config;
+		}
 		const childCtx = buildContext(childStableId, id, parent.id, initialRuntimeState, persistedConfig, deviceMeta);
 		const child = spec.factory(childCtx);
 		await deviceApi.register(child);

package/dist/{manifest-python-deps-Ba_eOEPT.js → manifest-python-deps-Cro19O4u.js}

@@ -1290,11 +1290,19 @@ function createBrokerDeviceManagerApi(opts) {
 			deviceId: id,
 			data: spec.config
 		}).catch(() => {});
-		const [initialRuntimeState, persistedConfig, deviceMeta] = await Promise.all([
+		const [initialRuntimeState, loadedConfig, deviceMeta] = await Promise.all([
 			callDeviceManager(api, "loadRuntimeState", { deviceId: id }).catch(() => empty),
 			callDeviceManager(api, "loadConfig", { deviceId: id }).catch(() => empty),
 			callDeviceManager(api, "loadMeta", { deviceId: id }).catch(() => null)
 		]);
+		let persistedConfig = loadedConfig;
+		if (!isFirstSpawn && Object.keys(loadedConfig).length === 0 && Object.keys(spec.config).length > 0) {
+			await callDeviceManager(api, "persistConfig", {
+				deviceId: id,
+				data: spec.config
+			}).catch(() => {});
+			persistedConfig = spec.config;
+		}
 		const childCtx = buildContext(childStableId, id, parent.id, initialRuntimeState, persistedConfig, deviceMeta);
 		const child = spec.factory(childCtx);
 		await deviceApi.register(child);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/system",
-  "version": "1.1.10",
+  "version": "1.1.11",
   "description": "Core addon for CamStack — builtins, pipeline, process management, auth, logging, events",
   "keywords": [
     "camstack",