@camstack/system 1.2.456 → 1.2.458

package/dist/addon-runner.js

@@ -5467,6 +5467,67 @@ function createChildrenBatchLoader(opts) {
 	} };
 }
 //#endregion
+//#region src/kernel/moleculer/accessory-prune-gate.ts
+function isSpecList(answer) {
+	return Array.isArray(answer);
+}
+function classifyAccessoryRead(answer, ctx) {
+	if (isSpecList(answer)) {
+		if (!ctx.online) return {
+			kind: "unknown",
+			reason: "parent offline",
+			children: answer
+		};
+		if (ctx.probedAt === 0) return {
+			kind: "unknown",
+			reason: "probe not yet completed",
+			children: answer
+		};
+		return {
+			kind: "successful",
+			children: answer
+		};
+	}
+	if (answer.kind === "unknown") return {
+		kind: "unknown",
+		reason: answer.reason,
+		children: answer.known ?? []
+	};
+	return {
+		kind: "successful",
+		children: answer.children
+	};
+}
+/** One per parent registration; in-memory on purpose (a restart starts over — the safe direction). */
+var AccessoryShrinkGate = class {
+	/** childId → the probe (`lastProbedAt`) of the first successful read that lacked it. */
+	#firstMissing = /* @__PURE__ */ new Map();
+	/**
+	* `missing` = the managed children a SUCCESSFUL read no longer lists. Never
+	* call this for an unknown read.
+	*/
+	decide(missing, probedAt) {
+		const missingSet = new Set(missing);
+		for (const id of [...this.#firstMissing.keys()]) if (!missingSet.has(id)) this.#firstMissing.delete(id);
+		const prune = [];
+		const deferred = [];
+		for (const id of missing) {
+			const first = this.#firstMissing.get(id);
+			if (first !== void 0 && probedAt > first) {
+				prune.push(id);
+				this.#firstMissing.delete(id);
+				continue;
+			}
+			if (first === void 0) this.#firstMissing.set(id, probedAt);
+			deferred.push(id);
+		}
+		return {
+			prune,
+			deferred
+		};
+	}
+};
+//#endregion
 //#region src/kernel/moleculer/runtime-state-load.ts
 /** A device build refused because its runtime state could not be loaded. */
 var RuntimeStateLoadError = class extends Error {
@@ -6200,6 +6261,7 @@ function createBrokerDeviceManagerApi(opts) {
 				throw err;
 			}
 			const lifecycleHost = device;
+			const shrinkGate = new AccessoryShrinkGate();
 			const runReconcile = async () => {
 				try {
 					await callDeviceManager(api, "registerDevice", {
@@ -6223,7 +6285,12 @@ function createBrokerDeviceManagerApi(opts) {
 					});
 				}
 				if (typeof lifecycleHost.getAccessoryChildren !== "function") return;
-				const specs = lifecycleHost.getAccessoryChildren();
+				const probedAt = device.runtimeState?.getCapState("feature-probe")?.lastProbedAt ?? 0;
+				const read = classifyAccessoryRead(lifecycleHost.getAccessoryChildren(), {
+					online: device.online,
+					probedAt
+				});
+				const specs = read.children;
 				const expected = new Set(specs.map((s) => `${device.stableId}-${s.stableIdSuffix}`));
 				await runBounded(specs, ACCESSORY_SPAWN_CONCURRENCY, async (spec) => {
 					try {
@@ -6241,24 +6308,42 @@ function createBrokerDeviceManagerApi(opts) {
 						});
 					}
 				});
-				if ((device.runtimeState?.getCapState("feature-probe")?.lastProbedAt ?? 0) === 0 && specs.length === 0) {
-					opts.logger.debug("Accessory orphan reconciliation skipped — probe not yet completed", { tags: {
-						parentDeviceId: device.id,
-						parentStableId: device.stableId
-					} });
+				if (read.kind === "unknown") {
+					opts.logger.info("Accessory orphan reconciliation skipped — child list unknown", {
+						tags: {
+							deviceId: device.id,
+							parentStableId: device.stableId
+						},
+						meta: {
+							reason: read.reason,
+							probedAt
+						}
+					});
 					return;
 				}
 				try {
-					const currentChildren = await childrenLoader.load(device.id);
-					for (const child of currentChildren) {
-						if (child.linkDeviceId !== device.id) continue;
-						if (expected.has(child.stableId)) continue;
+					const missing = (await childrenLoader.load(device.id)).filter((child) => child.linkDeviceId === device.id && !expected.has(child.stableId));
+					const decision = shrinkGate.decide(missing.map((child) => child.id), probedAt);
+					if (decision.deferred.length > 0) opts.logger.info("Accessory children missing from a complete read — kept until a later probe agrees", {
+						tags: {
+							deviceId: device.id,
+							parentStableId: device.stableId
+						},
+						meta: {
+							childDeviceIds: [...decision.deferred],
+							probedAt
+						}
+					});
+					const confirmed = new Set(decision.prune);
+					for (const child of missing) {
+						if (!confirmed.has(child.id)) continue;
 						const live = registry.getById(child.id);
 						try {
 							if (live) await deviceApi.remove(child.id);
 							else await callDeviceManager(api, "removeDevice", { deviceId: child.id });
 							opts.logger.info("Removed orphan accessory child no longer in parent specs", {
 								tags: {
+									deviceId: child.id,
 									parentDeviceId: device.id,
 									parentStableId: device.stableId
 								},
@@ -6271,6 +6356,7 @@ function createBrokerDeviceManagerApi(opts) {
 						} catch (err) {
 							opts.logger.warn("Failed to remove orphan accessory child", {
 								tags: {
+									deviceId: child.id,
 									parentDeviceId: device.id,
 									parentStableId: device.stableId,
 									childDeviceId: child.id
@@ -7779,6 +7865,166 @@ function ipcParentLink(getCallOut) {
 	};
 }
 //#endregion
+//#region src/builtins/platform-probe/coral-accelerators.ts
+/**
+* Coral USB Edge TPU USB identifiers.
+*
+* The device enumerates as `1a6e:089a` (Global Unichip) BEFORE the libedgetpu
+* firmware loads, then re-enumerates as `18d1:9302` (Google) AFTER. Either id
+* means a Coral is physically attached, so both count as a positive signal.
+*/
+var CORAL_USB_IDS = [{
+	vendor: "1a6e",
+	product: "089a"
+}, {
+	vendor: "18d1",
+	product: "9302"
+}];
+/** The PCIe / M.2 Coral's PCI function id (Global Unichip "Apex"). */
+var CORAL_PCI_VENDOR = "0x1ac1";
+var CORAL_PCI_DEVICE = "0x089a";
+/** A unit the apex driver bound: `/sys/class/apex/apex_<N>` ↔ `/dev/apex_<N>`. */
+var APEX_ENTRY = /^apex_(\d+)$/;
+/**
+* Default install path of the libedgetpu delegate on the hub, provisioned
+* out-of-band by `/data/deps/edgetpu-install.sh` (it is a system shared
+* library, not a pip package). Overridable via `CAMSTACK_EDGETPU_LIB` — kept in
+* sync with the Python pool's own default in `inference_pool.py`.
+*/
+var DEFAULT_EDGETPU_LIB = "/data/deps/edgetpu/lib/libedgetpu.so.1";
+function countUsbCorals(fsx) {
+	let count = 0;
+	for (const device of fsx.listUsbDevices()) {
+		const vendor = fsx.readUsbAttr(device, "idVendor").toLowerCase();
+		const product = fsx.readUsbAttr(device, "idProduct").toLowerCase();
+		if (CORAL_USB_IDS.some((id) => id.vendor === vendor && id.product === product)) count++;
+	}
+	return count;
+}
+function countPciCorals(fsx) {
+	let count = 0;
+	for (const device of fsx.listPciDevices()) {
+		const vendor = fsx.readPciAttr(device, "vendor").toLowerCase();
+		const product = fsx.readPciAttr(device, "device").toLowerCase();
+		if (vendor === CORAL_PCI_VENDOR && product === CORAL_PCI_DEVICE) count++;
+	}
+	return count;
+}
+/**
+* PCIe units: each `/sys/class/apex/apex_N` is a unit the driver bound; it is
+* usable only when `/dev/apex_N` is in this process's view AND opens read/write.
+* PCI functions with the Coral id beyond the bound units have no driver.
+*/
+function classifyPci(fsx) {
+	let usable = 0;
+	let notAccessible = 0;
+	for (const entry of fsx.listApexClass()) {
+		const match = APEX_ENTRY.exec(entry);
+		if (match === null) continue;
+		const node = `/dev/apex_${match[1]}`;
+		if (fsx.exists(node) && fsx.canOpen(node)) usable++;
+		else notAccessible++;
+	}
+	const driverMissing = Math.max(0, countPciCorals(fsx) - usable - notAccessible);
+	return {
+		usable,
+		notAccessible,
+		driverMissing
+	};
+}
+/**
+* Detect Coral Edge TPUs on USB and PCIe/M.2.
+*
+* - USB: every matching USB device counts (multiple Corals run concurrently).
+* - PCIe: the apex driver's units, each usable only if its device node opens;
+*   a Coral PCI function the driver did not bind is `driver-missing`.
+* - Fallback: when NO Coral signal of either bus is visible but the libedgetpu
+*   delegate is installed (a container whose `/sys` USB view is limited), one
+*   USB Coral is assumed — never when a PCI Coral was seen, since the delegate
+*   then says nothing about USB.
+*
+* Returns `null` only when no Coral was found at all; a present-but-unusable
+* Coral is reported with its typed reason, never as absent (D393/D315).
+*/
+function classifyCoralAccelerator(fsx) {
+	const usb = countUsbCorals(fsx);
+	const pci = classifyPci(fsx);
+	const units = [];
+	if (usb > 0) units.push({
+		bus: "usb",
+		count: usb
+	});
+	if (pci.usable > 0) units.push({
+		bus: "pci",
+		count: pci.usable
+	});
+	const unavailable = [];
+	if (pci.driverMissing > 0) unavailable.push({
+		bus: "pci",
+		count: pci.driverMissing,
+		reason: "driver-missing"
+	});
+	if (pci.notAccessible > 0) unavailable.push({
+		bus: "pci",
+		count: pci.notAccessible,
+		reason: "device-not-accessible"
+	});
+	if (units.length > 0 || unavailable.length > 0) return unavailable.length > 0 ? {
+		type: "coral-edgetpu",
+		units,
+		unavailable
+	} : {
+		type: "coral-edgetpu",
+		units
+	};
+	const libPath = process.env["CAMSTACK_EDGETPU_LIB"] ?? DEFAULT_EDGETPU_LIB;
+	if (fsx.exists(libPath)) return {
+		type: "coral-edgetpu",
+		units: [{
+			bus: "usb",
+			count: 1
+		}]
+	};
+	return null;
+}
+function safeList(dir) {
+	try {
+		return node_fs.default.readdirSync(dir);
+	} catch {
+		return [];
+	}
+}
+function safeRead(path) {
+	try {
+		return node_fs.default.readFileSync(path, "utf8").trim();
+	} catch {
+		return "";
+	}
+}
+/** The real filesystem view: `/sys` for enumeration, `/dev` for access. */
+var nodeCoralFs = {
+	listUsbDevices: () => safeList("/sys/bus/usb/devices"),
+	readUsbAttr: (device, attr) => safeRead(`/sys/bus/usb/devices/${device}/${attr}`),
+	listPciDevices: () => safeList("/sys/bus/pci/devices"),
+	readPciAttr: (device, attr) => safeRead(`/sys/bus/pci/devices/${device}/${attr}`),
+	listApexClass: () => safeList("/sys/class/apex"),
+	canOpen: (path) => {
+		try {
+			node_fs.default.accessSync(path, node_fs.default.constants.R_OK | node_fs.default.constants.W_OK);
+			return true;
+		} catch {
+			return false;
+		}
+	},
+	exists: (path) => {
+		try {
+			return node_fs.default.existsSync(path);
+		} catch {
+			return false;
+		}
+	}
+};
+//#endregion
 //#region src/kernel/hwaccel/hwaccel-resolver.ts
 /**
 * Platform-probe for hardware video decode acceleration.
@@ -7803,30 +8049,6 @@ function safeExistsSync(path) {
 		return false;
 	}
 }
-/**
-* Detect a Coral USB Edge TPU: a matching USB device (`1a6e:089a` pre-init or
-* `18d1:9302` post-init) OR the installed libedgetpu delegate (the hub
-* provisions it out-of-band; its presence is a reliable "Coral is wired"
-* signal even where the container's `/sys` USB view is limited).
-*/
-function detectCoralUsb() {
-	const CORAL_IDS = [{
-		vendor: "1a6e",
-		product: "089a"
-	}, {
-		vendor: "18d1",
-		product: "9302"
-	}];
-	try {
-		for (const device of node_fs.readdirSync("/sys/bus/usb/devices")) try {
-			const base = `/sys/bus/usb/devices/${device}`;
-			const vendor = node_fs.readFileSync(`${base}/idVendor`, "utf8").trim().toLowerCase();
-			const product = node_fs.readFileSync(`${base}/idProduct`, "utf8").trim().toLowerCase();
-			if (CORAL_IDS.some((id) => id.vendor === vendor && id.product === product)) return true;
-		} catch {}
-	} catch {}
-	return safeExistsSync(process.env["CAMSTACK_EDGETPU_LIB"] ?? "/data/deps/edgetpu/lib/libedgetpu.so.1");
-}
 /** Probe Linux GPU vendors by parsing /proc/bus/pci/devices or /sys/class/drm. */
 function probeLinuxGpus() {
 	const signals = {
@@ -7835,7 +8057,7 @@ function probeLinuxGpus() {
 		hasIntelGpu: false,
 		hasRenderNode: false,
 		hasIntelNpu: safeExistsSync("/dev/accel/accel0"),
-		hasCoral: detectCoralUsb()
+		coral: classifyCoralAccelerator(nodeCoralFs)
 	};
 	signals.hasRenderNode = safeExistsSync("/dev/dri/renderD128");
 	if (safeExistsSync("/dev/nvidia0") || safeExistsSync("/proc/driver/nvidia/version")) signals.hasNvidiaGpu = true;
@@ -7869,7 +8091,7 @@ function probePlatform() {
 		hasIntelGpu: false,
 		hasRenderNode: false,
 		hasIntelNpu: false,
-		hasCoral: safeExistsSync(process.env["CAMSTACK_EDGETPU_LIB"] ?? "/data/deps/edgetpu/lib/libedgetpu.so.1")
+		coral: classifyCoralAccelerator(nodeCoralFs)
 	};
 }
 function pickBackendsForPlatform(signals) {
@@ -7960,7 +8182,7 @@ function mapSignalsToInferenceHardware(signals) {
 	return {
 		gpu: signals.hasNvidiaGpu ? { type: "nvidia" } : signals.hasAmdGpu ? { type: "amd" } : signals.hasIntelGpu ? { type: "intel" } : signals.hasRenderNode ? { type: "intel" } : null,
 		npu: signals.platform === "darwin" && signals.arch === "arm64" ? { type: "apple-ane" } : signals.hasIntelNpu ? { type: "intel-npu" } : null,
-		coral: signals.hasCoral ? { type: "coral-edgetpu" } : null
+		coral: signals.coral
 	};
 }
 /**