dsh-mnemon-source-memory-spaces 0.5.3 → 0.5.5

package/lib/index.js

@@ -1,7 +1,7 @@
-import { findMnemonCommand, isMnemonExecutable, mnemonNpmLauncher } from "./native-cli.js";
+import { findMnemonCommand, isMnemonExecutable, mnemonNpmLauncher, nodeLauncherEnvironment } from "./native-cli.js";
 import { CATEGORIES as CATEGORIES$1, EDGE_TYPES, INTENTS as INTENTS$1, MNEMON_EMBEDDING_PROTOCOLS, SOURCES as SOURCES$1 } from "./contracts.js";
 import { a as MemoryProviderCatalog, i as EMPTY_MEMORY_PROVIDER_CATALOG, n as PrivateMemorySpaceProviderHost, r as MemoryProviderAdapterRegistry, t as createMemorySpaceProviderPlugin } from "./plugin-DlsNeZbQ.js";
-import { t as runProcess } from "./process-B-t3UflO.js";
+import { t as runProcess } from "./process-BvrgxPNP.js";
 import { r as defineMemorySpaceProvider } from "./definitions-DfmOqJjR.js";
 import { existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
@@ -16,7 +16,7 @@ function boundedToolText(value, maximum) {
 	return value.length <= maximum ? value : `${value.slice(0, maximum - 1)}…`;
 }
 /** Strip control-plane paths, provider settings, and statistics from model output. */
-function modelBodyCatalog(catalog) {
+function modelSpaceCatalog(catalog) {
 	const items = catalog.items.slice(0, MODEL_MEMORY_BODY_LIMIT);
 	return {
 		items: items.map((body) => ({
@@ -95,7 +95,7 @@ function modelJson(value, maximum) {
 	return result;
 }
 //#endregion
-//#region src/memory-bodies.ts
+//#region src/memory-spaces.ts
 const NATIVE_REGISTRY_VERSION = 1;
 const PROVIDER_REGISTRY_VERSION = 4;
 const ID_PATTERN = /^[a-zA-Z0-9][a-zA-Z0-9_-]*$/;
@@ -193,7 +193,7 @@ function normalizePlacementDecision(value, providerId, providerCatalog = EMPTY_M
 		...placement.subagentProvider === void 0 ? {} : { subagentProvider: placement.subagentProvider }
 	};
 }
-function validateMemoryBodyId(value) {
+function validateMemorySpaceId(value) {
 	const normalized = value.trim();
 	if (!ID_PATTERN.test(normalized)) throw new Error("memoryBodyId must match [a-zA-Z0-9][a-zA-Z0-9_-]*");
 	return normalized;
@@ -205,7 +205,7 @@ function validateMemoryBodyId(value) {
 * compatible. External connection metadata lives under state and is never
 * included in Memory Space Packs.
 */
-var MemoryBodyRegistry = class MemoryBodyRegistry {
+var MemorySpaceRegistry = class MemorySpaceRegistry {
 	runner;
 	persistent;
 	now;
@@ -221,7 +221,7 @@ var MemoryBodyRegistry = class MemoryBodyRegistry {
 		this.now = now;
 		this.providerCatalog = providerCatalog;
 		this.state = sharedState ?? {
-			bodies: [],
+			spaces: [],
 			services: {},
 			serviceEnabled: {}
 		};
@@ -230,11 +230,11 @@ var MemoryBodyRegistry = class MemoryBodyRegistry {
 		this.providerRegistryPath = join(runner.effectiveDataDir(), "state", "memory-providers.json");
 		if (sharedState === void 0) this.reload();
 	}
-	get bodies() {
-		return this.state.bodies;
+	get spaces() {
+		return this.state.spaces;
 	}
-	set bodies(value) {
-		this.state.bodies = value;
+	set spaces(value) {
+		this.state.spaces = value;
 	}
 	get services() {
 		return this.state.services;
@@ -250,7 +250,7 @@ var MemoryBodyRegistry = class MemoryBodyRegistry {
 	}
 	/** One generation-local descriptor view over the same persistent authority. */
 	withProviderCatalog(providerCatalog) {
-		return new MemoryBodyRegistry(this.runner, this.persistent, this.now, providerCatalog, this.state);
+		return new MemorySpaceRegistry(this.runner, this.persistent, this.now, providerCatalog, this.state);
 	}
 	isNative(providerId) {
 		return this.providerTypeId(providerId) === "mnemon-native";
@@ -262,15 +262,15 @@ var MemoryBodyRegistry = class MemoryBodyRegistry {
 	list() {
 		this.refreshIfChanged();
 		this.reconcileDiscoveredStores();
-		return this.bodies.filter((body) => this.providerCatalog.has(body.providerId)).map((body) => this.view(body));
+		return this.spaces.filter((body) => this.providerCatalog.has(body.providerId)).map((body) => this.view(body));
 	}
 	active() {
 		return this.list().filter((body) => body.active && (this.isNative(body.provider.id) || Object.hasOwn(this.services, body.provider.id) && this.serviceEnabled[body.provider.id] === true));
 	}
 	get(id) {
-		const normalized = validateMemoryBodyId(id);
+		const normalized = validateMemorySpaceId(id);
 		const body = this.list().find((entry) => entry.id === normalized);
-		if (body === void 0) throw new Error(`unknown memory body: ${normalized}`);
+		if (body === void 0) throw new Error(`unknown memory space: ${normalized}`);
 		return body;
 	}
 	openVikingConnection(id) {
@@ -286,10 +286,10 @@ var MemoryBodyRegistry = class MemoryBodyRegistry {
 	}
 	providerConnection(id, expectedProviderId) {
 		this.refreshIfChanged();
-		const normalized = validateMemoryBodyId(id);
-		const body = this.bodies.find((entry) => entry.id === normalized);
-		if (body === void 0 || this.isNative(body.providerId)) throw new Error(`memory body has no external provider connection: ${normalized}`);
-		if (expectedProviderId !== void 0 && body.providerId !== expectedProviderId) throw new Error(`memory body ${normalized} uses ${body.providerId}, not ${expectedProviderId}`);
+		const normalized = validateMemorySpaceId(id);
+		const body = this.spaces.find((entry) => entry.id === normalized);
+		if (body === void 0 || this.isNative(body.providerId)) throw new Error(`memory space has no external provider connection: ${normalized}`);
+		if (expectedProviderId !== void 0 && body.providerId !== expectedProviderId) throw new Error(`memory space ${normalized} uses ${body.providerId}, not ${expectedProviderId}`);
 		return this.connectionFor(body);
 	}
 	/** Used only after a public operation has refreshed the registry authority. */
@@ -334,7 +334,7 @@ var MemoryBodyRegistry = class MemoryBodyRegistry {
 		const previous = this.services[providerId] ?? {};
 		this.services[providerId] = this.providerCatalog.normalizeService(providerId, settings, previous, clearSecrets);
 		this.serviceEnabled[providerId] = enabled;
-		if (!enabled) this.bodies = this.bodies.filter((body) => body.providerId !== providerId);
+		if (!enabled) this.spaces = this.spaces.filter((body) => body.providerId !== providerId);
 		this.save();
 		return this.providerServices().items.find((item) => item.providerId === providerId);
 	}
@@ -349,8 +349,8 @@ var MemoryBodyRegistry = class MemoryBodyRegistry {
 		if (this.isNative(providerId)) throw new Error("Mnemon Native Stores are discovered from disk");
 		let normalizedService = this.providerCatalog.normalizeService(providerId, service);
 		const seen = /* @__PURE__ */ new Set();
-		const existing = this.bodies.filter((body) => body.providerId === providerId);
-		const reservedIds = new Set(this.bodies.filter((body) => body.providerId !== providerId).map((body) => body.id));
+		const existing = this.spaces.filter((body) => body.providerId === providerId);
+		const reservedIds = new Set(this.spaces.filter((body) => body.providerId !== providerId).map((body) => body.id));
 		const timestamp = this.now().toISOString();
 		const projections = discovered.map((candidate) => {
 			const externalId = requiredText(candidate.externalId, "provider externalId", 2e3);
@@ -362,10 +362,10 @@ var MemoryBodyRegistry = class MemoryBodyRegistry {
 				...connection
 			});
 			const previous = existing.find((body) => body.externalId === externalId);
-			let id = previous?.id ?? validateMemoryBodyId(`${providerId}-${createHash("sha256").update(externalId).digest("hex").slice(0, 24)}`);
+			let id = previous?.id ?? validateMemorySpaceId(`${providerId}-${createHash("sha256").update(externalId).digest("hex").slice(0, 24)}`);
 			let suffix = 1;
 			while (reservedIds.has(id)) {
-				id = validateMemoryBodyId(`${providerId}-${createHash("sha256").update(`${externalId}:${suffix}`).digest("hex").slice(0, 24)}`);
+				id = validateMemorySpaceId(`${providerId}-${createHash("sha256").update(`${externalId}:${suffix}`).digest("hex").slice(0, 24)}`);
 				suffix += 1;
 			}
 			reservedIds.add(id);
@@ -395,7 +395,7 @@ var MemoryBodyRegistry = class MemoryBodyRegistry {
 		}
 		this.services[providerId] = normalizedService;
 		this.serviceEnabled[providerId] = true;
-		this.bodies = [...this.bodies.filter((body) => body.providerId !== providerId), ...projections];
+		this.spaces = [...this.spaces.filter((body) => body.providerId !== providerId), ...projections];
 		this.save();
 		return this.providerServices().items.find((item) => item.providerId === providerId);
 	}
@@ -437,8 +437,8 @@ var MemoryBodyRegistry = class MemoryBodyRegistry {
 		const reservedIds = new Set(this.list().map((body) => body.id));
 		const nativeStoreIds = this.nativeStoreIds();
 		const nativeProvider = this.isNative(providerId);
-		let id = nativeProvider && nativeStoreIds.length === 0 && !reservedIds.has("default") ? "default" : validateMemoryBodyId(nativeProvider ? randomUUID() : `${providerId}-${randomUUID()}`);
-		while (reservedIds.has(id) || nativeStoreIds.includes(id)) id = validateMemoryBodyId(randomUUID());
+		let id = nativeProvider && nativeStoreIds.length === 0 && !reservedIds.has("default") ? "default" : validateMemorySpaceId(nativeProvider ? randomUUID() : `${providerId}-${randomUUID()}`);
+		while (reservedIds.has(id) || nativeStoreIds.includes(id)) id = validateMemorySpaceId(randomUUID());
 		const connectionInput = request.providerConnections?.[providerId] ?? (this.providerTypeId(providerId) === "openviking" && request.connection === void 0 && request.openViking !== void 0 ? request.openViking : request.connection);
 		let connection;
 		if (!nativeProvider) {
@@ -475,19 +475,19 @@ var MemoryBodyRegistry = class MemoryBodyRegistry {
 			createdAt: timestamp,
 			updatedAt: timestamp
 		};
-		this.bodies.push(body);
+		this.spaces.push(body);
 		this.save();
 		return this.view(body);
 	}
 	update(id, request) {
 		this.refreshIfChanged();
-		const normalized = validateMemoryBodyId(id);
-		const index = this.bodies.findIndex((body) => body.id === normalized);
-		if (index < 0) throw new Error(`unknown memory body: ${normalized}`);
-		const current = this.bodies[index];
-		if (request.openViking !== void 0 && this.providerTypeId(current.providerId) !== "openviking") throw new Error("OpenViking connection settings only apply to OpenViking memory bodies");
+		const normalized = validateMemorySpaceId(id);
+		const index = this.spaces.findIndex((body) => body.id === normalized);
+		if (index < 0) throw new Error(`unknown memory space: ${normalized}`);
+		const current = this.spaces[index];
+		if (request.openViking !== void 0 && this.providerTypeId(current.providerId) !== "openviking") throw new Error("OpenViking connection settings only apply to OpenViking memory spaces");
 		const nativeProvider = this.isNative(current.providerId);
-		if ((request.connection !== void 0 || request.clearSecrets !== void 0) && nativeProvider) throw new Error("Mnemon Native memory bodies do not have provider connection settings");
+		if ((request.connection !== void 0 || request.clearSecrets !== void 0) && nativeProvider) throw new Error("Mnemon Native memory spaces do not have provider connection settings");
 		const legacyPatch = request.openViking === void 0 ? void 0 : {
 			...request.openViking,
 			...request.openViking.clearApiKey === true ? { apiKey: "" } : {}
@@ -519,7 +519,7 @@ var MemoryBodyRegistry = class MemoryBodyRegistry {
 			...connection === void 0 ? {} : { connection },
 			updatedAt: this.nextTimestamp(current.updatedAt)
 		};
-		this.bodies[index] = body;
+		this.spaces[index] = body;
 		this.save();
 		return this.view(body);
 	}
@@ -529,30 +529,30 @@ var MemoryBodyRegistry = class MemoryBodyRegistry {
 		if (updates.length === 0 || updates.length > 20) throw new Error("metadata maintenance requires 1 through 20 Memory Spaces");
 		const seen = /* @__PURE__ */ new Set();
 		const replacements = updates.map((update) => {
-			const id = validateMemoryBodyId(update.memoryBodyId);
+			const id = validateMemorySpaceId(update.memoryBodyId);
 			if (seen.has(id)) throw new Error(`duplicate metadata update: ${id}`);
 			seen.add(id);
-			const index = this.bodies.findIndex((body) => body.id === id);
-			if (index < 0) throw new Error(`unknown memory body: ${id}`);
+			const index = this.spaces.findIndex((body) => body.id === id);
+			if (index < 0) throw new Error(`unknown memory space: ${id}`);
 			return {
 				index,
 				body: {
-					...this.bodies[index],
+					...this.spaces[index],
 					name: requiredText(update.title, "title", 48),
 					description: requiredText(update.description, "description", 200),
 					metadataSource: "ai",
-					updatedAt: this.nextTimestamp(this.bodies[index].updatedAt)
+					updatedAt: this.nextTimestamp(this.spaces[index].updatedAt)
 				}
 			};
 		});
-		for (const replacement of replacements) this.bodies[replacement.index] = replacement.body;
+		for (const replacement of replacements) this.spaces[replacement.index] = replacement.body;
 		this.save();
 		return replacements.map((replacement) => this.view(replacement.body));
 	}
 	async remove(id, signal) {
 		const body = this.get(id);
 		if (!this.isNative(body.provider.id)) {
-			this.bodies = this.bodies.filter((entry) => entry.id !== body.id);
+			this.spaces = this.spaces.filter((entry) => entry.id !== body.id);
 			this.save();
 			return body;
 		}
@@ -590,7 +590,7 @@ var MemoryBodyRegistry = class MemoryBodyRegistry {
 			}
 		});
 		await this.runner.runTextBatch(commands);
-		this.bodies = this.bodies.filter((entry) => entry.id !== body.id);
+		this.spaces = this.spaces.filter((entry) => entry.id !== body.id);
 		this.save();
 		return body;
 	}
@@ -599,14 +599,14 @@ var MemoryBodyRegistry = class MemoryBodyRegistry {
 	}
 	/** Advance the safe catalog checkpoint after provider-backed content changes. */
 	touch(id) {
-		const normalized = validateMemoryBodyId(id);
-		const index = this.bodies.findIndex((body) => body.id === normalized);
-		if (index < 0) throw new Error(`unknown memory body: ${normalized}`);
+		const normalized = validateMemorySpaceId(id);
+		const index = this.spaces.findIndex((body) => body.id === normalized);
+		if (index < 0) throw new Error(`unknown memory space: ${normalized}`);
 		const body = {
-			...this.bodies[index],
-			updatedAt: this.nextTimestamp(this.bodies[index].updatedAt)
+			...this.spaces[index],
+			updatedAt: this.nextTimestamp(this.spaces[index].updatedAt)
 		};
-		this.bodies[index] = body;
+		this.spaces[index] = body;
 		this.save();
 		return this.view(body);
 	}
@@ -614,7 +614,7 @@ var MemoryBodyRegistry = class MemoryBodyRegistry {
 	reload() {
 		this.refreshing = true;
 		try {
-			this.bodies = [];
+			this.spaces = [];
 			this.services = {};
 			this.serviceEnabled = {};
 			this.loadAndReconcile();
@@ -646,7 +646,7 @@ var MemoryBodyRegistry = class MemoryBodyRegistry {
 			const parsed = JSON.parse(readFileSync(this.registryPath, "utf8"));
 			if ((parsed.version === NATIVE_REGISTRY_VERSION || parsed.version === 2) && Array.isArray(parsed.bodies)) {
 				migratedProviderRegistry = parsed.version === 2;
-				this.bodies = parsed.bodies.filter((body) => ID_PATTERN.test(body.id)).map((body) => {
+				this.spaces = parsed.bodies.filter((body) => ID_PATTERN.test(body.id)).map((body) => {
 					const syntheticDefault = body.id === "default" && body.name === "默认记忆体" && body.description === "从现有 Mnemon Store 自动接入。";
 					migratedSyntheticDefault ||= syntheticDefault;
 					const providerId = "providerId" in body && storedProviderId(body.providerId) ? body.providerId : "mnemon-native";
@@ -686,7 +686,7 @@ var MemoryBodyRegistry = class MemoryBodyRegistry {
 				});
 			}
 		} catch {
-			this.bodies = [];
+			this.spaces = [];
 		}
 		if (this.persistent && existsSync(this.providerRegistryPath)) try {
 			const parsed = JSON.parse(readFileSync(this.providerRegistryPath, "utf8"));
@@ -698,8 +698,8 @@ var MemoryBodyRegistry = class MemoryBodyRegistry {
 			}
 			if ((parsed.version === 1 || parsed.version === 2 || parsed.version === 3 || parsed.version === PROVIDER_REGISTRY_VERSION) && Array.isArray(parsed.bodies)) {
 				migratedProviderRegistry ||= parsed.version !== PROVIDER_REGISTRY_VERSION;
-				const existingIds = new Set(this.bodies.map((body) => body.id));
-				this.bodies.push(...parsed.bodies.filter((body) => storedProviderId(body.providerId) && (!this.providerCatalog.has(body.providerId) || !this.isNative(body.providerId)) && ID_PATTERN.test(body.id) && !existingIds.has(body.id)).map((body) => {
+				const existingIds = new Set(this.spaces.map((body) => body.id));
+				this.spaces.push(...parsed.bodies.filter((body) => storedProviderId(body.providerId) && (!this.providerCatalog.has(body.providerId) || !this.isNative(body.providerId)) && ID_PATTERN.test(body.id) && !existingIds.has(body.id)).map((body) => {
 					const providerId = body.providerId;
 					if (!this.providerCatalog.has(providerId)) return {
 						id: body.id,
@@ -744,9 +744,9 @@ var MemoryBodyRegistry = class MemoryBodyRegistry {
 				}));
 			}
 		} catch {}
-		const retainedBodies = this.bodies.filter((body) => !this.providerCatalog.has(body.providerId) || this.isNative(body.providerId) || this.providerServiceEnabled(body.providerId));
-		if (retainedBodies.length !== this.bodies.length) {
-			this.bodies = retainedBodies;
+		const retainedBodies = this.spaces.filter((body) => !this.providerCatalog.has(body.providerId) || this.isNative(body.providerId) || this.providerServiceEnabled(body.providerId));
+		if (retainedBodies.length !== this.spaces.length) {
+			this.spaces = retainedBodies;
 			migratedProviderRegistry = true;
 		}
 		this.reconcileDiscoveredStores();
@@ -759,12 +759,12 @@ var MemoryBodyRegistry = class MemoryBodyRegistry {
 		let changed = false;
 		for (const entry of readdirSync(this.directory, { withFileTypes: true })) {
 			if (!entry.isDirectory() || !ID_PATTERN.test(entry.name) || !existsSync(join(this.directory, entry.name, "mnemon.db"))) continue;
-			if (this.bodies.some((body) => body.id === entry.name)) continue;
-			this.bodies.push({
+			if (this.spaces.some((body) => body.id === entry.name)) continue;
+			this.spaces.push({
 				id: entry.name,
 				name: entry.name,
 				description: "Existing Mnemon Store discovered on disk.",
-				active: this.bodies.length === 0 || entry.name === legacyActive,
+				active: this.spaces.length === 0 || entry.name === legacyActive,
 				providerId: "mnemon-native",
 				createdAt: timestamp,
 				updatedAt: timestamp
@@ -820,12 +820,12 @@ var MemoryBodyRegistry = class MemoryBodyRegistry {
 			recursive: true,
 			mode: 448
 		});
-		const nativeBodies = this.bodies.filter((body) => body.providerId === "mnemon-native" || this.providerCatalog.has(body.providerId) && this.isNative(body.providerId)).map(({ providerId: _providerId, connection: _connection, openViking: _openViking, ...body }) => body);
+		const nativeBodies = this.spaces.filter((body) => body.providerId === "mnemon-native" || this.providerCatalog.has(body.providerId) && this.isNative(body.providerId)).map(({ providerId: _providerId, connection: _connection, openViking: _openViking, ...body }) => body);
 		this.writeRegistry(this.registryPath, {
 			version: NATIVE_REGISTRY_VERSION,
 			bodies: nativeBodies
 		});
-		const providerBodies = this.bodies.filter((body) => body.providerId !== "mnemon-native" && (!this.providerCatalog.has(body.providerId) || !this.isNative(body.providerId)));
+		const providerBodies = this.spaces.filter((body) => body.providerId !== "mnemon-native" && (!this.providerCatalog.has(body.providerId) || !this.isNative(body.providerId)));
 		if (providerBodies.length === 0 && Object.keys(this.services).length === 0) {
 			rmSync(this.providerRegistryPath, { force: true });
 			this.state.diskRevision = this.diskRevision();
@@ -1375,10 +1375,12 @@ var MemorySpacesService = class {
 	config;
 	recallQualityPolicyRegistry;
 	providerCatalog;
+	memorySpaces;
+	/** @deprecated Use memorySpaces. Both names share the same registry authority. */
 	memoryBodies;
 	providers;
 	recallQualityPolicy;
-	bodiesInFlight;
+	spacesInFlight;
 	providersDisposed = false;
 	providerTypeId(providerId) {
 		const catalog = this.providerCatalog;
@@ -1389,18 +1391,20 @@ var MemorySpacesService = class {
 	isNativeProvider(providerId) {
 		return this.providerTypeId(providerId) === "mnemon-native";
 	}
-	isNativeBody(body) {
+	isNativeSpace(body) {
 		return (body.provider.typeId ?? body.provider.id) === "mnemon-native";
 	}
-	constructor(runner, config, memoryBodies, recallQualityPolicyRegistry = recallQualityPolicies, providerAdapterRegistry = new MemoryProviderAdapterRegistry(), providerCatalog = EMPTY_MEMORY_PROVIDER_CATALOG) {
+	constructor(runner, config, memorySpaces, recallQualityPolicyRegistry = recallQualityPolicies, providerAdapterRegistry = new MemoryProviderAdapterRegistry(), providerCatalog = EMPTY_MEMORY_PROVIDER_CATALOG) {
 		this.runner = runner;
 		this.config = config;
 		this.recallQualityPolicyRegistry = recallQualityPolicyRegistry;
 		this.providerCatalog = providerCatalog;
-		this.memoryBodies = memoryBodies === void 0 ? new MemoryBodyRegistry(runner, true, () => /* @__PURE__ */ new Date(), providerCatalog) : providerCatalog === EMPTY_MEMORY_PROVIDER_CATALOG ? memoryBodies : memoryBodies.withProviderCatalog(providerCatalog);
+		this.memorySpaces = memorySpaces === void 0 ? new MemorySpaceRegistry(runner, true, () => /* @__PURE__ */ new Date(), providerCatalog) : providerCatalog === EMPTY_MEMORY_PROVIDER_CATALOG ? memorySpaces : memorySpaces.withProviderCatalog(providerCatalog);
+		this.memoryBodies = this.memorySpaces;
 		this.recallQualityPolicy = recallQualityPolicyRegistry.resolve(config.recallQuality.policy);
 		this.providers = providerAdapterRegistry.create({
-			memoryBodies: this.memoryBodies,
+			memorySpaces: this.memorySpaces,
+			memoryBodies: this.memorySpaces,
 			config: this.config,
 			nativeRunner: this.runner
 		});
@@ -1418,20 +1422,20 @@ var MemorySpacesService = class {
 		this.providers.clear();
 		if (failures.length > 0) throw new AggregateError(failures, "Memory Space Provider disposal failed");
 	}
-	async bodies(signal) {
-		if (signal !== void 0) return this.collectBodies(signal);
-		if (this.bodiesInFlight !== void 0) return this.bodiesInFlight;
-		const pending = this.collectBodies();
-		this.bodiesInFlight = pending;
+	async spaces(signal) {
+		if (signal !== void 0) return this.collectSpaces(signal);
+		if (this.spacesInFlight !== void 0) return this.spacesInFlight;
+		const pending = this.collectSpaces();
+		this.spacesInFlight = pending;
 		try {
 			return await pending;
 		} finally {
-			if (this.bodiesInFlight === pending) this.bodiesInFlight = void 0;
+			if (this.spacesInFlight === pending) this.spacesInFlight = void 0;
 		}
 	}
 	/** Coalesce simultaneous Status/Memory-page probes without caching mutations. */
-	async collectBodies(signal) {
-		const directory = this.bodyDirectory();
+	async collectSpaces(signal) {
+		const directory = this.spaceDirectory();
 		const items = await Promise.all(directory.items.map(async (body) => {
 			let status;
 			if (!(body.providerEnabled !== false)) status = {
@@ -1460,12 +1464,12 @@ var MemorySpacesService = class {
 		};
 	}
 	/** Return the control-plane directory without waiting for provider I/O. */
-	bodyDirectory() {
+	spaceDirectory() {
 		const mnemonDefaultStore = this.runner.persistedStore();
-		const all = this.memoryBodies.list();
-		const enabled = new Set(this.memoryBodies.providerServices().items.filter((service) => service.enabled).map((service) => service.providerId));
+		const all = this.memorySpaces.list();
+		const enabled = new Set(this.memorySpaces.providerServices().items.filter((service) => service.enabled).map((service) => service.providerId));
 		const items = all.map((body) => {
-			const nativeProvider = this.isNativeBody(body);
+			const nativeProvider = this.isNativeSpace(body);
 			const providerEnabled = nativeProvider || enabled.has(body.provider.id);
 			return {
 				...body,
@@ -1489,7 +1493,7 @@ var MemorySpacesService = class {
 			},
 			total: items.length,
 			activeCount: items.filter((body) => body.active && body.providerEnabled !== false).length,
-			directory: this.memoryBodies.directory,
+			directory: this.memorySpaces.directory,
 			generatedAt: (/* @__PURE__ */ new Date()).toISOString()
 		};
 	}
@@ -1499,11 +1503,11 @@ var MemorySpacesService = class {
 	}
 	/** One local metadata observation supplies membership and its revision. */
 	memoryState() {
-		const all = this.memoryBodies.list();
-		const serviceItems = this.memoryBodies.providerServices().items;
+		const all = this.memorySpaces.list();
+		const serviceItems = this.memorySpaces.providerServices().items;
 		const enabled = new Set(serviceItems.filter((service) => service.enabled).map((service) => service.providerId));
-		const active = all.filter((body) => body.active && (this.isNativeBody(body) || enabled.has(body.provider.id))).sort((left, right) => left.id.localeCompare(right.id));
-		const bodies = [...all].sort((left, right) => left.id.localeCompare(right.id)).map((body) => ({
+		const active = all.filter((body) => body.active && (this.isNativeSpace(body) || enabled.has(body.provider.id))).sort((left, right) => left.id.localeCompare(right.id));
+		const spaces = [...all].sort((left, right) => left.id.localeCompare(right.id)).map((body) => ({
 			id: body.id,
 			name: body.name,
 			description: body.description,
@@ -1521,19 +1525,19 @@ var MemorySpacesService = class {
 			all,
 			active,
 			revision: createHash("sha256").update(JSON.stringify({
-				bodies,
+				bodies: spaces,
 				services
 			})).digest("hex")
 		};
 	}
 	/** Return a usable system snapshot without waiting for any Provider I/O. */
 	statusSummary() {
-		const catalog = this.bodyDirectory();
+		const catalog = this.spaceDirectory();
 		const dshActiveStores = catalog.items.filter((body) => body.active && body.providerEnabled !== false).map((body) => body.id);
-		const providerServices = this.memoryBodies.providerServices().items.map((service) => {
+		const providerServices = this.memorySpaces.providerServices().items.map((service) => {
 			const descriptor = this.providerCatalog.descriptor(service.providerId);
-			const bodies = catalog.items.filter((body) => body.provider.id === service.providerId);
-			const activeBodies = bodies.filter((body) => body.active && body.providerEnabled !== false);
+			const spaces = catalog.items.filter((body) => body.provider.id === service.providerId);
+			const activeSpaces = spaces.filter((body) => body.active && body.providerEnabled !== false);
 			return {
 				providerId: service.providerId,
 				label: descriptor.label,
@@ -1541,8 +1545,8 @@ var MemorySpacesService = class {
 				enabled: service.enabled,
 				configured: service.configured,
 				status: !service.enabled ? "disabled" : "idle",
-				memoryBodyCount: bodies.length,
-				activeMemoryBodyCount: activeBodies.length
+				memoryBodyCount: spaces.length,
+				activeMemoryBodyCount: activeSpaces.length
 			};
 		});
 		return {
@@ -1582,9 +1586,9 @@ var MemorySpacesService = class {
 		};
 	}
 	async status(signal) {
-		const hasNativeBody = this.memoryBodies.list().some((body) => this.isNativeBody(body));
+		const hasNativeSpace = this.memorySpaces.list().some((body) => this.isNativeSpace(body));
 		let versionError;
-		const [catalog, rawVersion] = await Promise.all([this.bodies(signal), hasNativeBody ? this.runner.runText(["--version"], signal === void 0 ? { globalFlags: false } : {
+		const [catalog, rawVersion] = await Promise.all([this.spaces(signal), hasNativeSpace ? this.runner.runText(["--version"], signal === void 0 ? { globalFlags: false } : {
 			signal,
 			globalFlags: false
 		}).catch((error) => {
@@ -1592,12 +1596,12 @@ var MemorySpacesService = class {
 		}) : Promise.resolve(void 0)]);
 		const active = catalog.items.filter((body) => body.active && body.providerEnabled !== false);
 		const dshActiveStores = active.map((body) => body.id);
-		const providerServices = this.memoryBodies.providerServices().items.map((service) => {
+		const providerServices = this.memorySpaces.providerServices().items.map((service) => {
 			const descriptor = this.providerCatalog.descriptor(service.providerId);
-			const bodies = catalog.items.filter((body) => body.provider.id === service.providerId);
-			const activeBodies = bodies.filter((body) => body.active && body.providerEnabled !== false);
-			const failed = activeBodies.filter((body) => !body.healthy);
-			const status = !service.enabled ? "disabled" : activeBodies.length === 0 ? "idle" : failed.length === 0 ? "healthy" : "unhealthy";
+			const spaces = catalog.items.filter((body) => body.provider.id === service.providerId);
+			const activeSpaces = spaces.filter((body) => body.active && body.providerEnabled !== false);
+			const failed = activeSpaces.filter((body) => !body.healthy);
+			const status = !service.enabled ? "disabled" : activeSpaces.length === 0 ? "idle" : failed.length === 0 ? "healthy" : "unhealthy";
 			return {
 				providerId: service.providerId,
 				label: descriptor.label,
@@ -1605,8 +1609,8 @@ var MemorySpacesService = class {
 				enabled: service.enabled,
 				configured: service.configured,
 				status,
-				memoryBodyCount: bodies.length,
-				activeMemoryBodyCount: activeBodies.length,
+				memoryBodyCount: spaces.length,
+				activeMemoryBodyCount: activeSpaces.length,
 				...failed.length === 0 ? {} : { error: failed.map((body) => `${body.name}: ${body.error ?? "unavailable"}`).join("; ") }
 			};
 		});
@@ -1627,19 +1631,19 @@ var MemorySpacesService = class {
 		};
 		try {
 			if (versionError !== void 0) throw versionError;
-			const healthyBodies = active.filter((body) => body.healthy && body.stats !== void 0);
+			const healthySpaces = active.filter((body) => body.healthy && body.stats !== void 0);
 			const topEntities = /* @__PURE__ */ new Map();
 			const byCategory = {};
-			for (const body of healthyBodies) {
+			for (const body of healthySpaces) {
 				for (const [category, count] of Object.entries(body.stats.byCategory)) byCategory[category] = (byCategory[category] ?? 0) + count;
 				for (const entity of body.stats.topEntities) topEntities.set(entity.entity, (topEntities.get(entity.entity) ?? 0) + entity.count);
 			}
 			const stats = {
-				totalInsights: healthyBodies.reduce((total, body) => total + body.stats.totalInsights, 0),
-				deletedInsights: healthyBodies.reduce((total, body) => total + body.stats.deletedInsights, 0),
-				edgeCount: healthyBodies.reduce((total, body) => total + body.stats.edgeCount, 0),
-				oplogCount: healthyBodies.reduce((total, body) => total + body.stats.oplogCount, 0),
-				dbSizeBytes: healthyBodies.reduce((total, body) => total + body.stats.dbSizeBytes, 0),
+				totalInsights: healthySpaces.reduce((total, body) => total + body.stats.totalInsights, 0),
+				deletedInsights: healthySpaces.reduce((total, body) => total + body.stats.deletedInsights, 0),
+				edgeCount: healthySpaces.reduce((total, body) => total + body.stats.edgeCount, 0),
+				oplogCount: healthySpaces.reduce((total, body) => total + body.stats.oplogCount, 0),
+				dbSizeBytes: healthySpaces.reduce((total, body) => total + body.stats.dbSizeBytes, 0),
 				byCategory,
 				topEntities: [...topEntities].map(([entity, count]) => ({
 					entity,
@@ -1663,11 +1667,11 @@ var MemorySpacesService = class {
 			};
 		}
 	}
-	async reconnectBody(id, signal) {
-		const body = this.memoryBodies.list().find((candidate) => candidate.id === id);
-		if (body === void 0) throw new Error(`unknown memory body: ${id}`);
-		if (!this.isNativeBody(body)) {
-			if (!this.memoryBodies.providerServiceEnabled(body.provider.id)) throw new Error(`${body.provider.label} is disabled in Settings`);
+	async reconnectSpace(id, signal) {
+		const body = this.memorySpaces.list().find((candidate) => candidate.id === id);
+		if (body === void 0) throw new Error(`unknown memory space: ${id}`);
+		if (!this.isNativeSpace(body)) {
+			if (!this.memorySpaces.providerServiceEnabled(body.provider.id)) throw new Error(`${body.provider.label} is disabled in Settings`);
 		}
 		const provider = this.providerFor(body);
 		provider.invalidateStatus?.(body.id);
@@ -1675,7 +1679,7 @@ var MemorySpacesService = class {
 		return {
 			...body,
 			providerEnabled: true,
-			mnemonDefault: this.isNativeBody(body) && body.id === this.runner.persistedStore(),
+			mnemonDefault: this.isNativeSpace(body) && body.id === this.runner.persistedStore(),
 			...status
 		};
 	}
@@ -1695,7 +1699,7 @@ var MemorySpacesService = class {
 		const category = allowed(request.category, CATEGORIES$1, "category");
 		const source = allowed(request.source, SOURCES$1, "source");
 		const intent = allowed(request.intent, INTENTS$1, "intent");
-		const bodies = this.readBodies(request.memoryBodyIds);
+		const spaces = this.readSpaces(request.memoryBodyIds);
 		const normalizedRequest = {
 			query,
 			mode,
@@ -1704,7 +1708,7 @@ var MemorySpacesService = class {
 			...source === void 0 ? {} : { source },
 			...intent === void 0 ? {} : { intent }
 		};
-		let batches = await Promise.all(bodies.map(async (body) => {
+		let batches = await Promise.all(spaces.map(async (body) => {
 			if (!body.provider.capabilities.search) return {
 				body,
 				result: {
@@ -1748,7 +1752,7 @@ var MemorySpacesService = class {
 				})));
 				if (result.hint !== void 0) hints.push(`${body.name}: ${result.hint}`);
 			}
-			const heterogeneous = new Set(bodies.map((body) => body.provider.id)).size > 1;
+			const heterogeneous = new Set(spaces.map((body) => body.provider.id)).size > 1;
 			if (heterogeneous) for (const candidate of candidates) candidate.insight.federatedScore = 1 / (60 + candidate.providerRank);
 			candidates.sort((left, right) => heterogeneous ? (right.insight.federatedScore ?? 0) - (left.insight.federatedScore ?? 0) || left.bodyOrder - right.bodyOrder : (right.insight.score ?? 0) - (left.insight.score ?? 0));
 			return {
@@ -1760,7 +1764,7 @@ var MemorySpacesService = class {
 		const hasRecoveryEvidence = recoveryPlan !== void 0 && evaluation.quality.selected.some((candidate) => recoveryMatchCount(candidate.candidate.insight.content, recoveryPlan) >= recoveryPlan.requiredMatches);
 		if (recoveryPlan !== void 0 && !hasRecoveryEvidence) {
 			batches = await Promise.all(batches.map(async (batch) => {
-				if (!this.isNativeBody(batch.body) || batch.source.status === "unsupported" || batch.source.status === "unavailable") return batch;
+				if (!this.isNativeSpace(batch.body) || batch.source.status === "unsupported" || batch.source.status === "unavailable") return batch;
 				try {
 					const recovered = await this.providerFor(batch.body).search(batch.body, {
 						query: recoveryPlan.query,
@@ -1830,12 +1834,12 @@ var MemorySpacesService = class {
 	* expansion, and large browse projections before an LLM metadata pass.
 	*/
 	async metadataSample(memoryBodyId, signal) {
-		const body = this.readBodies([memoryBodyId])[0];
+		const body = this.readSpaces([memoryBodyId])[0];
 		const provider = this.providerFor(body);
 		const limit = 6;
 		let method;
 		let items;
-		if (this.isNativeBody(body)) {
+		if (this.isNativeSpace(body)) {
 			method = "native-basic";
 			items = provider.metadataSample === void 0 ? await provider.list(body, { limit }, signal) : await provider.metadataSample(body, limit, signal);
 		} else if (METADATA_SEARCH_FIRST_PROVIDERS.has(body.provider.typeId ?? body.provider.id) || !body.provider.capabilities.browse) {
@@ -1865,11 +1869,11 @@ var MemorySpacesService = class {
 		};
 	}
 	async graph(signal, memoryBodyIds) {
-		const bodies = this.readBodies(memoryBodyIds);
+		const spaces = this.readSpaces(memoryBodyIds);
 		const nodes = [];
 		const edges = [];
 		const sources = [];
-		const snapshots = await Promise.all(bodies.map(async (body) => {
+		const snapshots = await Promise.all(spaces.map(async (body) => {
 			const mode = body.provider.capabilities.graph ? "graph" : body.provider.capabilities.browse ? "projection" : body.provider.capabilities.search ? "query-only" : "unsupported";
 			if (mode === "query-only") return {
 				body,
@@ -1922,7 +1926,7 @@ var MemorySpacesService = class {
 			nodes,
 			edges,
 			generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
-			memoryBodies: bodies.map(({ id, name, active }) => ({
+			memoryBodies: spaces.map(({ id, name, active }) => ({
 				id,
 				name,
 				active
@@ -1936,8 +1940,8 @@ var MemorySpacesService = class {
 		if (rawQuery.length > 500) throw new Error("query is too long (max 500 characters)");
 		const category = allowed(request.category, CATEGORIES$1, "category");
 		const limit = boundedInteger(request.limit, 200, 1, 1e3);
-		const bodies = this.readBodies(request.memoryBodyIds);
-		const batches = await Promise.all(bodies.map(async (body) => {
+		const spaces = this.readSpaces(request.memoryBodyIds);
+		const batches = await Promise.all(spaces.map(async (body) => {
 			const mode = body.provider.capabilities.browse ? "enumerable" : body.provider.capabilities.search ? "query-only" : "unsupported";
 			if (mode === "query-only" && rawQuery === "") return {
 				body,
@@ -1983,7 +1987,7 @@ var MemorySpacesService = class {
 		};
 	}
 	async entities(entity, limit, signal) {
-		const active = (await this.bodies(signal)).items.filter((body) => body.active);
+		const active = (await this.spaces(signal)).items.filter((body) => body.active);
 		const capable = active.filter((body) => body.provider.capabilities.entities);
 		const entityCounts = /* @__PURE__ */ new Map();
 		for (const body of capable) for (const item of body.stats?.topEntities ?? []) entityCounts.set(item.entity, (entityCounts.get(item.entity) ?? 0) + item.count);
@@ -2043,7 +2047,7 @@ var MemorySpacesService = class {
 			const provider = this.providerFor(body);
 			let providerChanged = false;
 			const batchWriter = provider.rememberMany;
-			const batch = batchWriter === void 0 ? [] : group.filter((entry) => !this.isNativeBody(body) || entry.request.content.length <= 8e3);
+			const batch = batchWriter === void 0 ? [] : group.filter((entry) => !this.isNativeSpace(body) || entry.request.content.length <= 8e3);
 			if (batchWriter !== void 0 && batch.length > 0) {
 				const written = await batchWriter.call(provider, body, batch.map((entry) => entry.request), signal);
 				if (written.length !== batch.length) throw new Error(`batch remember did not return one receipt per request for Memory Space ${body.id}`);
@@ -2064,7 +2068,7 @@ var MemorySpacesService = class {
 		return results;
 	}
 	async related(id, depth = 2, edge, signal, memoryBodyId) {
-		const body = this.readBody(memoryBodyId);
+		const body = this.readSpace(memoryBodyId);
 		const selectedEdge = allowed(edge, EDGE_TYPES, "edge");
 		const provider = this.providerFor(body);
 		if (provider.related === void 0 || !body.provider.capabilities.related) throw new Error(`${body.provider.label} does not support related-memory traversal`);
@@ -2072,7 +2076,7 @@ var MemorySpacesService = class {
 	}
 	async link(sourceId, targetId, type = "semantic", weight = .5, reason, signal, memoryBodyId) {
 		this.assertWritable();
-		const body = this.writeBody(memoryBodyId);
+		const body = this.writeSpace(memoryBodyId);
 		if (!Number.isFinite(weight) || weight < 0 || weight > 1) throw new Error("weight must be within 0..1");
 		const selectedType = allowed(type, EDGE_TYPES, "type") ?? "semantic";
 		const provider = this.providerFor(body);
@@ -2083,35 +2087,35 @@ var MemorySpacesService = class {
 	}
 	async forget(id, signal, memoryBodyId) {
 		this.assertWritable();
-		const body = this.writeBody(memoryBodyId);
+		const body = this.writeSpace(memoryBodyId);
 		const provider = this.providerFor(body);
 		if (provider.forget === void 0 || !body.provider.capabilities.forget) throw new Error(`${body.provider.label} does not expose safe forget semantics in this integration`);
 		const result = await provider.forget(body, required(id, "id", 2e3), signal);
 		this.activateAfterWrite(body, mutationResultCommitted(result));
 		return this.annotateResult(result, body);
 	}
-	prepareBodyPlacement(request) {
+	prepareSpacePlacement(request) {
 		if (request.placement === void 0) throw new Error("automatic provider placement request is required");
 		if (request.providerId !== void 0) throw new Error("automatic provider placement cannot include a fixed providerId");
-		return prepareMemoryPlacement(request.placement, this.memoryBodies.placementCandidates(request));
+		return prepareMemoryPlacement(request.placement, this.memorySpaces.placementCandidates(request));
 	}
-	async createBody(request, signal, placement) {
+	async createSpace(request, signal, placement) {
 		this.assertWritable();
-		return await this.memoryBodies.create(request, signal, placement);
+		return await this.memorySpaces.create(request, signal, placement);
 	}
 	/**
 	* Create a Memory Space from the configured distillation policy. The model
 	* may choose only among candidates already filtered by the host; manual mode
 	* ignores model preference and always uses the configured fixed provider.
 	*/
-	async createBodyForPersistence(body, selection, signal, delegation = {
+	async createSpaceForPersistence(body, selection, signal, delegation = {
 		runId: "memory-write",
 		provider: "task-agent"
 	}) {
 		const strategy = this.config.persistenceStrategy;
 		if (strategy.mode === "manual") {
 			const connection = strategy.providerConnections[strategy.providerId];
-			return this.createBody({
+			return this.createSpace({
 				...body,
 				providerId: strategy.providerId,
 				...this.isNativeProvider(strategy.providerId) || connection === void 0 ? {} : { connection }
@@ -2126,45 +2130,45 @@ var MemorySpacesService = class {
 			},
 			...Object.keys(strategy.providerConnections).length === 0 ? {} : { providerConnections: strategy.providerConnections }
 		};
-		const prepared = this.prepareBodyPlacement(request);
+		const prepared = this.prepareSpacePlacement(request);
 		const decision = rulesOnlyPlacement(prepared) ?? finalizeLlmPlacement(prepared, selection ?? {
 			providerId: "",
 			reason: "",
 			confidence: ""
 		}, delegation);
-		return this.createBody(request, signal, decision);
+		return this.createSpace(request, signal, decision);
 	}
 	async updateProviderService(providerId, settings, clearSecrets = [], enabled = true, signal) {
 		this.assertWritable();
 		if (this.isNativeProvider(providerId)) throw new Error("Mnemon Native service settings are managed by the native configuration");
-		if (!enabled) return this.memoryBodies.updateProviderService(providerId, settings, clearSecrets, false);
-		const connection = this.memoryBodies.resolveProviderService(providerId, settings, clearSecrets);
+		if (!enabled) return this.memorySpaces.updateProviderService(providerId, settings, clearSecrets, false);
+		const connection = this.memorySpaces.resolveProviderService(providerId, settings, clearSecrets);
 		const provider = this.providers.get(providerId);
 		if (provider?.discover === void 0) throw new Error(`${this.providerCatalog.descriptor(providerId).label} does not support Memory Space discovery`);
 		const discovered = await provider.discover(connection, signal);
-		return this.memoryBodies.syncProviderService(providerId, connection, discovered);
+		return this.memorySpaces.syncProviderService(providerId, connection, discovered);
 	}
-	updateBody(id, request) {
+	updateSpace(id, request) {
 		this.assertWritable();
-		return this.memoryBodies.update(id, request);
+		return this.memorySpaces.update(id, request);
 	}
-	updateBodyMetadata(updates) {
+	updateSpaceMetadata(updates) {
 		this.assertWritable();
-		return this.memoryBodies.updateMetadata(updates);
+		return this.memorySpaces.updateMetadata(updates);
 	}
-	async deleteBody(id, signal) {
+	async deleteSpace(id, signal) {
 		this.assertWritable();
-		return await this.memoryBodies.remove(id, signal);
+		return await this.memorySpaces.remove(id, signal);
 	}
-	async mergeBodies(targetBodyId, sourceBodyIds, deactivateSources = true, signal) {
+	async mergeSpaces(targetSpaceId, sourceSpaceIds, deactivateSources = true, signal) {
 		this.assertWritable();
-		const target = this.memoryBodies.get(targetBodyId);
-		if (!this.isNativeBody(target)) throw new Error("memory-body merge currently requires a Mnemon Native target");
-		const sourceIds = [...new Set(sourceBodyIds.map((id) => id.trim()).filter((id) => id !== ""))];
-		if (sourceIds.length === 0) throw new Error("sourceMemoryBodyIds requires at least one memory body");
-		if (sourceIds.includes(target.id)) throw new Error("target memory body cannot also be a merge source");
-		const sources = sourceIds.map((id) => this.memoryBodies.get(id));
-		if (sources.some((source) => !this.isNativeBody(source))) throw new Error("memory-body merge currently supports Mnemon Native sources only");
+		const target = this.memorySpaces.get(targetSpaceId);
+		if (!this.isNativeSpace(target)) throw new Error("memory-space merge currently requires a Mnemon Native target");
+		const sourceIds = [...new Set(sourceSpaceIds.map((id) => id.trim()).filter((id) => id !== ""))];
+		if (sourceIds.length === 0) throw new Error("sourceMemoryBodyIds requires at least one memory space");
+		if (sourceIds.includes(target.id)) throw new Error("target memory space cannot also be a merge source");
+		const sources = sourceIds.map((id) => this.memorySpaces.get(id));
+		if (sources.some((source) => !this.isNativeSpace(source))) throw new Error("memory-space merge currently supports Mnemon Native sources only");
 		const insights = [];
 		const edges = [];
 		for (const source of sources) {
@@ -2197,7 +2201,7 @@ var MemorySpacesService = class {
 		if (insights.length === 0) {
 			if (deactivateSources) for (const source of sources) {
 				if (!source.active) continue;
-				this.memoryBodies.setActive(source.id, false);
+				this.memorySpaces.setActive(source.id, false);
 			}
 			return {
 				action: "merged",
@@ -2234,7 +2238,7 @@ var MemorySpacesService = class {
 			this.activateAfterWrite(target, complete);
 			if (deactivateSources && complete) for (const source of sources) {
 				if (!source.active) continue;
-				this.memoryBodies.setActive(source.id, false);
+				this.memorySpaces.setActive(source.id, false);
 			}
 			const completion = mutationResultCompletion(result);
 			return this.annotateResult({
@@ -2253,39 +2257,39 @@ var MemorySpacesService = class {
 		if (provider === void 0) throw new Error(`unsupported memory provider: ${body.provider.id}`);
 		return provider;
 	}
-	readBodies(ids) {
-		const active = this.memoryBodies.active();
+	readSpaces(ids) {
+		const active = this.memorySpaces.active();
 		if (ids === void 0 || ids.length === 0) return active;
 		return [...new Set(ids.map((id) => id.trim()).filter((id) => id !== ""))].map((id) => {
-			const body = this.memoryBodies.get(id);
-			if (!body.active) throw new Error(`memory body is not active for reading: ${id}`);
-			if (!this.isNativeBody(body) && !this.memoryBodies.providerServiceEnabled(body.provider.id)) throw new Error(`${body.provider.label} is disabled in Settings`);
+			const body = this.memorySpaces.get(id);
+			if (!body.active) throw new Error(`memory space is not active for reading: ${id}`);
+			if (!this.isNativeSpace(body) && !this.memorySpaces.providerServiceEnabled(body.provider.id)) throw new Error(`${body.provider.label} is disabled in Settings`);
 			return body;
 		});
 	}
-	readBody(id) {
+	readSpace(id) {
 		if (id !== void 0 && id.trim() !== "") {
-			const body = this.memoryBodies.get(id);
-			if (!body.active) throw new Error(`memory body is not active for reading: ${body.id}`);
-			if (!this.isNativeBody(body) && !this.memoryBodies.providerServiceEnabled(body.provider.id)) throw new Error(`${body.provider.label} is disabled in Settings`);
+			const body = this.memorySpaces.get(id);
+			if (!body.active) throw new Error(`memory space is not active for reading: ${body.id}`);
+			if (!this.isNativeSpace(body) && !this.memorySpaces.providerServiceEnabled(body.provider.id)) throw new Error(`${body.provider.label} is disabled in Settings`);
 			return body;
 		}
-		const active = this.memoryBodies.active();
-		if (active.length !== 1) throw new Error("memoryBodyId is required when the number of active memory bodies is not exactly one");
+		const active = this.memorySpaces.active();
+		if (active.length !== 1) throw new Error("memoryBodyId is required when the number of active memory spaces is not exactly one");
 		return active[0];
 	}
-	writeBody(id) {
+	writeSpace(id) {
 		if (id !== void 0 && id.trim() !== "") {
-			const body = this.memoryBodies.get(id);
-			if (!this.isNativeBody(body) && !this.memoryBodies.providerServiceEnabled(body.provider.id)) throw new Error(`${body.provider.label} is disabled in Settings`);
+			const body = this.memorySpaces.get(id);
+			if (!this.isNativeSpace(body) && !this.memorySpaces.providerServiceEnabled(body.provider.id)) throw new Error(`${body.provider.label} is disabled in Settings`);
 			return body;
 		}
-		const active = this.memoryBodies.active();
-		if (active.length !== 1) throw new Error("memoryBodyId is required when the number of active memory bodies is not exactly one");
+		const active = this.memorySpaces.active();
+		if (active.length !== 1) throw new Error("memoryBodyId is required when the number of active memory spaces is not exactly one");
 		return active[0];
 	}
 	prepareRemember(request) {
-		const body = this.writeBody(request.memoryBodyId);
+		const body = this.writeSpace(request.memoryBodyId);
 		const content = required(request.content, "content", 8192);
 		const importance = boundedInteger(request.importance, 3, 1, 5);
 		const category = allowed(request.category, CATEGORIES$1, "category") ?? "general";
@@ -2327,12 +2331,52 @@ var MemorySpacesService = class {
 	}
 	activateAfterWrite(body, providerChanged) {
 		if (!providerChanged) return;
-		if (!body.active) this.memoryBodies.setActive(body.id, true);
-		else this.memoryBodies.touch(body.id);
+		if (!body.active) this.memorySpaces.setActive(body.id, true);
+		else this.memorySpaces.touch(body.id);
 	}
 	assertWritable() {
 		if (!this.config.writeEnabled) throw new Error("dsh-mnemon is configured read-only (writeEnabled: false)");
 	}
+	/** @deprecated Use spaces. */
+	bodies(...args) {
+		return this.spaces(...args);
+	}
+	/** @deprecated Use spaceDirectory. */
+	bodyDirectory(...args) {
+		return this.spaceDirectory(...args);
+	}
+	/** @deprecated Use reconnectSpace. */
+	reconnectBody(...args) {
+		return this.reconnectSpace(...args);
+	}
+	/** @deprecated Use prepareSpacePlacement. */
+	prepareBodyPlacement(...args) {
+		return this.prepareSpacePlacement(...args);
+	}
+	/** @deprecated Use createSpace. */
+	createBody(...args) {
+		return this.createSpace(...args);
+	}
+	/** @deprecated Use createSpaceForPersistence. */
+	createBodyForPersistence(...args) {
+		return this.createSpaceForPersistence(...args);
+	}
+	/** @deprecated Use updateSpace. */
+	updateBody(...args) {
+		return this.updateSpace(...args);
+	}
+	/** @deprecated Use updateSpaceMetadata. */
+	updateBodyMetadata(...args) {
+		return this.updateSpaceMetadata(...args);
+	}
+	/** @deprecated Use deleteSpace. */
+	deleteBody(...args) {
+		return this.deleteSpace(...args);
+	}
+	/** @deprecated Use mergeSpaces. */
+	mergeBodies(...args) {
+		return this.mergeSpaces(...args);
+	}
 };
 //#endregion
 //#region src/runner.ts
@@ -2401,7 +2445,10 @@ function createRunner(config, processRunner = runProcess, workspaceRoot) {
 		try {
 			const command = currentCommand();
 			const launcher = mnemonNpmLauncher(command);
-			result = await processRunner(launcher === void 0 ? command : process.execPath, launcher === void 0 ? argv : [launcher, ...argv], processOptions);
+			result = await processRunner(launcher === void 0 ? command : process.execPath, launcher === void 0 ? argv : [launcher, ...argv], launcher === void 0 ? processOptions : {
+				...processOptions,
+				env: nodeLauncherEnvironment(processOptions.env)
+			});
 		} catch (error) {
 			throw new MnemonCliError(`${error instanceof Error ? error.message : String(error)}. ${process.platform === "win32" ? "Install the official Mnemon Windows release, ensure mnemon.exe is on PATH or under %LOCALAPPDATA%\\Programs\\mnemon, or set MNEMON_CLI_PATH or mnemon.cliPath to its absolute path." : "Install Mnemon and ensure \"mnemon\" is on PATH, or set MNEMON_CLI_PATH or mnemon.cliPath."}`);
 		}
@@ -2640,7 +2687,7 @@ function providerConnections(value) {
 	const input = memoryInputRecord(value, "providerConnections");
 	return Object.fromEntries(Object.entries(input).map(([providerId, connection]) => [memoryInputText(providerId, "providerId", 128), scalarRecord(connection, `providerConnections.${providerId}`)]));
 }
-function createBodyRequest(value) {
+function createSpaceRequest(value) {
 	const input = memoryInputRecord(value, "Memory Space body-create request");
 	const providerId = memoryInputText(input.providerId, "providerId", 128, false);
 	const connection = scalarRecord(input.connection, "connection");
@@ -2669,7 +2716,7 @@ function createBodyRequest(value) {
 		...placement === void 0 ? {} : { placement }
 	};
 }
-function updateBodyRequest(value) {
+function updateSpaceRequest(value) {
 	const input = memoryInputRecord(value, "Memory Space body-update request");
 	const connection = scalarRecord(input.connection, "connection");
 	return {
@@ -2711,9 +2758,9 @@ async function manageMemorySpaces(service, request) {
 		case "embedding-status": return managementResult(service, await service.embeddingStatus(request.signal));
 		case "status-summary": return managementResult(service, service.statusSummary());
 		case "status": return managementResult(service, await service.status(request.signal));
-		case "body-directory": return managementResult(service, service.bodyDirectory());
-		case "bodies": return managementResult(service, await service.bodies(request.signal));
-		case "provider-services": return managementResult(service, service.memoryBodies.providerServices());
+		case "body-directory": return managementResult(service, service.spaceDirectory());
+		case "bodies": return managementResult(service, await service.spaces(request.signal));
+		case "provider-services": return managementResult(service, service.memorySpaces.providerServices());
 		case "graph": return managementResult(service, await service.graph(request.signal, memoryInputStringArray(input.memoryBodyIds, "memoryBodyIds", 1e4)));
 		case "list": return managementResult(service, await service.list({
 			...memoryInputText(input.query, "query", 2e3, false) === void 0 ? {} : { query: memoryInputText(input.query, "query", 2e3, false) },
@@ -2732,8 +2779,8 @@ async function manageMemorySpaces(service, request) {
 			...memoryInputStringArray(input.memoryBodyIds, "memoryBodyIds", 1e4) === void 0 ? {} : { memoryBodyIds: memoryInputStringArray(input.memoryBodyIds, "memoryBodyIds", 1e4) }
 		}, request.signal));
 		case "related": return managementResult(service, await service.related(memoryInputText(input.id, "id", 2e3), memoryInputInteger(input.depth, 2, 1, 5), memoryInputText(input.edge, "edge", 30, false), request.signal, memoryInputText(input.memoryBodyId, "memoryBodyId", 300, false)));
-		case "body-reconnect": return managementResult(service, await service.reconnectBody(memoryInputText(input.memoryBodyId, "memoryBodyId", 300), request.signal));
-		case "prepare-body-placement": return managementResult(service, service.prepareBodyPlacement(createBodyRequest(request.input)));
+		case "body-reconnect": return managementResult(service, await service.reconnectSpace(memoryInputText(input.memoryBodyId, "memoryBodyId", 300), request.signal));
+		case "prepare-body-placement": return managementResult(service, service.prepareSpacePlacement(createSpaceRequest(request.input)));
 		case "finalize-placement": {
 			const prepared = memoryInputRecord(input.prepared, "prepared placement");
 			if (!Array.isArray(prepared.candidates) || prepared.candidates.length === 0) throw new Error("placement candidates are required");
@@ -2755,7 +2802,7 @@ async function manageMemorySpaces(service, request) {
 		case "provider-service-update": {
 			const providerId = memoryInputText(input.providerId, "providerId", 128);
 			await service.updateProviderService(providerId, scalarRecord(input.settings, "settings") ?? {}, memoryInputStringArray(input.clearSecrets, "clearSecrets", 100) ?? [], input.enabled === void 0 ? true : input.enabled === true, request.signal);
-			return managementResult(service, service.memoryBodies.providerServices().items.find((item) => item.providerId === providerId));
+			return managementResult(service, service.memorySpaces.providerServices().items.find((item) => item.providerId === providerId));
 		}
 		case "remember": return managementResult(service, await service.remember({
 			content: memoryInputText(input.content, "content", 1e5),
@@ -2770,18 +2817,18 @@ async function manageMemorySpaces(service, request) {
 		case "forget": return managementResult(service, await service.forget(memoryInputText(input.id, "id", 2e3), request.signal, memoryInputText(input.memoryBodyId, "memoryBodyId", 300, false)));
 		case "body-create": {
 			const bodyInput = input.request ?? request.input;
-			return managementResult(service, await service.createBody(createBodyRequest(bodyInput), request.signal, placementDecision(input.placementDecision)));
+			return managementResult(service, await service.createSpace(createSpaceRequest(bodyInput), request.signal, placementDecision(input.placementDecision)));
 		}
 		case "body-update": {
-			const parsed = updateBodyRequest(request.input);
-			return managementResult(service, service.updateBody(parsed.memoryBodyId, parsed.request));
+			const parsed = updateSpaceRequest(request.input);
+			return managementResult(service, service.updateSpace(parsed.memoryBodyId, parsed.request));
 		}
 		case "remember-many":
 			if (!Array.isArray(input.requests) || input.requests.length > 1e3) throw new Error("remember-many requires at most 1000 requests");
 			return managementResult(service, await service.rememberMany(input.requests.map((value) => memoryInputRecord(value, "remember request")), request.signal));
 		case "body-create-for-persistence": {
 			const selection = input.selection === void 0 ? void 0 : memoryInputRecord(input.selection, "placement selection");
-			return managementResult(service, await service.createBodyForPersistence(createBodyRequest(input.request ?? request.input), selection === void 0 ? void 0 : {
+			return managementResult(service, await service.createSpaceForPersistence(createSpaceRequest(input.request ?? request.input), selection === void 0 ? void 0 : {
 				providerId: memoryInputText(selection.providerId, "providerId", 128),
 				reason: memoryInputText(selection.reason, "reason", 4e3),
 				confidence: memoryInputText(selection.confidence, "confidence", 40)
@@ -2797,13 +2844,13 @@ async function manageMemorySpaces(service, request) {
 					description: memoryInputText(update.description, "description", 200)
 				};
 			});
-			return managementResult(service, service.updateBodyMetadata(updates));
+			return managementResult(service, service.updateSpaceMetadata(updates));
 		}
-		case "body-merge": return managementResult(service, await service.mergeBodies(memoryInputText(input.targetMemoryBodyId, "targetMemoryBodyId", 300), memoryInputStringArray(input.sourceMemoryBodyIds, "sourceMemoryBodyIds", 1e3) ?? [], input.deactivateSources !== false, request.signal));
+		case "body-merge": return managementResult(service, await service.mergeSpaces(memoryInputText(input.targetMemoryBodyId, "targetMemoryBodyId", 300), memoryInputStringArray(input.sourceMemoryBodyIds, "sourceMemoryBodyIds", 1e3) ?? [], input.deactivateSources !== false, request.signal));
 		case "reload":
-			service.memoryBodies.reload();
+			service.memorySpaces.reload();
 			return managementResult(service, { reloaded: true });
-		case "body-delete": return managementResult(service, await service.deleteBody(memoryInputText(input.memoryBodyId, "memoryBodyId", 300), request.signal));
+		case "body-delete": return managementResult(service, await service.deleteSpace(memoryInputText(input.memoryBodyId, "memoryBodyId", 300), request.signal));
 		default: throw new Error(`unsupported Memory Spaces management mutation operation: ${request.operation}`);
 	}
 }
@@ -3135,9 +3182,9 @@ function createMemorySpacesSource(providerSnapshot, config = {}) {
 						const known = memoryInputStringArray(memoryInputRecord(request.grant.value, "Memory Spaces scope").knownMemoryBodyIds, "knownMemoryBodyIds", 1e4) ?? allowedBodies;
 						let value;
 						if (input.section === "directory") {
-							const catalog = service.bodyDirectory();
+							const catalog = service.spaceDirectory();
 							const owned = createdByView.get(request.view.id);
-							value = modelBodyCatalog({
+							value = modelSpaceCatalog({
 								...catalog,
 								items: catalog.items.filter((body) => known.includes(body.id) || owned?.has(body.id))
 							});
@@ -3155,14 +3202,14 @@ function createMemorySpacesSource(providerSnapshot, config = {}) {
 						if (category !== void 0 && !CATEGORIES.has(category)) throw new Error(`unsupported category: ${category}`);
 						if (source !== void 0 && !SOURCES.has(source)) throw new Error(`unsupported source: ${source}`);
 						if (intent !== void 0 && !INTENTS.has(intent)) throw new Error(`unsupported intent: ${intent}`);
-						const requestedBodies = memoryInputStringArray(input.memoryBodyIds, "memoryBodyIds", 1e4) ?? allowedBodies;
-						if (requestedBodies.some((id) => !allowedBodies.includes(id))) throw new Error("Recall requested a Memory Space outside this View ReadGrant");
+						const requestedSpaces = memoryInputStringArray(input.memoryBodyIds, "memoryBodyIds", 1e4) ?? allowedBodies;
+						if (requestedSpaces.some((id) => !allowedBodies.includes(id))) throw new Error("Recall requested a Memory Space outside this View ReadGrant");
 						const mode = memoryInputText(input.mode, "mode", 20, false);
 						const result = await service.search({
 							query: memoryInputText(input.query, "query", 2e3),
 							...mode === void 0 ? {} : { mode },
 							limit: Math.min(request.route.maxResults ?? 20, memoryInputInteger(input.limit, 10, 1, 20)),
-							memoryBodyIds: requestedBodies,
+							memoryBodyIds: requestedSpaces,
 							...category === void 0 ? {} : { category },
 							...source === void 0 ? {} : { source },
 							...intent === void 0 ? {} : { intent }
@@ -3171,10 +3218,10 @@ function createMemorySpacesSource(providerSnapshot, config = {}) {
 					}
 					if (request.route.sourceRouteId === "related") {
 						const id = memoryInputText(input.id, "id", 2e3);
-						const requestedBody = memoryInputText(input.memoryBodyId, "memoryBodyId", 300, false);
+						const requestedSpace = memoryInputText(input.memoryBodyId, "memoryBodyId", 300, false);
 						const admitted = admittedByView.get(request.view.id);
 						const owners = [...admitted?.entries() ?? []].filter(([reference]) => reference.endsWith("/" + id)).map(([, bodyId]) => bodyId);
-						const owner = requestedBody === void 0 ? owners.length === 1 ? owners[0] : void 0 : admitted?.get(requestedBody + "/" + id);
+						const owner = requestedSpace === void 0 ? owners.length === 1 ? owners[0] : void 0 : admitted?.get(requestedSpace + "/" + id);
 						if (owner === void 0) throw new Error("related-memory traversal requires evidence already admitted by this View");
 						if (!allowedBodies.includes(owner)) throw new Error("related-memory owner is outside this View ReadGrant");
 						const edge = memoryInputText(input.edge, "edge", 30, false);
@@ -3194,9 +3241,9 @@ function createMemorySpacesSource(providerSnapshot, config = {}) {
 					const created = createdByView.get(request.view.id) ?? /* @__PURE__ */ new Set();
 					const writeBodies = [.../* @__PURE__ */ new Set([...knownBodies, ...created])];
 					const admittedOwner = (id) => {
-						const requestedBody = memoryInputText(input.memoryBodyId, "memoryBodyId", 300, false);
+						const requestedSpace = memoryInputText(input.memoryBodyId, "memoryBodyId", 300, false);
 						const entries = admittedByView.get(request.view.id);
-						if (requestedBody !== void 0) return entries?.get(requestedBody + "/" + id);
+						if (requestedSpace !== void 0) return entries?.get(requestedSpace + "/" + id);
 						const owners = [...entries?.entries() ?? []].filter(([reference]) => reference.endsWith("/" + id)).map(([, owner]) => owner);
 						return owners.length === 1 ? owners[0] : void 0;
 					};
@@ -3205,7 +3252,7 @@ function createMemorySpacesSource(providerSnapshot, config = {}) {
 					if (request.offer.sourceActionId === "manage-spaces") {
 						if (input.operation === "create") {
 							const selection = input.selection === void 0 ? void 0 : memoryInputRecord(input.selection, "placement selection");
-							const body = await service.createBodyForPersistence(createBodyRequest(input.request), selection === void 0 ? void 0 : {
+							const body = await service.createSpaceForPersistence(createSpaceRequest(input.request), selection === void 0 ? void 0 : {
 								providerId: memoryInputText(selection.providerId, "providerId", 128),
 								reason: memoryInputText(selection.reason, "reason", 4e3),
 								confidence: memoryInputText(selection.confidence, "confidence", 40)
@@ -3223,7 +3270,7 @@ function createMemorySpacesSource(providerSnapshot, config = {}) {
 						} else if (input.operation === "update") {
 							bodyId = memoryInputText(input.memoryBodyId, "memoryBodyId", 300);
 							if (!writeBodies.includes(bodyId)) throw new Error("Memory Space update is outside this View scope");
-							const body = service.updateBody(bodyId, {
+							const body = service.updateSpace(bodyId, {
 								...input.name === void 0 ? {} : { name: memoryInputText(input.name, "name", 100) },
 								...input.description === void 0 ? {} : { description: memoryInputText(input.description, "description", 1e3) },
 								...typeof input.active === "boolean" ? { active: input.active } : {}
@@ -3240,7 +3287,7 @@ function createMemorySpacesSource(providerSnapshot, config = {}) {
 							const sources = memoryInputStringArray(input.sourceMemoryBodyIds, "sourceMemoryBodyIds", 20) ?? [];
 							if ([target, ...sources].some((id) => !writeBodies.includes(id))) throw new Error("Memory Space merge is outside this View scope");
 							bodyId = target;
-							result = await service.mergeBodies(target, sources, input.deactivateSources !== false, request.signal);
+							result = await service.mergeSpaces(target, sources, input.deactivateSources !== false, request.signal);
 						} else throw new Error("unsupported Memory Space management action");
 					} else if (request.offer.sourceActionId === "remember") {
 						bodyId = memoryInputText(input.memoryBodyId, "memoryBodyId", 300, false);
@@ -3266,10 +3313,10 @@ function createMemorySpacesSource(providerSnapshot, config = {}) {
 					} else if (request.offer.sourceActionId === "link") {
 						const sourceId = memoryInputText(input.sourceId, "sourceId", 2e3);
 						const targetId = memoryInputText(input.targetId, "targetId", 2e3);
-						const sourceBody = admittedOwner(sourceId);
-						const targetBody = admittedOwner(targetId);
-						if (sourceBody === void 0 || targetBody === void 0 || sourceBody !== targetBody || !allowedBodies.includes(sourceBody)) throw new Error("link requires two evidence items admitted by this View from the same Memory Space");
-						bodyId = sourceBody;
+						const sourceSpace = admittedOwner(sourceId);
+						const targetSpace = admittedOwner(targetId);
+						if (sourceSpace === void 0 || targetSpace === void 0 || sourceSpace !== targetSpace || !allowedBodies.includes(sourceSpace)) throw new Error("link requires two evidence items admitted by this View from the same Memory Space");
+						bodyId = sourceSpace;
 						const edge = memoryInputText(input.type, "type", 30, false);
 						if (edge !== void 0 && !EDGES.has(edge)) throw new Error(`unsupported edge: ${edge}`);
 						const weight = typeof input.weight === "number" ? input.weight : .5;