stim 1.20.2 → 1.22.0

package/dist/{created-devices-Dzd5C2LF.mjs → created-devices-x9rN6bhs.mjs}

@@ -1,8 +1,8 @@
-import { d as getConfigDir } from "./config-BYDxlMY3.mjs";
-import { D as withDirLock$1 } from "./workspace-state-DJt_MMvf.mjs";
+import { v as withDirLock$1, y as withDirLockAsync$1 } from "./paths-DQtTgsBf.mjs";
+import { d as getConfigDir } from "./config-DlrsduwG.mjs";
 import { renameSync, rmSync, writeFileSync } from "node:fs";
-import { createdDevicesFile, createdDevicesLock, readCreatedDevices, readCreatedDevices as readCreatedDevices$1 } from "@stim-cli/core/state";
 import { ensurePrivateDir } from "@stim-cli/core";
+import { createdDevicesFile, createdDevicesLock, readCreatedDevices, readCreatedDevices as readCreatedDevices$1 } from "@stim-cli/core/state";
 //#region src/devices/created-devices.ts
 function update(platform, change) {
 	const dir = getConfigDir();
@@ -34,5 +34,15 @@ function recordCreatedDevice(platform, id) {
 function forgetCreatedDevice(platform, id) {
 	update(platform, (entries) => entries.delete(id));
 }
+/** Waits asynchronously for the ledger lock, then atomically forgets the device. The synchronous transaction decides whether to commit the removal; cancellation stops admission. */
+function forgetCreatedDeviceAsync(platform, id, signal, transaction = (forget) => {
+	forget();
+	return true;
+}) {
+	return withDirLockAsync$1(createdDevicesLock(), () => transaction(() => forgetCreatedDevice(platform, id)), {
+		ensureParent: () => ensurePrivateDir(getConfigDir()),
+		signal
+	});
+}
 //#endregion
-export { readCreatedDevices$1 as n, recordCreatedDevice as r, forgetCreatedDevice as t };
+export { recordCreatedDevice as i, forgetCreatedDeviceAsync as n, readCreatedDevices$1 as r, forgetCreatedDevice as t };

package/dist/{dependency-state-DG0p31-y.mjs → dependency-state-1I9KZT1Y.mjs}

@@ -1,5 +1,5 @@
-import { t as getExecutor } from "./exec-DqKo9GKJ.mjs";
-import { Dt as repoRoot } from "./settings-B717odTD.mjs";
+import { t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { Mt as repoRoot } from "./settings-C7O8A6ZI.mjs";
 import { existsSync } from "node:fs";
 import { dirname, join, relative } from "node:path";
 //#region src/dependency-state.ts
@@ -19,6 +19,22 @@ function installedNpmTreeIsValid(projectRoot) {
 		return false;
 	}
 }
+async function installedNpmTreeIsValidAsync(projectRoot) {
+	try {
+		await getExecutor().runFileAsync("npm", [
+			"ls",
+			"--all",
+			"--json",
+			"--silent"
+		], {
+			cwd: projectRoot,
+			timeoutMs: 3e4
+		});
+		return true;
+	} catch {
+		return false;
+	}
+}
 const DEPENDENCY_STATES = [
 	{
 		lock: "pnpm-lock.yaml",
@@ -50,8 +66,7 @@ const DEPENDENCY_STATES = [
 		command: "npm ci"
 	}
 ];
-function dependencyState(projectRoot) {
-	const root = repoRoot(projectRoot) ?? projectRoot;
+function dependencyState(projectRoot, root = repoRoot(projectRoot) ?? projectRoot) {
 	let dir = projectRoot;
 	while (true) {
 		const state = DEPENDENCY_STATES.find((candidate) => existsSync(join(dir, candidate.lock)));
@@ -73,4 +88,4 @@ function hasInstalledDependencies(projectRoot, markers = [
 	return markers.some((entry) => existsSync(join(projectRoot, entry)));
 }
 //#endregion
-export { hasInstalledDependencies as n, installedNpmTreeIsValid as r, dependencyState as t };
+export { installedNpmTreeIsValidAsync as i, hasInstalledDependencies as n, installedNpmTreeIsValid as r, dependencyState as t };

package/dist/{detached-entry-B9C_zeQC.mjs → detached-entry-BwNEtIrP.mjs}

@@ -1,4 +1,4 @@
-import { t as getExecutor } from "./exec-DqKo9GKJ.mjs";
+import { t as getExecutor } from "./exec-DEoAhcze.mjs";
 import { openSync } from "node:fs";
 //#region src/detached-entry.ts
 const LOG_FILE_FLAG = "--log-file";

package/dist/{dev-client-DAWVIGBu.mjs → dev-client-BSDR5h3F.mjs}

@@ -1,5 +1,5 @@
-import { S as resolvePackageJson, y as isPackageResolvable } from "./project-_phNIJfs.mjs";
-import { D as readBundleSchemes, E as pickDevClientScheme } from "./app-install-BIKtMfPq.mjs";
+import { C as resolvePackageJson, b as isPackageResolvable } from "./project-wM_XFTvE.mjs";
+import { An as readBundleSchemes, kn as pickDevClientScheme } from "./budget-Cvwn54qV.mjs";
 import { dirname, join } from "node:path";
 import { isJsonObject, readJsonObject } from "@stim-cli/core/state";
 //#region src/commands/dev-client.ts

package/dist/{device-BECOiufl.mjs → device-B-L3Fbxy.mjs}

@@ -1,21 +1,23 @@
-import { A as acquireAvdClaim, D as withConfigLock, V as deviceSlotPlatforms, W as projectDeviceSlots, _ as loadConfig, a as clearDevice, b as releaseAndroidConsolePort, i as clearAndroidBootPending, j as ownership_claim_exports, t as allConsolePortsAndSerials, w as setDevice } from "./config-BYDxlMY3.mjs";
-import { t as getExecutor } from "./exec-DqKo9GKJ.mjs";
-import { l as androidDataPartitionSizeGbSetting, o as androidAvdConfigSetting } from "./settings-B717odTD.mjs";
-import { l as phaseLine } from "./command-output-BTy8hZ0F.mjs";
-import { o as ownedDeviceLabel } from "./project-_phNIJfs.mjs";
-import { A as listAvds, B as ownedAvdSystemImage, E as getAvdNameForSerial, F as ownedAvdDeviceProfile, J as resolveOwnedAvdSerial, L as ownedAvdMatchesConfiguration, O as listAdbDevices, P as nextConsolePort, R as ownedAvdName, W as pickDefaultSystemImage, b as createOwnedAvd, dt as parkedMaxSetting, f as assertOwnedAvdStopped, ft as readParked, g as avdPoolConfiguration, j as listInstalledSystemImages, lt as isLegacyDeletionClaim, n as OWNED_AVD_CONFIG_DEFAULTS, ot as adoptParked, t as DEFAULT_AVD_DEVICE_PROFILE, tt as waitForBoot, v as bootAndroidEmulator, y as configureNewOwnedAvd } from "./android-Mz_Inn3w.mjs";
-import { s as pidExists } from "./metro-DnCEjCxs.mjs";
-import { v as teardownOwnedAvd, x as teardownParkedAvd } from "./workspaces-C36s2jb9.mjs";
-import { F as memoryCulpritAdvice, N as memoryCulpritsUnder, P as readHostMemoryPressure, d as listAllIosSims } from "./ios-RkW4pnQf.mjs";
-import { t as clearDeviceIdleShutdown } from "./idle-shutdown-DtxhPTKe.mjs";
-import { i as countLiveOwnedDevices, n as DeviceAdmissionRefusal, p as withDeviceBootAdmission } from "./device-capacity-CBUAcRyQ.mjs";
-import { t as reconcileSimSlim } from "./simslim-CCr3rE-A.mjs";
-import { i as ensureOwnedIosDevice, r as ensureIosBooted } from "./device-ios-COSi6oS1.mjs";
+import { t as getExecutor, x as ownership_claim_exports } from "./exec-DEoAhcze.mjs";
+import { D as withConfigLock, G as projectDeviceSlots, H as deviceSlotPlatforms, O as withConfigLockAsync, _ as loadConfig, a as clearDevice, b as releaseAndroidConsolePort, i as clearAndroidBootPending, j as acquireAvdClaim, t as allConsolePortsAndSerials, w as setDevice } from "./config-DlrsduwG.mjs";
+import { l as phaseLine } from "./command-output-gwpm28fu.mjs";
+import { l as androidDataPartitionSizeGbSetting, o as androidAvdConfigSetting } from "./settings-C7O8A6ZI.mjs";
+import { s as ownedDeviceLabel } from "./project-wM_XFTvE.mjs";
+import { c as pidExists } from "./metro-DiXtA3Ty.mjs";
+import { A as teardownParkedAvd, D as teardownOwnedAvd } from "./workspaces-CpANmBlq.mjs";
+import { A as listAdbDevices, B as ownedAvdDeviceProfile, F as listAvdsAsync, H as ownedAvdMatchesConfiguration, I as listInstalledSystemImages, K as ownedAvdSystemImage, O as getAvdNameForSerialAsync, U as ownedAvdName, X as pickDefaultSystemImage, _ as avdPoolConfiguration, _t as parkedMaxSetting, b as configureNewOwnedAvd, et as resolveOwnedAvdSerialAsync, f as assertOwnedAvdStopped, ft as adoptParked, ht as isLegacyDeletionClaim, j as listAdbDevicesAsync, n as OWNED_AVD_CONFIG_DEFAULTS, ot as waitForBoot, t as DEFAULT_AVD_DEVICE_PROFILE, vt as readParked, x as createOwnedAvd, y as bootAndroidEmulator, z as nextConsolePort } from "./android-C7sVmyI9.mjs";
+import { I as memoryCulpritAdvice, N as memoryCulpritsUnder, P as readHostMemoryPressure, d as listAllIosSims } from "./ios-hcBpnEGk.mjs";
+import { t as clearDeviceIdleShutdown } from "./idle-shutdown-DDg3SdvY.mjs";
+import { i as countLiveOwnedDevices, m as withDeviceBootAdmission, n as DeviceAdmissionRefusal } from "./device-capacity-DK5_EwRS.mjs";
+import { i as ensureOwnedIosDevice, r as ensureIosBooted } from "./device-ios-DoB6KFCO.mjs";
+import { t as reconcileSimSlim } from "./simslim-BNckWpXi.mjs";
 import { claimRemoveCommand, clearClaimChild, markClaimChildPending, processGroupAlive, releaseClaim, setClaimChild } from "@stim-cli/core/ownership-claim";
-import { captureProcessIdentity } from "@stim-cli/core/process-identity";
 import { randomUUID } from "node:crypto";
-import chalk from "chalk";
+import { existsSync } from "node:fs";
 import { isDeepStrictEqual } from "node:util";
+import { fileURLToPath } from "node:url";
+import { captureProcessIdentity } from "@stim-cli/core/process-identity";
+import chalk from "chalk";
 import { request } from "node:http";
 //#region src/engine/metro-warmup.ts
 const WARMUP_TIMEOUT_MS = 6e4;
@@ -93,7 +95,7 @@ function findOtherOwner(avdName, projectPath, selectedSlot = "default") {
 	return null;
 }
 async function prepareOwnedAvd({ projectPath, slot, label, previousAvdName, systemImage, deviceProfile, configuration, configure, teardown = teardownOwnedAvd }) {
-	const { claim, reservation, previous, avdName } = withConfigLock(() => {
+	const { claim, reservation, previous, avdName } = await withConfigLockAsync(() => {
 		const previous = deviceSlotPlatforms(loadConfig()?.projects?.[projectPath], slot)?.android;
 		if (previous?.avdName && previous.avdName !== previousAvdName) throw new Error(`Another Stim run assigned AVD ${previous.avdName} to this workspace. Retry to use it.`);
 		if (readParked("android").some((entry) => entry.name === ownedAvdName(label)) || findOtherOwner(ownedAvdName(label), projectPath, slot)) label = `${label}-${randomUUID().slice(0, 8)}`;
@@ -165,9 +167,9 @@ async function prepareOwnedAvd({ projectPath, slot, label, previousAvdName, syst
 			const message = String(error?.message || error);
 			if (!message.includes("already exists")) throw error;
 			try {
-				if (!listAvds().includes(avdName)) throw new AvdRecoveryError(`AVD ${avdName} already exists on disk but is not listed by the emulator. ${message}`, "Run `npx stim gc` to inspect orphaned owned AVDs, then `npx stim gc --delete` to reclaim those safe to delete. Retry `stim android` after cleanup; keep any AVD that GC cannot verify.", error);
-				withConfigLock(assertReservation);
-				const resolved = resolveOwnedAvdSerial(avdName);
+				if (!(await listAvdsAsync()).includes(avdName)) throw new AvdRecoveryError(`AVD ${avdName} already exists on disk but is not listed by the emulator. ${message}`, "Run `npx stim gc` to inspect orphaned owned AVDs, then `npx stim gc --delete` to reclaim those safe to delete. Retry `stim android` after cleanup; keep any AVD that GC cannot verify.", error);
+				await withConfigLockAsync(assertReservation);
+				const resolved = await resolveOwnedAvdSerialAsync(avdName);
 				if (resolved.missing || resolved.notOwned) throw new Error(`AVD ${avdName} could not be verified for recovery. Retry after checking its registration.`, { cause: error });
 				if (!resolved.serial) assertOwnedAvdStopped(avdName);
 				prepared = {
@@ -181,7 +183,7 @@ async function prepareOwnedAvd({ projectPath, slot, label, previousAvdName, syst
 					} : {}
 				};
 			} catch (recoveryError) {
-				withConfigLock(() => {
+				await withConfigLockAsync(() => {
 					if (!isDeepStrictEqual(currentRecord(), reservation)) return;
 					if (previous) setDevice(projectPath, "android", previous, slot);
 					else clearDevice(projectPath, "android", slot, avdName);
@@ -195,7 +197,7 @@ async function prepareOwnedAvd({ projectPath, slot, label, previousAvdName, syst
 		} catch (error) {
 			configurationFailure = { error };
 		}
-		if (!configurationFailure) withConfigLock(() => {
+		if (!configurationFailure) await withConfigLockAsync(() => {
 			assertReservation();
 			setDevice(projectPath, "android", {
 				avdName,
@@ -218,7 +220,7 @@ async function prepareOwnedAvd({ projectPath, slot, label, previousAvdName, syst
 	}
 	if (configurationFailure) {
 		const { error } = configurationFailure;
-		const cleanup = teardown(avdName, {
+		const cleanup = await teardown(avdName, {
 			del: true,
 			owner: {
 				projectPath,
@@ -248,7 +250,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, slot, settingsRoo
 	let replacedProfile = null;
 	if (record?.setupIncomplete && record.avdName) {
 		const avdName = record.avdName;
-		const cleanup = teardownAvd(avdName, {
+		const cleanup = await teardownAvd(avdName, {
 			del: true,
 			owner: {
 				projectPath,
@@ -268,7 +270,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, slot, settingsRoo
 		const avdName = record.avdName;
 		if (!record.bootPending) throw new AvdRecoveryError(`this project's emulator ${avdName} uses system image ${currentImage}, but ${requestedImage} was requested. --system-image replaces only an emulator that never finished a boot, and this one has.`, "Run `stim worktree remove` (or `stim gc --delete`) to reap the current emulator, then `stim android` again to create the requested one, or pass `--slot <name>` to create it beside the current one.");
 		replacedProfile = ownedAvdDeviceProfile(avdName);
-		const cleanup = teardownAvd(avdName, {
+		const cleanup = await teardownAvd(avdName, {
 			del: true,
 			owner: {
 				projectPath,
@@ -288,7 +290,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, slot, settingsRoo
 	const configurationBeforeDefaults = avdPoolConfiguration(androidDataPartitionSizeGbSetting(settings), projectAvdConfig, deviceProfile);
 	if (record?.avdName) {
 		if (record.owned) {
-			const resolved = resolveOwnedAvdSerial(record.avdName);
+			const resolved = await resolveOwnedAvdSerialAsync(record.avdName);
 			const currentProfile = resolved.notOwned || resolved.missing ? null : ownedAvdDeviceProfile(record.avdName);
 			if (requestedProfile && currentProfile && currentProfile !== requestedProfile) throw new AvdRecoveryError(`this project's emulator uses device profile ${currentProfile}, but ${requestedProfile} was requested. Stim will not silently boot a different model.`, "Run `stim worktree remove` (or `stim gc --delete`) to reap the current emulator, then `stim android` again to create the requested one, or pass `--slot <name>` to create it beside the current one.");
 			if (resolved.notOwned) note(chalk.yellow(`Note: recorded AVD ${record.avdName} is not Stim-owned -- creating a fresh owned AVD instead of reusing it.`));
@@ -326,8 +328,8 @@ async function ensureOwnedAndroidDevice({ record, projectPath, slot, settingsRoo
 					deviceProfile: currentProfile
 				};
 			}
-		} else if (listAvds().includes(record.avdName)) {
-			if (!listAdbDevices().emulators.some((e) => e.consolePort === record.consolePort)) {
+		} else if ((await listAvdsAsync()).includes(record.avdName)) {
+			if (!(await listAdbDevicesAsync()).emulators.some((e) => e.consolePort === record.consolePort)) {
 				note(chalk.yellow(`Note: assigned AVD ${record.avdName} (emulator-${record.consolePort}) is shut down and is not owned by Stim, so it will not be booted automatically.`));
 				note(chalk.dim("Boot it yourself, or run `stim gc --delete` to clear the assignment so Stim can create an owned AVD."));
 			}
@@ -342,9 +344,9 @@ async function ensureOwnedAndroidDevice({ record, projectPath, slot, settingsRoo
 		const candidates = readParked("android").filter((entry) => entry.systemImage === systemImage && (entry.configuration === configuration || entry.configuration === configurationBeforeDefaults)).toSorted((a, b) => a.parkedAt.localeCompare(b.parkedAt));
 		for (const parked of candidates) {
 			if (isLegacyDeletionClaim(parked.deletionClaim)) continue;
-			const resolved = resolveOwnedAvdSerial(parked.name);
+			const resolved = await resolveOwnedAvdSerialAsync(parked.name);
 			if (resolved.missing) {
-				const result = teardownParkedAvd(parked.name);
+				const result = await teardownParkedAvd(parked.name);
 				if (result.status === "failed") out(phaseLine("device", `kept ${parked.name}: ${result.reason}`));
 				continue;
 			}
@@ -356,7 +358,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, slot, settingsRoo
 				continue;
 			}
 			if (ownedAvdSystemImage(parked.name) !== systemImage || !ownedAvdMatchesConfiguration(parked.name, parked.configuration)) {
-				const result = teardownParkedAvd(parked.name);
+				const result = await teardownParkedAvd(parked.name);
 				if (result.status === "failed") out(phaseLine("device", `kept ${parked.name}: ${result.reason}`));
 				continue;
 			}
@@ -478,7 +480,7 @@ async function bootOwnedAvdOnFreshPort({ avdName, deviceSlotWait, metadata, proj
 		const serial = `emulator-${claim.consolePort}`;
 		try {
 			reportAndroidMemoryPressure(out);
-			const pid = bootAndroidEmulator(avdName, claim.consolePort, { logFile });
+			const pid = await bootAndroidEmulator(avdName, claim.consolePort, { logFile });
 			out(chalk.dim(phaseLine("device", `waiting for ${serial} to finish booting`)));
 			const result = await waitForAndroidBoot({
 				serial,
@@ -488,9 +490,10 @@ async function bootOwnedAvdOnFreshPort({ avdName, deviceSlotWait, metadata, proj
 				out
 			});
 			if (result.failed) throw new AvdBootError(result.reason, result.remedy);
-			const running = getAvdNameForSerial(serial);
+			const running = await getAvdNameForSerialAsync(serial);
 			if (running && running !== avdName) throw new Error(`${serial} is running AVD ${running}, not this workspace's owned AVD ${avdName}; refusing to use it.`);
 			clearAndroidBootPending(projectPath, avdName, slot);
+			await muteBootedEmulator(serial, avdName, out);
 			const { bootPending: _booted, ...booted } = claim;
 			return {
 				...booted,
@@ -507,6 +510,59 @@ async function bootOwnedAvdOnFreshPort({ avdName, deviceSlotWait, metadata, proj
 		out
 	});
 }
+async function muteBootedEmulator(serial, avdName, out) {
+	const exec = getExecutor();
+	try {
+		const helper = ["../shim/android-audio.jar", "../../shim/android-audio.jar"].map((path) => fileURLToPath(new URL(path, import.meta.url))).find(existsSync);
+		if (!helper) throw new Error("Stim installation is missing shim/android-audio.jar.");
+		const remote = `/data/local/tmp/stim-audio-${randomUUID()}.jar`;
+		const adb = async (args) => {
+			if (await getAvdNameForSerialAsync(serial) !== avdName) throw new Error("The emulator no longer matches this workspace; media volume was not confirmed.");
+			return exec.runFileAsync("adb", [
+				"-s",
+				serial,
+				...args
+			], { timeoutMs: 3e4 });
+		};
+		try {
+			await adb([
+				"push",
+				helper,
+				remote
+			]);
+			await adb([
+				"shell",
+				`CLASSPATH=${remote}`,
+				"app_process",
+				"/system/bin",
+				"dev.stim.audio.Main",
+				"0"
+			]);
+		} finally {
+			await adb([
+				"shell",
+				"rm",
+				"-f",
+				remote
+			]);
+		}
+		const readback = await exec.runFileAsync("adb", [
+			"-s",
+			serial,
+			"shell",
+			"cmd",
+			"media_session",
+			"volume",
+			"--stream",
+			"3",
+			"--get"
+		], { timeoutMs: 3e4 });
+		if (!/\bvolume is 0 in range \[0\.\.\d+\]/.test(readback)) throw new Error("Android did not confirm media volume zero for this emulator.");
+		out(chalk.dim(phaseLine("device", "emulator media muted; turn on Media sound in its Stim Desktop options")));
+	} catch (error) {
+		out(chalk.yellow(phaseLine("device", `Could not mute emulator media: ${error instanceof Error ? error.message : String(error)}`)));
+	}
+}
 function reportAndroidMemoryPressure(out) {
 	const pressure = readHostMemoryPressure();
 	if (pressure === "warning" || pressure === "critical") {
@@ -571,7 +627,7 @@ async function ensureAndroidBooted({ device, deviceSlotWait, projectPath, slot,
 	};
 	let resolved;
 	try {
-		resolved = resolveOwnedAvdSerial(device.avdName);
+		resolved = await resolveOwnedAvdSerialAsync(device.avdName);
 	} catch (e) {
 		return {
 			failed: true,
@@ -616,7 +672,7 @@ async function ensureAndroidBooted({ device, deviceSlotWait, projectPath, slot,
 		out(chalk.dim(phaseLine("device", `booting ${avdName} as ${serial}`)));
 		let pid = null;
 		try {
-			pid = bootAndroidEmulator(avdName, claim.consolePort, { logFile });
+			pid = await bootAndroidEmulator(avdName, claim.consolePort, { logFile });
 		} catch (e) {
 			releaseAndroidConsolePort(projectPath, claim.consolePort, slot);
 			return {
@@ -632,6 +688,7 @@ async function ensureAndroidBooted({ device, deviceSlotWait, projectPath, slot,
 			out
 		});
 		if (result.failed) releaseAndroidConsolePort(projectPath, claim.consolePort, slot);
+		else await muteBootedEmulator(serial, avdName, out);
 		return booted(result);
 	};
 	try {