stim 1.20.2 → 1.22.0

package/dist/{error-diagnostics-BR677IDM.mjs → error-diagnostics-DBWO2rxE.mjs}

@@ -1,23 +1,26 @@
-import { B as deviceSlotKey, V as deviceSlotPlatforms, p as getProject } from "./config-BYDxlMY3.mjs";
-import { t as getExecutor } from "./exec-DqKo9GKJ.mjs";
-import { a as parseLease, n as fileLeaseIo, t as deviceLeasePath } from "./device-lease-BX1sJQ2E.mjs";
-import { D as withDirLock, r as readWorkspaceState$1 } from "./workspace-state-DJt_MMvf.mjs";
-import { v as launchErrorPreview } from "./command-output-BTy8hZ0F.mjs";
-import { F as readWorkspaceLaunches } from "./project-_phNIJfs.mjs";
-import { o as androidHome, u as androidToolCwd } from "./android-Mz_Inn3w.mjs";
-import { u as resolveProjectMetro } from "./metro-DnCEjCxs.mjs";
-import { r as deviceConsoleLevel } from "./ios-device-B5veSDDQ.mjs";
-import { n as parseLogcatLine, t as androidClockOffset } from "./android-HqP1_vB_.mjs";
-import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, statSync, unlinkSync, writeFileSync } from "node:fs";
-import { basename, dirname, join, resolve, sep } from "node:path";
-import { NATIVE_CRASH_LOG_PREFIX, attachExpoErrorContext, readLogRecords, readLogTimeline } from "@stim-cli/core/state";
+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-gwpm28fu.mjs";
+import { r as readWorkspaceState$1 } from "./workspace-state-U08dEzhG.mjs";
+import { I as readWorkspaceLaunches } from "./project-wM_XFTvE.mjs";
+import { d as resolveProjectMetro } from "./metro-DiXtA3Ty.mjs";
+import { S as parseLease, v as deviceLeasePath, y as fileLeaseIo } from "./activity-CMLmzp7o.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 { createHash, randomUUID } from "node:crypto";
+import { existsSync, mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } 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(`${path}.lock`, () => {
+	withDirLock$1(`${path}.lock`, () => {
 		if (existsSync(path)) return;
 		const temporary = `${path}.${randomUUID()}.tmp`;
 		try {
@@ -33,6 +36,27 @@ function writeDiagnosticOnce(path, content) {
 		pollMs: 10
 	});
 }
+/** Publishes an immutable diagnostic snapshot without blocking on content writes or lock contention. */
+async function writeDiagnosticOnceAsync(path, content, signal) {
+	signal?.throwIfAborted();
+	await mkdir(dirname(path), { recursive: true });
+	const temporary = `${path}.${randomUUID()}.tmp`;
+	try {
+		await writeFile(temporary, content, {
+			flag: "wx",
+			signal
+		});
+		await withDirLockAsync(`${path}.lock`, () => {
+			signal?.throwIfAborted();
+			if (!existsSync(path)) renameSync(temporary, path);
+		}, {
+			waitMs: 100,
+			pollMs: 10
+		});
+	} finally {
+		await unlink(temporary).catch(() => {});
+	}
+}
 //#endregion
 //#region src/diagnostics/native-crash.ts
 const IOS_CRASH_REPORT_RETRY = "iOS crash reports can take about a minute or longer to appear. Run `stim logs --errors` again for the native stack.";
@@ -115,7 +139,7 @@ function parseAndroidCrashes(text, target, clockOffsetMs) {
 		}];
 	});
 }
-function symbolicateIos(record, report, appPath, deadline) {
+async function symbolicateIos(record, report, appPath, deadline, signal) {
 	if (!appPath || !existsSync(appPath) || !Array.isArray(record.stack)) return record;
 	const thread = report.threads?.find((entry) => entry.triggered) ?? report.threads?.[report.faultingThread ?? -1];
 	const stack = [...record.stack];
@@ -133,11 +157,11 @@ function symbolicateIos(record, report, appPath, deadline) {
 			const binary = relative ? resolve(appPath, relative) : null;
 			let matched = null;
 			if (binary && binary.startsWith(resolve(appPath) + sep) && existsSync(binary)) {
-				if (getExecutor().runFileQuiet("xcrun", [
+				if ((await crashCommand("xcrun", [
 					"dwarfdump",
 					"--uuid",
 					binary
-				], { timeoutMs: 2e3 })?.toLowerCase().includes(`uuid: ${image.uuid.toLowerCase()} (${image.arch.toLowerCase()})`)) matched = binary;
+				], { timeoutMs: 2e3 }, signal))?.toLowerCase().includes(`uuid: ${image.uuid.toLowerCase()} (${image.arch.toLowerCase()})`)) matched = binary;
 			}
 			verified.set(imageIndex, matched);
 		}
@@ -145,7 +169,7 @@ function symbolicateIos(record, report, appPath, deadline) {
 		if (!binary || Date.now() >= deadline) continue;
 		const address = image.base + frame.imageOffset;
 		if (!Number.isSafeInteger(address)) continue;
-		const output = getExecutor().runFileQuiet("xcrun", [
+		const output = await crashCommand("xcrun", [
 			"atos",
 			"-o",
 			binary,
@@ -154,7 +178,7 @@ function symbolicateIos(record, report, appPath, deadline) {
 			"-l",
 			`0x${image.base.toString(16)}`,
 			`0x${address.toString(16)}`
-		], { timeoutMs: 2e3 });
+		], { timeoutMs: 2e3 }, signal);
 		if (output && !/^0x[0-9a-f]+$/i.test(output) && !/error:|cannot|unable/i.test(output)) stack[index] = {
 			file: image.name ?? basename(binary),
 			fn: output
@@ -165,7 +189,7 @@ function symbolicateIos(record, report, appPath, deadline) {
 		stack
 	};
 }
-function symbolicateAndroid(record, root, budget) {
+async function symbolicateAndroid(record, root, budget, signal, env = process.env) {
 	if (!root || typeof record.msg !== "string" || !/#\d+ pc /.test(record.msg)) return record;
 	const frames = [...record.msg.matchAll(/^\s*#\d+ pc ([0-9a-f]+)\s+(\S+)(.*)$/gim)];
 	const stack = frames.map(([, address, file, suffix]) => ({
@@ -173,12 +197,12 @@ function symbolicateAndroid(record, root, budget) {
 		fn: `${suffix?.trim() || `0x${address}`} [captured native frame]`
 	}));
 	let deadline = Math.min(Date.now() + 2e3, budget - 1e3);
-	const ndks = join(androidHome(), "ndk");
+	const ndks = join(androidHome(env), "ndk");
 	let tools;
 	try {
-		for (const version of readdirSync(ndks).toSorted().toReversed()) {
+		for (const version of (await readdir(ndks)).toSorted().toReversed()) {
 			const prebuilt = join(ndks, version, "toolchains/llvm/prebuilt");
-			for (const host of readdirSync(prebuilt)) {
+			for (const host of await readdir(prebuilt)) {
 				const bin = join(prebuilt, host, "bin");
 				if (existsSync(join(bin, "llvm-symbolizer"))) {
 					tools = bin;
@@ -189,10 +213,10 @@ function symbolicateAndroid(record, root, budget) {
 		}
 	} catch {}
 	const files = [];
-	const visit = (directory, depth) => {
+	const visit = async (directory, depth) => {
 		if (depth > 10 || files.length > 500 || Date.now() >= deadline) return;
 		try {
-			for (const entry of readdirSync(directory, { withFileTypes: true })) if (entry.isDirectory()) visit(join(directory, entry.name), depth + 1);
+			for (const entry of await readdir(directory, { withFileTypes: true })) if (entry.isDirectory()) await visit(join(directory, entry.name), depth + 1);
 			else if (entry.isFile() && entry.name.endsWith(".so")) files.push(join(directory, entry.name));
 		} catch {}
 	};
@@ -201,7 +225,7 @@ function symbolicateAndroid(record, root, budget) {
 			"android/app/src/main/jniLibs",
 			"android/app/build/intermediates/cxx",
 			"android/app/.cxx"
-		]) visit(join(root, directory), 0);
+		]) await visit(join(root, directory), 0);
 		deadline = budget;
 		const byId = /* @__PURE__ */ new Map();
 		for (const [index, [, address, file, suffix]] of frames.entries()) {
@@ -209,21 +233,25 @@ function symbolicateAndroid(record, root, budget) {
 			const id = /\(BuildId: ([0-9a-f]+)\)/i.exec(suffix ?? "")?.[1]?.toLowerCase();
 			if (!id) continue;
 			if (!byId.has(id)) {
-				const binary = files.filter((path) => file.endsWith(".apk") || basename(path) === basename(file)).find((path) => {
-					if (Date.now() >= deadline) return false;
-					const notes = getExecutor().runFileQuiet(join(tools, "llvm-readelf"), ["--notes", path], { timeoutMs: 1e3 });
-					return /Build ID: ([0-9a-f]+)/i.exec(notes ?? "")?.[1]?.toLowerCase() === id;
-				});
+				let binary;
+				for (const path of files.filter((candidate) => file.endsWith(".apk") || basename(candidate) === basename(file))) {
+					if (Date.now() >= deadline) break;
+					const notes = await crashCommand(join(tools, "llvm-readelf"), ["--notes", path], { timeoutMs: 1e3 }, signal);
+					if (/Build ID: ([0-9a-f]+)/i.exec(notes ?? "")?.[1]?.toLowerCase() === id) {
+						binary = path;
+						break;
+					}
+				}
 				byId.set(id, binary ?? null);
 			}
 			const binary = byId.get(id);
 			if (!binary) continue;
-			const [fn, location] = getExecutor().runFileQuiet(join(tools, "llvm-symbolizer"), [
+			const [fn, location] = (await crashCommand(join(tools, "llvm-symbolizer"), [
 				"--no-inlines",
 				"--demangle",
 				`--obj=${binary}`,
 				`0x${address}`
-			], { timeoutMs: 1e3 })?.split("\n") ?? [];
+			], { timeoutMs: 1e3 }, signal))?.split("\n") ?? [];
 			const match = /^(.*):(\d+):(\d+)$/.exec(location ?? "");
 			if (fn && fn !== "??" && match && match[1] !== "??" && Number(match[2]) > 0) stack[index] = {
 				fn,
@@ -241,15 +269,15 @@ function symbolicateAndroid(record, root, budget) {
 		symbolicationNote: stack.some((frame) => !frame.line) ? "Native symbols are partial: unresolved frames retain crash-buffer symbols/addresses. Full captured report: stim logs --source device --json." : void 0
 	};
 }
-function simulatorConsolePaths(target, prepare = false, remote = false) {
+async function simulatorConsolePaths(target, prepare = false, remote = false, signal) {
 	if (remote) return void 0;
-	const container = getExecutor().runFileQuiet("xcrun", [
+	const container = await crashCommand("xcrun", [
 		"simctl",
 		"get_app_container",
 		target.deviceId,
 		target.appId,
 		"data"
-	], { timeoutMs: 2e3 });
+	], { timeoutMs: 2e3 }, signal);
 	if (!container?.startsWith("/")) return void 0;
 	const directory = join(container, "Library/Caches/Stim");
 	const key = createHash("sha256").update(JSON.stringify([
@@ -262,24 +290,35 @@ function simulatorConsolePaths(target, prepare = false, remote = false) {
 		stderr: join(directory, `launch-${key}.stderr`)
 	};
 	if (prepare) try {
-		mkdirSync(directory, { recursive: true });
-		for (const path of Object.values(paths)) writeFileSync(path, "", { flag: "wx" });
+		await mkdir(directory, { recursive: true });
+		for (const path of Object.values(paths)) await writeFile(path, "", {
+			flag: "wx",
+			signal
+		});
 	} catch {
+		signal?.throwIfAborted();
 		return;
 	}
+	signal?.throwIfAborted();
 	return paths;
 }
-function simulatorFatalConsole(target) {
-	const paths = simulatorConsolePaths(target);
-	return Object.values(paths ?? {}).flatMap((path) => {
+async function simulatorFatalConsole(target, signal) {
+	const paths = await simulatorConsolePaths(target, false, false, signal);
+	const records = [];
+	for (const path of Object.values(paths ?? {})) {
+		signal?.throwIfAborted();
 		try {
-			if (statSync(path).size > 8388608) return [];
-			if (target.until !== void 0 && statSync(path).mtimeMs > target.until) return [];
-			const text = readFileSync(path, "utf8");
+			const info = await stat(path);
+			if (info.size > 8388608) continue;
+			if (target.until !== void 0 && info.mtimeMs > target.until) continue;
+			const text = await readFile(path, {
+				encoding: "utf8",
+				signal
+			});
 			const fatal = text.split("\n").filter((line) => deviceConsoleLevel(line) === "fatal");
-			if (!fatal.length) return [];
-			return [{
-				ts: Math.max(target.since + 1, statSync(path).mtimeMs),
+			if (!fatal.length) continue;
+			records.push({
+				ts: Math.max(target.since + 1, info.mtimeMs),
 				src: "device",
 				platform: "ios",
 				level: "fatal",
@@ -291,34 +330,60 @@ function simulatorFatalConsole(target) {
 				msg: fatal.join("\n"),
 				rawReport: text,
 				symbolicationNote: `Captured app stderr; the full operating system crash report is not available yet. ${IOS_CRASH_REPORT_RETRY}`
-			}];
-		} catch {
-			return [];
-		}
-	});
+			});
+		} catch {}
+	}
+	signal?.throwIfAborted();
+	return records;
 }
 /** Reads platform crash evidence without starting, stopping or modifying a device. */
-function captureNativeCrashes(target, logsDir) {
+async function captureNativeCrashes(target, logsDir, signal, env = process.env) {
+	signal?.throwIfAborted();
 	let records = [];
 	try {
 		if (target.platform === "ios" && !target.physical && process.platform === "darwin") {
 			const deadline = Date.now() + 4e3;
-			records = simulatorFatalConsole(target);
-			const directory = join(homedir(), "Library/Logs/DiagnosticReports");
-			const nativeReports = readdirSync(directory).filter((name) => name.endsWith(".ips")).map((name) => ({
-				path: join(directory, name),
-				time: statSync(join(directory, name)).mtimeMs
-			})).filter(({ time }) => time >= target.since).toSorted((a, b) => b.time - a.time).slice(0, 50).flatMap(({ path }) => {
-				if (Date.now() >= deadline) return [];
-				if (statSync(path).size > 8388608) return [];
-				const parsed = parseIosCrash(readFileSync(path, "utf8"), target);
-				return parsed ? [symbolicateIos(parsed.record, parsed.report, target.appPath, deadline)] : [];
-			});
+			records = await simulatorFatalConsole(target, signal);
+			const directory = join(env.HOME || homedir(), "Library/Logs/DiagnosticReports");
+			const reports = [];
+			for (const name of await readdir(directory)) {
+				signal?.throwIfAborted();
+				if (!name.endsWith(".ips")) continue;
+				const path = join(directory, name);
+				const time = (await stat(path)).mtimeMs;
+				if (time >= target.since) reports.push({
+					path,
+					time
+				});
+			}
+			reports.sort((a, b) => b.time - a.time);
+			const nativeReports = [];
+			for (const { path } of reports.slice(0, 50)) {
+				if (Date.now() >= deadline) break;
+				if ((await stat(path)).size > 8388608) continue;
+				const parsed = parseIosCrash(await readFile(path, {
+					encoding: "utf8",
+					signal
+				}), target);
+				if (parsed) nativeReports.push(await symbolicateIos(parsed.record, parsed.report, target.appPath, deadline, signal));
+			}
 			if (nativeReports.length) records = nativeReports;
 		} else if (target.platform === "android") {
-			const offset = androidClockOffset(target.deviceId);
-			if (offset === null) return [];
-			const text = getExecutor().runFileQuiet("adb", [
+			const before = Date.now();
+			const clock = (await crashCommand("adb", [
+				"-s",
+				target.deviceId,
+				"shell",
+				"date",
+				"+%s%3N"
+			], {
+				timeoutMs: 1e3,
+				cwd: androidToolCwd()
+			}, signal))?.trim();
+			const after = Date.now();
+			if (!/^\d{13}$/.test(clock ?? "") || after < before || after - before > 1e3) return [];
+			const offset = Math.round((before + after) / 2) - Number(clock);
+			const text = await crashCommand("adb", [
 				"-s",
 				target.deviceId,
 				"logcat",
@@ -332,11 +397,12 @@ function captureNativeCrashes(target, logsDir) {
 			], {
 				timeoutMs: 3e3,
 				cwd: androidToolCwd()
-			});
+			}, signal);
 			const deadline = Date.now() + 4e3;
-			if (text) records = parseAndroidCrashes(text, target, offset).map((record) => symbolicateAndroid(record, target.root, deadline));
+			if (text) for (const record of parseAndroidCrashes(text, target, offset)) records.push(await symbolicateAndroid(record, target.root, deadline, signal, env));
 		}
 	} catch {}
+	signal?.throwIfAborted();
 	for (const record of records) {
 		if (target.slot && target.slot !== "default") record.slot = target.slot;
 		try {
@@ -346,23 +412,26 @@ function captureNativeCrashes(target, logsDir) {
 				record.incident ?? record.deviceTs,
 				record.rawReport
 			])).digest("hex");
-			writeDiagnosticOnce(join(logsDir, `${NATIVE_CRASH_LOG_PREFIX}${key}.ndjson`), `${JSON.stringify(record)}\n`);
+			await writeDiagnosticOnceAsync(join(logsDir, `${NATIVE_CRASH_LOG_PREFIX}${key}.ndjson`), `${JSON.stringify(record)}\n`, signal);
 		} catch {}
 	}
+	signal?.throwIfAborted();
 	return records;
 }
-function printNativeCrashReport(target, logsDir, emit, remote) {
+async function printNativeCrashReport(target, logsDir, emit, remote, signal, env) {
 	if (remote) return;
-	for (const line of launchErrorPreview(captureNativeCrashes(target, logsDir), target.root)) emit(line);
+	for (const line of launchErrorPreview(await captureNativeCrashes(target, logsDir, signal, env), target.root)) emit(line);
 }
-/** Captures native crash reports for this workspace's current launches and returns the whole timeline. */
-function captureWorkspaceCrashes(root, logsDir) {
-	const timeline = readLogRecords(logsDir, (name) => !name.startsWith(NATIVE_CRASH_LOG_PREFIX));
-	const attempts = timeline.filter((record) => record.event === "launch_attempt");
+/** Captures current launch crashes. Supplying attempts skips the timeline read and returns an empty array. */
+async function captureWorkspaceCrashes(root, logsDir, attempts, signal, env = process.env) {
+	signal?.throwIfAborted();
+	const timeline = attempts === void 0 ? readLogRecords(logsDir, (name) => !name.startsWith(NATIVE_CRASH_LOG_PREFIX)) : [];
+	const launchAttempts = attempts ?? timeline.filter((record) => record.event === "launch_attempt");
 	const launches = readWorkspaceLaunches(root);
 	const latest = /* @__PURE__ */ new Map();
-	for (const attempt of attempts) if (attempt.platform === "ios" || attempt.platform === "android") latest.set(deviceSlotKey(attempt.platform, String(attempt.slot ?? "default")), attempt);
+	for (const attempt of launchAttempts) if (attempt.platform === "ios" || attempt.platform === "android") latest.set(deviceSlotKey(attempt.platform, String(attempt.slot ?? "default")), attempt);
 	for (const [key, attempt] of latest) {
+		signal?.throwIfAborted();
 		const platform = attempt.platform;
 		const slot = String(attempt.slot ?? "default");
 		try {
@@ -383,7 +452,7 @@ function captureWorkspaceCrashes(root, logsDir) {
 				if (platform === "ios" && configured.deviceUdid !== deviceId) continue;
 				if (platform === "android") {
 					if (!configured.avdName) continue;
-					if (getExecutor().runFileQuiet("adb", [
+					if ((await crashCommand("adb", [
 						"-s",
 						deviceId,
 						"emu",
@@ -392,10 +461,10 @@ function captureWorkspaceCrashes(root, logsDir) {
 					], {
 						timeoutMs: 2e3,
 						cwd: androidToolCwd()
-					})?.split("\n")[0]?.trim() !== configured.avdName) continue;
+					}, signal))?.split("\n")[0]?.trim() !== configured.avdName) continue;
 				}
 			}
-			captureNativeCrashes({
+			await captureNativeCrashes({
 				root,
 				slot,
 				platform,
@@ -405,10 +474,31 @@ function captureWorkspaceCrashes(root, logsDir) {
 				until,
 				physical: attempt?.physical === true,
 				appPath: attempt?.appPath ?? readWorkspaceState$1(root)?.lastBuild?.appPath
-			}, logsDir);
+			}, logsDir, signal, env);
 		} catch {}
 	}
-	return readLogTimeline(logsDir, timeline);
+	signal?.throwIfAborted();
+	return attempts === void 0 ? readLogTimeline(logsDir, timeline) : [];
+}
+async function crashCommand(file, args, options, signal) {
+	signal?.throwIfAborted();
+	let cancel;
+	try {
+		const result = await getExecutor().runFileQuietAsync(file, args, {
+			...options,
+			...signal ? { onSpawn(child) {
+				cancel = () => {
+					child.kill("SIGKILL");
+				};
+				signal.addEventListener("abort", cancel, { once: true });
+				if (signal.aborted) cancel();
+			} } : {}
+		});
+		signal?.throwIfAborted();
+		return result;
+	} finally {
+		if (cancel) signal?.removeEventListener("abort", cancel);
+	}
 }
 //#endregion
 //#region src/diagnostics/error-symbolication.ts