stim 1.8.0 → 1.10.0

package/dist/status-Dr4fRkym.mjs

@@ -0,0 +1,216 @@
+import { H as projectDeviceSlots } from "./config-BEq0Qw_a.mjs";
+import { a as formatElapsed, o as formatLongDuration, r as clockTime, u as plural } from "./command-output-D5z2_bcF.mjs";
+import { sep } from "path";
+//#region src/status.ts
+const IOS_SIM_MB = 1500;
+const ANDROID_EMULATOR_MB = 2500;
+const METRO_MB = 700;
+function remoteDeviceState(record, ledger, root) {
+	if (!record) return null;
+	const claim = ledger.claims.get(record.sessionId);
+	return {
+		platform: record.platform,
+		backend: "eas",
+		sessionId: record.sessionId,
+		state: !ledger.safe ? "unknown" : claim?.workspaceRoot === root ? "claimed" : "unclaimed",
+		startedAt: record.startedAt,
+		webPreviewUrl: record.webPreviewUrl
+	};
+}
+function poolLine({ platform, parked, max }) {
+	if (parked <= 0) return null;
+	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, androidRuntime = null, androidRuntimes = {}, supervisor = null, logs = null, remote = null, idleStop = 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 androidDetected = androidRuntime ? Boolean(androidRuntime.serial) : Boolean(android?.serial);
+	let live = simBooted || metroRunning || androidDetected || Boolean(remote);
+	let memoryMb = 0;
+	if (simBooted) memoryMb += IOS_SIM_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}`);
+	const slots = [];
+	for (const { slot, platforms } of projectDeviceSlots(project).slice(1)) {
+		const deviceState = environmentState({
+			...project,
+			platforms,
+			deviceSlots: void 0
+		}, {
+			simsByUdid,
+			simsAvailable,
+			metro,
+			androidRuntime: androidRuntimes[slot]
+		});
+		slots.push({
+			slot,
+			ios: deviceState.ios,
+			android: deviceState.android
+		});
+		memoryMb += deviceState.memoryMb - (metroRunning ? METRO_MB : 0);
+		live ||= deviceState.live;
+		warnings.push(...deviceState.warnings.map((warning) => `${slot}: ${warning}`));
+	}
+	return {
+		path: project.__path,
+		...slots.length ? { slots } : {},
+		live,
+		memoryMb,
+		warnings,
+		ios: ios ? {
+			name: sim?.name ?? null,
+			udid: ios.deviceUdid,
+			owned: Boolean(ios.owned),
+			state: sim?.state ?? (simsAvailable ? "missing" : "unknown")
+		} : null,
+		android: android ? {
+			name: android.avdName ?? android.serial,
+			owned: Boolean(android.owned),
+			physical: Boolean(android.serial && !android.avdName),
+			...androidRuntime ? {
+				serial: androidRuntime.serial,
+				state: androidRuntime.state
+			} : {}
+		} : null,
+		metro: project.metroPort ? {
+			port: project.metroPort,
+			running: metroRunning,
+			pid: metro?.metro?.pid ?? null,
+			...idleStop && !metroRunning ? { idleStop } : {}
+		} : null,
+		supervisor: supervisor ? {
+			pid: supervisor.pid ?? null,
+			mode: supervisor.mode ?? null,
+			startedAt: supervisor.startedAt ?? null,
+			healthy: Boolean(supervisor.healthy)
+		} : null,
+		logs: logs ? {
+			dir: logs.dir,
+			errorsSinceMarker: logs.errorsSinceMarker ?? 0
+		} : null,
+		worktree: worktrees.find((w) => w.path === project.__path) ?? null,
+		remoteDevices: remote ? [remote] : []
+	};
+}
+function activityLabel(activity, now) {
+	if (!activity) return null;
+	if (activity.state === "driven") {
+		const since = Date.parse(activity.driver?.since ?? "");
+		const duration = Number.isFinite(since) ? ` for ${formatLongDuration(Math.max(0, now - since))}` : "";
+		return `driven by ${activity.driver?.tool ?? "an unknown tool"}${duration}`;
+	}
+	if (activity.state === "unknown") return `activity unknown (${activity.basis.join(", ")})`;
+	if (activity.state === "active") return "active";
+	const last = Date.parse(activity.lastActivityAt ?? "");
+	return Number.isFinite(last) ? `idle ${formatLongDuration(Math.max(0, now - last))}` : "idle (no recorded activity)";
+}
+function remoteDeviceLine(remote) {
+	const claim = remote.state === "claimed" ? "" : ` (${remote.state})`;
+	const watch = remote.webPreviewUrl ? ` -- watch: ${remote.webPreviewUrl}` : "";
+	return `remote ${remote.platform ?? "?"}: EAS session ${remote.sessionId} billable${claim}${watch}`;
+}
+function capacity(states, totalMemoryMb) {
+	const committedMb = states.reduce((n, s) => n + s.memoryMb, 0);
+	return {
+		liveCount: states.filter((s) => s.live).length,
+		committedMb,
+		totalMemoryMb,
+		overCapacity: Boolean(totalMemoryMb && committedMb > totalMemoryMb * .6)
+	};
+}
+function parseDfFree(output) {
+	const lines = String(output || "").trim().split("\n");
+	if (lines.length < 2) return null;
+	const lastLine = lines[lines.length - 1];
+	if (lastLine === void 0) return null;
+	const m = /\s(\d+)\s+(\d+)\s+(\d+)\s+(\d+)%/.exec(lastLine);
+	if (!m) return null;
+	const totalKb = Number(m[1]);
+	const availableKb = Number(m[3]);
+	if (!Number.isFinite(totalKb) || !Number.isFinite(availableKb) || totalKb <= 0) return null;
+	return {
+		availableMb: Math.round(availableKb / 1024),
+		totalMb: Math.round(totalKb / 1024)
+	};
+}
+function diskIsTight(disk) {
+	return Boolean(disk && disk.availableMb < 25600);
+}
+function formatSpace(mb) {
+	if (!Number.isFinite(mb)) return "?";
+	if (mb >= 1048576) return `${(mb / 1048576).toFixed(1)} TB`;
+	if (mb >= 1024) return `${Math.round(mb / 1024)} GB`;
+	return `${Math.round(mb)} MB`;
+}
+function diskLine(volumes) {
+	const usable = (volumes || []).filter((v) => Boolean(v && v.disk));
+	if (usable.length === 0) return null;
+	if (usable.length === 1) {
+		const first = usable[0];
+		if (!first) return null;
+		const { disk } = first;
+		return `${formatSpace(disk.availableMb)} free of ${formatSpace(disk.totalMb)} on disk.`;
+	}
+	return `${usable.map((v) => `${formatSpace(v.disk.availableMb)} free on ${v.volume}`).join(", ")}.`;
+}
+function tightVolumes(volumes) {
+	return (volumes || []).filter((v) => v && diskIsTight(v.disk));
+}
+function unprovisionedWorktrees(worktrees, projectPaths) {
+	return worktrees.filter((w) => {
+		const inside = w.path.endsWith(sep) ? w.path : w.path + sep;
+		return !projectPaths.some((p) => p === w.path || p.startsWith(inside));
+	});
+}
+function deviceLeaseStates(entries, { root, now }) {
+	return entries.map((entry) => {
+		const lease = entry.lease;
+		return {
+			path: entry.path,
+			platform: entry.platform,
+			...lease?.slot ? { slot: lease.slot } : {},
+			id: entry.id,
+			deviceName: lease?.deviceName ?? null,
+			holder: lease?.holder ?? null,
+			grantedAt: lease?.grantedAt ?? null,
+			expiresAt: lease?.expiresAt ?? null,
+			mine: Boolean(lease && root && lease.holder === root),
+			expired: Boolean(lease && Date.parse(lease.expiresAt) <= now),
+			parsed: Boolean(lease)
+		};
+	});
+}
+function deviceLeaseLines(states, now) {
+	if (states.length === 0) return [];
+	const lines = [`Device leases (${states.length}):`];
+	for (const state of states) {
+		const device = `${state.platform}${state.slot ? ` [${state.slot}]` : ""} ${state.id ?? state.path}${state.deviceName ? ` (${state.deviceName})` : ""}`;
+		if (!state.parsed || state.expiresAt === null) {
+			lines.push(`  ${device} -- unreadable lease file, so nothing may take the device: ${state.path}`);
+			continue;
+		}
+		const when = clockTime(state.expiresAt);
+		const remaining = Date.parse(state.expiresAt) - now;
+		const expiry = state.expired ? `expired at ${when}` : `until ${when} (${formatElapsed(remaining)} left)`;
+		lines.push(`  ${device} -- ${state.holder} ${expiry}${state.mine ? " [this workspace]" : ""}`);
+	}
+	return lines;
+}
+//#endregion
+export { diskLine as a, parseDfFree as c, remoteDeviceState as d, tightVolumes as f, deviceLeaseStates as i, poolLine as l, capacity as n, environmentState as o, unprovisionedWorktrees as p, deviceLeaseLines as r, formatSpace as s, activityLabel as t, remoteDeviceLine as u };

package/dist/{guide-status-Craq9z0t.mjs → stim-installations-CINXy_su.mjs}

@@ -1,6 +1,5 @@
-import { t as getExecutor } from "./exec-B29XNuhP.mjs";
-import { S as upsertProject, f as getProject, u as getConfigDir } from "./config-B7iyKWkL.mjs";
-import { accessSync, constants, mkdirSync, readFileSync, realpathSync, renameSync, statSync, unlinkSync, writeFileSync } from "node:fs";
+import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
+import { accessSync, constants, realpathSync, statSync } from "node:fs";
 import { delimiter, join, resolve } from "node:path";
 //#region src/diagnostics/stim-installations.ts
 const VERSION_OUTPUT_LIMIT = 4096;
@@ -150,122 +149,4 @@ async function inspectStimVersions(runningVersion, { pathValue = process.env.PAT
 	return analyzeStimVersions(runningVersion, canonicalPath(runningPath), installations);
 }
 //#endregion
-//#region src/guide-status.ts
-const DAY_MS = 864e5;
-const DOCTOR_STALE_MS = 7 * DAY_MS;
-const UPDATE_CHECK_INTERVAL_MS = DAY_MS;
-const UPDATE_CHECK_TIMEOUT_MS = 2e3;
-const LATEST_URL = "https://registry.npmjs.org/stim/latest";
-const PLATFORMS = ["ios", "android"];
-function recordDoctorRun(projectRoot, platform, version, now = /* @__PURE__ */ new Date()) {
-	const run = {
-		at: now.toISOString(),
-		version
-	};
-	try {
-		upsertProject(projectRoot, (existing) => {
-			const doctorRuns = { ...existing.doctorRuns };
-			for (const target of platform ? [platform] : PLATFORMS) doctorRuns[target] = run;
-			return { doctorRuns };
-		});
-	} catch {}
-}
-function doctorDueReason(record, running, now) {
-	const at = record ? Date.parse(record.at) : NaN;
-	if (!record || Number.isNaN(at)) return "never run";
-	if (record.version !== running) return `last run with stim ${record.version}`;
-	const age = now.getTime() - at;
-	if (age > DOCTOR_STALE_MS) return `last run ${Math.floor(age / DAY_MS)} days ago`;
-	return null;
-}
-function updateCacheFile() {
-	return join(getConfigDir(), "update-check.json");
-}
-function readUpdateCache() {
-	try {
-		const parsed = JSON.parse(readFileSync(updateCacheFile(), "utf-8"));
-		if (typeof parsed?.checkedAt !== "string") return null;
-		return {
-			checkedAt: parsed.checkedAt,
-			latest: typeof parsed.latest === "string" ? parsed.latest : null
-		};
-	} catch {
-		return null;
-	}
-}
-function writeUpdateCache(cache) {
-	const target = updateCacheFile();
-	const tmp = `${target}.${process.pid}.${Math.random().toString(36).slice(2)}.tmp`;
-	try {
-		mkdirSync(getConfigDir(), { recursive: true });
-		writeFileSync(tmp, `${JSON.stringify(cache)}\n`);
-		renameSync(tmp, target);
-	} catch {
-		try {
-			unlinkSync(tmp);
-		} catch {}
-	}
-}
-async function fetchLatest(fetchImpl) {
-	const res = await fetchImpl(LATEST_URL, { signal: AbortSignal.timeout(UPDATE_CHECK_TIMEOUT_MS) });
-	if (!res.ok) return null;
-	const body = await res.json();
-	return typeof body.version === "string" ? body.version : null;
-}
-async function checkForUpdate(running, { now = /* @__PURE__ */ new Date(), fetch: fetchImpl = fetch } = {}) {
-	if (process.env.STIM_NO_UPDATE_CHECK) return null;
-	const cached = readUpdateCache();
-	const checkedAt = cached ? Date.parse(cached.checkedAt) : NaN;
-	let latest = cached?.latest ?? null;
-	if (Number.isNaN(checkedAt) || now.getTime() - checkedAt > UPDATE_CHECK_INTERVAL_MS) {
-		try {
-			latest = await fetchLatest(fetchImpl);
-		} catch {
-			latest = null;
-		}
-		writeUpdateCache({
-			checkedAt: now.toISOString(),
-			latest
-		});
-	}
-	if (!latest) return null;
-	const comparison = compareStimVersions(latest, running);
-	return comparison !== null && comparison > 0 ? latest : null;
-}
-function renderGuideStatus({ running, doctor, latest }) {
-	const lines = [];
-	if (doctor.length) {
-		const named = doctor.map((due) => `${due.platform} (${due.reason})`).join(" and ");
-		const command = doctor.length === 1 ? `stim doctor --platform ${doctor[0]?.platform}` : "stim doctor";
-		lines.push(`  Doctor is due for ${named}.`, `  Run before native work:  ${command}`);
-	}
-	if (latest) lines.push(`  stim ${latest} is available (running ${running}):  npm install -g stim@latest`);
-	if (!lines.length) return null;
-	return ["STATUS", ...lines].join("\n");
-}
-async function guideStatus({ projectRoot, running, now = /* @__PURE__ */ new Date(), fetch: fetchImpl = fetch }) {
-	const doctor = [];
-	if (projectRoot) {
-		let runs = null;
-		try {
-			runs = getProject(projectRoot)?.doctorRuns ?? {};
-		} catch {}
-		if (runs) for (const platform of PLATFORMS) {
-			const reason = doctorDueReason(runs[platform], running, now);
-			if (reason) doctor.push({
-				platform,
-				reason
-			});
-		}
-	}
-	return renderGuideStatus({
-		running,
-		doctor,
-		latest: await checkForUpdate(running, {
-			now,
-			fetch: fetchImpl
-		})
-	});
-}
-//#endregion
-export { inspectStimVersions as i, recordDoctorRun as n, compareStimVersions as r, guideStatus as t };
+export { inspectStimVersions as n, compareStimVersions as t };

package/dist/{stop-C8JW6kKp.mjs → stop-Dj4pfmyv.mjs}

@@ -1,15 +1,13 @@
-import { B as validateDeviceSlot, C as withConfigLock, I as deviceSlotPlatforms, L as parseDeviceSlotKey, R as projectDeviceSlots, S as upsertProject, a as clearSupervisor, f as getProject, w as process_identity_exports } from "./config-B7iyKWkL.mjs";
-import { a as withWorkspaceStateLock, h as workspaceDir, n as clearWorkspaceStateKeys, o as writeWorkspaceState, r as readWorkspaceState } from "./workspace-state-BT5E3SA2.mjs";
-import { a as findProjectRoot } from "./project-DDZWf_16.mjs";
-import { a as clearRemoteSession, i as clearManagedMetroTunnel, l as readRemoteSession, o as clearWorkspaceSupervisor, s as readMetroTunnel } from "./state-DZobzxLW.mjs";
-import { a as resolveProjectMetro, i as pidExists, n as killMetroTree, o as signalProcessTree } from "./metro-C7bcJ0uo.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-Cp52QAK1.mjs";
-import { f as releasedLeaseFact, l as phaseLine, u as plural } from "./command-output-B3ycpsYv.mjs";
-import { S as resolveEasCliBin, n as teardownOwnedIosSim, t as teardownOwnedAvd } from "./teardown-BJqEzPo_.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-BYfZz_S-.mjs";
-import { l as releaseWorkspaceLeases } from "./device-lease-Ffz_M5t0.mjs";
-import { i as endRecordedSession } from "./device-remote-ByN8P6CB.mjs";
-import { r as stopTunnel, t as resolveSupervisorTarget } from "./ownership-wolE-0Do.mjs";
+import { B as parseDeviceSlotKey, D as process_identity_exports, H as projectDeviceSlots, T as withConfigLock, V as parseDeviceSlotOption, W as validateDeviceSlot, a as clearSupervisor, f as getProject, w as upsertProject, z as deviceSlotPlatforms } from "./config-BEq0Qw_a.mjs";
+import { O as workspaceDir, _ as withWorkspaceStateLock, c as signalProcessTree, i as pidExists, m as readWorkspaceState, p as clearWorkspaceStateKeys, s as resolveProjectMetro, t as killMetroTree, y as writeWorkspaceState } from "./metro-BWLOJ_Wr.mjs";
+import { o as findProjectRoot } from "./project-BXZzOABt.mjs";
+import { a as clearRemoteSession, i as clearManagedMetroTunnel, l as readRemoteSession, o as clearWorkspaceSupervisor, s as readMetroTunnel } from "./state-WGdIbi_d.mjs";
+import { t as withWorkspaceProcessLock } from "./workspace-process-lock-BXA96myD.mjs";
+import { f as refuseNoProject, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-D5z2_bcF.mjs";
+import { u as releaseWorkspaceLeases } from "./device-lease-CbEaIk7b.mjs";
+import { d as teardownOwnedAvd, f as teardownOwnedIosSim, i as stopTunnel, t as resolveSupervisorTarget } from "./ownership-DZjdx8Gq.mjs";
+import { n as verifyCollectorOwnership } from "./ownership-D2xbLVoz.mjs";
+import { i as endRecordedSession, z as resolveEasCliBin } from "./device-remote-Dy1jGj3U.mjs";
 import chalk from "chalk";
 //#region src/commands/stop.ts
 const DEFAULT_WAIT_MS = 1e4;
@@ -143,7 +141,7 @@ async function runStop(options) {
 	result.summary = summarize(root, result.outcomes, result.ok);
 	return result;
 }
-async function stopWorkspace({ root, project = void 0, state = void 0, collectors = void 0, signalCollector = (pid) => signalProcessTree(pid), verifyCollector = verifyCollectorOwnership, clearCollectors = clearCollectorState, isAlive = pidExists, killGroup = killMetroTree, inspectIdentity = process_identity_exports.inspectProcessIdentity, waitForDeath = void 0, waitMs = DEFAULT_WAIT_MS, resolveMetro = resolveProjectMetro, teardownIos = teardownOwnedIosSim, teardownAvd = teardownOwnedAvd, remoteDevice = void 0, teardownRemoteSession = defaultTeardownRemoteSession, metroTunnel = void 0, stopMetroTunnel = stopTunnel, releaseLeases = releaseWorkspaceLeases, freePort = defaultFreePort, clearRegistration = defaultClearRegistration, clearState = clearSupervisorState, report = (line) => console.error(line) }) {
+async function stopWorkspace({ root, project = void 0, state = void 0, collectors = void 0, signalCollector = (pid) => signalProcessTree(pid), verifyCollector = verifyCollectorOwnership, clearCollectors = clearCollectorState, isAlive = pidExists, killGroup = killMetroTree, signalServer = (pid) => signalProcessTree(pid), inspectIdentity = process_identity_exports.inspectProcessIdentity, waitForDeath = void 0, waitMs = DEFAULT_WAIT_MS, resolveMetro = resolveProjectMetro, teardownIos = teardownOwnedIosSim, teardownAvd = teardownOwnedAvd, remoteDevice = void 0, teardownRemoteSession = defaultTeardownRemoteSession, metroTunnel = void 0, stopMetroTunnel = stopTunnel, releaseLeases = releaseWorkspaceLeases, freePort = defaultFreePort, clearRegistration = defaultClearRegistration, clearState = clearSupervisorState, report = (line) => console.error(line) }) {
 	const proj = project === void 0 ? getProject(root) : project;
 	const sup = state === void 0 ? readSupervisorState(root) : state;
 	const collectorRecords = collectors === void 0 ? readCollectorState(root) : collectors;
@@ -172,6 +170,7 @@ async function stopWorkspace({ root, project = void 0, state = void 0, collector
 	};
 	let ok = true;
 	let stillHolding = null;
+	let keepPort = null;
 	const target = resolveSupervisorTarget({
 		state: sup,
 		record: proj?.supervisor ?? null,
@@ -232,10 +231,17 @@ async function stopWorkspace({ root, project = void 0, state = void 0, collector
 	};
 	else if (reservedPort === null) report(chalk.dim(phaseLine("metro", "no port reserved")));
 	else {
-		outcomes.metro = await stopMetro(reservedPort, root, {
+		const metro = await stopMetro(reservedPort, root, {
+			server: sup,
+			supervisorGone: target.status === "stale",
+			signalServer,
+			inspectIdentity,
+			waiter,
 			resolveMetro,
 			report
 		});
+		outcomes.metro = metro.outcome;
+		keepPort = metro.keepPort;
 		if (outcomes.metro.status === "refused" || outcomes.metro.status === "failed") {
 			ok = false;
 			stillHolding = outcomes.metro.reason;
@@ -254,6 +260,15 @@ async function stopWorkspace({ root, project = void 0, state = void 0, collector
 			return;
 		}
 		if (reservedPort !== null) {
+			if (keepPort) {
+				outcomes.port = {
+					status: "kept",
+					port: reservedPort,
+					reason: keepPort
+				};
+				report(chalk.dim(phaseLine("port", `keeping reservation ${reservedPort} -- ${keepPort}`)));
+				return;
+			}
 			if (freePort(root, reservedPort) === false) {
 				ok = false;
 				outcomes.port = {
@@ -334,8 +349,12 @@ async function stopWorkspace({ root, project = void 0, state = void 0, collector
 			reason: stillHolding
 		};
 		report(chalk.yellow(phaseLine("port", `keeping reservation ${reservedPort ?? "(none)"} -- ${stillHolding}`)));
-		const supervisorIsDown = outcomes.supervisor.status === "none" || outcomes.supervisor.status === "already-stopped" || outcomes.supervisor.status === "stopped";
-		if (tunnelHolding && supervisorIsDown) {
+		const serverIsDown = [
+			"none",
+			"already-stopped",
+			"stopped"
+		].includes(outcomes.supervisor.status) && !["refused", "failed"].includes(outcomes.metro.status);
+		if (tunnelHolding && serverIsDown) {
 			clearState(root, sup);
 			await clearRegistration(root, proj?.supervisor ?? null);
 		}
@@ -476,21 +495,76 @@ async function stopSupervisor(target, { killGroup, waiter, report }) {
 		reason
 	};
 }
-async function stopMetro(port, root, { resolveMetro, report }) {
+async function stopMetro(port, root, { server, supervisorGone, signalServer, inspectIdentity, waiter, resolveMetro, report }) {
+	const serverPid = numberOrNull(server?.serverPid);
+	const serverProcessToken = server?.serverProcessToken;
+	const serverRecord = {
+		pid: serverPid,
+		processToken: serverProcessToken
+	};
+	const identity = supervisorGone && serverPid && typeof serverProcessToken === "string" ? inspectIdentity(serverRecord) : null;
+	if (identity === "unknown") {
+		const reason = `the identity of dev server pid ${serverPid} left by the supervisor could not be verified`;
+		report(chalk.yellow(phaseLine("metro", `refusing to signal it: ${reason}`)));
+		return {
+			outcome: {
+				status: "refused",
+				port,
+				pid: serverPid,
+				reason
+			},
+			keepPort: null
+		};
+	}
+	if (identity === "same") {
+		report(chalk.dim(phaseLine("metro", `sending SIGTERM to dev server pid ${serverPid} left by the supervisor`)));
+		let signalled = false;
+		try {
+			signalled = signalServer(serverPid);
+		} catch {}
+		if (signalled ? await waiter(serverPid, serverProcessToken) : ["gone", "different"].includes(inspectIdentity(serverRecord))) {
+			report(chalk.green(phaseLine("metro", `dev server pid ${serverPid}`)));
+			return {
+				outcome: {
+					status: "stopped",
+					port,
+					pid: serverPid
+				},
+				keepPort: null
+			};
+		}
+		const reason = `dev server pid ${serverPid} left by the supervisor did not exit`;
+		report(chalk.red(phaseLine("metro", reason)));
+		return {
+			outcome: {
+				status: "failed",
+				port,
+				pid: serverPid,
+				reason
+			},
+			keepPort: null
+		};
+	}
 	const resolution = await resolveMetro(port, root);
 	if (resolution.missing) {
 		report(chalk.dim(phaseLine("metro", `nothing listening on port ${port}`)));
 		return {
-			status: "missing",
-			port
+			outcome: {
+				status: "missing",
+				port
+			},
+			keepPort: null
 		};
 	}
 	const reason = resolution.notOurs || "no recorded Stim supervisor owns this server; stop it with the tool that started it";
 	report(chalk.yellow(phaseLine("metro", `leaving port ${port} alone: ${reason}`)));
 	return {
-		status: "not-managed",
-		port,
-		reason
+		outcome: {
+			status: "not-managed",
+			port,
+			reason
+		},
+		keepPort: resolution.metro ? `a dev server from this project still answers on port ${port}` : null
 	};
 }
 const OCCUPANCY_HINT = "often a UI-test runner or device tool still attached";
@@ -521,7 +595,7 @@ function shutDownDevices(project, { teardownIos, teardownAvd, report }) {
 			} else device[iosKey] = reportDevice(iosUdid, teardownIos(iosUdid, {
 				del: false,
 				label: iosName
-			}), report);
+			}), report, "ios");
 		}
 		const android = platforms.android;
 		if (android?.avdName) {
@@ -533,12 +607,15 @@ function shutDownDevices(project, { teardownIos, teardownAvd, report }) {
 					reason: "Stim does not own this device"
 				};
 				report(chalk.dim(phaseLine("device", `${android.avdName} is not Stim-owned, leaving it running`)));
-			} else device[androidKey] = reportDevice(android.avdName, teardownAvd(android.avdName, { del: false }), report);
+			} else device[androidKey] = reportDevice(android.avdName, teardownAvd(android.avdName, { del: false }), report, "android");
 		}
 	}
 	return device;
 }
-function reportDevice(label, r, report) {
+function deviceShutdownRemedy(kind, label) {
+	return kind === "ios" ? `check it with \`xcrun simctl list devices\`, then \`xcrun simctl shutdown ${label}\` yourself -- if it will not respond, \`stim gc --delete\` reclaims it` : `check it with \`adb devices\`, then \`adb -s <serial> emu kill\` yourself -- if it will not respond, \`stim gc --delete\` reclaims it`;
+}
+function reportDevice(label, r, report, kind) {
 	if (r.status === "torn-down") {
 		report(chalk.green(phaseLine("device", `shut down ${r.label ?? label}`)));
 		return {
@@ -563,11 +640,14 @@ function reportDevice(label, r, report) {
 			reason
 		};
 	}
-	report(chalk.red(phaseLine("device", `failed to shut down ${label}: ${r.reason}`)));
+	const remedy = deviceShutdownRemedy(kind, r.label ?? label);
+	report(chalk.red(phaseLine("device", `failed to shut down ${r.label ?? label}: ${r.reason}`)));
+	report(chalk.dim(phaseLine("", remedy)));
 	return {
 		status: "failed",
-		label,
-		reason: r.reason
+		label: r.label ?? label,
+		reason: r.reason,
+		remedy
 	};
 }
 function summarize(root, outcomes, ok) {
@@ -617,11 +697,11 @@ async function defaultClearRegistration(root, expected) {
 	}
 }
 function stopCommand(program) {
-	program.command("stop").description("The inverse of `start`: halt this workspace's supervisor, shut the owned device down (never deleted), and free the reserved port. Non-destructive -- the device stays assigned, so coming back costs a boot. Acts on the current workspace.").option("--slot <name>", "Stop only this device slot, keeping the shared server running", validateDeviceSlot).option("--json", "print the per-step outcomes as JSON").action(async (opts) => {
+	program.command("stop").description("The inverse of `start`: halt this workspace's supervisor, shut the owned device down (never deleted), and free the reserved port. Non-destructive -- the device stays assigned, so coming back costs a boot. Acts on the current workspace.").option("--slot <name>", "Stop only this device slot, keeping the shared server running", parseDeviceSlotOption).option("--json", "print the per-step outcomes as JSON").action(async (opts) => {
 		const root = findProjectRoot(process.cwd());
 		if (!root) {
-			console.error(chalk.red("Not inside a project (no package.json found above the current directory)."));
-			process.exit(1);
+			refuseNoProject({ json: Boolean(opts.json) });
+			return;
 		}
 		const { ok, outcomes, summary } = await withWorkspaceProcessLock(workspaceDir(root), "native-run", () => runStop({
 			root,

package/dist/{stop-B1kOpYei.mjs → stop-ZvOeTmKb.mjs}

@@ -1,3 +1,3 @@
-import { t as resolveSupervisorTarget } from "./ownership-wolE-0Do.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-C8JW6kKp.mjs";
+import { t as resolveSupervisorTarget } from "./ownership-DZjdx8Gq.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-Dj4pfmyv.mjs";
 export { clearCollectorState, clearSupervisorState, stopCommand as default, readCollectorState, readSupervisorState, resolveCollectorTargets, resolveSupervisorTarget, runStop };

package/dist/supervisor-run.d.mts

@@ -1,4 +1,10 @@
-import { t as NdjsonWriter } from "./ndjson-DvHSsNU9.mjs";
+import { t as NdjsonWriter } from "./ndjson-Du3j0AQ9.mjs";
+import "@stim-cli/core/state";
+//#region src/supervisor/idle-stop.d.ts
+interface IdleProbe {
+  lastActivityAt(): number;
+  blocker(): string | null;
+}
 import * as import__stim_cli_core_process_identity from "@stim-cli/core/process-identity";
 //#endregion
 //#region src/supervisor/state.d.ts
@@ -15,6 +21,7 @@ interface ParsedSupervisorArgs {
   port?: number;
   tunnel?: boolean;
   resetCache?: boolean;
+  idleStopMinutes?: number;
   error?: string;
 }
 declare function parseArgs(argv: string[]): ParsedSupervisorArgs;
@@ -43,6 +50,8 @@ interface RunSupervisorOptions {
   port: number;
   tunnel?: boolean;
   resetCache?: boolean;
+  idleStopMinutes?: number;
+  idleProbe?: IdleProbe;
   isExpo?: (projectRoot: string) => boolean;
   startBare?: ServerStarter | null;
   startExpo?: ServerStarter | null;
@@ -51,7 +60,7 @@ interface RunSupervisorOptions {
   attachSignals?: boolean;
   stderr?: (line: string) => void;
 }
-declare function runSupervisor({ root, port, tunnel, resetCache, isExpo, startBare, startExpo, now, onExit, attachSignals, stderr }: RunSupervisorOptions): Promise<{
+declare function runSupervisor({ root, port, tunnel, resetCache, idleStopMinutes, idleProbe, isExpo, startBare, startExpo, now, onExit, attachSignals, stderr }: RunSupervisorOptions): Promise<{
   mode: string;
   server: ServerHandle | undefined;
   shutdown: (code: number, event: string, msg: string) => Promise<void>;