@camstack/addon-pipeline 1.2.70 → 1.2.71

package/dist/pipeline-runner/index.mjs

@@ -1,6 +1,6 @@
-import { At as string, Ct as boolean, Dt as number, Et as literal, K as pipelineRunnerCapability, M as deriveDetailCropRect, Mt as EventCategory, Ot as object, St as array, Tt as lazy, U as pickDetailCropConvention, W as pickNativeLeaseOverride, dt as createEvent, gt as nodePin, j as defineCustomActions, k as customAction, s as DEFAULT_DETAIL_CROP_CONVENTION, st as BaseAddon, tt as errMsg, u as DEVICE_BACKEND_TO_FORMAT, xt as _enum } from "../dist-BPaa4_z6.mjs";
-import { c as getStepDefinition, t as attributeStall } from "../event-loop-stall-monitor-B79REtL2.mjs";
-import { a as nativeLeaseSettingEnv, t as isWorkerReply } from "../worker-protocol-CBO8nwQj.mjs";
+import { At as string, Ct as boolean, Dt as number, Et as literal, K as pipelineRunnerCapability, M as deriveDetailCropRect, Mt as EventCategory, Ot as object, St as array, Tt as lazy, U as pickDetailCropConvention, W as pickNativeLeaseOverride, dt as createEvent, gt as nodePin, j as defineCustomActions, k as customAction, s as DEFAULT_DETAIL_CROP_CONVENTION, st as BaseAddon, tt as errMsg, u as DEVICE_BACKEND_TO_FORMAT, xt as _enum } from "../dist-D1Xk5Tji.mjs";
+import { c as getStepDefinition, t as attributeStall } from "../event-loop-stall-monitor-Cmbt664E.mjs";
+import { a as nativeLeaseSettingEnv, t as isWorkerReply } from "../worker-protocol-Dm6LQ9Ls.mjs";
 import { t as resolveHubHostname } from "../hub-hostname-cCknRYKj.mjs";
 import { t as getSharp } from "../lazy-sharp-B-mb8uWx.mjs";
 import { i as withDetectionIntent, n as profileForStreamId, t as isRemoteRestream } from "../remote-restream-Ci7RXNGb.mjs";
@@ -10,28 +10,6 @@ import { fileURLToPath } from "node:url";
 import { PerformanceObserver } from "node:perf_hooks";
 import * as os from "node:os";
 //#region src/session-decode/fork-decode-worker.ts
-/**
-* Real `fork` implementation for the session-decode coordinator — Epic C P1,
-* Task 4.
-*
-* Spawns the decode-worker child (`decode-worker-child.ts`, Task 2) as a
-* dedicated `child_process.fork` and adapts the returned `ChildProcess` to the
-* coordinator's minimal {@link ForkedChildLike} contract WITHOUT any cast —
-* an explicit forwarding wrapper, so a wider Node `ChildProcess` signature
-* never has to structurally satisfy the narrower interface.
-*
-* `serialization: 'advanced'` is MANDATORY: Node's default 'json' IPC
-* base64-serialises the `buffer` reply's `Uint8Array`, breaking the "raw
-* bytes, not base64" contract the coordinator + `worker-protocol.ts`'s
-* `value.bytes instanceof Uint8Array` guard both depend on. Advanced (V8
-* structured-clone) preserves the typed array on the wire.
-*
-* The child entry is resolved relative to THIS module's built location. Both
-* this module and `pipeline-runner/index.ts` bundle into the SAME entry
-* (`dist/pipeline-runner/index.js`, `manualChunks: () => null`), so
-* `import.meta.url` here is that file's URL and the sibling child lands at
-* `dist/session-decode/decode-worker-child.js` (its own vite build entry).
-*/
 /** Absolute path to the built decode-worker child entry (a vite build entry). */
 var CHILD_ENTRY_PATH = fileURLToPath(new URL("../session-decode/decode-worker-child.js", import.meta.url));
 /**
@@ -689,8 +667,24 @@ var SessionDecodeSession = class {
 		});
 	}
 	/**
-	* Prompt-release the worker's RAM native-frame lease for `frameId`. Fire and
-	* forget (no reply): a lease also self-expires on its TTL, so a dropped
+	* The runner has this frame's detections: cut one native subject tile per box
+	* and END the hold on `frameId`. Fire and forget (no reply) so the encode can
+	* never delay the runner; a dropped message costs only the tiles.
+	*
+	* An EMPTY box list is still sent — it is how a frame that detected nothing
+	* releases its hold, and that is the common case.
+	*/
+	cutTiles(frameId, bboxes) {
+		if (this.exited) return;
+		this.trySend({
+			kind: "cutTiles",
+			frameId,
+			bboxes
+		});
+	}
+	/**
+	* Prompt-release the worker's RAM native-frame hold for `frameId`. Fire and
+	* forget (no reply): the hold is also bounded by a frame count, so a dropped
 	* release only defers reclaim. No-op once the worker has exited.
 	*/
 	releaseLease(frameId) {
@@ -970,6 +964,7 @@ function buildFrameImage(session, reply) {
 			return session.requestBuffer(reply.frameId, opts);
 		},
 		nativeCrop: (bbox, maxWidth) => session.requestNativeCrop(reply.frameId, bbox, maxWidth),
+		cutTiles: (bboxes) => session.cutTiles(reply.frameId, bboxes),
 		releaseNativeLease: () => session.releaseLease(reply.frameId),
 		markInferred: () => session.markInferred(reply.frameId),
 		close: () => {
@@ -1110,6 +1105,7 @@ function startSessionDecodePump(deps) {
 					const image = frame.image;
 					const cropFn = image.nativeCrop;
 					const nativeCrop = cropFn ? Object.assign((bbox, maxWidth) => cropFn(bbox, maxWidth), {
+						cutTiles: (bboxes) => image.cutTiles?.(bboxes),
 						release: () => image.releaseNativeLease?.(),
 						markInferred: () => image.markInferred?.()
 					}) : void 0;
@@ -2517,7 +2513,7 @@ var NATIVE_LEASE_OWNER_ADDON_ID = "pipeline-orchestrator";
 * old value.
 */
 function sameOverride(a, b) {
-	return a.ttlMs === b.ttlMs && a.budgetMb === b.budgetMb && a.activityMs === b.activityMs && a.admission === b.admission;
+	return a.holdFrames === b.holdFrames && a.budgetMb === b.budgetMb && a.activityMs === b.activityMs && a.admission === b.admission && a.tileBudgetMb === b.tileBudgetMb;
 }
 /**
 * TTL-cached read of the cluster native-lease knobs.
@@ -3794,6 +3790,42 @@ async function runStatelessStep(deps, input) {
 		details
 	};
 }
+/**
+* Normalised boxes for the subjects worth a tile, highest confidence first,
+* capped.
+*
+* Returns an empty array for a frame with no usable detections — and the caller
+* still sends it: an empty `cutTiles` is how a frame that detected nothing ends
+* its hold, which is the majority of frames and the whole reason this design
+* costs less than the one it replaces.
+*
+* A degenerate or non-finite box is DROPPED rather than clamped: a zero-area
+* container serves nothing, and a NaN one would poison the worker's geometry.
+*/
+function planTileCuts(detections, frame, maxSubjects = 4) {
+	if (frame.width <= 0 || frame.height <= 0) return [];
+	const ordered = [...detections.filter((d) => isUsable(d.bbox))].sort((a, b) => b.score - a.score);
+	const out = [];
+	for (const detection of ordered.slice(0, Math.max(0, maxSubjects))) {
+		const { x, y, width, height } = detection.bbox;
+		out.push({
+			x: x / frame.width,
+			y: y / frame.height,
+			w: width / frame.width,
+			h: height / frame.height
+		});
+	}
+	return out;
+}
+function isUsable(bbox) {
+	if (![
+		bbox.x,
+		bbox.y,
+		bbox.width,
+		bbox.height
+	].every((v) => Number.isFinite(v))) return false;
+	return bbox.width > 0 && bbox.height > 0;
+}
 //#endregion
 //#region src/pipeline-runner/index.ts
 var DEFAULT_CONFIG = {
@@ -4282,6 +4314,7 @@ var PipelineRunnerAddon = class PipelineRunnerAddon extends BaseAddon {
 			this.handleDetectionStreamChange(deviceId, action);
 		});
 		this.runner.onResult(async (deviceId, frame, result, _streamType, handle) => {
+			this.cutSubjectTiles(deviceId, result, handle);
 			this.emitInferenceResult(deviceId, frame, result, handle);
 			const detectionCount = result.detections?.length ?? 0;
 			this.runner?.noteDetectionResult(deviceId, detectionCount);
@@ -5103,6 +5136,40 @@ var PipelineRunnerAddon = class PipelineRunnerAddon extends BaseAddon {
 		}, resolved.tier, input.encodeJpeg);
 	}
 	/**
+	* Turn a finished frame into subject TILES and end its hold — the runner half
+	* of R2 (`docs/design/2026-08-13-native-lease-two-tier-redesign.md`).
+	*
+	* Called from the result callback, which is the last instant at which the
+	* frame's native pixels exist and its detections are known at the same time.
+	* Every path through here ends the hold, including the one where there is
+	* nothing to cut: a frame that detected nothing is the majority of frames and
+	* releasing it promptly is most of the RAM this redesign gives back.
+	*
+	* Deliberately synchronous and unawaited. The worker replies to nothing, so
+	* there is nothing to wait for, and a detection result must never be delayed
+	* by an encode.
+	*/
+	cutSubjectTiles(deviceId, result, handle) {
+		if (!handle) return;
+		const found = this.nativeCropRegistry.get(handle);
+		if (!found) return;
+		const boxes = planTileCuts(result.detections ?? [], {
+			width: result.width,
+			height: result.height
+		});
+		try {
+			found.request.cutTiles(boxes);
+		} catch (err) {
+			this.ctx.logger.debug("subject tile cut could not be dispatched", {
+				tags: { deviceId },
+				meta: {
+					subjects: boxes.length,
+					error: err instanceof Error ? err.message : String(err)
+				}
+			});
+		}
+	}
+	/**
 	* The native-lease half of {@link getNativeCrop}, extracted so the DETAIL path
 	* can keep the miss REASON the cap's `null` return has no room for. Both
 	* callers share this one decision — a second copy of the tier arithmetic is