stim 1.23.1 → 1.25.0

package/dist/{android-C7sVmyI9.mjs → android-Cjcj8MCw.mjs}

@@ -1,10 +1,10 @@
-import { c as declareSpawnsOn, f as stopDeclaringSpawnsOn, g as process_identity_exports, r as WorkspaceProcessCleanupError, t as getExecutor, x as ownership_claim_exports } from "./exec-DEoAhcze.mjs";
-import { C as saveConfig, D as withConfigLock$1, G as projectDeviceSlots, H as deviceSlotPlatforms, K as removeSlotDevice, O as withConfigLockAsync$1, _ as loadConfig$1, c as ensureConfig, d as getConfigDir, f as getConfigPath$1, z as assignSlotDevice } from "./config-DlrsduwG.mjs";
-import { n as runOperationFileQuiet, t as runOperationFile, u as cancellableSleep } from "./operation-exec-BW0em61G.mjs";
-import { c as androidDataPartitionSizeBytes } from "./settings-C7O8A6ZI.mjs";
-import { c as pidExists, p as signalProcessTreeAsync } from "./metro-DiXtA3Ty.mjs";
-import { i as recordCreatedDevice, r as readCreatedDevices$1, t as forgetCreatedDevice } from "./created-devices-x9rN6bhs.mjs";
-import { i as stimDesktopInstalledAsync, n as settingDefault, t as STIM_DESKTOP_OPEN_OPTIONS } from "./stim-desktop-D5OGpYZM.mjs";
+import { D as ownership_claim_exports, S as process_identity_exports, l as WorkspaceProcessCleanupError, m as declareSpawnsOn, o as cancellableSleep, t as getExecutor, v as stopDeclaringSpawnsOn } from "./exec-VFRpu1iA.mjs";
+import { C as saveConfig, D as withConfigLock$1, G as projectDeviceSlots, H as deviceSlotPlatforms, K as removeSlotDevice, O as withConfigLockAsync$1, _ as loadConfig$1, c as ensureConfig, d as getConfigDir, f as getConfigPath$1, z as assignSlotDevice } from "./config-BZhXY15H.mjs";
+import { n as runOperationFileQuiet, t as runOperationFile } from "./operation-exec-CUZifp6Z.mjs";
+import { c as androidDataPartitionSizeBytes } from "./settings-B5tCoq9N.mjs";
+import { i as stimDesktopInstalledAsync, n as settingDefault, t as STIM_DESKTOP_OPEN_OPTIONS } from "./stim-desktop-DS0mzR8U.mjs";
+import { a as recordCreatedDeviceAsync, n as forgetCreatedDeviceAsync, r as readCreatedDevices$1 } from "./created-devices-D2Aca-xu.mjs";
+import { c as pidExists, p as signalProcessTreeAsync } from "./metro-1pJgCX4U.mjs";
 import { isDeepStrictEqual } from "node:util";
 import { join } from "node:path";
 import { ambientEnv, ambientWrite } from "@stim-cli/core";
@@ -13,6 +13,27 @@ import { dirname as dirname$1, isAbsolute as isAbsolute$1, join as join$1, resol
 import { existsSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, writeFileSync } from "fs";
 import { rm } from "node:fs/promises";
 import { homedir, tmpdir } from "os";
+//#region src/devices/android-emulator-viewer.ts
+async function configuredAndroidEmulatorApp(platform = process.platform, env) {
+	let value = loadConfig$1()?.androidEmulatorApp;
+	if (value === void 0) {
+		const installed = await stimDesktopInstalledAsync(platform, env);
+		value = settingDefault(settingDefinition("androidEmulatorApp"), () => installed).value;
+	}
+	if (ANDROID_EMULATOR_APPS.includes(value)) return value;
+	const error = /* @__PURE__ */ new Error("Invalid androidEmulatorApp in machine config. Use \"emulator\" or \"stim-desktop\".");
+	Object.assign(error, { code: "STIM_BAD_ARG" });
+	throw error;
+}
+async function openEmulatorInStimDesktop(serial) {
+	await getExecutor().runFileQuietAsync("open", [
+		"-g",
+		"-a",
+		"Stim",
+		`stim-desktop://open?serial=${serial}`
+	], STIM_DESKTOP_OPEN_OPTIONS);
+}
+//#endregion
 //#region src/devices/sim-pool.ts
 const POOL_SETTING_REMEDY = "Run `stim guide settings` for the device pool bounds and where it can be set.";
 function parkedMaxSetting(platform, options = {}) {
@@ -89,11 +110,11 @@ function parkSim({ platform, projectPath, slot = "default", record, max }) {
 		return evicted;
 	});
 }
-function adoptParked({ platform, projectPath, slot = "default", udid, device }) {
+async function adoptParked({ platform, projectPath, slot = "default", udid, device }) {
 	const claim = claimParkedOperation(platform, udid);
 	if (!claim) return null;
 	try {
-		return withConfigLock$1(() => {
+		return await withConfigLockAsync$1(() => {
 			const cfg = ensureConfig();
 			const records = readParked(platform, { config: cfg });
 			const taken = records.find((r) => r.udid === udid);
@@ -243,27 +264,6 @@ function isStimOwnedAvd(name) {
 	return name.startsWith("stim-") && isStimOwnedDevice("android", name);
 }
 //#endregion
-//#region src/devices/android-emulator-viewer.ts
-async function configuredAndroidEmulatorApp(platform = process.platform, env) {
-	let value = loadConfig$1()?.androidEmulatorApp;
-	if (value === void 0) {
-		const installed = await stimDesktopInstalledAsync(platform, env);
-		value = settingDefault(settingDefinition("androidEmulatorApp"), () => installed).value;
-	}
-	if (ANDROID_EMULATOR_APPS.includes(value)) return value;
-	const error = /* @__PURE__ */ new Error("Invalid androidEmulatorApp in machine config. Use \"emulator\" or \"stim-desktop\".");
-	Object.assign(error, { code: "STIM_BAD_ARG" });
-	throw error;
-}
-async function openEmulatorInStimDesktop(serial) {
-	await getExecutor().runFileQuietAsync("open", [
-		"-g",
-		"-a",
-		"Stim",
-		`stim-desktop://open?serial=${serial}`
-	], STIM_DESKTOP_OPEN_OPTIONS);
-}
-//#endregion
 //#region src/devices/android.ts
 const ANDROID_ABIS = /* @__PURE__ */ new Set([
 	"armeabi-v7a",
@@ -410,7 +410,7 @@ async function createOwnedAvd(label, { systemImage, deviceProfile = DEFAULT_AVD_
 		throw new Error(`No ${arch} Android system image is installed. Install one, e.g.: sdkmanager "system-images;android-36;google_apis;${arch}"`);
 	}
 	const avdName = ownedAvdName(label);
-	recordCreatedDevice("android", avdName);
+	await recordCreatedDeviceAsync("android", avdName);
 	const tool = androidToolPath("avdmanager");
 	const args = [
 		"create",
@@ -542,7 +542,7 @@ async function deleteAvd(avdName, operation) {
 		cwd: operation?.cwd,
 		...root ? { env: { ANDROID_AVD_HOME: root } } : {}
 	});
-	forgetCreatedDevice("android", avdName);
+	await forgetCreatedDeviceAsync("android", avdName);
 }
 function parseAvdList(text) {
 	return text.split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith("INFO") && !l.startsWith("WARNING"));
@@ -964,7 +964,10 @@ async function resetAdoptedAvd(avdName, serial, keepPackage) {
 	let unavailableTarget = false;
 	const commandTimeout = (timeoutMs) => recoveryDeadline === void 0 ? timeoutMs : Math.max(1, Math.min(timeoutMs, recoveryDeadline - Date.now()));
 	const assertTarget = async () => {
-		const resolved = await resolveOwnedAvdSerialAsync(avdName, { timeoutMs: commandTimeout(3e4) });
+		const resolved = await resolveOwnedAvdSerialAsync(avdName, {
+			timeoutMs: commandTimeout(3e4),
+			preferredSerial: serial
+		});
 		unavailableTarget = Boolean(resolved.notRunning);
 		if (resolved.serial !== serial) throw new Error(`AVD ${avdName} is no longer running on ${serial}.`);
 	};
@@ -1283,6 +1286,44 @@ async function shutdownAndroidEmulator(serial, timeoutMs = ANDROID_EMULATOR_SHUT
 		"kill"
 	], Math.max(1, timeoutMs - (Date.now() - started)));
 }
+function reverseDevicePortsTo(listing, hostPorts) {
+	return String(listing ?? "").split("\n").flatMap((line) => {
+		const [, device, host] = line.trim().split(/\s+/);
+		return device?.startsWith("tcp:") && hostPorts.some((port) => host === `tcp:${port}`) ? [device] : [];
+	});
+}
+/**
+* Removes the reverses that point an owned emulator at `metroPort`, verified by the emulator's own
+* console. The adb server connects a reverse stream from the device to the host port synchronously
+* on its single event thread (packages/modules/adb services.cpp `service_to_fd`), and on Windows a
+* refused loopback connect takes seconds, so an app retrying a stopped Metro stalls every adb call.
+* https://github.com/appandflow/stim/issues/4101
+*/
+async function removeOwnedEmulatorMetroReverses(avdName, serial, metroPort, operation) {
+	if (await getAvdNameForSerialAsync(serial, { operation }) !== avdName) return;
+	await removeMetroReverses(serial, [metroPort], operation);
+}
+async function removeMetroReverses(serial, hostPorts, operation) {
+	const adb = androidToolPath("adb", process.platform, operation?.env);
+	const options = {
+		timeoutMs: ADB_PROP_TIMEOUT_MS,
+		killSignal: "SIGKILL",
+		cwd: androidToolCwd() ?? operation?.cwd
+	};
+	const listing = await runOperationFileQuiet(operation, getExecutor(), adb, [
+		"-s",
+		serial,
+		"reverse",
+		"--list"
+	], options);
+	for (const devicePort of reverseDevicePortsTo(listing, hostPorts)) await runOperationFileQuiet(operation, getExecutor(), adb, [
+		"-s",
+		serial,
+		"reverse",
+		"--remove",
+		devicePort
+	], options);
+}
 function avdProcessLockPaths(avdDirectory, platform) {
 	return ["hardware-qemu.ini.lock", "userdata-qemu.img.lock"].map((name) => join$1(avdDirectory, name, ...platform === "win32" ? ["pid"] : []));
 }
@@ -1557,11 +1598,20 @@ async function getAvdNameForSerialAsync(serial, { timeoutMs = EMU_AVD_NAME_TIMEO
 	if (!out) return null;
 	return out.split("\n")[0]?.trim() || null;
 }
-/** `resolveOwnedAvdSerial` without blocking the event loop, with the same reads and the same timeout budget. */
+/**
+* `resolveOwnedAvdSerial` without blocking the event loop, with the same reads and the same timeout budget.
+* `preferredSerial` is the serial this workspace recorded for the AVD: it is read first, and the other
+* emulators are read only when it does not run the AVD.
+*/
 async function resolveOwnedAvdSerialAsync(avdName, opts = {}) {
-	return ownedAvdSerialResolverAsync(opts)(avdName);
+	return ownedAvdSerialResolverAsync(opts)(avdName, opts.preferredSerial);
 }
-/** Shares bounded asynchronous AVD, adb and emulator-name reads across the requested AVDs. */
+/**
+* Shares bounded asynchronous AVD, adb and emulator-name reads across the requested AVDs. Emulators are
+* read concurrently within each tier (the preferred serial, then healthy ones, then unhealthy ones), and
+* the reads still pending are cancelled once one runs the requested AVD, so a wedged foreign emulator
+* neither adds up across serials nor delays the match.
+*/
 function ownedAvdSerialResolverAsync({ timeoutMs, signal, operation } = {}) {
 	const started = Date.now();
 	const remaining = () => ({
@@ -1571,23 +1621,67 @@ function ownedAvdSerialResolverAsync({ timeoutMs, signal, operation } = {}) {
 	});
 	const avds = once(() => listAvdsAsync(remaining()));
 	const adb = once(() => listAdbDevicesAsync(remaining()));
-	const names = /* @__PURE__ */ new Map();
+	const reads = /* @__PURE__ */ new Map();
 	const avdNameOf = (serial) => {
-		let name = names.get(serial);
-		if (!name) {
-			name = getAvdNameForSerialAsync(serial, remaining());
-			names.set(serial, name);
+		let read = reads.get(serial);
+		if (!read) {
+			const own = new AbortController();
+			const options = remaining();
+			const entry = {
+				name: getAvdNameForSerialAsync(serial, {
+					...options,
+					signal: options.signal ? AbortSignal.any([options.signal, own.signal]) : own.signal
+				}),
+				settled: false,
+				cancel: () => {
+					if (entry.settled) return;
+					own.abort();
+					reads.delete(serial);
+				}
+			};
+			const settle = () => {
+				entry.settled = true;
+			};
+			entry.name.then(settle, settle);
+			reads.set(serial, entry);
+			read = entry;
 		}
-		return name;
+		return read;
 	};
-	return async (avdName) => {
+	const firstRunning = async (serials, avdName) => {
+		try {
+			return await new Promise((settle, reject) => {
+				let pending = serials.length;
+				if (pending === 0) return settle(void 0);
+				for (const serial of serials) avdNameOf(serial).name.then((name) => {
+					if (name === avdName) settle(serial);
+					else if (--pending === 0) settle(void 0);
+					return name;
+				}, reject);
+			});
+		} finally {
+			for (const serial of serials) reads.get(serial)?.cancel();
+		}
+	};
+	return async (avdName, preferredSerial) => {
 		signal?.throwIfAborted();
 		if (!(await avds()).includes(avdName)) return { missing: true };
 		if (!isStimOwnedAvd(avdName)) return { notOwned: true };
 		const devices = await adb();
 		signal?.throwIfAborted();
-		const candidates = [...devices.emulators, ...devices.unhealthy.filter((entry) => entry.kind === "emulator" && entry.consolePort !== void 0)];
-		for (const candidate of candidates) if (await avdNameOf(candidate.serial) === avdName) return { serial: candidate.serial };
+		const healthy = devices.emulators.map((entry) => entry.serial);
+		const unhealthy = devices.unhealthy.filter((entry) => entry.kind === "emulator" && entry.consolePort !== void 0).map((entry) => entry.serial);
+		const preferred = preferredSerial && [...healthy, ...unhealthy].includes(preferredSerial) ? preferredSerial : null;
+		const tiers = [
+			...preferred ? [[preferred]] : [],
+			healthy.filter((serial) => serial !== preferred),
+			unhealthy.filter((serial) => serial !== preferred)
+		];
+		for (const tier of tiers) {
+			const serial = await firstRunning(tier, avdName);
+			signal?.throwIfAborted();
+			if (serial) return { serial };
+		}
 		return { notRunning: true };
 	};
 }
@@ -1631,4 +1725,4 @@ function ownedAvdSerialResolver({ timeoutMs } = {}) {
 	};
 }
 //#endregion
-export { resetAdoptedAvd as $, listAdbDevices as A, ownedAvdDeviceProfile as B, emulatorDiskSpaceRemedy as C, getAvdNameForSerial as D, findBuildTool as E, listAvdsAsync as F, ownedAvdSerialResolverAsync as G, ownedAvdMatchesConfiguration as H, listInstalledSystemImages as I, parseAvdSystemImage as J, ownedAvdSystemImage as K, listOrphanedAvdDirectories as L, listAvdDeviceProfiles as M, listAvdDeviceProfilesAsync as N, getAvdNameForSerialAsync as O, listAvds as P, profileNeedsFoldFeature as Q, memoizeEmulatorProbe as R, deleteAvd as S, extractEmulatorFailure as T, ownedAvdName as U, ownedAvdDirectory as V, ownedAvdSerialResolver as W, pickDefaultSystemImage as X, physicalDeviceModel as Y, probeEmulatorSerial as Z, avdPoolConfiguration as _, parkedMaxSetting as _t, androidDeviceAbi as a, waitForAndroidEmulatorShutdown as at, configureNewOwnedAvd as b, selectParked as bt, androidPoolNoCandidatesRefusal as c, configuredAndroidEmulatorApp as ct, androidToolPath as d, POOL_SETTING_REMEDY as dt, resolveOwnedAvdSerialAsync as et, assertOwnedAvdStopped as f, adoptParked as ft, avdPathExists as g, parkSim as gt, avdNameAbsent as h, isLegacyDeletionClaim as ht, androidDataFreeBytes as i, trimAndroidCaches as it, listAdbDevicesAsync as j, hostSystemImageArch as k, androidSystemImageAbi as l, isStimOwnedAvd as lt, avdIniPaths as m, eraseParkedAfter as mt, OWNED_AVD_CONFIG_DEFAULTS as n, shutdownAndroidEmulator as nt, androidHome as o, waitForBoot as ot, assertOwnedAvdStoppedAsync as p, dropParked as pt, parseAvdDeviceProfile as q, androidBuildToolName as r, systemImageSupportsFold as rt, androidPoolCandidates as s, wipeAvdUserData as st, DEFAULT_AVD_DEVICE_PROFILE as t, resolvePhysicalDevice as tt, androidToolCwd as u, isStimOwnedSim as ut, avdStorageRoots as v, readParked as vt, emulatorFailureRemedy as w, createOwnedAvd as x, bootAndroidEmulator as y, removeParkedAfter as yt, nextConsolePort as z };
+export { removeMetroReverses as $, listAdbDevices as A, ownedAvdDeviceProfile as B, emulatorDiskSpaceRemedy as C, getAvdNameForSerial as D, findBuildTool as E, listAvdsAsync as F, ownedAvdSerialResolverAsync as G, ownedAvdMatchesConfiguration as H, listInstalledSystemImages as I, parseAvdSystemImage as J, ownedAvdSystemImage as K, listOrphanedAvdDirectories as L, listAvdDeviceProfiles as M, listAvdDeviceProfilesAsync as N, getAvdNameForSerialAsync as O, listAvds as P, profileNeedsFoldFeature as Q, memoizeEmulatorProbe as R, deleteAvd as S, configuredAndroidEmulatorApp as St, extractEmulatorFailure as T, ownedAvdName as U, ownedAvdDirectory as V, ownedAvdSerialResolver as W, pickDefaultSystemImage as X, physicalDeviceModel as Y, probeEmulatorSerial as Z, avdPoolConfiguration as _, parkSim as _t, androidDeviceAbi as a, systemImageSupportsFold as at, configureNewOwnedAvd as b, removeParkedAfter as bt, androidPoolNoCandidatesRefusal as c, waitForBoot as ct, androidToolPath as d, isStimOwnedSim as dt, removeOwnedEmulatorMetroReverses as et, assertOwnedAvdStopped as f, POOL_SETTING_REMEDY as ft, avdPathExists as g, isLegacyDeletionClaim as gt, avdNameAbsent as h, eraseParkedAfter as ht, androidDataFreeBytes as i, shutdownAndroidEmulator as it, listAdbDevicesAsync as j, hostSystemImageArch as k, androidSystemImageAbi as l, wipeAvdUserData as lt, avdIniPaths as m, dropParked as mt, OWNED_AVD_CONFIG_DEFAULTS as n, resolveOwnedAvdSerialAsync as nt, androidHome as o, trimAndroidCaches as ot, assertOwnedAvdStoppedAsync as p, adoptParked as pt, parseAvdDeviceProfile as q, androidBuildToolName as r, resolvePhysicalDevice as rt, androidPoolCandidates as s, waitForAndroidEmulatorShutdown as st, DEFAULT_AVD_DEVICE_PROFILE as t, resetAdoptedAvd as tt, androidToolCwd as u, isStimOwnedAvd as ut, avdStorageRoots as v, parkedMaxSetting as vt, emulatorFailureRemedy as w, createOwnedAvd as x, selectParked as xt, bootAndroidEmulator as y, readParked as yt, nextConsolePort as z };

package/dist/{android-cas-ngferVq2.mjs → android-cas-BVqh2Zep.mjs}

@@ -1,7 +1,7 @@
 import { n as ensureWorkspaceStorage, v as withDirLock$1 } from "./paths-DQtTgsBf.mjs";
-import { d as getConfigDir } from "./config-DlrsduwG.mjs";
-import { m as defaultAndroidLayout } from "./settings-C7O8A6ZI.mjs";
-import { r as register } from "./cache-manifest-DSeQjt-Q.mjs";
+import { d as getConfigDir } from "./config-BZhXY15H.mjs";
+import { m as defaultAndroidLayout } from "./settings-B5tCoq9N.mjs";
+import { r as register } from "./cache-manifest-BPXRONJz.mjs";
 import { createHash, randomUUID } from "node:crypto";
 import { accessSync, constants, existsSync, mkdirSync, readFileSync, realpathSync, renameSync, statSync, writeFileSync } from "node:fs";
 import { join } from "node:path";

package/dist/android-cas-compiler.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { t as getExecutor } from "./exec-VFRpu1iA.mjs";
 import { createHash, randomUUID } from "node:crypto";
 import { appendFileSync, existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { join } from "node:path";

package/dist/{android-project-DVWyCbWU.d.mts → android-project-CTYaETc0.d.mts}

@@ -221,15 +221,19 @@ interface AndroidBuildPlan {
 //#region src/offload/toolchain.d.ts
 /** What must be identical on this Mac and a remote Mac for an iOS simulator build to come out the same. */
 interface IosToolchain {
-  /** A digest of Stim's built code, so both sides prove they run the same Stim. */
+  /** A digest of Stim's built code, compared only with a remote machine that reports no `compat`. */
   stimBuild: string | null;
+  /** The Stim build compatibility version both sides must share. */
+  compat: number;
   arch: string;
   xcode: string | null;
   simulatorSdk: string | null;
   cocoapods: string | null;
 }
 /** A remote machine's toolchain, the simulator runtimes it can build for, and its JDK and Android SDK packages. */
-interface WorkerToolchain extends IosToolchain {
+interface WorkerToolchain extends Omit<IosToolchain, "compat"> {
+  /** Absent from a stim-server older than build compatibility versions. */
+  compat?: number;
   /** The OS stim-server runs on, as Node names it; absent from a stim-server older than this field. */
   os?: string;
   macosSdk: string | null;

package/dist/{android-DR5lZ2Az.mjs → android-saBeB4lr.mjs}

@@ -1,5 +1,5 @@
-import { t as getExecutor } from "./exec-DEoAhcze.mjs";
-import { u as androidToolCwd } from "./android-C7sVmyI9.mjs";
+import { t as getExecutor } from "./exec-VFRpu1iA.mjs";
+import { u as androidToolCwd } from "./android-Cjcj8MCw.mjs";
 //#region src/collector/android.ts
 const LEVEL_BY_LETTER = {
 	V: "debug",
@@ -90,6 +90,16 @@ function parseLogcatLine(line, { now = Date.now, clockOffsetMs = null } = {}) {
 		proc: `${tag.trim()}(${pid})`
 	};
 }
+const isAndroidCrashText = (text) => /FATAL EXCEPTION:|signal \d+ \(/.test(text);
+function androidLogGroups(entries) {
+	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;
+}
 function logcatArgs(serial, pid) {
 	return [
 		"-s",
@@ -214,4 +224,4 @@ function watchAppPid({ serial, packageName, pid, intervalMs = null, exec = null,
 	};
 }
 //#endregion
-export { waitForAppPid as a, startAndroidLogcat as i, parseLogcatLine as n, watchAppPid as o, parsePidof as r, androidClockOffset as t };
+export { parsePidof as a, watchAppPid as c, parseLogcatLine as i, androidLogGroups as n, startAndroidLogcat as o, isAndroidCrashText as r, waitForAppPid as s, androidClockOffset as t };

package/dist/api.d.mts

@@ -1,4 +1,4 @@
-import { _ as IosFacts, a as BuildMachinesInspection, d as DoctorPlatform, f as Finding, g as CompilationCacheActivity, h as CcacheActivity, m as AndroidFacts, n as WebLaunched, o as GeneratedTickets, s as TailnetMachineIo, u as BudgetReport } from "./android-project-DVWyCbWU.mjs";
+import { _ as IosFacts, a as BuildMachinesInspection, d as DoctorPlatform, f as Finding, g as CompilationCacheActivity, h as CcacheActivity, m as AndroidFacts, n as WebLaunched, o as GeneratedTickets, s as TailnetMachineIo, u as BudgetReport } from "./android-project-CTYaETc0.mjs";
 import { a as WorkspaceLaunchPlatform } from "./ios-CDvlmUs7.mjs";
 import "./exec-DnYc4HGH.mjs";
 import "./pull-request-eODyIqZF.mjs";
@@ -19,7 +19,7 @@ interface ReleasedLease {
 }
 //#endregion
 //#region src/commands/gc/results.d.ts
-type GcResultKind = "archive" | "device" | "parkedDevice" | "parkedHostedDevice" | "idleDevice" | "deviceRecord" | "workspaceOutputs" | "recording" | "workspaceDirectory" | "project" | "buildLock" | "buildSlot" | "deviceLease" | "easSession" | "worktree" | "cache" | "statusCache" | "tempLeftover" | "watchmanRoot" | "watchman" | "gradleDaemon" | "gradleVersion" | "kotlinDaemon";
+type GcResultKind = "archive" | "device" | "parkedDevice" | "parkedHostedDevice" | "idleDevice" | "deviceRecord" | "workspaceOutputs" | "recording" | "workspaceDirectory" | "project" | "buildLock" | "buildSlot" | "deviceLease" | "easSession" | "worktree" | "cache" | "statusCache" | "tempLeftover" | "trash" | "watchmanRoot" | "watchman" | "gradleDaemon" | "gradleVersion" | "kotlinDaemon";
 type GcResultStatus = "done" | "kept" | "failed";
 interface GcResult {
   kind: GcResultKind;
@@ -449,7 +449,8 @@ interface OwnedDeviceDisk {
 type RecordingKeptCode = "unresolved" | "retained" | "recently-recorded";
 //#endregion
 //#region src/commands/gc/temp-leftovers.d.ts
-type TempLeftoverKind = "stim" | "xctrace" | "jest";
+type TempLeftoverKind = "stim" | "xctrace" | "swiftpm" | "jest";
+type DeletableKind = Exclude<TempLeftoverKind, "jest">;
 interface TempLeftover {
   kind: TempLeftoverKind;
   path: string;
@@ -461,7 +462,7 @@ interface TempLeftoverReport {
   root: string;
   entries: TempLeftover[];
   /** Judges an entry again right before deletion (a Stim directory after its rename to `staged`), so a claim or recording use since the scan keeps it. */
-  recheck?: (staged: string, original: string, kind: "stim" | "xctrace") => Promise<string | null>;
+  recheck?: (staged: string, original: string, kind: DeletableKind) => Promise<string | null>;
 }
 interface TempLeftoverGroup {
   kind: TempLeftoverKind;
@@ -480,6 +481,20 @@ declare function tempLeftoverSection(report: TempLeftoverReport | null | undefin
   groups: TempLeftoverGroup[];
 } | null;
 //#endregion
+//#region src/commands/gc/trash.d.ts
+interface TrashEntry {
+  path: string;
+  worktree: string | null;
+  removedAt: string | null;
+  bytes: number | null;
+  willDelete: boolean;
+  kept: string | null;
+}
+interface TrashReport {
+  root: string;
+  entries: TrashEntry[];
+}
+//#endregion
 //#region src/commands/gc/memory.d.ts
 declare const WATCHMAN_KIND = "watchman";
 declare const GRADLE_DAEMONS_KIND = "gradle-daemons";
@@ -691,6 +706,7 @@ interface GcJsonSections {
   swiftpmCache: SwiftpmCacheUsage | null;
   machineCaches: MachineCacheReport | null;
   tempLeftovers: ReturnType<typeof tempLeftoverSection>;
+  trash: TrashReport | null;
   gradleVersions: GradleVersionSweep | null;
   caches: {
     name: string;
@@ -793,7 +809,8 @@ interface ReloadFacts {
   platform: ReloadPlatform;
   deviceId: string;
   deviceName: string;
-  appId: string;
+  /** Null when the app was not launched by Stim: a physical device or an EAS Simulator session. */
+  appId: string | null;
   metroPort: number | null;
   strategy: "metro-websocket" | "metro-broadcast" | "cdp";
   targets: number | null;

package/dist/api.mjs

@@ -1,32 +1,31 @@
-import { m as operationState, r as WorkspaceProcessCleanupError, v as runReport, x as ownership_claim_exports, y as trackReportResource } from "./exec-DEoAhcze.mjs";
-import { d as workspaceDir, m as workspaceLogsDir$1, n as ensureWorkspaceStorage, r as ensureWorkspaceStorageAsync } from "./paths-DQtTgsBf.mjs";
-import { E as upsertProject, p as getProject, q as validateDeviceSlot, y as refuseRelativeStimPaths } from "./config-DlrsduwG.mjs";
-import { l as phaseLine } from "./command-output-YKGWivpG.mjs";
-import { d as cancelledError, f as throwIfCancelled } from "./operation-exec-BW0em61G.mjs";
-import { a as recordWorkspaceUseAsync, i as recordWorkspaceUse } from "./workspace-state-U08dEzhG.mjs";
-import { J as resolveProjectSettingsAsync, Nt as repoRootAsync, a as SETTING_SHAPE_REMEDY, et as settingShapeErrors, it as unknownSettingKeys, p as cacheProviderSettingError } from "./settings-C7O8A6ZI.mjs";
-import { c as projectProblem, f as projectRegistry, i as findProjectRoot$1, r as findCommandWorkspaceAsync, t as NO_PROJECT_REFUSAL } from "./project-DhCtQWWU.mjs";
-import { n as macosDir } from "./state-08I3hw3_.mjs";
+import { D as ownership_claim_exports, T as trackReportResource, b as operationState, c as throwIfCancelled, l as WorkspaceProcessCleanupError, s as cancelledError, w as runReport } from "./exec-VFRpu1iA.mjs";
+import { d as workspaceDir, m as workspaceLogsDir$1, r as ensureWorkspaceStorageAsync } from "./paths-DQtTgsBf.mjs";
+import { E as upsertProject, O as withConfigLockAsync$1, p as getProject, q as validateDeviceSlot, y as refuseRelativeStimPaths } from "./config-BZhXY15H.mjs";
+import { l as phaseLine } from "./command-output-BBvS1H6v.mjs";
+import { a as recordWorkspaceUseAsync } from "./workspace-state-CPSp3mav.mjs";
+import { Pt as repoRootAsync, Y as resolveProjectSettingsAsync, a as SETTING_SHAPE_REMEDY, at as unknownSettingKeys, p as cacheProviderSettingError, tt as settingShapeErrors } from "./settings-B5tCoq9N.mjs";
+import { c as projectProblem, f as projectRegistry, i as findProjectRoot$1, r as findCommandWorkspaceAsync, t as NO_PROJECT_REFUSAL } from "./project-BiC68mIp.mjs";
+import { n as macosDir } from "./state-DPaM3u5K.mjs";
+import { c as ensureHomeIdentity, s as workspaceShareURL } from "./stim-desktop-DS0mzR8U.mjs";
 import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
-import { B as recordFinishedBuild, H as tapBuildLog, V as startBuildProgress } from "./budget-3ivAK99e.mjs";
-import { d as runCancellationSignal, f as withNativeBuildRun } from "./native-run-Dv88i0aU.mjs";
-import { c as ensureHomeIdentity, s as workspaceShareURL } from "./stim-desktop-D5OGpYZM.mjs";
-import { s as resolveBuildPlacement } from "./selection-DSMbWEX2.mjs";
-import { c as stopWorkspaceNow } from "./stop-BJ06ipTZ.mjs";
-import { r as runReload } from "./reload-COJWTbae.mjs";
-import { c as startDevServer } from "./start-CU8mCPC7.mjs";
-import { s as recordDoctorCheck } from "./doctor-watchman-iGBpC6KM.mjs";
-import { a as readDoctorReport } from "./doctor-C6t4Maue.mjs";
-import { h as warmWorktreeTarget, m as removeWorktreeTarget } from "./worktree-B4Nj3EGS.mjs";
-import { i as readGcReport, n as executeGc, o as withGcMaintenanceClaim } from "./gc-BW8E1uSC.mjs";
-import { r as readWorkspaceLogs, t as followWorkspaceLogs } from "./logs-pNvA2hHK.mjs";
-import { t as readProjectStats } from "./stats-report-BzaPrRm6.mjs";
-import { n as buildAndroidOperation, t as buildIosOperation } from "./build-Dv9s8Fz-.mjs";
-import { a as readAndroidBuildPlan, i as runAndroidOperation } from "./android-DtfRGLcc.mjs";
-import { i as readIosBuildPlan, r as runIosOperation } from "./ios-CWjqfSm_.mjs";
-import { a as buildMacosBundle, i as planMacos, n as runMacos } from "./macos-C67FZ2ft.mjs";
-import { t as runWeb } from "./web-DRF_oFXk.mjs";
-import { i as SettingsRefusal, o as readSettingsContext, s as readSettingsPayload, t as mutateSetting } from "./settings-write-Chuy7Cte.mjs";
+import { B as recordFinishedBuild, H as startBuildProgress, U as tapBuildLog } from "./budget-HyShrIpL.mjs";
+import { d as runCancellationSignal, f as withNativeBuildRun } from "./native-run-D5OJsGwA.mjs";
+import { c as resolveBuildPlacement } from "./selection-D5cxEl3t.mjs";
+import { c as stopWorkspaceNow } from "./stop-Db9Kh-UA.mjs";
+import { r as runReload } from "./reload-FbSgMF8x.mjs";
+import { c as startDevServer } from "./start-YMpNwLhh.mjs";
+import { s as recordDoctorCheck } from "./doctor-watchman-BovI1y3-.mjs";
+import { a as readDoctorReport } from "./doctor-k3P3PizH.mjs";
+import { h as warmWorktreeTarget, m as removeWorktreeTarget } from "./worktree-CclFIe1Z.mjs";
+import { i as readGcReport, n as executeGc, o as withGcMaintenanceClaim } from "./gc-B9jcnmIk.mjs";
+import { r as readWorkspaceLogs, t as followWorkspaceLogs } from "./logs-BsIRre8x.mjs";
+import { t as readProjectStats } from "./stats-report-n2U5plhk.mjs";
+import { n as buildAndroidOperation, t as buildIosOperation } from "./build-CAiw8Ezm.mjs";
+import { a as readAndroidBuildPlan, i as runAndroidOperation } from "./android-BGwuK3Mc.mjs";
+import { i as readIosBuildPlan, r as runIosOperation } from "./ios-BRVM8b0P.mjs";
+import { a as buildMacosBundle, i as planMacos, n as runMacos } from "./macos-D477nfzH.mjs";
+import { t as runWeb } from "./web-B4Yjyt1G.mjs";
+import { i as SettingsRefusal, o as readSettingsContext, s as readSettingsPayload, t as mutateSetting } from "./settings-write-n0zwfohx.mjs";
 import { randomBytes } from "node:crypto";
 import { mkdirSync, mkdtempSync, readFileSync, realpathSync, rmSync } from "node:fs";
 import { stripVTControlCharacters } from "node:util";
@@ -54,13 +53,15 @@ async function buildMacosOperation(context, root, options) {
 	const placement = resolveBuildPlacement(options.remoteBuild);
 	if (placement.failure) throw Object.assign(new Error(placement.failure.message), placement.failure);
 	const recipe = await (await selected.load()).prepare(context, settings);
-	ensureWorkspaceStorage(root);
+	await ensureWorkspaceStorageAsync(root, context.signal);
 	return withNativeBuildRun(context, root, {
 		command: "build",
 		platform: "macos"
 	}, async (claim) => {
-		if (!getProject(root)) upsertProject(root, {});
-		recordWorkspaceUse(root, /* @__PURE__ */ new Date(), context.env, context.cwd);
+		await withConfigLockAsync$1(() => {
+			if (!getProject(root)) upsertProject(root, {});
+		});
+		await recordWorkspaceUseAsync(root, /* @__PURE__ */ new Date(), context.env, context.cwd, context.signal);
 		const started = Date.now();
 		const progress = startBuildProgress({
 			root,

package/dist/{artifact-Xvgibgzq.mjs → artifact-Co8zixVx.mjs}

@@ -1,18 +1,17 @@
-import { h as withDrainingCancellation, x as ownership_claim_exports } from "./exec-DEoAhcze.mjs";
+import { D as ownership_claim_exports, c as throwIfCancelled, x as withDrainingCancellation } from "./exec-VFRpu1iA.mjs";
 import { d as workspaceDir } from "./paths-DQtTgsBf.mjs";
-import { _ as stepTimer, i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-YKGWivpG.mjs";
-import { f as throwIfCancelled } from "./operation-exec-BW0em61G.mjs";
-import { Hn as isEasAuthFailureText, Ln as RESOLVE_TIMEOUT_MS, Vn as easAuthNote } from "./budget-3ivAK99e.mjs";
-import { d as runCancellationSignal, r as cancelledFailure } from "./native-run-Dv88i0aU.mjs";
-import { d as prepareProviderDownloadDir, f as providerDownloadPath } from "./build-cache-Dv7RN200.mjs";
-import { n as CCACHE_UNAVAILABLE, r as ccacheActivityLine, t as CCACHE_NOT_RUN } from "./ccache-CH2EWGPB.mjs";
-import { c as offloadPlacement, i as closeOffload, l as placementLoad, n as buildPlacementCandidates, o as offloadBuild, r as chooseBuildMachine, u as remotePhaseText } from "./client-B4MMzfo_.mjs";
-import { a as requireLocalBuild, r as namedBuildMachine, t as OffloadRefusal } from "./selection-DSMbWEX2.mjs";
-import { f as formatDiagnostic } from "./react-native-build-CelbTO_y.mjs";
-import { l as skippedMissReason } from "./prebuild-BligW0QS.mjs";
-import { t as buildPlacementRecord } from "./placement-log-BnGgJRRZ.mjs";
-import { n as settleArtifactUploads, t as acquireArtifact } from "./acquire-artifact-BzYRDgaP.mjs";
-import { a as PLATFORM, h as displayPath } from "./support-CbXPbUMJ.mjs";
+import { _ as stepTimer, i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-BBvS1H6v.mjs";
+import { Bn as RESOLVE_TIMEOUT_MS, Gn as isEasAuthFailureText, Wn as easAuthNote } from "./budget-HyShrIpL.mjs";
+import { d as runCancellationSignal, r as cancelledFailure } from "./native-run-D5OJsGwA.mjs";
+import { g as providerDownloadPath, h as prepareProviderDownloadDir } from "./build-cache-CKCzxzxA.mjs";
+import { n as CCACHE_UNAVAILABLE, r as ccacheActivityLine, t as CCACHE_NOT_RUN } from "./ccache-h1FKhZeg.mjs";
+import { c as offloadPlacement, i as closeOffload, l as placementLoad, n as buildPlacementCandidates, o as offloadBuild, r as chooseBuildMachine, u as remotePhaseText } from "./client-BQsmyp_-.mjs";
+import { i as namedBuildMachine, o as requireLocalBuild, r as fingerprintMismatchRemedy, t as OffloadRefusal } from "./selection-D5cxEl3t.mjs";
+import { f as formatDiagnostic } from "./react-native-build-CwZB-agu.mjs";
+import { u as skippedMissReason } from "./prebuild-JUaqOLpc.mjs";
+import { t as buildPlacementRecord } from "./placement-log-DjOXJRIH.mjs";
+import { n as settleArtifactUploads, t as acquireArtifact } from "./acquire-artifact-zA4S7RHE.mjs";
+import { a as PLATFORM, h as displayPath } from "./support-Cxj9CmII.mjs";
 import { t as AndroidRecipeRefusal } from "./android-project-BCAAmMwz.mjs";
 import { rmSync } from "node:fs";
 import { join } from "node:path";
@@ -29,7 +28,7 @@ function fail(code, message, remedy, extra = {}) {
 		extra
 	};
 }
-async function acquireAndroidArtifact({ context, root, buildLog, writer, recipe, targetOffloadRefusal, buildPlan, cacheProviderConfig, requestedBuildCache, easBuild, androidPackage: initialPackage, record, maxBuilds, progress }, { acquireLock, releaseLock, waitForBuild, easAuth, resolveRemoteBuild, uploadRemoteBuild, loadCacheProviderModule, acquireSlot, releaseSlot, now }) {
+async function acquireAndroidArtifact({ context, root, buildLog, writer, recipe, targetOffloadRefusal, buildPlan, cacheProviderConfig, requestedBuildCache, easBuild, androidPackage: initialPackage, record, maxBuilds, progress }, { acquireLock, releaseLock, waitForBuild, easAuth, resolveRemoteBuild, uploadRemoteBuild, loadCacheProviderModule, storedAppId: entryAppId, acquireSlot, releaseSlot, now }) {
 	const { phase, out, stats, step, miss, hit: lateHit, place, waitingOn, waitingFor } = progress;
 	let fallbackMachine = null;
 	let hereReason = "no remote machine is paired";
@@ -47,7 +46,7 @@ async function acquireAndroidArtifact({ context, root, buildLog, writer, recipe,
 				machine: info.machine
 			}
 		}));
-		if (namedBuildMachine(buildMachine)) throw new OffloadRefusal(buildMachine, reason);
+		if (namedBuildMachine(buildMachine)) throw new OffloadRefusal(buildMachine, reason, info.remedy);
 		requireLocalBuild(buildMachine);
 		record.offloadFallback = reason;
 		phase("build", `${line} -> building here`);
@@ -445,6 +444,7 @@ async function acquireAndroidArtifact({ context, root, buildLog, writer, recipe,
 			choice,
 			expectedFingerprint: uncached ? null : storeHash,
 			request: recipe.offload.request,
+			fingerprintInputs: recipe.offload.fingerprintInputs,
 			stagingDir,
 			onPhase: (name, msg) => phase(name, remotePhaseText(name, msg, choice.machine)),
 			onEnter: (name) => {
@@ -505,7 +505,8 @@ async function acquireAndroidArtifact({ context, root, buildLog, writer, recipe,
 			fallbackMachine = choice.machine;
 			fallBack(`${choice.machine}: ${why}`, `offload failed: ${why}`, {
 				code: "offload-failed",
-				machine: choice.machine
+				machine: choice.machine,
+				remedy: outcome.ok ? void 0 : fingerprintMismatchRemedy(outcome.reason)
 			});
 			writer.write({
 				src: "build",
@@ -790,6 +791,7 @@ async function acquireAndroidArtifact({ context, root, buildLog, writer, recipe,
 			apkPath: acquired.artifact,
 			handoff,
 			androidPackage,
+			apkPackage: record.cacheHit && storeKey ? entryAppId(PLATFORM, storeKey) : null,
 			release: async () => {
 				await settleArtifactUploads(providerUpload, uploadPending);
 				acquired.release();