@camstack/addon-pipeline 1.1.27 → 1.1.28

package/dist/pipeline-runner/index.js

@@ -2,8 +2,8 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_dist = require("../dist-DAIlCdAx.js");
-const require_frame_handle_plane = require("../frame-handle-plane-DtTRX_0n.js");
+const require_dist = require("../dist-Biq62zt4.js");
+const require_frame_handle_plane = require("../frame-handle-plane-D6BzyEgy.js");
 const require_hub_hostname = require("../hub-hostname-DAJXlOgV.js");
 let _camstack_shm_ring = require("@camstack/shm-ring");
 //#region src/pipeline-runner/bench-actions.ts
@@ -950,6 +950,34 @@ function ownDetectionEntry(entry) {
 		handle: entry.handle
 	};
 }
+/**
+* Clone a {@link MotionQueueEntry} for the queue's copy-on-retain boundary —
+* same contract as {@link ownDetectionEntry}: detach the borrowed shm pixels,
+* carry the plain-record `FrameHandle` through unchanged.
+*/
+function ownMotionEntry(entry) {
+	return {
+		frame: ownFrame(entry.frame),
+		handle: entry.handle
+	};
+}
+/**
+* CB5 shm FrameHandle passthrough gate. The runner hands the executor / motion
+* provider a zero-pixel shm `FrameHandle` (instead of re-serialising ~1.2MB of
+* pixels over UDS) ONLY while the pipeline is keeping up. The FrameRing is a
+* latest-wins seqlock with NO refcount, so deferring the pixel read from the
+* poll tick to the executor (after queue + semaphore + UDS) widens the
+* publish→read window — under backpressure the producer can recycle the slot
+* before the executor reads it (a silent drop). When the pipeline is backed up
+* we therefore fall back to copying pixels inline (today's behaviour).
+*
+* The per-camera detection `FrameQueue` is latest-only (capacity 1), so raw
+* queue length is 0/1 and the operative backpressure signal is inference
+* saturation on the shared semaphore — no spare inference permit ⇒ frames are
+* waiting ⇒ ship pixels. The queue-depth clause is kept for defence in depth
+* and future multi-slot queues.
+*/
+var HANDLE_PASSTHROUGH_MAX_QUEUE_DEPTH = 1;
 var DEFAULT_MOTION_COOLDOWN_MS = 3e4;
 function toFrameInput$1(frame) {
 	return {
@@ -1032,7 +1060,7 @@ var PipelineRunner = class {
 		this.detectionStreamHandler = handler;
 	}
 	registerCamera(deviceId, registration) {
-		const motionQueue = new FrameQueue(this.config.maxQueueDepth, ownFrame);
+		const motionQueue = new FrameQueue(this.config.maxQueueDepth, ownMotionEntry);
 		const detectionQueue = new FrameQueue(this.config.maxQueueDepth, ownDetectionEntry);
 		const initialPhase = registration.detectionMode === "disabled" ? "idle" : registration.detectionMode === "always-on" ? "active" : "watching";
 		const state = {
@@ -1087,10 +1115,13 @@ var PipelineRunner = class {
 			if (this.defaultRoundRobinIndex >= this.defaultRoundRobinKeys.length) this.defaultRoundRobinIndex = 0;
 		}
 	}
-	enqueueMotionFrame(deviceId, frame) {
+	enqueueMotionFrame(deviceId, frame, handle) {
 		const state = this.cameras.get(deviceId);
 		if (!state) return;
-		state.motionQueue.enqueue(frame);
+		state.motionQueue.enqueue({
+			frame,
+			handle
+		});
 	}
 	enqueueDetectionFrame(deviceId, frame, handle) {
 		const state = this.cameras.get(deviceId);
@@ -1274,8 +1305,8 @@ var PipelineRunner = class {
 	}
 	drainMotionQueues() {
 		for (const [deviceId, state] of this.cameras) while (state.motionQueue.size > 0) {
-			const frame = state.motionQueue.dequeue();
-			if (frame) this.config.analyzeMotion(deviceId, frame);
+			const entry = state.motionQueue.dequeue();
+			if (entry) this.config.analyzeMotion(deviceId, entry.frame, entry.handle);
 		}
 	}
 	async processWithSemaphore(deviceId, entry, frameInput, state, streamType) {
@@ -1284,8 +1315,9 @@ var PipelineRunner = class {
 		const enqueuedAt = frame._enqueuedAt ?? pickedAt;
 		const release = await this.semaphore.acquire();
 		const semAcquiredAt = Date.now();
+		const executorHandle = state.detectionQueue.size <= HANDLE_PASSTHROUGH_MAX_QUEUE_DEPTH && this.semaphore.available > 0 ? handle : void 0;
 		try {
-			const result = await this.config.processFrame(deviceId, frameInput);
+			const result = await this.config.processFrame(deviceId, frameInput, executorHandle);
 			const inferDoneAt = Date.now();
 			const inferenceMs = inferDoneAt - semAcquiredAt;
 			state.inferenceTimes.push(inferenceMs);
@@ -1463,8 +1495,8 @@ var PipelineRunnerAddon = class extends require_dist.BaseAddon {
 			maxConcurrentInferences: this.config.maxConcurrentInferences,
 			targetLoadPercent: this.config.targetLoadPercent,
 			minThrottledFps: this.config.minThrottledFps,
-			processFrame: (deviceId, frame) => this.runInference(deviceId, frame),
-			analyzeMotion: (deviceId, frame) => this.runMotionAnalysis(deviceId, frame),
+			processFrame: (deviceId, frame, handle) => this.runInference(deviceId, frame, handle),
+			analyzeMotion: (deviceId, frame, handle) => this.runMotionAnalysis(deviceId, frame, handle),
 			onPhaseChanged: (deviceId, phase, meta) => this.handlePhaseChanged(deviceId, phase, meta),
 			logger: this.ctx.logger,
 			onOccupancyRecheck: (deviceId, frames) => {
@@ -2129,8 +2161,8 @@ var PipelineRunnerAddon = class extends require_dist.BaseAddon {
 			ownNodeId: this.nodeId,
 			getRemoteFrame: (handle) => this.getRemoteFrame(handle),
 			...remote ? { source: remote.makeSource(config.motionStreamId) } : {},
-			onFrame: (frame, _handle) => {
-				runner.enqueueMotionFrame(config.deviceId, frame);
+			onFrame: (frame, handle) => {
+				runner.enqueueMotionFrame(config.deviceId, frame, handle);
 			}
 		});
 	}
@@ -2221,7 +2253,7 @@ var PipelineRunnerAddon = class extends require_dist.BaseAddon {
 			}
 		});
 	}
-	async runInference(deviceId, frame) {
+	async runInference(deviceId, frame, handle) {
 		if (!this.ctx) return null;
 		const log = this.ctx.logger.withTags({ deviceId });
 		const api = this.ctx.api;
@@ -2237,10 +2269,11 @@ var PipelineRunnerAddon = class extends require_dist.BaseAddon {
 			return null;
 		}
 		if (steps.length === 0) return null;
+		const useHandle = handle !== void 0 && handle.nodeId === this.nodeId;
 		try {
 			return await api.pipelineExecutor.runPipeline.mutate({
 				steps: [...steps],
-				frame,
+				...useHandle ? { frameHandle: handle } : { frame },
 				deviceId,
 				...engine ? { engine } : {}
 			});
@@ -2250,7 +2283,7 @@ var PipelineRunnerAddon = class extends require_dist.BaseAddon {
 			return null;
 		}
 	}
-	async runMotionAnalysis(deviceId, frame) {
+	async runMotionAnalysis(deviceId, frame, handle) {
 		const ctx = this.ctx;
 		const runner = this.runner;
 		if (!ctx || !runner) return;
@@ -2262,9 +2295,10 @@ var PipelineRunnerAddon = class extends require_dist.BaseAddon {
 				log.warn("runMotionAnalysis: this.ctx.api not available");
 				return;
 			}
+			const useHandle = handle !== void 0 && handle.nodeId === this.nodeId;
 			const result = await api.motionDetection.analyze.mutate({
 				deviceId,
-				frame: toFrameInput(frame)
+				...useHandle ? { frameHandle: handle } : { frame: toFrameInput(frame) }
 			});
 			if (!result) return;
 			const detected = result.regions.length > 0;

package/dist/pipeline-runner/index.mjs

@@ -1,5 +1,5 @@
-import { B as errMsg, C as defineCustomActions, G as EventCategory, J as createEvent, N as pipelineRunnerCapability, V as BaseAddon, Z as makeSourceBrokerId, b as customAction, ct as number, dt as string, it as boolean, j as nodePin, lt as object, nt as _enum, ot as lazy, rt as array } from "../dist-CgEP_0OL.mjs";
-import { t as FrameHandlePlane } from "../frame-handle-plane-Dq20KtKL.mjs";
+import { B as errMsg, C as defineCustomActions, G as EventCategory, K as createEvent, N as pipelineRunnerCapability, V as BaseAddon, Y as makeSourceBrokerId, b as customAction, et as _enum, it as lazy, j as nodePin, lt as string, nt as boolean, ot as number, st as object, tt as array } from "../dist-C6_wgXqF.mjs";
+import { t as FrameHandlePlane } from "../frame-handle-plane-BIoY6nRV.mjs";
 import { t as resolveHubHostname } from "../hub-hostname-cCknRYKj.mjs";
 import { FrameRingReaderCache } from "@camstack/shm-ring";
 //#region src/pipeline-runner/bench-actions.ts
@@ -946,6 +946,34 @@ function ownDetectionEntry(entry) {
 		handle: entry.handle
 	};
 }
+/**
+* Clone a {@link MotionQueueEntry} for the queue's copy-on-retain boundary —
+* same contract as {@link ownDetectionEntry}: detach the borrowed shm pixels,
+* carry the plain-record `FrameHandle` through unchanged.
+*/
+function ownMotionEntry(entry) {
+	return {
+		frame: ownFrame(entry.frame),
+		handle: entry.handle
+	};
+}
+/**
+* CB5 shm FrameHandle passthrough gate. The runner hands the executor / motion
+* provider a zero-pixel shm `FrameHandle` (instead of re-serialising ~1.2MB of
+* pixels over UDS) ONLY while the pipeline is keeping up. The FrameRing is a
+* latest-wins seqlock with NO refcount, so deferring the pixel read from the
+* poll tick to the executor (after queue + semaphore + UDS) widens the
+* publish→read window — under backpressure the producer can recycle the slot
+* before the executor reads it (a silent drop). When the pipeline is backed up
+* we therefore fall back to copying pixels inline (today's behaviour).
+*
+* The per-camera detection `FrameQueue` is latest-only (capacity 1), so raw
+* queue length is 0/1 and the operative backpressure signal is inference
+* saturation on the shared semaphore — no spare inference permit ⇒ frames are
+* waiting ⇒ ship pixels. The queue-depth clause is kept for defence in depth
+* and future multi-slot queues.
+*/
+var HANDLE_PASSTHROUGH_MAX_QUEUE_DEPTH = 1;
 var DEFAULT_MOTION_COOLDOWN_MS = 3e4;
 function toFrameInput$1(frame) {
 	return {
@@ -1028,7 +1056,7 @@ var PipelineRunner = class {
 		this.detectionStreamHandler = handler;
 	}
 	registerCamera(deviceId, registration) {
-		const motionQueue = new FrameQueue(this.config.maxQueueDepth, ownFrame);
+		const motionQueue = new FrameQueue(this.config.maxQueueDepth, ownMotionEntry);
 		const detectionQueue = new FrameQueue(this.config.maxQueueDepth, ownDetectionEntry);
 		const initialPhase = registration.detectionMode === "disabled" ? "idle" : registration.detectionMode === "always-on" ? "active" : "watching";
 		const state = {
@@ -1083,10 +1111,13 @@ var PipelineRunner = class {
 			if (this.defaultRoundRobinIndex >= this.defaultRoundRobinKeys.length) this.defaultRoundRobinIndex = 0;
 		}
 	}
-	enqueueMotionFrame(deviceId, frame) {
+	enqueueMotionFrame(deviceId, frame, handle) {
 		const state = this.cameras.get(deviceId);
 		if (!state) return;
-		state.motionQueue.enqueue(frame);
+		state.motionQueue.enqueue({
+			frame,
+			handle
+		});
 	}
 	enqueueDetectionFrame(deviceId, frame, handle) {
 		const state = this.cameras.get(deviceId);
@@ -1270,8 +1301,8 @@ var PipelineRunner = class {
 	}
 	drainMotionQueues() {
 		for (const [deviceId, state] of this.cameras) while (state.motionQueue.size > 0) {
-			const frame = state.motionQueue.dequeue();
-			if (frame) this.config.analyzeMotion(deviceId, frame);
+			const entry = state.motionQueue.dequeue();
+			if (entry) this.config.analyzeMotion(deviceId, entry.frame, entry.handle);
 		}
 	}
 	async processWithSemaphore(deviceId, entry, frameInput, state, streamType) {
@@ -1280,8 +1311,9 @@ var PipelineRunner = class {
 		const enqueuedAt = frame._enqueuedAt ?? pickedAt;
 		const release = await this.semaphore.acquire();
 		const semAcquiredAt = Date.now();
+		const executorHandle = state.detectionQueue.size <= HANDLE_PASSTHROUGH_MAX_QUEUE_DEPTH && this.semaphore.available > 0 ? handle : void 0;
 		try {
-			const result = await this.config.processFrame(deviceId, frameInput);
+			const result = await this.config.processFrame(deviceId, frameInput, executorHandle);
 			const inferDoneAt = Date.now();
 			const inferenceMs = inferDoneAt - semAcquiredAt;
 			state.inferenceTimes.push(inferenceMs);
@@ -1459,8 +1491,8 @@ var PipelineRunnerAddon = class extends BaseAddon {
 			maxConcurrentInferences: this.config.maxConcurrentInferences,
 			targetLoadPercent: this.config.targetLoadPercent,
 			minThrottledFps: this.config.minThrottledFps,
-			processFrame: (deviceId, frame) => this.runInference(deviceId, frame),
-			analyzeMotion: (deviceId, frame) => this.runMotionAnalysis(deviceId, frame),
+			processFrame: (deviceId, frame, handle) => this.runInference(deviceId, frame, handle),
+			analyzeMotion: (deviceId, frame, handle) => this.runMotionAnalysis(deviceId, frame, handle),
 			onPhaseChanged: (deviceId, phase, meta) => this.handlePhaseChanged(deviceId, phase, meta),
 			logger: this.ctx.logger,
 			onOccupancyRecheck: (deviceId, frames) => {
@@ -2125,8 +2157,8 @@ var PipelineRunnerAddon = class extends BaseAddon {
 			ownNodeId: this.nodeId,
 			getRemoteFrame: (handle) => this.getRemoteFrame(handle),
 			...remote ? { source: remote.makeSource(config.motionStreamId) } : {},
-			onFrame: (frame, _handle) => {
-				runner.enqueueMotionFrame(config.deviceId, frame);
+			onFrame: (frame, handle) => {
+				runner.enqueueMotionFrame(config.deviceId, frame, handle);
 			}
 		});
 	}
@@ -2217,7 +2249,7 @@ var PipelineRunnerAddon = class extends BaseAddon {
 			}
 		});
 	}
-	async runInference(deviceId, frame) {
+	async runInference(deviceId, frame, handle) {
 		if (!this.ctx) return null;
 		const log = this.ctx.logger.withTags({ deviceId });
 		const api = this.ctx.api;
@@ -2233,10 +2265,11 @@ var PipelineRunnerAddon = class extends BaseAddon {
 			return null;
 		}
 		if (steps.length === 0) return null;
+		const useHandle = handle !== void 0 && handle.nodeId === this.nodeId;
 		try {
 			return await api.pipelineExecutor.runPipeline.mutate({
 				steps: [...steps],
-				frame,
+				...useHandle ? { frameHandle: handle } : { frame },
 				deviceId,
 				...engine ? { engine } : {}
 			});
@@ -2246,7 +2279,7 @@ var PipelineRunnerAddon = class extends BaseAddon {
 			return null;
 		}
 	}
-	async runMotionAnalysis(deviceId, frame) {
+	async runMotionAnalysis(deviceId, frame, handle) {
 		const ctx = this.ctx;
 		const runner = this.runner;
 		if (!ctx || !runner) return;
@@ -2258,9 +2291,10 @@ var PipelineRunnerAddon = class extends BaseAddon {
 				log.warn("runMotionAnalysis: this.ctx.api not available");
 				return;
 			}
+			const useHandle = handle !== void 0 && handle.nodeId === this.nodeId;
 			const result = await api.motionDetection.analyze.mutate({
 				deviceId,
-				frame: toFrameInput(frame)
+				...useHandle ? { frameHandle: handle } : { frame: toFrameInput(frame) }
 			});
 			if (!result) return;
 			const detected = result.regions.length > 0;

package/dist/recorder/index.js

@@ -1,5 +1,5 @@
 const require_model_download_service_C_IHWnXx = require("../model-download-service-C-IHWnXx-DxM2DSns.js");
-const require_dist = require("../dist-DAIlCdAx.js");
+const require_dist = require("../dist-Biq62zt4.js");
 const require_hub_hostname = require("../hub-hostname-DAJXlOgV.js");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
@@ -726,9 +726,15 @@ function buildRecordingDeviceSchema() {
 * (stringified) numeric deviceId — enumerable for boot hydrate (so the addon
 * knows which devices have persisted footage to index without scanning every
 * device store). The whole Zod-validated blob round-trips on every read/write
-* via a {@link createDurableState} handle, so no per-device field can be
-* silently dropped on persist. A corrupt blob reads back as EMPTY rather than
-* crashing boot.
+* via a {@link DurableState} handle, so no per-device field can be silently
+* dropped on persist. A corrupt blob reads back as EMPTY rather than crashing
+* boot.
+*
+* P3b settings-API migration: the functions here consume the durable handle
+* directly — in production the recorder addon builds it via the sanctioned
+* `BaseAddon.state()` (retry budget + validated fallback + parse-warning
+* logging); {@link recordingConfigsState} adapts a raw store slice for test
+* fakes. Same store key, same persisted blob shape as before.
 *
 * On read the legacy `mode`/`schedules`/`triggers` fields are derived once into
 * the authoritative `bands` via `migrateConfigToBands`, then persisted, so the
@@ -743,23 +749,14 @@ var DEFAULT_DEVICE_CONFIG = {
 	enabled: false,
 	bands: []
 };
-function blobState(store) {
-	return require_dist.createDurableState({
-		key: RECORDING_CONFIGS_KEY,
-		schema: RecordingConfigsBlobSchema,
-		fallback: {},
-		read: () => store.readAddonStore(),
-		write: (patch) => store.writeAddonStore(patch)
-	});
-}
 function serialize(map) {
 	const out = {};
 	for (const [id, config] of map) out[String(id)] = config;
 	return out;
 }
 /** Read every persisted device config, keyed by numeric deviceId. */
-async function readDeviceConfigs(store) {
-	const blob = await blobState(store).get();
+async function readDeviceConfigs(state) {
+	const blob = await state.get();
 	const map = /* @__PURE__ */ new Map();
 	for (const [key, config] of Object.entries(blob)) {
 		const id = Number(key);
@@ -773,15 +770,15 @@ async function readDeviceConfigs(store) {
 * re-persisted so the stored shape converges on the authoritative model. An
 * unconfigured device returns {@link DEFAULT_DEVICE_CONFIG}.
 */
-async function loadDeviceConfig(store, deviceId) {
-	const stored = (await readDeviceConfigs(store)).get(deviceId);
+async function loadDeviceConfig(state, deviceId) {
+	const stored = (await readDeviceConfigs(state)).get(deviceId);
 	if (!stored) return DEFAULT_DEVICE_CONFIG;
 	if (stored.bands) return stored;
 	const migrated = {
 		...stored,
 		bands: require_dist.migrateConfigToBands(stored)
 	};
-	await saveDeviceConfig(store, deviceId, migrated);
+	await saveDeviceConfig(state, deviceId, migrated);
 	return migrated;
 }
 /**
@@ -789,11 +786,11 @@ async function loadDeviceConfig(store, deviceId) {
 * `RecordingConfigSchema` at the boundary (untrusted cap input). Returns the
 * validated config that was persisted.
 */
-async function saveDeviceConfig(store, deviceId, config) {
+async function saveDeviceConfig(state, deviceId, config) {
 	const validated = require_dist.RecordingConfigSchema.parse(config);
-	const map = await readDeviceConfigs(store);
+	const map = await readDeviceConfigs(state);
 	map.set(deviceId, validated);
-	await blobState(store).set(serialize(map));
+	await state.set(serialize(map));
 	return validated;
 }
 /**
@@ -2052,9 +2049,16 @@ var resolveRecordingHubHostname = require_hub_hostname.resolveHubHostname;
 * provider until the controller swaps the manifest entry in a later step — this
 * file ships dormant (separate tree, not wired into the manifest yet).
 */
+/** Default designated recording node (`recordingNodeId` global setting). The
+*  stream-broker is hub-only and recording is a single-node global function, so
+*  the hub is the safe default — mirrors pipeline-analytics' post-processing
+*  node gate. */
+var RECORDING_NODE_DEFAULT = "hub";
 var DEFAULT_CONFIG = {
 	segmentSeconds: 10,
-	watchIntervalMs: 2e3
+	watchIntervalMs: 2e3,
+	recordingNodeId: RECORDING_NODE_DEFAULT,
+	recordingHubHostname: ""
 };
 /** Playback-marker window padding around a motion event (EventMap only; the
 *  controller's events-band gating uses the raw trigger ms, not this pad).
@@ -2069,11 +2073,6 @@ var MARKER_PAD_POST_MS = require_dist.EVENT_PAD_MS.postMs;
 *  form the hub reverse-proxy client path `/addon/recorder/playback`. */
 var RECORDER_ADDON_ID = "recorder";
 var PLAYBACK_PREFIX = "playback";
-/** Default designated recording node (`recordingNodeId` global setting). The
-*  stream-broker is hub-only and recording is a single-node global function, so
-*  the hub is the safe default — mirrors pipeline-analytics' post-processing
-*  node gate. */
-var RECORDING_NODE_DEFAULT = "hub";
 /** Node the hub-only `stream-broker` runs on. Every recorder — on the hub or on
 *  a designated agent — gates on, and pulls from, THIS node's broker. */
 var BROKER_HOST_NODE_ID = "hub";
@@ -2101,9 +2100,8 @@ var RecorderV2Addon = class extends require_dist.BaseAddon {
 	async onInitialize() {
 		const raw = this.ctx.kernel.localNodeId ?? this.ctx.id;
 		this.nodeId = raw.includes("/") ? raw.split("/")[0] : raw;
-		const store = await this.ctx.settings?.readAddonStore() ?? {};
-		const rawNode = store["recordingNodeId"];
-		const designated = typeof rawNode === "string" && rawNode.length > 0 ? rawNode : RECORDING_NODE_DEFAULT;
+		const configuredNode = this.config.recordingNodeId;
+		const designated = configuredNode.length > 0 ? configuredNode : RECORDING_NODE_DEFAULT;
 		this.isRecordingNode = this.nodeId === designated;
 		if (!this.isRecordingNode) {
 			this.ctx.logger.info("recorder INERT on this node — recording assigned elsewhere", { meta: {
@@ -2112,8 +2110,7 @@ var RecorderV2Addon = class extends require_dist.BaseAddon {
 			} });
 			return { providers: [] };
 		}
-		const rawHubHostname = store["recordingHubHostname"];
-		const consumerHostname = this.nodeId === BROKER_HOST_NODE_ID ? void 0 : resolveRecordingHubHostname(typeof rawHubHostname === "string" ? rawHubHostname : void 0, process.env["CAMSTACK_HUB_URL"]);
+		const consumerHostname = this.nodeId === BROKER_HOST_NODE_ID ? void 0 : resolveRecordingHubHostname(this.config.recordingHubHostname, process.env["CAMSTACK_HUB_URL"]);
 		if (this.nodeId !== BROKER_HOST_NODE_ID) {
 			this.ctx.logger.info("recorder is a REMOTE recording node — pulling broker streams cross-node", { meta: {
 				ownNodeId: this.nodeId,
@@ -2318,7 +2315,9 @@ var RecorderV2Addon = class extends require_dist.BaseAddon {
 	* Global settings surfaced in the admin UI (and persisted to the addon
 	* store). The cluster Recording tab drives `recordingNodeId` via a node
 	* picker; `recordingHubHostname` is an advanced override for cross-node
-	* pulls. Both take effect on addon restart (read once in `onInitialize`).
+	* pulls. Both are SHARED cluster keys (not perNode) hydrated into
+	* `this.config` by `resolveConfig()` and take effect on addon restart
+	* (read once in `onInitialize`).
 	*/
 	globalSettingsSchema() {
 		return this.schema({ sections: [{
@@ -2341,14 +2340,11 @@ var RecorderV2Addon = class extends require_dist.BaseAddon {
 			}]
 		}] });
 	}
-	/** The addon-store slice config-store reads/writes the deviceId→config blob on. */
+	/** Durable handle config-store reads/writes the deviceId→config blob on —
+	*  the sanctioned `BaseAddon.state()` wrapper (same key, same blob shape;
+	*  adds the read-retry budget + parse-warning logging over the raw slice). */
 	configStore() {
-		const settings = this.ctx.settings;
-		if (!settings) throw new Error("RecorderV2Addon: ctx.settings unavailable — cannot persist recording config");
-		return {
-			readAddonStore: () => settings.readAddonStore(),
-			writeAddonStore: (patch) => settings.writeAddonStore(patch)
-		};
+		return this.state(RECORDING_CONFIGS_KEY, RecordingConfigsBlobSchema, {});
 	}
 };
 //#endregion

package/dist/recorder/index.mjs

@@ -1,4 +1,4 @@
-import { B as errMsg, G as EventCategory, I as storageEvictableCapability, P as recordingCapability, V as BaseAddon, W as DeviceType, Y as hydrateSchema, c as EVENT_PAD_MS, dt as string, et as selectAssignedProfileSlots, f as RecordingConfigSchema, k as migrateConfigToBands, q as createDurableState, ut as record } from "../dist-CgEP_0OL.mjs";
+import { B as errMsg, G as EventCategory, I as storageEvictableCapability, P as recordingCapability, Q as selectAssignedProfileSlots, V as BaseAddon, W as DeviceType, c as EVENT_PAD_MS, ct as record, f as RecordingConfigSchema, k as migrateConfigToBands, lt as string, q as hydrateSchema } from "../dist-C6_wgXqF.mjs";
 import { t as resolveHubHostname } from "../hub-hostname-cCknRYKj.mjs";
 import { t as createFileDataPlaneHandler } from "../model-download-service-C-IHWnXx-BPy6aoAx.mjs";
 import { promises } from "node:fs";
@@ -725,9 +725,15 @@ function buildRecordingDeviceSchema() {
 * (stringified) numeric deviceId — enumerable for boot hydrate (so the addon
 * knows which devices have persisted footage to index without scanning every
 * device store). The whole Zod-validated blob round-trips on every read/write
-* via a {@link createDurableState} handle, so no per-device field can be
-* silently dropped on persist. A corrupt blob reads back as EMPTY rather than
-* crashing boot.
+* via a {@link DurableState} handle, so no per-device field can be silently
+* dropped on persist. A corrupt blob reads back as EMPTY rather than crashing
+* boot.
+*
+* P3b settings-API migration: the functions here consume the durable handle
+* directly — in production the recorder addon builds it via the sanctioned
+* `BaseAddon.state()` (retry budget + validated fallback + parse-warning
+* logging); {@link recordingConfigsState} adapts a raw store slice for test
+* fakes. Same store key, same persisted blob shape as before.
 *
 * On read the legacy `mode`/`schedules`/`triggers` fields are derived once into
 * the authoritative `bands` via `migrateConfigToBands`, then persisted, so the
@@ -742,23 +748,14 @@ var DEFAULT_DEVICE_CONFIG = {
 	enabled: false,
 	bands: []
 };
-function blobState(store) {
-	return createDurableState({
-		key: RECORDING_CONFIGS_KEY,
-		schema: RecordingConfigsBlobSchema,
-		fallback: {},
-		read: () => store.readAddonStore(),
-		write: (patch) => store.writeAddonStore(patch)
-	});
-}
 function serialize(map) {
 	const out = {};
 	for (const [id, config] of map) out[String(id)] = config;
 	return out;
 }
 /** Read every persisted device config, keyed by numeric deviceId. */
-async function readDeviceConfigs(store) {
-	const blob = await blobState(store).get();
+async function readDeviceConfigs(state) {
+	const blob = await state.get();
 	const map = /* @__PURE__ */ new Map();
 	for (const [key, config] of Object.entries(blob)) {
 		const id = Number(key);
@@ -772,15 +769,15 @@ async function readDeviceConfigs(store) {
 * re-persisted so the stored shape converges on the authoritative model. An
 * unconfigured device returns {@link DEFAULT_DEVICE_CONFIG}.
 */
-async function loadDeviceConfig(store, deviceId) {
-	const stored = (await readDeviceConfigs(store)).get(deviceId);
+async function loadDeviceConfig(state, deviceId) {
+	const stored = (await readDeviceConfigs(state)).get(deviceId);
 	if (!stored) return DEFAULT_DEVICE_CONFIG;
 	if (stored.bands) return stored;
 	const migrated = {
 		...stored,
 		bands: migrateConfigToBands(stored)
 	};
-	await saveDeviceConfig(store, deviceId, migrated);
+	await saveDeviceConfig(state, deviceId, migrated);
 	return migrated;
 }
 /**
@@ -788,11 +785,11 @@ async function loadDeviceConfig(store, deviceId) {
 * `RecordingConfigSchema` at the boundary (untrusted cap input). Returns the
 * validated config that was persisted.
 */
-async function saveDeviceConfig(store, deviceId, config) {
+async function saveDeviceConfig(state, deviceId, config) {
 	const validated = RecordingConfigSchema.parse(config);
-	const map = await readDeviceConfigs(store);
+	const map = await readDeviceConfigs(state);
 	map.set(deviceId, validated);
-	await blobState(store).set(serialize(map));
+	await state.set(serialize(map));
 	return validated;
 }
 /**
@@ -2051,9 +2048,16 @@ var resolveRecordingHubHostname = resolveHubHostname;
 * provider until the controller swaps the manifest entry in a later step — this
 * file ships dormant (separate tree, not wired into the manifest yet).
 */
+/** Default designated recording node (`recordingNodeId` global setting). The
+*  stream-broker is hub-only and recording is a single-node global function, so
+*  the hub is the safe default — mirrors pipeline-analytics' post-processing
+*  node gate. */
+var RECORDING_NODE_DEFAULT = "hub";
 var DEFAULT_CONFIG = {
 	segmentSeconds: 10,
-	watchIntervalMs: 2e3
+	watchIntervalMs: 2e3,
+	recordingNodeId: RECORDING_NODE_DEFAULT,
+	recordingHubHostname: ""
 };
 /** Playback-marker window padding around a motion event (EventMap only; the
 *  controller's events-band gating uses the raw trigger ms, not this pad).
@@ -2068,11 +2072,6 @@ var MARKER_PAD_POST_MS = EVENT_PAD_MS.postMs;
 *  form the hub reverse-proxy client path `/addon/recorder/playback`. */
 var RECORDER_ADDON_ID = "recorder";
 var PLAYBACK_PREFIX = "playback";
-/** Default designated recording node (`recordingNodeId` global setting). The
-*  stream-broker is hub-only and recording is a single-node global function, so
-*  the hub is the safe default — mirrors pipeline-analytics' post-processing
-*  node gate. */
-var RECORDING_NODE_DEFAULT = "hub";
 /** Node the hub-only `stream-broker` runs on. Every recorder — on the hub or on
 *  a designated agent — gates on, and pulls from, THIS node's broker. */
 var BROKER_HOST_NODE_ID = "hub";
@@ -2100,9 +2099,8 @@ var RecorderV2Addon = class extends BaseAddon {
 	async onInitialize() {
 		const raw = this.ctx.kernel.localNodeId ?? this.ctx.id;
 		this.nodeId = raw.includes("/") ? raw.split("/")[0] : raw;
-		const store = await this.ctx.settings?.readAddonStore() ?? {};
-		const rawNode = store["recordingNodeId"];
-		const designated = typeof rawNode === "string" && rawNode.length > 0 ? rawNode : RECORDING_NODE_DEFAULT;
+		const configuredNode = this.config.recordingNodeId;
+		const designated = configuredNode.length > 0 ? configuredNode : RECORDING_NODE_DEFAULT;
 		this.isRecordingNode = this.nodeId === designated;
 		if (!this.isRecordingNode) {
 			this.ctx.logger.info("recorder INERT on this node — recording assigned elsewhere", { meta: {
@@ -2111,8 +2109,7 @@ var RecorderV2Addon = class extends BaseAddon {
 			} });
 			return { providers: [] };
 		}
-		const rawHubHostname = store["recordingHubHostname"];
-		const consumerHostname = this.nodeId === BROKER_HOST_NODE_ID ? void 0 : resolveRecordingHubHostname(typeof rawHubHostname === "string" ? rawHubHostname : void 0, process.env["CAMSTACK_HUB_URL"]);
+		const consumerHostname = this.nodeId === BROKER_HOST_NODE_ID ? void 0 : resolveRecordingHubHostname(this.config.recordingHubHostname, process.env["CAMSTACK_HUB_URL"]);
 		if (this.nodeId !== BROKER_HOST_NODE_ID) {
 			this.ctx.logger.info("recorder is a REMOTE recording node — pulling broker streams cross-node", { meta: {
 				ownNodeId: this.nodeId,
@@ -2317,7 +2314,9 @@ var RecorderV2Addon = class extends BaseAddon {
 	* Global settings surfaced in the admin UI (and persisted to the addon
 	* store). The cluster Recording tab drives `recordingNodeId` via a node
 	* picker; `recordingHubHostname` is an advanced override for cross-node
-	* pulls. Both take effect on addon restart (read once in `onInitialize`).
+	* pulls. Both are SHARED cluster keys (not perNode) hydrated into
+	* `this.config` by `resolveConfig()` and take effect on addon restart
+	* (read once in `onInitialize`).
 	*/
 	globalSettingsSchema() {
 		return this.schema({ sections: [{
@@ -2340,14 +2339,11 @@ var RecorderV2Addon = class extends BaseAddon {
 			}]
 		}] });
 	}
-	/** The addon-store slice config-store reads/writes the deviceId→config blob on. */
+	/** Durable handle config-store reads/writes the deviceId→config blob on —
+	*  the sanctioned `BaseAddon.state()` wrapper (same key, same blob shape;
+	*  adds the read-retry budget + parse-warning logging over the raw slice). */
 	configStore() {
-		const settings = this.ctx.settings;
-		if (!settings) throw new Error("RecorderV2Addon: ctx.settings unavailable — cannot persist recording config");
-		return {
-			readAddonStore: () => settings.readAddonStore(),
-			writeAddonStore: (patch) => settings.writeAddonStore(patch)
-		};
+		return this.state(RECORDING_CONFIGS_KEY, RecordingConfigsBlobSchema, {});
 	}
 };
 //#endregion

package/dist/stream-broker/_stub.js

@@ -1,8 +1,8 @@
-import { a as e, c as t, i as n, l as r, n as i, o as a, r as o, s, t as c, u as l } from "./_virtual_mf___mfe_internal__addon_stream_broker_widgets__loadShare___mf_0_camstack_mf_1_ui_mf_2_library__loadShare__.js-BJK0-svt.mjs";
+import { a as e, c as t, i as n, l as r, n as i, o as a, r as o, s, t as c, u as l } from "./_virtual_mf___mfe_internal__addon_stream_broker_widgets__loadShare___mf_0_camstack_mf_1_ui_mf_2_library__loadShare__.js-DtoYGpTp.mjs";
 import { a as u, i as d, n as f, o as p, r as m, t as h } from "./_virtual_mf___mfe_internal__addon_stream_broker_widgets__loadShare__react__loadShare__.js-C9j-2lBe.mjs";
 import { n as g, r as _, t as v } from "./_virtual_mf___mfe_internal__addon_stream_broker_widgets__loadShare__react_mf_1_jsx_mf_2_runtime__loadShare__.js-XO0-Pyu6.mjs";
 import { n as y, t as b } from "./_virtual_mf___mfe_internal__addon_stream_broker_widgets__loadShare___mf_0_tanstack_mf_1_react_mf_2_query__loadShare__.js-BO7TIbJV.mjs";
-import { t as x } from "./_virtual_mf___mfe_internal__addon_stream_broker_widgets__loadShare___mf_0_camstack_mf_1_types__loadShare__.js-CkOPfV8r.mjs";
+import { t as x } from "./_virtual_mf___mfe_internal__addon_stream_broker_widgets__loadShare___mf_0_camstack_mf_1_types__loadShare__.js-DhY3MZ2C.mjs";
 //#region ../../node_modules/lucide-react/dist/esm/shared/src/utils.js
 var S = (e) => e.replace(/([a-z0-9])([A-Z])/g, "$1-$2").toLowerCase(), C = (e) => e.replace(/^([A-Z])|[\s-_]+(\w)/g, (e, t, n) => n ? n.toUpperCase() : t.toLowerCase()), w = (e) => {
 	let t = C(e);