@camera.ui/server 2.2.5-beta.4 → 2.2.5

package/dist/server/src/camera/decoder/perf-tracker.js

@@ -29,6 +29,8 @@ export class PerfTracker {
     plateCount = 0;
     clipMs = 0;
     clipCount = 0;
+    faceEmbedMs = 0;
+    faceEmbedCount = 0;
     classifierMs = 0;
     classifierCount = 0;
     secondaryMs = 0;
@@ -36,6 +38,14 @@ export class PerfTracker {
     faces = 0;
     plates = 0;
     framesWithObjects = 0;
+    objectWorkMs = 0;
+    objectLoopMs = 0;
+    vectorJobs = 0;
+    vectorsAccepted = 0;
+    vectorsParked = 0;
+    vectorsDropped = 0;
+    closeDelays = 0;
+    closeDelayMs = 0;
     zoomTicks = 0;
     zoomWindows = 0;
     // stamped by the plugin itself, per sensor type: the wall-clock counters above
@@ -132,6 +142,8 @@ export class PerfTracker {
             plateCount: this.plateCount,
             clipMs: this.clipMs,
             clipCount: this.clipCount,
+            faceEmbedMs: this.faceEmbedMs,
+            faceEmbedCount: this.faceEmbedCount,
             classifierMs: this.classifierMs,
             classifierCount: this.classifierCount,
             zoomTicks: this.zoomTicks,
@@ -141,6 +153,14 @@ export class PerfTracker {
             faces: this.faces,
             plates: this.plates,
             framesWithObjects: this.framesWithObjects,
+            objectWorkMs: this.objectWorkMs,
+            objectLoopMs: this.objectLoopMs,
+            vectorJobs: this.vectorJobs,
+            vectorsAccepted: this.vectorsAccepted,
+            vectorsParked: this.vectorsParked,
+            vectorsDropped: this.vectorsDropped,
+            closeDelays: this.closeDelays,
+            closeDelayMs: this.closeDelayMs,
         };
     }
     diff(base) {

package/dist/server/src/camera/decoder/perf-tracker.js.map

@@ -1 +1 @@
-{"version":3,"file":"perf-tracker.js","sourceRoot":"","sources":["../../../../../src/camera/decoder/perf-tracker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"perf-tracker.js","sourceRoot":"","sources":["../../../../../src/camera/decoder/perf-tracker.ts"],"names":[],"mappings":"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"}

package/dist/server/src/camera/decoder/secondary-stage.d.ts

@@ -16,6 +16,10 @@ export declare class SecondaryStage {
     private readonly proxy;
     private readonly perf;
     private readonly logger;
+    private readonly embeddedTracks;
+    private readonly clipTracks;
+    private readonly clipQueue;
+    private readonly faceQueue;
     private nvrProxy?;
     private nvrProxyPromise?;
     constructor(coordinator: DetectionCoordinator, plugins: PluginRegistry, pipeline: DetectionPipeline, frameScaler: FrameScaler, proxy: RPCClient, perf: PerfTracker, logger: Logger);
@@ -25,15 +29,31 @@ export declare class SecondaryStage {
     private attributeCrops;
     private attributeThumbnail;
     private runAllSecondaries;
+    private recognizeFaces;
+    private queueFaces;
+    private runFaces;
+    private wantsEmbedding;
+    private markAttempt;
+    private markGoodVector;
+    private cropPointToFrame;
+    private carryTrackIdentities;
+    private embedKey;
     private collectConsumers;
     private prepareSecondaryRegions;
     private prepareFullFrameRegions;
+    private fullFrameRegion;
     private runSecondaryDetection;
     private trackTiming;
     private runFaceDetection;
     private runLicensePlateDetection;
     private runClassifierDetections;
-    private runClipDetection;
+    private queueClip;
+    private pushClipJob;
+    private queueFullFrameClip;
+    private clipTarget;
+    private clipDue;
+    private runClip;
+    private faceParent;
     private prepareSecondaryFrames;
     private resolveFaceIdentities;
     private transformBoxToOriginal;

package/dist/server/src/camera/decoder/secondary-stage.js

@@ -7,12 +7,44 @@ import { EVENT_THUMB_MAX_WIDTH } from './event-thumbnailer.js';
 import { directionBetween, MOMENT_QUALITY, momentFormat, momentWindow } from './moment-crop.js';
 import { MIN_PLATE_LENGTH, normalizePlateText } from './plate-vote.js';
 import { hasSecondaryModelSpec, isVideoInputSpec } from './plugin-registry.js';
+import { SideQueue } from './side-queue.js';
 import { DETECT_TIMEOUT_MS, ensureDetectionBoxes, FULL_FRAME_BOX } from './types.js';
 const SECONDARY_CONSUMERS = [
     { type: SensorType.Face, key: 'face', fit: 'expand' },
     { type: SensorType.LicensePlate, key: 'lpd', fit: 'stretch' },
-    { type: SensorType.Clip, key: 'clip', fit: 'expand' },
 ];
+const MIN_FACE_PX = 40;
+const FACE_CROP_PADDING = 0.25;
+const EMBED_EVERY_MS = 1_000;
+const GOOD_VECTORS_PER_TRACK = 3;
+const EMBEDDED_TRACKS_MAX = 256;
+const EMBEDDED_TRACK_IDLE_MS = 60_000;
+const UNTRACKED_IDLE_MS = 5_000;
+const UNTRACKED_GRID = 8;
+const CLIP_EVERY_MS = 10_000;
+const CLIP_AREA_FACTOR = 1.5;
+const CLIP_TIMEOUT_MS = 5_000;
+const FACE_TIMEOUT_MS = 5_000;
+const CLIP_FULL_FRAME_KEY = 'full';
+function keepOneFacePerTrack(faces) {
+    const heads = new Map();
+    for (const face of faces) {
+        if (face.parentTrackId === undefined)
+            continue;
+        const head = heads.get(face.parentTrackId);
+        if (!head || centreY(face.box) < centreY(head.box))
+            heads.set(face.parentTrackId, face);
+    }
+    for (const face of faces) {
+        if (face.parentTrackId === undefined || heads.get(face.parentTrackId) === face)
+            continue;
+        face.parentTrackId = undefined;
+        face.parentBox = undefined;
+    }
+}
+function centreY(box) {
+    return box.y + box.height / 2;
+}
 export class SecondaryStage {
     coordinator;
     plugins;
@@ -21,6 +53,22 @@ export class SecondaryStage {
     proxy;
     perf;
     logger;
+    embeddedTracks = new Map();
+    clipTracks = new Map();
+    clipQueue = new SideQueue((jobs) => this.runClip(jobs), CLIP_TIMEOUT_MS, (error) => {
+        if (this.coordinator.running && !isNoRespondersError(error))
+            this.logger.error('CLIP detection error:', error);
+    }, (jobs) => {
+        for (const _job of jobs)
+            this.coordinator.vectorJobSettled();
+    });
+    faceQueue = new SideQueue((jobs) => this.runFaces(jobs), FACE_TIMEOUT_MS, (error) => {
+        if (this.coordinator.running && !isNoRespondersError(error))
+            this.logger.error('Face recognition error:', error);
+    }, (jobs) => {
+        for (const _job of jobs)
+            this.coordinator.vectorJobSettled();
+    });
     nvrProxy;
     nvrProxyPromise;
     constructor(coordinator, plugins, pipeline, frameScaler, proxy, perf, logger) {
@@ -33,13 +81,17 @@ export class SecondaryStage {
         this.logger = logger;
     }
     async detect(sourceFrame, scaler, objectDetections, results) {
+        await this.queueClip(sourceFrame, scaler, objectDetections);
         const regionMap = await this.prepareSecondaryRegions(sourceFrame, scaler, objectDetections);
         await this.runAllSecondaries(regionMap, results);
+        await this.recognizeFaces(sourceFrame, scaler, results);
     }
     async detectFullFrame(rawFrame, results) {
+        await this.queueFullFrameClip(rawFrame);
         const regionMap = await this.prepareFullFrameRegions(rawFrame);
         if (regionMap.size > 0) {
             await this.runAllSecondaries(regionMap, results);
+            await this.recognizeFaces(rawFrame, this.frameScaler, results);
         }
         try {
             return await this.frameScaler.frameToJPEG(rawFrame, EVENT_THUMB_MAX_WIDTH);
@@ -56,7 +108,6 @@ export class SecondaryStage {
             const faceMinConfidence = settings.face?.confidence ?? 0;
             const faces = results.face.detections.filter((d) => d.confidence >= faceMinConfidence);
             for (const [detection, jpeg] of await this.attributeCrops(sourceFrame, scaler, faces)) {
-                // enrichSegment persists unknown faces to the face store from this
                 detection.thumbnail ??= jpeg;
                 thumbnails.push(this.attributeThumbnail(`face:${detection.identity ?? 'unknown'}`, detection, jpeg));
             }
@@ -95,7 +146,7 @@ export class SecondaryStage {
             try {
                 const jpeg = await scaler.cropWindowToJPEG(sourceFrame, window, format.width, format.height, MOMENT_QUALITY);
                 if (jpeg)
-                    crops.push([detection, jpeg]);
+                    crops.push([detection, jpeg, window]);
             }
             catch (error) {
                 this.logger.debug('Attribute crop failed:', error);
@@ -122,13 +173,144 @@ export class SecondaryStage {
             this.runSecondaryDetection(SensorType.Face, results, () => this.runFaceDetection(regionMap.get('face') ?? [])),
             this.runSecondaryDetection(SensorType.LicensePlate, results, () => this.runLicensePlateDetection(regionMap.get('lpd') ?? [])),
             this.runSecondaryDetection(SensorType.Classifier, results, () => this.runClassifierDetections(regionMap)),
-            this.runSecondaryDetection(SensorType.Clip, results, () => this.runClipDetection(regionMap.get('clip') ?? [])),
         ]);
         if (results.face?.detections.length) {
-            const facePlugin = this.plugins.get(SensorType.Face);
-            results.faceEmbeddingModel = facePlugin?.modelSpec?.embeddingModel;
+            const embedPlugin = this.plugins.get(SensorType.FaceEmbedder);
+            results.faceEmbeddingModel = embedPlugin?.modelSpec?.embeddingModel;
         }
     }
+    async recognizeFaces(sourceFrame, scaler, results) {
+        if (!results.face?.detections.length)
+            return;
+        await this.queueFaces(sourceFrame, scaler, results.face.detections);
+        this.carryTrackIdentities(results.face.detections);
+    }
+    async queueFaces(sourceFrame, scaler, faces) {
+        const plugin = this.plugins.get(SensorType.FaceEmbedder);
+        const spec = plugin?.modelSpec;
+        const input = spec && isVideoInputSpec(spec.input) ? spec.input : undefined;
+        if (!input)
+            return;
+        for (const face of faces) {
+            if (!this.wantsEmbedding(face, sourceFrame))
+                continue;
+            const scaled = await scaler.cropAndScaleMulti(sourceFrame, face, 
+            // a stretched face drifts away from its enrolled picture: same crop, cosine p10 0.35 stretched, 0.60 square
+            [{ key: 'faceEmbed', width: input.width, height: input.height, format: input.format, fit: 'expand' }], FACE_CROP_PADDING);
+            const region = scaled.get('faceEmbed');
+            if (!region)
+                continue;
+            const [crop] = await this.attributeCrops(sourceFrame, scaler, [face]);
+            const card = crop ? { jpeg: crop[1], window: crop[2], frameWidth: sourceFrame.width, frameHeight: sourceFrame.height } : undefined;
+            this.markAttempt(face);
+            const job = { face: { ...face }, region, capturedAt: Date.now(), card };
+            if (!this.faceQueue.push(this.embedKey(face), job))
+                this.coordinator.vectorJobStarted();
+        }
+    }
+    async runFaces(jobs) {
+        const plugin = this.plugins.get(SensorType.FaceEmbedder);
+        if (!plugin || !this.coordinator.running)
+            return;
+        const started = Date.now();
+        const embedded = await plugin.proxy.embedFaces(jobs.map((job, index) => ({ ...job.region.frame, id: String(index) })));
+        this.perf.faceEmbedMs += Date.now() - started;
+        this.perf.faceEmbedCount += jobs.length;
+        const faces = [];
+        for (let i = 0; i < jobs.length; i++) {
+            const { face, region, card } = jobs[i];
+            const { embedding, landmarks, quality } = embedded[i] ?? {};
+            if (!embedding?.length)
+                continue;
+            face.embedding = embedding;
+            face.quality = quality;
+            face.landmarks = landmarks?.map((point) => this.cropPointToFrame(point, region));
+            if (card) {
+                face.thumbnail = card.jpeg;
+                face.thumbnailLandmarks = face.landmarks?.map((point) => [
+                    (point[0] * card.frameWidth - card.window.x) / card.window.width,
+                    (point[1] * card.frameHeight - card.window.y) / card.window.height,
+                ]);
+            }
+            faces.push(face);
+        }
+        await this.resolveFaceIdentities(faces);
+        for (const face of faces)
+            this.markGoodVector(face);
+        if (faces.length === 0 || !this.coordinator.running)
+            return;
+        const embeddingModel = plugin.modelSpec?.embeddingModel ?? '';
+        for (const job of jobs) {
+            if (job.face.embedding?.length)
+                this.coordinator.acceptFaceVectors([job.face], embeddingModel, job.capturedAt);
+        }
+    }
+    wantsEmbedding(face, frame) {
+        const shortest = Math.min(face.box.width * frame.width, face.box.height * frame.height);
+        if (shortest < MIN_FACE_PX)
+            return false;
+        const now = Date.now();
+        const key = this.embedKey(face);
+        const seen = this.embeddedTracks.get(key);
+        // without a track a cell is all there is, and the next face in it may be someone else
+        if (!seen || (key.startsWith('u') && now - seen.seen > UNTRACKED_IDLE_MS)) {
+            this.embeddedTracks.delete(key);
+            return true;
+        }
+        seen.seen = now;
+        if (seen.identity || seen.good >= GOOD_VECTORS_PER_TRACK)
+            return false;
+        return now - seen.attemptAt >= EMBED_EVERY_MS;
+    }
+    markAttempt(face) {
+        const now = Date.now();
+        const key = this.embedKey(face);
+        const seen = this.embeddedTracks.get(key);
+        this.embeddedTracks.set(key, { good: 0, ...seen, attemptAt: now, seen: now });
+        if (this.embeddedTracks.size <= EMBEDDED_TRACKS_MAX)
+            return;
+        for (const [id, track] of this.embeddedTracks) {
+            if (now - track.seen > EMBEDDED_TRACK_IDLE_MS)
+                this.embeddedTracks.delete(id);
+        }
+    }
+    markGoodVector(face) {
+        const seen = this.embeddedTracks.get(this.embedKey(face));
+        if (!seen)
+            return;
+        seen.good++;
+        if (face.identity && face.parentTrackId !== undefined)
+            seen.identity = face.identity;
+    }
+    cropPointToFrame(point, region) {
+        return [
+            (region.offset.x + point[0] * region.cropSize.width) / region.originalSize.width,
+            (region.offset.y + point[1] * region.cropSize.height) / region.originalSize.height,
+        ];
+    }
+    carryTrackIdentities(faces) {
+        const now = Date.now();
+        for (const face of faces) {
+            if (face.parentTrackId === undefined)
+                continue;
+            const seen = this.embeddedTracks.get(this.embedKey(face));
+            if (!seen)
+                continue;
+            seen.seen = now;
+            if (face.identity)
+                seen.identity = face.identity;
+            else
+                face.identity = seen.identity;
+        }
+    }
+    embedKey(face) {
+        const trackId = face.parentTrackId;
+        if (trackId !== undefined)
+            return `t${trackId}`;
+        const cellX = Math.floor((face.box.x + face.box.width / 2) * UNTRACKED_GRID);
+        const cellY = Math.floor((face.box.y + face.box.height / 2) * UNTRACKED_GRID);
+        return `u${cellX}:${cellY}`;
+    }
     collectConsumers(requireFrames) {
         const consumers = [];
         for (const { type, key, fit } of SECONDARY_CONSUMERS) {
@@ -201,31 +383,28 @@ export class SecondaryStage {
         const consumers = this.collectConsumers(true);
         if (consumers.length === 0)
             return result;
-        const frameWidth = rawFrame.width;
-        const frameHeight = rawFrame.height;
-        const fullFrameDetection = {
-            label: 'person',
-            confidence: 1.0,
-            box: { ...FULL_FRAME_BOX },
-        };
         for (const consumer of consumers) {
-            const letterboxed = await this.frameScaler.letterboxToSpec(rawFrame, consumer.input);
-            if (!letterboxed)
-                continue;
-            const g = letterboxed.geometry;
-            const region = {
-                frame: this.frameScaler.toVideoFrameData(letterboxed.padded, `fullframe:${consumer.key}`),
-                detection: fullFrameDetection,
-                // a virtual crop covering frame plus fill bars, so the linear box
-                // mapping in transformBoxToOriginal un-letterboxes for free
-                offset: { x: (-g.padX / g.innerWidth) * frameWidth, y: (-g.padY / g.innerHeight) * frameHeight },
-                cropSize: { width: (g.targetWidth / g.innerWidth) * frameWidth, height: (g.targetHeight / g.innerHeight) * frameHeight },
-                originalSize: { width: frameWidth, height: frameHeight },
-            };
-            result.set(consumer.key, [region]);
+            const region = await this.fullFrameRegion(rawFrame, consumer.input, consumer.key);
+            if (region)
+                result.set(consumer.key, [region]);
         }
         return result;
     }
+    async fullFrameRegion(rawFrame, input, key) {
+        const letterboxed = await this.frameScaler.letterboxToSpec(rawFrame, input);
+        if (!letterboxed)
+            return undefined;
+        const g = letterboxed.geometry;
+        return {
+            frame: this.frameScaler.toVideoFrameData(letterboxed.padded, `fullframe:${key}`),
+            detection: { label: 'person', confidence: 1.0, box: { ...FULL_FRAME_BOX } },
+            // a virtual crop covering frame plus fill bars, so the linear box
+            // mapping in transformBoxToOriginal un-letterboxes for free
+            offset: { x: (-g.padX / g.innerWidth) * rawFrame.width, y: (-g.padY / g.innerHeight) * rawFrame.height },
+            cropSize: { width: (g.targetWidth / g.innerWidth) * rawFrame.width, height: (g.targetHeight / g.innerHeight) * rawFrame.height },
+            originalSize: { width: rawFrame.width, height: rawFrame.height },
+        };
+    }
     async runSecondaryDetection(type, results, fn) {
         let detections;
         const startedAt = Date.now();
@@ -237,23 +416,17 @@ export class SecondaryStage {
         catch (error) {
             if (!this.coordinator.running || isNoRespondersError(error))
                 return;
-            const logType = type === SensorType.Face ? 'Face' : type === SensorType.LicensePlate ? 'License plate' : type === SensorType.Clip ? 'CLIP' : 'Classifier';
+            const logType = type === SensorType.Face ? 'Face' : type === SensorType.LicensePlate ? 'License plate' : 'Classifier';
             this.logger.error(`${logType} detection error:`, error);
         }
         if (!detections)
             return;
         if (type === SensorType.Face) {
             results.face = detections;
-            await this.resolveFaceIdentities(results.face.detections);
         }
         else if (type === SensorType.LicensePlate) {
             results.licensePlate = detections;
         }
-        else if (type === SensorType.Clip) {
-            results.clip = detections;
-            const clipPlugin = this.plugins.get(SensorType.Clip);
-            results.clipEmbeddingModel = clipPlugin?.modelSpec?.embeddingModel;
-        }
         else if (type === SensorType.Classifier) {
             results.classifiers ??= {};
             for (const { pluginId, result } of detections) {
@@ -272,10 +445,6 @@ export class SecondaryStage {
             this.perf.plateMs += ms;
             this.perf.plateCount++;
         }
-        else if (type === SensorType.Clip) {
-            this.perf.clipMs += ms;
-            this.perf.clipCount++;
-        }
         else {
             this.perf.classifierMs += ms;
             this.perf.classifierCount++;
@@ -288,17 +457,18 @@ export class SecondaryStage {
         const batchResults = await PromiseTimeout(facePlugin.proxy.detectFaces(this.prepareSecondaryFrames(croppedRegions)), DETECT_TIMEOUT_MS, undefined, `Face detection timed out after ${DETECT_TIMEOUT_MS}ms`);
         const allFaces = [];
         for (let i = 0; i < batchResults.length; i++) {
-            const parent = croppedRegions[i].detection;
-            const parentTrackId = 'trackId' in parent ? parent.trackId : undefined;
             for (const face of ensureDetectionBoxes(batchResults[i].detections)) {
                 const transformed = this.transformBoxToOriginal(face.box, croppedRegions[i]);
-                allFaces.push({ ...face, box: transformed, parentTrackId, parentBox: parent.box });
+                const parent = this.faceParent(transformed, croppedRegions, i);
+                const parentTrackId = parent && 'trackId' in parent ? parent.trackId : undefined;
+                allFaces.push({ ...face, box: transformed, parentTrackId, parentBox: parent?.box });
             }
         }
         if (allFaces.length === 0)
             return { detected: false, detections: [] };
         // NMS only, the crops come from already zone-filtered object detections
         const deduped = this.pipeline.runNms(allFaces);
+        keepOneFacePerTrack(deduped);
         return { detected: deduped.length > 0, detections: deduped };
     }
     async runLicensePlateDetection(croppedRegions) {
@@ -351,25 +521,97 @@ export class SecondaryStage {
         const settled = await Promise.all(promises);
         return settled.filter((r) => r !== undefined);
     }
-    async runClipDetection(croppedRegions) {
-        const clipPlugin = this.plugins.get(SensorType.Clip);
-        if (!clipPlugin || croppedRegions.length === 0)
+    async queueClip(sourceFrame, scaler, objectDetections) {
+        const target = this.clipTarget(false);
+        if (!target)
+            return;
+        for (const detection of objectDetections) {
+            const label = detection.label.toLowerCase();
+            if (target.triggerLabels.length > 0 && !target.triggerLabels.some((l) => l.toLowerCase() === label))
+                continue;
+            const trackId = 'trackId' in detection ? detection.trackId : undefined;
+            const key = trackId !== undefined ? `t${trackId}` : `l${label}`;
+            if (!this.clipDue(key, detection.box.width * detection.box.height))
+                continue;
+            const regions = await scaler.cropAndScaleMulti(sourceFrame, detection, [target.scale]);
+            const region = regions.get('clip');
+            if (region)
+                this.pushClipJob(key, region);
+        }
+    }
+    pushClipJob(key, region) {
+        if (!this.clipQueue.push(key, { region, capturedAt: Date.now() }))
+            this.coordinator.vectorJobStarted();
+    }
+    async queueFullFrameClip(rawFrame) {
+        const target = this.clipTarget(true);
+        if (!target || !this.clipDue(CLIP_FULL_FRAME_KEY, 1))
+            return;
+        const region = await this.fullFrameRegion(rawFrame, target.scale, 'clip');
+        if (region)
+            this.pushClipJob(CLIP_FULL_FRAME_KEY, region);
+    }
+    clipTarget(requireFrames) {
+        const plugin = this.plugins.get(SensorType.Clip);
+        if (!plugin || (requireFrames && !plugin.requiresFrames))
             return undefined;
-        const batchResults = await PromiseTimeout(clipPlugin.proxy.detectEmbeddings(this.prepareSecondaryFrames(croppedRegions)), DETECT_TIMEOUT_MS, undefined, `CLIP detection timed out after ${DETECT_TIMEOUT_MS}ms`);
-        const allEmbeddings = [];
-        for (let i = 0; i < batchResults.length; i++) {
-            if (batchResults[i].embeddings && batchResults[i].embeddings.length > 0) {
-                const parentTrackId = 'trackId' in croppedRegions[i].detection ? croppedRegions[i].detection.trackId : undefined;
-                for (const emb of ensureDetectionBoxes(batchResults[i].embeddings)) {
-                    const transformed = this.transformBoxToOriginal(emb.box, croppedRegions[i]);
-                    allEmbeddings.push({ ...emb, box: transformed, parentTrackId });
-                }
+        if (!hasSecondaryModelSpec(plugin.modelSpec) || !isVideoInputSpec(plugin.modelSpec.input))
+            return undefined;
+        const { input, triggerLabels } = plugin.modelSpec;
+        return { triggerLabels, scale: { key: 'clip', width: input.width, height: input.height, format: input.format, fit: 'expand' } };
+    }
+    clipDue(key, area) {
+        const now = Date.now();
+        const seen = this.clipTracks.get(key);
+        if (seen && area < seen.area * CLIP_AREA_FACTOR && now - seen.at < CLIP_EVERY_MS)
+            return false;
+        this.clipTracks.set(key, { at: now, area: Math.max(area, seen?.area ?? 0) });
+        if (this.clipTracks.size > EMBEDDED_TRACKS_MAX) {
+            for (const [id, track] of this.clipTracks) {
+                if (now - track.at > EMBEDDED_TRACK_IDLE_MS)
+                    this.clipTracks.delete(id);
             }
         }
-        if (allEmbeddings.length === 0)
-            return undefined;
+        return true;
+    }
+    async runClip(jobs) {
+        const clipPlugin = this.plugins.get(SensorType.Clip);
+        if (!clipPlugin || !this.coordinator.running)
+            return;
+        const started = Date.now();
+        const batchResults = await clipPlugin.proxy.detectEmbeddings(this.prepareSecondaryFrames(jobs.map((job) => job.region)));
+        this.perf.clipMs += Date.now() - started;
+        this.perf.clipCount++;
+        if (!this.coordinator.running)
+            return;
         const embeddingModel = clipPlugin.modelSpec?.embeddingModel ?? '';
-        return { embeddings: allEmbeddings, embeddingModel };
+        for (let i = 0; i < batchResults.length && i < jobs.length; i++) {
+            const { region, capturedAt } = jobs[i];
+            const parentTrackId = 'trackId' in region.detection ? region.detection.trackId : undefined;
+            const embeddings = ensureDetectionBoxes(batchResults[i].embeddings ?? []).map((emb) => ({
+                ...emb,
+                box: this.transformBoxToOriginal(emb.box, region),
+                parentTrackId,
+            }));
+            this.coordinator.acceptClipVectors(embeddings, embeddingModel, capturedAt);
+        }
+    }
+    faceParent(face, regions, cropIndex) {
+        const cx = face.x + face.width / 2;
+        const cy = face.y + face.height / 2;
+        let best;
+        for (const { detection } of regions) {
+            const box = detection.box;
+            if (cx < box.x || cx > box.x + box.width || cy < box.y || cy > box.y + box.height)
+                continue;
+            if (!best || box.width * box.height < best.box.width * best.box.height)
+                best = detection;
+        }
+        if (best)
+            return best;
+        const own = regions[cropIndex].detection;
+        const inside = cx >= own.box.x && cx <= own.box.x + own.box.width && cy <= own.box.y + own.box.height;
+        return inside ? own : undefined;
     }
     prepareSecondaryFrames(croppedRegions) {
         return croppedRegions.map((r, i) => ({ ...r.frame, id: String(i), label: r.detection.label }));
@@ -378,8 +620,8 @@ export class SecondaryStage {
         const withEmbeddings = faces.filter((f) => f.embedding?.length);
         if (!withEmbeddings.length)
             return;
-        const facePlugin = this.plugins.get(SensorType.Face);
-        const embeddingModel = facePlugin?.modelSpec?.embeddingModel;
+        const embedPlugin = this.plugins.get(SensorType.FaceEmbedder);
+        const embeddingModel = embedPlugin?.modelSpec?.embeddingModel;
         if (!embeddingModel)
             return;
         const nvr = await this.getNvrProxy();
@@ -387,7 +629,7 @@ export class SecondaryStage {
             return;
         try {
             const embeddings = withEmbeddings.map((f) => f.embedding);
-            const matches = await nvr.matchFaces(embeddings, embeddingModel, this.coordinator.detectionSettings.face?.matchThreshold ?? 0);
+            const matches = await nvr.matchFaces(embeddings, embeddingModel, this.coordinator.detectionSettings.face?.matchSensitivity ?? 'balanced');
             for (let i = 0; i < withEmbeddings.length; i++) {
                 if (matches[i]) {
                     withEmbeddings[i].identity = matches[i].identity;