stim 1.13.0 → 1.15.0

package/dist/android-cas-PnKfAdB2.mjs

@@ -0,0 +1,167 @@
+import { d as getConfigDir } from "./config-D0DbpZtM.mjs";
+import { r as register } from "./cache-manifest-DnUHBJaU.mjs";
+import { E as withDirLock, p as ensureWorkspaceStorage } from "./workspace-state-CL2V2Ons.mjs";
+import { createHash, randomUUID } from "node:crypto";
+import { accessSync, constants, existsSync, mkdirSync, readFileSync, realpathSync, renameSync, statSync, symlinkSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
+import { isJsonObject, readJsonFile } from "@stim-cli/core/state";
+import { fileURLToPath } from "node:url";
+//#region src/engine/android-cas.ts
+const CAS_TOOLCHAIN_FIELDS = [
+	"clang",
+	"clangxx",
+	"lld",
+	"ar",
+	"ranlib",
+	"ndk",
+	"resourceDir"
+];
+const CAS_TOOLCHAIN_BINARIES = [
+	"clang",
+	"clangxx",
+	"lld",
+	"ar",
+	"ranlib"
+];
+function executableFile(path) {
+	try {
+		accessSync(path, constants.X_OK);
+		return statSync(path).isFile();
+	} catch {
+		return false;
+	}
+}
+function directory(path) {
+	try {
+		return statSync(path).isDirectory();
+	} catch {
+		return false;
+	}
+}
+function isAndroidCasToolchain(value) {
+	return CAS_TOOLCHAIN_FIELDS.every((field) => typeof value[field] === "string");
+}
+function readAndroidCasToolchain(manifest) {
+	const parsed = readJsonFile(manifest);
+	const toolchain = isJsonObject(parsed) ? parsed : {};
+	if (!isAndroidCasToolchain(toolchain)) {
+		const missing = CAS_TOOLCHAIN_FIELDS.filter((field) => typeof toolchain[field] !== "string");
+		throw new Error(`${manifest} declares no ${missing.join(", ")}.`);
+	}
+	const notExecutable = CAS_TOOLCHAIN_BINARIES.filter((field) => !executableFile(toolchain[field]));
+	if (notExecutable.length > 0) throw new Error(`${manifest} names no executable ${notExecutable.join(", ")}.`);
+	if (!directory(toolchain.resourceDir)) throw new Error(`${manifest} names resourceDir ${toolchain.resourceDir}, which is not a directory.`);
+	const ndkProperties = readFileSync(join(toolchain.ndk, "source.properties"), "utf8");
+	const ndkVersion = /Pkg.Revision\s*=\s*([^\r\n]+)/.exec(ndkProperties)?.[1]?.trim();
+	if (!ndkVersion) throw new Error(`Missing NDK version in ${toolchain.ndk}/source.properties.`);
+	return {
+		toolchain,
+		ndkVersion,
+		ndkProperties
+	};
+}
+function resolveAndroidCompilerCache({ optimizations, use, env = process.env }) {
+	if (optimizations.android.compilerCache !== "cas") return {
+		cas: null,
+		optimizations
+	};
+	const manifest = optimizations.android.casToolchain;
+	try {
+		return {
+			cas: use(manifest),
+			optimizations
+		};
+	} catch (error) {
+		const fromEnvironment = Boolean(env.STIM_ANDROID_CAS_TOOLCHAIN);
+		return {
+			cas: null,
+			optimizations: {
+				...optimizations,
+				android: {
+					...optimizations.android,
+					compilerCache: "ccache",
+					compilerCacheFallback: {
+						key: fromEnvironment ? "STIM_ANDROID_CAS_TOOLCHAIN" : "optimizations.android.casToolchain",
+						reason: `could not be used: ${error.message.replace(/\.$/, "")}`,
+						fromEnvironment,
+						manifest
+					}
+				}
+			}
+		};
+	}
+}
+function resolveAndroidCas(root, env = process.env) {
+	const manifest = env.STIM_ANDROID_CAS_TOOLCHAIN;
+	if (!manifest) return null;
+	const { toolchain, ndkVersion, ndkProperties } = readAndroidCasToolchain(manifest);
+	const scripts = [
+		"shim/android-cas.gradle",
+		"shim/android-cas.toolchain.cmake",
+		"shim/android-cas-pch.cmake",
+		"dist/android-cas-compiler.mjs"
+	].map((name) => {
+		const path = [`../${name}`, `../../${name}`].map((candidate) => fileURLToPath(new URL(candidate, import.meta.url))).find((candidate) => existsSync(candidate));
+		if (!path) throw new Error(`Stim installation is missing ${name}.`);
+		return path;
+	});
+	const hash = createHash("sha256").update(JSON.stringify(toolchain));
+	for (const path of [
+		...scripts,
+		toolchain.clang,
+		toolchain.clangxx,
+		toolchain.lld,
+		toolchain.ar,
+		toolchain.ranlib
+	]) hash.update(readFileSync(path));
+	hash.update(ndkProperties);
+	const id = `apple-cas-${hash.digest("hex")}`;
+	const dir = join(getConfigDir(), "android-cas", id);
+	const state = join(ensureWorkspaceStorage(root), "android-cas", id);
+	const context = join(state, "context.json");
+	mkdirSync(state, { recursive: true });
+	mkdirSync(dir, { recursive: true });
+	withDirLock(join(state, "setup.lock"), () => {
+		for (const name of ["clang", "clang++"]) {
+			const path = join(state, name);
+			const temporary = `${path}.${randomUUID()}.tmp`;
+			symlinkSync(scripts[3], temporary);
+			renameSync(temporary, path);
+		}
+		const temporary = `${context}.${process.pid}.tmp`;
+		writeFileSync(temporary, JSON.stringify({
+			...toolchain,
+			source: realpathSync(root),
+			state,
+			cache: dir
+		}));
+		renameSync(temporary, context);
+	});
+	register({
+		dir,
+		name: "android-cas",
+		prune: "atomic",
+		note: "Experimental Android compiler CAS"
+	});
+	return {
+		id,
+		dir,
+		initScript: scripts[0],
+		env: {
+			STIM_ANDROID_CAS_CONTEXT: context,
+			STIM_ANDROID_CAS_SOURCE_ROOT: realpathSync(root),
+			STIM_ANDROID_CAS_STATE: state,
+			STIM_ANDROID_CAS_NDK: toolchain.ndk,
+			STIM_ANDROID_CAS_NDK_VERSION: ndkVersion,
+			STIM_ANDROID_CAS_AR: toolchain.ar,
+			STIM_ANDROID_CAS_RANLIB: toolchain.ranlib,
+			STIM_ANDROID_CAS_CMAKE_TOOLCHAIN: scripts[1],
+			STIM_ANDROID_CAS_CMAKE_PCH: scripts[2],
+			CMAKE_C_COMPILER_LAUNCHER: "",
+			CMAKE_CXX_COMPILER_LAUNCHER: "",
+			CCACHE_DISABLE: "1"
+		}
+	};
+}
+//#endregion
+export { resolveAndroidCas as n, resolveAndroidCompilerCache as r, readAndroidCasToolchain as t };

package/dist/android-cas-compiler.mjs

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
-import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
+import { t as getExecutor } from "./exec-CaErVv7t.mjs";
+import { createHash, randomUUID } from "node:crypto";
 import { appendFileSync, existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
-import { createHash, randomUUID } from "node:crypto";
 import { once } from "node:events";
 //#region bin/android-cas-compiler.ts
 const context = process.env.STIM_ANDROID_CAS_CONTEXT;

package/dist/{app-install-CDFY2nUL.mjs → app-install-CAAplXAt.mjs}

@@ -1,138 +1,6 @@
-import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
-import { T as uninstallIosApp, c as iosSimulatorFailureAdvice, p as listUserApps } from "./ios-CmEzZiOj.mjs";
-import { closeSync, lstatSync, openSync, readSync, readdirSync } from "node:fs";
-import { isAbsolute, join } from "node:path";
-import { createHash } from "node:crypto";
-//#region src/engine/installed-artifact.ts
-const READ_CHUNK_BYTES = 1048576;
-const DEVICE_PATH_TIMEOUT_MS = 3e4;
-const DEVICE_HASH_TIMEOUT_MS = 12e4;
-const SHA256_HEX = /^[0-9a-f]{64}$/;
-function parseInstalledApkPath(text) {
-	if (typeof text !== "string") return null;
-	const paths = [];
-	for (const raw of text.split("\n")) {
-		const line = raw.trim();
-		if (!line.startsWith("package:")) continue;
-		const path = line.slice(8);
-		if (path.startsWith("/")) paths.push(path);
-	}
-	return paths.length === 1 ? paths[0] : null;
-}
-function parseDeviceSha256(text) {
-	if (typeof text !== "string") return null;
-	const first = text.trim().split(/\s+/)[0] ?? "";
-	return SHA256_HEX.test(first) ? first : null;
-}
-function parseAppContainerPath(text) {
-	if (typeof text !== "string") return null;
-	const lines = text.split("\n").map((line) => line.trim()).filter(Boolean);
-	return lines.length === 1 && isAbsolute(lines[0]) ? lines[0] : null;
-}
-function artifactsMatch(local, installed) {
-	return Boolean(local) && local === installed;
-}
-function hashFile(file) {
-	let fd = null;
-	try {
-		fd = openSync(file, "r");
-		const digest = createHash("sha256");
-		const buffer = Buffer.allocUnsafe(READ_CHUNK_BYTES);
-		for (;;) {
-			const read = readSync(fd, buffer, 0, READ_CHUNK_BYTES, null);
-			if (read <= 0) break;
-			digest.update(buffer.subarray(0, read));
-		}
-		return digest.digest("hex");
-	} catch {
-		return null;
-	} finally {
-		if (fd !== null) try {
-			closeSync(fd);
-		} catch {}
-	}
-}
-function hashBundle(dir) {
-	const digest = createHash("sha256");
-	const walk = (abs, rel) => {
-		let names;
-		try {
-			names = readdirSync(abs);
-		} catch {
-			return false;
-		}
-		for (const name of names.toSorted()) {
-			const child = join(abs, name);
-			const path = rel === "" ? name : `${rel}/${name}`;
-			let stat;
-			try {
-				stat = lstatSync(child);
-			} catch {
-				return false;
-			}
-			if (stat.isDirectory()) {
-				if (!walk(child, path)) return false;
-				continue;
-			}
-			if (!stat.isFile()) return false;
-			const file = hashFile(child);
-			if (file === null) return false;
-			digest.update(`${path}\0${file}\n`);
-		}
-		return true;
-	};
-	return walk(dir, "") ? digest.digest("hex") : null;
-}
-function deviceHoldsApk({ serial, packageName, apkPath }, { exec = null } = {}) {
-	const e = exec || getExecutor();
-	let path;
-	try {
-		path = parseInstalledApkPath(e.runFile("adb", [
-			"-s",
-			serial,
-			"shell",
-			"pm",
-			"path",
-			packageName
-		], { timeoutMs: DEVICE_PATH_TIMEOUT_MS }));
-	} catch {
-		return false;
-	}
-	if (!path) return false;
-	let installed;
-	try {
-		installed = parseDeviceSha256(e.runFile("adb", [
-			"-s",
-			serial,
-			"shell",
-			"sha256sum",
-			path
-		], { timeoutMs: DEVICE_HASH_TIMEOUT_MS }));
-	} catch {
-		return false;
-	}
-	if (!installed) return false;
-	return artifactsMatch(hashFile(apkPath), installed);
-}
-function deviceHoldsBundle({ udid, bundleId, appPath }, { exec = null } = {}) {
-	const e = exec || getExecutor();
-	let container;
-	try {
-		container = parseAppContainerPath(e.runFile("xcrun", [
-			"simctl",
-			"get_app_container",
-			udid,
-			bundleId
-		], { timeoutMs: DEVICE_PATH_TIMEOUT_MS }));
-	} catch {
-		return false;
-	}
-	if (!container) return false;
-	const installed = hashBundle(container);
-	if (!installed) return false;
-	return artifactsMatch(hashBundle(appPath), installed);
-}
-//#endregion
+import { t as getExecutor } from "./exec-CaErVv7t.mjs";
+import { D as uninstallIosApp, M as deviceHoldsApk, N as deviceHoldsBundle, l as iosSimulatorFailureAdvice, m as listUserApps } from "./ios-3CtCRhwr.mjs";
+import { t as DEV_MENU_LAUNCH_ARGS } from "./ios-device-Ee7sDXfp.mjs";
 //#region src/engine/app-install.ts
 const INSTALL_ERROR = "STIM_INSTALL_FAILED";
 const LAUNCH_ERROR = "STIM_LAUNCH_FAILED";
@@ -142,12 +10,37 @@ const IOS_SCHEME_APPROVAL_OPENER = "com.apple.CoreSimulator.CoreSimulatorBridge"
 const IOS_DEV_MENU_OFF_KEYS = ["EXDevMenuShowsAtLaunch", "EXDevMenuShowFloatingActionButton"];
 const DEV_CLIENT_ONBOARDING_QUERY = "disableOnboarding=1";
 const DEV_CLIENT_DISABLE_FAB_QUERY = "disableFab=1";
+const DEV_CLIENT_DEV_MENU_OFF_QUERY = "disableFab=1&disableAutoLaunch=1";
+const DEV_CLIENT_RESERVED_DEV_MENU_OFF_QUERY = "__expo_disable_fab=1&__expo_disable_auto_launch=1";
 const ANDROID_DISABLE_AUTO_LAUNCH_EXTRA = "EXDevMenuDisableAutoLaunch";
+const IOS_DEV_MENU_OFF_DEFAULTS_PLIST = [
+	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>",
+	"<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">",
+	"<plist version=\"1.0\">",
+	"<dict>",
+	...IOS_DEV_MENU_OFF_KEYS.flatMap((key) => [`  <key>${key}</key>`, "  <false/>"]),
+	"</dict>",
+	"</plist>",
+	""
+].join("\n");
+function writeIosDevMenuOffDefaults(udid, bundleId, exec) {
+	for (const key of IOS_DEV_MENU_OFF_KEYS) exec.runFile("xcrun", [
+		"simctl",
+		"spawn",
+		udid,
+		"defaults",
+		"write",
+		bundleId,
+		key,
+		"-bool",
+		"false"
+	], { timeoutMs: 6e4 });
+}
 function describeIosSimulatorFailure(error, exec) {
 	const detail = describe(error);
 	return error?.code === "ETIMEDOUT" ? `${detail}. ${iosSimulatorFailureAdvice(exec)}` : detail;
 }
-function installIosApp({ udid, appPath, bundleId = null, devClientScheme = null, proveInstalled = true }, { exec = null, now = null } = {}) {
+function installIosApp({ udid, appPath, bundleId = null, devClientScheme = null, schemeApprovals = [], proveInstalled = true }, { exec = null, now = null } = {}) {
 	const e = exec || getExecutor();
 	const artifactStartedAt = now?.();
 	const skipped = bundleId && proveInstalled ? deviceHoldsBundle({
@@ -174,20 +67,13 @@ function installIosApp({ udid, appPath, bundleId = null, devClientScheme = null,
 	}
 	const artifactFinishedAt = now?.();
 	const artifactDurationMs = artifactStartedAt !== void 0 && artifactFinishedAt !== void 0 ? artifactFinishedAt - artifactStartedAt : void 0;
-	const preparationStartedAt = bundleId && devClientScheme ? artifactFinishedAt : void 0;
-	if (bundleId && devClientScheme) try {
-		for (const key of IOS_DEV_MENU_OFF_KEYS) e.runFile("xcrun", [
-			"simctl",
-			"spawn",
-			udid,
-			"defaults",
-			"write",
-			bundleId,
-			key,
-			"-bool",
-			"false"
-		], { timeoutMs: 6e4 });
-		for (const key of iosSchemeApprovalKeys(bundleId, devClientScheme)) e.runFile("xcrun", [
+	const devMenuKeys = bundleId && devClientScheme && !skipped ? IOS_DEV_MENU_OFF_KEYS : [];
+	const missingApprovals = (bundleId && devClientScheme ? iosSchemeApprovalKeys(bundleId, devClientScheme) : []).filter((key) => !schemeApprovals.includes(`${key}=${bundleId}`));
+	const preparing = bundleId && (devMenuKeys.length > 0 || missingApprovals.length > 0);
+	const preparationStartedAt = preparing ? artifactFinishedAt : void 0;
+	if (bundleId && preparing) try {
+		if (devMenuKeys.length > 0) writeIosDevMenuOffDefaults(udid, bundleId, e);
+		for (const key of missingApprovals) e.runFile("xcrun", [
 			"simctl",
 			"spawn",
 			udid,
@@ -208,7 +94,8 @@ function installIosApp({ udid, appPath, bundleId = null, devClientScheme = null,
 	const devClientPreparationDurationMs = now && preparationStartedAt !== void 0 ? now() - preparationStartedAt : void 0;
 	const timing = {
 		...artifactDurationMs === void 0 ? {} : { artifactDurationMs },
-		...devClientPreparationDurationMs === void 0 ? {} : { devClientPreparationDurationMs }
+		...devClientPreparationDurationMs === void 0 ? {} : { devClientPreparationDurationMs },
+		...missingApprovals.length > 0 ? { schemeApprovals: [...schemeApprovals, ...missingApprovals.map((key) => `${key}=${bundleId}`)] } : {}
 	};
 	return skipped ? {
 		ok: true,
@@ -230,6 +117,7 @@ function clearOtherUserApps({ udid, keep }, { list = listUserApps, uninstall = u
 	} catch {
 		return {
 			listed: false,
+			kept: false,
 			removed,
 			failed
 		};
@@ -245,6 +133,7 @@ function clearOtherUserApps({ udid, keep }, { list = listUserApps, uninstall = u
 	}
 	return {
 		listed: true,
+		kept: keep ? installed.includes(keep) : false,
 		removed,
 		failed
 	};
@@ -252,16 +141,20 @@ function clearOtherUserApps({ udid, keep }, { list = listUserApps, uninstall = u
 function jsLocationValue(metroPort) {
 	return `localhost:${metroPort}`;
 }
-function devClientDeepLink(scheme, projectOrigin) {
-	const projectUrl = `${projectOrigin.replace(/\/+$/, "")}/?${DEV_CLIENT_ONBOARDING_QUERY}`;
-	return `${scheme}://expo-development-client/?url=${encodeURIComponent(projectUrl)}&${DEV_CLIENT_DISABLE_FAB_QUERY}`;
+function devClientDeepLink(scheme, projectOrigin, { devMenuParams = false } = {}) {
+	const projectQuery = devMenuParams ? `${DEV_CLIENT_ONBOARDING_QUERY}&${DEV_CLIENT_DEV_MENU_OFF_QUERY}&${DEV_CLIENT_RESERVED_DEV_MENU_OFF_QUERY}` : DEV_CLIENT_ONBOARDING_QUERY;
+	const projectUrl = `${projectOrigin.replace(/\/+$/, "")}/?${projectQuery}`;
+	return `${scheme}://expo-development-client/?url=${encodeURIComponent(projectUrl)}&${devMenuParams ? DEV_CLIENT_DEV_MENU_OFF_QUERY : DEV_CLIENT_DISABLE_FAB_QUERY}`;
 }
-function devClientUrl(scheme, metroPort, host = "localhost") {
-	return devClientDeepLink(scheme, `http://${host}:${metroPort}`);
+function devClientUrl(scheme, metroPort, host = "localhost", options = {}) {
+	return devClientDeepLink(scheme, `http://${host}:${metroPort}`, options);
 }
 function iosSchemeApprovalKeys(bundleId, devClientScheme) {
 	return [.../* @__PURE__ */ new Set([bundleId, devClientScheme])].map((target) => `${IOS_SCHEME_APPROVAL_OPENER}-->${target}`);
 }
+function restartedAppNote(restartedPid, lead = " ") {
+	return restartedPid ? `${lead}restarted running app (was pid ${restartedPid})` : "";
+}
 function parseLaunchedPid(text) {
 	if (typeof text !== "string") return null;
 	const match = text.trim().match(/:\s*(\d+)\s*$/);
@@ -296,7 +189,7 @@ function launchedIosAppAfterNoHandle(error, udid, bundleId, exec) {
 	if (!stderr.includes("domain=NSPOSIXErrorDomain, code=3") || !stderr.includes(`Application launch for '${bundleId}' did not return a process handle nor launch error.`)) return null;
 	return iosAppProcess(udid, bundleId, { exec }) ?? null;
 }
-function launchIosApp({ udid, bundleId, metroPort, devClientScheme = null, consolePaths }, { exec = null } = {}) {
+function launchIosApp({ udid, bundleId, metroPort, devClientScheme = null, devMenuParams = false, consolePaths }, { exec = null } = {}) {
 	const e = exec || getExecutor();
 	const launchArgs = [
 		"simctl",
@@ -305,6 +198,26 @@ function launchIosApp({ udid, bundleId, metroPort, devClientScheme = null, conso
 		udid,
 		bundleId
 	];
+	let runningPid = iosAppProcess(udid, bundleId, { exec: e });
+	const restart = {};
+	if (runningPid) {
+		try {
+			e.runFile("xcrun", [
+				"simctl",
+				"terminate",
+				udid,
+				bundleId
+			], { timeoutMs: 3e4 });
+		} catch (err) {
+			return {
+				failed: true,
+				code: LAUNCH_ERROR,
+				reason: `simctl terminate ${bundleId} failed, so the running app (pid ${runningPid}) was not restarted: ${describeIosSimulatorFailure(err, e)}`
+			};
+		}
+		restart.restartedPid = runningPid;
+		runningPid = null;
+	}
 	if (metroPort !== null) {
 		try {
 			e.runFile("xcrun", [
@@ -325,23 +238,35 @@ function launchIosApp({ udid, bundleId, metroPort, devClientScheme = null, conso
 			};
 		}
 		if (devClientScheme) {
-			const url = devClientUrl(devClientScheme, metroPort);
+			const url = devClientUrl(devClientScheme, metroPort, "localhost", { devMenuParams });
+			const viaInitialUrl = Boolean(consolePaths) && runningPid === null;
+			if (!viaInitialUrl) try {
+				writeIosDevMenuOffDefaults(udid, bundleId, e);
+			} catch (err) {
+				return {
+					failed: true,
+					code: LAUNCH_ERROR,
+					reason: `Could not turn off ${bundleId}'s dev menu before opening it (defaults write): ${describeIosSimulatorFailure(err, e)}`
+				};
+			}
 			let launchedWithInitialUrl = false;
 			try {
-				if (consolePaths && iosAppProcess(udid, bundleId, { exec: e }) === null) {
+				if (viaInitialUrl) {
 					const initialUrl = new URL(url).searchParams.get("url");
 					launchedWithInitialUrl = true;
 					const pid = parseLaunchedPid(e.runFile("xcrun", [
 						...launchArgs,
 						"--initialUrl",
-						initialUrl
+						initialUrl,
+						...DEV_MENU_LAUNCH_ARGS
 					], { timeoutMs: 6e4 }));
 					return {
 						ok: true,
 						mode: "launch",
 						url,
 						jsLocation: jsLocationValue(metroPort),
-						pid
+						pid,
+						...restart
 					};
 				}
 				e.runFile("xcrun", [
@@ -354,16 +279,18 @@ function launchIosApp({ udid, bundleId, metroPort, devClientScheme = null, conso
 					ok: true,
 					mode: "openurl",
 					url,
-					jsLocation: jsLocationValue(metroPort)
+					jsLocation: jsLocationValue(metroPort),
+					...restart
 				};
 			} catch (err) {
 				const pid = launchedWithInitialUrl ? launchedIosAppAfterNoHandle(err, udid, bundleId, e) : null;
-				if (pid) return {
+				if (pid && pid !== restart.restartedPid) return {
 					ok: true,
 					mode: "launch",
 					url,
 					jsLocation: jsLocationValue(metroPort),
-					pid
+					pid,
+					...restart
 				};
 				return {
 					failed: true,
@@ -373,22 +300,23 @@ function launchIosApp({ udid, bundleId, metroPort, devClientScheme = null, conso
 			}
 		}
 	}
-	const preLaunchPid = iosAppProcess(udid, bundleId, { exec: e });
 	try {
 		const result = {
 			ok: true,
 			mode: "launch",
-			pid: parseLaunchedPid(e.runFile("xcrun", launchArgs, { timeoutMs: 6e4 }))
+			pid: parseLaunchedPid(e.runFile("xcrun", launchArgs, { timeoutMs: 6e4 })),
+			...restart
 		};
 		if (metroPort !== null) result.jsLocation = jsLocationValue(metroPort);
 		return result;
 	} catch (err) {
-		const pid = preLaunchPid === null ? launchedIosAppAfterNoHandle(err, udid, bundleId, e) : null;
-		if (pid) {
+		const pid = runningPid === null ? launchedIosAppAfterNoHandle(err, udid, bundleId, e) : null;
+		if (pid && pid !== restart.restartedPid) {
 			const result = {
 				ok: true,
 				mode: "launch",
-				pid
+				pid,
+				...restart
 			};
 			if (metroPort !== null) result.jsLocation = jsLocationValue(metroPort);
 			return result;
@@ -533,6 +461,39 @@ function reverseMetroPorts({ serial, metroPort, devicePorts = null }, { exec = n
 		reversed: pairs.map(([device, host]) => `tcp:${device}->tcp:${host}`)
 	};
 }
+function hasMetroReverse(listing, metroPort) {
+	return String(listing ?? "").split("\n").some((line) => {
+		const cols = line.trim().split(/\s+/);
+		return cols[1] === `tcp:${metroPort}` && cols[2] === `tcp:${metroPort}`;
+	});
+}
+/** Re-applies the launch's `metroPort` reverse when the device no longer has it. */
+function ensureMetroReverse({ serial, metroPort }, { exec = null } = {}) {
+	const e = exec || getExecutor();
+	let listing;
+	try {
+		listing = e.runFile("adb", [
+			"-s",
+			serial,
+			"reverse",
+			"--list"
+		], ADB_SHELL_OPTIONS);
+	} catch {
+		return {
+			failed: true,
+			reason: `adb reverse --list failed on ${serial}`
+		};
+	}
+	if (hasMetroReverse(listing, metroPort)) return { restored: false };
+	const reversed = reverseMetroPorts({
+		serial,
+		metroPort
+	}, { exec: e });
+	return reversed.failed ? {
+		failed: true,
+		reason: reversed.reason ?? "adb reverse failed"
+	} : { restored: true };
+}
 const EMULATOR_HOST_LOOPBACK = "127.0.0.1";
 const PHYSICAL_HOST_LOOPBACK = "localhost";
 function androidMetroHost(physical) {
@@ -631,8 +592,31 @@ function openAndroidDevClientUrl({ serial, url, packageName }, { exec = null } =
 		url
 	};
 }
+function stopRunningAndroidApp(serial, packageName, exec) {
+	const pid = androidAppProcess(serial, packageName, { exec });
+	if (!pid) return {};
+	try {
+		exec.runFile("adb", [
+			"-s",
+			serial,
+			"shell",
+			"am",
+			"force-stop",
+			packageName
+		], ADB_SHELL_OPTIONS);
+	} catch (err) {
+		return {
+			failed: true,
+			code: LAUNCH_ERROR,
+			reason: `am force-stop ${packageName} failed on ${serial}, so the running app (pid ${pid}) was not restarted: ${describe(err)}`
+		};
+	}
+	return { restartedPid: pid };
+}
 function launchAndroidApp({ serial, packageName, metroPort, devClientScheme = null, physical = false }, { exec = null } = {}) {
 	const e = exec || getExecutor();
+	const restart = stopRunningAndroidApp(serial, packageName, e);
+	if (restart.failed) return restart;
 	const reversed = reverseMetroPorts({
 		serial,
 		metroPort
@@ -657,7 +641,8 @@ function launchAndroidApp({ serial, packageName, metroPort, devClientScheme = nu
 	const wiring = {
 		reversed: reversedPairs,
 		debugHttpHost: prefs.ok ? prefs.host : null,
-		debugHttpHostNote: prefs.ok ? null : prefs.reason
+		debugHttpHostNote: prefs.ok ? null : prefs.reason,
+		...restart
 	};
 	let devClientNote = null;
 	if (devClientScheme) {
@@ -725,6 +710,8 @@ function launchAndroidApp({ serial, packageName, metroPort, devClientScheme = nu
 }
 function launchAndroidReleaseApp({ serial, packageName }, { exec = null } = {}) {
 	const e = exec || getExecutor();
+	const restart = stopRunningAndroidApp(serial, packageName, e);
+	if (restart.failed) return restart;
 	const component = resolveLaunchActivity(serial, packageName, { exec: e });
 	if (component) try {
 		e.runFile("adb", [
@@ -739,7 +726,8 @@ function launchAndroidReleaseApp({ serial, packageName }, { exec = null } = {})
 		return {
 			ok: true,
 			mode: "am-start",
-			component
+			component,
+			...restart
 		};
 	} catch (err) {
 		return {
@@ -760,7 +748,8 @@ function launchAndroidReleaseApp({ serial, packageName }, { exec = null } = {})
 		], ADB_SHELL_OPTIONS);
 		return {
 			ok: true,
-			mode: "monkey"
+			mode: "monkey",
+			...restart
 		};
 	} catch (err) {
 		return {
@@ -816,4 +805,4 @@ function androidAppProcess(serial, packageName, { exec = null } = {}) {
 	}
 }
 //#endregion
-export { launchAndroidReleaseApp as _, LAUNCH_ERROR as a, clearOtherUserApps as c, deviceShellArg as d, installAndroidApp as f, launchAndroidApp as g, iosAppProcess as h, INSTALL_ERROR as i, devClientDeepLink as l, installIosApp as m, ANDROID_DISABLE_AUTO_LAUNCH_EXTRA as n, androidAppProcess as o, installConflictKind as p, DEFAULT_METRO_PORT as r, androidDevClientUrl as s, ADB_INSTALL_TIMEOUT_MS as t, devClientUrl as u, launchIosApp as v };
+export { restartedAppNote as S, installIosApp as _, IOS_DEV_MENU_OFF_DEFAULTS_PLIST as a, launchAndroidReleaseApp as b, androidDevClientUrl as c, devClientUrl as d, deviceShellArg as f, installConflictKind as g, installAndroidApp as h, INSTALL_ERROR as i, clearOtherUserApps as l, hasMetroReverse as m, ANDROID_DISABLE_AUTO_LAUNCH_EXTRA as n, LAUNCH_ERROR as o, ensureMetroReverse as p, DEFAULT_METRO_PORT as r, androidAppProcess as s, ADB_INSTALL_TIMEOUT_MS as t, devClientDeepLink as u, iosAppProcess as v, launchIosApp as x, launchAndroidApp as y };