stim 1.26.0 → 1.28.0

package/dist/{device-capacity-DCSvUF0l.mjs → device-capacity-Cd8lMSn3.mjs}

@@ -1,18 +1,61 @@
-import { D as ownership_claim_exports, d as workspaceProcessLockError, u as withWorkspaceProcessLock } from "./exec-VFRpu1iA.mjs";
-import { G as projectDeviceSlots, H as deviceSlotPlatforms, O as withConfigLockAsync$1, _ as loadConfig$1, d as getConfigDir, u as getConcurrencyLimits } from "./config-BktkY_zC.mjs";
-import { a as formatElapsed, l as phaseLine } from "./command-output-BF5AR2dL.mjs";
-import { g as deviceReclaimIdleMinutesSetting } from "./settings-CosW5X-S.mjs";
-import { A as listAdbDevices, j as listAdbDevicesAsync } from "./android-DTAcRwBC.mjs";
-import { $ as recordCapacityWait, Q as recordCapacityRefusal } from "./budget-k2mZGvvk.mjs";
+import { D as ownership_claim_exports, d as workspaceProcessLockError, u as withWorkspaceProcessLock } from "./exec-aULwtNly.mjs";
+import { G as projectDeviceSlots, H as deviceSlotPlatforms, O as withConfigLockAsync$1, _ as loadConfig$1, d as getConfigDir, u as getConcurrencyLimits } from "./config-Cn94Jc0g.mjs";
+import { a as formatElapsed, l as phaseLine } from "./command-output-C8R1KIvi.mjs";
+import { g as deviceReclaimIdleMinutesSetting } from "./settings-CY5JZlNN.mjs";
+import { A as listAdbDevices, j as listAdbDevicesAsync } from "./android-CsPs-7Mg.mjs";
+import { ot as recordCapacityRefusal, st as recordCapacityWait, v as withIdleWorkspace } from "./workspaces-CmOcceDN.mjs";
 import { t as canonicalPath } from "./paths-BsJMoPP2.mjs";
-import { p as withIdleWorkspace } from "./workspaces-g2lhdBXF.mjs";
-import { d as listAllIosSims, f as listAllIosSimsAsync, l as iosRuntimeMatches, y as parseRuntimeVersion } from "./ios-WxpDJ5T1.mjs";
-import { i as writeIdleShutdownEvent, n as dueIdleDevices, r as shutDownIdleDevices } from "./idle-shutdown-FfxL1KdG.mjs";
+import { d as listAllIosSims, f as listAllIosSimsAsync, l as iosRuntimeMatches, y as parseRuntimeVersion } from "./ios-B1DYuOjh.mjs";
+import { i as writeIdleShutdownEvent, n as dueIdleDevices, r as shutDownIdleDevices } from "./idle-shutdown-CQ0QwU9J.mjs";
 import { realpathSync } from "node:fs";
 import { basename, join } from "node:path";
 import { workspaceId } from "@stim-cli/core";
 import { DEVICE_RECLAIM_REASON, automaticMachineEnabled } from "@stim-cli/core/state";
 import { setTimeout } from "node:timers/promises";
+//#region src/workspace/display-label.ts
+function baseLabel({ root, label }) {
+	return label || basename(root);
+}
+function pathSegments(root) {
+	return root.split(/[\\/]+/).filter(Boolean).toReversed();
+}
+function workspaceLabels(workspaces) {
+	const labels = /* @__PURE__ */ new Map();
+	const groups = /* @__PURE__ */ new Map();
+	for (const workspace of workspaces) {
+		const base = baseLabel(workspace);
+		const group = groups.get(base) ?? [];
+		if (!group.some(({ root }) => root === workspace.root)) group.push(workspace);
+		groups.set(base, group);
+	}
+	for (const [base, group] of groups) {
+		const [only] = group;
+		if (group.length === 1 && only) {
+			labels.set(only.root, base);
+			continue;
+		}
+		const segments = group.map(({ root }) => pathSegments(root));
+		const longest = Math.max(...segments.map((parts) => parts.length));
+		let depth = 0;
+		while (depth < longest && segments.every((parts) => parts[depth] === segments[0]?.[depth])) depth++;
+		const suffixes = segments.map((parts) => parts[depth]);
+		const distinct = new Set(suffixes).size === group.length;
+		group.forEach(({ root }, index) => {
+			const suffix = distinct ? suffixes[index] : root;
+			labels.set(root, suffix ? `${base} (${suffix})` : base);
+		});
+	}
+	return labels;
+}
+function workspaceDisplayLabel(root, config) {
+	const registered = Object.entries(config?.projects ?? {}).map(([path, project]) => ({
+		root: path,
+		label: project.label
+	}));
+	const own = registered.find((entry) => entry.root === root);
+	return workspaceLabels([...registered, own ?? { root }]).get(root) ?? basename(root);
+}
+//#endregion
 //#region src/devices/queue-reclaim.ts
 async function reclaimIdleDevice(root, idleMs, out, now, skipped) {
 	try {
@@ -26,7 +69,7 @@ async function reclaimIdleDevice(root, idleMs, out, now, skipped) {
 		}).toSorted((a, b) => b.idleForMs - a.idleForMs).find(({ device }) => !skipped.has(`${device.kind}:${device.id}`));
 		if (!candidate) return 0;
 		const { device, idleForMs } = candidate;
-		const label = loadConfig$1()?.projects[device.project]?.label || basename(device.project);
+		const label = workspaceDisplayLabel(device.project, loadConfig$1());
 		const log = (event) => {
 			writeIdleShutdownEvent(device.project, event);
 			if (event.level === "warn") out(`${"device".padEnd(11)} ${event.msg}`);
@@ -167,6 +210,31 @@ function listed(source, empty, absent = () => false) {
 		throw new DeviceCountUnavailable("", { cause: error });
 	}
 }
+async function listedAwait(read, empty, absent = () => false) {
+	try {
+		return await read() ?? empty;
+	} catch (error) {
+		if (absent(error)) return empty;
+		throw new DeviceCountUnavailable("", { cause: error });
+	}
+}
+async function readInventoryAsync({ sims = () => process.platform === "darwin" ? listAllIosSimsAsync({ timeoutMs: LISTING_TIMEOUT_MS }) : [], adb = () => listAdbDevicesAsync({ timeoutMs: LISTING_TIMEOUT_MS }), config = loadConfig$1, booting = readBootingDevices }) {
+	try {
+		const recorded = await listedAwait(() => typeof config === "function" ? config() : config, null);
+		return {
+			booting: await listedAwait(() => typeof booting === "function" ? booting() : booting, []),
+			sims: await listedAwait(() => typeof sims === "function" ? sims() : sims, [], toolAbsent),
+			adb: recordsOwnedEmulator(recorded) ? await listedAwait(() => typeof adb === "function" ? adb() : adb, NO_ADB, toolAbsent) : NO_ADB,
+			config: recorded
+		};
+	} catch (error) {
+		if (error instanceof DeviceCountUnavailable) {
+			if ((0, ownership_claim_exports.isClaimRefusal)(error.cause)) throw error.cause;
+			return uncountedRefusal(error.cause);
+		}
+		throw error;
+	}
+}
 function readInventory({ sims = listSimsForCount, adb = listAdbForCount, config = loadConfig$1, booting = readBootingDevices }) {
 	try {
 		const recorded = listed(config, null);
@@ -205,6 +273,15 @@ async function listedAsync(source, empty) {
 		throw new DeviceCountUnavailable("", { cause: error });
 	}
 }
+async function countLiveOwnedDevicesFrom(sources, { exclude = [] } = {}) {
+	try {
+		const inventory = await readInventoryAsync(sources);
+		return "code" in inventory ? { unknown: inventory.message } : inventoryKeys(inventory, exclude).size;
+	} catch (error) {
+		if ((0, ownership_claim_exports.isClaimRefusal)(error)) return { unknown: error.message };
+		throw error;
+	}
+}
 async function countLiveOwnedDevicesAsync(operation) {
 	try {
 		operation.signal.throwIfAborted();
@@ -308,21 +385,93 @@ const DEFAULT_DEVICE_SLOT_WAIT_MS = 6e5;
 function deviceSlotWaitingLine({ count, max, holders, elapsedMs, queue }) {
 	return `${"device".padEnd(11)} waiting for a device slot (${count}/${max} in use${holders.length ? `: ${holders.join(", ")}` : ""}), ${formatElapsed(elapsedMs)} elapsed -- stim guide lifecycle concurrency${queue ? `; ${queue}` : ""}`;
 }
-function deviceHolders(inventory, keys) {
-	const names = /* @__PURE__ */ new Map();
-	for (const [root, project] of Object.entries(inventory.config?.projects ?? {})) for (const { platforms } of projectDeviceSlots(project)) {
-		if (platforms.ios?.deviceUdid) names.set(deviceKey("ios", platforms.ios.deviceUdid), project.label || basename(root));
-		if (platforms.android?.avdName) names.set(deviceKey("android", platforms.android.avdName), project.label || basename(root));
+function unrecordedHolder(label) {
+	return {
+		label,
+		workspace: null,
+		slot: null
+	};
+}
+function slotHolders(inventory, keys) {
+	const owners = /* @__PURE__ */ new Map();
+	const projects = Object.entries(inventory.config?.projects ?? {});
+	const labels = workspaceLabels(projects.map(([root, project]) => ({
+		root,
+		label: project.label
+	})));
+	for (const [root, project] of projects) {
+		const label = labels.get(root) ?? basename(root);
+		for (const { slot, platforms } of projectDeviceSlots(project)) {
+			if (platforms.ios?.deviceUdid) owners.set(deviceKey("ios", platforms.ios.deviceUdid), {
+				label,
+				workspace: root,
+				slot
+			});
+			if (platforms.android?.avdName) owners.set(deviceKey("android", platforms.android.avdName), {
+				label,
+				workspace: root,
+				slot
+			});
+		}
 	}
 	for (const sim of inventory.sims) {
 		const key = deviceKey("ios", sim.udid);
-		if (!names.has(key)) names.set(key, sim.name);
+		if (!owners.has(key)) owners.set(key, unrecordedHolder(sim.name));
 	}
+	const booting = /* @__PURE__ */ new Set();
 	for (const device of inventory.booting) {
 		const key = deviceKey(device.platform, device.key);
-		if (!names.has(key)) names.set(key, device.displayName ?? device.key);
+		booting.add(key);
+		if (!owners.has(key)) owners.set(key, unrecordedHolder(device.displayName ?? device.key));
+	}
+	return [...keys].map((key) => {
+		const { label, workspace, slot } = owners.get(key) ?? unrecordedHolder(key.slice(key.indexOf(":") + 1));
+		const platform = key.startsWith("android:") ? "android" : "ios";
+		return booting.has(key) ? {
+			platform,
+			label,
+			workspace,
+			slot,
+			booting: true
+		} : {
+			platform,
+			label,
+			workspace,
+			slot
+		};
+	}).toSorted((a, b) => a.label.localeCompare(b.label) || a.platform.localeCompare(b.platform));
+}
+function deviceHolders(inventory, keys) {
+	return [...new Set(slotHolders(inventory, keys).map((holder) => holder.label))].toSorted();
+}
+/**
+* `concurrency.maxDevices` usage for status: the owned devices the cap counts and who holds each. `sims` is the
+* listing status already read; an unknown count reports why instead of failing.
+*/
+async function deviceSlotUsage(max, sources = {}) {
+	try {
+		const inventory = await readInventoryAsync(sources);
+		if ("code" in inventory) return {
+			max,
+			inUse: null,
+			unknown: inventory.message,
+			holders: []
+		};
+		const keys = inventoryKeys(inventory);
+		return {
+			max,
+			inUse: keys.size,
+			holders: slotHolders(inventory, keys)
+		};
+	} catch (error) {
+		if ((0, ownership_claim_exports.isClaimRefusal)(error)) return {
+			max,
+			inUse: null,
+			unknown: error.message,
+			holders: []
+		};
+		throw error;
 	}
-	return [...new Set([...keys].map((key) => names.get(key) ?? key.slice(key.indexOf(":") + 1)))].toSorted();
 }
 function liveWaiters() {
 	const root = join(getConfigDir(), "device-waits");
@@ -394,7 +543,7 @@ async function admissionTransaction(action, lockWaitMs, out, signal) {
 	}
 }
 /** Boots an owned device under the Stim home's cap, reserving capacity before releasing admission. */
-async function withDeviceBootAdmission(device, boot, { root, max = getConcurrencyLimits().maxDevices, sources = {}, lockWaitMs = ADMISSION_LOCK_WAIT_MS, out = () => {}, waitMs = DEFAULT_DEVICE_SLOT_WAIT_MS, noWait = false, automatic = false, displayName = basename(root), reclaimIdleMinutes = deviceReclaimIdleMinutesSetting({}), now = Date.now, signal, sleep = (ms) => setTimeout(ms, void 0, { signal }), waitingFor = () => {}, onWait = () => {} }) {
+async function withDeviceBootAdmission(device, boot, { root, max = getConcurrencyLimits().maxDevices, sources = {}, lockWaitMs = ADMISSION_LOCK_WAIT_MS, out = () => {}, waitMs = DEFAULT_DEVICE_SLOT_WAIT_MS, noWait = false, automatic = false, displayName = workspaceDisplayLabel(root, loadConfig$1()), reclaimIdleMinutes = deviceReclaimIdleMinutesSetting({}), now = Date.now, signal, sleep = (ms) => setTimeout(ms, void 0, { signal }), waitingFor = () => {}, onWait = () => {}, onBootStart = () => {} }) {
 	const requireMembership = () => {
 		if (automatic && !automaticMachineEnabled("device", "local")) throw new DeviceAdmissionRefusal({
 			code: "STIM_HOSTING_REFUSED",
@@ -404,7 +553,10 @@ async function withDeviceBootAdmission(device, boot, { root, max = getConcurrenc
 	};
 	signal?.throwIfAborted();
 	requireMembership();
-	if (!max || max <= 0) return boot();
+	if (!max || max <= 0) {
+		onBootStart();
+		return boot();
+	}
 	const workspace = workspaceId(root);
 	device = {
 		...device,
@@ -466,7 +618,7 @@ async function withDeviceBootAdmission(device, boot, { root, max = getConcurrenc
 						if ((typeof booting === "function" ? booting() : booting).some((entry) => deviceKey(entry.platform, entry.key) === own)) return admit();
 						return wait(lastInventory);
 					}
-					const inventory = readInventory(sources);
+					const inventory = await readInventoryAsync(sources);
 					if ("code" in inventory) throw new DeviceAdmissionRefusal(inventory);
 					const keys = inventoryKeys(inventory);
 					const own = deviceKey(device.platform, device.key);
@@ -543,6 +695,7 @@ async function withDeviceBootAdmission(device, boot, { root, max = getConcurrenc
 			}
 		}
 		requireMembership();
+		onBootStart();
 		return await boot();
 	} finally {
 		(0, ownership_claim_exports.releaseClaim)(marker);
@@ -612,4 +765,4 @@ function unknownAndroidDeviceProfileRefusal(requested, profiles) {
 	};
 }
 //#endregion
-export { countLiveOwnedDevicesAsync as a, peekDeviceSlots as c, unknownAndroidSystemImageRefusal as d, unknownIosDeviceTypeRefusal as f, countLiveOwnedDevices as i, runtimeMismatch as l, withDeviceBootAdmission as m, DeviceAdmissionRefusal as n, deviceTypeMismatch as o, unknownIosRuntimeRefusal as p, checkDeviceCapacity as r, layerNote as s, DEFAULT_DEVICE_SLOT_WAIT_MS as t, unknownAndroidDeviceProfileRefusal as u };
+export { countLiveOwnedDevicesAsync as a, deviceTypeMismatch as c, runtimeMismatch as d, unknownAndroidDeviceProfileRefusal as f, withDeviceBootAdmission as g, unknownIosRuntimeRefusal as h, countLiveOwnedDevices as i, layerNote as l, unknownIosDeviceTypeRefusal as m, DeviceAdmissionRefusal as n, countLiveOwnedDevicesFrom as o, unknownAndroidSystemImageRefusal as p, checkDeviceCapacity as r, deviceSlotUsage as s, DEFAULT_DEVICE_SLOT_WAIT_MS as t, peekDeviceSlots as u };

package/dist/{device-BcYeHSFu.mjs → device-eeK95Lir.mjs}

@@ -1,20 +1,20 @@
-import { b as operationState, t as getExecutor } from "./exec-VFRpu1iA.mjs";
-import { G as projectDeviceSlots, V as deviceSlotKey, W as parseDeviceSlotOption, _ as loadConfig$1, p as getProject } from "./config-BktkY_zC.mjs";
+import { b as operationState, t as getExecutor } from "./exec-aULwtNly.mjs";
+import { G as projectDeviceSlots, V as deviceSlotKey, W as parseDeviceSlotOption, _ as loadConfig$1, p as getProject } from "./config-Cn94Jc0g.mjs";
 import { t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { r as clockTime } from "./command-output-BF5AR2dL.mjs";
-import { J as resolveProjectSettings, Ut as makeTemporaryDirectory, Wt as removeTemporaryEntry, nt as settingValueAt, q as resolveIosProjectDir } from "./settings-CosW5X-S.mjs";
-import { f as projectRegistry, g as selectNativeXcodeProject, i as findProjectRoot$1, p as NativeXcodeError, t as NO_PROJECT_REFUSAL } from "./project-BUu6Is4k.mjs";
-import { A as listAdbDevices, O as getAvdNameForSerialAsync, R as memoizeEmulatorProbe, Y as physicalDeviceModel, Z as probeEmulatorSerial, c as androidPoolNoCandidatesRefusal, rt as resolvePhysicalDevice, s as androidPoolCandidates } from "./android-DTAcRwBC.mjs";
-import { Un as runProcessOperation } from "./budget-k2mZGvvk.mjs";
-import { C as parseLeaseDuration, D as releaseWorkspaceLeases, j as takeLease, y as fileLeaseIo } from "./activity-Lnb_EoRY.mjs";
-import { H as resolveScheme, K as xcodebuildArgs } from "./toolchain-J4J8MrAr.mjs";
-import { a as discoverXcodeProject } from "./react-native-build-oNwqF5Wb.mjs";
-import { l as parseDeviceWait, p as waitForDevice } from "./device-lease-run-BmvIl7bI.mjs";
-import { m as resolveConfiguration, y as resolveSchemeSelection } from "./support-CVOCp0Ft.mjs";
-import { n as findSigningIdentities, o as parsePlist, s as parseProvisioningProfilePlist, t as decodeProvisioningProfile } from "./ios-signing-4c_qXvQm.mjs";
-import { t as selectFromPool } from "./device-pool-Dluix4H3.mjs";
-import { a as iosPoolCandidates, c as isWirelessIosDevice, f as resolveIosPhysicalDevice, l as listIosDevices, o as iosPoolNoCandidatesRefusal } from "./ios-device-CsyryvpT.mjs";
-import { i as nativeXcodePackages, t as nativeXcodeHasPackages } from "./native-xcode-inputs-BW7H8JGu.mjs";
+import { r as clockTime } from "./command-output-C8R1KIvi.mjs";
+import { X as resolveProjectSettings, Y as resolveIosProjectDir, an as makeTemporaryDirectory, it as settingValueAt, on as removeTemporaryEntry } from "./settings-CY5JZlNN.mjs";
+import { f as projectRegistry, g as selectNativeXcodeProject, i as findProjectRoot$1, p as NativeXcodeError, t as NO_PROJECT_REFUSAL } from "./project-Sui52ywT.mjs";
+import { A as listAdbDevices, O as getAvdNameForSerialAsync, R as memoizeEmulatorProbe, Y as physicalDeviceModel, Z as probeEmulatorSerial, c as androidPoolNoCandidatesRefusal, rt as resolvePhysicalDevice, s as androidPoolCandidates } from "./android-CsPs-7Mg.mjs";
+import { En as runProcessOperation } from "./ccache-Bm_A1xX9.mjs";
+import { H as resolveScheme, K as xcodebuildArgs } from "./toolchain-mLA_km-b.mjs";
+import { C as parseLeaseDuration, D as releaseWorkspaceLeases, j as takeLease, y as fileLeaseIo } from "./activity-DRMg4_mD.mjs";
+import { a as discoverXcodeProject } from "./react-native-build-jUHnIfZ9.mjs";
+import { l as parseDeviceWait, p as waitForDevice } from "./device-lease-run-Mtzp4THX.mjs";
+import { m as resolveConfiguration, y as resolveSchemeSelection } from "./support-BtlJKjyQ.mjs";
+import { n as findSigningIdentities, o as parsePlist, s as parseProvisioningProfilePlist, t as decodeProvisioningProfile } from "./ios-signing-BJzvDPfU.mjs";
+import { t as selectFromPool } from "./device-pool-eRz6DtCg.mjs";
+import { a as iosPoolCandidates, c as isWirelessIosDevice, f as resolveIosPhysicalDevice, l as listIosDevices, o as iosPoolNoCandidatesRefusal } from "./ios-device-B4elVFKi.mjs";
+import { i as nativeXcodePackages, t as nativeXcodeHasPackages } from "./native-xcode-inputs-BKarCoKg.mjs";
 import { existsSync, readdirSync, realpathSync, statSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";

package/dist/device-host-worker.mjs

@@ -1,19 +1,19 @@
-import { t as getExecutor } from "./exec-VFRpu1iA.mjs";
-import { _ as ensureWorkspaceStorage, d as writeWorkspaceState } from "./workspace-state-pUg3_RRA.mjs";
-import { O as withConfigLockAsync$1, _ as loadConfig$1, c as ensureConfig } from "./config-BktkY_zC.mjs";
-import { i as macosProcess, o as requiredMacosRecord } from "./state-C4OdpOTF.mjs";
-import { A as listAdbDevices, Ct as forgetCreatedDeviceAsync, D as getAvdNameForSerial, F as listAvdsAsync, I as listInstalledSystemImages, K as ownedAvdSystemImage, M as listAvdDeviceProfiles, O as getAvdNameForSerialAsync, U as ownedAvdName, X as pickDefaultSystemImage, a as androidDeviceAbi, ct as waitForBoot, d as androidToolPath, f as assertOwnedAvdStopped, g as avdPathExists, k as hostSystemImageArch, nt as resolveOwnedAvdSerialAsync, t as DEFAULT_AVD_DEVICE_PROFILE, tt as resetAdoptedAvd, v as avdStorageRoots, x as createOwnedAvd, y as bootAndroidEmulator } from "./android-DTAcRwBC.mjs";
-import { a as parsePidof, i as parseLogcatLine, t as androidClockOffset } from "./android-B5P81yI-.mjs";
-import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
-import { An as launchAndroidApp, En as installAndroidApp, Fn as writeDebugHttpHost, Mn as launchIosApp, On as installIosApp, Pn as reverseMetroPorts, jn as launchAndroidReleaseApp, kn as iosAppProcess, vn as androidAppProcess } from "./budget-k2mZGvvk.mjs";
-import { A as teardownOwnedIosSim, O as teardownOwnedAvd } from "./workspaces-g2lhdBXF.mjs";
-import { A as uninstallIosApp, E as resolveIosCreation, L as readHostMemoryPressure, T as resetIosPrivacy, a as createOwnedIosSim, d as listAllIosSims, g as listUserApps, n as bootIosSim, w as resetIosKeychain } from "./ios-WxpDJ5T1.mjs";
-import { r as stopMacosAppHeld } from "./stop-ySNQHXMG.mjs";
+import { t as getExecutor } from "./exec-aULwtNly.mjs";
+import { _ as ensureWorkspaceStorage, d as writeWorkspaceState } from "./workspace-state-kIZrdlSg.mjs";
+import { O as withConfigLockAsync$1, _ as loadConfig$1, c as ensureConfig } from "./config-Cn94Jc0g.mjs";
+import { i as macosProcess, o as requiredMacosRecord } from "./state-BXC1Lfxw.mjs";
+import { A as listAdbDevices, Ct as forgetCreatedDeviceAsync, D as getAvdNameForSerial, F as listAvdsAsync, I as listInstalledSystemImages, K as ownedAvdSystemImage, M as listAvdDeviceProfiles, O as getAvdNameForSerialAsync, U as ownedAvdName, X as pickDefaultSystemImage, a as androidDeviceAbi, ct as waitForBoot, d as androidToolPath, f as assertOwnedAvdStopped, g as avdPathExists, k as hostSystemImageArch, nt as resolveOwnedAvdSerialAsync, t as DEFAULT_AVD_DEVICE_PROFILE, tt as resetAdoptedAvd, v as avdStorageRoots, x as createOwnedAvd, y as bootAndroidEmulator } from "./android-CsPs-7Mg.mjs";
+import { a as parsePidof, i as parseLogcatLine, t as androidClockOffset } from "./android-D577ApKG.mjs";
+import { i as createNdjsonWriter } from "./ndjson-Dy2W4vRa.mjs";
+import { _n as reverseMetroPorts, dn as installIosApp, fn as iosAppProcess, hn as launchIosApp, ln as installAndroidApp, mn as launchAndroidReleaseApp, pn as launchAndroidApp, tn as androidAppProcess, vn as writeDebugHttpHost } from "./ccache-Bm_A1xX9.mjs";
+import { ht as teardownOwnedIosSim, pt as teardownOwnedAvd } from "./workspaces-CmOcceDN.mjs";
+import { E as resolveIosCreation, R as readHostMemoryPressure, T as resetIosPrivacy, a as createOwnedIosSim, d as listAllIosSims, g as listUserApps, j as uninstallIosApp, n as bootIosSim, w as resetIosKeychain } from "./ios-B1DYuOjh.mjs";
+import { i as stopMacosAppHeld, n as stopHostedBundleInstances } from "./stop-DQvE-P76.mjs";
 import { t as spawnEntry } from "./spawn-entry-jw19m8Nl.mjs";
-import { i as countLiveOwnedDevices } from "./device-capacity-DCSvUF0l.mjs";
-import { _ as findAapt } from "./support-BGSCBoib.mjs";
-import { t as waitForMacosRegistration } from "./registration-CN6nlhcD.mjs";
-import { n as parseLogStreamLine } from "./ios-ENC4sRPA.mjs";
+import { i as countLiveOwnedDevices } from "./device-capacity-Cd8lMSn3.mjs";
+import { _ as findAapt } from "./support-04IhBUTT.mjs";
+import { t as waitForMacosRegistration } from "./registration-BwCe64PH.mjs";
+import { n as parseLogStreamLine } from "./ios-CsRVik64.mjs";
 import { createHash, randomUUID } from "node:crypto";
 import { chmodSync, closeSync, copyFileSync, createReadStream, existsSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statfsSync, symlinkSync, writeFileSync } from "node:fs";
 import { availableParallelism, freemem, homedir, loadavg } from "node:os";
@@ -232,7 +232,7 @@ function collectHostedNativeLogs({ home, platform, since, final, query, parse, t
 //#endregion
 //#region src/device-host/android-logs.ts
 /** Captures bounded logcat output from the installed app on this home's exact ledger-owned serial. */
-function collectHostedAndroidLogs(home, session, attempt, since, final = false) {
+async function collectHostedAndroidLogs(home, session, attempt, since, final = false) {
 	const deadline = Date.now() + 1e4;
 	const device = readHostedDevice(home, "android");
 	assertHostedAndroidSerial(home, device);
@@ -240,9 +240,9 @@ function collectHostedAndroidLogs(home, session, attempt, since, final = false)
 	if (app.state !== "installed") return false;
 	const exec = getExecutor();
 	const adb = androidToolPath("adb");
-	const clockOffsetMs = androidClockOffset(device.serial, { exec: {
+	const clockOffsetMs = await androidClockOffset(device.serial, { exec: {
 		...exec,
-		runFile: (file, args, options) => exec.runFile(file === "adb" ? adb : file, args, options)
+		runFileAsync: (file, args, options) => exec.runFileAsync(file === "adb" ? adb : file, args, options)
 	} }) ?? 0;
 	const previous = readHostedNativeLogsCheckpoint(home, "android");
 	let current = null;
@@ -953,11 +953,12 @@ async function runHostedMacosApp(mode, request, app) {
 		if (device.appSlot !== request.appSlot) throw new Error("The hosted macOS app slot changed.");
 		assertHostedDeviceLedger(home, `macos-${device.appSlot}`, "macos");
 		const runRoot = join(realpathSync(home), "macos-app");
+		const area = realpathSync(join(home, ".."));
 		if (mode === "stop") {
 			if (requiredMacosRecord(runRoot)) await stopMacosAppHeld(runRoot);
+			await stopHostedBundleInstances(area);
 			const bundleId = preferenceIdentity(home, device.appSlot);
 			if (bundleId) removePreferences(bundleId);
-			const area = realpathSync(join(home, ".."));
 			assertInside(area, home);
 			removeAppData(realpathSync(home), join(home, "app-home"));
 			const apps = join(home, "..", "apps");
@@ -1035,6 +1036,7 @@ async function runHostedMacosApp(mode, request, app) {
 			bundle
 		], options);
 		if (requiredMacosRecord(runRoot)) await stopMacosAppHeld(runRoot);
+		await stopHostedBundleInstances(area);
 		const previousId = preferenceIdentity(home, device.appSlot);
 		if (previousId && previousId !== bundleId) removePreferences(previousId);
 		mkdirSync(runRoot, {
@@ -1226,7 +1228,7 @@ async function main() {
 	if (input.platform === "macos" && !hostedMacosAppSlot(input.appSlot)) throw new Error("Invalid hosted macOS app slot.");
 	if (input.mode === "logs") {
 		if (input.platform !== "ios" && input.platform !== "android" || !process.env.STIM_HOME || typeof input.since !== "number" || !Number.isFinite(input.since)) throw new Error("Invalid hosted native log request.");
-		const more = (input.platform === "android" ? collectHostedAndroidLogs : collectHostedIosLogs)(process.env.STIM_HOME, input.session, input.attempt, input.since, input.final === true);
+		const more = await (input.platform === "android" ? collectHostedAndroidLogs : collectHostedIosLogs)(process.env.STIM_HOME, input.session, input.attempt, input.since, input.final === true);
 		process.stdout.write(`${JSON.stringify({ more })}\n`);
 		return;
 	}