stim 1.20.2 → 1.21.0

package/dist/pull-request-zjCSAryH.d.mts

@@ -0,0 +1,120 @@
+//#region src/workspace/pull-request.d.ts
+interface GhPullRequest {
+  number: number;
+  state: string;
+  url: string;
+  headRefOid: string;
+  mergedAt: string | null;
+  closedAt: string | null;
+  isCrossRepository?: boolean;
+  isDraft?: boolean;
+  headRepository?: {
+    name?: string | null;
+  } | null;
+  headRepositoryOwner?: {
+    login?: string | null;
+  } | null;
+  title?: string;
+  reviewDecision?: string | null;
+  commits?: {
+    nodes?: {
+      commit?: {
+        statusCheckRollup?: GhCheckRollup | null;
+      };
+    }[];
+  };
+}
+interface GhStateCount {
+  state: string;
+  count: number;
+}
+interface GhCheckRollup {
+  contexts?: {
+    checkRunCountsByState?: GhStateCount[];
+    statusContextCountsByState?: GhStateCount[];
+  };
+}
+interface CheckCounts {
+  passing: number;
+  failing: number;
+  pending: number;
+}
+/**
+ * The pull request whose head branch is the worktree's branch and whose commits include the worktree's HEAD.
+ * `containsHead` is false when the pull request's head is an ancestor of HEAD: HEAD has commits the pull request
+ * never had. `endedAt` is when it was merged or closed, in epoch milliseconds, and null while it is open.
+ */
+interface PullRequestFact {
+  number: number;
+  state: "open" | "merged" | "closed";
+  draft: boolean;
+  url: string;
+  head: string;
+  containsHead: boolean;
+  endedAt: number | null;
+  /** Present when the lookup asked for detail. */
+  title?: string;
+  reviewDecision?: "approved" | "changes-requested" | "review-required" | null;
+  checks?: CheckCounts | null;
+}
+/** Sums a head commit's check runs and commit statuses by outcome; null when the commit has no checks. */
+declare function checkCounts(rollup: GhCheckRollup | null | undefined): CheckCounts | null;
+type PullRequestLookup = {
+  pullRequest: PullRequestFact | null;
+} | {
+  unavailable: string;
+};
+/**
+ * Picks the pull request that describes `head` among those `gh pr list --head <branch>` returned. One whose head is
+ * `head` wins, then one whose head contains `head`, then one whose head `head` contains. An open one wins a tier,
+ * then the newest. A pull request unrelated to `head` is from an earlier use of the branch name and is ignored. A
+ * cross-repository pull request is kept only when its head repository is one of `ownRepos` (this checkout's own git
+ * remotes, lowercased "owner/name"); otherwise it only shares the branch name with a stranger's fork and is ignored.
+ * `isAncestor(a, b)` answers whether commit `a` is an ancestor of commit `b`, and false when git cannot tell.
+ */
+declare function selectPullRequest(pulls: readonly GhPullRequest[], head: string, isAncestor: (ancestor: string, descendant: string) => boolean, ownRepos?: ReadonlySet<string>): PullRequestFact | null;
+/**
+ * "owner/name", lowercased, parsed out of a git remote URL, or null when it doesn't match: https, `ssh://`, or
+ * scp-like (`[user@]host:owner/name`, which also covers an `~/.ssh/config` host alias in place of `user@host`).
+ */
+declare function parseRemoteRepo(url: string): string | null;
+/**
+ * Asks GitHub, through `gh`, which pull requests have `branch` as their head, run from `cwd` so `gh` picks the
+ * repository from its remotes. Each call is one fixed `gh pr list` invocation. Once `gh` is missing, signed out or
+ * times out, every later lookup through the same function answers `unavailable` without running it again.
+ */
+declare function pullRequestLookup(): (cwd: string, branch: string, head: string) => PullRequestLookup;
+/** A worktree whose pull request {@link pullRequestLookups} looks up: its path, branch and HEAD commit. */
+interface PullRequestQuery {
+  cwd: string;
+  branch: string;
+  head: string;
+}
+/**
+ * {@link pullRequestLookup} for every branch of one repository in one fixed `gh api graphql` call run from `repo`,
+ * which asks for the same 20 newest pull requests of each head branch that `gh pr list --head` returns. `gh` fills
+ * `{owner}` and `{repo}` from the remotes of `repo`; branch names travel as variables. Once `gh` is missing, signed
+ * out or times out, every later call through the same function answers `unavailable` without running it again.
+ * With `detail`, it also asks for each pull request's title, review decision and head commit check counts.
+ */
+declare function pullRequestLookups({ detail }?: {
+  detail?: boolean;
+}): (repo: string, queries: readonly PullRequestQuery[]) => Promise<PullRequestLookup[]>;
+/** The merged or closed pull request whose commits include HEAD, which makes the worktree removable. */
+declare function endedPullRequest(lookup: PullRequestLookup | null): PullRequestFact | null;
+/** "PR #123 merged", for reports. */
+declare function describePullRequest(pr: Pick<PullRequestFact, "number" | "state">): string;
+/** A linked worktree whose pull request {@link worktreePullRequests} looks up. */
+interface WorktreeBranch {
+  path: string;
+  branch: string;
+  repository: string;
+}
+/**
+ * Looks up the pull request of each worktree's branch and HEAD, with one {@link pullRequestLookups} call per
+ * repository. The map holds null for a worktree without one, and leaves out a worktree whose HEAD git cannot read
+ * or whose lookup was unavailable.
+ */
+declare function worktreePullRequests(): (worktrees: readonly WorktreeBranch[]) => Promise<Map<string, PullRequestFact | null>>;
+//#endregion
+export { PullRequestLookup as a, checkCounts as c, parseRemoteRepo as d, pullRequestLookup as f, worktreePullRequests as h, PullRequestFact as i, describePullRequest as l, selectPullRequest as m, GhCheckRollup as n, PullRequestQuery as o, pullRequestLookups as p, GhPullRequest as r, WorktreeBranch as s, CheckCounts as t, endedPullRequest as u };

package/dist/pull-requests.d.mts

@@ -1,120 +1,2 @@
-//#region src/workspace/pull-request.d.ts
-interface GhPullRequest {
-  number: number;
-  state: string;
-  url: string;
-  headRefOid: string;
-  mergedAt: string | null;
-  closedAt: string | null;
-  isCrossRepository?: boolean;
-  isDraft?: boolean;
-  headRepository?: {
-    name?: string | null;
-  } | null;
-  headRepositoryOwner?: {
-    login?: string | null;
-  } | null;
-  title?: string;
-  reviewDecision?: string | null;
-  commits?: {
-    nodes?: {
-      commit?: {
-        statusCheckRollup?: GhCheckRollup | null;
-      };
-    }[];
-  };
-}
-interface GhStateCount {
-  state: string;
-  count: number;
-}
-interface GhCheckRollup {
-  contexts?: {
-    checkRunCountsByState?: GhStateCount[];
-    statusContextCountsByState?: GhStateCount[];
-  };
-}
-interface CheckCounts {
-  passing: number;
-  failing: number;
-  pending: number;
-}
-/**
- * The pull request whose head branch is the worktree's branch and whose commits include the worktree's HEAD.
- * `containsHead` is false when the pull request's head is an ancestor of HEAD: HEAD has commits the pull request
- * never had. `endedAt` is when it was merged or closed, in epoch milliseconds, and null while it is open.
- */
-interface PullRequestFact {
-  number: number;
-  state: "open" | "merged" | "closed";
-  draft: boolean;
-  url: string;
-  head: string;
-  containsHead: boolean;
-  endedAt: number | null;
-  /** Present when the lookup asked for detail. */
-  title?: string;
-  reviewDecision?: "approved" | "changes-requested" | "review-required" | null;
-  checks?: CheckCounts | null;
-}
-/** Sums a head commit's check runs and commit statuses by outcome; null when the commit has no checks. */
-declare function checkCounts(rollup: GhCheckRollup | null | undefined): CheckCounts | null;
-type PullRequestLookup = {
-  pullRequest: PullRequestFact | null;
-} | {
-  unavailable: string;
-};
-/**
- * Picks the pull request that describes `head` among those `gh pr list --head <branch>` returned. One whose head is
- * `head` wins, then one whose head contains `head`, then one whose head `head` contains. An open one wins a tier,
- * then the newest. A pull request unrelated to `head` is from an earlier use of the branch name and is ignored. A
- * cross-repository pull request is kept only when its head repository is one of `ownRepos` (this checkout's own git
- * remotes, lowercased "owner/name"); otherwise it only shares the branch name with a stranger's fork and is ignored.
- * `isAncestor(a, b)` answers whether commit `a` is an ancestor of commit `b`, and false when git cannot tell.
- */
-declare function selectPullRequest(pulls: readonly GhPullRequest[], head: string, isAncestor: (ancestor: string, descendant: string) => boolean, ownRepos?: ReadonlySet<string>): PullRequestFact | null;
-/**
- * "owner/name", lowercased, parsed out of a git remote URL, or null when it doesn't match: https, `ssh://`, or
- * scp-like (`[user@]host:owner/name`, which also covers an `~/.ssh/config` host alias in place of `user@host`).
- */
-declare function parseRemoteRepo(url: string): string | null;
-/**
- * Asks GitHub, through `gh`, which pull requests have `branch` as their head, run from `cwd` so `gh` picks the
- * repository from its remotes. Each call is one fixed `gh pr list` invocation. Once `gh` is missing, signed out or
- * times out, every later lookup through the same function answers `unavailable` without running it again.
- */
-declare function pullRequestLookup(): (cwd: string, branch: string, head: string) => PullRequestLookup;
-/** A worktree whose pull request {@link pullRequestLookups} looks up: its path, branch and HEAD commit. */
-interface PullRequestQuery {
-  cwd: string;
-  branch: string;
-  head: string;
-}
-/**
- * {@link pullRequestLookup} for every branch of one repository in one fixed `gh api graphql` call run from `repo`,
- * which asks for the same 20 newest pull requests of each head branch that `gh pr list --head` returns. `gh` fills
- * `{owner}` and `{repo}` from the remotes of `repo`; branch names travel as variables. Once `gh` is missing, signed
- * out or times out, every later call through the same function answers `unavailable` without running it again.
- * With `detail`, it also asks for each pull request's title, review decision and head commit check counts.
- */
-declare function pullRequestLookups({ detail }?: {
-  detail?: boolean;
-}): (repo: string, queries: readonly PullRequestQuery[]) => Promise<PullRequestLookup[]>;
-/** The merged or closed pull request whose commits include HEAD, which makes the worktree removable. */
-declare function endedPullRequest(lookup: PullRequestLookup | null): PullRequestFact | null;
-/** "PR #123 merged", for reports. */
-declare function describePullRequest(pr: Pick<PullRequestFact, "number" | "state">): string;
-/** A linked worktree whose pull request {@link worktreePullRequests} looks up. */
-interface WorktreeBranch {
-  path: string;
-  branch: string;
-  repository: string;
-}
-/**
- * Looks up the pull request of each worktree's branch and HEAD, with one {@link pullRequestLookups} call per
- * repository. The map holds null for a worktree without one, and leaves out a worktree whose HEAD git cannot read
- * or whose lookup was unavailable.
- */
-declare function worktreePullRequests(): (worktrees: readonly WorktreeBranch[]) => Promise<Map<string, PullRequestFact | null>>;
-//#endregion
+import { a as PullRequestLookup, c as checkCounts, d as parseRemoteRepo, f as pullRequestLookup, h as worktreePullRequests, i as PullRequestFact, l as describePullRequest, m as selectPullRequest, n as GhCheckRollup, o as PullRequestQuery, p as pullRequestLookups, r as GhPullRequest, s as WorktreeBranch, t as CheckCounts, u as endedPullRequest } from "./pull-request-zjCSAryH.mjs";
 export { CheckCounts, GhCheckRollup, GhPullRequest, PullRequestFact, PullRequestLookup, PullRequestQuery, WorktreeBranch, checkCounts, describePullRequest, endedPullRequest, parseRemoteRepo, pullRequestLookup, pullRequestLookups, selectPullRequest, worktreePullRequests };

package/dist/pull-requests.mjs

@@ -1,2 +1,2 @@
-import { a as pullRequestLookup, c as worktreePullRequests, i as parseRemoteRepo, n as describePullRequest, o as pullRequestLookups, r as endedPullRequest, s as selectPullRequest, t as checkCounts } from "./pull-request-CQ8sPbZa.mjs";
+import { a as pullRequestLookup, c as worktreePullRequests, i as parseRemoteRepo, n as describePullRequest, o as pullRequestLookups, r as endedPullRequest, s as selectPullRequest, t as checkCounts } from "./pull-request-Lfetn8Kr.mjs";
 export { checkCounts, describePullRequest, endedPullRequest, parseRemoteRepo, pullRequestLookup, pullRequestLookups, selectPullRequest, worktreePullRequests };

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

@@ -1,32 +1,34 @@
-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 { s as spawnDeclared, t as getExecutor, u as operationState } from "./exec-_UbtCQcG.mjs";
+import { J as validateDeviceSlot, U as deviceSlotPlatforms, p as getProject } from "./config-CYcBF478.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-B1UrjZHL.mjs";
+import { r as readWorkspaceState } from "./workspace-state-Cjuigeeu.mjs";
+import { $ as settingOriginScope, B as realpathInside, H as remoteEasFallbackSetting, R as publicUrlSetting, W as resolveAndroidLayout, Xt as removeTemporaryEntry, Yt as makeTemporaryDirectory, en as throwIfCancelled, m as defaultAndroidLayout, nt as settingsLayers, qt as killOnAbort, rt as tunnelModeSetting } from "./settings-CsJDEXgK.mjs";
+import { v as detectIsExpo } from "./project-BZNjmW_8.mjs";
+import { Bn as checkEasAuth, Jn as resolveRemote, Un as loadProjectProvider, Xn as bundleInvocation, Y as statsProjectKey } from "./budget-Bs6SxxzO.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-DmyR9Zzc.mjs";
+import { J as pickDefaultSystemImage, M as listAvds, O as hostSystemImageArch, P as listInstalledSystemImages, T as findBuildTool, W as ownedAvdSystemImage, l as androidSystemImageAbi, r as androidBuildToolName, z as ownedAvdDirectory } from "./android-DUYkNF4u.mjs";
+import { t as cleanLine } from "./server-expo-DT_F_uVI.mjs";
+import { o as resolveCcache } from "./ccache-BJRZ9pG3.mjs";
+import { _ as tailLines, h as startBuildHeartbeat, r as HEARTBEAT_INTERVAL_MS } from "./xcode-Zlx3qjEs.mjs";
+import { r as androidToolchainAsync, t as androidRequirements } from "./toolchain-Hp9sCpK4.mjs";
+import { c as readProductFlavors, n as buildAndroid, s as productFlavorRefusal } from "./react-native-build-rhk4smwQ.mjs";
+import { i as planEasDevelopmentBuild } from "./eas-build-BomfRnFT.mjs";
+import { h as detectAppIds, m as detectAndroidPackage } from "./start-7lpH7hmN.mjs";
+import { a as explainBuildMiss, i as staleNativeDirRefusal, n as recordPrebuild, o as fingerprintErrorMissReason, r as runPrebuild, t as planPrebuild } from "./prebuild-uD_ipCxF.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-67vraa1Q.mjs";
+import { t as AndroidRecipeRefusal } from "./android-project-BCAAmMwz.mjs";
+import { c as resolveAndroidRunPlan } from "./result-DNiS-tTP.mjs";
+import { t as checkEasFallback } from "./eas-fallback-DJwZpy0c.mjs";
+import { n as androidProcessRuntime, t as androidMetroRuntime } from "./launch-CD1yVc7U.mjs";
+import { n as planFlagRefusal, r as planPayload, t as planCachedBuild } from "./build-plan-CaFskB7_.mjs";
+import { a as runOperationFile, n as detectEntryFile, r as refreshUpdatesManifestFile, t as UPDATES_MANIFEST_NAME } from "./js-swap-Cc1dttps.mjs";
+import { t as planHostedDevice } from "./plan-placement-Bwj-IjY1.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 +178,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 +206,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 +247,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 +256,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 +300,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 +332,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 +349,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 +364,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 +378,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 +414,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;
@@ -670,7 +687,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 +719,8 @@ function reactNativeAndroidArtifact({ root, buildLog, writer, settings, buildPla
 			return null;
 		}
 		const swap = await swapApk({
+			context: operation,
+			onHeartbeat: out,
 			root,
 			isExpo,
 			cachedApkPath: cachedPath,
@@ -751,6 +770,7 @@ function reactNativeAndroidArtifact({ root, buildLog, writer, settings, buildPla
 			return identity();
 		},
 		cache: (compiled = false) => filesystemBuildCapability({
+			context: operation,
 			resolve: resolveCached,
 			store: storeCached,
 			sources,
@@ -816,7 +836,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 +874,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,
@@ -886,14 +909,17 @@ 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 }),
+			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: {