@camstack/system 1.2.186 → 1.2.188

package/dist/addon-runner.js

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-Cek0wNdY.js");
-const require_manifest_system_deps = require("./manifest-system-deps-KBuTXH-y.js");
+const require_manifest_system_deps = require("./manifest-system-deps-CdIVy85V.js");
 const require_custom_action_registry = require("./custom-action-registry-jY0NOZK8.js");
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);

package/dist/addon-runner.mjs

@@ -1,4 +1,4 @@
-import { A as createUdsLoggerWithControl, Ft as RUNNER_RSS_BUDGET_ENV, Jt as startRunnerHeapWatch, Qt as emitHeapDiagnosticReport, a as createUdsAddonContext, bt as resolveAddonClass, it as setWorkerNativeCapsChangeListener, j as LocalChildClient, n as installManifestPythonDeps, nt as getWorkerNativeCapSnapshot, ot as validateProviderRegistrations, t as installManifestSystemDeps, tt as getWorkerNativeCapProvider, yt as installManifestNativeDeps } from "./manifest-system-deps-BF-C5NDL.mjs";
+import { A as createUdsLoggerWithControl, Ft as RUNNER_RSS_BUDGET_ENV, Jt as startRunnerHeapWatch, Qt as emitHeapDiagnosticReport, a as createUdsAddonContext, bt as resolveAddonClass, it as setWorkerNativeCapsChangeListener, j as LocalChildClient, n as installManifestPythonDeps, nt as getWorkerNativeCapSnapshot, ot as validateProviderRegistrations, t as installManifestSystemDeps, tt as getWorkerNativeCapProvider, yt as installManifestNativeDeps } from "./manifest-system-deps-CYKgsQ_b.mjs";
 import { t as CustomActionRegistry } from "./custom-action-registry-F__gp_VX.mjs";
 import { register } from "node:module";
 import * as path$1 from "node:path";

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-0fjBDzUu.js");
+const require_dist = require("../../dist-DlL8iWQo.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 { E as addonPagesCapability, Ft as BaseAddon, Pt as errMsg, sn as EventCategory } from "../../dist-BLU9Dol1.mjs";
+import { E as addonPagesCapability, Ft as BaseAddon, Pt as errMsg, sn as EventCategory } from "../../dist-D0_hqbgc.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-0fjBDzUu.js");
+const require_dist = require("../../dist-DlL8iWQo.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 { Ft as BaseAddon, O as addonWidgetsCapability, Pt as errMsg, sn as EventCategory } from "../../dist-BLU9Dol1.mjs";
+import { Ft as BaseAddon, O as addonWidgetsCapability, Pt as errMsg, sn as EventCategory } from "../../dist-D0_hqbgc.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-0fjBDzUu.js");
+const require_dist = require("../../dist-DlL8iWQo.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 { Ft as BaseAddon, Jt as createEvent, Pt as errMsg, k as alertsCapability, n as AlertSchema, sn as EventCategory } from "../../dist-BLU9Dol1.mjs";
+import { Ft as BaseAddon, Jt as createEvent, Pt as errMsg, k as alertsCapability, n as AlertSchema, sn as EventCategory } from "../../dist-D0_hqbgc.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-0fjBDzUu.js");
+const require_dist = require("../../dist-DlL8iWQo.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 { Ft as BaseAddon, j as backupCapability, sn as EventCategory } from "../../dist-BLU9Dol1.mjs";
+import { Ft as BaseAddon, j as backupCapability, sn as EventCategory } from "../../dist-D0_hqbgc.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-0fjBDzUu.js");
+const require_dist = require("../../dist-DlL8iWQo.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 { Ft as BaseAddon, ct as logDestinationCapability } from "../../dist-BLU9Dol1.mjs";
+import { Ft as BaseAddon, ct as logDestinationCapability } from "../../dist-D0_hqbgc.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-0fjBDzUu.js");
+const require_dist = require("../../dist-DlL8iWQo.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 { Ft as BaseAddon, I as coreBlockAddonId, L as coreBlockIdFromAddonId, Pt as errMsg, R as coreBlocksCapability, c as CORE_BLOCK_ADDON_PREFIX, d as DeclaredDevices, l as CoreBlockSchema, s as CORE_BLOCKS_ADDON_ID } from "../../dist-BLU9Dol1.mjs";
+import { Ft as BaseAddon, I as coreBlockAddonId, L as coreBlockIdFromAddonId, Pt as errMsg, R as coreBlocksCapability, c as CORE_BLOCK_ADDON_PREFIX, d as DeclaredDevices, l as CoreBlockSchema, s as CORE_BLOCKS_ADDON_ID } from "../../dist-D0_hqbgc.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/device-linked-devices.d.ts

@@ -9,6 +9,8 @@ export declare const LINKED_IDS_CONFIG_KEY = "_linkedDeviceIds";
  *  auto-materialized sensor snapshots the operator never asked for). */
 export declare const LINKED_TRACKED_IDS_CONFIG_KEY = "_linkedDeviceTrackedIds";
 export interface LinkedDevicesConfig {
+    /** Always `manual` since D356 — kept on the type because the cap output
+     *  still carries it for clients already shipped. */
     readonly mode: LinkedDevicesMode;
     readonly manualIds: readonly number[];
 }
@@ -47,10 +49,21 @@ export interface LinkCandidate {
  */
 export declare function resolveLinkedDeviceIds(params: {
     readonly selfId: number;
-    readonly selfLocation: string | null;
     readonly config: LinkedDevicesConfig;
     readonly candidates: readonly LinkCandidate[];
 }): readonly number[];
+/**
+ * What the retired `auto` mode (pre-D356) added beyond the device-tree
+ * children: every non-container candidate sharing the camera's location, a
+ * container child standing in for its container's PRIMARY child. Kept ONLY
+ * for the one-shot boot backfill that materialises it into the manual list
+ * (`linked-devices-manual-backfill.ts`); nothing on the read path calls it.
+ */
+export declare function legacyAutoLinkIds(params: {
+    readonly selfId: number;
+    readonly selfLocation: string | null;
+    readonly candidates: readonly LinkCandidate[];
+}): readonly number[];
 /**
  * Which linked devices materialize synthetic tracked events on the camera.
  * Absent / non-array config key ⇒ NONE — the operator must explicitly pick
@@ -62,28 +75,30 @@ export declare function resolveLinkedDeviceIds(params: {
  * are ignored.
  */
 export declare function resolveTrackedEventDeviceIds(config: Record<string, unknown>, linkedIds: readonly number[]): readonly number[];
-/** The single resolved answer, before it is tagged with its camera. */
-export type ResolvedLinkedDevices = Awaited<ReturnType<IDeviceManagerProvider['getLinkedDevices']>>;
 /**
- * The broken state the 2026-08-26 design leaves possible, made DETECTABLE: a
- * container whose OWN location matches the camera's while its descendants
- * carry `location: null` (a location that predates the cascade, or a cascade
- * write that failed) is skipped by the container rule AND matched by nobody —
- * the whole appliance silently vanishes from auto-link. Measured live
- * 2026-09-05: 40 containers, 373 children, zero log lines.
+ * The fleet listing every function here needs, and the ONLY projection any of
+ * them may ask for.
+ *
+ * Linked-device policy reads five fields off a candidate — `id`,
+ * `parentDeviceId`, `location`, `name`, `features` — and `slim` carries all
+ * five. What `slim` drops is `config`, and `config` is not a column: `listAll`
+ * materialises it with ONE `readDeviceStore` per device, sequentially, on
+ * device-manager's event loop. This module asked for the full projection three
+ * times, so every linked-devices read swept the whole fleet's settings rows to
+ * use none of them.
  *
- * A container qualifies when it matches the camera's location, has at least
- * one descendant, contributed NONE of them to the resolved set, and at least
- * one descendant is location-less. A subtree whose members all carry a
- * DIFFERENT explicit location is excluded on purpose — that is an operator's
- * deliberate split, not the broken state.
+ * Measured on the live hub 2026-08-25: `query addon-device-settings` ran
+ * 36 814 times a minute against a 967-device fleet — ~38 full-fleet sweeps a
+ * minute, ~31 of them the `pipeline-analytics` reverse index rebuilding itself
+ * one camera at a time through `getLinkedDevices`. The per-camera `config`
+ * this query DOES need is the separate `readDeviceStore(deviceId)` below, and
+ * it is one row, not the fleet.
  */
-export declare function findLocationInvisibleContainers(params: {
-    readonly selfId: number;
-    readonly selfLocation: string | null;
-    readonly resolvedIds: ReadonlySet<number>;
-    readonly candidates: readonly LinkCandidate[];
-}): readonly number[];
+export declare const LINK_CANDIDATE_PROJECTION: {
+    readonly projection: "slim";
+};
+/** The single resolved answer, before it is tagged with its camera. */
+export type ResolvedLinkedDevices = Awaited<ReturnType<IDeviceManagerProvider['getLinkedDevices']>>;
 /** Cap implementation of `getLinkedDevices`. */
 export declare function getLinkedDevices(pctx: ProviderContext, input: Parameters<IDeviceManagerProvider['getLinkedDevices']>[0]): ReturnType<IDeviceManagerProvider['getLinkedDevices']>;
 /**

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-0fjBDzUu.js");
-const require_retired_settings_keys = require("../../retired-settings-keys-pL2Nq6KT.js");
+const require_dist = require("../../dist-DlL8iWQo.js");
+const require_retired_settings_keys = require("../../retired-settings-keys-B5wVSU65.js");
 let node_crypto = require("node:crypto");
 let _camstack_types_node = require("@camstack/types/node");
 //#region src/builtins/device-manager/adoption-job-engine.ts
@@ -2051,7 +2051,7 @@ var LINKED_TRACKED_IDS_CONFIG_KEY = "_linkedDeviceTrackedIds";
 *  ids may arrive as numbers or numeric strings (the multiselect field
 *  stores string option values); anything else is dropped. */
 function parseLinkedDevicesConfig(blob) {
-	const mode = blob["_linkedDevicesMode"] === "manual" ? "manual" : "auto";
+	const mode = "manual";
 	const rawIds = blob[LINKED_IDS_CONFIG_KEY];
 	const manualIds = [];
 	if (Array.isArray(rawIds)) for (const v of rawIds) {
@@ -2104,7 +2104,7 @@ function expandContainer(id, byId, byParent, visited, out) {
 * header). Order: children first, then mode additions.
 */
 function resolveLinkedDeviceIds(params) {
-	const { selfId, selfLocation, config, candidates } = params;
+	const { selfId, config, candidates } = params;
 	const byId = new Map(candidates.map((c) => [c.id, c]));
 	const byParent = /* @__PURE__ */ new Map();
 	for (const c of candidates) {
@@ -2116,18 +2116,41 @@ function resolveLinkedDeviceIds(params) {
 	const ids = /* @__PURE__ */ new Set();
 	const expand = (id) => expandContainer(id, byId, byParent, /* @__PURE__ */ new Set(), ids);
 	for (const c of candidates) if (c.parentDeviceId === selfId) expand(c.id);
-	if (config.mode === "auto") {
-		if (selfLocation !== null && selfLocation.length > 0) for (const c of candidates) {
-			if (c.type === require_dist.DeviceType.Container) continue;
-			if (c.location !== selfLocation) continue;
-			const parent = c.parentDeviceId !== null ? byId.get(c.parentDeviceId) : void 0;
-			if (parent !== void 0 && parent.type === require_dist.DeviceType.Container) {
-				expand(parent.id);
-				continue;
-			}
-			ids.add(c.id);
+	for (const id of config.manualIds) if (byId.has(id)) expand(id);
+	ids.delete(selfId);
+	return [...ids];
+}
+/**
+* What the retired `auto` mode (pre-D356) added beyond the device-tree
+* children: every non-container candidate sharing the camera's location, a
+* container child standing in for its container's PRIMARY child. Kept ONLY
+* for the one-shot boot backfill that materialises it into the manual list
+* (`linked-devices-manual-backfill.ts`); nothing on the read path calls it.
+*/
+function legacyAutoLinkIds(params) {
+	const { selfId, selfLocation, candidates } = params;
+	if (selfLocation === null || selfLocation.length === 0) return [];
+	const byId = new Map(candidates.map((c) => [c.id, c]));
+	const byParent = /* @__PURE__ */ new Map();
+	for (const c of candidates) {
+		if (c.parentDeviceId === null) continue;
+		const siblings = byParent.get(c.parentDeviceId);
+		if (siblings) siblings.push(c);
+		else byParent.set(c.parentDeviceId, [c]);
+	}
+	const ids = /* @__PURE__ */ new Set();
+	const expand = (id) => expandContainer(id, byId, byParent, /* @__PURE__ */ new Set(), ids);
+	for (const c of candidates) {
+		if (c.type === require_dist.DeviceType.Container) continue;
+		if (c.location !== selfLocation) continue;
+		if (c.parentDeviceId === selfId) continue;
+		const parent = c.parentDeviceId !== null ? byId.get(c.parentDeviceId) : void 0;
+		if (parent !== void 0 && parent.type === require_dist.DeviceType.Container) {
+			expand(parent.id);
+			continue;
 		}
-	} else for (const id of config.manualIds) if (byId.has(id)) expand(id);
+		ids.add(c.id);
+	}
 	ids.delete(selfId);
 	return [...ids];
 }
@@ -2172,91 +2195,6 @@ function resolveTrackedEventDeviceIds(config, linkedIds) {
 */
 var LINK_CANDIDATE_PROJECTION = { projection: "slim" };
 /**
-* The broken state the 2026-08-26 design leaves possible, made DETECTABLE: a
-* container whose OWN location matches the camera's while its descendants
-* carry `location: null` (a location that predates the cascade, or a cascade
-* write that failed) is skipped by the container rule AND matched by nobody —
-* the whole appliance silently vanishes from auto-link. Measured live
-* 2026-09-05: 40 containers, 373 children, zero log lines.
-*
-* A container qualifies when it matches the camera's location, has at least
-* one descendant, contributed NONE of them to the resolved set, and at least
-* one descendant is location-less. A subtree whose members all carry a
-* DIFFERENT explicit location is excluded on purpose — that is an operator's
-* deliberate split, not the broken state.
-*/
-function findLocationInvisibleContainers(params) {
-	const { selfId, selfLocation, resolvedIds, candidates } = params;
-	if (selfLocation === null || selfLocation.length === 0) return [];
-	const byParent = /* @__PURE__ */ new Map();
-	for (const c of candidates) {
-		if (c.parentDeviceId === null) continue;
-		const bucket = byParent.get(c.parentDeviceId);
-		if (bucket) bucket.push(c);
-		else byParent.set(c.parentDeviceId, [c]);
-	}
-	const out = [];
-	for (const c of candidates) {
-		if (c.type !== require_dist.DeviceType.Container) continue;
-		if (c.id === selfId) continue;
-		if (c.location !== selfLocation) continue;
-		let anyResolved = false;
-		let anyNullLocation = false;
-		let descendantCount = 0;
-		const visited = new Set([c.id]);
-		let frontier = [c.id];
-		while (frontier.length > 0) {
-			const next = [];
-			for (const parentId of frontier) for (const child of byParent.get(parentId) ?? []) {
-				if (visited.has(child.id)) continue;
-				visited.add(child.id);
-				descendantCount += 1;
-				if (resolvedIds.has(child.id)) anyResolved = true;
-				if (child.location === null) anyNullLocation = true;
-				next.push(child.id);
-			}
-			frontier = next;
-		}
-		if (descendantCount > 0 && !anyResolved && anyNullLocation) out.push(c.id);
-	}
-	return out;
-}
-/**
-* Per-process warn dedupe for {@link findLocationInvisibleContainers}. This
-* read path runs continuously (the analytics reverse index resolves linked
-* devices for every camera on a timer), so an undeduped warn would be a log
-* flood about a state that only an operator action (or the boot backfill)
-* changes. One line per (camera, container) pair per process is exactly as
-* loud as the fact is. Bounded so pathological id churn cannot grow it
-* forever; once full it stops ADDING, never stops the resolver.
-*/
-var INVISIBLE_CONTAINER_WARN_CAP = 4096;
-var warnedInvisibleContainers = /* @__PURE__ */ new Set();
-function warnLocationInvisibleContainers(pctx, cameraId, byId, all, resolved) {
-	if (resolved.mode !== "auto") return;
-	const selfLocation = byId.get(cameraId)?.location ?? null;
-	if (selfLocation === null || selfLocation.length === 0) return;
-	const invisible = findLocationInvisibleContainers({
-		selfId: cameraId,
-		selfLocation,
-		resolvedIds: new Set(resolved.devices.map((d) => d.deviceId)),
-		candidates: all
-	});
-	for (const containerId of invisible) {
-		const key = `${cameraId}:${containerId}`;
-		if (warnedInvisibleContainers.has(key)) continue;
-		if (warnedInvisibleContainers.size >= INVISIBLE_CONTAINER_WARN_CAP) return;
-		warnedInvisibleContainers.add(key);
-		pctx.host.ctx.logger.warn("getLinkedDevices: container matches the camera location but is invisible to auto-link — its children carry no location; re-save the container location to realign", {
-			tags: { deviceId: containerId },
-			meta: {
-				cameraId,
-				location: selfLocation
-			}
-		});
-	}
-}
-/**
 * Resolve ONE camera's linked set against an ALREADY-FETCHED fleet.
 *
 * The fleet is a parameter, not a fetch, because it is the entire cost of this
@@ -2268,7 +2206,6 @@ function resolveFor(deviceId, all, byId, blob) {
 	const config = parseLinkedDevicesConfig(blob);
 	const ids = resolveLinkedDeviceIds({
 		selfId: deviceId,
-		selfLocation: byId.get(deviceId)?.location ?? null,
 		config,
 		candidates: all
 	});
@@ -2294,10 +2231,7 @@ function resolveFor(deviceId, all, byId, blob) {
 async function getLinkedDevices(pctx, input) {
 	const { deviceId } = input;
 	const [all, blob] = await Promise.all([listAll(pctx, LINK_CANDIDATE_PROJECTION), pctx.settings.readDeviceStore(deviceId)]);
-	const byId = new Map(all.map((d) => [d.id, d]));
-	const resolved = resolveFor(deviceId, all, byId, blob);
-	warnLocationInvisibleContainers(pctx, deviceId, byId, all, resolved);
-	return resolved;
+	return resolveFor(deviceId, all, new Map(all.map((d) => [d.id, d])), blob);
 }
 /**
 * Cap implementation of `getLinkedDevicesBatch` — ONE fleet listing for the
@@ -2324,11 +2258,9 @@ async function getLinkedDevicesBatch(pctx, input) {
 	})))]);
 	const byId = new Map(all.map((d) => [d.id, d]));
 	return deviceIds.map((deviceId, index) => {
-		const resolved = resolveFor(deviceId, all, byId, blobs[index] ?? {});
-		warnLocationInvisibleContainers(pctx, deviceId, byId, all, resolved);
 		return {
 			deviceId,
-			...resolved
+			...resolveFor(deviceId, all, byId, blobs[index] ?? {})
 		};
 	});
 }
@@ -2343,13 +2275,9 @@ async function buildLinkedDevicesContribution(pctx, deviceId) {
 	if (!persisted || persisted.meta.type !== require_dist.DeviceType.Camera) return null;
 	const [all, blob] = await Promise.all([listAll(pctx, LINK_CANDIDATE_PROJECTION), pctx.settings.readDeviceStore(deviceId)]);
 	const config = parseLinkedDevicesConfig(blob);
-	const options = all.filter((d) => d.id !== deviceId && d.type !== require_dist.DeviceType.Container).map((d) => ({
-		value: String(d.id),
-		label: d.location !== null ? `${d.name} (${d.location})` : d.name
-	}));
+	const self = all.find((d) => d.id === deviceId);
 	const linkedIds = resolveLinkedDeviceIds({
 		selfId: deviceId,
-		selfLocation: all.find((d) => d.id === deviceId)?.location ?? null,
 		config,
 		candidates: all
 	});
@@ -2366,44 +2294,27 @@ async function buildLinkedDevicesContribution(pctx, deviceId) {
 	return { sections: [{
 		id: "linked-devices",
 		title: "Linked devices",
-		description: "Companion devices associated with this camera. Device-tree children are always linked; auto mode also links every device sharing the camera location, manual mode links the picked list instead.",
+		description: "Companion devices associated with this camera. Device-tree children are always linked; everything else is the list you pick below. Devices in the same location are suggested first, never linked on their own (D356).",
 		order: 70,
-		fields: [
-			{
-				type: "select",
-				key: LINKED_MODE_CONFIG_KEY,
-				label: "Link mode",
-				description: "Auto: children + same-location devices. Manual: children + the list below.",
-				options: [{
-					value: "auto",
-					label: "Auto (location-based)"
-				}, {
-					value: "manual",
-					label: "Manual"
-				}],
-				value: config.mode
-			},
-			{
-				type: "multiselect",
-				key: LINKED_IDS_CONFIG_KEY,
-				label: "Manually linked devices",
-				description: "Used in manual mode (children stay linked regardless).",
-				showWhen: {
-					field: LINKED_MODE_CONFIG_KEY,
-					equals: "manual"
-				},
-				options,
-				value: config.manualIds.map(String)
+		fields: [{
+			type: "device-multiselect",
+			key: LINKED_IDS_CONFIG_KEY,
+			label: "Linked devices",
+			description: "Pick the companions of this camera. Same-location devices are suggested; device-tree children stay linked regardless.",
+			deviceFilter: {
+				excludeDeviceId: deviceId,
+				excludeTypes: [require_dist.DeviceType.Container]
 			},
-			{
-				type: "multiselect",
-				key: LINKED_TRACKED_IDS_CONFIG_KEY,
-				label: "Devices that produce tracked events",
-				description: "Linked devices whose state changes materialize a synthetic tracked event on this camera. Default: none (opt-in).",
-				options: trackedOptions,
-				value: trackedValue
-			}
-		]
+			suggestLocation: self?.location ?? null,
+			value: config.manualIds.map(String)
+		}, {
+			type: "multiselect",
+			key: LINKED_TRACKED_IDS_CONFIG_KEY,
+			label: "Devices that produce tracked events",
+			description: "Linked devices whose state changes materialize a synthetic tracked event on this camera. Default: none (opt-in).",
+			options: trackedOptions,
+			value: trackedValue
+		}]
 	}] };
 }
 /**
@@ -2414,7 +2325,6 @@ async function buildLinkedDevicesContribution(pctx, deviceId) {
 */
 async function applyLinkedDevicesPatch(pctx, deviceId, patch) {
 	const next = { ...await pctx.settings.readDeviceStore(deviceId) };
-	if ("_linkedDevicesMode" in patch) next[LINKED_MODE_CONFIG_KEY] = patch["_linkedDevicesMode"] === "manual" ? "manual" : "auto";
 	if ("_linkedDeviceIds" in patch) next[LINKED_IDS_CONFIG_KEY] = [...parseLinkedDevicesConfig({ [LINKED_IDS_CONFIG_KEY]: patch[LINKED_IDS_CONFIG_KEY] }).manualIds];
 	if ("_linkedDeviceTrackedIds" in patch) {
 		const raw = patch[LINKED_TRACKED_IDS_CONFIG_KEY];
@@ -3817,7 +3727,7 @@ async function runLocationBackfillAtBoot(pctx, bootRows) {
 		});
 	}
 	const residual = planNullLocationFills((!repaired && bootRows !== void 0 ? bootRows : await pctx.metaStore.rows.listAll()).map((r) => r.meta));
-	for (const [ancestorId, fills] of groupByAncestor(residual)) logger.warn("location cascade misaligned — location-less descendants under a located ancestor never match location auto-link; re-save the ancestor location to realign", {
+	for (const [ancestorId, fills] of groupByAncestor(residual)) logger.warn("location cascade misaligned — location-less descendants under a located ancestor never reach the same-location suggestions of the picker; re-save the ancestor location to realign", {
 		tags: { deviceId: ancestorId },
 		meta: {
 			location: fills[0]?.location,
@@ -4376,7 +4286,7 @@ async function collectDescendants(metaStore, rootId) {
 * every failing id — never indistinguishable from a clean cascade. A
 * `DeviceMetaChanged` event fires for the parent itself and for every
 * descendant actually written (never for one that failed), so linked-device
-* consumers (auto-link) see exactly what landed.
+* consumers (the linked-devices picker, which suggests by location) see exactly what landed.
 */
 async function setLocation(pctx, input) {
 	const { deviceId, location } = input;
@@ -4974,6 +4884,66 @@ async function removeLocation(pctx, input) {
 	});
 }
 //#endregion
+//#region src/builtins/device-manager/linked-devices-manual-backfill.ts
+var LINKED_MANUAL_BACKFILL_MARKER_KEY = "_linkedDevicesManualBackfillVersion";
+function planManualBackfill(params) {
+	const { selfId, selfLocation, blob, candidates } = params;
+	const current = parseLinkedDevicesConfig(blob).manualIds;
+	if (blob["_linkedDevicesMode"] === "manual") return {
+		write: false,
+		manualIds: current
+	};
+	const merged = [...current];
+	for (const id of legacyAutoLinkIds({
+		selfId,
+		selfLocation,
+		candidates
+	})) if (!merged.includes(id)) merged.push(id);
+	return {
+		write: true,
+		manualIds: merged
+	};
+}
+async function runLinkedDevicesManualBackfillAtBoot(pctx) {
+	const logger = pctx.host.ctx.logger;
+	const addonStore = await pctx.settings.readAddonStore();
+	const markerRaw = addonStore[LINKED_MANUAL_BACKFILL_MARKER_KEY];
+	if ((typeof markerRaw === "number" ? markerRaw : 0) >= 1) return;
+	const all = await listAll(pctx, LINK_CANDIDATE_PROJECTION);
+	let written = 0;
+	let linked = 0;
+	for (const cam of all) {
+		if (cam.type !== require_dist.DeviceType.Camera) continue;
+		const blob = await pctx.settings.readDeviceStore(cam.id);
+		const plan = planManualBackfill({
+			selfId: cam.id,
+			selfLocation: cam.location ?? null,
+			blob,
+			candidates: all
+		});
+		if (!plan.write) continue;
+		await pctx.settings.writeDeviceStore(cam.id, {
+			...blob,
+			[LINKED_MODE_CONFIG_KEY]: "manual",
+			[LINKED_IDS_CONFIG_KEY]: [...plan.manualIds]
+		});
+		written += 1;
+		linked += plan.manualIds.length;
+		logger.info("linked devices: auto links materialised into the manual list (D356)", {
+			tags: { deviceId: cam.id },
+			meta: { manualIds: plan.manualIds }
+		});
+	}
+	await pctx.settings.writeAddonStore({
+		...addonStore,
+		[LINKED_MANUAL_BACKFILL_MARKER_KEY]: 1
+	});
+	logger.info("linked devices: manual backfill complete (D356)", { meta: {
+		camerasWritten: written,
+		linksMaterialised: linked
+	} });
+}
+//#endregion
 //#region src/builtins/device-manager/device-meta-types.ts
 /**
 * Decode the raw `ctx.settings.readAddonStore()` record into {@link AddonStore}.
@@ -6727,6 +6697,11 @@ var DeviceManagerAddon = class extends require_dist.BaseAddon {
 		} catch (err) {
 			this.ctx.logger.warn("location backfill failed — fleet boots without it", { meta: { error: require_dist.errMsg(err) } });
 		}
+		try {
+			await runLinkedDevicesManualBackfillAtBoot(pctx);
+		} catch (err) {
+			this.ctx.logger.warn("linked-devices manual backfill failed — auto links are NOT materialised", { meta: { error: require_dist.errMsg(err) } });
+		}
 		const provider = {
 			resolveDeviceOwnerSync: (deviceId) => resolveDeviceOwnerSync(pctx, deviceId),
 			resolveNativeCapOwnerSync: (capName, deviceId) => resolveNativeCapOwnerSync(pctx, capName, deviceId),