stim 1.21.0 → 1.23.0

package/dist/{pull-request-Lfetn8Kr.mjs → pull-request-W1IuLXDt.mjs}

@@ -1,5 +1,5 @@
-import { t as getExecutor } from "./exec-_UbtCQcG.mjs";
-import { n as gitAsync, r as gitQuiet } from "./git-C3iTsJaZ.mjs";
+import { r as WorkspaceProcessCleanupError, t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { c as gitQuiet, l as gitQuietAsync, r as childEnvironment, s as gitAsync, t as runOperationFile } from "./operation-exec-BW0em61G.mjs";
 //#region src/workspace/pull-request.ts
 const GH_TIMEOUT_MS = 2e4;
 const GH_ENV = {
@@ -81,16 +81,8 @@ function headRepoOf(pull) {
 	const name = pull.headRepository?.name;
 	return owner && name ? `${owner.toLowerCase()}/${name.toLowerCase()}` : null;
 }
-/**
-* 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.
-*/
-function selectPullRequest(pulls, head, isAncestor, ownRepos = /* @__PURE__ */ new Set()) {
-	const known = pulls.flatMap((pull) => {
+function knownPullRequests(pulls, ownRepos) {
+	return pulls.flatMap((pull) => {
 		if (!pull || typeof pull !== "object") return [];
 		const state = stateOf(pull.state);
 		if (!state || !pull.headRefOid) return [];
@@ -103,6 +95,17 @@ function selectPullRequest(pulls, head, isAncestor, ownRepos = /* @__PURE__ */ n
 			state
 		}];
 	});
+}
+/**
+* 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.
+*/
+function selectPullRequest(pulls, head, isAncestor, ownRepos = /* @__PURE__ */ new Set()) {
+	const known = knownPullRequests(pulls, ownRepos);
 	const tiers = [
 		known.filter(({ pull }) => pull.headRefOid === head),
 		known.filter(({ pull }) => pull.headRefOid !== head && isAncestor(head, pull.headRefOid)),
@@ -159,7 +162,9 @@ function parseRemoteRepo(url) {
 	return owner && name ? `${owner.toLowerCase()}/${name.toLowerCase()}` : null;
 }
 function localRemoteRepos(cwd) {
-	const out = gitQuiet(cwd, ["remote", "-v"]);
+	return remoteRepos(gitQuiet(cwd, ["remote", "-v"]));
+}
+function remoteRepos(out) {
 	const repos = /* @__PURE__ */ new Set();
 	for (const line of out ? out.split("\n") : []) {
 		const url = /^\S+\s+(\S+)\s+\((?:fetch|push)\)$/.exec(line)?.[1];
@@ -168,6 +173,33 @@ function localRemoteRepos(cwd) {
 	}
 	return repos;
 }
+function gitExecution(operation) {
+	return {
+		...operation ? childEnvironment(operation.env) : {},
+		signal: operation?.signal,
+		declareFor: operation,
+		cwd: operation?.cwd,
+		killSignal: "SIGKILL"
+	};
+}
+async function selectPullRequestAsync(cwd, pulls, head, ownRepos, operation) {
+	const options = gitExecution(operation);
+	const ancestors = /* @__PURE__ */ new Map();
+	for (const { pull } of knownPullRequests(pulls, ownRepos)) {
+		if (pull.headRefOid === head) continue;
+		for (const [a, b] of [[head, pull.headRefOid], [pull.headRefOid, head]]) {
+			const key = `${a}:${b}`;
+			if (!ancestors.has(key)) ancestors.set(key, await gitQuietAsync(cwd, [
+				"merge-base",
+				"--is-ancestor",
+				a,
+				b
+			], options) !== null);
+		}
+	}
+	operation?.signal.throwIfAborted();
+	return selectPullRequest(pulls, head, (a, b) => ancestors.get(`${a}:${b}`) ?? false, ownRepos);
+}
 /**
 * 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
@@ -211,6 +243,50 @@ function pullRequestLookup() {
 		return { pullRequest: Array.isArray(pulls) ? selectPullRequest(pulls, head, ancestry(cwd), localRemoteRepos(cwd)) : null };
 	};
 }
+/** The same branch and commit lookup as `pullRequestLookup`, with nonblocking Git and GitHub probes. */
+function pullRequestLookupAsync(operation) {
+	let unavailable;
+	return async (cwd, branch, head) => {
+		const exec = getExecutor();
+		operation?.signal.throwIfAborted();
+		if (unavailable === void 0) unavailable = exec.findExecutable("gh") ? null : "gh is not installed";
+		if (unavailable) return { unavailable };
+		let out;
+		try {
+			out = await runOperationFile(operation, exec, "gh", [
+				"pr",
+				"list",
+				"--head",
+				branch,
+				"--state",
+				"all",
+				"--limit",
+				"20",
+				"--json",
+				GH_FIELDS
+			], {
+				cwd,
+				timeoutMs: GH_TIMEOUT_MS,
+				env: GH_ENV
+			});
+		} catch (error) {
+			if (error instanceof WorkspaceProcessCleanupError || error instanceof Error && "reportCleanup" in error) throw error;
+			operation?.signal.throwIfAborted();
+			const failure = ghFailure(error, "gh pr list");
+			if (failure.sticky) unavailable = failure.unavailable;
+			return { unavailable: failure.unavailable };
+		}
+		let pulls;
+		try {
+			pulls = JSON.parse(out);
+		} catch {
+			return { unavailable: "gh pr list printed no JSON" };
+		}
+		if (!Array.isArray(pulls)) return { pullRequest: null };
+		const ownRepos = remoteRepos(await gitQuietAsync(cwd, ["remote", "-v"], gitExecution(operation)));
+		return { pullRequest: await selectPullRequestAsync(cwd, pulls, head, ownRepos, operation) };
+	};
+}
 function branchesQuery(count, detail) {
 	const variables = Array.from({ length: count }, (_, i) => `, $b${i}: String!`).join("");
 	const nodes = `${GH_SCALAR_FIELDS.replaceAll(",", " ")} ${GH_GRAPHQL_REPO_SELECTION}` + (detail ? ` ${GH_DETAIL_FIELDS}` : "");
@@ -223,9 +299,10 @@ function branchesQuery(count, detail) {
 * 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.
 */
-function pullRequestLookups({ detail = false } = {}) {
+function pullRequestLookups({ detail = false, operation } = {}) {
 	let unavailable;
 	return async (repo, queries) => {
+		operation?.signal.throwIfAborted();
 		const exec = getExecutor();
 		if (unavailable === void 0) unavailable = exec.findExecutable("gh") ? null : "gh is not installed";
 		const all = (lookup) => queries.map(() => lookup);
@@ -243,12 +320,14 @@ function pullRequestLookups({ detail = false } = {}) {
 		args.push("-f", `query=${branchesQuery(queries.length, detail)}`);
 		let out;
 		try {
-			out = await exec.runFileAsync("gh", args, {
+			out = await runOperationFile(operation, exec, "gh", args, {
 				cwd: repo,
 				timeoutMs: GH_TIMEOUT_MS,
 				env: GH_ENV
 			});
 		} catch (error) {
+			if (error instanceof WorkspaceProcessCleanupError || error instanceof Error && "reportCleanup" in error) throw error;
+			operation?.signal.throwIfAborted();
 			const failure = ghFailure(error, "gh api graphql");
 			if (failure.sticky) unavailable = failure.unavailable;
 			return all({ unavailable: failure.unavailable });
@@ -260,11 +339,14 @@ function pullRequestLookups({ detail = false } = {}) {
 			return all({ unavailable: "gh api graphql printed no JSON" });
 		}
 		if (!found) return all({ unavailable: "gh api graphql printed no repository" });
-		const ownRepos = localRemoteRepos(repo);
-		return queries.map(({ cwd, head }, i) => {
+		const ownRepos = remoteRepos(await gitQuietAsync(repo, ["remote", "-v"], gitExecution(operation)));
+		const results = [];
+		for (const [i, { cwd, head }] of queries.entries()) {
+			operation?.signal.throwIfAborted();
 			const pulls = found[`b${i}`]?.nodes;
-			return { pullRequest: Array.isArray(pulls) ? selectPullRequest(pulls, head, ancestry(cwd), ownRepos) : null };
-		});
+			results.push({ pullRequest: Array.isArray(pulls) ? await selectPullRequestAsync(cwd, pulls, head, ownRepos, operation) : null });
+		}
+		return results;
 	};
 }
 /** The merged or closed pull request whose commits include HEAD, which makes the worktree removable. */
@@ -306,4 +388,4 @@ function worktreePullRequests() {
 	};
 }
 //#endregion
-export { pullRequestLookup as a, worktreePullRequests as c, parseRemoteRepo as i, describePullRequest as n, pullRequestLookups as o, endedPullRequest as r, selectPullRequest as s, checkCounts as t };
+export { pullRequestLookup as a, selectPullRequest as c, parseRemoteRepo as i, worktreePullRequests as l, describePullRequest as n, pullRequestLookupAsync as o, endedPullRequest as r, pullRequestLookups as s, checkCounts as t };

package/dist/{pull-request-zjCSAryH.d.mts → pull-request-eODyIqZF.d.mts}

@@ -1,3 +1,4 @@
+import { StimContext } from "@stim-cli/core";
 //#region src/workspace/pull-request.d.ts
 interface GhPullRequest {
   number: number;
@@ -84,6 +85,8 @@ declare function parseRemoteRepo(url: string): string | null;
  * 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;
+/** The same branch and commit lookup as `pullRequestLookup`, with nonblocking Git and GitHub probes. */
+declare function pullRequestLookupAsync(operation?: StimContext): (cwd: string, branch: string, head: string) => Promise<PullRequestLookup>;
 /** A worktree whose pull request {@link pullRequestLookups} looks up: its path, branch and HEAD commit. */
 interface PullRequestQuery {
   cwd: string;
@@ -97,8 +100,9 @@ interface PullRequestQuery {
  * 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 }?: {
+declare function pullRequestLookups({ detail, operation }?: {
   detail?: boolean;
+  operation?: StimContext;
 }): (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;
@@ -117,4 +121,4 @@ interface WorktreeBranch {
  */
 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 };
+export { PullRequestLookup as a, checkCounts as c, parseRemoteRepo as d, pullRequestLookup as f, worktreePullRequests as g, selectPullRequest as h, PullRequestFact as i, describePullRequest as l, pullRequestLookups as m, GhCheckRollup as n, PullRequestQuery as o, pullRequestLookupAsync as p, GhPullRequest as r, WorktreeBranch as s, CheckCounts as t, endedPullRequest as u };

package/dist/pull-requests.d.mts

@@ -1,2 +1,2 @@
-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 };
+import { a as PullRequestLookup, c as checkCounts, d as parseRemoteRepo, f as pullRequestLookup, g as worktreePullRequests, h as selectPullRequest, i as PullRequestFact, l as describePullRequest, m as pullRequestLookups, n as GhCheckRollup, o as PullRequestQuery, p as pullRequestLookupAsync, r as GhPullRequest, s as WorktreeBranch, t as CheckCounts, u as endedPullRequest } from "./pull-request-eODyIqZF.mjs";
+export { CheckCounts, GhCheckRollup, GhPullRequest, PullRequestFact, PullRequestLookup, PullRequestQuery, WorktreeBranch, checkCounts, describePullRequest, endedPullRequest, parseRemoteRepo, pullRequestLookup, pullRequestLookupAsync, 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-Lfetn8Kr.mjs";
-export { checkCounts, describePullRequest, endedPullRequest, parseRemoteRepo, pullRequestLookup, pullRequestLookups, selectPullRequest, worktreePullRequests };
+import { a as pullRequestLookup, c as selectPullRequest, i as parseRemoteRepo, l as worktreePullRequests, n as describePullRequest, o as pullRequestLookupAsync, r as endedPullRequest, s as pullRequestLookups, t as checkCounts } from "./pull-request-W1IuLXDt.mjs";
+export { checkCounts, describePullRequest, endedPullRequest, parseRemoteRepo, pullRequestLookup, pullRequestLookupAsync, pullRequestLookups, selectPullRequest, worktreePullRequests };

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

@@ -1,29 +1,31 @@
-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 { _ 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-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 { i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-Db8BqzxH.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-CTLNHCfE.mjs";
+import { Bn as checkEasAuth, Fn as processContext, Jn as resolveRemote, Un as loadProjectProvider, Xn as bundleInvocation, Y as statsProjectKey } from "./budget-DnPX3DXj.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-D9lEz4aq.mjs";
+import { o as resolveCcache } from "./ccache-RcAy92gH.mjs";
+import { _ as tailLines, h as startBuildHeartbeat, r as HEARTBEAT_INTERVAL_MS } from "./xcode-iQnROM5o.mjs";
+import { r as androidToolchainAsync, t as androidRequirements } from "./toolchain-CWeGJgCc.mjs";
+import { h as detectAppIds, m as detectAndroidPackage } from "./start-bjfiScgz.mjs";
+import { c as readProductFlavors, n as buildAndroid, s as productFlavorRefusal } from "./react-native-build-CmJkTljQ.mjs";
+import { t as readDoctorFingerprint } from "./doctor-fingerprint-DZLoYFVb.mjs";
+import { i as planEasDevelopmentBuild } from "./eas-build-CyjU5K7E.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-BFm63bQ0.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-DTBV56gy.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 { c as resolveAndroidRunPlan } from "./result-Cx5CRLvS.mjs";
+import { t as checkEasFallback } from "./eas-fallback-DV3Wytf1.mjs";
+import { n as androidProcessRuntime, t as androidMetroRuntime } from "./launch-Bz7JtaC4.mjs";
+import { n as planFlagRefusal, r as planPayload, t as planCachedBuild } from "./build-plan-C8CIvRyi.mjs";
+import { n as detectEntryFile, r as refreshUpdatesManifestFile, t as UPDATES_MANIFEST_NAME } from "./js-swap-C3QxUFJR.mjs";
+import { t as planHostedDevice } from "./plan-placement-BU42oOyT.mjs";
 import { constants, existsSync, mkdirSync, readFileSync, renameSync } from "node:fs";
 import { basename, dirname, isAbsolute, join, relative } from "node:path";
 import chalk from "chalk";
@@ -442,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 {
@@ -483,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,
@@ -533,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,
@@ -564,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",
@@ -578,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,
@@ -603,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,
@@ -619,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,
@@ -646,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 ? {
@@ -664,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.`,
@@ -797,10 +819,7 @@ function reactNativeAndroidArtifact({ operation, root, buildLog, writer, setting
 			beforePrepare();
 			step("prebuild");
 			recordPrebuild(root, "android", null);
-			const pre = await prebuild(root, "android", writer, {
-				isExpo,
-				clean: plan === "regenerate"
-			});
+			const pre = await prebuild(root, "android", writer, { isExpo });
 			if (pre.failed) throw new AndroidRecipeRefusal({
 				code: pre.code,
 				message: pre.reason,
@@ -811,7 +830,7 @@ function reactNativeAndroidArtifact({ operation, root, buildLog, writer, setting
 					logPath: displayPath(root, buildLog)
 				}
 			});
-			phase("prebuild", `${plan === "generate" ? "android/ generated" : "android/ not generated from this fingerprint -> regenerated with --clean"} (${formatDuration(pre.durationMs)})`);
+			phase("prebuild", `${plan === "generate" ? "android/ generated" : "android/ not generated from this fingerprint -> updated in place"} (${formatDuration(pre.durationMs)})`);
 		},
 		async reconcile() {
 			const rekeyedBy = [];
@@ -908,7 +927,7 @@ function reactNativeAndroidArtifact({ operation, root, buildLog, writer, setting
 			};
 		},
 		untrackedLine: () => untrackedMissLine(untracked({ projectRoot: root })),
-		legacyCache: target.abi || cas || profile || !buildPlan.cache.remote ? null : {
+		expoCache: target.abi || cas || profile || !buildPlan.cache.remote ? null : {
 			load: () => loadProvider(root, {
 				context: operation,
 				isExpo
@@ -924,6 +943,7 @@ function reactNativeAndroidArtifact({ operation, root, buildLog, writer, setting
 			}),
 			request: {
 				platform: "android",
+				cacheArtifact: buildPlan.cache.write && buildPlan.cache.remote,
 				isExpo,
 				android: {
 					variant,

package/dist/{react-native-build-rhk4smwQ.mjs → react-native-build-CmJkTljQ.mjs}

@@ -1,14 +1,14 @@
-import { s as spawnDeclared, t as getExecutor } from "./exec-_UbtCQcG.mjs";
+import { d as spawnDeclared, t as getExecutor } from "./exec-DEoAhcze.mjs";
 import { o as sharedCompilationCache } from "./paths-DQtTgsBf.mjs";
 import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { l as phaseLine } from "./command-output-B1UrjZHL.mjs";
-import { qt as killOnAbort } from "./settings-CsJDEXgK.mjs";
-import { C as resolvePackageJson } from "./project-BZNjmW_8.mjs";
-import { r as register } from "./cache-manifest-DkkqguoK.mjs";
-import { o as androidHome } from "./android-DUYkNF4u.mjs";
+import { l as phaseLine } from "./command-output-Db8BqzxH.mjs";
+import { a as killOnAbort } from "./operation-exec-BW0em61G.mjs";
+import { C as resolvePackageJson } from "./project-CTLNHCfE.mjs";
+import { r as register } from "./cache-manifest-DSeQjt-Q.mjs";
+import { o as androidHome } from "./android-C7sVmyI9.mjs";
 import { p as resolveOptimizations } from "./errors-ccaPc4ox.mjs";
-import { a as readCcacheActivity, n as CCACHE_UNAVAILABLE } from "./ccache-BJRZ9pG3.mjs";
-import { a as buildXcode, d as pickXcodeProject, g as swiftPrefixMappingSupported, h as startBuildHeartbeat, i as SWIFT_PREFIX_MAPPING_MIN_SWIFT, l as parseSwiftVersion, r as HEARTBEAT_INTERVAL_MS, s as compilationCacheSettings, u as parseXcodeMajor } from "./xcode-Zlx3qjEs.mjs";
+import { a as readCcacheActivity, n as CCACHE_UNAVAILABLE } from "./ccache-RcAy92gH.mjs";
+import { a as buildXcode, d as pickXcodeProject, g as swiftPrefixMappingSupported, h as startBuildHeartbeat, i as SWIFT_PREFIX_MAPPING_MIN_SWIFT, l as parseSwiftVersion, r as HEARTBEAT_INTERVAL_MS, s as compilationCacheSettings, u as parseXcodeMajor } from "./xcode-iQnROM5o.mjs";
 import { createHash } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, statSync } from "node:fs";
 import { dirname, isAbsolute, join, relative, sep } from "node:path";

package/dist/{react-native-doctor-CQpuIMso.mjs → react-native-doctor-LTF-Xt8l.mjs}

@@ -1,10 +1,10 @@
-import { t as getExecutor } from "./exec-_UbtCQcG.mjs";
-import { l as phaseLine } from "./command-output-B1UrjZHL.mjs";
-import { K as resolveIosProjectDir, W as resolveAndroidLayout } from "./settings-CsJDEXgK.mjs";
-import { v as detectIsExpo } from "./project-BZNjmW_8.mjs";
-import { b as bundlerPin } from "./xcode-Zlx3qjEs.mjs";
-import { i as iosToolchainAsync, n as androidToolchain, r as androidToolchainAsync, t as androidRequirements } from "./toolchain-Hp9sCpK4.mjs";
-import { a as reactNativeDoctorFindings, i as mainCheckoutProjectRoot, n as detectFingerprintParity, r as detectLinkedLibraryGitMetadata, s as repairCxxLauncherState, t as checkMainCheckout } from "./doctor-DTvaDOda.mjs";
+import { t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { l as phaseLine } from "./command-output-Db8BqzxH.mjs";
+import { K as resolveIosProjectDir, W as resolveAndroidLayout } from "./settings-C7O8A6ZI.mjs";
+import { v as detectIsExpo } from "./project-CTLNHCfE.mjs";
+import { b as bundlerPin } from "./xcode-iQnROM5o.mjs";
+import { a as iosToolchainAsync, n as androidToolchain, r as androidToolchainAsync, t as androidRequirements } from "./toolchain-CWeGJgCc.mjs";
+import { a as reactNativeDoctorFindings, i as mainCheckoutProjectRoot, n as detectFingerprintParity, r as detectLinkedLibraryGitMetadata, s as repairCxxLauncherState, t as checkMainCheckout } from "./doctor-8sr2tFOL.mjs";
 import { existsSync, readdirSync } from "node:fs";
 import { join, relative } from "node:path";
 //#region src/diagnostics/doctor-ios-architectures.ts