@animus-ui/extract 0.1.26 → 0.1.27

package/dist/session.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_pipeline = require("./pipeline-DyUf-eKZ.cjs");
+const require_pipeline = require("./pipeline-CPSPw522.cjs");
 let crypto = require("crypto");
 let fs = require("fs");
 let path = require("path");
@@ -51,6 +51,50 @@ var CoalescingWindow = class {
 	}
 };
 //#endregion
+//#region session/environment-builds.ts
+/**
+* Each environment build that started and has not ended, by name. A host
+* that builds a shared plugin's environments in parallel (a Vite `buildApp`)
+* shares one build among them, retired by the last to end. A build under a
+* name whose build is open (a reused builder, or a second environment under
+* one name) waits for that build's end, so each build ends only its own
+* generation, once.
+*/
+var EnvironmentBuilds = class {
+	/** What a host without environments builds as. */
+	single = { name: "build" };
+	builds = /* @__PURE__ */ new Map();
+	/** Opens `environment`'s build once no build under its name is open;
+	*  whether another environment's build is open beside it. */
+	async open(environment) {
+		for (;;) {
+			const open = this.builds.get(environment.name);
+			if (open === void 0) break;
+			await open.ended;
+		}
+		let end = () => {};
+		const ended = new Promise((settle) => {
+			end = settle;
+		});
+		this.builds.set(environment.name, {
+			environment,
+			ended,
+			end
+		});
+		return this.builds.size > 1;
+	}
+	/** Ends `environment`'s build if this environment opened it; whether that
+	*  left none open. A host can end an environment it never opened (a dev
+	*  server ends every environment, started or not), which ends nothing. */
+	end(environment) {
+		const open = this.builds.get(environment.name);
+		if (open === void 0 || open.environment !== environment) return false;
+		this.builds.delete(environment.name);
+		open.end();
+		return this.builds.size === 0;
+	}
+};
+//#endregion
 //#region pipeline/system-instances.ts
 /**
 * The system and the analysis read one instance of each kit (spec §2.2
@@ -60,11 +104,11 @@ var CoalescingWindow = class {
 * one the system evaluated is refused: its components would be extracted
 * against another instance's vocabulary.
 */
-function realPath(path$38) {
+function realPath(path$39) {
 	try {
-		return (0, fs.realpathSync)(path$38);
+		return (0, fs.realpathSync)(path$39);
 	} catch {
-		return path$38;
+		return path$39;
 	}
 }
 /**
@@ -75,7 +119,7 @@ function realPath(path$38) {
 */
 function systemInstanceMismatches(input) {
 	const evaluated = new Set(input.evaluated.map(realPath));
-	const shown = (path$39) => (0, path.relative)(input.rootDir, path$39).split(path.sep).join("/");
+	const shown = (path$40) => (0, path.relative)(input.rootDir, path$40).split(path.sep).join("/");
 	const diagnostics = [];
 	for (const specifier of input.specifiers) {
 		if (!require_pipeline.isPackageSpecifier(specifier)) continue;
@@ -315,7 +359,7 @@ function lockRecordBytes(startedAt, build) {
 const HEARTBEAT_TEMP_PREFIX = ".lock-heartbeat-";
 function holdDirectoryClaim(dir, options = {}) {
 	const startedAt = options.startedAt ?? (/* @__PURE__ */ new Date()).toISOString();
-	const path$37 = (0, path.join)(dir, CLI_LOCK_ARTIFACT);
+	const path$38 = (0, path.join)(dir, CLI_LOCK_ARTIFACT);
 	const tempPath = (0, path.join)(dir, `${HEARTBEAT_TEMP_PREFIX}${process.pid}`);
 	const rename = options.write === "rename";
 	let refresh = null;
@@ -329,12 +373,12 @@ function holdDirectoryClaim(dir, options = {}) {
 		try {
 			if (rename) {
 				(0, fs.writeFileSync)(tempPath, lockRecordBytes(startedAt, options.build));
-				(0, fs.renameSync)(tempPath, path$37);
-			} else (0, fs.writeFileSync)(path$37, lockRecordBytes(startedAt, options.build));
+				(0, fs.renameSync)(tempPath, path$38);
+			} else (0, fs.writeFileSync)(path$38, lockRecordBytes(startedAt, options.build));
 		} catch (error) {
 			stop();
 			if (isMissingFile(error)) return;
-			console.error(`[animus] Could not write the directory claim ${path$37}: ${String(error)}`);
+			console.error(`[animus] Could not write the directory claim ${path$38}: ${String(error)}`);
 		}
 	};
 	stamp();
@@ -345,7 +389,7 @@ function holdDirectoryClaim(dir, options = {}) {
 	return () => {
 		stop();
 		if (rename) (0, fs.rmSync)(tempPath, { force: true });
-		(0, fs.rmSync)(path$37, { force: true });
+		(0, fs.rmSync)(path$38, { force: true });
 	};
 }
 /** Snapshot the session's copied asset() files, sorted, BEFORE the session
@@ -373,11 +417,15 @@ function joined(key) {
 	if (state === void 0) throw new Error(`[animus] no participant has joined build ${key.build} of ${key.root}`);
 	return state;
 }
-function getManifestJson(key) {
-	return findSession(key)?.manifestJson ?? null;
+/** Commits the build's publication, the one write of everything below. */
+function setPublication(key, publication) {
+	joined(key).publication = publication;
 }
-function setManifestJson(key, json) {
-	joined(key).manifestJson = json;
+function publicationOf(key) {
+	return findSession(key)?.publication ?? null;
+}
+function getManifestJson(key) {
+	return publicationOf(key)?.manifestJson ?? null;
 }
 /**
 * A latch over the most recently STARTED analysis, never cleared on settle:
@@ -402,36 +450,21 @@ function claimUnmatchedExcludeReport(key) {
 	return true;
 }
 function getSharedCss(key) {
-	return findSession(key)?.sharedCss ?? "";
-}
-function setSharedCss(key, css) {
-	joined(key).sharedCss = css;
+	return publicationOf(key)?.styles ?? "";
 }
 function getSharedSystemProps(key) {
-	return findSession(key)?.sharedSystemProps ?? "";
-}
-function setSharedSystemProps(key, content) {
-	joined(key).sharedSystemProps = content;
+	return publicationOf(key)?.systemPropsModule ?? "";
 }
 function getSharedExternalDirs(key) {
-	return findSession(key)?.externalDirs ?? [];
-}
-function setSharedExternalDirs(key, dirs) {
-	joined(key).externalDirs = dirs;
+	return publicationOf(key)?.externalPackageDirs ?? [];
 }
 function getSharedExternalEntries(key) {
-	return findSession(key)?.externalEntries ?? /* @__PURE__ */ new Map();
-}
-function setSharedExternalEntries(key, entries) {
-	joined(key).externalEntries = entries;
+	return publicationOf(key)?.externalSourceEntries ?? /* @__PURE__ */ new Map();
 }
 /** Specifier → its source entry's side effects, published with the shared
 *  entries; absent leaves the bundler's own classification. */
 function getSharedExternalSideEffects(key) {
-	return findSession(key)?.externalSideEffects ?? /* @__PURE__ */ new Map();
-}
-function setSharedExternalSideEffects(key, sideEffects) {
-	joined(key).externalSideEffects = sideEffects;
+	return publicationOf(key)?.externalSourceSideEffects ?? /* @__PURE__ */ new Map();
 }
 /**
 * The only session of a build that can run watch analysis. A non-owning
@@ -449,18 +482,12 @@ function setOwningWatchSession(key, session) {
 * the exact bytes analyzed), including files that produced zero entries.
 */
 function getAnalyzedHashes(key) {
-	return findSession(key)?.analyzedHashes ?? null;
-}
-function setAnalyzedHashes(key, hashes) {
-	joined(key).analyzedHashes = hashes;
+	return publicationOf(key)?.analyzedHashes ?? null;
 }
 /** What the build's last published analysis read of the discovered
 *  packages (spec §2.2 A4); null before one publishes. */
 function getSharedPackageReadRecord(key) {
-	return findSession(key)?.packageReadRecord ?? null;
-}
-function setSharedPackageReadRecord(key, record) {
-	joined(key).packageReadRecord = record;
+	return publicationOf(key)?.packageReadRecord ?? null;
 }
 /**
 * One participant publishes a build's analysis, holding this claim until it
@@ -486,15 +513,10 @@ function getSessionArtifactDir(key) {
 function setSessionArtifactDir(key, dir) {
 	joined(key).artifactDir = dir;
 }
-/**
-* Replacement epoch of the last published analysis, written AFTER the
-* manifest so an epoch reader always sees at least that generation's manifest.
-*/
+/** Replacement epoch of the last published analysis: committed in the same
+*  record as its manifest, so an epoch reader sees that generation's. */
 function getReplacementEpoch(key) {
-	return findSession(key)?.replacementEpoch ?? null;
-}
-function setReplacementEpoch(key, epoch) {
-	joined(key).replacementEpoch = epoch;
+	return publicationOf(key)?.replacementEpoch ?? null;
 }
 /**
 * The build's one in-flight watch-analysis transaction: a participant that
@@ -672,6 +694,7 @@ const OPTION_CLASSES = {
 	layers: digestOf("layers"),
 	engine: digestOf("engine"),
 	mode: digestOf("mode"),
+	runtimeImport: digestOf("runtimeImport"),
 	root: "excluded"
 };
 /** The options a build's analysis depends on, each as stable text; each is
@@ -724,15 +747,7 @@ function joinSession(key, participant, options) {
 			},
 			systemAuthority: null,
 			claimRecord: null,
-			manifestJson: null,
-			sharedCss: "",
-			sharedSystemProps: "",
-			externalDirs: [],
-			externalEntries: /* @__PURE__ */ new Map(),
-			externalSideEffects: /* @__PURE__ */ new Map(),
-			analyzedHashes: null,
-			packageReadRecord: null,
-			replacementEpoch: null,
+			publication: null,
 			artifactDir: null,
 			unmatchedExcludesReported: false
 		};
@@ -887,6 +902,9 @@ function misspelledHostSources(hostSources, readPaths) {
 function isDiskNumber(value) {
 	return Object(value) !== value && Object.prototype.toString.call(value) === "[object Number]";
 }
+/** The session's own system-props file, imported by absolute path: what a
+*  host that serves no system-props module (the CLI) delivers. */
+const SESSION_ARTIFACT = Symbol("animus.session-artifact");
 /** A file's content hash, or '' when it cannot be read. */
 function fileHashOrEmpty(path$7) {
 	try {
@@ -906,9 +924,6 @@ var ExtractionSession = class {
 	host;
 	/** Set by the adapter before any pipeline run. */
 	rootDir = null;
-	/** The module extracted terminals import their factories from; an
-	*  override must supply every terminal the analysis extracts. */
-	runtimeImport = require_pipeline.DEFAULT_RUNTIME_IMPORT;
 	/** A host that resolves imports itself (Vite's `this.resolve`): package
 	*  discovery asks it first, the loader only for a declared workspace it
 	*  cannot resolve. Null resolves through the loader alone. */
@@ -942,12 +957,12 @@ var ExtractionSession = class {
 	/** Physical asset files registered with the host watcher. */
 	assetDependencyPaths = /* @__PURE__ */ new Set();
 	assetDependencyKeys = /* @__PURE__ */ new Set();
-	/** System-props module id override. Turbopack rejects absolute-path
-	*  imports, so its driver sets a virtual id; null injects the abs path. */
-	systemPropsModuleId = null;
-	/** The stylesheet module generated code imports; a host that serves the
-	*  stylesheet itself names its own. */
-	cssModuleId = ANIMUS_CSS_MODULE_ID;
+	/** What generated code imports; a host that serves its own modules
+	*  declares them before planning. */
+	delivery = {
+		cssModuleId: ANIMUS_CSS_MODULE_ID,
+		systemPropsModuleId: SESSION_ARTIFACT
+	};
 	/** Whether the analysis-inputs hydration corpus is written to disk. Only
 	*  isolated loader workers replay it; an in-process loader reads memory. */
 	persistAnalysisInputs = false;
@@ -1019,8 +1034,8 @@ var ExtractionSession = class {
 	get heldSources() {
 		return this.fileCache;
 	}
-	/** The generation an emit produced, current once its ingestion
-	*  publishes. */
+	/** The generation an emit produced, until it commits with the
+	*  ingestion's ownership and the external package state it analysed. */
 	stagedPublication = null;
 	options;
 	staticCssJson;
@@ -1062,10 +1077,31 @@ var ExtractionSession = class {
 		};
 	}
 	systemDependencyKeys = /* @__PURE__ */ new Set();
+	/** What a host watches for this Session, one list for every host: the
+	*  files whose change it acts on (the system module and the modules it
+	*  read, asset() sources, the configuration inputs), the paths the system
+	*  load found absent, whose creation reloads it, and the external package
+	*  roots, watched recursively. An absent path inside `covered` (roots the
+	*  host already watches recursively) is left out: a host's recursive
+	*  watch reports its creation, and watching an absent file inside a
+	*  watched directory can stop that directory's events (inotify). */
+	watchPlan(covered = []) {
+		const system = this.rootDir === null ? [] : [(0, path.resolve)(this.rootDir, this.options.system)];
+		return {
+			files: [.../* @__PURE__ */ new Set([
+				...system,
+				...this.systemDependencyPaths,
+				...this.assetDependencyPaths,
+				...this.configInputPaths
+			])],
+			missing: this.systemMissingPaths.filter((path$9) => !covered.some((root) => require_pipeline.isPathWithinRoot(root, path$9))),
+			directories: [...this.externalWatchRoots]
+		};
+	}
 	/** Whether `path` is the system module, one of its dependencies, or a
 	*  path its load found absent: a change to it reloads the system. */
-	isSystemDependency(path$9) {
-		return require_pipeline.toWatchKeys(path$9).some((key) => this.systemDependencyKeys.has(key));
+	isSystemDependency(path$10) {
+		return require_pipeline.toWatchKeys(path$10).some((key) => this.systemDependencyKeys.has(key));
 	}
 	/** Loader-reported dependency paths for bundler watch registration. */
 	systemDependencyPaths = [];
@@ -1153,6 +1189,10 @@ var ExtractionSession = class {
 		this.ingestionFailureDiagnostics = this.ingestionFailureDiagnostics.filter((diagnostic) => diagnostic.file !== relPath);
 		return this.ingestionFailureDiagnostics.length !== before;
 	}
+	/** The module extracted terminals import their factories from. */
+	get runtimeImport() {
+		return this.options.runtimeImport ?? "@animus-ui/system/runtime";
+	}
 	get sessionDir() {
 		return sessionArtifactDir(this.rootDir, this.sessionId);
 	}
@@ -1276,27 +1316,27 @@ var ExtractionSession = class {
 	recordObservation(changes) {
 		const queue = observationQueue(this.key);
 		const observed = /* @__PURE__ */ new Map();
-		for (const path$10 of changes.modifiedFiles ?? []) {
+		for (const path$11 of changes.modifiedFiles ?? []) {
 			let state;
 			try {
-				state = require_pipeline.contentHash(changes.sources?.get(path$10) ?? (0, fs.readFileSync)(path$10, "utf-8"));
+				state = require_pipeline.contentHash(changes.sources?.get(path$11) ?? (0, fs.readFileSync)(path$11, "utf-8"));
 			} catch {
 				state = UNREADABLE_OBSERVATION;
 			}
-			observed.set(path$10, state);
+			observed.set(path$11, state);
 		}
-		for (const path$11 of changes.removedFiles ?? []) observed.set(path$11, REMOVED_OBSERVATION);
+		for (const path$12 of changes.removedFiles ?? []) observed.set(path$12, REMOVED_OBSERVATION);
 		const revision = ++queue.revision;
 		const active = queue.active;
-		if (active !== null && [...observed].every(([path$12, state]) => !queue.untaken.has(path$12) && active.taken.get(path$12) === state)) {
+		if (active !== null && [...observed].every(([path$13, state]) => !queue.untaken.has(path$13) && active.taken.get(path$13) === state)) {
 			queue.revisions.set(revision, active.transaction);
 			return revision;
 		}
-		for (const [path$13, state] of observed) {
-			queue.untaken.set(path$13, state);
-			const supplied = changes.sources?.get(path$13);
-			if (supplied === void 0) queue.suppliedSources.delete(path$13);
-			else queue.suppliedSources.set(path$13, supplied);
+		for (const [path$14, state] of observed) {
+			queue.untaken.set(path$14, state);
+			const supplied = changes.sources?.get(path$14);
+			if (supplied === void 0) queue.suppliedSources.delete(path$14);
+			else queue.suppliedSources.set(path$14, supplied);
 		}
 		queue.revisions.set(revision, null);
 		return revision;
@@ -1334,7 +1374,7 @@ var ExtractionSession = class {
 		const { taken, rescan, sources } = this.takeObservations();
 		const modifiedFiles = /* @__PURE__ */ new Set();
 		const removedFiles = /* @__PURE__ */ new Set();
-		for (const [path$14, state] of taken) (state === REMOVED_OBSERVATION ? removedFiles : modifiedFiles).add(path$14);
+		for (const [path$15, state] of taken) (state === REMOVED_OBSERVATION ? removedFiles : modifiedFiles).add(path$15);
 		this.settleTaken(taken, this.runWatchAttempt({
 			modifiedFiles,
 			removedFiles,
@@ -1399,11 +1439,11 @@ var ExtractionSession = class {
 			if (changed.length === 0) {
 				systemHit = firstChangedFile(this.systemDependencyHashes);
 				if (systemHit === void 0) configHit = firstChangedFile(this.configInputHashes);
-			} else systemHit = changed.find((path$15) => this.isSystemDependency(path$15));
+			} else systemHit = changed.find((path$16) => this.isSystemDependency(path$16));
 		} catch (err) {
 			this.warn(`HMR system-reload check failed: ${String(err)}`);
 		}
-		configHit ??= changed.find((path$16) => require_pipeline.toWatchKeys(path$16).some((key) => this.configInputKeys.has(key)));
+		configHit ??= changed.find((path$17) => require_pipeline.toWatchKeys(path$17).some((key) => this.configInputKeys.has(key)));
 		const debtRetry = this.systemReloadOwed && this.heldRejection === null;
 		if (systemHit || configHit || debtRetry) {
 			this.log(systemHit ? `system reload: system dependency changed (${(0, path.relative)(rootDir, systemHit)})` : configHit ? `system reload: configuration changed (${(0, path.relative)(rootDir, configHit)})` : "system reload: retrying the reload a failure left owed");
@@ -1423,13 +1463,14 @@ var ExtractionSession = class {
 			}
 			return;
 		}
-		if (changed.some((path$17) => require_pipeline.toWatchKeys(path$17).some((key) => this.assetDependencyKeys.has(key)))) {
+		if (changed.some((path$18) => require_pipeline.toWatchKeys(path$18).some((key) => this.assetDependencyKeys.has(key)))) {
 			this.assetCopyCache.clear();
 			assetChanged = true;
 		}
 		const { excludeMatcher, extensionsSet } = this.scanConfig;
 		const priorCacheEntries = /* @__PURE__ */ new Map();
 		const priorExternalFileOwners = { ...this.externalFileOwners };
+		const priorHostSuppliedKeys = new Set(this.hostSuppliedKeys);
 		const recordPrior = (key) => {
 			if (!priorCacheEntries.has(key)) priorCacheEntries.set(key, this.fileCache.get(key) ?? null);
 		};
@@ -1579,6 +1620,7 @@ var ExtractionSession = class {
 						else this.fileCache.set(key, prior);
 					}
 					this.externalFileOwners = priorExternalFileOwners;
+					this.hostSuppliedKeys = priorHostSuppliedKeys;
 				}
 				if (this.statusAttemptOpen) {
 					this.debouncePending.clear();
@@ -1586,7 +1628,7 @@ var ExtractionSession = class {
 				}
 				throw err;
 			}
-			this.publishSourceIngestion(ingested, "incremental", (path$18) => this.fileCache.get(path$18));
+			this.publishSourceIngestion(ingested, "incremental", (path$19) => this.fileCache.get(path$19));
 			commitObservedBatch();
 		} else if (this.statusAttemptOpen) {
 			this.debouncePending.clear();
@@ -1607,6 +1649,20 @@ var ExtractionSession = class {
 		});
 		throw new AbortedParseRejection(rejection.message);
 	}
+	/** Holds a held full read's entries: what it read stays the held bytes,
+	*  never overwriting held host bytes with the disk's (a key the host
+	*  supplied before that this read took from disk keeps its bytes). */
+	holdObservedEntries(entries, supplied) {
+		for (const entry of entries) {
+			const fromHost = supplied.has(entry.path);
+			if (this.hostSuppliedKeys.has(entry.path) && !fromHost) continue;
+			this.fileCache.set(entry.path, {
+				hash: entry.hash,
+				source: entry.source
+			});
+			if (fromHost) this.hostSuppliedKeys.add(entry.path);
+		}
+	}
 	/** Held sources whose bytes the host supplied and which the disk no
 	*  longer matches: a full read not carrying them (`carried`) would
 	*  publish the disk's bytes in their place. */
@@ -1638,9 +1694,9 @@ var ExtractionSession = class {
 			hash: entry.hash,
 			source: entry.source
 		}]));
-		for (const path$19 of result.skippedOriginals ?? []) {
-			const entry = raw(path$19);
-			if (entry) held.set(path$19, {
+		for (const path$20 of result.skippedOriginals ?? []) {
+			const entry = raw(path$20);
+			if (entry) held.set(path$20, {
 				hash: entry.hash ?? require_pipeline.contentHash(entry.source),
 				source: entry.source
 			});
@@ -1653,9 +1709,13 @@ var ExtractionSession = class {
 		const previous = this.publication;
 		const publication = {
 			...staged,
-			ownership: result.ownership
+			ownership: result.ownership,
+			externalPackageDirs: this.externalPackageDirs,
+			externalSourceEntries: this.externalSourceEntries,
+			externalSourceSideEffects: this.externalSourceSideEffects
 		};
 		this.publication = publication;
+		setPublication(this.key, publication);
 		this.onOutcome?.({
 			kind: "published",
 			publication,
@@ -1713,18 +1773,18 @@ var ExtractionSession = class {
 	*  paths it found absent, whose creation is a system change. */
 	recordSystemDependencies(systemPath, dependencies, missing) {
 		const keys = /* @__PURE__ */ new Set();
-		for (const path$20 of [
+		for (const path$21 of [
 			systemPath,
 			...dependencies,
 			...missing
-		]) for (const key of require_pipeline.toWatchKeys(path$20)) keys.add(key);
+		]) for (const key of require_pipeline.toWatchKeys(path$21)) keys.add(key);
 		const hashes = /* @__PURE__ */ new Map();
 		for (const dep of dependencies.length > 0 ? dependencies : [systemPath]) try {
 			hashes.set(dep, require_pipeline.contentHash((0, fs.readFileSync)(dep, "utf-8")));
 		} catch {
 			hashes.set(dep, "");
 		}
-		for (const path$21 of missing) hashes.set(path$21, "");
+		for (const path$22 of missing) hashes.set(path$22, "");
 		this.systemDependencyKeys = keys;
 		this.systemDependencyPaths = dependencies;
 		this.systemMissingPaths = missing;
@@ -1735,8 +1795,8 @@ var ExtractionSession = class {
 	*  re-reads its aliases. */
 	readConfigInputs(rootDir) {
 		this.configInputPaths = [(0, path.join)(rootDir, "package.json"), ...require_pipeline.tsconfigChainPaths(rootDir)];
-		this.configInputKeys = new Set(this.configInputPaths.flatMap((path$22) => require_pipeline.toWatchKeys(path$22)));
-		this.configInputHashes = new Map(this.configInputPaths.map((path$23) => [path$23, fileHashOrEmpty(path$23)]));
+		this.configInputKeys = new Set(this.configInputPaths.flatMap((path$23) => require_pipeline.toWatchKeys(path$23)));
+		this.configInputHashes = new Map(this.configInputPaths.map((path$24) => [path$24, fileHashOrEmpty(path$24)]));
 		if (this.aliasesFromTsconfig) this.pathAliasesJson = require_pipeline.buildPathAliasesJson(require_pipeline.readTsconfigAliasPairs(rootDir), rootDir)?.json ?? null;
 	}
 	/** What hosts watch for assets, and what the last-good generation
@@ -1819,15 +1879,15 @@ var ExtractionSession = class {
 		const rawEntries = [];
 		const ingestionFailures = [];
 		const readPaths = /* @__PURE__ */ new Set();
+		const supplied = /* @__PURE__ */ new Set();
 		for (const filePath of files) {
 			const relPath = (0, path.relative)(rootDir, filePath);
 			readPaths.add(filePath);
 			let source;
 			try {
-				const supplied = hostSources.get(filePath);
-				source = supplied ?? (0, fs.readFileSync)(filePath, "utf-8");
-				if (supplied === void 0) this.hostSuppliedKeys.delete(relPath);
-				else this.hostSuppliedKeys.add(relPath);
+				const hostSource = hostSources.get(filePath);
+				source = hostSource ?? (0, fs.readFileSync)(filePath, "utf-8");
+				if (hostSource !== void 0) supplied.add(relPath);
 			} catch (err) {
 				if (!require_pipeline.isDeletedSource(err)) ingestionFailures.push(require_pipeline.unreadableSourceDiagnostic(relPath, err));
 				continue;
@@ -1957,7 +2017,9 @@ var ExtractionSession = class {
 			for (const entry of admitted.entries) {
 				const entryPath = (0, path.resolve)(rootDir, entry.path);
 				readPaths.add(entryPath);
-				const source = hostSources.get(entryPath) ?? entry.source;
+				const hostSource = hostSources.get(entryPath);
+				if (hostSource !== void 0) supplied.add(entry.path);
+				const source = hostSource ?? entry.source;
 				rawEntries.push({
 					path: entry.path,
 					source,
@@ -1968,17 +2030,19 @@ var ExtractionSession = class {
 			this.externalLinkedDirs = admitted.linkedDirs;
 			this.externalOutputDirs = admitted.outputDirs;
 			bt.packageResolve = this.elapsed(t);
-			const misspelled = misspelledHostSources(hostSources, readPaths).map(({ path: path$24, read }) => `${(0, path.relative)(rootDir, path$24)} (read as ${read.map((readPath) => (0, path.relative)(rootDir, readPath)).join(", ")})`);
+			const misspelled = misspelledHostSources(hostSources, readPaths).map(({ path: path$25, read }) => `${(0, path.relative)(rootDir, path$25)} (read as ${read.map((readPath) => (0, path.relative)(rootDir, readPath)).join(", ")})`);
 			if (misspelled.length > 0) throw new DeferredReloadRefusal(`[${this.driverLabel}] reload not published: the host supplied bytes for ${misspelled.join(", ")}, which the full read reaches only under another spelling; the last generation stays served`);
 			this.beginStatusAttempt();
 			let accepted;
+			const readEntries = this.withoutOutputSources(rawEntries);
 			try {
-				accepted = await this.corpus.prepare(this.withoutOutputSources(rawEntries));
+				accepted = await this.corpus.prepare(readEntries);
 				this.throwOnAbortedParse(accepted);
 				this.skippedSources = accepted.skippedOriginals ?? [];
 				this.ingestionOpenings = accepted.openings ?? [];
 				this.ingestionAdapted = require_pipeline.adaptedOriginals(accepted.ownership);
 			} catch (err) {
+				if (err instanceof AbortedParseRejection) this.holdObservedEntries(readEntries, supplied);
 				this.debouncePending.clear();
 				this.writeAnalysisStatus("failed", pending, String(err));
 				throw err;
@@ -1987,10 +2051,8 @@ var ExtractionSession = class {
 			bt.fileCount = accepted.analysisEntries.length;
 			require_pipeline.clearEngineCache(() => this.engine());
 			await this.analyzeAndEmit(accepted.analysisEntries, packageMap, false, bt, pipelineStart, pending);
-			this.publishSourceIngestion(accepted, "full", (path$25) => rawEntries.find((entry) => entry.path === path$25));
-			setSharedExternalDirs(this.key, admitted.packageDirs);
-			setSharedExternalEntries(this.key, admitted.sourceEntries);
-			setSharedExternalSideEffects(this.key, admitted.sourceEntrySideEffects);
+			this.publishSourceIngestion(accepted, "full", (path$26) => rawEntries.find((entry) => entry.path === path$26));
+			this.hostSuppliedKeys = supplied;
 			this.onExternalRootsCommitted?.(this.externalWatchRoots);
 			setOwningWatchSession(this.key, this);
 		} catch (err) {
@@ -2072,7 +2134,7 @@ var ExtractionSession = class {
 		if (own.identity === authority.identity) return;
 		const shared = new Set(authority.dependencies);
 		const mine = new Set(own.dependencies);
-		const differing = [...authority.dependencies.filter((path$26) => !mine.has(path$26)), ...own.dependencies.filter((path$27) => !shared.has(path$27))].map((path$28) => (0, path.relative)(this.rootDir, path$28));
+		const differing = [...authority.dependencies.filter((path$27) => !mine.has(path$27)), ...own.dependencies.filter((path$28) => !shared.has(path$28))].map((path$29) => (0, path.relative)(this.rootDir, path$29));
 		throw new SessionConfigurationConflict(this.key, authority.label, this.resolutionContextLabel(), differing.length > 0 ? [`system modules ${differing.join(", ")}`] : ["the evaluated system"], "Every participant of one build must evaluate the same system: give each compiler conditions that select the same system modules.");
 	}
 	/** Release this session's publication claim so a successor may publish,
@@ -2081,6 +2143,7 @@ var ExtractionSession = class {
 	close() {
 		this.releasePublicationClaim?.();
 		this.releasePublicationClaim = null;
+		this.hostSuppliedKeys.clear();
 		if (this.joinedKey === null || this.participant === null) return;
 		if (getOwningWatchSession(this.joinedKey) === this) setOwningWatchSession(this.joinedKey, null);
 		leaveSession(this.joinedKey, this.participant);
@@ -2128,14 +2191,14 @@ var ExtractionSession = class {
 	pendingFromBatch(changes) {
 		const { excludeMatcher, extensionsSet } = this.scanConfig;
 		const pending = [];
-		for (const path$29 of changes.modifiedFiles ?? []) {
-			const classified = this.classifyWatchPath(path$29, {
+		for (const path$30 of changes.modifiedFiles ?? []) {
+			const classified = this.classifyWatchPath(path$30, {
 				excludeMatcher,
 				extensionsSet
 			});
 			if (!classified) continue;
 			try {
-				pending.push([classified.key, require_pipeline.contentHash(changes.sources?.get(path$29) ?? (0, fs.readFileSync)(path$29, "utf-8"))]);
+				pending.push([classified.key, require_pipeline.contentHash(changes.sources?.get(path$30) ?? (0, fs.readFileSync)(path$30, "utf-8"))]);
 			} catch {}
 		}
 		return pending;
@@ -2151,24 +2214,24 @@ var ExtractionSession = class {
 		const dirtyRoots = /* @__PURE__ */ new Set();
 		const modified = /* @__PURE__ */ new Set();
 		const removed = /* @__PURE__ */ new Set();
-		const rootHitFor = (path$30) => {
-			const containing = identity.containingExternalRoot(path$30);
+		const rootHitFor = (path$31) => {
+			const containing = identity.containingExternalRoot(path$31);
 			if (!containing) return null;
 			try {
-				return (0, fs.statSync)(path$30).isDirectory() ? containing : null;
+				return (0, fs.statSync)(path$31).isDirectory() ? containing : null;
 			} catch {
-				return identity.resolveDeletedSourceId(path$30) ? null : containing;
+				return identity.resolveDeletedSourceId(path$31) ? null : containing;
 			}
 		};
-		for (const path$31 of changes.modifiedFiles ?? []) {
-			const root = rootHitFor(path$31);
+		for (const path$32 of changes.modifiedFiles ?? []) {
+			const root = rootHitFor(path$32);
 			if (root) dirtyRoots.add(root);
-			else modified.add(path$31);
+			else modified.add(path$32);
 		}
-		for (const path$32 of changes.removedFiles ?? []) {
-			const root = rootHitFor(path$32);
+		for (const path$33 of changes.removedFiles ?? []) {
+			const root = rootHitFor(path$33);
 			if (root) dirtyRoots.add(root);
-			else removed.add(path$32);
+			else removed.add(path$33);
 		}
 		for (const root of dirtyRoots) {
 			const previous = this.externalInventory.get(root) ?? /* @__PURE__ */ new Map();
@@ -2260,8 +2323,8 @@ var ExtractionSession = class {
 			system,
 			emitter: {
 				runtimeImport: this.runtimeImport,
-				cssModuleId: this.cssModuleId,
-				systemPropsModuleId: this.systemPropsModuleId ?? systemPropsPath(this.sessionDir)
+				cssModuleId: this.delivery.cssModuleId,
+				systemPropsModuleId: this.delivery.systemPropsModuleId === SESSION_ARTIFACT ? systemPropsPath(this.sessionDir) : this.delivery.systemPropsModuleId
 			},
 			pathAliasesJson: this.pathAliasesJson,
 			staticCssJson: this.staticCssJson,
@@ -2345,7 +2408,6 @@ var ExtractionSession = class {
 			prefix: `[${this.driverLabel}]`,
 			surface: "generated runtime modules"
 		});
-		setSharedCss(this.key, fullCss);
 		const systemPropsContent = require_pipeline.buildSystemPropsModule({
 			systemPropMapJson: JSON.stringify(manifest?.system_prop_map ?? {}),
 			groupRegistryJson: system.groupRegistryJson,
@@ -2353,20 +2415,6 @@ var ExtractionSession = class {
 			admittedTransforms: manifest?.admitted_transforms ?? {},
 			typedSystemProps: manifest?.typed_system_props ?? []
 		});
-		setSharedSystemProps(this.key, systemPropsContent);
-		setManifestJson(this.key, result.manifestJson);
-		if (manifest) this.stagedPublication = {
-			manifest,
-			manifestJson: result.manifestJson,
-			analysisGlobalCss: sheets.globalCss,
-			analysisComponentCss: sheets.componentCss,
-			styles: fullCss,
-			systemPropsModule: systemPropsContent,
-			system,
-			packageMap
-		};
-		setAnalyzedHashes(this.key, new Map(fileEntries.map((entry) => [entry.path, entry.hash])));
-		if (this.packageReadRecord !== null) setSharedPackageReadRecord(this.key, this.packageReadRecord);
 		this.writeAnalysisStatus("committing", pending);
 		const epoch = require_pipeline.hashReplacementPlans(require_pipeline.snapshotFilePlans(manifest), systemPropsContent);
 		if (this.lastCommit === null) this.lastCommit = this.seedCommitFromDisk();
@@ -2386,6 +2434,19 @@ var ExtractionSession = class {
 		} else this.writeSessionArtifact(SYSTEM_PROPS_ARTIFACT, systemPropsContent);
 		this.publishAnalysisCommit(epoch, generation);
 		this.publishReplacementEpoch(epoch);
+		this.stagedPublication = {
+			manifest,
+			manifestJson: result.manifestJson,
+			analysisGlobalCss: sheets.globalCss,
+			analysisComponentCss: sheets.componentCss,
+			styles: fullCss,
+			systemPropsModule: systemPropsContent,
+			system,
+			packageMap,
+			analyzedHashes: new Map(fileEntries.map((entry) => [entry.path, entry.hash])),
+			packageReadRecord: this.packageReadRecord,
+			replacementEpoch: epoch
+		};
 		bt.total = this.elapsed(pipelineStart);
 		logBuildTimings(bt, manifest?.timing, (msg) => this.log(msg), this.verbose);
 	}
@@ -2446,12 +2507,12 @@ var ExtractionSession = class {
 		if (!require_pipeline.isEngineTransformExtension(file)) return false;
 		const { extractFacts } = this.engine();
 		if (extractFacts === void 0) return true;
-		const path$33 = (0, path.relative)(this.rootDir, file);
+		const path$34 = (0, path.relative)(this.rootDir, file);
 		try {
 			const facts = require_pipeline.parseInternalWire(extractFacts(JSON.stringify([{
-				path: path$33,
+				path: path$34,
 				source: (0, fs.readFileSync)(file, "utf-8")
-			}])), "extractFacts").files[path$33];
+			}])), "extractFacts").files[path$34];
 			return facts === void 0 || facts.parsePanicked || facts.chains.length > 0;
 		} catch {
 			return true;
@@ -2590,7 +2651,6 @@ var ExtractionSession = class {
 	publishReplacementEpoch(epoch) {
 		if (!this.persistArtifacts) {
 			this.lastEpochValue = epoch;
-			setReplacementEpoch(this.key, epoch);
 			return;
 		}
 		const onDisk = this.diskEpochValue();
@@ -2604,7 +2664,6 @@ var ExtractionSession = class {
 			this.lastEpochValue = epoch;
 			this.reconcileSiblingEpochs(epoch);
 		}
-		setReplacementEpoch(this.key, epoch);
 	}
 	/** sessions-root listing memo, keyed by the root dir's mtime — a new or
 	*  pruned sibling DIRECTORY moves it; agreeing siblings stay listed. */
@@ -2743,11 +2802,11 @@ var ExtractionSession = class {
 	assetFingerprints() {
 		const { fingerprintFile, fingerprintBytes } = this.engine();
 		if (fingerprintFile && fingerprintBytes) return {
-			ofFile: (path$34) => fingerprintFile(path$34) ?? require_pipeline.contentHash((0, fs.readFileSync)(path$34)),
+			ofFile: (path$35) => fingerprintFile(path$35) ?? require_pipeline.contentHash((0, fs.readFileSync)(path$35)),
 			ofBytes: fingerprintBytes
 		};
 		return {
-			ofFile: (path$35) => require_pipeline.contentHash((0, fs.readFileSync)(path$35)),
+			ofFile: (path$36) => require_pipeline.contentHash((0, fs.readFileSync)(path$36)),
 			ofBytes: require_pipeline.contentHash
 		};
 	}
@@ -2797,9 +2856,9 @@ var ExtractionSession = class {
 		const message = `unresolvable asset() specifier: ${specifier}`;
 		this.strictOrWarn(message, `[${this.driverLabel}] ${message}`);
 	}
-	trackAssetDependency(path$36) {
-		this.assetDependencyPaths.add(path$36);
-		for (const key of require_pipeline.toWatchKeys(path$36)) this.assetDependencyKeys.add(key);
+	trackAssetDependency(path$37) {
+		this.assetDependencyPaths.add(path$37);
+		for (const key of require_pipeline.toWatchKeys(path$37)) this.assetDependencyKeys.add(key);
 	}
 	/** Resolve an asset specifier through the shared resolver, with one
 	*  last resort: a discovered source entry's package root. */
@@ -2821,7 +2880,10 @@ var ExtractionSession = class {
 //#endregion
 //#region session/turbopack-orchestrator.ts
 async function runSessionPipeline(session) {
-	session.systemPropsModuleId = TURBOPACK_SYSTEM_PROPS_ID;
+	session.delivery = {
+		...session.delivery,
+		systemPropsModuleId: TURBOPACK_SYSTEM_PROPS_ID
+	};
 	session.persistAnalysisInputs = true;
 	await session.runFullPipeline();
 }
@@ -2987,16 +3049,14 @@ function startTurbopackWatcher(session, rootDir, options = {}) {
 		if (require_pipeline.isPathWithinRoot(rootDir, path$2) && !(0, path.relative)(rootDir, path$2).split(/[\\/]/).some((segment) => IGNORED_SEGMENTS.has(segment))) return true;
 		return [...externalWatchers.keys()].some((root) => require_pipeline.isPathWithinRoot(root, path$2));
 	};
-	/** Watches the system, asset and configuration dependencies no root
-	*  watcher reports, by their directories, for those files only. */
+	/** Watches the Session's plan (its files, and the absent paths whose
+	*  creation reloads the system) where no root watcher reports them, by
+	*  their directories, for those paths only. */
 	const syncDependencyWatchers = () => {
 		if (closed) return;
 		const wanted = /* @__PURE__ */ new Map();
-		for (const path$3 of [
-			...session.systemDependencyPaths,
-			...session.assetDependencyPaths,
-			...session.configInputPaths
-		]) {
+		const plan = session.watchPlan();
+		for (const path$3 of [...plan.files, ...plan.missing]) {
 			if (watchedByRoot(path$3)) continue;
 			const files = wanted.get((0, path.dirname)(path$3)) ?? /* @__PURE__ */ new Set();
 			files.add(path$3);
@@ -3098,9 +3158,11 @@ exports.CLI_LOCK_HEARTBEAT_INTERVAL_MS = CLI_LOCK_HEARTBEAT_INTERVAL_MS;
 exports.CLI_LOCK_STALE_AFTER_MS = CLI_LOCK_STALE_AFTER_MS;
 exports.COALESCING_WINDOW_MS = COALESCING_WINDOW_MS;
 exports.CoalescingWindow = CoalescingWindow;
+exports.EnvironmentBuilds = EnvironmentBuilds;
 exports.EnvironmentFailure = EnvironmentFailure;
 exports.ExtractionSession = ExtractionSession;
 exports.MANIFEST_ARTIFACT = MANIFEST_ARTIFACT;
+exports.SESSION_ARTIFACT = SESSION_ARTIFACT;
 exports.SESSION_ASSETS_DIR = SESSION_ASSETS_DIR;
 exports.STYLES_ARTIFACT = STYLES_ARTIFACT;
 exports.SYSTEM_PROPS_ARTIFACT = SYSTEM_PROPS_ARTIFACT;