stim 1.24.0 → 1.26.0

package/dist/{launch-SfzGH_s9.mjs → launch-DOp8RjDz.mjs}

@@ -1,22 +1,23 @@
-import { m as workspaceLogsDir } from "./paths-DQtTgsBf.mjs";
-import { B as deviceSlotFileKey, C as saveConfig, E as upsertProject, H as deviceSlotPlatforms, O as withConfigLockAsync, P as formatBytes, V as deviceSlotKey, _ as loadConfig, w as setDevice } from "./config-BZhXY15H.mjs";
-import { _ as stepTimer, c as launchErrorReport, i as formatDuration, l as phaseLine, n as appReadinessMessage, v as launchErrorPreview } from "./command-output-DxC0k2rk.mjs";
-import { L as workspaceDevServerMode } from "./project-Dz-hWkb-.mjs";
-import { o as workspaceLinks } from "./stim-desktop-DS0mzR8U.mjs";
-import { i as androidDataFreeBytes, ot as trimAndroidCaches, tt as resetAdoptedAvd, u as androidToolCwd } from "./android-882m4hxX.mjs";
-import { c as pidExists, f as signalProcessTree } from "./metro-Bu8LBfzS.mjs";
-import { $t as VERIFY_TIMEOUT_MS, On as restartedAppNote, Qt as RELEASE_VERIFY_WAIT_MS, Sn as installConflictKind, Xt as LAUNCH_FATAL, Yt as LAUNCH_BUNDLING, Zt as LAUNCH_UNVERIFIED, in as unverifiedLaunchLines, ln as ADB_INSTALL_TIMEOUT_MS, mn as androidDevClientUrl, pn as androidAppProcess, rn as unattributedLaunchLines } from "./budget-dPGuhNai.mjs";
-import { O as teardownOwnedAvd } from "./workspaces-CSV2Orf4.mjs";
-import { _ as providerUploadOutcome } from "./build-cache-HFUQ9eLz.mjs";
-import { n as verifyCollectorOwnership, r as readCollectors } from "./ownership-DxlZGDcV.mjs";
-import { t as recordPhoneReverse } from "./phone-reverses-BdsdesVF.mjs";
-import { n as nativeRunCommand, r as siblingPlatformSlots, t as launchSlotScope } from "./slot-launch-A1BgotaM.mjs";
+import { k as workspaceLogsDir } from "./workspace-state-pUg3_RRA.mjs";
+import { B as deviceSlotFileKey, C as saveConfig, E as upsertProject, H as deviceSlotPlatforms, O as withConfigLockAsync, P as formatBytes, V as deviceSlotKey, _ as loadConfig, w as setDevice } from "./config-BktkY_zC.mjs";
+import { _ as stepTimer, c as launchErrorReport, i as formatDuration, l as phaseLine, n as appReadinessMessage, v as launchErrorPreview } from "./command-output-BF5AR2dL.mjs";
+import { L as workspaceDevServerMode } from "./project-BUu6Is4k.mjs";
+import { o as workspaceLinks } from "./stim-desktop-6Dqp-gjX.mjs";
+import { i as androidDataFreeBytes, ot as trimAndroidCaches, tt as resetAdoptedAvd, u as androidToolCwd } from "./android-DTAcRwBC.mjs";
+import { c as pidExists, f as signalProcessTree } from "./metro-CjC10t6E.mjs";
+import { $t as LAUNCH_BUNDLING, Dn as installConflictKind, Nn as restartedAppNote, cn as unattributedLaunchLines, en as LAUNCH_FATAL, in as VERIFY_TIMEOUT_MS, ln as unverifiedLaunchLines, mn as ADB_INSTALL_TIMEOUT_MS, rn as RELEASE_VERIFY_WAIT_MS, tn as LAUNCH_UNVERIFIED, vn as androidAppProcess, yn as androidDevClientUrl } from "./budget-k2mZGvvk.mjs";
+import { O as teardownOwnedAvd } from "./workspaces-g2lhdBXF.mjs";
+import { b as providerUploadOutcome } from "./build-cache-DrXNCy3T.mjs";
+import { n as verifyCollectorOwnership, r as readCollectors } from "./ownership-BjYvMNX_.mjs";
+import { t as recordPhoneReverse } from "./phone-reverses-lmj6kcPm.mjs";
+import { n as nativeRunCommand, r as siblingPlatformSlots, t as launchSlotScope } from "./slot-launch-CYCEhfBY.mjs";
 import { t as spawnEntry } from "./spawn-entry-jw19m8Nl.mjs";
-import { c as lostRefusal, s as lostLine, t as DEBUG_VERIFY_STEP_MS } from "./device-lease-run-DUtkbqBQ.mjs";
-import { a as printNativeCrashReport, r as captureNativeCrashes, t as errorDiagnostics } from "./error-diagnostics-BkKCZq4P.mjs";
-import { i as launchOutcomeRecord } from "./native-runtime-DgtJkzIa.mjs";
-import { a as PLATFORM, b as noDeviceDiagnostic, h as displayPath, n as LAUNCH_FAILED, r as NO_DEVICE, t as INSTALL_FAILED } from "./support-B3tzVhKn.mjs";
-import { a as persistLastBuild, n as finishAndroidUpload, s as reportAndroidResult } from "./result-DqBrb12U.mjs";
+import { c as lostRefusal, s as lostLine, t as DEBUG_VERIFY_STEP_MS } from "./device-lease-run-BmvIl7bI.mjs";
+import { a as printNativeCrashReport, r as captureNativeCrashes, t as errorDiagnostics } from "./error-diagnostics-BOOm9Db7.mjs";
+import { f as settleFingerprintCheck } from "./prebuild-gmouvmJZ.mjs";
+import { i as launchOutcomeRecord } from "./native-runtime-Dq3RBcON.mjs";
+import { a as PLATFORM, b as noDeviceDiagnostic, h as displayPath, n as LAUNCH_FAILED, r as NO_DEVICE, t as INSTALL_FAILED } from "./support-BGSCBoib.mjs";
+import { a as persistLastBuild, n as finishAndroidUpload, s as reportAndroidResult } from "./result-7F5hEwQJ.mjs";
 import { mkdirSync, openSync, statSync } from "node:fs";
 import { basename, join } from "node:path";
 import { ambientEnv } from "@stim-cli/core";
@@ -186,12 +187,12 @@ async function verifyAndroidProcessRun({ operation, root, slot, remoteDevice, ve
 	phase("", chalk.yellow(`${embeddedJavaScript ? "A release process" : "The app process"} exited before readiness. Run \`stim logs --errors\` for captured crash reports, or \`stim logs --source device\` for the full device output.`));
 	return { state: LAUNCH_FATAL };
 }
-async function verifyAndroidMetroRun({ operation, root, slot, remoteDevice, verifyLaunched, serial, androidPackage, metroCheck, logsDir, launchedAt, metroPort, isExpo, physical, device, scheme, component = null, phase, enterActivity }) {
-	const runCommand = nativeRunCommand("android", slot, {
+async function verifyAndroidMetroRun({ operation, root, slot, remoteDevice, verifyLaunched, serial, androidPackage, metroCheck, logsDir, launchedAt, metroPort, isExpo, physical, device, scheme, component = null, phase, enterActivity, hostedLogs, hostedRunCommand }) {
+	const runCommand = hostedRunCommand ?? nativeRunCommand("android", slot, {
 		physical,
 		deviceId: serial
 	});
-	const readNativeCrashes = () => remoteDevice ? [] : captureNativeCrashes({
+	const readNativeCrashes = () => hostedLogs ? hostedLogs.readNativeCrashes() : remoteDevice ? [] : captureNativeCrashes({
 		root,
 		slot,
 		platform: "android",
@@ -216,7 +217,9 @@ async function verifyAndroidMetroRun({ operation, root, slot, remoteDevice, veri
 		platform: "android",
 		mode: workspaceDevServerMode(root, isExpo),
 		readNativeCrashes,
-		processAlive: async () => {
+		readDeviceRecords: hostedLogs?.readDeviceRecords,
+		deviceLogsThrough: hostedLogs?.deviceLogsThrough,
+		processAlive: hostedLogs ? null : async () => {
 			const running = await androidAppProcess(serial, androidPackage);
 			return running.state === "unknown" ? null : running.state === "running";
 		}
@@ -240,12 +243,12 @@ async function verifyAndroidMetroRun({ operation, root, slot, remoteDevice, veri
 		phase("verify", chalk.red(`FATAL after ${formatDuration(verification.waitedMs ?? 0)}: ${reason}`));
 		for (const line of launchErrorPreview(verification.errors ?? [], root)) phase("", chalk.red(line));
 		if (verification.processAlive === false && !verification.errors?.some((record) => record.event === "native_crash")) phase("logs", "No attributable native crash report captured yet. Run `stim logs --errors` again for delayed reports, or `stim logs --source device` for available output.");
-		if (nativeFatal || verification.processAlive === false) phase("remedy", chalk.yellow(`Fix the crash, then run \`${runCommand}\` again; it force-stops a crashed process that remains alive behind the system crash dialog. Metro reload cannot recover it.`));
+		if (nativeFatal || verification.processAlive === false) phase("remedy", chalk.yellow(hostedRunCommand ? `Fix the crash, then run \`${runCommand}\` again. Metro reload cannot recover it.` : `Fix the crash, then run \`${runCommand}\` again; it force-stops a crashed process that remains alive behind the system crash dialog. Metro reload cannot recover it.`));
 		else if (verification.processAlive === true && metroPort !== null) phase("remedy", chalk.yellow(`The native app is still running. ${deliveryFailed ? "Check the Metro logs and device connection, then" : "Fix the JavaScript or TypeScript error, then"} run \`stim reload android\`. Do not run \`${runCommand}\` unless native inputs changed or the app process exits.`));
 		return { state: LAUNCH_FATAL };
 	}
 	if (verification?.verified) {
-		phase("verify", `bundle loaded` + (verification.processAlive === true ? ", process alive" : "") + (verification.readiness ? "" : ", stable for 3s -- the first screen may still be rendering") + ` (${formatDuration(verification.waitedMs ?? 0)} total)`);
+		phase("verify", `bundle loaded` + (verification.processAlive === true ? ", process alive" : "") + (verification.readiness ? "" : verification.jsRunning ? ", app JavaScript running -- the first screen may still be rendering" : ", stable for 3s -- the first screen may still be rendering") + ` (${formatDuration(verification.waitedMs ?? 0)} total)`);
 		const report = launchErrorReport(verification.errors ?? [], root);
 		if (report.summary) phase("launch", chalk.dim(report.summary));
 		for (const line of report.lines) phase("launch", chalk.yellow(line));
@@ -288,7 +291,8 @@ async function verifyAndroidMetroRun({ operation, root, slot, remoteDevice, veri
 		component,
 		devClientUrl: scheme ? androidDevClientUrl(scheme, metroPort ?? 8081, physical) : null,
 		devClient: Boolean(scheme),
-		mode: workspaceDevServerMode(root, isExpo)
+		mode: workspaceDevServerMode(root, isExpo),
+		remote: Boolean(hostedLogs)
 	})) phase("", chalk.yellow(line));
 	return { state: LAUNCH_UNVERIFIED };
 }
@@ -374,7 +378,7 @@ async function resolveInstallSerial({ root, slot, device, physical, remoteDevice
 	});
 	return resolved.serial;
 }
-async function finishAndroidRun({ operation, runtime, runtimePreparation, lease, releaseLease, root, slot, json, metroCheck, useBuildCache, variant, release, isExpo, metroPort, logsDir, emuLog, device, physical, remoteDevice, bootPromise, resolveAvdSerial, waitForDeviceBoot, bootDuration, bootPending, apkPath, androidPackage: initialPackage, androidPackageProblem, record, waitedForBuild, ccache, uploadPending, providerUpload, providerName, remote, abandonedRemote: remoteWasAbandoned, started, startedAt, writer, phase, fail, readApkPackage, readProjectPackage, packageRemedy, install, launch, launchRelease, resolveDevClientScheme, verifyLaunched, verifyReleaseLaunched, spawn, kill, pidAlive, verifyCollector, writeLaunch, recordBuild, now, out, emit, recordRun, reclaimed, devServer, enterPhase, enterActivity, rebootDevice, dataFreeBytes = androidDataFreeBytes, trimCaches = trimAndroidCaches, wipeDevice = teardownOwnedAvd }) {
+async function finishAndroidRun({ operation, runtime, runtimePreparation, lease, releaseLease, root, slot, json, metroCheck, useBuildCache, variant, release, isExpo, metroPort, logsDir, emuLog, device, physical, remoteDevice, bootPromise, resolveAvdSerial, waitForDeviceBoot, bootDuration, bootPending, apkPath, androidPackage: initialPackage, androidPackageProblem, record, waitedForBuild, ccache, uploadPending, fingerprintCheck, providerUpload, providerName, remote, abandonedRemote: remoteWasAbandoned, started, startedAt, writer, phase, fail, readApkPackage, readProjectPackage, packageRemedy, install, launch, launchRelease, resolveDevClientScheme, verifyLaunched, verifyReleaseLaunched, spawn, kill, pidAlive, verifyCollector, writeLaunch, recordBuild, now, out, emit, recordRun, reclaimed, devServer, enterPhase, enterActivity, rebootDevice, dataFreeBytes = androidDataFreeBytes, trimCaches = trimAndroidCaches, wipeDevice = teardownOwnedAvd }) {
 	const { env, signal } = operation ?? {};
 	let androidPackage = initialPackage;
 	let leaseWarned = false;
@@ -590,6 +594,7 @@ async function finishAndroidRun({ operation, runtime, runtimePreparation, lease,
 	const uploadWasAbandoned = await finishAndroidUpload(uploadPending, remote, phase);
 	const providerOutcome = providerUploadOutcome(providerUpload ? await providerUpload : null, providerName, env);
 	if (providerOutcome) phase("cache", providerOutcome.warn ? chalk.yellow(providerOutcome.line) : providerOutcome.line);
+	await settleFingerprintCheck(fingerprintCheck, "android", (line) => phase("fingerprint", chalk.yellow(line)), (entry) => writer.write(entry));
 	persistLastBuild({
 		recordBuild,
 		root,
@@ -762,4 +767,4 @@ function diagnoseBootFailure(booted, logFile, runCommand, physical) {
 	};
 }
 //#endregion
-export { killPreviousCollector as a, collectorLogFile as i, androidProcessRuntime as n, startCollector as o, finishAndroidRun as r, androidMetroRuntime as t };
+export { collectorLogFile as a, verifyAndroidMetroRun as i, androidProcessRuntime as n, killPreviousCollector as o, finishAndroidRun as r, startCollector as s, androidMetroRuntime as t };

package/dist/{logs-DXE32kyb.mjs → logs-dQDki6Tt.mjs}

@@ -1,18 +1,13 @@
 import { S as process_identity_exports } from "./exec-VFRpu1iA.mjs";
-import { m as workspaceLogsDir$1 } from "./paths-DQtTgsBf.mjs";
-import { G as projectDeviceSlots, _ as loadConfig$1 } from "./config-BZhXY15H.mjs";
-import { n as pullHostedNativeLogs, t as pullHostedMacosLogs } from "./hosted-logs-CYIZ5ubJ.mjs";
-import { l as phaseLine } from "./command-output-DxC0k2rk.mjs";
-import { f as readAgentDeviceRecordsAsync, n as agentDeviceLiveness, o as envDir } from "./activity-Dq3ZcdD8.mjs";
-import { l as connectHost } from "./hosted-client-BBTVe3X6.mjs";
-import { n as readHostedIos, t as readHostedAndroid } from "./ios-state-DlElquYD.mjs";
-import "./hosted-macos-CXjsUNBR.mjs";
-import { i as captureWorkspaceCrashes } from "./error-diagnostics-BkKCZq4P.mjs";
+import { k as workspaceLogsDir$1 } from "./workspace-state-pUg3_RRA.mjs";
+import { G as projectDeviceSlots, _ as loadConfig$1 } from "./config-BktkY_zC.mjs";
+import { f as readAgentDeviceRecordsAsync, n as agentDeviceLiveness, o as envDir } from "./activity-Lnb_EoRY.mjs";
+import { i as captureWorkspaceCrashes } from "./error-diagnostics-BOOm9Db7.mjs";
+import { n as followHostedLogs, r as syncHostedLogs } from "./hosted-logs-sync-B0pvmOk-.mjs";
 import { readdirSync, statSync, watch } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join, relative, resolve, sep } from "node:path";
-import { ambientWrite, configDir } from "@stim-cli/core";
-import { LEVELS, SOURCES, agentDeviceStateDirsAsync, buildCriteria, compileGrep, createAsyncAgentActionReader, followLogs, logFiles, openLogDir, parseSince, readMacosRecord, recordMatches, workspaceStateFile } from "@stim-cli/core/state";
+import { LEVELS, SOURCES, agentDeviceStateDirsAsync, buildCriteria, compileGrep, createAsyncAgentActionReader, followLogs, logFiles, openLogDir, parseSince, readMacosRecord, recordMatches } from "@stim-cli/core/state";
 import { setImmediate } from "node:timers/promises";
 import { realpath } from "node:fs/promises";
 //#region src/devices/agent-actions.ts
@@ -221,166 +216,6 @@ function followAgentActions(context, read, onRecord) {
 	return stop;
 }
 //#endregion
-//#region src/device-host/hosted-logs-sync.ts
-const WATCH_RECHECK_MS = 100;
-function warn(context, machine, error) {
-	const text = `${warning(machine, error)}\n`;
-	if (context) context.output("stderr", text);
-	else ambientWrite("stderr", text);
-}
-function warning(machine, error) {
-	const message = error.message.replace(/\.$/, "");
-	const hint = message.includes("refused device-host.logs.query") ? ` If ${machine} runs an older stim-server, update it.` : "";
-	return phaseLine("device", `Could not read the app's logs from ${machine}: ${message}. Showing the logs already copied here.${hint}`);
-}
-async function syncHostedMacosLogs(root, placement, slot, warnings, platform = "ios", context) {
-	let host;
-	const cancel = () => host?.connection.close();
-	context?.signal.addEventListener("abort", cancel, { once: true });
-	try {
-		host = await connectHost(placement.machine, void 0, false, context?.signal);
-		if (slot !== void 0) await pullHostedNativeLogs(root, slot, placement, host, false, platform, context?.signal);
-		else await pullHostedMacosLogs(root, placement, host, void 0, void 0, false, context?.signal);
-		return true;
-	} catch (error) {
-		context?.signal.throwIfAborted();
-		if (!warnings?.has(placement.machine)) {
-			warn(context, placement.machine, error);
-			warnings?.add(placement.machine);
-		}
-		return false;
-	} finally {
-		context?.signal.removeEventListener("abort", cancel);
-		host?.connection.close();
-	}
-}
-function followHostedMacosLogs(root, { failing = false, intervalMs = 500, retryMs = 5e3, slot, platform = "ios", context } = {}) {
-	let host;
-	const controller = new AbortController();
-	const signal = context ? AbortSignal.any([context.signal, controller.signal]) : controller.signal;
-	const cancel = () => host?.connection.close();
-	signal.addEventListener("abort", cancel, { once: true });
-	let retryAt = 0;
-	let stopped = false;
-	let running = false;
-	const tick = async () => {
-		if (running || stopped || signal.aborted || Date.now() < retryAt) return;
-		running = true;
-		try {
-			const placement = slot !== void 0 ? (platform === "ios" ? readHostedIos(root) : readHostedAndroid(root))[slot] : readMacosRecord(root)?.host;
-			if (!placement) {
-				host?.connection.close();
-				host = void 0;
-				return;
-			}
-			host ??= await connectHost(placement.machine, void 0, false, signal);
-			if (slot !== void 0) await pullHostedNativeLogs(root, slot, placement, host, false, platform, signal);
-			else await pullHostedMacosLogs(root, placement, host, void 0, void 0, false, signal);
-			failing = false;
-		} catch (error) {
-			host?.connection.close();
-			host = void 0;
-			if (signal.aborted) return;
-			if (!failing) warn(context, (slot !== void 0 ? (platform === "ios" ? readHostedIos(root) : readHostedAndroid(root))[slot] : readMacosRecord(root)?.host)?.machine ?? "the host", error);
-			failing = true;
-			retryAt = Date.now() + retryMs;
-		} finally {
-			running = false;
-		}
-	};
-	const timer = setInterval(() => void tick(), intervalMs);
-	return () => {
-		stopped = true;
-		controller.abort();
-		signal.removeEventListener("abort", cancel);
-		clearInterval(timer);
-		host?.connection.close();
-	};
-}
-async function syncHostedLogs(root, context) {
-	const macos = readMacosRecord(root)?.host;
-	const warnings = /* @__PURE__ */ new Set();
-	return (await Promise.all([
-		...macos ? [syncHostedMacosLogs(root, macos, void 0, warnings, "ios", context)] : [],
-		...Object.entries(readHostedIos(root)).map(([slot, placement]) => syncHostedMacosLogs(root, placement, slot, warnings, "ios", context)),
-		...Object.entries(readHostedAndroid(root)).map(([slot, placement]) => syncHostedMacosLogs(root, placement, slot, warnings, "android", context))
-	])).every(Boolean);
-}
-function followHostedLogs(root, failing, context) {
-	const stops = /* @__PURE__ */ new Map();
-	let closed = false;
-	const refresh = () => {
-		if (closed) return;
-		const active = /* @__PURE__ */ new Set();
-		if (readMacosRecord(root)?.host) {
-			active.add("macos");
-			if (!stops.has("macos")) stops.set("macos", followHostedMacosLogs(root, {
-				failing,
-				context
-			}));
-		}
-		for (const platform of ["ios", "android"]) for (const slot of Object.keys(platform === "ios" ? readHostedIos(root) : readHostedAndroid(root))) {
-			const key = `${platform}:${slot}`;
-			active.add(key);
-			if (!stops.has(key)) stops.set(key, followHostedMacosLogs(root, {
-				failing,
-				slot,
-				platform,
-				context
-			}));
-		}
-		for (const [key, stop] of stops) {
-			if (active.has(key)) continue;
-			stop();
-			stops.delete(key);
-		}
-	};
-	const stateFile = workspaceStateFile(root);
-	const home = resolve(configDir());
-	let watcher = null;
-	let recheck;
-	const observe = () => {
-		if (closed) return;
-		watcher?.close();
-		watcher = null;
-		clearTimeout(recheck);
-		let directory = dirname(stateFile);
-		for (;;) try {
-			const entry = relative(directory, stateFile).split(sep)[0];
-			const next = watch(directory, (_event, name) => {
-				if (name !== null && name.toString() !== entry) return;
-				if (directory !== dirname(stateFile)) observe();
-				refresh();
-			});
-			next.on("error", () => {
-				next.close();
-				if (watcher === next) watcher = null;
-			});
-			next.unref();
-			watcher = next;
-			recheck = setTimeout(refresh, WATCH_RECHECK_MS);
-			recheck.unref();
-			return;
-		} catch (error) {
-			if (directory === home || !(error instanceof Error && "code" in error && error.code === "ENOENT")) return;
-			directory = dirname(directory);
-		}
-	};
-	observe();
-	refresh();
-	const timer = setInterval(() => {
-		observe();
-		refresh();
-	}, 1e4);
-	return () => {
-		closed = true;
-		watcher?.close();
-		clearTimeout(recheck);
-		clearInterval(timer);
-		for (const stop of stops.values()) stop();
-	};
-}
-//#endregion
 //#region src/engine/logs.ts
 async function openWorkspaceLogs(context, options = {}, follow = false) {
 	context.signal.throwIfAborted();
@@ -429,8 +264,9 @@ async function readWorkspaceLogs(context, options = {}) {
 		await view.close();
 	}
 }
+const WORKSPACE_SOURCES = SOURCES.filter((source) => source !== "gc");
 function validateLogOptions(options) {
-	const invalid = (options.tail !== void 0 && (!Number.isSafeInteger(options.tail) || options.tail < 0) ? "tail must be a non-negative integer." : options.sources?.some((source) => !SOURCES.includes(source)) ? `sources must contain only ${SOURCES.join(", ")}.` : options.minLevel !== void 0 && !LEVELS.includes(options.minLevel) ? `minLevel must be one of ${LEVELS.join(", ")}.` : void 0) ?? (options.since !== void 0 ? parseSince(options.since).error : void 0) ?? (options.grep !== void 0 ? compileGrep(options.grep).error : void 0);
+	const invalid = (options.tail !== void 0 && (!Number.isSafeInteger(options.tail) || options.tail < 0) ? "tail must be a non-negative integer." : options.sources?.some((source) => !WORKSPACE_SOURCES.includes(source)) ? `sources must contain only ${WORKSPACE_SOURCES.join(", ")}.` : options.minLevel !== void 0 && !LEVELS.includes(options.minLevel) ? `minLevel must be one of ${LEVELS.join(", ")}.` : void 0) ?? (options.since !== void 0 ? parseSince(options.since).error : void 0) ?? (options.grep !== void 0 ? compileGrep(options.grep).error : void 0);
 	if (invalid) throw Object.assign(new Error(invalid), { code: "STIM_BAD_ARG" });
 }
 async function followWorkspaceLogs(context, options, onRecord, onBackfill) {
@@ -483,4 +319,4 @@ async function followWorkspaceLogs(context, options, onRecord, onBackfill) {
 	return stop;
 }
 //#endregion
-export { followAgentActions as a, followHostedLogs as i, openWorkspaceLogs as n, readWorkspaceLogs as r, followWorkspaceLogs as t };
+export { followAgentActions as i, openWorkspaceLogs as n, readWorkspaceLogs as r, followWorkspaceLogs as t };

package/dist/{logs-ovlU7m7N.mjs → logs-s1dRIG1E.mjs}

@@ -1,16 +1,16 @@
-import { m as workspaceLogsDir$1 } from "./paths-DQtTgsBf.mjs";
-import { W as parseDeviceSlotOption, _ as loadConfig$1, g as isPathPrefix } from "./config-BZhXY15H.mjs";
-import { f as refuseNoProject, v as launchErrorPreview } from "./command-output-DxC0k2rk.mjs";
-import { r as readWorkspaceState$1 } from "./workspace-state-CeBpIZgr.mjs";
-import { n as findCommandWorkspace } from "./project-Dz-hWkb-.mjs";
+import { k as workspaceLogsDir$1, r as readWorkspaceState$1 } from "./workspace-state-pUg3_RRA.mjs";
+import { W as parseDeviceSlotOption, _ as loadConfig$1, g as isPathPrefix } from "./config-BktkY_zC.mjs";
+import { f as refuseNoProject, v as launchErrorPreview } from "./command-output-BF5AR2dL.mjs";
+import { n as findCommandWorkspace } from "./project-BUu6Is4k.mjs";
 import { n as SOURCES$1, t as LEVELS$1 } from "./ndjson-CgE_o3Dl.mjs";
-import { a as followAgentActions, i as followHostedLogs, n as openWorkspaceLogs } from "./logs-DXE32kyb.mjs";
-import { t as errorDiagnostics } from "./error-diagnostics-BkKCZq4P.mjs";
+import { i as followAgentActions, n as openWorkspaceLogs } from "./logs-dQDki6Tt.mjs";
+import { t as errorDiagnostics } from "./error-diagnostics-BOOm9Db7.mjs";
+import { n as followHostedLogs } from "./hosted-logs-sync-B0pvmOk-.mjs";
 import { t as watchStdoutReader } from "./stdout-reader-C8yjre1x.mjs";
 import { realpathSync } from "node:fs";
 import { relative, sep } from "node:path";
 import { configDir } from "@stim-cli/core";
-import { buildCriteria, compileGrep, followLogs, logFiles, parseSince, queryLogs, recordMatches, runId, sortByTs } from "@stim-cli/core/state";
+import { buildCriteria, compileGrep, fileSizes, followLogs, gcLogDir, logFiles, parseSince, queryLogs, readGcLog, recordMatches, runId, sortByTs } from "@stim-cli/core/state";
 import chalk from "chalk";
 //#region src/commands/logs.ts
 const LEVEL_WIDTH = 5;
@@ -57,7 +57,8 @@ function parseTail(value) {
 function validateSources(sources) {
 	if (sources === void 0 || sources === null) return { sources: void 0 };
 	const list = Array.isArray(sources) ? sources : [sources];
-	if (list.includes("all")) return { sources: [...SOURCES$1] };
+	if (list.includes("gc") && list.length > 1) return { error: "--source gc reads the machine-wide gc log and cannot be combined with other sources." };
+	if (list.includes("all")) return { sources: SOURCES$1.filter((source) => source !== "gc") };
 	const unknown = list.filter((s) => !SOURCES$1.includes(s));
 	if (unknown.length > 0) return { error: `Unknown --source value(s): ${unknown.join(", ")}. Use one or more of: ${SOURCES$1.join(", ")}, or all.` };
 	return { sources: list };
@@ -97,39 +98,20 @@ const LEVEL_COLOURS = {
 	fatal: chalk.bgRed
 };
 function logsCommand(program) {
-	program.command("logs").description("Query this workspace's merged NDJSON log timeline (bundler, client, device, build, agent actions, maintenance). Prints and exits; an existing timeline with nothing matching is a successful, empty result. Use --follow to stream.").option("--slot <name>", "Only this device slot's records, plus the shared Metro and app client records once it has launched", parseDeviceSlotOption).option("--source <s...>", "Only these sources: metro, client, device, build, agent, maintenance, placement, or all").option("--level <l>", `Minimum level: ${LEVELS$1.join(", ")}`).option("--since <d>", "Only records newer than this, e.g. 30s, 5m, 2h").option("--grep <re>", "Only records whose message matches this regular expression").option("--tail <n>", "Only the last n matching records").option("--errors", "Errors and fatals since the last marker, from metro, client and build, plus confirmed native app-crash reports and stim web browser errors. Add --source maintenance for maintenance failures, or --source device or --source all for general device errors.").option("--follow", "Keep streaming new records until interrupted").option("--json", "Emit the raw records, one per line (valid NDJSON; zero matches is zero bytes, exit 0)").action(async (opts) => {
+	program.command("logs").description("Query this workspace's merged NDJSON log timeline (bundler, client, device, build, agent actions, maintenance). Prints and exits; an existing timeline with nothing matching is a successful, empty result. Use --follow to stream.").option("--slot <name>", "Only this device slot's records, plus the shared Metro and app client records once it has launched", parseDeviceSlotOption).option("--source <s...>", "Only these sources: metro, client, device, build, agent, maintenance, placement, or all; gc alone reads the machine-wide gc log of what gc and maintenance cleared").option("--level <l>", `Minimum level: ${LEVELS$1.join(", ")}`).option("--since <d>", "Only records newer than this, e.g. 30s, 5m, 2h").option("--grep <re>", "Only records whose message matches this regular expression").option("--tail <n>", "Only the last n matching records").option("--errors", "Errors and fatals since the last marker, from metro, client and build, plus confirmed native app-crash reports and stim web browser errors. Add --source maintenance for maintenance failures, or --source device or --source all for general device errors.").option("--follow", "Keep streaming new records until interrupted").option("--json", "Emit the raw records, one per line (valid NDJSON; zero matches is zero bytes, exit 0)").action(async (opts) => {
+		const requested = [opts.source ?? []].flat();
+		if (requested.length === 1 && requested[0] === "gc") {
+			const { minLevel, tail } = validateOptions(opts);
+			printGcLog(opts, opts.errors ? "error" : minLevel, tail);
+			return;
+		}
 		const root = findCommandWorkspace(process.cwd());
 		if (!root) {
 			refuseNoProject({ json: false });
 			return;
 		}
 		const dir = workspaceLogsDir$1(root);
-		let sources;
-		if (opts.source !== void 0) {
-			const checked = validateSources(opts.source);
-			if (checked.error) fail(checked.error);
-			sources = checked.sources;
-		}
-		let minLevel;
-		if (opts.level !== void 0) {
-			const checked = validateLevel(opts.level);
-			if (checked.error) fail(checked.error);
-			minLevel = checked.level;
-		}
-		if (opts.since !== void 0) {
-			const parsed = parseSince(opts.since);
-			if (parsed.error) fail(parsed.error);
-		}
-		let tail;
-		if (opts.tail !== void 0) {
-			const parsed = parseTail(opts.tail);
-			if (parsed.error) fail(parsed.error);
-			tail = parsed.n;
-		}
-		if (opts.grep !== void 0) {
-			const compiled = compileGrep(opts.grep);
-			if (compiled.error) fail(compiled.error);
-		}
+		const { sources, minLevel, tail } = validateOptions(opts);
 		requireLogsWorkspace(root, dir);
 		const query = {
 			slot: opts.slot,
@@ -242,6 +224,73 @@ function logsCommand(program) {
 		process.on("SIGTERM", finish);
 	});
 }
+function validateOptions(opts) {
+	let sources;
+	if (opts.source !== void 0) {
+		const checked = validateSources(opts.source);
+		if (checked.error) fail(checked.error);
+		sources = checked.sources;
+	}
+	let minLevel;
+	if (opts.level !== void 0) {
+		const checked = validateLevel(opts.level);
+		if (checked.error) fail(checked.error);
+		minLevel = checked.level;
+	}
+	if (opts.since !== void 0) {
+		const parsed = parseSince(opts.since);
+		if (parsed.error) fail(parsed.error);
+	}
+	let tail;
+	if (opts.tail !== void 0) {
+		const parsed = parseTail(opts.tail);
+		if (parsed.error) fail(parsed.error);
+		tail = parsed.n;
+	}
+	if (opts.grep !== void 0) {
+		const compiled = compileGrep(opts.grep);
+		if (compiled.error) fail(compiled.error);
+	}
+	return {
+		sources,
+		minLevel,
+		tail
+	};
+}
+function printGcLog(opts, minLevel, tail) {
+	const emit = (record) => console.log(opts.json ? JSON.stringify(record) : formatRecord(record, { paint: record.level ? LEVEL_COLOURS[record.level] : void 0 }));
+	const query = {
+		sources: ["gc"],
+		minLevel,
+		since: opts.since,
+		grep: opts.grep
+	};
+	const offsets = opts.follow ? fileSizes(gcLogDir()) : null;
+	const records = queryLogs({
+		...query,
+		records: readGcLog(),
+		tail
+	});
+	for (const record of records) emit(record);
+	if (!opts.follow) {
+		if (records.length === 0 && !opts.json) console.error(chalk.dim(`No matching log records in ${gcLogDir()}`));
+		return;
+	}
+	const stop = followLogs({
+		dir: gcLogDir(),
+		offsets,
+		criteria: buildCriteria(query),
+		onRecord: emit
+	});
+	const finish = () => {
+		stop();
+		stopReader();
+		process.exit(0);
+	};
+	const stopReader = watchStdoutReader(finish);
+	process.on("SIGINT", finish);
+	process.on("SIGTERM", finish);
+}
 function fail(message) {
 	console.error(chalk.red(message));
 	process.exit(1);

package/dist/{macos-B3BveDrU.mjs → macos-B0VEV3Gf.mjs}

@@ -1,2 +1,2 @@
-import { n as runMacos, r as waitForLaunchServices, t as macosCommand } from "./macos-CCfhb-jT.mjs";
+import { n as runMacos, r as waitForLaunchServices, t as macosCommand } from "./macos-DBBPNnIA.mjs";
 export { macosCommand as default, runMacos, waitForLaunchServices };

package/dist/{macos-CCfhb-jT.mjs → macos-DBBPNnIA.mjs}

@@ -1,24 +1,23 @@
 import { _ as spawnDeclared, c as throwIfCancelled, t as getExecutor, u as withWorkspaceProcessLock, x as withDrainingCancellation } from "./exec-VFRpu1iA.mjs";
-import { d as workspaceDir, l as workspaceAgentDeviceDir, m as workspaceLogsDir$1, r as ensureWorkspaceStorageAsync } from "./paths-DQtTgsBf.mjs";
-import { E as upsertProject, O as withConfigLockAsync$1, u as getConcurrencyLimits } from "./config-BZhXY15H.mjs";
-import { l as phaseLine } from "./command-output-DxC0k2rk.mjs";
-import { a as recordWorkspaceUseAsync, f as writeWorkspaceStateAsync } from "./workspace-state-CeBpIZgr.mjs";
-import { J as resolveProjectSettingsAsync, a as SETTING_SHAPE_REMEDY, et as settingShapeErrors } from "./settings-RKwY33wv.mjs";
-import { f as projectRegistry, i as findProjectRoot$1, s as ownedDeviceLabel } from "./project-Dz-hWkb-.mjs";
-import { i as macosProcess, n as macosDir, o as requiredMacosRecord, r as macosLogFile } from "./state-BfAltYJP.mjs";
+import { E as workspaceDir, a as recordWorkspaceUseAsync, f as writeWorkspaceStateAsync, k as workspaceLogsDir$1, v as ensureWorkspaceStorageAsync, w as workspaceAgentDeviceDir } from "./workspace-state-pUg3_RRA.mjs";
+import { E as upsertProject, O as withConfigLockAsync$1, u as getConcurrencyLimits } from "./config-BktkY_zC.mjs";
+import { l as phaseLine } from "./command-output-BF5AR2dL.mjs";
+import { Y as resolveProjectSettingsAsync, a as SETTING_SHAPE_REMEDY, tt as settingShapeErrors } from "./settings-CosW5X-S.mjs";
+import { f as projectRegistry, i as findProjectRoot$1, s as ownedDeviceLabel } from "./project-BUu6Is4k.mjs";
+import { i as macosProcess, n as macosDir, o as requiredMacosRecord, r as macosLogFile } from "./state-C4OdpOTF.mjs";
 import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
-import { B as recordFinishedBuild, H as startBuildProgress, Ln as processContext, M as NO_BUILD_PROGRESS, Rn as runProcessOperation, U as tapBuildLog, z as recordBuildPhase } from "./budget-dPGuhNai.mjs";
-import { d as runCancellationSignal, f as withNativeBuildRun } from "./native-run-BmH7U8pr.mjs";
-import { L as acquireBuildSlot, z as releaseBuildSlot } from "./workspaces-CSV2Orf4.mjs";
-import { D as sanitizeDeviceLabel } from "./ios-CVUFFZ6C.mjs";
-import { S as setRemoteLogSink, c as offloadPlacement, i as closeOffload, l as placementLoad, n as buildPlacementCandidates, o as offloadBuild, r as chooseBuildMachine, u as remotePhaseText } from "./client-18-ZowoT.mjs";
-import { a as parseBuildMachineOption, c as resolveBuildPlacement, i as namedBuildMachine, o as requireLocalBuild, t as OffloadRefusal } from "./selection-BLtvaqxc.mjs";
-import { l as connectHost } from "./hosted-client-BBTVe3X6.mjs";
-import { t as placeHostedMacos } from "./hosted-macos-CXjsUNBR.mjs";
-import { r as stopMacosAppHeld, t as stopBundleInstances } from "./stop-DhclRwOO.mjs";
+import { Hn as processContext, I as NO_BUILD_PROGRESS, K as startBuildProgress, U as recordBuildPhase, Un as runProcessOperation, W as recordFinishedBuild, q as tapBuildLog } from "./budget-k2mZGvvk.mjs";
+import { d as runCancellationSignal, f as withNativeBuildRun } from "./native-run-BfIDFKLH.mjs";
+import { L as acquireBuildSlot, z as releaseBuildSlot } from "./workspaces-g2lhdBXF.mjs";
+import { O as sanitizeDeviceLabel } from "./ios-WxpDJ5T1.mjs";
+import { S as setRemoteLogSink, c as offloadPlacement, i as closeOffload, l as placementLoad, n as buildPlacementCandidates, o as offloadBuild, r as chooseBuildMachine, u as remotePhaseText } from "./client-D9CaRks-.mjs";
+import { a as parseBuildMachineOption, i as namedBuildMachine, l as resolveBuildPlacement, s as requireLocalBuild, t as OffloadRefusal } from "./selection-BNPBZ6T5.mjs";
+import { l as connectHost } from "./hosted-client-fHO8yqzc.mjs";
+import { t as placeHostedMacos } from "./hosted-macos-CPl0OZ9h.mjs";
+import { r as stopMacosAppHeld, t as stopBundleInstances } from "./stop-ySNQHXMG.mjs";
 import { t as spawnEntry } from "./spawn-entry-jw19m8Nl.mjs";
-import { t as buildPlacementRecord } from "./placement-log-DUvqqsB-.mjs";
-import { t as reidentifyBundle } from "./stage-ERTMh88n.mjs";
+import { t as buildPlacementRecord } from "./placement-log-DIFPQAXp.mjs";
+import { t as reidentifyBundle } from "./stage-jKQ7CP_B.mjs";
 import { t as validateMacosArtifactPlatform } from "./artifact-platform-CMRc0M_r.mjs";
 import { t as waitForMacosRegistration } from "./registration-CN6nlhcD.mjs";
 import { createHash, randomUUID } from "node:crypto";
@@ -346,7 +345,7 @@ async function planMacos(context, root, buildMachineFlag) {
 	if (selected.failure) throw Object.assign(new Error(selected.failure.message), selected.failure);
 	const macos = settings.macos;
 	if (!macos?.product || !macos.infoPlist) throw Object.assign(/* @__PURE__ */ new Error("Set macos.product and macos.infoPlist explicitly in .stim.json. See stim guide macos."), { code: "STIM_BAD_ARG" });
-	const { swiftpmMacosProject } = await import("./swiftpm-macos-BVCP5mO4.mjs");
+	const { swiftpmMacosProject } = await import("./swiftpm-macos-x6HPpl_2.mjs");
 	const recipe = await swiftpmMacosProject(root).prepare(context, settings);
 	let identity = null;
 	let cacheHit = false;

package/dist/macos-run.mjs

@@ -1,2 +1,2 @@
-import { n as runMacosSupervisor, t as logLines } from "./run-BIwoU44q.mjs";
+import { n as runMacosSupervisor, t as logLines } from "./run-BqB0v3pt.mjs";
 export { logLines, runMacosSupervisor };