@camstack/addon-decoder-ffmpeg 1.1.1 → 1.1.3

package/dist/index.js

@@ -13052,7 +13052,9 @@ var decoderCapability = {
 			id: string(),
 			name: string(),
 			isPullMode: boolean().optional(),
-			priority: number().optional()
+			priority: number().optional(),
+			hwaccel: string().optional(),
+			probedBestHwaccel: string().optional()
 		})),
 		createSession: method(DecoderSessionConfigSchema, object({
 			sessionId: string(),
@@ -22721,23 +22723,110 @@ var DEFAULT_DECODER_BACKEND = "nodeav";
 function parseDecoderBackend(value) {
 	return value === "ffmpeg" || value === "nodeav" ? value : null;
 }
+/**
+* Normalise a raw kernel node id to the bare node id used for scoping.
+* `localNodeId` can carry a `<node>/<addon>` suffix; the decoder selection is
+* per-NODE, so strip the addon segment. Falls back to `hub`.
+*/
+function normalizeDecoderNodeId(rawNodeId) {
+	const raw = rawNodeId ?? "hub";
+	return raw.includes("/") ? raw.split("/")[0] ?? "hub" : raw;
+}
 //#endregion
 //#region src/shared/decoder-backend.ts
+/** The NEUTRAL addon (pipeline-orchestrator, hub-resident) whose global
+* settings OWN the per-node `backend` selector. Neither decoder addon owns
+* it, so decoder-nodeav / decoder-ffmpeg stay fully independent. */
+var DECODER_OWNER_ADDON_ID = "pipeline-orchestrator";
+function isHydratedField(entry) {
+	return typeof entry === "object" && entry !== null && "key" in entry;
+}
 /**
-* Resolve the OWNER addon's (`decoder-ffmpeg`) own per-node backend from its
-* ALREADY-PROJECTED global store — the store `BaseAddon.resolveGlobalStore`
-* returns, where the `perNode` `backend` field carries THIS node's value on
-* its bare key. The owner MUST use this instead of {@link resolveDecoderBackend}:
-* routing `addonSettings.getGlobalSettings({addonId:'decoder-ffmpeg'})` back to
-* itself during its OWN `onInitialize` DEADLOCKS (the addon is not "loaded" on
-* the node until init completes, but init is blocked on the read) → the read
-* throws `transport-failed (addon not loaded)` → it silently defaults to the
-* built-in default and mis-decides its own registration (e.g. an explicitly
-* selected `ffmpeg` fallback would never come up). Reading its own store is
-* local, race-free, and has no deadlock.
+* Pure selection from an already-read hydrated settings payload: extract the
+* owner's `backend` field value (which the owner projected per-node from its
+* scoped store key) and narrow it. A missing/invalid field or a null payload
+* resolves to {@link DEFAULT_DECODER_BACKEND} — never a bare store key.
 */
-function resolveOwnDecoderBackend(projectedGlobalStore) {
-	return parseDecoderBackend(projectedGlobalStore["backend"]) ?? "nodeav";
+function pickDecoderBackendFromSettings(view) {
+	if (view === null) return DEFAULT_DECODER_BACKEND;
+	for (const section of view.sections) for (const entry of section.fields) {
+		if (!isHydratedField(entry) || entry.key !== "backend") continue;
+		return parseDecoderBackend(entry.value) ?? "nodeav";
+	}
+	return DEFAULT_DECODER_BACKEND;
+}
+/** Missing optional owner fingerprints: ffmpeg may be uninstalled. */
+function isMissingOwnerSettingsError(message) {
+	return /not routable/i.test(message) || /provider not available/i.test(message);
+}
+/** Transient transport/settings-store fingerprints worth retrying on. */
+function isTransientSettingsError(message) {
+	return /not loaded/i.test(message) || /transport-failed/i.test(message) || /not connected/i.test(message) || /SqliteSettingsBackend not initialized/i.test(message);
+}
+/**
+* Resolve the decoder backend a NON-OWNER addon (`decoder-nodeav`) should run,
+* by reading the OWNER's (`decoder-ffmpeg`) hub-central per-node `backend`.
+*
+* The read routes to the owner addon's child runner; during a simultaneous
+* (re)start the owner may not be up yet → a transient `transport-failed (addon
+* not loaded)`. Immediately defaulting here would ignore an explicit `ffmpeg`
+* selection (the node would silently run the node-av default instead). So retry
+* on the transient fingerprints with a bounded budget (mirrors
+* `BaseAddon.readAddonStoreWithRetry`) until the owner answers; only a
+* persistent failure falls back to {@link DEFAULT_DECODER_BACKEND}.
+*
+* The OWNER addon must NOT call this (it would self-route + deadlock) — it uses
+* {@link resolveOwnDecoderBackend} against its own store instead.
+*/
+async function resolveDecoderBackend(api, nodeId, logger) {
+	if (!api) {
+		logger.warn("decoder-backend: no api surface — using default backend", { meta: { default: DEFAULT_DECODER_BACKEND } });
+		return DEFAULT_DECODER_BACKEND;
+	}
+	const normalized = normalizeDecoderNodeId(nodeId);
+	const delaysMs = [
+		150,
+		350,
+		600,
+		900,
+		1200
+	];
+	let lastErr;
+	for (let attempt = 0; attempt <= delaysMs.length; attempt++) {
+		try {
+			const view = await api.addonSettings.getGlobalSettings.query({
+				addonId: DECODER_OWNER_ADDON_ID,
+				nodeId: normalized
+			});
+			if (view !== null) return pickDecoderBackendFromSettings(view);
+			lastErr = /* @__PURE__ */ new Error("owner settings unavailable (null)");
+		} catch (err) {
+			lastErr = err;
+			const msg = err instanceof Error ? err.message : String(err);
+			if (isTransientSettingsError(msg)) {} else if (isMissingOwnerSettingsError(msg)) {
+				logger.warn("decoder-backend: optional owner unavailable — using default backend", { meta: {
+					default: DEFAULT_DECODER_BACKEND,
+					owner: DECODER_OWNER_ADDON_ID,
+					error: msg
+				} });
+				return DEFAULT_DECODER_BACKEND;
+			} else {
+				logger.warn("decoder-backend: settings read failed — using default backend", { meta: {
+					default: DEFAULT_DECODER_BACKEND,
+					error: msg
+				} });
+				return DEFAULT_DECODER_BACKEND;
+			}
+		}
+		if (attempt === delaysMs.length) break;
+		await new Promise((resolve) => setTimeout(resolve, delaysMs[attempt]));
+	}
+	logger.warn("decoder-backend: owner settings unavailable after retries — using default backend", { meta: {
+		default: DEFAULT_DECODER_BACKEND,
+		owner: DECODER_OWNER_ADDON_ID,
+		error: lastErr instanceof Error ? lastErr.message : String(lastErr)
+	} });
+	return DEFAULT_DECODER_BACKEND;
 }
 //#endregion
 //#region src/shared/notifying-ring-buffer.ts
@@ -24051,19 +24140,15 @@ function probeGpuScaleFilters(ffmpegPath, logger) {
 //#endregion
 //#region src/addon/index.ts
 var FRAME_BUFFER_CAPACITY = 32;
-var DEFAULT_DECODER_FFMPEG_ADDON_CONFIG = {
-	...DEFAULT_DECODER_HWACCEL_CONFIG,
-	backend: DEFAULT_DECODER_BACKEND,
-	binaryPath: ""
-};
-/** The two selectable decoder backends, in default-first order. */
-var DECODER_BACKEND_OPTIONS = [{
-	value: "nodeav",
-	label: "node-av (in-process FFmpeg bindings — default)"
-}, {
-	value: "ffmpeg",
-	label: "ffmpeg (subprocess — crash-isolated fallback)"
-}];
+/**
+* decoder-ffmpeg owns only its own `hwaccel` override + `probedBestHwaccel`
+* probe (the shared {@link DecoderHwAccelConfig}), both `perNode: true` — the
+* BASE `BaseAddon` settings surface persists them node-scoped as
+* `<key>@<nodeId>`. The per-node `backend` selector lives on the neutral
+* pipeline-orchestrator; the ffmpeg binary is resolved node-level via
+* `ctx.deps.ensureFfmpeg()` (no per-addon override).
+*/
+var DEFAULT_DECODER_FFMPEG_ADDON_CONFIG = { ...DEFAULT_DECODER_HWACCEL_CONFIG };
 var DecoderFfmpegAddon = class extends BaseAddon {
 	sessions = /* @__PURE__ */ new Map();
 	frameBuffers = /* @__PURE__ */ new Map();
@@ -24074,10 +24159,9 @@ var DecoderFfmpegAddon = class extends BaseAddon {
 	getFrameHits = 0;
 	getFrameMisses = 0;
 	/**
-	* The ffmpeg binary every session spawns — resolved once at init from the
-	* cluster `ffmpeg` config section (`binaryPath`), defaulting to PATH
-	* `ffmpeg`. MUST be the same binary the broker / recorder / probe use so the
-	* decode-accel probe reports for the right build.
+	* The ffmpeg binary every session spawns — resolved once at init via the
+	* node-level `ctx.deps.ensureFfmpeg()`. The SAME binary the broker / recorder
+	* / audio-codec use, so the decode-accel probe reports for the right build.
 	*/
 	ffmpegPath = "ffmpeg";
 	/**
@@ -24098,74 +24182,39 @@ var DecoderFfmpegAddon = class extends BaseAddon {
 	}
 	globalSettingsSchema() {
 		return this.schema({ sections: [{
-			id: "backend",
-			title: "Decoder backend",
+			id: "hwaccel",
+			title: "Hardware acceleration",
 			tab: "decoder",
-			description: "Which decoder addon provides the decoder capability on this node — per-node selection, stored centrally on the hub. Selection is decided once at addon init (registration-time, race-free), so a change applies at the next restart of the decoder addons on the node.",
+			description: "Backend used by ffmpeg-subprocess decoder sessions. \"Auto\" defers to the probed best (VA-API on Intel); \"Off\" forces pure software. Only the VA-API hardware path is validated — other concrete backends degrade to software. Changes apply to NEW sessions.",
 			fields: [this.field({
 				type: "select",
-				key: "backend",
-				label: "Backend",
-				options: [...DECODER_BACKEND_OPTIONS],
-				default: DEFAULT_DECODER_BACKEND,
+				key: "hwaccel",
+				label: "Preferred backend",
+				options: [...HWACCEL_OPTIONS],
+				default: "auto",
 				immediate: true,
 				perNode: true
+			}), this.field({
+				type: "text",
+				key: "probedBestHwaccel",
+				label: "Probed best",
+				description: "Auto-detected best decoder backend on this host. Click the refresh icon to re-run the probe.",
+				readonlyField: true,
+				default: "",
+				perNode: true,
+				actions: [{
+					action: "reprobe-hwaccel",
+					icon: "refresh-cw",
+					tooltip: "Re-probe hwaccel"
+				}]
 			})]
-		}, {
-			id: "hwaccel",
-			title: "Hardware acceleration",
-			tab: "decoder",
-			description: "Backend used by ffmpeg-subprocess decoder sessions. \"Auto\" defers to the probed best (VA-API on Intel); \"Off\" forces pure software. Only the VA-API hardware path is validated — other concrete backends degrade to software. Changes apply to NEW sessions.",
-			fields: [
-				this.field({
-					type: "select",
-					key: "hwaccel",
-					label: "Preferred backend",
-					options: [...HWACCEL_OPTIONS],
-					default: "auto",
-					immediate: true,
-					perNode: true
-				}),
-				this.field({
-					type: "text",
-					key: "probedBestHwaccel",
-					label: "Probed best",
-					description: "Auto-detected best decoder backend on this host. Click the refresh icon to re-run the probe.",
-					readonlyField: true,
-					default: "",
-					perNode: true,
-					actions: [{
-						action: "reprobe-hwaccel",
-						icon: "refresh-cw",
-						tooltip: "Re-probe hwaccel"
-					}]
-				}),
-				this.field({
-					type: "text",
-					key: "binaryPath",
-					label: "ffmpeg binary path (override)",
-					description: "Optional per-node override for the ffmpeg binary. Leave empty to auto-provision a portable static ffmpeg on this node (recommended). Per-node because the path differs per OS/arch.",
-					placeholder: "ffmpeg",
-					default: "",
-					perNode: true
-				})
-			]
 		}] });
 	}
 	async onInitialize() {
 		if (!this.config.probedBestHwaccel) this.reprobeHwaccel().catch((err) => {
 			this.ctx.logger.warn("ffmpeg: auto-reprobe hwaccel failed", { meta: { error: err instanceof Error ? err.message : String(err) } });
 		});
-		let backend;
-		try {
-			backend = resolveOwnDecoderBackend(await this.resolveGlobalStore(this.resolveLocalNodeId()));
-		} catch (err) {
-			this.ctx.logger.warn("decoder-ffmpeg: own-store backend read failed — using default", { meta: {
-				default: DEFAULT_DECODER_BACKEND,
-				error: err instanceof Error ? err.message : String(err)
-			} });
-			backend = DEFAULT_DECODER_BACKEND;
-		}
+		const backend = await resolveDecoderBackend(this.ctx.api, this.resolveLocalNodeId(), this.ctx.logger);
 		if (backend !== "ffmpeg") {
 			this.ctx.logger.info("ffmpeg decoder: this node selects a different decoder backend — standing down (no decoder provider registered)", { meta: { selectedBackend: backend } });
 			return [];
@@ -24184,14 +24233,11 @@ var DecoderFfmpegAddon = class extends BaseAddon {
 		}];
 	}
 	/**
-	* Resolve the ffmpeg binary the sessions spawn.
+	* Resolve the ffmpeg binary the sessions spawn — node-level only.
 	*
-	* Precedence:
-	* 1. An explicit operator override in the cluster `ffmpeg` config section
-	*    (`binaryPath`) — wins when set, so a hand-picked build can be forced.
-	* 2. Otherwise `ctx.deps.ensureFfmpeg()` — provisions a portable static
-	*    ffmpeg into the node's deps dir when the system has none and returns its
-	*    absolute path. This GUARANTEES ffmpeg on every node (hub, agent, Mac),
+	* `ctx.deps.ensureFfmpeg()` provisions a portable static ffmpeg into the
+	* node's deps dir when the system has none and returns its absolute path.
+	* This GUARANTEES ffmpeg on every node (hub, agent, Mac),
 	*    so there is no missing-ffmpeg case and no node-av fallback.
 	*
 	* `ensureFfmpeg()` is single-flighted, so we resolve once at init and reuse
@@ -24200,8 +24246,6 @@ var DecoderFfmpegAddon = class extends BaseAddon {
 	* decoder cap and a later session spawn re-runs the ensure.
 	*/
 	async resolveFfmpegBinaryPath() {
-		const override = this.config.binaryPath;
-		if (typeof override === "string" && override.trim().length > 0) return override;
 		try {
 			return await this.ctx.deps.ensureFfmpeg();
 		} catch (err) {
@@ -24302,7 +24346,9 @@ var DecoderFfmpegAddon = class extends BaseAddon {
 			id: "decoder-ffmpeg",
 			name: "Decoder (ffmpeg)",
 			isPullMode: true,
-			priority: 5
+			priority: 5,
+			hwaccel: this.config.hwaccel,
+			probedBestHwaccel: this.config.probedBestHwaccel || void 0
 		};
 	}
 	/**

package/dist/index.mjs

@@ -13048,7 +13048,9 @@ var decoderCapability = {
 			id: string(),
 			name: string(),
 			isPullMode: boolean().optional(),
-			priority: number().optional()
+			priority: number().optional(),
+			hwaccel: string().optional(),
+			probedBestHwaccel: string().optional()
 		})),
 		createSession: method(DecoderSessionConfigSchema, object({
 			sessionId: string(),
@@ -22717,23 +22719,110 @@ var DEFAULT_DECODER_BACKEND = "nodeav";
 function parseDecoderBackend(value) {
 	return value === "ffmpeg" || value === "nodeav" ? value : null;
 }
+/**
+* Normalise a raw kernel node id to the bare node id used for scoping.
+* `localNodeId` can carry a `<node>/<addon>` suffix; the decoder selection is
+* per-NODE, so strip the addon segment. Falls back to `hub`.
+*/
+function normalizeDecoderNodeId(rawNodeId) {
+	const raw = rawNodeId ?? "hub";
+	return raw.includes("/") ? raw.split("/")[0] ?? "hub" : raw;
+}
 //#endregion
 //#region src/shared/decoder-backend.ts
+/** The NEUTRAL addon (pipeline-orchestrator, hub-resident) whose global
+* settings OWN the per-node `backend` selector. Neither decoder addon owns
+* it, so decoder-nodeav / decoder-ffmpeg stay fully independent. */
+var DECODER_OWNER_ADDON_ID = "pipeline-orchestrator";
+function isHydratedField(entry) {
+	return typeof entry === "object" && entry !== null && "key" in entry;
+}
 /**
-* Resolve the OWNER addon's (`decoder-ffmpeg`) own per-node backend from its
-* ALREADY-PROJECTED global store — the store `BaseAddon.resolveGlobalStore`
-* returns, where the `perNode` `backend` field carries THIS node's value on
-* its bare key. The owner MUST use this instead of {@link resolveDecoderBackend}:
-* routing `addonSettings.getGlobalSettings({addonId:'decoder-ffmpeg'})` back to
-* itself during its OWN `onInitialize` DEADLOCKS (the addon is not "loaded" on
-* the node until init completes, but init is blocked on the read) → the read
-* throws `transport-failed (addon not loaded)` → it silently defaults to the
-* built-in default and mis-decides its own registration (e.g. an explicitly
-* selected `ffmpeg` fallback would never come up). Reading its own store is
-* local, race-free, and has no deadlock.
+* Pure selection from an already-read hydrated settings payload: extract the
+* owner's `backend` field value (which the owner projected per-node from its
+* scoped store key) and narrow it. A missing/invalid field or a null payload
+* resolves to {@link DEFAULT_DECODER_BACKEND} — never a bare store key.
 */
-function resolveOwnDecoderBackend(projectedGlobalStore) {
-	return parseDecoderBackend(projectedGlobalStore["backend"]) ?? "nodeav";
+function pickDecoderBackendFromSettings(view) {
+	if (view === null) return DEFAULT_DECODER_BACKEND;
+	for (const section of view.sections) for (const entry of section.fields) {
+		if (!isHydratedField(entry) || entry.key !== "backend") continue;
+		return parseDecoderBackend(entry.value) ?? "nodeav";
+	}
+	return DEFAULT_DECODER_BACKEND;
+}
+/** Missing optional owner fingerprints: ffmpeg may be uninstalled. */
+function isMissingOwnerSettingsError(message) {
+	return /not routable/i.test(message) || /provider not available/i.test(message);
+}
+/** Transient transport/settings-store fingerprints worth retrying on. */
+function isTransientSettingsError(message) {
+	return /not loaded/i.test(message) || /transport-failed/i.test(message) || /not connected/i.test(message) || /SqliteSettingsBackend not initialized/i.test(message);
+}
+/**
+* Resolve the decoder backend a NON-OWNER addon (`decoder-nodeav`) should run,
+* by reading the OWNER's (`decoder-ffmpeg`) hub-central per-node `backend`.
+*
+* The read routes to the owner addon's child runner; during a simultaneous
+* (re)start the owner may not be up yet → a transient `transport-failed (addon
+* not loaded)`. Immediately defaulting here would ignore an explicit `ffmpeg`
+* selection (the node would silently run the node-av default instead). So retry
+* on the transient fingerprints with a bounded budget (mirrors
+* `BaseAddon.readAddonStoreWithRetry`) until the owner answers; only a
+* persistent failure falls back to {@link DEFAULT_DECODER_BACKEND}.
+*
+* The OWNER addon must NOT call this (it would self-route + deadlock) — it uses
+* {@link resolveOwnDecoderBackend} against its own store instead.
+*/
+async function resolveDecoderBackend(api, nodeId, logger) {
+	if (!api) {
+		logger.warn("decoder-backend: no api surface — using default backend", { meta: { default: DEFAULT_DECODER_BACKEND } });
+		return DEFAULT_DECODER_BACKEND;
+	}
+	const normalized = normalizeDecoderNodeId(nodeId);
+	const delaysMs = [
+		150,
+		350,
+		600,
+		900,
+		1200
+	];
+	let lastErr;
+	for (let attempt = 0; attempt <= delaysMs.length; attempt++) {
+		try {
+			const view = await api.addonSettings.getGlobalSettings.query({
+				addonId: DECODER_OWNER_ADDON_ID,
+				nodeId: normalized
+			});
+			if (view !== null) return pickDecoderBackendFromSettings(view);
+			lastErr = /* @__PURE__ */ new Error("owner settings unavailable (null)");
+		} catch (err) {
+			lastErr = err;
+			const msg = err instanceof Error ? err.message : String(err);
+			if (isTransientSettingsError(msg)) {} else if (isMissingOwnerSettingsError(msg)) {
+				logger.warn("decoder-backend: optional owner unavailable — using default backend", { meta: {
+					default: DEFAULT_DECODER_BACKEND,
+					owner: DECODER_OWNER_ADDON_ID,
+					error: msg
+				} });
+				return DEFAULT_DECODER_BACKEND;
+			} else {
+				logger.warn("decoder-backend: settings read failed — using default backend", { meta: {
+					default: DEFAULT_DECODER_BACKEND,
+					error: msg
+				} });
+				return DEFAULT_DECODER_BACKEND;
+			}
+		}
+		if (attempt === delaysMs.length) break;
+		await new Promise((resolve) => setTimeout(resolve, delaysMs[attempt]));
+	}
+	logger.warn("decoder-backend: owner settings unavailable after retries — using default backend", { meta: {
+		default: DEFAULT_DECODER_BACKEND,
+		owner: DECODER_OWNER_ADDON_ID,
+		error: lastErr instanceof Error ? lastErr.message : String(lastErr)
+	} });
+	return DEFAULT_DECODER_BACKEND;
 }
 //#endregion
 //#region src/shared/notifying-ring-buffer.ts
@@ -24047,19 +24136,15 @@ function probeGpuScaleFilters(ffmpegPath, logger) {
 //#endregion
 //#region src/addon/index.ts
 var FRAME_BUFFER_CAPACITY = 32;
-var DEFAULT_DECODER_FFMPEG_ADDON_CONFIG = {
-	...DEFAULT_DECODER_HWACCEL_CONFIG,
-	backend: DEFAULT_DECODER_BACKEND,
-	binaryPath: ""
-};
-/** The two selectable decoder backends, in default-first order. */
-var DECODER_BACKEND_OPTIONS = [{
-	value: "nodeav",
-	label: "node-av (in-process FFmpeg bindings — default)"
-}, {
-	value: "ffmpeg",
-	label: "ffmpeg (subprocess — crash-isolated fallback)"
-}];
+/**
+* decoder-ffmpeg owns only its own `hwaccel` override + `probedBestHwaccel`
+* probe (the shared {@link DecoderHwAccelConfig}), both `perNode: true` — the
+* BASE `BaseAddon` settings surface persists them node-scoped as
+* `<key>@<nodeId>`. The per-node `backend` selector lives on the neutral
+* pipeline-orchestrator; the ffmpeg binary is resolved node-level via
+* `ctx.deps.ensureFfmpeg()` (no per-addon override).
+*/
+var DEFAULT_DECODER_FFMPEG_ADDON_CONFIG = { ...DEFAULT_DECODER_HWACCEL_CONFIG };
 var DecoderFfmpegAddon = class extends BaseAddon {
 	sessions = /* @__PURE__ */ new Map();
 	frameBuffers = /* @__PURE__ */ new Map();
@@ -24070,10 +24155,9 @@ var DecoderFfmpegAddon = class extends BaseAddon {
 	getFrameHits = 0;
 	getFrameMisses = 0;
 	/**
-	* The ffmpeg binary every session spawns — resolved once at init from the
-	* cluster `ffmpeg` config section (`binaryPath`), defaulting to PATH
-	* `ffmpeg`. MUST be the same binary the broker / recorder / probe use so the
-	* decode-accel probe reports for the right build.
+	* The ffmpeg binary every session spawns — resolved once at init via the
+	* node-level `ctx.deps.ensureFfmpeg()`. The SAME binary the broker / recorder
+	* / audio-codec use, so the decode-accel probe reports for the right build.
 	*/
 	ffmpegPath = "ffmpeg";
 	/**
@@ -24094,74 +24178,39 @@ var DecoderFfmpegAddon = class extends BaseAddon {
 	}
 	globalSettingsSchema() {
 		return this.schema({ sections: [{
-			id: "backend",
-			title: "Decoder backend",
+			id: "hwaccel",
+			title: "Hardware acceleration",
 			tab: "decoder",
-			description: "Which decoder addon provides the decoder capability on this node — per-node selection, stored centrally on the hub. Selection is decided once at addon init (registration-time, race-free), so a change applies at the next restart of the decoder addons on the node.",
+			description: "Backend used by ffmpeg-subprocess decoder sessions. \"Auto\" defers to the probed best (VA-API on Intel); \"Off\" forces pure software. Only the VA-API hardware path is validated — other concrete backends degrade to software. Changes apply to NEW sessions.",
 			fields: [this.field({
 				type: "select",
-				key: "backend",
-				label: "Backend",
-				options: [...DECODER_BACKEND_OPTIONS],
-				default: DEFAULT_DECODER_BACKEND,
+				key: "hwaccel",
+				label: "Preferred backend",
+				options: [...HWACCEL_OPTIONS],
+				default: "auto",
 				immediate: true,
 				perNode: true
+			}), this.field({
+				type: "text",
+				key: "probedBestHwaccel",
+				label: "Probed best",
+				description: "Auto-detected best decoder backend on this host. Click the refresh icon to re-run the probe.",
+				readonlyField: true,
+				default: "",
+				perNode: true,
+				actions: [{
+					action: "reprobe-hwaccel",
+					icon: "refresh-cw",
+					tooltip: "Re-probe hwaccel"
+				}]
 			})]
-		}, {
-			id: "hwaccel",
-			title: "Hardware acceleration",
-			tab: "decoder",
-			description: "Backend used by ffmpeg-subprocess decoder sessions. \"Auto\" defers to the probed best (VA-API on Intel); \"Off\" forces pure software. Only the VA-API hardware path is validated — other concrete backends degrade to software. Changes apply to NEW sessions.",
-			fields: [
-				this.field({
-					type: "select",
-					key: "hwaccel",
-					label: "Preferred backend",
-					options: [...HWACCEL_OPTIONS],
-					default: "auto",
-					immediate: true,
-					perNode: true
-				}),
-				this.field({
-					type: "text",
-					key: "probedBestHwaccel",
-					label: "Probed best",
-					description: "Auto-detected best decoder backend on this host. Click the refresh icon to re-run the probe.",
-					readonlyField: true,
-					default: "",
-					perNode: true,
-					actions: [{
-						action: "reprobe-hwaccel",
-						icon: "refresh-cw",
-						tooltip: "Re-probe hwaccel"
-					}]
-				}),
-				this.field({
-					type: "text",
-					key: "binaryPath",
-					label: "ffmpeg binary path (override)",
-					description: "Optional per-node override for the ffmpeg binary. Leave empty to auto-provision a portable static ffmpeg on this node (recommended). Per-node because the path differs per OS/arch.",
-					placeholder: "ffmpeg",
-					default: "",
-					perNode: true
-				})
-			]
 		}] });
 	}
 	async onInitialize() {
 		if (!this.config.probedBestHwaccel) this.reprobeHwaccel().catch((err) => {
 			this.ctx.logger.warn("ffmpeg: auto-reprobe hwaccel failed", { meta: { error: err instanceof Error ? err.message : String(err) } });
 		});
-		let backend;
-		try {
-			backend = resolveOwnDecoderBackend(await this.resolveGlobalStore(this.resolveLocalNodeId()));
-		} catch (err) {
-			this.ctx.logger.warn("decoder-ffmpeg: own-store backend read failed — using default", { meta: {
-				default: DEFAULT_DECODER_BACKEND,
-				error: err instanceof Error ? err.message : String(err)
-			} });
-			backend = DEFAULT_DECODER_BACKEND;
-		}
+		const backend = await resolveDecoderBackend(this.ctx.api, this.resolveLocalNodeId(), this.ctx.logger);
 		if (backend !== "ffmpeg") {
 			this.ctx.logger.info("ffmpeg decoder: this node selects a different decoder backend — standing down (no decoder provider registered)", { meta: { selectedBackend: backend } });
 			return [];
@@ -24180,14 +24229,11 @@ var DecoderFfmpegAddon = class extends BaseAddon {
 		}];
 	}
 	/**
-	* Resolve the ffmpeg binary the sessions spawn.
+	* Resolve the ffmpeg binary the sessions spawn — node-level only.
 	*
-	* Precedence:
-	* 1. An explicit operator override in the cluster `ffmpeg` config section
-	*    (`binaryPath`) — wins when set, so a hand-picked build can be forced.
-	* 2. Otherwise `ctx.deps.ensureFfmpeg()` — provisions a portable static
-	*    ffmpeg into the node's deps dir when the system has none and returns its
-	*    absolute path. This GUARANTEES ffmpeg on every node (hub, agent, Mac),
+	* `ctx.deps.ensureFfmpeg()` provisions a portable static ffmpeg into the
+	* node's deps dir when the system has none and returns its absolute path.
+	* This GUARANTEES ffmpeg on every node (hub, agent, Mac),
 	*    so there is no missing-ffmpeg case and no node-av fallback.
 	*
 	* `ensureFfmpeg()` is single-flighted, so we resolve once at init and reuse
@@ -24196,8 +24242,6 @@ var DecoderFfmpegAddon = class extends BaseAddon {
 	* decoder cap and a later session spawn re-runs the ensure.
 	*/
 	async resolveFfmpegBinaryPath() {
-		const override = this.config.binaryPath;
-		if (typeof override === "string" && override.trim().length > 0) return override;
 		try {
 			return await this.ctx.deps.ensureFfmpeg();
 		} catch (err) {
@@ -24298,7 +24342,9 @@ var DecoderFfmpegAddon = class extends BaseAddon {
 			id: "decoder-ffmpeg",
 			name: "Decoder (ffmpeg)",
 			isPullMode: true,
-			priority: 5
+			priority: 5,
+			hwaccel: this.config.hwaccel,
+			probedBestHwaccel: this.config.probedBestHwaccel || void 0
 		};
 	}
 	/**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-decoder-ffmpeg",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "Standalone ffmpeg-subprocess decoder fallback addon for CamStack",
   "keywords": [
     "camstack",