stim 1.20.2 → 1.21.0

package/dist/{android-DCKZrNvV.mjs → android-BLgbNqox.mjs}

@@ -1,50 +1,48 @@
-import { E as upsertProject, K as validateDeviceSlot, U as parseDeviceSlotOption, V as deviceSlotPlatforms, j as ownership_claim_exports, p as getProject, u as getConcurrencyLimits, z as deviceSlotFileKey } from "./config-BYDxlMY3.mjs";
-import { t as getExecutor } from "./exec-DqKo9GKJ.mjs";
-import { I as projectSettingsContext, K as resolveProjectSettings, L as publicUrlSetting, N as metroWarmupUrlSetting, V as remoteEasFallbackSetting, W as resolveCacheProviderConfig, a as SETTING_SHAPE_REMEDY, g as deviceReclaimIdleMinutesSetting, j as metroPortSetting, ot as detectProviders, q as resolveSettings, tt as tunnelModeSetting } from "./settings-B717odTD.mjs";
-import { _ as waitForBuild, g as releaseBuildLock, m as acquireBuildLock } from "./device-lease-BX1sJQ2E.mjs";
-import { c as writeWorkspaceState, f as emulatorLogFile, i as recordWorkspaceUse, r as readWorkspaceState$1, w as workspaceLogsDir$1 } from "./workspace-state-DJt_MMvf.mjs";
-import { _ as stepTimer, f as refuseNoProject, g as stepClock, i as formatDuration, l as phaseLine } from "./command-output-BTy8hZ0F.mjs";
-import { I as workspaceDevServerMode, R as writeWorkspaceLaunch, c as projectShortcut, d as projectRegistry, r as findProjectRoot, t as NO_PROJECT_REFUSAL } from "./project-_phNIJfs.mjs";
-import { G as probeEmulatorSerial, J as resolveOwnedAvdSerial, O as listAdbDevices, U as physicalDeviceModel, Y as resolvePhysicalDevice, a as androidDeviceAbi, ht as configuredAndroidEmulatorApp, j as listInstalledSystemImages, tt as waitForBoot } from "./android-Mz_Inn3w.mjs";
-import { s as pidExists, u as resolveProjectMetro } from "./metro-DnCEjCxs.mjs";
-import { F as acquireBuildSlot, L as releaseBuildSlot } from "./workspaces-C36s2jb9.mjs";
-import { At as createRunRecorder, Ft as recordRunStats, It as statsProjectKey$1, Nt as recordCapacityRefusal, Ot as startBuildProgress, jt as readRunEstimates, kt as tapBuildLog, t as budgetGate, yt as NO_BUILD_PROGRESS } from "./budget-f7516Zk0.mjs";
-import { S as withNativeBuildRun, b as runCancellation, p as cancelledFailure, x as runCancellationSignal } from "./tailnet-Dh-qiYzG.mjs";
-import { r as createNdjsonWriter } from "./ndjson-GOnbyvso.mjs";
-import { f as resolveEasCliBin, i as checkEasAuth, m as uploadRemote, p as resolveRemote } from "./remote-cache-OyOyVIS3.mjs";
-import { f as setRemoteLogSink, g as parseBuildMachineOption, y as resolveBuildPlacement } from "./client-qQAaXSUs.mjs";
-import { c as startDevServer } from "./start-BWqzODpb.mjs";
-import { d as verifyAndroidReleaseLaunch, f as verifyLaunch } from "./launch-verify-B6Q8hZP-.mjs";
-import { b as launchAndroidApp, g as installAndroidApp, r as DEFAULT_METRO_PORT, t as ADB_INSTALL_TIMEOUT_MS, x as launchAndroidReleaseApp } from "./app-install-BIKtMfPq.mjs";
-import { n as ensureWorkspaceStorageSafely, r as isPhysicalDeviceRequest, t as ensureDevServer } from "./native-runtime-k8dTIrbK.mjs";
-import { n as devicePlacementRecord } from "./placement-log-MOfPVgaM.mjs";
-import { t as CCACHE_NOT_RUN } from "./ccache-zdKiYQ3E.mjs";
-import { n as DeviceAdmissionRefusal, r as checkDeviceCapacity } from "./device-capacity-CBUAcRyQ.mjs";
-import { S as pooledAndroidDevice, a as PLATFORM, b as noDeviceDiagnostic, g as dumpApkManifest, h as displayPath, o as androidBuildOptions, p as apkPackage, r as NO_DEVICE, s as androidDevClientScheme } from "./support-DMTqj3Hm.mjs";
-import { r as resolveAndroidRunPlan, t as androidDeviceSelectorRefusal } from "./plan-C4TjdPsR.mjs";
-import { t as acquireAndroidArtifact } from "./artifact-D3czlUvT.mjs";
-import { a as acquireRunLease, d as runLease, f as waitFlagConflict, o as leaseExpiryText, u as releaseLeaseOnSignal } from "./device-lease-run-Cw2M4z51.mjs";
-import { a as reportAndroidResult, i as persistLastBuild, n as finishAndroidUpload } from "./result-CaJg5Iat.mjs";
-import { r as hostedMetroSettings } from "./metro-gateway-CX9Xlkq2.mjs";
-import { a as writeHostedAndroid, i as writeDevicePlacement, t as readHostedAndroid } from "./ios-state-CBLe1xYw.mjs";
-import { a as refusePlan, c as devicePlacementLine, i as printPlan, n as planFlagRefusal, o as checkEasFallback, s as automaticDevicePlacement } from "./build-plan-B7SZsc2N.mjs";
-import { n as prepareHostedAndroid, t as placeHostedAndroid } from "./hosted-android-C3MHGld1.mjs";
-import { r as siblingPlatformSlots, t as launchSlotScope } from "./slot-launch-DPt0m9Nd.mjs";
-import { S as ownedSessionName, a as ensureMetroReachable, c as remoteAndroidDeps, n as binOnPath, o as ensureRemoteBootOwned, u as resolveRemoteContext } from "./device-remote-xRT0Vmo9.mjs";
-import { a as resolveEasDevelopmentBuild, r as isEasBuildFailure } from "./eas-build-JyfqyHfC.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-DCtw_2IA.mjs";
-import { a as AvdRecoveryError, i as AvdBootError, n as ensureBooted, o as warmMetro, r as ensureOwnedDevice, t as didSetUpDevice } from "./device-BECOiufl.mjs";
-import { t as selectFromPool } from "./device-pool-Bf-pOhSw.mjs";
-import { r as finishAndroidRun } from "./launch-F4sOqAhB.mjs";
+import { f as ownership_claim_exports, t as getExecutor } from "./exec-_UbtCQcG.mjs";
+import { m as workspaceLogsDir$1, t as emulatorLogFile } from "./paths-DQtTgsBf.mjs";
+import { E as upsertProject, G as parseDeviceSlotOption, J as validateDeviceSlot, U as deviceSlotPlatforms, V as deviceSlotFileKey, p as getProject, u as getConcurrencyLimits } from "./config-CYcBF478.mjs";
+import { _ as stepTimer, f as refuseNoProject, g as stepClock, i as formatDuration, l as phaseLine } from "./command-output-B1UrjZHL.mjs";
+import { d as writeWorkspaceState, i as recordWorkspaceUse, r as readWorkspaceState$1 } from "./workspace-state-Cjuigeeu.mjs";
+import { G as resolveCacheProviderConfig, H as remoteEasFallbackSetting, J as resolveProjectSettingsAsync, L as projectSettingsContextAsync, N as metroWarmupUrlSetting, R as publicUrlSetting, Y as resolveSettings, a as SETTING_SHAPE_REMEDY, ct as detectProviders, g as deviceReclaimIdleMinutesSetting, j as metroPortSetting, rt as tunnelModeSetting } from "./settings-CsJDEXgK.mjs";
+import { L as workspaceDevServerMode, f as projectRegistry, i as findProjectRoot$1, l as projectShortcut, t as NO_PROJECT_REFUSAL, z as writeWorkspaceLaunch } from "./project-BZNjmW_8.mjs";
+import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
+import { f as resolveProjectMetro, l as pidExists } from "./metro-DEXpIhHC.mjs";
+import { Bn as checkEasAuth, Bt as ensureMetroReachable, Cn as launchAndroidApp, Gt as resolveRemoteContext, H as tapBuildLog, In as runProcessOperation, J as recordRunStats, Jn as resolveRemote, K as recordCapacityRefusal, Lt as binOnPath, M as NO_BUILD_PROGRESS, Pn as exitAfterFlush, U as createRunRecorder, Ut as remoteAndroidDeps, V as startBuildProgress, Vt as ensureRemoteBootOwned, W as readRunEstimates, Y as statsProjectKey$1, Yn as uploadRemote, cn as DEFAULT_METRO_PORT, in as verifyLaunch, qn as resolveEasCliBin, rn as verifyAndroidReleaseLaunch, rr as ownedSessionName, sn as ADB_INSTALL_TIMEOUT_MS, t as budgetGate, wn as launchAndroidReleaseApp, yn as installAndroidApp } from "./budget-Bs6SxxzO.mjs";
+import { d as runCancellationSignal, f as withNativeBuildRun, r as cancelledFailure, u as runCancellation } from "./native-run-DY_RLx3C.mjs";
+import { F as acquireBuildSlot, L as releaseBuildSlot } from "./workspaces-BccMFmGQ.mjs";
+import { F as waitForBuild, M as acquireBuildLock, P as releaseBuildLock } from "./activity-BzVfHSrY.mjs";
+import { $ as resolvePhysicalDevice, P as listInstalledSystemImages, Q as resolveOwnedAvdSerialAsync, Y as probeEmulatorSerial, a as androidDeviceAbi, it as waitForBoot, k as listAdbDevices, ot as configuredAndroidEmulatorApp, q as physicalDeviceModel } from "./android-DUYkNF4u.mjs";
+import { t as CCACHE_NOT_RUN } from "./ccache-BJRZ9pG3.mjs";
+import { f as setRemoteLogSink } from "./client-UXD70ZbM.mjs";
+import { i as parseBuildMachineOption, s as resolveBuildPlacement } from "./selection-CSl9i5qU.mjs";
+import { r as hostedMetroSettings } from "./metro-gateway-BMJNlj3E.mjs";
+import { a as writeHostedAndroid, i as writeDevicePlacement, t as readHostedAndroid } from "./ios-state-DvFX-K_l.mjs";
+import { n as prepareHostedAndroid, t as placeHostedAndroid } from "./hosted-android-Bw-honsd.mjs";
+import { n as verifyCollectorOwnership } from "./ownership-DEmM5vhh.mjs";
+import { r as siblingPlatformSlots, t as launchSlotScope } from "./slot-launch-DF8VfT64.mjs";
+import { a as acquireRunLease, d as runLease, f as waitFlagConflict, o as leaseExpiryText, u as releaseLeaseOnAbort } from "./device-lease-run-C8raGFoP.mjs";
+import { n as DeviceAdmissionRefusal, r as checkDeviceCapacity } from "./device-capacity-CMlqEcvw.mjs";
+import { a as resolveEasDevelopmentBuild, r as isEasBuildFailure } from "./eas-build-BomfRnFT.mjs";
+import { c as startDevServer } from "./start-7lpH7hmN.mjs";
+import { n as ensureWorkspaceStorageSafely, r as isPhysicalDeviceRequest, t as ensureDevServer } from "./native-runtime-Dg1Q7tfF.mjs";
+import { n as devicePlacementRecord } from "./placement-log-BqGbTa61.mjs";
+import { S as pooledAndroidDevice, a as PLATFORM, b as noDeviceDiagnostic, g as dumpApkManifest, h as displayPath, o as androidBuildOptions, p as apkPackage, r as NO_DEVICE, s as androidDevClientScheme } from "./support-67vraa1Q.mjs";
+import { t as acquireAndroidArtifact } from "./artifact-DAuZ-FNU.mjs";
+import { a as reportAndroidResult, c as resolveAndroidRunPlan, i as persistLastBuild, n as finishAndroidUpload, o as androidDeviceSelectorRefusal } from "./result-DNiS-tTP.mjs";
+import { n as automaticDevicePlacement, r as devicePlacementLine, t as checkEasFallback } from "./eas-fallback-DJwZpy0c.mjs";
+import { a as AvdRecoveryError, i as AvdBootError, n as ensureBooted, o as warmMetro, r as ensureOwnedDevice, t as didSetUpDevice } from "./device-ExJq8Ei7.mjs";
+import { t as selectFromPool } from "./device-pool-DMRpVX9a.mjs";
+import { r as finishAndroidRun } from "./launch-CD1yVc7U.mjs";
 import { t as unsupportedPlan } from "./project-plan-BPwbLwQu.mjs";
+import { a as refusePlan, i as printPlan, n as planFlagRefusal } from "./build-plan-CaFskB7_.mjs";
 import { basename, join } from "node:path";
-import { hostedAndroidStatus, parseMachine } from "@stim-cli/core/state";
-import { loadCacheProvider } from "@stim-cli/cache";
 import { workspaceId } from "@stim-cli/core";
-import { InvalidArgumentError } from "commander";
+import { hostedAndroidStatus, parseMachine } from "@stim-cli/core/state";
 import chalk from "chalk";
+import { InvalidArgumentError } from "commander";
+import { loadCacheProvider } from "@stim-cli/cache";
 //#region src/commands/android/remote.ts
-async function connectAndroidHosting({ root, slot, machine, release, appMode = release ? "release" : "development", metroCheck, selectors, read = readHostedAndroid, resolveSerial = resolveOwnedAvdSerial, prepare = prepareHostedAndroid }) {
+async function connectAndroidHosting({ root, slot, machine, release, appMode = release ? "release" : "development", metroCheck, selectors, read = readHostedAndroid, resolveSerial = resolveOwnedAvdSerialAsync, prepare = prepareHostedAndroid }) {
 	let recorded;
 	try {
 		recorded = read(root, slot)[slot];
@@ -69,12 +67,12 @@ async function connectAndroidHosting({ root, slot, machine, release, appMode = r
 	if (local?.owned && local.avdName) {
 		let running = true;
 		try {
-			const resolved = resolveSerial(local.avdName, { timeoutMs: 5e3 });
+			const resolved = await resolveSerial(local.avdName, { timeoutMs: 5e3 });
 			running = Boolean(resolved.serial) || !resolved.notRunning && !resolved.missing;
 		} catch {}
 		if (running) return { failure: {
 			code: "STIM_BAD_ARG",
-			message: `This workspace's Android emulator for slot ${slot} runs on this Mac; run stim stop first.`
+			message: `This workspace's Android emulator for slot ${slot} runs on this machine; run stim stop first.`
 		} };
 	}
 	try {
@@ -184,7 +182,7 @@ async function selectAndroidPlacement({ target: selected, automatic = automaticD
 //#endregion
 //#region src/commands/android/hosted.ts
 async function finishHostedAndroidRun({ target, artifact, root, slot = "default", release, appMode = release ? "release" : "development", isExpo, metroPort, logsDir, selectors, place, writePlacement, verifyLaunch: verify, writeLaunch, readApkPackage, resolveDevClientScheme, now, started, startedAt, fail, phase, enterPhase, out, recordBuild, ...report }) {
-	const packageName = artifact.androidPackage ?? readApkPackage(artifact.apkPath);
+	const packageName = artifact.androidPackage ?? await readApkPackage(artifact.apkPath);
 	if (!artifact.apkPath || !packageName) return fail("STIM_INSTALL_FAILED", "The built APK has no package identity.");
 	const launchedAt = now();
 	try {
@@ -198,7 +196,7 @@ async function finishHostedAndroidRun({ target, artifact, root, slot = "default"
 			...appMode === "process" ? { mode: appMode } : {},
 			metroPort,
 			selectors,
-			...appMode === "development" && isExpo ? { devClientScheme: resolveDevClientScheme(root, artifact.apkPath) ?? void 0 } : {},
+			...appMode === "development" && isExpo ? { devClientScheme: await resolveDevClientScheme(root, artifact.apkPath) ?? void 0 } : {},
 			reserved: (placement) => writePlacement(root, slot, placement),
 			note: out,
 			enterPhase
@@ -222,7 +220,7 @@ async function finishHostedAndroidRun({ target, artifact, root, slot = "default"
 				metroPort,
 				mode: workspaceDevServerMode(root, isExpo),
 				slot: launchSlotScope(root, slot),
-				platformShared: siblingPlatformSlots(root, "android", slot).length > 0
+				platformShared: (await siblingPlatformSlots(root, "android", slot)).length > 0
 			});
 			if (evidence.fatal) return fail("STIM_LAUNCH_FAILED", "Metro could not deliver the hosted app bundle.", "Run stim logs --errors and fix the bundle error.");
 			launched = evidence.verified ? true : evidence.requested ? "bundling" : "unverified";
@@ -246,6 +244,7 @@ async function finishHostedAndroidRun({ target, artifact, root, slot = "default"
 			ok: true,
 			facts: reportAndroidResult({
 				...report,
+				out,
 				...appMode === "process" ? { runtimeKind: "process" } : {},
 				root,
 				slot,
@@ -267,7 +266,7 @@ async function finishHostedAndroidRun({ target, artifact, root, slot = "default"
 			})
 		};
 	} catch (error) {
-		return fail(error.code ?? "STIM_HOSTING_REFUSED", error.message, `Retry stim android --remote ${target.host.machine}, or run stim stop to reconcile the recorded placement.`);
+		return fail(error.code ?? "STIM_HOSTING_REFUSED", error.message, `Retry stim android --remote ${target.host.machine}, or run stim stop to reconcile the recorded placement.`, { lastBuildStatus: true });
 	}
 }
 //#endregion
@@ -281,7 +280,7 @@ function runOnlyFlag(opts) {
 }
 async function planAndroid(opts, overrides = {}) {
 	const deps = {
-		findRoot: findProjectRoot,
+		findRoot: findProjectRoot$1,
 		projectRegistry,
 		...overrides
 	};
@@ -295,12 +294,13 @@ async function planAndroid(opts, overrides = {}) {
 		code: "STIM_NO_PROJECT",
 		...selected.problem
 	}, json);
-	const resolved = resolveProjectSettings(root);
-	const project = await selected.load(resolved);
-	if (!project.plan) return refusePlan(unsupportedPlan("android"), json);
-	const result = await project.plan(opts, resolved);
+	const resolved = await resolveProjectSettingsAsync(root);
+	const planner = (await selected.load(resolved)).plan;
+	if (!planner) return refusePlan(unsupportedPlan("android"), json);
+	const { value: result, interrupted } = await runProcessOperation(root, (operation) => planner(opts, resolved, operation));
 	if ("platform" in result) printPlan(result, json);
 	else refusePlan(result.refusal, json, result.lines);
+	if (interrupted) process.exitCode = interrupted;
 }
 //#endregion
 //#region src/commands/android.ts
@@ -308,38 +308,41 @@ function androidCommand(program) {
 	registerAndroid(program);
 }
 function registerAndroid(program) {
-	program.command("android").description("Build (or install from the shared cache), install and launch this workspace's Android app on its owned emulator. React Native and Expo Debug runs start the dev server when it is not running.").option("--eas-profile <name>", "Download a matching EAS development build; on a miss, print the build command without running it").option("--slot <name>", "Reusable device slot within this workspace (default: default)", parseDeviceSlotOption).option("--remote-build <value>", "Build on auto, local, or one named machine; a name refuses without fallback", parseBuildMachineOption).option("--json", "Emit the facts as a single JSON line on stdout; every other line goes to stderr").option("--plan", "Predict the next build without building, booting or installing: resolve the fingerprint, check the local then remote cache, and print the expected cache result and duration. Writes no Stim state.").option("--no-metro-check", "Skip the reserved-port Metro health check and do not start it (the app will load no bundle unless something else serves it)").option("--no-build-cache", "Build fresh, ignoring cached artifacts (local and the project's build-cache provider); the fresh build still replaces the cache entry").option("--variant <name>", "Gradle variant to assemble and install (e.g. productionDebug on a flavored project); overrides the android.variant setting. A variant ending in Release embeds the JS bundle and skips Metro entirely. Default: debug").option("--system-image <id>", "Android system image to create this workspace's owned AVD from, as the sdkmanager package id (e.g. \"system-images;android-36;google_apis;arm64-v8a\"). Overrides the android.systemImage setting for this invocation. An unknown id refuses with STIM_BAD_ARG and prints the installed images.").option("--device-profile <id>", "Hardware profile to create this workspace's owned AVD with, as an `avdmanager list device -c` id (e.g. \"pixel_fold\", \"pixel_tablet\"). Overrides the android.deviceProfile setting for this invocation. An unknown id refuses with STIM_BAD_ARG and prints the available ids.").option("--device [serial]", "Install and launch on a connected physical device instead of this workspace's owned emulator. With no serial, the first connected device this workspace can lease is used. Stim never creates, boots, or deletes a physical device.").option("--remote <target>", "Run on eas, proxy, or a named approved Mac from remote.machines; auto places on an approved Mac when this Mac is full or busy; local runs here, whatever android.remote says", (value) => {
+	program.command("android").description("Build (or install from the shared cache), install and launch this workspace's Android app on its owned emulator. React Native and Expo Debug runs start the dev server when it is not running.").option("--eas-profile <name>", "Download a matching EAS development build; on a miss, print the build command without running it").option("--slot <name>", "Reusable device slot within this workspace (default: default)", parseDeviceSlotOption).option("--remote-build <value>", "Build on auto, local, or one named machine; a name refuses without fallback", parseBuildMachineOption).option("--json", "Emit the facts as a single JSON line on stdout; every other line goes to stderr").option("--plan", "Predict the next build without building, booting or installing: resolve the fingerprint, check the local then remote cache, and print the expected cache result and duration. Writes no Stim state.").option("--no-metro-check", "Skip the reserved-port Metro health check and do not start it (the app will load no bundle unless something else serves it)").option("--no-build-cache", "Build fresh, ignoring cached artifacts (local and the project's build-cache provider); the fresh build still replaces the cache entry").option("--variant <name>", "Gradle variant to assemble and install (e.g. productionDebug on a flavored project); overrides the android.variant setting. A variant ending in Release embeds the JS bundle and skips Metro entirely. Default: debug").option("--system-image <id>", "Android system image to create this workspace's owned AVD from, as the sdkmanager package id (e.g. \"system-images;android-36;google_apis;arm64-v8a\"). Overrides the android.systemImage setting for this invocation. An unknown id refuses with STIM_BAD_ARG and prints the installed images.").option("--device-profile <id>", "Hardware profile to create this workspace's owned AVD with, as an `avdmanager list device -c` id (e.g. \"pixel_fold\", \"pixel_tablet\"). Overrides the android.deviceProfile setting for this invocation. An unknown id refuses with STIM_BAD_ARG and prints the available ids.").option("--device [serial]", "Install and launch on a connected physical device instead of this workspace's owned emulator. With no serial, the first connected device this workspace can lease is used. Stim never creates, boots, or deletes a physical device.").option("--remote <target>", "Run on eas, proxy, or a named approved Mac from remote.machines; auto places on an approved Mac when this machine is full or busy; local runs here, whatever android.remote says", (value) => {
 		if (!parseMachine(value)) throw new InvalidArgumentError("expected eas, proxy, auto, local, or a tailnet machine name");
 		return value;
 	}).option("--wait <seconds>", "How long to wait for another workspace to release the device it leases, before refusing with STIM_DEVICE_BUSY (default 60, 0 refuses at once). Without --device, wait for an owned-device slot (default 600 seconds; --no-wait refuses immediately).").option("--no-wait", "Install on a device another workspace leases instead of waiting: this run takes no lease and, when both workspaces build the same app id, the install terminates the holder's running app. Without --device, refuse a full device cap or existing slot queue immediately.").action(async (opts) => {
 		if (opts.plan) return planAndroid(opts);
-		const root = findProjectRoot(process.cwd());
+		const root = findProjectRoot$1(process.cwd());
 		if (!root) {
 			refuseNoProject({ json: Boolean(opts.json) });
 			return;
 		}
-		if (!(await runAndroidOperation(root, {
+		const { value: result, interrupted } = await runProcessOperation(root, (context) => runAndroidOperation(context, root, {
 			...opts,
 			waitConflict: waitFlagConflict(process.argv)
-		})).ok) process.exit(runCancellation() ? 130 : 1);
+		}));
+		if (!result.ok) process.exit(interrupted ?? 1);
+		else if (result.uploadsAbandoned) exitAfterFlush(0);
 	});
 }
-function runAndroidOperation(root, opts = {}) {
-	return withNativeBuildRun(root, {
+function runAndroidOperation(context, root, opts = {}) {
+	return withNativeBuildRun(context, root, {
 		command: "android",
 		platform: PLATFORM,
 		slot: opts.slot ?? "default"
 	}, async (claim) => {
-		recordWorkspaceUse(root);
+		recordWorkspaceUse(root, /* @__PURE__ */ new Date(), context.env, context.cwd);
 		const progress = startBuildProgress({
 			root,
 			platform: PLATFORM,
 			slot: opts.slot ?? "default",
 			claim,
-			note: (line) => console.error(chalk.dim(line))
+			note: (line) => context.output("stderr", `${chalk.dim(line)}\n`)
 		});
 		try {
 			return await runAndroid({
+				context,
 				root,
 				buildMachine: opts.remoteBuild,
 				slot: opts.slot,
@@ -359,9 +362,12 @@ function runAndroidOperation(root, opts = {}) {
 		} finally {
 			progress.clear();
 		}
-	}, { write: (line) => console.error(chalk.dim(phaseLine("lock", line))) });
+	}, { write: (line) => context.output("stderr", `${chalk.dim(phaseLine("lock", line))}\n`) });
 }
-function resolveRunAndroidOptions({ root, json = false, remoteDevice: commandRemoteBackend = null, resolveSettingsFor = resolveSettings, resolveRemoteDeviceContext = resolveRemoteContext, remoteDeviceDeps: makeRemoteDeviceDeps = remoteAndroidDeps, resolveEasBin = resolveEasCliBin, ensureMetroReachable: ensureRemoteMetro = ensureMetroReachable, ensureRemoteBootOwned: ensureRemoteOwned = ensureRemoteBootOwned, detectRemoteProviders = detectProviders, metroCheck = true, useBuildCache = true, easProfile, resolveEasDevelopmentBuild: resolveEasBuild = resolveEasDevelopmentBuild, variant: variantFlag = null, systemImage: systemImageFlag = null, deviceProfile: deviceProfileFlag, device: deviceFlag = null, wait: waitFlag = void 0, waitConflict = false, acquireLease = acquireRunLease, makeRunLease = runLease, selectPool = selectFromPool, onLeaseSignal = releaseLeaseOnSignal, listDevices = listAdbDevices, deviceModel = physicalDeviceModel, deviceAbi = androidDeviceAbi, isEmulatorDevice = probeEmulatorSerial, readApkPackage = (apkPath) => apkPackage(dumpApkManifest(apkPath)), getLimits = getConcurrencyLimits, checkCapacity = checkDeviceCapacity, acquireSlot = acquireBuildSlot, releaseSlot = releaseBuildSlot, ensureDevice = ensureOwnedDevice, listSystemImages = listInstalledSystemImages, listDeviceProfiles, ensureDeviceBooted = ensureBooted, resolveAvdSerial = resolveOwnedAvdSerial, waitForDeviceBoot = waitForBoot, dataFreeBytes, trimCaches, wipeDevice, resolveMetro = resolveProjectMetro, warmMetro: prewarmMetro = warmMetro, startServer = startDevServer, readState = readWorkspaceState$1, pidAlive = pidExists, verifyCollector = verifyCollectorOwnership, verifyLaunched = verifyLaunch, ensureStorage = ensureWorkspaceStorageSafely, acquireLock = acquireBuildLock, releaseLock = releaseBuildLock, waitForBuild: waitForBuild$1 = waitForBuild, easAuth = checkEasAuth, resolveRemoteBuild = resolveRemote, uploadRemoteBuild = uploadRemote, resolveCacheProvider = resolveCacheProviderConfig, loadCacheProviderModule = loadCacheProvider, install = installAndroidApp, launch = launchAndroidApp, launchRelease = launchAndroidReleaseApp, verifyReleaseLaunched = verifyAndroidReleaseLaunch, resolveDevClientScheme = androidDevClientScheme, spawn = (cmd, args, opts) => getExecutor().spawn(cmd, args, opts), kill = (pid, signal) => process.kill(pid, signal), createWriter = createNdjsonWriter, writeLaunch = writeWorkspaceLaunch, writeState = writeWorkspaceState, recordBuild, recordStats = recordRunStats, recordCapacityRefusal: recordRefusal, readEstimates = readRunEstimates, now = Date.now, out = (line) => console.error(line), emit = (line) => console.log(line) } = {}) {
+function resolveRunAndroidOptions({ context, root, json = false, remoteDevice: commandRemoteBackend = null, resolveSettingsFor = resolveSettings, resolveRemoteDeviceContext = resolveRemoteContext, remoteDeviceDeps: makeRemoteDeviceDeps = remoteAndroidDeps, resolveEasBin = resolveEasCliBin, ensureMetroReachable: ensureRemoteMetro = ensureMetroReachable, ensureRemoteBootOwned: ensureRemoteOwned = ensureRemoteBootOwned, detectRemoteProviders = detectProviders, metroCheck = true, useBuildCache = true, easProfile, resolveEasDevelopmentBuild: resolveEasBuild = resolveEasDevelopmentBuild, variant: variantFlag = null, systemImage: systemImageFlag = null, deviceProfile: deviceProfileFlag, device: deviceFlag = null, wait: waitFlag = void 0, waitConflict = false, acquireLease = acquireRunLease, makeRunLease = runLease, selectPool = selectFromPool, onLeaseSignal = releaseLeaseOnAbort, listDevices = listAdbDevices, deviceModel = physicalDeviceModel, deviceAbi = androidDeviceAbi, isEmulatorDevice = probeEmulatorSerial, readApkPackage = async (apkPath) => apkPackage(await dumpApkManifest(apkPath, { context })), getLimits = getConcurrencyLimits, checkCapacity = checkDeviceCapacity, acquireSlot = acquireBuildSlot, releaseSlot = releaseBuildSlot, ensureDevice = ensureOwnedDevice, listSystemImages = listInstalledSystemImages, listDeviceProfiles, ensureDeviceBooted = ensureBooted, resolveAvdSerial = resolveOwnedAvdSerialAsync, waitForDeviceBoot = waitForBoot, dataFreeBytes, trimCaches, wipeDevice, resolveMetro = resolveProjectMetro, warmMetro: prewarmMetro = warmMetro, startServer = startDevServer, readState = readWorkspaceState$1, pidAlive = pidExists, verifyCollector = verifyCollectorOwnership, verifyLaunched = verifyLaunch, ensureStorage = ensureWorkspaceStorageSafely, acquireLock = acquireBuildLock, releaseLock = releaseBuildLock, waitForBuild: waitForBuild$1 = waitForBuild, easAuth = checkEasAuth, resolveRemoteBuild = resolveRemote, uploadRemoteBuild = uploadRemote, resolveCacheProvider = resolveCacheProviderConfig, loadCacheProviderModule = loadCacheProvider, install = installAndroidApp, launch = launchAndroidApp, launchRelease = launchAndroidReleaseApp, verifyReleaseLaunched = verifyAndroidReleaseLaunch, resolveDevClientScheme = (projectRoot, apkPath, options) => androidDevClientScheme(projectRoot, apkPath, {
+	...options,
+	context
+}), spawn = (cmd, args, opts) => getExecutor().spawn(cmd, args, opts), kill = (pid, signal) => process.kill(pid, signal), createWriter = createNdjsonWriter, writeLaunch = writeWorkspaceLaunch, writeState = writeWorkspaceState, recordBuild, recordStats = recordRunStats, recordCapacityRefusal: recordRefusal, readEstimates = readRunEstimates, now = Date.now, out = (line) => context ? context.output("stderr", `${line}\n`) : console.error(line), emit = (line) => context ? context.output("stdout", `${line}\n`) : console.log(line) } = {}) {
 	return {
 		root,
 		json,
@@ -498,6 +504,7 @@ function avdSetupFailure(error, root, logFile) {
 	};
 }
 async function runAndroid(options = {}) {
+	const { context } = options;
 	let { root, json, commandRemoteBackend, resolveSettingsFor, resolveRemoteDeviceContext, makeRemoteDeviceDeps, resolveEasBin, ensureRemoteMetro, ensureRemoteOwned, detectRemoteProviders, metroCheck, useBuildCache: requestedBuildCache, easProfile, resolveEasBuild, variantFlag, systemImageFlag, deviceProfileFlag, deviceFlag, waitFlag, waitConflict, acquireLease, makeRunLease, selectPool, onLeaseSignal, listDevices, deviceModel, deviceAbi, isEmulatorDevice, readApkPackage, getLimits, checkCapacity, acquireSlot, releaseSlot, ensureDevice, listSystemImages, listDeviceProfiles, ensureDeviceBooted, resolveAvdSerial, waitForDeviceBoot, dataFreeBytes, trimCaches, wipeDevice, resolveMetro, prewarmMetro, startServer, readState, pidAlive, verifyCollector, verifyLaunched, ensureStorage, acquireLock, releaseLock, waitForBuild, easAuth, resolveRemoteBuild, uploadRemoteBuild, resolveCacheProvider, loadCacheProviderModule, install, launch, launchRelease, verifyReleaseLaunched, resolveDevClientScheme, spawn, kill, createWriter, writeLaunch, writeState, recordBuild, recordStats, recordCapacityRefusal: recordRefusal = recordCapacityRefusal, readEstimates, now, out, emit } = androidSlotOptions(options);
 	const progress = options.progress ?? NO_BUILD_PROGRESS;
 	const slot = validateDeviceSlot(options.slot);
@@ -553,7 +560,7 @@ async function runAndroid(options = {}) {
 			slot
 		}
 	}), progress);
-	setRemoteLogSink((entry) => writer.write(entry));
+	setRemoteLogSink(context, (entry) => writer.write(entry));
 	const record = {
 		fingerprint: null,
 		cacheKey: null,
@@ -576,7 +583,7 @@ async function runAndroid(options = {}) {
 	let ccacheActivity = CCACHE_NOT_RUN;
 	let reclaimed = [];
 	const fail = (code, message, remedy, { lastBuildStatus = false, setup = false, diagnostics = [], buildDiagnostics: rawDiagnostics = [], lines = [], logPath = null, lease } = {}) => {
-		const cancellation = cancelledFailure(PLATFORM, {
+		const cancellation = cancelledFailure(context, PLATFORM, {
 			code,
 			message
 		});
@@ -621,7 +628,17 @@ async function runAndroid(options = {}) {
 		};
 	};
 	const settingsRoot = root;
-	const settingsContext = projectSettingsContext(root);
+	const settingsSignal = runCancellationSignal(context) ?? context.signal;
+	let settingsContext;
+	try {
+		settingsContext = await projectSettingsContextAsync(root, void 0, {
+			env: context.env,
+			signal: settingsSignal
+		});
+	} catch (error) {
+		if (!settingsSignal.aborted) throw error;
+		return fail("STIM_CANCELLED", "before resolving project settings", null, { setup: true });
+	}
 	const projectKey = statsProjectKey$1({
 		root,
 		commonDir: settingsContext.gitCommonDir,
@@ -648,6 +665,7 @@ async function runAndroid(options = {}) {
 	const planned = resolveAndroidRunPlan({
 		settings,
 		settingsContext,
+		env: context.env,
 		slot,
 		easProfile,
 		variant: variantFlag,
@@ -673,7 +691,7 @@ async function runAndroid(options = {}) {
 	if (easProfile !== void 0 && !integration.eas) return fail("STIM_BAD_ARG", "This project integration does not support EAS builds.", "Use its local Android build recipe.");
 	const deviceSlotWait = {
 		automatic: plan.target.kind === "hosted" && plan.target.machine === "auto",
-		signal: runCancellationSignal(),
+		signal: runCancellationSignal(context),
 		waitMs: plan.deviceSlotWaitMs,
 		displayName: basename(root),
 		reclaimIdleMinutes: deviceReclaimIdleMinutesSetting(settings),
@@ -704,6 +722,8 @@ async function runAndroid(options = {}) {
 		...integration.eas && remoteEasFallbackSetting(settings) ? { eas: () => (options.checkEasFallback ?? checkEasFallback)({
 			root,
 			platform: PLATFORM,
+			env: context.env,
+			operation: context,
 			slot,
 			release,
 			isExpo,
@@ -724,7 +744,10 @@ async function runAndroid(options = {}) {
 			listSystemImages,
 			listDeviceProfiles
 		}),
-		checkBudget: options.checkBudget,
+		checkBudget: (args) => (options.checkBudget ?? budgetGate)({
+			...args,
+			env: context.env
+		}),
 		note: out,
 		phase,
 		log: (entry) => writer.write(entry),
@@ -746,10 +769,13 @@ async function runAndroid(options = {}) {
 		root,
 		platform: PLATFORM,
 		backend: remoteBackend,
+		env: context.env,
+		operation: context,
 		easBin: resolveEasBin(root)?.file ?? null
 	}) : null;
 	if (remoteContext && "failed" in remoteContext) return fail(remoteContext.code ?? "STIM_NO_REMOTE_SESSION", remoteContext.failed, remoteContext.remedy);
 	const easBuild = await resolveEasBuild({
+		context,
 		root,
 		platform: PLATFORM,
 		profile: easProfile,
@@ -757,10 +783,22 @@ async function runAndroid(options = {}) {
 		isExpo,
 		physical,
 		selectors: [variantFlag],
-		buildCache: requestedBuildCache
+		buildCache: requestedBuildCache,
+		env: context.env,
+		signal: settingsSignal
+	}).catch((error) => {
+		const cancelled = cancelledFailure(context, PLATFORM, {
+			code: "STIM_CANCELLED",
+			message: "during EAS lookup"
+		});
+		if (cancelled) return {
+			ok: false,
+			...cancelled
+		};
+		throw error;
 	});
 	if (isEasBuildFailure(easBuild)) return fail(easBuild.code, easBuild.message, easBuild.remedy);
-	const appIds = integration.appIds();
+	const appIds = await integration.appIds();
 	let androidPackage = appIds.androidPackage;
 	record.bundleId = androidPackage;
 	const registerProject = () => upsertProject(root, {
@@ -778,6 +816,7 @@ async function runAndroid(options = {}) {
 	async function prepareMetro() {
 		if (metroCheck) {
 			const gate = await ensureDevServer({
+				env: context.env,
 				root,
 				port: reservedPort,
 				settings: hostedMetroSettings(settings, Boolean(hostedTarget)),
@@ -806,7 +845,7 @@ async function runAndroid(options = {}) {
 				prepared: { metroPort }
 			};
 		} else {
-			const pin = metroPortSetting(settings);
+			const pin = metroPortSetting(settings, context.env);
 			if (pin.error) return {
 				ok: false,
 				error: {
@@ -841,6 +880,7 @@ async function runAndroid(options = {}) {
 		if (metroPort !== null) {
 			const reachable = await ensureRemoteMetro({
 				ctx: remoteDevice.ctx,
+				env: context.env,
 				metroPort,
 				isExpo,
 				tunnelMode: tunnelModeSetting(settings) ?? void 0,
@@ -852,8 +892,9 @@ async function runAndroid(options = {}) {
 		checkCapacity = remoteDevice.checkCapacity;
 		ensureDevice = remoteDevice.ensureDevice;
 		ensureDeviceBooted = remoteDevice.ensureDeviceBooted;
-		install = remoteDevice.install;
-		launch = remoteDevice.launch;
+		const remote = remoteDevice;
+		install = async (args) => remote.install(args);
+		launch = async (args) => remote.launch(args);
 	}
 	const emuLog = emulatorLogFile(root);
 	const limits = getLimits();
@@ -901,7 +942,7 @@ async function runAndroid(options = {}) {
 		});
 	} else {
 		if (!remoteDevice) try {
-			configuredAndroidEmulatorApp();
+			await configuredAndroidEmulatorApp();
 		} catch (err) {
 			return fail("STIM_BAD_ARG", err.message, "Run `stim settings set androidEmulatorApp emulator` or `stim settings set androidEmulatorApp stim-desktop`.");
 		}
@@ -962,6 +1003,7 @@ async function runAndroid(options = {}) {
 				root,
 				platform: PLATFORM,
 				sessionName: ownedSessionName(remoteDevice.ctx.label),
+				operation: context,
 				startedAt: new Date(now()).toISOString(),
 				boot,
 				createdSessionId: remoteDevice.createdSessionId,
@@ -993,10 +1035,12 @@ async function runAndroid(options = {}) {
 			bundleUrl: metroWarmupUrlSetting(settings, "android")
 		});
 		const acquiredArtifact = await acquireAndroidArtifact({
+			context,
 			root,
 			buildLog,
 			writer,
 			recipe: integration.artifact({
+				operation: context,
 				root,
 				buildLog,
 				writer,
@@ -1058,7 +1102,7 @@ async function runAndroid(options = {}) {
 		ccacheActivity = artifact.ccache;
 		androidPackage = artifact.androidPackage;
 		record.appPath = apkPath;
-		if (runCancellation()) return fail("STIM_CANCELLED", "before install");
+		if (runCancellation(context)) return fail("STIM_CANCELLED", "before install");
 		if (hostedTarget) return finishHostedAndroidRun({
 			target: hostedTarget,
 			artifact,
@@ -1151,12 +1195,13 @@ async function runAndroid(options = {}) {
 				expiresAt: acquired.status === "leased" ? acquired.expiresAt : null
 			});
 			if (acquired.status === "leased") {
-				stopLeaseSignals = onLeaseSignal(releaseLease);
+				stopLeaseSignals = onLeaseSignal(context, releaseLease);
 				phase("lease", `${acquired.kind} lease on ${device.serial} until ${leaseExpiryText(acquired.expiresAt, now())}`);
 			}
 		}
 		try {
 			return await finishAndroidRun({
+				operation: context,
 				runtime,
 				runtimePreparation,
 				slot,
@@ -1200,7 +1245,7 @@ async function runAndroid(options = {}) {
 				phase,
 				fail,
 				readApkPackage,
-				readProjectPackage: () => integration.appIds().androidPackage,
+				readProjectPackage: async () => (await integration.appIds()).androidPackage,
 				packageRemedy: integration.packageRemedy,
 				install,
 				launch,
@@ -1244,13 +1289,18 @@ async function runAndroid(options = {}) {
 	try {
 		return await runFromFingerprint();
 	} catch (error) {
+		const cancelled = cancelledFailure(context, PLATFORM, {
+			code: "STIM_CANCELLED",
+			message: "while finishing the run"
+		});
+		if (cancelled) return fail(cancelled.code, cancelled.message, cancelled.remedy, { lastBuildStatus: true });
 		recordRun({
 			failed: true,
 			durationMs: now() - started
 		});
 		throw error;
 	} finally {
-		preparedArtifact?.release();
+		await preparedArtifact?.release();
 	}
 }
 //#endregion

package/dist/{android-Dlzxshgp.mjs → android-CV_GCELZ.mjs}

@@ -1,6 +1,6 @@
-import { i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-BTy8hZ0F.mjs";
-import { E as resolveVariant, T as resolveSystemImage, _ as findAapt, b as noDeviceDiagnostic, d as androidVariantSetting, f as apkDevClientFacts, g as dumpApkManifest, h as displayPath, i as NO_FINGERPRINT, p as apkPackage, r as NO_DEVICE, s as androidDevClientScheme, u as androidSystemImageSetting, x as parseXmltree, y as isReleaseVariant } from "./support-DMTqj3Hm.mjs";
-import { r as lastBuildRecord, t as androidFacts } from "./result-CaJg5Iat.mjs";
-import { i as runAndroidOperation, n as registerAndroid, r as runAndroid, t as androidCommand } from "./android-DCKZrNvV.mjs";
-import { a as killPreviousCollector, i as collectorLogFile, o as startCollector } from "./launch-F4sOqAhB.mjs";
+import { i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-B1UrjZHL.mjs";
+import { E as resolveVariant, T as resolveSystemImage, _ as findAapt, b as noDeviceDiagnostic, d as androidVariantSetting, f as apkDevClientFacts, g as dumpApkManifest, h as displayPath, i as NO_FINGERPRINT, p as apkPackage, r as NO_DEVICE, s as androidDevClientScheme, u as androidSystemImageSetting, x as parseXmltree, y as isReleaseVariant } from "./support-67vraa1Q.mjs";
+import { r as lastBuildRecord, t as androidFacts } from "./result-DNiS-tTP.mjs";
+import { i as runAndroidOperation, n as registerAndroid, r as runAndroid, t as androidCommand } from "./android-BLgbNqox.mjs";
+import { a as killPreviousCollector, i as collectorLogFile, o as startCollector } from "./launch-CD1yVc7U.mjs";
 export { NO_DEVICE, NO_FINGERPRINT, androidDevClientScheme, androidFacts, androidSystemImageSetting, androidVariantSetting, apkDevClientFacts, apkPackage, collectorLogFile, androidCommand as default, displayPath, dumpApkManifest, findAapt, formatDuration, isReleaseVariant, killPreviousCollector, lastBuildRecord, noDeviceDiagnostic, parseXmltree, phaseLine, registerAndroid, resolveSystemImage, resolveVariant, runAndroid, runAndroidOperation, shortHash, startCollector };