@wyw-in-js/transform 2.0.0-alpha.0 → 2.0.0-alpha.1

package/esm/eval/broker.js

@@ -11,8 +11,8 @@ import { isStaticallyEvaluatableModule } from "../transform/isStaticallyEvaluata
 import { applyImportOverrideToOnly, getImportOverride, resolveMockSpecifier, toImportKey } from "../utils/importOverrides.js";
 import { getFileIdx } from "../utils/getFileIdx.js";
 import { collectOxcExportsAndImports } from "../utils/collectOxcExportsAndImports.js";
+import { resolveWithNativeResolver } from "../utils/nativeResolver.js";
 import { parseRequest, stripQueryAndHash } from "../utils/parseRequest.js";
-import { resolveFilenameWithConditions } from "../utils/resolveWithConditions.js";
 import { hasCachedWywPrevalExport } from "../utils/hasCachedWywPrevalExport.js";
 import { isSuperSet, mergeOnly } from "../transform/Entrypoint.helpers.js";
 import { oxcShaker } from "../shaker.js";
@@ -22,23 +22,6 @@ import { prepareModuleOnDemand } from "./prepareModuleOnDemand.js";
 import { deserializeValue, encodeGlobals, serializeValue } from "./serialize.js";
 import { createWriteQueue, writeToStream } from "./writeQueue.js";
 const DefaultModuleImplementation = NativeModule;
-const CJS_DEFAULT_CONDITIONS = [
-	"require",
-	"node",
-	"default"
-];
-const expandConditions = (conditionNames) => {
-	const result = new Set();
-	conditionNames.forEach((name) => {
-		if (name === "...") {
-			CJS_DEFAULT_CONDITIONS.forEach((condition) => result.add(condition));
-			return;
-		}
-		result.add(name);
-	});
-	return result;
-};
-const NOOP = () => {};
 const isBuiltinSpecifier = (specifier) => {
 	const normalized = specifier.startsWith("node:") ? specifier.slice(5) : specifier;
 	return DefaultModuleImplementation.builtinModules?.includes(normalized) || DefaultModuleImplementation.builtinModules?.includes(`node:${normalized}`);
@@ -160,7 +143,7 @@ const getSerializableStaticImportKeys = (services, id, cachedEntrypoint, require
 	return requiredOnly.includes("*") ? evaluatedOnly : requiredOnly;
 };
 const DEFAULT_EVAL_OPTIONS = {
-	mode: "strict",
+	errors: "strict",
 	require: "warn-and-run",
 	resolver: "bundler"
 };
@@ -203,6 +186,24 @@ const resolveDebugEvalDir = () => {
 };
 const debugEvalDir = resolveDebugEvalDir();
 let debugEvalDirReady = false;
+const toBase64 = (value) => Buffer.from(value, "utf8").toString("base64");
+const toJsonBase64 = (value) => toBase64(JSON.stringify(value));
+const serializedExportsToDebugValues = (serializedExports) => ({ exports: Object.fromEntries(Object.entries(serializedExports).map(([key, serialized]) => [key, {
+	serialized,
+	status: "serialized"
+}])) });
+const getDebugValuesStatus = (values) => {
+	const statuses = [...Object.values(values?.exports ?? {}), ...Object.values(values?.preval ?? {})].map((value) => value.status);
+	if (statuses.length === 0) {
+		return "none";
+	}
+	const hasSerialized = statuses.includes("serialized");
+	const hasStringified = statuses.includes("stringified");
+	if (hasSerialized && hasStringified) {
+		return "mixed";
+	}
+	return hasStringified ? "stringified" : "serialized";
+};
 const ensureDebugEvalDir = () => {
 	if (!debugEvalDir || debugEvalDirReady) {
 		return;
@@ -322,7 +323,7 @@ const buildRunnerInitPayload = (services, entrypoint, featuresOverride) => {
 		evalOptions: {
 			globals: encodeGlobalsCached(sanitizedGlobals),
 			importOverrides,
-			mode: evalOptions.mode ?? "strict",
+			errors: evalOptions.errors ?? "strict",
 			require: evalOptions.require ?? "warn-and-run",
 			root,
 			extensions
@@ -657,7 +658,6 @@ const canonicalizeForHash = (value) => {
 	}
 	return value;
 };
-const getInitPayloadKey = (payload) => createHash("sha256").update(JSON.stringify(canonicalizeForHash(payload))).digest("hex");
 // Hash everything in the init payload that affects whether the runner needs
 // a fresh INIT — i.e. everything except `entrypoint` (which only affects
 // __filename/__dirname rebinding, not context reuse). The broker memoizes
@@ -665,7 +665,8 @@ const getInitPayloadKey = (payload) => createHash("sha256").update(JSON.stringif
 // with one SHA-256 of the stable bits + a cheap string concat per
 // entrypoint.
 const getStableInitPayloadHash = (payload) => {
-	const { entrypoint: _entrypoint, ...stable } = payload;
+	const { entrypoint, ...stable } = payload;
+	void entrypoint;
 	return createHash("sha256").update(JSON.stringify(canonicalizeForHash(stable))).digest("hex");
 };
 // Memoize encodeGlobals on input reference. The user's globals object is
@@ -716,6 +717,12 @@ export class EvalBroker {
 	loadInFlight = new Map();
 	importsByModule = new Map();
 	onlyByModule = new Map();
+	// Modules that are part of the current eval session's link graph. Used
+	// to scope `mergeKnownDependencyOnly` to entrypoints that share the
+	// current runner's VM, instead of unioning across every cached
+	// entrypoint project-wide. Cleared whenever the runner is killed or
+	// respawned (mirrors lastSentLoadByModule).
+	sessionLinkGraph = new Set();
 	runtimeDependenciesByModule = new Map();
 	emittedDependencies = new Set();
 	// Mirrors the runner's view: for each module id, the (hash, mergedOnly) of
@@ -739,6 +746,7 @@ export class EvalBroker {
 	// re-canonicalizing+stringifying+SHA-256ing the whole payload per call.
 	stableInitHashCache = null;
 	evalSeq = 0;
+	evalFileDebugLines = null;
 	happyDomDisabled = false;
 	happyDomDisableWarned = false;
 	activeResolveRootId = null;
@@ -845,6 +853,7 @@ export class EvalBroker {
 		this.activeResolveRootId = resolveRootId;
 		this.resetPerEntrypointState(entrypoint);
 		this.evalSeq += 1;
+		this.evalFileDebugLines = activeServices.eventEmitter.enabled ? [] : null;
 		if (debugEvalDir) {
 			debugAction({
 				type: "eval:start",
@@ -856,6 +865,7 @@ export class EvalBroker {
 		try {
 			await this.initRunner(entrypoint);
 			const payload = await this.request("EVAL", { id: entrypoint.name }, EVAL_TIMEOUT_MS);
+			this.flushEvalFileDebugLines(payload.debugEvalFiles);
 			if (debugEvalDir) {
 				debugAction({
 					type: "eval:finish",
@@ -883,11 +893,62 @@ export class EvalBroker {
 				dependencies: this.collectEntrypointDependencies(entrypoint.name)
 			};
 		} finally {
+			this.evalFileDebugLines = null;
 			if (this.activeResolveRootId === resolveRootId) {
 				this.activeResolveRootId = null;
 			}
 		}
 	}
+	recordEvalFileDebugLine(payload, prepared, shouldShipCode) {
+		if (!this.evalFileDebugLines) {
+			return;
+		}
+		if (shouldShipCode && prepared.code) {
+			this.evalFileDebugLines.push({
+				contentBase64: toBase64(prepared.code),
+				evalSeq: this.evalSeq,
+				hash: prepared.hash ?? null,
+				id: payload.id,
+				importer: payload.importerId ?? null,
+				only: prepared.only,
+				payloadKind: "code",
+				request: payload.request ?? null,
+				type: "eval-file",
+				valueStatus: "none",
+				valuesBase64: null
+			});
+			return;
+		}
+		if (prepared.exports) {
+			const values = serializedExportsToDebugValues(prepared.exports);
+			this.evalFileDebugLines.push({
+				contentBase64: null,
+				evalSeq: this.evalSeq,
+				hash: prepared.hash ?? null,
+				id: payload.id,
+				importer: payload.importerId ?? null,
+				only: prepared.only,
+				payloadKind: "serialized-exports",
+				request: payload.request ?? null,
+				type: "eval-file",
+				valueStatus: getDebugValuesStatus(values),
+				valuesBase64: toJsonBase64(values)
+			});
+		}
+	}
+	flushEvalFileDebugLines(valuesById) {
+		const lines = this.evalFileDebugLines;
+		if (!lines) {
+			return;
+		}
+		for (const line of lines) {
+			this.currentServices.eventEmitter.single({
+				...line,
+				valueStatus: line.valueStatus === "none" ? getDebugValuesStatus(valuesById?.[line.id]) : line.valueStatus,
+				valuesBase64: line.valuesBase64 ?? toJsonBase64(valuesById?.[line.id] ?? {})
+			});
+		}
+	}
 	resetPerEntrypointState(entrypoint) {
 		this.runtimeDependenciesByModule.clear();
 		this.emittedDependencies.clear();
@@ -895,6 +956,8 @@ export class EvalBroker {
 		this.onlyByModule.clear();
 		this.resolveCache.clear();
 		this.resolveInFlight.clear();
+		this.sessionLinkGraph.clear();
+		this.sessionLinkGraph.add(entrypoint.name);
 		this.onlyByModule.set(entrypoint.name, ["__wywPreval"]);
 	}
 	applyModuleExports(modules) {
@@ -934,6 +997,7 @@ export class EvalBroker {
 		this.lastInitKey = null;
 		this.lastHappyDomEnabled = false;
 		this.lastSentLoadByModule.clear();
+		this.sessionLinkGraph.clear();
 		this.stableInitHashCache = null;
 		flushDebugStreams();
 	}
@@ -973,6 +1037,7 @@ export class EvalBroker {
 			this.lastInitKey = null;
 			this.lastHappyDomEnabled = false;
 			this.lastSentLoadByModule.clear();
+			this.sessionLinkGraph.clear();
 		});
 	}
 	async ensureRunner() {
@@ -1081,6 +1146,7 @@ export class EvalBroker {
 		// New process ⇒ runner's moduleCache/moduleHashes are empty, so our mirror
 		// of "what we already shipped" is stale.
 		this.lastSentLoadByModule.clear();
+		this.sessionLinkGraph.clear();
 	}
 	getStableInitHash(services, features) {
 		const pluginOptionsRef = services.options.pluginOptions;
@@ -1108,13 +1174,18 @@ export class EvalBroker {
 	async initRunner(entrypoint) {
 		const features = this.getRunnerFeatures();
 		const stableHash = this.getStableInitHash(this.currentServices, features);
-		const initKey = `${stableHash}::${entrypoint.name}`;
+		const debugEvalFiles = this.currentServices.eventEmitter.enabled;
+		const debugEvalFilesKeyPart = debugEvalFiles ? "1" : "0";
+		const initKey = `${stableHash}::${entrypoint.name}::debugEvalFiles:${debugEvalFilesKeyPart}`;
 		if (this.lastInitKey === initKey) {
 			return;
 		}
 		const nextHappyDomEnabled = isFeatureEnabled(features, "happyDOM", entrypoint.name);
 		const payload = buildRunnerInitPayload(this.services, entrypoint, features);
 		payload.reuseModules = true;
+		if (debugEvalFiles) {
+			payload.debugEvalFiles = true;
+		}
 		const timeoutMs = this.getInitTimeoutMs(entrypoint, features);
 		if (this.runner && this.lastInitKey !== null && nextHappyDomEnabled && !this.lastHappyDomEnabled && !this.happyDomDisabled) {
 			try {
@@ -1130,8 +1201,11 @@ export class EvalBroker {
 					const fallbackFeatures = this.getRunnerFeatures();
 					const fallbackPayload = buildRunnerInitPayload(this.services, entrypoint, fallbackFeatures);
 					fallbackPayload.reuseModules = true;
+					if (debugEvalFiles) {
+						fallbackPayload.debugEvalFiles = true;
+					}
 					await this.request("INIT", fallbackPayload, INIT_TIMEOUT_MS);
-					this.lastInitKey = `${this.getStableInitHash(this.currentServices, fallbackFeatures)}::${entrypoint.name}`;
+					this.lastInitKey = `${this.getStableInitHash(this.currentServices, fallbackFeatures)}::${entrypoint.name}::debugEvalFiles:${debugEvalFilesKeyPart}`;
 					this.lastHappyDomEnabled = false;
 					return;
 				}
@@ -1151,8 +1225,11 @@ export class EvalBroker {
 				const fallbackFeatures = this.getRunnerFeatures();
 				const fallbackPayload = buildRunnerInitPayload(this.services, entrypoint, fallbackFeatures);
 				fallbackPayload.reuseModules = true;
+				if (debugEvalFiles) {
+					fallbackPayload.debugEvalFiles = true;
+				}
 				await this.request("INIT", fallbackPayload, INIT_TIMEOUT_MS);
-				this.lastInitKey = getInitPayloadKey(fallbackPayload);
+				this.lastInitKey = `${this.getStableInitHash(this.currentServices, fallbackFeatures)}::${entrypoint.name}::debugEvalFiles:${debugEvalFilesKeyPart}`;
 				this.lastHappyDomEnabled = false;
 				return;
 			}
@@ -1218,16 +1295,29 @@ export class EvalBroker {
 					// context rebuild or reuseModules:false). Drop our shipped-code
 					// mirror so handleLoad ships fresh code on the next LOAD.
 					this.lastSentLoadByModule.clear();
+					this.sessionLinkGraph.clear();
 				}
 				this.resolvePending(message.id, {});
 				return;
-			case "EVAL_RESULT":
+			case "EVAL_RESULT": {
+				// Runner reports any ids it dropped from its caches during this
+				// session (e.g. modules whose link errored after a transient missing
+				// import). Mirror those evictions here — otherwise lastSentLoadByModule
+				// would keep claiming the runner has them and handleLoad would ship
+				// empty `code` on the next session, leaving the runner stuck.
+				const evictedIds = message.payload?.evictedIds;
+				if (evictedIds && evictedIds.length > 0) {
+					for (const evictedId of evictedIds) {
+						this.lastSentLoadByModule.delete(evictedId);
+					}
+				}
 				if (message.error) {
 					this.rejectPending(message.id, message.error);
 					return;
 				}
 				this.resolvePending(message.id, message.payload);
 				return;
+			}
 			case "RESOLVE":
 				this.handleResolve(message.id, message.payload).catch((error) => {
 					void this.sendMessage({
@@ -1301,7 +1391,7 @@ export class EvalBroker {
 			}
 		});
 	}
-	normalizeResolvedId(resolvedId, specifier, importerId) {
+	normalizeResolvedId(resolvedId, specifier, importerId, kind) {
 		const stripped = stripQueryAndHash(resolvedId);
 		if (!stripped) return resolvedId;
 		if (path.extname(stripped)) return resolvedId;
@@ -1331,15 +1421,29 @@ export class EvalBroker {
 		if (importerId) {
 			try {
 				const importerFile = stripQueryAndHash(importerId);
-				const resolved = DefaultModuleImplementation._resolveFilename(stripped, {
-					id: importerFile,
-					filename: importerFile,
-					paths: DefaultModuleImplementation._nodeModulePaths(path.dirname(importerFile))
+				const { conditionNames, extensions, oxcOptions } = this.services.options.pluginOptions;
+				const resolved = resolveWithNativeResolver({
+					conditionNames,
+					extensions,
+					importer: importerFile,
+					kind,
+					oxcOptions,
+					specifier: resolvedId
 				});
 				if (resolved && resolved !== stripped) {
-					return `${resolved}${suffix}`;
+					return resolved;
 				}
-			} catch {}
+			} catch (error) {
+				if (process.env.WYW_DEBUG_EVAL_RESOLVE) {
+					// eslint-disable-next-line no-console
+					console.warn("[wyw-eval:resolve:native-normalize-miss]", {
+						specifier,
+						importerId,
+						kind,
+						error
+					});
+				}
+			}
 		}
 		return resolvedId;
 	}
@@ -1380,7 +1484,7 @@ export class EvalBroker {
 		}
 		const strippedSpecifier = stripQueryAndHash(specifier);
 		if (path.isAbsolute(strippedSpecifier)) {
-			const normalized = this.normalizeResolvedId(specifier, specifier, importerId);
+			const normalized = this.normalizeResolvedId(specifier, specifier, importerId, kind);
 			const overridden = this.applyImportOverrides({
 				source: specifier,
 				resolved: normalized,
@@ -1401,15 +1505,15 @@ export class EvalBroker {
 					only: ["*"]
 				});
 			}
-			const normalized = this.normalizeResolvedId(cached.resolvedId, specifier, importerId);
+			const normalized = this.normalizeResolvedId(cached.resolvedId, specifier, importerId, kind);
 			const overridden = this.applyImportOverrides({
 				source: specifier,
 				resolved: normalized,
 				only,
 				external: cached.external
 			}, importerId, stack);
-			if (cached.usedNodeFallback) {
-				this.maybeWarnNodeFallback({
+			if (cached.usedNativeFallback) {
+				this.maybeWarnNativeFallback({
 					importerId,
 					specifier,
 					resolvedId: normalized,
@@ -1427,15 +1531,15 @@ export class EvalBroker {
 					only: ["*"]
 				});
 			}
-			const normalized = this.normalizeResolvedId(cachedResult.resolvedId, specifier, importerId);
+			const normalized = this.normalizeResolvedId(cachedResult.resolvedId, specifier, importerId, kind);
 			const overridden = this.applyImportOverrides({
 				source: specifier,
 				resolved: normalized,
 				only,
 				external: cachedResult.external
 			}, importerId, stack);
-			if (cachedResult.usedNodeFallback) {
-				this.maybeWarnNodeFallback({
+			if (cachedResult.usedNativeFallback) {
+				this.maybeWarnNativeFallback({
 					importerId,
 					specifier,
 					resolvedId: normalized,
@@ -1448,7 +1552,7 @@ export class EvalBroker {
 			if (evalOptions.customResolver) {
 				const customResolved = await evalOptions.customResolver(specifier, importerId, kind);
 				if (customResolved) {
-					const normalized = this.normalizeResolvedId(customResolved.id, specifier, importerId);
+					const normalized = this.normalizeResolvedId(customResolved.id, specifier, importerId, kind);
 					if (process.env.WYW_DEBUG_EVAL_RESOLVE) {
 						// eslint-disable-next-line no-console
 						console.warn("[wyw-eval:resolve:custom]", {
@@ -1468,7 +1572,43 @@ export class EvalBroker {
 					return { resolvedId: null };
 				}
 			}
-			if (evalOptions.resolver !== "node") {
+			if (evalOptions.resolver === "hybrid") {
+				try {
+					const nativeResolved = this.resolveWithNativeFallback(specifier, importerId, kind);
+					if (process.env.WYW_DEBUG_EVAL_RESOLVE) {
+						// eslint-disable-next-line no-console
+						console.warn("[wyw-eval:resolve:native]", {
+							specifier,
+							importerId,
+							resolved: nativeResolved.resolvedId
+						});
+					}
+					return nativeResolved;
+				} catch (error) {
+					if (process.env.WYW_DEBUG_EVAL_RESOLVE) {
+						// eslint-disable-next-line no-console
+						console.warn("[wyw-eval:resolve:native-miss]", {
+							specifier,
+							importerId,
+							kind,
+							error
+						});
+					}
+				}
+			}
+			if (evalOptions.resolver === "native") {
+				const nativeResolved = this.resolveWithNativeFallback(specifier, importerId, kind);
+				if (process.env.WYW_DEBUG_EVAL_RESOLVE) {
+					// eslint-disable-next-line no-console
+					console.warn("[wyw-eval:resolve:native]", {
+						specifier,
+						importerId,
+						resolved: nativeResolved.resolvedId
+					});
+				}
+				return nativeResolved;
+			}
+			if (evalOptions.resolver === "bundler" || evalOptions.resolver === "hybrid") {
 				let resolved = null;
 				try {
 					resolved = await this.asyncResolve(specifier, importerId, stack);
@@ -1476,7 +1616,7 @@ export class EvalBroker {
 					resolved = null;
 				}
 				if (resolved) {
-					const normalized = this.normalizeResolvedId(resolved, specifier, importerId);
+					const normalized = this.normalizeResolvedId(resolved, specifier, importerId, kind);
 					if (process.env.WYW_DEBUG_EVAL_RESOLVE) {
 						// eslint-disable-next-line no-console
 						console.warn("[wyw-eval:resolve:async]", {
@@ -1489,19 +1629,19 @@ export class EvalBroker {
 					return { resolvedId: normalized };
 				}
 			}
-			if (evalOptions.resolver === "node" || evalOptions.require !== "off") {
-				const nodeResolved = this.resolveWithNodeFallback(specifier, importerId);
+			if (evalOptions.resolver === "bundler" && evalOptions.require !== "off") {
+				const nativeResolved = this.resolveWithNativeFallback(specifier, importerId, kind);
 				if (process.env.WYW_DEBUG_EVAL_RESOLVE) {
 					// eslint-disable-next-line no-console
-					console.warn("[wyw-eval:resolve:node]", {
+					console.warn("[wyw-eval:resolve:native-fallback]", {
 						specifier,
 						importerId,
-						resolved: nodeResolved.resolvedId
+						resolved: nativeResolved.resolvedId
 					});
 				}
 				return {
-					...nodeResolved,
-					usedNodeFallback: evalOptions.resolver !== "node"
+					...nativeResolved,
+					usedNativeFallback: true
 				};
 			}
 			if (process.env.WYW_DEBUG_EVAL_RESOLVE) {
@@ -1529,8 +1669,8 @@ export class EvalBroker {
 				only,
 				external: result.external
 			}, importerId, stack);
-			if (result.usedNodeFallback && result.resolvedId) {
-				this.maybeWarnNodeFallback({
+			if (result.usedNativeFallback && result.resolvedId) {
+				this.maybeWarnNativeFallback({
 					importerId,
 					specifier,
 					resolvedId: result.resolvedId,
@@ -1632,46 +1772,30 @@ export class EvalBroker {
 			only: nextOnly
 		};
 	}
-	resolveWithNodeFallback(specifier, importerId) {
-		const extensions = DefaultModuleImplementation._extensions;
-		const added = [];
-		const { conditionNames } = this.services.options.pluginOptions;
-		const conditions = conditionNames?.length ? expandConditions(conditionNames) : undefined;
+	resolveWithNativeFallback(specifier, importerId, kind) {
+		const { conditionNames, extensions, oxcOptions } = this.services.options.pluginOptions;
 		try {
-			this.services.options.pluginOptions.extensions.forEach((ext) => {
-				if (ext in extensions) return;
-				extensions[ext] = NOOP;
-				added.push(ext);
+			const resolved = resolveWithNativeResolver({
+				conditionNames,
+				extensions,
+				importer: importerId,
+				kind,
+				oxcOptions,
+				specifier
 			});
-			const filename = importerId;
-			const strippedId = stripQueryAndHash(specifier);
-			let resolved;
-			try {
-				resolved = resolveFilenameWithConditions(DefaultModuleImplementation, strippedId, {
-					id: filename,
-					filename,
-					paths: DefaultModuleImplementation._nodeModulePaths(path.dirname(filename))
-				}, conditions);
-			} catch (error) {
-				throw new Error([
-					`[wyw-in-js] Node resolver failed during eval.`,
-					``,
-					`importer: ${filename}`,
-					`source:   ${specifier}`,
-					``,
-					`error: ${error instanceof Error ? error.message : String(error)}`
-				].join("\n"));
-			}
-			const isFileSpecifier = strippedId.startsWith(".") || path.isAbsolute(strippedId);
-			if (isFileSpecifier && path.extname(strippedId) === "" && resolved.endsWith(".cjs") && fs.existsSync(`${resolved.slice(0, -4)}.js`)) {
-				resolved = `${resolved.slice(0, -4)}.js`;
-			}
-			return { resolvedId: this.normalizeResolvedId(resolved, specifier, importerId) };
-		} finally {
-			added.forEach((ext) => delete extensions[ext]);
+			return { resolvedId: this.normalizeResolvedId(resolved, specifier, importerId, kind) };
+		} catch (error) {
+			throw new Error([
+				`[wyw-in-js] Native resolver failed during eval.`,
+				``,
+				`importer: ${importerId}`,
+				`source:   ${specifier}`,
+				``,
+				`error: ${error instanceof Error ? error.message : String(error)}`
+			].join("\n"));
 		}
 	}
-	maybeWarnNodeFallback({ importerId, specifier, resolvedId, kind }) {
+	maybeWarnNativeFallback({ importerId, specifier, resolvedId, kind }) {
 		const evalOptions = getEvalOptions(this.services);
 		const { root } = this.services.options;
 		const keyInfo = toImportKey({
@@ -1690,7 +1814,7 @@ export class EvalBroker {
 		}
 		if (policy === "error") {
 			throw new Error([
-				`[wyw-in-js] Unknown import reached during eval (Node resolver fallback)`,
+				`[wyw-in-js] Unknown import reached during eval (native resolver fallback)`,
 				``,
 				`importer: ${importerId}`,
 				`source:   ${specifier}`,
@@ -1704,7 +1828,7 @@ export class EvalBroker {
 		if (policy === "warn" && !warnedUnknownImports.has(keyInfo.key)) {
 			warnedUnknownImports.add(keyInfo.key);
 			const warningMessage = [
-				`[wyw-in-js] Unknown import reached during eval (Node resolver fallback)`,
+				`[wyw-in-js] Unknown import reached during eval (native resolver fallback)`,
 				``,
 				`importer: ${importerId}`,
 				`source:   ${specifier}`,
@@ -1759,6 +1883,7 @@ export class EvalBroker {
 				ts: performance.now()
 			});
 		}
+		this.recordEvalFileDebugLine(payload, prepared, shouldShipCode);
 		await this.sendLoadResult(id, {
 			id: payload.id,
 			code: shouldShipCode ? prepared.code : "",
@@ -1774,6 +1899,14 @@ export class EvalBroker {
 				only: merged
 			});
 		}
+		// Session link graph tracks every module that's been admitted into
+		// the current runner's VM. mergeKnownDependencyOnly uses this to
+		// narrow its consumer-set to entrypoints actually linking against
+		// the same module instance.
+		this.sessionLinkGraph.add(payload.id);
+		if (payload.importerId) {
+			this.sessionLinkGraph.add(payload.importerId);
+		}
 	}
 	async loadModule({ id, importerId, request }) {
 		const actionEntrypoint = importerId ?? id;
@@ -2092,6 +2225,14 @@ export class EvalBroker {
 		}
 		let mergedOnly = storedOnly;
 		for (const cachedEntrypoint of this.services.cache.entrypoints.values()) {
+			// Scope the union to entrypoints that are part of the CURRENT
+			// session's link graph. Cached entrypoints from prior transforms
+			// already evaluated against their own VMs; their imports must not
+			// widen this load. Empty session graph (initial load) falls back
+			// to project-wide for safety.
+			if (this.sessionLinkGraph.size > 0 && !this.sessionLinkGraph.has(cachedEntrypoint.name)) {
+				continue;
+			}
 			const { dependencies } = cachedEntrypoint;
 			if (!dependencies) {
 				continue;