@camstack/addon-post-analysis 1.2.315 → 1.2.316

package/dist/pipeline-analytics/index.js

@@ -2,7 +2,7 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_clip_model_registry = require("../clip-model-registry-8Ss3XHG0.js");
+const require_clip_model_registry = require("../clip-model-registry-D-zzCBKK.js");
 let node_fs = require("node:fs");
 node_fs = require_clip_model_registry.__toESM(node_fs, 1);
 let node_path = require("node:path");
@@ -16996,7 +16996,7 @@ var NcStateSummaryTestSchema = require_clip_model_registry.object({
 	/** Nothing open and every section read: nothing was enqueued. */
 	nothingToReport: require_clip_model_registry.boolean(),
 	sections: require_clip_model_registry.array(require_clip_model_registry.object({
-		id: require_clip_model_registry.string(),
+		id: require_clip_model_registry.NcStateSummarySectionIdSchema,
 		status: require_clip_model_registry._enum(["read", "unavailable"]),
 		items: require_clip_model_registry.number().int().nonnegative(),
 		reason: require_clip_model_registry.string().optional()
@@ -17004,7 +17004,7 @@ var NcStateSummaryTestSchema = require_clip_model_registry.object({
 	rows: require_clip_model_registry.array(require_clip_model_registry.object({
 		recordId: require_clip_model_registry.string(),
 		/** The section of a per-section row. */
-		section: require_clip_model_registry.string().optional(),
+		section: require_clip_model_registry.NcStateSummarySectionIdSchema.optional(),
 		enqueued: require_clip_model_registry.number().int().nonnegative(),
 		targetIds: require_clip_model_registry.array(require_clip_model_registry.string())
 	}))
@@ -20730,17 +20730,8 @@ var NcDeviceStateCache = class {
 * a job that COMPLETED, and the state it leaves behind is not a condition that
 * is still true. The ADR records why it is excluded rather than approximated.
 */
-var NC_STATE_SUMMARY_SECTION_IDS = [
-	"device-state",
-	"streams",
-	"battery",
-	"consumables",
-	"tanks",
-	"detection-blind",
-	"nodes",
-	"addons",
-	"updates"
-];
+/** One source: the cap's Zod enum (D698 LOW-6). */
+var NC_STATE_SUMMARY_SECTION_IDS = require_clip_model_registry.NcStateSummarySectionIdSchema.options;
 /** The kind groups that have no section, and why — said on the preview. */
 var NC_STATE_SUMMARY_EXCLUDED_GROUPS = { "backups-exports": "a backup or an export is a completed job, not a state that is still true" };
 function isStateSectionId(value) {
@@ -35209,10 +35200,10 @@ var NcStateSummaryService = class {
 		const rows = [];
 		for (const subject of subjects) {
 			const enqueued = await this.deps.enqueue(rule, subject, "synthetic");
-			const section = subject.systemEvent?.data["section"];
+			const section = stateSummarySectionOf(subject);
 			rows.push({
 				recordId: subject.recordId,
-				...typeof section === "string" ? { section } : {},
+				...section !== void 0 ? { section } : {},
 				enqueued: enqueued.inserted,
 				targetIds: [...enqueued.targetIds]
 			});
@@ -66122,6 +66113,51 @@ var EventStore = class {
 		return found;
 	}
 	/**
+	* The GENERATION of each live event in `table` among `eventIds` — its camera
+	* and its own timestamp (D694). Same throw-on-failure contract as
+	* {@link existingEventIdsIn}: a quiet under-report here would let the orphan
+	* audit keep treating another camera's leftovers as owned.
+	*/
+	async eventGenerationsIn(table, eventIds) {
+		const collection = EVENT_COLLECTION_BY_TABLE[table];
+		const found = /* @__PURE__ */ new Map();
+		for (let i = 0; i < eventIds.length; i += PRUNE_PAGE_SIZE) {
+			const chunk = eventIds.slice(i, i + PRUNE_PAGE_SIZE);
+			if (chunk.length === 0) continue;
+			const rows = await this.store.query.query({
+				collection,
+				columns: [
+					"id",
+					"deviceId",
+					"timestamp"
+				],
+				filter: {
+					whereIn: { id: [...chunk] },
+					limit: chunk.length
+				}
+			});
+			for (const row of rows) {
+				const deviceId = row.data["deviceId"];
+				const timestamp = row.data["timestamp"];
+				if (typeof deviceId !== "number" || !Number.isFinite(deviceId)) continue;
+				if (typeof timestamp !== "number" || !Number.isFinite(timestamp)) continue;
+				found.set(row.id, {
+					deviceId,
+					timestamp
+				});
+			}
+		}
+		return found;
+	}
+	/**
+	* One event's generation, or `null` when the id is not live in `table`.
+	* Used by the `/o/<eventOwner>/<id>` plane ladder to scope media to the
+	* current holder (D694).
+	*/
+	async eventGenerationOf(table, eventId) {
+		return (await this.eventGenerationsIn(table, [eventId])).get(eventId) ?? null;
+	}
+	/**
 	* The SUBSET of `eventIds` that are MOTION events specifically.
 	*
 	* {@link existingEventIds} answers "is this event alive", which is the
@@ -93492,6 +93528,7 @@ async function auditScope(scope, deps, limits, cursor) {
 		const { trackIds, eventIdsByTable } = questionsFor(refs);
 		let liveTracks;
 		const liveEvents = /* @__PURE__ */ new Map();
+		const eventGens = /* @__PURE__ */ new Map();
 		let keptMedia = /* @__PURE__ */ new Set();
 		try {
 			liveTracks = trackIds.length > 0 ? await deps.liveTrackIds(trackIds) : /* @__PURE__ */ new Set();
@@ -93499,6 +93536,7 @@ async function auditScope(scope, deps, limits, cursor) {
 			for (const [table, ids] of eventIdsByTable) {
 				if (ids.length === 0) continue;
 				liveEvents.set(table, await deps.liveEventIds(table, ids));
+				if (deps.eventGenerations !== void 0 && scope.collection === MEDIA_COLLECTION) eventGens.set(table, await deps.eventGenerations(table, ids));
 			}
 		} catch (err) {
 			deps.logger.warn("orphan audit: liveness probe failed — scope abandoned for this run", { meta: {
@@ -93527,7 +93565,13 @@ async function auditScope(scope, deps, limits, cursor) {
 				tally.unresolvable += 1;
 				continue;
 			}
-			if (ref.kind === "track" ? liveTracks.has(ref.trackId) || keptMedia.has(row.key) : ref.kind === "event" ? liveEvents.get(ref.table)?.has(ref.eventId) ?? false : false) continue;
+			let live = ref.kind === "track" ? liveTracks.has(ref.trackId) || keptMedia.has(row.key) : ref.kind === "event" ? liveEvents.get(ref.table)?.has(ref.eventId) ?? false : false;
+			if (live && ref.kind === "event" && scope.collection === MEDIA_COLLECTION) {
+				const gen = eventGens.get(ref.table)?.get(ref.eventId);
+				const mediaDeviceId = num(row.data, scope.deviceIdField);
+				if (gen !== void 0 && mediaDeviceId !== null && mediaDeviceId !== gen.deviceId) live = false;
+			}
+			if (live) continue;
 			const ts = num(row.data, scope.timestampField);
 			if (ts !== null && ts > graceFloor) {
 				tally.withinGrace += 1;
@@ -93542,7 +93586,7 @@ async function auditScope(scope, deps, limits, cursor) {
 				break;
 			}
 			try {
-				const outcome = await deps.reclaim(scope.collection, row.key);
+				const outcome = await deps.reclaim(scope.collection, row.key, row);
 				if (outcome.rows === 0) continue;
 				tally.reclaimed += 1;
 				reclaimedInPage += 1;
@@ -93698,7 +93742,10 @@ var ORPHAN_AUDIT_DEFAULTS = {
 	intervalHours: OrphanAuditIntervalHoursSchema.parse(void 0),
 	pageSize: OrphanAuditPageSizeSchema.parse(void 0)
 };
-var RAW_DELETE_COLLECTIONS = new Set(["pipeline-analytics:object-events", "pipeline-analytics:plates"]);
+//#endregion
+//#region src/pipeline-analytics/retention/orphan-reclaimers.ts
+var OBJECT_EVENTS_COLLECTION = "pipeline-analytics:object-events";
+var RAW_DELETE_COLLECTIONS = new Set([OBJECT_EVENTS_COLLECTION, "pipeline-analytics:plates"]);
 /**
 * The `deleteRow` port: ONE row by its primary key `id` (what every
 * raw-delete collection above declares), answering whether a row went.
@@ -93707,12 +93754,19 @@ var RAW_DELETE_COLLECTIONS = new Set(["pipeline-analytics:object-events", "pipel
 * is `z.void()`, and reading it as `!== undefined` answered `false` for every
 * row it really deleted — the audit counted every plates/object-events reclaim
 * as "found nothing", and the per-scope reclaim ceiling never tripped.
+*
+* When `assert.trackId` is set, the delete also requires that column: an
+* object-events rowid alone is not an identity across the row's life (D694).
 */
 function settingsRowDeleter(store) {
-	return async (collection, key) => {
+	return async (collection, key, assert) => {
+		const where = assert !== void 0 ? {
+			id: key,
+			trackId: assert.trackId
+		} : { id: key };
 		const { deleted } = await store.deleteWhere.mutate({
 			collection,
-			filter: { where: { id: key } }
+			filter: { where }
 		});
 		return deleted > 0;
 	};
@@ -93727,14 +93781,19 @@ function settingsRowDeleter(store) {
 * `scripts/check-orphan-reclaimers.ts` checks `index.ts` uses it.
 */
 function settingsRowDeleterOf(getStore) {
-	return async (collection, key) => {
+	return async (collection, key, assert) => {
 		const store = getStore();
 		if (store === null) throw new Error("orphan audit: settings store not bound");
-		return await settingsRowDeleter(store)(collection, key);
+		return await settingsRowDeleter(store)(collection, key, assert);
 	};
 }
+/** Pull the trackId the raw delete must re-assert, or `null` when absent. */
+function trackIdAssertOf(data) {
+	const trackId = data["trackId"];
+	return typeof trackId === "string" && trackId.length > 0 ? { trackId } : null;
+}
 function buildOrphanReclaimer(ports) {
-	return async (collection, key) => {
+	return async (collection, key, data = {}) => {
 		if (collection === MEDIA_COLLECTION) {
 			const mediaId = Number(key);
 			if (!Number.isInteger(mediaId) || mediaId <= 0) {
@@ -93760,10 +93819,23 @@ function buildOrphanReclaimer(ports) {
 			rows: await ports.deleteTrackAlias(key) ? 1 : 0,
 			bytes: null
 		};
-		if (RAW_DELETE_COLLECTIONS.has(collection)) return {
-			rows: await ports.deleteRow(collection, key) ? 1 : 0,
-			bytes: null
-		};
+		if (RAW_DELETE_COLLECTIONS.has(collection)) {
+			const assert = trackIdAssertOf(data);
+			if (collection === OBJECT_EVENTS_COLLECTION && assert === null) {
+				ports.logger.warn("orphan audit: object-events reclaim without trackId — row kept (id-only delete refused)", { meta: {
+					collection,
+					key
+				} });
+				return {
+					rows: 0,
+					bytes: null
+				};
+			}
+			return {
+				rows: await ports.deleteRow(collection, key, assert === null ? void 0 : assert) ? 1 : 0,
+				bytes: null
+			};
+		}
 		throw new Error(`orphan audit: '${collection}' is not declared in RECLAIMED_COLLECTIONS — a collection walked by the audit must say how its rows are deleted, because the raw path leaves behind anything its store owns outside the row`);
 	};
 }
@@ -101163,8 +101235,14 @@ async function buildTrainingExportPlan(readers, input) {
 		const eventsByTrack = /* @__PURE__ */ new Map();
 		for (const link of eventLinks) {
 			const list = eventsByTrack.get(link.trackId);
-			if (list) list.push(link.eventId);
-			else eventsByTrack.set(link.trackId, [link.eventId]);
+			if (list) list.push({
+				eventId: link.eventId,
+				recordAt: link.recordAt
+			});
+			else eventsByTrack.set(link.trackId, [{
+				eventId: link.eventId,
+				recordAt: link.recordAt
+			}]);
 		}
 		for (const track of take) {
 			const files = [];
@@ -101184,15 +101262,17 @@ async function buildTrainingExportPlan(readers, input) {
 					ownerId: `${PLATE_OWNER_PREFIX}${track.trackId}`,
 					scope: "plate"
 				},
-				...(eventsByTrack.get(track.trackId) ?? []).map((eventId) => ({
+				...(eventsByTrack.get(track.trackId) ?? []).map((ev) => ({
 					ownerKind: "object",
-					ownerId: eventId,
-					scope: `events/${eventId}`
+					ownerId: ev.eventId,
+					scope: `events/${ev.eventId}`,
+					recordAt: ev.recordAt
 				}))
 			];
 			for (const owner of owners) {
-				const infos = await readers.listMediaInfo(owner.ownerKind, owner.ownerId);
-				for (const info of infos) {
+				const infos = await readers.listMediaInfo(owner.ownerKind, owner.ownerId, owner.ownerKind === "object" ? track.deviceId : void 0);
+				const kept = owner.recordAt === void 0 ? infos : infos.filter((info) => info.timestamp === owner.recordAt);
+				for (const info of kept) {
 					const archivePath = archivePathFor({
 						deviceId: track.deviceId,
 						trackId: track.trackId,
@@ -105703,15 +105783,16 @@ var PipelineAnalyticsAddon = class PipelineAnalyticsAddon extends require_clip_m
 		if (!trackStore || !mediaStore) throw new Error("training export: analytics stores unavailable");
 		return buildTrainingExportPlan({
 			listMarkedTracks: (deviceId, limit) => trackStore.listStaging(deviceId, limit),
-			listMediaInfo: async (ownerKind, ownerId) => {
+			listMediaInfo: async (ownerKind, ownerId, deviceId) => {
 				if (!isMediaOwnerKind(ownerKind)) return [];
-				return mediaStore.listInfoByOwner(ownerKind, ownerId);
+				return mediaStore.listInfoByOwner(ownerKind, ownerId, deviceId);
 			},
 			listEventIdsForTracks: async (trackIds) => {
 				if (!eventStore || trackIds.length === 0) return [];
 				return (await eventStore.queryObjectByTrackIds(trackIds)).flatMap((e) => e.trackId === void 0 ? [] : [{
 					eventId: String(e.id),
-					trackId: e.trackId
+					trackId: e.trackId,
+					recordAt: e.timestamp
 				}]);
 			},
 			now: () => Date.now()
@@ -111912,26 +111993,30 @@ var PipelineAnalyticsAddon = class PipelineAnalyticsAddon extends require_clip_m
 				},
 				liveTrackIds: (ids) => this.liveTrackIdsThroughAliases(ids, trackStore),
 				liveEventIds: (table, ids) => eventStore.existingEventIdsIn(table, ids),
+				eventGenerations: (table, ids) => eventStore.eventGenerationsIn(table, ids),
 				keptMediaKeys: async (keys) => this.keptStationaryMediaKeys(keys),
-				reclaim: buildOrphanReclaimer({
-					deleteFace: async (faceId) => {
-						await this.faceStore?.delete(faceId);
-					},
-					deleteMediaConfirmed: async (mediaId) => {
-						const count = await mediaStore.deleteConfirmed(mediaId);
-						return {
-							rows: count.rows,
-							bytes: count.bytes
-						};
-					},
-					deleteTrackAlias: async (aliasId) => {
-						const aliasStore = this.trackAliasStore;
-						if (aliasStore === null) throw new Error("track alias store not bound");
-						return await aliasStore.deleteAlias(aliasId);
-					},
-					deleteRow: settingsRowDeleterOf(() => this.settingsStore),
-					logger: this.ctx.logger
-				}),
+				reclaim: (() => {
+					const reclaimOne = buildOrphanReclaimer({
+						deleteFace: async (faceId) => {
+							await this.faceStore?.delete(faceId);
+						},
+						deleteMediaConfirmed: async (mediaId) => {
+							const count = await mediaStore.deleteConfirmed(mediaId);
+							return {
+								rows: count.rows,
+								bytes: count.bytes
+							};
+						},
+						deleteTrackAlias: async (aliasId) => {
+							const aliasStore = this.trackAliasStore;
+							if (aliasStore === null) throw new Error("track alias store not bound");
+							return await aliasStore.deleteAlias(aliasId);
+						},
+						deleteRow: settingsRowDeleterOf(() => this.settingsStore),
+						logger: this.ctx.logger
+					});
+					return (collection, key, row) => reclaimOne(collection, key, row.data);
+				})(),
 				now: () => Date.now(),
 				logger: this.ctx.logger,
 				breathe: () => new Promise((resolve) => setImmediate(resolve))
@@ -114696,7 +114781,7 @@ var PipelineAnalyticsAddon = class PipelineAnalyticsAddon extends require_clip_m
 	*/
 	async readOwnerThumbnail(ownerType, rawOwnerId, preferKind) {
 		const ownerId = ownerType === "track" ? await resolveMediaOwnerId(ownerType, rawOwnerId, (id) => this.trackAliasStore?.resolve(id) ?? Promise.resolve(null), (failure) => this.aliasResolveFailureLogger?.(failure), "readOwnerThumbnail") : rawOwnerId;
-		const listInfo = (ownerKind, id) => this.mediaStore?.listInfoByOwner(ownerKind, id) ?? Promise.resolve([]);
+		const listInfo = (ownerKind, id, deviceId) => this.mediaStore?.listInfoByOwner(ownerKind, id, deviceId) ?? Promise.resolve([]);
 		const getTrackIdForEvent = (eventId) => require_clip_model_registry.isEventOwnerType(ownerType) ? this.eventStore?.getTrackIdForEvent(eventId, ownerType) ?? Promise.resolve(null) : Promise.resolve(null);
 		const readBlob = async (mediaId) => {
 			const file = await (this.mediaStore?.getById(mediaId) ?? Promise.resolve(null));
@@ -114707,7 +114792,26 @@ var PipelineAnalyticsAddon = class PipelineAnalyticsAddon extends require_clip_m
 				deviceId: file.deviceId
 			};
 		};
-		const ownFiles = await listInfo(ownerType, ownerId);
+		let ownFiles = await listInfo(ownerType, ownerId);
+		if (require_clip_model_registry.isEventOwnerType(ownerType) && this.eventStore !== null) {
+			const gen = await this.eventStore.eventGenerationOf(ownerType, ownerId);
+			if (gen !== null) {
+				const onCamera = await listInfo(ownerType, ownerId, gen.deviceId);
+				const kept = onCamera.filter((f) => f.timestamp === gen.timestamp);
+				if (kept.length < onCamera.length) this.ctx.logger.warn("event media of another record on a reused event id — not used", {
+					tags: { deviceId: gen.deviceId },
+					meta: {
+						ownerId,
+						ownerType,
+						recordAt: gen.timestamp,
+						refused: onCamera.length - kept.length,
+						kept: kept.length,
+						via: "readOwnerThumbnail"
+					}
+				});
+				ownFiles = kept;
+			}
+		}
 		if (preferKind !== void 0 && preferKind.length > 0) {
 			const layers = await collectCropForcedMedia({
 				listByOwner: listInfo,