stim 1.20.2 → 1.21.0

package/dist/{js-swap-Bb3nsS07.mjs → js-swap-Cc1dttps.mjs}

@@ -1,11 +1,35 @@
-import { t as getExecutor } from "./exec-DqKo9GKJ.mjs";
-import { Ft as makeTemporaryDirectory, It as removeTemporaryEntry } from "./settings-B717odTD.mjs";
+import { s as spawnDeclared, t as getExecutor, u as operationState } from "./exec-_UbtCQcG.mjs";
 import { r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { t as cleanLine } from "./server-expo-DsguMGUF.mjs";
-import { M as startBuildHeartbeat, P as tailLines, y as HEARTBEAT_INTERVAL_MS } from "./toolchain-DxSsNssu.mjs";
+import { Gt as childEnvironment, Xt as removeTemporaryEntry, Yt as makeTemporaryDirectory, en as throwIfCancelled, qt as killOnAbort } from "./settings-CsJDEXgK.mjs";
+import { Xn as bundleInvocation } from "./budget-Bs6SxxzO.mjs";
+import { t as cleanLine } from "./server-expo-DT_F_uVI.mjs";
+import { _ as tailLines, h as startBuildHeartbeat, r as HEARTBEAT_INTERVAL_MS } from "./xcode-Zlx3qjEs.mjs";
+import { randomUUID } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from "node:fs";
 import { basename, join } from "node:path";
-import { randomUUID } from "node:crypto";
+//#region src/engine/operation-exec.ts
+async function runOperationFile(context, executor, file, args, options) {
+	const signal = context ? operationState(context).runSignal ?? context.signal : void 0;
+	throwIfCancelled(signal, file);
+	const environment = context ? childEnvironment(context.env) : {
+		env: {},
+		omitEnv: []
+	};
+	const output = await executor.runFileAsync(file, args, {
+		...environment,
+		...options,
+		...context ? { env: {
+			...environment.env,
+			...options.env
+		} } : {},
+		omitEnv: [...environment.omitEnv.filter((name) => options.env?.[name] === void 0), ...options.omitEnv ?? []],
+		declareFor: context,
+		onSpawn: killOnAbort(signal)
+	});
+	throwIfCancelled(signal, file);
+	return output;
+}
+//#endregion
 //#region src/engine/js-swap.ts
 const JS_BUNDLE_NAME = "main.jsbundle";
 const LAST_LINES = 5;
@@ -107,9 +131,9 @@ function assetCatalogTarget(infoPlist) {
 		targetDevices: targetDevices.length ? targetDevices : ["iphone"]
 	};
 }
-function readPlistKey(e, plist, key, format) {
+async function readPlistKey(context, e, plist, key, format) {
 	try {
-		return e.runFile("plutil", [
+		return await runOperationFile(context, e, "plutil", [
 			"-extract",
 			key,
 			format,
@@ -122,14 +146,14 @@ function readPlistKey(e, plist, key, format) {
 		throw err;
 	}
 }
-function readAssetCatalogTarget(e, plist) {
-	const flag = readPlistKey(e, plist, "RCTUseAssetCatalog", "raw");
+async function readAssetCatalogTarget(context, e, plist) {
+	const flag = await readPlistKey(context, e, plist, "RCTUseAssetCatalog", "raw");
 	if (flag === null) return null;
-	const families = readPlistKey(e, plist, "UIDeviceFamily", "json");
+	const families = await readPlistKey(context, e, plist, "UIDeviceFamily", "json");
 	return assetCatalogTarget({
 		RCTUseAssetCatalog: flag,
-		DTPlatformName: readPlistKey(e, plist, "DTPlatformName", "raw"),
-		MinimumOSVersion: readPlistKey(e, plist, "MinimumOSVersion", "raw"),
+		DTPlatformName: await readPlistKey(context, e, plist, "DTPlatformName", "raw"),
+		MinimumOSVersion: await readPlistKey(context, e, plist, "MinimumOSVersion", "raw"),
 		UIDeviceFamily: families === null ? void 0 : JSON.parse(families)
 	});
 }
@@ -206,7 +230,7 @@ function hermescArgs({ bundle, out }) {
 		bundle
 	];
 }
-async function swapJsBundle({ root, iosDir, isExpo, cachedAppPath, logWriter = null, exec = null, spawnFn = null, mkdtemp = () => makeTemporaryDirectory(cachedAppPath, "stim-js-swap-"), exists = existsSync, hermesEnabled = null, now = Date.now, heartbeatMs = HEARTBEAT_INTERVAL_MS, onHeartbeat = (line) => console.error(line) }) {
+async function swapJsBundle({ context, root, iosDir, isExpo, cachedAppPath, logWriter = null, exec = null, spawnFn = null, mkdtemp = () => makeTemporaryDirectory(cachedAppPath, "stim-js-swap-"), exists = existsSync, hermesEnabled = null, now = Date.now, heartbeatMs = HEARTBEAT_INTERVAL_MS, onHeartbeat = (line) => console.error(line) }) {
 	const e = exec || getExecutor();
 	const startedAt = now();
 	const elapsed = () => now() - startedAt;
@@ -232,15 +256,16 @@ async function swapJsBundle({ root, iosDir, isExpo, cachedAppPath, logWriter = n
 		tmp = mkdtemp();
 		appCopy = join(tmp, basename(cachedAppPath));
 		try {
-			e.runFile("cp", [
+			await runOperationFile(context, e, "cp", [
 				"-c",
 				"-R",
 				cachedAppPath,
 				appCopy
 			], { timeoutMs: "unbounded" });
 		} catch {
+			throwIfCancelled(context ? operationState(context).runSignal ?? context.signal : void 0, "JS swap");
 			removeTemporaryEntry(appCopy);
-			e.runFile("cp", [
+			await runOperationFile(context, e, "cp", [
 				"-R",
 				cachedAppPath,
 				appCopy
@@ -252,7 +277,7 @@ async function swapJsBundle({ root, iosDir, isExpo, cachedAppPath, logWriter = n
 	let catalogTarget;
 	const infoPlistPath = join(appCopy, "Info.plist");
 	try {
-		catalogTarget = readAssetCatalogTarget(e, infoPlistPath);
+		catalogTarget = await readAssetCatalogTarget(context, e, infoPlistPath);
 	} catch (err) {
 		return fail("catalog", `could not read ${infoPlistPath}: ${describe(err)}`);
 	}
@@ -299,7 +324,8 @@ async function swapJsBundle({ root, iosDir, isExpo, cachedAppPath, logWriter = n
 	};
 	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",
@@ -307,10 +333,11 @@ async function swapJsBundle({ root, iosDir, isExpo, cachedAppPath, logWriter = n
 				"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)}`);
 	}
@@ -350,11 +377,11 @@ async function swapJsBundle({ root, iosDir, isExpo, cachedAppPath, logWriter = n
 		else {
 			const hbc = join(tmp, `${JS_BUNDLE_NAME}.hbc`);
 			try {
-				e.runFile(hermesc, hermescArgs({
+				await runOperationFile(context, e, hermesc, hermescArgs({
 					bundle: bundleOutput,
 					out: hbc
 				}), { timeoutMs: "unbounded" });
-				e.runFile("mv", [hbc, bundleOutput], { timeoutMs: 3e4 });
+				await runOperationFile(context, e, "mv", [hbc, bundleOutput], { timeoutMs: 3e4 });
 				hermes = true;
 			} catch (err) {
 				return fail("hermesc", `hermesc failed on ${bundleOutput}: ${describe(err)}`);
@@ -362,8 +389,8 @@ async function swapJsBundle({ root, iosDir, isExpo, cachedAppPath, logWriter = n
 		}
 	}
 	try {
-		e.runFile("cp", [bundleOutput, join(appCopy, JS_BUNDLE_NAME)], { timeoutMs: "unbounded" });
-		e.runFile("cp", [
+		await runOperationFile(context, e, "cp", [bundleOutput, join(appCopy, JS_BUNDLE_NAME)], { timeoutMs: "unbounded" });
+		await runOperationFile(context, e, "cp", [
 			"-R",
 			`${assetsDest}/.`,
 			`${appCopy}/`
@@ -380,7 +407,7 @@ async function swapJsBundle({ root, iosDir, isExpo, cachedAppPath, logWriter = n
 			});
 			if (readdirSync(catalogDir).some((name) => name.endsWith(".imageset"))) {
 				mkdirSync(catalogBundle);
-				const output = e.runFile("xcrun", actoolArgs({
+				const output = await runOperationFile(context, e, "xcrun", actoolArgs({
 					catalog: catalogDir,
 					out: catalogBundle,
 					target: catalogTarget
@@ -400,7 +427,7 @@ async function swapJsBundle({ root, iosDir, isExpo, cachedAppPath, logWriter = n
 		return fail("updates", `could not refresh the expo-updates manifest ${manifest}: ${describe(err)}`);
 	}
 	try {
-		e.runFile("codesign", [
+		await runOperationFile(context, e, "codesign", [
 			"--force",
 			"--sign",
 			"-",
@@ -429,4 +456,4 @@ function describe(err) {
 	return String(err?.message || err);
 }
 //#endregion
-export { swapJsBundle as i, detectEntryFile as n, refreshUpdatesManifestFile as r, UPDATES_MANIFEST_NAME as t };
+export { runOperationFile as a, swapJsBundle as i, detectEntryFile as n, refreshUpdatesManifestFile as r, UPDATES_MANIFEST_NAME as t };

package/dist/{launch-F4sOqAhB.mjs → launch-CD1yVc7U.mjs}

@@ -1,25 +1,24 @@
-import { B as deviceSlotKey, C as saveConfig, D as withConfigLock, E as upsertProject, N as formatBytes, V as deviceSlotPlatforms, _ as loadConfig, w as setDevice, z as deviceSlotFileKey } from "./config-BYDxlMY3.mjs";
-import { t as spawnEntry } from "./spawn-entry-Dcb7sDUz.mjs";
-import { j as providerUploadOutcome } from "./device-lease-BX1sJQ2E.mjs";
-import { w as workspaceLogsDir } from "./workspace-state-DJt_MMvf.mjs";
-import { _ as stepTimer, c as launchErrorReport, i as formatDuration, l as phaseLine, n as appReadinessMessage, v as launchErrorPreview } from "./command-output-BTy8hZ0F.mjs";
-import { I as workspaceDevServerMode } from "./project-_phNIJfs.mjs";
-import { a as workspaceLinks } from "./stim-desktop-BzBN2Em2.mjs";
-import { $ as trimAndroidCaches, i as androidDataFreeBytes, q as resetAdoptedAvd, u as androidToolCwd } from "./android-Mz_Inn3w.mjs";
-import { d as signalProcessTree, s as pidExists } from "./metro-DnCEjCxs.mjs";
-import { v as teardownOwnedAvd } from "./workspaces-C36s2jb9.mjs";
-import { o as exitAfterFlush } from "./remote-cache-OyOyVIS3.mjs";
-import { a as VERIFY_TIMEOUT_MS, i as RELEASE_VERIFY_WAIT_MS, l as unattributedLaunchLines, n as LAUNCH_FATAL, r as LAUNCH_UNVERIFIED, t as LAUNCH_BUNDLING, u as unverifiedLaunchLines } from "./launch-verify-B6Q8hZP-.mjs";
-import { C as restartedAppNote, _ as installConflictKind, c as androidDevClientUrl, s as androidAppProcess, t as ADB_INSTALL_TIMEOUT_MS } from "./app-install-BIKtMfPq.mjs";
-import { i as launchOutcomeRecord } from "./native-runtime-k8dTIrbK.mjs";
-import { a as PLATFORM, b as noDeviceDiagnostic, h as displayPath, n as LAUNCH_FAILED, r as NO_DEVICE, t as INSTALL_FAILED } from "./support-DMTqj3Hm.mjs";
-import { c as lostRefusal, s as lostLine, t as DEBUG_VERIFY_STEP_MS } from "./device-lease-run-Cw2M4z51.mjs";
-import { a as reportAndroidResult, i as persistLastBuild, n as finishAndroidUpload } from "./result-CaJg5Iat.mjs";
-import { n as nativeRunCommand, r as siblingPlatformSlots, t as launchSlotScope } from "./slot-launch-DPt0m9Nd.mjs";
-import { n as verifyCollectorOwnership, r as readCollectors } from "./ownership-DCtw_2IA.mjs";
-import { a as printNativeCrashReport, r as captureNativeCrashes, t as errorDiagnostics } from "./error-diagnostics-BR677IDM.mjs";
+import { m as workspaceLogsDir } from "./paths-DQtTgsBf.mjs";
+import { C as saveConfig, E as upsertProject, H as deviceSlotKey, O as withConfigLockAsync, P as formatBytes, U as deviceSlotPlatforms, V as deviceSlotFileKey, _ as loadConfig, w as setDevice } from "./config-CYcBF478.mjs";
+import { _ as stepTimer, c as launchErrorReport, i as formatDuration, l as phaseLine, n as appReadinessMessage, v as launchErrorPreview } from "./command-output-B1UrjZHL.mjs";
+import { L as workspaceDevServerMode } from "./project-BZNjmW_8.mjs";
+import { l as pidExists, p as signalProcessTree } from "./metro-DEXpIhHC.mjs";
+import { En as restartedAppNote, Jt as LAUNCH_FATAL, Xt as RELEASE_VERIFY_WAIT_MS, Yt as LAUNCH_UNVERIFIED, Zt as VERIFY_TIMEOUT_MS, bn as installConflictKind, dn as androidAppProcess, fn as androidDevClientUrl, nn as unverifiedLaunchLines, qt as LAUNCH_BUNDLING, sn as ADB_INSTALL_TIMEOUT_MS, tn as unattributedLaunchLines } from "./budget-Bs6SxxzO.mjs";
+import { E as teardownOwnedAvd } from "./workspaces-BccMFmGQ.mjs";
+import { p as providerUploadOutcome } from "./build-cache-DmyR9Zzc.mjs";
+import { Z as resetAdoptedAvd, i as androidDataFreeBytes, nt as trimAndroidCaches, u as androidToolCwd } from "./android-DUYkNF4u.mjs";
+import { o as workspaceLinks } from "./stim-desktop-C12we7lz.mjs";
+import { n as verifyCollectorOwnership, r as readCollectors } from "./ownership-DEmM5vhh.mjs";
+import { n as nativeRunCommand, r as siblingPlatformSlots, t as launchSlotScope } from "./slot-launch-DF8VfT64.mjs";
+import { c as lostRefusal, s as lostLine, t as DEBUG_VERIFY_STEP_MS } from "./device-lease-run-C8raGFoP.mjs";
+import { a as printNativeCrashReport, r as captureNativeCrashes, t as errorDiagnostics } from "./error-diagnostics-Bf0rZvG9.mjs";
+import { t as spawnEntry } from "./spawn-entry-jw19m8Nl.mjs";
+import { i as launchOutcomeRecord } from "./native-runtime-Dg1Q7tfF.mjs";
+import { a as PLATFORM, b as noDeviceDiagnostic, h as displayPath, n as LAUNCH_FAILED, r as NO_DEVICE, t as INSTALL_FAILED } from "./support-67vraa1Q.mjs";
+import { a as reportAndroidResult, i as persistLastBuild, n as finishAndroidUpload } from "./result-DNiS-tTP.mjs";
 import { mkdirSync, openSync, statSync } from "node:fs";
 import { basename, join } from "node:path";
+import { ambientEnv } from "@stim-cli/core";
 import chalk from "chalk";
 //#region src/commands/android/collector.ts
 function collectorEntry() {
@@ -91,7 +90,7 @@ async function startCollector({ root, slot = "default", serial, packageName, spa
 			cwd: androidToolCwd() ?? root,
 			detached: true,
 			stdio,
-			env: process.env
+			env: ambientEnv()
 		});
 		child?.unref?.();
 		return child?.pid ?? null;
@@ -154,7 +153,7 @@ function androidMetroRuntime(prepare) {
 		})
 	};
 }
-async function verifyAndroidProcessRun({ root, slot, remoteDevice, verifyReleaseLaunched, serial, androidPackage, variant, logsDir, launchedAt, phase, embeddedJavaScript }) {
+async function verifyAndroidProcessRun({ operation, root, slot, remoteDevice, verifyReleaseLaunched, serial, androidPackage, variant, logsDir, launchedAt, phase, embeddedJavaScript }) {
 	const readNativeCrashes = () => remoteDevice ? [] : captureNativeCrashes({
 		root,
 		slot,
@@ -162,7 +161,7 @@ async function verifyAndroidProcessRun({ root, slot, remoteDevice, verifyRelease
 		deviceId: serial,
 		appId: androidPackage,
 		since: launchedAt
-	}, logsDir);
+	}, logsDir, operation?.signal, operation?.env);
 	if (remoteDevice) {
 		phase("verify", chalk.yellow("UNVERIFIED: remote adapter launch accepted; process verification is unavailable"));
 		return { state: LAUNCH_UNVERIFIED };
@@ -171,9 +170,9 @@ async function verifyAndroidProcessRun({ root, slot, remoteDevice, verifyRelease
 		serial,
 		packageName: androidPackage
 	});
-	const crashes = readNativeCrashes();
+	const crashes = await readNativeCrashes();
 	if (processCheck?.verified && !crashes.length) {
-		phase("verify", `process alive ${formatDuration(processCheck.waitedMs ?? 0)} after launch (${variant}: no bundle fetch to observe)`);
+		phase("verify", `process alive ${formatDuration(processCheck.waitedMs ?? 0)} after launch (${variant ?? "debug"}: no bundle fetch to observe)`);
 		return { state: true };
 	}
 	if (processCheck?.reason === "probe-failed" && !crashes.length) {
@@ -186,7 +185,7 @@ async function verifyAndroidProcessRun({ root, slot, remoteDevice, verifyRelease
 	phase("", chalk.yellow(`${embeddedJavaScript ? "A release process" : "The app process"} exited before readiness. Run \`stim logs --errors\` for captured crash reports, or \`stim logs --source device\` for the full device output.`));
 	return { state: LAUNCH_FATAL };
 }
-async function verifyAndroidMetroRun({ root, slot, remoteDevice, verifyLaunched, serial, androidPackage, metroCheck, logsDir, launchedAt, metroPort, isExpo, physical, device, scheme, component = null, phase, enterActivity }) {
+async function verifyAndroidMetroRun({ operation, root, slot, remoteDevice, verifyLaunched, serial, androidPackage, metroCheck, logsDir, launchedAt, metroPort, isExpo, physical, device, scheme, component = null, phase, enterActivity }) {
 	const runCommand = nativeRunCommand("android", slot, {
 		physical,
 		deviceId: serial
@@ -198,11 +197,11 @@ async function verifyAndroidMetroRun({ root, slot, remoteDevice, verifyLaunched,
 		deviceId: serial,
 		appId: androidPackage,
 		since: launchedAt
-	}, logsDir);
+	}, logsDir, operation?.signal, operation?.env);
 	const freshEmulator = Boolean((device.created || device.adoptionPending) && device.owned && !remoteDevice);
 	const timeoutMs = freshEmulator ? 6e4 : VERIFY_TIMEOUT_MS;
 	if (metroCheck && freshEmulator) phase("verify", `waiting up to 60s for bundle load (${device.created ? "new" : "adopted"} emulator)`);
-	const siblings = metroCheck ? siblingPlatformSlots(root, "android", slot) : [];
+	const siblings = metroCheck ? await siblingPlatformSlots(root, "android", slot) : [];
 	const verification = metroCheck ? await verifyLaunched({
 		timeoutMs,
 		requireBundleResponse: true,
@@ -216,15 +215,15 @@ async function verifyAndroidMetroRun({ root, slot, remoteDevice, verifyLaunched,
 		platform: "android",
 		mode: workspaceDevServerMode(root, isExpo),
 		readNativeCrashes,
-		processAlive: () => {
-			const running = androidAppProcess(serial, androidPackage);
+		processAlive: async () => {
+			const running = await androidAppProcess(serial, androidPackage);
 			return running.state === "unknown" ? null : running.state === "running";
 		}
 	}) : {
 		verified: false,
 		skipped: true
 	};
-	const nativeCrashes = verification.errors?.some((record) => record.event === "native_crash") ? [] : readNativeCrashes();
+	const nativeCrashes = verification.errors?.some((record) => record.event === "native_crash") ? [] : await readNativeCrashes();
 	if (nativeCrashes.length) verification.fatal = true;
 	verification.errors = await errorDiagnostics([...verification.errors ?? [], ...nativeCrashes], {
 		root,
@@ -304,7 +303,7 @@ async function wipeAdoptedAvd(room, free) {
 	room.phase("device", chalk.yellow(`${room.avdName} has ${free === null ? "too little space" : `${formatBytes(free)} free`} on /data after removing other apps and trimming caches; wiping its user data`));
 	const expectedRecord = deviceSlotPlatforms(loadConfig()?.projects?.[room.root], room.slot)?.android;
 	if (!expectedRecord?.adoptionPending || expectedRecord.avdName !== room.avdName) throw new Error("the emulator assignment changed before the wipe; its data was kept");
-	const wiped = room.wipeDevice(room.avdName, {
+	const wiped = await room.wipeDevice(room.avdName, {
 		wipe: true,
 		owner: {
 			projectPath: room.root,
@@ -316,7 +315,7 @@ async function wipeAdoptedAvd(room, free) {
 	if (wiped.status !== "torn-down") throw new Error(`could not wipe it: ${wiped.reason ?? wiped.status}`);
 	const rebooted = await room.rebootDevice();
 	if (!rebooted.ok || !rebooted.serial) throw new Error(`it did not boot after its user data was wiped: ${rebooted.reason ?? "no serial"}`);
-	if (room.resolveAvdSerial(room.avdName).serial !== rebooted.serial) throw new Error(`${rebooted.serial} is not running ${room.avdName} after the wipe`);
+	if ((await room.resolveAvdSerial(room.avdName)).serial !== rebooted.serial) throw new Error(`${rebooted.serial} is not running ${room.avdName} after the wipe`);
 	room.phase("device", `${room.avdName} (${rebooted.serial}) booted with wiped user data`);
 	return rebooted.serial;
 }
@@ -326,45 +325,45 @@ async function installOnAdoptedAvd(room, serial, installApk) {
 	const outOfSpace = (result) => Boolean(result.failed) && INSUFFICIENT_STORAGE.test(result.reason ?? "");
 	let target = serial;
 	let wiped = false;
-	if (!roomy(room.dataFreeBytes(target))) {
-		room.trimCaches(target, neededBytes);
-		const free = room.dataFreeBytes(target);
+	if (!roomy(await room.dataFreeBytes(target))) {
+		await room.trimCaches(target, neededBytes);
+		const free = await room.dataFreeBytes(target);
 		if (roomy(free)) room.phase("install", `trimmed app caches on ${room.avdName} to make room for the APK`);
 		else {
 			target = await wipeAdoptedAvd(room, free);
 			wiped = true;
 		}
 	}
-	let installed = installApk(target);
+	let installed = await installApk(target);
 	if (wiped || !outOfSpace(installed)) return {
 		serial: target,
 		installed
 	};
-	room.trimCaches(target, neededBytes);
-	installed = installApk(target);
+	await room.trimCaches(target, neededBytes);
+	installed = await installApk(target);
 	if (!outOfSpace(installed)) return {
 		serial: target,
 		installed
 	};
-	target = await wipeAdoptedAvd(room, room.dataFreeBytes(target));
+	target = await wipeAdoptedAvd(room, await room.dataFreeBytes(target));
 	return {
 		serial: target,
-		installed: installApk(target)
+		installed: await installApk(target)
 	};
 }
 async function resolveInstallSerial({ root, slot, device, physical, remoteDevice, serial, resolveAvdSerial, waitForDeviceBoot, phase }) {
 	if (physical || remoteDevice || !device.owned || !device.avdName) return serial;
-	const resolved = resolveAvdSerial(device.avdName, { timeoutMs: 5e3 });
+	const resolved = await resolveAvdSerial(device.avdName, { timeoutMs: 5e3 });
 	if (!resolved.serial) throw new Error(`Could not verify a running owned AVD ${device.avdName} before installation.`);
 	if (resolved.serial !== serial) {
 		phase("device", `${device.avdName} changed serial (${serial} -> ${resolved.serial}); checking readiness before installation`);
 		const ready = await waitForDeviceBoot(resolved.serial, 6e4, { commandTimeoutMs: 5e3 });
 		if (!ready.ok) throw new Error(`Emulator ${resolved.serial} never reported boot completion. Diagnostic: ${JSON.stringify(ready.diagnostic)}`);
-		if (resolveAvdSerial(device.avdName, { timeoutMs: 5e3 }).serial !== resolved.serial) throw new Error(`Could not verify AVD ${device.avdName} still runs on ${resolved.serial} after checking readiness.`);
+		if ((await resolveAvdSerial(device.avdName, { timeoutMs: 5e3 })).serial !== resolved.serial) throw new Error(`Could not verify AVD ${device.avdName} still runs on ${resolved.serial} after checking readiness.`);
 		phase("device", `reopen agent-device on ${resolved.serial}`);
 	}
 	const consolePort = Number(resolved.serial.replace(/^emulator-/, ""));
-	withConfigLock(() => {
+	await withConfigLockAsync(() => {
 		const current = deviceSlotPlatforms(loadConfig()?.projects?.[root], slot)?.android;
 		if (!current?.owned || current.avdName !== device.avdName) throw new Error("The owned emulator assignment changed before installation.");
 		if (current.consolePort !== consolePort) setDevice(root, PLATFORM, {
@@ -374,7 +373,8 @@ async function resolveInstallSerial({ root, slot, device, physical, remoteDevice
 	});
 	return resolved.serial;
 }
-async function finishAndroidRun({ runtime, runtimePreparation, lease, releaseLease, root, slot, json, metroCheck, useBuildCache, variant, release, isExpo, metroPort, logsDir, emuLog, device, physical, remoteDevice, bootPromise, resolveAvdSerial, waitForDeviceBoot, bootDuration, bootPending, apkPath, androidPackage: initialPackage, androidPackageProblem, record, waitedForBuild, ccache, uploadPending, providerUpload, providerName, remote, abandonedRemote: remoteWasAbandoned, started, startedAt, writer, phase, fail, readApkPackage, readProjectPackage, packageRemedy, install, launch, launchRelease, resolveDevClientScheme, verifyLaunched, verifyReleaseLaunched, spawn, kill, pidAlive, verifyCollector, writeLaunch, recordBuild, now, out, emit, recordRun, reclaimed, devServer, enterPhase, enterActivity, rebootDevice, dataFreeBytes = androidDataFreeBytes, trimCaches = trimAndroidCaches, wipeDevice = teardownOwnedAvd }) {
+async function finishAndroidRun({ operation, runtime, runtimePreparation, lease, releaseLease, root, slot, json, metroCheck, useBuildCache, variant, release, isExpo, metroPort, logsDir, emuLog, device, physical, remoteDevice, bootPromise, resolveAvdSerial, waitForDeviceBoot, bootDuration, bootPending, apkPath, androidPackage: initialPackage, androidPackageProblem, record, waitedForBuild, ccache, uploadPending, providerUpload, providerName, remote, abandonedRemote: remoteWasAbandoned, started, startedAt, writer, phase, fail, readApkPackage, readProjectPackage, packageRemedy, install, launch, launchRelease, resolveDevClientScheme, verifyLaunched, verifyReleaseLaunched, spawn, kill, pidAlive, verifyCollector, writeLaunch, recordBuild, now, out, emit, recordRun, reclaimed, devServer, enterPhase, enterActivity, rebootDevice, dataFreeBytes = androidDataFreeBytes, trimCaches = trimAndroidCaches, wipeDevice = teardownOwnedAvd }) {
+	const { env, signal } = operation ?? {};
 	let androidPackage = initialPackage;
 	let leaseWarned = false;
 	const raiseLeaseFor = (boundMs, beforeInstall) => {
@@ -422,9 +422,9 @@ async function finishAndroidRun({ runtime, runtimePreparation, lease, releaseLea
 		return fail(NO_DEVICE, error instanceof Error ? error.message : String(error), `Run \`stim status\` to inspect the owned AVD, then retry \`${runCommand}\`; the APK was not installed.`);
 	}
 	phase("device", physical ? `${device.deviceName || serial} (${serial}) connected, not owned by Stim` : `${device.avdName || serial} (${serial}) ${device.adopted || device.adoptionPending ? "adopted" : "booted"} ${bootDuration()}`);
-	const packageFromApk = readApkPackage(apkPath);
+	const packageFromApk = await readApkPackage(apkPath);
 	if (packageFromApk && androidPackage && packageFromApk !== androidPackage) phase("install", chalk.dim(`applicationId ${packageFromApk} (from the APK; project files say ${androidPackage})`));
-	androidPackage = packageFromApk || androidPackage || readProjectPackage();
+	androidPackage = packageFromApk || androidPackage || await readProjectPackage();
 	if (!androidPackage && androidPackageProblem) return fail(LAUNCH_FAILED, androidPackageProblem, packageRemedy, { lastBuildStatus: true });
 	const adopting = !physical && !remoteDevice && Boolean(device.adoptionPending);
 	if (adopting) {
@@ -467,7 +467,7 @@ async function finishAndroidRun({ runtime, runtimePreparation, lease, releaseLea
 		} catch (error) {
 			return fail(INSTALL_FAILED, `Could not make room on adopted emulator ${device.avdName}: ${String(error?.message || error)}`, `Run \`${runCommand}\` again; adoption remains pending, so it retries the cleanup.`);
 		}
-	} else installed = installApk(serial);
+	} else installed = await installApk(serial);
 	if (installed.failed) {
 		const installRemedy = remoteDevice?.failureRemedy() ?? localInstallRemedy({
 			reason: installed.reason,
@@ -478,7 +478,7 @@ async function finishAndroidRun({ runtime, runtimePreparation, lease, releaseLea
 		return fail(installed.code || "STIM_INSTALL_FAILED", installed.reason, installRemedy, { lastBuildStatus: true });
 	}
 	if (adopting) try {
-		withConfigLock(() => {
+		await withConfigLockAsync(() => {
 			const config = loadConfig();
 			const current = deviceSlotPlatforms(config?.projects?.[root], slot)?.android;
 			if (!config || !current || current.avdName !== device.avdName) throw new Error("The adopted emulator assignment changed during installation.");
@@ -503,7 +503,7 @@ async function finishAndroidRun({ runtime, runtimePreparation, lease, releaseLea
 	record.bundleId = androidPackage;
 	if (!androidPackage) return fail(LAUNCH_FAILED, "Could not determine this app's Android package name, so there is nothing to launch.", packageRemedy, { lastBuildStatus: true });
 	if (physical) raiseLeaseFor(0, false);
-	const scheme = runtime.scheme(root, apkPath, resolveDevClientScheme);
+	const scheme = await runtime.scheme(root, apkPath, resolveDevClientScheme);
 	enterPhase("launch");
 	const launchTimer = stepTimer(now);
 	const launchedAt = now();
@@ -530,14 +530,14 @@ async function finishAndroidRun({ runtime, runtimePreparation, lease, releaseLea
 		launchRelease
 	});
 	if (launched.failed) {
-		printNativeCrashReport({
+		await printNativeCrashReport({
 			root,
 			slot,
 			platform: "android",
 			deviceId: serial,
 			appId: androidPackage,
 			since: launchedAt
-		}, logsDir, (line) => phase("launch", chalk.red(line)), Boolean(remoteDevice));
+		}, logsDir, (line) => phase("launch", chalk.red(line)), Boolean(remoteDevice), signal, env);
 		return fail(launched.code || "STIM_LAUNCH_FAILED", launched.reason, launchRemedy(remoteDevice, serial, androidPackage), { lastBuildStatus: true });
 	}
 	writer.write({
@@ -578,7 +578,7 @@ async function finishAndroidRun({ runtime, runtimePreparation, lease, releaseLea
 		});
 	}
 	const uploadWasAbandoned = await finishAndroidUpload(uploadPending, remote, phase);
-	const providerOutcome = providerUploadOutcome(providerUpload ? await providerUpload : null, providerName);
+	const providerOutcome = providerUploadOutcome(providerUpload ? await providerUpload : null, providerName, env);
 	if (providerOutcome) phase("cache", providerOutcome.warn ? chalk.yellow(providerOutcome.line) : providerOutcome.line);
 	persistLastBuild({
 		recordBuild,
@@ -621,6 +621,7 @@ async function finishAndroidRun({ runtime, runtimePreparation, lease, releaseLea
 	}
 	if (physical) raiseLeaseFor(runtime.verificationWaitMs, false);
 	const { state: launchState, warning: launchWarning, unattributed } = await runtime.verify(runtimePreparation, {
+		operation,
 		root,
 		slot,
 		remoteDevice: Boolean(remoteDevice),
@@ -654,45 +655,45 @@ async function finishAndroidRun({ runtime, runtimePreparation, lease, releaseLea
 	}));
 	const leaseFacts = lease?.facts() ?? null;
 	releaseLease();
-	const facts = reportAndroidResult({
-		root,
-		slot,
-		json,
-		useBuildCache,
-		variant,
-		release,
-		runtimeKind: runtime.kind,
-		metroCheck,
-		metroPort,
-		logsDir: remoteRelease ? null : logsDir,
-		serial,
-		apkPath,
-		androidPackage,
-		installSkipped,
-		record,
-		waitedForBuild,
-		remote,
-		providerName,
-		launchState,
-		launchWarning,
-		launched,
-		ccache,
-		durationMs: now() - started,
-		writer,
-		emit,
-		lease: physical ? leaseFacts : void 0,
-		recordRun,
-		reclaimed,
-		devServer,
-		links: workspaceLinks(root, {
-			platform: "android",
-			slot
-		})
-	});
-	if (remoteWasAbandoned || uploadWasAbandoned) exitAfterFlush(0);
 	return {
 		ok: true,
-		facts
+		facts: reportAndroidResult({
+			root,
+			slot,
+			json,
+			useBuildCache,
+			variant,
+			release,
+			runtimeKind: runtime.kind,
+			metroCheck,
+			metroPort,
+			logsDir: remoteRelease ? null : logsDir,
+			serial,
+			apkPath,
+			androidPackage,
+			installSkipped,
+			record,
+			waitedForBuild,
+			remote,
+			providerName,
+			launchState,
+			launchWarning,
+			launched,
+			ccache,
+			durationMs: now() - started,
+			writer,
+			emit,
+			out,
+			lease: physical ? leaseFacts : void 0,
+			recordRun,
+			reclaimed,
+			devServer,
+			links: await workspaceLinks(root, {
+				platform: "android",
+				slot
+			})
+		}),
+		uploadsAbandoned: remoteWasAbandoned || uploadWasAbandoned
 	};
 }
 function localInstallRemedy({ reason, packageName, serial, useBuildCache }) {