@camstack/system 1.2.25 → 1.2.26

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

@@ -3,18 +3,44 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 const require_chunk = require("../../chunk-Cek0wNdY.js");
-const require_dist = require("../../dist-CS0pdC8l.js");
+const require_dist = require("../../dist-Cu72wsz5.js");
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);
 let node_fs_promises = require("node:fs/promises");
 node_fs_promises = require_chunk.__toESM(node_fs_promises);
 let _camstack_system = require("@camstack/system");
 //#region src/builtins/storage-orchestrator/storage-orchestrator.service.ts
+var SESSION_VOCABULARY = {
+	upload: {
+		idLabel: "uploadId",
+		openMethod: "beginUpload"
+	},
+	download: {
+		idLabel: "downloadId",
+		openMethod: "beginDownload"
+	}
+};
+/** Map key for a tracked chunked session — the id spaces never collide. */
+function sessionKey(kind, sessionId) {
+	return `${kind}:${sessionId}`;
+}
+/**
+* Bare node id for a raw kernel `localNodeId`. Forked children carry a
+* `<node>/<addon>` suffix; routing is per-NODE, so the addon segment is
+* dropped. (Mirrors `normalizeNodeId` in `@camstack/types/addon`, which is a
+* leaf module not re-exported on any subpath this package can import.)
+*/
+function bareNodeId(raw) {
+	if (raw === void 0 || raw === "") return "hub";
+	const slash = raw.indexOf("/");
+	if (slash < 0) return raw;
+	const bare = raw.slice(0, slash);
+	return bare === "" ? "hub" : bare;
+}
 var StorageOrchestratorService = class {
 	logger;
 	getProviders;
 	locationStore;
-	localNodeId;
 	getRemoteProvider;
 	locations = /* @__PURE__ */ new Map();
 	/**
@@ -33,12 +59,29 @@ var StorageOrchestratorService = class {
 	* early-boot path that predates the resolver wiring.
 	*/
 	nodeLocalResolver = null;
+	/** `localNodeId` with any forked-child `/addon` suffix stripped. */
+	localNode;
+	/**
+	* `<kind>:<sessionId>` → the dispatch target that OPENED the session.
+	* Chunked I/O carries no `StorageLocation` after the first hop, so without
+	* this the follow-up chunks fall back to a `providerId`-only lookup — which
+	* on a multi-node cluster means the hub's filesystem, not the agent's.
+	*/
+	sessionTargets = /* @__PURE__ */ new Map();
 	constructor(logger, getProviders, locationStore = null, localNodeId = "hub", getRemoteProvider) {
 		this.logger = logger;
 		this.getProviders = getProviders;
 		this.locationStore = locationStore;
-		this.localNodeId = localNodeId;
 		this.getRemoteProvider = getRemoteProvider;
+		this.localNode = bareNodeId(localNodeId);
+	}
+	/**
+	* The node this orchestrator runs on, with any forked-child `/addon`
+	* suffix stripped. A location whose `nodeId` differs is NOT this node's
+	* to touch — its bytes, and its free space, live elsewhere.
+	*/
+	getLocalNodeId() {
+		return this.localNode;
 	}
 	/** True once a persistence store is wired (constructor or {@link attachStore}). */
 	hasStore() {
@@ -346,22 +389,96 @@ var StorageOrchestratorService = class {
 		return def;
 	}
 	/**
-	* Find the storage-provider that backs a given location. Lookup is by
-	* `location.providerId` against `getProviderInfo().providerId` from
-	* each registered collection provider. Throws with both the missing
-	* providerId and the offending location id so the operator can pick
-	* the right place to fix the config.
+	* Find the storage-provider that backs a given location — the entry point
+	* every consumer-facing `storage` cap method funnels through.
+	*
+	* Routing key is `(providerId, nodeId)`, never `providerId` alone: every
+	* node's FilesystemStorageProvider registers under the SAME providerId, so
+	* a providerId-only match resolves to whichever node asked. That is how a
+	* location created on an agent ended up writing to the HUB's filesystem
+	* (root-caused 2026-07-29).
 	*/
 	async getProviderFor(location) {
-		const nodeId = location.nodeId;
-		if (nodeId !== void 0 && nodeId !== this.localNodeId) {
+		return this.getProviderForTarget({
+			providerId: location.providerId,
+			...location.nodeId !== void 0 && { nodeId: location.nodeId }
+		}, `location "${location.id}"`, location.id);
+	}
+	/**
+	* Resolve one dispatch target to the provider that must execute it.
+	*
+	* `descriptor` is the operator-facing subject of the error message
+	* (`location "recordings:disk"`, `uploadId "u-42"`); `locationId` is the
+	* structured tag for the log line when there is a location behind the
+	* dispatch (chunked sessions carry only the session id).
+	*
+	* Both failure branches LOG before throwing, and NEITHER falls back to the
+	* local provider — a silent fallback is the bug this method exists to fix.
+	*/
+	async getProviderForTarget(target, descriptor, locationId) {
+		const nodeId = target.nodeId;
+		if (nodeId !== void 0 && bareNodeId(nodeId) !== this.localNode) {
 			const remote = this.getRemoteProvider?.(nodeId);
 			if (remote) return remote;
-			throw new Error(`storage-provider for location "${location.id}" lives on node "${nodeId}" which is not reachable`);
+			this.logger.error("storage-orchestrator: target node has no reachable storage-provider — dispatch refused", { meta: {
+				...locationId !== void 0 && { locationId },
+				descriptor,
+				nodeId,
+				providerId: target.providerId,
+				localNodeId: this.localNode,
+				crossNodeResolverWired: this.getRemoteProvider !== void 0
+			} });
+			throw new Error(`storage-provider for ${descriptor} lives on node "${nodeId}" which is not reachable`);
 		}
 		const providers = this.getProviders();
-		for (const p of providers) if ((await p.getProviderInfo()).providerId === location.providerId) return p;
-		throw new Error(`No storage-provider registered for providerId "${location.providerId}" (location "${location.id}")`);
+		for (const p of providers) if ((await p.getProviderInfo()).providerId === target.providerId) return p;
+		this.logger.error("storage-orchestrator: no local storage-provider for providerId", { meta: {
+			...locationId !== void 0 && { locationId },
+			descriptor,
+			providerId: target.providerId,
+			localNodeId: this.localNode,
+			registered: providers.length
+		} });
+		throw new Error(`No storage-provider registered for providerId "${target.providerId}" (${descriptor})`);
+	}
+	/**
+	* Remember which provider — and on which NODE — opened a chunked session.
+	* `beginUpload` / `beginDownload` carry a `StorageLocation`; every later
+	* chunk carries only the session id, and a session id issued by an agent
+	* means nothing to the hub's provider.
+	*/
+	rememberSession(kind, sessionId, location) {
+		this.sessionTargets.set(sessionKey(kind, sessionId), {
+			providerId: location.providerId,
+			...location.nodeId !== void 0 && { nodeId: location.nodeId }
+		});
+	}
+	/** Drop a session's routing entry (finalize / abort / end). */
+	forgetSession(kind, sessionId) {
+		this.sessionTargets.delete(sessionKey(kind, sessionId));
+	}
+	/** Drop every session entry (addon shutdown). */
+	clearSessions() {
+		this.sessionTargets.clear();
+	}
+	/**
+	* Resolve the provider that owns an in-flight chunked session, on the node
+	* that opened it. Throws when the orchestrator has no record of the open
+	* call (provider gone, or a chunk for a session it never issued).
+	*/
+	async getProviderForSession(kind, sessionId) {
+		const vocabulary = SESSION_VOCABULARY[kind];
+		const descriptor = `${vocabulary.idLabel} "${sessionId}"`;
+		const target = this.sessionTargets.get(sessionKey(kind, sessionId));
+		if (!target) {
+			this.logger.error("storage-orchestrator: chunk for an unknown session — dispatch refused", { meta: {
+				descriptor,
+				kind,
+				sessionId
+			} });
+			throw new Error(`Unknown ${vocabulary.idLabel} "${sessionId}" — orchestrator has no record of ${vocabulary.openMethod}`);
+		}
+		return this.getProviderForTarget(target, descriptor);
 	}
 	/** Convenience: lookup by id (returns `undefined` if not found). */
 	getLocationById(id) {
@@ -795,16 +912,6 @@ var StorageOrchestratorAddon = class extends require_dist.BaseAddon {
 	pressureTimer = null;
 	pressureSweepInFlight = false;
 	/**
-	* `uploadId` → providerId. Populated on `beginUpload`, consulted on
-	* every subsequent `writeChunk` / `finalizeUpload` / `abortUpload`,
-	* cleared on terminal calls. The provider holds the actual session
-	* state (open file descriptor, buffered offsets, …) — we just
-	* remember which provider owns it.
-	*/
-	uploadOwners = /* @__PURE__ */ new Map();
-	/** Symmetric to `uploadOwners` for download sessions. */
-	downloadOwners = /* @__PURE__ */ new Map();
-	/**
 	* Cached `providerId → nodeLocal` snapshot (SP1). Backs the orchestrator's
 	* synchronous `NodeLocalResolver` — `getProviderInfo()` is async, so we
 	* keep a sync cache and refresh it whenever the provider collection
@@ -949,26 +1056,26 @@ var StorageOrchestratorAddon = class extends require_dist.BaseAddon {
 					location: loc,
 					relativePath
 				});
-				this.uploadOwners.set(result.uploadId, loc.providerId);
+				service.rememberSession("upload", result.uploadId, loc);
 				return result;
 			},
 			writeChunk: async (input) => {
-				return (await this.resolveByUploadId(input.uploadId)).writeChunk(input);
+				return (await service.getProviderForSession("upload", input.uploadId)).writeChunk(input);
 			},
 			finalizeUpload: async (input) => {
-				const p = await this.resolveByUploadId(input.uploadId);
+				const p = await service.getProviderForSession("upload", input.uploadId);
 				try {
 					return await p.finalizeUpload(input);
 				} finally {
-					this.uploadOwners.delete(input.uploadId);
+					service.forgetSession("upload", input.uploadId);
 				}
 			},
 			abortUpload: async (input) => {
-				const p = await this.resolveByUploadId(input.uploadId);
+				const p = await service.getProviderForSession("upload", input.uploadId);
 				try {
 					return await p.abortUpload(input);
 				} finally {
-					this.uploadOwners.delete(input.uploadId);
+					service.forgetSession("upload", input.uploadId);
 				}
 			},
 			beginDownload: async ({ location, relativePath }) => {
@@ -977,18 +1084,18 @@ var StorageOrchestratorAddon = class extends require_dist.BaseAddon {
 					location: loc,
 					relativePath
 				});
-				this.downloadOwners.set(result.downloadId, loc.providerId);
+				service.rememberSession("download", result.downloadId, loc);
 				return result;
 			},
 			readChunk: async (input) => {
-				return (await this.resolveByDownloadId(input.downloadId)).readChunk(input);
+				return (await service.getProviderForSession("download", input.downloadId)).readChunk(input);
 			},
 			endDownload: async (input) => {
-				const p = await this.resolveByDownloadId(input.downloadId);
+				const p = await service.getProviderForSession("download", input.downloadId);
 				try {
 					return await p.endDownload(input);
 				} finally {
-					this.downloadOwners.delete(input.downloadId);
+					service.forgetSession("download", input.downloadId);
 				}
 			}
 		};
@@ -1031,8 +1138,7 @@ var StorageOrchestratorAddon = class extends require_dist.BaseAddon {
 			this.pressureTimer = null;
 		}
 		this.pressureManager = null;
-		this.uploadOwners.clear();
-		this.downloadOwners.clear();
+		this.service?.clearSessions();
 		this.service = null;
 	}
 	/**
@@ -1122,7 +1228,8 @@ var StorageOrchestratorAddon = class extends require_dist.BaseAddon {
 	/** statfs capacity of a location's basePath, walking up to the nearest
 	*  existing ancestor. Null for remote-node locations or unstattable paths. */
 	async localCapacityOf(loc) {
-		if (loc.nodeId !== void 0 && loc.nodeId !== "hub" && loc.nodeId !== this.ctx.nodeId) return null;
+		const localNode = this.service?.getLocalNodeId() ?? "hub";
+		if (loc.nodeId !== void 0 && loc.nodeId !== localNode) return null;
 		const bp = loc.config["basePath"];
 		if (typeof bp !== "string" || bp.length === 0) return null;
 		try {
@@ -1251,37 +1358,6 @@ var StorageOrchestratorAddon = class extends require_dist.BaseAddon {
 		});
 		for (const info of infos) this.nodeLocalByProvider.set(info.providerId, info.nodeLocal);
 	}
-	async resolveByUploadId(uploadId) {
-		const providerId = this.uploadOwners.get(uploadId);
-		if (!providerId) throw new Error(`Unknown uploadId "${uploadId}" — orchestrator has no record of beginUpload`);
-		return this.providerByProviderId(providerId, `uploadId "${uploadId}"`);
-	}
-	async resolveByDownloadId(downloadId) {
-		const providerId = this.downloadOwners.get(downloadId);
-		if (!providerId) throw new Error(`Unknown downloadId "${downloadId}" — orchestrator has no record of beginDownload`);
-		return this.providerByProviderId(providerId, `downloadId "${downloadId}"`);
-	}
-	/**
-	* Look up a `storage-provider` by `providerId` only — used for
-	* upload / download dispatch where the original `StorageLocation` is
-	* no longer in scope. Throws if the provider has gone away (e.g.
-	* addon unloaded mid-session).
-	*/
-	async providerByProviderId(providerId, sessionDescriptor) {
-		if (!this.service) throw new Error("storage-orchestrator: service not initialized");
-		const probe = {
-			id: `__session:${sessionDescriptor}`,
-			type: "data",
-			displayName: sessionDescriptor,
-			providerId,
-			config: {},
-			isDefault: false,
-			isSystem: false,
-			createdAt: 0,
-			updatedAt: 0
-		};
-		return this.service.getProviderFor(probe);
-	}
 };
 //#endregion
 exports.SqliteLocationStore = SqliteLocationStore;

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

@@ -1,13 +1,39 @@
-import { Q as storageCapability, Tt as parseJsonObject, at as BaseAddon, d as StorageLocationTypeSchema } from "../../dist-CIek6F9X.mjs";
+import { Q as storageCapability, Tt as parseJsonObject, at as BaseAddon, d as StorageLocationTypeSchema } from "../../dist-DimX9eZy.mjs";
 import * as path$1 from "node:path";
 import * as fs from "node:fs/promises";
 import { buildStorageLocationRegistry } from "@camstack/system";
 //#region src/builtins/storage-orchestrator/storage-orchestrator.service.ts
+var SESSION_VOCABULARY = {
+	upload: {
+		idLabel: "uploadId",
+		openMethod: "beginUpload"
+	},
+	download: {
+		idLabel: "downloadId",
+		openMethod: "beginDownload"
+	}
+};
+/** Map key for a tracked chunked session — the id spaces never collide. */
+function sessionKey(kind, sessionId) {
+	return `${kind}:${sessionId}`;
+}
+/**
+* Bare node id for a raw kernel `localNodeId`. Forked children carry a
+* `<node>/<addon>` suffix; routing is per-NODE, so the addon segment is
+* dropped. (Mirrors `normalizeNodeId` in `@camstack/types/addon`, which is a
+* leaf module not re-exported on any subpath this package can import.)
+*/
+function bareNodeId(raw) {
+	if (raw === void 0 || raw === "") return "hub";
+	const slash = raw.indexOf("/");
+	if (slash < 0) return raw;
+	const bare = raw.slice(0, slash);
+	return bare === "" ? "hub" : bare;
+}
 var StorageOrchestratorService = class {
 	logger;
 	getProviders;
 	locationStore;
-	localNodeId;
 	getRemoteProvider;
 	locations = /* @__PURE__ */ new Map();
 	/**
@@ -26,12 +52,29 @@ var StorageOrchestratorService = class {
 	* early-boot path that predates the resolver wiring.
 	*/
 	nodeLocalResolver = null;
+	/** `localNodeId` with any forked-child `/addon` suffix stripped. */
+	localNode;
+	/**
+	* `<kind>:<sessionId>` → the dispatch target that OPENED the session.
+	* Chunked I/O carries no `StorageLocation` after the first hop, so without
+	* this the follow-up chunks fall back to a `providerId`-only lookup — which
+	* on a multi-node cluster means the hub's filesystem, not the agent's.
+	*/
+	sessionTargets = /* @__PURE__ */ new Map();
 	constructor(logger, getProviders, locationStore = null, localNodeId = "hub", getRemoteProvider) {
 		this.logger = logger;
 		this.getProviders = getProviders;
 		this.locationStore = locationStore;
-		this.localNodeId = localNodeId;
 		this.getRemoteProvider = getRemoteProvider;
+		this.localNode = bareNodeId(localNodeId);
+	}
+	/**
+	* The node this orchestrator runs on, with any forked-child `/addon`
+	* suffix stripped. A location whose `nodeId` differs is NOT this node's
+	* to touch — its bytes, and its free space, live elsewhere.
+	*/
+	getLocalNodeId() {
+		return this.localNode;
 	}
 	/** True once a persistence store is wired (constructor or {@link attachStore}). */
 	hasStore() {
@@ -339,22 +382,96 @@ var StorageOrchestratorService = class {
 		return def;
 	}
 	/**
-	* Find the storage-provider that backs a given location. Lookup is by
-	* `location.providerId` against `getProviderInfo().providerId` from
-	* each registered collection provider. Throws with both the missing
-	* providerId and the offending location id so the operator can pick
-	* the right place to fix the config.
+	* Find the storage-provider that backs a given location — the entry point
+	* every consumer-facing `storage` cap method funnels through.
+	*
+	* Routing key is `(providerId, nodeId)`, never `providerId` alone: every
+	* node's FilesystemStorageProvider registers under the SAME providerId, so
+	* a providerId-only match resolves to whichever node asked. That is how a
+	* location created on an agent ended up writing to the HUB's filesystem
+	* (root-caused 2026-07-29).
 	*/
 	async getProviderFor(location) {
-		const nodeId = location.nodeId;
-		if (nodeId !== void 0 && nodeId !== this.localNodeId) {
+		return this.getProviderForTarget({
+			providerId: location.providerId,
+			...location.nodeId !== void 0 && { nodeId: location.nodeId }
+		}, `location "${location.id}"`, location.id);
+	}
+	/**
+	* Resolve one dispatch target to the provider that must execute it.
+	*
+	* `descriptor` is the operator-facing subject of the error message
+	* (`location "recordings:disk"`, `uploadId "u-42"`); `locationId` is the
+	* structured tag for the log line when there is a location behind the
+	* dispatch (chunked sessions carry only the session id).
+	*
+	* Both failure branches LOG before throwing, and NEITHER falls back to the
+	* local provider — a silent fallback is the bug this method exists to fix.
+	*/
+	async getProviderForTarget(target, descriptor, locationId) {
+		const nodeId = target.nodeId;
+		if (nodeId !== void 0 && bareNodeId(nodeId) !== this.localNode) {
 			const remote = this.getRemoteProvider?.(nodeId);
 			if (remote) return remote;
-			throw new Error(`storage-provider for location "${location.id}" lives on node "${nodeId}" which is not reachable`);
+			this.logger.error("storage-orchestrator: target node has no reachable storage-provider — dispatch refused", { meta: {
+				...locationId !== void 0 && { locationId },
+				descriptor,
+				nodeId,
+				providerId: target.providerId,
+				localNodeId: this.localNode,
+				crossNodeResolverWired: this.getRemoteProvider !== void 0
+			} });
+			throw new Error(`storage-provider for ${descriptor} lives on node "${nodeId}" which is not reachable`);
 		}
 		const providers = this.getProviders();
-		for (const p of providers) if ((await p.getProviderInfo()).providerId === location.providerId) return p;
-		throw new Error(`No storage-provider registered for providerId "${location.providerId}" (location "${location.id}")`);
+		for (const p of providers) if ((await p.getProviderInfo()).providerId === target.providerId) return p;
+		this.logger.error("storage-orchestrator: no local storage-provider for providerId", { meta: {
+			...locationId !== void 0 && { locationId },
+			descriptor,
+			providerId: target.providerId,
+			localNodeId: this.localNode,
+			registered: providers.length
+		} });
+		throw new Error(`No storage-provider registered for providerId "${target.providerId}" (${descriptor})`);
+	}
+	/**
+	* Remember which provider — and on which NODE — opened a chunked session.
+	* `beginUpload` / `beginDownload` carry a `StorageLocation`; every later
+	* chunk carries only the session id, and a session id issued by an agent
+	* means nothing to the hub's provider.
+	*/
+	rememberSession(kind, sessionId, location) {
+		this.sessionTargets.set(sessionKey(kind, sessionId), {
+			providerId: location.providerId,
+			...location.nodeId !== void 0 && { nodeId: location.nodeId }
+		});
+	}
+	/** Drop a session's routing entry (finalize / abort / end). */
+	forgetSession(kind, sessionId) {
+		this.sessionTargets.delete(sessionKey(kind, sessionId));
+	}
+	/** Drop every session entry (addon shutdown). */
+	clearSessions() {
+		this.sessionTargets.clear();
+	}
+	/**
+	* Resolve the provider that owns an in-flight chunked session, on the node
+	* that opened it. Throws when the orchestrator has no record of the open
+	* call (provider gone, or a chunk for a session it never issued).
+	*/
+	async getProviderForSession(kind, sessionId) {
+		const vocabulary = SESSION_VOCABULARY[kind];
+		const descriptor = `${vocabulary.idLabel} "${sessionId}"`;
+		const target = this.sessionTargets.get(sessionKey(kind, sessionId));
+		if (!target) {
+			this.logger.error("storage-orchestrator: chunk for an unknown session — dispatch refused", { meta: {
+				descriptor,
+				kind,
+				sessionId
+			} });
+			throw new Error(`Unknown ${vocabulary.idLabel} "${sessionId}" — orchestrator has no record of ${vocabulary.openMethod}`);
+		}
+		return this.getProviderForTarget(target, descriptor);
 	}
 	/** Convenience: lookup by id (returns `undefined` if not found). */
 	getLocationById(id) {
@@ -788,16 +905,6 @@ var StorageOrchestratorAddon = class extends BaseAddon {
 	pressureTimer = null;
 	pressureSweepInFlight = false;
 	/**
-	* `uploadId` → providerId. Populated on `beginUpload`, consulted on
-	* every subsequent `writeChunk` / `finalizeUpload` / `abortUpload`,
-	* cleared on terminal calls. The provider holds the actual session
-	* state (open file descriptor, buffered offsets, …) — we just
-	* remember which provider owns it.
-	*/
-	uploadOwners = /* @__PURE__ */ new Map();
-	/** Symmetric to `uploadOwners` for download sessions. */
-	downloadOwners = /* @__PURE__ */ new Map();
-	/**
 	* Cached `providerId → nodeLocal` snapshot (SP1). Backs the orchestrator's
 	* synchronous `NodeLocalResolver` — `getProviderInfo()` is async, so we
 	* keep a sync cache and refresh it whenever the provider collection
@@ -942,26 +1049,26 @@ var StorageOrchestratorAddon = class extends BaseAddon {
 					location: loc,
 					relativePath
 				});
-				this.uploadOwners.set(result.uploadId, loc.providerId);
+				service.rememberSession("upload", result.uploadId, loc);
 				return result;
 			},
 			writeChunk: async (input) => {
-				return (await this.resolveByUploadId(input.uploadId)).writeChunk(input);
+				return (await service.getProviderForSession("upload", input.uploadId)).writeChunk(input);
 			},
 			finalizeUpload: async (input) => {
-				const p = await this.resolveByUploadId(input.uploadId);
+				const p = await service.getProviderForSession("upload", input.uploadId);
 				try {
 					return await p.finalizeUpload(input);
 				} finally {
-					this.uploadOwners.delete(input.uploadId);
+					service.forgetSession("upload", input.uploadId);
 				}
 			},
 			abortUpload: async (input) => {
-				const p = await this.resolveByUploadId(input.uploadId);
+				const p = await service.getProviderForSession("upload", input.uploadId);
 				try {
 					return await p.abortUpload(input);
 				} finally {
-					this.uploadOwners.delete(input.uploadId);
+					service.forgetSession("upload", input.uploadId);
 				}
 			},
 			beginDownload: async ({ location, relativePath }) => {
@@ -970,18 +1077,18 @@ var StorageOrchestratorAddon = class extends BaseAddon {
 					location: loc,
 					relativePath
 				});
-				this.downloadOwners.set(result.downloadId, loc.providerId);
+				service.rememberSession("download", result.downloadId, loc);
 				return result;
 			},
 			readChunk: async (input) => {
-				return (await this.resolveByDownloadId(input.downloadId)).readChunk(input);
+				return (await service.getProviderForSession("download", input.downloadId)).readChunk(input);
 			},
 			endDownload: async (input) => {
-				const p = await this.resolveByDownloadId(input.downloadId);
+				const p = await service.getProviderForSession("download", input.downloadId);
 				try {
 					return await p.endDownload(input);
 				} finally {
-					this.downloadOwners.delete(input.downloadId);
+					service.forgetSession("download", input.downloadId);
 				}
 			}
 		};
@@ -1024,8 +1131,7 @@ var StorageOrchestratorAddon = class extends BaseAddon {
 			this.pressureTimer = null;
 		}
 		this.pressureManager = null;
-		this.uploadOwners.clear();
-		this.downloadOwners.clear();
+		this.service?.clearSessions();
 		this.service = null;
 	}
 	/**
@@ -1115,7 +1221,8 @@ var StorageOrchestratorAddon = class extends BaseAddon {
 	/** statfs capacity of a location's basePath, walking up to the nearest
 	*  existing ancestor. Null for remote-node locations or unstattable paths. */
 	async localCapacityOf(loc) {
-		if (loc.nodeId !== void 0 && loc.nodeId !== "hub" && loc.nodeId !== this.ctx.nodeId) return null;
+		const localNode = this.service?.getLocalNodeId() ?? "hub";
+		if (loc.nodeId !== void 0 && loc.nodeId !== localNode) return null;
 		const bp = loc.config["basePath"];
 		if (typeof bp !== "string" || bp.length === 0) return null;
 		try {
@@ -1244,37 +1351,6 @@ var StorageOrchestratorAddon = class extends BaseAddon {
 		});
 		for (const info of infos) this.nodeLocalByProvider.set(info.providerId, info.nodeLocal);
 	}
-	async resolveByUploadId(uploadId) {
-		const providerId = this.uploadOwners.get(uploadId);
-		if (!providerId) throw new Error(`Unknown uploadId "${uploadId}" — orchestrator has no record of beginUpload`);
-		return this.providerByProviderId(providerId, `uploadId "${uploadId}"`);
-	}
-	async resolveByDownloadId(downloadId) {
-		const providerId = this.downloadOwners.get(downloadId);
-		if (!providerId) throw new Error(`Unknown downloadId "${downloadId}" — orchestrator has no record of beginDownload`);
-		return this.providerByProviderId(providerId, `downloadId "${downloadId}"`);
-	}
-	/**
-	* Look up a `storage-provider` by `providerId` only — used for
-	* upload / download dispatch where the original `StorageLocation` is
-	* no longer in scope. Throws if the provider has gone away (e.g.
-	* addon unloaded mid-session).
-	*/
-	async providerByProviderId(providerId, sessionDescriptor) {
-		if (!this.service) throw new Error("storage-orchestrator: service not initialized");
-		const probe = {
-			id: `__session:${sessionDescriptor}`,
-			type: "data",
-			displayName: sessionDescriptor,
-			providerId,
-			config: {},
-			isDefault: false,
-			isSystem: false,
-			createdAt: 0,
-			updatedAt: 0
-		};
-		return this.service.getProviderFor(probe);
-	}
 };
 //#endregion
 export { StorageOrchestratorAddon, StorageOrchestratorAddon as default, StorageOrchestratorService as n, SqliteLocationStore as t };