@camstack/system 1.2.233 → 1.2.235

package/dist/addon-runner.js

@@ -1,6 +1,6 @@
 const require_chunk = require("./chunk-Cek0wNdY.js");
 const require_manifest_system_deps = require("./manifest-system-deps-CrSP0Kkp.js");
-const require_custom_action_registry = require("./custom-action-registry-CWFK5UDj.js");
+const require_custom_action_registry = require("./custom-action-registry-acBY3mHA.js");
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);
 let node_fs = require("node:fs");

package/dist/addon-runner.mjs

@@ -1,5 +1,5 @@
 import { A as createUdsLoggerWithControl, It as RUNNER_RSS_BUDGET_ENV, L as LocalChildClient, Yt as startRunnerHeapWatch, a as createUdsAddonContext, bt as resolveAddonClass, it as setWorkerNativeCapsChangeListener, n as installManifestPythonDeps, nt as getWorkerNativeCapSnapshot, ot as validateProviderRegistrations, sn as emitHeapDiagnosticReport, t as installManifestSystemDeps, tt as getWorkerNativeCapProvider, yt as installManifestNativeDeps } from "./manifest-system-deps-BEj9Dpu1.mjs";
-import { t as CustomActionRegistry } from "./custom-action-registry-CFHYDHAu.mjs";
+import { t as CustomActionRegistry } from "./custom-action-registry-B4Cf4O_X.mjs";
 import { register } from "node:module";
 import * as path$1 from "node:path";
 import * as fs from "node:fs";

package/dist/addon-utils.js

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./chunk-Cek0wNdY.js");
 const require_event_loop_stall_monitor = require("./event-loop-stall-monitor-CAsHdMwP.js");
-const require_custom_action_registry = require("./custom-action-registry-CWFK5UDj.js");
+const require_custom_action_registry = require("./custom-action-registry-acBY3mHA.js");
 const require_snapshot_courtesy = require("./snapshot-courtesy-oeTWCXPv.js");
 exports.COURTESY_DEFAULT_WIDTH = require_snapshot_courtesy.COURTESY_DEFAULT_WIDTH;
 exports.CustomActionRegistry = require_custom_action_registry.CustomActionRegistry;

package/dist/addon-utils.mjs

@@ -1,4 +1,4 @@
 import { a as createFileDataPlaneHandler, c as parseRangeHeader, d as ModelDownloadService, f as collectModelFiles, g as ensureModel, i as startEventLoopStallMonitor, m as downloadFile, n as STALL_TICK_MS, o as contentTypeFor, p as deleteModelFromDisk, r as attributeStall, t as STALL_REPORT_MS, v as getModelFilePath, y as isModelDownloaded } from "./event-loop-stall-monitor-GPrVvx14.mjs";
-import { t as CustomActionRegistry } from "./custom-action-registry-CFHYDHAu.mjs";
+import { t as CustomActionRegistry } from "./custom-action-registry-B4Cf4O_X.mjs";
 import { i as renderCourtesyOverlayJpeg, n as courtesyCacheKey, r as renderCourtesyJpeg, t as COURTESY_DEFAULT_WIDTH } from "./snapshot-courtesy-LoJNgHHZ.mjs";
 export { COURTESY_DEFAULT_WIDTH, CustomActionRegistry, ModelDownloadService, STALL_REPORT_MS, STALL_TICK_MS, attributeStall, collectModelFiles, contentTypeFor, courtesyCacheKey, createFileDataPlaneHandler, deleteModelFromDisk, downloadFile, ensureModel, getModelFilePath, isModelDownloaded, parseRangeHeader, renderCourtesyJpeg, renderCourtesyOverlayJpeg, startEventLoopStallMonitor };

package/dist/builtins/addon-pages-aggregator/addon-pages-aggregator.addon.js

@@ -3,7 +3,7 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 const require_chunk = require("../../chunk-Cek0wNdY.js");
-const require_dist = require("../../dist-D3lJV9M7.js");
+const require_dist = require("../../dist-Ctn_E3-0.js");
 const require_settle_sources = require("../../settle-sources-Bhsy57y-.js");
 let node_crypto = require("node:crypto");
 let node_path = require("node:path");

package/dist/builtins/addon-pages-aggregator/addon-pages-aggregator.addon.mjs

@@ -1,4 +1,4 @@
-import { Jt as errMsg, Yt as BaseAddon, k as addonPagesCapability, xn as EventCategory } from "../../dist-BIvXRexm.mjs";
+import { Jt as BaseAddon, bn as EventCategory, k as addonPagesCapability, qt as errMsg } from "../../dist-CGG0rSEx.mjs";
 import { t as settleSourcesWithTimeout } from "../../settle-sources-CDtNC8ub.mjs";
 import { createHash, randomUUID } from "node:crypto";
 import * as path$1 from "node:path";

package/dist/builtins/addon-widgets-aggregator/addon-widgets-aggregator.addon.js

@@ -3,7 +3,7 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 const require_chunk = require("../../chunk-Cek0wNdY.js");
-const require_dist = require("../../dist-D3lJV9M7.js");
+const require_dist = require("../../dist-Ctn_E3-0.js");
 const require_settle_sources = require("../../settle-sources-Bhsy57y-.js");
 let node_crypto = require("node:crypto");
 let node_path = require("node:path");

package/dist/builtins/addon-widgets-aggregator/addon-widgets-aggregator.addon.mjs

@@ -1,4 +1,4 @@
-import { Jt as errMsg, Yt as BaseAddon, j as addonWidgetsCapability, xn as EventCategory } from "../../dist-BIvXRexm.mjs";
+import { Jt as BaseAddon, bn as EventCategory, j as addonWidgetsCapability, qt as errMsg } from "../../dist-CGG0rSEx.mjs";
 import { t as settleSourcesWithTimeout } from "../../settle-sources-CDtNC8ub.mjs";
 import { createHash, randomUUID } from "node:crypto";
 import * as path$1 from "node:path";

package/dist/builtins/alerts/alerts.addon.js

@@ -3,7 +3,7 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 require("../../chunk-Cek0wNdY.js");
-const require_dist = require("../../dist-D3lJV9M7.js");
+const require_dist = require("../../dist-Ctn_E3-0.js");
 //#region src/builtins/alerts/prune-policy.ts
 /**
 * Ids older than `cutoffMs`, oldest first.

package/dist/builtins/alerts/alerts.addon.mjs

@@ -1,4 +1,4 @@
-import { Jt as errMsg, M as alertsCapability, Yt as BaseAddon, cn as createEvent, n as AlertSchema, xn as EventCategory } from "../../dist-BIvXRexm.mjs";
+import { Jt as BaseAddon, M as alertsCapability, bn as EventCategory, n as AlertSchema, qt as errMsg, sn as createEvent } from "../../dist-CGG0rSEx.mjs";
 //#region src/builtins/alerts/prune-policy.ts
 /**
 * Ids older than `cutoffMs`, oldest first.

package/dist/builtins/backup-orchestrator/backup-orchestrator.addon.js

@@ -3,7 +3,7 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 const require_chunk = require("../../chunk-Cek0wNdY.js");
-const require_dist = require("../../dist-D3lJV9M7.js");
+const require_dist = require("../../dist-Ctn_E3-0.js");
 let node_crypto = require("node:crypto");
 let buffer = require("buffer");
 let node_fs_promises = require("node:fs/promises");

package/dist/builtins/backup-orchestrator/backup-orchestrator.addon.mjs

@@ -1,4 +1,4 @@
-import { P as backupCapability, Vt as storageOccupancyCapability, Yt as BaseAddon, bt as mayWriteToLocation, xn as EventCategory } from "../../dist-BIvXRexm.mjs";
+import { Bt as storageOccupancyCapability, Jt as BaseAddon, P as backupCapability, bn as EventCategory, yt as mayWriteToLocation } from "../../dist-CGG0rSEx.mjs";
 import { randomBytes, randomUUID } from "node:crypto";
 import { Buffer as Buffer$1 } from "buffer";
 import * as fsp from "node:fs/promises";

package/dist/builtins/console-logging/index.js

@@ -3,7 +3,7 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 require("../../chunk-Cek0wNdY.js");
-const require_dist = require("../../dist-D3lJV9M7.js");
+const require_dist = require("../../dist-Ctn_E3-0.js");
 const require_formatter = require("../../formatter-DqAKDlvN.js");
 //#region src/builtins/console-logging/console-destination.ts
 var LEVEL_RANK = {

package/dist/builtins/console-logging/index.mjs

@@ -1,4 +1,4 @@
-import { Yt as BaseAddon, gt as logDestinationCapability } from "../../dist-BIvXRexm.mjs";
+import { Jt as BaseAddon, ht as logDestinationCapability } from "../../dist-CGG0rSEx.mjs";
 import { t as formatLogLine } from "../../formatter-B7qW8bPJ.mjs";
 //#region src/builtins/console-logging/console-destination.ts
 var LEVEL_RANK = {

package/dist/builtins/core-blocks/core-blocks.addon.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_chunk = require("../../chunk-Cek0wNdY.js");
-const require_dist = require("../../dist-D3lJV9M7.js");
+const require_dist = require("../../dist-Ctn_E3-0.js");
 let node_crypto = require("node:crypto");
 let node_fs_promises = require("node:fs/promises");
 node_fs_promises = require_chunk.__toESM(node_fs_promises);

package/dist/builtins/core-blocks/core-blocks.addon.mjs

@@ -1,4 +1,4 @@
-import { B as coreBlockIdFromAddonId, Jt as errMsg, V as coreBlocksCapability, Yt as BaseAddon, c as CORE_BLOCK_ADDON_PREFIX, d as DeclaredDevices, l as CoreBlockSchema, s as CORE_BLOCKS_ADDON_ID, z as coreBlockAddonId } from "../../dist-BIvXRexm.mjs";
+import { B as coreBlockIdFromAddonId, Jt as BaseAddon, V as coreBlocksCapability, c as CORE_BLOCK_ADDON_PREFIX, d as DeclaredDevices, l as CoreBlockSchema, qt as errMsg, s as CORE_BLOCKS_ADDON_ID, z as coreBlockAddonId } from "../../dist-CGG0rSEx.mjs";
 import { randomUUID } from "node:crypto";
 import * as fs from "node:fs/promises";
 import * as path$1 from "node:path";

package/dist/builtins/device-manager/contribution-cache.d.ts

@@ -0,0 +1,68 @@
+/**
+ * The device-details fan-out, made survivable: budgeted, cached, single-flight.
+ *
+ * ## What it is for
+ *
+ * `getDeviceAggregate` asks every contributing provider for this device's
+ * settings panel and waits for all of them. Measured on this hub (2026-09-14):
+ * 10 595 ms on a battery camera against 331 ms on a mains one, while the page
+ * re-polls every 2 500 ms. One slow contributor stalled the whole device page,
+ * the poll stacked a fresh 10 s call on top of the one still running, and not
+ * one line named which provider was holding it.
+ *
+ * ## Why a budget alone would have been worse
+ *
+ * Dropping the provider that overran makes its settings SECTION disappear and
+ * come back between polls. A section of settings that flickers is worse than a
+ * slow one — and it is also what moved the operator's page: the schema loses a
+ * tab for a beat, and everything downstream reacts to a tab that is not there.
+ *
+ * So the budget is paired with the last answer that provider gave. A slow
+ * provider costs the page its budget ONCE; after that the page is instant and
+ * shows what that provider last said, until it says something new.
+ *
+ * ## The rules
+ *
+ * - **A read never joins a refresh already in flight** (D224). Without this the
+ *   2.5 s poll starts a new 10 s call every tick and they pile up.
+ * - **An explicit `null` is an ANSWER**, not a miss: it means "I have nothing
+ *   for this device", and it replaces what was cached. A cache that only ever
+ *   remembers successes would serve a stale panel around a provider that has
+ *   since disowned the device.
+ * - **A failure falls back**, but a failure with nothing behind it is ABSENT
+ *   and says which of the two it was — "never answered" and "answered once and
+ *   is now broken" are different operator problems.
+ */
+/** How long the page waits for ONE provider before serving what it has. */
+export declare const CONTRIBUTION_BUDGET_MS = 1500;
+/**
+ * Entries held across all devices. A device page touches a dozen or so, and an
+ * operator walks a fleet — bounded so a long session cannot grow it without
+ * limit. Oldest-inserted is evicted first; a re-read of an evicted key simply
+ * pays the budget again.
+ */
+export declare const CONTRIBUTION_CACHE_MAX_ENTRIES = 512;
+/** How a single provider's contribution was resolved. */
+export type ContributionOutcome<T> = {
+    readonly kind: 'fresh';
+    readonly value: T | null;
+} | {
+    readonly kind: 'stale';
+    readonly value: T;
+} | {
+    readonly kind: 'absent';
+    readonly reason: 'slow' | 'failed';
+};
+export declare class ContributionCache<T = unknown> {
+    private readonly maxEntries;
+    private readonly entries;
+    constructor(maxEntries?: number);
+    /**
+     * Resolve one provider's contribution within `budgetMs`.
+     *
+     * The call is never cancelled: it keeps running and its answer refreshes the
+     * cache, so the provider that overran this page pays for the next one.
+     */
+    resolve(key: string, call: () => Promise<T | null>, budgetMs?: number): Promise<ContributionOutcome<T>>;
+    private remember;
+}

package/dist/builtins/device-manager/device-config-contribution.d.ts

@@ -23,7 +23,6 @@ export type ProfileSetter = (profile: StreamProfile, patch: StreamProfilePatch)
 export declare const STREAM_PARAMS_BUILDER_ID: "stream-params";
 export declare const DAY_NIGHT_BUILDER_ID: "day-night";
 export declare const IMAGE_SETTINGS_BUILDER_ID: "image-settings";
-export declare const NATIVE_OBJECT_DETECTION_BUILDER_ID: "native-object-detection";
 /**
  * Build the device-detail form section for a `derived-form` device-config
  * cap. Returns null when the camera exposes no configurable property.

package/dist/builtins/device-manager/device-manager.addon.js

@@ -3,8 +3,8 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 require("../../chunk-Cek0wNdY.js");
-const require_dist = require("../../dist-D3lJV9M7.js");
-const require_retired_settings_keys = require("../../retired-settings-keys-YPsd2Exa.js");
+const require_dist = require("../../dist-Ctn_E3-0.js");
+const require_retired_settings_keys = require("../../retired-settings-keys-B209Nykf.js");
 let node_crypto = require("node:crypto");
 let _camstack_types_node = require("@camstack/types/node");
 //#region src/builtins/device-manager/adoption-job-engine.ts
@@ -295,6 +295,113 @@ var AdoptionJobEngine = class {
 	}
 };
 //#endregion
+//#region src/builtins/device-manager/contribution-cache.ts
+/**
+* The device-details fan-out, made survivable: budgeted, cached, single-flight.
+*
+* ## What it is for
+*
+* `getDeviceAggregate` asks every contributing provider for this device's
+* settings panel and waits for all of them. Measured on this hub (2026-09-14):
+* 10 595 ms on a battery camera against 331 ms on a mains one, while the page
+* re-polls every 2 500 ms. One slow contributor stalled the whole device page,
+* the poll stacked a fresh 10 s call on top of the one still running, and not
+* one line named which provider was holding it.
+*
+* ## Why a budget alone would have been worse
+*
+* Dropping the provider that overran makes its settings SECTION disappear and
+* come back between polls. A section of settings that flickers is worse than a
+* slow one — and it is also what moved the operator's page: the schema loses a
+* tab for a beat, and everything downstream reacts to a tab that is not there.
+*
+* So the budget is paired with the last answer that provider gave. A slow
+* provider costs the page its budget ONCE; after that the page is instant and
+* shows what that provider last said, until it says something new.
+*
+* ## The rules
+*
+* - **A read never joins a refresh already in flight** (D224). Without this the
+*   2.5 s poll starts a new 10 s call every tick and they pile up.
+* - **An explicit `null` is an ANSWER**, not a miss: it means "I have nothing
+*   for this device", and it replaces what was cached. A cache that only ever
+*   remembers successes would serve a stale panel around a provider that has
+*   since disowned the device.
+* - **A failure falls back**, but a failure with nothing behind it is ABSENT
+*   and says which of the two it was — "never answered" and "answered once and
+*   is now broken" are different operator problems.
+*/
+/** How long the page waits for ONE provider before serving what it has. */
+var CONTRIBUTION_BUDGET_MS = 1500;
+var ContributionCache = class {
+	maxEntries;
+	entries = /* @__PURE__ */ new Map();
+	constructor(maxEntries = 512) {
+		this.maxEntries = maxEntries;
+	}
+	/**
+	* Resolve one provider's contribution within `budgetMs`.
+	*
+	* The call is never cancelled: it keeps running and its answer refreshes the
+	* cache, so the provider that overran this page pays for the next one.
+	*/
+	async resolve(key, call, budgetMs = CONTRIBUTION_BUDGET_MS) {
+		const existing = this.entries.get(key);
+		if (existing?.inFlight) return existing.value !== null ? {
+			kind: "stale",
+			value: existing.value
+		} : {
+			kind: "absent",
+			reason: "slow"
+		};
+		const entry = existing ?? {
+			value: null,
+			inFlight: null
+		};
+		if (!existing) this.remember(key, entry);
+		let settled = false;
+		let answer = null;
+		let failed = false;
+		const refresh = call().then((value) => {
+			answer = value;
+			settled = true;
+			entry.value = value;
+			entry.inFlight = null;
+		}, () => {
+			failed = true;
+			settled = true;
+			entry.inFlight = null;
+		});
+		entry.inFlight = refresh;
+		await Promise.race([refresh, sleep(budgetMs)]);
+		if (settled && !failed) return {
+			kind: "fresh",
+			value: answer
+		};
+		if (entry.value !== null) return {
+			kind: "stale",
+			value: entry.value
+		};
+		return {
+			kind: "absent",
+			reason: failed ? "failed" : "slow"
+		};
+	}
+	remember(key, entry) {
+		this.entries.set(key, entry);
+		while (this.entries.size > this.maxEntries) {
+			const oldest = this.entries.keys().next();
+			if (oldest.done === true) break;
+			this.entries.delete(oldest.value);
+		}
+	}
+};
+function sleep(ms) {
+	return new Promise((resolve) => {
+		setTimeout(resolve, ms).unref?.();
+	});
+}
+//#endregion
 //#region src/builtins/device-manager/device-aggregation-merge.ts
 /**
 * Pure aggregator-merge + field-tagging helpers for the device-manager
@@ -1130,42 +1237,6 @@ function parseImageSettingsFormPatch(patch) {
 	return out;
 }
 //#endregion
-//#region src/builtins/device-manager/native-object-detection-config-schema.ts
-/**
-* What the toggle buys, per geometry. Written out rather than computed: the
-* `flag-only` sentence is the one an operator needs BEFORE flipping the switch,
-* and a generic "may not be supported" would not have said it.
-*/
-var GEOMETRY_HELP = {
-	boxed: "This camera ships a bounding box with each detection, so the pipeline tracks it as a subject: it gets a track, a best shot and the notification rules that address onboard detections.",
-	"flag-only": "This camera ships the class with no bounding box — on Reolink that is every battery camera, because the boxes ride a sub-stream a battery camera never attaches. Turning this on makes the detections reach the tracker as motion and no further; it will not produce tracked subjects."
-};
-function buildNativeObjectDetectionConfigSchema(options, status) {
-	if (options.supportedClasses.length === 0) return null;
-	const fields = [{
-		type: "boolean",
-		key: "nativeObjectDetection_enabled",
-		label: "Forward onboard AI detections",
-		default: status?.enabled ?? false
-	}];
-	return { sections: [{
-		id: "native-object-detection",
-		tab: "motion",
-		title: "Onboard AI detections",
-		description: `${GEOMETRY_HELP[options.geometry]} Detected by this firmware: ${options.supportedClasses.join(", ")}.`,
-		columns: 1,
-		fields
-	}] };
-}
-function parseNativeObjectDetectionFormPatch(patch) {
-	const out = {};
-	if ("nativeObjectDetection_enabled" in patch) {
-		const value = patch.nativeObjectDetection_enabled;
-		if (typeof value === "boolean") out.enabled = value;
-	}
-	return out;
-}
-//#endregion
 //#region src/builtins/device-manager/device-config-contribution.ts
 /**
 * D14 device-config archetype — framework-side contribution derivation.
@@ -1193,7 +1264,6 @@ function parseNativeObjectDetectionFormPatch(patch) {
 var STREAM_PARAMS_BUILDER_ID = "stream-params";
 var DAY_NIGHT_BUILDER_ID = "day-night";
 var IMAGE_SETTINGS_BUILDER_ID = "image-settings";
-var NATIVE_OBJECT_DETECTION_BUILDER_ID = "native-object-detection";
 var STREAM_PARAMS_REDUCER = {
 	kind: "profile",
 	buildSchema: (options, status) => require_dist.buildStreamParamsConfigSchema(options, status ?? null),
@@ -1214,16 +1284,10 @@ var IMAGE_SETTINGS_REDUCER = {
 	buildSchema: (options, status) => buildImageSettingsConfigSchema(options, status ?? null),
 	parsePatch: (patch) => parseImageSettingsFormPatch(patch)
 };
-var NATIVE_OBJECT_DETECTION_REDUCER = {
-	kind: "settings",
-	buildSchema: (options, status) => buildNativeObjectDetectionConfigSchema(options, status ?? null),
-	parsePatch: (patch) => parseNativeObjectDetectionFormPatch(patch)
-};
 var BUILDER_REDUCERS = {
 	[STREAM_PARAMS_BUILDER_ID]: STREAM_PARAMS_REDUCER,
 	[DAY_NIGHT_BUILDER_ID]: DAY_NIGHT_REDUCER,
-	[IMAGE_SETTINGS_BUILDER_ID]: IMAGE_SETTINGS_REDUCER,
-	[NATIVE_OBJECT_DETECTION_BUILDER_ID]: NATIVE_OBJECT_DETECTION_REDUCER
+	[IMAGE_SETTINGS_BUILDER_ID]: IMAGE_SETTINGS_REDUCER
 };
 function resolveReducer(builderId) {
 	const reducer = BUILDER_REDUCERS[builderId];
@@ -2481,6 +2545,52 @@ function splitDeviceStoreKeys(patch) {
 * and side effects of the original class methods are preserved; the addon keeps
 * thin delegator methods over these functions.
 */
+/**
+* One process-wide cache behind every device-details fan-out.
+*
+* Module-level on purpose: the page re-polls every 2.5 s and a per-call cache
+* would be empty every time, which is the same as having none.
+*/
+var contributionCache = new ContributionCache();
+/**
+* Ask ONE provider for its contribution, bounded, and say what happened.
+*
+* The two non-fresh outcomes are logged because they are the two questions an
+* operator asks of a slow device page, and neither had an answer before: WHICH
+* provider is slow, and whether the panel in front of them is current.
+*/
+async function resolveContribution(deps, input) {
+	const { deviceId, kind, capName, addonId } = input;
+	const outcome = await contributionCache.resolve(`${String(deviceId)}:${kind}:${capName}:${addonId}`, input.call);
+	if (outcome.kind === "fresh") return outcome.value === null ? null : tagContribution(outcome.value, capName, addonId, kind);
+	if (outcome.kind === "stale") {
+		deps.ctx.logger.info("device contribution served from the last answer — the provider is slow", {
+			tags: {
+				deviceId,
+				addonId
+			},
+			meta: {
+				capName,
+				method: kind,
+				budgetMs: CONTRIBUTION_BUDGET_MS
+			}
+		});
+		return tagContribution(outcome.value, capName, addonId, kind);
+	}
+	deps.ctx.logger.warn("device contribution unavailable — the panel is missing this section", {
+		tags: {
+			deviceId,
+			addonId
+		},
+		meta: {
+			capName,
+			method: kind,
+			reason: outcome.reason,
+			budgetMs: CONTRIBUTION_BUDGET_MS
+		}
+	});
+	return null;
+}
 async function getDeviceAggregate(deps, deviceId, kind) {
 	const registry = deps.capabilityRegistry;
 	if (!registry) {
@@ -2496,25 +2606,16 @@ async function getDeviceAggregate(deps, deviceId, kind) {
 		if (!def?.exposesDeviceSettings) return null;
 		const provider = registry.getProviderByAddon(entry.capName, entry.providerAddonId);
 		if (!provider) return null;
-		try {
-			const contribution = await provider[method]({ deviceId });
-			if (!contribution) return null;
-			return tagContribution(toWireShape(contribution), entry.capName, entry.providerAddonId, kind);
-		} catch (err) {
-			const msg = err instanceof Error ? err.message : String(err);
-			deps.ctx.logger.warn("contribution method failed", {
-				tags: {
-					deviceId,
-					addonId: entry.providerAddonId
-				},
-				meta: {
-					capName: entry.capName,
-					method,
-					error: msg
-				}
-			});
-			return null;
-		}
+		return await resolveContribution(deps, {
+			deviceId,
+			kind,
+			capName: entry.capName,
+			addonId: entry.providerAddonId,
+			call: async () => {
+				const contribution = await provider[method]({ deviceId });
+				return contribution ? toWireShape(contribution) : null;
+			}
+		});
 	}));
 	const base = kind === "settings" ? await buildBaseDeviceSection(deps, deviceId) : null;
 	const systemResults = await collectSystemDeviceContributions(deps, deviceId, kind, seenCaps);
@@ -2564,24 +2665,16 @@ async function collectSystemDeviceContributions(deps, deviceId, kind, seenCaps)
 		for (const addonId of addonIds) tasks.push((async () => {
 			const provider = registry.getProviderByAddon(info.name, addonId);
 			if (!provider) return null;
-			try {
-				const contribution = await provider[method]({ deviceId });
-				if (!contribution) return null;
-				return tagContribution(toWireShape(contribution), info.name, addonId, kind);
-			} catch (err) {
-				deps.ctx.logger.warn("system device-settings contribution skipped", {
-					tags: {
-						deviceId,
-						addonId
-					},
-					meta: {
-						capName: info.name,
-						method,
-						error: err instanceof Error ? err.message : String(err)
-					}
-				});
-				return null;
-			}
+			return await resolveContribution(deps, {
+				deviceId,
+				kind,
+				capName: info.name,
+				addonId,
+				call: async () => {
+					const contribution = await provider[method]({ deviceId });
+					return contribution ? toWireShape(contribution) : null;
+				}
+			});
 		})());
 	}
 	return (await Promise.all(tasks)).filter((r) => r !== null);