@camstack/addon-pipeline 1.2.333 → 1.2.335

package/dist/pipeline-runner/index.js

@@ -3,9 +3,9 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 const require_chunk = require("../chunk-emK7D4bc.js");
-const require_dist = require("../dist-DJV7Z6Bb.js");
-const require_node = require("../node-CkmucLYG.js");
-const require_default_detection_model = require("../default-detection-model-Biwf5-ML.js");
+const require_dist = require("../dist-C5DlS_lW.js");
+const require_node = require("../node-BUafKArW.js");
+const require_custom_model_catalog = require("../custom-model-catalog-CL-xJa8w.js");
 const require_hub_hostname = require("../hub-hostname-DAJXlOgV.js");
 const require_lazy_sharp = require("../lazy-sharp-BuwKlQLR.js");
 const require_restream_intent = require("../restream-intent-7uDNqMKs.js");
@@ -1723,7 +1723,7 @@ function cropRgb(frame, bbox, maxWidth) {
 * pass exists to fix.
 */
 async function toDecodedFrame(frame, format, viewSpec) {
-	const geometry = viewSpec ? require_default_detection_model.resolveFrameViewGeometry(frame.image.width, frame.image.height, viewSpec) : void 0;
+	const geometry = viewSpec ? require_custom_model_catalog.resolveFrameViewGeometry(frame.image.width, frame.image.height, viewSpec) : void 0;
 	const bytes = await frame.image.toBuffer(geometry ? {
 		crop: geometry.sourceCrop,
 		resize: geometry.output,
@@ -1762,7 +1762,7 @@ function startSessionDecodePump(deps) {
 		workerGone = true;
 		deps.onWorkerGone?.();
 	};
-	const iterator = require_default_detection_model.createSessionDecodeCoordinator({
+	const iterator = require_custom_model_catalog.createSessionDecodeCoordinator({
 		fork: (source) => {
 			const child = deps.fork(source);
 			forked = true;
@@ -1964,7 +1964,7 @@ function onboardRootDetections(slot, frame, gate) {
 			}
 		};
 	});
-	const admitted = detections.filter((d) => require_default_detection_model.macroGateVerdict(d.macroClass, d.score, gate) === "pass");
+	const admitted = detections.filter((d) => require_custom_model_catalog.macroGateVerdict(d.macroClass, d.score, gate) === "pass");
 	if (admitted.length === 0) return {
 		kind: "gated",
 		refused: detections.length
@@ -1976,6 +1976,158 @@ function onboardRootDetections(slot, frame, gate) {
 	};
 }
 //#endregion
+//#region src/pipeline-runner/root-mask-supply.ts
+/** The frame-plane step a seg root supplies. */
+var SEGMENTATION_STEP_ID = "segmentation";
+/** Whether an ENABLED `stepId` is reachable through enabled ancestors. */
+function dispatchesStep(steps, stepId) {
+	return steps.some((s) => s.enabled !== false && (s.addonId === stepId || s.children !== void 0 && dispatchesStep(s.children, stepId)));
+}
+function withoutStep(steps, stepId) {
+	return steps.filter((s) => s.addonId !== stepId).map((s) => s.children !== void 0 ? {
+		...s,
+		children: withoutStep(s.children, stepId)
+	} : s);
+}
+/**
+* When the camera's mask supply is effective and the step would run, drop it
+* from the dispatch: the root's masks replace one inference per detection.
+* Otherwise the tree is returned untouched — a root that emits no masks (or a
+* flag the operator unchecked) leaves the step running its own model.
+*/
+function applyMaskFill(steps, plan) {
+	const dispatched = dispatchesStep(steps, SEGMENTATION_STEP_ID);
+	if (!dispatched || plan.states.get("segmentation")?.effective !== true) return {
+		steps,
+		filledByRoot: false,
+		segmentationDispatched: dispatched
+	};
+	return {
+		steps: withoutStep(steps, SEGMENTATION_STEP_ID),
+		filledByRoot: true,
+		segmentationDispatched: false
+	};
+}
+/**
+* The largest 4-connected non-zero component of a `width × height` byte mask —
+* the same reduction the `segmentation` step's decode applies to its own mask
+* (`saliency.py`). `null` when the mask has no foreground (or a size that does
+* not match its bytes).
+*/
+function largestMaskComponent(mask, width, height) {
+	const size = width * height;
+	if (!(size > 0) || mask.length < size) return null;
+	const visited = new Uint8Array(size);
+	const stack = new Int32Array(size);
+	let best = null;
+	for (let start = 0; start < size; start++) {
+		if (mask[start] === 0 || visited[start] === 1) continue;
+		visited[start] = 1;
+		let top = 0;
+		stack[top++] = start;
+		let area = 0;
+		let minX = width;
+		let minY = height;
+		let maxX = -1;
+		let maxY = -1;
+		while (top > 0) {
+			const p = stack[--top];
+			area += 1;
+			const x = p % width;
+			const y = (p - x) / width;
+			if (x < minX) minX = x;
+			if (x > maxX) maxX = x;
+			if (y < minY) minY = y;
+			if (y > maxY) maxY = y;
+			if (x > 0 && visited[p - 1] === 0 && mask[p - 1] !== 0) {
+				visited[p - 1] = 1;
+				stack[top++] = p - 1;
+			}
+			if (x < width - 1 && visited[p + 1] === 0 && mask[p + 1] !== 0) {
+				visited[p + 1] = 1;
+				stack[top++] = p + 1;
+			}
+			if (y > 0 && visited[p - width] === 0 && mask[p - width] !== 0) {
+				visited[p - width] = 1;
+				stack[top++] = p - width;
+			}
+			if (y < height - 1 && visited[p + width] === 0 && mask[p + width] !== 0) {
+				visited[p + width] = 1;
+				stack[top++] = p + width;
+			}
+		}
+		if (best === null || area > best.area) best = {
+			area,
+			box: [
+				minX,
+				minY,
+				maxX - minX + 1,
+				maxY - minY + 1
+			]
+		};
+	}
+	return best?.box ?? null;
+}
+/**
+* The detection's `refinedBbox` from its own mask — the mapping the result
+* assembler applies to the `segmentation` step's `maskBbox`: the mask spans
+* the detection's box, so mask pixels scale linearly onto it.
+*/
+function refinedBboxFromMask(detection) {
+	const { mask, maskWidth, maskHeight, bbox } = detection;
+	if (mask === void 0 || maskWidth === void 0 || maskHeight === void 0) return void 0;
+	const component = largestMaskComponent(new Uint8Array(Buffer.from(mask, "base64")), maskWidth, maskHeight);
+	if (component === null) return void 0;
+	const [mx, my, mw, mh] = component;
+	const sx = bbox.width / maskWidth;
+	const sy = bbox.height / maskHeight;
+	return {
+		x: bbox.x + mx * sx,
+		y: bbox.y + my * sy,
+		width: mw * sx,
+		height: mh * sy
+	};
+}
+function withoutMask(detection) {
+	const { mask: _mask, maskWidth: _w, maskHeight: _h, ...rest } = detection;
+	if (rest.debug === void 0) return rest;
+	const { mask: _dm, maskWidth: _dw, maskHeight: _dh, ...debug } = rest.debug;
+	return {
+		...rest,
+		debug
+	};
+}
+/**
+* Apply the mask decision to a frame. Filled by the root ⇒ each root
+* detection's mask is completed with its `refinedBbox`, exactly what the
+* step would have written. The step ran ⇒ untouched (its own masks). Neither
+* ⇒ a seg root's masks are removed from the first-level detections. Never
+* mutates; returns the input when nothing changes.
+*/
+function applyRootMasks(result, fill) {
+	if (fill.segmentationDispatched) return result;
+	let changed = false;
+	const detections = result.detections.map((d) => {
+		if (d.kind !== "first-level" || d.mask === void 0) return d;
+		if (!fill.filledByRoot) {
+			changed = true;
+			return withoutMask(d);
+		}
+		if (d.refinedBbox !== void 0) return d;
+		const refinedBbox = refinedBboxFromMask(d);
+		if (refinedBbox === void 0) return d;
+		changed = true;
+		return {
+			...d,
+			refinedBbox
+		};
+	});
+	return changed ? {
+		...result,
+		detections
+	} : result;
+}
+//#endregion
 //#region src/pipeline-runner/root-supply.ts
 /**
 * The runner's half of root-model supply (D715, D730).
@@ -2003,35 +2155,80 @@ function onboardRootDetections(slot, frame, gate) {
 var ROOT_SUPPLY_ROOT_STEP_ID = "object-detection";
 var PACKAGE_STEP_ID = "package-detection";
 var PACKAGE_THRESHOLD_KEY = "minConfidencePackage";
+/** The step slider that governs a supplied label — one knob per step (D741). */
+var SUPPLIED_LABEL_FLOOR_KEY = "minConfidence";
+/**
+* The floor a supplied label must clear for one step, under the D738 binding
+* rule against the ROOT model: an operator value made for the root applies; one
+* made for the step's own classifier does not (another scale); the root's
+* measured floor is the default, and no floor at all when it declares none.
+*/
+function suppliedLabelFloor(stepId, settings, rootModelId, rootEntry) {
+	const state = require_dist.resolveModelBoundSetting(settings, SUPPLIED_LABEL_FLOOR_KEY, rootModelId, rootEntry?.suppliedLabelFloors?.[stepId] ?? 0, 0);
+	return typeof state.value === "number" ? state.value : 0;
+}
 var EMPTY_ROOT_SUPPLY_PLAN = { states: /* @__PURE__ */ new Map() };
-function findStep(steps, addonId) {
+/** The step `addonId` when it is in the tree AND switched on — the per-camera gate's answer. */
+function findEnabledStep(steps, addonId) {
 	for (const step of steps) {
+		if (step.enabled === false) continue;
 		if (step.addonId === addonId) return step;
-		const nested = step.children !== void 0 ? findStep(step.children, addonId) : void 0;
+		const nested = step.children !== void 0 ? findEnabledStep(step.children, addonId) : void 0;
 		if (nested !== void 0) return nested;
 	}
 }
 /**
-* Plan a camera's root supplies from its configured tree. A root with no
-* pinned model runs the step's default — a COCO model, which supplies the
-* animal and vehicle classifiers like any other root.
+* The model an UNPINNED root runs on the elected device — the executor's own
+* rule (`resolveDefaultDetectionModel` on the device's backend, accelerator and
+* format), so the supplies are read off the model that really runs. Before
+* this, an unpinned root was judged as the step's flat `defaultModelId`
+* (`yolo26n`) on every accelerator, while an Intel GPU ran `yolov9m-320-int8`
+* and a Coral an SSD: `filledBy` named a model that was not running, and a
+* crop supply's input-size gate (D731) measured the wrong model. No elected
+* device (the runner's default pool) or an unknown backend ⇒ the flat default.
 */
-function planRootSupplies(steps, resolveModel) {
+function unpinnedRootModelId(deviceKey, flatDefault) {
+	if (deviceKey === void 0) return flatDefault;
+	try {
+		const engine = require_custom_model_catalog.resolveDeviceEngine(deviceKey);
+		return require_custom_model_catalog.resolveDefaultDetectionModel(engine.backend, engine.device ?? null, engine.format);
+	} catch {
+		return flatDefault;
+	}
+}
+/**
+* Plan a camera's root supplies from its configured tree.
+*
+* - The root's model is the one the executor runs: its pin, else the
+*   hardware-aware default of the elected device (`deviceKey`).
+* - Only a step the camera RUNS is planned. A suppliable step that is absent
+*   from the tree or switched off (the per-camera gate) has no state: the
+*   operator switched that function off, so the root's labels are not made
+*   authoritative for it, its root child boxes are removed, and nothing logs
+*   that the root "supplies" it. Before this, a camera whose classifiers were
+*   gated OFF logged `root model supplies a pipeline step` for both of them
+*   and raised the root's labels to the detection score anyway (D736).
+*/
+function planRootSupplies(steps, resolveModel, deviceKey) {
 	if (steps === void 0) return EMPTY_ROOT_SUPPLY_PLAN;
 	const root = steps.find((s) => s.addonId === "object-detection" && s.enabled !== false);
 	if (root === void 0) return EMPTY_ROOT_SUPPLY_PLAN;
-	const definition = require_default_detection_model.getStepDefinition(ROOT_SUPPLY_ROOT_STEP_ID);
-	const rootModelId = root.modelId ?? definition.defaultModelId;
-	const supplies = require_dist.rootSuppliesOf(resolveModel(ROOT_SUPPLY_ROOT_STEP_ID, rootModelId), {
+	const definition = require_custom_model_catalog.getStepDefinition(ROOT_SUPPLY_ROOT_STEP_ID);
+	const rootModelId = root.modelId ?? unpinnedRootModelId(deviceKey, definition.defaultModelId);
+	const rootEntry = resolveModel(ROOT_SUPPLY_ROOT_STEP_ID, rootModelId);
+	const supplies = require_dist.rootSuppliesOf(rootEntry, {
 		labels: definition.labels ?? [],
 		...definition.classMap !== void 0 ? { classMap: definition.classMap } : {}
 	});
 	const states = /* @__PURE__ */ new Map();
 	for (const stepId of require_dist.ROOT_SUPPLIABLE_STEP_IDS) {
-		const settings = findStep(steps, stepId)?.settings;
+		const step = findEnabledStep(steps, stepId);
+		if (step === void 0) continue;
+		const settings = step.settings;
 		states.set(stepId, {
 			...require_dist.resolveRootSupply(stepId, settings, supplies),
-			...settings !== void 0 ? { settings } : {}
+			...settings !== void 0 ? { settings } : {},
+			labelFloor: suppliedLabelFloor(stepId, settings, rootModelId, rootEntry)
 		});
 	}
 	return {
@@ -2043,7 +2240,7 @@ function planRootSupplies(steps, resolveModel) {
 function suppliedSteps(plan) {
 	const out = /* @__PURE__ */ new Map();
 	if (plan.rootModelId === void 0) return out;
-	for (const [stepId, state] of plan.states) if (state.effective && state.supply !== void 0) out.set(stepId, {
+	for (const [stepId, state] of plan.states) if (state.effective && state.supply !== void 0 && state.supply.kind !== "mask") out.set(stepId, {
 		modelId: plan.rootModelId,
 		kind: state.supply.kind
 	});
@@ -2069,6 +2266,10 @@ function authoritativeLabels(detection, plan) {
 			changed = true;
 			continue;
 		}
+		if (state.labelFloor >= 1 || detection.score < state.labelFloor) {
+			changed = true;
+			continue;
+		}
 		if (label.score === detection.score) {
 			labels.push(label);
 			continue;
@@ -2121,7 +2322,7 @@ function applyRootSupplyAuthority(result, plan) {
 }
 /** The root step's schema default for its class allow-list. */
 function rootDefaultMacroClasses() {
-	const field = require_default_detection_model.getStep(ROOT_SUPPLY_ROOT_STEP_ID).getConfigSchema().find((f) => "key" in f && f.key === "enabledMacroClasses");
+	const field = require_custom_model_catalog.getStep(ROOT_SUPPLY_ROOT_STEP_ID).getConfigSchema().find((f) => "key" in f && f.key === "enabledMacroClasses");
 	const value = field !== void 0 && "default" in field ? field.default : void 0;
 	return Array.isArray(value) ? value : [];
 }
@@ -3363,7 +3564,7 @@ var FaceOutsideParentLog = class {
 */
 /** The face detector's input side for the step as it will run. */
 function detectorInputPx(step) {
-	const def = require_default_detection_model.getStepDefinition(step.addonId);
+	const def = require_custom_model_catalog.getStepDefinition(step.addonId);
 	const modelId = step.modelId ?? def.defaultModelId;
 	return def.models.find((m) => m.id === modelId)?.inputSize.width ?? 160;
 }
@@ -3474,7 +3675,7 @@ async function refineRootFace(deps, input, supplied, step, requested, deviceKey)
 	}
 	const chain = requested === void 0 ? step : pruneChildStepsToRequested(step, requested);
 	if (chain.children === void 0 || chain.children.length === 0) return [toDetailResult(face, step.addonId, crop)];
-	const modelId = step.modelId ?? require_default_detection_model.getStepDefinition(step.addonId).defaultModelId;
+	const modelId = step.modelId ?? require_custom_model_catalog.getStepDefinition(step.addonId).defaultModelId;
 	const embedded = await deps.runPipeline([chain], crop.jpeg, input.deviceId, deviceKey, nativeCropRef, refinedAsSupplied(face, step.addonId, modelId));
 	if (embedded === null) return [toDetailResult(face, step.addonId, crop)];
 	return embedded.detections.map((d) => toDetailResult(d, step.addonId, crop));
@@ -7438,7 +7639,7 @@ function writeRetainedDetectionFrame(store, deviceId, frame, retention) {
 	if (retention) return retention.admitFrame(deviceId, frame);
 	if (!store) return void 0;
 	if (!isContinuousRetainEnabled()) return store.allocateHandle(deviceId, frame) ?? void 0;
-	return store.write(deviceId, frame, frame.frameRef ? createRetainedContentFallback(require_default_detection_model.localFrameRegistry, frame.frameRef) : void 0) ?? void 0;
+	return store.write(deviceId, frame, frame.frameRef ? createRetainedContentFallback(require_custom_model_catalog.localFrameRegistry, frame.frameRef) : void 0) ?? void 0;
 }
 /**
 * Occupancy-burst safety timeout (both the dial path and the analyzer-tap
@@ -7555,7 +7756,7 @@ function collectEnabledStepIds(steps, acc) {
 */
 function tryGetStepDefinition(stepId) {
 	try {
-		return require_default_detection_model.getStepDefinition(stepId);
+		return require_custom_model_catalog.getStepDefinition(stepId);
 	} catch {
 		return null;
 	}
@@ -8121,7 +8322,7 @@ var PipelineRunnerAddon = class PipelineRunnerAddon extends require_dist.BaseAdd
 		});
 		this.retention = new OnDemandRetentionSession({
 			store: this.retainedFrames,
-			registry: require_default_detection_model.localFrameRegistry,
+			registry: require_custom_model_catalog.localFrameRegistry,
 			telemetry: this.frameLazy,
 			nodeId: this.nodeId,
 			continuousRetain: isContinuousRetainEnabled()
@@ -8139,7 +8340,7 @@ var PipelineRunnerAddon = class PipelineRunnerAddon extends require_dist.BaseAdd
 			minThrottledFps: this.config.minThrottledFps,
 			processFrame: (deviceId, frame, handle) => this.runInference(deviceId, frame, handle),
 			analyzeMotion: (deviceId, frame, handle) => this.runMotionAnalysis(deviceId, frame, handle),
-			releaseFrameRef: (ref, reason) => require_default_detection_model.localFrameRegistry.release(ref, reason),
+			releaseFrameRef: (ref, reason) => require_custom_model_catalog.localFrameRegistry.release(ref, reason),
 			releaseRetention: (handle, reason) => {
 				this.retention?.release(handle, reason);
 				this.frameCutters.drop(handle);
@@ -9085,7 +9286,7 @@ var PipelineRunnerAddon = class PipelineRunnerAddon extends require_dist.BaseAdd
 			detectionMode: config.detectionMode,
 			...config.detectionSources !== void 0 ? { detectionSources: config.detectionSources } : {},
 			...config.sessionTrigger !== void 0 ? { sessionTrigger: config.sessionTrigger } : {},
-			...require_default_detection_model.rootObjectGate(config.steps) !== void 0 ? { objectGate: require_default_detection_model.rootObjectGate(config.steps) } : {},
+			...require_custom_model_catalog.rootObjectGate(config.steps) !== void 0 ? { objectGate: require_custom_model_catalog.rootObjectGate(config.steps) } : {},
 			fps: config.detectionFps,
 			motionCooldownMs: config.motionCooldownMs,
 			occupancyRecheckEnabled: config.occupancyRecheckEnabled,
@@ -9484,7 +9685,7 @@ var PipelineRunnerAddon = class PipelineRunnerAddon extends require_dist.BaseAdd
 	}
 	/** The evidence crop from the process-local lease, JPEG-encoded by the view. */
 	async encodeEvidenceFromLease(ref, entry) {
-		const lease = require_default_detection_model.localFrameRegistry.acquire(ref);
+		const lease = require_custom_model_catalog.localFrameRegistry.acquire(ref);
 		if (!lease) return null;
 		let reason = "error";
 		try {
@@ -9574,7 +9775,7 @@ var PipelineRunnerAddon = class PipelineRunnerAddon extends require_dist.BaseAdd
 	/** A 16×32 RGB view of `crop`: the lease when there is one, else the inline buffer. */
 	async readAppearanceView(frame, result, crop) {
 		if (frame.frameRef !== void 0) {
-			const lease = require_default_detection_model.localFrameRegistry.acquire(frame.frameRef);
+			const lease = require_custom_model_catalog.localFrameRegistry.acquire(frame.frameRef);
 			if (lease) {
 				let reason = "error";
 				try {
@@ -9920,12 +10121,13 @@ var PipelineRunnerAddon = class PipelineRunnerAddon extends require_dist.BaseAdd
 	* Refreshed on the async boundaries (`runInference`, `runDetailSubtree`),
 	* read synchronously by the placement.
 	*/
-	customModels = new require_default_detection_model.CustomModelCatalog({ warn: (message, extras) => this.ctxIfReady?.logger.warn(message, extras) });
+	customModels = new require_custom_model_catalog.CustomModelCatalog({ warn: (message, extras) => this.ctxIfReady?.logger.warn(message, extras) });
 	/**
 	* Per camera, the root-supply plan (D730) and the announce derived from it,
 	* keyed on the two inputs it reads: the attach tree and the custom-model
-	* snapshot (a Frigate+ root is a custom model). Recomputed when either
-	* changes identity — at most once per catalog refresh.
+	* snapshot (a Frigate+ root is a custom model), plus the elected device
+	* whose default an unpinned root runs. Recomputed when any changes — at
+	* most once per catalog refresh.
 	*/
 	rootSupplyCache = /* @__PURE__ */ new Map();
 	/**
@@ -9934,14 +10136,15 @@ var PipelineRunnerAddon = class PipelineRunnerAddon extends require_dist.BaseAdd
 	* animal and vehicle classifiers by default, and that must be readable per
 	* camera rather than inferred from a missing dispatch (D391).
 	*/
-	rootSupplyPlanFor(deviceId, steps) {
+	rootSupplyPlanFor(deviceId, steps, deviceKey) {
 		const byStep = this.customModels.current();
 		const cached = this.rootSupplyCache.get(deviceId);
-		if (cached !== void 0 && cached.steps === steps && cached.byStep === byStep) return cached.plan;
-		const plan = planRootSupplies(steps, (stepId, modelId) => this.customModels.stepDefinition(stepId)?.models.find((m) => m.id === modelId));
+		if (cached !== void 0 && cached.steps === steps && cached.deviceKey === deviceKey && cached.byStep === byStep) return cached.plan;
+		const plan = planRootSupplies(steps, (stepId, modelId) => this.customModels.stepDefinition(stepId)?.models.find((m) => m.id === modelId), deviceKey);
 		const announces = deriveDetailSteps(steps, plan);
 		this.rootSupplyCache.set(deviceId, {
 			steps,
+			deviceKey,
 			byStep,
 			plan,
 			announces
@@ -10084,7 +10287,7 @@ var PipelineRunnerAddon = class PipelineRunnerAddon extends require_dist.BaseAdd
 	* the elected pool pre-warms, D657) read. Pure: nothing is logged here.
 	*/
 	placementOf(config, step, attachedByKey) {
-		return require_default_detection_model.placeDetailStep({
+		return require_custom_model_catalog.placeDetailStep({
 			step,
 			effectiveDeviceKey: config?.deviceKey,
 			roster: config?.inferenceDevices,
@@ -10106,7 +10309,7 @@ var PipelineRunnerAddon = class PipelineRunnerAddon extends require_dist.BaseAdd
 			return steps;
 		}
 		const attachedByKey = this.perDeviceAttachedCounts();
-		const result = require_default_detection_model.stepsForElectedPool(steps, isDetailPlaneStepId, (step) => this.placementOf(config, step, attachedByKey));
+		const result = require_custom_model_catalog.stepsForElectedPool(steps, isDetailPlaneStepId, (step) => this.placementOf(config, step, attachedByKey));
 		this.noteElectedPoolDelegation(deviceId, config.deviceKey, result.delegated);
 		return result.delegated.length === 0 ? steps : result.steps;
 	}
@@ -10797,7 +11000,7 @@ var PipelineRunnerAddon = class PipelineRunnerAddon extends require_dist.BaseAdd
 						return materialize;
 					},
 					...useLocalFrameRef ? {
-						frameRegistry: require_default_detection_model.localFrameRegistry,
+						frameRegistry: require_custom_model_catalog.localFrameRegistry,
 						inlineWhen: () => runner.detectionBackpressure(config.deviceId),
 						inlineViewSpec: SPLIT_DETECTION_VIEW,
 						onFrameRef: async (frame, nativeCrop) => {
@@ -10817,7 +11020,7 @@ var PipelineRunnerAddon = class PipelineRunnerAddon extends require_dist.BaseAdd
 							const admitted = current.detection && (frame.preRoll === true ? runner.enqueuePreRollFrame(config.deviceId, frame, handle) : runner.enqueueReservedDetectionFrame(config.deviceId, frame, handle));
 							if (admitted) nativeCrop?.markInferred();
 							if (current.motion) {
-								const motion = await resolveMotionFrameView(require_default_detection_model.localFrameRegistry, frame.frameRef);
+								const motion = await resolveMotionFrameView(require_custom_model_catalog.localFrameRegistry, frame.frameRef);
 								if (motion.kind === "view") runner.enqueueMotionFrame(config.deviceId, {
 									data: Buffer.from(motion.data),
 									width: motion.width,
@@ -11072,9 +11275,10 @@ var PipelineRunnerAddon = class PipelineRunnerAddon extends require_dist.BaseAdd
 			return null;
 		}
 		if (steps.length === 0) return null;
-		const rootSupplyPlan = this.rootSupplyPlanFor(deviceId, steps);
+		const rootSupplyPlan = this.rootSupplyPlanFor(deviceId, steps, camConfig?.deviceKey);
 		const packageFill = applyPackageFill(steps, rootSupplyPlan);
-		let dispatchSteps = packageFill.steps;
+		const maskFill = applyMaskFill(packageFill.steps, rootSupplyPlan);
+		let dispatchSteps = maskFill.steps;
 		if (dispatchSteps.some((s) => s.addonId === "package-detection" && s.enabled !== false)) {
 			this.refreshPackageZoneUnion(deviceId);
 			const motionInZone = this.lastMotionNearPackageZone.get(deviceId) ?? this.lastAnalyzerDetected.get(deviceId) ?? false;
@@ -11144,7 +11348,7 @@ var PipelineRunnerAddon = class PipelineRunnerAddon extends require_dist.BaseAdd
 			});
 		} catch (err) {
 			const msg = require_dist.errMsg(err);
-			if (require_default_detection_model.isSessionDecodeReadGone(err)) {
+			if (require_custom_model_catalog.isSessionDecodeReadGone(err)) {
 				log.warn("runInference skipped — session decode frame gone", { meta: {
 					error: msg,
 					nodeId: this.nodeId,
@@ -11162,7 +11366,7 @@ var PipelineRunnerAddon = class PipelineRunnerAddon extends require_dist.BaseAdd
 			return null;
 		}
 		if (result === null) return null;
-		const looked = withPackageLook(applyRootSupplyAuthority(result, rootSupplyPlan), dispatchSteps, packageFill.filledByRoot);
+		const looked = withPackageLook(applyRootMasks(applyRootSupplyAuthority(result, rootSupplyPlan), maskFill), dispatchSteps, packageFill.filledByRoot);
 		return this.recoverSmallSubjects(deviceId, frame, looked, dispatchSteps, camConfig?.deviceKey);
 	}
 	/**
@@ -11297,7 +11501,7 @@ var PipelineRunnerAddon = class PipelineRunnerAddon extends require_dist.BaseAdd
 	* on a miss — the frame is gone, and the full-frame result stands.
 	*/
 	async resolveRecoveryCropView(ref, crop) {
-		const lease = require_default_detection_model.localFrameRegistry.acquire(ref);
+		const lease = require_custom_model_catalog.localFrameRegistry.acquire(ref);
 		if (!lease) return null;
 		let reason = "error";
 		try {
@@ -11822,7 +12026,7 @@ var PipelineRunnerAddon = class PipelineRunnerAddon extends require_dist.BaseAdd
 					},
 					shouldMaterializeFrame: () => !admissionClosed,
 					...useLocalFrameRef ? {
-						frameRegistry: require_default_detection_model.localFrameRegistry,
+						frameRegistry: require_custom_model_catalog.localFrameRegistry,
 						inlineWhen: () => runner.detectionBackpressure(config.deviceId),
 						inlineViewSpec: SPLIT_DETECTION_VIEW,
 						onFrameRef: (frame, nativeCrop) => {