stim 1.1.0 → 1.2.0

package/dist/{status-Dia0XTqG.mjs → status-DFI1Hfpg.mjs}

@@ -1,16 +1,17 @@
-import { t as getExecutor } from "./exec-bsN9MJXb.mjs";
-import { P as volumeRootFor, g as loadConfig, u as getConfigDir } from "./config-D7uu8Gbq.mjs";
-import { D as workspaceLogsDir } from "./state-IYEY-zi8.mjs";
-import { f as listWorktrees } from "./worktree-Dx3ZC5lS.mjs";
-import { a as findProjectRoot, c as projectShortcut } from "./project-COj6nzzh.mjs";
-import { a as isMetroRunning, i as resolveProjectMetro } from "./metro-B01H3EuD.mjs";
-import { S as readParked, v as POOL_SETTING_REMEDY, x as parkedMaxSetting } from "./remote-cache-DOi5-zLj.mjs";
+import { t as getExecutor } from "./exec-CyylIdq9.mjs";
+import { P as volumeRootFor, g as loadConfig, u as getConfigDir } from "./config-CMtIaTk9.mjs";
+import { D as workspaceLogsDir } from "./state-CZ-ER-8d.mjs";
+import { f as listWorktrees } from "./worktree-C79xx_kM.mjs";
+import { a as findProjectRoot, c as projectShortcut } from "./project-BBTVABUz.mjs";
+import { a as isMetroRunning, i as resolveProjectMetro } from "./metro-COslRK_F.mjs";
+import { S as readParked, v as POOL_SETTING_REMEDY, x as parkedMaxSetting } from "./remote-cache-DDmJ1Roq.mjs";
 import { a as formatElapsed, r as clockTime, u as plural } from "./command-output-8wHMEde0.mjs";
-import { l as listAllIosSims } from "./ios-BZxKPuqP.mjs";
-import { i as listLeaseFiles } from "./device-lease-D-G3SgVe.mjs";
+import { u as listAllIosSims } from "./ios-D1h1Di39.mjs";
+import { i as listLeaseFiles } from "./device-lease-Dpik41RY.mjs";
+import { N as resolveOwnedAvdSerial } from "./android-K63_0UfF.mjs";
 import { s as queryLogs } from "./logs-query-oqn47Ffx.mjs";
-import { t as resolveSupervisorTarget } from "./ownership-B9QIdQOw.mjs";
-import { i as readSupervisorState } from "./stop-BApyaF21.mjs";
+import { t as resolveSupervisorTarget } from "./ownership-CYOyqxUo.mjs";
+import { i as readSupervisorState } from "./stop-Btg770vV.mjs";
 import { existsSync } from "fs";
 import { totalmem } from "os";
 import chalk from "chalk";
@@ -23,21 +24,29 @@ function poolLine({ platform, parked, max }) {
 	const what = plural(parked, `parked ${platform === "ios" ? "iOS simulator" : "Android emulator"}`);
 	return max > 0 ? `pool: ${what} (max ${max})` : `pool: ${what} (parking off; gc --delete removes them)`;
 }
-function environmentState(project, { simsByUdid = {}, metro = null, worktrees = [], simsAvailable = true, supervisor = null, logs = null } = {}) {
+function environmentState(project, { simsByUdid = {}, metro = null, worktrees = [], simsAvailable = true, androidRuntime = null, supervisor = null, logs = null } = {}) {
 	const ios = project.platforms?.ios;
 	const android = project.platforms?.android;
 	const sim = ios ? simsByUdid[ios.deviceUdid] : null;
 	const simBooted = Boolean(sim && sim.state === "Booted");
 	const metroRunning = Boolean(metro?.metro);
-	const live = simBooted || metroRunning || Boolean(android?.serial);
+	const androidDetected = androidRuntime ? Boolean(androidRuntime.serial) : Boolean(android?.serial);
+	const live = simBooted || metroRunning || androidDetected;
 	let memoryMb = 0;
 	if (simBooted) memoryMb += IOS_SIM_MB;
-	if (android?.serial) memoryMb += ANDROID_EMULATOR_MB;
+	if (androidDetected) memoryMb += ANDROID_EMULATOR_MB;
 	if (metroRunning) memoryMb += METRO_MB;
 	const warnings = [];
 	if (metro?.notOurs) warnings.push(`port ${project.metroPort}: ${metro.notOurs}`);
 	if (ios && !sim && simsAvailable) warnings.push(`recorded sim ${ios.deviceUdid} no longer exists`);
 	if (simBooted && project.metroPort && !metroRunning) warnings.push("simulator is booted with no Metro serving it");
+	if (androidRuntime && android?.avdName) {
+		const recordedSerial = android.consolePort ? `emulator-${android.consolePort}` : android.serial;
+		if (androidRuntime.serial && recordedSerial && androidRuntime.serial !== recordedSerial) warnings.push(`owned AVD ${android.avdName} changed serial (${recordedSerial} -> ${androidRuntime.serial}); rerun your \`stim android\` command in this workspace to restore Metro forwarding, then reopen agent-device on ${androidRuntime.serial}`);
+		if (androidRuntime.state === "missing") warnings.push(`recorded AVD ${android.avdName} no longer exists`);
+		if (androidRuntime.state === "not-detected") warnings.push(`owned AVD ${android.avdName} is not detected by adb; rerun your \`stim android\` command in this workspace to reconnect`);
+		if (androidRuntime.error) warnings.push(`could not check owned AVD ${android.avdName}: ${androidRuntime.error}`);
+	}
 	if (supervisor && supervisor.alive === false) warnings.push(`stale supervisor record for ${project.__path}`);
 	return {
 		path: project.__path,
@@ -53,7 +62,11 @@ function environmentState(project, { simsByUdid = {}, metro = null, worktrees =
 		android: android ? {
 			name: android.avdName ?? android.serial,
 			owned: Boolean(android.owned),
-			physical: Boolean(android.serial && !android.avdName)
+			physical: Boolean(android.serial && !android.avdName),
+			...androidRuntime ? {
+				serial: androidRuntime.serial,
+				state: androidRuntime.state
+			} : {}
 		} : null,
 		metro: project.metroPort ? {
 			port: project.metroPort,
@@ -191,6 +204,7 @@ function statusCommand(program) {
 				metro,
 				worktrees,
 				simsAvailable,
+				androidRuntime: proj.platforms?.android?.owned && proj.platforms.android.avdName ? readAndroidRuntime(proj.platforms.android.avdName) : null,
 				supervisor,
 				logs: logFacts(path)
 			}));
@@ -267,7 +281,8 @@ function statusCommand(program) {
 			}
 			if (state.android) {
 				const kind = state.android.physical ? chalk.dim("(physical)") : chalk.dim("(emulator)");
-				console.log(`  android: ${chalk.cyan(state.android.name)} ${kind}${state.android.owned ? chalk.dim(" (owned)") : ""}`);
+				const observed = state.android.state ? ` ${state.android.state}${state.android.serial ? ` (${state.android.serial})` : ""}` : "";
+				console.log(`  android: ${chalk.cyan(state.android.name)} ${kind}${observed}${state.android.owned ? chalk.dim(" (owned)") : ""}`);
 			}
 			for (const w of state.warnings) console.log(chalk.yellow(`  ! ${w}`));
 		}
@@ -297,6 +312,21 @@ function statusCommand(program) {
 		if (cap.overCapacity) console.log(chalk.yellow("Over comfortable capacity. A machine that swaps is slower than one working in sequence -- release one before starting another."));
 	});
 }
+function readAndroidRuntime(avdName) {
+	try {
+		const resolved = resolveOwnedAvdSerial(avdName, { timeoutMs: 5e3 });
+		return {
+			serial: resolved.serial ?? null,
+			state: resolved.serial ? "detected" : resolved.missing ? "missing" : resolved.notRunning ? "not-detected" : "unknown"
+		};
+	} catch (error) {
+		return {
+			serial: null,
+			state: "unknown",
+			error: String(error?.message || error).split("\n")[0]
+		};
+	}
+}
 function readVolumes(projectPath) {
 	const roots = [.../* @__PURE__ */ new Set([
 		"/",

package/dist/{stop-D6o5zAdm.mjs → stop-B7DR4awK.mjs}

@@ -1,3 +1,3 @@
-import { t as resolveSupervisorTarget } from "./ownership-B9QIdQOw.mjs";
-import { a as resolveCollectorTargets, i as readSupervisorState, n as clearSupervisorState, o as runStop, r as readCollectorState, s as stopCommand, t as clearCollectorState } from "./stop-BApyaF21.mjs";
+import { t as resolveSupervisorTarget } from "./ownership-CYOyqxUo.mjs";
+import { a as resolveCollectorTargets, i as readSupervisorState, n as clearSupervisorState, o as runStop, r as readCollectorState, s as stopCommand, t as clearCollectorState } from "./stop-Btg770vV.mjs";
 export { clearCollectorState, clearSupervisorState, stopCommand as default, readCollectorState, readSupervisorState, resolveCollectorTargets, resolveSupervisorTarget, runStop };

package/dist/{stop-BApyaF21.mjs → stop-Btg770vV.mjs}

@@ -1,13 +1,13 @@
-import { C as withConfigLock, D as sameProcessRecord, E as inspectProcessIdentity, O as waitForProcessExit, S as upsertProject, a as clearSupervisor, f as getProject } from "./config-D7uu8Gbq.mjs";
-import { _ as writeWorkspaceState, a as clearRemoteSession, c as readMetroTunnel, i as clearManagedMetroTunnel, m as withWorkspaceStateLock, o as clearWorkspaceStateKeys, p as readWorkspaceState, s as clearWorkspaceSupervisor, u as readRemoteSession } from "./state-IYEY-zi8.mjs";
-import { a as findProjectRoot } from "./project-COj6nzzh.mjs";
-import { i as resolveProjectMetro, n as killMetroTree, r as pidExists } from "./metro-B01H3EuD.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-D8HmSv2E.mjs";
-import { d as resolveEasCliBin, h as teardownOwnedIosSim, m as teardownOwnedAvd } from "./remote-cache-DOi5-zLj.mjs";
+import { C as withConfigLock, D as sameProcessRecord, E as inspectProcessIdentity, O as waitForProcessExit, S as upsertProject, a as clearSupervisor, f as getProject } from "./config-CMtIaTk9.mjs";
+import { _ as writeWorkspaceState, a as clearRemoteSession, c as readMetroTunnel, i as clearManagedMetroTunnel, m as withWorkspaceStateLock, o as clearWorkspaceStateKeys, p as readWorkspaceState, s as clearWorkspaceSupervisor, u as readRemoteSession } from "./state-CZ-ER-8d.mjs";
+import { a as findProjectRoot } from "./project-BBTVABUz.mjs";
+import { i as resolveProjectMetro, n as killMetroTree, r as pidExists } from "./metro-COslRK_F.mjs";
+import { n as verifyCollectorOwnership } from "./ownership-CGPart6T.mjs";
+import { d as resolveEasCliBin, h as teardownOwnedIosSim, m as teardownOwnedAvd } from "./remote-cache-DDmJ1Roq.mjs";
 import { f as releasedLeaseFact, l as phaseLine, u as plural } from "./command-output-8wHMEde0.mjs";
-import { l as releaseWorkspaceLeases } from "./device-lease-D-G3SgVe.mjs";
-import { i as endRecordedSession } from "./device-remote-CCgkG82J.mjs";
-import { r as stopTunnel, t as resolveSupervisorTarget } from "./ownership-B9QIdQOw.mjs";
+import { l as releaseWorkspaceLeases } from "./device-lease-Dpik41RY.mjs";
+import { i as endRecordedSession } from "./device-remote-E81KAdXf.mjs";
+import { r as stopTunnel, t as resolveSupervisorTarget } from "./ownership-CYOyqxUo.mjs";
 import chalk from "chalk";
 //#region src/commands/stop.ts
 const DEFAULT_WAIT_MS = 1e4;

package/dist/supervisor-run.mjs

@@ -1,7 +1,7 @@
-import { T as captureProcessToken, a as clearSupervisor, x as setSupervisor } from "./config-D7uu8Gbq.mjs";
+import { T as captureProcessToken, a as clearSupervisor, x as setSupervisor } from "./config-CMtIaTk9.mjs";
 import { r as createNdjsonWriter } from "./ndjson-DcAtEx_K.mjs";
-import { D as workspaceLogsDir, _ as writeWorkspaceState, h as writePidFile, l as readPidFile, m as withWorkspaceStateLock, n as MODE_EXPO, p as readWorkspaceState, r as clearExpoMetroTunnel, s as clearWorkspaceSupervisor, t as MODE_BARE } from "./state-IYEY-zi8.mjs";
-import { i as detectIsExpo } from "./project-COj6nzzh.mjs";
+import { D as workspaceLogsDir, _ as writeWorkspaceState, h as writePidFile, l as readPidFile, m as withWorkspaceStateLock, n as MODE_EXPO, p as readWorkspaceState, r as clearExpoMetroTunnel, s as clearWorkspaceSupervisor, t as MODE_BARE } from "./state-CZ-ER-8d.mjs";
+import { i as detectIsExpo } from "./project-BBTVABUz.mjs";
 import { t as describeError } from "./errors-B6W7FkxQ.mjs";
 import { existsSync, realpathSync } from "node:fs";
 import { isAbsolute, join, resolve } from "node:path";
@@ -97,7 +97,7 @@ async function runSupervisor({ root, port, tunnel = false, isExpo = detectIsExpo
 	};
 	let server;
 	try {
-		server = await (mode === "expo-child" ? startExpo || (await import("./server-expo-rb0k-0w7.mjs")).startExpoServer : startBare || (await import("./server-bare-BYHqEeyw.mjs")).startBareServer)({
+		server = await (mode === "expo-child" ? startExpo || (await import("./server-expo-Drd7ksHu.mjs")).startExpoServer : startBare || (await import("./server-bare-DEk37Mz2.mjs")).startBareServer)({
 			root,
 			port,
 			logsDir,

package/dist/{workspace-process-lock-CxOO9-pf.mjs → workspace-process-lock-BKfdys1q.mjs}

@@ -1,4 +1,4 @@
-import { f as releaseClaim, h as tryAcquireClaim } from "./ownership-claim-CeJLEpjD.mjs";
+import { f as releaseClaim, h as tryAcquireClaim } from "./ownership-claim-7zRxxTfZ.mjs";
 import { join } from "node:path";
 //#region src/engine/workspace-process-lock.ts
 const DEFAULT_WAIT_MS = 6e4;

package/dist/{worktree-DxEmUI_n.mjs → worktree-BPTbI-LN.mjs}

@@ -1,17 +1,17 @@
-import { t as getExecutor } from "./exec-bsN9MJXb.mjs";
-import { S as upsertProject, f as getProject, g as loadConfig, h as isPathPrefix, u as getConfigDir, v as removeProject, w as captureProcessIdentity } from "./config-D7uu8Gbq.mjs";
-import { c as readMetroTunnel, u as readRemoteSession } from "./state-IYEY-zi8.mjs";
-import { _ as resolveFullRef, b as warmWorktreePaths, c as hasRemote, d as isPodInstallChurn, f as listWorktrees, h as removeWorktree, i as depsOutOfSync, l as hasUncommittedWork, m as readWorktreeExclude, n as cloneIgnoredEntries, o as dirtyPaths, p as podsOutOfSync, r as deleteBranch, s as gitCommonDir, t as branchExists, u as isMainWorkingTree, v as restoreFile, y as unpushedCommits } from "./worktree-Dx3ZC5lS.mjs";
-import { a as findProjectRoot } from "./project-COj6nzzh.mjs";
-import { v as POOL_SETTING_REMEDY, x as parkedMaxSetting } from "./remote-cache-DOi5-zLj.mjs";
-import { F as unknownSettingKeys, M as settingShapeErrors, a as SETTING_SHAPE_REMEDY, k as resolveSettings } from "./settings-BSwrY4FZ.mjs";
+import { t as getExecutor } from "./exec-CyylIdq9.mjs";
+import { S as upsertProject, f as getProject, g as loadConfig, h as isPathPrefix, u as getConfigDir, v as removeProject, w as captureProcessIdentity } from "./config-CMtIaTk9.mjs";
+import { c as readMetroTunnel, u as readRemoteSession } from "./state-CZ-ER-8d.mjs";
+import { _ as resolveFullRef, b as warmWorktreePaths, c as hasRemote, d as isPodInstallChurn, f as listWorktrees, h as removeWorktree, i as depsOutOfSync, l as hasUncommittedWork, m as readWorktreeExclude, n as cloneIgnoredEntries, o as dirtyPaths, p as podsOutOfSync, r as deleteBranch, s as gitCommonDir, t as branchExists, u as isMainWorkingTree, v as restoreFile, y as unpushedCommits } from "./worktree-C79xx_kM.mjs";
+import { a as findProjectRoot } from "./project-BBTVABUz.mjs";
+import { v as POOL_SETTING_REMEDY, x as parkedMaxSetting } from "./remote-cache-DDmJ1Roq.mjs";
+import { A as resolveSettings, I as unknownSettingKeys, N as settingShapeErrors, a as SETTING_SHAPE_REMEDY } from "./settings-DwU1_U_q.mjs";
 import { a as formatElapsed, f as releasedLeaseFact, i as formatDuration, l as phaseLine, m as shortUdid, u as plural } from "./command-output-8wHMEde0.mjs";
-import { a as clearClaimChild, c as isClaimUnavailable, d as readClaimSet, f as releaseClaim, h as tryAcquireClaim, i as claimRemoveCommand, l as markClaimChildPending, m as settleClaim, p as setClaimChild, r as claimFailure, s as isClaimRefusal, u as processGroupAlive } from "./ownership-claim-CeJLEpjD.mjs";
-import { g as podInstallCommand, r as HEARTBEAT_INTERVAL_MS } from "./xcode-CDB6fytw.mjs";
-import { a as installedNpmTreeIsValid, i as hasInstalledDependencies, o as locallyKnownUpstream, t as dependencyState } from "./doctor-DlVxTtMq.mjs";
-import { c as withManagedTunnelRemovalLock, o as withManagedRemoteWorktreeRemovalLock } from "./ownership-B9QIdQOw.mjs";
-import { n as reclaimProject } from "./reclaim-BPvN2HlP.mjs";
-import { a as runPodInstall, i as runCaptured, n as podsAreStale, r as readPodState, t as DEPS_ERROR } from "./deps-64wVnpZc.mjs";
+import { a as clearClaimChild, c as isClaimUnavailable, d as readClaimSet, f as releaseClaim, h as tryAcquireClaim, i as claimRemoveCommand, l as markClaimChildPending, m as settleClaim, p as setClaimChild, r as claimFailure, s as isClaimRefusal, u as processGroupAlive } from "./ownership-claim-7zRxxTfZ.mjs";
+import { g as podInstallCommand, r as HEARTBEAT_INTERVAL_MS } from "./xcode-DeKCribl.mjs";
+import { a as installedNpmTreeIsValid, i as hasInstalledDependencies, o as locallyKnownUpstream, t as dependencyState } from "./doctor-CqPeMsSm.mjs";
+import { c as withManagedTunnelRemovalLock, o as withManagedRemoteWorktreeRemovalLock } from "./ownership-CYOyqxUo.mjs";
+import { n as reclaimProject } from "./reclaim-C5Jmuahx.mjs";
+import { a as runPodInstall, i as runCaptured, n as podsAreStale, r as readPodState, t as DEPS_ERROR } from "./deps-BLBsTNDS.mjs";
 import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { createHash, randomUUID } from "node:crypto";
 import { join, relative } from "node:path";
@@ -54,11 +54,11 @@ function asHolder(holder) {
 	};
 }
 function waitingLine(holder, elapsedMs) {
-	return phaseLine("lock", `waiting ${formatElapsed(elapsedMs)} for ${warmCommand(holder.phase)} (pid ${holder.pid})`);
+	return phaseLine("lock", `waiting ${formatElapsed(elapsedMs)} for ${warmCommand(holder.phase)} (pid ${holder.pid}) -- stim guide lifecycle options`);
 }
 function warmClaimAcquiredLine(wait) {
 	if (!wait.holder || wait.waitedMs <= 0) return phaseLine("lock", "acquired");
-	return phaseLine("lock", `acquired (waited ${formatElapsed(wait.waitedMs)} for ${warmCommand(wait.holder.phase)} pid ${wait.holder.pid})`);
+	return phaseLine("lock", `acquired (waited ${formatElapsed(wait.waitedMs)} for ${warmCommand(wait.holder.phase)} pid ${wait.holder.pid}) -- stim guide lifecycle options`);
 }
 function warmClaimUnavailableLine(reason) {
 	return phaseLine("lock", `unavailable (${reason}); copying without it`);
@@ -109,7 +109,7 @@ function warmClaimBlockedRefusal(blocker) {
 	return `Refusing to copy past a claim Stim cannot resolve. If nothing is warming, remove it and run warm again:\n  ${claimRemoveCommand(blocker.path)}`;
 }
 function installerWaitingLine(pid, elapsedMs) {
-	return phaseLine("lock", `waiting on the install this refresh spawned (pid ${pid}, ${formatElapsed(elapsedMs)} elapsed)`);
+	return phaseLine("lock", `waiting on the install this refresh spawned (pid ${pid}, ${formatElapsed(elapsedMs)} elapsed) -- stim guide lifecycle options`);
 }
 function installerUnrecordedLine(reason) {
 	return phaseLine("lock", `could not record the install this refresh spawned (${reason}); holding the claim here until it exits`);

package/dist/{worktree-Dx3ZC5lS.mjs → worktree-C79xx_kM.mjs}

@@ -1,5 +1,5 @@
-import { t as getExecutor } from "./exec-bsN9MJXb.mjs";
-import { g as loadConfig, u as getConfigDir } from "./config-D7uu8Gbq.mjs";
+import { t as getExecutor } from "./exec-CyylIdq9.mjs";
+import { g as loadConfig, u as getConfigDir } from "./config-CMtIaTk9.mjs";
 import { accessSync, chmodSync, constants, lstatSync, mkdirSync, mkdtempSync, readdirSync, realpathSync, rmSync, statSync } from "node:fs";
 import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { chmodSync as chmodSync$1, existsSync as existsSync$1, lstatSync as lstatSync$1, mkdirSync as mkdirSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, realpathSync as realpathSync$1, utimesSync } from "fs";
@@ -85,7 +85,11 @@ function removeTemporaryEntry(path) {
 }
 //#endregion
 //#region src/worktree.ts
-const CARRY_SKIP_BASENAMES = /* @__PURE__ */ new Set([".DerivedData"]);
+const CARRY_SKIP_BASENAMES = /* @__PURE__ */ new Set([
+	".DerivedData",
+	".DS_Store",
+	".idea"
+]);
 function isCarrySkipped(rel) {
 	return /(^|\/)android\/build\/generated\/autolinking(\/|$)/.test(rel) || String(rel).split("/").some((seg) => CARRY_SKIP_BASENAMES.has(seg));
 }

package/dist/{xcode-CDB6fytw.mjs → xcode-DeKCribl.mjs}

@@ -1,23 +1,24 @@
-import { t as getExecutor } from "./exec-bsN9MJXb.mjs";
-import { C as withConfigLock, _ as releaseAndroidConsolePort, b as setDevice, g as loadConfig, i as clearDevice, t as allConsolePortsAndSerials, u as getConfigDir, y as saveConfig } from "./config-D7uu8Gbq.mjs";
-import { r as register } from "./cache-manifest-oeH18ERr.mjs";
-import { E as workspaceId, S as sharedCompilationCache, w as workspaceDerivedData } from "./state-IYEY-zi8.mjs";
-import { s as ownedDeviceLabel } from "./project-COj6nzzh.mjs";
+import { t as getExecutor } from "./exec-CyylIdq9.mjs";
+import { C as withConfigLock, E as inspectProcessIdentity, _ as releaseAndroidConsolePort, b as setDevice, g as loadConfig, i as clearDevice, t as allConsolePortsAndSerials, u as getConfigDir, w as captureProcessIdentity, y as saveConfig } from "./config-CMtIaTk9.mjs";
+import { r as register } from "./cache-manifest-Cu4_Znw9.mjs";
+import { E as workspaceId, S as sharedCompilationCache, w as workspaceDerivedData } from "./state-CZ-ER-8d.mjs";
+import { s as ownedDeviceLabel } from "./project-BBTVABUz.mjs";
 import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-C7IlIzd7.mjs";
-import { r as pidExists } from "./metro-B01H3EuD.mjs";
-import { C as selectParked, S as readParked, _ as teardownParkedIosSim, b as dropParked, g as teardownParkedAvd, m as teardownOwnedAvd, x as parkedMaxSetting, y as adoptParked } from "./remote-cache-DOi5-zLj.mjs";
-import { H as resolveOptimizations, l as androidDataPartitionSizeGbSetting, o as androidAvdConfigSetting, v as iosSimSlimProfileSetting } from "./settings-BSwrY4FZ.mjs";
+import { r as pidExists } from "./metro-COslRK_F.mjs";
+import { C as selectParked, S as readParked, _ as teardownParkedIosSim, b as dropParked, g as teardownParkedAvd, m as teardownOwnedAvd, x as parkedMaxSetting, y as adoptParked } from "./remote-cache-DDmJ1Roq.mjs";
+import { U as resolveOptimizations, l as androidDataPartitionSizeGbSetting, o as androidAvdConfigSetting, v as iosSimSlimProfileSetting } from "./settings-DwU1_U_q.mjs";
 import { a as formatElapsed, l as phaseLine } from "./command-output-8wHMEde0.mjs";
-import { _ as resetIosKeychain, b as resolveOwnedIosSim, c as iosRuntimeMatches, g as renameIosSim, h as parseRuntimeVersion, i as createOwnedIosSim, l as listAllIosSims, n as bootIosSim, p as ownedSimName, u as listIosDeviceTypes, v as resetIosPrivacy, y as resolveIosCreation } from "./ios-BZxKPuqP.mjs";
-import { A as resolveOwnedAvdSerial, C as ownedAvdMatchesConfiguration, D as pickDefaultSystemImage, P as waitForBoot, T as ownedAvdSystemImage, _ as listAdbDevices, c as bootAndroidEmulator, g as getAvdNameForSerial, l as configureNewOwnedAvd, o as assertOwnedAvdStopped, s as avdPoolConfiguration, u as createOwnedAvd, v as listAvds, w as ownedAvdName, x as nextConsolePort, y as listInstalledSystemImages } from "./android-xmyGBNy5.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-CxOO9-pf.mjs";
-import { t as cleanLine } from "./server-expo-BEMr_m6p.mjs";
+import { E as readHostMemoryPressure, T as hostMemoryPressureAdvice, _ as renameIosSim, b as resolveIosCreation, c as iosRuntimeMatches, d as listIosDeviceTypes, g as parseRuntimeVersion, i as createOwnedIosSim, l as iosSimulatorFailureAdvice, m as ownedSimName, n as bootIosSim, u as listAllIosSims, v as resetIosKeychain, x as resolveOwnedIosSim, y as resetIosPrivacy } from "./ios-D1h1Di39.mjs";
+import { f as releaseClaim, h as tryAcquireClaim, i as claimRemoveCommand, l as markClaimChildPending, n as ClaimRefusedError, p as setClaimChild, u as processGroupAlive } from "./ownership-claim-7zRxxTfZ.mjs";
+import { A as pickDefaultSystemImage, D as ownedAvdName, E as ownedAvdMatchesConfiguration, L as waitForBoot, N as resolveOwnedAvdSerial, O as ownedAvdSystemImage, b as listAvds, c as avdPoolConfiguration, d as configureNewOwnedAvd, f as createOwnedAvd, o as assertOwnedAvdStopped, u as bootAndroidEmulator, v as getAvdNameForSerial, w as nextConsolePort, x as listInstalledSystemImages, y as listAdbDevices } from "./android-K63_0UfF.mjs";
+import { t as withWorkspaceProcessLock } from "./workspace-process-lock-BKfdys1q.mjs";
+import { t as cleanLine } from "./server-expo-C3ktAwUG.mjs";
 import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { createHash, randomUUID } from "node:crypto";
 import { basename, isAbsolute, join, relative, resolve, sep } from "node:path";
 import chalk from "chalk";
 //#region src/engine/simslim.ts
-async function reconcileSimSlim({ udid, profile, previouslyManaged = false, out = () => {}, spawn }) {
+async function reconcileSimSlim({ udid, profile, previouslyManaged = false, out = () => {}, spawn, timeoutMs = 72e4, cleanupMs = 1e4 }) {
 	if (!profile && !previouslyManaged) return {
 		managed: false,
 		profile: null
@@ -39,25 +40,107 @@ async function reconcileSimSlim({ udid, profile, previouslyManaged = false, out
 	};
 	const stdout = createLineReader(onLine);
 	const stderr = createLineReader(onLine);
+	const root = join(getConfigDir(), "simslim-locks", `${encodeURIComponent(udid.toLowerCase())}.lock`);
+	const label = `SimSlim for ${udid}`;
+	const attempt = tryAcquireClaim({
+		root,
+		mode: "exclusive",
+		label
+	});
+	if (attempt.pending) releaseClaim(attempt.pending);
+	const claim = attempt.acquired;
+	if (!claim) throw new ClaimRefusedError({
+		root,
+		claimPath: attempt.held?.path ?? root,
+		label,
+		reason: "another SimSlim operation is still using this simulator"
+	});
 	let child;
+	let result;
+	let identity;
+	let cancellation;
+	const stopGroup = () => {
+		if (child?.pid !== void 0 && identity && inspectProcessIdentity(identity) === "same") try {
+			process.kill(-child.pid, "SIGKILL");
+		} catch {}
+	};
+	const cancel = (signal) => {
+		cancellation ??= signal;
+		stopGroup();
+	};
+	const onInterrupt = () => cancel("SIGINT");
+	const onTerminate = () => cancel("SIGTERM");
+	const groupAlive = () => child?.pid !== void 0 && processGroupAlive(child.pid);
+	const settled = () => result !== void 0 && !groupAlive();
+	const waitUntil = async (deadline, cancellable = false) => {
+		while (!settled() && Date.now() < deadline) {
+			if (cancellable && cancellation) break;
+			await new Promise((resolve) => setTimeout(resolve, Math.min(50, deadline - Date.now())));
+		}
+		return settled();
+	};
+	process.on("SIGINT", onInterrupt);
+	process.on("SIGTERM", onTerminate);
+	process.on("exit", stopGroup);
 	try {
-		child = (spawn ?? ((cmd, childArgs, opts) => getExecutor().spawn(cmd, childArgs, opts)))("simslim", args, { stdio: [
-			"ignore",
-			"pipe",
-			"pipe"
-		] });
-	} catch (error) {
-		throw simslimLaunchError(error);
+		markClaimChildPending(claim);
+		try {
+			child = (spawn ?? ((cmd, childArgs, opts) => getExecutor().spawn(cmd, childArgs, opts)))("simslim", args, {
+				stdio: [
+					"ignore",
+					"pipe",
+					"pipe"
+				],
+				detached: true
+			});
+		} catch (error) {
+			throw simslimLaunchError(error);
+		}
+		child.stdout?.on("data", (chunk) => stdout.push(chunk));
+		child.stderr?.on("data", (chunk) => stderr.push(chunk));
+		waitForChild(child).then((value) => {
+			result = value;
+		});
+		if (child.pid !== void 0) {
+			const captured = captureProcessIdentity(child.pid);
+			if (captured.ok) {
+				identity = {
+					pid: child.pid,
+					processToken: captured.token
+				};
+				try {
+					setClaimChild(claim, identity);
+				} catch {}
+			}
+		}
+		const completed = await waitUntil(Date.now() + timeoutMs, true);
+		if (cancellation || !completed) {
+			stopGroup();
+			const stopped = await waitUntil(Date.now() + cleanupMs);
+			const detail = lines.length ? ` ${lines.join(" | ")}` : "";
+			const recovery = stopped ? "Its process group has stopped. Retry stim ios to reconcile the retained simulator settings." : `Its process group could not be confirmed stopped. The claim remains at ${claim.path}. Inspect the SimSlim process group ${child.pid ?? "unknown"} before retrying. Only when nothing is using it, remove the claim: ${claimRemoveCommand(claim.path)}`;
+			const message = `SimSlim ${action} ${cancellation ? `interrupted by ${cancellation}` : `exceeded ${Math.round(timeoutMs / 1e3)}s`}. ${recovery}${detail}`;
+			if (cancellation) out(message);
+			throw Object.assign(new Error(message), { code: cancellation ? "EINTR" : "ETIMEDOUT" });
+		}
+	} finally {
+		if (!child || settled()) releaseClaim(claim);
+		else {
+			child.stdout?.destroy?.();
+			child.stderr?.destroy?.();
+			child.unref();
+		}
+		process.off("SIGINT", onInterrupt);
+		process.off("SIGTERM", onTerminate);
+		process.off("exit", stopGroup);
+		if (cancellation) process.exit(cancellation === "SIGINT" ? 130 : 143);
 	}
-	child.stdout?.on("data", (chunk) => stdout.push(chunk));
-	child.stderr?.on("data", (chunk) => stderr.push(chunk));
-	const result = await waitForChild(child);
 	stdout.flush();
 	stderr.flush();
-	if (result.error) throw simslimLaunchError(result.error);
-	if (result.code !== 0) {
+	if (result?.error) throw simslimLaunchError(result.error);
+	if (result?.code !== 0) {
 		const detail = lines.length ? ` ${lines.join(" | ")}` : "";
-		throw new Error(`SimSlim ${action} failed with exit code ${result.code ?? "unknown"}.${detail}`);
+		throw new Error(`SimSlim ${action} failed with exit code ${result?.code ?? "unknown"}.${detail}`);
 	}
 	return {
 		managed: Boolean(profile),
@@ -118,6 +201,8 @@ async function ensureOwnedDevice({ platform, project, projectPath, settingsRoot
 	});
 }
 async function ensureOwnedIosDevice({ record, projectPath, settingsRoot, label, settings, flags, note, out, reconcileIosSimulator }) {
+	const memoryAdvice = hostMemoryPressureAdvice(readHostMemoryPressure());
+	if (memoryAdvice) out(chalk.yellow(phaseLine("memory", memoryAdvice)));
 	const simslimProfile = iosSimSlimProfileSetting(settings, settingsRoot);
 	if (record?.deviceUdid) {
 		if (record.owned) {
@@ -361,11 +446,21 @@ function findOtherProjectOwningAvd(avdName, projectPath) {
 	}
 	return null;
 }
+var AvdRecoveryError = class extends Error {
+	remedy;
+	constructor(message, remedy, cause) {
+		super(message, { cause });
+		this.remedy = remedy;
+	}
+};
 async function ensureOwnedAndroidDevice({ record, projectPath, settingsRoot, label, settings, flags, note, out, logFile, alive, configureAvd, teardownAvd }) {
 	const avdConfig = androidAvdConfigSetting(settings, settingsRoot);
 	const configuration = avdPoolConfiguration(androidDataPartitionSizeGbSetting(settings), avdConfig);
 	if (record?.setupIncomplete && record.avdName) {
-		const cleanup = teardownAvd(record.avdName, { del: true });
+		const cleanup = teardownAvd(record.avdName, {
+			del: true,
+			owner: { projectPath }
+		});
 		if (cleanup.status === "failed" || cleanup.status === "skipped") throw new Error(`Owned AVD ${record.avdName} has incomplete setup and could not be deleted (${cleanup.reason || cleanup.status}). Fix the cause, then retry; Stim kept the device record for cleanup.`);
 		clearDevice(projectPath, "android");
 		record = null;
@@ -376,6 +471,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, settingsRoot, lab
 			if (resolved.notOwned) note(chalk.yellow(`Note: recorded AVD ${record.avdName} is not Stim-owned by name -- creating a fresh owned AVD instead of reusing it.`));
 			else if (resolved.serial) {
 				const consolePort = Number(resolved.serial.replace(/^emulator-/, ""));
+				if (record.consolePort && record.consolePort !== consolePort) out(phaseLine("device", `${record.avdName} changed serial (emulator-${record.consolePort} -> ${resolved.serial}); reconnecting this run, reopen agent-device on ${resolved.serial}`));
 				const updated = {
 					...record,
 					avdName: record.avdName,
@@ -421,7 +517,8 @@ async function ensureOwnedAndroidDevice({ record, projectPath, settingsRoot, lab
 			if (parked.deletionClaim !== void 0) continue;
 			const resolved = resolveOwnedAvdSerial(parked.name);
 			if (resolved.missing) {
-				dropParked("android", parked.udid);
+				const result = teardownParkedAvd(parked.name);
+				if (result.status === "failed") out(phaseLine("device", `kept ${parked.name}: ${result.reason}`));
 				continue;
 			}
 			if (resolved.notOwned || resolved.serial) continue;
@@ -484,28 +581,45 @@ async function ensureOwnedAndroidDevice({ record, projectPath, settingsRoot, lab
 	} catch (e) {
 		const message = String(e?.message || e);
 		const avdName = ownedAvdName(label);
-		if (message.includes("already exists") && listAvds().includes(avdName)) {
-			created = withConfigLock(() => {
-				if (readParked("android").some((entry) => entry.name === avdName)) throw new Error(`AVD ${avdName} was parked by another Stim run. Retry to adopt it safely.`, { cause: e });
-				const owner = findOtherProjectOwningAvd(avdName, projectPath);
-				if (owner) throw new Error(`AVD ${avdName} already exists and is owned by another project (${owner}). Retry to allocate a distinct owned emulator.`, { cause: e });
-				const current = loadConfig()?.projects?.[projectPath]?.platforms?.android;
-				if (current?.avdName) {
-					const state = current.setupIncomplete ? "has incomplete setup" : "was registered";
-					throw new Error(`AVD ${current.avdName} ${state} by another concurrent Stim run. Retry after that run finishes so the recorded device is resolved safely.`, { cause: e });
-				}
-				const result = {
-					avdName,
-					systemImage: ownedAvdSystemImage(avdName)
-				};
-				setDevice(projectPath, "android", {
-					avdName,
-					owned: true,
-					deviceName: avdName
+		if (message.includes("already exists")) {
+			try {
+				if (!listAvds().includes(avdName)) throw new AvdRecoveryError(`AVD ${avdName} already exists on disk but is not listed by the emulator. ${message}`, "Run `npx stim gc` to inspect orphaned owned AVDs, then `npx stim gc --delete` to reclaim those safe to delete. Retry `stim android` after cleanup; keep any AVD that GC cannot verify.", e);
+				created = withConfigLock(() => {
+					if (readParked("android").some((entry) => entry.name === avdName)) throw new Error(`AVD ${avdName} was parked by another Stim run. Retry to adopt it safely.`, { cause: e });
+					const owner = findOtherProjectOwningAvd(avdName, projectPath);
+					if (owner) throw new Error(`AVD ${avdName} already exists and is owned by another project (${owner}). Retry to allocate a distinct owned emulator.`, { cause: e });
+					const current = loadConfig()?.projects?.[projectPath]?.platforms?.android;
+					if (current?.avdName) {
+						const state = current.setupIncomplete ? "has incomplete setup" : "was registered";
+						throw new Error(`AVD ${current.avdName} ${state} by another concurrent Stim run. Retry after that run finishes so the recorded device is resolved safely.`, { cause: e });
+					}
+					const resolved = resolveOwnedAvdSerial(avdName);
+					if (resolved.missing || resolved.notOwned) throw new Error(`AVD ${avdName} could not be verified for recovery. Retry after checking its registration.`, { cause: e });
+					if (!resolved.serial) assertOwnedAvdStopped(avdName);
+					const recovered = {
+						avdName,
+						owned: true,
+						deviceName: avdName,
+						...resolved.serial ? { consolePort: Number(resolved.serial.replace(/^emulator-/, "")) } : {}
+					};
+					setDevice(projectPath, "android", recovered);
+					return {
+						...recovered,
+						systemImage: ownedAvdSystemImage(avdName),
+						serial: resolved.serial
+					};
 				});
-				return result;
-			});
+			} catch (error) {
+				if (error instanceof AvdRecoveryError) throw error;
+				throw new AvdRecoveryError(`Could not recover owned AVD ${avdName}: ${String(error?.message || error)}`, "Inspect `npx stim status` and `adb devices`. Wait for any other Stim run using this AVD to finish, then retry `stim android`. Keep the AVD and its process locks while its state is unverified.", error);
+			}
 			out(chalk.dim(phaseLine("device", `recovered ${avdName} (unrecorded from a prior run)`)));
+			if (created.serial) return {
+				...created,
+				owned: true,
+				deviceName: avdName,
+				created: false
+			};
 		} else throw e;
 	}
 	if (fresh) try {
@@ -514,7 +628,10 @@ async function ensureOwnedAndroidDevice({ record, projectPath, settingsRoot, lab
 			avdConfig
 		});
 	} catch (error) {
-		const cleanup = teardownAvd(created.avdName, { del: true });
+		const cleanup = teardownAvd(created.avdName, {
+			del: true,
+			owner: { projectPath }
+		});
 		const kept = cleanup.status === "failed" || cleanup.status === "skipped";
 		if (!kept) clearDevice(projectPath, "android");
 		const orphan = kept ? ` The owned AVD remains tracked for cleanup (${cleanup.reason || cleanup.status}); fix the cause, then retry or run \`stim gc --delete\`.` : "";
@@ -530,7 +647,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, settingsRoot, lab
 			logFile,
 			alive
 		}),
-		created: true,
+		created: fresh,
 		systemImage: created.systemImage
 	};
 }
@@ -716,6 +833,25 @@ async function ensureIosBooted({ device, timeoutMs, pollMs, out }) {
 		failed: true,
 		reason: "No iOS simulator is recorded for this project."
 	};
+	const ready = () => {
+		try {
+			getExecutor().runFile("xcrun", [
+				"simctl",
+				"spawn",
+				udid,
+				"/usr/bin/true"
+			], { timeoutMs: 3e4 });
+			return {
+				ok: true,
+				udid
+			};
+		} catch (error) {
+			return {
+				failed: true,
+				reason: `Simulator ${udid} failed its process-spawn readiness check: ${error?.message || error}. ${iosSimulatorFailureAdvice()}`
+			};
+		}
+	};
 	const booting = device?.booting;
 	if (booting?.udid === udid) {
 		try {
@@ -726,10 +862,7 @@ async function ensureIosBooted({ device, timeoutMs, pollMs, out }) {
 				reason: `Could not boot simulator ${udid}: ${e?.message || e}`
 			};
 		}
-		return {
-			ok: true,
-			udid
-		};
+		return ready();
 	}
 	let resolved;
 	try {
@@ -749,10 +882,7 @@ async function ensureIosBooted({ device, timeoutMs, pollMs, out }) {
 		reason: `Simulator ${udid} is now named "${resolved.notOwned}" and is not Stim-owned; refusing to boot it.`
 	};
 	const sim = resolved.sim;
-	if (sim.state === "Booted") return {
-		ok: true,
-		udid
-	};
+	if (sim.state === "Booted") return ready();
 	out(chalk.dim(phaseLine("device", `booting ${sim.name} (${udid})`)));
 	const bootDeadline = Date.now() + timeoutMs;
 	try {
@@ -770,10 +900,7 @@ async function ensureIosBooted({ device, timeoutMs, pollMs, out }) {
 		try {
 			state = listAllIosSims({ timeoutMs: 3e4 }).find((s) => s.udid === udid)?.state ?? null;
 		} catch {}
-		if (state === "Booted") return {
-			ok: true,
-			udid
-		};
+		if (state === "Booted") return ready();
 	}
 	return {
 		failed: true,
@@ -1702,4 +1829,4 @@ async function buildIos({ root, udid = null, logWriter, project = null, scheme =
 	};
 }
 //#endregion
-export { unknownIosDeviceTypeRefusal as C, unknownAndroidSystemImageRefusal as S, simslimIsOnPath as T, checkDeviceCapacity as _, ccacheEnabled as a, ensureOwnedDevice as b, discoverXcodeProject as c, resolveScheme as d, startBuildHeartbeat as f, podInstallCommand as g, bundlerPin as h, buildIos as i, readBundleExecutable as l, describeDiagnostic as m, COMPILATION_CACHE_UNAVAILABLE as n, compilationCacheActivityLine as o, tailLines as p, HEARTBEAT_INTERVAL_MS as r, detectXcodeMajor as s, COMPILATION_CACHE_NOT_RUN as t, readBundleId as u, clearIosAdoptionPending as v, unknownIosRuntimeRefusal as w, liveOwnedDeviceCount as x, ensureBooted as y };
+export { unknownAndroidSystemImageRefusal as C, simslimIsOnPath as E, liveOwnedDeviceCount as S, unknownIosRuntimeRefusal as T, AvdRecoveryError as _, ccacheEnabled as a, ensureBooted as b, discoverXcodeProject as c, resolveScheme as d, startBuildHeartbeat as f, podInstallCommand as g, bundlerPin as h, buildIos as i, readBundleExecutable as l, describeDiagnostic as m, COMPILATION_CACHE_UNAVAILABLE as n, compilationCacheActivityLine as o, tailLines as p, HEARTBEAT_INTERVAL_MS as r, detectXcodeMajor as s, COMPILATION_CACHE_NOT_RUN as t, readBundleId as u, checkDeviceCapacity as v, unknownIosDeviceTypeRefusal as w, ensureOwnedDevice as x, clearIosAdoptionPending as y };