stim 1.20.2 → 1.22.0

package/dist/{react-native-android-CM1XRDwv.mjs → react-native-android-6OZ7MSM7.mjs}

@@ -1,32 +1,36 @@
-import { K as validateDeviceSlot, V as deviceSlotPlatforms, p as getProject } from "./config-BYDxlMY3.mjs";
-import { t as getExecutor } from "./exec-DqKo9GKJ.mjs";
-import { Ft as makeTemporaryDirectory, It as removeTemporaryEntry, L as publicUrlSetting, U as resolveAndroidLayout, V as remoteEasFallbackSetting, Z as settingOriginScope, et as settingsLayers, m as defaultAndroidLayout, tt as tunnelModeSetting, z as realpathInside } from "./settings-B717odTD.mjs";
-import { B as captureAssetManifest, D as fingerprintProject, E as fingerprintDiffRecord, F as storedAssetManifest, H as readAssetManifest, L as untrackedMissLine, M as refingerprintAfterMutation, N as resolveBuild, O as inputsChangedDuringBuild, P as storeBuild, R as untrackedNativeFiles, S as configInputsChanged, T as filesystemBuildCapability, V as compareAssetManifests, b as buildCacheKey, x as changedDuringBuildLine, z as assetDiffReason } from "./device-lease-BX1sJQ2E.mjs";
-import { r as readWorkspaceState } from "./workspace-state-DJt_MMvf.mjs";
+import { _ as reportSignal, d as spawnDeclared, m as operationState, t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { H as deviceSlotPlatforms, p as getProject, q as validateDeviceSlot } from "./config-DlrsduwG.mjs";
 import { r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-BTy8hZ0F.mjs";
-import { _ as detectIsExpo } from "./project-_phNIJfs.mjs";
-import { A as listAvds, B as ownedAvdSystemImage, D as hostSystemImageArch, I as ownedAvdDirectory, T as findBuildTool, W as pickDefaultSystemImage, j as listInstalledSystemImages, l as androidSystemImageAbi, r as androidBuildToolName } from "./android-Mz_Inn3w.mjs";
-import { It as statsProjectKey } from "./budget-f7516Zk0.mjs";
-import { t as cleanLine } from "./server-expo-DsguMGUF.mjs";
-import { c as loadProjectProvider, i as checkEasAuth, p as resolveRemote } from "./remote-cache-OyOyVIS3.mjs";
-import { h as detectAppIds, m as detectAndroidPackage } from "./start-BWqzODpb.mjs";
-import { n as fingerprintErrorMissReason, t as explainBuildMiss } from "./miss-reason-mKzZ4VvN.mjs";
-import { o as resolveCcache } from "./ccache-zdKiYQ3E.mjs";
-import { M as startBuildHeartbeat, P as tailLines, n as androidToolchain, t as androidRequirements, y as HEARTBEAT_INTERVAL_MS } from "./toolchain-DxSsNssu.mjs";
-import { a as PLATFORM, c as androidGradleProject, h as displayPath, i as NO_FINGERPRINT, l as androidJobLayout, o as androidBuildOptions, r as NO_DEVICE } from "./support-DMTqj3Hm.mjs";
-import { i as AndroidRecipeRefusal, r as resolveAndroidRunPlan } from "./plan-C4TjdPsR.mjs";
-import { c as readProductFlavors, n as buildAndroid, s as productFlavorRefusal } from "./react-native-build-CtCccJtb.mjs";
-import { n as planFlagRefusal, o as checkEasFallback, r as planPayload, t as planCachedBuild } from "./build-plan-B7SZsc2N.mjs";
-import { i as planEasDevelopmentBuild } from "./eas-build-JyfqyHfC.mjs";
-import { n as androidProcessRuntime, t as androidMetroRuntime } from "./launch-F4sOqAhB.mjs";
-import { i as staleNativeDirRefusal, n as recordPrebuild, r as runPrebuild, t as planPrebuild } from "./prebuild-DYbucPXy.mjs";
-import { n as detectEntryFile, r as refreshUpdatesManifestFile, t as UPDATES_MANIFEST_NAME } from "./js-swap-Bb3nsS07.mjs";
-import { t as planHostedDevice } from "./plan-placement-V0TdzYXp.mjs";
-import { constants, copyFileSync, existsSync, mkdirSync, readFileSync, renameSync } from "node:fs";
+import { i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-gwpm28fu.mjs";
+import { a as killOnAbort, f as throwIfCancelled, t as runOperationFile } from "./operation-exec-BW0em61G.mjs";
+import { r as readWorkspaceState } from "./workspace-state-U08dEzhG.mjs";
+import { $ as settingOriginScope, B as realpathInside, H as remoteEasFallbackSetting, Ht as makeTemporaryDirectory, R as publicUrlSetting, Ut as removeTemporaryEntry, W as resolveAndroidLayout, m as defaultAndroidLayout, nt as settingsLayers, rt as tunnelModeSetting } from "./settings-C7O8A6ZI.mjs";
+import { v as detectIsExpo } from "./project-wM_XFTvE.mjs";
+import { Bn as checkEasAuth, Fn as processContext, Jn as resolveRemote, Un as loadProjectProvider, Xn as bundleInvocation, Y as statsProjectKey } from "./budget-Cvwn54qV.mjs";
+import { C as compareAssetManifests, S as captureAssetManifest, _ as storedAssetManifest, b as untrackedNativeFiles, c as fingerprintDiffRecord, g as storeBuild, h as resolveBuild, i as configInputsChanged, l as fingerprintProject, m as refingerprintAfterMutation, n as buildCacheKey, r as changedDuringBuildLine, s as filesystemBuildCapability, u as inputsChangedDuringBuild, w as readAssetManifest, x as assetDiffReason, y as untrackedMissLine } from "./build-cache-Dv7RN200.mjs";
+import { E as findBuildTool, F as listAvdsAsync, I as listInstalledSystemImages, K as ownedAvdSystemImage, V as ownedAvdDirectory, X as pickDefaultSystemImage, k as hostSystemImageArch, l as androidSystemImageAbi, r as androidBuildToolName } from "./android-C7sVmyI9.mjs";
+import { t as cleanLine } from "./server-expo-CrjB29pq.mjs";
+import { o as resolveCcache } from "./ccache-Btwc36-I.mjs";
+import { _ as tailLines, h as startBuildHeartbeat, r as HEARTBEAT_INTERVAL_MS } from "./xcode-BXn9-xYx.mjs";
+import { r as androidToolchainAsync, t as androidRequirements } from "./toolchain-DpJMHq0n.mjs";
+import { h as detectAppIds, m as detectAndroidPackage } from "./start-EojN4WFz.mjs";
+import { c as readProductFlavors, n as buildAndroid, s as productFlavorRefusal } from "./react-native-build-Dvd8hC21.mjs";
+import { t as readDoctorFingerprint } from "./doctor-fingerprint-DZLoYFVb.mjs";
+import { i as planEasDevelopmentBuild } from "./eas-build-CwknaQYj.mjs";
+import { a as staleNativeDirRefusal, i as runPrebuild, n as planPrebuildAsync, o as explainBuildMiss, r as recordPrebuild, s as fingerprintErrorMissReason, t as planPrebuild } from "./prebuild-D4JoEAEs.mjs";
+import { a as PLATFORM, c as androidGradleProject, h as displayPath, i as NO_FINGERPRINT, l as androidJobLayout, o as androidBuildOptions, r as NO_DEVICE } from "./support-yUiOjnVY.mjs";
+import { t as AndroidRecipeRefusal } from "./android-project-BCAAmMwz.mjs";
+import { c as resolveAndroidRunPlan } from "./result-D2Ykz_iD.mjs";
+import { t as checkEasFallback } from "./eas-fallback-CSgAulr5.mjs";
+import { n as androidProcessRuntime, t as androidMetroRuntime } from "./launch-CCzXlc8r.mjs";
+import { n as planFlagRefusal, r as planPayload, t as planCachedBuild } from "./build-plan-DUC8Ka9y.mjs";
+import { n as detectEntryFile, r as refreshUpdatesManifestFile, t as UPDATES_MANIFEST_NAME } from "./js-swap-Bwhh4S7V.mjs";
+import { t as planHostedDevice } from "./plan-placement-DIsMtN-d.mjs";
+import { constants, existsSync, mkdirSync, readFileSync, renameSync } from "node:fs";
 import { basename, dirname, isAbsolute, join, relative } from "node:path";
-import { loadCacheProvider } from "@stim-cli/cache";
 import chalk from "chalk";
+import { copyFile } from "node:fs/promises";
+import { loadCacheProvider } from "@stim-cli/cache";
 //#region src/engine/apk-swap.ts
 const ANDROID_BUNDLE_NAME = "index.android.bundle";
 const LAST_LINES = 5;
@@ -176,7 +180,7 @@ function apksignerArgs({ keystore, apkPath }) {
 		apkPath
 	];
 }
-async function swapApkBundle({ root, isExpo, cachedApkPath, keystore, logWriter = null, exec = null, spawnFn = null, mkdtemp = () => makeTemporaryDirectory(cachedApkPath, "stim-apk-swap-"), exists = existsSync, hermesEnabled = null, layout = defaultAndroidLayout(root), buildTools = null, findTool = findBuildTool, storedAssets = null, readManifest = readAssetManifest, now = Date.now, heartbeatMs = HEARTBEAT_INTERVAL_MS, onHeartbeat = (line) => console.error(line), platform = process.platform }) {
+async function swapApkBundle({ context, root, isExpo, cachedApkPath, keystore, logWriter = null, exec = null, spawnFn = null, mkdtemp = () => makeTemporaryDirectory(cachedApkPath, "stim-apk-swap-"), exists = existsSync, hermesEnabled = null, layout = defaultAndroidLayout(root), buildTools = null, findTool = findBuildTool, storedAssets = null, readManifest = readAssetManifest, now = Date.now, heartbeatMs = HEARTBEAT_INTERVAL_MS, onHeartbeat = (line) => console.error(line), platform = process.platform }) {
 	const e = exec || getExecutor();
 	const startedAt = now();
 	const elapsed = () => now() - startedAt;
@@ -204,7 +208,7 @@ async function swapApkBundle({ root, isExpo, cachedApkPath, keystore, logWriter
 		const base = basename(cachedApkPath);
 		work = join(tmp, `unaligned-${base}`);
 		final = join(tmp, base);
-		copyApk(e, cachedApkPath, work, platform);
+		await copyApk(context, e, cachedApkPath, work, platform);
 	} catch (err) {
 		return fail("copy", `could not copy ${cachedApkPath} aside: ${describe(err)}`);
 	}
@@ -245,7 +249,8 @@ async function swapApkBundle({ root, isExpo, cachedApkPath, keystore, logWriter
 	};
 	let child;
 	try {
-		child = spawn(command.file, command.args, {
+		const invocation = bundleInvocation(root, isExpo, command.args.slice(1));
+		child = spawnDeclared(context, () => spawn(invocation.file, invocation.args, {
 			cwd: root,
 			stdio: [
 				"ignore",
@@ -253,10 +258,11 @@ async function swapApkBundle({ root, isExpo, cachedApkPath, keystore, logWriter
 				"pipe"
 			],
 			env: {
-				...process.env,
+				...context?.env ?? process.env,
 				FORCE_COLOR: "0"
 			}
-		});
+		}));
+		killOnAbort(context ? operationState(context).runSignal ?? context.signal : void 0)(child);
 	} catch (err) {
 		return fail("bundle", `could not run ${command.file} ${command.args[0]}: ${describe(err)}`);
 	}
@@ -296,7 +302,7 @@ async function swapApkBundle({ root, isExpo, cachedApkPath, keystore, logWriter
 		else {
 			const hbc = `${bundleOutput}.hbc`;
 			try {
-				e.runFile(hermesc, androidHermescArgs({
+				await runOperationFile(context, e, hermesc, androidHermescArgs({
 					bundle: bundleOutput,
 					out: hbc
 				}), { timeoutMs: "unbounded" });
@@ -328,10 +334,10 @@ async function swapApkBundle({ root, isExpo, cachedApkPath, keystore, logWriter
 	if (!fresh) return fail("assets", `could not hash the assets emitted into ${assetsDest}, so the asset set cannot be verified`);
 	const diff = compareAssetManifests(fresh, storedAssets);
 	if (!diff.same) return refuse(assetDiffReason(diff), diff);
-	const jar = jarPath();
+	const jar = jarPath({ javaHome: (context?.env ?? process.env).JAVA_HOME ?? "" });
 	const updatesManifest = join(stage, "assets", UPDATES_MANIFEST_NAME);
 	try {
-		e.runFile(jar, [
+		await runOperationFile(context, e, jar, [
 			"--extract",
 			"--file",
 			work,
@@ -345,7 +351,7 @@ async function swapApkBundle({ root, isExpo, cachedApkPath, keystore, logWriter
 		return fail("updates", `could not refresh the expo-updates manifest from ${work}: ${describe(err)}`);
 	}
 	try {
-		e.runFile(jar, [
+		await runOperationFile(context, e, jar, [
 			"--update",
 			"--file",
 			work,
@@ -360,7 +366,7 @@ async function swapApkBundle({ root, isExpo, cachedApkPath, keystore, logWriter
 	const tools = buildTools ?? findTool(["zipalign"]);
 	if (!tools) return fail("zipalign", "no zipalign found under the Android SDK build-tools; install one with `sdkmanager \"build-tools;36.0.0\"`");
 	try {
-		e.runFile(tools.path, zipalignArgs({
+		await runOperationFile(context, e, tools.path, zipalignArgs({
 			buildToolsMajor: tools.major,
 			input: work,
 			output: final
@@ -374,10 +380,19 @@ async function swapApkBundle({ root, isExpo, cachedApkPath, keystore, logWriter
 	} : findTool(["apksigner"]);
 	if (!signer) return fail("apksigner", "no apksigner found under the Android SDK build-tools; install one with `sdkmanager \"build-tools;36.0.0\"`");
 	try {
-		e.runFile(signer.path, apksignerArgs({
+		let signerFile = signer.path;
+		const signerArgs = apksignerArgs({
 			keystore,
 			apkPath: final
-		}), keystore.password === null ? { timeoutMs: "unbounded" } : {
+		});
+		if (platform === "win32") {
+			const javaHome = ((context?.env ?? process.env).JAVA_HOME ?? "").replaceAll("\"", "");
+			signerFile = javaHome ? join(javaHome, "bin", "java.exe") : "java.exe";
+			const fallbackJar = join(dirname(signer.path), "..", "framework", "apksigner.jar");
+			const signerJar = [join(dirname(signer.path), "apksigner.jar"), join(dirname(signer.path), "lib", "apksigner.jar")].find(exists) ?? fallbackJar;
+			signerArgs.unshift("-Xmx1024M", "-Xss1m", "-jar", signerJar);
+		}
+		await runOperationFile(context, e, signerFile, signerArgs, keystore.password === null ? { timeoutMs: "unbounded" } : {
 			timeoutMs: "unbounded",
 			env: { [KEYSTORE_PASSWORD_ENV]: keystore.password },
 			redact: [keystore.password]
@@ -401,16 +416,20 @@ async function swapApkBundle({ root, isExpo, cachedApkPath, keystore, logWriter
 	if (note) result.note = note;
 	return result;
 }
-function copyApk(e, from, to, platform) {
+async function copyApk(context, e, from, to, platform) {
 	if (platform === "darwin") try {
-		e.runFile("cp", [
+		await runOperationFile(context, e, "cp", [
 			"-c",
 			from,
 			to
 		], { timeoutMs: "unbounded" });
 		return;
-	} catch {}
-	copyFileSync(from, to, constants.COPYFILE_FICLONE);
+	} catch {
+		throwIfCancelled(context ? operationState(context).runSignal ?? context.signal : void 0, "APK swap");
+	}
+	throwIfCancelled(context ? operationState(context).runSignal ?? context.signal : void 0, "APK swap");
+	await copyFile(from, to, constants.COPYFILE_FICLONE);
+	throwIfCancelled(context ? operationState(context).runSignal ?? context.signal : void 0, "APK swap");
 }
 function describe(err) {
 	const e = err;
@@ -425,27 +444,24 @@ const DEFAULT_PLAN_DEPS = {
 	listSystemImages: listInstalledSystemImages,
 	avdSystemImage: ownedAvdSystemImage,
 	avdDirectory: ownedAvdDirectory,
-	listAvds,
+	listAvds: listAvdsAsync,
 	loadCacheProvider,
 	loadProjectProvider,
 	checkEasAuth,
 	resolveRemote,
-	planPrebuild
+	planPrebuild: planPrebuildAsync
 };
-function note(line) {
-	console.error(line);
-}
 function refuse(refusal, lines = []) {
 	return {
 		refusal,
 		lines
 	};
 }
-function emulatorImage(root, slot, requested, deps) {
+async function emulatorImage(root, slot, requested, deps, signal) {
 	const record = deviceSlotPlatforms(getProject(root), slot)?.android;
 	if (record?.avdName && !record.setupIncomplete) {
 		if (record.owned && deps.avdDirectory(record.avdName)) return { systemImage: deps.avdSystemImage(record.avdName) };
-		if (!record.owned && avdListed(record.avdName, deps.listAvds)) return { systemImage: null };
+		if (!record.owned && await avdListed(record.avdName, deps.listAvds, signal)) return { systemImage: null };
 	}
 	let images;
 	try {
@@ -466,22 +482,29 @@ function emulatorImage(root, slot, requested, deps) {
 		remedy: `Install one, e.g.: sdkmanager "system-images;android-36;google_apis;${arch}", then try again.`
 	} };
 }
-function avdListed(avdName, list) {
+async function avdListed(avdName, list, signal) {
 	try {
-		return list({ timeoutMs: 1e4 }).includes(avdName);
+		return (await list({
+			timeoutMs: 1e4,
+			signal
+		})).includes(avdName);
 	} catch {
+		signal?.throwIfAborted();
 		return false;
 	}
 }
-async function planReactNativeAndroid(root, opts, runtimeKind, { context: settingsContext, settings }, layout, variantProblem, overrides = {}) {
+async function planReactNativeAndroid(root, opts, runtimeKind, { context: settingsContext, settings }, layout, variantProblem, overrides = {}, operation = processContext(root)) {
+	const note = (line) => operation.output("stderr", `${line}\n`);
 	const deps = {
 		...DEFAULT_PLAN_DEPS,
 		...overrides
 	};
 	const slot = validateDeviceSlot(opts.slot);
-	const planned = resolveAndroidRunPlan({
+	const planned = await resolveAndroidRunPlan({
 		settings,
 		settingsContext,
+		env: operation?.env,
+		signal: operation?.signal,
 		slot,
 		easProfile: opts.easProfile,
 		variant: opts.variant ?? null,
@@ -516,6 +539,9 @@ async function planReactNativeAndroid(root, opts, runtimeKind, { context: settin
 	};
 	if (opts.easProfile !== void 0) {
 		const eas = await planEasDevelopmentBuild({
+			context: operation,
+			env: operation?.env,
+			signal: operation?.signal,
 			root,
 			platform: PLATFORM,
 			profile: opts.easProfile,
@@ -547,12 +573,14 @@ async function planReactNativeAndroid(root, opts, runtimeKind, { context: settin
 		remedy: "Run `stim android` to build with the CAS, or set optimizations.android.compilerCache to ccache."
 	});
 	const abiKeyed = build.targetAbiOnly && !build.release;
-	const localImage = () => abiKeyed ? emulatorImage(root, slot, target.systemImage, deps) : { systemImage: null };
+	let localImageRead;
+	const localImage = () => localImageRead ??= abiKeyed ? emulatorImage(root, slot, target.systemImage, deps, operation.signal) : Promise.resolve({ systemImage: null });
 	let image;
 	let hostedAbi = null;
 	let placement;
 	if (target.kind === "hosted") {
 		const hostedPlan = await planHostedDevice({
+			operation,
 			root,
 			slot,
 			platform: "android",
@@ -561,14 +589,16 @@ async function planReactNativeAndroid(root, opts, runtimeKind, { context: settin
 				...target.systemImage ? { systemImage: target.systemImage } : {},
 				...target.deviceProfile ? { deviceProfile: target.deviceProfile } : {}
 			},
-			sameKey: (choice) => {
+			sameKey: async (choice) => {
 				if (build.targetAbiOnly && build.release) return !("architecture" in choice && choice.architecture);
 				if (!abiKeyed) return true;
-				const local = localImage();
+				const local = await localImage();
 				if ("refusal" in local || !("systemImage" in choice)) return null;
 				return androidSystemImageAbi(local.systemImage) === androidSystemImageAbi(choice.systemImage);
 			},
 			...remoteEasFallbackSetting(settings) ? { eas: () => checkEasFallback({
+				operation,
+				env: operation?.env,
 				root,
 				platform: "android",
 				slot,
@@ -586,8 +616,8 @@ async function planReactNativeAndroid(root, opts, runtimeKind, { context: settin
 		});
 		placement = hostedPlan.placement;
 		if (hostedPlan.kind === "hosted" && "architecture" in hostedPlan.choice) hostedAbi = hostedPlan.choice.architecture ?? null;
-		image = hostedPlan.kind === "hosted" ? { systemImage: abiKeyed && "systemImage" in hostedPlan.choice ? hostedPlan.choice.systemImage : null } : localImage();
-	} else image = localImage();
+		image = hostedPlan.kind === "hosted" ? { systemImage: abiKeyed && "systemImage" in hostedPlan.choice ? hostedPlan.choice.systemImage : null } : await localImage();
+	} else image = await localImage();
 	if ("refusal" in image) return refuse(image.refusal);
 	const { abi, runOptions, remoteRunOptions } = androidBuildOptions({
 		release: build.release,
@@ -602,22 +632,30 @@ async function planReactNativeAndroid(root, opts, runtimeKind, { context: settin
 	});
 	let fingerprint;
 	try {
-		fingerprint = await deps.fingerprint(root, {
+		fingerprint = operation && reportSignal(operation) ? await readDoctorFingerprint(operation, {
+			root,
+			platform: PLATFORM,
+			androidLayout: layout
+		}) : await deps.fingerprint(root, {
 			platform: PLATFORM,
 			androidLayout: layout
 		});
 	} catch (error) {
+		operation?.signal.throwIfAborted();
 		return refuse({
 			code: NO_FINGERPRINT,
 			message: `@expo/fingerprint could not fingerprint ${root}: ${error?.message || error}`,
 			remedy: "Fix the @expo/fingerprint error above, then retry."
 		});
 	}
-	if (!fingerprint?.hash) return refuse({
-		code: NO_FINGERPRINT,
-		message: `@expo/fingerprint returned no hash for ${root}, so the build cache cannot be addressed.`,
-		remedy: "Check the project native inputs and the @expo/fingerprint error above, then retry."
-	});
+	if (!fingerprint?.hash) {
+		operation?.signal.throwIfAborted();
+		return refuse({
+			code: NO_FINGERPRINT,
+			message: `@expo/fingerprint returned no hash for ${root}, so the build cache cannot be addressed.`,
+			remedy: "Check the project native inputs and the @expo/fingerprint error above, then retry."
+		});
+	}
 	const plan = await planCachedBuild({
 		...planTarget,
 		isExpo,
@@ -629,6 +667,7 @@ async function planReactNativeAndroid(root, opts, runtimeKind, { context: settin
 		expoRemote: abi || build.profile || !build.cache.remote ? null : { runOptions: remoteRunOptions }
 	}, {
 		...deps,
+		operation,
 		note
 	});
 	return placement ? {
@@ -647,7 +686,7 @@ function reactNativeAndroidProject(root, { context, settings }, dependencies = {
 		variant
 	});
 	return {
-		plan: (options, resolved) => planReactNativeAndroid(root, options, runtimeKind, resolved, layout, variantProblem, dependencies.plan),
+		plan: (options, resolved, operation) => planReactNativeAndroid(root, options, runtimeKind, resolved, layout, variantProblem, dependencies.plan, operation),
 		isExpo,
 		appIds: () => detectAppIds(root, void 0, layout.moduleDir),
 		packageRemedy: `Set \`expo.android.package\` in app.json / app.config.js, or \`namespace\` in ${relative(root, layout.moduleDir) || "."}/build.gradle.`,
@@ -670,7 +709,7 @@ function reactNativeAndroidProject(root, { context, settings }, dependencies = {
 		artifact: (artifactContext) => reactNativeAndroidArtifact(artifactContext, isExpo, layout, context, dependencies)
 	};
 }
-function reactNativeAndroidArtifact({ root, buildLog, writer, settings, buildPlan, target, phase, out, step, estimates }, isExpo, layout, context, { fingerprint = fingerprintProject, untracked = untrackedNativeFiles, resolveCached = resolveBuild, storeCached = storeBuild, storedAssets = storedAssetManifest, captureAssets = captureAssetManifest, loadProvider = loadProjectProvider, planPrebuildFor = planPrebuild, prebuild = runPrebuild, build = buildAndroid, ccacheFor = resolveCcache, swapApk = swapApkBundle, readState = readWorkspaceState }) {
+function reactNativeAndroidArtifact({ operation, root, buildLog, writer, settings, buildPlan, target, phase, out, step, estimates }, isExpo, layout, context, { fingerprint = fingerprintProject, untracked = untrackedNativeFiles, resolveCached = resolveBuild, storeCached = storeBuild, storedAssets = storedAssetManifest, captureAssets = captureAssetManifest, loadProvider = loadProjectProvider, planPrebuildFor = planPrebuild, prebuild = runPrebuild, build = buildAndroid, ccacheFor = resolveCcache, swapApk = swapApkBundle, readState = readWorkspaceState }) {
 	const { variant, release, profile, cas } = buildPlan;
 	const runOptions = {
 		...variant ? { variant } : {},
@@ -702,6 +741,8 @@ function reactNativeAndroidArtifact({ root, buildLog, writer, settings, buildPla
 			return null;
 		}
 		const swap = await swapApk({
+			context: operation,
+			onHeartbeat: out,
 			root,
 			isExpo,
 			cachedApkPath: cachedPath,
@@ -751,6 +792,7 @@ function reactNativeAndroidArtifact({ root, buildLog, writer, settings, buildPla
 			return identity();
 		},
 		cache: (compiled = false) => filesystemBuildCapability({
+			context: operation,
 			resolve: resolveCached,
 			store: storeCached,
 			sources,
@@ -816,7 +858,7 @@ function reactNativeAndroidArtifact({ root, buildLog, writer, settings, buildPla
 				identity: identity(),
 				rekeyedBy,
 				cacheRefusal: editedConfig.length ? "prebuild changed config inputs, so the APK cannot be cached" : null,
-				...prebuildRan ? { androidPackage: detectAndroidPackage(root, layout.moduleDir) } : {}
+				...prebuildRan ? { androidPackage: await detectAndroidPackage(root, layout.moduleDir) } : {}
 			};
 		},
 		async validate() {
@@ -854,10 +896,13 @@ function reactNativeAndroidArtifact({ root, buildLog, writer, settings, buildPla
 			abi: target.abi
 		}, {
 			estimateMs: estimates().coldBuildMs,
+			onHeartbeat: out,
+			onNote: out,
 			ccache: buildPlan.compilerCache === "ccache" ? ccacheFor({
 				root,
 				layout,
-				onNote: out
+				onNote: out,
+				env: operation?.env
 			}) : null,
 			cas,
 			buildCache: buildPlan.gradleBuildCache,
@@ -885,19 +930,23 @@ function reactNativeAndroidArtifact({ root, buildLog, writer, settings, buildPla
 			};
 		},
 		untrackedLine: () => untrackedMissLine(untracked({ projectRoot: root })),
-		legacyCache: target.abi || cas || profile || !buildPlan.cache.remote ? null : {
-			load: () => loadProvider(root, { isExpo }),
+		expoCache: target.abi || cas || profile || !buildPlan.cache.remote ? null : {
+			load: () => loadProvider(root, {
+				context: operation,
+				isExpo
+			}),
 			runOptions: Object.keys(runOptions).length ? runOptions : null
 		},
 		offload: {
 			unsupported: release ? `${variant} builds build here` : cas ? "Apple Clang CAS builds build here" : !buildPlan.cache.write ? "the build cache is off" : null,
-			target: () => ({
+			target: async () => ({
 				platform: "android",
-				local: androidToolchain(),
+				local: await androidToolchainAsync(operation?.env),
 				requires: androidRequirements(root)
 			}),
 			request: {
 				platform: "android",
+				cacheArtifact: buildPlan.cache.write && buildPlan.cache.remote,
 				isExpo,
 				android: {
 					variant,