stim 1.23.0 → 1.24.0

package/dist/{android-BoUJKbfz.mjs → android-BZppyPe_.mjs}

@@ -1,40 +1,40 @@
-import { t as getExecutor, x as ownership_claim_exports } from "./exec-DEoAhcze.mjs";
+import { D as ownership_claim_exports, t as getExecutor } from "./exec-VFRpu1iA.mjs";
 import { m as workspaceLogsDir$1, t as emulatorLogFile } from "./paths-DQtTgsBf.mjs";
-import { B as deviceSlotFileKey, E as upsertProject, H as deviceSlotPlatforms, W as parseDeviceSlotOption, p as getProject, q as validateDeviceSlot, u as getConcurrencyLimits } from "./config-DlrsduwG.mjs";
-import { _ as stepTimer, f as refuseNoProject, g as stepClock, i as formatDuration, l as phaseLine } from "./command-output-Db8BqzxH.mjs";
-import { d as writeWorkspaceState, i as recordWorkspaceUse, r as readWorkspaceState$1 } from "./workspace-state-U08dEzhG.mjs";
-import { G as resolveCacheProviderConfig, H as remoteEasFallbackSetting, J as resolveProjectSettingsAsync, L as projectSettingsContextAsync, N as metroWarmupUrlSetting, R as publicUrlSetting, Y as resolveSettings, a as SETTING_SHAPE_REMEDY, ct as detectProviders, g as deviceReclaimIdleMinutesSetting, j as metroPortSetting, rt as tunnelModeSetting } from "./settings-C7O8A6ZI.mjs";
-import { L as workspaceDevServerMode, f as projectRegistry, i as findProjectRoot$1, l as projectShortcut, t as NO_PROJECT_REFUSAL, z as writeWorkspaceLaunch } from "./project-CTLNHCfE.mjs";
+import { B as deviceSlotFileKey, E as upsertProject, H as deviceSlotPlatforms, O as withConfigLockAsync$1, W as parseDeviceSlotOption, p as getProject, q as validateDeviceSlot, u as getConcurrencyLimits } from "./config-BZhXY15H.mjs";
+import { _ as stepTimer, f as refuseNoProject, g as stepClock, i as formatDuration, l as phaseLine } from "./command-output-DxC0k2rk.mjs";
+import { a as recordWorkspaceUseAsync, f as writeWorkspaceStateAsync, r as readWorkspaceState$1 } from "./workspace-state-CeBpIZgr.mjs";
+import { G as resolveCacheProviderConfig, H as remoteEasFallbackSetting, J as resolveProjectSettingsAsync, L as projectSettingsContextAsync, N as metroWarmupUrlSetting, R as publicUrlSetting, Y as resolveSettings, a as SETTING_SHAPE_REMEDY, ct as detectProviders, g as deviceReclaimIdleMinutesSetting, j as metroPortSetting, rt as tunnelModeSetting } from "./settings-RKwY33wv.mjs";
+import { L as workspaceDevServerMode, f as projectRegistry, i as findProjectRoot$1, l as projectShortcut, t as NO_PROJECT_REFUSAL, z as writeWorkspaceLaunchAsync } from "./project-Dz-hWkb-.mjs";
+import { A as listAdbDevices, I as listInstalledSystemImages, St as configuredAndroidEmulatorApp, Y as physicalDeviceModel, Z as probeEmulatorSerial, a as androidDeviceAbi, ct as waitForBoot, nt as resolveOwnedAvdSerialAsync, rt as resolvePhysicalDevice } from "./android-882m4hxX.mjs";
+import { c as pidExists, d as resolveProjectMetro } from "./metro-Bu8LBfzS.mjs";
 import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
-import { c as pidExists, d as resolveProjectMetro } from "./metro-DiXtA3Ty.mjs";
-import { Bn as checkEasAuth, Bt as ensureMetroReachable, Cn as launchAndroidApp, Gt as resolveRemoteContext, H as tapBuildLog, In as runProcessOperation, J as recordRunStats, Jn as resolveRemote, K as recordCapacityRefusal, Lt as binOnPath, M as NO_BUILD_PROGRESS, Pn as exitAfterFlush, U as createRunRecorder, Ut as remoteAndroidDeps, V as startBuildProgress, Vt as ensureRemoteBootOwned, W as readRunEstimates, Y as statsProjectKey$1, Yn as uploadRemote, cn as DEFAULT_METRO_PORT, in as verifyLaunch, qn as resolveEasCliBin, rn as verifyAndroidReleaseLaunch, rr as ownedSessionName, sn as ADB_INSTALL_TIMEOUT_MS, t as budgetGate, wn as launchAndroidReleaseApp, yn as installAndroidApp } from "./budget-DnPX3DXj.mjs";
-import { d as runCancellationSignal, f as withNativeBuildRun, r as cancelledFailure, u as runCancellation } from "./native-run-BUTu8T7A.mjs";
-import { I as acquireBuildSlot, R as releaseBuildSlot } from "./workspaces-BxzYlo3P.mjs";
-import { F as waitForBuild, M as acquireBuildLock, P as releaseBuildLock } from "./activity-B5RtpFda.mjs";
-import { A as listAdbDevices, I as listInstalledSystemImages, Y as physicalDeviceModel, Z as probeEmulatorSerial, a as androidDeviceAbi, ct as configuredAndroidEmulatorApp, et as resolveOwnedAvdSerialAsync, ot as waitForBoot, tt as resolvePhysicalDevice } from "./android-C7sVmyI9.mjs";
-import { t as CCACHE_NOT_RUN } from "./ccache-RcAy92gH.mjs";
-import { h as setRemoteLogSink } from "./client-yyso1bwi.mjs";
-import { i as parseBuildMachineOption, s as resolveBuildPlacement } from "./selection-DSMbWEX2.mjs";
-import { r as hostedMetroSettings } from "./metro-gateway-CKZqKqx7.mjs";
-import { a as writeHostedAndroid, i as writeDevicePlacement, t as readHostedAndroid } from "./ios-state-Dtw5K2aI.mjs";
-import { n as prepareHostedAndroid, t as placeHostedAndroid } from "./hosted-android-CkclQig_.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-C5fo5Edb.mjs";
-import { r as siblingPlatformSlots, t as launchSlotScope } from "./slot-launch-D7M2nE4b.mjs";
-import { c as startDevServer } from "./start-bjfiScgz.mjs";
-import { a as acquireRunLease, d as runLease, f as waitFlagConflict, o as leaseExpiryText, u as releaseLeaseOnAbort } from "./device-lease-run-BgwPHc6u.mjs";
-import { n as DeviceAdmissionRefusal, r as checkDeviceCapacity } from "./device-capacity-CjaSdrhg.mjs";
-import { a as resolveEasDevelopmentBuild, r as isEasBuildFailure } from "./eas-build-CyjU5K7E.mjs";
-import { n as ensureWorkspaceStorageSafely, r as isPhysicalDeviceRequest, t as ensureDevServer } from "./native-runtime-CRSOZxKY.mjs";
-import { n as devicePlacementRecord } from "./placement-log-BnGgJRRZ.mjs";
-import { S as pooledAndroidDevice, a as PLATFORM, b as noDeviceDiagnostic, g as dumpApkManifest, h as displayPath, o as androidBuildOptions, p as apkPackage, r as NO_DEVICE, s as androidDevClientScheme } from "./support-DTBV56gy.mjs";
-import { t as acquireAndroidArtifact } from "./artifact-5RteZem7.mjs";
-import { a as reportAndroidResult, c as resolveAndroidRunPlan, i as persistLastBuild, n as finishAndroidUpload, o as androidDeviceSelectorRefusal } from "./result-Cx5CRLvS.mjs";
-import { n as automaticDevicePlacement, r as devicePlacementLine, t as checkEasFallback } from "./eas-fallback-DV3Wytf1.mjs";
-import { a as AvdRecoveryError, i as AvdBootError, n as ensureBooted, o as warmMetro, r as ensureOwnedDevice, t as didSetUpDevice } from "./device-CCkWmkAA.mjs";
-import { t as selectFromPool } from "./device-pool-C-ptmZTa.mjs";
-import { r as finishAndroidRun } from "./launch-Bz7JtaC4.mjs";
+import { En as launchAndroidReleaseApp, G as createRunRecorder, Gt as remoteAndroidDeps, H as startBuildProgress, Hn as checkEasAuth, Ht as ensureMetroReachable, In as exitAfterFlush, J as recordCapacityRefusal, K as readRunEstimates, M as NO_BUILD_PROGRESS, Rn as runProcessOperation, Tn as launchAndroidApp, U as tapBuildLog, Ut as ensureRemoteBootOwned, V as runFailureRecord, W as thrownRunFailureRecord, X as recordRunStats, Xn as resolveRemote, Yn as resolveEasCliBin, Z as statsProjectKey$1, Zn as uploadRemote, an as verifyAndroidReleaseLaunch, ar as ownedSessionName, ln as ADB_INSTALL_TIMEOUT_MS, on as verifyLaunch, qt as resolveRemoteContext, t as budgetGate, un as DEFAULT_METRO_PORT, xn as installAndroidApp, zt as binOnPath } from "./budget-dPGuhNai.mjs";
+import { d as runCancellationSignal, f as withNativeBuildRun, r as cancelledFailure, u as runCancellation } from "./native-run-BmH7U8pr.mjs";
+import { L as acquireBuildSlot, z as releaseBuildSlot } from "./workspaces-CSV2Orf4.mjs";
+import { F as waitForBuild, M as acquireBuildLock, P as releaseBuildLock } from "./activity-Dq3ZcdD8.mjs";
+import { t as CCACHE_NOT_RUN } from "./ccache-CCn1S6qG.mjs";
+import { S as setRemoteLogSink } from "./client-18-ZowoT.mjs";
+import { a as parseBuildMachineOption, c as resolveBuildPlacement } from "./selection-BLtvaqxc.mjs";
+import { r as hostedMetroSettings } from "./metro-gateway-DtsOy-0P.mjs";
+import { a as writeHostedAndroidAsync, i as writeDevicePlacementAsync, t as readHostedAndroid } from "./ios-state-DlElquYD.mjs";
+import { n as prepareHostedAndroid, t as placeHostedAndroid } from "./hosted-android-D4dweBof.mjs";
+import { n as verifyCollectorOwnership } from "./ownership-DxlZGDcV.mjs";
+import { r as siblingPlatformSlots, t as launchSlotScope } from "./slot-launch-A1BgotaM.mjs";
+import { c as startDevServer } from "./start-BKGrEhzG.mjs";
+import { a as acquireRunLease, d as runLease, f as waitFlagConflict, o as leaseExpiryText, u as releaseLeaseOnAbort } from "./device-lease-run-DUtkbqBQ.mjs";
+import { n as DeviceAdmissionRefusal, r as checkDeviceCapacity } from "./device-capacity-Ic-kdmEV.mjs";
+import { a as resolveEasDevelopmentBuild, r as isEasBuildFailure } from "./eas-build-CxKUNHsb.mjs";
+import { n as ensureWorkspaceStorageSafely, r as isPhysicalDeviceRequest, t as ensureDevServer } from "./native-runtime-DgtJkzIa.mjs";
+import { n as devicePlacementRecord } from "./placement-log-DUvqqsB-.mjs";
+import { S as pooledAndroidDevice, a as PLATFORM, b as noDeviceDiagnostic, g as dumpApkManifest, h as displayPath, o as androidBuildOptions, p as apkPackage, r as NO_DEVICE, s as androidDevClientScheme } from "./support-B3tzVhKn.mjs";
+import { t as acquireAndroidArtifact } from "./artifact-BR5VNArK.mjs";
+import { a as persistLastBuild, c as androidDeviceSelectorRefusal, i as logPostBuildFailure, n as finishAndroidUpload, o as persistThrownBuild, s as reportAndroidResult, u as resolveAndroidRunPlan } from "./result-DqBrb12U.mjs";
+import { n as automaticDevicePlacement, r as devicePlacementLine, t as checkEasFallback } from "./eas-fallback-LMxk9Kw0.mjs";
+import { a as AvdRecoveryError, i as AvdBootError, n as ensureBooted, o as warmMetro, r as ensureOwnedDevice, t as didSetUpDevice } from "./device-BktRGdjS.mjs";
+import { t as selectFromPool } from "./device-pool-CgBHk401.mjs";
+import { r as finishAndroidRun } from "./launch-SfzGH_s9.mjs";
 import { t as unsupportedPlan } from "./project-plan-BPwbLwQu.mjs";
-import { a as refusePlan, i as printPlan, n as planFlagRefusal } from "./build-plan-C8CIvRyi.mjs";
+import { a as refusePlan, i as printPlan, n as planFlagRefusal } from "./build-plan-JsDUq4w1.mjs";
 import { basename, join } from "node:path";
 import { workspaceId } from "@stim-cli/core";
 import { hostedAndroidStatus, parseMachine } from "@stim-cli/core/state";
@@ -201,8 +201,8 @@ async function finishHostedAndroidRun({ target, artifact, root, slot = "default"
 			note: out,
 			enterPhase
 		});
-		writePlacement(root, slot, run.placement);
-		writeLaunch(root, "android", {
+		await writePlacement(root, slot, run.placement);
+		await writeLaunch(root, "android", {
 			appId: packageName,
 			deviceId: run.placement.session,
 			metroPort,
@@ -235,7 +235,7 @@ async function finishHostedAndroidRun({ target, artifact, root, slot = "default"
 			record: report.record,
 			startedAt,
 			durationMs: now() - started,
-			status: "success",
+			status: "ok",
 			out
 		});
 		await finishAndroidUpload(artifact.uploadPending, artifact.remote, phase);
@@ -339,7 +339,7 @@ function runAndroidOperation(context, root, opts = {}) {
 		platform: PLATFORM,
 		slot: opts.slot ?? "default"
 	}, async (claim) => {
-		recordWorkspaceUse(root, /* @__PURE__ */ new Date(), context.env, context.cwd);
+		await recordWorkspaceUseAsync(root, /* @__PURE__ */ new Date(), context.env, context.cwd, context.signal);
 		const progress = startBuildProgress({
 			root,
 			platform: PLATFORM,
@@ -374,7 +374,7 @@ function runAndroidOperation(context, root, opts = {}) {
 function resolveRunAndroidOptions({ context, root, json = false, remoteDevice: commandRemoteBackend = null, resolveSettingsFor = resolveSettings, resolveRemoteDeviceContext = resolveRemoteContext, remoteDeviceDeps: makeRemoteDeviceDeps = remoteAndroidDeps, resolveEasBin = resolveEasCliBin, ensureMetroReachable: ensureRemoteMetro = ensureMetroReachable, ensureRemoteBootOwned: ensureRemoteOwned = ensureRemoteBootOwned, detectRemoteProviders = detectProviders, metroCheck = true, useBuildCache = true, easProfile, resolveEasDevelopmentBuild: resolveEasBuild = resolveEasDevelopmentBuild, variant: variantFlag = null, systemImage: systemImageFlag = null, deviceProfile: deviceProfileFlag, device: deviceFlag = null, wait: waitFlag = void 0, waitConflict = false, acquireLease = acquireRunLease, makeRunLease = runLease, selectPool = selectFromPool, onLeaseSignal = releaseLeaseOnAbort, listDevices = listAdbDevices, deviceModel = physicalDeviceModel, deviceAbi = androidDeviceAbi, isEmulatorDevice = probeEmulatorSerial, readApkPackage = async (apkPath) => apkPackage(await dumpApkManifest(apkPath, { context })), getLimits = getConcurrencyLimits, checkCapacity = checkDeviceCapacity, acquireSlot = acquireBuildSlot, releaseSlot = releaseBuildSlot, ensureDevice = ensureOwnedDevice, listSystemImages = listInstalledSystemImages, listDeviceProfiles, ensureDeviceBooted = ensureBooted, resolveAvdSerial = resolveOwnedAvdSerialAsync, waitForDeviceBoot = waitForBoot, dataFreeBytes, trimCaches, wipeDevice, resolveMetro = resolveProjectMetro, warmMetro: prewarmMetro = warmMetro, startServer = startDevServer, readState = readWorkspaceState$1, pidAlive = pidExists, verifyCollector = verifyCollectorOwnership, verifyLaunched = verifyLaunch, ensureStorage = ensureWorkspaceStorageSafely, acquireLock = acquireBuildLock, releaseLock = releaseBuildLock, waitForBuild: waitForBuild$1 = waitForBuild, easAuth = checkEasAuth, resolveRemoteBuild = resolveRemote, uploadRemoteBuild = uploadRemote, resolveCacheProvider = resolveCacheProviderConfig, loadCacheProviderModule = loadCacheProvider, install = installAndroidApp, launch = launchAndroidApp, launchRelease = launchAndroidReleaseApp, verifyReleaseLaunched = verifyAndroidReleaseLaunch, resolveDevClientScheme = (projectRoot, apkPath, options) => androidDevClientScheme(projectRoot, apkPath, {
 	...options,
 	context
-}), spawn = (cmd, args, opts) => getExecutor().spawn(cmd, args, opts), kill = (pid, signal) => process.kill(pid, signal), createWriter = createNdjsonWriter, writeLaunch = writeWorkspaceLaunch, writeState = writeWorkspaceState, recordBuild, recordStats = recordRunStats, recordCapacityRefusal: recordRefusal, readEstimates = readRunEstimates, now = Date.now, out = (line) => context ? context.output("stderr", `${line}\n`) : console.error(line), emit = (line) => context ? context.output("stdout", `${line}\n`) : console.log(line) } = {}) {
+}), spawn = (cmd, args, opts) => getExecutor().spawn(cmd, args, opts), kill = (pid, signal) => process.kill(pid, signal), createWriter = createNdjsonWriter, writeLaunch = writeWorkspaceLaunchAsync, writeState = writeWorkspaceStateAsync, recordBuild, recordStats = recordRunStats, recordCapacityRefusal: recordRefusal, readEstimates = readRunEstimates, now = Date.now, out = (line) => context ? context.output("stderr", `${line}\n`) : console.error(line), emit = (line) => context ? context.output("stdout", `${line}\n`) : console.log(line) } = {}) {
 	return {
 		root,
 		json,
@@ -589,13 +589,14 @@ async function runAndroid(options = {}) {
 	const recordRun = stats.record;
 	let ccacheActivity = CCACHE_NOT_RUN;
 	let reclaimed = [];
+	let artifactAcquired = false;
 	const fail = (code, message, remedy, { lastBuildStatus = false, setup = false, diagnostics = [], buildDiagnostics: rawDiagnostics = [], retainedClaimRoots, lines = [], logPath = null, lease } = {}) => {
 		const cancellation = cancelledFailure(context, PLATFORM, {
 			code,
 			message
 		});
 		if (cancellation) ({code, message, remedy, lines} = cancellation);
-		if (lastBuildStatus) persistLastBuild({
+		if (lastBuildStatus || artifactAcquired) persistLastBuild({
 			recordBuild,
 			root,
 			record,
@@ -606,6 +607,11 @@ async function runAndroid(options = {}) {
 			diagnostics: rawDiagnostics,
 			out
 		});
+		logPostBuildFailure(artifactAcquired, writer, runFailureRecord({
+			code,
+			message,
+			phase: progress.phase()
+		}));
 		out(phaseLine("error", chalk.red(`${code}: ${message}`)));
 		for (const diagnostic of diagnostics) out(phaseLine("error", chalk.red(diagnostic)));
 		for (const line of lines) out(phaseLine("", chalk.dim(line)));
@@ -684,8 +690,10 @@ async function runAndroid(options = {}) {
 		wait: waitFlag,
 		waitConflict,
 		remote: commandRemoteBackend,
-		buildCache: requestedBuildCache
+		buildCache: requestedBuildCache,
+		buildMachine: placement.selected
 	}, {
+		preflight: integration.preflight,
 		resolveCacheProvider,
 		runtimeKind: integration.runtimeKind,
 		variantProblem: integration.variantProblem,
@@ -766,7 +774,7 @@ async function runAndroid(options = {}) {
 	if ("failure" in hosting) return fail(hosting.failure.code, hosting.failure.message, hosting.failure.remedy);
 	const { target, hostedTarget, budget, selectors } = hosting;
 	record.devicePlacement = hosting.devicePlacement;
-	writeDevicePlacement(root, slot, PLATFORM, record.devicePlacement);
+	await writeDevicePlacementAsync(root, slot, PLATFORM, record.devicePlacement);
 	const physical = target.kind === "physical";
 	const remoteBackend = target.kind === "remote" ? target.backend : null;
 	if (hostedTarget) {
@@ -811,12 +819,12 @@ async function runAndroid(options = {}) {
 	const appIds = await integration.appIds();
 	let androidPackage = appIds.androidPackage;
 	record.bundleId = androidPackage;
-	const registerProject = () => upsertProject(root, {
+	const registerProject = () => withConfigLockAsync$1(() => upsertProject(root, {
 		bundleId: appIds.bundleId ?? void 0,
 		androidPackage: androidPackage ?? void 0,
 		isExpo
-	});
-	if (remoteBackend !== "eas") registerProject();
+	}));
+	if (remoteBackend !== "eas") await registerProject();
 	const project = getProject(root);
 	const label = projectShortcut(root, project);
 	let remoteDevice = null;
@@ -1116,6 +1124,7 @@ async function runAndroid(options = {}) {
 		ccacheActivity = artifact.ccache;
 		androidPackage = artifact.androidPackage;
 		record.appPath = apkPath;
+		artifactAcquired = true;
 		if (runCancellation(context)) return fail("STIM_CANCELLED", "before install");
 		if (hostedTarget) return finishHostedAndroidRun({
 			target: hostedTarget,
@@ -1129,7 +1138,7 @@ async function runAndroid(options = {}) {
 			logsDir,
 			selectors,
 			place: options.placeHostedAndroid ?? placeHostedAndroid,
-			writePlacement: options.writeHostedAndroid ?? writeHostedAndroid,
+			writePlacement: options.writeHostedAndroid ?? writeHostedAndroidAsync,
 			verifyLaunch: verifyLaunched,
 			writeLaunch,
 			readApkPackage,
@@ -1308,6 +1317,17 @@ async function runAndroid(options = {}) {
 			message: "while finishing the run"
 		});
 		if (cancelled) return fail(cancelled.code, cancelled.message, cancelled.remedy, { lastBuildStatus: true });
+		logPostBuildFailure(artifactAcquired, writer, thrownRunFailureRecord(error, progress.phase()));
+		persistThrownBuild({
+			acquired: artifactAcquired,
+			error,
+			recordBuild,
+			root,
+			record,
+			startedAt,
+			durationMs: now() - started,
+			out
+		});
 		recordRun({
 			failed: true,
 			durationMs: now() - started

package/dist/{android-DR5lZ2Az.mjs → android-CX5IcRuf.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-882m4hxX.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/{android-CHH4KLOR.mjs → android-DcztblCT.mjs}

@@ -1,6 +1,6 @@
-import { i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-Db8BqzxH.mjs";
-import { E as resolveVariant, T as resolveSystemImage, _ as findAapt, b as noDeviceDiagnostic, d as androidVariantSetting, f as apkDevClientFacts, g as dumpApkManifest, h as displayPath, i as NO_FINGERPRINT, p as apkPackage, r as NO_DEVICE, s as androidDevClientScheme, u as androidSystemImageSetting, x as parseXmltree, y as isReleaseVariant } from "./support-DTBV56gy.mjs";
-import { r as lastBuildRecord, t as androidFacts } from "./result-Cx5CRLvS.mjs";
-import { i as runAndroidOperation, n as registerAndroid, r as runAndroid, t as androidCommand } from "./android-BoUJKbfz.mjs";
-import { a as killPreviousCollector, i as collectorLogFile, o as startCollector } from "./launch-Bz7JtaC4.mjs";
+import { i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-DxC0k2rk.mjs";
+import { E as resolveVariant, T as resolveSystemImage, _ as findAapt, b as noDeviceDiagnostic, d as androidVariantSetting, f as apkDevClientFacts, g as dumpApkManifest, h as displayPath, i as NO_FINGERPRINT, p as apkPackage, r as NO_DEVICE, s as androidDevClientScheme, u as androidSystemImageSetting, x as parseXmltree, y as isReleaseVariant } from "./support-B3tzVhKn.mjs";
+import { r as lastBuildRecord, t as androidFacts } from "./result-DqBrb12U.mjs";
+import { i as runAndroidOperation, n as registerAndroid, r as runAndroid, t as androidCommand } from "./android-BZppyPe_.mjs";
+import { a as killPreviousCollector, i as collectorLogFile, o as startCollector } from "./launch-SfzGH_s9.mjs";
 export { NO_DEVICE, NO_FINGERPRINT, androidDevClientScheme, androidFacts, androidSystemImageSetting, androidVariantSetting, apkDevClientFacts, apkPackage, collectorLogFile, androidCommand as default, displayPath, dumpApkManifest, findAapt, formatDuration, isReleaseVariant, killPreviousCollector, lastBuildRecord, noDeviceDiagnostic, parseXmltree, phaseLine, registerAndroid, resolveSystemImage, resolveVariant, runAndroid, runAndroidOperation, shortHash, startCollector };

package/dist/{android-cas-ngferVq2.mjs → android-cas-BtCOrNqb.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-RKwY33wv.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/api.d.mts

@@ -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;
@@ -247,6 +247,7 @@ interface ToolchainReport {
     spec: string;
     bin: string | null;
     version: string | null;
+    match: "exact" | "major" | null;
   } | null;
 }
 interface DoctorReport {
@@ -448,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;
@@ -460,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;
@@ -479,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";
@@ -690,6 +706,7 @@ interface GcJsonSections {
   swiftpmCache: SwiftpmCacheUsage | null;
   machineCaches: MachineCacheReport | null;
   tempLeftovers: ReturnType<typeof tempLeftoverSection>;
+  trash: TrashReport | null;
   gradleVersions: GradleVersionSweep | null;
   caches: {
     name: string;
@@ -792,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-Db8BqzxH.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-CTLNHCfE.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-DxC0k2rk.mjs";
+import { a as recordWorkspaceUseAsync } from "./workspace-state-CeBpIZgr.mjs";
+import { J as resolveProjectSettingsAsync, Nt as repoRootAsync, a as SETTING_SHAPE_REMEDY, et as settingShapeErrors, it as unknownSettingKeys, p as cacheProviderSettingError } from "./settings-RKwY33wv.mjs";
+import { c as projectProblem, f as projectRegistry, i as findProjectRoot$1, r as findCommandWorkspaceAsync, t as NO_PROJECT_REFUSAL } from "./project-Dz-hWkb-.mjs";
+import { n as macosDir } from "./state-BfAltYJP.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-DnPX3DXj.mjs";
-import { d as runCancellationSignal, f as withNativeBuildRun } from "./native-run-BUTu8T7A.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-B2uLQfoM.mjs";
-import { r as runReload } from "./reload-DF9hqUUB.mjs";
-import { c as startDevServer } from "./start-bjfiScgz.mjs";
-import { s as recordDoctorCheck } from "./doctor-watchman-sy_RNhFt.mjs";
-import { a as readDoctorReport } from "./doctor-D2SN3Ltx.mjs";
-import { h as warmWorktreeTarget, m as removeWorktreeTarget } from "./worktree-8lqn_lBp.mjs";
-import { i as readGcReport, n as executeGc, o as withGcMaintenanceClaim } from "./gc-CDoogxAI.mjs";
-import { r as readWorkspaceLogs, t as followWorkspaceLogs } from "./logs-mxqsWpJs.mjs";
-import { t as readProjectStats } from "./stats-report-BzaPrRm6.mjs";
-import { n as buildAndroidOperation, t as buildIosOperation } from "./build-CqufZFqy.mjs";
-import { a as readAndroidBuildPlan, i as runAndroidOperation } from "./android-BoUJKbfz.mjs";
-import { i as readIosBuildPlan, r as runIosOperation } from "./ios-DZZbNYlY.mjs";
-import { a as buildMacosBundle, i as planMacos, n as runMacos } from "./macos-u0BoHKnO.mjs";
-import { t as runWeb } from "./web-CwREhjD-.mjs";
-import { i as SettingsRefusal, o as readSettingsContext, s as readSettingsPayload, t as mutateSetting } from "./settings-write-79mQRr9C.mjs";
+import { B as recordFinishedBuild, H as startBuildProgress, U as tapBuildLog } from "./budget-dPGuhNai.mjs";
+import { d as runCancellationSignal, f as withNativeBuildRun } from "./native-run-BmH7U8pr.mjs";
+import { c as resolveBuildPlacement } from "./selection-BLtvaqxc.mjs";
+import { c as stopWorkspaceNow } from "./stop-CL1kDHds.mjs";
+import { r as runReload } from "./reload-C1TTVesC.mjs";
+import { c as startDevServer } from "./start-BKGrEhzG.mjs";
+import { s as recordDoctorCheck } from "./doctor-watchman-B453A231.mjs";
+import { a as readDoctorReport } from "./doctor-DZgpqR6J.mjs";
+import { h as warmWorktreeTarget, m as removeWorktreeTarget } from "./worktree-Dw8kfacb.mjs";
+import { i as readGcReport, n as executeGc, o as withGcMaintenanceClaim } from "./gc-yVKpAOKM.mjs";
+import { r as readWorkspaceLogs, t as followWorkspaceLogs } from "./logs-DXE32kyb.mjs";
+import { t as readProjectStats } from "./stats-report-n2U5plhk.mjs";
+import { n as buildAndroidOperation, t as buildIosOperation } from "./build-CaF574eS.mjs";
+import { a as readAndroidBuildPlan, i as runAndroidOperation } from "./android-BZppyPe_.mjs";
+import { i as readIosBuildPlan, r as runIosOperation } from "./ios-B1FXRCMX.mjs";
+import { a as buildMacosBundle, i as planMacos, n as runMacos } from "./macos-CCfhb-jT.mjs";
+import { t as runWeb } from "./web-BH7peScT.mjs";
+import { i as SettingsRefusal, o as readSettingsContext, s as readSettingsPayload, t as mutateSetting } from "./settings-write--gj6MACV.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-5RteZem7.mjs → artifact-BR5VNArK.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-Db8BqzxH.mjs";
-import { f as throwIfCancelled } from "./operation-exec-BW0em61G.mjs";
-import { Hn as isEasAuthFailureText, Ln as RESOLVE_TIMEOUT_MS, Vn as easAuthNote } from "./budget-DnPX3DXj.mjs";
-import { d as runCancellationSignal, r as cancelledFailure } from "./native-run-BUTu8T7A.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-RcAy92gH.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-yyso1bwi.mjs";
-import { a as requireLocalBuild, r as namedBuildMachine, t as OffloadRefusal } from "./selection-DSMbWEX2.mjs";
-import { f as formatDiagnostic } from "./react-native-build-CmJkTljQ.mjs";
-import { l as skippedMissReason } from "./prebuild-BFm63bQ0.mjs";
-import { t as buildPlacementRecord } from "./placement-log-BnGgJRRZ.mjs";
-import { n as settleArtifactUploads, t as acquireArtifact } from "./acquire-artifact-ybouwJSR.mjs";
-import { a as PLATFORM, h as displayPath } from "./support-DTBV56gy.mjs";
+import { _ as stepTimer, i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-DxC0k2rk.mjs";
+import { Un as easAuthNote, Wn as isEasAuthFailureText, zn as RESOLVE_TIMEOUT_MS } from "./budget-dPGuhNai.mjs";
+import { d as runCancellationSignal, r as cancelledFailure } from "./native-run-BmH7U8pr.mjs";
+import { g as providerDownloadPath, h as prepareProviderDownloadDir } from "./build-cache-HFUQ9eLz.mjs";
+import { n as CCACHE_UNAVAILABLE, r as ccacheActivityLine, t as CCACHE_NOT_RUN } from "./ccache-CCn1S6qG.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-18-ZowoT.mjs";
+import { i as namedBuildMachine, o as requireLocalBuild, r as fingerprintMismatchRemedy, t as OffloadRefusal } from "./selection-BLtvaqxc.mjs";
+import { f as formatDiagnostic } from "./react-native-build-AuCu-aAP.mjs";
+import { u as skippedMissReason } from "./prebuild-DmVCf5xb.mjs";
+import { t as buildPlacementRecord } from "./placement-log-DUvqqsB-.mjs";
+import { n as settleArtifactUploads, t as acquireArtifact } from "./acquire-artifact-CEs02U2o.mjs";
+import { a as PLATFORM, h as displayPath } from "./support-B3tzVhKn.mjs";
 import { t as AndroidRecipeRefusal } from "./android-project-BCAAmMwz.mjs";
 import { rmSync } from "node:fs";
 import { join } from "node:path";
@@ -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",

package/dist/{artifact-Dwdo7k1E.mjs → artifact-Bdt_n9Jc.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-Db8BqzxH.mjs";
-import { f as throwIfCancelled } from "./operation-exec-BW0em61G.mjs";
-import { Hn as isEasAuthFailureText, Ln as RESOLVE_TIMEOUT_MS, Vn as easAuthNote } from "./budget-DnPX3DXj.mjs";
-import { d as runCancellationSignal, r as cancelledFailure } from "./native-run-BUTu8T7A.mjs";
-import { d as prepareProviderDownloadDir, f as providerDownloadPath, p as providerUploadOutcome } from "./build-cache-Dv7RN200.mjs";
-import { o as compilationCacheActivityLine, t as COMPILATION_CACHE_NOT_RUN } from "./xcode-iQnROM5o.mjs";
-import { _ as clearCorruptCompilationCache, c as offloadPlacement, g as COMPILATION_CACHE_CORRUPT, i as closeOffload, l as placementLoad, n as buildPlacementCandidates, o as offloadBuild, r as chooseBuildMachine, u as remotePhaseText } from "./client-yyso1bwi.mjs";
-import { a as requireLocalBuild, r as namedBuildMachine, t as OffloadRefusal } from "./selection-DSMbWEX2.mjs";
-import { S as xcodeFailureReport, p as printDiagnostics } from "./support-BTpZ6RAJ.mjs";
-import { l as skippedMissReason } from "./prebuild-BFm63bQ0.mjs";
-import { t as buildPlacementRecord } from "./placement-log-BnGgJRRZ.mjs";
-import { n as settleArtifactUploads, t as acquireArtifact } from "./acquire-artifact-ybouwJSR.mjs";
-import { r as finishIosUpload, t as IosRecipeRefusal } from "./ios-project-CVyNwjAF.mjs";
+import { _ as stepTimer, i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-DxC0k2rk.mjs";
+import { Un as easAuthNote, Wn as isEasAuthFailureText, zn as RESOLVE_TIMEOUT_MS } from "./budget-dPGuhNai.mjs";
+import { d as runCancellationSignal, r as cancelledFailure } from "./native-run-BmH7U8pr.mjs";
+import { _ as providerUploadOutcome, g as providerDownloadPath, h as prepareProviderDownloadDir } from "./build-cache-HFUQ9eLz.mjs";
+import { o as compilationCacheActivityLine, t as COMPILATION_CACHE_NOT_RUN } from "./xcode-DHu41qQ4.mjs";
+import { C as COMPILATION_CACHE_CORRUPT, c as offloadPlacement, i as closeOffload, l as placementLoad, n as buildPlacementCandidates, o as offloadBuild, r as chooseBuildMachine, u as remotePhaseText, w as clearCorruptCompilationCache } from "./client-18-ZowoT.mjs";
+import { i as namedBuildMachine, o as requireLocalBuild, r as fingerprintMismatchRemedy, t as OffloadRefusal } from "./selection-BLtvaqxc.mjs";
+import { S as xcodeFailureReport, p as printDiagnostics } from "./support-B1W-hmC2.mjs";
+import { u as skippedMissReason } from "./prebuild-DmVCf5xb.mjs";
+import { t as buildPlacementRecord } from "./placement-log-DUvqqsB-.mjs";
+import { n as settleArtifactUploads, t as acquireArtifact } from "./acquire-artifact-CEs02U2o.mjs";
+import { r as finishIosUpload, t as IosRecipeRefusal } from "./ios-project-KYqeJURj.mjs";
 import { rmSync } from "node:fs";
 import { join } from "node:path";
 import { machineCapacity } from "@stim-cli/core/state";
@@ -64,7 +63,7 @@ async function acquireIosArtifact({ context, root, logFile, recipe, physical, co
 				machine: info.machine
 			}
 		}));
-		if (namedBuildMachine(buildMachine)) throw new OffloadRefusal(buildMachine, reason);
+		if (namedBuildMachine(buildMachine)) throw new OffloadRefusal(buildMachine, reason, info.remedy);
 		requireLocalBuild(buildMachine);
 		offloadFallback = reason;
 		buildFailure = {
@@ -424,6 +423,7 @@ async function acquireIosArtifact({ context, root, logFile, recipe, physical, co
 			choice,
 			expectedFingerprint: storeHash,
 			request: recipe.offload.request(runtime),
+			fingerprintInputs: recipe.offload.fingerprintInputs,
 			stagingDir,
 			onPhase: (name, msg) => phase(name, remotePhaseText(name, msg, choice.machine)),
 			onEnter: (name) => {
@@ -483,7 +483,8 @@ async function acquireIosArtifact({ context, root, logFile, recipe, physical, co
 			});
 			fallBack(`${choice.machine}: ${why}`, `offload failed: ${why}`, {
 				code: corrupt === void 0 ? "offload-failed" : COMPILATION_CACHE_CORRUPT,
-				machine: choice.machine
+				machine: choice.machine,
+				remedy: outcome.ok ? void 0 : fingerprintMismatchRemedy(outcome.reason)
 			});
 			logWriter().write({
 				src: "build",

package/dist/{artifact-platform-CXcmX_j3.mjs → artifact-platform-CMRc0M_r.mjs}

@@ -1,14 +1,14 @@
-import { t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { t as getExecutor } from "./exec-VFRpu1iA.mjs";
 import { join } from "node:path";
 //#region src/macos/artifact-platform.ts
-async function validateMacosArtifactPlatform(context, bundle, product, signal) {
+async function validateMacosArtifactPlatform(context, bundle, product, signal, nodeArch = process.arch) {
 	const binary = join(bundle, "Contents", "MacOS", product);
 	const options = {
 		timeoutMs: 3e4,
 		signal,
 		declareFor: context
 	};
-	const architecture = process.arch === "x64" ? "x86_64" : process.arch;
+	const architecture = nodeArch === "x64" ? "x86_64" : nodeArch;
 	const archs = await getExecutor().runFileAsync("xcrun", [
 		"lipo",
 		"-archs",