@camstack/addon-post-analysis 1.1.22 → 1.1.24

package/dist/pipeline-analytics/index.js

@@ -2,8 +2,8 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_dist = require("../dist-DbgDsnRE.js");
-const require_resolve_frame = require("../resolve-frame-nQMd6Z8B.js");
+const require_dist = require("../dist-B0VgBdBN.js");
+const require_resolve_frame = require("../resolve-frame-DBXwF5fk.js");
 let _camstack_shm_ring = require("@camstack/shm-ring");
 let sharp = require("sharp");
 sharp = require_dist.__toESM(sharp);
@@ -699,17 +699,24 @@ function normalizeToPixel(p, width, height) {
 //#region src/pipeline-analytics/pipeline/tracker/sort-tracker.ts
 var DEFAULT_TRACKER_CONFIG = {
 	iouThreshold: .3,
-	maxMissedFrames: 30,
+	maxMissedMs: 4e3,
 	minHits: 3,
 	predictiveCoasting: true,
 	classGating: true,
 	occlusionEnabled: true,
 	occlusionContainment: .6,
-	occlusionMaxMissedFrames: 60,
-	maxTrackLifetimeMs: 3e5
+	occlusionMaxMissedMs: 8e3,
+	maxTrackLifetimeMs: 3e5,
+	rescueIouThreshold: .1,
+	rescueCentroidFactor: .75,
+	resurrectionWindowMs: 8e3,
+	stationarySpeedPx: 2
 };
 var MAX_PATH_LENGTH = 300;
 var nextTrackId = 1;
+function clamp(value, min, max) {
+	return Math.max(min, Math.min(max, value));
+}
 function iou$1(a, b) {
 	const ax1 = a.x, ay1 = a.y, ax2 = a.x + a.w, ay2 = a.y + a.h;
 	const bx1 = b.x, by1 = b.y, bx2 = b.x + b.w, by2 = b.y + b.h;
@@ -739,26 +746,51 @@ var SortTracker = class {
 		};
 	}
 	/** Where a track is expected this frame — extrapolated by velocity while
-	*  coasting (predictiveCoasting), else its last known bbox. */
+	*  coasting (predictiveCoasting), else its last known bbox. A stationary
+	*  track (speed < stationarySpeedPx) is frozen so bbox jitter can't walk the
+	*  box off a sitting object; otherwise the drift is capped at one bbox size
+	*  so a stale velocity can't fling the box across the frame. Public so the
+	*  clamp is directly unit-testable. */
 	predicted(t) {
 		if (!this.config.predictiveCoasting) return t.bbox;
+		if (Math.hypot(t.velocity.dx, t.velocity.dy) < this.config.stationarySpeedPx) return t.bbox;
 		const f = t.age + 1;
+		const driftX = clamp(t.velocity.dx * f, -t.bbox.w, t.bbox.w);
+		const driftY = clamp(t.velocity.dy * f, -t.bbox.h, t.bbox.h);
 		return {
-			x: t.bbox.x + t.velocity.dx * f,
-			y: t.bbox.y + t.velocity.dy * f,
+			x: t.bbox.x + driftX,
+			y: t.bbox.y + driftY,
 			w: t.bbox.w,
 			h: t.bbox.h
 		};
 	}
+	/**
+	* Loose same-class gate used by the rescue and resurrection passes: accept
+	* when the detection overlaps the track's LAST-KNOWN bbox by `rescueIou`, or
+	* its centroid is within `rescueCentroidFactor × bbox-diagonal`. Always class-
+	* gated (a rescue must never cross classes), independent of `classGating`.
+	*/
+	looseMatch(track, det) {
+		if (track.class !== det.class) return false;
+		if (iou$1(track.bbox, det.bbox) >= this.config.rescueIouThreshold) return true;
+		const tc = bboxCentroid(track.bbox);
+		const dc = bboxCentroid(det.bbox);
+		const dist = Math.hypot(tc.x - dc.x, tc.y - dc.y);
+		const diag = Math.hypot(track.bbox.w, track.bbox.h);
+		return dist <= this.config.rescueCentroidFactor * diag;
+	}
 	update(detections, timestamp) {
 		if (this.config.maxTrackLifetimeMs > 0) {
 			const alive = [];
 			for (const track of this.tracks) if (timestamp - track.firstSeen > this.config.maxTrackLifetimeMs) {
 				track.lost = true;
+				track.lostAt = timestamp;
+				track.resurrectable = false;
 				this.lostTracks.push(track);
 			} else alive.push(track);
 			this.tracks = alive;
 		}
+		this.lostTracks = this.lostTracks.filter((t) => timestamp - t.lostAt <= this.config.resurrectionWindowMs);
 		const used = /* @__PURE__ */ new Set();
 		const matchedTracks = /* @__PURE__ */ new Set();
 		const matched = /* @__PURE__ */ new Map();
@@ -783,6 +815,27 @@ var SortTracker = class {
 			matchedTracks.add(pair.track);
 			used.add(pair.detIdx);
 		}
+		const rescuePairs = [];
+		for (const track of this.tracks) {
+			if (matchedTracks.has(track)) continue;
+			for (let di = 0; di < detections.length; di++) {
+				if (used.has(di)) continue;
+				const det = detections[di];
+				if (!this.looseMatch(track, det)) continue;
+				rescuePairs.push({
+					track,
+					detIdx: di,
+					score: iou$1(track.bbox, det.bbox)
+				});
+			}
+		}
+		rescuePairs.sort((a, b) => b.score - a.score);
+		for (const pair of rescuePairs) {
+			if (matchedTracks.has(pair.track) || used.has(pair.detIdx)) continue;
+			matched.set(pair.track, detections[pair.detIdx]);
+			matchedTracks.add(pair.track);
+			used.add(pair.detIdx);
+		}
 		for (const [track, det] of matched) {
 			const prevCenter = bboxCentroid({
 				x: track.bbox.x,
@@ -821,12 +874,47 @@ var SortTracker = class {
 			}
 			const occluded = this.config.occlusionEnabled && occluderBoxes.some((ob) => containment(this.predicted(track), ob) >= this.config.occlusionContainment);
 			track.age++;
-			const limit = occluded ? this.config.occlusionMaxMissedFrames : this.config.maxMissedFrames;
-			if (track.age > limit) {
+			if (timestamp - track.lastSeen > (occluded ? this.config.occlusionMaxMissedMs : this.config.maxMissedMs)) {
 				track.lost = true;
+				track.lostAt = timestamp;
+				track.resurrectable = true;
 				this.lostTracks.push(track);
 			} else surviving.push(track);
 		}
+		for (let di = 0; di < detections.length; di++) {
+			if (used.has(di)) continue;
+			const det = detections[di];
+			let best;
+			let bestScore = -1;
+			for (const lost of this.lostTracks) {
+				if (!lost.resurrectable) continue;
+				if (timestamp - lost.lostAt > this.config.resurrectionWindowMs) continue;
+				if (!this.looseMatch(lost, det)) continue;
+				const score = iou$1(lost.bbox, det.bbox);
+				if (score > bestScore) {
+					best = lost;
+					bestScore = score;
+				}
+			}
+			if (!best) continue;
+			this.lostTracks = this.lostTracks.filter((t) => t !== best);
+			best.bbox = det.bbox;
+			best.class = det.class;
+			best.originalClass = det.originalClass;
+			best.score = det.score;
+			best.age = 0;
+			best.hits++;
+			best.lost = false;
+			best.lastSeen = timestamp;
+			best.velocity = {
+				dx: 0,
+				dy: 0
+			};
+			best.path.push(det.bbox);
+			if (best.path.length > MAX_PATH_LENGTH) best.path.shift();
+			surviving.push(best);
+			used.add(di);
+		}
 		for (let di = 0; di < detections.length; di++) {
 			if (used.has(di)) continue;
 			const det = detections[di];
@@ -846,7 +934,9 @@ var SortTracker = class {
 					dx: 0,
 					dy: 0
 				},
-				lost: false
+				lost: false,
+				lostAt: 0,
+				resurrectable: true
 			});
 		}
 		this.tracks = surviving;
@@ -961,6 +1051,7 @@ var StateAnalyzer = class {
 //#region src/pipeline-analytics/pipeline/events/event-filter.ts
 var DEFAULT_EVENT_EMITTER_CONFIG = {
 	minTrackAge: 3,
+	minTrackAgeMs: 0,
 	cooldownSec: 5,
 	enabledTypes: [
 		"object.entering",
@@ -991,6 +1082,13 @@ var DetectionEventEmitter = class {
 	config;
 	previousStates = /* @__PURE__ */ new Map();
 	lastEmitted = /* @__PURE__ */ new Map();
+	/**
+	* Last-known track per id. A `leaving` state fires for a track that is ABSENT
+	* from the current frame, so it can't be resolved from `trackMap` — it is
+	* resolved from this snapshot instead (without it, leaving events never
+	* fired: the latent "0 `left` events in 24h" bug).
+	*/
+	lastKnownTracks = /* @__PURE__ */ new Map();
 	constructor(config = {}) {
 		this.config = {
 			...DEFAULT_EVENT_EMITTER_CONFIG,
@@ -1002,10 +1100,12 @@ var DetectionEventEmitter = class {
 		const now = Date.now();
 		const stateMap = new Map(states.map((s) => [s.trackId, s]));
 		const trackMap = new Map(tracks.map((t) => [t.trackId, t]));
+		for (const t of tracks) this.lastKnownTracks.set(t.trackId, t);
 		for (const state of states) {
-			const track = trackMap.get(state.trackId);
+			const track = trackMap.get(state.trackId) ?? this.lastKnownTracks.get(state.trackId);
 			if (!track) continue;
 			if (track.trackAge < this.config.minTrackAge) continue;
+			if (state.dwellTimeMs < this.config.minTrackAgeMs) continue;
 			const eventType = STATE_TO_EVENT[state.state];
 			if (!eventType) continue;
 			if (!this.config.enabledTypes.includes(eventType)) continue;
@@ -1051,12 +1151,16 @@ var DetectionEventEmitter = class {
 				trackPath: [...track.path]
 			});
 		}
-		for (const state of states) if (state.state === "leaving") this.previousStates.delete(state.trackId);
+		for (const state of states) if (state.state === "leaving") {
+			this.previousStates.delete(state.trackId);
+			this.lastKnownTracks.delete(state.trackId);
+		}
 		return events;
 	}
 	reset() {
 		this.previousStates.clear();
 		this.lastEmitted.clear();
+		this.lastKnownTracks.clear();
 	}
 };
 //#endregion
@@ -1717,10 +1821,13 @@ var TrackStore = class {
 			try {
 				await this.persistCompleted(record);
 			} catch (err) {
-				this.logger.warn("persist completed track failed", { meta: {
-					trackId,
-					error: String(err)
-				} });
+				this.logger.warn("persist completed track failed", {
+					tags: { deviceId: t.deviceId },
+					meta: {
+						trackId,
+						error: String(err)
+					}
+				});
 			}
 			this.active.delete(trackId);
 			expired.push(record);
@@ -1947,10 +2054,13 @@ var MediaStore = class {
 			});
 			return key;
 		} catch (err) {
-			this.logger.warn("media put failed", { meta: {
-				key,
-				error: String(err)
-			} });
+			this.logger.warn("media put failed", {
+				tags: { deviceId: params.deviceId },
+				meta: {
+					key,
+					error: String(err)
+				}
+			});
 			throw err;
 		}
 	}
@@ -2139,11 +2249,14 @@ var MediaStore = class {
 				relativePath: oldPath
 			});
 		} catch (err) {
-			this.logger.warn("MediaStore.reown: old blob delete failed (best-effort)", { meta: {
-				key,
-				oldPath,
-				error: String(err)
-			} });
+			this.logger.warn("MediaStore.reown: old blob delete failed (best-effort)", {
+				tags: { deviceId },
+				meta: {
+					key,
+					oldPath,
+					error: String(err)
+				}
+			});
 		}
 		try {
 			await this.store.delete.mutate({
@@ -2151,10 +2264,13 @@ var MediaStore = class {
 				key
 			});
 		} catch (err) {
-			this.logger.warn("MediaStore.reown: old index row delete failed (best-effort)", { meta: {
-				key,
-				error: String(err)
-			} });
+			this.logger.warn("MediaStore.reown: old index row delete failed (best-effort)", {
+				tags: { deviceId },
+				meta: {
+					key,
+					error: String(err)
+				}
+			});
 		}
 		return newKey;
 	}
@@ -2355,10 +2471,13 @@ var EventStore = class {
 				}
 			});
 		} catch (err) {
-			this.logger.warn("insertMotion failed", { meta: {
-				eventId: ev.id,
-				error: String(err)
-			} });
+			this.logger.warn("insertMotion failed", {
+				tags: { deviceId: ev.deviceId },
+				meta: {
+					eventId: ev.id,
+					error: String(err)
+				}
+			});
 		}
 	}
 	async insertObject(ev) {
@@ -2372,10 +2491,13 @@ var EventStore = class {
 				}
 			});
 		} catch (err) {
-			this.logger.warn("insertObject failed", { meta: {
-				eventId: ev.id,
-				error: String(err)
-			} });
+			this.logger.warn("insertObject failed", {
+				tags: { deviceId: ev.deviceId },
+				meta: {
+					eventId: ev.id,
+					error: String(err)
+				}
+			});
 		}
 	}
 	async insertAudio(ev) {
@@ -2389,10 +2511,13 @@ var EventStore = class {
 				}
 			});
 		} catch (err) {
-			this.logger.warn("insertAudio failed", { meta: {
-				eventId: ev.id,
-				error: String(err)
-			} });
+			this.logger.warn("insertAudio failed", {
+				tags: { deviceId: ev.deviceId },
+				meta: {
+					eventId: ev.id,
+					error: String(err)
+				}
+			});
 		}
 	}
 	buildFilter(q) {
@@ -2861,25 +2986,34 @@ var EventMediaDispatcher = class {
 				getRemoteFrame: this.deps.getRemoteFrame
 			});
 		} catch (err) {
-			this.deps.logger.debug("event media: resolveFrame threw", { meta: {
-				deviceId,
-				shmId: frameHandle.shmId,
-				error: String(err)
-			} });
+			this.deps.logger.debug("event media: resolveFrame threw", {
+				tags: { deviceId },
+				meta: {
+					deviceId,
+					shmId: frameHandle.shmId,
+					error: String(err)
+				}
+			});
 			return;
 		}
 		if (!decoded) {
-			this.deps.logger.debug("event media: frame recycled before resolve", { meta: {
-				deviceId,
-				shmId: frameHandle.shmId
-			} });
+			this.deps.logger.debug("event media: frame recycled before resolve", {
+				tags: { deviceId },
+				meta: {
+					deviceId,
+					shmId: frameHandle.shmId
+				}
+			});
 			return;
 		}
 		if (decoded.format !== "rgb") {
-			this.deps.logger.debug("event media: resolved frame is not RGB", { meta: {
-				deviceId,
-				format: decoded.format
-			} });
+			this.deps.logger.debug("event media: resolved frame is not RGB", {
+				tags: { deviceId },
+				meta: {
+					deviceId,
+					format: decoded.format
+				}
+			});
 			return;
 		}
 		const frameData = Buffer.isBuffer(decoded.data) ? decoded.data : Buffer.from(decoded.data);
@@ -2921,11 +3055,14 @@ var EventMediaDispatcher = class {
 				data: crop
 			});
 		} catch (err) {
-			this.deps.logger.warn("event media: crop failed", { meta: {
-				deviceId,
-				eventId: ev.eventId,
-				error: err instanceof Error ? err.message : String(err)
-			} });
+			this.deps.logger.warn("event media: crop failed", {
+				tags: { deviceId },
+				meta: {
+					deviceId,
+					eventId: ev.eventId,
+					error: err instanceof Error ? err.message : String(err)
+				}
+			});
 		}
 		try {
 			const fullFrame = await drawBoxedFrame(frameData, fw, fh, [], { quality: MEDIA_QUALITY });
@@ -2938,11 +3075,14 @@ var EventMediaDispatcher = class {
 				data: fullFrame
 			});
 		} catch (err) {
-			this.deps.logger.warn("event media: clear full frame failed", { meta: {
-				deviceId,
-				eventId: ev.eventId,
-				error: err instanceof Error ? err.message : String(err)
-			} });
+			this.deps.logger.warn("event media: clear full frame failed", {
+				tags: { deviceId },
+				meta: {
+					deviceId,
+					eventId: ev.eventId,
+					error: err instanceof Error ? err.message : String(err)
+				}
+			});
 		}
 		try {
 			const fullFrameBoxed = await drawBoxedFrame(frameData, fw, fh, [box], { quality: MEDIA_QUALITY });
@@ -2955,11 +3095,14 @@ var EventMediaDispatcher = class {
 				data: fullFrameBoxed
 			});
 		} catch (err) {
-			this.deps.logger.warn("event media: boxed full frame failed", { meta: {
-				deviceId,
-				eventId: ev.eventId,
-				error: err instanceof Error ? err.message : String(err)
-			} });
+			this.deps.logger.warn("event media: boxed full frame failed", {
+				tags: { deviceId },
+				meta: {
+					deviceId,
+					eventId: ev.eventId,
+					error: err instanceof Error ? err.message : String(err)
+				}
+			});
 		}
 		if (ev.childCrops) for (const child of ev.childCrops) try {
 			const childRegion = squareSafeCropRegion(child.bbox, {
@@ -2989,11 +3132,14 @@ var EventMediaDispatcher = class {
 				data: childCropData
 			});
 		} catch (err) {
-			this.deps.logger.warn(`event media: ${child.kind} failed`, { meta: {
-				deviceId,
-				eventId: ev.eventId,
-				error: err instanceof Error ? err.message : String(err)
-			} });
+			this.deps.logger.warn(`event media: ${child.kind} failed`, {
+				tags: { deviceId },
+				meta: {
+					deviceId,
+					eventId: ev.eventId,
+					error: err instanceof Error ? err.message : String(err)
+				}
+			});
 		}
 	}
 	async writeTrackFrame(deviceId, frameData, fw, fh, tf) {
@@ -3012,11 +3158,14 @@ var EventMediaDispatcher = class {
 				data: boxed
 			});
 		} catch (err) {
-			this.deps.logger.warn("event media: track frame failed", { meta: {
-				deviceId,
-				trackId: tf.trackId,
-				error: err instanceof Error ? err.message : String(err)
-			} });
+			this.deps.logger.warn("event media: track frame failed", {
+				tags: { deviceId },
+				meta: {
+					deviceId,
+					trackId: tf.trackId,
+					error: err instanceof Error ? err.message : String(err)
+				}
+			});
 		}
 	}
 };
@@ -3732,22 +3881,22 @@ function resolveDetectionSensitivitySettings(raw) {
 		stationaryThresholdSec: pick("stationaryThresholdSec")
 	};
 }
-//#endregion
-//#region src/pipeline-analytics/tracking-settings.ts
-/**
-* Per-device tracker tuning. These drive the SORT tracker (association,
-* coasting, occlusion, lifetime) and the detector-dropout frame skip. Every
-* field is independently overridable per camera from the admin UI; unknown or
-* invalid values fall back to the field default (never throws on a bad blob).
-*
-* Note: `minHits` lives in detection-sensitivity-settings (it predates this
-* file and already flows to the tracker) — it is NOT duplicated here.
-*/
 var TrackingSettingsSchema = require_dist.object({
 	/** IoU required to match a (predicted) track to a detection. */
 	iouThreshold: require_dist.number().min(0).max(1).default(.3),
-	/** Frames a track may miss detections (coast) before it is dropped. */
+	/** Wall-clock coasting budget (ms) before a missed track is dropped. Time-
+	*  based so behaviour is identical across camera frame rates. */
+	maxMissedMs: require_dist.number().min(0).default(4e3),
+	/** Minimum wall-clock track age (ms) before it may produce events. */
+	minTrackAgeMs: require_dist.number().min(0).default(1e3),
+	/** Extended coasting budget (ms) while a track is occluded. */
+	occlusionMaxMissedMs: require_dist.number().min(0).default(8e3),
+	/** @deprecated frame-based alias for {@link maxMissedMs}. Retained so
+	*  existing per-device blobs keep working — resolved into `maxMissedMs`
+	*  (× {@link NOMINAL_FRAME_MS}) only when `maxMissedMs` is unset. */
 	maxMissedFrames: require_dist.number().int().min(0).default(30),
+	/** @deprecated frame-based alias for {@link occlusionMaxMissedMs}. */
+	occlusionMaxMissedFrames: require_dist.number().int().min(0).default(60),
 	/** Hard cap on total track lifetime — retire+restart beyond this to bound
 	*  drift / long-lived false positives. 0 = unlimited. */
 	maxTrackLifetimeSec: require_dist.number().min(0).default(300),
@@ -3761,8 +3910,17 @@ var TrackingSettingsSchema = require_dist.object({
 	/** Containment ratio (intersection / occluded-area) above which a missed
 	*  track is considered hidden behind another track. */
 	occlusionContainment: require_dist.number().min(0).max(1).default(.6),
-	/** Extended coasting budget (frames) while a track is occluded. */
-	occlusionMaxMissedFrames: require_dist.number().int().min(0).default(60),
+	/** Loose IoU gate (vs. last-known bbox) for the second (rescue) association
+	*  pass + graveyard resurrection. */
+	rescueIouThreshold: require_dist.number().min(0).max(1).default(.1),
+	/** Centroid gate for rescue/resurrection: fraction of the bbox diagonal. */
+	rescueCentroidFactor: require_dist.number().min(0).default(.75),
+	/** Wall-clock graveyard retention (ms): a dropped track re-attaches to a new
+	*  same-class detection (keeping its id) for this long. */
+	resurrectionWindowMs: require_dist.number().min(0).default(8e3),
+	/** Speed (px/frame) below which a track's prediction is frozen (stationary
+	*  jitter can't drift the box off a sitting object). */
+	stationarySpeedPx: require_dist.number().min(0).default(2),
 	/** Skip frames where detections suddenly drop to zero (detector glitch). */
 	dropoutSkipEnabled: require_dist.boolean().default(true),
 	/** Max consecutive all-zero frames absorbed as a glitch before the scene is
@@ -3777,15 +3935,26 @@ var TRACKING_DEFAULTS = TrackingSettingsSchema.parse({});
 */
 function resolveTrackingSettings(raw) {
 	const s = TrackingSettingsSchema.shape;
+	const maxMissedFrames = s.maxMissedFrames.catch(TRACKING_DEFAULTS.maxMissedFrames).parse(raw.maxMissedFrames);
+	const occlusionMaxMissedFrames = s.occlusionMaxMissedFrames.catch(TRACKING_DEFAULTS.occlusionMaxMissedFrames).parse(raw.occlusionMaxMissedFrames);
+	const maxMissedMs = raw.maxMissedMs !== void 0 ? s.maxMissedMs.catch(TRACKING_DEFAULTS.maxMissedMs).parse(raw.maxMissedMs) : raw.maxMissedFrames !== void 0 ? Math.round(maxMissedFrames * 133) : TRACKING_DEFAULTS.maxMissedMs;
+	const occlusionMaxMissedMs = raw.occlusionMaxMissedMs !== void 0 ? s.occlusionMaxMissedMs.catch(TRACKING_DEFAULTS.occlusionMaxMissedMs).parse(raw.occlusionMaxMissedMs) : raw.occlusionMaxMissedFrames !== void 0 ? Math.round(occlusionMaxMissedFrames * 133) : TRACKING_DEFAULTS.occlusionMaxMissedMs;
 	return {
 		iouThreshold: s.iouThreshold.catch(TRACKING_DEFAULTS.iouThreshold).parse(raw.iouThreshold),
-		maxMissedFrames: s.maxMissedFrames.catch(TRACKING_DEFAULTS.maxMissedFrames).parse(raw.maxMissedFrames),
+		maxMissedMs,
+		minTrackAgeMs: s.minTrackAgeMs.catch(TRACKING_DEFAULTS.minTrackAgeMs).parse(raw.minTrackAgeMs),
+		occlusionMaxMissedMs,
+		maxMissedFrames,
+		occlusionMaxMissedFrames,
 		maxTrackLifetimeSec: s.maxTrackLifetimeSec.catch(TRACKING_DEFAULTS.maxTrackLifetimeSec).parse(raw.maxTrackLifetimeSec),
 		predictiveCoasting: s.predictiveCoasting.catch(TRACKING_DEFAULTS.predictiveCoasting).parse(raw.predictiveCoasting),
 		classGating: s.classGating.catch(TRACKING_DEFAULTS.classGating).parse(raw.classGating),
 		occlusionEnabled: s.occlusionEnabled.catch(TRACKING_DEFAULTS.occlusionEnabled).parse(raw.occlusionEnabled),
 		occlusionContainment: s.occlusionContainment.catch(TRACKING_DEFAULTS.occlusionContainment).parse(raw.occlusionContainment),
-		occlusionMaxMissedFrames: s.occlusionMaxMissedFrames.catch(TRACKING_DEFAULTS.occlusionMaxMissedFrames).parse(raw.occlusionMaxMissedFrames),
+		rescueIouThreshold: s.rescueIouThreshold.catch(TRACKING_DEFAULTS.rescueIouThreshold).parse(raw.rescueIouThreshold),
+		rescueCentroidFactor: s.rescueCentroidFactor.catch(TRACKING_DEFAULTS.rescueCentroidFactor).parse(raw.rescueCentroidFactor),
+		resurrectionWindowMs: s.resurrectionWindowMs.catch(TRACKING_DEFAULTS.resurrectionWindowMs).parse(raw.resurrectionWindowMs),
+		stationarySpeedPx: s.stationarySpeedPx.catch(TRACKING_DEFAULTS.stationarySpeedPx).parse(raw.stationarySpeedPx),
 		dropoutSkipEnabled: s.dropoutSkipEnabled.catch(TRACKING_DEFAULTS.dropoutSkipEnabled).parse(raw.dropoutSkipEnabled),
 		dropoutMaxSkipFrames: s.dropoutMaxSkipFrames.catch(TRACKING_DEFAULTS.dropoutMaxSkipFrames).parse(raw.dropoutMaxSkipFrames)
 	};
@@ -4228,10 +4397,13 @@ var FaceStore = class {
 				value: rest
 			});
 		} catch (err) {
-			this.logger.warn("FaceStore.insert failed", { meta: {
-				faceId: id,
-				error: String(err)
-			} });
+			this.logger.warn("FaceStore.insert failed", {
+				tags: { deviceId: face.deviceId },
+				meta: {
+					faceId: id,
+					error: String(err)
+				}
+			});
 		}
 	}
 	/**
@@ -4298,10 +4470,13 @@ var FaceStore = class {
 			});
 			deleted.push(id);
 		} catch (err) {
-			this.logger.warn("FaceStore.prune delete failed", { meta: {
-				faceId: id,
-				error: String(err)
-			} });
+			this.logger.warn("FaceStore.prune delete failed", {
+				tags: { deviceId: input.deviceId },
+				meta: {
+					faceId: id,
+					error: String(err)
+				}
+			});
 		}
 		return deleted;
 	}
@@ -4587,10 +4762,13 @@ var ObjectEmbeddingStore = class {
 				value: record
 			});
 		} catch (err) {
-			this.logger.warn("ObjectEmbeddingStore.upsertIfBetter failed", { meta: {
-				trackId: input.trackId,
-				error: String(err)
-			} });
+			this.logger.warn("ObjectEmbeddingStore.upsertIfBetter failed", {
+				tags: { deviceId: input.deviceId },
+				meta: {
+					trackId: input.trackId,
+					error: String(err)
+				}
+			});
 		}
 	}
 	/**
@@ -4802,18 +4980,24 @@ var FaceRecognizer = class {
 					try {
 						await this.deps.trackStore.setLabel(c.trackId, name);
 					} catch (err) {
-						this.deps.logger.warn("setLabel failed", { meta: {
-							trackId: c.trackId,
-							error: String(err)
-						} });
+						this.deps.logger.warn("setLabel failed", {
+							tags: { deviceId: input.deviceId },
+							meta: {
+								trackId: c.trackId,
+								error: String(err)
+							}
+						});
 					}
 					try {
 						await this.deps.eventStore.setLabelForTrack(c.trackId, name);
 					} catch (err) {
-						this.deps.logger.warn("setLabelForTrack failed", { meta: {
-							trackId: c.trackId,
-							error: String(err)
-						} });
+						this.deps.logger.warn("setLabelForTrack failed", {
+							tags: { deviceId: input.deviceId },
+							meta: {
+								trackId: c.trackId,
+								error: String(err)
+							}
+						});
 					}
 				}
 			}
@@ -4825,10 +5009,13 @@ var FaceRecognizer = class {
 				if (input.frameHandle !== void 0) try {
 					crop = await this.deps.captureCrop(input.frameHandle, cropBbox, input.frameWidth, input.frameHeight, input.cropPadding) ?? void 0;
 				} catch (err) {
-					this.deps.logger.debug("FaceRecognizer crop capture failed", { meta: {
-						trackId: c.trackId,
-						error: String(err)
-					} });
+					this.deps.logger.debug("FaceRecognizer crop capture failed", {
+						tags: { deviceId: input.deviceId },
+						meta: {
+							trackId: c.trackId,
+							error: String(err)
+						}
+					});
 				}
 				this.bestFace.set(c.trackId, {
 					score: c.confidence,
@@ -4884,10 +5071,13 @@ var FaceRecognizer = class {
 				data: held.crop
 			});
 		} catch (err) {
-			this.deps.logger.warn("FaceRecognizer face crop put failed", { meta: {
-				faceId,
-				error: String(err)
-			} });
+			this.deps.logger.warn("FaceRecognizer face crop put failed", {
+				tags: { deviceId },
+				meta: {
+					faceId,
+					error: String(err)
+				}
+			});
 		}
 		try {
 			await this.deps.faceStore.insert({
@@ -4913,10 +5103,13 @@ var FaceRecognizer = class {
 				}
 			});
 		} catch (err) {
-			this.deps.logger.warn("FaceRecognizer faceStore insert failed", { meta: {
-				faceId,
-				error: String(err)
-			} });
+			this.deps.logger.warn("FaceRecognizer faceStore insert failed", {
+				tags: { deviceId },
+				meta: {
+					faceId,
+					error: String(err)
+				}
+			});
 		}
 	}
 };
@@ -4996,10 +5189,13 @@ var PlateStore = class {
 				value: rest
 			});
 		} catch (err) {
-			this.logger.warn("PlateStore.insert failed", { meta: {
-				plateId: id,
-				error: String(err)
-			} });
+			this.logger.warn("PlateStore.insert failed", {
+				tags: { deviceId: plate.deviceId },
+				meta: {
+					plateId: id,
+					error: String(err)
+				}
+			});
 		}
 	}
 	normalizeRow(r) {
@@ -5155,10 +5351,13 @@ var PlateRecognizer = class {
 			if (input.frameHandle !== void 0) try {
 				crop = await this.deps.captureCrop(input.frameHandle, c.plateBbox, input.frameWidth, input.frameHeight, input.cropPadding) ?? void 0;
 			} catch (err) {
-				this.deps.logger.debug("PlateRecognizer crop capture failed", { meta: {
-					trackId: c.trackId,
-					error: String(err)
-				} });
+				this.deps.logger.debug("PlateRecognizer crop capture failed", {
+					tags: { deviceId: input.deviceId },
+					meta: {
+						trackId: c.trackId,
+						error: String(err)
+					}
+				});
 			}
 			this.bestPlate.set(c.trackId, {
 				text: c.plateText,
@@ -5187,10 +5386,13 @@ var PlateRecognizer = class {
 				data: held.crop
 			});
 		} catch (err) {
-			this.deps.logger.warn("PlateRecognizer plate crop put failed", { meta: {
-				plateId,
-				error: String(err)
-			} });
+			this.deps.logger.warn("PlateRecognizer plate crop put failed", {
+				tags: { deviceId },
+				meta: {
+					plateId,
+					error: String(err)
+				}
+			});
 		}
 		try {
 			await this.deps.plateStore.insert({
@@ -5216,10 +5418,13 @@ var PlateRecognizer = class {
 				}
 			});
 		} catch (err) {
-			this.deps.logger.warn("PlateRecognizer plateStore insert failed", { meta: {
-				plateId,
-				error: String(err)
-			} });
+			this.deps.logger.warn("PlateRecognizer plateStore insert failed", {
+				tags: { deviceId },
+				meta: {
+					plateId,
+					error: String(err)
+				}
+			});
 		}
 	}
 };
@@ -5666,7 +5871,7 @@ var PipelineAnalyticsAddon = class extends require_dist.BaseAddon {
 		let storage = this.ctx.kernel.storage;
 		const mediaRoot = process.env.CAMSTACK_MEDIA_ROOT?.trim();
 		if (mediaRoot) {
-			const { FilesystemStorageProvider } = await Promise.resolve().then(() => require("../node-CdzrYoKs.js"));
+			const { FilesystemStorageProvider } = await Promise.resolve().then(() => require("../node-Cx0LM0Sq.js"));
 			storage = new FilesystemStorageProvider(mediaRoot);
 			logger.info("pipeline-analytics: event media rooted at CAMSTACK_MEDIA_ROOT", { meta: { mediaRoot } });
 		}
@@ -6530,7 +6735,10 @@ var PipelineAnalyticsAddon = class extends require_dist.BaseAddon {
 		} : void 0, { classificationMinScore: settings.classificationMinScore });
 		if (route.kind === "classification") {
 			if (!topClassification) {
-				this.ctx.logger.warn("classifyAudioFrame returned classification but topClassification is null", { meta: { deviceId } });
+				this.ctx.logger.warn("classifyAudioFrame returned classification but topClassification is null", {
+					tags: { deviceId },
+					meta: { deviceId }
+				});
 				return;
 			}
 			const last = this.lastAudioInsertByDevice.get(deviceId);
@@ -6891,16 +7099,21 @@ var PipelineAnalyticsAddon = class extends require_dist.BaseAddon {
 			p = new FrameProcessor(deviceId, {
 				minHits,
 				iouThreshold: trk.iouThreshold,
-				maxMissedFrames: trk.maxMissedFrames,
+				maxMissedMs: trk.maxMissedMs,
 				predictiveCoasting: trk.predictiveCoasting,
 				classGating: trk.classGating,
 				occlusionEnabled: trk.occlusionEnabled,
 				occlusionContainment: trk.occlusionContainment,
-				occlusionMaxMissedFrames: trk.occlusionMaxMissedFrames,
+				occlusionMaxMissedMs: trk.occlusionMaxMissedMs,
+				rescueIouThreshold: trk.rescueIouThreshold,
+				rescueCentroidFactor: trk.rescueCentroidFactor,
+				resurrectionWindowMs: trk.resurrectionWindowMs,
+				stationarySpeedPx: trk.stationarySpeedPx,
 				maxTrackLifetimeMs: trk.maxTrackLifetimeSec * 1e3
 			}, { stationaryThresholdSec }, {
 				minTrackAge,
-				cooldownSec
+				cooldownSec,
+				minTrackAgeMs: trk.minTrackAgeMs
 			}, source);
 			this.processors.set(key, p);
 		}
@@ -7080,13 +7293,16 @@ var PipelineAnalyticsAddon = class extends require_dist.BaseAddon {
 		const { counts, ids } = await this.eventStore.pruneBefore(input);
 		if (ids.length > 0 && this.mediaStore) await this.mediaStore.deleteForEvents([...ids]);
 		const { motion, object, audio } = counts;
-		if (motion + object + audio > 0) this.ctx.logger.info("analytics event eviction (floor)", { meta: {
-			deviceId: input.deviceId,
-			cutoffMs: input.cutoffMs,
-			motion,
-			object,
-			audio
-		} });
+		if (motion + object + audio > 0) this.ctx.logger.info("analytics event eviction (floor)", {
+			tags: { deviceId: input.deviceId },
+			meta: {
+				deviceId: input.deviceId,
+				cutoffMs: input.cutoffMs,
+				motion,
+				object,
+				audio
+			}
+		});
 		return counts;
 	}
 	/**
@@ -7458,12 +7674,53 @@ var PipelineAnalyticsAddon = class extends require_dist.BaseAddon {
 					},
 					{
 						type: "number",
-						key: "maxMissedFrames",
-						label: "Max missed frames",
-						description: "Frames a track may miss detections (coast) before it is dropped.",
+						key: "maxMissedMs",
+						label: "Max coasting time",
+						description: "How long (ms) a track may miss detections before it is dropped. Time-based so it behaves the same on a 5fps and a 23fps camera.",
 						min: 0,
-						step: 1,
-						default: TRACKING_DEFAULTS.maxMissedFrames
+						step: 100,
+						default: TRACKING_DEFAULTS.maxMissedMs,
+						unit: "ms"
+					},
+					{
+						type: "number",
+						key: "minTrackAgeMs",
+						label: "Min track age",
+						description: "A track must exist for at least this long (ms) before it can produce events — stops sub-second flicker fragments from becoming events.",
+						min: 0,
+						step: 100,
+						default: TRACKING_DEFAULTS.minTrackAgeMs,
+						unit: "ms"
+					},
+					{
+						type: "number",
+						key: "resurrectionWindowMs",
+						label: "Resurrection window",
+						description: "How long (ms) a dropped track can be re-attached to a re-appearing same-class detection (keeping its id) — the main fix for a stationary object fragmenting into many tracks.",
+						min: 0,
+						step: 500,
+						default: TRACKING_DEFAULTS.resurrectionWindowMs,
+						unit: "ms"
+					},
+					{
+						type: "number",
+						key: "rescueIouThreshold",
+						label: "Rescue IoU threshold",
+						description: "Looser overlap (vs. a track’s last-known box) for the second association + resurrection passes. Lower = more aggressive re-attachment.",
+						min: 0,
+						max: 1,
+						step: .05,
+						default: TRACKING_DEFAULTS.rescueIouThreshold
+					},
+					{
+						type: "number",
+						key: "stationarySpeedPx",
+						label: "Stationary speed",
+						description: "Speed (px/frame) below which a track is treated as stationary and its prediction is frozen, so bbox jitter cannot walk the box off a sitting object.",
+						min: 0,
+						step: .5,
+						default: TRACKING_DEFAULTS.stationarySpeedPx,
+						unit: "px"
 					},
 					{
 						type: "number",
@@ -7508,12 +7765,13 @@ var PipelineAnalyticsAddon = class extends require_dist.BaseAddon {
 					},
 					{
 						type: "number",
-						key: "occlusionMaxMissedFrames",
-						label: "Occlusion max missed frames",
-						description: "Extended coasting budget (frames) while a track is occluded.",
+						key: "occlusionMaxMissedMs",
+						label: "Occlusion max coasting time",
+						description: "Extended coasting time (ms) while a track is hidden behind another.",
 						min: 0,
-						step: 1,
-						default: TRACKING_DEFAULTS.occlusionMaxMissedFrames
+						step: 100,
+						default: TRACKING_DEFAULTS.occlusionMaxMissedMs,
+						unit: "ms"
 					},
 					{
 						type: "boolean",