stim 1.18.0 → 1.20.0

package/dist/artifact-lifecycle-DzPpBYvK.mjs

@@ -0,0 +1,30 @@
+//#region src/engine/artifact-lifecycle.ts
+async function runArtifactLifecycle(phases) {
+	try {
+		const resolved = await phases.resolve();
+		if (resolved.kind === "ready") return resolved.artifact;
+		const cached = resolved.kind === "cached" ? resolved.artifact : await phases.claim?.() ?? null;
+		if (cached !== null) {
+			const reused = await phases.reuse(cached);
+			if (reused !== null) return reused;
+		}
+		const { build } = phases;
+		const placement = build.placement?.select() ?? null;
+		if (placement === null) await build.admit();
+		const preparation = await build.prepare();
+		const late = await build.revalidate(preparation);
+		if (late !== null) return late.ready;
+		if (build.placement && placement !== null) {
+			const offloaded = await build.placement.acquire(placement, preparation);
+			if (offloaded !== null) return offloaded.ready;
+			await build.admit();
+		}
+		const artifact = await build.compile(placement, preparation);
+		if (await build.validate(preparation) === "cacheable") await build.store(artifact);
+		return build.finish ? await build.finish(artifact) : artifact;
+	} finally {
+		phases.release();
+	}
+}
+//#endregion
+export { runArtifactLifecycle as t };

package/dist/{web-DTU0uiWj.mjs → browser-web-CzBmhmgs.mjs}

@@ -1,27 +1,36 @@
-import { t as getExecutor } from "./exec-DWhCZDGm.mjs";
+import { t as getExecutor } from "./exec-B81Qodjn.mjs";
 import { t as spawnEntry } from "./spawn-entry-Dcb7sDUz.mjs";
-import { f as refuseNoProject, l as phaseLine } from "./command-output-CBtzyIgF.mjs";
-import { E as upsertProject, p as getProject } from "./config-CgYMahz7.mjs";
-import { s as gitCommonDir, y as repoRoot } from "./worktree-CsKYexJM.mjs";
-import { i as detectIsExpo, l as isPackageResolvable, o as findCommandWorkspace } from "./project-C3ChRLZy.mjs";
-import { l as resolveProjectMetro } from "./metro-Dh8T4Ytd.mjs";
-import { i as recordWorkspaceUse, r as readWorkspaceState, v as workspaceDir, x as workspaceLogsDir } from "./workspace-state-C59dqG-Z.mjs";
-import { d as webLogFile, o as readWebRecord, p as webSupervisorLogFile, r as cdpEndpoint, s as updateWebRecord } from "./state-BG-aAk4k.mjs";
-import { T as teardownBrowserHeld, m as resolveSupervisorTarget } from "./workspaces-xXItD8Dj.mjs";
-import { a as workspaceLinks, i as workspaceLinkLine } from "./stim-desktop-Behws_fi.mjs";
-import { F as resolveSettings, W as webSettings, i as SETTING_SHAPE_REMEDY, x as metroPortSetting, z as settingShapeErrors } from "./settings-CQyMElEP.mjs";
-import { a as withWorkspaceProcessLock, i as reserveBrowserPort, n as getNamedPort } from "./named-ports-BFIz1Shz.mjs";
-import { o as readNdjsonGenerations } from "./ndjson-LGZAMsqa.mjs";
-import { c as readMetroRecords } from "./launch-verify-hskNcWkZ.mjs";
-import { o as resolveWorkspaceMetroPort } from "./start-D-IeOyoK.mjs";
-import { n as windowsLauncherArgs } from "./detached-entry-BLfcgc4O.mjs";
-import { a as sleep, n as ensureWorkspaceStorageSafely } from "./native-runtime-D_603JiC.mjs";
-import { a as findChrome, t as CHROME_INSTALL_REMEDY } from "./chrome-DJnmnS5q.mjs";
+import { p as getProject } from "./config-D0LhTY3S.mjs";
+import { a as SETTING_SHAPE_REMEDY, j as metroPortSetting, rt as webSettings } from "./settings-Bbztm4oV.mjs";
+import { r as readWorkspaceState, w as workspaceLogsDir, x as workspaceDir } from "./workspace-state-CSIFuuDa.mjs";
+import { l as phaseLine } from "./command-output-BjPN99ZB.mjs";
+import { _ as detectIsExpo, y as isPackageResolvable } from "./project-B8_duAzW.mjs";
+import { u as resolveProjectMetro } from "./metro-D_j9sN-B.mjs";
+import { P as resolveSupervisorTarget, _ as teardownBrowserHeld } from "./workspaces-D2xSHBDY.mjs";
+import { a as withWorkspaceProcessLock, i as reserveBrowserPort, n as getNamedPort } from "./named-ports-C2lvoPsb.mjs";
+import { s as readNdjsonGenerations } from "./ndjson-GOnbyvso.mjs";
+import { o as resolveWorkspaceMetroPort } from "./start-CdvcTaXr.mjs";
+import { n as windowsLauncherArgs } from "./detached-entry-BXq4fIl-.mjs";
+import { d as webLogFile, o as readWebRecord, p as webSupervisorLogFile, s as updateWebRecord } from "./state-DI84A-uu.mjs";
+import { c as readMetroRecords } from "./launch-verify-BzRdbuO1.mjs";
+import { a as sleep } from "./native-runtime-BRmWL7ru.mjs";
 import { n as sendToOwnedPage, t as liveWebRecord } from "./page-Bv9s2KwY.mjs";
+import { a as findChrome, t as CHROME_INSTALL_REMEDY } from "./chrome-Dp2lMLBe.mjs";
 import { mkdirSync, openSync } from "node:fs";
-import chalk from "chalk";
 import { randomUUID } from "node:crypto";
+import chalk from "chalk";
 //#region src/web/launch.ts
+const PORT_PLACEHOLDER = /\{port:([^}]*)\}/g;
+/** Replaces each `{port:<label>}` in a `web.url` template; `metro` is the workspace's Metro port. */
+async function resolveWebUrl(template, { metroPort, namedPort }) {
+	let url = template;
+	for (const [placeholder, label] of template.matchAll(PORT_PLACEHOLDER)) {
+		const port = label === "metro" ? metroPort : await namedPort(label);
+		if (port === null) throw new Error(`${placeholder} needs a Metro port, and this workspace has none reserved.`);
+		url = url.replace(placeholder, String(port));
+	}
+	return url;
+}
 const VERIFY_WAIT_MS = 2e4;
 const LOADING_WAIT_MS = 6e4;
 const METRO_WEB_BUNDLE = /\bWeb\s+Bundl(?:ing|ed)\b/i;
@@ -128,12 +137,10 @@ function webLaunchRemedy(verdict, { url, template, usesMetro, serve }) {
 	return usesMetro ? METRO_BUILD(url) : nothingServed;
 }
 //#endregion
-//#region src/commands/web.ts
-const PORT_PLACEHOLDER = /\{port:([^}]*)\}/g;
+//#region src/web/runtime.ts
 const REGISTER_WAIT_MS = 3e4;
-const POLL_MS = 250;
-const printNote = (line) => console.error(line);
-function failure(code, message, remedy) {
+const POLL_MS$1 = 250;
+function failure$1(code, message, remedy) {
 	return {
 		ok: false,
 		error: {
@@ -143,16 +150,6 @@ function failure(code, message, remedy) {
 		}
 	};
 }
-/** Replaces each `{port:<label>}` in a `web.url` template; `metro` is the workspace's Metro port. */
-async function resolveWebUrl(template, { metroPort, namedPort }) {
-	let url = template;
-	for (const [placeholder, label] of template.matchAll(PORT_PLACEHOLDER)) {
-		const port = label === "metro" ? metroPort : await namedPort(label);
-		if (port === null) throw new Error(`${placeholder} needs a Metro port, and this workspace has none reserved.`);
-		url = url.replace(placeholder, String(port));
-	}
-	return url;
-}
 function sameLaunch(record, config) {
 	return record.chrome === config.chrome && record.headless === config.headless && record.viewport === config.viewport && record.ignoreCertificateErrors === config.ignoreCertificateErrors;
 }
@@ -216,77 +213,12 @@ async function waitForSupervisor(root, child, launchId) {
 		const record = readWebRecord(root);
 		if (record?.launchId === launchId && record.targetId) return record;
 		if (exited) return null;
-		await sleep(POLL_MS);
+		await sleep(POLL_MS$1);
 	}
 	return null;
 }
-async function verifyLaunch(root, since, expectBundle) {
-	const startedAt = Date.now();
-	for (;;) {
-		const verdict = webLaunchVerdict({
-			records: readNdjsonGenerations(webLogFile(root)),
-			metroRecords: expectBundle ? readMetroRecords(workspaceLogsDir(root)) : [],
-			since,
-			expectBundle,
-			elapsedMs: Date.now() - startedAt
-		});
-		if (verdict) return verdict;
-		await sleep(POLL_MS);
-	}
-}
-async function runWeb({ root, headed, note }) {
-	const startedAt = Date.now();
-	await ensureWorkspaceStorageSafely(root, { note });
-	if (!getProject(root)) upsertProject(root, {});
-	const settings = resolveSettings({
-		projectPath: root,
-		gitCommonDir: gitCommonDir(root),
-		repoRoot: repoRoot(root)
-	});
-	const [shapeError] = settingShapeErrors(settings);
-	if (shapeError) return failure("STIM_BAD_ARG", shapeError, SETTING_SHAPE_REMEDY);
-	const web = webSettings(settings);
-	const usesMetro = web.url === null || web.url.includes("{port:metro}");
-	const pin = usesMetro ? metroPortSetting(root) : null;
-	if (pin?.error) return failure("STIM_BAD_ARG", pin.error, SETTING_SHAPE_REMEDY);
-	const chrome = findChrome();
-	if (!chrome) return failure("STIM_WEB_NO_CHROME", "Google Chrome or Chromium is not installed.", CHROME_INSTALL_REMEDY);
-	if (web.url === null && !detectIsExpo(root)) return failure("STIM_WEB_NO_URL", "This is not an Expo app, so Stim does not know which page to open.", "Start your web dev server on a named port, then set the page: `stim settings set web.url 'http://localhost:{port:web}/' --scope workspace`. See `stim guide web`.");
-	if (web.url === null && !isPackageResolvable(root, "react-native-web")) return failure("STIM_WEB_DEPS_MISSING", "This Expo app cannot render on the web: react-native-web is not installed.", `Run \`${EXPO_WEB_DEPENDENCIES}\` and \`stim start\`, then run \`stim web\` again.`);
-	let metroPort = getProject(root)?.metroPort ?? null;
-	if (usesMetro && (pin?.port !== null || metroPort === null)) {
-		const result = await resolveWorkspaceMetroPort(root, note, "web");
-		if (typeof result !== "number") return failure(result.code, result.message, result.remedy);
-		metroPort = result;
-	}
-	const metro = usesMetro && metroPort !== null ? await resolveProjectMetro(metroPort, root) : null;
-	const supervisor = resolveSupervisorTarget({
-		state: readWorkspaceState(root)?.supervisor,
-		record: getProject(root)?.supervisor,
-		reservedPort: metroPort
-	});
-	const { serve, foreign } = webServePlan({
-		usesMetro,
-		metro,
-		supervisorHeld: supervisor.status !== "none" && supervisor.status !== "stale",
-		missingWebPackages: usesMetro && detectIsExpo(root) ? EXPO_WEB_PACKAGES.filter((name) => !isPackageResolvable(root, name)) : []
-	});
-	let url;
-	try {
-		url = await resolveWebUrl(web.url ?? "http://localhost:{port:metro}/", {
-			metroPort,
-			namedPort: (label) => getNamedPort(root, label)
-		});
-	} catch (error) {
-		return failure("STIM_BAD_ARG", `web.url: ${error.message}`, SETTING_SHAPE_REMEDY);
-	}
-	const config = {
-		chrome,
-		headless: !headed,
-		viewport: web.viewport,
-		ignoreCertificateErrors: web.ignoreCertificateErrors
-	};
-	const launch = await withWorkspaceProcessLock(workspaceDir(root), "web", async () => {
+async function launchOwnedBrowser({ url, config }, { root, note }) {
+	return withWorkspaceProcessLock(workspaceDir(root), "web", async () => {
 		const live = liveWebRecord(readWebRecord(root));
 		if (live && sameLaunch(live, config)) {
 			const since = Date.now();
@@ -308,7 +240,7 @@ async function runWeb({ root, headed, note }) {
 			}
 		}
 		const stopped = await teardownBrowserHeld(root);
-		if (stopped.status === "failed" || stopped.status === "skipped") return failure("STIM_WEB_BROWSER_HELD", `The previous owned Chrome could not be stopped: ${stopped.reason ?? "unknown reason"}.`, "Run `stim status` and `stim guide errors teardown`.");
+		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`.");
 		const port = await reserveBrowserPort(root);
 		const since = Date.now();
 		note(chalk.dim(phaseLine("device", `starting ${config.headless ? "headless " : ""}Chrome on DevTools port ${port}`)));
@@ -319,7 +251,7 @@ async function runWeb({ root, headed, note }) {
 			config,
 			launchId
 		}), launchId);
-		if (!record) return failure("STIM_WEB_LAUNCH_FAILED", "The owned Chrome did not start.", `Read ${webSupervisorLogFile(root)} and \`stim logs --errors\`, then run \`stim web\` again.`);
+		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,
 			record,
@@ -330,80 +262,110 @@ async function runWeb({ root, headed, note }) {
 		external: true,
 		ownerPurpose: "stim web"
 	});
-	if (!launch.ok) return launch;
-	const measured = await verifyLaunch(root, launch.since, usesMetro);
-	const live = liveWebRecord(readWebRecord(root));
-	const record = live ?? launch.record;
-	const verdict = foreign ? {
-		launched: "unverified",
-		kind: "no-response",
-		reason: foreign.reason
-	} : measured;
-	const remedy = foreign ? foreign.remedy : webLaunchRemedy(verdict, {
-		url,
-		template: web.url,
-		usesMetro,
-		serve
-	});
+}
+//#endregion
+//#region src/integrations/browser-web.ts
+const POLL_MS = 250;
+function failure(code, message, remedy) {
 	return {
-		ok: true,
-		remedy: verdict.reason && remedy ? `${verdict.reason}. ${remedy}` : remedy,
-		facts: {
-			platform: "web",
-			browser: "chrome",
-			version: record.version ?? null,
-			running: live !== null,
-			pid: live?.chromeProcess?.pid ?? null,
-			supervisorPid: live?.pid ?? null,
-			url,
-			headless: record.headless,
-			viewport: record.viewport,
-			profile: record.profile,
-			cdpEndpoint: live ? cdpEndpoint(live.cdpPort) : null,
-			targetId: live?.targetId ?? null,
-			reused: launch.reused,
-			launched: verdict.launched,
-			metroPort: usesMetro ? metroPort : null,
-			logs: { dir: workspaceLogsDir(root) },
-			durationMs: Date.now() - startedAt
+		ok: false,
+		error: {
+			code,
+			message,
+			remedy
 		}
 	};
 }
-function webCommand(program) {
-	program.command("web").description("Open this workspace's page in a Stim-owned headless Chrome and capture its console, errors and failed requests in stim logs").option("--headed", "Show the Chrome window instead of running headless").option("--json", "Print the result as one JSON object; progress goes to stderr").action(async (opts) => {
-		const json = Boolean(opts.json);
-		const root = findCommandWorkspace(process.cwd());
-		if (!root) {
-			refuseNoProject({ json });
-			return;
-		}
-		recordWorkspaceUse(root);
-		const result = await runWeb({
-			root,
-			headed: Boolean(opts.headed),
-			note: printNote
-		});
-		if (!result.ok) {
-			printNote(chalk.red(phaseLine("error", `${result.error.code}: ${result.error.message}`)));
-			if (result.error.remedy) printNote(phaseLine("remedy", result.error.remedy));
-			if (json) console.log(JSON.stringify(result.error));
-			process.exitCode = 1;
-			return;
-		}
-		const { facts, remedy } = result;
-		if (remedy) printNote(chalk.yellow(phaseLine("launch", remedy)));
-		const links = workspaceLinks(root, { platform: "web" });
-		if (json) {
-			console.log(JSON.stringify(links ? {
-				...facts,
-				links
-			} : facts));
-			return;
+function browserWebProject(root) {
+	return { runtime: ({ settings, headed, note }) => ({
+		async prepare() {
+			const web = webSettings(settings);
+			const usesMetro = web.url === null || web.url.includes("{port:metro}");
+			const pin = usesMetro ? metroPortSetting(settings) : null;
+			if (pin?.error) return failure("STIM_BAD_ARG", pin.error, SETTING_SHAPE_REMEDY);
+			const chrome = findChrome();
+			if (!chrome) return failure("STIM_WEB_NO_CHROME", "Google Chrome or Chromium is not installed.", CHROME_INSTALL_REMEDY);
+			if (web.url === null && !detectIsExpo(root)) return failure("STIM_WEB_NO_URL", "This is not an Expo app, so Stim does not know which page to open.", "Start your web dev server on a named port, then set the page: `stim settings set web.url 'http://localhost:{port:web}/' --scope workspace`. See `stim guide web`.");
+			if (web.url === null && !isPackageResolvable(root, "react-native-web")) return failure("STIM_WEB_DEPS_MISSING", "This Expo app cannot render on the web: react-native-web is not installed.", `Run \`${EXPO_WEB_DEPENDENCIES}\` and \`stim start\`, then run \`stim web\` again.`);
+			let metroPort = getProject(root)?.metroPort ?? null;
+			if (usesMetro && (pin?.port !== null || metroPort === null)) {
+				const result = await resolveWorkspaceMetroPort(root, settings, note, "web");
+				if (typeof result !== "number") return failure(result.code, result.message, result.remedy);
+				metroPort = result;
+			}
+			const metro = usesMetro && metroPort !== null ? await resolveProjectMetro(metroPort, root) : null;
+			const supervisor = resolveSupervisorTarget({
+				state: readWorkspaceState(root)?.supervisor,
+				record: getProject(root)?.supervisor,
+				reservedPort: metroPort
+			});
+			const { serve, foreign } = webServePlan({
+				usesMetro,
+				metro,
+				supervisorHeld: supervisor.status !== "none" && supervisor.status !== "stale",
+				missingWebPackages: usesMetro && detectIsExpo(root) ? EXPO_WEB_PACKAGES.filter((name) => !isPackageResolvable(root, name)) : []
+			});
+			let url;
+			try {
+				url = await resolveWebUrl(web.url ?? "http://localhost:{port:metro}/", {
+					metroPort,
+					namedPort: (label) => getNamedPort(root, label)
+				});
+			} catch (error) {
+				return failure("STIM_BAD_ARG", `web.url: ${error.message}`, SETTING_SHAPE_REMEDY);
+			}
+			return {
+				ok: true,
+				prepared: {
+					url,
+					config: {
+						chrome,
+						headless: !headed,
+						viewport: web.viewport,
+						ignoreCertificateErrors: web.ignoreCertificateErrors
+					},
+					metroPort: usesMetro ? metroPort : null,
+					verification: {
+						template: web.url,
+						expectBundle: usesMetro,
+						serve,
+						foreign
+					}
+				}
+			};
+		},
+		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 sleep(POLL_MS);
+			}
+			const verdict = foreign ? {
+				launched: "unverified",
+				kind: "no-response",
+				reason: foreign.reason
+			} : measured;
+			const remedy = foreign ? foreign.remedy : webLaunchRemedy(verdict, {
+				url,
+				template,
+				usesMetro: expectBundle,
+				serve
+			});
+			return {
+				verdict,
+				remedy: verdict.reason && remedy ? `${verdict.reason}. ${remedy}` : remedy
+			};
 		}
-		const launched = facts.launched === true ? chalk.green("loaded") : chalk.yellow(facts.launched === "bundling" ? "bundling" : "unverified");
-		console.log(facts.running ? `${facts.url} ${launched} in ${facts.version ?? "Chrome"} (pid ${facts.pid}, ${facts.headless ? "headless" : "headed"}, ${facts.viewport}). DevTools: ${facts.cdpEndpoint}. Logs: stim logs --errors.` : `${facts.url} ${launched}, and the owned Chrome is no longer running. Run stim logs --errors, then stim web again.`);
-		if (links) console.error(chalk.dim(workspaceLinkLine(links)));
-	});
+	}) };
 }
 //#endregion
-export { runWeb as n, webCommand as r, resolveWebUrl as t };
+export { browserWebProject };