@camstack/addon-provider-ecowitt 0.2.153 → 0.2.154

package/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.154] - 2026-11-01
+
+### Changed
+
+- Ecowitt: weather-station and CH1 sensors are no longer duplicated under the gateway container; existing duplicates are removed on the next reading
+
 ## [0.2.153] - 2026-11-01
 
 ### Changed

package/dist/addon.js

@@ -95229,6 +95229,73 @@ function deviceGroupForSensor(category, channel) {
 	return "gateway";
 }
 //#endregion
+//#region src/ecowitt-sensor-groups.ts
+/** Resolve `deviceGroup` from a persisted container config (defaults to 'gateway'). */
+function configDeviceGroup(config) {
+	const g = config["deviceGroup"];
+	return ECOWITT_DEVICE_GROUPS.find((group) => group === g) ?? "gateway";
+}
+/** Build the persisted sensor entry (incl. self-describing category) from a live Sensor. */
+function sensorToEntry(s) {
+	return {
+		sensorId: s.id,
+		quantity: s.quantity,
+		...s.channel !== void 0 ? { channel: s.channel } : {},
+		...s.name !== void 0 ? { name: s.name } : {},
+		...s.category !== void 0 ? { category: s.category } : {}
+	};
+}
+/** Bucket live sensors into their device group. */
+function bucketSensorsByGroup(sensors) {
+	const byGroup = /* @__PURE__ */ new Map();
+	for (const group of ECOWITT_DEVICE_GROUPS) byGroup.set(group, []);
+	for (const s of sensors) {
+		const group = deviceGroupForSensor(s.category, s.channel);
+		byGroup.get(group)?.push(sensorToEntry(s));
+	}
+	return byGroup;
+}
+/** Structural equality of two persisted sensor lists (order-independent by id + name). */
+function sensorsEqual(a, b) {
+	if (a.length !== b.length) return false;
+	const aById = /* @__PURE__ */ new Map();
+	for (const entry of a) if (typeof entry === "object" && entry !== null && "sensorId" in entry) {
+		const id = entry.sensorId;
+		if (typeof id === "string") {
+			const name = "name" in entry && typeof entry.name === "string" ? entry.name : void 0;
+			aById.set(id, name);
+		}
+	}
+	for (const entry of b) {
+		if (!aById.has(entry.sensorId)) return false;
+		if (aById.get(entry.sensorId) !== entry.name) return false;
+	}
+	return true;
+}
+/** The measurement key of a sensor id: the part after the first ':' (`8E:0x02` gives `0x02`). */
+function sensorKeyOf(sensorId) {
+	const i = sensorId.indexOf(":");
+	return i < 0 ? sensorId : sensorId.slice(i + 1);
+}
+/** The owner prefix of a sensor id (`8E` of `8E:0x02`, `gateway` for a gateway-owned reading). */
+function sensorOwnerOf(sensorId) {
+	const i = sensorId.indexOf(":");
+	return i < 0 ? "" : sensorId.slice(0, i);
+}
+/**
+* The persisted entries a Container of `group` may spawn as children. An early snapshot had no
+* model, so nodewitt called a weather-station reading `gateway:<key>`; once the sensor map is
+* known the same reading is `<hardwareId>:<key>`. An entry is dropped when its live sensor (the
+* exact id, or for a `gateway:` id the hardware-owned sensor of the same key) belongs to another
+* group. An entry the live set does not know is kept: unknown is not gone (D49).
+*/
+function entriesForGroup(entries, group, live) {
+	return entries.filter((entry) => {
+		const sensor = live.find((s) => s.id === entry.sensorId) ?? (sensorOwnerOf(entry.sensorId) === "gateway" ? live.find((s) => sensorOwnerOf(s.id) !== "gateway" && sensorKeyOf(s.id) === sensorKeyOf(entry.sensorId)) : void 0);
+		return sensor === void 0 || deviceGroupForSensor(sensor.category, sensor.channel) === group;
+	});
+}
+//#endregion
 //#region src/devices/ecowitt-sensor-device.ts
 /**
 * Persisted config every Ecowitt sensor child carries. `sensorId` resolves the
@@ -95566,7 +95633,7 @@ var EcowittContainerDevice = class extends BaseDevice {
 		});
 	}
 	getAccessoryChildren() {
-		return this.config.values.sensors.map((sensor) => {
+		return entriesForGroup(this.config.values.sensors, this.config.values.deviceGroup, ecowittFacades.getSensors(this.gatewayId)).map((sensor) => {
 			const meta = {
 				type: DeviceType.Sensor,
 				role: roleForQuantity(sensor.quantity),
@@ -99413,7 +99480,7 @@ function parseValue(input) {
 		raw
 	};
 }
-function str(item, field) {
+function str$1(item, field) {
 	const v = item[field];
 	if (typeof v === "string") return v;
 	if (typeof v === "number") return String(v);
@@ -99453,7 +99520,7 @@ function makeReading(key, val, unit, forceId) {
 	}
 }
 function channelOf(item) {
-	const ch = str(item, "channel");
+	const ch = str$1(item, "channel");
 	return ch && ch.trim() !== "" ? ch.trim() : void 0;
 }
 function push(out, reading) {
@@ -99463,8 +99530,8 @@ function decodeChSoil(items, out) {
 	for (const item of items) {
 		const ch = channelOf(item);
 		if (ch === void 0) continue;
-		const humidity = stripPercent(str(item, "humidity"));
-		const battery = str(item, "battery");
+		const humidity = stripPercent(str$1(item, "humidity"));
+		const battery = str$1(item, "battery");
 		if (humidity) push(out, makeReading(`soilmoisture${ch}`, humidity));
 		if (battery) push(out, makeReading(`soilbatt${ch}`, batteryPercent(battery, true)));
 	}
@@ -99473,11 +99540,11 @@ function decodeChEc(items, out) {
 	for (const item of items) {
 		const ch = channelOf(item);
 		if (ch === void 0) continue;
-		const humidity = stripPercent(str(item, "humidity"));
-		const temp = str(item, "temp");
-		const unit = str(item, "unit") ?? "C";
-		const ec = str(item, "ec");
-		const battery = str(item, "battery");
+		const humidity = stripPercent(str$1(item, "humidity"));
+		const temp = str$1(item, "temp");
+		const unit = str$1(item, "unit") ?? "C";
+		const ec = str$1(item, "ec");
+		const battery = str$1(item, "battery");
 		if (humidity) push(out, makeReading(`soilmoisture${ch}`, humidity));
 		if (temp) push(out, makeReading(`soiltemp${ch}`, temp, unit));
 		if (ec) push(out, makeReading(`soilec${ch}`, ec));
@@ -99488,9 +99555,9 @@ function decodeChAisle(items, gatewayTempUnit, out) {
 	for (const item of items) {
 		const ch = channelOf(item);
 		if (ch === void 0) continue;
-		const temp = str(item, "temp");
-		const humidity = str(item, "humidity");
-		const battery = str(item, "battery");
+		const temp = str$1(item, "temp");
+		const humidity = str$1(item, "humidity");
+		const battery = str$1(item, "battery");
 		if (temp && temp !== "None") push(out, makeReading(`temp${ch}f`, temp, gatewayTempUnit));
 		if (humidity && humidity !== "None") push(out, makeReading(`humidity${ch}`, stripPercent(humidity)));
 		if (battery && battery !== "None") push(out, makeReading(`batt${ch}`, batteryPercent(battery, true)));
@@ -99500,8 +99567,8 @@ function decodeChTemp(items, gatewayTempUnit, out) {
 	for (const item of items) {
 		const ch = channelOf(item);
 		if (ch === void 0) continue;
-		const temp = str(item, "temp");
-		const battery = str(item, "battery");
+		const temp = str$1(item, "temp");
+		const battery = str$1(item, "battery");
 		if (temp && temp !== "None") push(out, makeReading(`tf_ch${ch}`, temp, gatewayTempUnit));
 		if (battery && battery !== "None") push(out, makeReading(`tf_batt${ch}`, batteryPercent(battery, false)));
 	}
@@ -99510,11 +99577,11 @@ function decodeChPm25(items, out) {
 	for (const item of items) {
 		const ch = channelOf(item);
 		if (ch === void 0) continue;
-		const pm25 = str(item, "pm25") ?? str(item, "PM25");
-		const pm25_24h = str(item, "pm25_avg_24h") ?? str(item, "pm25_24h");
-		const realaqi = str(item, "PM25_RealAQI");
-		const aqi24h = str(item, "PM25_24HAQI");
-		const battery = str(item, "battery");
+		const pm25 = str$1(item, "pm25") ?? str$1(item, "PM25");
+		const pm25_24h = str$1(item, "pm25_avg_24h") ?? str$1(item, "pm25_24h");
+		const realaqi = str$1(item, "PM25_RealAQI");
+		const aqi24h = str$1(item, "PM25_24HAQI");
+		const battery = str$1(item, "battery");
 		if (pm25 && pm25 !== "None") push(out, makeReading(`pm25_ch${ch}`, pm25));
 		if (pm25_24h && pm25_24h !== "None") push(out, makeReading(`pm25_avg_24h_ch${ch}`, pm25_24h));
 		if (realaqi && realaqi !== "None") push(out, makeReading(`pm25_aqi_realtime_ch${ch}`, realaqi));
@@ -99526,8 +99593,8 @@ function decodeChLeaf(items, out) {
 	for (const item of items) {
 		const ch = channelOf(item);
 		if (ch === void 0) continue;
-		const humidity = stripPercent(str(item, "humidity"));
-		const battery = str(item, "battery");
+		const humidity = stripPercent(str$1(item, "humidity"));
+		const battery = str$1(item, "battery");
 		if (humidity) push(out, makeReading(`leafwetness_ch${ch}`, humidity));
 		if (battery && battery !== "None") push(out, makeReading(`leaf_batt${ch}`, batteryPercent(battery, false)));
 	}
@@ -99536,8 +99603,8 @@ function decodeChLeak(items, out) {
 	for (const item of items) {
 		const ch = channelOf(item);
 		if (ch === void 0) continue;
-		const status = str(item, "status");
-		const battery = str(item, "battery");
+		const status = str$1(item, "status");
+		const battery = str$1(item, "battery");
 		if (status !== void 0 && status !== "") {
 			const leak = status.trim().toLowerCase() === "normal" ? "0" : "1";
 			push(out, makeReading(`leak_ch${ch}`, leak));
@@ -99549,10 +99616,10 @@ function decodeChLds(items, out) {
 	for (const item of items) {
 		const ch = channelOf(item);
 		if (ch === void 0) continue;
-		const air = str(item, "air");
-		const depth = str(item, "depth");
-		const voltage = str(item, "voltage");
-		const battery = str(item, "battery");
+		const air = str$1(item, "air");
+		const depth = str$1(item, "depth");
+		const voltage = str$1(item, "voltage");
+		const battery = str$1(item, "battery");
 		if (air && air !== "None") push(out, makeReading(`lds_air_ch${ch}`, air));
 		if (depth && depth !== "None") push(out, makeReading(`lds_depth_ch${ch}`, depth));
 		if (voltage && voltage !== "None") push(out, makeReading(`lds_voltage_ch${ch}`, voltage));
@@ -99581,23 +99648,23 @@ var CO2_FIELDS = [
 ];
 function firstField(item, fields) {
 	for (const f of fields) {
-		const v = str(item, f);
+		const v = str$1(item, f);
 		if (v && v !== "None") return v;
 	}
 }
 function decodeCo2(items, out) {
 	const item = items[0];
 	if (item === void 0) return;
-	const temp = str(item, "temp");
-	const unit = str(item, "unit") ?? "C";
+	const temp = str$1(item, "temp");
+	const unit = str$1(item, "unit") ?? "C";
 	if (temp) push(out, makeReading(unit === "C" ? "tf_co2c" : "tf_co2", temp, unit));
-	const humidity = stripPercent(str(item, "humidity"));
+	const humidity = stripPercent(str$1(item, "humidity"));
 	if (humidity) push(out, makeReading("humi_co2", humidity));
 	for (const [fields, key] of CO2_FIELDS) {
 		const v = firstField(item, fields);
 		if (v !== void 0) push(out, makeReading(key, v));
 	}
-	const battery = str(item, "battery");
+	const battery = str$1(item, "battery");
 	if (battery && battery !== "None") {
 		const n = num(battery);
 		push(out, makeReading("co2_batt", n !== void 0 ? String(Math.min(n * 20, 100)) : battery));
@@ -99609,12 +99676,12 @@ function push2(out, reading) {
 }
 function decodeCommonList(items, mapper, out) {
 	for (const item of items) {
-		const id = str(item, "id");
-		const val = str(item, "val");
-		const unit = str(item, "unit");
+		const id = str$1(item, "id");
+		const val = str$1(item, "val");
+		const unit = str$1(item, "unit");
 		if (id && val !== void 0) push2(out, makeReading(id, val, unit));
 		if (id === "0x03" && mapper.getHardwareId("wh26batt") !== void 0) {
-			const battery = str(item, "battery");
+			const battery = str$1(item, "battery");
 			if (battery !== void 0) push2(out, makeReading("wh26batt", battery === "0" ? "100" : "10"));
 		}
 	}
@@ -99622,12 +99689,12 @@ function decodeCommonList(items, mapper, out) {
 function decodeRain(items, mapper, out) {
 	const rainHwId = mapper.getHardwareId("wh69batt") ?? mapper.getHardwareId("wh40batt");
 	for (const item of items) {
-		const id = str(item, "id");
-		const val = str(item, "val");
+		const id = str$1(item, "id");
+		const val = str$1(item, "val");
 		if (!id || val === void 0) continue;
-		push2(out, makeReading(id, val, str(item, "unit"), rainHwId));
+		push2(out, makeReading(id, val, str$1(item, "unit"), rainHwId));
 		if (id === "0x13") {
-			const battery = str(item, "battery");
+			const battery = str$1(item, "battery");
 			if (battery) {
 				const n = num(battery);
 				const pct = n !== void 0 && n > 1 ? String(n * 20) : battery === "0" ? "100" : "10";
@@ -99659,30 +99726,30 @@ function piezoKeysFor(mapper) {
 function decodePiezo(items, mapper, out) {
 	const piezoHwId = mapper.getHardwareId("ws85batt") ?? mapper.getHardwareId("ws90batt") ?? mapper.getHardwareId("wh90batt");
 	for (const item of items) {
-		const id = str(item, "id");
-		const val = str(item, "val");
+		const id = str$1(item, "id");
+		const val = str$1(item, "val");
 		if (!id || val === void 0) continue;
-		push2(out, makeReading(id, val, str(item, "unit"), piezoHwId));
+		push2(out, makeReading(id, val, str$1(item, "unit"), piezoHwId));
 		if (id !== "0x13") continue;
-		const battery = str(item, "battery");
+		const battery = str$1(item, "battery");
 		if (!battery) continue;
 		const keys = piezoKeysFor(mapper);
 		const n = num(battery);
 		push2(out, makeReading(keys.batt, n !== void 0 ? String(n * 20) : battery));
-		const voltage = str(item, "voltage");
+		const voltage = str$1(item, "voltage");
 		if (voltage) push2(out, makeReading(keys.volt, voltage));
-		const cap = str(item, keys.capField);
+		const cap = str$1(item, keys.capField);
 		if (cap) push2(out, makeReading(keys.capKey, cap));
 	}
 }
 function decodeLightning(items, out) {
 	const item = items[0];
 	if (item === void 0) return;
-	const count = str(item, "count");
+	const count = str$1(item, "count");
 	if (count !== void 0) push2(out, makeReading("lightning_num", count));
-	const distance = str(item, "distance");
+	const distance = str$1(item, "distance");
 	if (distance !== void 0) push2(out, makeReading("lightning", distance.replace(" km", "").trim()));
-	const battery = str(item, "battery");
+	const battery = str$1(item, "battery");
 	if (battery !== void 0) {
 		const n = num(battery);
 		push2(out, makeReading("wh57batt", n !== void 0 ? String(n * 20) : battery));
@@ -99691,30 +99758,30 @@ function decodeLightning(items, out) {
 function decodeWh25(items, out) {
 	const item = items[0];
 	if (item === void 0) return;
-	const intemp = str(item, "intemp");
-	const unit = str(item, "unit") ?? "F";
+	const intemp = str$1(item, "intemp");
+	const unit = str$1(item, "unit") ?? "F";
 	if (intemp !== void 0) push2(out, makeReading("tempinf", intemp, unit));
-	const inhumi = str(item, "inhumi");
+	const inhumi = str$1(item, "inhumi");
 	if (inhumi !== void 0) push2(out, makeReading("humidityin", stripPercent(inhumi)));
-	const abs = str(item, "abs");
+	const abs = str$1(item, "abs");
 	if (abs !== void 0) push2(out, makeReading("baromabsin", abs.replace(" hPa", "").trim()));
-	const rel = str(item, "rel");
+	const rel = str$1(item, "rel");
 	if (rel !== void 0) push2(out, makeReading("baromrelin", rel.replace(" hPa", "").trim()));
 }
 function decodeSoilCalibration(items, out) {
 	for (const item of items) {
-		const ch = str(item, "ch");
-		const nowAd = str(item, "nowAd");
+		const ch = str$1(item, "ch");
+		const nowAd = str$1(item, "nowAd");
 		if (ch && nowAd !== void 0) push2(out, makeReading(`soilad${ch}`, nowAd));
 	}
 }
 function decodeLdsConfig(items, out) {
 	for (const item of items) {
-		const ch = str(item, "ch");
+		const ch = str$1(item, "ch");
 		if (!ch) continue;
-		const level = str(item, "level");
+		const level = str$1(item, "level");
 		if (level !== void 0 && level !== "None") push2(out, makeReading(`lds_level_ch${ch}`, level));
-		const totalHeat = str(item, "total_heat");
+		const totalHeat = str$1(item, "total_heat");
 		if (totalHeat !== void 0 && totalHeat !== "None") push2(out, makeReading(`lds_total_heat_ch${ch}`, totalHeat));
 	}
 }
@@ -101781,50 +101848,6 @@ function buildEcowittGatewayCandidates(input) {
 	})];
 }
 //#endregion
-//#region src/ecowitt-sensor-groups.ts
-/** Resolve `deviceGroup` from a persisted container config (defaults to 'gateway'). */
-function configDeviceGroup(config) {
-	const g = config["deviceGroup"];
-	return ECOWITT_DEVICE_GROUPS.find((group) => group === g) ?? "gateway";
-}
-/** Build the persisted sensor entry (incl. self-describing category) from a live Sensor. */
-function sensorToEntry(s) {
-	return {
-		sensorId: s.id,
-		quantity: s.quantity,
-		...s.channel !== void 0 ? { channel: s.channel } : {},
-		...s.name !== void 0 ? { name: s.name } : {},
-		...s.category !== void 0 ? { category: s.category } : {}
-	};
-}
-/** Bucket live sensors into their device group. */
-function bucketSensorsByGroup(sensors) {
-	const byGroup = /* @__PURE__ */ new Map();
-	for (const group of ECOWITT_DEVICE_GROUPS) byGroup.set(group, []);
-	for (const s of sensors) {
-		const group = deviceGroupForSensor(s.category, s.channel);
-		byGroup.get(group)?.push(sensorToEntry(s));
-	}
-	return byGroup;
-}
-/** Structural equality of two persisted sensor lists (order-independent by id + name). */
-function sensorsEqual(a, b) {
-	if (a.length !== b.length) return false;
-	const aById = /* @__PURE__ */ new Map();
-	for (const entry of a) if (typeof entry === "object" && entry !== null && "sensorId" in entry) {
-		const id = entry.sensorId;
-		if (typeof id === "string") {
-			const name = "name" in entry && typeof entry.name === "string" ? entry.name : void 0;
-			aById.set(id, name);
-		}
-	}
-	for (const entry of b) {
-		if (!aById.has(entry.sensorId)) return false;
-		if (aById.get(entry.sensorId) !== entry.name) return false;
-	}
-	return true;
-}
-//#endregion
 //#region src/ecowitt-adoption-provider.ts
 var DEVICES_FILTER = {
 	id: "devices",
@@ -102128,6 +102151,56 @@ function ecowittCandidates(gateways, known = /* @__PURE__ */ new Set()) {
 	});
 }
 //#endregion
+//#region src/ecowitt-duplicate-sensors.ts
+function str(config, key) {
+	const v = config[key];
+	return typeof v === "string" && v.length > 0 ? v : null;
+}
+/**
+* Sensors minted under the `gateway` group Container (id `gateway:<key>`) that are the SAME reading
+* as a hardware-owned child (`<hw>:<key>`) of the weather-station / CH1 Container of the same
+* gateway. Early snapshots carry no
+* model for a sensor, which nodewitt classifies as `gateway`, so a weather-station reading was
+* once minted under the gateway Container as well; the live readings reach only the sensor under
+* its own group. Only a duplicate is returned: a sensor that exists nowhere else is the
+* gateway's own and is never touched. `scanned` is the number of sensor children seen, so a
+* caller can tell "nothing to remove" from "children not spawned yet".
+*/
+function findDuplicateGatewaySensors(rows) {
+	const containers = /* @__PURE__ */ new Map();
+	for (const row of rows) {
+		if (row.type !== DeviceType.Container || row.config["system"] !== "ecowitt") continue;
+		const gatewayId = str(row.config, "gatewayId");
+		if (gatewayId === null) continue;
+		containers.set(row.id, {
+			gatewayId,
+			gateway: configDeviceGroup(row.config) === "gateway"
+		});
+	}
+	const ownedElsewhere = /* @__PURE__ */ new Set();
+	const underGateway = [];
+	let scanned = 0;
+	for (const row of rows) {
+		if (row.type !== DeviceType.Sensor || row.parentDeviceId === null) continue;
+		const container = containers.get(row.parentDeviceId);
+		const sensorId = str(row.config, "sensorId");
+		if (container === void 0 || sensorId === null) continue;
+		scanned += 1;
+		const key = `${container.gatewayId}\u0000${sensorKeyOf(sensorId)}`;
+		const owner = sensorOwnerOf(sensorId);
+		if (container.gateway) {
+			if (owner === "gateway") underGateway.push({
+				id: row.id,
+				key
+			});
+		} else if (owner !== "gateway" && owner !== "") ownedElsewhere.add(key);
+	}
+	return {
+		duplicates: underGateway.filter((s) => ownedElsewhere.has(s.key)).map((s) => s.id),
+		scanned
+	};
+}
+//#endregion
 //#region src/ecowitt-reconciler.ts
 /**
 * Keeps one live client per enabled integration. Devices are removed ONLY on an explicit
@@ -102581,6 +102654,55 @@ var EcowittProviderAddon = class extends BaseDeviceProvider {
 		const devices = this.ctx.kernel.devices;
 		if (!reg || !devices) return;
 		const byGroup = bucketSensorsByGroup(sensors);
+		if (await this.reconcileEachContainer(gatewayKey, byGroup) || !this.duplicatesChecked.has(gatewayKey)) await this.removeDuplicateGatewaySensors(gatewayKey);
+	}
+	/** Gateway keys whose duplicate scan already saw spawned sensor children (idempotent anyway). */
+	duplicatesChecked = /* @__PURE__ */ new Set();
+	/**
+	* Idempotent cleanup of the sensors minted under the `gateway` Container that duplicate a
+	* sensor of the weather-station / CH1 Container (see {@link findDuplicateGatewaySensors}).
+	* Goes through the normal device removal (tombstone); a read that failed removes nothing.
+	*/
+	async removeDuplicateGatewaySensors(gatewayKey) {
+		const reg = this.ctx.kernel.deviceRegistry;
+		const devices = this.ctx.kernel.devices;
+		if (!reg || !devices) return;
+		const rows = [];
+		for (const d of reg.getAllForAddon(this.addonId)) {
+			if (d.type !== DeviceType.Container && d.type !== DeviceType.Sensor) continue;
+			const config = await devices.loadConfig(d.id).catch(() => null);
+			if (config === null) return;
+			if (config["system"] !== "ecowitt" || config["gatewayId"] !== gatewayKey) continue;
+			rows.push({
+				id: d.id,
+				type: d.type,
+				parentDeviceId: d.parentDeviceId,
+				config
+			});
+		}
+		const { duplicates, scanned } = findDuplicateGatewaySensors(rows);
+		if (scanned > 0) this.duplicatesChecked.add(gatewayKey);
+		for (const id of duplicates) try {
+			await devices.remove(id);
+			this.ctx.logger.info("Ecowitt: duplicate sensor under the gateway container removed", {
+				tags: { deviceId: id },
+				meta: { gatewayKey }
+			});
+		} catch (err) {
+			this.ctx.logger.warn("Ecowitt: duplicate sensor removal failed", {
+				tags: { deviceId: id },
+				meta: {
+					gatewayKey,
+					error: errMsg(err)
+				}
+			});
+		}
+	}
+	async reconcileEachContainer(gatewayKey, byGroup) {
+		const reg = this.ctx.kernel.deviceRegistry;
+		const devices = this.ctx.kernel.devices;
+		if (!reg || !devices) return false;
+		let changed = false;
 		for (const d of reg.getAllForAddon(this.addonId)) {
 			if (d.parentDeviceId !== null || d.type !== DeviceType.Container) continue;
 			const cfg = await devices.loadConfig(d.id).catch(() => ({}));
@@ -102588,6 +102710,7 @@ var EcowittProviderAddon = class extends BaseDeviceProvider {
 			const nextSensors = byGroup.get(configDeviceGroup(cfg)) ?? [];
 			if (sensorsEqual(Array.isArray(cfg["sensors"]) ? cfg["sensors"] : [], nextSensors)) continue;
 			await devices.applyDerivedSpec(d.id, { config: { sensors: nextSensors } });
+			changed = true;
 			this.ctx.logger.info("Ecowitt: group sensors reconciled", {
 				tags: { deviceId: d.id },
 				meta: {
@@ -102596,6 +102719,7 @@ var EcowittProviderAddon = class extends BaseDeviceProvider {
 				}
 			});
 		}
+		return changed;
 	}
 	async adoptGatewayDevice(integrationId, gatewayKey, name) {
 		const devices = this.ctx.kernel.devices;

package/dist/addon.mjs

@@ -95228,6 +95228,73 @@ function deviceGroupForSensor(category, channel) {
 	return "gateway";
 }
 //#endregion
+//#region src/ecowitt-sensor-groups.ts
+/** Resolve `deviceGroup` from a persisted container config (defaults to 'gateway'). */
+function configDeviceGroup(config) {
+	const g = config["deviceGroup"];
+	return ECOWITT_DEVICE_GROUPS.find((group) => group === g) ?? "gateway";
+}
+/** Build the persisted sensor entry (incl. self-describing category) from a live Sensor. */
+function sensorToEntry(s) {
+	return {
+		sensorId: s.id,
+		quantity: s.quantity,
+		...s.channel !== void 0 ? { channel: s.channel } : {},
+		...s.name !== void 0 ? { name: s.name } : {},
+		...s.category !== void 0 ? { category: s.category } : {}
+	};
+}
+/** Bucket live sensors into their device group. */
+function bucketSensorsByGroup(sensors) {
+	const byGroup = /* @__PURE__ */ new Map();
+	for (const group of ECOWITT_DEVICE_GROUPS) byGroup.set(group, []);
+	for (const s of sensors) {
+		const group = deviceGroupForSensor(s.category, s.channel);
+		byGroup.get(group)?.push(sensorToEntry(s));
+	}
+	return byGroup;
+}
+/** Structural equality of two persisted sensor lists (order-independent by id + name). */
+function sensorsEqual(a, b) {
+	if (a.length !== b.length) return false;
+	const aById = /* @__PURE__ */ new Map();
+	for (const entry of a) if (typeof entry === "object" && entry !== null && "sensorId" in entry) {
+		const id = entry.sensorId;
+		if (typeof id === "string") {
+			const name = "name" in entry && typeof entry.name === "string" ? entry.name : void 0;
+			aById.set(id, name);
+		}
+	}
+	for (const entry of b) {
+		if (!aById.has(entry.sensorId)) return false;
+		if (aById.get(entry.sensorId) !== entry.name) return false;
+	}
+	return true;
+}
+/** The measurement key of a sensor id: the part after the first ':' (`8E:0x02` gives `0x02`). */
+function sensorKeyOf(sensorId) {
+	const i = sensorId.indexOf(":");
+	return i < 0 ? sensorId : sensorId.slice(i + 1);
+}
+/** The owner prefix of a sensor id (`8E` of `8E:0x02`, `gateway` for a gateway-owned reading). */
+function sensorOwnerOf(sensorId) {
+	const i = sensorId.indexOf(":");
+	return i < 0 ? "" : sensorId.slice(0, i);
+}
+/**
+* The persisted entries a Container of `group` may spawn as children. An early snapshot had no
+* model, so nodewitt called a weather-station reading `gateway:<key>`; once the sensor map is
+* known the same reading is `<hardwareId>:<key>`. An entry is dropped when its live sensor (the
+* exact id, or for a `gateway:` id the hardware-owned sensor of the same key) belongs to another
+* group. An entry the live set does not know is kept: unknown is not gone (D49).
+*/
+function entriesForGroup(entries, group, live) {
+	return entries.filter((entry) => {
+		const sensor = live.find((s) => s.id === entry.sensorId) ?? (sensorOwnerOf(entry.sensorId) === "gateway" ? live.find((s) => sensorOwnerOf(s.id) !== "gateway" && sensorKeyOf(s.id) === sensorKeyOf(entry.sensorId)) : void 0);
+		return sensor === void 0 || deviceGroupForSensor(sensor.category, sensor.channel) === group;
+	});
+}
+//#endregion
 //#region src/devices/ecowitt-sensor-device.ts
 /**
 * Persisted config every Ecowitt sensor child carries. `sensorId` resolves the
@@ -95565,7 +95632,7 @@ var EcowittContainerDevice = class extends BaseDevice {
 		});
 	}
 	getAccessoryChildren() {
-		return this.config.values.sensors.map((sensor) => {
+		return entriesForGroup(this.config.values.sensors, this.config.values.deviceGroup, ecowittFacades.getSensors(this.gatewayId)).map((sensor) => {
 			const meta = {
 				type: DeviceType.Sensor,
 				role: roleForQuantity(sensor.quantity),
@@ -99412,7 +99479,7 @@ function parseValue(input) {
 		raw
 	};
 }
-function str(item, field) {
+function str$1(item, field) {
 	const v = item[field];
 	if (typeof v === "string") return v;
 	if (typeof v === "number") return String(v);
@@ -99452,7 +99519,7 @@ function makeReading(key, val, unit, forceId) {
 	}
 }
 function channelOf(item) {
-	const ch = str(item, "channel");
+	const ch = str$1(item, "channel");
 	return ch && ch.trim() !== "" ? ch.trim() : void 0;
 }
 function push(out, reading) {
@@ -99462,8 +99529,8 @@ function decodeChSoil(items, out) {
 	for (const item of items) {
 		const ch = channelOf(item);
 		if (ch === void 0) continue;
-		const humidity = stripPercent(str(item, "humidity"));
-		const battery = str(item, "battery");
+		const humidity = stripPercent(str$1(item, "humidity"));
+		const battery = str$1(item, "battery");
 		if (humidity) push(out, makeReading(`soilmoisture${ch}`, humidity));
 		if (battery) push(out, makeReading(`soilbatt${ch}`, batteryPercent(battery, true)));
 	}
@@ -99472,11 +99539,11 @@ function decodeChEc(items, out) {
 	for (const item of items) {
 		const ch = channelOf(item);
 		if (ch === void 0) continue;
-		const humidity = stripPercent(str(item, "humidity"));
-		const temp = str(item, "temp");
-		const unit = str(item, "unit") ?? "C";
-		const ec = str(item, "ec");
-		const battery = str(item, "battery");
+		const humidity = stripPercent(str$1(item, "humidity"));
+		const temp = str$1(item, "temp");
+		const unit = str$1(item, "unit") ?? "C";
+		const ec = str$1(item, "ec");
+		const battery = str$1(item, "battery");
 		if (humidity) push(out, makeReading(`soilmoisture${ch}`, humidity));
 		if (temp) push(out, makeReading(`soiltemp${ch}`, temp, unit));
 		if (ec) push(out, makeReading(`soilec${ch}`, ec));
@@ -99487,9 +99554,9 @@ function decodeChAisle(items, gatewayTempUnit, out) {
 	for (const item of items) {
 		const ch = channelOf(item);
 		if (ch === void 0) continue;
-		const temp = str(item, "temp");
-		const humidity = str(item, "humidity");
-		const battery = str(item, "battery");
+		const temp = str$1(item, "temp");
+		const humidity = str$1(item, "humidity");
+		const battery = str$1(item, "battery");
 		if (temp && temp !== "None") push(out, makeReading(`temp${ch}f`, temp, gatewayTempUnit));
 		if (humidity && humidity !== "None") push(out, makeReading(`humidity${ch}`, stripPercent(humidity)));
 		if (battery && battery !== "None") push(out, makeReading(`batt${ch}`, batteryPercent(battery, true)));
@@ -99499,8 +99566,8 @@ function decodeChTemp(items, gatewayTempUnit, out) {
 	for (const item of items) {
 		const ch = channelOf(item);
 		if (ch === void 0) continue;
-		const temp = str(item, "temp");
-		const battery = str(item, "battery");
+		const temp = str$1(item, "temp");
+		const battery = str$1(item, "battery");
 		if (temp && temp !== "None") push(out, makeReading(`tf_ch${ch}`, temp, gatewayTempUnit));
 		if (battery && battery !== "None") push(out, makeReading(`tf_batt${ch}`, batteryPercent(battery, false)));
 	}
@@ -99509,11 +99576,11 @@ function decodeChPm25(items, out) {
 	for (const item of items) {
 		const ch = channelOf(item);
 		if (ch === void 0) continue;
-		const pm25 = str(item, "pm25") ?? str(item, "PM25");
-		const pm25_24h = str(item, "pm25_avg_24h") ?? str(item, "pm25_24h");
-		const realaqi = str(item, "PM25_RealAQI");
-		const aqi24h = str(item, "PM25_24HAQI");
-		const battery = str(item, "battery");
+		const pm25 = str$1(item, "pm25") ?? str$1(item, "PM25");
+		const pm25_24h = str$1(item, "pm25_avg_24h") ?? str$1(item, "pm25_24h");
+		const realaqi = str$1(item, "PM25_RealAQI");
+		const aqi24h = str$1(item, "PM25_24HAQI");
+		const battery = str$1(item, "battery");
 		if (pm25 && pm25 !== "None") push(out, makeReading(`pm25_ch${ch}`, pm25));
 		if (pm25_24h && pm25_24h !== "None") push(out, makeReading(`pm25_avg_24h_ch${ch}`, pm25_24h));
 		if (realaqi && realaqi !== "None") push(out, makeReading(`pm25_aqi_realtime_ch${ch}`, realaqi));
@@ -99525,8 +99592,8 @@ function decodeChLeaf(items, out) {
 	for (const item of items) {
 		const ch = channelOf(item);
 		if (ch === void 0) continue;
-		const humidity = stripPercent(str(item, "humidity"));
-		const battery = str(item, "battery");
+		const humidity = stripPercent(str$1(item, "humidity"));
+		const battery = str$1(item, "battery");
 		if (humidity) push(out, makeReading(`leafwetness_ch${ch}`, humidity));
 		if (battery && battery !== "None") push(out, makeReading(`leaf_batt${ch}`, batteryPercent(battery, false)));
 	}
@@ -99535,8 +99602,8 @@ function decodeChLeak(items, out) {
 	for (const item of items) {
 		const ch = channelOf(item);
 		if (ch === void 0) continue;
-		const status = str(item, "status");
-		const battery = str(item, "battery");
+		const status = str$1(item, "status");
+		const battery = str$1(item, "battery");
 		if (status !== void 0 && status !== "") {
 			const leak = status.trim().toLowerCase() === "normal" ? "0" : "1";
 			push(out, makeReading(`leak_ch${ch}`, leak));
@@ -99548,10 +99615,10 @@ function decodeChLds(items, out) {
 	for (const item of items) {
 		const ch = channelOf(item);
 		if (ch === void 0) continue;
-		const air = str(item, "air");
-		const depth = str(item, "depth");
-		const voltage = str(item, "voltage");
-		const battery = str(item, "battery");
+		const air = str$1(item, "air");
+		const depth = str$1(item, "depth");
+		const voltage = str$1(item, "voltage");
+		const battery = str$1(item, "battery");
 		if (air && air !== "None") push(out, makeReading(`lds_air_ch${ch}`, air));
 		if (depth && depth !== "None") push(out, makeReading(`lds_depth_ch${ch}`, depth));
 		if (voltage && voltage !== "None") push(out, makeReading(`lds_voltage_ch${ch}`, voltage));
@@ -99580,23 +99647,23 @@ var CO2_FIELDS = [
 ];
 function firstField(item, fields) {
 	for (const f of fields) {
-		const v = str(item, f);
+		const v = str$1(item, f);
 		if (v && v !== "None") return v;
 	}
 }
 function decodeCo2(items, out) {
 	const item = items[0];
 	if (item === void 0) return;
-	const temp = str(item, "temp");
-	const unit = str(item, "unit") ?? "C";
+	const temp = str$1(item, "temp");
+	const unit = str$1(item, "unit") ?? "C";
 	if (temp) push(out, makeReading(unit === "C" ? "tf_co2c" : "tf_co2", temp, unit));
-	const humidity = stripPercent(str(item, "humidity"));
+	const humidity = stripPercent(str$1(item, "humidity"));
 	if (humidity) push(out, makeReading("humi_co2", humidity));
 	for (const [fields, key] of CO2_FIELDS) {
 		const v = firstField(item, fields);
 		if (v !== void 0) push(out, makeReading(key, v));
 	}
-	const battery = str(item, "battery");
+	const battery = str$1(item, "battery");
 	if (battery && battery !== "None") {
 		const n = num(battery);
 		push(out, makeReading("co2_batt", n !== void 0 ? String(Math.min(n * 20, 100)) : battery));
@@ -99608,12 +99675,12 @@ function push2(out, reading) {
 }
 function decodeCommonList(items, mapper, out) {
 	for (const item of items) {
-		const id = str(item, "id");
-		const val = str(item, "val");
-		const unit = str(item, "unit");
+		const id = str$1(item, "id");
+		const val = str$1(item, "val");
+		const unit = str$1(item, "unit");
 		if (id && val !== void 0) push2(out, makeReading(id, val, unit));
 		if (id === "0x03" && mapper.getHardwareId("wh26batt") !== void 0) {
-			const battery = str(item, "battery");
+			const battery = str$1(item, "battery");
 			if (battery !== void 0) push2(out, makeReading("wh26batt", battery === "0" ? "100" : "10"));
 		}
 	}
@@ -99621,12 +99688,12 @@ function decodeCommonList(items, mapper, out) {
 function decodeRain(items, mapper, out) {
 	const rainHwId = mapper.getHardwareId("wh69batt") ?? mapper.getHardwareId("wh40batt");
 	for (const item of items) {
-		const id = str(item, "id");
-		const val = str(item, "val");
+		const id = str$1(item, "id");
+		const val = str$1(item, "val");
 		if (!id || val === void 0) continue;
-		push2(out, makeReading(id, val, str(item, "unit"), rainHwId));
+		push2(out, makeReading(id, val, str$1(item, "unit"), rainHwId));
 		if (id === "0x13") {
-			const battery = str(item, "battery");
+			const battery = str$1(item, "battery");
 			if (battery) {
 				const n = num(battery);
 				const pct = n !== void 0 && n > 1 ? String(n * 20) : battery === "0" ? "100" : "10";
@@ -99658,30 +99725,30 @@ function piezoKeysFor(mapper) {
 function decodePiezo(items, mapper, out) {
 	const piezoHwId = mapper.getHardwareId("ws85batt") ?? mapper.getHardwareId("ws90batt") ?? mapper.getHardwareId("wh90batt");
 	for (const item of items) {
-		const id = str(item, "id");
-		const val = str(item, "val");
+		const id = str$1(item, "id");
+		const val = str$1(item, "val");
 		if (!id || val === void 0) continue;
-		push2(out, makeReading(id, val, str(item, "unit"), piezoHwId));
+		push2(out, makeReading(id, val, str$1(item, "unit"), piezoHwId));
 		if (id !== "0x13") continue;
-		const battery = str(item, "battery");
+		const battery = str$1(item, "battery");
 		if (!battery) continue;
 		const keys = piezoKeysFor(mapper);
 		const n = num(battery);
 		push2(out, makeReading(keys.batt, n !== void 0 ? String(n * 20) : battery));
-		const voltage = str(item, "voltage");
+		const voltage = str$1(item, "voltage");
 		if (voltage) push2(out, makeReading(keys.volt, voltage));
-		const cap = str(item, keys.capField);
+		const cap = str$1(item, keys.capField);
 		if (cap) push2(out, makeReading(keys.capKey, cap));
 	}
 }
 function decodeLightning(items, out) {
 	const item = items[0];
 	if (item === void 0) return;
-	const count = str(item, "count");
+	const count = str$1(item, "count");
 	if (count !== void 0) push2(out, makeReading("lightning_num", count));
-	const distance = str(item, "distance");
+	const distance = str$1(item, "distance");
 	if (distance !== void 0) push2(out, makeReading("lightning", distance.replace(" km", "").trim()));
-	const battery = str(item, "battery");
+	const battery = str$1(item, "battery");
 	if (battery !== void 0) {
 		const n = num(battery);
 		push2(out, makeReading("wh57batt", n !== void 0 ? String(n * 20) : battery));
@@ -99690,30 +99757,30 @@ function decodeLightning(items, out) {
 function decodeWh25(items, out) {
 	const item = items[0];
 	if (item === void 0) return;
-	const intemp = str(item, "intemp");
-	const unit = str(item, "unit") ?? "F";
+	const intemp = str$1(item, "intemp");
+	const unit = str$1(item, "unit") ?? "F";
 	if (intemp !== void 0) push2(out, makeReading("tempinf", intemp, unit));
-	const inhumi = str(item, "inhumi");
+	const inhumi = str$1(item, "inhumi");
 	if (inhumi !== void 0) push2(out, makeReading("humidityin", stripPercent(inhumi)));
-	const abs = str(item, "abs");
+	const abs = str$1(item, "abs");
 	if (abs !== void 0) push2(out, makeReading("baromabsin", abs.replace(" hPa", "").trim()));
-	const rel = str(item, "rel");
+	const rel = str$1(item, "rel");
 	if (rel !== void 0) push2(out, makeReading("baromrelin", rel.replace(" hPa", "").trim()));
 }
 function decodeSoilCalibration(items, out) {
 	for (const item of items) {
-		const ch = str(item, "ch");
-		const nowAd = str(item, "nowAd");
+		const ch = str$1(item, "ch");
+		const nowAd = str$1(item, "nowAd");
 		if (ch && nowAd !== void 0) push2(out, makeReading(`soilad${ch}`, nowAd));
 	}
 }
 function decodeLdsConfig(items, out) {
 	for (const item of items) {
-		const ch = str(item, "ch");
+		const ch = str$1(item, "ch");
 		if (!ch) continue;
-		const level = str(item, "level");
+		const level = str$1(item, "level");
 		if (level !== void 0 && level !== "None") push2(out, makeReading(`lds_level_ch${ch}`, level));
-		const totalHeat = str(item, "total_heat");
+		const totalHeat = str$1(item, "total_heat");
 		if (totalHeat !== void 0 && totalHeat !== "None") push2(out, makeReading(`lds_total_heat_ch${ch}`, totalHeat));
 	}
 }
@@ -101780,50 +101847,6 @@ function buildEcowittGatewayCandidates(input) {
 	})];
 }
 //#endregion
-//#region src/ecowitt-sensor-groups.ts
-/** Resolve `deviceGroup` from a persisted container config (defaults to 'gateway'). */
-function configDeviceGroup(config) {
-	const g = config["deviceGroup"];
-	return ECOWITT_DEVICE_GROUPS.find((group) => group === g) ?? "gateway";
-}
-/** Build the persisted sensor entry (incl. self-describing category) from a live Sensor. */
-function sensorToEntry(s) {
-	return {
-		sensorId: s.id,
-		quantity: s.quantity,
-		...s.channel !== void 0 ? { channel: s.channel } : {},
-		...s.name !== void 0 ? { name: s.name } : {},
-		...s.category !== void 0 ? { category: s.category } : {}
-	};
-}
-/** Bucket live sensors into their device group. */
-function bucketSensorsByGroup(sensors) {
-	const byGroup = /* @__PURE__ */ new Map();
-	for (const group of ECOWITT_DEVICE_GROUPS) byGroup.set(group, []);
-	for (const s of sensors) {
-		const group = deviceGroupForSensor(s.category, s.channel);
-		byGroup.get(group)?.push(sensorToEntry(s));
-	}
-	return byGroup;
-}
-/** Structural equality of two persisted sensor lists (order-independent by id + name). */
-function sensorsEqual(a, b) {
-	if (a.length !== b.length) return false;
-	const aById = /* @__PURE__ */ new Map();
-	for (const entry of a) if (typeof entry === "object" && entry !== null && "sensorId" in entry) {
-		const id = entry.sensorId;
-		if (typeof id === "string") {
-			const name = "name" in entry && typeof entry.name === "string" ? entry.name : void 0;
-			aById.set(id, name);
-		}
-	}
-	for (const entry of b) {
-		if (!aById.has(entry.sensorId)) return false;
-		if (aById.get(entry.sensorId) !== entry.name) return false;
-	}
-	return true;
-}
-//#endregion
 //#region src/ecowitt-adoption-provider.ts
 var DEVICES_FILTER = {
 	id: "devices",
@@ -102127,6 +102150,56 @@ function ecowittCandidates(gateways, known = /* @__PURE__ */ new Set()) {
 	});
 }
 //#endregion
+//#region src/ecowitt-duplicate-sensors.ts
+function str(config, key) {
+	const v = config[key];
+	return typeof v === "string" && v.length > 0 ? v : null;
+}
+/**
+* Sensors minted under the `gateway` group Container (id `gateway:<key>`) that are the SAME reading
+* as a hardware-owned child (`<hw>:<key>`) of the weather-station / CH1 Container of the same
+* gateway. Early snapshots carry no
+* model for a sensor, which nodewitt classifies as `gateway`, so a weather-station reading was
+* once minted under the gateway Container as well; the live readings reach only the sensor under
+* its own group. Only a duplicate is returned: a sensor that exists nowhere else is the
+* gateway's own and is never touched. `scanned` is the number of sensor children seen, so a
+* caller can tell "nothing to remove" from "children not spawned yet".
+*/
+function findDuplicateGatewaySensors(rows) {
+	const containers = /* @__PURE__ */ new Map();
+	for (const row of rows) {
+		if (row.type !== DeviceType.Container || row.config["system"] !== "ecowitt") continue;
+		const gatewayId = str(row.config, "gatewayId");
+		if (gatewayId === null) continue;
+		containers.set(row.id, {
+			gatewayId,
+			gateway: configDeviceGroup(row.config) === "gateway"
+		});
+	}
+	const ownedElsewhere = /* @__PURE__ */ new Set();
+	const underGateway = [];
+	let scanned = 0;
+	for (const row of rows) {
+		if (row.type !== DeviceType.Sensor || row.parentDeviceId === null) continue;
+		const container = containers.get(row.parentDeviceId);
+		const sensorId = str(row.config, "sensorId");
+		if (container === void 0 || sensorId === null) continue;
+		scanned += 1;
+		const key = `${container.gatewayId}\u0000${sensorKeyOf(sensorId)}`;
+		const owner = sensorOwnerOf(sensorId);
+		if (container.gateway) {
+			if (owner === "gateway") underGateway.push({
+				id: row.id,
+				key
+			});
+		} else if (owner !== "gateway" && owner !== "") ownedElsewhere.add(key);
+	}
+	return {
+		duplicates: underGateway.filter((s) => ownedElsewhere.has(s.key)).map((s) => s.id),
+		scanned
+	};
+}
+//#endregion
 //#region src/ecowitt-reconciler.ts
 /**
 * Keeps one live client per enabled integration. Devices are removed ONLY on an explicit
@@ -102580,6 +102653,55 @@ var EcowittProviderAddon = class extends BaseDeviceProvider {
 		const devices = this.ctx.kernel.devices;
 		if (!reg || !devices) return;
 		const byGroup = bucketSensorsByGroup(sensors);
+		if (await this.reconcileEachContainer(gatewayKey, byGroup) || !this.duplicatesChecked.has(gatewayKey)) await this.removeDuplicateGatewaySensors(gatewayKey);
+	}
+	/** Gateway keys whose duplicate scan already saw spawned sensor children (idempotent anyway). */
+	duplicatesChecked = /* @__PURE__ */ new Set();
+	/**
+	* Idempotent cleanup of the sensors minted under the `gateway` Container that duplicate a
+	* sensor of the weather-station / CH1 Container (see {@link findDuplicateGatewaySensors}).
+	* Goes through the normal device removal (tombstone); a read that failed removes nothing.
+	*/
+	async removeDuplicateGatewaySensors(gatewayKey) {
+		const reg = this.ctx.kernel.deviceRegistry;
+		const devices = this.ctx.kernel.devices;
+		if (!reg || !devices) return;
+		const rows = [];
+		for (const d of reg.getAllForAddon(this.addonId)) {
+			if (d.type !== DeviceType.Container && d.type !== DeviceType.Sensor) continue;
+			const config = await devices.loadConfig(d.id).catch(() => null);
+			if (config === null) return;
+			if (config["system"] !== "ecowitt" || config["gatewayId"] !== gatewayKey) continue;
+			rows.push({
+				id: d.id,
+				type: d.type,
+				parentDeviceId: d.parentDeviceId,
+				config
+			});
+		}
+		const { duplicates, scanned } = findDuplicateGatewaySensors(rows);
+		if (scanned > 0) this.duplicatesChecked.add(gatewayKey);
+		for (const id of duplicates) try {
+			await devices.remove(id);
+			this.ctx.logger.info("Ecowitt: duplicate sensor under the gateway container removed", {
+				tags: { deviceId: id },
+				meta: { gatewayKey }
+			});
+		} catch (err) {
+			this.ctx.logger.warn("Ecowitt: duplicate sensor removal failed", {
+				tags: { deviceId: id },
+				meta: {
+					gatewayKey,
+					error: errMsg(err)
+				}
+			});
+		}
+	}
+	async reconcileEachContainer(gatewayKey, byGroup) {
+		const reg = this.ctx.kernel.deviceRegistry;
+		const devices = this.ctx.kernel.devices;
+		if (!reg || !devices) return false;
+		let changed = false;
 		for (const d of reg.getAllForAddon(this.addonId)) {
 			if (d.parentDeviceId !== null || d.type !== DeviceType.Container) continue;
 			const cfg = await devices.loadConfig(d.id).catch(() => ({}));
@@ -102587,6 +102709,7 @@ var EcowittProviderAddon = class extends BaseDeviceProvider {
 			const nextSensors = byGroup.get(configDeviceGroup(cfg)) ?? [];
 			if (sensorsEqual(Array.isArray(cfg["sensors"]) ? cfg["sensors"] : [], nextSensors)) continue;
 			await devices.applyDerivedSpec(d.id, { config: { sensors: nextSensors } });
+			changed = true;
 			this.ctx.logger.info("Ecowitt: group sensors reconciled", {
 				tags: { deviceId: d.id },
 				meta: {
@@ -102595,6 +102718,7 @@ var EcowittProviderAddon = class extends BaseDeviceProvider {
 				}
 			});
 		}
+		return changed;
 	}
 	async adoptGatewayDevice(integrationId, gatewayKey, name) {
 		const devices = this.ctx.kernel.devices;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-provider-ecowitt",
-  "version": "0.2.153",
+  "version": "0.2.154",
   "description": "Ecowitt weather-station device-provider addon for CamStack — wraps the @apocaliss92/nodewitt local-poll / push client",
   "keywords": [
     "camstack",
@@ -59,7 +59,7 @@
       }
     ],
     "requires": {
-      "server": ">=1.2.719"
+      "server": ">=1.2.722"
     }
   },
   "files": [