stim 1.10.1 → 1.11.0

package/dist/{android-787HhP5w.mjs → android-C4zG2Tuc.mjs}

@@ -1,12 +1,33 @@
-import { u as getConfigDir } from "./config-BEq0Qw_a.mjs";
+import { g as loadConfig$1, u as getConfigDir } from "./config-BEq0Qw_a.mjs";
 import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
 import { P as withDirLock, c as signalProcessTree, i as pidExists } from "./metro-BWLOJ_Wr.mjs";
-import { c as androidDataPartitionSizeBytes } from "./settings-DOugPlPz.mjs";
+import { c as androidDataPartitionSizeBytes } from "./settings-B5oFZEri.mjs";
 import { mkdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { existsSync as existsSync$1, lstatSync as lstatSync$1, mkdirSync as mkdirSync$1, openSync as openSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, realpathSync as realpathSync$1, renameSync as renameSync$1, rmSync as rmSync$1, statSync as statSync$1, writeFileSync as writeFileSync$1 } from "fs";
 import { dirname, isAbsolute, join, resolve } from "path";
-import { createdDevicesFile, createdDevicesLock, readCreatedDevices, readCreatedDevices as readCreatedDevices$1 } from "@stim-cli/core/state";
+import { ANDROID_EMULATOR_APPS, createdDevicesFile, createdDevicesLock, readCreatedDevices, readCreatedDevices as readCreatedDevices$1, settingDefinition } from "@stim-cli/core/state";
 import { homedir, tmpdir } from "os";
+//#region src/devices/android-emulator-viewer.ts
+function configuredAndroidEmulatorApp() {
+	const value = loadConfig$1()?.androidEmulatorApp;
+	if (value === void 0) return "emulator";
+	if (ANDROID_EMULATOR_APPS.includes(value)) return value;
+	const error = /* @__PURE__ */ new Error("Invalid androidEmulatorApp in machine config. Use \"emulator\" or \"stim-desktop\".");
+	Object.assign(error, { code: "STIM_BAD_ARG" });
+	throw error;
+}
+function openEmulatorInStimDesktop(serial) {
+	getExecutor().runFileQuiet("open", [
+		"-g",
+		"-a",
+		"Stim",
+		`stim-desktop://open?serial=${serial}`
+	], {
+		timeoutMs: 5e3,
+		killSignal: "SIGKILL"
+	});
+}
+//#endregion
 //#region src/devices/created-devices.ts
 function update(platform, change) {
 	const dir = getConfigDir();
@@ -70,7 +91,7 @@ const ANDROID_ABIS = /* @__PURE__ */ new Set([
 	"x86",
 	"x86_64"
 ]);
-const DEFAULT_AVD_DEVICE = "pixel_6";
+const DEFAULT_AVD_DEVICE_PROFILE = String(settingDefinition("android.deviceProfile")?.default);
 function androidHome() {
 	const configured = process.env.ANDROID_HOME || process.env.ANDROID_SDK_ROOT;
 	if (configured) return configured;
@@ -184,7 +205,7 @@ function pickDefaultSystemImage(images, { systemImage, hostArch } = {}) {
 	if (matching.length === 0) return null;
 	return matching.toSorted((a, b) => pageSizeRank(a) - pageSizeRank(b) || b.api - a.api || (b.tag === "google_apis" ? 1 : 0) - (a.tag === "google_apis" ? 1 : 0))[0] ?? null;
 }
-async function createOwnedAvd(label, { systemImage, spawn = (...args) => getExecutor().spawn(...args) } = {}) {
+async function createOwnedAvd(label, { systemImage, deviceProfile = DEFAULT_AVD_DEVICE_PROFILE, spawn = (...args) => getExecutor().spawn(...args) } = {}) {
 	const pick = pickDefaultSystemImage(listInstalledSystemImages(), { systemImage });
 	if (!pick) {
 		const arch = hostSystemImageArch();
@@ -201,7 +222,7 @@ async function createOwnedAvd(label, { systemImage, spawn = (...args) => getExec
 		"-k",
 		pick.pkg,
 		"--device",
-		DEFAULT_AVD_DEVICE
+		deviceProfile
 	];
 	const child = spawn(tool, args, {
 		detached: true,
@@ -229,17 +250,24 @@ async function createOwnedAvd(label, { systemImage, spawn = (...args) => getExec
 	if (result.code !== 0) throw new Error(`Command failed: ${tool} ${args.join(" ")} (${result.signal ?? result.code})\n${stderr.trim()}`);
 	return {
 		avdName,
-		systemImage: pick.pkg
+		systemImage: pick.pkg,
+		deviceProfile
 	};
 }
 function parseAvdSystemImage(configIni) {
+	const dir = avdIniValue(configIni, "image.sysdir.1")?.replace(/[\\/]+$/, "");
+	if (!dir) return null;
+	return dir.split(/[\\/]/).join(";");
+}
+function parseAvdDeviceProfile(configIni) {
+	return avdIniValue(configIni, "hw.device.name") || null;
+}
+function avdIniValue(configIni, key) {
 	for (const line of String(configIni).split(/\r?\n/)) {
 		const separator = line.indexOf("=");
 		if (separator < 0) continue;
-		if (line.slice(0, separator).trim() !== "image.sysdir.1") continue;
-		const dir = line.slice(separator + 1).trim().replace(/[\\/]+$/, "");
-		if (!dir) return null;
-		return dir.split(/[\\/]/).join(";");
+		if (line.slice(0, separator).trim() !== key) continue;
+		return line.slice(separator + 1).trim();
 	}
 	return null;
 }
@@ -252,6 +280,18 @@ function ownedAvdSystemImage(avdName, { avdDirectory = ownedAvdDirectory, readFi
 		return null;
 	}
 }
+function ownedAvdDeviceProfile(avdName) {
+	const configIni = avdConfigIni(avdName);
+	return configIni === null ? null : parseAvdDeviceProfile(configIni);
+}
+const AVDMANAGER_LIST_TIMEOUT_MS = 6e4;
+function listAvdDeviceProfiles() {
+	return parseAvdList(getExecutor().runFile(androidToolPath("avdmanager"), [
+		"list",
+		"device",
+		"-c"
+	], { timeoutMs: AVDMANAGER_LIST_TIMEOUT_MS }));
+}
 function sanitizeAvdLabel(label) {
 	return String(label).replace(/[^A-Za-z0-9._-]+/g, "-").replace(/^-+|-+$/g, "");
 }
@@ -454,8 +494,9 @@ function nextConsolePort(claimedPorts) {
 	if (claimedPorts.length === 0) return 5554;
 	return Math.max(...claimedPorts) + 2;
 }
-function headlessEmulatorArgs(env = process.env, platform = process.platform) {
+function headlessEmulatorArgs(env = process.env, platform = process.platform, app = "emulator") {
 	const args = [];
+	if (platform === "darwin" && app === "stim-desktop") args.push("-no-window", "-gpu", "host");
 	if (platform === "linux" && !env.DISPLAY && !env.WAYLAND_DISPLAY) args.push("-no-window", "-noaudio", "-no-boot-anim", "-gpu", "swiftshader_indirect", "-no-snapshot-save", "-no-snapshot-load");
 	return args;
 }
@@ -631,10 +672,10 @@ function configureNewOwnedAvd(avdName, { dataPartitionSizeGb, avdConfig = {} },
 	for (const [key, value] of Object.entries(expected)) if (!verified.split(/\r?\n/).includes(`${key}=${value}`)) throw new Error(`Could not verify ${key} in ${configPath}.`);
 	return configPath;
 }
-function avdPoolConfiguration(dataPartitionSizeGb, avdConfig) {
+function avdPoolConfiguration(dataPartitionSizeGb, avdConfig, deviceProfile = DEFAULT_AVD_DEVICE_PROFILE) {
 	return JSON.stringify(Object.entries({
 		...avdConfig,
-		"hw.device.name": DEFAULT_AVD_DEVICE,
+		"hw.device.name": deviceProfile,
 		"disk.dataPartition.size": String(androidDataPartitionSizeBytes(dataPartitionSizeGb))
 	}).toSorted(([a], [b]) => a.localeCompare(b)));
 }
@@ -751,7 +792,9 @@ function suppressEmulatorCrashConsent({ platform = process.platform, version = e
 	return [];
 }
 function bootAndroidEmulator(avdName, consolePort, { logFile, platform = process.platform } = {}) {
-	const child = getExecutor().spawn(androidToolPath("emulator"), [
+	const exec = getExecutor();
+	const app = configuredAndroidEmulatorApp();
+	const child = exec.spawn(androidToolPath("emulator"), [
 		"-avd",
 		avdName,
 		"-port",
@@ -759,7 +802,7 @@ function bootAndroidEmulator(avdName, consolePort, { logFile, platform = process
 		"-grpc",
 		String(consolePort + 3e3),
 		"-grpc-use-token",
-		...headlessEmulatorArgs(),
+		...headlessEmulatorArgs(process.env, platform, app),
 		...suppressEmulatorCrashConsent({ platform })
 	], {
 		cwd: androidToolCwd(platform),
@@ -767,7 +810,9 @@ function bootAndroidEmulator(avdName, consolePort, { logFile, platform = process
 		stdio: emulatorStdio(logFile)
 	});
 	child?.unref?.();
-	return child?.pid ?? null;
+	const pid = child?.pid ?? null;
+	if (pid !== null && platform === "darwin" && app === "stim-desktop") openEmulatorInStimDesktop(`emulator-${consolePort}`);
+	return pid;
 }
 function emulatorStdio(logFile) {
 	if (!logFile) return "ignore";
@@ -997,4 +1042,4 @@ function ownedAvdSerialResolver({ timeoutMs } = {}) {
 	};
 }
 //#endregion
-export { ownedAvdDirectory as A, resolvePhysicalDevice as B, isStimOwnedAvdName as C, listOrphanedAvdDirectories as D, listInstalledSystemImages as E, physicalDeviceModel as F, wipeAvdUserData as G, sleepSync as H, pickDefaultSystemImage as I, recordCreatedDevice as J, isStimOwnedSim as K, probeEmulatorSerial as L, ownedAvdName as M, ownedAvdSerialResolver as N, memoizeEmulatorProbe as O, ownedAvdSystemImage as P, resetAdoptedAvd as R, hostSystemImageArch as S, listAvds as T, waitForAndroidEmulatorShutdown as U, shutdownAndroidEmulator as V, waitForBoot as W, emulatorDiskSpaceRemedy as _, androidPoolNoCandidatesRefusal as a, findBuildTool as b, androidToolPath as c, avdPoolConfiguration as d, avdStorageRoots as f, deleteAvd as g, createOwnedAvd as h, androidPoolCandidates as i, ownedAvdMatchesConfiguration as j, nextConsolePort as k, assertOwnedAvdStopped as l, configureNewOwnedAvd as m, androidDeviceAbi as n, androidSystemImageAbi as o, bootAndroidEmulator as p, forgetCreatedDevice as q, androidHome as r, androidToolCwd as s, androidBuildToolName as t, avdPathExists as u, emulatorFailureRemedy as v, listAdbDevices as w, getAvdNameForSerial as x, extractEmulatorFailure as y, resolveOwnedAvdSerial as z };
+export { memoizeEmulatorProbe as A, probeEmulatorSerial as B, hostSystemImageArch as C, listAvds as D, listAvdDeviceProfiles as E, ownedAvdName as F, sleepSync as G, resolveOwnedAvdSerial as H, ownedAvdSerialResolver as I, wipeAvdUserData as J, waitForAndroidEmulatorShutdown as K, ownedAvdSystemImage as L, ownedAvdDeviceProfile as M, ownedAvdDirectory as N, listInstalledSystemImages as O, ownedAvdMatchesConfiguration as P, configuredAndroidEmulatorApp as Q, physicalDeviceModel as R, getAvdNameForSerial as S, listAdbDevices as T, resolvePhysicalDevice as U, resetAdoptedAvd as V, shutdownAndroidEmulator as W, forgetCreatedDevice as X, isStimOwnedSim as Y, recordCreatedDevice as Z, deleteAvd as _, androidPoolCandidates as a, extractEmulatorFailure as b, androidToolCwd as c, avdPathExists as d, avdPoolConfiguration as f, createOwnedAvd as g, configureNewOwnedAvd as h, androidHome as i, nextConsolePort as j, listOrphanedAvdDirectories as k, androidToolPath as l, bootAndroidEmulator as m, androidBuildToolName as n, androidPoolNoCandidatesRefusal as o, avdStorageRoots as p, waitForBoot as q, androidDeviceAbi as r, androidSystemImageAbi as s, DEFAULT_AVD_DEVICE_PROFILE as t, assertOwnedAvdStopped as u, emulatorDiskSpaceRemedy as v, isStimOwnedAvdName as w, findBuildTool as x, emulatorFailureRemedy as y, pickDefaultSystemImage as z };

package/dist/{android-cas-CITmIeWY.mjs → android-cas-DfJkwCXW.mjs}

@@ -2,11 +2,11 @@ import { u as getConfigDir } from "./config-BEq0Qw_a.mjs";
 import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
 import { r as register } from "./cache-manifest-Pubfp8wV.mjs";
 import { C as sharedCcache, P as withDirLock, j as workspaceLogsDir, x as ensureWorkspaceStorage } from "./metro-BWLOJ_Wr.mjs";
-import { n as spawnDeclared } from "./spawn-claims-CUleC2cM.mjs";
+import { a as spawnDeclared } from "./spawn-claims-BJwXTMPt.mjs";
 import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
 import { l as phaseLine } from "./command-output-D5z2_bcF.mjs";
-import { r as androidHome } from "./android-787HhP5w.mjs";
-import { d as startBuildHeartbeat, n as HEARTBEAT_INTERVAL_MS } from "./xcode-B2tBkf0m.mjs";
+import { i as androidHome } from "./android-C4zG2Tuc.mjs";
+import { d as startBuildHeartbeat, n as HEARTBEAT_INTERVAL_MS } from "./xcode-B5SPD--o.mjs";
 import { accessSync, constants, existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, symlinkSync, writeFileSync } from "node:fs";
 import { isJsonObject, readJsonFile } from "@stim-cli/core/state";
 import { dirname, isAbsolute, join, relative, sep } from "node:path";

package/dist/{app-install-Cfmqr3TQ.mjs → app-install-DHut6JnV.mjs}

@@ -1,5 +1,5 @@
 import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
-import { T as uninstallIosApp, c as iosSimulatorFailureAdvice, p as listUserApps } from "./ios-COGcGEcN.mjs";
+import { T as uninstallIosApp, c as iosSimulatorFailureAdvice, p as listUserApps } from "./ios-DArbmwer.mjs";
 import { closeSync, lstatSync, openSync, readSync, readdirSync } from "node:fs";
 import { isAbsolute, join } from "node:path";
 import { createHash } from "node:crypto";

package/dist/{budget-nDCEwtJv.mjs → budget-De3P2rq_.mjs}

@@ -2,16 +2,16 @@ import { D as process_identity_exports, F as volumeRootFor, H as projectDeviceSl
 import { O as workspaceDir, S as sharedBuildCache, m as readWorkspaceState$1, s as resolveProjectMetro, t as killMetroTree } from "./metro-BWLOJ_Wr.mjs";
 import { n as supervisorError } from "./errors-B6W7FkxQ.mjs";
 import { o as clearWorkspaceSupervisor } from "./state-WGdIbi_d.mjs";
-import { n as workspaceProcessLockError, t as withWorkspaceProcessLock } from "./workspace-process-lock-BXA96myD.mjs";
+import { n as workspaceProcessLockError, t as withWorkspaceProcessLock } from "./workspace-process-lock-Cx74RSDZ.mjs";
 import { l as phaseLine } from "./command-output-D5z2_bcF.mjs";
-import { u as workspaceActivity } from "./build-progress-BXx-ZBe4.mjs";
-import { N as ownedAvdSerialResolver } from "./android-787HhP5w.mjs";
-import { t as resolveSupervisorTarget } from "./ownership-BfPNRf3-.mjs";
-import { l as listAllIosSims } from "./ios-COGcGEcN.mjs";
-import { i as idleShutdownCandidates, n as collectOwnedDeviceActivity, o as shutDownIdleDevices, s as workspaceBuildInProgress, t as collectIdleDevices } from "./idle--jn7pBNe.mjs";
-import { i as canonicalPath, n as withIdleWorkspace } from "./in-use-CNIWU-r-.mjs";
-import { n as capacity, o as environmentState, s as formatSpace } from "./status-Dr4fRkym.mjs";
-import { A as discoverCaches, D as planCacheEmptying, a as collectWorkspaceOutputs, k as trimCaches, r as clearWorkspaceOutputs, y as deviceSweepIsScoped } from "./workspaces-wrH6dXfu.mjs";
+import { a as workspaceActivity } from "./activity-BtG4Va9l.mjs";
+import { I as ownedAvdSerialResolver } from "./android-C4zG2Tuc.mjs";
+import { t as resolveSupervisorTarget } from "./ownership-BiojdtAp.mjs";
+import { l as listAllIosSims } from "./ios-DArbmwer.mjs";
+import { i as idleShutdownCandidates, n as collectOwnedDeviceActivity, o as shutDownIdleDevices, s as workspaceBuildInProgress, t as collectIdleDevices } from "./idle-NETbeNiQ.mjs";
+import { i as canonicalPath, n as withIdleWorkspace } from "./in-use-DVhlSoyn.mjs";
+import { n as capacity, o as environmentState, s as formatSpace } from "./status-Q-WDEGCB.mjs";
+import { A as discoverCaches, D as planCacheEmptying, a as collectWorkspaceOutputs, k as trimCaches, r as clearWorkspaceOutputs, y as deviceSweepIsScoped } from "./workspaces-COD2xCz-.mjs";
 import { existsSync, statSync, statfsSync } from "node:fs";
 import { settingDefinition, settingValueError } from "@stim-cli/core/state";
 import { dirname, join, sep } from "node:path";