@animus-ui/extract 0.1.26 → 0.1.28

package/dist/session.mjs

@@ -1,4 +1,4 @@
-import { $ as excludeCollectedPackages, $t as createSourceIdentity, A as postProcessCss, Bn as __require, C as serializeStaticCss, Ct as tsconfigChainPaths, D as clearEngineCache, Dn as findSheetAssetSpecifiers, Et as extensionPolicyJson, Ft as pruneStaleAssets, G as discoveryResolver, I as createSourceCorpus, It as writeAssetCopy, J as packageInstanceFinding, Jt as outputSourceGuard, K as AliasAgreementCache, Kt as createExcludeMatcher, Ln as assembleStylesheet, M as buildPathAliasesJson, Mt as discoverFiles, N as enforceExternalTokenContracts, Nn as contentHash, Nt as DEFAULT_RUNTIME_IMPORT, O as runProjectAnalysis, On as generatedModuleCode, P as resolveAssetFile, Pn as parseInternalWire, Pt as assertRuntimeImportSuppliesTerminals, Qt as unmatchedExcludeLines, Sn as surfaceManifestDiagnostics, St as readTsconfigAliasPairs, T as stableStringify, X as bareSpecifierPackageName, Xt as resolveMode, Y as packageReadRecord, Yt as outputSourceMessage, Z as collectExternalPackageSources, Zt as resolveVerbosity, _ as buildSystemPropsModule, _t as declaredWorkspacePackages, at as isExcludedPackageRelativePath, b as loadSystemConfig, cn as adaptedOriginals, d as toWatchKeys, dn as isEngineTransformExtension, en as isPathWithinRoot, et as extractSystemFilePackages, f as diffFilePlans, gn as SYSTEM_INSTANCE_MISMATCH, gt as walkPackageSources, ht as unresolvableIncludesMessage, it as importedKitDiagnostics, j as resolveLightningTargets, jn as substituteSheetAssets, kn as reportSurvivingAssetPlaceholders, ln as DEFAULT_EXTENSIONS, lt as nativeKitSourceRoot, m as snapshotFilePlans, nn as createV2EngineApi, nt as findPackageRoot, on as projectExternalFileOwners, ot as isPackageSpecifier, p as hashReplacementPlans, pt as staleDistIncludesMessage, q as compareAliases, rt as firstOwners, s as builtInAssetClassification, tn as sharesVolumeRoot, ut as nativePackageLocator, wn as unreadableSourceDiagnostic, wt as BUILT_IN_EXTENSION_POLICY, x as systemLoadReads, xn as severityFor, yn as isDeletedSource } from "./pipeline-BzMQ_Z0M.mjs";
+import { $ as writeAssetCopy, $t as createExcludeMatcher, A as postProcessCss, At as declaredWorkspacePackages, Bn as __require, C as serializeStaticCss, Ct as nativePackageLocator, D as clearEngineCache, Dn as findSheetAssetSpecifiers, Et as staleDistIncludesMessage, Ft as readTsconfigAliasPairs, G as discoveryResolver, Gt as discoverFiles, I as createSourceCorpus, It as tsconfigChainPaths, J as packageInstanceFinding, K as AliasAgreementCache, Ln as assembleStylesheet, Lt as BUILT_IN_EXTENSION_POLICY, M as buildPathAliasesJson, N as enforceExternalTokenContracts, Nn as contentHash, O as runProjectAnalysis, On as generatedModuleCode, Ot as unresolvableIncludesMessage, P as resolveAssetFile, Pn as parseInternalWire, Q as pruneStaleAssets, Sn as surfaceManifestDiagnostics, St as nativeKitSourceRoot, T as stableStringify, Y as packageReadRecord, Z as assertRuntimeImportSuppliesTerminals, _ as buildSystemPropsModule, _t as importedKitDiagnostics, an as unmatchedExcludeLines, b as loadSystemConfig, cn as sharesVolumeRoot, ct as adaptedOriginals, d as toWatchKeys, dn as isEngineTransformExtension, f as diffFilePlans, ft as excludeCollectedPackages, gn as SYSTEM_INSTANCE_MISMATCH, gt as firstOwners, ht as findPackageRoot, in as resolveVerbosity, j as resolveLightningTargets, jn as substituteSheetAssets, kn as reportSurvivingAssetPlaceholders, kt as walkPackageSources, ln as DEFAULT_EXTENSIONS, lt as bareSpecifierPackageName, m as snapshotFilePlans, nn as outputSourceMessage, nt as createV2EngineApi, on as createSourceIdentity, ot as projectExternalFileOwners, p as hashReplacementPlans, pt as extractSystemFilePackages, q as compareAliases, rn as resolveMode, s as builtInAssetClassification, sn as isPathWithinRoot, tn as outputSourceGuard, ut as collectExternalPackageSources, vt as isExcludedPackageRelativePath, wn as unreadableSourceDiagnostic, x as systemLoadReads, xn as severityFor, yn as isDeletedSource, yt as isPackageSpecifier, zt as extensionPolicyJson } from "./pipeline-DAcqiv0D.mjs";
 import { randomUUID } from "crypto";
 import { existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, unlinkSync, watch, writeFileSync } from "fs";
 import { basename, dirname, extname, isAbsolute, join, posix, relative, resolve, sep } from "path";
@@ -50,6 +50,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
@@ -372,11 +416,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:
@@ -400,37 +448,30 @@ function claimUnmatchedExcludeReport(key) {
 	state.unmatchedExcludesReported = true;
 	return true;
 }
-function getSharedCss(key) {
-	return findSession(key)?.sharedCss ?? "";
+/** True for the build's first caller only: the one that reports what the
+*  build extracted. */
+function claimExtractionReport(key) {
+	const state = joined(key);
+	if (state.extractionReported) return false;
+	state.extractionReported = true;
+	return true;
 }
-function setSharedCss(key, css) {
-	joined(key).sharedCss = css;
+function getSharedCss(key) {
+	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
@@ -448,18 +489,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
@@ -485,15 +520,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
@@ -671,6 +701,8 @@ const OPTION_CLASSES = {
 	layers: digestOf("layers"),
 	engine: digestOf("engine"),
 	mode: digestOf("mode"),
+	runtimeImport: digestOf("runtimeImport"),
+	closedDynamicImports: digestOf("closedDynamicImports"),
 	root: "excluded"
 };
 /** The options a build's analysis depends on, each as stable text; each is
@@ -723,17 +755,10 @@ 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
+			unmatchedExcludesReported: false,
+			extractionReported: false
 		};
 		sessions.set(id, state);
 		return state;
@@ -886,6 +911,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) {
 	try {
@@ -905,9 +933,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 = 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. */
@@ -941,12 +966,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;
@@ -1018,8 +1043,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;
@@ -1061,6 +1086,27 @@ 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 ? [] : [resolve(this.rootDir, this.options.system)];
+		return {
+			files: [.../* @__PURE__ */ new Set([
+				...system,
+				...this.systemDependencyPaths,
+				...this.assetDependencyPaths,
+				...this.configInputPaths
+			])],
+			missing: this.systemMissingPaths.filter((path) => !covered.some((root) => isPathWithinRoot(root, path))),
+			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) {
@@ -1152,6 +1198,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);
 	}
@@ -1232,6 +1282,12 @@ var ExtractionSession = class {
 	*  excluded as literal path prefixes from discovery and from package
 	*  collection, whatever the user's list. */
 	structuralExclude = [];
+	/** The build configuration files the host loaded, absolute: config
+	*  roots, beside the well-known tool config names, whose unanalysed
+	*  imports open nothing the app renders. */
+	buildConfigFiles = [];
+	/** How long the last full pass took to load the system, in ms. */
+	systemLoadMs = 0;
 	scanConfigMemo = null;
 	/** Resolve the scan configuration from options — the single source of the
 	*  exclude/extension policy shared by the full and incremental pipelines,
@@ -1429,6 +1485,7 @@ var ExtractionSession = class {
 		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);
 		};
@@ -1578,6 +1635,7 @@ var ExtractionSession = class {
 						else this.fileCache.set(key, prior);
 					}
 					this.externalFileOwners = priorExternalFileOwners;
+					this.hostSuppliedKeys = priorHostSuppliedKeys;
 				}
 				if (this.statusAttemptOpen) {
 					this.debouncePending.clear();
@@ -1606,6 +1664,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. */
@@ -1652,9 +1724,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,
@@ -1809,24 +1885,32 @@ var ExtractionSession = class {
 		this.assetDependencyKeys.clear();
 		this.recordSystemDependencies(resolvedSystemPath, this.system.dependencies ?? [], this.system.missing ?? []);
 		bt.systemLoad = this.elapsed(t);
+		this.systemLoadMs = bt.systemLoad;
 		t = this.now();
 		const { excludeMatcher, extensionsSet } = this.scanConfig;
 		const files = discoverFiles(rootDir, rootDir, excludeMatcher, extensionsSet);
+		const systemPackageRoot = findPackageRoot(resolvedSystemPath);
+		const discovered = new Set(files);
+		const outsideRoot = files.length === 0 ? [] : [resolvedSystemPath, ...this.systemDependencyPaths];
+		for (const dependency of outsideRoot) if (!discovered.has(dependency) && !isPathWithinRoot(rootDir, dependency) && !dependency.split(sep).includes("node_modules") && extensionsSet.has(extname(dependency)) && findPackageRoot(dependency) === systemPackageRoot) {
+			discovered.add(dependency);
+			files.push(dependency);
+		}
 		if (claimUnmatchedExcludeReport(this.key)) for (const line of unmatchedExcludeLines(excludeMatcher)) this.logger.error(line);
 		bt.fileDiscovery = this.elapsed(t);
 		t = this.now();
 		const rawEntries = [];
 		const ingestionFailures = [];
 		const readPaths = /* @__PURE__ */ new Set();
+		const supplied = /* @__PURE__ */ new Set();
 		for (const filePath of files) {
 			const relPath = relative(rootDir, filePath);
 			readPaths.add(filePath);
 			let source;
 			try {
-				const supplied = hostSources.get(filePath);
-				source = supplied ?? readFileSync(filePath, "utf-8");
-				if (supplied === void 0) this.hostSuppliedKeys.delete(relPath);
-				else this.hostSuppliedKeys.add(relPath);
+				const hostSource = hostSources.get(filePath);
+				source = hostSource ?? readFileSync(filePath, "utf-8");
+				if (hostSource !== void 0) supplied.add(relPath);
 			} catch (err) {
 				if (!isDeletedSource(err)) ingestionFailures.push(unreadableSourceDiagnostic(relPath, err));
 				continue;
@@ -1847,7 +1931,6 @@ var ExtractionSession = class {
 			extensions: context.extensions
 		});
 		const discoveryDiagnostics = [];
-		const systemPackageRoot = findPackageRoot(resolvedSystemPath);
 		const kitMembers = /* @__PURE__ */ new Map();
 		const packageNames = await extractSystemFilePackages(resolvedSystemPath, { systemMembership: this.engine().systemMembership ?? requireEngine().systemMembership }, (diagnostic) => discoveryDiagnostics.push(diagnostic), (specifier, importer) => findPackageRoot(importer) === systemPackageRoot ? resolver.resolveSpecifier(specifier) : resolver.loaderResolve(specifier, dirname(importer)), context.extensions, kitMembers);
 		discoveryDiagnostics.push(...importedKitDiagnostics(rawEntries, this.engine(), rootDir, packageNames, (entries) => this.corpus.facts(entries)));
@@ -1956,7 +2039,9 @@ var ExtractionSession = class {
 			for (const entry of admitted.entries) {
 				const entryPath = 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,
@@ -1971,13 +2056,15 @@ var ExtractionSession = class {
 			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 = 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,9 +2074,7 @@ var ExtractionSession = class {
 			clearEngineCache(() => this.engine());
 			await this.analyzeAndEmit(accepted.analysisEntries, packageMap, false, bt, pipelineStart, pending);
 			this.publishSourceIngestion(accepted, "full", (path) => rawEntries.find((entry) => entry.path === path));
-			setSharedExternalDirs(this.key, admitted.packageDirs);
-			setSharedExternalEntries(this.key, admitted.sourceEntries);
-			setSharedExternalSideEffects(this.key, admitted.sourceEntrySideEffects);
+			this.hostSuppliedKeys = supplied;
 			this.onExternalRootsCommitted?.(this.externalWatchRoots);
 			setOwningWatchSession(this.key, this);
 		} catch (err) {
@@ -2080,6 +2165,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);
@@ -2259,8 +2345,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,
@@ -2277,7 +2363,13 @@ var ExtractionSession = class {
 				packageDirs: this.externalPackageDirs.map((dir) => relative(this.rootDir, dir)),
 				linkedDirs: this.externalLinkedDirs.map((dir) => relative(this.rootDir, dir)),
 				outputDirs: this.externalOutputDirs.map((dir) => relative(this.rootDir, dir)),
-				extensions: this.extensionPolicy
+				extensions: this.extensionPolicy,
+				configFiles: this.buildConfigFiles.map((file) => relative(this.rootDir, file).split(sep).join("/")),
+				systemModules: [...new Set([resolve(this.rootDir, this.options.system), ...this.systemDependencyPaths].map((file) => relative(this.rootDir, file).split(sep).join("/")))],
+				closedDynamicImports: (this.options.closedDynamicImports ?? []).map((site) => ({
+					...site,
+					importer: relative(this.rootDir, resolve(this.rootDir, site.importer)).split(sep).join("/")
+				}))
 			}
 		};
 		this.writeAnalysisStatus("analyzing", pending);
@@ -2307,10 +2399,9 @@ var ExtractionSession = class {
 		bt.jsonParse = result.timings.parseMs;
 		const manifest = result.manifest;
 		this.lastComponentCount = Object.keys(manifest?.components ?? {}).length;
-		if (!devMode) {
-			bt.analysis = (bt.jsonSerialize ?? 0) + (bt.rustExtract ?? 0) + (bt.jsonParse ?? 0);
-			if (manifest?.report) this.log(`Extracted ${manifest.report.components_extracted ?? "?"}/${manifest.report.components_total ?? "?"} components (${bt.analysis}ms)`);
-		}
+		const analysisMs = (bt.jsonSerialize ?? 0) + (bt.rustExtract ?? 0) + (bt.jsonParse ?? 0);
+		if (!devMode) bt.analysis = analysisMs;
+		if (manifest?.report && claimExtractionReport(this.key)) this.log(`Extracted ${manifest.report.components_extracted ?? "?"}/${manifest.report.components_total ?? "?"} components (${analysisMs}ms)`);
 		const sheets = this.substituteAssetReferences({
 			variableCss: system.variableCss,
 			globalCss: result.globalCss,
@@ -2344,7 +2435,6 @@ var ExtractionSession = class {
 			prefix: `[${this.driverLabel}]`,
 			surface: "generated runtime modules"
 		});
-		setSharedCss(this.key, fullCss);
 		const systemPropsContent = buildSystemPropsModule({
 			systemPropMapJson: JSON.stringify(manifest?.system_prop_map ?? {}),
 			groupRegistryJson: system.groupRegistryJson,
@@ -2352,20 +2442,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 = hashReplacementPlans(snapshotFilePlans(manifest), systemPropsContent);
 		if (this.lastCommit === null) this.lastCommit = this.seedCommitFromDisk();
@@ -2385,6 +2461,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);
 	}
@@ -2589,7 +2678,6 @@ var ExtractionSession = class {
 	publishReplacementEpoch(epoch) {
 		if (!this.persistArtifacts) {
 			this.lastEpochValue = epoch;
-			setReplacementEpoch(this.key, epoch);
 			return;
 		}
 		const onDisk = this.diskEpochValue();
@@ -2603,7 +2691,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. */
@@ -2820,7 +2907,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();
 }
@@ -2986,16 +3076,14 @@ function startTurbopackWatcher(session, rootDir, options = {}) {
 		if (isPathWithinRoot(rootDir, path) && !relative(rootDir, path).split(/[\\/]/).some((segment) => IGNORED_SEGMENTS.has(segment))) return true;
 		return [...externalWatchers.keys()].some((root) => isPathWithinRoot(root, path));
 	};
-	/** 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 of [
-			...session.systemDependencyPaths,
-			...session.assetDependencyPaths,
-			...session.configInputPaths
-		]) {
+		const plan = session.watchPlan();
+		for (const path of [...plan.files, ...plan.missing]) {
 			if (watchedByRoot(path)) continue;
 			const files = wanted.get(dirname(path)) ?? /* @__PURE__ */ new Set();
 			files.add(path);
@@ -3089,4 +3177,4 @@ function startTurbopackWatcher(session, rootDir, options = {}) {
 	};
 }
 //#endregion
-export { ANIMUS_ARTIFACT_DIR, ANIMUS_CSS_MODULE_ID, CLI_COMMIT_ARTIFACT, CLI_LOCK_ARTIFACT, CLI_LOCK_HEARTBEAT_INTERVAL_MS, CLI_LOCK_STALE_AFTER_MS, COALESCING_WINDOW_MS, CoalescingWindow, EnvironmentFailure, ExtractionSession, MANIFEST_ARTIFACT, SESSION_ASSETS_DIR, STYLES_ARTIFACT, SYSTEM_PROPS_ARTIFACT, SessionConfigurationConflict, TURBOPACK_SYSTEM_PROPS_ID, analysisCommitPath, analysisInputsPath, analysisStatusPath, checkLockLiveness, collectSessionAssets, createBuildId, decodeCommitRecord, engineApi, engineFactory, engineHandle, findSession, getAnalysisStartedPromise, getAnalyzedHashes, getManifestJson, getReplacementEpoch, getSessionArtifactDir, getSharedCss, getSharedExternalDirs, getSharedExternalEntries, getSharedExternalSideEffects, getSharedSystemProps, holdDirectoryClaim, isLockHolderAlive, joinSession, lockRecordBytes, manifestPath, pruneStaleAssets, readCliLockRecord, readJsonEnvelope, releaseEngineHandle, replacementEpochPath, requireEngine, resetAnalysisStartedPromise, runSessionPipeline, sessionArtifactDir, sessionKey, setAnalysisStartedPromise, startTurbopackWatcher, stylesPath, systemPropsPath, verifyCommitRecord };
+export { ANIMUS_ARTIFACT_DIR, ANIMUS_CSS_MODULE_ID, CLI_COMMIT_ARTIFACT, CLI_LOCK_ARTIFACT, CLI_LOCK_HEARTBEAT_INTERVAL_MS, CLI_LOCK_STALE_AFTER_MS, COALESCING_WINDOW_MS, CoalescingWindow, EnvironmentBuilds, EnvironmentFailure, ExtractionSession, MANIFEST_ARTIFACT, SESSION_ARTIFACT, SESSION_ASSETS_DIR, STYLES_ARTIFACT, SYSTEM_PROPS_ARTIFACT, SessionConfigurationConflict, TURBOPACK_SYSTEM_PROPS_ID, analysisCommitPath, analysisInputsPath, analysisStatusPath, checkLockLiveness, collectSessionAssets, createBuildId, decodeCommitRecord, engineApi, engineFactory, engineHandle, findSession, getAnalysisStartedPromise, getAnalyzedHashes, getManifestJson, getReplacementEpoch, getSessionArtifactDir, getSharedCss, getSharedExternalDirs, getSharedExternalEntries, getSharedExternalSideEffects, getSharedSystemProps, holdDirectoryClaim, isLockHolderAlive, joinSession, lockRecordBytes, manifestPath, pruneStaleAssets, readCliLockRecord, readJsonEnvelope, releaseEngineHandle, replacementEpochPath, requireEngine, resetAnalysisStartedPromise, runSessionPipeline, sessionArtifactDir, sessionKey, setAnalysisStartedPromise, startTurbopackWatcher, stylesPath, systemPropsPath, verifyCommitRecord };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@animus-ui/extract",
-  "version": "0.1.26",
+  "version": "0.1.28",
   "description": "Animus static CSS extraction pipeline (Rust/NAPI)",
   "keywords": [
     "animus",
@@ -55,13 +55,13 @@
     "build:v2:debug": "cd crates/extract-v2 && bunx napi build --platform --no-js"
   },
   "dependencies": {
-    "@animus-ui/properties": "0.1.26",
+    "@animus-ui/properties": "0.1.28",
     "browserslist": "^4.28.8",
     "lightningcss": "^1.33.0"
   },
   "devDependencies": {
-    "@animus-ui/assertions": "0.1.26",
-    "@animus-ui/system": "0.1.26",
+    "@animus-ui/assertions": "0.1.28",
+    "@animus-ui/system": "0.1.28",
     "@mdx-js/mdx": "3.1.1",
     "@napi-rs/cli": "^3.10.5",
     "svelte": "5.57.0"