stim 1.23.1 → 1.25.0

package/dist/{error-diagnostics-DYsjJIHz.mjs → error-diagnostics-B1Mj_-7h.mjs}

@@ -1,41 +1,21 @@
-import { t as getExecutor } from "./exec-DEoAhcze.mjs";
-import { v as withDirLock$1 } from "./paths-DQtTgsBf.mjs";
-import { H as deviceSlotPlatforms, V as deviceSlotKey, p as getProject } from "./config-DlrsduwG.mjs";
-import { v as launchErrorPreview } from "./command-output-YKGWivpG.mjs";
-import { r as readWorkspaceState$1 } from "./workspace-state-U08dEzhG.mjs";
-import { I as readWorkspaceLaunches } from "./project-DhCtQWWU.mjs";
-import { d as resolveProjectMetro } from "./metro-DiXtA3Ty.mjs";
-import { S as parseLease, v as deviceLeasePath, y as fileLeaseIo } from "./activity-BpWUPgUm.mjs";
-import { o as androidHome, u as androidToolCwd } from "./android-C7sVmyI9.mjs";
-import { r as deviceConsoleLevel } from "./ios-device-BXZ0c7Kb.mjs";
-import { n as parseLogcatLine } from "./android-DR5lZ2Az.mjs";
+import { t as getExecutor } from "./exec-VFRpu1iA.mjs";
+import { H as deviceSlotPlatforms, V as deviceSlotKey, p as getProject } from "./config-BZhXY15H.mjs";
+import { v as launchErrorPreview } from "./command-output-BBvS1H6v.mjs";
+import { r as readWorkspaceState$1 } from "./workspace-state-CPSp3mav.mjs";
+import { I as readWorkspaceLaunches } from "./project-BiC68mIp.mjs";
+import { o as androidHome, u as androidToolCwd } from "./android-Cjcj8MCw.mjs";
+import { d as resolveProjectMetro } from "./metro-1pJgCX4U.mjs";
+import { i as parseLogcatLine, n as androidLogGroups, r as isAndroidCrashText } from "./android-saBeB4lr.mjs";
+import { S as parseLease, v as deviceLeasePath, y as fileLeaseIo } from "./activity-BpjwrQXU.mjs";
+import { r as deviceConsoleLevel } from "./ios-device-B6HK951C.mjs";
 import { createHash, randomUUID } from "node:crypto";
-import { existsSync, mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
+import { existsSync, readFileSync, renameSync } from "node:fs";
 import { homedir } from "node:os";
 import { basename, dirname, join, resolve, sep } from "node:path";
 import { withDirLockAsync } from "@stim-cli/core";
 import { NATIVE_CRASH_LOG_PREFIX, attachExpoErrorContext, readLogRecords, readLogTimeline } from "@stim-cli/core/state";
 import { mkdir, readFile, readdir, stat, unlink, writeFile } from "node:fs/promises";
 //#region src/diagnostics/diagnostic-store.ts
-/** Publishes an immutable diagnostic snapshot atomically; existing evidence wins. */
-function writeDiagnosticOnce(path, content) {
-	mkdirSync(dirname(path), { recursive: true });
-	withDirLock$1(`${path}.lock`, () => {
-		if (existsSync(path)) return;
-		const temporary = `${path}.${randomUUID()}.tmp`;
-		try {
-			writeFileSync(temporary, content, { flag: "wx" });
-			renameSync(temporary, path);
-		} finally {
-			try {
-				unlinkSync(temporary);
-			} catch {}
-		}
-	}, {
-		waitMs: 100,
-		pollMs: 10
-	});
-}
 /** Publishes an immutable diagnostic snapshot without blocking on content writes or lock contention. */
 async function writeDiagnosticOnceAsync(path, content, signal) {
 	signal?.throwIfAborted();
@@ -111,19 +91,13 @@ function parseIosCrash(text, target) {
 /** Extracts crash-buffer groups only when their own process header names the target app. */
 function parseAndroidCrashes(text, target, clockOffsetMs) {
 	const entries = text.split("\n").map((line) => parseLogcatLine(line, { clockOffsetMs })).filter((record) => record !== null && Number(record.ts) >= target.since && Number(record.ts) <= (target.until ?? Infinity));
-	const groups = [];
-	for (const entry of entries) {
-		const last = groups.at(-1);
-		if (!last || entry.proc !== last.at(-1)?.proc || /^\s*(?:FATAL EXCEPTION:|\*\*\* \*\*\*)/.test(entry.msg ?? "")) groups.push([entry]);
-		else last.push(entry);
-	}
-	return groups.flatMap((group) => {
+	return androidLogGroups(entries).flatMap((group) => {
 		const messages = group.map((record) => record.msg ?? "");
 		const process = messages.map((line) => /^\s*(?:Process: (.+?), PID: \d+|pid: \d+, tid: \d+, name: .*?>>> (.*?) <<<)/.exec(line)).find(Boolean);
 		const appId = process?.[1] ?? process?.[2];
 		if (appId !== target.appId) return [];
 		const msg = messages.join("\n");
-		if (!/FATAL EXCEPTION:|signal \d+ \(/.test(msg)) return [];
+		if (!isAndroidCrashText(msg)) return [];
 		return [{
 			ts: group[0].ts,
 			deviceTs: group[0].deviceTs,
@@ -590,6 +564,7 @@ async function symbolicateErrors(records, { port, timeoutMs = 2e3, request = fet
 }
 //#endregion
 //#region src/diagnostics/error-diagnostics.ts
+const SOURCE_LOCATION = /(?<![^\s()"\\])[^\s()"\\]+:\d+:\d+/g;
 function key(record) {
 	return createHash("sha256").update(JSON.stringify(record)).digest("hex");
 }
@@ -648,12 +623,12 @@ function mergeErrorCopies(records, root) {
 			record.msg,
 			record.stack,
 			record.componentStack
-		]).replaceAll(root ? `${root}/` : "\0", "").matchAll(/[^\s()"\\]+:\d+:\d+/g)].map(([location]) => location));
+		]).replaceAll(root ? `${root}/` : "\0", "").matchAll(SOURCE_LOCATION)].map(([location]) => location));
 		const existing = title && locations.size ? result.findIndex((other) => !(Array.isArray(other.mirroredSources) ? other.mirroredSources : [other.src]).includes(record.src) && (!other.platform || !record.platform || other.platform === record.platform) && errorTitle(other) === title && typeof other.ts === "number" && typeof record.ts === "number" && Math.abs(other.ts - record.ts) < 1e3 && [...JSON.stringify([
 			other.msg,
 			other.stack,
 			other.componentStack
-		]).replaceAll(root ? `${root}/` : "\0", "").matchAll(/[^\s()"\\]+:\d+:\d+/g)].some(([location]) => locations.has(location))) : -1;
+		]).replaceAll(root ? `${root}/` : "\0", "").matchAll(SOURCE_LOCATION)].some(([location]) => locations.has(location))) : -1;
 		if (existing < 0) result.push(record);
 		else {
 			const prior = result[existing];
@@ -732,7 +707,7 @@ async function errorDiagnostics(input, { root, logsDir, port, allowRequest = fal
 			rendered[entry.index] = value;
 			if (bundleLocations(value).length === bundleLocations(entry.record).length) continue;
 			try {
-				writeDiagnosticOnce(join(directory, `${key(entry.record)}.json`), JSON.stringify({
+				await writeDiagnosticOnceAsync(join(directory, `${key(entry.record)}.json`), JSON.stringify({
 					original: key(entry.record),
 					rendered: value
 				}));

package/dist/{errors-ccaPc4ox.mjs → errors-DHm_U5gv.mjs}

@@ -179,11 +179,12 @@ function metroStoreConfirmedRoot(line) {
 	const root = line.slice(51).trim();
 	return root === "" ? null : root;
 }
-function expoMetroStoreEnv({ root, storeRoot, adapterPath, existingOverride }) {
+function expoMetroStoreEnv({ root, port, storeRoot, adapterPath, existingOverride }) {
 	return {
 		EXPO_OVERRIDE_METRO_CONFIG: adapterPath,
 		STIM_METRO_STORE: storeRoot,
 		STIM_PROJECT_ROOT: root,
+		STIM_METRO_PORT: String(port),
 		...existingOverride ? { STIM_EXPO_METRO_CONFIG: existingOverride } : {}
 	};
 }

package/dist/{exec-DEoAhcze.mjs → exec-VFRpu1iA.mjs}

@@ -1,8 +1,11 @@
 import { createRequire } from "node:module";
+import { randomUUID } from "node:crypto";
+import { existsSync, rmSync } from "node:fs";
+import { availableParallelism, loadavg, tmpdir } from "node:os";
 import { join } from "node:path";
 import { ambientContext, ambientEnv } from "@stim-cli/core";
 import { createDebugLog, runId } from "@stim-cli/core/state";
-import { basename as basename$1, delimiter as delimiter$1, resolve as resolve$1 } from "path";
+import { basename as basename$1, delimiter as delimiter$1, join as join$1, resolve as resolve$1 } from "path";
 import { execSync } from "child_process";
 import spawn from "cross-spawn";
 import which from "which";
@@ -122,7 +125,8 @@ async function runReport(context, work, timeoutMs = 6e4) {
 		const expireCleanup = () => {
 			state.failure ??= [...pending.values()].find((failure) => failure !== void 0) ?? Object.assign(/* @__PURE__ */ new Error("Report cleanup did not finish within 35 seconds."), {
 				code: "STIM_CLAIM_UNAVAILABLE",
-				reportCleanup: true
+				reportCleanup: true,
+				remedy: "Check that the child processes the report started and their descendants have stopped"
 			});
 		};
 		let cleanupTimer;
@@ -346,10 +350,58 @@ async function withWorkspaceProcessLock(root, name, fn, { now = Date.now, signal
 	}
 }
 //#endregion
+//#region src/cancellation.ts
+function cancelledError(what, cause) {
+	return Object.assign(new Error(`The ${what} was cancelled.`, cause === void 0 ? void 0 : { cause }), { code: "STIM_CANCELLED" });
+}
+function throwIfCancelled(signal, what) {
+	if (signal?.aborted) throw cancelledError(what);
+}
+function cancellableSleep(ms, { signal, what = "wait", ref = true } = {}) {
+	return new Promise((resolve, reject) => {
+		if (signal?.aborted) return reject(cancelledError(what));
+		const onAbort = () => {
+			clearTimeout(timer);
+			reject(cancelledError(what));
+		};
+		const timer = setTimeout(() => {
+			signal?.removeEventListener("abort", onAbort);
+			resolve();
+		}, ms);
+		if (!ref) timer.unref();
+		signal?.addEventListener("abort", onAbort, { once: true });
+	});
+}
+//#endregion
+//#region src/process-group-exit.ts
+const BASE_MS = 5e3;
+function loadScaledBudgetMs(baseMs, capMs) {
+	const loadPerCpu = (loadavg()[0] ?? 0) / availableParallelism();
+	return Math.min(capMs, baseMs * Math.max(1, loadPerCpu));
+}
+function groupExitBudgetMs(capMs = 6e4) {
+	return loadScaledBudgetMs(BASE_MS, capMs);
+}
+async function waitForGroupExit(pid, budgetMs) {
+	const deadline = performance.now() + budgetMs;
+	while ((0, ownership_claim_exports.processGroupAlive)(pid)) {
+		if (performance.now() >= deadline) return false;
+		await cancellableSleep(25);
+	}
+	return true;
+}
+//#endregion
 //#region src/exec.ts
 const MAX_BUFFER = 67108864;
+const REPORT_CHILD_EXIT_CAP_MS = 15e3;
+const REPORT_JOB_PHASE_MS = 3e4;
+function startsInReportJob(file, opts, containProcessTree) {
+	return process.platform === "win32" && (containProcessTree || Boolean(reportSignal(ambientContext()))) && Boolean(executableIn(file, opts.env ?? ambientEnv(), opts.cwd ?? process.cwd()));
+}
 function spawnReportProbe(file, args, opts, containProcessTree = false) {
-	if (process.platform !== "win32" || !containProcessTree && !reportSignal(ambientContext()) || !executableIn(file, opts.env ?? ambientEnv(), opts.cwd ?? process.cwd())) return spawn(file, args, opts);
+	return startsInReportJob(file, opts, containProcessTree) ? spawnReportJob(file, args, opts) : spawn(file, args, opts);
+}
+function spawnReportJob(file, args, opts, markers) {
 	const env = opts.env ?? ambientEnv();
 	const systemRoot = process.env.SystemRoot ?? process.env.SYSTEMROOT;
 	if (!systemRoot) throw new Error("SystemRoot is required to contain Windows report probes.");
@@ -370,7 +422,8 @@ function spawnReportProbe(file, args, opts, containProcessTree = false) {
 				file,
 				args,
 				node: process.execPath,
-				entry: fileURLToPath(new URL("../dist/windows-report.mjs", import.meta.url))
+				entry: fileURLToPath(new URL("../dist/windows-report.mjs", import.meta.url)),
+				...markers
 			})
 		}
 	});
@@ -413,7 +466,8 @@ function reportChild(child, signal, failed) {
 	const refuse = (message) => {
 		const failure = Object.assign(new Error(message), {
 			code: "STIM_CLAIM_UNAVAILABLE",
-			reportCleanup: true
+			reportCleanup: true,
+			remedy: `Check whether the report child${pid === void 0 ? "" : ` ${pid}${process.platform === "win32" ? "" : ` (\`ps -p ${pid}\`)`}`} and its descendants are still running and stop them if they are`
 		});
 		const error = failed?.(failure) ?? failure;
 		child.stdin?.destroy();
@@ -466,16 +520,13 @@ function reportChild(child, signal, failed) {
 		if (!ended) {
 			let timer;
 			await Promise.race([nativeClosed, new Promise((resolve) => {
-				timer = setTimeout(resolve, 1e3);
+				timer = setTimeout(resolve, groupExitBudgetMs(REPORT_CHILD_EXIT_CAP_MS));
 			})]);
 			clearTimeout(timer);
+			if (!ended) await new Promise((resolve) => setImmediate(resolve));
 			if (!ended) refuse(`Report child ${pid} did not close within the cleanup budget.`);
 		}
-		if (pid !== void 0 && process.platform !== "win32") {
-			const deadline = performance.now() + 1e3;
-			while ((0, ownership_claim_exports.processGroupAlive)(pid) && performance.now() < deadline) await setTimeout$1(25);
-			if ((0, ownership_claim_exports.processGroupAlive)(pid)) refuse(`Report child ${pid} still has descendants after cleanup.`);
-		}
+		if (pid !== void 0 && process.platform !== "win32" && !await waitForGroupExit(pid, groupExitBudgetMs(REPORT_CHILD_EXIT_CAP_MS))) refuse(`Report child ${pid} still has descendants after cleanup.`);
 	})();
 	if (report) trackReportResource(context, closed, cancel, signal);
 	else {
@@ -642,26 +693,42 @@ const defaultExecutor = {
 				clearDeclaration = resolveDeclaration;
 				retainDeclaration = rejectDeclaration;
 			}) : void 0;
-			const start = () => spawnReportProbe(file, args, opts, containProcessTree || Boolean(report));
+			const contained = startsInReportJob(file, opts, containProcessTree || Boolean(report));
+			const base = contained && timeout !== void 0 ? join$1(tmpdir(), `stim-report-${process.pid}-${randomUUID()}`) : null;
+			const markers = base ? {
+				started: `${base}.started`,
+				closed: `${base}.closed`
+			} : void 0;
+			const start = () => contained ? spawnReportJob(file, args, opts, markers) : spawn(file, args, opts);
 			const child = declareFor ? spawnDeclared(declareFor, start, declaration ? { until: declaration } : {}) : start();
 			let lifetime;
 			let cancel;
 			let timer;
+			let poll;
+			let phase = markers ? "starting" : "running";
+			const stopTimers = () => {
+				clearTimeout(timer);
+				clearInterval(poll);
+				for (const marker of Object.values(markers ?? {})) try {
+					rmSync(marker, { force: true });
+				} catch {}
+			};
 			try {
 				lifetime = reportChild(child, report, (error) => {
 					const failure = claims.length ? Object.assign(new WorkspaceProcessCleanupError(claims, error.message, "Verify the child and its descendants have stopped."), { reportCleanup: true }) : error;
-					clearTimeout(timer);
+					stopTimers();
 					return failure;
 				});
 				cancel = lifetime?.cancel;
 				if (cleanupOnExit && cancel) child.once("exit", () => {
-					clearTimeout(timer);
+					stopTimers();
 					cancel?.().catch(reject);
 				});
 				lifetime?.closed.catch(reject);
 				if (declaration) lifetime?.closed.then(clearDeclaration, retainDeclaration);
 				onSpawn?.(child);
 			} catch (error) {
+				stopTimers();
 				if (cancel) cancel().then(() => lifetime?.closed).then(() => reject(error), reject);
 				else {
 					if (!report) child.kill("SIGKILL");
@@ -697,24 +764,42 @@ const defaultExecutor = {
 					}
 				}
 			};
-			timer = timeout === void 0 ? void 0 : setTimeout(() => {
-				timedOut = true;
-				if (cancel) cancel().catch(reject);
-				else {
-					child.kill(killSignal ?? "SIGTERM");
-					child.stdin?.destroy();
-					child.stdout?.destroy();
-					child.stderr?.destroy();
-				}
-			}, timeout);
+			const arm = (ms) => {
+				clearTimeout(timer);
+				timer = setTimeout(() => {
+					timedOut = true;
+					clearInterval(poll);
+					if (cancel) cancel().catch(reject);
+					else {
+						child.kill(killSignal ?? "SIGTERM");
+						child.stdin?.destroy();
+						child.stdout?.destroy();
+						child.stderr?.destroy();
+					}
+				}, ms);
+			};
+			if (timeout !== void 0 && markers) {
+				arm(REPORT_JOB_PHASE_MS);
+				poll = setInterval(() => {
+					if (phase === "starting" && existsSync(markers.started)) {
+						phase = "running";
+						arm(timeout);
+					}
+					if (phase === "running" && existsSync(markers.closed)) {
+						phase = "closing";
+						arm(REPORT_JOB_PHASE_MS);
+						clearInterval(poll);
+					}
+				}, 50);
+			} else if (timeout !== void 0) arm(timeout);
 			child.stdout?.on("data", (chunk) => capture(stdout, chunk));
 			child.stderr?.on("data", (chunk) => capture(stderr, chunk));
 			child.on("error", (error) => {
-				clearTimeout(timer);
+				stopTimers();
 				reject(redactError(error, redact));
 			});
 			const finish = async (status, signal) => {
-				clearTimeout(timer);
+				stopTimers();
 				await lifetime?.closed;
 				const discardOutput = (timedOut || overflowed || report?.aborted) && redact?.some(Boolean);
 				const out = discardOutput ? "" : Buffer.concat(stdout).toString("utf-8");
@@ -726,7 +811,10 @@ const defaultExecutor = {
 					stderr: err
 				};
 				if (report?.aborted) reject(report.reason);
-				else if (timedOut) reject(redactError(nameTimeout(Object.assign(new Error(command), result, { code: "ETIMEDOUT" }), command, timeoutMs), redact));
+				else if (timedOut && phase !== "running") {
+					const message = `The Windows report job did not ${phase === "starting" ? "start" : "exit"} within ${REPORT_JOB_PHASE_MS}ms: ${command}`;
+					reject(redactError(Object.assign(new Error(message), result, { code: "ETIMEDOUT" }), redact));
+				} else if (timedOut) reject(redactError(nameTimeout(Object.assign(new Error(command), result, { code: "ETIMEDOUT" }), command, timeoutMs), redact));
 				else if (overflowed) reject(redactError(Object.assign(/* @__PURE__ */ new Error(`Command output exceeded ${MAX_BUFFER} bytes: ${command}`), result, { code: "ENOBUFS" }), redact));
 				else if (status !== 0 || rejectStderr && err.trim()) reject(redactError(Object.assign(/* @__PURE__ */ new Error(`Command failed: ${command}${err ? `\n${err}` : ""}`), result), redact));
 				else resolve(detachedSilent ? "" : untrimmed ? out : out.trim());
@@ -855,4 +943,4 @@ function getExecutor() {
 	return active;
 }
 //#endregion
-export { __require as C, __commonJSMin as S, reportSignal as _, workspaceProcessLockError as a, debugLog as b, declareSpawnsOn as c, spawnDeclared as d, stopDeclaringSpawnsOn as f, process_identity_exports as g, withDrainingCancellation as h, withWorkspaceProcessLock as i, refuseDeclaredSpawns as l, operationState as m, isTimeoutError as n, workspaceProcessLockPath as o, isTermination as p, WorkspaceProcessCleanupError as r, allowDeclaredSpawns as s, getExecutor as t, signalDeclaredSpawns as u, runReport as v, ownership_claim_exports as x, trackReportResource as y };
+export { reportSignal as C, ownership_claim_exports as D, debugLog as E, __commonJSMin as O, process_identity_exports as S, trackReportResource as T, spawnDeclared as _, waitForGroupExit as a, operationState as b, throwIfCancelled as c, workspaceProcessLockError as d, workspaceProcessLockPath as f, signalDeclaredSpawns as g, refuseDeclaredSpawns as h, loadScaledBudgetMs as i, __require as k, WorkspaceProcessCleanupError as l, declareSpawnsOn as m, isTimeoutError as n, cancellableSleep as o, allowDeclaredSpawns as p, groupExitBudgetMs as r, cancelledError as s, getExecutor as t, withWorkspaceProcessLock as u, stopDeclaringSpawnsOn as v, runReport as w, withDrainingCancellation as x, isTermination as y };