stim 1.18.0 → 1.20.0

package/dist/{client-DzhapoMB.mjs → client-BLy1Pw2V.mjs}

@@ -1,14 +1,18 @@
-import { n as debugLog, t as getExecutor } from "./exec-DWhCZDGm.mjs";
-import { _ as loadConfig$1, d as getConfigDir } from "./config-CgYMahz7.mjs";
-import { w as withDirLock } from "./workspace-state-C59dqG-Z.mjs";
-import { a as toolchainMismatches, d as readRubyVersion, h as COMPILATION_CACHE_UNAVAILABLE, j as CCACHE_UNAVAILABLE, s as manifestDigest } from "./toolchain-Bnyd_K3A.mjs";
+import { n as debugLog, t as getExecutor } from "./exec-B81Qodjn.mjs";
+import { _ as loadConfig$1, d as getConfigDir } from "./config-D0LhTY3S.mjs";
+import { D as withDirLock } from "./workspace-state-CSIFuuDa.mjs";
+import { a as markApproved, c as pinnedEndpoint$1, i as lapsedLine, l as realIo, n as findPeer$1, o as parseMachine$1, r as isLapsed, s as pendingReport, t as endpoint, u as requestedLine, x as runCancellationSignal } from "./tailnet-CoJUb2tB.mjs";
+import { n as CCACHE_UNAVAILABLE } from "./ccache-CjHQ5F8g.mjs";
+import { l as toolchainMismatches, m as readRubyVersion, v as COMPILATION_CACHE_UNAVAILABLE } from "./toolchain-DqyDXs30.mjs";
+import { c as gitVisiblePaths, i as nativeGradleTransfer, l as nativeTransferManifest, m as manifestDigest, s as checkNativeTransferMembership, u as sourceManifest } from "./native-gradle-inputs-BQnIdAlL.mjs";
 import { closeSync, existsSync, lstatSync, mkdirSync, openSync, readFileSync, readlinkSync, realpathSync, renameSync, rmSync, writeFileSync, writeSync } from "node:fs";
-import { basename, dirname, join, relative } from "node:path";
-import { OFFLOAD_MODES, acceptsShape, buildMachinesFile, buildMachinesLock, deviceHostMachinesClaims, deviceHostMachinesFile, deviceHostMachinesLock, endpoint, findPeer as findPeer$1, isJsonObject, parseMachine, parseMachine as parseMachine$1, pinnedEndpoint, readBuildMachines, readDeviceHostMachines, runId, saturation, settingDefinition } from "@stim-cli/core/state";
-import { hostname } from "node:os";
+import { basename, dirname, isAbsolute, join, relative, sep } from "node:path";
+import { OFFLOAD_MODES, acceptsShape, automaticMachineEnabled, buildMachinesFile, buildMachinesLock, deviceHostMachinesClaims, deviceHostMachinesFile, deviceHostMachinesLock, isJsonObject, parseMachine, readBuildMachines, readDeviceHostMachines, requireAutomaticMachine, runId, saturation, settingDefinition } from "@stim-cli/core/state";
 import { InvalidArgumentError } from "commander";
 import { releaseClaim, tryAcquireClaim } from "@stim-cli/core/ownership-claim";
 import { createHash } from "node:crypto";
+import { hostname } from "node:os";
+import { setTimeout as setTimeout$1 } from "node:timers/promises";
 import { WebSocket } from "ws";
 //#region src/offload/access-ticket.ts
 function readAccessTicket() {
@@ -27,95 +31,6 @@ function readHostPermissions(value) {
 	} : void 0;
 }
 //#endregion
-//#region src/offload/tailnet.ts
-const MAC_APP_TAILSCALE = "/Applications/Tailscale.app/Contents/MacOS/Tailscale";
-const HELLO_TIMEOUT_MS = 1e4;
-function isLapsed(credential) {
-	return credential.state === "pending" && !!credential.expiresAt && Date.parse(credential.expiresAt) <= Date.now();
-}
-function markApproved(credential) {
-	const { expiresAt: _expiresAt, ...rest } = credential;
-	return {
-		...rest,
-		state: "approved"
-	};
-}
-function pendingReport(credential) {
-	return {
-		state: "pending",
-		...credential.expiresAt ? { expiresAt: credential.expiresAt } : {}
-	};
-}
-function lapsedLine(machine, credential) {
-	return `${machine} did not approve this Mac before the request lapsed at ${credential.expiresAt}.`;
-}
-function requestedLine(credential) {
-	return `Requested at ${credential.requestedAt}${credential.expiresAt ? `; the request lapses at ${credential.expiresAt}` : ""}.`;
-}
-function tailscaleStatus() {
-	for (const binary of ["tailscale", MAC_APP_TAILSCALE]) {
-		const output = getExecutor().runFileQuiet(binary, ["status", "--json"], { timeoutMs: 5e3 });
-		if (output === null) continue;
-		try {
-			const status = JSON.parse(output);
-			return isJsonObject(status) && status.BackendState === "Running" ? status : null;
-		} catch {
-			return null;
-		}
-	}
-	return null;
-}
-function hello({ url, servername, host }, auth) {
-	return new Promise((resolve) => {
-		const socket = new WebSocket(url, {
-			handshakeTimeout: HELLO_TIMEOUT_MS,
-			servername,
-			headers: { Host: host }
-		});
-		const done = (reply) => {
-			clearTimeout(timer);
-			socket.removeAllListeners();
-			socket.on("error", () => {});
-			socket.close();
-			resolve(reply);
-		};
-		const timer = setTimeout(() => done({ failed: "no reply in time" }), HELLO_TIMEOUT_MS);
-		socket.on("open", () => {
-			socket.send(JSON.stringify({
-				id: 1,
-				method: "hello",
-				params: {
-					protocol: 1,
-					client: {
-						name: "stim",
-						version: "1"
-					},
-					auth
-				}
-			}));
-		});
-		socket.on("message", (data) => {
-			let message;
-			try {
-				message = JSON.parse(String(data));
-			} catch {
-				message = null;
-			}
-			if (isJsonObject(message) && ("result" in message || "error" in message)) return done(message);
-			done({ failed: "the reply was not a hello result" });
-		});
-		socket.on("error", (error) => done({ failed: error.message }));
-		socket.on("close", () => done({ failed: "the connection closed before a reply" }));
-	});
-}
-const realIo = {
-	status: tailscaleStatus,
-	hello
-};
-function pinnedEndpoint$1(credential, status = tailscaleStatus) {
-	return pinnedEndpoint(credential, parseMachine(credential.machine) ? status() : null);
-}
-//#endregion
 //#region src/device-host/machines.ts
 function note$1(title, detail, fix = null) {
 	return {
@@ -689,6 +604,9 @@ function parseBuildMachineOption(value) {
 		throw new InvalidArgumentError(error.message);
 	}
 }
+function requireLocalBuild(selected) {
+	if (selected === "auto" && !automaticMachineEnabled("build", "local")) throw new OffloadRefusal("auto", "local is disabled in remote.buildPoolDisabled; enable it or select a machine explicitly");
+}
 function namedBuildMachine(selected) {
 	return selected !== "auto" && selected !== "local";
 }
@@ -785,9 +703,11 @@ function offloadMode(env = process.env) {
 	return OFFLOAD_MODES.includes(raw) ? raw : "auto";
 }
 function buildPlacementCandidates(selected) {
+	const config = loadConfig$1();
 	return {
+		localEnabled: selected !== "auto" || automaticMachineEnabled("build", "local", config),
 		mode: selected === "local" ? "off" : offloadMode(),
-		machines: selected === "local" ? [] : namedBuildMachine(selected) ? pairedMachines([selected]).slice(0, 1) : pairedMachines()
+		machines: selected === "local" ? [] : namedBuildMachine(selected) ? pairedMachines([selected]).slice(0, 1) : pairedMachines().filter((entry) => automaticMachineEnabled("build", entry.machine, config))
 	};
 }
 function remotePhaseText(name, msg, machine) {
@@ -813,7 +733,7 @@ function placementLoad(choice) {
 * this Mac has a free `concurrency.maxBuilds` slot and its load per core is under `server.maxLoadPerCore`.
 * A named selection ignores local capacity and mode, and refuses an unsupported build or missing pairing.
 */
-function offloadPlacement({ mode, machines, here, unsupported, selected = "auto" }) {
+function offloadPlacement({ mode, machines, here, unsupported, localEnabled = true, selected = "auto" }) {
 	if (namedBuildMachine(selected)) {
 		if (unsupported) throw new OffloadRefusal(selected, `${unsupported}, so a named remote Mac cannot take it`);
 		if (machines === 0) throw new OffloadRefusal(selected, "no remote Mac is paired");
@@ -828,6 +748,15 @@ function offloadPlacement({ mode, machines, here, unsupported, selected = "auto"
 		code: "local-selected",
 		reason: "--remote-build local"
 	};
+	if (!localEnabled) {
+		const reason = mode === "off" ? "remote.buildMode is off" : unsupported ?? (machines === 0 ? "no enabled remote Mac is paired" : null);
+		if (reason) throw new OffloadRefusal("auto", `${reason}; local is disabled in remote.buildPoolDisabled`);
+		return {
+			offload: true,
+			code: "local-disabled",
+			reason: "local is disabled in remote.buildPoolDisabled"
+		};
+	}
 	if (mode === "off") return {
 		offload: false,
 		code: "mode-off",
@@ -891,7 +820,7 @@ function offerProblems(offer, target) {
 * 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.
 */
-function pickOffer({ mode, here, offers, target, selected = "auto" }) {
+function pickOffer({ mode, here, offers, target, localEnabled = true, selected = "auto" }) {
 	const slotsFull = here.maxBuilds > 0 && here.builds >= here.maxBuilds;
 	const reasons = [];
 	const candidates = [];
@@ -911,7 +840,7 @@ function pickOffer({ mode, here, offers, target, selected = "auto" }) {
 		const problems = offerProblems(offer, target);
 		if (problems.length) return skip(machine, problemCode(problems[0]), problems.map((problem) => problem.reason).join("; "), problems.map((problem) => problem.code));
 		const load = offer.capacity.loadPerCore;
-		if (selected === "auto" && mode === "auto" && !slotsFull) {
+		if (selected === "auto" && localEnabled && mode === "auto" && !slotsFull) {
 			if (typeof load !== "number") return skip(machine, "load", "capacity unknown (older stim-server) while this Mac has a free slot");
 			if (load >= here.loadPerCore) return skip(machine, "load", `no less loaded (load ${load}/core there, ${here.loadPerCore}/core here)`);
 		}
@@ -1146,6 +1075,7 @@ 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));
 	}
@@ -1183,6 +1113,14 @@ var BuildConnection = class BuildConnection {
 	}
 	forget() {
 		this.ended = true;
+		this.closed ??= "the connection was closed by this client";
+		for (const resolve of this.pending.values()) resolve({ error: {
+			code: "closed",
+			message: this.closed
+		} });
+		this.pending.clear();
+		this.progress = null;
+		this.binary = null;
 		clearInterval(this.keepalive);
 		this.socket.removeAllListeners("close");
 		openSockets.delete(this.socket);
@@ -1221,61 +1159,37 @@ function repoIdentity(projectRoot) {
 		lockfile: lock ? createHash("sha256").update(readFileSync(join(repoRoot, lock))).digest("hex") : null
 	};
 }
-/** The exact source a build needs: tracked and untracked, not ignored, as `git ls-files -co --exclude-standard`. */
-function sourceManifest(repoRoot) {
-	const listed = getExecutor().runFile("git", [
-		"-C",
-		repoRoot,
-		"ls-files",
-		"-z",
-		"-co",
-		"--exclude-standard"
-	], {
-		untrimmed: true,
-		timeoutMs: 12e4
-	});
-	const files = [];
-	for (const path of new Set(listed.split("\0").filter(Boolean))) {
-		const absolute = join(repoRoot, path);
-		let stat;
-		try {
-			stat = lstatSync(absolute);
-		} catch {
-			continue;
-		}
-		if (stat.isSymbolicLink()) {
-			const target = Buffer.from(readlinkSync(absolute));
-			files.push({
-				path,
-				kind: "link",
-				size: target.length,
-				sha256: sha256(target)
-			});
-		} else if (stat.isFile()) {
-			const content = readFileSync(absolute);
-			files.push({
-				path,
-				kind: stat.mode & 73 ? "exec" : "file",
-				size: content.length,
-				sha256: sha256(content)
-			});
-		}
+const sha256 = (content) => createHash("sha256").update(content).digest("hex");
+/** Why the native inputs cannot be sent to a remote Mac, such as an ignored file among them, or null when they can. */
+function nativeTransferRefusal(repoRoot, snapshot) {
+	try {
+		checkNativeTransferMembership(snapshot, gitVisiblePaths(repoRoot));
+		return null;
+	} catch (error) {
+		return error.message.split("\n")[0];
 	}
-	return files;
 }
-const sha256 = (content) => createHash("sha256").update(content).digest("hex");
 function blobContent(repoRoot, file) {
 	const absolute = join(repoRoot, file.path);
-	return file.kind === "link" ? Buffer.from(readlinkSync(absolute)) : readFileSync(absolute);
+	return file.kind === "directory" ? Buffer.alloc(0) : file.kind === "link" ? Buffer.from(readlinkSync(absolute)) : readFileSync(absolute);
 }
 /** Closes every connection the choice still holds. */
 function closeOffload(choice) {
 	choice.connection.close();
 	for (const each of choice.runnersUp.splice(0)) each.connection.close();
 }
+const NATIVE_BUILD_FEATURE = {
+	xcode: "native-xcode-build",
+	gradle: "native-gradle-build"
+};
+const unsupportedNative = (provider) => `This worker does not support native ${provider === "xcode" ? "Xcode" : "Gradle"} builds.`;
+const ANDROID_PACKAGE = /^[A-Za-z_][\w]*(?:\.[A-Za-z_][\w]*)+$/;
+function nativeTransferInput(native) {
+	return native?.provider === "xcode" ? native.snapshot : native?.transfer;
+}
 /** Connects to one paired machine and asks it for an offer; the caller closes the connection it returns. */
 async function probeMachine(credential, identity, { connectMs = CONNECT_TIMEOUT_MS, offerMs = OFFER_TIMEOUT_MS } = {}) {
-	const target = pinnedEndpoint$1(credential);
+	const target = await pinnedEndpoint$1(credential);
 	if (typeof target === "string") return {
 		credential,
 		failure: target
@@ -1285,10 +1199,18 @@ async function probeMachine(credential, identity, { connectMs = CONNECT_TIMEOUT_
 		credential,
 		failure: connection.failure
 	};
+	if (identity.native && !connection.supports(NATIVE_BUILD_FEATURE[identity.native])) {
+		connection.close();
+		return {
+			credential,
+			failure: unsupportedNative(identity.native)
+		};
+	}
+	const native = identity.native === "gradle" || identity.native && connection.supports("native-xcode-toolchain") ? identity.native : void 0;
 	const reply = await connection.request("build.offer", {
 		repo: identity.repo,
 		...identity.lockfile ? { lockfile: identity.lockfile } : {},
-		...identity.rubyVersion ? { rubyVersion: identity.rubyVersion } : {}
+		...native ? { native } : identity.rubyVersion ? { rubyVersion: identity.rubyVersion } : {}
 	}, offerMs);
 	const failure = replyError(reply);
 	if (failure || !("result" in reply)) {
@@ -1317,12 +1239,15 @@ async function chooseBuildMachine({ projectRoot, target, mode, here, note, machi
 		return `this app is not in a git checkout (${error.message.split("\n")[0]})`;
 	}
 	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 asked = await Promise.all(machines.map((credential) => probeMachine(credential, {
 		...identity,
-		rubyVersion
+		rubyVersion,
+		...target.platform !== "macos" ? { native: target.native } : {}
 	})));
 	const { order, reasons, candidates } = pickOffer({
+		localEnabled: selected !== "auto" || automaticMachineEnabled("build", "local"),
 		selected,
 		mode,
 		here,
@@ -1353,9 +1278,14 @@ async function chooseBuildMachine({ projectRoot, target, mode, here, note, machi
 		target,
 		offerMs: Date.now() - started,
 		identity,
-		runnersUp: rest
+		runnersUp: rest,
+		automatic: selected === "auto"
 	};
 }
+function validArtifactIdentity(request, fingerprint) {
+	if (request.platform === "macos") return true;
+	return request.native?.provider === "gradle" ? fingerprint === null : typeof fingerprint === "string" && fingerprint.length > 0;
+}
 const ARTIFACT_NAME = {
 	ios: /^[^/]+\.app$/,
 	android: /^[^/]+\.apk$/,
@@ -1366,12 +1296,12 @@ const ARTIFACT_NAME = {
 * `RESUME_WINDOW_MS`, shorter than the machine's grace for a dropped connection, has passed. Returns why it
 * could not.
 */
-async function resumeJob(credential, job, abandoned) {
+async function resumeJob(credential, job, abandoned, signal, native) {
 	const deadline = Date.now() + RESUME_WINDOW_MS;
 	let delay = RESUME_DELAY_MS;
 	let last = "no attempt";
 	while (!abandoned()) {
-		const target = pinnedEndpoint$1(credential);
+		const target = await pinnedEndpoint$1(credential);
 		const connection = typeof target === "string" ? {
 			failure: target,
 			refused: false
@@ -1380,9 +1310,24 @@ async function resumeJob(credential, job, abandoned) {
 			if (connection.refused) return `the machine turned this Mac away (${connection.failure})`;
 			last = connection.failure;
 		} else {
+			if (abandoned()) {
+				connection.close();
+				break;
+			}
+			if (native && !connection.supports(NATIVE_BUILD_FEATURE[native])) {
+				connection.close();
+				return unsupportedNative(native);
+			}
 			const early = [];
 			connection.onProgress((event) => early.push(event));
+			const cancel = () => connection.close();
+			signal?.addEventListener("abort", cancel, { once: true });
 			const reply = await connection.request("build.attach", { job }, OFFER_TIMEOUT_MS);
+			signal?.removeEventListener("abort", cancel);
+			if (abandoned()) {
+				connection.close();
+				break;
+			}
 			if ("result" in reply) {
 				const outcome = isJsonObject(reply.result) ? reply.result.outcome : null;
 				return {
@@ -1398,17 +1343,18 @@ async function resumeJob(credential, job, abandoned) {
 			}
 			connection.drop();
 		}
-		if (Date.now() + delay > deadline) break;
-		await new Promise((resolve) => setTimeout(resolve, delay));
+		if (abandoned() || Date.now() + delay > deadline) break;
+		await setTimeout$1(delay, void 0, { signal }).catch(() => {});
 		delay = Math.min(delay * 2, RESUME_MAX_DELAY_MS);
 	}
 	return `no connection to it within ${RESUME_WINDOW_MS / 6e4} min (${last})`;
 }
 /** Mirrors the checkout on the machine: the manifest in pages, then every blob it lacks. */
-async function syncSource(connection, identity, onEnter) {
+async function syncSource(connection, identity, onEnter, native) {
 	onEnter("sync");
 	const syncStarted = Date.now();
-	const manifest = sourceManifest(identity.repoRoot);
+	const manifest = native && "declaration" in native ? nativeGradleTransfer(join(identity.repoRoot, identity.project), native.declaration).files : native ? nativeTransferManifest(identity.repoRoot, native, sourceManifest(identity.repoRoot)) : sourceManifest(identity.repoRoot);
+	if (native && "declaration" in native && manifestDigest(manifest) !== native.digest) return { failure: "The native Gradle source changed before upload." };
 	const bySha = new Map(manifest.map((file) => [file.sha256, file]));
 	const missing = [];
 	for (let index = 0; index < manifest.length || index === 0;) {
@@ -1452,12 +1398,20 @@ async function syncSource(connection, identity, onEnter) {
 		digest: manifestDigest(manifest)
 	};
 }
+function stagedArtifactEscapes(stagingDir, artifactPath, hasContents) {
+	if ((hasContents ? [artifactPath, join(artifactPath, "Contents")] : [artifactPath]).some((path) => lstatSync(path, { throwIfNoEntry: false })?.isSymbolicLink())) return true;
+	if (!existsSync(artifactPath)) return false;
+	const inside = relative(realpathSync(stagingDir), realpathSync(artifactPath));
+	return inside === ".." || inside.startsWith(`..${sep}`) || isAbsolute(inside);
+}
 /**
 * Builds on the chosen machine and brings the `.app` or `.apk` back into `stagingDir`, verified against the
 * sha256 the machine reports. The caller re-fingerprints and stores it.
 */
 async function offloadBuild({ choice, expectedFingerprint, request, stagingDir, onPhase, onEnter, onRecord, note }) {
 	const { identity } = choice;
+	const native = request.platform !== "macos" ? request.native : void 0;
+	let sourceDigest = null;
 	const started = Date.now();
 	const fail = (reason) => {
 		closeOffload(choice);
@@ -1467,23 +1421,38 @@ async function offloadBuild({ choice, expectedFingerprint, request, stagingDir,
 			reason: reason.split("\n")[0].slice(0, 300)
 		};
 	};
+	const signal = runCancellationSignal();
+	const throwIfCancelled = () => {
+		if (signal?.aborted) throw Object.assign(/* @__PURE__ */ new Error("The offloaded build was cancelled."), { code: "STIM_CANCELLED" });
+	};
+	let settle;
+	let settled = false;
+	const outcome = new Promise((resolve) => {
+		settle = (value) => {
+			settled = true;
+			resolve(value);
+		};
+	});
+	const cancel = () => {
+		settle({
+			ok: false,
+			code: "cancelled"
+		});
+		closeOffload(choice);
+	};
+	signal?.addEventListener("abort", cancel, { once: true });
 	try {
+		throwIfCancelled();
+		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.");
 		let job = null;
 		let early = [];
-		let settle;
-		let settled = false;
-		const outcome = new Promise((resolve) => {
-			settle = (value) => {
-				settled = true;
-				resolve(value);
-			};
-		});
 		let resuming = false;
 		const reattach = async (why) => {
 			if (resuming || settled) return;
 			resuming = true;
 			note(`offload: the connection to ${choice.machine} dropped (${why}); reattaching to the build there`);
-			const resumed = await resumeJob(choice.credential, job, () => settled);
+			const resumed = await resumeJob(choice.credential, job, () => settled, signal, native?.provider);
 			resuming = false;
 			if (settled) {
 				if (typeof resumed !== "string") resumed.connection.close();
@@ -1526,21 +1495,44 @@ async function offloadBuild({ choice, expectedFingerprint, request, stagingDir,
 			return true;
 		};
 		for (;;) {
-			const synced = await syncSource(choice.connection, identity, onEnter);
+			if (choice.automatic && !automaticMachineEnabled("build", choice.machine)) {
+				const reason = `${choice.machine} is disabled in remote.buildPoolDisabled`;
+				if (moveOn(reason)) continue;
+				return fail(reason);
+			}
+			if (native && !choice.connection.supports(NATIVE_BUILD_FEATURE[native.provider])) {
+				const reason = unsupportedNative(native.provider);
+				if (moveOn(reason)) continue;
+				return fail(reason);
+			}
+			const synced = await syncSource(choice.connection, identity, onEnter, nativeTransferInput(native));
+			throwIfCancelled();
 			if ("failure" in synced) {
 				if (moveOn(synced.failure)) continue;
 				return fail(synced.failure);
 			}
 			({syncMs, uploadedBytes} = synced);
+			sourceDigest = synced.digest;
 			onPhase("sync", `${synced.files} files, uploaded ${synced.uploaded} (${mb(uploadedBytes)}) in ${seconds(syncMs)}`);
 			workerStarted = Date.now();
 			early = [];
 			choice.connection.onProgress((event) => job === null ? early.push(event) : handle(event));
+			if (choice.automatic) requireAutomaticMachine("build", choice.machine);
+			throwIfCancelled();
 			const reply = await choice.connection.request("build.start", {
 				repo: identity.repo,
 				project: identity.project,
 				platform: request.platform,
 				fingerprint: request.platform === "macos" ? synced.digest : expectedFingerprint,
+				...native ? { native: {
+					provider: native.provider,
+					sourceDigest: synced.digest,
+					...native.provider === "xcode" ? {
+						cacheKey: native.cacheKey,
+						arch: native.arch,
+						parameters: native.snapshot.parameters
+					} : { inputs: native.transfer.declaration }
+				} } : {},
 				...request.platform === "macos" ? { macos: {
 					product: request.product,
 					infoPlist: request.infoPlist,
@@ -1550,6 +1542,7 @@ async function offloadBuild({ choice, expectedFingerprint, request, stagingDir,
 				} } : {
 					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,
@@ -1558,6 +1551,7 @@ async function offloadBuild({ choice, expectedFingerprint, request, stagingDir,
 				},
 				stimBuild: choice.target.local.stimBuild
 			});
+			throwIfCancelled();
 			if ("result" in reply) {
 				job = reply.result.job;
 				break;
@@ -1575,14 +1569,18 @@ async function offloadBuild({ choice, expectedFingerprint, request, stagingDir,
 		}), JOB_TIMEOUT_MS);
 		const result = await outcome;
 		clearTimeout(timer);
+		throwIfCancelled();
 		const { connection, machine } = choice;
 		connection.onProgress(null);
 		const workerMs = Date.now() - workerStarted;
 		if (result.ok !== true) return fail(`${String(result.code ?? "failed")}: ${String(result.message ?? "")}`);
+		if (native && (result.sourceDigest !== sourceDigest || result.fingerprint !== expectedFingerprint)) return fail("The worker returned a different native source or artifact identity.");
+		if (native?.provider === "gradle" && !ANDROID_PACKAGE.test(String(result.androidPackage ?? ""))) return fail("The worker returned no verified native APK package.");
 		const artifact = result.artifact;
 		const name = typeof artifact?.name === "string" ? artifact.name : "";
 		if (!ARTIFACT_NAME[request.platform].test(name) || typeof artifact.sha256 !== "string") return fail(`the machine reported no .${request.platform === "android" ? "apk" : "app"} artifact`);
 		onEnter("fetch");
+		throwIfCancelled();
 		const fetchStarted = Date.now();
 		rmSync(stagingDir, {
 			recursive: true,
@@ -1612,6 +1610,7 @@ async function offloadBuild({ choice, expectedFingerprint, request, stagingDir,
 		const fetched = await connection.request("build.artifact", { job }, 9e5);
 		connection.onBinary(null);
 		closeSync(fd);
+		throwIfCancelled();
 		const fetchFailure = replyError(fetched);
 		if (fetchFailure || !("result" in fetched)) return fail(`fetch: ${fetchFailure ?? "no reply"}`);
 		const digest = hash.digest("hex");
@@ -1624,8 +1623,10 @@ async function offloadBuild({ choice, expectedFingerprint, request, stagingDir,
 			"-C",
 			stagingDir
 		], { timeoutMs: 6e5 });
+		throwIfCancelled();
 		rmSync(archive, { force: true });
 		const artifactPath = join(stagingDir, name);
+		if (stagedArtifactEscapes(stagingDir, artifactPath, request.platform === "macos")) return fail(`fetch: ${machine} returned ${name} as or through a symbolic link or outside the staging directory`);
 		if (request.platform === "ios" && !existsSync(join(artifactPath, "Info.plist"))) return fail(`fetch: ${name} has no Info.plist`);
 		if (request.platform === "android" && !(lstatSync(artifactPath, { throwIfNoEntry: false })?.isFile() ?? false)) return fail(`fetch: ${name} is not a file`);
 		if (request.platform === "macos") {
@@ -1647,6 +1648,7 @@ async function offloadBuild({ choice, expectedFingerprint, request, stagingDir,
 				sha256: digest
 			} } : {},
 			compilationCache: request.platform === "ios" ? compilationActivity(result.compilationCache) : COMPILATION_CACHE_UNAVAILABLE,
+			...native?.provider === "gradle" ? { androidPackage: result.androidPackage } : {},
 			ccache: request.platform === "android" ? ccacheActivity(result.compilationCache) : CCACHE_UNAVAILABLE,
 			timings: {
 				offerMs: choice.offerMs,
@@ -1660,7 +1662,11 @@ async function offloadBuild({ choice, expectedFingerprint, request, stagingDir,
 			}
 		};
 	} catch (error) {
+		closeOffload(choice);
+		throwIfCancelled();
 		return fail(error.message.split("\n")[0] ?? String(error));
+	} finally {
+		signal?.removeEventListener("abort", cancel);
 	}
 }
 function packageName(projectRoot) {
@@ -1754,9 +1760,10 @@ function offloadCheck(projectRoot, targets) {
 		};
 		probe.connection.close();
 		resolved ??= targets();
+		const resolvedTargets = await resolved;
 		const problems = [];
-		for (const target of resolved) for (const problem of offerProblems(probe.offer, target)) {
-			const labeled = resolved.length > 1 && !SHARED_PROBLEMS.has(problem.code) ? {
+		for (const target of resolvedTargets) for (const problem of offerProblems(probe.offer, target)) {
+			const labeled = resolvedTargets.length > 1 && !SHARED_PROBLEMS.has(problem.code) ? {
 				...problem,
 				reason: `${PLATFORM_LABEL[target.platform]}: ${problem.reason}`
 			} : problem;
@@ -1769,4 +1776,4 @@ function offloadCheck(projectRoot, targets) {
 	};
 }
 //#endregion
-export { pinnedEndpoint$1 as C, parseMachine$1 as S, resolveBuildPlacement as _, offloadBuild as a, hostingMachines as b, placementLoad as c, setRemoteLogSink as d, OffloadRefusal as f, resolveBuildMachine as g, parseBuildMachineOption as h, closeOffload as i, remotePhaseText as l, namedBuildMachine as m, buildPlacementCandidates as n, offloadCheck as o, buildPlacementSettings as p, chooseBuildMachine as r, offloadPlacement as s, BuildConnection as t, simulatorRuntime as u, inspectBuildMachines as v, realIo as w, inspectDeviceHostMachines as x, configuredMachines as y };
+export { inspectDeviceHostMachines as C, hostingMachines as S, requireLocalBuild as _, nativeTransferRefusal as a, inspectBuildMachines as b, offloadPlacement as c, simulatorRuntime as d, setRemoteLogSink as f, parseBuildMachineOption as g, namedBuildMachine as h, closeOffload as i, placementLoad as l, buildPlacementSettings as m, buildPlacementCandidates as n, offloadBuild as o, OffloadRefusal as p, chooseBuildMachine as r, offloadCheck as s, BuildConnection as t, remotePhaseText as u, resolveBuildMachine as v, configuredMachines as x, resolveBuildPlacement as y };

package/dist/collector-run.d.mts

@@ -10,8 +10,18 @@ interface ExecOptions {
   omitEnv?: readonly string[];
   /** Text written to the child's stdin; `runFile` only. */
   input?: string;
+  /** `runFileAsync` only: called with the child right after it starts; a throw kills the child and rejects the call. */
+  onSpawn?: (child: ChildProcess) => void;
   /** `runFile` only: return stdout as written, without trimming surrounding whitespace. */
   untrimmed?: boolean;
+  /**
+   * `runFile` and `runFileAsync`: reject nonempty stderr even when the command exits successfully.
+   */
+  rejectStderr?: boolean;
+  /** `runFile` and `runFileAsync`: run in its own session with all stdio ignored and return ''; the child reports through a file, so a background process it leaves behind cannot hold a pipe open. */
+  detachedSilent?: boolean;
+  /** `runFile` and `runFileAsync`: exact values replaced with `***` in every string field of a thrown error, including message, stack, stdout, stderr and output. */
+  redact?: readonly string[];
 }
 interface Executor {
   run(cmd: string, opts?: ExecOptions): string;

package/dist/collector-run.mjs

@@ -1,12 +1,12 @@
 import { t as process_identity_exports } from "./process-identity-Biv3arCO.mjs";
+import { R as deviceSlotKey, W as validateDeviceSlot } from "./config-D0LhTY3S.mjs";
+import { w as workspaceLogsDir } from "./workspace-state-CSIFuuDa.mjs";
 import { t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { R as deviceSlotKey, W as validateDeviceSlot } from "./config-CgYMahz7.mjs";
-import { x as workspaceLogsDir } from "./workspace-state-C59dqG-Z.mjs";
-import { r as createNdjsonWriter } from "./ndjson-LGZAMsqa.mjs";
-import { a as startIosDeviceConsole, i as parseDeviceConsoleLine } from "./ios-device-Bn7jWDB1.mjs";
-import { a as unregisterCollector, i as registerCollector, r as readCollectors, t as collectorProcessTitle } from "./ownership-D6Se7gg_.mjs";
-import { a as waitForAppPid, i as startAndroidLogcat, n as parseLogcatLine, o as watchAppPid, t as androidClockOffset } from "./android-CBwCNicO.mjs";
-import { n as parseLogStreamLine, r as startIosLogStream, t as appNameFromBundleId } from "./ios-Bvbf0SGY.mjs";
+import { r as createNdjsonWriter } from "./ndjson-GOnbyvso.mjs";
+import { a as startIosDeviceConsole, i as parseDeviceConsoleLine } from "./ios-device-B1B14xND.mjs";
+import { a as unregisterCollector, i as registerCollector, r as readCollectors, t as collectorProcessTitle } from "./ownership-DXzMMSx6.mjs";
+import { a as waitForAppPid, i as startAndroidLogcat, n as parseLogcatLine, o as watchAppPid, t as androidClockOffset } from "./android-CK3fpEyZ.mjs";
+import { n as parseLogStreamLine, r as startIosLogStream, t as appNameFromBundleId } from "./ios-VGvNdsv2.mjs";
 import { existsSync } from "node:fs";
 import { isAbsolute, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";

package/dist/{command-output-CBtzyIgF.mjs → command-output-BjPN99ZB.mjs}

@@ -1,7 +1,7 @@
 import { n as stripAnsi } from "./process-output-Fpl8PYi8.mjs";
-import { t as NO_PROJECT_REFUSAL } from "./project-C3ChRLZy.mjs";
-import chalk from "chalk";
+import { t as NO_PROJECT_REFUSAL } from "./project-B8_duAzW.mjs";
 import { quotedPath as quotedPath$1 } from "@stim-cli/core";
+import chalk from "chalk";
 //#region src/diagnostics/launch-error-preview.ts
 function framePriority(frame, root) {
 	const normalized = frame.replaceAll("\\", "/");