stim 1.21.0 → 1.23.0

package/dist/{artifact-B8T3S5gi.mjs → artifact-Dwdo7k1E.mjs}

@@ -1,18 +1,18 @@
-import { d as withDrainingCancellation, f as ownership_claim_exports } from "./exec-_UbtCQcG.mjs";
+import { h as withDrainingCancellation, x as ownership_claim_exports } from "./exec-DEoAhcze.mjs";
 import { d as workspaceDir } from "./paths-DQtTgsBf.mjs";
-import { _ as stepTimer, i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-B1UrjZHL.mjs";
-import { en as throwIfCancelled } from "./settings-CsJDEXgK.mjs";
-import { Hn as isEasAuthFailureText, Ln as RESOLVE_TIMEOUT_MS, Vn as easAuthNote } from "./budget-Bs6SxxzO.mjs";
-import { d as runCancellationSignal, r as cancelledFailure } from "./native-run-DY_RLx3C.mjs";
-import { d as prepareProviderDownloadDir, f as providerDownloadPath, p as providerUploadOutcome } from "./build-cache-DmyR9Zzc.mjs";
-import { o as compilationCacheActivityLine, t as COMPILATION_CACHE_NOT_RUN } from "./xcode-Zlx3qjEs.mjs";
-import { c as offloadPlacement, i as closeOffload, l as placementLoad, m as clearCorruptCompilationCache, n as buildPlacementCandidates, o as offloadBuild, p as COMPILATION_CACHE_CORRUPT, r as chooseBuildMachine, u as remotePhaseText } from "./client-UXD70ZbM.mjs";
-import { a as requireLocalBuild, r as namedBuildMachine, t as OffloadRefusal } from "./selection-CSl9i5qU.mjs";
-import { S as xcodeFailureReport, p as printDiagnostics } from "./support-Dlu37g6H.mjs";
-import { c as skippedMissReason } from "./prebuild-uD_ipCxF.mjs";
-import { t as buildPlacementRecord } from "./placement-log-BqGbTa61.mjs";
-import { t as acquireArtifact } from "./acquire-artifact-CD4lbiWE.mjs";
-import { r as finishIosUpload, t as IosRecipeRefusal } from "./ios-project-WuwwBdvW.mjs";
+import { _ as stepTimer, i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-Db8BqzxH.mjs";
+import { f as throwIfCancelled } from "./operation-exec-BW0em61G.mjs";
+import { Hn as isEasAuthFailureText, Ln as RESOLVE_TIMEOUT_MS, Vn as easAuthNote } from "./budget-DnPX3DXj.mjs";
+import { d as runCancellationSignal, r as cancelledFailure } from "./native-run-BUTu8T7A.mjs";
+import { d as prepareProviderDownloadDir, f as providerDownloadPath, p as providerUploadOutcome } from "./build-cache-Dv7RN200.mjs";
+import { o as compilationCacheActivityLine, t as COMPILATION_CACHE_NOT_RUN } from "./xcode-iQnROM5o.mjs";
+import { _ as clearCorruptCompilationCache, c as offloadPlacement, g as COMPILATION_CACHE_CORRUPT, i as closeOffload, l as placementLoad, n as buildPlacementCandidates, o as offloadBuild, r as chooseBuildMachine, u as remotePhaseText } from "./client-yyso1bwi.mjs";
+import { a as requireLocalBuild, r as namedBuildMachine, t as OffloadRefusal } from "./selection-DSMbWEX2.mjs";
+import { S as xcodeFailureReport, p as printDiagnostics } from "./support-BTpZ6RAJ.mjs";
+import { l as skippedMissReason } from "./prebuild-BFm63bQ0.mjs";
+import { t as buildPlacementRecord } from "./placement-log-BnGgJRRZ.mjs";
+import { n as settleArtifactUploads, t as acquireArtifact } from "./acquire-artifact-ybouwJSR.mjs";
+import { r as finishIosUpload, t as IosRecipeRefusal } from "./ios-project-CVyNwjAF.mjs";
 import { rmSync } from "node:fs";
 import { join } from "node:path";
 import { machineCapacity } from "@stim-cli/core/state";
@@ -83,6 +83,7 @@ async function acquireIosArtifact({ context, root, logFile, recipe, physical, co
 	const loadProvider = cachePolicy.remote && cacheProviderConfig && !physical ? () => providerLoad ??= d.loadCacheProvider({
 		projectRoot: root,
 		config: cacheProviderConfig,
+		env: context.env,
 		timeoutMs: timeoutFromEnv(PROVIDER_LOAD_TIMEOUT_ENV, PROVIDER_LOAD_TIMEOUT_MS, context.env)
 	}) : null;
 	if (cacheProviderConfig && physical) note(chalk.dim(phaseLine("cache", PROVIDER_SKIPPED_ON_DEVICE)));
@@ -142,9 +143,9 @@ async function acquireIosArtifact({ context, root, logFile, recipe, physical, co
 		appPath = found?.path ?? null;
 	}
 	async function resolveRemoteArtifact() {
-		if (cacheIneligible || !recipe.legacyCache) return null;
+		if (cacheIneligible || !recipe.expoCache) return null;
 		if (!appPath) {
-			const loaded = await recipe.legacyCache.load();
+			const loaded = await recipe.expoCache.load();
 			if (loaded?.unavailable) note(chalk.yellow(phaseLine("cache", `provider not usable: ${loaded.unavailable}`)));
 			else if (loaded?.provider) remote = loaded;
 			if (remote?.name === "eas") {
@@ -167,7 +168,7 @@ async function acquireIosArtifact({ context, root, logFile, recipe, physical, co
 				platform: "ios",
 				projectRoot: root,
 				fingerprintHash: fingerprint,
-				runOptions: recipe.legacyCache?.runOptions ?? null
+				runOptions: recipe.expoCache?.runOptions ?? null
 			});
 			if (hit?.appPath) {
 				let stored = null;
@@ -334,7 +335,7 @@ async function acquireIosArtifact({ context, root, logFile, recipe, physical, co
 		});
 		if (!placement.offload) {
 			hereReason = placement.reason;
-			if (placement.code === "this-mac-free" && runtime && useBuildCache && cachePolicy.remote && recipe.offload?.request(runtime).native?.provider === "xcode") return {
+			if (placement.code === "this-mac-free" && runtime && useBuildCache && cachePolicy.remote && recipe.offload !== void 0) return {
 				cacheOnly: true,
 				mode,
 				here,
@@ -379,6 +380,10 @@ async function acquireIosArtifact({ context, root, logFile, recipe, physical, co
 			selected: buildMachine,
 			onCandidates: (each) => asked = each,
 			cacheOnly: candidate.cacheOnly,
+			...useBuildCache && cachePolicy.remote && storeHash && !offload.request(candidate.runtime).native ? { reactNativeArtifact: {
+				fingerprint: storeHash,
+				request: offload.request(candidate.runtime)
+			} } : {},
 			...useBuildCache && cachePolicy.remote && storeHash && storeKey && offload.request(candidate.runtime).native?.provider === "xcode" ? { artifact: {
 				fingerprint: storeHash,
 				cacheKey: storeKey
@@ -594,7 +599,7 @@ async function acquireIosArtifact({ context, root, logFile, recipe, physical, co
 		if (!result.ok) {
 			phase("build", `FAILED after ${formatDuration(result.durationMs)}`);
 			printDiagnostics(note, result);
-			const report = result.compilationCacheCorruption ? clearCorruptCompilationCache(result.compilationCacheCorruption, root) : {
+			const report = result.compilationCacheCorruption ? await clearCorruptCompilationCache(result.compilationCacheCorruption, root) : {
 				code: result.code,
 				...xcodeFailureReport(result, logFile)
 			};
@@ -659,16 +664,19 @@ async function acquireIosArtifact({ context, root, logFile, recipe, physical, co
 			}
 		});
 		installPath = prepared;
-		if (remote && !physical && storeHash) uploadPending = d.uploadRemote({
-			context,
-			logWriter: logWriter(),
-			provider: remote.provider,
-			platform: "ios",
-			projectRoot: root,
-			fingerprintHash: storeHash,
-			buildPath: installPath,
-			runOptions: recipe.legacyCache?.runOptions ?? null
-		});
+		if (remote && !physical && storeHash) {
+			uploadPending = d.uploadRemote({
+				context,
+				logWriter: logWriter(),
+				provider: remote.provider,
+				platform: "ios",
+				projectRoot: root,
+				fingerprintHash: storeHash,
+				buildPath: installPath,
+				runOptions: recipe.expoCache?.runOptions ?? null
+			});
+			uploadPending.catch(() => {});
+		}
 		return installPath;
 	}
 	const acquired = await acquireArtifact({
@@ -729,7 +737,7 @@ async function acquireIosArtifact({ context, root, logFile, recipe, physical, co
 			};
 		},
 		settleFailed: async () => {
-			await Promise.allSettled([uploadPending, providerUpload]);
+			await settleArtifactUploads(uploadPending, providerUpload);
 		},
 		refuse: (error) => {
 			if (error instanceof OffloadRefusal) return {
@@ -816,11 +824,8 @@ async function acquireIosArtifact({ context, root, logFile, recipe, physical, co
 				return abandonedRemote || uploadWasAbandoned;
 			},
 			release: async () => {
-				try {
-					await Promise.allSettled([providerUpload, remote?.provider && "easCli" in remote.provider ? uploadPending : null]);
-				} finally {
-					acquired.release();
-				}
+				await settleArtifactUploads(providerUpload, uploadPending);
+				acquired.release();
 			}
 		}
 	};

package/dist/artifact-platform-CXcmX_j3.mjs

@@ -0,0 +1,27 @@
+import { t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { join } from "node:path";
+//#region src/macos/artifact-platform.ts
+async function validateMacosArtifactPlatform(context, bundle, product, signal) {
+	const binary = join(bundle, "Contents", "MacOS", product);
+	const options = {
+		timeoutMs: 3e4,
+		signal,
+		declareFor: context
+	};
+	const architecture = process.arch === "x64" ? "x86_64" : process.arch;
+	const archs = await getExecutor().runFileAsync("xcrun", [
+		"lipo",
+		"-archs",
+		binary
+	], options);
+	const platform = await getExecutor().runFileAsync("xcrun", [
+		"vtool",
+		"-arch",
+		architecture,
+		"-show-build",
+		binary
+	], options);
+	if (!archs.trim().split(/\s+/).includes(architecture) || !/^\s*platform\s+MACOS\s*$/m.test(platform)) throw new Error("The cached macOS executable does not match this platform and architecture.");
+}
+//#endregion
+export { validateMacosArtifactPlatform as t };

package/dist/{browser-web-QQzVjz3O.mjs → browser-web-CeEVlGug.mjs}

@@ -1,25 +1,26 @@
-import { t as getExecutor } from "./exec-_UbtCQcG.mjs";
-import { d as workspaceDir, m as workspaceLogsDir } from "./paths-DQtTgsBf.mjs";
-import { p as getProject } from "./config-CYcBF478.mjs";
-import { l as phaseLine } from "./command-output-B1UrjZHL.mjs";
-import { r as readWorkspaceState } from "./workspace-state-Cjuigeeu.mjs";
-import { Qt as cancellableSleep, a as SETTING_SHAPE_REMEDY, at as webSettings, j as metroPortSetting } from "./settings-CsJDEXgK.mjs";
-import { b as isPackageResolvable, v as detectIsExpo } from "./project-BZNjmW_8.mjs";
-import { s as readNdjsonGenerations } from "./ndjson-CgE_o3Dl.mjs";
-import { f as resolveProjectMetro } from "./metro-DEXpIhHC.mjs";
-import { f as webLogFile, m as webSupervisorLogFile, o as readWebRecord, s as updateWebRecord } from "./state-C4ZtUisW.mjs";
-import { en as readMetroRecords } from "./budget-Bs6SxxzO.mjs";
-import { T as teardownBrowserHeld, m as resolveSupervisorTarget } from "./workspaces-BccMFmGQ.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-1_1OoVW5.mjs";
-import { i as reserveBrowserPort, n as getNamedPort } from "./named-ports-BWTzt6mu.mjs";
-import { n as sendToOwnedPage, t as liveWebRecord } from "./page-CPaHeYqj.mjs";
-import { a as findChrome, t as CHROME_INSTALL_REMEDY } from "./chrome-B6tfCta1.mjs";
-import { o as resolveWorkspaceMetroPort } from "./start-7lpH7hmN.mjs";
+import { g as process_identity_exports, i as withWorkspaceProcessLock, r as WorkspaceProcessCleanupError, t as getExecutor, x as ownership_claim_exports } from "./exec-DEoAhcze.mjs";
+import { d as workspaceDir, m as workspaceLogsDir$1 } from "./paths-DQtTgsBf.mjs";
+import { p as getProject } from "./config-DlrsduwG.mjs";
+import { l as phaseLine } from "./command-output-Db8BqzxH.mjs";
+import { d as cancelledError, f as throwIfCancelled } from "./operation-exec-BW0em61G.mjs";
+import { r as readWorkspaceState$1 } from "./workspace-state-U08dEzhG.mjs";
+import { a as SETTING_SHAPE_REMEDY, at as webSettings, j as metroPortSetting } from "./settings-C7O8A6ZI.mjs";
+import { b as isPackageResolvable, v as detectIsExpo } from "./project-CTLNHCfE.mjs";
+import { s as readNdjsonGenerations$1 } from "./ndjson-CgE_o3Dl.mjs";
+import { d as resolveProjectMetro } from "./metro-DiXtA3Ty.mjs";
+import { f as webLogFile, m as webSupervisorLogFile, o as readWebRecord, s as updateWebRecord } from "./state--smjFSTL.mjs";
+import { en as readMetroRecords } from "./budget-DnPX3DXj.mjs";
+import { E as teardownBrowserHeld, h as resolveSupervisorTarget } from "./workspaces-BxzYlo3P.mjs";
+import { i as reserveBrowserPort, n as getNamedPort } from "./named-ports-DkEzOfzO.mjs";
+import { n as sendToOwnedPage, t as liveWebRecord } from "./page-DBL2PiUU.mjs";
+import { o as resolveWorkspaceMetroPort } from "./start-bjfiScgz.mjs";
 import { t as spawnEntry } from "./spawn-entry-jw19m8Nl.mjs";
-import { n as windowsLauncherArgs } from "./detached-entry-DFRyG1_o.mjs";
+import { n as windowsLauncherArgs } from "./detached-entry-BwNEtIrP.mjs";
+import { a as findChrome, t as CHROME_INSTALL_REMEDY } from "./chrome-Bbw689-6.mjs";
 import { randomUUID } from "node:crypto";
-import { mkdirSync, openSync } from "node:fs";
+import { mkdirSync, openSync, statSync, watch } from "node:fs";
 import { ambientEnv } from "@stim-cli/core";
+import { followLogs } from "@stim-cli/core/state";
 import chalk from "chalk";
 //#region src/web/launch.ts
 const PORT_PLACEHOLDER = /\{port:([^}]*)\}/g;
@@ -141,7 +142,7 @@ function webLaunchRemedy(verdict, { url, template, usesMetro, serve }) {
 //#endregion
 //#region src/web/runtime.ts
 const REGISTER_WAIT_MS = 3e4;
-const POLL_MS$1 = 250;
+const POLL_MS = 250;
 function failure$1(code, message, remedy) {
 	return {
 		ok: false,
@@ -172,7 +173,7 @@ function startSupervisor(root, { url, port, config, launchId }) {
 	if (!config.headless) args.push("--headed");
 	if (config.viewport !== "desktop") args.push("--viewport", config.viewport);
 	if (config.ignoreCertificateErrors) args.push("--ignore-certificate-errors");
-	mkdirSync(workspaceLogsDir(root), { recursive: true });
+	mkdirSync(workspaceLogsDir$1(root), { recursive: true });
 	const logFile = webSupervisorLogFile(root);
 	if (process.platform === "win32") {
 		const launcher = windowsLauncherArgs({
@@ -198,34 +199,67 @@ function startSupervisor(root, { url, port, config, launchId }) {
 		stdio: [
 			"ignore",
 			fd,
-			fd
+			fd,
+			"ipc"
 		],
 		env: ambientEnv()
 	});
 	child.unref?.();
 	return child;
 }
-async function waitForSupervisor(root, child, launchId) {
-	let exited = false;
-	if (process.platform !== "win32") child.once("exit", () => {
-		exited = true;
-	});
+function waitForSupervisor(root, child, launchId, signal) {
 	const deadline = Date.now() + REGISTER_WAIT_MS;
-	while (Date.now() < deadline) {
-		const record = readWebRecord(root);
-		if (record?.launchId === launchId && record.targetId) return record;
-		if (exited) return null;
-		await cancellableSleep(POLL_MS$1);
-	}
-	return null;
+	return new Promise((resolve) => {
+		let settled = false;
+		let repairTimer;
+		const finish = (record) => {
+			if (settled) return;
+			settled = true;
+			clearTimeout(repairTimer);
+			clearTimeout(deadlineTimer);
+			child.removeListener("message", onMessage);
+			child.removeListener("exit", onExit);
+			child.removeListener("error", onExit);
+			child.removeListener("disconnect", check);
+			signal?.removeEventListener("abort", check);
+			resolve(record);
+		};
+		const check = () => {
+			if (settled) return;
+			if (Date.now() >= deadline) return finish(null);
+			const record = readWebRecord(root);
+			if (record?.launchId === launchId && (record.targetId || signal?.aborted)) return finish(record);
+			if (process.platform !== "win32" && (child.exitCode !== null || child.signalCode !== null)) finish(null);
+		};
+		const onExit = () => {
+			check();
+			finish(null);
+		};
+		const onMessage = (message) => {
+			if (message === "web-registered") check();
+		};
+		const repair = () => {
+			check();
+			if (!settled) repairTimer = setTimeout(repair, process.platform === "win32" ? POLL_MS : 1e3);
+		};
+		const deadlineTimer = setTimeout(() => finish(null), REGISTER_WAIT_MS);
+		child.on("message", onMessage);
+		if (process.platform !== "win32") child.once("exit", onExit);
+		child.once("error", onExit);
+		child.once("disconnect", check);
+		signal?.addEventListener("abort", check);
+		check();
+		if (!settled) repairTimer = setTimeout(repair, process.platform === "win32" ? POLL_MS : 1e3);
+	});
 }
-async function launchOwnedBrowser({ url, config }, { root, note }) {
-	return withWorkspaceProcessLock(workspaceDir(root), "web", async () => {
+async function launchOwnedBrowser({ url, config }, { root, note, signal }) {
+	return withWorkspaceProcessLock(workspaceDir(root), "web", async (claim) => {
+		throwIfCancelled(signal, "browser launch");
 		const live = liveWebRecord(readWebRecord(root));
 		if (live && sameLaunch(live, config)) {
 			const since = Date.now();
 			try {
-				await sendToOwnedPage(live, "Page.navigate", { url });
+				await sendToOwnedPage(live, "Page.navigate", { url }, signal);
 				updateWebRecord(root, live, { url });
 				note(chalk.dim(phaseLine("device", `reusing the owned Chrome (pid ${live.chromeProcess?.pid})`)));
 				return {
@@ -238,21 +272,53 @@ async function launchOwnedBrowser({ url, config }, { root, note }) {
 					reused: true
 				};
 			} catch (error) {
+				throwIfCancelled(signal, "browser launch");
 				note(chalk.dim(phaseLine("device", `restarting the owned Chrome: ${error.message}`)));
 			}
 		}
+		throwIfCancelled(signal, "browser launch");
 		const stopped = await teardownBrowserHeld(root);
 		if (stopped.status === "failed" || stopped.status === "skipped") return failure$1("STIM_WEB_BROWSER_HELD", `The previous owned Chrome could not be stopped: ${stopped.reason ?? "unknown reason"}.`, "Run `stim status` and `stim guide errors teardown`.");
+		throwIfCancelled(signal, "browser launch");
 		const port = await reserveBrowserPort(root);
 		const since = Date.now();
 		note(chalk.dim(phaseLine("device", `starting ${config.headless ? "headless " : ""}Chrome on DevTools port ${port}`)));
 		const launchId = randomUUID();
-		const record = await waitForSupervisor(root, startSupervisor(root, {
-			url,
-			port,
-			config,
-			launchId
-		}), launchId);
+		throwIfCancelled(signal, "browser launch");
+		(0, ownership_claim_exports.markClaimChildPending)(claim);
+		let child;
+		try {
+			child = startSupervisor(root, {
+				url,
+				port,
+				config,
+				launchId
+			});
+		} catch (error) {
+			(0, ownership_claim_exports.clearClaimChild)(claim);
+			throw error;
+		}
+		let record;
+		try {
+			const captured = child.pid === void 0 ? null : (0, process_identity_exports.captureProcessIdentity)(child.pid);
+			if (captured?.ok) try {
+				(0, ownership_claim_exports.setClaimChild)(claim, {
+					pid: child.pid,
+					processToken: captured.token
+				});
+			} catch {
+				throw new WorkspaceProcessCleanupError([claim], "The browser supervisor could not be recorded.", "Run `stim stop`.");
+			}
+			record = await waitForSupervisor(root, child, launchId, signal);
+		} finally {
+			if (child.connected) child.disconnect();
+		}
+		if (signal?.aborted) {
+			const cleanup = record ? await teardownBrowserHeld(root) : null;
+			if (!cleanup || cleanup.status === "failed" || cleanup.status === "skipped") throw new WorkspaceProcessCleanupError([claim], "The cancelled browser launch could not be stopped.", "Run `stim stop`.");
+			(0, ownership_claim_exports.clearClaimChild)(claim);
+			throwIfCancelled(signal, "browser launch");
+		}
 		if (!record) return failure$1("STIM_WEB_LAUNCH_FAILED", "The owned Chrome did not start.", `Read ${webSupervisorLogFile(root)} and \`stim logs --errors\`, then run \`stim web\` again.`);
 		return {
 			ok: true,
@@ -262,12 +328,86 @@ async function launchOwnedBrowser({ url, config }, { root, note }) {
 		};
 	}, {
 		external: true,
-		ownerPurpose: "stim web"
+		ownerPurpose: "stim web",
+		signal
 	});
 }
 //#endregion
 //#region src/integrations/browser-web.ts
-const POLL_MS = 250;
+async function verifyLaunch(root, since, expectBundle, signal) {
+	signal?.throwIfAborted();
+	const startedAt = Date.now();
+	let stop;
+	let fileWatch;
+	let timer;
+	let queued;
+	let onAbort;
+	try {
+		return await new Promise((resolve, reject) => {
+			const schedule = () => {
+				queued ??= setImmediate(check);
+			};
+			const watchFile = () => {
+				try {
+					const file = webLogFile(root);
+					const stat = statSync(file);
+					if (fileWatch?.dev === stat.dev && fileWatch.ino === stat.ino) return;
+					fileWatch?.watcher.close();
+					fileWatch = void 0;
+					const watcher = watch(file, { persistent: false }, schedule);
+					fileWatch = {
+						watcher,
+						dev: stat.dev,
+						ino: stat.ino
+					};
+					const lost = () => {
+						if (fileWatch?.watcher === watcher) fileWatch = void 0;
+						watcher.close();
+					};
+					watcher.once("error", lost);
+					watcher.once("close", lost);
+				} catch {
+					fileWatch?.watcher.close();
+					fileWatch = void 0;
+				}
+			};
+			const check = () => {
+				clearImmediate(queued);
+				queued = void 0;
+				clearTimeout(timer);
+				try {
+					signal?.throwIfAborted();
+					watchFile();
+					const elapsedMs = Date.now() - startedAt;
+					const measured = webLaunchVerdict({
+						records: readNdjsonGenerations$1(webLogFile(root)),
+						metroRecords: expectBundle ? readMetroRecords(workspaceLogsDir$1(root)) : [],
+						since,
+						expectBundle,
+						elapsedMs
+					});
+					if (measured) resolve(measured);
+					else timer = setTimeout(check, Math.max(0, (elapsedMs < 2e4 ? VERIFY_WAIT_MS : LOADING_WAIT_MS) - elapsedMs));
+				} catch (error) {
+					reject(error);
+				}
+			};
+			stop = followLogs({
+				dir: workspaceLogsDir$1(root),
+				onRecord: schedule
+			});
+			onAbort = () => reject(cancelledError("wait"));
+			signal?.addEventListener("abort", onAbort, { once: true });
+			check();
+		});
+	} finally {
+		stop?.();
+		fileWatch?.watcher.close();
+		clearTimeout(timer);
+		clearImmediate(queued);
+		if (onAbort) signal?.removeEventListener("abort", onAbort);
+	}
+}
 function failure(code, message, remedy) {
 	return {
 		ok: false,
@@ -297,7 +437,7 @@ function browserWebProject(root) {
 			}
 			const metro = usesMetro && metroPort !== null ? await resolveProjectMetro(metroPort, root) : null;
 			const supervisor = resolveSupervisorTarget({
-				state: readWorkspaceState(root)?.supervisor,
+				state: readWorkspaceState$1(root)?.supervisor,
 				record: getProject(root)?.supervisor,
 				reservedPort: metroPort
 			});
@@ -338,19 +478,7 @@ function browserWebProject(root) {
 		},
 		launch: launchOwnedBrowser,
 		async verify({ url, verification: { template, expectBundle, serve, foreign } }, { since }) {
-			const startedAt = Date.now();
-			let measured;
-			for (;;) {
-				measured = webLaunchVerdict({
-					records: readNdjsonGenerations(webLogFile(root)),
-					metroRecords: expectBundle ? readMetroRecords(workspaceLogsDir(root)) : [],
-					since,
-					expectBundle,
-					elapsedMs: Date.now() - startedAt
-				});
-				if (measured) break;
-				await cancellableSleep(POLL_MS);
-			}
+			const measured = await verifyLaunch(root, since, expectBundle, context?.signal);
 			const verdict = foreign ? {
 				launched: "unverified",
 				kind: "no-response",