@camstack/addon-export-hap 1.2.13 → 1.2.14

package/dist/export-hap.addon.mjs

@@ -1,6 +1,7 @@
 import { createRequire } from "node:module";
 import { createHash, randomBytes } from "node:crypto";
 import * as path from "node:path";
+import { readFileSync } from "node:fs";
 import { spawn } from "node:child_process";
 import { Accessory, AudioBitrate, AudioStreamingCodecType, AudioStreamingSamplerate, CameraController, Categories, Characteristic, DoorbellController, H264Level, H264Profile, HAPStorage, SRTPCryptoSuites, Service, uuid } from "@homebridge/hap-nodejs";
 import * as fs from "node:fs/promises";
@@ -10,6 +11,43 @@ import { networkInterfaces } from "node:os";
 var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 //#endregion
+//#region src/exposed-entry.ts
+/**
+* Carrying an exposed-device entry across a re-expose.
+*
+* `exposeDevice` rebuilds its entry from scratch — display name, mapper kind,
+* timestamp — and then REPLACES the stored one. Anything the rebuilt object
+* does not mention is therefore destroyed, and two things it never mentioned
+* were the per-camera settings and the capability list.
+*
+* The visible cost: the operator's "Source stream (HomeKit)" selector writes
+* `low`, the addon logs `streamPreference changed — refreshing accessory
+* {from=auto to=low}`, and the accessory that comes back derives its
+* advertisement from DEFAULTS — `streamPreference=auto` — because the settings
+* were dropped between the write and the rebuild. The selector only ever took
+* effect after a full addon restart, when the settings were loaded first. A
+* second write after the re-expose hid this: the store ended up correct, so
+* nothing looked wrong except the stream nobody could explain.
+*/
+/**
+* Fill `base` from `existing` for the given keys, letting `base` win wherever
+* it actually says something.
+*
+* That asymmetry is the point: a caller who passes `capabilities` is stating a
+* new truth and must not be overruled by the stored copy, while a caller who
+* says nothing about `settings` is not asking for them to be erased.
+*/
+function carryForward(base, existing, keys) {
+	if (existing === void 0) return base;
+	const out = { ...base };
+	for (const key of keys) {
+		if (out[key] !== void 0) continue;
+		const carried = existing[key];
+		if (carried !== void 0) out[key] = carried;
+	}
+	return out;
+}
+//#endregion
 //#region ../types/dist/event-category-41fKf-q9.mjs
 var EventCategory = /* @__PURE__ */ function(EventCategory) {
 	EventCategory["SystemBoot"] = "system.boot";
@@ -6521,9 +6559,38 @@ var CAP_NODE_PIN_CONTEXT_KEY = "__camstackNodePin";
 /**
 * Build the tRPC request options that pin a single capability call to `nodeId`.
 * Pass as the second argument to `.query(input, …)` / `.mutate(input, …)`.
+*
+* ## The id is normalised here, and it has to be
+*
+* A forked addon reads its own node from `ctx.kernel.localNodeId`, and inside a
+* worker that value is a RUNNER id — `hub/export-hap`, not `hub`. Routing
+* compares a pin against real node ids, so such a pin matches nothing and the
+* call fails with `no provider registered for cap "…"`. The local-first
+* resolver already guarded against this (`localNodeId.split('/')[0]`), which
+* made the hazard invisible: unpinned calls worked, and only an explicit pin —
+* the thing you reach for when you specifically need THIS node — silently
+* addressed a node that does not exist.
+*
+* Cost of it being missing: `addon-export-hap` pinned `decoder.getInfo` to its
+* own node to read the host's hardware-decode backend. It never once answered,
+* so every HomeKit egress transcode decoded in SOFTWARE — including 4K H.265 —
+* while D67's whole premise was that the decoder addon is the authority on
+* hardware. The warn said `decoding in SOFTWARE` and read as "this node has no
+* hardware", which was false.
+*
+* Normalising in the ONE constructor fixes every caller at once, which is why
+* it is here and not at the call sites.
 */
 function nodePin(nodeId) {
-	return { context: { [CAP_NODE_PIN_CONTEXT_KEY]: nodeId } };
+	return { context: { [CAP_NODE_PIN_CONTEXT_KEY]: toNodeId(nodeId) } };
+}
+/**
+* A runner id is `<nodeId>/<addonId>`; a node id has no slash. Taking the head
+* is idempotent, so passing an already-clean id costs nothing.
+*/
+function toNodeId(idOrRunnerId) {
+	const head = idOrRunnerId.split("/")[0];
+	return head === void 0 || head.length === 0 ? idOrRunnerId : head;
 }
 /**
 * Output schema shared by the contribution + live methods.
@@ -7072,6 +7139,270 @@ var EncodeProfileSchema = object({
 	*/
 	outputArgs: array(string()).optional()
 });
+var AUDIO_ENCODER_BY_CODEC = {
+	opus: "libopus",
+	aac: "aac",
+	pcmu: "pcm_mulaw",
+	pcma: "pcm_alaw"
+};
+/**
+* Camera-microphone audio, per codec. Lives HERE rather than in
+* `encode-defaults.ts` only to avoid an import cycle (`encode-defaults` depends
+* on these types); it is re-exported from there, which is where to read it.
+*
+* Every source in this repo is a mono camera mic. The former broker preset
+* encoded Opus at `channels: 2`, spending bitrate duplicating one channel —
+* that is the value this consolidation changed.
+*/
+var AUDIO_PRESETS = {
+	aac: {
+		kind: "encode",
+		codec: "aac",
+		bitrateKbps: 128,
+		sampleRateHz: 48e3,
+		channels: 1
+	},
+	opus: {
+		kind: "encode",
+		codec: "opus",
+		bitrateKbps: 64,
+		sampleRateHz: 48e3,
+		channels: 1
+	},
+	pcmu: {
+		kind: "encode",
+		codec: "pcmu",
+		sampleRateHz: 8e3,
+		channels: 1
+	}
+};
+/** `-hide_banner -loglevel <level>` — every ffmpeg site opens with this. */
+function logBannerArgs(level) {
+	return [
+		"-hide_banner",
+		"-loglevel",
+		level
+	];
+}
+/** `true` when the resolved value means "decode in software" (⇒ no `-hwaccel`). */
+function isSoftwareDecode(decodeHwAccel) {
+	return !decodeHwAccel || decodeHwAccel === "none" || decodeHwAccel === "copy";
+}
+/**
+* Every INPUT option, in order, terminated by `-i <url>`. Nothing may be
+* appended to this list by a caller — that is the whole point of the function.
+*/
+function buildInputArgs(input, decodeHwAccel) {
+	const args = [];
+	if (!isSoftwareDecode(decodeHwAccel)) args.push("-hwaccel", String(decodeHwAccel));
+	if (input.extraArgs?.length) args.push(...input.extraArgs);
+	if (input.analyzeDurationUs !== void 0) args.push("-analyzeduration", String(input.analyzeDurationUs));
+	if (input.probeSizeBytes !== void 0) args.push("-probesize", String(input.probeSizeBytes));
+	if (input.fflags?.length) for (const flag of input.fflags) args.push("-fflags", flag);
+	if (input.rtspTransport) args.push("-rtsp_transport", input.rtspTransport);
+	args.push("-i", input.url);
+	return args;
+}
+/** The `-vf` filter args, or `[]` when a consumer `-vf` already claims the slot. */
+function buildVideoFilterArgs(scale, outputArgs) {
+	if (!scale) return [];
+	if (outputArgs.some((a) => a === "-vf")) return [];
+	if (scale.mode === "exact") return ["-vf", `scale=${scale.width}:${scale.height}`];
+	return ["-vf", `scale='min(${scale.width},iw)':'min(${scale.height},ih)':force_original_aspect_ratio=decrease:force_divisible_by=2`];
+}
+/** Rate-control args for an encode plan. */
+function buildRateControlArgs(video) {
+	const kbps = video.bitrateKbps;
+	if (kbps === void 0) return [];
+	const rc = video.rateControl ?? {
+		kind: "cap",
+		vbvSeconds: 2
+	};
+	const bufsize = Math.max(1, Math.round(kbps * rc.vbvSeconds));
+	return [
+		...rc.kind === "cbr" ? ["-b:v", `${kbps}k`] : [],
+		"-maxrate",
+		`${kbps}k`,
+		"-bufsize",
+		`${bufsize}k`
+	];
+}
+/** The whole video block (`-vf` … `-c:v` … knobs), after `-i`. */
+function buildVideoArgs(video, outputArgs) {
+	if (video.kind === "copy") return [
+		"-c:v",
+		"copy",
+		...video.bitstreamFilter ? ["-bsf:v", video.bitstreamFilter] : []
+	];
+	const args = [
+		...buildVideoFilterArgs(video.scale, outputArgs),
+		"-c:v",
+		video.encoder
+	];
+	if (video.preset !== void 0) args.push("-preset", video.preset);
+	if (video.tune !== void 0) args.push("-tune", video.tune);
+	if (video.profile !== void 0) args.push("-profile:v", video.profile);
+	if (video.level !== void 0) args.push("-level", video.level);
+	if (video.pixelFormat !== void 0) args.push("-pix_fmt", video.pixelFormat);
+	if (video.fps !== void 0) args.push("-r", String(video.fps));
+	if (video.gopFrames !== void 0) args.push("-g", String(video.gopFrames));
+	if (video.forceKeyFramesSeconds !== void 0) args.push("-force_key_frames", `expr:gte(t,n_forced*${video.forceKeyFramesSeconds})`);
+	if (video.bf !== void 0) args.push("-bf", String(video.bf));
+	args.push(...buildRateControlArgs(video));
+	if (video.bitstreamFilter !== void 0) args.push("-bsf:v", video.bitstreamFilter);
+	return args;
+}
+/** The whole audio block, after `-i`. */
+function buildAudioArgs(audio) {
+	if (audio.kind === "none") return ["-an"];
+	if (audio.kind === "copy") return ["-c:a", "copy"];
+	const args = [];
+	if (audio.filter !== void 0) args.push("-af", audio.filter);
+	args.push("-c:a", AUDIO_ENCODER_BY_CODEC[audio.codec]);
+	if (audio.application !== void 0) args.push("-application", audio.application);
+	if (audio.frameDurationMs !== void 0) args.push("-frame_duration", String(audio.frameDurationMs));
+	if (audio.globalHeader === true) args.push("-flags", "+global_header");
+	if (audio.sampleRateHz !== void 0) args.push("-ar", String(audio.sampleRateHz));
+	if (audio.bitrateKbps !== void 0) args.push("-b:a", `${audio.bitrateKbps}k`);
+	if (audio.vbvBufferKbits !== void 0) args.push("-bufsize", `${audio.vbvBufferKbits}k`);
+	if (audio.channels !== void 0) args.push("-ac", String(audio.channels));
+	return args;
+}
+/** RTP output-leg args (`-payload_type`, `-ssrc`, `-sdp_file`, `-f rtp <url>`). */
+function buildRtpOutputArgs(out) {
+	const args = [];
+	if (out.payloadType !== void 0) args.push("-payload_type", String(out.payloadType));
+	if (out.ssrc !== void 0) args.push("-ssrc", String(out.ssrc));
+	if (out.sdpFile !== void 0) args.push("-sdp_file", out.sdpFile);
+	args.push("-f", "rtp", out.url);
+	return args;
+}
+/** `true` when the sink is a raw elementary bytestream that cannot mux audio. */
+function isElementaryVideoSink(sink) {
+	return sink.kind === "stdout" && (sink.container === "h264" || sink.container === "hevc");
+}
+/**
+* The fragmented-MP4 muxer flags, in the order the recorder has proven them
+* (`recorder/addon/ffmpeg-args.ts` passes the same `movflags` string through
+* `-segment_format_options`, across every vendor in the fleet):
+*
+* - `frag_keyframe` — cut a fragment at each key frame, so every fragment
+*   opens on a sync sample. HKSV's whole requirement.
+* - `empty_moov` — write `ftyp`+`moov` up front with no samples in it, which
+*   is what makes the head a standalone INITIALISATION segment.
+* - `default_base_moof` — fragment offsets are self-relative, so a fragment is
+*   demuxable without the bytes that preceded it. D31's byte-range read path
+*   depends on exactly this property of the recorder's segments.
+*/
+var FMP4_MOVFLAGS = "+frag_keyframe+empty_moov+default_base_moof";
+/**
+* The terminal sink args for every non-`rtp-outputs` sink. Exhaustive over the
+* union so a new member cannot fall through to `['-f', container, 'pipe:1']`,
+* which is what a plain `container` read would have done for `mp4` — a valid
+* argv that writes a NON-fragmented, unseekable-to-a-pipe MP4 and produces one
+* unusable byte stream.
+*/
+function buildStdoutOrRtspSinkArgs(sink) {
+	if (sink.kind === "rtsp-listen") return [
+		"-f",
+		"rtsp",
+		"-rtsp_transport",
+		"tcp",
+		"-rtsp_flags",
+		"listen",
+		sink.url
+	];
+	if (sink.kind === "rtp-outputs") return [];
+	return sink.container === "mp4" ? buildFmp4SinkArgs(sink) : [
+		"-f",
+		sink.container,
+		"pipe:1"
+	];
+}
+/** `-movflags … -min_frag_duration <us> -f mp4 pipe:1`. */
+function buildFmp4SinkArgs(sink) {
+	return [
+		"-movflags",
+		FMP4_MOVFLAGS,
+		"-min_frag_duration",
+		String(Math.max(0, Math.round(sink.fragmentMs * 1e3))),
+		"-f",
+		"mp4",
+		"pipe:1"
+	];
+}
+/**
+* A second output mapping source audio to RTP-over-UDP. `0:a:0?` makes the
+* audio optional so a source with no audio skips it instead of failing the
+* whole invocation.
+*/
+function buildAudioSidecarArgs(sidecar) {
+	return [
+		"-map",
+		"0:a:0?",
+		...buildAudioArgs(sidecar.codec === "pcma" ? {
+			kind: "encode",
+			codec: "pcma",
+			sampleRateHz: 8e3,
+			channels: 1
+		} : AUDIO_PRESETS[sidecar.codec]),
+		...buildRtpOutputArgs({
+			url: sidecar.rtpUrl,
+			sdpFile: sidecar.sdpFile
+		})
+	];
+}
+/**
+* Assemble the full ffmpeg argument list. Layout:
+*
+*   -hide_banner -loglevel <level>
+*   [-hwaccel <backend|auto>]        ─┐ INPUT options — strictly before -i.
+*   [<input.extraArgs>]               │
+*   [-fflags <flag>…]                 │
+*   [-rtsp_transport tcp]             │
+*   -i <url>                         ─┘
+*   <video block>  <threads>  <audio block>   ─┐ OUTPUT options.
+*   <consumer outputArgs verbatim>             │
+*   <sink>                                    ─┘ terminal
+*/
+function buildFfmpegArgs(inv) {
+	const head = [...logBannerArgs(inv.logLevel), ...buildInputArgs(inv.input, inv.decodeHwAccel)];
+	const threadArgs = inv.threadCount > 0 ? ["-threads", String(inv.threadCount)] : [];
+	if (inv.sink.kind === "rtp-outputs") {
+		const videoLeg = inv.sink.video ? [
+			"-an",
+			"-map",
+			"0:v:0",
+			...buildVideoArgs(inv.video, inv.outputArgs),
+			...threadArgs,
+			...inv.outputArgs,
+			...buildRtpOutputArgs(inv.sink.video)
+		] : [];
+		const audioLeg = inv.sink.audio ? [
+			"-vn",
+			"-map",
+			"0:a:0?",
+			...buildAudioArgs(inv.audio),
+			...buildRtpOutputArgs(inv.sink.audio)
+		] : [];
+		return [
+			...head,
+			...videoLeg,
+			...audioLeg
+		];
+	}
+	const audioArgs = isElementaryVideoSink(inv.sink) ? ["-an"] : buildAudioArgs(inv.audio);
+	const sinkArgs = buildStdoutOrRtspSinkArgs(inv.sink);
+	return [
+		...head,
+		...buildVideoArgs(inv.video, inv.outputArgs),
+		...threadArgs,
+		...audioArgs,
+		...inv.outputArgs,
+		...sinkArgs,
+		...inv.audioSidecar ? buildAudioSidecarArgs(inv.audioSidecar) : []
+	];
+}
 /**
 * The shape every live egress starts from: H.264 Baseline 3.1 at 720p25.
 * Baseline because it is the one profile every consumer in this repo decodes
@@ -7095,6 +7426,34 @@ var BASE_LIVE_EGRESS_PROFILE = {
 };
 ({ ...BASE_LIVE_EGRESS_PROFILE }), { ...BASE_LIVE_EGRESS_PROFILE.video };
 ({ ...BASE_LIVE_EGRESS_PROFILE });
+/** VBV window for a consumer whose budget is enforced per second (HomeKit). */
+var RATE_CONTROL_TIGHT = {
+	kind: "cbr",
+	vbvSeconds: 1
+};
+var HAP_AUDIO_BASE = {
+	kind: "encode",
+	codec: "opus",
+	bitrateKbps: 24,
+	channels: 1,
+	application: "lowdelay",
+	globalHeader: true,
+	filter: "aresample=async=1000:first_pts=0"
+};
+function createHwAccelCache(options) {
+	const now = options.now ?? (() => Date.now());
+	let value = null;
+	let writtenAt = Number.NEGATIVE_INFINITY;
+	return {
+		read() {
+			return now() - writtenAt < options.ttlMs ? value : void 0;
+		},
+		write(next) {
+			value = next;
+			writtenAt = now();
+		}
+	};
+}
 /**
 * Deep wiring healthcheck — snapshot of active reachability probes across
 * every declared capability + widget of every installed plugin, on every
@@ -7151,7 +7510,7 @@ object({
 * ## This file adds no state
 *
 * Every switch here is a VIEW onto an authority that already existed
-* ([D61](../../../../docs/decisions/adr-0062.md)). The whole point of the
+* ([D62](../../../../docs/decisions/adr-0062.md)). The whole point of the
 * group is that there is exactly one place each function is turned off, and
 * the group routes to it:
 *
@@ -7162,6 +7521,40 @@ object({
 * | `audio-analysis` | `deviceManager.setWrapperActive('audio-analysis')` | `AudioSubscriptionController.subscribeAudioStream` returns `null` before opening the stream |
 * | `recording` | `recording.setDeviceConfig` → `RecordingConfig.enabled` | `band-decision.shouldRecord` returns false; the controller detaches the device |
 * | `notifications` | `notificationRules.setDeviceMuted` | `NotificationCenter.evaluateAndEnqueue` returns before any rule is evaluated |
+* | `privacy-mask` | `privacyMask.setMask({ enabled })` → the CAMERA | the camera blanks the masked regions itself; every stream and recording carries the black boxes |
+* | `device-audio` | `privacyMask.setAudioEnabled` → the CAMERA | the camera stops encoding an audio track at all; every consumer sees silent video |
+*
+* ## The two switches whose authority is not on this server
+*
+* `privacy-mask` and `device-audio` write the CAMERA. That is not a loophole
+* in "the group stores nothing" — it is the purest form of it: the camera
+* holds the fact, every read is a read-through, and there is no server-side
+* copy that could drift. Their availability therefore cannot come from
+* `listBindableCapsForDeviceType` (a device-NATIVE cap carries no wrappers and
+* is filtered out there); it comes from the cap's own camera-probed
+* `privacyMask.getOptions()`, which is strictly more honest — it answers for
+* THIS camera rather than for the device type
+* ([D74](../../../../docs/decisions/adr-0074.md)).
+*
+* ## `privacy-mask` is the one row whose ON is not "the function is working"
+*
+* Every other switch means *this camera's function is doing its job*, so
+* `enabled: false` is a thing an operator took away. `privacy-mask` means **the
+* MASK is active** — `enabled: true` is video deliberately obscured. The
+* polarity is not a choice made here: `addon-export-hap`'s privacy `Switch`
+* (`builders/privacy-switch.ts`) already mirrors `patch.enabled` verbatim, and
+* a HomeKit toggle that disagreed with the app's toggle for the same camera is
+* worse than either surface not having one.
+*
+* Two consequences follow and both are load-bearing:
+*
+* - **It never counts as `switchedOff`.** `countsAsSwitchedOff` is `false` for
+*   exactly this row. With the polarity above, every camera that has NOT drawn
+*   a privacy mask would otherwise report `switchedOff: ['privacy-mask']` — the
+*   normal, healthy state of most cameras rendered as an operator disablement.
+* - **Its cost line names BOTH directions.** `costWhenOff` is rendered
+*   unconditionally by both clients, so for this row it has to read correctly
+*   whichever way the switch is sitting.
 *
 * The wrapper-binding pair is not a new idea: `legacy-migrations.ts` already
 * migrated the legacy `audioEnabled` / `pipelineEnabled` /
@@ -7180,14 +7573,17 @@ object({
 *   `CameraStatus.switchedOff`.
 */
 /**
-* The five functions the operator named (2026-08-05). Deliberately NOT one id
-* per pipeline step: face recognition and plate/LPR are per-step toggles on
+* The functions the operator named — five on 2026-08-05, plus the camera's own
+* microphone on 2026-08-07. Deliberately NOT one id per pipeline step: face
+* recognition and plate/LPR are per-step toggles on
 * `pipelineOrchestrator.setCameraStepToggle` and belong in the pipeline
-* editor, not in a five-button safety group.
+* editor, not in a safety group.
 */
 var CameraSwitchIdSchema = _enum([
 	"stream-broker",
 	"object-detection",
+	"privacy-mask",
+	"device-audio",
 	"audio-analysis",
 	"recording",
 	"notifications"
@@ -7205,14 +7601,26 @@ var CameraSwitchAuthoritySchema = discriminatedUnion("kind", [
 		capName: string()
 	}),
 	object({ kind: literal("recording-config") }),
-	object({ kind: literal("notification-mute") })
+	object({ kind: literal("notification-mute") }),
+	object({
+		kind: literal("camera-audio"),
+		capName: string()
+	}),
+	object({
+		kind: literal("camera-mask"),
+		capName: string()
+	})
 ]);
 /**
 * Why a switch is not offered for this camera. Rendered instead of the
 * control, never as a dead control — an absent function and a broken one must
 * not look the same.
 */
-var CameraSwitchUnavailableReasonSchema = _enum(["no-provider", "source-unreachable"]);
+var CameraSwitchUnavailableReasonSchema = _enum([
+	"no-provider",
+	"source-unreachable",
+	"not-configured"
+]);
 /**
 * One switch, resolved for one camera.
 *
@@ -9234,6 +9642,26 @@ var EgressTranscodeRequestSchema = object({
 		"h264_mp4toannexb",
 		"hevc_mp4toannexb"
 	]).optional(),
+	/**
+	* Publish the transcode as a LOCAL push cam stream, instead of leaving the
+	* consumer to dial the returned url. The broker picks the id and returns it
+	* as `camStreamId` — a caller-supplied one would be circular, since the
+	* sharing key is computed FROM this request.
+	*
+	* The url is still returned and still the contract for a transcode pinned to
+	* another node. But dialling it locally costs an RTSP round trip that changes
+	* the transport underneath the consumer: a dialled stream is an RTP source,
+	* so `isRtpSource()` is true and the session takes the RTP-passthrough +
+	* repacketizer branch. The push branch — the one the derived mechanism has
+	* live hours on — is never reached. Measured on Alexa: broker registered, RTP
+	* arriving, key frame arriving, black screen, on a chain healthy at every
+	* other point.
+	*
+	* Same idea the transport already applies to CALLS, where `classifyCapRoute`
+	* gives priority to `hub-in-process` so a local call never leaves the node.
+	* This is that rule for media.
+	*/
+	publishLocally: boolean().optional(),
 	pixelFormat: _enum(["yuv420p", "nv12"]).optional(),
 	/**
 	* Operator/consumer override for decode hardware. ABSENT is the normal case
@@ -9278,7 +9706,13 @@ var EgressTranscodeSchema = object({
 	* Returned rather than assumed: a consumer that asked for hardware and got
 	* software needs to be able to see that without reading the broker's logs.
 	*/
-	decodeHwAccel: string().nullable()
+	decodeHwAccel: string().nullable(),
+	/**
+	* Set when `publishLocally` was honoured: attach to THIS instead of dialling
+	* `url`, and the session takes the push/deframe transport rather than the
+	* RTP-passthrough one. `null` means the consumer must dial.
+	*/
+	camStreamId: string().nullable()
 });
 method(object({
 	deviceId: number().int().nonnegative(),
@@ -17120,9 +17554,15 @@ DeviceType.Camera, method(object({
 	* Bypass the cache freshness check and fetch directly from the
 	* native (or stream-broker fallback). Triggered by the UI's
 	* "refresh" button so an operator can force a fresh frame
-	* even when the cache is well within `snapshotMaxAgeMs`.
-	* On battery cams this WILL wake the camera — accept the
-	* cost only when the user explicitly asks for it.
+	* even when the cache is well within the device's
+	* `snapshotMaxAgeS` window.
+	*
+	* **`force` is an OPERATOR signal, not a freshness preference.** On a
+	* battery camera it is the one thing that walks past the wrapper's
+	* sleep gate and wakes the camera, so a background caller — a poller,
+	* an event handler, a thumbnail — must NEVER set it. Every such caller
+	* gets the cached frame, which on a sleeping battery camera is the
+	* correct answer: stale but honest beats woken.
 	*/
 	force: boolean().optional()
 }), SnapshotImageSchema.nullable()), method(object({ deviceId: number() }), _void(), {
@@ -21404,12 +21844,30 @@ object({
 });
 DeviceType.Sensor;
 /**
-* Privacy mask = up to `maxRegions` SHAPES the camera blanks out (NOT a
-* cell grid). Reolink `<shelterList>` zones are rectangles; Hikvision
-* ISAPI `<RegionCoordinatesList>` zones are free polygons (this camera:
-* exactly 4 vertices, not necessarily axis-aligned). The cap composes the
-* shared rect|polygon subset of the MaskShape vocabulary. All coords are
-* normalized 0..1 (top-left origin).
+* PRIVACY — what the camera deliberately does not capture. Two planes:
+*
+*  - **video**: up to `maxRegions` SHAPES the camera blanks out (NOT a cell
+*    grid). Reolink `<shelterList>` zones are rectangles; Hikvision ISAPI
+*    `<RegionCoordinatesList>` zones are free polygons (this camera: exactly
+*    4 vertices, not necessarily axis-aligned). The cap composes the shared
+*    rect|polygon subset of the MaskShape vocabulary. All coords are
+*    normalized 0..1 (top-left origin).
+*  - **audio**: the camera's microphone. `setAudioEnabled(false)` stops the
+*    camera encoding an audio track at all, so EVERY consumer — live view,
+*    recording, the audio analyzer, an export — sees silent video. There is
+*    no server-side copy of this fact; the camera is the store and every read
+*    is a read-through, which is why a switch over it cannot drift
+*    ([D62](../../../../docs/decisions/adr-0062.md)).
+*
+* Both belong here for one reason: they are the two things an operator turns
+* off when the answer to "what is this camera allowed to record" changes, and
+* both are applied ON the device, before anything leaves it.
+*
+* **The audio flag has exactly one writer.** `stream-params` used to carry a
+* per-profile `audio` in its patch schema — reachable from no UI and honoured
+* by one provider — and it was removed when this landed. A second writer onto
+* one device register is the shape of every knob this repo has shipped that
+* disagreed with the one the reader read.
 */
 /** A privacy-mask region's geometry — rectangle or free polygon. */
 var PrivacyMaskShapeSchema = discriminatedUnion("kind", [MaskRectShapeSchema, MaskPolygonShapeSchema]);
@@ -21425,16 +21883,40 @@ object({
 	enabled: boolean(),
 	/** Active zones (normalized 0..1). Length ≤ maxRegions. */
 	regions: array(PrivacyMaskRegionSchema),
+	/**
+	* Is the camera capturing sound right now? Read from the camera, never from
+	* a server-side mirror.
+	*
+	* `null` means "no answer" — either this camera exposes no controllable
+	* microphone (`getOptions().supportsAudioMute === false`) or the read
+	* failed. A consumer must render `null` as UNKNOWN and never as `false`:
+	* "the microphone is off" and "we could not ask" look identical to an
+	* operator only until one of them is wrong.
+	*
+	* On a camera whose profiles carry the flag independently (Reolink writes
+	* it per stream), `true` means AT LEAST ONE profile still carries audio —
+	* privacy is only satisfied when every one of them is silent.
+	*/
+	audioEnabled: boolean().nullable(),
 	lastFetchedAt: number()
 });
-/** Per-camera availability. */
+/** Per-camera availability. Probed, never assumed from the model name. */
 var PrivacyMaskOptionsSchema = object({
 	/** Maximum number of supported zones. */
 	maxRegions: number(),
 	/** Shape kinds this camera accepts — Reolink: ['rect']; Hikvision: ['rect','polygon']. */
 	supportedShapes: array(MaskShapeKindSchema),
 	/** Polygon vertex bounds when 'polygon' is supported (Hikvision: {min:4,max:4}). */
-	polygonVertices: MaskPolygonVerticesSchema.optional()
+	polygonVertices: MaskPolygonVerticesSchema.optional(),
+	/**
+	* Does this camera expose a microphone switch we can actually write?
+	*
+	* Camera-probed: `true` only when the firmware answered with an audio flag
+	* we know how to patch. A camera that never answered is `false` — a control
+	* the operator can press that changes nothing is worse than no control, and
+	* the switch group renders "not available" instead.
+	*/
+	supportsAudioMute: boolean()
 });
 /** Partial change — every field optional. */
 var PrivacyMaskPatchSchema = object({
@@ -21447,6 +21929,12 @@ DeviceType.Camera, method(object({ deviceId: number() }), PrivacyMaskOptionsSche
 }), _void(), {
 	kind: "mutation",
 	auth: "admin"
+}), method(object({
+	deviceId: number(),
+	enabled: boolean()
+}), _void(), {
+	kind: "mutation",
+	auth: "admin"
 });
 var PtzPresetSchema = object({
 	id: string(),
@@ -21656,6 +22144,21 @@ var LocateSegmentResultSchema = discriminatedUnion("kind", [object({
 })]);
 /** Raw bytes of one finalized footage segment (read off disk on the recording node). */
 var ReadSegmentBytesResultSchema = object({ data: _instanceof(Uint8Array) });
+/**
+* One GOP of a finalized segment, cut by byte range through the segment's own
+* `mfra` (D31 on the D42 feeder path). `data` is the `ftyp`+`moov` head plus
+* the single `moof`+`mdat` covering the requested instant — standalone-
+* demuxable, never the whole file. When the segment's index cannot be parsed
+* the provider degrades INSIDE the mechanism to the whole segment (still one
+* `data`, `gopStartMs` = the segment start) — a worse read, not another path.
+*/
+var ReadGopBytesResultSchema = object({
+	data: _instanceof(Uint8Array),
+	/** Absolute epoch ms of the returned fragment's first sample. */
+	gopStartMs: number(),
+	/** Media ms the returned fragment covers. */
+	gopDurMs: number()
+});
 method(object({
 	deviceId: number(),
 	fromMs: number(),
@@ -21698,6 +22201,14 @@ method(object({
 }), ReadSegmentBytesResultSchema, {
 	kind: "query",
 	auth: "admin"
+}), method(object({
+	deviceId: number(),
+	profile: string(),
+	startMs: number(),
+	epochMs: number()
+}), ReadGopBytesResultSchema, {
+	kind: "query",
+	auth: "admin"
 }), method(object({
 	deviceId: number(),
 	config: RecordingConfigSchema
@@ -22178,6 +22689,16 @@ var StreamProfileConfigSchema = object({
 		"baseline"
 	]).optional(),
 	gop: number().optional(),
+	/**
+	* Whether THIS profile currently carries an audio track. READ-ONLY here.
+	*
+	* There is no matching field on {@link StreamProfilePatchSchema}: the
+	* camera's microphone is owned by `privacy-mask` (`setAudioEnabled`), which
+	* writes every profile at once so "audio off" means silent everywhere. A
+	* per-profile writer beside it would let a camera be half-muted and would be
+	* a second knob onto one device register — the failure D62 exists to
+	* prevent. Absent when the firmware does not report the flag.
+	*/
 	audio: boolean().optional()
 });
 object({
@@ -22218,7 +22739,13 @@ var StreamParamsOptionsSchema = object({
 	ext: StreamProfileOptionsSchema.optional()
 });
 /** A partial change to one profile — every field optional; a provider
-*  ignores fields it doesn't support. */
+*  ignores fields it doesn't support.
+*
+*  There is deliberately NO `audio` here. It existed until 2026-08-07,
+*  reachable from no form and honoured by exactly one provider, while the
+*  camera's microphone is a whole-device fact. It now has one writer,
+*  `privacyMask.setAudioEnabled`, which writes every profile — see
+*  `privacy-mask.cap.ts`. */
 var StreamProfilePatchSchema = object({
 	width: number().optional(),
 	height: number().optional(),
@@ -22231,8 +22758,7 @@ var StreamProfilePatchSchema = object({
 		"main",
 		"baseline"
 	]).optional(),
-	gop: number().optional(),
-	audio: boolean().optional()
+	gop: number().optional()
 });
 DeviceType.Camera, method(object({ deviceId: number() }), StreamParamsOptionsSchema), method(object({
 	deviceId: number(),
@@ -26744,6 +27270,12 @@ Object.freeze({
 		addonId: null,
 		access: "view"
 	},
+	"privacyMask.setAudioEnabled": {
+		capName: "privacy-mask",
+		capScope: "device",
+		addonId: null,
+		access: "create"
+	},
 	"privacyMask.setMask": {
 		capName: "privacy-mask",
 		capScope: "device",
@@ -26912,6 +27444,12 @@ Object.freeze({
 		addonId: null,
 		access: "create"
 	},
+	"recording.readGopBytes": {
+		capName: "recording",
+		capScope: "system",
+		addonId: null,
+		access: "view"
+	},
 	"recording.readSegmentBytes": {
 		capName: "recording",
 		capScope: "system",
@@ -28333,6 +28871,88 @@ object({
 	square: false
 }).paddingRatio;
 /**
+* WHICH delivered frames the decode worker retains a native copy of.
+*
+* - `all` — every frame the worker delivered to the runner. The shipped
+*   behaviour, and the only correct one if something can ask for a crop of a
+*   frame the runner never sent to inference.
+* - `inferred` — only the frames the runner ADMITTED to its detection queue.
+*   A native-crop request always names a `frameId` that rode an inference
+*   result, so that is the only set a request can name. How much it drops is
+*   the two-plane governor's admit ratio and nothing else: measured at ~50% on
+*   this cluster, not the ~80% the design sketch assumed, because the governor
+*   was not throttling as hard as the sketch supposed. Read
+*   `leaseAdmitted`/`leaseOffered` off the metrics line for the camera in front
+*   of you rather than quoting a number from here. The newest delivered frame is
+*   croppable regardless — it is still the worker's reserved slot, not a lease —
+*   which covers the one-frame race between a mark and the supersede that
+*   consumes it.
+*/
+var NativeLeaseAdmissionSchema = _enum(["all", "inferred"]);
+object({
+	/**
+	* How long a retained native frame is served before it counts as a miss.
+	*
+	* Must cover the FULL late-crop horizon: detection inference + the
+	* cross-process inference-result hop to hub post-analysis + tracking + the
+	* tRPC crop round-trip back. Below ~500 ms the busiest cameras' subject crops
+	* outrun it and fall back to the ≤640 detection frame; above ~3 s the resident
+	* RAM per busy camera grows linearly with no measured hit-rate gain.
+	*/
+	ttlMs: number().int().min(250).max(1e4),
+	/**
+	* Hard per-decode-worker RAM ceiling for retained native frames, in MB.
+	*
+	* Intended as a SAFETY ceiling with the TTL as the effective cap — but check
+	* which one is actually binding before reasoning from that. At the shipped
+	* 1024 MB and a 2 800 ms TTL, a 4K camera hits the CEILING first (~43 frames
+	* at ~24 MB each) and the TTL never gets to expire anything; `leaseMb` /
+	* `leaseFrames` on the metrics line say which. When the ceiling binds, a
+	* change that admits fewer frames buys retention WINDOW at constant RAM
+	* rather than giving RAM back — lower this knob if RAM is what you wanted.
+	* `0` DISABLES the lease entirely and falls the worker back to the tiny
+	* leak-prone GPU surface ring (~85% crop miss; that is what the lease exists
+	* to replace).
+	*/
+	budgetMb: number().int().min(0).max(4096),
+	/**
+	* Demand window: eager per-frame native retention runs only within this many
+	* ms of the last native-crop request (or of the dial starting).
+	*
+	* `0` means ALWAYS ON — it disables the gate, it does not disable retention.
+	* That is the legacy behaviour that saturated an N100 (24 native-4K downloads
+	* per second on a camera with zero crop demand), so leave it non-zero unless
+	* you are reproducing that.
+	*/
+	activityMs: number().int().min(0).max(12e4),
+	/**
+	* Which delivered frames are retained at all — see
+	* {@link NativeLeaseAdmissionSchema}. This is the only knob of the four that
+	* changes WHAT is kept rather than for how long, so it is also the only one
+	* that can turn a crop that used to hit into a miss. The worker counts every
+	* crop request naming a frame it did NOT see marked
+	* (`leaseUnmarkedCrops` on the session-decode metrics line): a non-zero value
+	* there is the signal that some caller names frames outside the inference set
+	* and that this must go back to `all`.
+	*/
+	admission: NativeLeaseAdmissionSchema
+});
+/**
+* The values in force when the operator has set nothing — byte-for-byte the
+* constants the decode worker shipped with as env-var defaults, so making these
+* settings changed no behaviour on the day it landed.
+*/
+var DEFAULT_NATIVE_LEASE_SETTINGS = {
+	ttlMs: 1200,
+	budgetMb: 1024,
+	activityMs: 15e3,
+	admission: "inferred"
+};
+DEFAULT_NATIVE_LEASE_SETTINGS.ttlMs;
+DEFAULT_NATIVE_LEASE_SETTINGS.budgetMb;
+DEFAULT_NATIVE_LEASE_SETTINGS.activityMs;
+DEFAULT_NATIVE_LEASE_SETTINGS.admission;
+/**
 * Compute the stable 64-char lowercase-hex fingerprint of a device's
 * export-relevant shape. Two structurally-equal shapes (any feature order,
 * any duplicates, any deviceId) hash identically.
@@ -28471,7 +29091,7 @@ function clearPairingFiles(accessoryUuid, logger) {
 }
 //#endregion
 //#region src/hap-setup-uri.ts
-function errMsg$10(e) {
+function errMsg$11(e) {
 	return e instanceof Error ? e.message : String(e);
 }
 /**
@@ -28498,7 +29118,7 @@ function firstExposedAccessorySetupUri(exposed, logger) {
 		try {
 			return first.setupURI();
 		} catch (err) {
-			logger.debug("export-hap: setupURI failed on first exposed accessory", { meta: { error: errMsg$10(err) } });
+			logger.debug("export-hap: setupURI failed on first exposed accessory", { meta: { error: errMsg$11(err) } });
 			return;
 		}
 	}
@@ -28536,13 +29156,19 @@ function hapServiceName(parts, fallback) {
 /**
 * The privacy-mask switch.
 *
-* The camera's own name carries the meaning; "Privacy" only says which of the
-* camera's switches this is. It used to be the WHOLE name, which is why the
-* operator saw a switch that named neither its camera nor, with two cameras
-* exposed, which camera it belonged to.
+* Just "Privacy". The camera name is NOT prefixed: this service lives inside
+* the camera's own accessory, iOS already renders it under the camera, and a
+* round that prefixed it gave the operator "Videocamera ingresso Privacy"
+* sitting inside a tile titled "Videocamera ingresso".
+*
+* The prefix was added for a real reason — two cameras publishing a switch
+* called "Privacy" — but that was a symptom of the label being the ONLY thing
+* shown, which stopped being true once `ConfiguredName` made the service
+* render in its accessory's context. Uniqueness is required WITHIN one
+* accessory, not across the bridge, and one camera has one privacy switch.
 */
-function privacyServiceName(deviceName) {
-	return hapServiceName([deviceName, PRIVACY_SUFFIX], PRIVACY_SUFFIX);
+function privacyServiceName() {
+	return hapServiceName([PRIVACY_SUFFIX], PRIVACY_SUFFIX);
 }
 /**
 * Deliberately not localised, and deliberately not a translation table.
@@ -28559,35 +29185,60 @@ var PRIVACY_SUFFIX = "Privacy";
 * the parent camera.
 *
 * The child's OWN stored name wins. It is the string the operator typed, in
-* the operator's language, and the previous rule threw it away: `role` was
+* the operator's language, and an early rule threw it away: `role` was
 * consulted first and title-cased, so every siren on the fleet published as
 * the English word "Siren" no matter what the operator had called it.
 *
-* The parent name is prefixed only when the child's name does not already
-* carry it — providers name children both ways ("Sirena" and "Videocamera
-* cucina Sirena") and the result must be one form, not two.
+* Providers name children both ways — "Sirena" and "Videocamera cucina
+* Sirena". The parent half is now REMOVED rather than added, because the
+* service is published inside the parent camera's own accessory and iOS
+* already shows it there. The result must be one form, not two.
 */
 function childServiceName(parentName, child) {
-	const own = child.name.trim();
-	if (own.length > 0) return mentions(own, parentName) ? hapServiceName([own], parentName) : hapServiceName([parentName, own], own);
-	return hapServiceName([parentName, typeof child.role === "string" ? titleCase(child.role) : ""], parentName);
+	const own = withoutParent(child.name.trim(), parentName);
+	if (own.length > 0) return hapServiceName([own], own);
+	return hapServiceName([typeof child.role === "string" ? titleCase(child.role) : ""], CHILD_FALLBACK);
 }
 /**
-* A PTZ action switch.
+* Last resort for a child that carries neither a name nor a role. Better than
+* the parent's name, which would publish a service indistinguishable from the
+* accessory holding it — the exact defect this module keeps being asked to fix.
 *
-* The action labels themselves stay in `ptz-labels.ts` — they name a HomeKit
-* control, not a device — but the service is still qualified by the camera, so
-* a home with two PTZ cameras does not publish two switches called "Preset
-* ingresso".
+* English, like the role slugs it stands in for ("Floodlight", "Siren"): the
+* only strings this module invents are English, and inventing one Italian word
+* would be a localisation layer that localises nothing.
 */
-function ptzServiceName(deviceName, actionLabel) {
-	return hapServiceName([deviceName, actionLabel], actionLabel);
+var CHILD_FALLBACK = "Accessory";
+/**
+* A PTZ action switch: the bare action, "Preset ingresso" / "Pan Left" /
+* "Autotrack".
+*
+* The labels themselves stay in `ptz-labels.ts` — they name a HomeKit control,
+* not a device. This function exists only to put the operator-typed half of a
+* preset name through the same sanitisation everything else gets; it no longer
+* qualifies the label with the camera, because all eight PTZ services live on
+* that camera's accessory and are unique among themselves.
+*/
+function ptzServiceName(actionLabel) {
+	return hapServiceName([actionLabel], actionLabel);
 }
-/** Does `name` already contain `parentName` as a whole word? */
-function mentions(name, parentName) {
-	const needle = parentName.trim().toLowerCase();
-	if (needle.length === 0) return true;
-	return name.toLowerCase().includes(needle);
+/**
+* Drop `parentName` from the front of `name`.
+*
+* A PREFIX only. "Videocamera cucina Sirena" → "Sirena"; "Sirena" is already
+* bare and untouched. A parent name appearing anywhere else in the child's
+* name is left alone — cutting from the middle of a string the operator typed
+* would mangle it, and this function must never make a label WORSE.
+*
+* Returns `name` unchanged when stripping would leave nothing: a child the
+* operator called exactly what the camera is called still needs a label.
+*/
+function withoutParent(name, parentName) {
+	const needle = parentName.trim();
+	if (needle.length === 0) return name;
+	if (!name.toLowerCase().startsWith(needle.toLowerCase())) return name;
+	const rest = name.slice(needle.length).trim();
+	return rest.length > 0 ? rest : name;
 }
 /**
 * Truncate to the HAP ceiling and shave any leading/trailing character the
@@ -28636,7 +29287,7 @@ async function buildBattery(bctx) {
 		const status = await proxy.battery?.getStatus({});
 		if (status) applyToService(service, status);
 	} catch (err) {
-		log.debug("export-hap: battery getStatus hydrate failed (non-fatal)", { meta: { error: errMsg$9(err) } });
+		log.debug("export-hap: battery getStatus hydrate failed (non-fatal)", { meta: { error: errMsg$10(err) } });
 	}
 	const unsubscribes = [];
 	if (proxy.state.battery) {
@@ -28662,7 +29313,7 @@ function applyToService(service, status) {
 	const lowBattery = pct <= LOW_BATTERY_THRESHOLD_PCT ? Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW : Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
 	service.updateCharacteristic(Characteristic.StatusLowBattery, lowBattery);
 }
-function errMsg$9(err) {
+function errMsg$10(err) {
 	return err instanceof Error ? err.message : String(err);
 }
 //#endregion
@@ -39158,9 +39809,121 @@ function ingestDecryptedRtcp(plaintext, tally) {
 		failure: null
 	};
 }
+function classifyConnection(input) {
+	if (input.negotiatedWidth < 640) return "watch";
+	if (input.audioPacketTimeMs >= 60) return "remote";
+	return input.viaHomeHub ? "home-hub" : "local";
+}
+/**
+* The slot each class asks for.
+*
+* ## `local` takes the camera's best stream — settled by measurement
+*
+* This function was pinned to `low` for EVERY class by one number. On 615/high,
+* 3840x2160 pass-through:
+*
+*   durationMs=30820  videoPacketsForwarded=93  videoKeyframes=1
+*   audioPacketsForwarded=1497  lost=0
+*
+* Three video datagrams a second, one key frame in half a minute, while the
+* AUDIO leg of the *same* ffmpeg ran perfectly. It read as "our path cannot
+* carry a high-bitrate stream".
+*
+* **It was not HomeKit, not 4K and not SRTP. The loopback UDP socket ffmpeg
+* writes its RTP into had no `SO_RCVBUF` at all** (2026-08-07). It ran on
+* `net.core.rmem_default`, 212 992 B — about a fifth of one 4K IDR, which
+* arrives as ~750 datagrams at `pkt_size=1378` in a single burst. The kernel
+* discarded the overflow, and a datagram dropped there never reaches a
+* `message` handler, so it lowered the forwarded count exactly like a packet
+* ffmpeg never wrote and the controller reported no loss for it either. Audio,
+* a few hundred bytes every 20 ms, never filled the buffer. That is the whole
+* asymmetry. See `stream-socket-buffer.ts`.
+*
+* With an 8 MiB buffer (granted — this hub's `net.core.rmem_max` is 16 MiB),
+* the same camera and the same slot, session
+* `12308100-7dbe-4ad1-b277-1f046ba54ec2` on 2026-08-07:
+*
+*   selectedProfile=high  transcode=false  slotMeasuredKbps=5097
+*   videoPacketsForwarded=6512  durationMs=9867      (~660/s, was ~3/s)
+*   msToFirstKeyframe=858  deliveredFps=24  worstFractionLostPct=0.4
+*   videoLoopRcvbufBytes=16777216  clamped=false
+*
+* Operator: loaded instantly, and visibly not the low stream. A 220x increase
+* in delivered packet rate from sizing one socket.
+*
+* ## Why the remote classes stay `low`
+*
+* Not caution left over from the freeze — a different, UNMEASURED question.
+* `watch`, `remote` and `home-hub` all send video across a link whose budget
+* nothing here has measured; the buffer fix says something about a loopback hop
+* inside one host and nothing whatsoever about a WAN. 4K pass-through at ~5 Mbps
+* to a phone on LTE is a decision that needs its own evidence, and `watch` has
+* a panel under 640 px wide that could not use the pixels anyway. Raise these
+* only with a measurement of the remote link, not by analogy with this one.
+*
+* `mid` remains excluded from every class, unrelated to all of the above: it is
+* a 10 fps stream on this fleet and it has never rendered under any combination
+* tried.
+*/
+function slotForConnection(connection) {
+	switch (connection) {
+		case "watch": return "low";
+		case "remote": return "low";
+		case "home-hub": return "low";
+		case "local": return "high";
+	}
+}
 //#endregion
 //#region src/mappers/builders/stream-bitrate.ts
 /**
+* Send a stream that FITS the rate HomeKit negotiated. (R5)
+*
+* The controller's own Receiver Reports, read on the live hub on 2026-08-06,
+* closed a year of guessing: one 19.27 s session on `615/mid` forwarded 737
+* video packets at `mtu=1378` — roughly **421 kbps** — against a negotiated
+* `max_bit_rate` of **299**, and iOS reported losing **450 of those 737
+* packets (61 %)**, worst fraction lost 51.2 %, peak jitter 3.03 s. Under
+* `-c:v copy` the accessory has no lever at all: it forwards whatever the
+* camera's encoder produces, at whatever cadence it produces it.
+*
+* So the fix has two halves, and this module owns both:
+*
+*   1. **Choose a slot that fits.** Among the slots that can be passed through
+*      (H.264) and whose rate is known to be within budget, the existing
+*      resolution-closest picker decides — so the "which slot serves which
+*      resolution" opinion stays single, exactly as D51 requires.
+*   2. **Transcode only when none does**, with a real cap
+*      (`-b:v` / `-maxrate` / `-bufsize`) at the negotiated rate.
+*
+* ## Where the authoritative rate comes from, and why it is NOT the obvious one
+*
+* `webrtcSession.listStreams` reports a `bitrateKbps` per slot and it is a
+* **measured flow rate**, which is meaningless for a slot nobody is consuming.
+* Live on 2026-08-06 it reported `mid = 9 kbps` for the very slot that had just
+* delivered ~421 kbps, `low = 5 kbps`, and `high = 5441 kbps` (high was being
+* consumed, hence plausible). Selecting on that reading would admit every slot.
+*
+* The authority is therefore the camera's **configured** encoder rate, from
+* `streamParams.getStatus` — `main` / `sub` / `ext`, each carrying the
+* `bitrate` the operator (or the vendor default) set. On 615 that is
+* `main 8192`, `sub 2048`, `ext 2048` kbps. It is mapped onto a profile slot
+* through the slot's assigned cam-stream, matched on resolution and frame
+* rate; an ambiguous or absent match is reported as **unknown**, never as a
+* number.
+*
+* This inverts D51's ordering — there, `measured` outranks `published` — and
+* the inversion is deliberate:
+*
+*   - a frame rate is a stable property of the source and a measurement of it
+*     is the *best* evidence;
+*   - a bitrate under VBR is an envelope. A measurement is a **lower bound**
+*     on it, and a lower bound can prove a slot does NOT fit but can never
+*     prove that it does.
+*
+* So `measured` is kept, and used only in the direction it is sound in.
+* Everything here is pure; the cap reads live in `stream-bitrate-probe.ts`.
+*/
+/**
 * Fraction of the negotiated ceiling we actually aim the encoder at.
 *
 * `max_bit_rate` is what the controller budgeted for the stream; what crosses
@@ -39253,7 +40016,8 @@ function classifyBitrateFit(evidence, budgetKbps) {
 function selectStreamForBudget(input) {
 	const budgetKbps = budgetForNegotiatedRate(input.negotiatedMaxBitrateKbps);
 	const notes = fitNotes(input.entries, input.bitrates, budgetKbps);
-	const fallback = pickPreferredRtspEntry(input.entries, input.pref, input.deviceId, { targetResolution: input.targetResolution });
+	const effectivePref = input.pref === "auto" ? slotForConnection(input.connection) : input.pref;
+	const fallback = pickPreferredRtspEntry(input.entries, effectivePref, input.deviceId, { targetResolution: input.targetResolution });
 	if (fallback === null) return null;
 	const fallbackProfile = toCamProfile$1(fallback.profileId);
 	if (budgetKbps === null) {
@@ -39278,7 +40042,7 @@ function selectStreamForBudget(input) {
 		return classifyBitrateFit(input.bitrates.get(entry.profile), budgetKbps) === "fits";
 	});
 	if (affordable.length > 0) {
-		const picked = pickPreferredRtspEntry(affordable, input.pref, input.deviceId, { targetResolution: input.targetResolution });
+		const picked = pickPreferredRtspEntry(affordable, effectivePref, input.deviceId, { targetResolution: input.targetResolution });
 		if (picked !== null) return {
 			kind: "copy",
 			reason: "source-fits-budget",
@@ -39323,16 +40087,15 @@ function withSlotCodecs(entries, slots) {
 	});
 }
 /**
-* The rate we will actually deliver: never more than the controller asked for,
-* and never more than the source produces. `-r` above the source rate makes
-* ffmpeg DUPLICATE frames, which spends the budget on nothing.
-*/
-function deliverableFps(negotiatedFps, slotFps) {
-	if (slotFps === null || !Number.isFinite(slotFps) || slotFps <= 0) return negotiatedFps;
-	return Math.min(negotiatedFps, Math.floor(slotFps));
-}
-/**
-* The ffmpeg video-output arguments.
+* The video half of the ffmpeg plan, in the SHARED vocabulary
+* (`@camstack/types` `ffmpeg/invocation.ts`). This function used to emit
+* arguments; it now describes them, and `buildFfmpegArgs` emits every one — the
+* repo keeps exactly one argv builder, and HomeKit stopped being an exception
+* to that (D67, `scripts/check-ffmpeg-primitive.ts` Rule 1).
+*
+* Nothing about the RESULT changed except the rescale spelling: `-s WxH` became
+* `-vf scale=W:H`. Equivalent for a plain rescale, and worth knowing because
+* the two are NOT interchangeable once another `-vf` is in play.
 *
 * Pass-through carries `-bsf:v dump_extra` so every IDR inlines its own
 * SPS/PPS — sources that publish parameter sets only in the RTSP SDP hand iOS
@@ -39343,54 +40106,42 @@ function deliverableFps(negotiatedFps, slotFps) {
 * **one-second** `-bufsize` bounds any one-second window at the negotiated
 * rate, which is also the only lever available on the 3.03 s peak jitter — the
 * VBV window is what forces x264 to size a key frame to fit rather than
-* emitting it as one tight burst.
-*/
-/**
-* Seconds between forced IDRs on the transcode path.
-*
-* A join can only start decoding at a key frame, so this is the worst-case
-* wait a controller pays before the first picture — and the bound the RTSP
-* join-burst withhold falls back on when it declines to replay a wide GOP.
-*/
-var KEYFRAME_INTERVAL_SEC = 4;
-function buildVideoEncodeArgs(input) {
-	if (!input.transcode) return [
-		"-c:v",
-		"copy",
-		"-bsf:v",
-		"dump_extra"
-	];
-	const rate = input.budgetKbps === null ? [] : [
-		"-b:v",
-		`${input.budgetKbps}k`,
-		"-maxrate",
-		`${input.budgetKbps}k`,
-		"-bufsize",
-		`${input.budgetKbps}k`
-	];
-	return [
-		"-c:v",
-		"libx264",
-		"-preset",
-		"ultrafast",
-		"-tune",
-		"zerolatency",
-		"-pix_fmt",
-		"yuv420p",
-		"-r",
-		String(input.fps),
-		"-s",
-		`${input.width}x${input.height}`,
-		"-g",
-		String(Math.max(1, Math.round(input.fps * KEYFRAME_INTERVAL_SEC))),
-		...rate,
-		"-profile:v",
-		"baseline",
-		"-level",
-		"3.1",
-		"-bsf:v",
-		"dump_extra"
-	];
+* emitting it as one tight burst. That window is {@link RATE_CONTROL_TIGHT},
+* the shared constant whose whole reason to exist is HomeKit's per-second
+* budget; the browser and Echo use the relaxed two-second one.
+*
+* **The encoder stays `libx264`, deliberately.** `h264_vaapi` / `h264_qsv`
+* carry their own rate-control model, do not accept `-profile:v baseline`, and
+* emit parameter sets on their own schedule rather than x264's — which puts the
+* two load-bearing flags below back in play, with no hardware here to prove
+* they still hold. Hardware DECODE is where the measured cost is.
+*/
+function buildVideoPlan(input) {
+	if (!input.transcode) return {
+		kind: "copy",
+		bitstreamFilter: "dump_extra"
+	};
+	return {
+		kind: "encode",
+		encoder: "libx264",
+		scale: {
+			mode: "exact",
+			width: input.width,
+			height: input.height
+		},
+		preset: "ultrafast",
+		tune: "zerolatency",
+		profile: "baseline",
+		level: "3.1",
+		pixelFormat: "yuv420p",
+		fps: input.fps,
+		gopFrames: Math.max(1, Math.round(input.fps * 4)),
+		...input.budgetKbps === null ? {} : {
+			bitrateKbps: input.budgetKbps,
+			rateControl: RATE_CONTROL_TIGHT
+		},
+		bitstreamFilter: "dump_extra"
+	};
 }
 /** Compact `mid=2048pub/9meas:over-budget` rendering for a single log field. */
 function formatFitNotes(notes) {
@@ -39470,23 +40221,129 @@ function toCamProfile$1(profileId) {
 	return CAM_PROFILES$1.find((p) => p === profileId) ?? null;
 }
 //#endregion
+//#region src/mappers/builders/deadline.ts
+/**
+* Bound a piece of optional work in time.
+*
+* HomeKit answers `Selected RTP Stream Configuration` inside a write handler
+* hap-nodejs expects back quickly, and the start path behind it makes six
+* sequential cross-process cap calls into a stream-broker that regularly
+* freezes for two to three seconds at a time. Measured on the live hub: the
+* controller negotiated at :11, gave up at 9.1 s, and the bitrate fit resolved
+* at :32 — twenty-one seconds — with the start then failing on `Not running`
+* because the session it was preparing no longer existed.
+*
+* The evidence those calls gather is genuinely optional: an absent reading
+* classifies as `unknown`, and the tolerated branch still picks a slot. So the
+* right trade under load is to answer with less evidence rather than late, and
+* this makes that trade explicit at each call site instead of leaving it to
+* whatever the broker's latency happens to be.
+*
+* A late failure from work we stopped waiting on is swallowed on purpose: the
+* probe keeps running after the deadline fires, and an unhandled rejection
+* from an abandoned probe would take the process down over a reading nobody is
+* using any more.
+*/
+var TIMED_OUT = Symbol("deadline:timed-out");
+var FAILED = Symbol("deadline:failed");
+async function withDeadline(work, ms, fallback, onTimeout) {
+	let timer;
+	const guard = new Promise((resolve) => {
+		timer = setTimeout(() => resolve(TIMED_OUT), ms);
+	});
+	try {
+		const settled = await Promise.race([work.catch(() => FAILED), guard]);
+		if (settled === TIMED_OUT) {
+			onTimeout();
+			return fallback;
+		}
+		return settled === FAILED ? fallback : settled;
+	} finally {
+		if (timer !== void 0) clearTimeout(timer);
+		work.catch(() => void 0);
+	}
+}
+//#endregion
 //#region src/mappers/builders/stream-bitrate-probe.ts
 /**
-* Resolve every profile slot's rate. Never throws: an unresolvable slot ends
-* up `unknown`, which the selector treats as "cannot prove it fits" and
-* therefore transcodes — the safe direction on the wire.
+* Total budget for the rate evidence, not per call — the point is to bound
+* what the CONTROLLER waits for, and it waits for the sum.
+*/
+var BITRATE_EVIDENCE_BUDGET_MS = 1500;
+var NO_EVIDENCE = {
+	camStreams: null,
+	streamParams: null,
+	choices: null
+};
+/**
+* The last evidence that actually arrived, per device.
+*
+* Falling back to NO evidence on a slow read was not a neutral degradation: it
+* changed WHICH SLOT the picker chose. Measured on 615 within forty seconds,
+* same camera, same negotiated 1280x720:
+*
+*   10:22:11  mid  10 fps
+*   10:22:17  low  24 fps
+*   10:22:26  mid  10 fps
+*   10:22:50  low  24 fps
+*
+* With evidence, `low` classifies as a fit and wins; without it every slot is
+* `unknown` and the fallback takes `mid`. So the stream a controller received
+* depended on whether a cap read beat a 1500 ms timer — a coin flip, and one
+* that hands iOS a different profile on each retry.
+*
+* A rate is a property of the camera's encoder configuration, which changes
+* when an operator changes it and not otherwise. Yesterday's reading is a far
+* better answer than no reading, and the ONE case that must still see fresh
+* numbers — the operator lowering a substream — is a deliberate act followed
+* by a new session, by which time the background read has long landed.
+*/
+var lastGoodEvidence = /* @__PURE__ */ new Map();
+/**
+* Resolve every profile slot's rate. Never throws and never outlives its
+* budget: a slow read falls back to this device's last good reading, and only
+* a device that has never answered at all ends up `unknown`.
 */
 async function probeProfileBitrates(input) {
-	const { proxy } = input.bctx;
-	const camStreams = await probe$1(() => proxy.cameraStreams?.getCameraStreams({}), "cameraStreams.getCameraStreams", input.log);
-	const streamParams = await probe$1(() => proxy.streamParams?.getStatus({}), "streamParams.getStatus", input.log);
-	const choices = await probe$1(() => proxy.webrtcSession?.listStreams({}), "webrtcSession.listStreams", input.log);
+	const deviceId = input.bctx.numericDeviceId;
+	const evidence = await gatherRateEvidence(input.bctx.proxy, input.log, lastGoodEvidence.get(deviceId));
+	if (evidence.camStreams !== null || evidence.streamParams !== null) lastGoodEvidence.set(deviceId, evidence);
 	return resolveProfileBitrates({
 		slots: input.slots,
-		camStreams: camStreams ?? [],
+		camStreams: evidence.camStreams ?? [],
+		streamParams: evidence.streamParams,
+		choices: evidence.choices ?? []
+	});
+}
+/**
+* Issue the three reads CONCURRENTLY under one budget.
+*
+* Exported so the concurrency and the budget can be asserted directly: run in
+* sequence these latencies add, and adding them is what cost a session.
+*/
+async function gatherRateEvidence(proxy, log, lastGood) {
+	const startedAt = Date.now();
+	const evidence = await withDeadline(Promise.all([
+		probe$1(() => proxy.cameraStreams?.getCameraStreams({}), "cameraStreams.getCameraStreams", log),
+		probe$1(() => proxy.streamParams?.getStatus({}), "streamParams.getStatus", log),
+		probe$1(() => proxy.webrtcSession?.listStreams({}), "webrtcSession.listStreams", log)
+	]).then(([camStreams, streamParams, choices]) => ({
+		camStreams,
 		streamParams,
-		choices: choices ?? []
+		choices
+	})), BITRATE_EVIDENCE_BUDGET_MS, lastGood ?? NO_EVIDENCE, () => {
+		log.warn("export-hap: rate evidence ABANDONED on its budget", { meta: {
+			budgetMs: BITRATE_EVIDENCE_BUDGET_MS,
+			fellBackTo: lastGood === void 0 ? "no-evidence" : "last-good",
+			consequence: lastGood === void 0 ? "every slot rate reads UNKNOWN; the picker loses its rate preference" : "the previous reading decides the fit, so the chosen slot stays STABLE"
+		} });
 	});
+	const elapsedMs = Date.now() - startedAt;
+	if (elapsedMs > 1500 / 2) log.info("export-hap: rate evidence was slow", { meta: {
+		elapsedMs,
+		budgetMs: BITRATE_EVIDENCE_BUDGET_MS
+	} });
+	return evidence;
 }
 async function probe$1(call, label, log) {
 	try {
@@ -39504,61 +40361,138 @@ async function probe$1(call, label, log) {
 		return null;
 	}
 }
+//#endregion
+//#region src/mappers/builders/stream-ffmpeg-args.ts
+/**
+* The ffmpeg PLAN for one HomeKit streaming session.
+*
+* This file used to assemble the argument vector by hand. It no longer emits a
+* single argument: it describes the session as an {@link FfmpegInvocation} and
+* `buildFfmpegArgs` (`@camstack/types` `ffmpeg/invocation.ts`) emits every one.
+* The repo keeps exactly ONE argv builder — `scripts/check-ffmpeg-primitive.ts`
+* Rule 1 refuses a second, and HomeKit was the last exception (D67).
+*
+* ## What moved behind the primitive, and what stayed here
+*
+* MOVED — everything that describes an ENCODE, because it is the same job every
+* other live egress does and the repo had five disagreeing copies of it: the
+* encoder, preset, tune, profile, level, pixel format, rate, GOP, the tight VBV
+* window ({@link RATE_CONTROL_TIGHT}), the bitstream filter, and the Opus block
+* ({@link HAP_AUDIO_BASE}).
+*
+* STAYED — everything that is a HAP PROTOCOL fact and belongs to no other
+* consumer: the payload types, the SSRCs (and their signed-int32 coercion), the
+* MTU baked into each `rtp://…?pkt_size=` target, the loopback ports the
+* JS-side SRTP encrypt reads from, and the negotiated audio sample rate and
+* packet time.
+*
+* ## The two flags this file exists to protect
+*
+* `-g` and `-bsf:v dump_extra` were two of the four causes of the year-long
+* failure, and both live in the encode plan now. They are asserted by token
+* AND by position in `__tests__/stream-ffmpeg-argv.spec.ts`, on both the copy
+* and the encode branch, so the move behind the primitive cannot quietly drop
+* either. Every other comment below records something learned the expensive
+* way; deleting one loses the reason a flag is there.
+*/
+/**
+* Opus encoder targets — kept low because:
+*  - Camera audio is overwhelmingly speech / ambient noise; 24 kbps mono
+*    is the published "fullband speech" sweet spot for libopus (well
+*    above the 20 kbps "wideband speech" floor).
+*  - HAP audio is one-shot live (no buffering on the controller side),
+*    so under-shooting the bitrate is cheaper than over-shooting it and
+*    hitting jitter.
+*  - Mono / low-delay profile matches Apple Home's published Opus decoder
+*    expectations for camera accessories.
+*
+* The numbers themselves live in `@camstack/types` `ffmpeg/encode-defaults.ts`
+* now, alongside every other live-egress constant, so the five sets that used
+* to disagree about Opus channel count can be diffed in one place. Re-exported
+* here because the session telemetry reports the bitrate it dialled.
+*/
+var OPUS_BITRATE_KBPS = 24;
+/**
+* The Opus plane, per session.
+*
+* Re-encoded regardless of source codec: the source pool is a mix of
+* PCM_MULAW, PCM_ALAW, G.711 and AAC depending on driver, and Apple Home
+* expects Opus on the wire.
+*
+* `sampleRateHz` and `frameDurationMs` are NEGOTIATED — the controller picks
+* them — which is why the shared {@link HAP_AUDIO_BASE} leaves both out and
+* they are filled in here.
+*
+* CRITICAL on the sample rate: encode at the rate iOS asked for, never a
+* constant. iOS's `AudioStreamingSamplerate` enum surfaces as 8 / 16 / 24 kHz;
+* encoding at 24 when iOS asked for 16 produces RTP timestamps stepping by 480
+* samples/packet against a clock expecting 320 — the SRTP frames decrypt
+* cleanly but the speaker stays mute, because the timestamps slide out of the
+* AV-sync window before the first Opus frame renders. The same request value
+* drives `audioIntervalScale` in the re-stamping pass, so the two MUST come
+* from one source.
+*
+* On the frame duration: libopus emits exactly one RTP packet per Opus frame at
+* that duration, and matching HAP's `packet_time` (20 ms on LAN, 30/40/60 on
+* LTE) is what keeps the 1:1 frame↔packet mapping the controller expects.
+*/
+function audioPlan(input) {
+	return {
+		...HAP_AUDIO_BASE,
+		sampleRateHz: input.audioSampleRateKhz * 1e3,
+		frameDurationMs: input.audioPacketTimeMs,
+		vbvBufferKbits: 96
+	};
+}
 /**
 * Two outputs from one input: video SRTP and audio SRTP, one process, one
-* lifetime, one kill signal. ffmpeg-internal stream selection (`-vn` / `-an`
-* plus per-output codec args) keeps both flowing through it.
+* lifetime, one kill signal. The shared builder's `rtp-outputs` sink maps each
+* plane explicitly (`-an -map 0:v:0` / `-vn -map 0:a:0?`) so ffmpeg never
+* guesses which stream belongs where, and `0:a:0?` makes the audio optional so
+* a source with no microphone skips it instead of failing the invocation.
 */
-function buildSessionFfmpegArgs(input) {
-	return [
-		"-hide_banner",
-		"-loglevel",
-		"warning",
-		...input.decodeArgs,
-		"-rtsp_transport",
-		"tcp",
-		"-i",
-		input.rtspUrl,
-		"-an",
-		"-map",
-		"0:v:0",
-		...input.videoArgs,
-		"-payload_type",
-		String(input.videoPayloadType),
-		"-ssrc",
-		String(input.videoSsrcSigned),
-		"-f",
-		"rtp",
-		input.videoTarget,
-		"-vn",
-		"-map",
-		"0:a:0?",
-		"-af",
-		"aresample=async=1000:first_pts=0",
-		"-c:a",
-		"libopus",
-		"-application",
-		"lowdelay",
-		"-frame_duration",
-		String(input.audioPacketTimeMs),
-		"-flags",
-		"+global_header",
-		"-ar",
-		String(input.audioSampleRateKhz * 1e3),
-		"-b:a",
-		`24k`,
-		"-bufsize",
-		`96k`,
-		"-ac",
-		String(1),
-		"-payload_type",
-		String(input.audioPayloadType),
-		"-ssrc",
-		String(input.audioSsrcSigned),
-		"-f",
-		"rtp",
-		input.audioTarget
-	];
+/**
+* How long ffmpeg may inspect the broker's restream before emitting.
+*
+* Not zero. A zero-length probe makes ffmpeg trust the SDP completely, and an
+* RTSP source that announces a track it then never sends would leave the
+* mapping wrong with no way to notice. 200 ms and 64 KB is far below the
+* shortest key-frame interval on this fleet while still letting the demuxer
+* see real packets — enough to be honest, short enough that nobody watches it.
+*/
+var HAP_INPUT_PROBE = {
+	analyzeDurationUs: 2e5,
+	probeSizeBytes: 64 * 1024
+};
+function buildSessionInvocation(input) {
+	return {
+		logLevel: "warning",
+		decodeHwAccel: input.decode.hwaccel,
+		input: {
+			url: input.rtspUrl,
+			rtspTransport: "tcp",
+			analyzeDurationUs: HAP_INPUT_PROBE.analyzeDurationUs,
+			probeSizeBytes: HAP_INPUT_PROBE.probeSizeBytes,
+			...input.decode.extraInputArgs.length > 0 ? { extraArgs: input.decode.extraInputArgs } : {}
+		},
+		video: input.video,
+		audio: audioPlan(input),
+		threadCount: 0,
+		outputArgs: [],
+		sink: {
+			kind: "rtp-outputs",
+			video: {
+				url: input.videoTarget,
+				payloadType: input.videoPayloadType,
+				ssrc: input.videoSsrcSigned
+			},
+			audio: {
+				url: input.audioTarget,
+				payloadType: input.audioPayloadType,
+				ssrc: input.audioSsrcSigned
+			}
+		}
+	};
 }
 /**
 * The resolutions we offer, before rates are attached. Same list the delegate
@@ -39698,6 +40632,84 @@ var CAM_PROFILES = [
 function toCamProfile(profileId) {
 	return CAM_PROFILES.find((p) => p === profileId) ?? null;
 }
+//#endregion
+//#region src/mappers/builders/h264-idr.ts
+/**
+* Does this RTP packet carry the start of an H.264 IDR?
+*
+* A pass-through session cannot manufacture a key frame on demand — it can
+* only forward the one the camera decides to emit. So the number that decides
+* whether a controller sees a picture or a loader is *how long it waited for
+* the first IDR*, and until now nothing measured it: a session could report
+* a thousand packets forwarded, zero loss, and a blank screen, with no field
+* distinguishing "the stream is broken" from "the next key frame is 20
+* seconds away".
+*
+* That is the whole reason this exists, so it is deliberately narrow: a
+* boolean per packet, no state, no allocation, and it never throws. It runs on
+* every forwarded video packet, and a parser that throws on a malformed packet
+* would take the media path down with it.
+*/
+/** NAL unit type carrying a coded slice of an IDR picture (RFC 6184 §5.2). */
+var NAL_TYPE_IDR = 5;
+/** Single-time aggregation packet — several NALs in one RTP payload. */
+var NAL_TYPE_STAP_A = 24;
+/** Fragmentation units: one NAL spread over several RTP payloads. */
+var NAL_TYPE_FU_A = 28;
+var NAL_TYPE_FU_B = 29;
+var RTP_MIN_HEADER_BYTES = 12;
+var NAL_TYPE_MASK = 31;
+/** FU header start bit — set only on the FIRST fragment of a fragmented NAL. */
+var FU_START_BIT = 128;
+function rtpPacketCarriesIdr(packet) {
+	const payloadStart = rtpPayloadOffset(packet);
+	if (payloadStart === null) return false;
+	const firstPayloadByte = packet[payloadStart];
+	if (firstPayloadByte === void 0) return false;
+	const nalType = firstPayloadByte & NAL_TYPE_MASK;
+	if (nalType === NAL_TYPE_FU_A || nalType === NAL_TYPE_FU_B) {
+		const fuHeader = packet[payloadStart + 1];
+		if (fuHeader === void 0) return false;
+		if ((fuHeader & FU_START_BIT) === 0) return false;
+		return (fuHeader & NAL_TYPE_MASK) === NAL_TYPE_IDR;
+	}
+	if (nalType === NAL_TYPE_STAP_A) return stapContainsIdr(packet, payloadStart + 1);
+	return nalType === NAL_TYPE_IDR;
+}
+/**
+* Byte offset of the RTP payload, or `null` when the packet is too short to
+* hold one. The variable-length parts are what make this worth a function:
+* a fixed offset of 12 is right for every packet ffmpeg emits today and wrong
+* the moment one carries a CSRC list or a header extension.
+*/
+function rtpPayloadOffset(packet) {
+	if (packet.length <= RTP_MIN_HEADER_BYTES) return null;
+	const flags = packet[0];
+	if (flags === void 0) return null;
+	const csrcCount = flags & 15;
+	const hasExtension = (flags & 16) !== 0;
+	let offset = RTP_MIN_HEADER_BYTES + csrcCount * 4;
+	if (hasExtension) {
+		if (offset + 4 > packet.length) return null;
+		const words = packet.readUInt16BE(offset + 2);
+		offset += 4 + words * 4;
+	}
+	return offset < packet.length ? offset : null;
+}
+/** Walk a STAP-A's `[size][nal]` pairs looking for an IDR. */
+function stapContainsIdr(packet, start) {
+	let offset = start;
+	while (offset + 2 <= packet.length) {
+		const size = packet.readUInt16BE(offset);
+		offset += 2;
+		if (size === 0 || offset + size > packet.length) return false;
+		const nalHeader = packet[offset];
+		if (nalHeader === void 0) return false;
+		if ((nalHeader & NAL_TYPE_MASK) === NAL_TYPE_IDR) return true;
+		offset += size;
+	}
+	return false;
+}
 /**
 * How long after spawn an exit still counts as "hardware init failed".
 *
@@ -39762,34 +40774,65 @@ function software(reason) {
 	return {
 		kind: "software",
 		reason,
+		hwaccel: null,
+		extraInputArgs: [],
 		args: []
 	};
 }
 function hardware(backend, source, input) {
+	if (input.recentlyFailedBackend === backend) return software("hardware-attempt-failed");
+	const { hwaccel, extraInputArgs } = decodePlan(backend, input);
 	return {
 		kind: "hardware",
 		backend,
 		source,
-		args: decodeArgs(backend, input)
+		hwaccel,
+		extraInputArgs,
+		args: [
+			"-hwaccel",
+			hwaccel,
+			...extraInputArgs
+		]
 	};
 }
 /**
-* The input-side flags, and nothing else.
+* The input-side decode configuration, and nothing else.
 *
 * No `-hwaccel_output_format`: the decoded frames have to land in system
 * memory for libx264 to scale and encode them. Setting it would keep them on
 * the GPU, which only pays off with a GPU scale filter — and that is the
 * decoder addon's job, not a two-output SRTP session's.
+*
+* The two halves are returned SEPARATELY because the shared argv builder emits
+* `-hwaccel` itself (it is the only function allowed to, so the flag cannot
+* drift past `-i`) and takes everything else as the input plan's `extraArgs`.
 */
-function decodeArgs(backend, input) {
-	if (backend === "videotoolbox" && input.platform === "darwin") return ["-hwaccel", "auto"];
-	const args = ["-hwaccel", backend];
-	if (RENDER_NODE_BACKENDS.includes(backend)) args.push("-hwaccel_device", input.renderDevice ?? "/dev/dri/renderD128");
-	return args;
+function decodePlan(backend, input) {
+	if (backend === "videotoolbox" && input.platform === "darwin") return {
+		hwaccel: "auto",
+		extraInputArgs: []
+	};
+	return {
+		hwaccel: backend,
+		extraInputArgs: RENDER_NODE_BACKENDS.includes(backend) ? ["-hwaccel_device", input.renderDevice ?? "/dev/dri/renderD128"] : []
+	};
 }
 //#endregion
 //#region src/mappers/builders/stream-hwaccel-probe.ts
 /**
+* The real read: `decoder.getInfo`, pinned to the LOCAL node.
+*
+* Pinned explicitly rather than left to routing, because an unpinned singleton
+* cap answers from whichever node owns it and would report the WRONG host's
+* hardware.
+*/
+function decoderInfoSourceFromContext(ctx) {
+	return {
+		localNodeId: ctx.kernel?.localNodeId,
+		readInfo: (nodeId) => ctx.api.decoder.getInfo.query(void 0, nodePin(nodeId))
+	};
+}
+/**
 * Read this node's decode-hwaccel state, or `null` when nothing answered.
 *
 * Never throws. `null` means "we do not know", which
@@ -39797,27 +40840,144 @@ function decodeArgs(backend, input) {
 * the safe direction, because a guess here costs the whole stream.
 */
 async function probeDecoderHwaccel(input) {
-	const { ctx, log } = input;
-	const nodeId = ctx.kernel?.localNodeId;
+	const { source, log, memo } = input;
+	const memoised = memo.read();
+	if (memoised !== void 0) return memoised;
+	const nodeId = source.localNodeId;
 	if (nodeId === void 0 || nodeId.length === 0) {
 		log.warn("export-hap: hwaccel probe skipped — no local node id, decoding in SOFTWARE");
 		return null;
 	}
 	try {
-		const info = await ctx.api.decoder.getInfo.query(void 0, nodePin(nodeId));
+		const info = await source.readInfo(nodeId);
 		if (info === null || info === void 0) {
 			log.info("export-hap: hwaccel probe returned nothing — decoding in SOFTWARE", { meta: { nodeId } });
+			memo.write(null);
 			return null;
 		}
-		return {
+		const reading = {
 			hwaccel: info.hwaccel ?? null,
 			probedBestHwaccel: info.probedBestHwaccel ?? null
 		};
+		memo.write(reading);
+		return reading;
 	} catch (err) {
 		log.warn("export-hap: hwaccel probe failed — decoding in SOFTWARE", { meta: {
 			nodeId,
 			error: err instanceof Error ? err.message : String(err)
 		} });
+		memo.write(null);
+		return null;
+	}
+}
+/**
+* What we ask for on the VIDEO loopback socket.
+*
+* Generous on purpose: the cost is virtual address space the kernel only
+* commits as datagrams actually queue, and the failure it prevents is a black
+* tile. Sized well above {@link KEYFRAME_BURST_FLOOR_BYTES} so a slow drain
+* (the JS forwarder is on the same event loop as everything else this addon
+* does) still has headroom.
+*/
+var VIDEO_LOOPBACK_RCVBUF_BYTES = 8 * 1024 * 1024;
+/**
+* What we ask for on the AUDIO loopback socket.
+*
+* Audio never bursts — that is the control in this experiment, and it is why
+* the two legs get different numbers rather than one shared constant. If audio
+* ever starts dropping at the same buffer that carries video fine, the cause is
+* not burst size.
+*/
+var AUDIO_LOOPBACK_RCVBUF_BYTES = 1024 * 1024;
+function errMsg$9(err) {
+	return err instanceof Error ? err.message : String(err);
+}
+/**
+* Set `SO_RCVBUF` and READ IT BACK.
+*
+* Never throws: a platform that refuses the option must cost the buffer, never
+* the session. The read-back is the point — a request the kernel clamped and a
+* request it honoured are indistinguishable at the call site.
+*/
+function applyReceiveBuffer(socket, requestedBytes) {
+	let error = null;
+	try {
+		socket.setRecvBufferSize(requestedBytes);
+	} catch (err) {
+		error = errMsg$9(err);
+	}
+	let effectiveBytes = null;
+	try {
+		effectiveBytes = socket.getRecvBufferSize();
+	} catch (err) {
+		if (error === null) error = errMsg$9(err);
+	}
+	return {
+		requestedBytes,
+		effectiveBytes,
+		clamped: effectiveBytes !== null && effectiveBytes < requestedBytes,
+		sufficientForKeyframeBurst: effectiveBytes !== null && effectiveBytes >= 2097152,
+		error
+	};
+}
+/** Where the kernel publishes per-socket UDP counters, by address family. */
+var PROC_NET_UDP = {
+	ipv4: "/proc/net/udp",
+	ipv6: "/proc/net/udp6"
+};
+/**
+* The per-socket `drops` count for `port`, out of a `/proc/net/udp` table.
+*
+* Pure so the format assumption is pinned by a test rather than by a live
+* kernel. Returns `null` when the port has no row — which is NOT the same as
+* zero drops, and the two must never collapse: `0` is evidence the buffer held,
+* `null` is the absence of evidence.
+*/
+function parseUdpSocketDrops(table, port) {
+	const lines = table.split("\n");
+	for (const line of lines) {
+		const fields = line.trim().split(/\s+/);
+		if (fields.length < 13) continue;
+		const local = fields[1];
+		if (local === void 0) continue;
+		const hexPort = local.split(":")[1];
+		if (hexPort === void 0) continue;
+		const parsedPort = Number.parseInt(hexPort, 16);
+		if (!Number.isFinite(parsedPort) || parsedPort !== port) continue;
+		const drops = Number(fields[fields.length - 1]);
+		return Number.isFinite(drops) ? drops : null;
+	}
+	return null;
+}
+/**
+* Fold a fresh drop sample into the one already held.
+*
+* A socket that has been CLOSED disappears from `/proc/net/udp`, so a resample
+* after teardown returns `null` — "I can no longer look", which must never
+* erase "I looked and it was 0". The first live session that proved the buffer
+* fix reported `videoLoopKernelDrops=null` for exactly this reason: on a
+* controller `stop` the sockets are closed synchronously while the summary is
+* emitted later from ffmpeg's `exit` handler.
+*/
+function mergeDropSample(previous, sampled) {
+	return sampled ?? previous;
+}
+/**
+* Read the kernel's drop counter for a bound local UDP port.
+*
+* Linux only — `null` on every other platform and on every read failure, which
+* is honest: "we could not look" and "nothing was dropped" are different
+* answers and this returns the first as `null`.
+*
+* Synchronous on purpose. It is called at the session heartbeat (5 s) and once
+* at teardown, against a memory-backed pseudo-file; making it async would mean
+* the SUMMARY line — the one line this experiment is read from — could not
+* carry a fresh count, which is the only reason it exists.
+*/
+function readUdpSocketDrops(port, ipVersion) {
+	try {
+		return parseUdpSocketDrops(readFileSync(PROC_NET_UDP[ipVersion], "utf8"), port);
+	} catch {
 		return null;
 	}
 }
@@ -39946,6 +41106,9 @@ function summariseSession(snapshot) {
 		encodeBudgetKbps: slot?.budgetKbps ?? null,
 		fitNotes: slot?.fitNotes ?? [],
 		videoPacketsForwarded: snapshot.videoPacketsForwarded,
+		msToFirstKeyframe: snapshot.firstKeyframeAtMs === null || snapshot.startedAtMs === null ? null : snapshot.firstKeyframeAtMs - snapshot.startedAtMs,
+		videoKeyframes: snapshot.videoKeyframes,
+		maxKeyframeGapMs: snapshot.maxKeyframeGapMs,
 		audioPacketsForwarded: snapshot.audioPacketsForwarded,
 		videoRtcpSrSent: snapshot.videoRtcpSrSent,
 		audioRtcpSrSent: snapshot.audioRtcpSrSent,
@@ -39960,11 +41123,21 @@ function summariseSession(snapshot) {
 		videoLossVerdict: lossVerdict(snapshot.videoReceiverReports),
 		audioLossVerdict: lossVerdict(snapshot.audioReceiverReports),
 		mediaStarved: snapshot.videoPacketsForwarded === 0,
+		videoLoopRcvbufRequestedBytes: snapshot.videoLoopback.rcvbufRequestedBytes,
+		videoLoopRcvbufBytes: snapshot.videoLoopback.rcvbufEffectiveBytes,
+		videoLoopRcvbufClamped: snapshot.videoLoopback.rcvbufClamped,
+		videoLoopKernelDrops: snapshot.videoLoopback.kernelDrops,
+		videoLoopKernelDropped: (snapshot.videoLoopback.kernelDrops ?? 0) > 0,
+		audioLoopRcvbufBytes: snapshot.audioLoopback.rcvbufEffectiveBytes,
+		audioLoopKernelDrops: snapshot.audioLoopback.kernelDrops,
+		audioLoopKernelDropped: (snapshot.audioLoopback.kernelDrops ?? 0) > 0,
 		drops: nonZeroDrops(snapshot.drops)
 	};
 }
 //#endregion
 //#region src/mappers/builders/camera-streams.ts
+/** A decoder that is slow to describe itself costs hardware decode, not the session. */
+var HWACCEL_PROBE_BUDGET_MS = 1e3;
 var SRTP_KEY_LEN = 16;
 var SRTP_SALT_LEN = 14;
 /**
@@ -40048,6 +41221,7 @@ function buildCameraStreamingDelegate(bctx, advertised) {
 				const hadFfmpeg = session.ffmpeg !== null;
 				killFfmpeg(session, ctx, numericDeviceId);
 				stopHeartbeat(session);
+				sampleLoopbackDrops(session);
 				if (!hadFfmpeg) logSessionSummary(session, log, "accessory-dispose-no-ffmpeg");
 				await closeIntercomTalkSession(session, bctx).catch(() => void 0);
 				closeSocket(session.videoUdp);
@@ -40076,8 +41250,10 @@ async function prepareStream(request, sessions, bctx) {
 	const localIp = pickLocalInterfaceIp(request.targetAddress, ipVersion);
 	const videoUdp = await bindUdp(ipVersion, localIp);
 	const audioUdp = await bindUdp(ipVersion, localIp);
-	const videoLoopUdp = await bindLoopback(ipVersion);
-	const audioLoopUdp = await bindLoopback(ipVersion);
+	const videoLoop = await bindLoopback(ipVersion, VIDEO_LOOPBACK_RCVBUF_BYTES);
+	const audioLoop = await bindLoopback(ipVersion, AUDIO_LOOPBACK_RCVBUF_BYTES);
+	const videoLoopUdp = videoLoop.socket;
+	const audioLoopUdp = audioLoop.socket;
 	const localVideoPort = videoUdp.address().port;
 	const localAudioPort = audioUdp.address().port;
 	if (request.video.srtp_key.length !== SRTP_KEY_LEN || request.video.srtp_salt.length !== SRTP_SALT_LEN || request.audio.srtp_key.length !== SRTP_KEY_LEN || request.audio.srtp_salt.length !== SRTP_SALT_LEN) {
@@ -40153,6 +41329,10 @@ async function prepareStream(request, sessions, bctx) {
 		drops: emptyDropCounters(),
 		videoPacketsForwarded: 0,
 		audioPacketsForwarded: 0,
+		videoKeyframes: 0,
+		firstKeyframeAtMs: null,
+		lastKeyframeAtMs: null,
+		maxKeyframeGapMs: 0,
 		videoRtcpSrSent: 0,
 		audioRtcpSrSent: 0,
 		videoRtcpReceived: 0,
@@ -40192,6 +41372,12 @@ async function prepareStream(request, sessions, bctx) {
 		audioInSrtcp,
 		audioSendGate: null,
 		ipVersion,
+		videoLoopRcvbuf: videoLoop.buffer,
+		audioLoopRcvbuf: audioLoop.buffer,
+		videoLoopPort: videoLoopUdp.address().port,
+		audioLoopPort: audioLoopUdp.address().port,
+		videoLoopKernelDrops: null,
+		audioLoopKernelDrops: null,
 		ffmpeg: null,
 		lastStartParams: null,
 		upstreamAudioSrtp,
@@ -40231,6 +41417,7 @@ async function prepareStream(request, sessions, bctx) {
 	});
 	videoLoopUdp.on("message", (rtpPacket) => {
 		session.videoPacketsForwarded += 1;
+		if (rtpPacketCarriesIdr(rtpPacket)) recordKeyframe(session);
 		if (session.videoPacketsForwarded === 1) tagLog.info("export-hap: first video packet from ffmpeg", { meta: {
 			sessionId: session.sessionId,
 			bytes: rtpPacket.length
@@ -40246,6 +41433,8 @@ async function prepareStream(request, sessions, bctx) {
 			bctx.ctx.logger.withTags({ deviceId: bctx.numericDeviceId }).debug("export-hap: incoming-audio handler error (dropped)", { meta: { error: errMsg$8(err) } });
 		});
 	});
+	logLoopbackBuffer(tagLog, request.sessionID, "video", videoLoop.buffer);
+	logLoopbackBuffer(tagLog, request.sessionID, "audio", audioLoop.buffer);
 	tagLog.info("export-hap: stream prepared", { meta: {
 		sessionId: request.sessionID,
 		controllerAddress: request.targetAddress,
@@ -40326,12 +41515,45 @@ function sameIpv4Subnet(a, mask, b) {
 	return true;
 }
 /**
+* Report one loopback socket's receive buffer.
+*
+* `warn` when the video leg cannot hold a 4K key-frame burst: that is the state
+* in which this addon silently drops most of a key frame and the tile stays
+* black, and it was invisible for the whole life of this code path.
+*/
+function logLoopbackBuffer(log, sessionId, leg, outcome) {
+	const meta = {
+		sessionId,
+		leg,
+		requestedBytes: outcome.requestedBytes,
+		effectiveBytes: outcome.effectiveBytes,
+		clamped: outcome.clamped,
+		sufficientForKeyframeBurst: outcome.sufficientForKeyframeBurst,
+		error: outcome.error
+	};
+	if (leg === "video" && !outcome.sufficientForKeyframeBurst) {
+		log.warn("export-hap: loopback receive buffer is TOO SMALL for a key-frame burst — raise net.core.rmem_max on the host", { meta });
+		return;
+	}
+	log.info("export-hap: loopback receive buffer", { meta });
+}
+/**
 * Resolve once-per-session: the local IP we bind iOS-facing sockets to
 * AND its mate on `127.0.0.1` for the ffmpeg loopback path. Both go
 * through the bounded-wait `dgram.bind` pattern.
+*
+* `SO_RCVBUF` is set AFTER the bind and read back, never assumed. Until
+* 2026-08-07 nothing set it at all, so these sockets ran on
+* `net.core.rmem_default` (212 992 B on this hub) — about a fifth of one 4K
+* key frame, which arrives as ~750 datagrams in one burst. See
+* `stream-socket-buffer.ts` for the measurement.
 */
-async function bindLoopback(ipVersion) {
-	return bindUdp(ipVersion, ipVersion === "ipv6" ? "::1" : "127.0.0.1");
+async function bindLoopback(ipVersion, requestedRcvbufBytes) {
+	const socket = await bindUdp(ipVersion, ipVersion === "ipv6" ? "::1" : "127.0.0.1");
+	return {
+		socket,
+		buffer: applyReceiveBuffer(socket, requestedRcvbufBytes)
+	};
 }
 /** Book a named drop. Every silent `return` on the streaming path routes here. */
 function drop(session, reason) {
@@ -40472,6 +41694,30 @@ function logReceiverReports(session, leg, reports, isFirst, log) {
 	if (!shouldLogReceiverReport(session, leg)) return;
 	log.info("export-hap: controller receiver report", { meta });
 }
+/**
+* Record a forwarded key frame. Kept separate from the packet counter because
+* the interesting quantity is TIMING, not a tally: the first arrival dates the
+* moment the controller could begin decoding, and the widest gap says how long
+* a mid-GOP join can be expected to stare at a loader.
+*/
+function recordKeyframe(session) {
+	const now = Date.now();
+	session.videoKeyframes += 1;
+	if (session.firstKeyframeAtMs === null) session.firstKeyframeAtMs = now;
+	else if (session.lastKeyframeAtMs !== null) session.maxKeyframeGapMs = Math.max(session.maxKeyframeGapMs, now - session.lastKeyframeAtMs);
+	session.lastKeyframeAtMs = now;
+}
+/**
+* Refresh the kernel's per-socket drop counters.
+*
+* Called immediately before every line that reports them, because a stale
+* sample on the summary would answer the experiment's central question with
+* data from five seconds earlier. Cheap: `/proc/net/udp` is memory-backed.
+*/
+function sampleLoopbackDrops(session) {
+	session.videoLoopKernelDrops = mergeDropSample(session.videoLoopKernelDrops, readUdpSocketDrops(session.videoLoopPort, session.ipVersion));
+	session.audioLoopKernelDrops = mergeDropSample(session.audioLoopKernelDrops, readUdpSocketDrops(session.audioLoopPort, session.ipVersion));
+}
 /** Snapshot every counter into the summary meta. */
 function sessionSummaryMeta(session) {
 	return summariseSession({
@@ -40482,6 +41728,9 @@ function sessionSummaryMeta(session) {
 		selectedSlot: session.selectedSlot,
 		videoPacketsForwarded: session.videoPacketsForwarded,
 		audioPacketsForwarded: session.audioPacketsForwarded,
+		videoKeyframes: session.videoKeyframes,
+		firstKeyframeAtMs: session.firstKeyframeAtMs,
+		maxKeyframeGapMs: session.maxKeyframeGapMs,
 		videoRtcpSrSent: session.videoRtcpSrSent,
 		audioRtcpSrSent: session.audioRtcpSrSent,
 		videoRtcpReceived: session.videoRtcpReceived,
@@ -40494,7 +41743,19 @@ function sessionSummaryMeta(session) {
 		audioReceiverReports: session.audioReceiverReports,
 		drops: session.drops,
 		ffmpegExit: session.ffmpegExit,
-		stopRequestedByController: session.stopRequestedByController
+		stopRequestedByController: session.stopRequestedByController,
+		videoLoopback: {
+			rcvbufRequestedBytes: session.videoLoopRcvbuf.requestedBytes,
+			rcvbufEffectiveBytes: session.videoLoopRcvbuf.effectiveBytes,
+			rcvbufClamped: session.videoLoopRcvbuf.clamped,
+			kernelDrops: session.videoLoopKernelDrops
+		},
+		audioLoopback: {
+			rcvbufRequestedBytes: session.audioLoopRcvbuf.requestedBytes,
+			rcvbufEffectiveBytes: session.audioLoopRcvbuf.effectiveBytes,
+			rcvbufClamped: session.audioLoopRcvbuf.clamped,
+			kernelDrops: session.audioLoopKernelDrops
+		}
 	});
 }
 /**
@@ -40508,6 +41769,7 @@ function armHeartbeat(session, log) {
 	const timer = setInterval(() => {
 		const forwarded = session.videoPacketsForwarded - lastVideo;
 		lastVideo = session.videoPacketsForwarded;
+		sampleLoopbackDrops(session);
 		log.info("export-hap: stream heartbeat", { meta: {
 			...sessionSummaryMeta(session),
 			videoPacketsSinceLastBeat: forwarded,
@@ -40546,6 +41808,7 @@ function stopHeartbeat(session) {
 */
 function logSessionSummary(session, log, trigger) {
 	session.endedAtMs = Date.now();
+	sampleLoopbackDrops(session);
 	log.info("export-hap: stream session summary", { meta: {
 		...sessionSummaryMeta(session),
 		trigger
@@ -40730,6 +41993,7 @@ async function handleStreamRequest(request, sessions, bctx, advertised) {
 		const hadFfmpeg = session.ffmpeg !== null;
 		killFfmpeg(session, bctx.ctx, bctx.numericDeviceId);
 		stopHeartbeat(session);
+		sampleLoopbackDrops(session);
 		if (!hadFfmpeg) logSessionSummary(session, log, "controller-stop-no-ffmpeg");
 		await closeIntercomTalkSession(session, bctx).catch(() => void 0);
 		closeSocket(session.videoUdp);
@@ -40839,7 +42103,7 @@ async function handleStreamRequest(request, sessions, bctx, advertised) {
 async function startFfmpegForSession(bctx, session, sessionId, video, advertised) {
 	const { ctx, proxy, numericDeviceId, options } = bctx;
 	const startLog = ctx.logger.withTags({ deviceId: numericDeviceId });
-	const entries = await proxy.cameraStreams?.getProfileRtspEntries({}) ?? [];
+	const [entries, brokerStreams] = await Promise.all([(async () => await proxy.cameraStreams?.getProfileRtspEntries({}) ?? [])(), (async () => await proxy.cameraStreams?.getBrokerStreams({}) ?? [])()]);
 	if (entries.length === 0) {
 		startLog.warn("export-hap: stream start DROPPED — device publishes no profile RTSP entries", { meta: {
 			sessionId,
@@ -40848,16 +42112,21 @@ async function startFfmpegForSession(bctx, session, sessionId, video, advertised
 		throw new Error(`export-hap: no profile RTSP entries for device ${numericDeviceId}`);
 	}
 	const pref = options.hapDeviceSettings.streamPreference;
-	const brokerStreams = await proxy.cameraStreams?.getBrokerStreams({}) ?? [];
 	const bitrates = await probeProfileBitrates({
 		bctx,
 		slots: brokerStreams,
 		log: startLog
 	});
+	const connection = classifyConnection({
+		negotiatedWidth: video.width,
+		audioPacketTimeMs: session.negotiated?.audioPacketTimeMs ?? 20,
+		viaHomeHub: false
+	});
 	const fit = selectStreamForBudget({
 		entries: withSlotCodecs(entries, brokerStreams),
 		deviceId: numericDeviceId,
 		pref,
+		connection,
 		targetResolution: {
 			width: video.width,
 			height: video.height
@@ -40883,7 +42152,7 @@ async function startFfmpegForSession(bctx, session, sessionId, video, advertised
 	const resolvedFps = pickedProfile === null ? void 0 : advertised.fpsByProfile.get(pickedProfile);
 	const advertisedFps = resolvedFps?.fps ?? video.fps;
 	const advertisedFpsSource = resolvedFps?.source ?? "assumed";
-	const deliveredFps = needsTranscode ? deliverableFps(video.fps, resolvedFps?.fps ?? null) : advertisedFps;
+	const deliveredFps = needsTranscode ? video.fps : advertisedFps;
 	const slotEvidence = pickedProfile === null ? void 0 : bitrates.get(pickedProfile);
 	const fitNotes = formatFitNotes(fit.notes);
 	session.selectedSlot = {
@@ -40928,7 +42197,7 @@ async function startFfmpegForSession(bctx, session, sessionId, video, advertised
 	const audioLoopPort = session.audioLoopUdp.address().port;
 	const videoTarget = `rtp://127.0.0.1:${videoLoopPort}?pkt_size=${video.mtu}`;
 	const audioTarget = `rtp://127.0.0.1:${audioLoopPort}?pkt_size=${video.mtu}`;
-	const videoArgs = buildVideoEncodeArgs({
+	const videoPlan = buildVideoPlan({
 		transcode: needsTranscode,
 		width: video.width,
 		height: video.height,
@@ -40937,19 +42206,21 @@ async function startFfmpegForSession(bctx, session, sessionId, video, advertised
 	});
 	const hwDecode = selectHwDecode({
 		transcode: needsTranscode,
-		reading: needsTranscode ? await probeDecoderHwaccel({
-			ctx,
-			log: startLog
-		}) : null,
-		platform: process.platform
+		reading: needsTranscode ? await withDeadline(probeDecoderHwaccel({
+			source: decoderInfoSourceFromContext(ctx),
+			log: startLog,
+			memo: options.decodeMemos.reading
+		}), HWACCEL_PROBE_BUDGET_MS, null, () => startLog.warn("export-hap: hwaccel probe ABANDONED on its budget — decoding in SOFTWARE", { meta: { budgetMs: HWACCEL_PROBE_BUDGET_MS } })) : null,
+		platform: process.platform,
+		recentlyFailedBackend: options.decodeMemos.failedBackend.read() ?? null
 	});
 	logDecodePath(startLog, sessionId, hwDecode, needsTranscode);
 	const videoSsrcSigned = session.videoSsrc | 0;
 	const audioSsrcSigned = video.audio_ssrc | 0;
-	const buildArgs = (decodeArgs) => buildSessionFfmpegArgs({
-		decodeArgs,
+	const buildArgs = (decode) => buildFfmpegArgs(buildSessionInvocation({
+		decode,
 		rtspUrl,
-		videoArgs,
+		video: videoPlan,
 		videoTarget,
 		audioTarget,
 		videoPayloadType: video.pt,
@@ -40958,13 +42229,13 @@ async function startFfmpegForSession(bctx, session, sessionId, video, advertised
 		audioSsrcSigned,
 		audioPacketTimeMs: video.packet_time ?? 20,
 		audioSampleRateKhz: video.sample_rate ?? 16
-	});
+	}));
 	const log = ctx.logger.withTags({ deviceId: numericDeviceId });
 	let hardwareAlreadyFailed = false;
 	const spawnFfmpeg = (decision) => {
 		const spawnedAtMs = Date.now();
 		const usedHardware = decision.kind === "hardware";
-		const proc = spawn("ffmpeg", buildArgs(decision.args), { stdio: [
+		const proc = spawn("ffmpeg", buildArgs(decision), { stdio: [
 			"ignore",
 			"ignore",
 			"pipe"
@@ -40987,6 +42258,7 @@ async function startFfmpegForSession(bctx, session, sessionId, video, advertised
 				runtimeMs: Date.now() - spawnedAtMs
 			})) {
 				hardwareAlreadyFailed = true;
+				if (decision.kind === "hardware") options.decodeMemos.failedBackend.write(decision.backend);
 				log.warn("export-hap: hardware decode FAILED at init — respawning ffmpeg in software", { meta: {
 					sessionId,
 					backend: decision.kind === "hardware" ? decision.backend : null,
@@ -40996,11 +42268,7 @@ async function startFfmpegForSession(bctx, session, sessionId, video, advertised
 					runtimeMs: Date.now() - spawnedAtMs
 				} });
 				if (session.ffmpeg === proc) session.ffmpeg = null;
-				spawnFfmpeg({
-					kind: "software",
-					reason: "hardware-attempt-failed",
-					args: []
-				});
+				spawnFfmpeg(software("hardware-attempt-failed"));
 				return;
 			}
 			onFfmpegExit(proc, code, signal);
@@ -41045,7 +42313,7 @@ async function startFfmpegForSession(bctx, session, sessionId, video, advertised
 		fitReason: fit.reason,
 		encodeBudgetKbps: fit.budgetKbps,
 		audioCodec: "opus",
-		audioBitrateKbps: 24,
+		audioBitrateKbps: OPUS_BITRATE_KBPS,
 		videoDecode: hwDecode.kind === "hardware" ? hwDecode.backend : "software"
 	} });
 }
@@ -41250,16 +42518,87 @@ function errMsg$8(err) {
 	return err instanceof Error ? err.message : String(err);
 }
 //#endregion
+//#region src/mappers/builders/doorbell-delivery.ts
+function isRecord(value) {
+	return typeof value === "object" && value !== null;
+}
+function numberOrNull(value) {
+	return typeof value === "number" ? value : null;
+}
+function isConnectionLike(value) {
+	return isRecord(value) && typeof value["hasEventNotifications"] === "function";
+}
+function isIterable(value) {
+	return isRecord(value) && typeof value[Symbol.iterator] === "function";
+}
+/** `accessory._server.httpServer.connections`, or null at any missing hop. */
+function readConnections(accessory) {
+	if (!isRecord(accessory)) return null;
+	const server = accessory["_server"];
+	if (!isRecord(server)) return null;
+	const httpServer = server["httpServer"];
+	if (!isRecord(httpServer)) return null;
+	const connections = httpServer["connections"];
+	return isIterable(connections) ? connections : null;
+}
+/**
+* Probe how far a ring on `characteristic` of `accessory` can travel RIGHT NOW.
+* Pure with respect to HAP state — it only reads. Never throws.
+*/
+function describeDoorbellDelivery(accessory, characteristic) {
+	const aid = isRecord(accessory) ? numberOrNull(accessory["aid"]) : null;
+	const iid = isRecord(characteristic) ? numberOrNull(characteristic["iid"]) : null;
+	const serverPublished = isRecord(accessory) && isRecord(accessory["_server"]);
+	const connections = readConnections(accessory);
+	if (connections === null) return {
+		aid,
+		iid,
+		serverPublished,
+		connectionCount: 0,
+		subscriberCount: 0
+	};
+	let connectionCount = 0;
+	let subscriberCount = 0;
+	for (const connection of connections) {
+		connectionCount += 1;
+		if (aid === null || iid === null) continue;
+		if (isConnectionLike(connection) && connection.hasEventNotifications(aid, iid)) subscriberCount += 1;
+	}
+	return {
+		aid,
+		iid,
+		serverPublished,
+		connectionCount,
+		subscriberCount
+	};
+}
+/**
+* True when the ring provably reached nobody: no connection is subscribed to
+* the characteristic, so hap-nodejs dropped every event frame silently. The
+* caller must say so out loud — this is a branch that discards work.
+*/
+function ringReachedNobody(report) {
+	return report.subscriberCount === 0;
+}
+//#endregion
 //#region src/mappers/builders/doorbell.ts
 async function buildDoorbell(input) {
 	const { bctx, controller } = input;
 	const { ctx, numericDeviceId } = bctx;
+	const log = ctx.logger.withTags({ deviceId: numericDeviceId });
+	log.info("export-hap: doorbell forward armed — HomeKit will ring on doorbell.onPressed");
 	const unsubscribe = ctx.eventBus.subscribe({ category: EventCategory.DoorbellOnPressed }, (event) => {
-		if (event.data.deviceId !== numericDeviceId) return;
+		if (event.data?.deviceId !== numericDeviceId) return;
 		try {
+			const delivery = describeDoorbellDelivery(bctx.accessory, bctx.accessory.getService(Service.Doorbell)?.getCharacteristic(Characteristic.ProgrammableSwitchEvent) ?? null);
 			controller.ringDoorbell();
+			if (ringReachedNobody(delivery)) {
+				log.warn("export-hap: doorbell rang but NO HomeKit controller is subscribed — the press was dropped before it left the hub (no home hub connected, or the accessory was republished and iOS has not re-subscribed yet)", { meta: { ...delivery } });
+				return;
+			}
+			log.info("export-hap: doorbell SINGLE_PRESS pushed to HomeKit", { meta: { ...delivery } });
 		} catch (err) {
-			ctx.logger.withTags({ deviceId: numericDeviceId }).warn("export-hap: ringDoorbell() failed", { meta: { error: errMsg$7(err) } });
+			log.warn("export-hap: ringDoorbell() failed", { meta: { error: errMsg$7(err) } });
 		}
 	});
 	return { async dispose() {
@@ -41335,6 +42674,78 @@ function errMsg$6(err) {
 	return err instanceof Error ? err.message : String(err);
 }
 //#endregion
+//#region src/mappers/builders/service-label.ts
+/**
+* The ONE place a secondary service on the camera accessory gets its label.
+*
+* A "secondary service" here is a Switch or Lightbulb published alongside the
+* camera on the same accessory — the privacy switch, each accessory child
+* (siren, floodlight), each PTZ action. iOS Home renders these as their own
+* controls, and the operator has seen them as "Interruttore 1", "Interruttore
+* 2" through three separate rounds of fixes.
+*
+* ## Why `Name` alone cannot rename anything
+*
+* Two facts about hap-nodejs 2.1.7, both measured against the installed copy
+* rather than reasoned about:
+*
+*  1. `accessory.addService(Type, displayName, subtype)` ALREADY writes
+*     `displayName` to `Characteristic.Name` (`Service` constructor). So every
+*     round of this bug — including the one that moved the label onto
+*     `ConfiguredName` — shipped with `Name` correctly set. "iOS had no name
+*     to render" was never true.
+*  2. The mDNS configuration number (`c#`) is a sha1 over
+*     `internalHAPRepresentation(false)`, which OMITS characteristic VALUES.
+*     Changing the string in `Name` therefore does not bump `c#`, a paired
+*     controller gets no signal to re-read `/accessories`, and the name it
+*     cached at first enumeration stands forever.
+*
+* `Name` is also declared `pr` only — paired read, no write, no notify. It is
+* the seed a controller seeds its database from once; it is not a channel.
+*
+* ## Why `ConfiguredName`
+*
+* `ConfiguredName` (`000000E3`) is declared `pr | pw | ev` — the only name
+* characteristic a controller may write and may subscribe to. It is what iOS
+* 16+ reads for a service the user can rename, and adding it CHANGES the
+* accessory structure, so `c#` does bump and the controller re-reads.
+*
+* It was removed once because hap-nodejs logged
+*
+* ```
+* Characteristic not in required or optional characteristic section for
+* service Switch. Adding anyway.
+* ```
+*
+* That line is a WARNING, not a rejection: `Service.getCharacteristic` calls
+* `addCharacteristic` unconditionally and only then emits the warning. The
+* characteristic was always present and always published. hap-nodejs'
+* per-service optional lists simply predate `ConfiguredName` being valid on
+* any service.
+*
+* Registering it with {@link Service.addOptionalCharacteristic} first takes
+* the branch above the warning, so the accessory still builds with ZERO
+* characteristic warnings — which is what `service-naming.spec.ts` asserts.
+*
+* ## Scope
+*
+* Switch- and Lightbulb-shaped services only. `Service.MotionSensor` on a
+* camera accessory is not a separately named tile in iOS Home, so giving it a
+* writable name would be a guess, and this module does not guess.
+*/
+/**
+* Publish `name` as both the immutable `Name` and the controller-visible
+* `ConfiguredName` of `service`.
+*
+* `name` must already be HAP-valid — build it with `service-names.ts`, which
+* cannot return a string hap-nodejs' `checkName` would warn about.
+*/
+function applyServiceLabel(service, name) {
+	service.setCharacteristic(Characteristic.Name, name);
+	if (!service.optionalCharacteristics.some((characteristic) => characteristic.UUID === Characteristic.ConfiguredName.UUID)) service.addOptionalCharacteristic(Characteristic.ConfiguredName);
+	service.setCharacteristic(Characteristic.ConfiguredName, name);
+}
+//#endregion
 //#region src/mappers/builders/privacy-switch.ts
 /**
 * Privacy-mask switch builder — turns the camstack `privacy-mask` cap's
@@ -41352,12 +42763,12 @@ function errMsg$6(err) {
 * camera-enabled switch — distinct from privacy-mask).
 */
 async function buildPrivacySwitch(bctx) {
-	const { ctx, accessory, proxy, numericDeviceId, displayName } = bctx;
+	const { ctx, accessory, proxy, numericDeviceId } = bctx;
 	const log = ctx.logger.withTags({ deviceId: numericDeviceId });
 	const subtype = "privacy-mask";
-	const serviceName = privacyServiceName(displayName);
+	const serviceName = privacyServiceName();
 	const service = accessory.addService(Service.Switch, serviceName, subtype);
-	service.setCharacteristic(Characteristic.Name, serviceName);
+	applyServiceLabel(service, serviceName);
 	try {
 		const status = await proxy.privacyMask?.getStatus({});
 		if (status && typeof status.enabled === "boolean") service.updateCharacteristic(Characteristic.On, status.enabled);
@@ -41447,23 +42858,17 @@ function ptzPresetLabel(presetName) {
 *    `proxy.ptzAutotrack.setEnabled({enabled})`. Initial value is
 *    hydrated from `getStatus({})`.
 *
-* Naming: `<camera> <action>` — "Videocamera ingresso Preset stanza" — built
-* by `ptzServiceName` and written to the `Name` characteristic.
-*
-* TWO separate naming defects have been through this file, and both are fixed
-* by that one line:
-*  - `${displayName} — <action>` embedded an em-dash (U+2014), which is
-*    outside Apple's permitted set. hap-nodejs' `checkName` warned, iOS
-*    discarded the name and showed "Interruttore N". A previous round dropped
-*    the camera prefix along with the em-dash; only the em-dash was the fault.
-*  - The bare label that replaced it was then written to `ConfiguredName`,
-*    which `Service.Switch` does not list, so hap-nodejs rejected the
-*    characteristic outright — SIX rejections per PTZ camera per build, never
-*    reported because only the two switches on the non-PTZ camera were noticed.
+* Naming: the bare action — "Preset stanza", "Pan Left", "Autotrack" — built
+* by `ptzServiceName` and published through `applyServiceLabel`, which writes
+* it to BOTH `Name` and `ConfiguredName`. The camera name is deliberately not
+* prefixed — these eight services live on that camera's accessory and iOS
+* shows them there. THREE rounds of this bug have been through this file;
+* `service-label.ts` records what each got wrong, and why only the writable
+* characteristic can rename a service after pairing.
 */
 var MOMENTARY_RESET_MS = 1e3;
 async function buildPtz(bctx) {
-	const { ctx, accessory, proxy, numericDeviceId, displayName, options } = bctx;
+	const { ctx, accessory, proxy, numericDeviceId, options } = bctx;
 	const log = ctx.logger.withTags({ deviceId: numericDeviceId });
 	const timers = /* @__PURE__ */ new Set();
 	const armReset = (cb, delay) => {
@@ -41475,10 +42880,10 @@ async function buildPtz(bctx) {
 	};
 	const presets = await readPresets(bctx);
 	for (const preset of presets) {
-		const label = ptzServiceName(displayName, ptzPresetLabel(preset.name));
+		const label = ptzServiceName(ptzPresetLabel(preset.name));
 		const subtype = `ptz-preset-${preset.id}`;
 		const service = accessory.addService(Service.Switch, label, subtype);
-		service.setCharacteristic(Characteristic.Name, label);
+		applyServiceLabel(service, label);
 		service.getCharacteristic(Characteristic.On).onSet(async (value) => {
 			if (value !== true) return;
 			try {
@@ -41493,9 +42898,9 @@ async function buildPtz(bctx) {
 		});
 	}
 	if (proxy.ptz) for (const dir of PTZ_DIRECTIONS) {
-		const label = ptzServiceName(displayName, dir.label);
+		const label = ptzServiceName(dir.label);
 		const service = accessory.addService(Service.Switch, label, dir.subtype);
-		service.setCharacteristic(Characteristic.Name, label);
+		applyServiceLabel(service, label);
 		service.getCharacteristic(Characteristic.On).onSet(async (value) => {
 			if (value !== true) return;
 			try {
@@ -41539,12 +42944,12 @@ async function readPresets(bctx) {
 	}
 }
 async function tryBuildAutotrack(bctx) {
-	const { ctx, accessory, proxy, numericDeviceId, displayName } = bctx;
+	const { ctx, accessory, proxy, numericDeviceId } = bctx;
 	if (!proxy.ptzAutotrack) return { async dispose() {} };
 	const log = ctx.logger.withTags({ deviceId: numericDeviceId });
-	const label = ptzServiceName(displayName, PTZ_AUTOTRACK_LABEL);
+	const label = ptzServiceName(PTZ_AUTOTRACK_LABEL);
 	const service = accessory.addService(Service.Switch, label, "ptz-autotrack");
-	service.setCharacteristic(Characteristic.Name, label);
+	applyServiceLabel(service, label);
 	try {
 		const status = await proxy.ptzAutotrack.getStatus({});
 		if (status && typeof status.enabled === "boolean") service.updateCharacteristic(Characteristic.On, status.enabled);
@@ -41671,7 +43076,7 @@ async function buildChildSwitch(bctx, subtype, deviceType) {
 	const isLightingDevice = deviceType === DeviceType.Light || deviceType === DeviceType.Generic;
 	const useLightbulb = hasBrightness && isLightingDevice;
 	const service = useLightbulb ? accessory.addService(Service.Lightbulb, displayName, subtype) : accessory.addService(Service.Switch, displayName, subtype);
-	service.setCharacteristic(Characteristic.Name, displayName);
+	applyServiceLabel(service, displayName);
 	try {
 		const switchStatus = await proxy.switch?.getStatus({});
 		if (switchStatus && typeof switchStatus.on === "boolean") service.updateCharacteristic(Characteristic.On, switchStatus.on);
@@ -41911,6 +43316,118 @@ function pickMapperKind(_capabilities) {
 	return "camera";
 }
 //#endregion
+//#region src/mappers/builders/stream-hwaccel-memo.ts
+/**
+* The two bounded memos HomeKit's decode path owns.
+*
+* ## Why they exist
+*
+* Everything D67 was actually about — one argv builder, one set of constants,
+* one hwaccel authority — HomeKit already had. What it did NOT have were the
+* two things the broker gained alongside them:
+*
+*  1. **A memo.** `probeDecoderHwaccel` issued a cross-process
+*     `decoder.getInfo` per SESSION. iOS starts sessions in bursts — one on
+*     record was started three times in 16 s — and every one of those paid a
+*     cap call on a hub whose main thread is the scarce resource.
+*  2. **Failure feedback.** When HomeKit's hardware child died at init and
+*     `shouldRetryInSoftware` saved the session, HomeKit told nobody. The next
+*     session re-picked the same corpse and paid the same two-second death.
+*     `EgressTranscodeManager` fixed exactly this for its own children
+*     (26a522cd5) by reporting the dead backend into the broker's 60 s memo.
+*
+* ## Both ride `HwAccelCache`, deliberately
+*
+* `createHwAccelCache` from `@camstack/types` is the primitive the broker's own
+* `egressHwAccelCache` is built from, and the discipline it encodes is the
+* point: **caller-owned, never a module global** — a module global would
+* outlive an addon respawn and survive an operator changing the decoder
+* backend. Same TTL as the broker's, so "has hardware come back yet" cannot
+* answer differently depending on which consumer asked.
+*
+* ## The cross-process gap, stated honestly
+*
+* These memos are scoped to the `export-hap` PROCESS. When HomeKit's vaapi
+* child dies, the broker's next child still pays its own two-second death, and
+* vice versa — because addons may never import each other and there is no
+* capability for "this backend is dead on this node right now". Closing that
+* would need a new cap surface, which Phase 0 explicitly does not take. What is
+* closed here is HomeKit's own repetition of the cost, across cameras and
+* across sessions.
+*/
+/**
+* The window both memos answer for.
+*
+* 60 s, the same as `stream-broker-manager`'s `egressHwAccelCache`. Long enough
+* that a burst of session restarts pays one read; short enough that an operator
+* who changes the decoder backend, or a host whose accelerator recovers, is
+* obeyed on the next session rather than after an addon respawn.
+*/
+var HAP_DECODE_MEMO_TTL_MS = 6e4;
+/**
+* Separator inside the encoded reading. A control character, because a backend
+* name is `[a-z0-9]+` and the decoder's non-backend choices are `auto` /
+* `none` / `''`, none of which can contain one — so the split is total.
+*/
+var READING_SEPARATOR = "
";
+/**
+* Marks a `null` FIELD, distinct from an EMPTY one.
+*
+* `probedBestHwaccel: ''` means the decoder answered and has never probed
+* (=> `not-probed`); `null` means the field was absent altogether. Encoding
+* both as `''` would lose a distinction `selectHwDecode` acts on.
+*/
+var NULL_FIELD = "\0";
+function encodeField(value) {
+	return value === null ? NULL_FIELD : value;
+}
+function decodeField(value) {
+	return value === NULL_FIELD ? null : value;
+}
+/**
+* A reading as ONE `string | null`, which is what {@link HwAccelCache} stores.
+*
+* The cache's three states are exactly the three a memoised reading needs:
+* `undefined` (never asked, or expired), `null` (asked, and the decoder could
+* not be reached), and a value. Encoding into the one cache rather than
+* splitting across two is what keeps those three from skewing — two caches
+* written together can still be READ across an expiry boundary.
+*/
+function encodeDecoderReading(reading) {
+	if (reading === null) return null;
+	return `${encodeField(reading.hwaccel)}${READING_SEPARATOR}${encodeField(reading.probedBestHwaccel)}`;
+}
+function decodeDecoderReading(value) {
+	if (value === null) return null;
+	const [hwaccel = NULL_FIELD, probed = NULL_FIELD] = value.split(READING_SEPARATOR);
+	return {
+		hwaccel: decodeField(hwaccel),
+		probedBestHwaccel: decodeField(probed)
+	};
+}
+function createDecoderReadingMemo(options) {
+	const cache = createHwAccelCache(options);
+	return {
+		read() {
+			const cached = cache.read();
+			return cached === void 0 ? void 0 : decodeDecoderReading(cached);
+		},
+		write(reading) {
+			cache.write(encodeDecoderReading(reading));
+		}
+	};
+}
+function createHapDecodeMemos(now) {
+	const options = {
+		ttlMs: HAP_DECODE_MEMO_TTL_MS,
+		...now ? { now } : {}
+	};
+	return {
+		reading: createDecoderReadingMemo(options),
+		failedBackend: createHwAccelCache(options)
+	};
+}
+//#endregion
 //#region src/reconcile/sync-state.ts
 function syncStateFromJson(json) {
 	const map = /* @__PURE__ */ new Map();
@@ -42053,6 +43570,18 @@ var ExportHapAddon = class extends BaseAddon {
 	pincode = "";
 	/** Optional mDNS/bind interface (config.interfaceName), or undefined. */
 	bind;
+	/**
+	* What this PROCESS remembers about decode hardware, shared by every camera
+	* mapper: the decoder addon's per-node reading (60 s), and the backend that
+	* last died at init (60 s).
+	*
+	* Owned here rather than as a module global for the reason `HwAccelCache`
+	* itself records — a module global outlives an addon respawn and survives an
+	* operator changing the decoder backend. Owned here rather than per mapper
+	* because the whole point is that camera B does not re-pay camera A's failed
+	* hardware init.
+	*/
+	decodeMemos = createHapDecodeMemos();
 	constructor() {
 		super({ ...DEFAULT_CONFIG });
 	}
@@ -42194,13 +43723,14 @@ var ExportHapAddon = class extends BaseAddon {
 		const mapperKind = pickMapperKind(capabilities);
 		if (!mapperKind) throw new Error(`export-hap: no mapper for capabilities ${JSON.stringify(capabilities ?? [])}`);
 		const displayName = await this.resolveDisplayName(deviceId);
-		const baseEntry = {
+		const previous = this.config.exposed.find((e) => e.deviceId === deviceId);
+		const baseEntry = carryForward({
 			deviceId,
 			displayName,
 			mapperKind,
-			addedAt: Date.now(),
+			addedAt: previous?.addedAt ?? Date.now(),
 			...capabilities ? { capabilities: [...capabilities] } : {}
-		};
+		}, previous, ["settings", "capabilities"]);
 		const attached = await this.attachMapper(baseEntry);
 		const finalEntry = {
 			...baseEntry,
@@ -42219,13 +43749,13 @@ var ExportHapAddon = class extends BaseAddon {
 			childCount: attached.childAccessoryUuids.length
 		} });
 	}
-	async unexposeDevice(deviceId) {
+	async unexposeDevice(deviceId, options = {}) {
 		const numericId = Number.parseInt(deviceId, 10);
 		const log = this.ctx.logger.withTags({ deviceId: numericId });
 		await this.detachMapper(deviceId);
 		const next = this.config.exposed.filter((e) => e.deviceId !== deviceId);
 		if (next.length !== this.config.exposed.length) await this.updateGlobalSettings({ exposed: next });
-		clearPairingFiles(uuid.generate(`camstack:camera:${numericId}`), this.ctx.logger);
+		if (options.clearPairing !== false) clearPairingFiles(uuid.generate(`camstack:camera:${numericId}`), this.ctx.logger);
 		await this.forgetFingerprint(numericId);
 		log.info("export-hap: unexposed device");
 	}
@@ -42238,6 +43768,7 @@ var ExportHapAddon = class extends BaseAddon {
 			displayName: entry.displayName,
 			options: {
 				ptzPulseMs: this.config.ptzPulseMs,
+				decodeMemos: this.decodeMemos,
 				hapDeviceSettings: { streamPreference: entrySettings.streamPreference ?? "auto" }
 			}
 		});
@@ -42628,9 +44159,8 @@ var ExportHapAddon = class extends BaseAddon {
 				to: streamPreference
 			} });
 			try {
-				await this.unexposeDevice(deviceIdStr);
+				await this.unexposeDevice(deviceIdStr, { clearPairing: false });
 				await this.exposeDevice(deviceIdStr);
-				await this.updateEntrySettings(deviceIdStr, nextSettings);
 			} catch (err) {
 				log.warn("export-hap: failed to refresh accessory after streamPreference change", { meta: { error: errMsg(err) } });
 			}