stim 1.23.1 → 1.24.0

package/README.md

@@ -188,8 +188,9 @@ refuses with `STIM_CLAIM_UNAVAILABLE` instead of a cancellation or timeout
 error. Child cleanup errors name the launcher PID; unverifiable processes and descendants
 are left untouched. On POSIX, a launcher that exited before identity capture can only
 finish successfully once its process group is proven gone.
-After a termination request, cleanup waits at most one second for a child to
-close. Overall cleanup has a 35 second budget, including temporary-worktree
+After a termination request, cleanup waits for a child to close, then for its
+process group to exit: each wait is 5 seconds times the host's load per CPU,
+from 5 to 15 seconds. Overall cleanup has a 35 second budget, including temporary-worktree
 removal; unfinished cleanup returns `STIM_CLAIM_UNAVAILABLE` and leaves
 unresolved resources in place. Credential refresh waits asynchronously and
 checks cancellation before writing.

package/dist/{acquire-artifact-BzYRDgaP.mjs → acquire-artifact-CEs02U2o.mjs}

@@ -1,5 +1,5 @@
-import { r as WorkspaceProcessCleanupError } from "./exec-DEoAhcze.mjs";
-import { I as waitForSharedBuild } from "./activity-BpWUPgUm.mjs";
+import { l as WorkspaceProcessCleanupError } from "./exec-VFRpu1iA.mjs";
+import { I as waitForSharedBuild } from "./activity-Dq3ZcdD8.mjs";
 import { rmSync } from "node:fs";
 //#region src/engine/artifact-lifecycle.ts
 async function runArtifactLifecycle(phases) {

package/dist/{act-vxiMwdf5.mjs → act-Cyvm8xYc.mjs}

@@ -1,23 +1,23 @@
-import { n as isTimeoutError, r as WorkspaceProcessCleanupError, t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { l as WorkspaceProcessCleanupError, n as isTimeoutError, t as getExecutor } from "./exec-VFRpu1iA.mjs";
 import { g as workspaceStateFile$1, m as workspaceLogsDir$1 } from "./paths-DQtTgsBf.mjs";
-import { F as isOnMountedVolume, G as projectDeviceSlots, I as listMountedVolumes, L as measuredDirectorySizeAsync, N as directorySizeAsync, P as formatBytes, _ as loadConfig$1, p as getProject } from "./config-DlrsduwG.mjs";
-import { o as formatLongDuration, u as plural } from "./command-output-YKGWivpG.mjs";
-import { c as gitQuiet, l as gitQuietAsync, n as runOperationFileQuiet, r as childEnvironment } from "./operation-exec-BW0em61G.mjs";
-import { r as readWorkspaceState$1, u as workspaceLastUsed } from "./workspace-state-U08dEzhG.mjs";
-import { E as maintenanceKeepSetting, Et as listWorktreesAsync, Ft as resolveFullRefAsync, It as resolveSourceCheckoutAsync, J as resolveProjectSettingsAsync, Rt as sourceCheckoutOf, St as hasUncommittedWorkAsync, Tt as listWorktrees, Wt as removeTemporaryEntryAsync, bt as hasPopulatedSubmodulesAsync, gt as dirtyPathsAsync, q as resolveProjectSettings, zt as unpushedCommitsAsync } from "./settings-C7O8A6ZI.mjs";
-import { i as findProjectRoot$1 } from "./project-DhCtQWWU.mjs";
-import { a as unregister, n as readManifest } from "./cache-manifest-DSeQjt-Q.mjs";
-import { A as workspaceBuildInProgress, E as collectOwnedDeviceActivityAsync, St as deleteProjectDevices, T as collectOwnedDeviceActivity, Tt as deviceSweepIsScoped, X as emptyCaches, _r as phase, br as discoverCaches, bt as deleteParkedAvds, ct as deleteGradleVersion, d as trimmableCaches, f as stopOwnedMetro, fr as memorySweepIsScoped, gr as stopIdleGradleDaemons, gt as DEVICE_LIST_TIMEOUT_MS, i as enforceBudget, kt as findStaleProjectDevices, nt as planCacheEmptying, o as machineNumber, pt as waitForGradleExit, r as cacheLabel, sr as collectMemoryReport, st as collectGradleVersions, u as resolveBudget, vt as collectParkedAvds, xr as pruneCache, xt as deleteParkedSims, yt as collectParkedSims } from "./budget-3ivAK99e.mjs";
+import { F as isOnMountedVolume, G as projectDeviceSlots, I as listMountedVolumes, L as measuredDirectorySizeAsync, N as directorySizeAsync, P as formatBytes, _ as loadConfig$1, p as getProject } from "./config-BZhXY15H.mjs";
+import { o as formatLongDuration, u as plural } from "./command-output-DxC0k2rk.mjs";
+import { c as gitQuiet, l as gitQuietAsync, n as runOperationFileQuiet, r as childEnvironment } from "./operation-exec-CUZifp6Z.mjs";
+import { r as readWorkspaceState$1, u as workspaceLastUsed } from "./workspace-state-CeBpIZgr.mjs";
+import { E as maintenanceKeepSetting, Et as listWorktreesAsync, Ft as resolveFullRefAsync, It as resolveSourceCheckoutAsync, J as resolveProjectSettingsAsync, Rt as sourceCheckoutOf, St as hasUncommittedWorkAsync, Tt as listWorktrees, Wt as removeTemporaryEntryAsync, bt as hasPopulatedSubmodulesAsync, gt as dirtyPathsAsync, q as resolveProjectSettings, zt as unpushedCommitsAsync } from "./settings-RKwY33wv.mjs";
+import { i as findProjectRoot$1 } from "./project-Dz-hWkb-.mjs";
+import { F as listAvdsAsync, G as ownedAvdSerialResolverAsync, P as listAvds, V as ownedAvdDirectory, yt as readParked } from "./android-882m4hxX.mjs";
+import { a as unregister, n as readManifest } from "./cache-manifest-BPXRONJz.mjs";
+import { A as workspaceBuildInProgress, Cr as pruneCache, Ct as deleteParkedSims, Dt as deviceSweepIsScoped, E as collectOwnedDeviceActivityAsync, Q as emptyCaches, Sr as discoverCaches, St as deleteParkedAvds, T as collectOwnedDeviceActivity, bt as collectParkedAvds, d as trimmableCaches, f as stopOwnedMetro, ht as waitForGradleExit, i as enforceBudget, it as planCacheEmptying, jt as findStaleProjectDevices, lr as collectMemoryReport, lt as collectGradleVersions, mr as memorySweepIsScoped, o as machineNumber, r as cacheLabel, u as resolveBudget, ut as deleteGradleVersion, vr as stopIdleGradleDaemons, vt as DEVICE_LIST_TIMEOUT_MS, wt as deleteProjectDevices, xt as collectParkedSims, yr as phase } from "./budget-dPGuhNai.mjs";
 import { t as canonicalPath } from "./paths-BsJMoPP2.mjs";
-import { V as takeGcResults, a as collectWorkspaceOutputs, c as listWorkspaceDirs, f as withIdleWorkspace, i as collectOrphanedWorkspaces, m as workspaceInUseAsync, o as deleteOrphanedWorkspaces, p as workspaceInUse, r as clearWorkspaceOutputs, s as isInsideWorkspaces, z as GC_OUTPUT } from "./workspaces-e41xsjKr.mjs";
-import { N as listBuildLocks, b as leaseIsExpired, g as workspaceActivity, x as listLeaseFiles } from "./activity-BpWUPgUm.mjs";
-import { F as listAvdsAsync, G as ownedAvdSerialResolverAsync, P as listAvds, V as ownedAvdDirectory, vt as readParked } from "./android-C7sVmyI9.mjs";
-import { d as listAllIosSims, f as listAllIosSimsAsync } from "./ios-hcBpnEGk.mjs";
+import { B as GC_OUTPUT, H as takeGcResults, a as collectWorkspaceOutputs, c as listWorkspaceDirs, d as workspaceDirRemoved, h as workspaceInUseAsync, i as collectOrphanedWorkspaces, m as workspaceInUse, o as deleteOrphanedWorkspaces, p as withIdleWorkspace, r as clearWorkspaceOutputs, s as isInsideWorkspaces } from "./workspaces-CSV2Orf4.mjs";
+import { N as listBuildLocks, b as leaseIsExpired, g as workspaceActivity, x as listLeaseFiles } from "./activity-Dq3ZcdD8.mjs";
+import { d as listAllIosSims, f as listAllIosSimsAsync } from "./ios-CVUFFZ6C.mjs";
 import { s as metroStoreRoot } from "./errors-ccaPc4ox.mjs";
 import { t as resolveMaintenanceSettings } from "./settings-Djl-mpjX.mjs";
-import { A as levelFloors, C as measureDisk, E as measurePressureAsync, M as lowestFree, N as protectWindowMs, S as cacheBlocked, T as measurePressure, a as matchWorktreeEntry, c as reclaimKeys, i as excludeWatchmanCookies, k as diskPressureLevel, m as removeWorktreeTarget, o as nestedWorktrees, r as excludePodChurn, s as porcelainPath, w as measureDiskAsync } from "./worktree-B4Nj3EGS.mjs";
-import { c as FETCH_FRESH_MS, d as localDefaultBranchAsync, l as fetchDefaultBranchAsync, o as recordPullRequestLookup, p as mergeStateAsync, u as lastFetchedAtAsync } from "./warm-progress-CA3TgT3-.mjs";
-import { n as describePullRequest, r as endedPullRequest, s as pullRequestLookups } from "./pull-request-W1IuLXDt.mjs";
+import { A as measurePressureAsync, D as measureDisk, E as cacheBlocked, I as lowestFree, L as protectWindowMs, N as diskPressureLevel, O as measureDiskAsync, P as levelFloors, a as matchWorktreeEntry, c as reclaimKeys, i as excludeWatchmanCookies, k as measurePressure, m as removeWorktreeTarget, o as nestedWorktrees, r as excludePodChurn, s as porcelainPath } from "./worktree-Dw8kfacb.mjs";
+import { c as FETCH_FRESH_MS, d as localDefaultBranchAsync, l as fetchDefaultBranchAsync, o as recordPullRequestLookup, p as mergeStateAsync, u as lastFetchedAtAsync } from "./warm-progress-ol0ZypEu.mjs";
+import { n as describePullRequest, r as endedPullRequest, s as pullRequestLookups } from "./pull-request-CbNlkFok.mjs";
 import { readClaimSet } from "@stim-cli/core/ownership-claim";
 import { existsSync, lstatSync, readdirSync, realpathSync, rmSync, statSync } from "node:fs";
 import { tmpdir } from "node:os";
@@ -1700,20 +1700,33 @@ const STIM_PREFIXES = [
 const STAGING_PREFIX = ".stim-delete-";
 const TRACE_PATTERN = /^instruments.*\.ktrace$/;
 const TRACE_PROCESSES = /* @__PURE__ */ new Set(["xctrace", "Instruments"]);
+const SWIFTPM_PATTERN = /^TemporaryDirectory\.[A-Za-z0-9]{6}$/;
+const SWIFTPM_PROCESSES = /* @__PURE__ */ new Set([
+	"swift",
+	"swift-build",
+	"swift-frontend",
+	"swift-package",
+	"swift-run",
+	"swift-test",
+	"xcodebuild"
+]);
 const REMEDIES = {
 	stim: "stim gc --delete removes them once they are idle for 24 hours",
 	xctrace: "stim gc --delete removes them once they are idle for 24 hours and no xctrace or Instruments process runs; export a recording you need first",
+	swiftpm: "stim gc --delete removes them once they are idle for 24 hours and no swift or xcodebuild process runs",
 	jest: "Jest owns this cache; clear it with `npx jest --clearCache`"
 };
 const LABELS = {
 	stim: "Stim temp directories",
 	xctrace: "xctrace recordings (instruments*.ktrace)",
+	swiftpm: "SwiftPM temp directories (TemporaryDirectory.*)",
 	jest: "Jest cache"
 };
 function kindOf(name, stat, jestName) {
 	const unstaged = name.startsWith(STAGING_PREFIX) ? name.slice(13) : name;
 	if (stat.isDirectory() && STIM_PREFIXES.some((prefix) => unstaged.startsWith(prefix))) return "stim";
 	if ((stat.isFile() || stat.isDirectory()) && TRACE_PATTERN.test(name)) return "xctrace";
+	if (stat.isDirectory() && SWIFTPM_PATTERN.test(name)) return "swiftpm";
 	if (stat.isDirectory() && name === jestName) return "jest";
 	return null;
 }
@@ -1812,8 +1825,8 @@ function temporaryRoot(env) {
 }
 /**
 * Recognized leftovers directly inside the user's TMPDIR, never following a symlink: Stim's own temp directories,
-* xctrace recordings and Jest's cache. Only the first two are ever deleted, and only once nothing in them changed for
-* 24 hours. Null with STIM_HOME set, because TMPDIR is shared by every Stim home, and for the real TMPDIR a test
+* xctrace recordings, SwiftPM's `TemporaryDirectory.*` and Jest's cache. All but Jest's are deleted, and only once
+* nothing in them changed for 24 hours. Null with STIM_HOME set, because TMPDIR is shared by every Stim home, and for the real TMPDIR a test
 * process recorded in STIM_TEST_GUARD_REAL_TMPDIR.
 */
 async function collectTempLeftovers({ now = Date.now(), env = process.env, signal, operation } = {}) {
@@ -1833,16 +1846,16 @@ async function collectTempLeftovers({ now = Date.now(), env = process.env, signa
 	const registeredProjects = () => Object.keys(loadConfig$1()?.projects ?? {}).flatMap((key) => [key, canonicalKey(key)]);
 	let projects = registeredProjects();
 	let executables;
-	const traceBusy = async () => {
+	const busy = async (processes) => {
 		if (executables === void 0) executables = await runningExecutables(operation, signal);
 		const listed = executables;
 		if (listed === null) return "the running processes could not be listed";
-		const running = [...TRACE_PROCESSES].filter((name) => listed.has(name));
+		const running = [...processes].filter((name) => listed.has(name));
 		return running.length ? `${running.join(" and ")} is running` : null;
 	};
 	const judge = async (path, stat, kind, identity = path) => {
 		const scan = await walk(path, stat, signal);
-		const kept = now - scan.newest < MIN_AGE_MS ? `modified within the last ${TEMP_LEFTOVER_MIN_AGE_HOURS}h` : kind === "stim" ? stimKept(identity, scan, projects) : scan.unreadable ?? await traceBusy();
+		const kept = now - scan.newest < MIN_AGE_MS ? `modified within the last ${TEMP_LEFTOVER_MIN_AGE_HOURS}h` : kind === "stim" ? stimKept(identity, scan, projects) : scan.unreadable ?? await busy(kind === "xctrace" ? TRACE_PROCESSES : SWIFTPM_PROCESSES);
 		return {
 			bytes: scan.bytes,
 			kept
@@ -1851,7 +1864,7 @@ async function collectTempLeftovers({ now = Date.now(), env = process.env, signa
 	const recheck = async (staged, original, kind) => {
 		const stat = await lstatOrError(staged);
 		if (!stat || "error" in stat || stat.isSymbolicLink()) return "it changed while it was being deleted";
-		if (kind === "xctrace") executables = void 0;
+		if (kind !== "stim") executables = void 0;
 		else projects = registeredProjects();
 		return (await judge(staged, stat, kind, original)).kept;
 	};
@@ -1896,6 +1909,7 @@ function summarize(report) {
 	return [
 		"stim",
 		"xctrace",
+		"swiftpm",
 		"jest"
 	].flatMap((kind) => {
 		const entries = report.entries.filter((entry) => entry.kind === kind);
@@ -1950,7 +1964,7 @@ async function deleteTempLeftovers(options = {}, output = GC_OUTPUT) {
 		try {
 			if (entry.kind === "jest") continue;
 			const name = basename(entry.path);
-			const staged = entry.kind === "xctrace" || name.startsWith(STAGING_PREFIX) ? entry.path : join(report.root, `${STAGING_PREFIX}${name}`);
+			const staged = entry.kind !== "stim" || name.startsWith(STAGING_PREFIX) ? entry.path : join(report.root, `${STAGING_PREFIX}${name}`);
 			const before = staged === entry.path ? null : await report.recheck?.(entry.path, entry.path, entry.kind) ?? null;
 			if (before) {
 				output.record("tempLeftover", "kept", entry.path, {
@@ -2062,7 +2076,7 @@ async function planLevel2({ settings, sizes, protectedRoot, pinned, now, operati
 		kind: "would-delete-temp-leftovers",
 		target: leftovers.root,
 		bytes: deletable.reduce((sum, entry) => sum + entry.bytes, 0),
-		reason: "disk pressure level 2, Stim temp directories and xctrace recordings unmodified for 24 hours",
+		reason: "disk pressure level 2, Stim temp directories, xctrace recordings and SwiftPM temp directories unmodified for 24 hours",
 		level: 2
 	});
 	const options = {
@@ -2242,7 +2256,7 @@ async function planPressureLevels(level, context) {
 function triggeringRoot(operation) {
 	return canonicalPath(findProjectRoot$1(operation?.cwd ?? process.cwd()) ?? join(configDir(), "maintenance", "no-project"));
 }
-async function plannedMaintenance(pressure, sizes, settings, { devices = true, sweep = false, worktrees = false, refresh = true, operation } = {}) {
+async function plannedMaintenance(pressure, recordedSizes, settings, { devices = true, sweep = false, worktrees = false, refresh = true, operation } = {}) {
 	const env = operation?.env ?? process.env;
 	const resolved = resolveBudget({ env });
 	if (resolved.error) throw new Error(resolved.error);
@@ -2272,6 +2286,7 @@ async function plannedMaintenance(pressure, sizes, settings, { devices = true, s
 		signal: operation?.signal,
 		operation
 	});
+	const sizes = recordedSizes.filter((size) => size.category !== "workspace-outputs" || !workspaceDirRemoved(size.dir));
 	const currentSizes = sizes.map((size) => {
 		if (size.category === "compilation-cache") return {
 			...size,

package/dist/{activity-BpWUPgUm.mjs → activity-Dq3ZcdD8.mjs}

@@ -1,10 +1,10 @@
-import { c as declareSpawnsOn, f as stopDeclaringSpawnsOn, g as process_identity_exports, t as getExecutor, x as ownership_claim_exports } from "./exec-DEoAhcze.mjs";
+import { D as ownership_claim_exports, S as process_identity_exports, m as declareSpawnsOn, t as getExecutor, v as stopDeclaringSpawnsOn } from "./exec-VFRpu1iA.mjs";
 import { m as workspaceLogsDir$1, v as withDirLock$1, y as withDirLockAsync$1 } from "./paths-DQtTgsBf.mjs";
-import { U as parseDeviceSlotKey, V as deviceSlotKey, d as getConfigDir, q as validateDeviceSlot } from "./config-DlrsduwG.mjs";
-import { a as formatElapsed, i as formatDuration, m as shortHash } from "./command-output-YKGWivpG.mjs";
-import { n as runOperationFileQuiet } from "./operation-exec-BW0em61G.mjs";
-import { c as withWorkspaceStateLock, d as writeWorkspaceState, l as withWorkspaceStateLockAsync, n as clearWorkspaceStateKeys, r as readWorkspaceState$1 } from "./workspace-state-U08dEzhG.mjs";
-import { h as resolveBuild } from "./build-cache-Dv7RN200.mjs";
+import { U as parseDeviceSlotKey, V as deviceSlotKey, d as getConfigDir, q as validateDeviceSlot } from "./config-BZhXY15H.mjs";
+import { a as formatElapsed, i as formatDuration, m as shortHash } from "./command-output-DxC0k2rk.mjs";
+import { n as runOperationFileQuiet } from "./operation-exec-CUZifp6Z.mjs";
+import { c as withWorkspaceStateLock, d as writeWorkspaceState, l as withWorkspaceStateLockAsync, n as clearWorkspaceStateKeys, r as readWorkspaceState$1 } from "./workspace-state-CeBpIZgr.mjs";
+import { y as resolveBuild } from "./build-cache-HFUQ9eLz.mjs";
 import { randomBytes } from "node:crypto";
 import { closeSync, fstatSync, mkdirSync, openSync, readFileSync, readSync, readdirSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";

package/dist/{agent-device-usage-output-CUlLsbRt.mjs → agent-device-usage-output-CccomeE0.mjs}

@@ -1,8 +1,8 @@
-import { g as process_identity_exports } from "./exec-DEoAhcze.mjs";
-import { P as formatBytes } from "./config-DlrsduwG.mjs";
-import { o as formatLongDuration } from "./command-output-YKGWivpG.mjs";
-import { F as writeUsageCache, N as canonical, P as measureDu, c as listWorkspaceDirs } from "./workspaces-e41xsjKr.mjs";
-import { c as parseAgentDeviceRecord, o as envDir, u as processMatches } from "./activity-BpWUPgUm.mjs";
+import { S as process_identity_exports } from "./exec-VFRpu1iA.mjs";
+import { P as formatBytes } from "./config-BZhXY15H.mjs";
+import { o as formatLongDuration } from "./command-output-DxC0k2rk.mjs";
+import { F as measureDu, I as writeUsageCache, P as canonical, c as listWorkspaceDirs } from "./workspaces-CSV2Orf4.mjs";
+import { c as parseAgentDeviceRecord, o as envDir, u as processMatches } from "./activity-Dq3ZcdD8.mjs";
 import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { homedir } from "node:os";
 import { isAbsolute, join, relative, sep } from "node:path";

package/dist/{android-C7sVmyI9.mjs → android-882m4hxX.mjs}

@@ -1,10 +1,10 @@
-import { c as declareSpawnsOn, f as stopDeclaringSpawnsOn, g as process_identity_exports, r as WorkspaceProcessCleanupError, t as getExecutor, x as ownership_claim_exports } from "./exec-DEoAhcze.mjs";
-import { C as saveConfig, D as withConfigLock$1, G as projectDeviceSlots, H as deviceSlotPlatforms, K as removeSlotDevice, O as withConfigLockAsync$1, _ as loadConfig$1, c as ensureConfig, d as getConfigDir, f as getConfigPath$1, z as assignSlotDevice } from "./config-DlrsduwG.mjs";
-import { n as runOperationFileQuiet, t as runOperationFile, u as cancellableSleep } from "./operation-exec-BW0em61G.mjs";
-import { c as androidDataPartitionSizeBytes } from "./settings-C7O8A6ZI.mjs";
-import { c as pidExists, p as signalProcessTreeAsync } from "./metro-DiXtA3Ty.mjs";
-import { i as recordCreatedDevice, r as readCreatedDevices$1, t as forgetCreatedDevice } from "./created-devices-x9rN6bhs.mjs";
-import { i as stimDesktopInstalledAsync, n as settingDefault, t as STIM_DESKTOP_OPEN_OPTIONS } from "./stim-desktop-D5OGpYZM.mjs";
+import { D as ownership_claim_exports, S as process_identity_exports, l as WorkspaceProcessCleanupError, m as declareSpawnsOn, o as cancellableSleep, t as getExecutor, v as stopDeclaringSpawnsOn } from "./exec-VFRpu1iA.mjs";
+import { C as saveConfig, D as withConfigLock$1, G as projectDeviceSlots, H as deviceSlotPlatforms, K as removeSlotDevice, O as withConfigLockAsync$1, _ as loadConfig$1, c as ensureConfig, d as getConfigDir, f as getConfigPath$1, z as assignSlotDevice } from "./config-BZhXY15H.mjs";
+import { n as runOperationFileQuiet, t as runOperationFile } from "./operation-exec-CUZifp6Z.mjs";
+import { c as androidDataPartitionSizeBytes } from "./settings-RKwY33wv.mjs";
+import { i as stimDesktopInstalledAsync, n as settingDefault, t as STIM_DESKTOP_OPEN_OPTIONS } from "./stim-desktop-DS0mzR8U.mjs";
+import { a as recordCreatedDeviceAsync, n as forgetCreatedDeviceAsync, r as readCreatedDevices$1 } from "./created-devices-D2Aca-xu.mjs";
+import { c as pidExists, p as signalProcessTreeAsync } from "./metro-Bu8LBfzS.mjs";
 import { isDeepStrictEqual } from "node:util";
 import { join } from "node:path";
 import { ambientEnv, ambientWrite } from "@stim-cli/core";
@@ -13,6 +13,27 @@ import { dirname as dirname$1, isAbsolute as isAbsolute$1, join as join$1, resol
 import { existsSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, writeFileSync } from "fs";
 import { rm } from "node:fs/promises";
 import { homedir, tmpdir } from "os";
+//#region src/devices/android-emulator-viewer.ts
+async function configuredAndroidEmulatorApp(platform = process.platform, env) {
+	let value = loadConfig$1()?.androidEmulatorApp;
+	if (value === void 0) {
+		const installed = await stimDesktopInstalledAsync(platform, env);
+		value = settingDefault(settingDefinition("androidEmulatorApp"), () => installed).value;
+	}
+	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;
+}
+async function openEmulatorInStimDesktop(serial) {
+	await getExecutor().runFileQuietAsync("open", [
+		"-g",
+		"-a",
+		"Stim",
+		`stim-desktop://open?serial=${serial}`
+	], STIM_DESKTOP_OPEN_OPTIONS);
+}
+//#endregion
 //#region src/devices/sim-pool.ts
 const POOL_SETTING_REMEDY = "Run `stim guide settings` for the device pool bounds and where it can be set.";
 function parkedMaxSetting(platform, options = {}) {
@@ -89,11 +110,11 @@ function parkSim({ platform, projectPath, slot = "default", record, max }) {
 		return evicted;
 	});
 }
-function adoptParked({ platform, projectPath, slot = "default", udid, device }) {
+async function adoptParked({ platform, projectPath, slot = "default", udid, device }) {
 	const claim = claimParkedOperation(platform, udid);
 	if (!claim) return null;
 	try {
-		return withConfigLock$1(() => {
+		return await withConfigLockAsync$1(() => {
 			const cfg = ensureConfig();
 			const records = readParked(platform, { config: cfg });
 			const taken = records.find((r) => r.udid === udid);
@@ -243,27 +264,6 @@ function isStimOwnedAvd(name) {
 	return name.startsWith("stim-") && isStimOwnedDevice("android", name);
 }
 //#endregion
-//#region src/devices/android-emulator-viewer.ts
-async function configuredAndroidEmulatorApp(platform = process.platform, env) {
-	let value = loadConfig$1()?.androidEmulatorApp;
-	if (value === void 0) {
-		const installed = await stimDesktopInstalledAsync(platform, env);
-		value = settingDefault(settingDefinition("androidEmulatorApp"), () => installed).value;
-	}
-	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;
-}
-async function openEmulatorInStimDesktop(serial) {
-	await getExecutor().runFileQuietAsync("open", [
-		"-g",
-		"-a",
-		"Stim",
-		`stim-desktop://open?serial=${serial}`
-	], STIM_DESKTOP_OPEN_OPTIONS);
-}
-//#endregion
 //#region src/devices/android.ts
 const ANDROID_ABIS = /* @__PURE__ */ new Set([
 	"armeabi-v7a",
@@ -410,7 +410,7 @@ async function createOwnedAvd(label, { systemImage, deviceProfile = DEFAULT_AVD_
 		throw new Error(`No ${arch} Android system image is installed. Install one, e.g.: sdkmanager "system-images;android-36;google_apis;${arch}"`);
 	}
 	const avdName = ownedAvdName(label);
-	recordCreatedDevice("android", avdName);
+	await recordCreatedDeviceAsync("android", avdName);
 	const tool = androidToolPath("avdmanager");
 	const args = [
 		"create",
@@ -542,7 +542,7 @@ async function deleteAvd(avdName, operation) {
 		cwd: operation?.cwd,
 		...root ? { env: { ANDROID_AVD_HOME: root } } : {}
 	});
-	forgetCreatedDevice("android", avdName);
+	await forgetCreatedDeviceAsync("android", avdName);
 }
 function parseAvdList(text) {
 	return text.split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith("INFO") && !l.startsWith("WARNING"));
@@ -964,7 +964,10 @@ async function resetAdoptedAvd(avdName, serial, keepPackage) {
 	let unavailableTarget = false;
 	const commandTimeout = (timeoutMs) => recoveryDeadline === void 0 ? timeoutMs : Math.max(1, Math.min(timeoutMs, recoveryDeadline - Date.now()));
 	const assertTarget = async () => {
-		const resolved = await resolveOwnedAvdSerialAsync(avdName, { timeoutMs: commandTimeout(3e4) });
+		const resolved = await resolveOwnedAvdSerialAsync(avdName, {
+			timeoutMs: commandTimeout(3e4),
+			preferredSerial: serial
+		});
 		unavailableTarget = Boolean(resolved.notRunning);
 		if (resolved.serial !== serial) throw new Error(`AVD ${avdName} is no longer running on ${serial}.`);
 	};
@@ -1283,6 +1286,44 @@ async function shutdownAndroidEmulator(serial, timeoutMs = ANDROID_EMULATOR_SHUT
 		"kill"
 	], Math.max(1, timeoutMs - (Date.now() - started)));
 }
+function reverseDevicePortsTo(listing, hostPorts) {
+	return String(listing ?? "").split("\n").flatMap((line) => {
+		const [, device, host] = line.trim().split(/\s+/);
+		return device?.startsWith("tcp:") && hostPorts.some((port) => host === `tcp:${port}`) ? [device] : [];
+	});
+}
+/**
+* Removes the reverses that point an owned emulator at `metroPort`, verified by the emulator's own
+* console. The adb server connects a reverse stream from the device to the host port synchronously
+* on its single event thread (packages/modules/adb services.cpp `service_to_fd`), and on Windows a
+* refused loopback connect takes seconds, so an app retrying a stopped Metro stalls every adb call.
+* https://github.com/appandflow/stim/issues/4101
+*/
+async function removeOwnedEmulatorMetroReverses(avdName, serial, metroPort, operation) {
+	if (await getAvdNameForSerialAsync(serial, { operation }) !== avdName) return;
+	await removeMetroReverses(serial, [metroPort], operation);
+}
+async function removeMetroReverses(serial, hostPorts, operation) {
+	const adb = androidToolPath("adb", process.platform, operation?.env);
+	const options = {
+		timeoutMs: ADB_PROP_TIMEOUT_MS,
+		killSignal: "SIGKILL",
+		cwd: androidToolCwd() ?? operation?.cwd
+	};
+	const listing = await runOperationFileQuiet(operation, getExecutor(), adb, [
+		"-s",
+		serial,
+		"reverse",
+		"--list"
+	], options);
+	for (const devicePort of reverseDevicePortsTo(listing, hostPorts)) await runOperationFileQuiet(operation, getExecutor(), adb, [
+		"-s",
+		serial,
+		"reverse",
+		"--remove",
+		devicePort
+	], options);
+}
 function avdProcessLockPaths(avdDirectory, platform) {
 	return ["hardware-qemu.ini.lock", "userdata-qemu.img.lock"].map((name) => join$1(avdDirectory, name, ...platform === "win32" ? ["pid"] : []));
 }
@@ -1557,11 +1598,20 @@ async function getAvdNameForSerialAsync(serial, { timeoutMs = EMU_AVD_NAME_TIMEO
 	if (!out) return null;
 	return out.split("\n")[0]?.trim() || null;
 }
-/** `resolveOwnedAvdSerial` without blocking the event loop, with the same reads and the same timeout budget. */
+/**
+* `resolveOwnedAvdSerial` without blocking the event loop, with the same reads and the same timeout budget.
+* `preferredSerial` is the serial this workspace recorded for the AVD: it is read first, and the other
+* emulators are read only when it does not run the AVD.
+*/
 async function resolveOwnedAvdSerialAsync(avdName, opts = {}) {
-	return ownedAvdSerialResolverAsync(opts)(avdName);
+	return ownedAvdSerialResolverAsync(opts)(avdName, opts.preferredSerial);
 }
-/** Shares bounded asynchronous AVD, adb and emulator-name reads across the requested AVDs. */
+/**
+* Shares bounded asynchronous AVD, adb and emulator-name reads across the requested AVDs. Emulators are
+* read concurrently within each tier (the preferred serial, then healthy ones, then unhealthy ones), and
+* the reads still pending are cancelled once one runs the requested AVD, so a wedged foreign emulator
+* neither adds up across serials nor delays the match.
+*/
 function ownedAvdSerialResolverAsync({ timeoutMs, signal, operation } = {}) {
 	const started = Date.now();
 	const remaining = () => ({
@@ -1571,23 +1621,67 @@ function ownedAvdSerialResolverAsync({ timeoutMs, signal, operation } = {}) {
 	});
 	const avds = once(() => listAvdsAsync(remaining()));
 	const adb = once(() => listAdbDevicesAsync(remaining()));
-	const names = /* @__PURE__ */ new Map();
+	const reads = /* @__PURE__ */ new Map();
 	const avdNameOf = (serial) => {
-		let name = names.get(serial);
-		if (!name) {
-			name = getAvdNameForSerialAsync(serial, remaining());
-			names.set(serial, name);
+		let read = reads.get(serial);
+		if (!read) {
+			const own = new AbortController();
+			const options = remaining();
+			const entry = {
+				name: getAvdNameForSerialAsync(serial, {
+					...options,
+					signal: options.signal ? AbortSignal.any([options.signal, own.signal]) : own.signal
+				}),
+				settled: false,
+				cancel: () => {
+					if (entry.settled) return;
+					own.abort();
+					reads.delete(serial);
+				}
+			};
+			const settle = () => {
+				entry.settled = true;
+			};
+			entry.name.then(settle, settle);
+			reads.set(serial, entry);
+			read = entry;
 		}
-		return name;
+		return read;
 	};
-	return async (avdName) => {
+	const firstRunning = async (serials, avdName) => {
+		try {
+			return await new Promise((settle, reject) => {
+				let pending = serials.length;
+				if (pending === 0) return settle(void 0);
+				for (const serial of serials) avdNameOf(serial).name.then((name) => {
+					if (name === avdName) settle(serial);
+					else if (--pending === 0) settle(void 0);
+					return name;
+				}, reject);
+			});
+		} finally {
+			for (const serial of serials) reads.get(serial)?.cancel();
+		}
+	};
+	return async (avdName, preferredSerial) => {
 		signal?.throwIfAborted();
 		if (!(await avds()).includes(avdName)) return { missing: true };
 		if (!isStimOwnedAvd(avdName)) return { notOwned: true };
 		const devices = await adb();
 		signal?.throwIfAborted();
-		const candidates = [...devices.emulators, ...devices.unhealthy.filter((entry) => entry.kind === "emulator" && entry.consolePort !== void 0)];
-		for (const candidate of candidates) if (await avdNameOf(candidate.serial) === avdName) return { serial: candidate.serial };
+		const healthy = devices.emulators.map((entry) => entry.serial);
+		const unhealthy = devices.unhealthy.filter((entry) => entry.kind === "emulator" && entry.consolePort !== void 0).map((entry) => entry.serial);
+		const preferred = preferredSerial && [...healthy, ...unhealthy].includes(preferredSerial) ? preferredSerial : null;
+		const tiers = [
+			...preferred ? [[preferred]] : [],
+			healthy.filter((serial) => serial !== preferred),
+			unhealthy.filter((serial) => serial !== preferred)
+		];
+		for (const tier of tiers) {
+			const serial = await firstRunning(tier, avdName);
+			signal?.throwIfAborted();
+			if (serial) return { serial };
+		}
 		return { notRunning: true };
 	};
 }
@@ -1631,4 +1725,4 @@ function ownedAvdSerialResolver({ timeoutMs } = {}) {
 	};
 }
 //#endregion
-export { resetAdoptedAvd as $, listAdbDevices as A, ownedAvdDeviceProfile as B, emulatorDiskSpaceRemedy as C, getAvdNameForSerial as D, findBuildTool as E, listAvdsAsync as F, ownedAvdSerialResolverAsync as G, ownedAvdMatchesConfiguration as H, listInstalledSystemImages as I, parseAvdSystemImage as J, ownedAvdSystemImage as K, listOrphanedAvdDirectories as L, listAvdDeviceProfiles as M, listAvdDeviceProfilesAsync as N, getAvdNameForSerialAsync as O, listAvds as P, profileNeedsFoldFeature as Q, memoizeEmulatorProbe as R, deleteAvd as S, extractEmulatorFailure as T, ownedAvdName as U, ownedAvdDirectory as V, ownedAvdSerialResolver as W, pickDefaultSystemImage as X, physicalDeviceModel as Y, probeEmulatorSerial as Z, avdPoolConfiguration as _, parkedMaxSetting as _t, androidDeviceAbi as a, waitForAndroidEmulatorShutdown as at, configureNewOwnedAvd as b, selectParked as bt, androidPoolNoCandidatesRefusal as c, configuredAndroidEmulatorApp as ct, androidToolPath as d, POOL_SETTING_REMEDY as dt, resolveOwnedAvdSerialAsync as et, assertOwnedAvdStopped as f, adoptParked as ft, avdPathExists as g, parkSim as gt, avdNameAbsent as h, isLegacyDeletionClaim as ht, androidDataFreeBytes as i, trimAndroidCaches as it, listAdbDevicesAsync as j, hostSystemImageArch as k, androidSystemImageAbi as l, isStimOwnedAvd as lt, avdIniPaths as m, eraseParkedAfter as mt, OWNED_AVD_CONFIG_DEFAULTS as n, shutdownAndroidEmulator as nt, androidHome as o, waitForBoot as ot, assertOwnedAvdStoppedAsync as p, dropParked as pt, parseAvdDeviceProfile as q, androidBuildToolName as r, systemImageSupportsFold as rt, androidPoolCandidates as s, wipeAvdUserData as st, DEFAULT_AVD_DEVICE_PROFILE as t, resolvePhysicalDevice as tt, androidToolCwd as u, isStimOwnedSim as ut, avdStorageRoots as v, readParked as vt, emulatorFailureRemedy as w, createOwnedAvd as x, bootAndroidEmulator as y, removeParkedAfter as yt, nextConsolePort as z };
+export { removeMetroReverses as $, listAdbDevices as A, ownedAvdDeviceProfile as B, emulatorDiskSpaceRemedy as C, getAvdNameForSerial as D, findBuildTool as E, listAvdsAsync as F, ownedAvdSerialResolverAsync as G, ownedAvdMatchesConfiguration as H, listInstalledSystemImages as I, parseAvdSystemImage as J, ownedAvdSystemImage as K, listOrphanedAvdDirectories as L, listAvdDeviceProfiles as M, listAvdDeviceProfilesAsync as N, getAvdNameForSerialAsync as O, listAvds as P, profileNeedsFoldFeature as Q, memoizeEmulatorProbe as R, deleteAvd as S, configuredAndroidEmulatorApp as St, extractEmulatorFailure as T, ownedAvdName as U, ownedAvdDirectory as V, ownedAvdSerialResolver as W, pickDefaultSystemImage as X, physicalDeviceModel as Y, probeEmulatorSerial as Z, avdPoolConfiguration as _, parkSim as _t, androidDeviceAbi as a, systemImageSupportsFold as at, configureNewOwnedAvd as b, removeParkedAfter as bt, androidPoolNoCandidatesRefusal as c, waitForBoot as ct, androidToolPath as d, isStimOwnedSim as dt, removeOwnedEmulatorMetroReverses as et, assertOwnedAvdStopped as f, POOL_SETTING_REMEDY as ft, avdPathExists as g, isLegacyDeletionClaim as gt, avdNameAbsent as h, eraseParkedAfter as ht, androidDataFreeBytes as i, shutdownAndroidEmulator as it, listAdbDevicesAsync as j, hostSystemImageArch as k, androidSystemImageAbi as l, wipeAvdUserData as lt, avdIniPaths as m, dropParked as mt, OWNED_AVD_CONFIG_DEFAULTS as n, resolveOwnedAvdSerialAsync as nt, androidHome as o, trimAndroidCaches as ot, assertOwnedAvdStoppedAsync as p, adoptParked as pt, parseAvdDeviceProfile as q, androidBuildToolName as r, resolvePhysicalDevice as rt, androidPoolCandidates as s, waitForAndroidEmulatorShutdown as st, DEFAULT_AVD_DEVICE_PROFILE as t, resetAdoptedAvd as tt, androidToolCwd as u, isStimOwnedAvd as ut, avdStorageRoots as v, parkedMaxSetting as vt, emulatorFailureRemedy as w, createOwnedAvd as x, selectParked as xt, bootAndroidEmulator as y, readParked as yt, nextConsolePort as z };