stim 1.25.0 → 1.27.0

package/dist/auto-placement-z-H5pJza.mjs

@@ -0,0 +1,350 @@
+import { _ as loadConfig$1, p as getProject } from "./config-Cn94Jc0g.mjs";
+import { m as peekBudget } from "./ccache-BWTze1Ls.mjs";
+import { z as readHostMemoryPressureAsync } from "./ios-E26qSpkb.mjs";
+import { _ as hostingMachines, o as namedBuildMachine, u as resolveBuildMachine } from "./selection-Bs8phwhN.mjs";
+import { c as call, l as connectHost, p as requireHostedAppMode } from "./hosted-client-D7Pk_Oo1.mjs";
+import { c as writeHostedNativeAsync, r as readHostedNative } from "./ios-state-BZ03NFgF.mjs";
+import { i as prepareHostedNative } from "./hosted-native-CdgaiuyP.mjs";
+import { l as peekDeviceSlots, t as DEFAULT_DEVICE_SLOT_WAIT_MS } from "./device-capacity-6LP7QsaA.mjs";
+import { ambientEnv } from "@stim-cli/core";
+import { automaticMachineEnabled, isJsonObject, machineCapacity, mayRunHere, parseHostedChoice, parseHostedNativeOffer, prefersRemote } from "@stim-cli/core/state";
+import { setTimeout } from "node:timers/promises";
+//#region src/device-host/placement.ts
+function local$1(code, reason, skipped = [], atCapacity = false) {
+	return {
+		kind: "local",
+		code,
+		reason,
+		skipped,
+		...atCapacity ? { atCapacity: true } : {}
+	};
+}
+function decideDevicePlacement(inputs) {
+	if ("sticky" in inputs) {
+		if ("machine" in inputs.sticky) {
+			const reason = `recorded session on ${inputs.sticky.machine}`;
+			return {
+				kind: "host",
+				code: "sticky",
+				reason,
+				machines: [{
+					machine: inputs.sticky.machine,
+					reason
+				}],
+				skipped: []
+			};
+		}
+		return {
+			kind: "local",
+			code: "sticky",
+			reason: "this workspace's device runs here",
+			skipped: []
+		};
+	}
+	const { platform, placement = "auto", here, offers, buildMachine, noWait, eas } = inputs;
+	const remoteFirst = prefersRemote(placement);
+	const { count, max, queued } = here.devices;
+	const room = max === 0 || count !== null && count < max;
+	const localEnabled = here.localEnabled !== false && mayRunHere(placement);
+	const cannotTake = !localEnabled || !room || queued > 0;
+	const atCapacity = count !== null && (!room || queued > 0);
+	const usage = max > 0 ? `${count} of ${max} devices in use` : `${count} devices in use, no device cap`;
+	const localReason = !mayRunHere(placement) ? "remote-only never runs here" : !localEnabled ? "local is disabled in remote.devicePoolDisabled" : count === null ? "cannot tell how many devices run here; local boot admission decides" : cannotTake ? `${usage}${queued ? `, ${queued} runs queued ahead` : ""}` : here.budgetRefusal ?? (here.memoryPressure !== "normal" ? `host memory pressure ${here.memoryPressure ?? "unknown"} here` : `load ${here.loadPerCore.toFixed(1)}/core here, ${usage}`);
+	let hostsFull = false;
+	const nowhere = (code, reason, skipped = [], waiting = "") => {
+		if (!mayRunHere(placement)) return {
+			kind: "refused",
+			code: "pool-unavailable",
+			reason,
+			skipped,
+			...hostsFull ? { hostsFull: true } : {}
+		};
+		if (!localEnabled && !atCapacity) return {
+			kind: "refused",
+			code: "pool-unavailable",
+			reason,
+			skipped
+		};
+		if (!cannotTake || count === null) return local$1(code, reason + waiting, skipped);
+		if (eas?.usable) return {
+			kind: "eas",
+			code: "eas-fallback",
+			reason: `${reason}; EAS Simulator (remote.easFallback)`,
+			skipped
+		};
+		const why = eas ? [...skipped, {
+			machine: "eas",
+			code: eas.code,
+			reason: eas.reason
+		}] : skipped;
+		return localEnabled ? local$1(code, reason + waiting, why, true) : {
+			kind: "refused",
+			code: "pool-unavailable",
+			reason,
+			skipped: why,
+			atCapacity: true
+		};
+	};
+	if (!offers.length) return nowhere("no-remote-mac", "no remote machines configured; " + localReason);
+	if (localEnabled && count === null && !remoteFirst) return local$1("device-count-unknown", localReason);
+	if (!remoteFirst && !cannotTake && here.memoryPressure === "normal" && !here.budgetRefusal && here.loadPerCore < here.maxLoadPerCore) return local$1("this-mac-free", localReason);
+	const ceiling = (offer) => offer.resources.maxLoadPerCore ?? here.maxLoadPerCore;
+	const skipped = [];
+	const admitted = [];
+	offers.forEach((probe, index) => {
+		let reason = null;
+		let code = "unreachable";
+		if ("failure" in probe) reason = probe.failure;
+		else {
+			const { offer } = probe;
+			if (offer.declined !== null) [code, reason] = ["declined", `declined: ${offer.declined}`];
+			else if (offer.platform !== platform || !offer.choice) [code, reason] = ["no-matching-device", `no matching ${platform} device choice`];
+			else if (offer.resources.memoryPressure !== "normal") [code, reason] = ["memory", "host memory pressure unknown or elevated"];
+			else if (offer.capacity.available === 0) [code, reason] = ["no-capacity", "no hosted device capacity available"];
+			else if (offer.resources.loadPerCore !== null && offer.resources.loadPerCore >= ceiling(offer)) [code, reason] = ["load", `saturated: load ${offer.resources.loadPerCore.toFixed(1)}/core there, at or above ${ceiling(offer)}/core`];
+			else if (placement === "auto" && !cannotTake && offer.resources.loadPerCore === null) [code, reason] = ["load", "host load unknown while this machine has room"];
+			else admitted.push({
+				machine: probe.machine,
+				offer,
+				index
+			});
+		}
+		if (reason) skipped.push({
+			machine: probe.machine,
+			code,
+			reason
+		});
+		if (reason && ("offer" in probe ? [
+			"no-capacity",
+			"load",
+			"memory"
+		].includes(code) || code === "declined" && (probe.offer.capacity.available === 0 || probe.offer.resources.memoryPressure !== "normal") : false)) hostsFull = true;
+	});
+	admitted.sort((a, b) => Number(b.machine === buildMachine) - Number(a.machine === buildMachine) || a.index - b.index);
+	if (!admitted.length) return nowhere("no-host-admits", `${localReason}; no host admits`, skipped, localEnabled && cannotTake && !noWait ? "; waiting locally if needed" : "");
+	const machines = admitted.map(({ machine, offer }) => ({
+		machine,
+		reason: `${remoteFirst && !cannotTake ? `${placement} tries remote machines first` : localReason}; ${machine}${machine === buildMachine ? " is the explicit remote machine," : ""} load ${offer.resources.loadPerCore === null ? "unknown" : offer.resources.loadPerCore.toFixed(1) + "/core"}`
+	}));
+	return {
+		kind: "host",
+		code: "placed",
+		machines,
+		reason: machines[0].reason,
+		skipped
+	};
+}
+//#endregion
+//#region src/device-host/auto-placement.ts
+const HOST_WAIT_POLL_MS = 5e3;
+function refusalText(decision, waitedMs) {
+	return [
+		decision.reason,
+		...decision.skipped.map((each) => `${each.machine}: ${each.reason}`),
+		...waitedMs === null ? [] : [`waited ${Math.round(waitedMs / 1e3)}s for a remote machine with room`]
+	].join("; ");
+}
+async function probeHost(machine, platform, selectors, appMode, signal) {
+	let host;
+	const deadline = Date.now() + 3e3;
+	const cancel = () => host?.connection.close();
+	try {
+		host = await connectHost(machine, 3e3, true, signal);
+		signal?.addEventListener("abort", cancel, { once: true });
+		signal?.throwIfAborted();
+		if (platform !== "macos") requireHostedAppMode(host, platform, appMode);
+		const offer = await call(host, "device-host.offer", {
+			platform,
+			...selectors
+		}, Math.max(1, deadline - Date.now()));
+		signal?.throwIfAborted();
+		const resources = isJsonObject(offer.resources) ? offer.resources : {};
+		const parsed = parseHostedNativeOffer({
+			...offer,
+			resources: {
+				...resources,
+				loadPerCore: resources.loadPerCore ?? 0
+			}
+		});
+		let choice = platform === "ios" ? offer.platform === "ios" ? parseHostedChoice(offer.choice) : null : parsed?.platform === platform ? parsed.choice : null;
+		if (choice && platform !== "macos" && ("runtime" in choice ? selectors.deviceType && selectors.deviceType !== choice.deviceType || selectors.runtime && selectors.runtime.replace(/^iOS /, "") !== choice.runtime.replace(/^iOS /, "") : "systemImage" in choice && (selectors.systemImage && selectors.systemImage !== choice.systemImage || selectors.deviceProfile && selectors.deviceProfile !== choice.deviceProfile))) choice = null;
+		if (!isJsonObject(offer.capacity) || offer.declined !== null && typeof offer.declined !== "string") throw new Error("unreadable device offer");
+		return {
+			probe: {
+				machine,
+				offer: {
+					platform,
+					choice,
+					declined: offer.declined,
+					capacity: { available: typeof offer.capacity.available === "number" ? offer.capacity.available : null },
+					resources: {
+						...typeof resources.maxLoadPerCore === "number" && Number.isFinite(resources.maxLoadPerCore) && resources.maxLoadPerCore > 0 ? { maxLoadPerCore: resources.maxLoadPerCore } : {},
+						loadPerCore: typeof resources.loadPerCore === "number" && Number.isFinite(resources.loadPerCore) && resources.loadPerCore >= 0 ? resources.loadPerCore : null,
+						memoryFreeBytes: typeof resources.memoryFreeBytes === "number" ? resources.memoryFreeBytes : 0,
+						memoryPressure: typeof resources.memoryPressure === "string" ? resources.memoryPressure : null
+					}
+				}
+			},
+			...choice && ("runtime" in choice || "systemImage" in choice) ? { target: {
+				host,
+				choice,
+				session: null
+			} } : {}
+		};
+	} catch (error) {
+		signal?.throwIfAborted();
+		return { probe: {
+			machine,
+			failure: error instanceof Error ? error.message : String(error)
+		} };
+	} finally {
+		signal?.removeEventListener("abort", cancel);
+		host?.connection.close();
+	}
+}
+function hosted(target, machine, code, reason, skipped = []) {
+	if (target) target.selection = {
+		selected: "auto",
+		reason
+	};
+	return {
+		target,
+		placement: {
+			decision: "hosted",
+			machine,
+			reason
+		},
+		code,
+		skipped
+	};
+}
+function local(code, reason, skipped = []) {
+	return {
+		target: null,
+		placement: {
+			decision: "local",
+			reason
+		},
+		code,
+		skipped
+	};
+}
+function viaEas(code, reason, skipped) {
+	return {
+		target: null,
+		placement: {
+			decision: "eas",
+			machine: "eas",
+			reason
+		},
+		code,
+		skipped
+	};
+}
+async function automaticDevicePlacement({ root, slot, platform, placement = "auto", selectors, appMode, buildMachine, noWait, waitMs = DEFAULT_DEVICE_SLOT_WAIT_MS, onWait = () => {}, eas, signal, localSims }, { machines = () => hostingMachines(void 0, signal), read = readHostedNative, write = writeHostedNativeAsync, resume = prepareHostedNative, peek = () => peekDeviceSlots({
+	platform: platform === "macos" ? "ios" : platform,
+	project: getProject(root),
+	slot,
+	...localSims ? { sources: { sims: localSims } } : {}
+}), capacity = machineCapacity, memory = () => readHostMemoryPressureAsync(void 0, void 0, signal), probe = probeHost, budget = (projectRoot) => peekBudget(projectRoot, {}, ambientEnv(), signal), now = Date.now, sleep = (ms) => setTimeout(ms, void 0, { signal }) } = {}) {
+	const recorded = platform === "macos" ? void 0 : read(root, platform, slot)[slot];
+	if (recorded && platform !== "macos") {
+		const target = await resume(recorded.machine, selectors, recorded, platform, true, appMode);
+		if (target) return {
+			target,
+			placement: {
+				decision: "hosted",
+				machine: recorded.machine,
+				reason: recorded.reason ?? decideDevicePlacement({ sticky: { machine: recorded.machine } }).reason
+			},
+			code: "sticky",
+			skipped: [],
+			sticky: true
+		};
+		await write(root, slot, null, platform);
+	}
+	const devices = platform === "macos" ? {
+		count: 0,
+		max: 0,
+		queued: 0,
+		localLive: false
+	} : peek();
+	if (devices.localLive && placement === "remote-only") throw Object.assign(/* @__PURE__ */ new Error(`This workspace's ${platform} device for slot ${slot} runs on this machine, and remote-only never runs here.`), {
+		code: "STIM_HOSTING_REFUSED",
+		remedy: "Run stim stop, then retry."
+	});
+	if (devices.localLive) return {
+		...local("sticky", decideDevicePlacement({ sticky: { local: true } }).reason),
+		sticky: true
+	};
+	const configured = await machines();
+	signal?.throwIfAborted();
+	if (configured === null) throw Object.assign(/* @__PURE__ */ new Error("remote.machines is invalid. Run stim guide settings and correct it."), { code: "STIM_HOSTING_REFUSED" });
+	const config = loadConfig$1();
+	const entries = configured.filter((machine) => automaticMachineEnabled("device", machine, config));
+	const preference = resolveBuildMachine(buildMachine, ambientEnv().STIM_REMOTE_BUILD, config?.remote?.build);
+	buildMachine = namedBuildMachine(preference) ? preference : void 0;
+	const load = capacity();
+	const here = {
+		localEnabled: automaticMachineEnabled("device", "local", config),
+		loadPerCore: load.loadPerCore,
+		maxLoadPerCore: load.maxLoadPerCore,
+		memoryPressure: await memory(),
+		devices,
+		budgetRefusal: await budget(root)
+	};
+	signal?.throwIfAborted();
+	const inputs = (offers) => ({
+		platform,
+		placement,
+		here,
+		offers,
+		buildMachine,
+		noWait
+	});
+	const notProbed = entries.map((machine) => ({
+		machine,
+		failure: "not probed"
+	}));
+	const waitStarted = now();
+	let announced = false;
+	let probes = [];
+	let offers = notProbed;
+	let decision;
+	for (;;) {
+		const early = decideDevicePlacement(inputs(notProbed));
+		probes = early.kind === "local" && early.skipped.length === 0 ? [] : await Promise.all(entries.map((machine) => probe(machine, platform, selectors, appMode, signal)));
+		offers = probes.length ? probes.map((each) => each.probe) : notProbed;
+		decision = decideDevicePlacement(inputs(offers));
+		if (decision.kind !== "refused" || !decision.hostsFull) break;
+		const waited = now() - waitStarted;
+		const immediate = noWait || waitMs <= 0;
+		if (immediate || waited >= waitMs) throw Object.assign(new Error(refusalText(decision, immediate ? null : waited)), {
+			code: "STIM_AT_CAPACITY",
+			remedy: `Wait for a remote machine in remote.machines to have room, ${platform === "macos" ? "retry later" : "retry with a longer --wait <seconds>"}, or select a placement that may run here.`
+		});
+		if (!announced) {
+			announced = true;
+			onWait(`remote-only waits up to ${Math.round(waitMs / 1e3)}s for a remote machine with room (${decision.skipped.map((each) => `${each.machine}: ${each.reason}`).join("; ")})`);
+		}
+		await sleep(Math.min(HOST_WAIT_POLL_MS, waitMs - waited));
+		signal?.throwIfAborted();
+	}
+	if ((decision.kind === "local" || decision.kind === "refused") && decision.atCapacity && eas && placement !== "remote-only") decision = decideDevicePlacement({
+		...inputs(offers),
+		eas: await eas()
+	});
+	if (decision.kind === "refused") throw Object.assign(new Error(refusalText(decision, null)), {
+		code: "STIM_HOSTING_REFUSED",
+		remedy: placement === "remote-only" ? entries.length === 0 ? "Add an approved Mac to remote.machines (stim guide settings), or select a placement that may run here." : "Wait for a remote machine in remote.machines to have room, check stim doctor for the ones that are unreachable or unapproved, or select a placement that may run here." : "Enable an available member in remote.devicePoolDisabled or select a machine explicitly."
+	});
+	if (decision.kind === "eas") return viaEas(decision.code, decision.reason, decision.skipped);
+	if (decision.kind === "local") return local(decision.code, decision.reason, decision.skipped);
+	const machine = decision.machines[0].machine;
+	return hosted(probes.find((each) => each.probe.machine === machine)?.target ?? null, machine, decision.code, decision.reason, decision.skipped);
+}
+function devicePlacementLine(placement, skipped) {
+	return `${placement.machine ?? "local"}, ${placement.reason}${placement.decision !== "hosted" && skipped.length ? "; " + skipped.map((each) => `${each.machine}: ${each.reason}`).join("; ") : ""}`;
+}
+//#endregion
+export { devicePlacementLine as n, probeHost as r, automaticDevicePlacement as t };

package/dist/{browser-web-CCgZsHmI.mjs → browser-web-slD8AvLp.mjs}

@@ -1,21 +1,20 @@
-import { D as ownership_claim_exports, S as process_identity_exports, c as throwIfCancelled, l as WorkspaceProcessCleanupError, s as cancelledError, t as getExecutor, u as withWorkspaceProcessLock } from "./exec-VFRpu1iA.mjs";
-import { d as workspaceDir, m as workspaceLogsDir$1 } from "./paths-DQtTgsBf.mjs";
-import { p as getProject } from "./config-BZhXY15H.mjs";
-import { l as phaseLine } from "./command-output-BBvS1H6v.mjs";
-import { l as withWorkspaceStateLockAsync, r as readWorkspaceState$1 } from "./workspace-state-CPSp3mav.mjs";
-import { M as metroPortSetting, a as SETTING_SHAPE_REMEDY, ot as webSettings } from "./settings-B5tCoq9N.mjs";
-import { b as isPackageResolvable, v as detectIsExpo } from "./project-BiC68mIp.mjs";
-import { d as resolveProjectMetro } from "./metro-1pJgCX4U.mjs";
-import { s as readNdjsonGenerations$1 } from "./ndjson-CgE_o3Dl.mjs";
-import { f as webLogFile, m as webSupervisorLogFile, o as readWebRecord, s as updateWebRecord } from "./state-DMRNP7-4.mjs";
-import { rn as readMetroRecords } from "./budget-HyShrIpL.mjs";
-import { D as teardownBrowserHeld, g as resolveSupervisorTarget } from "./workspaces-C9w4aeXF.mjs";
-import { i as reserveBrowserPort, n as getNamedPort } from "./named-ports-BVbn8SvC.mjs";
-import { n as sendToOwnedPage, t as liveWebRecord } from "./page-CzEA_-5_.mjs";
-import { o as resolveWorkspaceMetroPort } from "./start-YMpNwLhh.mjs";
+import { D as ownership_claim_exports, S as process_identity_exports, c as throwIfCancelled, l as WorkspaceProcessCleanupError, s as cancelledError, t as getExecutor, u as withWorkspaceProcessLock } from "./exec-aULwtNly.mjs";
+import { E as workspaceDir, k as workspaceLogsDir$1, l as withWorkspaceStateLockAsync, r as readWorkspaceState$1 } from "./workspace-state-BjqdjnJR.mjs";
+import { p as getProject } from "./config-Cn94Jc0g.mjs";
+import { l as phaseLine } from "./command-output-Dj-WT4BP.mjs";
+import { N as metroPortSetting, a as SETTING_SHAPE_REMEDY, ct as webSettings } from "./settings-BDVI8Ivc.mjs";
+import { b as isPackageResolvable, v as detectIsExpo } from "./project-DYj-HVx6.mjs";
+import { d as resolveProjectMetro } from "./metro-CvyD-xwe.mjs";
+import { c as readNdjsonGenerations$1 } from "./ndjson-Dy2W4vRa.mjs";
+import { Wt as readMetroRecords } from "./ccache-BWTze1Ls.mjs";
+import { f as webLogFile, m as webSupervisorLogFile, o as readWebRecord, s as updateWebRecord } from "./state-BX1y5syV.mjs";
+import { b as resolveSupervisorTarget, lt as teardownBrowserHeld } from "./workspaces-DFbj07jp.mjs";
+import { i as reserveBrowserPort, n as getNamedPort } from "./named-ports-BCyMWA6b.mjs";
+import { n as sendToOwnedPage, t as liveWebRecord } from "./page-CQJlcj3x.mjs";
+import { o as resolveWorkspaceMetroPort } from "./start-DrPwER_2.mjs";
 import { t as spawnEntry } from "./spawn-entry-jw19m8Nl.mjs";
-import { n as windowsLauncherArgs } from "./detached-entry-KmieOKgN.mjs";
-import { a as findChrome, t as CHROME_INSTALL_REMEDY } from "./chrome-BvV8ssI3.mjs";
+import { n as windowsLauncherArgs } from "./detached-entry-BPlSaCwC.mjs";
+import { a as findChrome, t as CHROME_INSTALL_REMEDY } from "./chrome-DyDWurWG.mjs";
 import { randomUUID } from "node:crypto";
 import { mkdirSync, openSync, statSync, watch } from "node:fs";
 import { ambientEnv } from "@stim-cli/core";

package/dist/{build-cache-CKCzxzxA.mjs → build-cache-gBJ-WKzA.mjs}

@@ -1,15 +1,17 @@
-import { c as throwIfCancelled, t as getExecutor, x as withDrainingCancellation } from "./exec-VFRpu1iA.mjs";
-import { i as sharedBuildCache } from "./paths-DQtTgsBf.mjs";
-import { a as killOnAbort, c as gitQuiet, o as git, r as childEnvironment, s as gitAsync } from "./operation-exec-CUZifp6Z.mjs";
-import { m as defaultAndroidLayout } from "./settings-B5tCoq9N.mjs";
-import { r as register } from "./cache-manifest-BPXRONJz.mjs";
+import { c as throwIfCancelled, t as getExecutor, x as withDrainingCancellation } from "./exec-aULwtNly.mjs";
+import { y as sharedBuildCache } from "./workspace-state-BjqdjnJR.mjs";
+import { a as killOnAbort, c as gitQuiet, o as git, r as childEnvironment, s as gitAsync } from "./operation-exec-Dp4FuIGR.mjs";
+import { m as defaultAndroidLayout } from "./settings-BDVI8Ivc.mjs";
+import { r as register } from "./cache-manifest-DEjqGGat.mjs";
+import { r as writeSignedTail, t as computeSignedTail } from "./apk-signed-tail-BHQHx3Rm.mjs";
 import { createHash } from "node:crypto";
 import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { join } from "node:path";
 import { artifactIn, buildCacheKey, resolveArtifact, storeArtifactAsync } from "@stim-cli/core";
-import { isAbsolute as isAbsolute$1, join as join$1, posix as posix$1, relative as relative$1, resolve as resolve$1, sep as sep$1 } from "path";
+import { trace } from "@stim-cli/core/state";
+import { basename as basename$1, isAbsolute as isAbsolute$1, join as join$1, posix as posix$1, relative as relative$1, resolve as resolve$1, sep as sep$1 } from "path";
 import { existsSync as existsSync$1, lstatSync as lstatSync$1, mkdirSync as mkdirSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, realpathSync as realpathSync$1, rmSync as rmSync$1, statSync as statSync$1 } from "fs";
-import { readdir, writeFile } from "node:fs/promises";
+import { readdir, rename, rm, writeFile } from "node:fs/promises";
 import { isDeepStrictEqual } from "util";
 import * as expoFingerprint from "@expo/fingerprint";
 import { loadConfigAsync } from "@expo/fingerprint/build/Config.js";
@@ -293,6 +295,58 @@ function androidProjectFingerprintOptions(projectRoot, layout, exists = existsSy
 		].map((dir) => `${moduleRel}/${dir}/**/*`)
 	};
 }
+const LOCKFILES = [
+	"pnpm-lock.yaml",
+	"yarn.lock",
+	"package-lock.json",
+	"bun.lock",
+	"bun.lockb"
+];
+/**
+* The patches of a monorepo's install root, which @expo/fingerprint does not see: its patch sourcer reads only the
+* app's own `patches/`, and its default preset hashes an installed package by name and version, so a patch applied
+* from the workspace root would leave the key unchanged.
+*/
+function workspacePatchSources(projectRoot) {
+	let dir = resolve$1(projectRoot);
+	for (;;) {
+		if (LOCKFILES.some((name) => existsSync$1(join$1(dir, name)))) break;
+		const parent = resolve$1(dir, "..");
+		if (parent === dir || existsSync$1(join$1(dir, ".git"))) return [];
+		dir = parent;
+	}
+	const sources = ["patches", ".yarn/patches"].filter((name) => (name === "patches" ? dir !== resolve$1(projectRoot) : true) && existsSync$1(join$1(dir, name))).map((name) => ({
+		type: "dir",
+		filePath: relative$1(projectRoot, join$1(dir, name)).split(sep$1).join("/"),
+		reasons: ["workspacePatches"]
+	}));
+	const patched = pnpmPatchedDependencies(join$1(dir, "pnpm-lock.yaml"));
+	if (patched) sources.push({
+		type: "contents",
+		id: "pnpmPatchedDependencies",
+		contents: patched,
+		reasons: ["workspacePatches"]
+	});
+	return sources;
+}
+/** The lockfile's `patchedDependencies` block, which pnpm rewrites with each patch's hash wherever the patch lives. */
+function pnpmPatchedDependencies(lockfile) {
+	let text;
+	try {
+		text = readFileSync$1(lockfile, "utf8");
+	} catch {
+		return null;
+	}
+	const lines = text.split(/\r?\n/);
+	const start = lines.indexOf("patchedDependencies:");
+	if (start === -1) return null;
+	const block = [];
+	for (const line of lines.slice(start + 1)) {
+		if (line && !/^\s/.test(line)) break;
+		if (line.trim()) block.push(line.trim());
+	}
+	return block.length ? block.join("\n") : null;
+}
 /**
 * The bundle output and, with `ios.projectPath` '.', the top-level entries that git ignores here for an iOS
 * fingerprint, as the paths a build worker needs to ignore the same ones: it has no .git/info/exclude or global
@@ -319,7 +373,12 @@ async function fingerprintOptions(projectRoot, { platform, iosProjectPath = "ios
 	const ignoredAtAppRoot = (names) => new Set([...ignoredHere(names)].filter((name) => !trackedPaths.includes(name)));
 	const platforms = platform && FINGERPRINT_PLATFORMS.has(platform) ? { platforms: [platform] } : void 0;
 	const ios = platform === "ios" ? iosProjectFingerprintOptions(projectRoot, iosProjectPath, { ignored: (_, names) => ignoredAtAppRoot(names) }) : androidLayout?.custom ? androidProjectFingerprintOptions(projectRoot, androidLayout) : {};
-	if (ios.extraSources) ios.extraSources = [...(await loadConfigAsync(projectRoot, true))?.extraSources ?? [], ...ios.extraSources];
+	const patches = workspacePatchSources(projectRoot);
+	if (ios.extraSources || patches.length) ios.extraSources = [
+		...(await loadConfigAsync(projectRoot, true))?.extraSources ?? [],
+		...ios.extraSources ?? [],
+		...patches
+	];
 	const bundleOutput = platform === "android" ? [] : [...ignoredHere(Object.keys(BUNDLE_OUTPUT_IGNORES), true)].map((path) => BUNDLE_OUTPUT_IGNORES[path]);
 	return {
 		...platforms,
@@ -333,26 +392,27 @@ async function fingerprintOptions(projectRoot, { platform, iosProjectPath = "ios
 	};
 }
 async function fingerprintProject(projectRoot, { createFingerprint = expoFingerprint.createFingerprintAsync, debug = false, ...target } = {}) {
-	const options = await fingerprintOptions(projectRoot, target);
-	const result = await createFingerprint(projectRoot, debug ? {
-		...options,
-		debug
-	} : options);
-	const hash = result?.hash ?? null;
-	if (!hash) return null;
-	return {
-		hash,
-		sources: Array.isArray(result?.sources) ? result.sources : []
-	};
+	return trace.spanAsync("fingerprint", async () => {
+		const options = await fingerprintOptions(projectRoot, target);
+		const result = await createFingerprint(projectRoot, debug ? {
+			...options,
+			debug
+		} : options);
+		const hash = result?.hash ?? null;
+		if (!hash) return null;
+		return {
+			hash,
+			sources: Array.isArray(result?.sources) ? result.sources : []
+		};
+	}, { platform: target.platform });
 }
-/** The env files @expo/env loads for the config, in the mode @expo/fingerprint's config loader sets. */
+/** The env files @expo/env loads for the config: @expo/fingerprint 0.21 evaluates it in development mode. */
 function expoEnvFiles(env = {}) {
 	if (/^(1|true)$/i.test(env.EXPO_NO_DOTENV ?? "")) return [];
-	const mode = env.NODE_ENV || "development";
 	return [
-		`.env.${mode}.local`,
-		...mode === "test" ? [] : [".env.local"],
-		`.env.${mode}`,
+		".env.development.local",
+		".env.local",
+		".env.development",
 		".env"
 	];
 }
@@ -367,8 +427,8 @@ async function gitignoredFingerprintInputs(projectRoot, sources, target, { env,
 	if (sources.some((source) => source.type === "contents" && source.id === "expoConfig")) {
 		for (const name of expoEnvFiles(env)) if (lstatSync$1(join$1(projectRoot, name), { throwIfNoEntry: false })?.isFile()) found.add(name);
 	}
-	const top = realpathSync$1(await gitAsync(projectRoot, ["rev-parse", "--show-toplevel"], { signal }));
-	const base = realpathSync$1(projectRoot);
+	const top = realpathSync$1.native(await gitAsync(projectRoot, ["rev-parse", "--show-toplevel"], { signal }));
+	const base = realpathSync$1.native(projectRoot);
 	const pathspecs = sources.flatMap((source) => {
 		if (source.type === "contents" || inNodeModules(source.filePath)) return [];
 		const inRepo = relative$1(top, resolve$1(base, source.filePath));
@@ -457,6 +517,17 @@ async function storeBuild(platform, key, buildPath, rootOrOptions = {}) {
 			}),
 			overwrite: Boolean(options.overwrite),
 			writeMetadata: async (staging) => {
+				if (platform === "android" && buildPath.endsWith(".apk")) try {
+					const tail = await computeSignedTail(join$1(staging, basename$1(buildPath)), (file, args) => getExecutor().runFileAsync(file, args, {
+						timeoutMs: 12e4,
+						...env ? childEnvironment(env) : {},
+						onSpawn: killOnAbort(signal),
+						declareFor: options.context
+					}));
+					if (tail) await writeSignedTail(staging, tail);
+				} catch {
+					throwIfCancelled(signal, "build cache copy");
+				}
 				if (Array.isArray(options.sources)) try {
 					await writeFile(join$1(staging, SOURCES_FILE), JSON.stringify(options.sources.map(withoutContents)));
 				} catch {}
@@ -476,6 +547,25 @@ async function storeBuild(platform, key, buildPath, rootOrOptions = {}) {
 		throw error;
 	}
 }
+/** Removes a stored build by renaming its entry aside first, so no run sees a half-deleted entry. */
+async function evictBuild(platform, key, root = sharedBuildCache()) {
+	const dir = entryDir(platform, key, root);
+	const evicted = `${dir}.evicted-${process.pid}`;
+	try {
+		await rm(evicted, {
+			recursive: true,
+			force: true
+		});
+		await rename(dir, evicted);
+	} catch {
+		return false;
+	}
+	await rm(evicted, {
+		recursive: true,
+		force: true
+	}).catch(() => {});
+	return true;
+}
 const PROVIDER_DOWNLOAD_DIR = "cache-provider";
 function providerDownloadPath(workspacePath) {
 	return join$1(workspacePath, PROVIDER_DOWNLOAD_DIR);
@@ -588,6 +678,28 @@ function diffItemChange(item) {
 		reasons: sourceReasons(source)
 	};
 }
+/** The installed package a source path lies in: the name after its last `node_modules/`. */
+function packageIn(path) {
+	return [...path.matchAll(/(?:^|\/)node_modules\/((?:@[^/]+\/)?[^/]+)/g)].at(-1)?.[1] ?? null;
+}
+/** A package that moved, such as a version bump of a pnpm store directory, is one change rather than a removal and an addition. */
+function mergeMovedPackages(changes) {
+	const added = /* @__PURE__ */ new Map();
+	for (const change of changes) {
+		const pkg = change.change === "added" ? packageIn(change.name) : null;
+		if (pkg && !added.has(pkg)) added.set(pkg, change);
+	}
+	const moved = /* @__PURE__ */ new Set();
+	const kept = changes.filter((change) => {
+		const pkg = change.change === "removed" ? packageIn(change.name) : null;
+		const counterpart = pkg ? added.get(pkg) : void 0;
+		if (!counterpart || moved.has(counterpart)) return true;
+		moved.add(counterpart);
+		return false;
+	});
+	for (const change of moved) change.change = "changed";
+	return kept;
+}
 function compareSourceLists(previous, current) {
 	const previousByName = /* @__PURE__ */ new Map();
 	for (const source of previous) {
@@ -621,7 +733,7 @@ function compareSourceLists(previous, current) {
 		change: "removed",
 		reasons: before.reasons
 	});
-	return changes;
+	return mergeMovedPackages(changes);
 }
 function diffFingerprintSources({ previous, previousHash = null, current, differ = null }) {
 	if (typeof differ === "function") try {
@@ -633,16 +745,8 @@ function diffFingerprintSources({ previous, previousHash = null, current, differ
 			hash: current.hash
 		});
 		if (Array.isArray(items)) {
-			const changes = [];
 			const seen = /* @__PURE__ */ new Set();
-			for (const item of items) {
-				const change = diffItemChange(item);
-				if (change !== null && !seen.has(change.name)) {
-					seen.add(change.name);
-					changes.push(change);
-				}
-			}
-			return changes;
+			return mergeMovedPackages(items.map(diffItemChange).filter((change) => change !== null)).filter((change) => !seen.has(change.name) && Boolean(seen.add(change.name)));
 		}
 	} catch {}
 	return compareSourceLists(previous, current.sources);
@@ -750,4 +854,4 @@ function fingerprintDiffRecord({ changed, previousHash, hash }) {
 	};
 }
 //#endregion
-export { readAssetManifest as A, storedSources as C, assetDiffReason as D, untrackedNativeFiles as E, captureAssetManifest as O, storedAssetManifest as S, untrackedMissLine as T, providerUploadOutcome as _, configInputsChanged as a, storeBuild as b, expoConfigContents as c, fingerprintProject as d, gitignoredFingerprintInputs as f, providerDownloadPath as g, prepareProviderDownloadDir as h, compareSourceLists as i, compareAssetManifests as k, filesystemBuildCapability as l, inputsChangedDuringBuild as m, buildCacheKey as n, diffFingerprintSources as o, ignoredFingerprintPaths as p, changedDuringBuildLine as r, entryDir as s, artifactIn as t, fingerprintDiffRecord as u, refingerprintAfterMutation as v, trackedFingerprintPaths as w, storedAppId as x, resolveBuild as y };
+export { untrackedNativeFiles as A, resolveBuild as C, storedSources as D, storedAssetManifest as E, captureAssetManifest as M, compareAssetManifests as N, trackedFingerprintPaths as O, readAssetManifest as P, refingerprintAfterMutation as S, storedAppId as T, inputsChangedDuringBuild as _, configInputsChanged as a, providerDownloadPath as b, evictBuild as c, filesystemBuildCapability as d, fingerprintDiffRecord as f, ignoredFingerprintPaths as g, gitignoredFingerprintInputs as h, compareSourceLists as i, assetDiffReason as j, untrackedMissLine as k, expoConfigContents as l, fingerprintProject as m, buildCacheKey as n, diffFingerprintSources as o, fingerprintOptions as p, changedDuringBuildLine as r, entryDir as s, artifactIn as t, expoEnvFiles as u, packageIn as v, storeBuild as w, providerUploadOutcome as x, prepareProviderDownloadDir as y };