stim 1.14.0 → 1.15.0

package/dist/{android-d6rGq1pA.mjs → android-Db2eEMaf.mjs}

@@ -1,14 +1,15 @@
-import { A as ownership_claim_exports, B as deviceSlotPlatforms, E as withConfigLock$1, L as assignSlotDevice, O as process_identity_exports, S as saveConfig, U as projectDeviceSlots, W as removeSlotDevice, _ as loadConfig$1, c as ensureConfig, d as getConfigDir, f as getConfigPath$1 } from "./config-lvc7d3C2.mjs";
-import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
-import { a as pidExists, l as signalProcessTree } from "./metro-CcEo8Fl8.mjs";
-import { n as settingDefault, r as stimDesktopInstalled, t as STIM_DESKTOP_OPEN_OPTIONS } from "./stim-desktop-CXt8-Z3J.mjs";
-import { n as readCreatedDevices$1, r as recordCreatedDevice, t as forgetCreatedDevice } from "./created-devices-CllH_8eb.mjs";
-import { c as androidDataPartitionSizeBytes } from "./settings-D61iNOsB.mjs";
+import { t as getExecutor } from "./exec-CaErVv7t.mjs";
+import { C as saveConfig, D as withConfigLock$1, H as projectDeviceSlots, I as assignSlotDevice, U as removeSlotDevice, _ as loadConfig$1, c as ensureConfig, d as getConfigDir, f as getConfigPath$1, z as deviceSlotPlatforms } from "./config-D0DbpZtM.mjs";
+import { n as ownership_claim_exports, t as process_identity_exports } from "./process-identity-BmRm1qV0.mjs";
+import { n as settingDefault, r as stimDesktopInstalled, t as STIM_DESKTOP_OPEN_OPTIONS } from "./stim-desktop-Cnz8CPnl.mjs";
+import { n as readCreatedDevices$1, r as recordCreatedDevice, t as forgetCreatedDevice } from "./created-devices-BwVb3liH.mjs";
+import { o as pidExists, u as signalProcessTree } from "./metro-Di8EN2Tb.mjs";
+import { c as androidDataPartitionSizeBytes } from "./settings-CduVcoxj.mjs";
+import { join } from "node:path";
 import { existsSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, writeFileSync } from "fs";
-import { dirname, isAbsolute, join, resolve } from "path";
-import { ANDROID_EMULATOR_APPS, loadConfig, settingDefinition } from "@stim-cli/core/state";
-import { join as join$1 } from "node:path";
 import { homedir, tmpdir } from "os";
+import { dirname as dirname$1, isAbsolute as isAbsolute$1, join as join$1, resolve as resolve$1 } from "path";
+import { ANDROID_EMULATOR_APPS, loadConfig, settingDefinition } from "@stim-cli/core/state";
 import { isDeepStrictEqual } from "node:util";
 //#region src/devices/android-emulator-viewer.ts
 function configuredAndroidEmulatorApp(platform = process.platform) {
@@ -70,7 +71,7 @@ function parkedMaxSetting(platform, { config, env = process.env } = {}) {
 function isParkedRecord(value, platform) {
 	if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
 	const record = value;
-	return typeof record.udid === "string" && typeof record.name === "string" && record.name.startsWith("stim-") && typeof record.parkedAt === "string" && (platform === "android" ? record.udid === record.name && /^stim-[A-Za-z0-9._-]+$/.test(record.name) && typeof record.systemImage === "string" && typeof record.configuration === "string" : typeof record.deviceTypeIdentifier === "string" && typeof record.runtimeIdentifier === "string" && typeof record.simslimManaged === "boolean" && (record.bundleId === void 0 || typeof record.bundleId === "string") && (record.cacheKey === void 0 || typeof record.cacheKey === "string"));
+	return typeof record.udid === "string" && typeof record.name === "string" && record.name.startsWith("stim-") && typeof record.parkedAt === "string" && (platform === "android" ? record.udid === record.name && /^stim-[A-Za-z0-9._-]+$/.test(record.name) && typeof record.systemImage === "string" && typeof record.configuration === "string" && (record.packageName === void 0 || typeof record.packageName === "string") && (record.cacheKey === void 0 || typeof record.cacheKey === "string") : typeof record.deviceTypeIdentifier === "string" && typeof record.runtimeIdentifier === "string" && typeof record.simslimManaged === "boolean" && (record.bundleId === void 0 || typeof record.bundleId === "string") && (record.cacheKey === void 0 || typeof record.cacheKey === "string") && (record.schemeApprovals === void 0 || Array.isArray(record.schemeApprovals) && record.schemeApprovals.every((v) => typeof v === "string")));
 }
 function poolBlock(config) {
 	const raw = config?.parked;
@@ -124,7 +125,13 @@ function parkSim({ platform, projectPath, slot = "default", record, max }) {
 		const current = deviceSlotPlatforms(cfg.projects[projectPath], slot)?.[platform];
 		const currentId = platform === "ios" ? current?.deviceUdid : current?.avdName;
 		if (!current?.owned || currentId !== record.udid) throw new Error(`The ${platform === "ios" ? "simulator" : "emulator"} assignment changed before parking.`);
-		const { keep, evicted } = evictOverflow([...readParked(platform, { config: cfg }).filter((r) => r.udid !== record.udid), record], max);
+		const currentApprovals = platform === "ios" ? current.schemeApprovals : void 0;
+		const schemeApprovals = Array.isArray(currentApprovals) && currentApprovals.every((v) => typeof v === "string") ? currentApprovals : void 0;
+		const carried = schemeApprovals && schemeApprovals.length > 0 ? {
+			...record,
+			schemeApprovals
+		} : record;
+		const { keep, evicted } = evictOverflow([...readParked(platform, { config: cfg }).filter((r) => r.udid !== record.udid), carried], max);
 		writeParked(cfg, platform, [...keep, ...evicted]);
 		const project = cfg.projects[projectPath];
 		if (project) removeSlotDevice(project, platform, slot);
@@ -145,10 +152,15 @@ function adoptParked({ platform, projectPath, slot = "default", udid, device })
 			writeParked(cfg, platform, records.filter((r) => r.udid !== udid));
 			const project = cfg.projects[projectPath];
 			if (!project) throw new Error(`Project not registered: ${projectPath}`);
-			assignSlotDevice(project, platform, device, slot);
-			saveConfig(cfg);
-			const adopted = { ...taken };
+			const adopted = taken.deletionClaim === void 0 ? { ...taken } : erasedRecord(taken);
 			delete adopted.deletionClaim;
+			const takenApprovals = platform === "ios" ? adopted.schemeApprovals : void 0;
+			const assigned = takenApprovals && takenApprovals.length > 0 ? {
+				...device,
+				schemeApprovals: takenApprovals
+			} : device;
+			assignSlotDevice(project, platform, assigned, slot);
+			saveConfig(cfg);
 			return adopted;
 		});
 	} finally {
@@ -157,7 +169,7 @@ function adoptParked({ platform, projectPath, slot = "default", udid, device })
 }
 function claimParkedOperation(platform, udid) {
 	const attempt = (0, ownership_claim_exports.tryAcquireClaim)({
-		root: join$1(getConfigDir(), "pool-locks", platform, `${encodeURIComponent(udid.toLowerCase())}.lock`),
+		root: join(getConfigDir(), "pool-locks", platform, `${encodeURIComponent(udid.toLowerCase())}.lock`),
 		mode: "exclusive",
 		label: `parked ${platform} device ${udid}`
 	});
@@ -165,6 +177,20 @@ function claimParkedOperation(platform, udid) {
 	return attempt.acquired ?? null;
 }
 function removeParkedAfter(platform, udid, beforeRemove) {
+	return settleParkedAfter(platform, udid, beforeRemove, null);
+}
+function eraseParkedAfter(platform, udid, erase) {
+	return settleParkedAfter(platform, udid, erase, erasedRecord);
+}
+function erasedRecord(record) {
+	const erased = { ...record };
+	delete erased.bundleId;
+	delete erased.packageName;
+	delete erased.cacheKey;
+	delete erased.schemeApprovals;
+	return erased;
+}
+function settleParkedAfter(platform, udid, action, keep) {
 	const claim = claimParkedOperation(platform, udid);
 	if (!claim) return null;
 	try {
@@ -193,11 +219,14 @@ function removeParkedAfter(platform, udid, beforeRemove) {
 		});
 		if (!claimed) return null;
 		let completed = false;
-		let removed = null;
+		let started = false;
+		let settled = null;
 		try {
 			(0, ownership_claim_exports.markClaimChildPending)(claim);
 			try {
-				beforeRemove(claimed.record);
+				action(claimed.record, () => {
+					started = true;
+				});
 			} finally {
 				(0, ownership_claim_exports.clearClaimChild)(claim);
 			}
@@ -209,12 +238,13 @@ function removeParkedAfter(platform, udid, beforeRemove) {
 				const records = readParked(platform, { config: cfg });
 				const current = records.find((candidate) => candidate.udid === udid);
 				if (!isDeepStrictEqual(current, claimed.marked)) return;
-				writeParked(cfg, platform, completed ? records.filter((candidate) => candidate.udid !== udid) : records.map((candidate) => candidate.udid === udid ? claimed.record : candidate));
+				const after = (completed || started) && keep ? keep(claimed.record) : claimed.record;
+				writeParked(cfg, platform, completed && !keep ? records.filter((candidate) => candidate.udid !== udid) : records.map((candidate) => candidate.udid === udid ? after : candidate));
 				saveConfig(cfg);
-				if (completed) removed = claimed.record;
+				if (completed) settled = claimed.record;
 			});
 		}
-		return removed;
+		return settled;
 	} finally {
 		(0, ownership_claim_exports.releaseClaim)(claim);
 	}
@@ -263,8 +293,8 @@ const DEFAULT_AVD_DEVICE_PROFILE = String(settingDefinition("android.deviceProfi
 function androidHome(env = process.env) {
 	const configured = env.ANDROID_HOME || env.ANDROID_SDK_ROOT;
 	if (configured) return configured;
-	if (process.platform === "win32") return join(env.LOCALAPPDATA || join(homedir(), "AppData", "Local"), "Android", "Sdk");
-	return join(homedir(), "Library", "Android", "sdk");
+	if (process.platform === "win32") return join$1(env.LOCALAPPDATA || join$1(homedir(), "AppData", "Local"), "Android", "Sdk");
+	return join$1(homedir(), "Library", "Android", "sdk");
 }
 const SDK_TOOL_LOCATIONS = {
 	emulator: ["emulator", "emulator"],
@@ -292,7 +322,7 @@ function androidToolPath(tool, platform = process.platform) {
 	const location = SDK_TOOL_LOCATIONS[tool];
 	const bare = location.at(-1);
 	const name = platform === "win32" ? `${bare}${WINDOWS_SDK_TOOL_EXTENSIONS[tool]}` : bare;
-	const abs = join(androidHome(), ...location.slice(0, -1), name);
+	const abs = join$1(androidHome(), ...location.slice(0, -1), name);
 	return existsSync(abs) ? abs : bare;
 }
 const WINDOWS_BUILD_TOOL_EXTENSIONS = { apksigner: ".bat" };
@@ -316,7 +346,7 @@ function buildToolsMajor(version) {
 	return Number.isFinite(major) ? major : 0;
 }
 function findBuildTool(tools, { home = androidHome(), readDir = readdirSync, exists = existsSync, platform = process.platform } = {}) {
-	const root = join(home, "build-tools");
+	const root = join$1(home, "build-tools");
 	let versions = [];
 	try {
 		versions = readDir(root);
@@ -327,7 +357,7 @@ function findBuildTool(tools, { home = androidHome(), readDir = readdirSync, exi
 		const version = newestBuildTools(versions);
 		if (!version) return null;
 		for (const tool of tools) {
-			const path = join(root, version, androidBuildToolName(tool, platform));
+			const path = join$1(root, version, androidBuildToolName(tool, platform));
 			if (exists(path)) return {
 				path,
 				tool,
@@ -344,7 +374,7 @@ function androidTool(tool) {
 	return resolved === tool ? tool : `"${resolved}"`;
 }
 function listInstalledSystemImages(onUnreadable) {
-	const root = join(androidHome(), "system-images");
+	const root = join$1(androidHome(), "system-images");
 	const images = [];
 	const list = (dir) => {
 		try {
@@ -358,8 +388,8 @@ function listInstalledSystemImages(onUnreadable) {
 	for (const apiDir of list(root)) {
 		const m = apiDir.match(/^android-(\d+)$/);
 		if (!m) continue;
-		const apiPath = join(root, apiDir);
-		for (const tag of list(apiPath)) for (const arch of list(join(apiPath, tag))) images.push({
+		const apiPath = join$1(root, apiDir);
+		for (const tag of list(apiPath)) for (const arch of list(join$1(apiPath, tag))) images.push({
 			api: Number(m[1]),
 			tag,
 			arch,
@@ -387,7 +417,7 @@ function profileNeedsFoldFeature(profile) {
 }
 function systemImageSupportsFold(pkg, home = androidHome()) {
 	try {
-		const ini = readFileSync(join(home, ...pkg.split(";"), "advancedFeatures.ini"), "utf8");
+		const ini = readFileSync(join$1(home, ...pkg.split(";"), "advancedFeatures.ini"), "utf8");
 		return /^\s*SupportPixelFold\s*=\s*on\s*$/im.test(ini);
 	} catch {
 		return false;
@@ -412,13 +442,23 @@ async function createOwnedAvd(label, { systemImage, deviceProfile = DEFAULT_AVD_
 		"--device",
 		deviceProfile
 	];
+	let env = process.env;
+	if (!env.ANDROID_AVD_HOME) {
+		const root = avdLookupRoots(env, homedir())[0];
+		mkdirSync(root, { recursive: true });
+		env = {
+			...env,
+			ANDROID_AVD_HOME: root
+		};
+	}
 	const child = spawn(tool, args, {
 		detached: true,
 		stdio: [
 			"pipe",
 			"pipe",
 			"pipe"
-		]
+		],
+		env
 	});
 	let stderr = "";
 	child.stdout?.on("data", () => {});
@@ -463,7 +503,7 @@ function ownedAvdSystemImage(avdName, { avdDirectory = ownedAvdDirectory, readFi
 	const directory = avdDirectory(avdName);
 	if (!directory) return null;
 	try {
-		return parseAvdSystemImage(readFile(join(directory, "config.ini")));
+		return parseAvdSystemImage(readFile(join$1(directory, "config.ini")));
 	} catch {
 		return null;
 	}
@@ -486,7 +526,7 @@ function sanitizeAvdLabel(label) {
 function avdConfigIni(avdName, directory = ownedAvdDirectory(avdName)) {
 	if (!directory) return null;
 	try {
-		return readFileSync(join(directory, "config.ini"), "utf8");
+		return readFileSync(join$1(directory, "config.ini"), "utf8");
 	} catch {
 		return null;
 	}
@@ -498,9 +538,11 @@ function ownedAvdName(label) {
 const AVDMANAGER_DELETE_TIMEOUT_MS = 12e4;
 function deleteAvd(avdName) {
 	if (!isStimOwnedAvd(avdName)) throw new Error(`Refusing to delete AVD "${avdName}": not a Stim-owned AVD; Stim has no record of creating it.`);
+	const root = process.env.ANDROID_AVD_HOME ? void 0 : avdStorageRoots().find((candidate) => avdPathExists(join$1(candidate, `${avdName}.ini`)));
 	getExecutor().run(`${androidTool("avdmanager")} delete avd -n "${avdName}"`, {
 		timeoutMs: AVDMANAGER_DELETE_TIMEOUT_MS,
-		killSignal: "SIGKILL"
+		killSignal: "SIGKILL",
+		...root ? { env: { ANDROID_AVD_HOME: root } } : {}
 	});
 	forgetCreatedDevice("android", avdName);
 }
@@ -703,17 +745,17 @@ function parseAvdRootIni(contents) {
 }
 function avdIniPaths(root, ini) {
 	const parsed = parseAvdRootIni(ini);
-	return [parsed.relativePath && !isAbsolute(parsed.relativePath) ? resolve(dirname(root), parsed.relativePath) : null, parsed.path && isAbsolute(parsed.path) ? parsed.path : null].filter((candidate) => candidate !== null);
+	return [parsed.relativePath && !isAbsolute$1(parsed.relativePath) ? resolve$1(dirname$1(root), parsed.relativePath) : null, parsed.path && isAbsolute$1(parsed.path) ? parsed.path : null].filter((candidate) => candidate !== null);
 }
 function avdStorageRoots() {
 	const env = process.env;
 	return [...new Set([
 		env.ANDROID_AVD_HOME,
-		env.ANDROID_EMULATOR_HOME ? join(env.ANDROID_EMULATOR_HOME, "avd") : null,
-		env.ANDROID_USER_HOME ? join(env.ANDROID_USER_HOME, "avd") : null,
-		env.ANDROID_SDK_HOME ? join(env.ANDROID_SDK_HOME, ".android", "avd") : null,
-		env.ANDROID_SDK_HOME ? join(env.ANDROID_SDK_HOME, "avd") : null,
-		join(homedir(), ".android", "avd")
+		env.ANDROID_EMULATOR_HOME ? join$1(env.ANDROID_EMULATOR_HOME, "avd") : null,
+		env.ANDROID_USER_HOME ? join$1(env.ANDROID_USER_HOME, "avd") : null,
+		env.ANDROID_SDK_HOME ? join$1(env.ANDROID_SDK_HOME, ".android", "avd") : null,
+		env.ANDROID_SDK_HOME ? join$1(env.ANDROID_SDK_HOME, "avd") : null,
+		join$1(homedir(), ".android", "avd")
 	].filter((value) => Boolean(value)))];
 }
 function avdPathExists(path) {
@@ -732,7 +774,7 @@ function avdPathExists(path) {
 */
 function avdNameAbsent(avdName, roots = avdStorageRoots()) {
 	if (!roots[0] || !isDirectoryPath(roots[0])) return false;
-	return roots.every((root) => !avdPathExists(join(root, `${avdName}.ini`)) && !avdPathExists(join(root, `${avdName}.avd`)));
+	return roots.every((root) => !avdPathExists(join$1(root, `${avdName}.ini`)) && !avdPathExists(join$1(root, `${avdName}.avd`)));
 }
 function isDirectoryPath(path) {
 	try {
@@ -751,7 +793,7 @@ function listOrphanedAvdDirectories(avdName) {
 	}));
 	const registered = /* @__PURE__ */ new Set();
 	for (const { root, canonicalRoot, names } of stores) for (const name of names.filter((entry) => entry.endsWith(".ini"))) {
-		const path = join(root, name);
+		const path = join$1(root, name);
 		const ini = readFileSync(path, "utf8");
 		const targets = /* @__PURE__ */ new Set([...avdIniPaths(root, ini), ...avdIniPaths(canonicalRoot, ini)]);
 		if (!targets.size) throw new Error(`Cannot verify AVD registration at ${path}; its data was kept.`);
@@ -768,8 +810,8 @@ function listOrphanedAvdDirectories(avdName) {
 		for (const entry of names) {
 			if (!/^stim-[A-Za-z0-9._-]+\.avd$/.test(entry)) continue;
 			const name = entry.slice(0, -4);
-			if (roots.some((candidate) => avdPathExists(join(candidate, `${name}.ini`)))) continue;
-			const directory = join(canonicalRoot, entry);
+			if (roots.some((candidate) => avdPathExists(join$1(candidate, `${name}.ini`)))) continue;
+			const directory = join$1(canonicalRoot, entry);
 			if (registered.has(directory) || !avdPathExists(directory)) continue;
 			const stat = lstatSync(directory);
 			if (!stat.isDirectory() || stat.isSymbolicLink() || realpathSync(directory) !== directory) throw new Error(`Cannot verify AVD data at ${directory}; it was kept.`);
@@ -783,17 +825,20 @@ function listOrphanedAvdDirectories(avdName) {
 	}
 	return orphaned;
 }
-function ownedAvdDirectory(avdName, { env = process.env, home = homedir(), readFile = (path) => readFileSync(path, "utf8"), realpath = realpathSync, isDirectory = (path) => statSync(path).isDirectory() } = {}) {
-	if (!/^stim-[A-Za-z0-9._-]+$/.test(avdName)) return null;
+function avdLookupRoots(env, home) {
 	const roots = [
 		env.ANDROID_AVD_HOME,
-		env.ANDROID_SDK_HOME ? join(env.ANDROID_SDK_HOME, "avd") : null,
-		join(home, ".android", "avd")
+		env.ANDROID_SDK_HOME ? join$1(env.ANDROID_SDK_HOME, "avd") : null,
+		join$1(home, ".android", "avd")
 	];
-	for (const root of new Set(roots.filter((value) => Boolean(value)))) {
+	return [...new Set(roots.filter((value) => Boolean(value)))];
+}
+function ownedAvdDirectory(avdName, { env = process.env, home = homedir(), readFile = (path) => readFileSync(path, "utf8"), realpath = realpathSync, isDirectory = (path) => statSync(path).isDirectory() } = {}) {
+	if (!/^stim-[A-Za-z0-9._-]+$/.test(avdName)) return null;
+	for (const root of avdLookupRoots(env, home)) {
 		let ini;
 		try {
-			ini = readFile(join(root, `${avdName}.ini`));
+			ini = readFile(join$1(root, `${avdName}.ini`));
 		} catch (error) {
 			const code = error.code;
 			if (code === "ENOENT" || code === "ENOTDIR") continue;
@@ -817,7 +862,7 @@ const AVD_USER_DATA = [
 	"snapshots"
 ];
 function wipeAvdUserData(directory) {
-	for (const name of AVD_USER_DATA) rmSync(join(directory, name), {
+	for (const name of AVD_USER_DATA) rmSync(join$1(directory, name), {
 		recursive: true,
 		force: true
 	});
@@ -850,14 +895,14 @@ function configureNewOwnedAvd(avdName, { dataPartitionSizeGb, avdConfig = {} },
 	const sizeBytes = androidDataPartitionSizeBytes(dataPartitionSizeGb);
 	const directory = avdDirectory(avdName);
 	if (!directory) throw new Error(`Could not resolve the content directory for newly created AVD ${avdName}.`);
-	const configPath = join(directory, "config.ini");
+	const configPath = join$1(directory, "config.ini");
 	const original = readFile(configPath);
 	const expected = {
 		...avdConfig,
 		"disk.dataPartition.size": String(sizeBytes)
 	};
 	const updated = withAvdConfigOverrides(original, expected);
-	const tempPath = join(directory, `.config.ini.stim-${process.pid}-${++avdConfigWriteSequence}.tmp`);
+	const tempPath = join$1(directory, `.config.ini.stim-${process.pid}-${++avdConfigWriteSequence}.tmp`);
 	try {
 		writeFile(tempPath, updated);
 		rename(tempPath, configPath);
@@ -886,7 +931,7 @@ function avdPoolConfiguration(dataPartitionSizeGb, avdConfig, deviceProfile = DE
 function ownedAvdMatchesConfiguration(avdName, configuration) {
 	const directory = ownedAvdDirectory(avdName);
 	if (!directory) return false;
-	const contents = readFileSync(join(directory, "config.ini"), "utf8");
+	const contents = readFileSync(join$1(directory, "config.ini"), "utf8");
 	const expected = JSON.parse(configuration);
 	return Array.isArray(expected) && expected.length > 0 && expected.every((entry) => Array.isArray(entry) && entry.length === 2 && entry.every((value) => typeof value === "string") && contents.split(/\r?\n/).some((line) => line.trim() === `${entry[0]}=${entry[1]}`));
 }
@@ -953,6 +998,35 @@ async function resetAdoptedAvd(avdName, serial, keepPackage) {
 		}
 	}
 }
+function parseDfAvailableBytes(text) {
+	const lines = String(text ?? "").split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+	if (lines.length !== 2 || !/^Filesystem\s/.test(lines[0])) return null;
+	const available = lines[1].split(/\s+/)[3];
+	return available && /^\d+$/.test(available) ? Number(available) * 1024 : null;
+}
+function androidDataFreeBytes(serial) {
+	return parseDfAvailableBytes(getExecutor().runFileQuiet("adb", [
+		"-s",
+		serial,
+		"shell",
+		"df",
+		"-k",
+		"/data"
+	], { timeoutMs: 3e4 }));
+}
+function trimAndroidCaches(serial, desiredFreeBytes) {
+	getExecutor().runFile("adb", [
+		"-s",
+		serial,
+		"shell",
+		"pm",
+		"trim-caches",
+		String(desiredFreeBytes)
+	], {
+		timeoutMs: 12e4,
+		killSignal: "SIGKILL"
+	});
+}
 function parseEmulatorVersion(text) {
 	const match = /Android emulator version (\d+)\./.exec(String(text ?? ""));
 	return match ? Number(match[1]) : null;
@@ -967,9 +1041,9 @@ const CRASH_REPORT_MODE_EMULATOR_VERSION = 37;
 * under GetTempPath, which reads TMP before TEMP.
 */
 function emulatorCrashDatabases(env = process.env) {
-	const root = join(env.TMP || env.TEMP || tmpdir(), "AndroidEmulator");
+	const root = join$1(env.TMP || env.TEMP || tmpdir(), "AndroidEmulator");
 	try {
-		return readdirSync(root).filter((name) => /^emu-crash-.*\.db$/.test(name)).map((name) => join(root, name));
+		return readdirSync(root).filter((name) => /^emu-crash-.*\.db$/.test(name)).map((name) => join$1(root, name));
 	} catch {
 		return [];
 	}
@@ -995,7 +1069,7 @@ function suppressEmulatorCrashConsent({ platform = process.platform, version = e
 	} catch {}
 	return [];
 }
-function bootAndroidEmulator(avdName, consolePort, { logFile, platform = process.platform } = {}) {
+function bootAndroidEmulator(avdName, consolePort, { logFile, platform = process.platform, openViewer = true } = {}) {
 	const exec = getExecutor();
 	const app = configuredAndroidEmulatorApp(platform);
 	const child = exec.spawn(androidToolPath("emulator"), [
@@ -1006,7 +1080,7 @@ function bootAndroidEmulator(avdName, consolePort, { logFile, platform = process
 		"-grpc",
 		String(consolePort + 3e3),
 		"-grpc-use-token",
-		...headlessEmulatorArgs(process.env, platform, app),
+		...headlessEmulatorArgs(process.env, platform, openViewer ? app : "stim-desktop"),
 		...suppressEmulatorCrashConsent({ platform })
 	], {
 		cwd: androidToolCwd(platform),
@@ -1015,13 +1089,13 @@ function bootAndroidEmulator(avdName, consolePort, { logFile, platform = process
 	});
 	child?.unref?.();
 	const pid = child?.pid ?? null;
-	if (pid !== null && platform === "darwin" && app === "stim-desktop") openEmulatorInStimDesktop(`emulator-${consolePort}`);
+	if (openViewer && pid !== null && platform === "darwin" && app === "stim-desktop") openEmulatorInStimDesktop(`emulator-${consolePort}`);
 	return pid;
 }
 function emulatorStdio(logFile) {
 	if (!logFile) return "ignore";
 	try {
-		mkdirSync(dirname(logFile), { recursive: true });
+		mkdirSync(dirname$1(logFile), { recursive: true });
 		const fd = openSync(logFile, "w");
 		return [
 			"ignore",
@@ -1123,7 +1197,7 @@ function sleepSync(ms) {
 	Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
 }
 function avdProcessLockPaths(avdDirectory, platform) {
-	return ["hardware-qemu.ini.lock", "userdata-qemu.img.lock"].map((name) => join(avdDirectory, name, ...platform === "win32" ? ["pid"] : []));
+	return ["hardware-qemu.ini.lock", "userdata-qemu.img.lock"].map((name) => join$1(avdDirectory, name, ...platform === "win32" ? ["pid"] : []));
 }
 function readAvdProcessId(path) {
 	try {
@@ -1177,7 +1251,18 @@ function scanAvdEmulatorProcesses(avdName, platform, listProcesses) {
 	if (pids === null) throw new Error(`Could not read the process table to verify that owned AVD ${avdName} stopped.`);
 	return pids;
 }
-function assertOwnedAvdStopped(avdName, { processAlive = pidExists, listProcesses = listAvdEmulatorProcesses, ...resolveOptions } = {}) {
+function emulatorProcessRunning(pid) {
+	if (!pidExists(pid)) return false;
+	if (process.platform === "win32") return true;
+	const stat = getExecutor().runFileQuiet("ps", [
+		"-o",
+		"stat=",
+		"-p",
+		String(pid)
+	], { timeoutMs: 5e3 });
+	return stat === null || !stat.trim().startsWith("Z");
+}
+function assertOwnedAvdStopped(avdName, { processAlive = emulatorProcessRunning, listProcesses = listAvdEmulatorProcesses, ...resolveOptions } = {}) {
 	const { processId } = resolveAvdProcess(avdName, resolveOptions);
 	const live = new Set(scanAvdEmulatorProcesses(avdName, resolveOptions.platform ?? process.platform, listProcesses));
 	if (processId !== null && processAlive(processId)) live.add(processId);
@@ -1312,20 +1397,22 @@ function once(read) {
 		return result.value;
 	};
 }
+/** Floor for a single `listAvds`, `adb devices`, or `emu avd name` call in {@link ownedAvdSerialResolver}. */
+const MIN_LOOKUP_TIMEOUT_MS = 1e3;
 /**
 * `resolveOwnedAvdSerial` for several AVDs against one reading of the AVD list, `adb devices`, and
 * each emulator's AVD name. The timeout budget starts when the resolver is created.
 */
 function ownedAvdSerialResolver({ timeoutMs } = {}) {
 	const started = Date.now();
-	const remaining = () => ({ timeoutMs: timeoutMs === void 0 ? void 0 : Math.max(1, timeoutMs - (Date.now() - started)) });
+	const remaining = () => ({ timeoutMs: timeoutMs === void 0 ? void 0 : Math.max(MIN_LOOKUP_TIMEOUT_MS, timeoutMs - (Date.now() - started)) });
 	const avds = once(() => listAvds(remaining()));
 	const adb = once(() => listAdbDevices(remaining()));
 	const names = /* @__PURE__ */ new Map();
 	const avdNameOf = (serial) => {
-		if (names.has(serial)) return names.get(serial);
+		if (names.has(serial)) return names.get(serial) ?? null;
 		const name = getAvdNameForSerial(serial, remaining());
-		if (name !== null) names.set(serial, name);
+		names.set(serial, name);
 		return name;
 	};
 	return (avdName) => {
@@ -1338,4 +1425,4 @@ function ownedAvdSerialResolver({ timeoutMs } = {}) {
 	};
 }
 //#endregion
-export { waitForBoot as $, listInstalledSystemImages as A, parseAvdDeviceProfile as B, extractEmulatorFailure as C, listAdbDevices as D, hostSystemImageArch as E, ownedAvdDirectory as F, profileNeedsFoldFeature as G, physicalDeviceModel as H, ownedAvdMatchesConfiguration as I, resolvePhysicalDevice as J, resetAdoptedAvd as K, ownedAvdName as L, memoizeEmulatorProbe as M, nextConsolePort as N, listAvdDeviceProfiles as O, ownedAvdDeviceProfile as P, waitForAndroidEmulatorShutdown as Q, ownedAvdSerialResolver as R, emulatorFailureRemedy as S, getAvdNameForSerial as T, pickDefaultSystemImage as U, parseAvdSystemImage as V, probeEmulatorSerial as W, sleepSync as X, shutdownAndroidEmulator as Y, systemImageSupportsFold as Z, bootAndroidEmulator as _, androidHome as a, dropParked as at, deleteAvd as b, androidSystemImageAbi as c, parkedMaxSetting as ct, assertOwnedAvdStopped as d, selectParked as dt, wipeAvdUserData as et, avdIniPaths as f, configuredAndroidEmulatorApp as ft, avdStorageRoots as g, avdPoolConfiguration as h, androidDeviceAbi as i, adoptParked as it, listOrphanedAvdDirectories as j, listAvds as k, androidToolCwd as l, readParked as lt, avdPathExists as m, OWNED_AVD_CONFIG_DEFAULTS as n, isStimOwnedSim as nt, androidPoolCandidates as o, isLegacyDeletionClaim as ot, avdNameAbsent as p, resolveOwnedAvdSerial as q, androidBuildToolName as r, POOL_SETTING_REMEDY as rt, androidPoolNoCandidatesRefusal as s, parkSim as st, DEFAULT_AVD_DEVICE_PROFILE as t, isStimOwnedAvd as tt, androidToolPath as u, removeParkedAfter as ut, configureNewOwnedAvd as v, findBuildTool as w, emulatorDiskSpaceRemedy as x, createOwnedAvd as y, ownedAvdSystemImage as z };
+export { trimAndroidCaches as $, listAvds as A, ownedAvdSystemImage as B, emulatorFailureRemedy as C, hostSystemImageArch as D, getAvdNameForSerial as E, ownedAvdDeviceProfile as F, probeEmulatorSerial as G, parseAvdSystemImage as H, ownedAvdDirectory as I, resolveOwnedAvdSerial as J, profileNeedsFoldFeature as K, ownedAvdMatchesConfiguration as L, listOrphanedAvdDirectories as M, memoizeEmulatorProbe as N, listAdbDevices as O, nextConsolePort as P, systemImageSupportsFold as Q, ownedAvdName as R, emulatorDiskSpaceRemedy as S, findBuildTool as T, physicalDeviceModel as U, parseAvdDeviceProfile as V, pickDefaultSystemImage as W, shutdownAndroidEmulator as X, resolvePhysicalDevice as Y, sleepSync as Z, avdStorageRoots as _, androidDeviceAbi as a, POOL_SETTING_REMEDY as at, createOwnedAvd as b, androidPoolNoCandidatesRefusal as c, eraseParkedAfter as ct, androidToolPath as d, parkedMaxSetting as dt, waitForAndroidEmulatorShutdown as et, assertOwnedAvdStopped as f, readParked as ft, avdPoolConfiguration as g, avdPathExists as h, configuredAndroidEmulatorApp as ht, androidDataFreeBytes as i, isStimOwnedSim as it, listInstalledSystemImages as j, listAvdDeviceProfiles as k, androidSystemImageAbi as l, isLegacyDeletionClaim as lt, avdNameAbsent as m, selectParked as mt, OWNED_AVD_CONFIG_DEFAULTS as n, wipeAvdUserData as nt, androidHome as o, adoptParked as ot, avdIniPaths as p, removeParkedAfter as pt, resetAdoptedAvd as q, androidBuildToolName as r, isStimOwnedAvd as rt, androidPoolCandidates as s, dropParked as st, DEFAULT_AVD_DEVICE_PROFILE as t, waitForBoot as tt, androidToolCwd as u, parkSim as ut, bootAndroidEmulator as v, extractEmulatorFailure as w, deleteAvd as x, configureNewOwnedAvd as y, ownedAvdSerialResolver as z };