stim 1.21.0 → 1.22.0

package/dist/{client-UXD70ZbM.mjs → client-OyRoEuSr.mjs}

@@ -1,22 +1,23 @@
-import { _ as debugLog, m as reportSignal, t as getExecutor, u as operationState } from "./exec-_UbtCQcG.mjs";
-import { $ as openAuthenticated, _ as loadConfig$1, at as sayHello, it as resolveEndpoint } from "./config-CYcBF478.mjs";
-import { en as throwIfCancelled } from "./settings-CsJDEXgK.mjs";
-import { n as gitAsync, t as git } from "./git-C3iTsJaZ.mjs";
+import { _ as reportSignal, b as debugLog, m as operationState, t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { Q as openAuthenticated, _ as loadConfig$1, it as sayHello, rt as resolveEndpoint } from "./config-DlrsduwG.mjs";
+import { f as throwIfCancelled, o as git, s as gitAsync } from "./operation-exec-BW0em61G.mjs";
 import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
-import { X as emptyCaches, br as discoverCaches, nt as planCacheEmptying } from "./budget-Bs6SxxzO.mjs";
+import { X as emptyCaches, br as discoverCaches, nt as planCacheEmptying } from "./budget-Cvwn54qV.mjs";
 import { t as canonicalPath } from "./paths-BsJMoPP2.mjs";
-import { d as runCancellationSignal } from "./native-run-DY_RLx3C.mjs";
-import { n as CCACHE_UNAVAILABLE, t as CCACHE_NOT_RUN } from "./ccache-BJRZ9pG3.mjs";
-import { n as COMPILATION_CACHE_UNAVAILABLE, t as COMPILATION_CACHE_NOT_RUN } from "./xcode-Zlx3qjEs.mjs";
+import { d as runCancellationSignal } from "./native-run-NwUuxbkg.mjs";
+import { n as CCACHE_UNAVAILABLE, t as CCACHE_NOT_RUN } from "./ccache-Btwc36-I.mjs";
+import { n as COMPILATION_CACHE_UNAVAILABLE, t as COMPILATION_CACHE_NOT_RUN } from "./xcode-BXn9-xYx.mjs";
 import { t as resolveMaintenanceSettings } from "./settings-Djl-mpjX.mjs";
-import { h as readRubyVersion, u as toolchainMismatches } from "./toolchain-Hp9sCpK4.mjs";
-import { l as pairedMachines, r as namedBuildMachine, t as OffloadRefusal } from "./selection-CSl9i5qU.mjs";
+import { a as iosToolchainAsync, d as toolchainMismatches, f as workerToolchain, g as readRubyVersion } from "./toolchain-DpJMHq0n.mjs";
+import { l as pairedMachines, r as namedBuildMachine, t as OffloadRefusal } from "./selection-DSMbWEX2.mjs";
 import { r as manifestDigest } from "./native-inputs-TRTTTRxt.mjs";
-import { a as nativeGradleTransfer, c as checkNativeTransferMembership, d as sourceManifest, l as gitVisiblePaths, u as nativeTransferManifest } from "./native-gradle-inputs-Bep9JcSF.mjs";
+import { a as sourceManifest, i as nativeTransferManifest, n as gitVisiblePaths, t as checkNativeTransferMembership } from "./native-source-Y0yLhFyQ.mjs";
+import { a as nativeGradleTransfer } from "./native-gradle-inputs-Dnh84Zbd.mjs";
 import { createHash, webcrypto } from "node:crypto";
 import { closeSync, existsSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, rmSync, statSync, unlinkSync, writeSync } from "node:fs";
+import { isDeepStrictEqual } from "node:util";
 import { basename, dirname, isAbsolute, join, relative, sep } from "node:path";
-import { LOG_ROTATE_BYTES, ambientContext, rotatedLogPath, withDirLock } from "@stim-cli/core";
+import { LOG_ROTATE_BYTES, ambientContext, reactNativeArtifactIdentity, reactNativeArtifactQuery, rotatedLogPath, swiftpmArtifactQuery, withDirLock } from "@stim-cli/core";
 import { MAINTENANCE_LOG_NAME, OFFLOAD_MODES, automaticMachineEnabled, isJsonObject, maintenanceDir, maintenanceNdjsonFile, requireAutomaticMachine, runId, saturation, workspaceLogsDir } from "@stim-cli/core/state";
 import { WebSocket } from "ws";
 import { setTimeout as setTimeout$1 } from "node:timers/promises";
@@ -66,13 +67,14 @@ function maintenanceLogger(settings, pass, trigger) {
 //#endregion
 //#region src/cache/compilation-cache-corruption.ts
 const COMPILATION_CACHE_CORRUPT = "STIM_COMPILATION_CACHE_CORRUPT";
-function emptyCompilationCache(dir) {
+async function emptyCompilationCache(dir) {
 	const results = [];
 	const cache = discoverCaches().find((candidate) => canonicalPath(candidate.dir) === canonicalPath(dir));
 	if (cache?.source !== "registered" || cache.prune !== "atomic") return `${dir} is not a registered cache Stim empties whole`;
 	const [planned] = planCacheEmptying([cache], true);
-	emptyCaches(planned ? [planned] : [], {
+	await emptyCaches(planned ? [planned] : [], {
 		log: () => {},
+		error: () => {},
 		record: (kind, status, label, { id = null, bytes = null, detail = null } = {}) => {
 			results.push({
 				kind,
@@ -106,11 +108,11 @@ function recordInMaintenanceLog(workspace, msg, fields, cleared) {
 * Empties the shared compilation cache a failed build reported corrupt, through the path `gc --delete --cache` uses,
 * unless another build may be using it. It never retries the build; the result is the refusal to print.
 */
-function clearCorruptCompilationCache(corruption, workspace) {
+async function clearCorruptCompilationCache(corruption, workspace) {
 	const { dir, line } = corruption;
 	let blocked;
 	try {
-		blocked = emptyCompilationCache(dir);
+		blocked = await emptyCompilationCache(dir);
 	} catch (error) {
 		blocked = error instanceof Error ? error.message : String(error);
 	}
@@ -156,6 +158,60 @@ function reportRemoteFailure(context, event, fields) {
 	} catch {}
 }
 //#endregion
+//#region src/offload/react-native-artifact.ts
+function reactNativeBuildQuery(build, fingerprint, project, toolchain) {
+	if (build.native) return null;
+	return reactNativeArtifactQuery({
+		project,
+		fingerprint,
+		toolchain,
+		isExpo: build.isExpo === true,
+		platform: build.platform,
+		...build.platform === "ios" ? { ios: {
+			runtime: build.runtime,
+			configuration: build.configuration ?? "Debug",
+			scheme: build.scheme ?? null,
+			projectPath: build.iosProjectPath ?? "ios",
+			optimizations: build.optimizations
+		} } : { android: build.android }
+	});
+}
+async function reactNativeArtifactToolchain(platform, root) {
+	if (platform === "ios") {
+		const tools = await iosToolchainAsync(root);
+		return tools.stimBuild && tools.xcode && tools.simulatorSdk && tools.cocoapods ? {
+			...tools,
+			os: process.platform
+		} : null;
+	}
+	const { stimBuild, os, arch, jdk, androidSdk } = workerToolchain(null, "gradle");
+	return stimBuild && jdk && androidSdk ? {
+		stimBuild,
+		os,
+		arch,
+		jdk,
+		androidSdk
+	} : null;
+}
+function reactNativeArtifactReceipt(query, toolchain) {
+	if (!toolchain || !isDeepStrictEqual(reactNativeArtifactQuery({
+		...query,
+		toolchain
+	})?.toolchain, query.toolchain)) return null;
+	const receipt = {
+		query,
+		toolchain
+	};
+	const identity = reactNativeArtifactIdentity(receipt);
+	return {
+		identity: {
+			hash: identity.fingerprint,
+			key: identity.cacheKey
+		},
+		receipt
+	};
+}
+//#endregion
 //#region src/offload/client.ts
 const CONNECT_TIMEOUT_MS = 1e4;
 const OFFER_TIMEOUT_MS = 2e4;
@@ -270,7 +326,14 @@ function offloadPlacement({ mode, machines, here, unsupported, localEnabled = tr
 }
 function matchingArtifact(offer, identity) {
 	const cached = offer.artifact;
-	return identity && cached && cached.cacheKey === identity.cacheKey && cached.fingerprint === identity.fingerprint && typeof cached.name === "string" && basename(cached.name) === cached.name && cached.name.endsWith(".app") && Number.isSafeInteger(cached.size) && cached.size > 0 && typeof cached.sha256 === "string" && /^[a-f0-9]{64}$/.test(cached.sha256) ? cached : null;
+	if (!identity || !cached || typeof cached.name !== "string" || basename(cached.name) !== cached.name || !Number.isSafeInteger(cached.size) || cached.size <= 0 || typeof cached.sha256 !== "string" || !/^[a-f0-9]{64}$/.test(cached.sha256)) return null;
+	if (identity === "react-native-ios" || identity === "react-native-android") {
+		const platform = identity === "react-native-ios" ? "ios" : "android";
+		return ARTIFACT_NAME[platform].test(cached.name) && /^[a-f0-9]{64}$/.test(cached.fingerprint) && cached.cacheKey === `react-native-${platform}-${cached.fingerprint}` && (platform === "ios" || ANDROID_PACKAGE.test(String(cached.androidPackage ?? ""))) ? cached : null;
+	}
+	if (identity === "swiftpm") return cached.name.endsWith(".app") && typeof cached.fingerprint === "string" && /^[a-f0-9]{64}$/.test(cached.fingerprint) && cached.cacheKey === `swiftpm-peer-${cached.fingerprint}` ? cached : null;
+	if (identity === "native-gradle") return cached.name.endsWith(".apk") && typeof cached.fingerprint === "string" && /^[a-f0-9]{64}$/.test(cached.fingerprint) && typeof cached.cacheKey === "string" && cached.cacheKey.length > 0 && cached.cacheKey.length <= 1024 && typeof cached.androidPackage === "string" && ANDROID_PACKAGE.test(cached.androidPackage) ? cached : null;
+	return cached.name.endsWith(".app") && cached.cacheKey === identity.cacheKey && cached.fingerprint === identity.fingerprint ? cached : null;
 }
 const gb = (bytes) => (bytes / 1024 ** 3).toFixed(1);
 /** Every reason a machine's offer cannot take this build, in either mode; empty when it can. */
@@ -302,7 +365,7 @@ function offerProblems(offer, target) {
 * every local build slot is busy any machine that accepts will do, otherwise its load per core must be lower than
 * this machine's. A named selection considers only that machine and skips this local-capacity gating.
 * A machine that reports no load (a stim-server older than capacity) takes an `auto` build only while
-* every local slot is busy. The rest rank warmest first, then least loaded.
+* every local slot is busy. Matching dependency installations rank first, then load.
 */
 function pickOffer({ mode, here, offers, target, localEnabled = true, selected = "auto", artifact, cacheOnly = false }) {
 	const slotsFull = here.maxBuilds > 0 && here.builds >= here.maxBuilds;
@@ -321,7 +384,7 @@ function pickOffer({ mode, here, offers, target, localEnabled = true, selected =
 	offers.forEach(({ machine, offer, failure }, index) => {
 		if (namedBuildMachine(selected) && machine !== selected) return;
 		if (!offer) return skip(machine, "unreachable", failure ?? "no offer");
-		if (matchingArtifact(offer, artifact)) {
+		if (matchingArtifact(offer, artifact) && (artifact !== "swiftpm" || toolchainMismatches(target, offer.toolchain).length === 0)) {
 			ranked.push({
 				index,
 				score: Number.POSITIVE_INFINITY,
@@ -342,7 +405,7 @@ function pickOffer({ mode, here, offers, target, localEnabled = true, selected =
 			if (typeof load !== "number") return skip(machine, "load", "capacity unknown (older stim-server) while this machine has a free slot");
 			if (load >= here.loadPerCore) return skip(machine, "load", `no less loaded (load ${load}/core there, ${here.loadPerCore}/core here)`);
 		}
-		const score = Number(offer.warm.checkout) + Number(offer.warm.dependencies) + Number(offer.warm.build);
+		const score = Number(offer.warm.dependencies);
 		ranked.push({
 			index,
 			score,
@@ -382,6 +445,7 @@ function closeOnExit(socket, context) {
 var BuildConnection = class BuildConnection {
 	nextId = 2;
 	pending = /* @__PURE__ */ new Map();
+	writeWaiters = /* @__PURE__ */ new Set();
 	progress = null;
 	binary = null;
 	closed = null;
@@ -425,6 +489,7 @@ var BuildConnection = class BuildConnection {
 		socket.on("close", (code, reason) => {
 			clearInterval(this.keepalive);
 			this.closed = `the connection closed (${code}${reason.length ? ` ${reason.toString()}` : ""})`;
+			for (const wake of this.writeWaiters) wake();
 			for (const resolve of this.pending.values()) resolve({ error: {
 				code: "closed",
 				message: this.closed
@@ -553,8 +618,21 @@ var BuildConnection = class BuildConnection {
 	}
 	async sendBinary(frame) {
 		if (this.closed) return;
-		this.socket.send(frame, { binary: true });
-		while (this.socket.bufferedAmount > MAX_BUFFERED && !this.closed) await new Promise((resolve) => setTimeout(resolve, 5));
+		let completed = false;
+		let resume;
+		this.socket.send(frame, { binary: true }, () => {
+			completed = true;
+			resume?.();
+		});
+		if (completed || this.closed || this.socket.bufferedAmount <= MAX_BUFFERED) return;
+		await new Promise((resolve) => {
+			const wake = () => {
+				this.writeWaiters.delete(wake);
+				resolve();
+			};
+			resume = wake;
+			this.writeWaiters.add(wake);
+		});
 	}
 	onProgress(listener) {
 		this.progress = listener;
@@ -591,6 +669,7 @@ var BuildConnection = class BuildConnection {
 	forget() {
 		this.ended = true;
 		this.closed ??= "the connection was closed by this client";
+		for (const wake of this.writeWaiters) wake();
 		for (const resolve of this.pending.values()) resolve({ error: {
 			code: "closed",
 			message: this.closed
@@ -630,6 +709,13 @@ function repositoryIdentity(projectRoot, repoRoot, common) {
 		lockfile: lock ? createHash("sha256").update(readFileSync(join(repoRoot, lock))).digest("hex") : null
 	};
 }
+function dependencySelection(identity, target) {
+	if (!identity.lockfile || target.platform === "macos" || target.native) return void 0;
+	return {
+		project: identity.project.split(sep).join("/"),
+		packageName: packageName(join(identity.repoRoot, identity.project))
+	};
+}
 /** Why the native inputs cannot be sent to a remote machine, such as an ignored file among them, or null when they can. */
 async function nativeTransferRefusal(repoRoot, snapshot, signal) {
 	try {
@@ -681,8 +767,12 @@ async function probeMachine(credential, identity, { connectMs = CONNECT_TIMEOUT_
 	const reply = await connection.request("build.offer", {
 		repo: identity.repo,
 		...identity.lockfile ? { lockfile: identity.lockfile } : {},
+		...identity.dependencies && connection.supports("build-dependency-cache") ? { dependencies: identity.dependencies } : {},
 		...native ? { native } : identity.rubyVersion ? { rubyVersion: identity.rubyVersion } : {},
-		...native === "xcode" && identity.artifact && connection.supports("build-artifact-cache") ? { artifact: identity.artifact } : {}
+		...native === "xcode" && identity.artifact && connection.supports("build-artifact-cache") ? { artifact: identity.artifact } : {},
+		...identity.swiftpmArtifact && connection.supports("swiftpm-peer-cache") ? { swiftpmArtifact: identity.swiftpmArtifact } : {},
+		...identity.reactNativeArtifact && connection.supports("react-native-peer-cache") ? { reactNativeArtifact: identity.reactNativeArtifact } : {},
+		...native === "gradle" && identity.gradleArtifact && connection.supports("native-gradle-peer-cache") ? { gradleArtifact: identity.gradleArtifact } : {}
 	}, offerMs);
 	const failure = replyError(reply);
 	if (failure || !("result" in reply)) {
@@ -692,17 +782,28 @@ async function probeMachine(credential, identity, { connectMs = CONNECT_TIMEOUT_
 			failure: failure ?? "no offer"
 		};
 	}
+	const reported = reply.result;
+	const offer = {
+		...reported,
+		warm: {
+			...reported.warm,
+			dependencies: identity.dependencies !== void 0 && connection.supports("build-dependency-cache") && reported.warm.dependencies
+		}
+	};
 	return {
 		credential,
 		connection,
-		offer: reply.result
+		offer: identity.swiftpmArtifact && !connection.supports("swiftpm-peer-cache") || identity.reactNativeArtifact && !connection.supports("react-native-peer-cache") || native === "gradle" && (!identity.gradleArtifact || !connection.supports("native-gradle-peer-cache")) ? {
+			...offer,
+			artifact: null
+		} : offer
 	};
 }
 /**
 * Asks every paired machine for an offer in parallel and keeps the connection to the one `pickOffer` chooses, or
 * returns why none takes the build. A named selection probes only its credential and skips auto load gating.
 */
-async function chooseBuildMachine({ projectRoot, target, mode, here, note, machines = pairedMachines(), selected = "auto", onCandidates, artifact, cacheOnly = false }) {
+async function chooseBuildMachine({ projectRoot, target, mode, here, note, machines = pairedMachines(), selected = "auto", onCandidates, artifact, gradleArtifact, reactNativeArtifact, swiftpmArtifact, cacheOnly = false }) {
 	const started = Date.now();
 	let identity;
 	try {
@@ -713,11 +814,32 @@ async function chooseBuildMachine({ projectRoot, target, mode, here, note, machi
 	if (namedBuildMachine(selected)) machines = machines.filter((each) => each.machine === selected).slice(0, 1);
 	else machines = machines.filter((each) => automaticMachineEnabled("build", each.machine));
 	const rubyVersion = readRubyVersion(projectRoot) ?? void 0;
+	const gradleQuery = gradleArtifact ? {
+		...gradleArtifact,
+		project: identity.project
+	} : void 0;
+	const reactNativeQuery = reactNativeArtifact ? reactNativeBuildQuery(reactNativeArtifact.request, reactNativeArtifact.fingerprint, identity.project, target.local) : null;
+	const swiftpmQuery = swiftpmArtifact?.artifactInputs ? swiftpmArtifactQuery({
+		project: identity.project,
+		sourceDigest: manifestDigest(await sourceManifest(identity.repoRoot, true, runCancellationSignal(ambientContext()) ?? ambientContext()?.signal)),
+		stimBuild: target.local.stimBuild,
+		inputs: swiftpmArtifact.artifactInputs,
+		build: {
+			product: swiftpmArtifact.product,
+			infoPlist: swiftpmArtifact.infoPlist,
+			resources: swiftpmArtifact.resources ?? {},
+			assetCatalog: swiftpmArtifact.assetCatalog ?? null
+		}
+	}) : null;
 	const asked = await Promise.all(machines.map((credential) => probeMachine(credential, {
 		...identity,
 		rubyVersion,
+		dependencies: dependencySelection(identity, target),
 		...target.platform !== "macos" ? { native: target.native } : {},
-		...artifact ? { artifact } : {}
+		...artifact ? { artifact } : {},
+		...gradleQuery ? { gradleArtifact: gradleQuery } : {},
+		...reactNativeQuery ? { reactNativeArtifact: reactNativeQuery } : {},
+		...swiftpmQuery ? { swiftpmArtifact: swiftpmQuery } : {}
 	})));
 	const { order, reasons, candidates } = pickOffer({
 		localEnabled: selected !== "auto" || automaticMachineEnabled("build", "local"),
@@ -725,7 +847,7 @@ async function chooseBuildMachine({ projectRoot, target, mode, here, note, machi
 		mode,
 		here,
 		target,
-		artifact,
+		artifact: swiftpmQuery ? "swiftpm" : reactNativeQuery ? `react-native-${reactNativeQuery.platform}` : gradleQuery ? "native-gradle" : artifact,
 		cacheOnly,
 		offers: asked.map((each) => ({
 			machine: each.credential.machine,
@@ -757,7 +879,23 @@ async function chooseBuildMachine({ projectRoot, target, mode, here, note, machi
 		identity,
 		runnersUp: rest,
 		automatic: selected === "auto",
-		cacheOnly
+		cacheOnly,
+		...gradleQuery ? { gradleArtifact: gradleQuery } : {},
+		...reactNativeQuery ? { reactNativeArtifact: reactNativeQuery } : {},
+		...swiftpmQuery ? { swiftpmArtifact: swiftpmQuery } : {}
+	};
+}
+function macosBuildParameters(request, peerCache) {
+	return {
+		...request.cacheArtifact === true && peerCache ? { cacheArtifact: true } : {},
+		macos: {
+			...request.artifactInputs && peerCache ? { artifactInputs: request.artifactInputs } : {},
+			product: request.product,
+			infoPlist: request.infoPlist,
+			bundleId: request.bundleId,
+			...request.resources !== void 0 ? { resources: request.resources } : {},
+			...request.assetCatalog !== void 0 ? { assetCatalog: request.assetCatalog } : {}
+		}
 	};
 }
 function validArtifactIdentity(request, fingerprint) {
@@ -769,6 +907,38 @@ const ARTIFACT_NAME = {
 	android: /^[^/]+\.apk$/,
 	macos: /^[^/]+\.app$/
 };
+async function peerArtifact(choice, request, fingerprint) {
+	const swiftpm = choice.swiftpmArtifact;
+	if (swiftpm) {
+		if (request.platform !== "macos" || !isDeepStrictEqual(swiftpm, swiftpmArtifactQuery({
+			...swiftpm,
+			inputs: request.artifactInputs,
+			build: {
+				product: request.product,
+				infoPlist: request.infoPlist,
+				resources: request.resources ?? {},
+				assetCatalog: request.assetCatalog ?? null
+			}
+		}))) throw new Error("The SwiftPM artifact query does not match the build request.");
+		if (!choice.connection.supports("swiftpm-peer-cache") || manifestDigest(await sourceManifest(choice.identity.repoRoot, true, runCancellationSignal(ambientContext()) ?? ambientContext()?.signal)) !== swiftpm.sourceDigest) return null;
+		return matchingArtifact(choice.offer, "swiftpm");
+	}
+	const reactNative = choice.reactNativeArtifact;
+	if (reactNative) {
+		if (typeof fingerprint !== "string" || !isDeepStrictEqual(reactNative, reactNativeBuildQuery(request, fingerprint, choice.identity.project, choice.target.local))) throw new Error("The React Native artifact query does not match the build request.");
+		return choice.connection.supports("react-native-peer-cache") ? matchingArtifact(choice.offer, `react-native-${reactNative.platform}`) : null;
+	}
+	const query = choice.gradleArtifact;
+	if (query) {
+		if (request.platform !== "android" || request.native?.provider !== "gradle" || !request.native.cache?.read || !request.native.cache.remote || query.project !== choice.identity.project || query.sourceDigest !== request.native.transfer.digest || !isDeepStrictEqual(query.inputs, request.native.transfer.declaration) || !isDeepStrictEqual(query.android, request.android)) throw new Error("The Gradle artifact query does not match the build request.");
+		return choice.connection.supports("native-gradle-peer-cache") ? matchingArtifact(choice.offer, "native-gradle") : null;
+	}
+	if (request.platform === "ios" && request.native && typeof fingerprint === "string" && choice.connection.supports("build-artifact-cache")) return matchingArtifact(choice.offer, {
+		fingerprint,
+		cacheKey: request.native.cacheKey
+	});
+	return null;
+}
 /**
 * Reconnects to the machine that runs `job` and takes the job over with `build.attach`, retrying until
 * `RESUME_WINDOW_MS`, shorter than the machine's grace for a dropped connection, has passed. Returns why it
@@ -1018,6 +1188,7 @@ async function offloadBuild(input) {
 			choice.connection.close();
 			const probe = await probeMachine(choice.credential, {
 				...identity,
+				dependencies: dependencySelection(identity, choice.target),
 				...native ? { native: native.provider } : {}
 			});
 			if ("failure" in probe) return fail(probe.failure);
@@ -1049,10 +1220,7 @@ async function offloadBuild(input) {
 		checkCancelled();
 		if (!validArtifactIdentity(request, expectedFingerprint)) return fail("The build request has an invalid reusable artifact identity.");
 		if (native?.provider === "xcode" && native.snapshot.hash !== expectedFingerprint) return fail("The native source snapshot does not match the requested artifact identity.");
-		const cachedIdentity = native?.provider === "xcode" && typeof expectedFingerprint === "string" ? {
-			fingerprint: expectedFingerprint,
-			cacheKey: native.cacheKey
-		} : void 0;
+		let cached = null;
 		let job = null;
 		let early = [];
 		let resuming = false;
@@ -1113,13 +1281,14 @@ async function offloadBuild(input) {
 				if (moveOn(reason)) continue;
 				return fail(reason);
 			}
-			const cached = native?.provider === "xcode" && choice.connection.supports("build-artifact-cache") ? matchingArtifact(choice.offer, cachedIdentity) : null;
+			cached = await peerArtifact(choice, request, expectedFingerprint);
 			if (cached) {
 				cacheHit = true;
 				settle({
 					ok: true,
 					artifact: cached,
-					fingerprint: expectedFingerprint
+					fingerprint: expectedFingerprint,
+					androidPackage: cached.androidPackage
 				});
 				break;
 			}
@@ -1150,21 +1319,19 @@ async function offloadBuild(input) {
 						cacheKey: native.cacheKey,
 						arch: native.arch,
 						parameters: native.snapshot.parameters
-					} : { inputs: native.transfer.declaration }
+					} : {
+						inputs: native.transfer.declaration,
+						...choice.connection.supports("native-gradle-artifact-cache") ? { cache: native.cache } : {}
+					}
 				} } : {},
-				...request.platform === "macos" ? { macos: {
-					product: request.product,
-					infoPlist: request.infoPlist,
-					bundleId: request.bundleId,
-					...request.resources !== void 0 ? { resources: request.resources } : {},
-					...request.assetCatalog !== void 0 ? { assetCatalog: request.assetCatalog } : {}
-				} } : {
+				...request.platform === "macos" ? macosBuildParameters(request, choice.connection.supports("swiftpm-peer-cache")) : {
 					configuration: request.platform === "ios" ? request.configuration : null,
 					scheme: request.platform === "ios" ? request.scheme : null,
 					iosProjectPath: request.platform === "ios" ? request.iosProjectPath ?? null : null,
 					runtime: request.platform === "ios" ? request.runtime : null,
 					packageName: packageName(join(identity.repoRoot, identity.project)),
 					isExpo: request.isExpo,
+					...!native && request.cacheArtifact === true && choice.connection.supports("react-native-peer-cache") ? { cacheArtifact: true } : {},
 					optimizations: request.platform === "ios" && isJsonObject(request.optimizations) ? request.optimizations : null,
 					...request.platform === "android" ? { android: request.android } : {}
 				},
@@ -1219,15 +1386,19 @@ async function offloadBuild(input) {
 			cacheHit,
 			checkCancelled,
 			method: cacheHit ? "build.cached-artifact" : "build.artifact",
-			params: cacheHit && native?.provider === "xcode" ? {
+			params: cached ? {
 				repo: identity.repo,
 				artifact: {
-					fingerprint: expectedFingerprint,
-					cacheKey: native.cacheKey
-				}
+					fingerprint: cached.fingerprint,
+					cacheKey: cached.cacheKey
+				},
+				...choice.gradleArtifact ? { gradleArtifact: choice.gradleArtifact } : {},
+				...choice.reactNativeArtifact ? { reactNativeArtifact: choice.reactNativeArtifact } : {},
+				...choice.swiftpmArtifact ? { swiftpmArtifact: choice.swiftpmArtifact } : {}
 			} : { job }
 		});
 		if ("failure" in downloaded) return cacheHit ? await retryCachedMiss(downloaded.failure) : fail(downloaded.failure);
+		if (cacheHit && choice.swiftpmArtifact && !await peerArtifact(choice, request, expectedFingerprint)) return await retryCachedMiss("The SwiftPM source changed during artifact transfer.");
 		const { artifactPath, digest, received, declared } = downloaded;
 		const fetchMs = Date.now() - fetchStarted;
 		closeOffload(choice);
@@ -1403,4 +1574,4 @@ function offloadCheck(projectRoot, targets) {
 	};
 }
 //#endregion
-export { nativeTransferRefusal as a, offloadPlacement as c, simulatorRuntime as d, setRemoteLogSink as f, maintenanceLogger as h, closeOffload as i, placementLoad as l, clearCorruptCompilationCache as m, buildPlacementCandidates as n, offloadBuild as o, COMPILATION_CACHE_CORRUPT as p, chooseBuildMachine as r, offloadCheck as s, BuildConnection as t, remotePhaseText as u };
+export { clearCorruptCompilationCache as _, nativeTransferRefusal as a, offloadPlacement as c, simulatorRuntime as d, reactNativeArtifactReceipt as f, COMPILATION_CACHE_CORRUPT as g, setRemoteLogSink as h, closeOffload as i, placementLoad as l, reactNativeBuildQuery as m, buildPlacementCandidates as n, offloadBuild as o, reactNativeArtifactToolchain as p, chooseBuildMachine as r, offloadCheck as s, BuildConnection as t, remotePhaseText as u, maintenanceLogger as v };

package/dist/collector-run.d.mts

@@ -1,4 +1,4 @@
-import { n as NdjsonWriter, t as Executor } from "./exec-H20xSg2T.mjs";
+import { n as NdjsonWriter, t as Executor } from "./exec-DnYc4HGH.mjs";
 import { ChildProcess } from "node:child_process";
 //#region src/collector/android.d.ts
 declare function androidClockOffset(serial: string, { exec, now }?: {

package/dist/collector-run.mjs

@@ -1,12 +1,12 @@
-import { p as process_identity_exports } from "./exec-_UbtCQcG.mjs";
+import { g as process_identity_exports } from "./exec-DEoAhcze.mjs";
 import { m as workspaceLogsDir } from "./paths-DQtTgsBf.mjs";
-import { H as deviceSlotKey, J as validateDeviceSlot } from "./config-CYcBF478.mjs";
+import { V as deviceSlotKey, q as validateDeviceSlot } from "./config-DlrsduwG.mjs";
 import { t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
 import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
-import { a as startIosDeviceConsole, i as parseDeviceConsoleLine } from "./ios-device-CXGP1bsD.mjs";
-import { a as unregisterCollector, i as registerCollector, r as readCollectors, t as collectorProcessTitle } from "./ownership-DEmM5vhh.mjs";
-import { a as waitForAppPid, i as startAndroidLogcat, n as parseLogcatLine, o as watchAppPid, t as androidClockOffset } from "./android-BEJ8Jpl7.mjs";
-import { n as parseLogStreamLine, r as startIosLogStream, t as appNameFromBundleId } from "./ios-qNJt4dFm.mjs";
+import { a as startIosDeviceConsole, i as parseDeviceConsoleLine } from "./ios-device-BXZ0c7Kb.mjs";
+import { a as unregisterCollector, i as registerCollector, r as readCollectors, t as collectorProcessTitle } from "./ownership-C5fo5Edb.mjs";
+import { a as waitForAppPid, i as startAndroidLogcat, n as parseLogcatLine, o as watchAppPid, t as androidClockOffset } from "./android-DR5lZ2Az.mjs";
+import { n as parseLogStreamLine, r as startIosLogStream, t as appNameFromBundleId } from "./ios-xtlRHaeB.mjs";
 import { existsSync } from "node:fs";
 import { isAbsolute, join, resolve } from "node:path";
 import { LOG_ROTATE_BYTES } from "@stim-cli/core";

package/dist/{command-output-B1UrjZHL.mjs → command-output-gwpm28fu.mjs}

@@ -1,5 +1,5 @@
 import { n as stripAnsi } from "./process-output-Fpl8PYi8.mjs";
-import { t as NO_PROJECT_REFUSAL } from "./project-BZNjmW_8.mjs";
+import { t as NO_PROJECT_REFUSAL } from "./project-wM_XFTvE.mjs";
 import { quotedPath as quotedPath$1 } from "@stim-cli/core";
 import chalk from "chalk";
 //#region src/diagnostics/launch-error-preview.ts

package/dist/{config-CYcBF478.mjs → config-DlrsduwG.mjs}

@@ -1,4 +1,5 @@
-import { f as ownership_claim_exports, g as trackReportResource, m as reportSignal, p as process_identity_exports, t as getExecutor } from "./exec-_UbtCQcG.mjs";
+import { _ as reportSignal, g as process_identity_exports, r as WorkspaceProcessCleanupError, t as getExecutor, x as ownership_claim_exports, y as trackReportResource } from "./exec-DEoAhcze.mjs";
+import { t as runOperationFile } from "./operation-exec-BW0em61G.mjs";
 import { join } from "node:path";
 import { ambientEnv, configDir, ensurePrivateDir } from "@stim-cli/core";
 import { allMetroPorts, cannotHost, clientIdentity, configCorruptRepair, endpoint, findEnclosingWorktreeRoot, findPeer as findPeer$1, getConcurrencyLimits, getConfigPath, getConfigPath as getConfigPath$1, getProject, getProjectSettings, getRepoSettings, isJsonObject, isPathPrefix, loadConfig, loadConfig as loadConfig$1, machineEndpoint, parseMachine, parseMachine as parseMachine$1, validateAutomaticPool, withConfigLock, withConfigLock as withConfigLock$1, withConfigLockAsync, withConfigLockAsync as withConfigLockAsync$1 } from "@stim-cli/core/state";
@@ -77,7 +78,7 @@ function outdatedServer(entry, version, command) {
 	return {
 		title: `Remote machine ${entry} runs an older stim-server`,
 		detail: `The stim-server on ${entry} speaks an older protocol than this Stim, so it cannot authenticate this machine.`,
-		fix: command ? `${update}, then run this there to approve this machine: ${command}` : `${update}, then run \`stim doctor --fix\` here.`
+		fix: command ? `${update}, then run this there to approve this machine: ${command}\nAfter approving, run \`stim doctor\` on this machine to reconnect.` : `${update}, then run \`stim doctor --fix\` here.`
 	};
 }
 /**
@@ -254,10 +255,10 @@ async function resolveEndpoint(credential, status = () => tailscaleStatusAsync(s
 }
 /** The remedy for a pending request: the printed setup command, or where the person finds it. */
 function setupRemedy(entry, command) {
-	return command ? `A person on ${entry} runs this there to approve this machine: ${command}` : `A person on ${entry} runs the \`stim-server setup\` command Stim Desktop showed for this machine.`;
+	return command ? `A person on ${entry} runs this there to approve this machine: ${command}\nAfter approving, run \`stim doctor\` on this machine to reconnect.` : `A person on ${entry} runs the \`stim-server setup\` command Stim Desktop showed for this machine.`;
 }
 function setupCommand(ticket, expiresAt, flags, version) {
-	return `STIM_SETUP_TICKET=${ticket} npx --yes --package @stim-cli/server@${version} stim-server setup --expires ${expiresAt} ${flags.map((flag) => `--${flag}`).join(" ")}`;
+	return `STIM_SETUP_TICKET=${ticket} STIM_SETUP_ORIGIN=doctor npx --yes --package @stim-cli/server@${version} stim-server setup --expires ${expiresAt} ${flags.map((flag) => `--${flag}`).join(" ")}`;
 }
 function newPending(input, ticket, expiresAt, now) {
 	return {
@@ -601,17 +602,22 @@ function isOnMountedVolume(path, mountedVolumes, { statFn = statSync } = {}) {
 function directorySize(dir, { timeoutMs }) {
 	return measuredDirectorySize(dir, { timeoutMs }) ?? 0;
 }
-async function directorySizeAsync(dir, { timeoutMs }) {
-	return await measuredDirectorySizeAsync(dir, { timeoutMs }) ?? 0;
+async function directorySizeAsync(dir, options) {
+	return await measuredDirectorySizeAsync(dir, options) ?? 0;
 }
-async function measuredDirectorySizeAsync(dir, { timeoutMs }) {
+async function measuredDirectorySizeAsync(dir, { timeoutMs, signal, operation }) {
 	let out;
 	try {
-		out = await getExecutor().runFileAsync("du", ["-sk", dir], {
+		out = await runOperationFile(operation, getExecutor(), "du", ["-sk", dir], {
 			timeoutMs,
-			killSignal: "SIGKILL"
+			killSignal: "SIGKILL",
+			signal,
+			cwd: operation?.cwd
 		});
-	} catch {
+	} catch (error) {
+		if (error instanceof WorkspaceProcessCleanupError) throw error;
+		signal?.throwIfAborted();
+		operation?.signal.throwIfAborted();
 		return null;
 	}
 	if (!out) return 0;
@@ -946,4 +952,4 @@ function allConsolePortsAndSerials({ isMounted = isOnMountedVolume } = {}) {
 	return result;
 }
 //#endregion
-export { openAuthenticated as $, writeConfigSettingAsync as A, assignSlotDevice as B, saveConfig as C, withConfigLock$1 as D, upsertProject as E, isOnMountedVolume as F, parseDeviceSlotOption as G, deviceSlotKey as H, listMountedVolumes as I, validateDeviceSlot as J, projectDeviceSlots as K, measuredDirectorySize as L, directorySize as M, directorySizeAsync as N, withConfigLockAsync$1 as O, formatBytes as P, findPeer$1 as Q, measuredDirectorySizeAsync as R, removeProject as S, setSupervisor as T, deviceSlotPlatforms as U, deviceSlotFileKey as V, parseDeviceSlotKey as W, doctorIo as X, SERVER_OUTDATED as Y, endpoint as Z, loadConfig$1 as _, clearDevice as a, sayHello as at, releaseAndroidConsolePort as b, ensureConfig as c, readHostPermissions as ct, getConfigDir as d, outdatedServer as et, getConfigPath$1 as f, isPathPrefix as g, getRepoSettings as h, clearAndroidBootPending as i, resolveEndpoint as it, acquireAvdClaim as j, writeConfigSetting as k, findEnclosingWorktreeRoot as l, getProjectSettings as m, allMetroPorts as n, reachMachine as nt, clearSupervisor as o, setupRemedy as ot, getProject as p, removeSlotDevice as q, claimMetroPort as r, realIo as rt, configCorruptRepair as s, tailscaleStatusAsync as st, allConsolePortsAndSerials as t, parseMachine$1 as tt, getConcurrencyLimits as u, recordIosSchemeApprovals as v, setDevice as w, releaseMetroPort as x, refuseRelativeStimPaths as y, volumeRootFor as z };
+export { outdatedServer as $, writeConfigSettingAsync as A, deviceSlotFileKey as B, saveConfig as C, withConfigLock$1 as D, upsertProject as E, isOnMountedVolume as F, projectDeviceSlots as G, deviceSlotPlatforms as H, listMountedVolumes as I, SERVER_OUTDATED as J, removeSlotDevice as K, measuredDirectorySizeAsync as L, directorySize as M, directorySizeAsync as N, withConfigLockAsync$1 as O, formatBytes as P, openAuthenticated as Q, volumeRootFor as R, removeProject as S, setSupervisor as T, parseDeviceSlotKey as U, deviceSlotKey as V, parseDeviceSlotOption as W, endpoint as X, doctorIo as Y, findPeer$1 as Z, loadConfig$1 as _, clearDevice as a, setupRemedy as at, releaseAndroidConsolePort as b, ensureConfig as c, getConfigDir as d, parseMachine$1 as et, getConfigPath$1 as f, isPathPrefix as g, getRepoSettings as h, clearAndroidBootPending as i, sayHello as it, acquireAvdClaim as j, writeConfigSetting as k, findEnclosingWorktreeRoot as l, getProjectSettings as m, allMetroPorts as n, realIo as nt, clearSupervisor as o, tailscaleStatusAsync as ot, getProject as p, validateDeviceSlot as q, claimMetroPort as r, resolveEndpoint as rt, configCorruptRepair as s, readHostPermissions as st, allConsolePortsAndSerials as t, reachMachine as tt, getConcurrencyLimits as u, recordIosSchemeApprovals as v, setDevice as w, releaseMetroPort as x, refuseRelativeStimPaths as y, assignSlotDevice as z };

package/dist/{created-devices-CqeBlrEn.mjs → created-devices-x9rN6bhs.mjs}

@@ -1,5 +1,5 @@
-import { v as withDirLock$1 } from "./paths-DQtTgsBf.mjs";
-import { d as getConfigDir } from "./config-CYcBF478.mjs";
+import { v as withDirLock$1, y as withDirLockAsync$1 } from "./paths-DQtTgsBf.mjs";
+import { d as getConfigDir } from "./config-DlrsduwG.mjs";
 import { renameSync, rmSync, writeFileSync } from "node:fs";
 import { ensurePrivateDir } from "@stim-cli/core";
 import { createdDevicesFile, createdDevicesLock, readCreatedDevices, readCreatedDevices as readCreatedDevices$1 } from "@stim-cli/core/state";
@@ -34,5 +34,15 @@ function recordCreatedDevice(platform, id) {
 function forgetCreatedDevice(platform, id) {
 	update(platform, (entries) => entries.delete(id));
 }
+/** Waits asynchronously for the ledger lock, then atomically forgets the device. The synchronous transaction decides whether to commit the removal; cancellation stops admission. */
+function forgetCreatedDeviceAsync(platform, id, signal, transaction = (forget) => {
+	forget();
+	return true;
+}) {
+	return withDirLockAsync$1(createdDevicesLock(), () => transaction(() => forgetCreatedDevice(platform, id)), {
+		ensureParent: () => ensurePrivateDir(getConfigDir()),
+		signal
+	});
+}
 //#endregion
-export { readCreatedDevices$1 as n, recordCreatedDevice as r, forgetCreatedDevice as t };
+export { recordCreatedDevice as i, forgetCreatedDeviceAsync as n, readCreatedDevices$1 as r, forgetCreatedDevice as t };

package/dist/{dependency-state-BbKQW83h.mjs → dependency-state-1I9KZT1Y.mjs}

@@ -1,5 +1,5 @@
-import { t as getExecutor } from "./exec-_UbtCQcG.mjs";
-import { Ft as repoRoot } from "./settings-CsJDEXgK.mjs";
+import { t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { Mt as repoRoot } from "./settings-C7O8A6ZI.mjs";
 import { existsSync } from "node:fs";
 import { dirname, join, relative } from "node:path";
 //#region src/dependency-state.ts

package/dist/{detached-entry-DFRyG1_o.mjs → detached-entry-BwNEtIrP.mjs}

@@ -1,4 +1,4 @@
-import { t as getExecutor } from "./exec-_UbtCQcG.mjs";
+import { t as getExecutor } from "./exec-DEoAhcze.mjs";
 import { openSync } from "node:fs";
 //#region src/detached-entry.ts
 const LOG_FILE_FLAG = "--log-file";

package/dist/{dev-client-UOeESKm6.mjs → dev-client-BSDR5h3F.mjs}

@@ -1,5 +1,5 @@
-import { C as resolvePackageJson, b as isPackageResolvable } from "./project-BZNjmW_8.mjs";
-import { An as readBundleSchemes, kn as pickDevClientScheme } from "./budget-Bs6SxxzO.mjs";
+import { C as resolvePackageJson, b as isPackageResolvable } from "./project-wM_XFTvE.mjs";
+import { An as readBundleSchemes, kn as pickDevClientScheme } from "./budget-Cvwn54qV.mjs";
 import { dirname, join } from "node:path";
 import { isJsonObject, readJsonObject } from "@stim-cli/core/state";
 //#region src/commands/dev-client.ts