stim 1.21.0 → 1.22.0

package/dist/{remote-ByYkXdGD.mjs → remote-DjGDmlTZ.mjs}

@@ -1,19 +1,22 @@
-import { U as deviceSlotPlatforms } from "./config-CYcBF478.mjs";
-import { l as phaseLine } from "./command-output-B1UrjZHL.mjs";
-import { F as parseIosRemote, H as remoteEasFallbackSetting, R as publicUrlSetting, U as remoteIosSetting, rt as tunnelModeSetting } from "./settings-CsJDEXgK.mjs";
-import "./budget-Bs6SxxzO.mjs";
-import { b as resolveSimulatorAppFlag } from "./support-Dlu37g6H.mjs";
-import { n as devicePlacementRecord } from "./placement-log-BqGbTa61.mjs";
-import { r as devicePlacementLine } from "./eas-fallback-DJwZpy0c.mjs";
+import { H as deviceSlotPlatforms } from "./config-DlrsduwG.mjs";
+import { l as phaseLine } from "./command-output-gwpm28fu.mjs";
+import { F as parseIosRemote, H as remoteEasFallbackSetting, R as publicUrlSetting, U as remoteIosSetting, rt as tunnelModeSetting } from "./settings-C7O8A6ZI.mjs";
+import "./budget-Cvwn54qV.mjs";
+import { b as resolveSimulatorAppFlag } from "./support-CNioewsd.mjs";
+import { n as devicePlacementRecord } from "./placement-log-BnGgJRRZ.mjs";
+import { r as devicePlacementLine } from "./eas-fallback-CSgAulr5.mjs";
 import chalk from "chalk";
 //#region src/commands/ios/remote.ts
-function resolveIosRemote({ opts, settings, physical, recorded }) {
-	const target = opts.remote !== void 0 ? parseIosRemote(opts.remote) : remoteIosSetting(settings);
-	if (physical && target?.kind === "machine") return { failure: {
+function deviceRemoteConflict(remote, physical) {
+	if (!physical || remote === void 0 || !parseIosRemote(remote)) return null;
+	return {
 		code: "STIM_BAD_ARG",
-		message: "--device builds for a phone connected to this machine, and --remote installs on a remote one.",
-		remedy: "Pass only one of --device and --remote; unset ios.remote for a local phone."
-	} };
+		message: `--device runs on a phone connected to this machine, and --remote ${remote} chooses where a simulator runs.`,
+		remedy: "Pass only one of --device and --remote, or --remote local with --device."
+	};
+}
+function resolveIosRemote({ opts, settings, physical, recorded }) {
+	const target = opts.remote !== void 0 ? parseIosRemote(opts.remote) : physical ? null : remoteIosSetting(settings);
 	const machine = target?.kind === "machine" ? target.machine : null;
 	if (recorded && recorded.machine !== machine && machine !== "auto") return { failure: {
 		code: "STIM_BAD_ARG",
@@ -67,7 +70,7 @@ async function selectIosPlacement(args) {
 	const { root, slot, d, opts, deviceType, runtime, noWait, phase, log, release, appMode, metroCheck } = args;
 	const viewer = resolveSimulatorAppFlag(opts.simulatorApp, args.physical, null);
 	if ("refusal" in viewer) return { failure: viewer.refusal };
-	const refusal = args.validateSelectors();
+	const refusal = await args.validateSelectors();
 	if (refusal) return { failure: refusal };
 	const easFallback = args.supportsRemote && remoteEasFallbackSetting(args.settings);
 	try {
@@ -194,4 +197,4 @@ async function connectIosBackend(root, backend, deviceType, d, env, operation) {
 	};
 }
 //#endregion
-export { iosPlacementBudget as a, hostedIosSelectors as i, connectIosTarget as n, selectIosPlacement as o, hostedIosMetroNote as r, connectIosBackend as t };
+export { hostedIosSelectors as a, hostedIosMetroNote as i, connectIosTarget as n, iosPlacementBudget as o, deviceRemoteConflict as r, selectIosPlacement as s, connectIosBackend as t };

package/dist/{result-DNiS-tTP.mjs → result-D2Ykz_iD.mjs}

@@ -1,19 +1,19 @@
 import { l as workspaceAgentDeviceDir } from "./paths-DQtTgsBf.mjs";
-import { U as deviceSlotPlatforms, p as getProject } from "./config-CYcBF478.mjs";
-import { i as formatDuration, l as phaseLine } from "./command-output-B1UrjZHL.mjs";
-import { $ as settingOriginScope, F as parseIosRemote, G as resolveCacheProviderConfig, V as remoteAndroidSetting, W as resolveAndroidLayout, Z as settingFile, a as SETTING_SHAPE_REMEDY, d as androidLayoutSetting, et as settingShapeErrors, f as androidLayoutSettingError, it as unknownSettingKeys, nt as settingsLayers, p as cacheProviderSettingError, s as androidAvdConfigSettingError, u as androidDataPartitionSizeGbSettingError } from "./settings-CsJDEXgK.mjs";
-import { v as detectIsExpo } from "./project-BZNjmW_8.mjs";
-import { B as recordFinishedBuild, Hn as isEasAuthFailureText, Rn as UPLOAD_TIMEOUT_MS, Vn as easAuthNote, zn as cacheLevel } from "./budget-Bs6SxxzO.mjs";
-import { J as pickDefaultSystemImage, P as listInstalledSystemImages, R as ownedAvdDeviceProfile, W as ownedAvdSystemImage, X as profileNeedsFoldFeature, ht as parkedMaxSetting, j as listAvdDeviceProfiles, t as DEFAULT_AVD_DEVICE_PROFILE, tt as systemImageSupportsFold } from "./android-DUYkNF4u.mjs";
-import { a as workspaceLinkLine } from "./stim-desktop-C12we7lz.mjs";
+import { H as deviceSlotPlatforms, p as getProject } from "./config-DlrsduwG.mjs";
+import { i as formatDuration, l as phaseLine } from "./command-output-gwpm28fu.mjs";
+import { $ as settingOriginScope, F as parseIosRemote, G as resolveCacheProviderConfig, V as remoteAndroidSetting, W as resolveAndroidLayout, Z as settingFile, a as SETTING_SHAPE_REMEDY, d as androidLayoutSetting, et as settingShapeErrors, f as androidLayoutSettingError, it as unknownSettingKeys, nt as settingsLayers, p as cacheProviderSettingError, s as androidAvdConfigSettingError, u as androidDataPartitionSizeGbSettingError } from "./settings-C7O8A6ZI.mjs";
+import { v as detectIsExpo } from "./project-wM_XFTvE.mjs";
+import { B as recordFinishedBuild, Hn as isEasAuthFailureText, Rn as UPLOAD_TIMEOUT_MS, Vn as easAuthNote, zn as cacheLevel } from "./budget-Cvwn54qV.mjs";
+import { B as ownedAvdDeviceProfile, I as listInstalledSystemImages, K as ownedAvdSystemImage, N as listAvdDeviceProfilesAsync, Q as profileNeedsFoldFeature, X as pickDefaultSystemImage, _t as parkedMaxSetting, rt as systemImageSupportsFold, t as DEFAULT_AVD_DEVICE_PROFILE } from "./android-C7sVmyI9.mjs";
+import { a as workspaceLinkLine } from "./stim-desktop-D5OGpYZM.mjs";
 import { d as optimizationBuildProfile, l as artifactCachePolicy, p as resolveOptimizations, u as compilerCacheFallbackMessage } from "./errors-ccaPc4ox.mjs";
-import { n as CCACHE_UNAVAILABLE, r as ccacheActivityLine } from "./ccache-BJRZ9pG3.mjs";
-import { c as readProductFlavors, s as productFlavorRefusal } from "./react-native-build-rhk4smwQ.mjs";
-import { l as parseDeviceWait } from "./device-lease-run-C8raGFoP.mjs";
-import { t as DEFAULT_DEVICE_SLOT_WAIT_MS } from "./device-capacity-CMlqEcvw.mjs";
-import { n as resolveAndroidCas, r as resolveAndroidCompilerCache } from "./android-cas-Ct5b1xCK.mjs";
-import { r as isPhysicalDeviceRequest } from "./native-runtime-Dg1Q7tfF.mjs";
-import { C as remoteAvdFlagRefusal, D as systemImageRefusal, E as resolveVariant, T as resolveSystemImage, a as PLATFORM, m as deviceProfileRefusal, v as foldableImageRefusal, w as resolveDeviceProfile, y as isReleaseVariant } from "./support-67vraa1Q.mjs";
+import { n as CCACHE_UNAVAILABLE, r as ccacheActivityLine } from "./ccache-Btwc36-I.mjs";
+import { c as readProductFlavors, s as productFlavorRefusal } from "./react-native-build-Dvd8hC21.mjs";
+import { l as parseDeviceWait } from "./device-lease-run-xJPQ_QQG.mjs";
+import { t as DEFAULT_DEVICE_SLOT_WAIT_MS } from "./device-capacity-DK5_EwRS.mjs";
+import { n as resolveAndroidCas, r as resolveAndroidCompilerCache } from "./android-cas-ngferVq2.mjs";
+import { r as isPhysicalDeviceRequest } from "./native-runtime-B7KIafpM.mjs";
+import { C as remoteAvdFlagRefusal, D as systemImageRefusal, E as resolveVariant, T as resolveSystemImage, a as PLATFORM, m as deviceProfileRefusal, v as foldableImageRefusal, w as resolveDeviceProfile, y as isReleaseVariant } from "./support-yUiOjnVY.mjs";
 import { buildDiagnostics } from "@stim-cli/core/state";
 import chalk from "chalk";
 //#region src/commands/android/plan.ts
@@ -118,10 +118,10 @@ function resolveAndroidBuildPlan({ settings, settingsContext, env, easProfile, v
 		}
 	};
 }
-function resolveAndroidRunPlan({ settings, settingsContext, env, slot, easProfile, variant: variantFlag, systemImage: systemImageFlag, deviceProfile: deviceProfileFlag, device: deviceFlag, wait: waitFlag, waitConflict, remote: commandRemoteBackend, buildCache: requestedBuildCache }, { warn, runtimeKind, resolveCompilerCache = androidCompilerCache, resolveCacheProvider = resolveCacheProviderConfig, validateAvdConfig = androidAvdConfigSettingError, readFlavors = readProductFlavors, variantProblem = (variant) => productFlavorRefusal({
+async function resolveAndroidRunPlan({ settings, settingsContext, env, slot, signal, easProfile, variant: variantFlag, systemImage: systemImageFlag, deviceProfile: deviceProfileFlag, device: deviceFlag, wait: waitFlag, waitConflict, remote: commandRemoteBackend, buildCache: requestedBuildCache }, { warn, runtimeKind, resolveCompilerCache = androidCompilerCache, resolveCacheProvider = resolveCacheProviderConfig, validateAvdConfig = androidAvdConfigSettingError, readFlavors = readProductFlavors, variantProblem = (variant) => productFlavorRefusal({
 	flavors: readFlavors(resolveAndroidLayout(settings, settingsContext.projectPath, settingsContext.repoRoot ?? settingsContext.projectPath)),
 	variant
-}), detectExpo = () => detectIsExpo(settingsContext.projectPath), listSystemImages = listInstalledSystemImages, listDeviceProfiles = listAvdDeviceProfiles, parkedLimit = parkedMaxSetting, supportsFold = systemImageSupportsFold, ownedAvd = slotOwnedAvd }) {
+}), detectExpo = () => detectIsExpo(settingsContext.projectPath), listSystemImages = listInstalledSystemImages, listDeviceProfiles = listAvdDeviceProfilesAsync, parkedLimit = parkedMaxSetting, supportsFold = systemImageSupportsFold, ownedAvd = slotOwnedAvd }) {
 	const root = settingsContext.projectPath;
 	const [shapeError, ...moreShapeErrors] = [parkedLimit("android").error, ...settingShapeErrors(settings)].filter((error) => Boolean(error));
 	if (shapeError) return fail("STIM_BAD_ARG", shapeError, SETTING_SHAPE_REMEDY, { lines: moreShapeErrors });
@@ -150,19 +150,19 @@ function resolveAndroidRunPlan({ settings, settingsContext, env, slot, easProfil
 	const isExpo = detectExpo();
 	const physical = isPhysicalDeviceRequest(deviceFlag);
 	if (physical && deviceFlag === "") return fail("STIM_BAD_ARG", "--device was given an empty serial.", "Pass `--device` on its own to take the first connected device this workspace can lease, or `--device <serial>` to name one.");
-	if (physical && commandRemoteBackend) return fail("STIM_BAD_ARG", "--device installs on a device connected to this machine, and --remote installs on a remote one.", "Pass only one of --device and --remote.");
+	if (physical && commandRemoteBackend !== null && parseIosRemote(commandRemoteBackend)) return fail("STIM_BAD_ARG", `--device installs on a device connected to this machine, and --remote ${commandRemoteBackend} chooses where an emulator runs.`, "Pass only one of --device and --remote, or --remote local with --device.");
 	const noWait = waitFlag === false;
 	if (waitConflict) return fail("STIM_BAD_ARG", "--wait and --no-wait ask for opposite things.", "Pass only one of `--wait <seconds>` and `--no-wait`.");
 	const waitParsed = parseDeviceWait(noWait ? void 0 : waitFlag);
 	if ("error" in waitParsed) return fail("STIM_BAD_ARG", waitParsed.error, "Pass a whole number of seconds, e.g. --wait 90. `--wait 0` refuses a busy lease or device slot at once.");
 	const waitSeconds = waitParsed.seconds;
-	const remoteTarget = commandRemoteBackend !== null ? parseIosRemote(commandRemoteBackend) : remoteAndroidSetting(settings);
-	if (physical && remoteTarget?.kind === "machine") return fail("STIM_BAD_ARG", "--device installs on a phone connected to this machine, and --remote installs on a remote one.", "Pass only one of --device and --remote; unset android.remote for a local phone.");
+	const remoteTarget = commandRemoteBackend !== null ? parseIosRemote(commandRemoteBackend) : physical ? null : remoteAndroidSetting(settings);
 	const machine = remoteTarget?.kind === "machine" ? remoteTarget.machine : null;
 	const remoteBackend = !physical && remoteTarget?.kind === "backend" ? remoteTarget.backend : null;
 	if (!machine) {
-		const refusal = androidDeviceSelectorRefusal({
+		const refusal = await androidDeviceSelectorRefusal({
 			settingsContext,
+			signal,
 			slot,
 			systemImageFlag,
 			deviceProfileFlag,
@@ -210,7 +210,7 @@ function resolveAndroidRunPlan({ settings, settingsContext, env, slot, easProfil
 		}
 	};
 }
-function androidDeviceSelectorRefusal({ settingsContext, slot, systemImageFlag, deviceProfileFlag, systemImage, deviceProfile, physical, remoteBackend }, { listSystemImages = listInstalledSystemImages, listDeviceProfiles = listAvdDeviceProfiles, supportsFold = systemImageSupportsFold, ownedAvd = slotOwnedAvd } = {}) {
+async function androidDeviceSelectorRefusal({ signal, settingsContext, slot, systemImageFlag, deviceProfileFlag, systemImage, deviceProfile, physical, remoteBackend }, { listSystemImages = listInstalledSystemImages, listDeviceProfiles = listAvdDeviceProfilesAsync, supportsFold = systemImageSupportsFold, ownedAvd = slotOwnedAvd } = {}) {
 	const root = settingsContext.projectPath;
 	const settingsLayersForOrigin = settingsLayers(settingsContext);
 	const imageRefusal = systemImageRefusal({
@@ -223,13 +223,14 @@ function androidDeviceSelectorRefusal({ settingsContext, slot, systemImageFlag,
 		listImages: listSystemImages
 	});
 	if (imageRefusal) return fail(imageRefusal.code, imageRefusal.message, imageRefusal.remedy);
-	const profileRefusal = deviceProfileRefusal({
+	const profileRefusal = await deviceProfileRefusal({
 		flag: deviceProfileFlag,
 		resolved: deviceProfile,
 		origin: settingOriginScope(settingsLayersForOrigin, "android.deviceProfile"),
 		physical,
 		remoteBackend,
-		listProfiles: listDeviceProfiles
+		listProfiles: listDeviceProfiles,
+		signal
 	});
 	if (profileRefusal) return fail(profileRefusal.code, profileRefusal.message, profileRefusal.remedy);
 	const avdFlagRefusal = remoteAvdFlagRefusal({

package/dist/{run-D23HmJMs.mjs → run-DidHghD1.mjs}

@@ -1,5 +1,5 @@
-import { f as ownership_claim_exports, p as process_identity_exports, t as getExecutor } from "./exec-_UbtCQcG.mjs";
-import { a as macosRuntimeClaim, i as macosProcess, r as macosLogFile, s as updateMacosRecord } from "./state-XMziexv2.mjs";
+import { g as process_identity_exports, t as getExecutor, x as ownership_claim_exports } from "./exec-DEoAhcze.mjs";
+import { a as macosRuntimeClaim, i as macosProcess, r as macosLogFile, s as updateMacosRecord } from "./state-08I3hw3_.mjs";
 import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
 import { LOG_ROTATE_BYTES } from "@stim-cli/core";
 import { readMacosRecord } from "@stim-cli/core/state";
@@ -93,6 +93,7 @@ async function runMacosSupervisor(root, launchId) {
 		process.on("SIGTERM", stop);
 		process.on("SIGINT", stop);
 		log("info", `Started ${record.product} (pid ${app.pid}).`);
+		process.send?.("macos-registered", () => {});
 		await ended;
 		process.off("SIGTERM", stop);
 		process.off("SIGINT", stop);

package/dist/{selection-CSl9i5qU.mjs → selection-DSMbWEX2.mjs}

@@ -1,11 +1,11 @@
-import { m as reportSignal, u as operationState } from "./exec-_UbtCQcG.mjs";
+import { _ as reportSignal, m as operationState } from "./exec-DEoAhcze.mjs";
 import { v as withDirLock$1 } from "./paths-DQtTgsBf.mjs";
-import { Q as findPeer$1, Z as endpoint, _ as loadConfig$1, ct as readHostPermissions, d as getConfigDir, et as outdatedServer, nt as reachMachine, ot as setupRemedy, rt as realIo, tt as parseMachine$1 } from "./config-CYcBF478.mjs";
+import { $ as outdatedServer, X as endpoint, Z as findPeer$1, _ as loadConfig$1, at as setupRemedy, d as getConfigDir, et as parseMachine$1, nt as realIo, ot as tailscaleStatusAsync, st as readHostPermissions, tt as reachMachine } from "./config-DlrsduwG.mjs";
+import { releaseClaim, tryAcquireClaim } from "@stim-cli/core/ownership-claim";
 import { mkdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { hostname } from "node:os";
 import { ambientContext, ambientEnv, withDirLockAsync } from "@stim-cli/core";
 import { MACHINE_CREDENTIALS_VERSION, OFFLOAD_MODES, acceptsShape, automaticMachineEnabled, buildMachinesFile, buildMachinesLock, cannotHost, deviceHostMachinesClaims, deviceHostMachinesFile, deviceHostMachinesLock, isJsonObject, parseMachine, readBuildMachines, readDeviceHostMachines, settingDefinition } from "@stim-cli/core/state";
-import { releaseClaim, tryAcquireClaim } from "@stim-cli/core/ownership-claim";
 import { InvalidArgumentError } from "commander";
 //#region src/device-host/machines.ts
 function note$1(title, detail, fix = null) {
@@ -28,7 +28,7 @@ function configuredMachines() {
 * The `remote.machines` entries this machine asked for device-host access, in setting order, without the ones the
 * tailnet reports as running another OS than macOS, which can never host; null when the setting is invalid.
 */
-function hostingMachines(status = realIo.status) {
+async function hostingMachines(status, signal) {
 	const configured = configuredMachines();
 	if (configured === null) return null;
 	let candidates = configured;
@@ -39,7 +39,8 @@ function hostingMachines(status = realIo.status) {
 		candidates = configured;
 	}
 	if (!candidates.length) return candidates;
-	const current = status();
+	const current = await (status ? status() : tailscaleStatusAsync(signal));
+	signal?.throwIfAborted();
 	return candidates.filter((machine) => !cannotHost(current, machine));
 }
 async function store(machines, operation) {

package/dist/{server-bare-CxTrvDg8.mjs → server-bare-CafzuyFB.mjs}

@@ -1,5 +1,5 @@
-import { t as getExecutor, v as __commonJSMin, y as __require } from "./exec-_UbtCQcG.mjs";
-import { q as resolveProjectSettings } from "./settings-CsJDEXgK.mjs";
+import { C as __require, S as __commonJSMin, t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { q as resolveProjectSettings } from "./settings-C7O8A6ZI.mjs";
 import { c as registerMetroStore, f as resolveMetroSharedCache, n as supervisorError, r as appendCacheStore, s as metroStoreRoot } from "./errors-ccaPc4ox.mjs";
 import { createRequire } from "node:module";
 import { isAbsolute, join, relative, sep } from "node:path";

package/dist/{server-command-CtzloH3v.mjs → server-command-C6QjeupS.mjs}

@@ -1,9 +1,9 @@
-import { t as getExecutor } from "./exec-_UbtCQcG.mjs";
-import { n as METRO_COMMAND_PORT } from "./settings-CsJDEXgK.mjs";
-import { T as MODE_COMMAND } from "./project-BZNjmW_8.mjs";
+import { t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { n as METRO_COMMAND_PORT } from "./settings-C7O8A6ZI.mjs";
+import { T as MODE_COMMAND } from "./project-wM_XFTvE.mjs";
 import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
-import { p as signalProcessTree } from "./metro-DEXpIhHC.mjs";
-import { f as recordFromLine, h as superviseChildServer, m as withProjectNode } from "./server-expo-DT_F_uVI.mjs";
+import { f as signalProcessTree } from "./metro-DiXtA3Ty.mjs";
+import { f as recordFromLine, h as superviseChildServer, m as withProjectNode } from "./server-expo-CrjB29pq.mjs";
 import { join } from "node:path";
 import { LOG_ROTATE_BYTES } from "@stim-cli/core";
 //#region src/supervisor/server-command.ts

package/dist/{server-expo-DT_F_uVI.mjs → server-expo-CrjB29pq.mjs}

@@ -1,7 +1,8 @@
-import { t as getExecutor } from "./exec-_UbtCQcG.mjs";
+import { t as getExecutor } from "./exec-DEoAhcze.mjs";
 import { n as stripAnsi, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { Qt as cancellableSleep, q as resolveProjectSettings } from "./settings-CsJDEXgK.mjs";
-import { C as resolvePackageJson } from "./project-BZNjmW_8.mjs";
+import { u as cancellableSleep } from "./operation-exec-BW0em61G.mjs";
+import { q as resolveProjectSettings } from "./settings-C7O8A6ZI.mjs";
+import { C as resolvePackageJson } from "./project-wM_XFTvE.mjs";
 import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
 import { a as expoMetroStoreEnv, c as registerMetroStore, f as resolveMetroSharedCache, i as expoMetroConfigPath, n as supervisorError, o as metroStoreConfirmedRoot, s as metroStoreRoot } from "./errors-ccaPc4ox.mjs";
 import { accessSync, constants, existsSync, readFileSync } from "node:fs";
@@ -74,10 +75,11 @@ function superviseChildServer({ mode, child, log, toRecord, signal, alive = null
 				while (running() && Date.now() < deadline) await cancellableSleep(25, { ref: false });
 				return !running();
 			};
-			if (!running() || !signal("SIGTERM")) return;
+			if (!running()) return;
+			signal("SIGTERM");
 			if (!await gone()) {
 				signal("SIGKILL");
-				await gone();
+				if (!await gone()) throw new Error(`Could not confirm shutdown of dev-server pid ${child.pid ?? "unknown"}.`);
 			}
 		}
 	};

package/dist/server-expo-D58c9L0M.mjs

@@ -0,0 +1,2 @@
+import { p as startExpoServer } from "./server-expo-CrjB29pq.mjs";
+export { startExpoServer };