@camstack/system 1.2.8 → 1.2.10

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

@@ -1,4 +1,4 @@
-import { Q as storageCapability, at as BaseAddon, u as StorageLocationTypeSchema, wt as parseJsonObject } from "../../dist-CxM20CkF.mjs";
+import { $ as storageCapability, Tt as parseJsonObject, d as StorageLocationTypeSchema, ot as BaseAddon } from "../../dist-DpKeSZel.mjs";
 import * as path$1 from "node:path";
 import * as fs from "node:fs/promises";
 import { buildStorageLocationRegistry } from "@camstack/system";
@@ -607,10 +607,19 @@ var StoragePressureManager = class {
 	/** Relieve every managed location currently under its threshold. */
 	async sweep() {
 		const thresholds = await this.deps.getLocationThresholds();
+		const relievedDevices = /* @__PURE__ */ new Set();
 		for (const [locationId, threshold] of thresholds) {
 			if (threshold <= 0) continue;
+			const deviceKey = await this.deps.getLocationDeviceKey?.(locationId) ?? null;
+			if (deviceKey !== null && relievedDevices.has(deviceKey)) {
+				this.deps.logger.debug("storage pressure: skipping location — physical device already relieved this sweep", { meta: {
+					locationId,
+					deviceKey
+				} });
+				continue;
+			}
 			try {
-				await this.relieveLocation(locationId, threshold);
+				if (await this.relieveLocation(locationId, threshold) && deviceKey !== null) relievedDevices.add(deviceKey);
 			} catch (err) {
 				this.deps.logger.warn("storage pressure: relief failed for location", { meta: {
 					locationId,
@@ -619,16 +628,25 @@ var StoragePressureManager = class {
 			}
 		}
 	}
+	/**
+	* Relieve one location until it recovers, nothing is evictable, or a round
+	* makes no progress. Returns `true` when at least one relief round actually
+	* reclaimed bytes (so the caller marks the location's physical device relieved
+	* for this sweep — the trigger for the over-eviction dedup: freed bytes mean a
+	* sibling alias may re-read a not-yet-settled `statfs`), `false` when nothing
+	* was freed (never breached, or breached with no evictable data).
+	*/
 	async relieveLocation(locationId, threshold) {
 		const maxRounds = this.deps.maxRounds ?? DEFAULT_MAX_ROUNDS;
 		const hysteresis = this.deps.hysteresisPercent ?? DEFAULT_HYSTERESIS_PERCENT;
+		let reclaimedAny = false;
 		for (let round = 0; round < maxRounds; round++) {
 			const free = await this.deps.getFreePercent(locationId);
-			if (free >= threshold) return;
+			if (free >= threshold) return reclaimedAny;
 			const total = await this.deps.getVolumeTotalBytes(locationId);
 			const deficitPercent = threshold - free + hysteresis;
 			const targetBytes = Math.ceil(total * deficitPercent / 100);
-			if (targetBytes <= 0) return;
+			if (targetBytes <= 0) return reclaimedAny;
 			const providers = this.deps.getEvictableProviders();
 			const usages = await Promise.all(providers.map(async (p) => ({
 				p,
@@ -641,7 +659,7 @@ var StoragePressureManager = class {
 					freePercent: free,
 					threshold
 				} });
-				return;
+				return reclaimedAny;
 			}
 			let reclaimed = 0;
 			for (const u of usages) {
@@ -653,6 +671,7 @@ var StoragePressureManager = class {
 				});
 				reclaimed += res.reclaimedBytes;
 			}
+			if (reclaimed > 0) reclaimedAny = true;
 			this.deps.logger.info("storage pressure: relief round", { meta: {
 				locationId,
 				round,
@@ -661,8 +680,9 @@ var StoragePressureManager = class {
 				targetBytes,
 				reclaimedBytes: reclaimed
 			} });
-			if (reclaimed <= 0) return;
+			if (reclaimed <= 0) return reclaimedAny;
 		}
+		return reclaimedAny;
 	}
 };
 //#endregion
@@ -916,7 +936,8 @@ var StorageOrchestratorAddon = class extends BaseAddon {
 			getFreePercent: (id) => this.locationFreePercent(id),
 			getVolumeTotalBytes: (id) => this.locationVolumeTotalBytes(id),
 			getEvictableProviders: () => this.ctx.kernel.capabilityRegistry?.getCollection(STORAGE_EVICTABLE_CAP_NAME) ?? [],
-			getLocationThresholds: () => this.resolveLocationThresholds()
+			getLocationThresholds: () => this.resolveLocationThresholds(),
+			getLocationDeviceKey: (id) => this.locationDeviceKey(id)
 		});
 		this.pressureTimer = setInterval(() => {
 			this.runPressureSweep();
@@ -1029,6 +1050,26 @@ var StorageOrchestratorAddon = class extends BaseAddon {
 		const bp = (this.service?.listLocations().find((l) => l.id === locationId))?.config["basePath"];
 		return typeof bp === "string" && bp.length > 0 ? bp : null;
 	}
+	/**
+	* A stable key for the PHYSICAL storage device behind a location — the
+	* `realpath` of its `basePath`, so symlinked / bind-mounted aliases and
+	* same-root managed locations (`recordings:default` + `recordingsLow:default`,
+	* both at `/recordings`) collapse to one key. Feeds the pressure manager's
+	* in-sweep dedup so a shared disk is relieved at most once per tick (closing
+	* the bounded over-eviction window; see `getLocationDeviceKey`). Falls back to
+	* the lexically-resolved path when realpath throws (root missing at boot),
+	* `null` when the location has no basePath — either way dedup degrades to
+	* per-location, never merging two distinct disks.
+	*/
+	async locationDeviceKey(locationId) {
+		const bp = this.locationBasePath(locationId);
+		if (!bp) return null;
+		try {
+			return await fs.realpath(bp);
+		} catch {
+			return path$1.resolve(bp);
+		}
+	}
 	/** Free capacity (%) on a location's volume via `statfs`; 100 (guard inert) when unstattable. */
 	async locationFreePercent(locationId) {
 		const bp = this.locationBasePath(locationId);

package/dist/builtins/storage-orchestrator/storage-pressure-manager.d.ts

@@ -28,11 +28,38 @@ export interface PressureManagerDeps {
     readonly maxRounds?: number;
     /** Extra headroom % freed beyond the threshold to avoid re-breaching immediately (default 1). */
     readonly hysteresisPercent?: number;
+    /**
+     * Optional: map a locationId to a stable key identifying its PHYSICAL storage
+     * device — the `realpath` of the location's `basePath`, so aliases (symlinks /
+     * bind-mounts) and same-root managed locations (`recordings:default` +
+     * `recordingsLow:default`, both at `/recordings`) share one key.
+     *
+     * Powers an in-sweep dedup: once a physical device has actually been RELIEVED
+     * this sweep, other locations resolving to the SAME device are skipped for the
+     * rest of the tick. This closes a bounded OVER-eviction window — after the
+     * first alias frees the shared disk, a second alias re-reading not-yet-settled
+     * `statfs` free% (lazy fs accounting, open fds) could see it still breached and
+     * evict the oldest footage a second time. A fresh sweep on the next timer tick
+     * re-checks the settled free% and finishes any genuinely-residual pressure, so
+     * skipping can only ever DEFER relief (self-correcting), never over-delete.
+     *
+     * Omitted, or returning `null`, → no dedup (each location relieved
+     * independently), preserving prior single-disk behaviour.
+     */
+    readonly getLocationDeviceKey?: (locationId: string) => Promise<string | null>;
 }
 export declare class StoragePressureManager {
     private readonly deps;
     constructor(deps: PressureManagerDeps);
     /** Relieve every managed location currently under its threshold. */
     sweep(): Promise<void>;
+    /**
+     * Relieve one location until it recovers, nothing is evictable, or a round
+     * makes no progress. Returns `true` when at least one relief round actually
+     * reclaimed bytes (so the caller marks the location's physical device relieved
+     * for this sweep — the trigger for the over-eviction dedup: freed bytes mean a
+     * sibling alias may re-read a not-yet-settled `statfs`), `false` when nothing
+     * was freed (never breached, or breached with no evictable data).
+     */
     private relieveLocation;
 }

package/dist/builtins/system-config/system-config.addon.js

@@ -3,7 +3,7 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 require("../../chunk-Cek0wNdY.js");
-const require_dist = require("../../dist-CdgScQ3H.js");
+const require_dist = require("../../dist-BQOCTD5b.js");
 //#region src/builtins/system-config/system-config.addon.ts
 /**
 * Built-in `system-config` addon — Phase 4 of the settings redesign.

package/dist/builtins/system-config/system-config.addon.mjs

@@ -1,4 +1,4 @@
-import { St as hydrateSchema, at as BaseAddon, it as errMsg } from "../../dist-CxM20CkF.mjs";
+import { Ct as hydrateSchema, at as errMsg, ot as BaseAddon } from "../../dist-DpKeSZel.mjs";
 //#region src/builtins/system-config/system-config.addon.ts
 /**
 * Built-in `system-config` addon — Phase 4 of the settings redesign.

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

@@ -3,7 +3,7 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 const require_chunk = require("../../chunk-Cek0wNdY.js");
-const require_dist = require("../../dist-CdgScQ3H.js");
+const require_dist = require("../../dist-BQOCTD5b.js");
 const require_formatter = require("../../formatter-DqAKDlvN.js");
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);

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

@@ -1,4 +1,4 @@
-import { R as logDestinationCapability, at as BaseAddon } from "../../dist-CxM20CkF.mjs";
+import { ot as BaseAddon, z as logDestinationCapability } from "../../dist-DpKeSZel.mjs";
 import { t as formatLogLine } from "../../formatter-B7qW8bPJ.mjs";
 import * as path$1 from "node:path";
 import path from "node:path";

package/dist/{custom-action-registry-BEXwC-oo.mjs → custom-action-registry-F__gp_VX.mjs}

@@ -16,7 +16,7 @@ var CustomActionRegistry = class {
 			if (scope.kind !== "system") throw new Error(`custom action '${addonId}.${name}' declared scope '${scope.kind}' — not yet implemented`);
 			actions.set(name, {
 				spec,
-				handler: (input) => handler(name, input)
+				handler: (input, caller) => handler(name, input, caller)
 			});
 		}
 		this.byAddon.set(addonId, actions);

package/dist/{custom-action-registry-vLYEFTtv.js → custom-action-registry-jY0NOZK8.js}

@@ -16,7 +16,7 @@ var CustomActionRegistry = class {
 			if (scope.kind !== "system") throw new Error(`custom action '${addonId}.${name}' declared scope '${scope.kind}' — not yet implemented`);
 			actions.set(name, {
 				spec,
-				handler: (input) => handler(name, input)
+				handler: (input, caller) => handler(name, input, caller)
 			});
 		}
 		this.byAddon.set(addonId, actions);