stim 1.31.0 → 1.33.0

package/dist/android-image-DFk26aY6.mjs

@@ -0,0 +1,254 @@
+import { D as ownership_claim_exports, T as process_identity_exports, l as cancellableSleep, t as getExecutor } from "./exec-CGuDzt40.mjs";
+import { it as settingValueAt } from "./settings-B5IBDfTx.mjs";
+import { Q as pickDefaultSystemImage, d as androidToolPath, j as hostSystemImageArch, kt as recordInstalledSystemImageAsync, o as androidHome, z as listInstalledSystemImages } from "./android-Iq0M2t2d.mjs";
+import { createHash } from "node:crypto";
+import { existsSync, readFileSync, realpathSync, statfsSync } from "node:fs";
+import { isAbsolute, join } from "node:path";
+import { configDir } from "@stim-cli/core";
+//#region src/devices/android-image.ts
+const RECOMMENDED_ANDROID_API = 36;
+const IMAGE_INSTALL_FREE_BYTES = 8 * 1024 ** 3;
+const IMAGE_INSTALL_TIMEOUT_MS = 18e5;
+const CLAIM_POLL_MS = 2e3;
+const SYSTEM_IMAGE_PACKAGE = /^system-images;android-\d+;[^;\s]+;([^;\s]+)$/;
+const LICENSE_NOT_ACCEPTED = /license is not accepted|licenses or those of the packages they depend on were not accepted/i;
+function recommendedSystemImage(arch = hostSystemImageArch()) {
+	return `system-images;android-${RECOMMENDED_ANDROID_API};google_apis;${arch}`;
+}
+function androidImageInstallPolicy(settings) {
+	return settingValueAt(settings, "android.installImages") === "never" ? "never" : "auto";
+}
+function sdkmanagerCommand(args, env) {
+	const tool = androidToolPath("sdkmanager", process.platform, env);
+	return `${isAbsolute(tool) ? JSON.stringify(tool) : tool} ${args}`;
+}
+/**
+* Decides which system image an owned AVD uses: the requested one, else the newest installed image for the host, else
+* Stim's recommended image. An image that is not installed is installed only when the policy allows it and its ABI is
+* the host's.
+*/
+function decideSystemImage({ requested, installed, policy, hostArch = hostSystemImageArch(), env }) {
+	if (requested && installed.some((image) => image.pkg === requested)) return {
+		kind: "installed",
+		pkg: requested
+	};
+	const picked = requested ? null : pickDefaultSystemImage([...installed], { hostArch });
+	if (picked) return {
+		kind: "installed",
+		pkg: picked.pkg
+	};
+	const pkg = requested ?? recommendedSystemImage(hostArch);
+	const arch = SYSTEM_IMAGE_PACKAGE.exec(pkg)?.[1];
+	if (arch !== hostArch) return {
+		kind: "refuse",
+		code: "STIM_BAD_ARG",
+		message: arch ? `The Android system image "${pkg}" is not installed, and Stim installs only ${hostArch} images on this machine.` : `"${pkg}" is not an Android system image package id.`,
+		remedy: `Pass \`--system-image\` (or set android.systemImage) to an installed image, or to one Stim can install for ${hostArch} such as "${recommendedSystemImage(hostArch)}".`
+	};
+	if (policy === "never") return {
+		kind: "refuse",
+		code: requested ? "STIM_BAD_ARG" : "STIM_NO_DEVICE",
+		message: `${requested ? `The Android system image "${pkg}" is not installed` : `No ${hostArch} Android system image is installed`}, and android.installImages is never, so Stim does not install one.`,
+		remedy: `${requested ? "Pass `--system-image` (or set android.systemImage) to an installed image, run" : "Run"} \`${sdkmanagerCommand(`--install "${pkg}"`, env)}\` on this machine, or set android.installImages to auto, then try again.`
+	};
+	return {
+		kind: "install",
+		pkg
+	};
+}
+function freeBytes(path) {
+	try {
+		const disk = statfsSync(path);
+		return disk.bavail * disk.bsize;
+	} catch {
+		return null;
+	}
+}
+function licenseAccepted(sdk) {
+	try {
+		return readFileSync(join(sdk, "licenses", "android-sdk-license"), "utf8").trim().length > 0;
+	} catch {
+		return false;
+	}
+}
+function imageComplete(sdk, pkg) {
+	const directory = join(sdk, ...pkg.split(";"));
+	return existsSync(join(directory, "package.xml")) && !existsSync(join(directory, ".installer"));
+}
+function claimRoot(sdk) {
+	let canonical = sdk;
+	try {
+		canonical = realpathSync(sdk);
+	} catch {}
+	const key = createHash("sha256").update(canonical).digest("hex").slice(0, 16);
+	return join(configDir(), "android-sdk-installs", key);
+}
+function failureLine(text) {
+	const lines = text.split(/[\r\n]+/).map((line) => line.trim()).filter((line) => line && !line.startsWith("["));
+	return lines.find((line) => /^(Warning|Error):/.test(line)) ?? lines.at(-1) ?? "";
+}
+const gb = (bytes) => (bytes / 1024 ** 3).toFixed(1);
+const refuse = (message, remedy, code = "STIM_NO_DEVICE") => ({
+	ok: false,
+	code,
+	message,
+	remedy
+});
+function outputOf(error) {
+	const field = (name) => {
+		const value = error && typeof error === "object" ? Reflect.get(error, name) : void 0;
+		return typeof value === "string" ? value : "";
+	};
+	return `${field("stdout")}\n${field("stderr")}`;
+}
+/** Makes sure the system image an owned AVD needs is installed. `installed` is true when it was missing at the start of this call, whichever run installed it. */
+async function ensureSystemImage({ requested, policy, env, signal, note }) {
+	const decision = decideSystemImage({
+		requested,
+		installed: listInstalledSystemImages(void 0, env),
+		policy,
+		env
+	});
+	if (decision.kind === "refuse") return {
+		ok: false,
+		code: decision.code,
+		message: decision.message,
+		remedy: decision.remedy
+	};
+	if (decision.kind === "installed") return {
+		ok: true,
+		installed: false
+	};
+	const result = await installSystemImage({
+		pkg: decision.pkg,
+		env,
+		signal,
+		note
+	});
+	return result.ok ? {
+		ok: true,
+		installed: true
+	} : result;
+}
+const licensesRefusal = (pkg, sdk, env) => ({
+	code: "STIM_NO_DEVICE",
+	message: `The Android SDK licenses ${pkg} needs are not accepted in ${sdk}, and Stim does not accept them for you.`,
+	remedy: `Run \`${sdkmanagerCommand("--licenses", env)}\` on this machine and accept them, then try again.`
+});
+/** Why this machine cannot install `pkg` now, checked before any download: no sdkmanager, no accepted license, or too little disk. */
+function systemImageInstallProblem(pkg, env) {
+	const sdk = androidHome(env);
+	if (!isAbsolute(androidToolPath("sdkmanager", process.platform, env))) return {
+		code: "STIM_NO_DEVICE",
+		message: `The Android SDK command-line tools are not installed in ${sdk}, so Stim cannot install ${pkg}.`,
+		remedy: "Install \"Android SDK Command-line Tools (latest)\" from the SDK Manager in Android Studio, then try again."
+	};
+	if (!licenseAccepted(sdk)) return licensesRefusal(pkg, sdk, env);
+	const free = freeBytes(sdk);
+	if (free !== null && free < IMAGE_INSTALL_FREE_BYTES) return {
+		code: "STIM_NO_DEVICE",
+		message: `${gb(free)} GB free on the volume of ${sdk}, needs ${gb(IMAGE_INSTALL_FREE_BYTES)} GB to download and unpack ${pkg}.`,
+		remedy: `Free space on that volume (\`stim gc\` lists what Stim can reclaim), or run \`${sdkmanagerCommand(`--install "${pkg}"`, env)}\` yourself, then try again.`
+	};
+	return null;
+}
+/**
+* Installs one system image with the SDK's own sdkmanager, never accepting a license for the user. One install runs per
+* SDK root and Stim home: a second caller waits for the first and returns without installing when the image is there.
+*/
+async function installSystemImage({ pkg, env, signal, note }) {
+	const sdk = androidHome(env);
+	const tool = androidToolPath("sdkmanager", process.platform, env);
+	const manual = sdkmanagerCommand(`--install "${pkg}"`, env);
+	const licenses = () => ({
+		ok: false,
+		...licensesRefusal(pkg, sdk, env)
+	});
+	const root = claimRoot(sdk);
+	let claim;
+	let waited = false;
+	while (!claim) {
+		try {
+			claim = (0, ownership_claim_exports.tryAcquireClaim)({
+				root,
+				mode: "exclusive",
+				details: {
+					sdk,
+					package: pkg
+				},
+				label: "Android system image install"
+			}).acquired;
+		} catch (error) {
+			const failure = (0, ownership_claim_exports.claimFailure)(error, null);
+			if (failure) return refuse(failure.message, failure.remedy, failure.code);
+			throw error;
+		}
+		if (claim) break;
+		if (!waited) note(`waiting for another Stim process that installs an Android system image in ${sdk}`);
+		waited = true;
+		await cancellableSleep(CLAIM_POLL_MS, {
+			signal,
+			what: "wait for the Android system image install"
+		});
+	}
+	const held = claim;
+	let unresolved = false;
+	try {
+		if (imageComplete(sdk, pkg)) return {
+			ok: true,
+			installed: false
+		};
+		const problem = systemImageInstallProblem(pkg, env);
+		if (problem) return {
+			ok: false,
+			...problem
+		};
+		note(`installing ${pkg} with sdkmanager (about 2 GB)`);
+		let output;
+		(0, ownership_claim_exports.markClaimChildPending)(held);
+		try {
+			output = await getExecutor().runFileAsync(tool, [
+				`--sdk_root=${sdk}`,
+				"--install",
+				pkg
+			], {
+				timeoutMs: IMAGE_INSTALL_TIMEOUT_MS,
+				input: "n\n",
+				signal,
+				containProcessTree: true,
+				onSpawn: (child) => {
+					if (child.pid === void 0) return;
+					const captured = (0, process_identity_exports.captureProcessIdentity)(child.pid);
+					if (!captured.ok) throw new Error(`Cannot record the sdkmanager process: ${captured.reason}`);
+					(0, ownership_claim_exports.setClaimChild)(held, {
+						pid: child.pid,
+						processToken: captured.token
+					});
+				}
+			});
+		} catch (error) {
+			if (error instanceof Error && "reportCleanup" in error) {
+				unresolved = true;
+				throw error;
+			}
+			signal?.throwIfAborted();
+			const text = outputOf(error);
+			if (LICENSE_NOT_ACCEPTED.test(text)) return licenses();
+			return refuse(`sdkmanager could not install ${pkg}: ${failureLine(text) || (error instanceof Error ? error.message : String(error))}`, `Run \`${manual}\` on this machine to see the full error, then try again.`);
+		} finally {
+			if (!unresolved) (0, ownership_claim_exports.clearClaimChild)(held);
+		}
+		if (LICENSE_NOT_ACCEPTED.test(output)) return licenses();
+		const directory = join(sdk, ...pkg.split(";"));
+		if (!imageComplete(sdk, pkg)) return refuse(`sdkmanager finished without installing ${pkg}: ${failureLine(output) || "it printed no error"}`, `Run \`${manual}\` on this machine to see the full output, then try again.`);
+		await recordInstalledSystemImageAsync(realpathSync(directory));
+		return {
+			ok: true,
+			installed: true
+		};
+	} finally {
+		if (!unresolved) (0, ownership_claim_exports.releaseClaim)(held);
+	}
+}
+//#endregion
+export { systemImageInstallProblem as a, installSystemImage as i, decideSystemImage as n, ensureSystemImage as r, androidImageInstallPolicy as t };

package/dist/{android-project-CCEQyYJK.d.mts → android-project-BDlPnfmL.d.mts}

@@ -3,9 +3,9 @@ import { r as createNdjsonWriter } from "./exec-DnYc4HGH.mjs";
 import { readFileSync, writeFileSync } from "node:fs";
 import { StimContext, hostSimulatorArch } from "@stim-cli/core";
 import { ANDROID_EMULATOR_APPS, BuildPhase, BuildPlanPayload, Endpoint, RunEstimates, SettingScope, WebViewport, machineCapacity } from "@stim-cli/core/state";
-import "@stim-cli/core/noise-session";
 import { readFileSync as readFileSync$1 } from "fs";
 import { Command } from "commander";
+import "@stim-cli/core/noise-session";
 import "@expo/fingerprint";
 import { CacheProviderConfig, loadCacheProvider } from "@stim-cli/cache";
 import { BuildReactNativeArtifactQuery, BuildSwiftpmArtifactQuery, GradleOffloadInputs, HelloResult, RemoteDiagnosis } from "@stim-cli/core/protocol";

package/dist/api.d.mts

@@ -1,4 +1,4 @@
-import { _ as CompilationCacheActivity, a as BuildMachinesInspection, c as TailnetMachineIo, d as BudgetReport, f as DoctorPlatform, g as CcacheActivity, h as AndroidFacts, n as WebLaunched, o as GeneratedTickets, p as Finding, s as KeyConfirmer, v as IosFacts } from "./android-project-CCEQyYJK.mjs";
+import { _ as CompilationCacheActivity, a as BuildMachinesInspection, c as TailnetMachineIo, d as BudgetReport, f as DoctorPlatform, g as CcacheActivity, h as AndroidFacts, n as WebLaunched, o as GeneratedTickets, p as Finding, s as KeyConfirmer, v as IosFacts } from "./android-project-BDlPnfmL.mjs";
 import { a as WorkspaceLaunchPlatform } from "./ios-CDvlmUs7.mjs";
 import "./exec-DnYc4HGH.mjs";
 import "./pull-request-eODyIqZF.mjs";
@@ -776,6 +776,7 @@ interface InventorySystemImage {
   package: string;
   directory: string;
   avdCount: number;
+  stimInstalled: boolean;
   command: string;
 }
 interface GcInventory {

package/dist/api.mjs

@@ -1,32 +1,32 @@
-import { D as ownership_claim_exports, T as trackReportResource, b as operationState, c as throwIfCancelled, l as WorkspaceProcessCleanupError, s as cancelledError, w as runReport } from "./exec-aULwtNly.mjs";
-import { E as workspaceDir, a as recordWorkspaceUseAsync, k as workspaceLogsDir$1, v as ensureWorkspaceStorageAsync } from "./workspace-state-3bF4TB8P.mjs";
-import { D as upsertProject, J as validateDeviceSlot, b as refuseRelativeStimPaths, k as withConfigLockAsync$1, m as getProject } from "./config-D5qNWJEP.mjs";
-import { l as phaseLine } from "./command-output-VrXd6qPX.mjs";
-import { Vt as repoRootAsync, Z as resolveProjectSettingsAsync, _ as inertSettingWarning, a as SETTING_SHAPE_REMEDY, p as cacheProviderSettingError, rt as settingShapeErrors, st as unknownSettingKeys } from "./settings-C6UTYW2K.mjs";
-import { c as projectProblem, f as projectRegistry, i as findProjectRoot$1, r as findCommandWorkspaceAsync, t as NO_PROJECT_REFUSAL } from "./project-DCLkDM8C.mjs";
-import { n as macosDir } from "./state-CiflgxTP.mjs";
-import { c as ensureHomeIdentity, s as workspaceShareURL } from "./stim-desktop-1XxET4S8.mjs";
+import { C as operationState, D as ownership_claim_exports, a as trackReportResource, d as throwIfCancelled, f as WorkspaceProcessCleanupError, i as runReport, u as cancelledError } from "./exec-CGuDzt40.mjs";
+import { E as workspaceDir, a as recordWorkspaceUseAsync, k as workspaceLogsDir$1, v as ensureWorkspaceStorageAsync } from "./workspace-state-BdZ-QgmB.mjs";
+import { l as phaseLine } from "./command-output-DWI9tGPU.mjs";
+import { D as upsertProject, _t as validateDeviceSlot, b as refuseRelativeStimPaths, k as withConfigLockAsync$1, m as getProject } from "./config-BW0fAtoK.mjs";
+import { Vt as repoRootAsync, Z as resolveProjectSettingsAsync, _ as inertSettingWarning, a as SETTING_SHAPE_REMEDY, p as cacheProviderSettingError, rt as settingShapeErrors, st as unknownSettingKeys } from "./settings-B5IBDfTx.mjs";
+import { c as projectProblem, f as projectRegistry, i as findProjectRoot$1, r as findCommandWorkspaceAsync, t as NO_PROJECT_REFUSAL } from "./project-DWEXiBA9.mjs";
+import { n as macosDir } from "./state-DSOUqO-o.mjs";
+import { c as ensureHomeIdentity, s as workspaceShareURL } from "./stim-desktop-_WTria-r.mjs";
 import { i as createNdjsonWriter } from "./ndjson-CrjIsGzw.mjs";
-import { $ as tapBuildLog, Q as startBuildProgress, X as recordFinishedBuild, tt as errorRemedy } from "./workspaces-BNEyJ1B_.mjs";
-import { ct as withNativeBuildRun, st as runCancellationSignal } from "./toolchain-CGdgD4x4.mjs";
-import { d as resolveBuildPlacement } from "./selection-C95m--1_.mjs";
-import { c as stopWorkspaceNow } from "./stop-WyrZQuX6.mjs";
-import { r as runReload } from "./reload-B-d7-CsI.mjs";
-import { m as warmWorktreeTarget, p as removeWorktreeTarget } from "./worktree-BTrii9e_.mjs";
-import { i as restoreLightenedDependencies } from "./lightened-DZ9Ip0T3.mjs";
-import { c as startDevServer } from "./start-LSwIFlBv.mjs";
-import { s as recordDoctorCheck } from "./doctor-watchman-DJY550yz.mjs";
-import { c as readSettingsPayload, s as readSettingsContext, t as SettingsRefusal } from "./settings-payload-zf5EnCTg.mjs";
-import { a as readDoctorReport } from "./doctor-BGcsAgAV.mjs";
-import { i as readGcReport, n as executeGc, o as withGcMaintenanceClaim } from "./gc-B0K4d_PL.mjs";
-import { r as readWorkspaceLogs, t as followWorkspaceLogs } from "./logs-C-hfMsxK.mjs";
-import { t as readProjectStats } from "./stats-report-B86Cv7Uc.mjs";
-import { n as buildAndroidOperation, t as buildIosOperation } from "./build-BpFFbdXD.mjs";
-import { a as readAndroidBuildPlan, i as runAndroidOperation } from "./android-DhiWSOFU.mjs";
-import { i as readIosBuildPlan, r as runIosOperation } from "./ios-DUL68MI5.mjs";
-import { a as buildMacosBundle, i as planMacos, n as runMacos } from "./macos-DZ9ZSolN.mjs";
-import { t as runWeb } from "./web-BE89ONcc.mjs";
-import { t as mutateSetting } from "./settings-write-Fe0K6BeC.mjs";
+import { $ as tapBuildLog, Q as startBuildProgress, X as recordFinishedBuild, tt as errorRemedy } from "./workspaces-B3ahAHZc.mjs";
+import { ct as withNativeBuildRun, st as runCancellationSignal } from "./toolchain-s5ZmG42Z.mjs";
+import { d as resolveBuildPlacement } from "./selection-xS50Mt0V.mjs";
+import { c as stopWorkspaceNow } from "./stop-BVI2-L7s.mjs";
+import { r as runReload } from "./reload-DsOByDfy.mjs";
+import { m as warmWorktreeTarget, p as removeWorktreeTarget } from "./worktree-BhsML6GV.mjs";
+import { i as restoreLightenedDependencies } from "./lightened-Cv4ToJRX.mjs";
+import { c as startDevServer } from "./start-BsEV4S-s.mjs";
+import { s as recordDoctorCheck } from "./doctor-watchman-CDhpC3Oh.mjs";
+import { c as readSettingsPayload, s as readSettingsContext, t as SettingsRefusal } from "./settings-payload-BIGGQ3or.mjs";
+import { a as readDoctorReport } from "./doctor-9GrW5YSP.mjs";
+import { i as readGcReport, n as executeGc, o as withGcMaintenanceClaim } from "./gc-DolXpMSB.mjs";
+import { r as readWorkspaceLogs, t as followWorkspaceLogs } from "./logs-DCQ3_tGS.mjs";
+import { t as readProjectStats } from "./stats-report-BVRCqwWA.mjs";
+import { n as buildAndroidOperation, t as buildIosOperation } from "./build-DFBGWOTc.mjs";
+import { a as readAndroidBuildPlan, i as runAndroidOperation } from "./android-BL-QqHjc.mjs";
+import { i as readIosBuildPlan, r as runIosOperation } from "./ios-dbXzjTxx.mjs";
+import { a as buildMacosBundle, i as planMacos, n as runMacos } from "./macos-Ch7vuM-G.mjs";
+import { t as runWeb } from "./web-DwYCTFdh.mjs";
+import { t as mutateSetting } from "./settings-write-D85j8mej.mjs";
 import { randomBytes } from "node:crypto";
 import { mkdirSync, mkdtempSync, readFileSync, realpathSync, rmSync } from "node:fs";
 import { stripVTControlCharacters } from "node:util";

package/dist/{apk-signed-tail-B9Usseps.mjs → apk-signed-tail-CPpA-3vu.mjs}

@@ -1,5 +1,5 @@
-import { y as sharedBuildCache } from "./workspace-state-3bF4TB8P.mjs";
-import { O as findBuildTool } from "./android-DsEj2CCs.mjs";
+import { y as sharedBuildCache } from "./workspace-state-BdZ-QgmB.mjs";
+import { O as findBuildTool } from "./android-Iq0M2t2d.mjs";
 import { createHash, randomUUID } from "node:crypto";
 import { closeSync, fstatSync, openSync, readFileSync, readSync, realpathSync, renameSync, rmSync } from "node:fs";
 import { basename, dirname, join } from "node:path";

package/dist/{artifact-ta3xA0c4.mjs → artifact-BMjubIP2.mjs}

@@ -1,16 +1,16 @@
-import { D as ownership_claim_exports, c as throwIfCancelled, x as withDrainingCancellation } from "./exec-aULwtNly.mjs";
-import { E as workspaceDir } from "./workspace-state-3bF4TB8P.mjs";
-import { _ as stepTimer, i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-VrXd6qPX.mjs";
-import { Dn as RESOLVE_TIMEOUT_MS, Mn as isEasAuthFailureText, jn as easAuthNote, n as CCACHE_UNAVAILABLE, r as ccacheActivityLine, t as CCACHE_NOT_RUN } from "./ccache-DVDO2ocE.mjs";
-import { $ as cancelledFailure, st as runCancellationSignal } from "./toolchain-CGdgD4x4.mjs";
-import { b as providerDownloadPath, y as prepareProviderDownloadDir } from "./build-cache-BsKim4V7.mjs";
-import { c as offloadPlacement, i as closeOffload, l as placementLoad, n as buildPlacementCandidates, o as offloadBuild, r as chooseBuildMachine, u as remotePhaseText } from "./client-DhJOvSvh.mjs";
-import { a as missingPackageManagerRemedy, i as fingerprintMismatchRemedy, l as requireLocalBuild, n as automaticBuild, o as namedBuildMachine, t as OffloadRefusal } from "./selection-C95m--1_.mjs";
-import { f as formatDiagnostic } from "./react-native-build-vK2lFYfN.mjs";
-import { u as skippedMissReason } from "./prebuild-D0hvmO4j.mjs";
-import { t as buildPlacementRecord } from "./placement-log-CFT8SnlS.mjs";
-import { n as settleArtifactUploads, t as acquireArtifact } from "./acquire-artifact-P84h3ssa.mjs";
-import { a as PLATFORM, h as displayPath } from "./support-Cffz6_Ft.mjs";
+import { D as ownership_claim_exports, d as throwIfCancelled, w as withDrainingCancellation } from "./exec-CGuDzt40.mjs";
+import { E as workspaceDir } from "./workspace-state-BdZ-QgmB.mjs";
+import { _ as stepTimer, i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-DWI9tGPU.mjs";
+import { Dn as RESOLVE_TIMEOUT_MS, Mn as isEasAuthFailureText, jn as easAuthNote, n as CCACHE_UNAVAILABLE, r as ccacheActivityLine, t as CCACHE_NOT_RUN } from "./ccache-BXtzEL6M.mjs";
+import { $ as cancelledFailure, st as runCancellationSignal } from "./toolchain-s5ZmG42Z.mjs";
+import { b as prepareProviderDownloadDir, x as providerDownloadPath } from "./build-cache-Cqj4FGnX.mjs";
+import { c as offloadPlacement, i as closeOffload, l as placementLoad, n as buildPlacementCandidates, o as offloadBuild, r as chooseBuildMachine, u as remotePhaseText } from "./client-0_Mnfz0a.mjs";
+import { a as missingPackageManagerRemedy, i as fingerprintMismatchRemedy, l as requireLocalBuild, n as automaticBuild, o as namedBuildMachine, t as OffloadRefusal } from "./selection-xS50Mt0V.mjs";
+import { f as formatDiagnostic } from "./react-native-build-DaPfzf_e.mjs";
+import { u as skippedMissReason } from "./prebuild-Bhs7TTcz.mjs";
+import { t as buildPlacementRecord } from "./placement-log-nnGnu8mo.mjs";
+import { n as settleArtifactUploads, t as acquireArtifact } from "./acquire-artifact-DTh_LxrE.mjs";
+import { a as PLATFORM, h as displayPath } from "./support-CqyWfZZI.mjs";
 import { t as AndroidRecipeRefusal } from "./android-project-BCAAmMwz.mjs";
 import { rmSync } from "node:fs";
 import { join } from "node:path";

package/dist/{artifact-Cr34-Yyy.mjs → artifact-BufzdGbT.mjs}

@@ -1,16 +1,16 @@
-import { D as ownership_claim_exports, c as throwIfCancelled, x as withDrainingCancellation } from "./exec-aULwtNly.mjs";
-import { E as workspaceDir } from "./workspace-state-3bF4TB8P.mjs";
-import { _ as stepTimer, i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-VrXd6qPX.mjs";
-import { Dn as RESOLVE_TIMEOUT_MS, Mn as isEasAuthFailureText, jn as easAuthNote } from "./ccache-DVDO2ocE.mjs";
-import { $ as cancelledFailure, A as COMPILATION_CACHE_NOT_RUN, F as compilationCacheActivityLine, st as runCancellationSignal } from "./toolchain-CGdgD4x4.mjs";
-import { T as storedAppId, b as providerDownloadPath, x as providerUploadOutcome, y as prepareProviderDownloadDir } from "./build-cache-BsKim4V7.mjs";
-import { C as COMPILATION_CACHE_CORRUPT, c as offloadPlacement, i as closeOffload, l as placementLoad, n as buildPlacementCandidates, o as offloadBuild, r as chooseBuildMachine, s as offloadCheck, u as remotePhaseText, w as clearCorruptCompilationCache } from "./client-DhJOvSvh.mjs";
-import { a as missingPackageManagerRemedy, c as podsFailedRemedy, h as predictedRefusal, i as fingerprintMismatchRemedy, l as requireLocalBuild, n as automaticBuild, o as namedBuildMachine, t as OffloadRefusal } from "./selection-C95m--1_.mjs";
-import { S as xcodeFailureReport, p as printDiagnostics } from "./support-Cs24xRQa.mjs";
-import { f as settleFingerprintCheck, u as skippedMissReason } from "./prebuild-D0hvmO4j.mjs";
-import { t as buildPlacementRecord } from "./placement-log-CFT8SnlS.mjs";
-import { n as settleArtifactUploads, t as acquireArtifact } from "./acquire-artifact-P84h3ssa.mjs";
-import { r as finishIosUpload, t as IosRecipeRefusal } from "./ios-project-Br1tVYWX.mjs";
+import { D as ownership_claim_exports, d as throwIfCancelled, w as withDrainingCancellation } from "./exec-CGuDzt40.mjs";
+import { E as workspaceDir } from "./workspace-state-BdZ-QgmB.mjs";
+import { _ as stepTimer, i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-DWI9tGPU.mjs";
+import { Dn as RESOLVE_TIMEOUT_MS, Mn as isEasAuthFailureText, jn as easAuthNote } from "./ccache-BXtzEL6M.mjs";
+import { $ as cancelledFailure, A as COMPILATION_CACHE_NOT_RUN, F as compilationCacheActivityLine, st as runCancellationSignal } from "./toolchain-s5ZmG42Z.mjs";
+import { E as storedAppId, S as providerUploadOutcome, b as prepareProviderDownloadDir, x as providerDownloadPath } from "./build-cache-Cqj4FGnX.mjs";
+import { C as COMPILATION_CACHE_CORRUPT, c as offloadPlacement, i as closeOffload, l as placementLoad, n as buildPlacementCandidates, o as offloadBuild, r as chooseBuildMachine, s as offloadCheck, u as remotePhaseText, w as clearCorruptCompilationCache } from "./client-0_Mnfz0a.mjs";
+import { a as missingPackageManagerRemedy, c as podsFailedRemedy, h as predictedRefusal, i as fingerprintMismatchRemedy, l as requireLocalBuild, n as automaticBuild, o as namedBuildMachine, t as OffloadRefusal } from "./selection-xS50Mt0V.mjs";
+import { S as xcodeFailureReport, p as printDiagnostics } from "./support-D8OH0z98.mjs";
+import { f as settleFingerprintCheck, u as skippedMissReason } from "./prebuild-Bhs7TTcz.mjs";
+import { t as buildPlacementRecord } from "./placement-log-nnGnu8mo.mjs";
+import { n as settleArtifactUploads, t as acquireArtifact } from "./acquire-artifact-DTh_LxrE.mjs";
+import { r as finishIosUpload, t as IosRecipeRefusal } from "./ios-project-BzfLigfh.mjs";
 import { rmSync } from "node:fs";
 import { join } from "node:path";
 import { machineCapacity } from "@stim-cli/core/state";
@@ -455,15 +455,28 @@ async function acquireIosArtifact({ context, root, logFile, recipe, physical, co
 		let stored = null;
 		let reason = outcome.ok ? null : outcome.reason;
 		if (outcome.ok) {
+			const rekeyed = outcome.builtFingerprint ? recipe.offload?.rekeyed?.(outcome.builtFingerprint) : void 0;
 			if (!await recipe.offload.unchanged()) reason = "the checkout here changed while it built";
-			else try {
-				stored = await recipe.cache().store({
-					...cacheTarget(storeKey),
-					sourcePath: outcome.artifactPath,
-					overwrite: !useBuildCache
-				}) ?? null;
-			} catch (e) {
-				reason = `could not store the app: ${e?.message || e}`;
+			else {
+				if (rekeyed) {
+					note(chalk.dim(phaseLine("fingerprint", `${shortHash(storeHash)} -> ${shortHash(rekeyed.hash)} (as ${outcome.machine} built it)`)));
+					storeHash = rekeyed.hash;
+					storeKey = rekeyed.key;
+					buildFailure = {
+						...buildFailure,
+						fingerprint: storeHash,
+						cacheKey: storeKey
+					};
+				}
+				try {
+					stored = await recipe.cache().store({
+						...cacheTarget(storeKey),
+						sourcePath: outcome.artifactPath,
+						overwrite: !useBuildCache
+					}) ?? null;
+				} catch (e) {
+					reason = `could not store the app: ${e?.message || e}`;
+				}
 			}
 		}
 		try {

package/dist/{artifact-platform-BO2Uvk_A.mjs → artifact-platform-DqCWUieN.mjs}

@@ -1,4 +1,4 @@
-import { t as getExecutor } from "./exec-aULwtNly.mjs";
+import { t as getExecutor } from "./exec-CGuDzt40.mjs";
 import { join } from "node:path";
 //#region src/macos/artifact-platform.ts
 async function validateMacosArtifactPlatform(context, bundle, product, signal, nodeArch = process.arch) {

package/dist/{auto-placement-DtTRG0rk.mjs → auto-placement-D7P98glJ.mjs}

@@ -1,11 +1,11 @@
-import { m as getProject, v as loadConfig$1 } from "./config-D5qNWJEP.mjs";
-import { m as peekBudget } from "./ccache-DVDO2ocE.mjs";
-import { z as readHostMemoryPressureAsync } from "./ios-CdAV4-1E.mjs";
-import { _ as hostingMachines, o as namedBuildMachine, u as resolveBuildMachine } from "./selection-C95m--1_.mjs";
-import { c as call, l as connectHost, m as requireHostedAppMode } from "./hosted-client-5ur3YpxY.mjs";
-import { c as writeHostedNativeAsync, r as readHostedNative } from "./ios-state-BEIJRJ7P.mjs";
-import { i as prepareHostedNative } from "./hosted-native-kaR4nUHk.mjs";
-import { d as peekDeviceSlots, t as DEFAULT_DEVICE_SLOT_WAIT_MS } from "./device-capacity-Du5wBTNJ.mjs";
+import { m as getProject, v as loadConfig$1 } from "./config-BW0fAtoK.mjs";
+import { m as peekBudget } from "./ccache-BXtzEL6M.mjs";
+import { z as readHostMemoryPressureAsync } from "./ios-BdZdNsAj.mjs";
+import { _ as hostingMachines, o as namedBuildMachine, u as resolveBuildMachine } from "./selection-xS50Mt0V.mjs";
+import { h as requireHostedAppMode, l as call, u as connectHost } from "./hosted-client-D19Lv0tg.mjs";
+import { c as writeHostedNativeAsync, r as readHostedNative } from "./ios-state-CWsBysyN.mjs";
+import { i as prepareHostedNative } from "./hosted-native-BzXIy97W.mjs";
+import { d as peekDeviceSlots, t as DEFAULT_DEVICE_SLOT_WAIT_MS } from "./device-capacity-BAkETfIl.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";
@@ -169,6 +169,7 @@ async function probeHost(machine, platform, selectors, appMode, signal) {
 		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");
+		const installImage = parsed?.platform === "android" ? parsed.installImage : void 0;
 		return {
 			probe: {
 				machine,
@@ -188,7 +189,8 @@ async function probeHost(machine, platform, selectors, appMode, signal) {
 			...choice && ("runtime" in choice || "systemImage" in choice) ? { target: {
 				host,
 				choice,
-				session: null
+				session: null,
+				...installImage ? { installImage } : {}
 			} } : {}
 		};
 	} catch (error) {

package/dist/{browser-web-DuULNZrS.mjs → browser-web-C74et-Nv.mjs}

@@ -1,20 +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-aULwtNly.mjs";
-import { E as workspaceDir, k as workspaceLogsDir$1, l as withWorkspaceStateLockAsync, r as readWorkspaceState$1 } from "./workspace-state-3bF4TB8P.mjs";
-import { m as getProject } from "./config-D5qNWJEP.mjs";
-import { l as phaseLine } from "./command-output-VrXd6qPX.mjs";
-import { N as metroPortSetting, a as SETTING_SHAPE_REMEDY, ct as webSettings } from "./settings-C6UTYW2K.mjs";
-import { b as isPackageResolvable, v as detectIsExpo } from "./project-DCLkDM8C.mjs";
-import { d as resolveProjectMetro } from "./metro-mKHEMO-a.mjs";
+import { D as ownership_claim_exports, T as process_identity_exports, d as throwIfCancelled, f as WorkspaceProcessCleanupError, p as withWorkspaceProcessLock, t as getExecutor, u as cancelledError } from "./exec-CGuDzt40.mjs";
+import { E as workspaceDir, k as workspaceLogsDir$1, l as withWorkspaceStateLockAsync, r as readWorkspaceState$1 } from "./workspace-state-BdZ-QgmB.mjs";
+import { l as phaseLine } from "./command-output-DWI9tGPU.mjs";
+import { m as getProject } from "./config-BW0fAtoK.mjs";
+import { N as metroPortSetting, a as SETTING_SHAPE_REMEDY, ct as webSettings } from "./settings-B5IBDfTx.mjs";
+import { b as isPackageResolvable, v as detectIsExpo } from "./project-DWEXiBA9.mjs";
+import { d as resolveProjectMetro } from "./metro-B5PVz0Wv.mjs";
 import { c as readNdjsonGenerations$1 } from "./ndjson-CrjIsGzw.mjs";
-import { Wt as readMetroRecords } from "./ccache-DVDO2ocE.mjs";
-import { f as webLogFile, m as webSupervisorLogFile, o as readWebRecord, s as updateWebRecord } from "./state-CM_HvvkS.mjs";
-import { ft as teardownBrowserHeld, x as resolveSupervisorTarget } from "./workspaces-BNEyJ1B_.mjs";
-import { i as reserveBrowserPort, n as getNamedPort } from "./named-ports-B0hCk2v-.mjs";
-import { n as sendToOwnedPage, t as liveWebRecord } from "./page-CQJlcj3x.mjs";
-import { o as resolveWorkspaceMetroPort } from "./start-LSwIFlBv.mjs";
+import { Wt as readMetroRecords } from "./ccache-BXtzEL6M.mjs";
+import { f as webLogFile, m as webSupervisorLogFile, o as readWebRecord, s as updateWebRecord } from "./state-CtmYTRWm.mjs";
+import { ft as teardownBrowserHeld, x as resolveSupervisorTarget } from "./workspaces-B3ahAHZc.mjs";
+import { i as reserveBrowserPort, n as getNamedPort } from "./named-ports-CA0nB9Yw.mjs";
+import { n as sendToOwnedPage, t as liveWebRecord } from "./page-Dj8IqvGM.mjs";
+import { o as resolveWorkspaceMetroPort } from "./start-BsEV4S-s.mjs";
 import { t as spawnEntry } from "./spawn-entry-jw19m8Nl.mjs";
-import { n as windowsLauncherArgs } from "./detached-entry-BPlSaCwC.mjs";
-import { a as findChrome, t as CHROME_INSTALL_REMEDY } from "./chrome-DyDWurWG.mjs";
+import { n as windowsLauncherArgs } from "./detached-entry-tfrgGVWb.mjs";
+import { a as findChrome, t as CHROME_INSTALL_REMEDY } from "./chrome-C8sC5tdl.mjs";
 import { randomUUID } from "node:crypto";
 import { mkdirSync, openSync, statSync, watch } from "node:fs";
 import { ambientEnv } from "@stim-cli/core";

package/dist/{build-BpFFbdXD.mjs → build-DFBGWOTc.mjs}

@@ -1,28 +1,28 @@
-import { c as throwIfCancelled, s as cancelledError, x as withDrainingCancellation } from "./exec-aULwtNly.mjs";
-import { E as workspaceDir, a as recordWorkspaceUseAsync, k as workspaceLogsDir } from "./workspace-state-3bF4TB8P.mjs";
-import { D as upsertProject, k as withConfigLockAsync, m as getProject, u as getConcurrencyLimits } from "./config-D5qNWJEP.mjs";
-import { l as phaseLine } from "./command-output-VrXd6qPX.mjs";
-import { J as resolveCacheProviderConfig, Z as resolveProjectSettingsAsync, a as SETTING_SHAPE_REMEDY } from "./settings-C6UTYW2K.mjs";
-import { f as projectRegistry, v as detectIsExpo } from "./project-DCLkDM8C.mjs";
-import { s as workspaceShareURL } from "./stim-desktop-1XxET4S8.mjs";
-import { j as hostSystemImageArch } from "./android-DsEj2CCs.mjs";
+import { d as throwIfCancelled, u as cancelledError, w as withDrainingCancellation } from "./exec-CGuDzt40.mjs";
+import { E as workspaceDir, a as recordWorkspaceUseAsync, k as workspaceLogsDir } from "./workspace-state-BdZ-QgmB.mjs";
+import { l as phaseLine } from "./command-output-DWI9tGPU.mjs";
+import { D as upsertProject, k as withConfigLockAsync, m as getProject, u as getConcurrencyLimits } from "./config-BW0fAtoK.mjs";
+import { J as resolveCacheProviderConfig, Z as resolveProjectSettingsAsync, a as SETTING_SHAPE_REMEDY } from "./settings-B5IBDfTx.mjs";
+import { f as projectRegistry, v as detectIsExpo } from "./project-DWEXiBA9.mjs";
+import { s as workspaceShareURL } from "./stim-desktop-_WTria-r.mjs";
+import { j as hostSystemImageArch } from "./android-Iq0M2t2d.mjs";
 import { i as createNdjsonWriter } from "./ndjson-CrjIsGzw.mjs";
-import { An as checkEasAuth, Rn as resolveRemote, zn as uploadRemote } from "./ccache-DVDO2ocE.mjs";
-import { $ as tapBuildLog, Q as startBuildProgress, St as acquireBuildSlot, Tt as releaseBuildSlot, X as recordFinishedBuild, ct as recordRunStats, it as readRunEstimates, lt as statsProjectKey, rt as createRunRecorder } from "./workspaces-BNEyJ1B_.mjs";
-import { H as readBundleId, ct as withNativeBuildRun, st as runCancellationSignal } from "./toolchain-CGdgD4x4.mjs";
-import { F as waitForBuild, M as acquireBuildLock, P as releaseBuildLock } from "./activity-Dw4N_RFe.mjs";
-import { T as storedAppId, x as providerUploadOutcome } from "./build-cache-BsKim4V7.mjs";
-import { m as listIosRuntimes } from "./ios-CdAV4-1E.mjs";
+import { An as checkEasAuth, Rn as resolveRemote, zn as uploadRemote } from "./ccache-BXtzEL6M.mjs";
+import { $ as tapBuildLog, Q as startBuildProgress, St as acquireBuildSlot, Tt as releaseBuildSlot, X as recordFinishedBuild, ct as recordRunStats, it as readRunEstimates, lt as statsProjectKey, rt as createRunRecorder } from "./workspaces-B3ahAHZc.mjs";
+import { H as readBundleId, ct as withNativeBuildRun, st as runCancellationSignal } from "./toolchain-s5ZmG42Z.mjs";
+import { F as waitForBuild, M as acquireBuildLock, P as releaseBuildLock } from "./activity-C8kBq9w0.mjs";
+import { E as storedAppId, S as providerUploadOutcome } from "./build-cache-Cqj4FGnX.mjs";
+import { m as listIosRuntimes } from "./ios-BdZdNsAj.mjs";
 import { d as optimizationBuildProfile, l as artifactCachePolicy } from "./errors-DHm_U5gv.mjs";
-import { S as setRemoteLogSink } from "./client-DhJOvSvh.mjs";
-import { d as resolveBuildPlacement } from "./selection-C95m--1_.mjs";
-import { c as iosProjectPathError, g as resolveIosBuildSetup, m as resolveConfiguration, x as simulatorBuildArch, y as resolveSchemeSelection } from "./support-Cs24xRQa.mjs";
-import { f as settleFingerprintCheck } from "./prebuild-D0hvmO4j.mjs";
-import { n as ensureWorkspaceStorageSafely } from "./native-runtime-D4qgnjK_.mjs";
-import { t as acquireAndroidArtifact } from "./artifact-ta3xA0c4.mjs";
-import { a as persistLastBuild, l as resolveAndroidBuildPlan, n as finishAndroidUpload } from "./result-Epkl6gyG.mjs";
-import { o as lastBuildRecord } from "./ios-project-Br1tVYWX.mjs";
-import { t as acquireIosArtifact } from "./artifact-Cr34-Yyy.mjs";
+import { S as setRemoteLogSink } from "./client-0_Mnfz0a.mjs";
+import { d as resolveBuildPlacement } from "./selection-xS50Mt0V.mjs";
+import { c as iosProjectPathError, g as resolveIosBuildSetup, m as resolveConfiguration, x as simulatorBuildArch, y as resolveSchemeSelection } from "./support-D8OH0z98.mjs";
+import { f as settleFingerprintCheck } from "./prebuild-Bhs7TTcz.mjs";
+import { n as ensureWorkspaceStorageSafely } from "./native-runtime-e1OU8gEN.mjs";
+import { t as acquireAndroidArtifact } from "./artifact-BMjubIP2.mjs";
+import { a as persistLastBuild, l as resolveAndroidBuildPlan, n as finishAndroidUpload } from "./result-DuimMZKJ.mjs";
+import { o as lastBuildRecord } from "./ios-project-BzfLigfh.mjs";
+import { t as acquireIosArtifact } from "./artifact-BufzdGbT.mjs";
 import { constants, promises } from "node:fs";
 import { basename, join } from "node:path";
 import { hostSimulatorArch } from "@stim-cli/core";