stim 1.16.0 → 1.17.0

package/dist/{status-Cs7VLg9D.mjs → status-dXX2JX1C.mjs}

@@ -1,34 +1,34 @@
 import { t as getExecutor } from "./exec-CaErVv7t.mjs";
 import { B as parseDeviceSlotKey, F as volumeRootFor, H as projectDeviceSlots, R as deviceSlotKey, _ as loadConfig$1, d as getConfigDir, j as formatBytes } from "./config-D0DbpZtM.mjs";
 import { t as process_identity_exports } from "./process-identity-BmRm1qV0.mjs";
-import { a as formatElapsed, i as formatDuration, r as clockTime, u as plural } from "./command-output-DnJMdEY-.mjs";
-import { P as resolveSettings, at as gitCommonDirOnDisk, gt as repoRoot, it as gitCommonDir, ut as linkedWorktreesOnDisk } from "./settings-oTSkkNrM.mjs";
-import { i as detectPlatforms, r as detectIsExpo, s as findServerWorkspace, u as projectShortcut } from "./project-Du91Ilvc.mjs";
-import { a as listeningPidsByPort, c as processCwds, d as isMetroRunning, i as listeningPids, l as resolveProjectMetro, o as pidExists, s as processCwd } from "./metro-BeK1ZPz1.mjs";
-import { b as workspaceLogErrorIndex, r as readWorkspaceState$1, x as workspaceLogsDir$1 } from "./workspace-state-B8-aJ1_5.mjs";
-import { a as readWebPage, o as readWebRecord, u as webFacts } from "./state-C1jB7Q8q.mjs";
-import { _ as statusActivity, a as capacity, b as withWebFacts, c as diskLine, d as gitSummaryText, f as metroReverseTargets, g as remoteDeviceState, h as remoteDeviceLine, i as applyMachineMemory, l as environmentState, m as poolLine, n as activityLabel, o as deviceLeaseLines, p as parseDfFree, r as addReverseMissingIssue, s as deviceLeaseStates, v as tightVolumes, y as unprovisionedWorktrees } from "./status-BuvBFeII.mjs";
-import { J as attributeMachineUsage, Y as readFootprints, a as machineNumber } from "./budget-DjrURfQn.mjs";
-import { d as readWebActivity, f as tailLines, i as createDeviceProcessTables, r as createActivityReader } from "./activity-BxwdD81S.mjs";
-import { i as listLeaseFiles, r as leaseIsExpired, s as parseWorkspaceLeases } from "./device-lease-D-hLqx1b.mjs";
-import { c as readMetroTunnel, f as readWorkspaceLaunches, u as readRemoteSession } from "./state-DcW6vOd_.mjs";
-import { S as statsProjectKey$1, b as readStats$1, c as ACTIVE_BUILD_KEY, d as buildReport, f as buildStatusLine, m as parseActiveBuild, u as activeBuildState } from "./idle-DYVymG92.mjs";
-import { F as ownedAvdDeviceProfile, O as listAdbDevices, d as androidToolPath, ft as parkedMaxSetting, ot as POOL_SETTING_REMEDY, pt as readParked, z as ownedAvdSerialResolver } from "./android-B_NumVyQ.mjs";
-import { d as listAllIosSimsAsync, v as parseSimctlList } from "./ios-BaInn3sW.mjs";
-import { t as resolveSupervisorTarget } from "./ownership-hCkPzGmr.mjs";
+import { a as formatElapsed, i as formatDuration, r as clockTime, u as plural } from "./command-output-CDAIFD-8.mjs";
+import { P as resolveSettings, at as gitCommonDirOnDisk, gt as repoRoot, it as gitCommonDir, ut as linkedWorktreesOnDisk } from "./settings-Cfd-0r2d.mjs";
+import { a as detectTutorial, c as findServerWorkspace, d as projectShortcut, i as detectPlatforms, p as readAppJson, r as detectIsExpo } from "./project-D47Rh0ly.mjs";
+import { a as listeningPidsByPort, c as processCwds, d as isMetroRunning, i as listeningPids, l as resolveProjectMetro, o as pidExists, s as processCwd } from "./metro-g8NqiJp-.mjs";
+import { b as workspaceLogErrorIndex, r as readWorkspaceState$1, x as workspaceLogsDir$1 } from "./workspace-state-DqcCbpE7.mjs";
+import { a as readWebPage, o as readWebRecord, u as webFacts } from "./state-PeQiJuIu.mjs";
+import { _ as statusActivity, a as capacity, b as withWebFacts, c as diskLine, d as gitSummaryText, f as metroReverseTargets, g as remoteDeviceState, h as remoteDeviceLine, i as applyMachineMemory, l as environmentState, m as poolLine, n as activityLabel, o as deviceLeaseLines, p as parseDfFree, r as addReverseMissingIssue, s as deviceLeaseStates, v as tightVolumes, y as unprovisionedWorktrees } from "./status-CzS4bPO9.mjs";
+import { X as readFootprints, Y as attributeMachineUsage, a as machineNumber } from "./budget-DM984mnd.mjs";
+import { d as readWebActivity, f as tailLines, i as createDeviceProcessTables, r as createActivityReader } from "./activity-IRvJY_ru.mjs";
+import { i as listLeaseFiles, r as leaseIsExpired, s as parseWorkspaceLeases } from "./device-lease-DpoS36_u.mjs";
+import { c as readMetroTunnel, f as readWorkspaceLaunches, u as readRemoteSession } from "./state-BKa8wNN5.mjs";
+import { F as ownedAvdDeviceProfile, O as listAdbDevices, d as androidToolPath, ft as parkedMaxSetting, ot as POOL_SETTING_REMEDY, pt as readParked, z as ownedAvdSerialResolver } from "./android-B_YNZy61.mjs";
+import { d as listAllIosSimsAsync, v as parseSimctlList } from "./ios-DSfnPfse.mjs";
+import { t as resolveSupervisorTarget } from "./ownership-BMLqyBgJ.mjs";
+import { b as readStats$1, c as ACTIVE_BUILD_KEY, d as buildReport, f as buildStatusLine, m as parseActiveBuild, u as activeBuildState, w as statsProjectKey$1 } from "./idle-B2m-Ovod.mjs";
 import { a as parseNdjsonLine } from "./ndjson-PclOIwVY.mjs";
-import { n as describeMetroLastStop, o as metroLastStop } from "./stop-cause-CidxIqup.mjs";
-import { l as probeHostedSession } from "./hosted-client-a-WmqE2L.mjs";
-import { m as hasMetroReverse } from "./app-install-CKWdbXIX.mjs";
-import "./hosted-macos-BSZyIb3y.mjs";
-import { m as readEasSessionLedger$1, p as easMachineStateRoot$1 } from "./device-remote-D5WVWqOq.mjs";
-import { d as readIosDevices, s as isReachable } from "./ios-device-FfCN_C8p.mjs";
+import { n as describeMetroLastStop, o as metroLastStop } from "./stop-cause-rhmGfwvt.mjs";
+import { l as probeHostedSession } from "./hosted-client-wk1W_CNW.mjs";
+import { m as hasMetroReverse } from "./app-install-VPkI5WEg.mjs";
+import "./hosted-macos-dlHXEeF5.mjs";
+import { m as readEasSessionLedger$1, p as easMachineStateRoot$1 } from "./device-remote-hFSkpfQu.mjs";
+import { d as readIosDevices, s as isReachable } from "./ios-device-pAN4t54-.mjs";
 import { n as maintenanceLines, r as maintenanceStatus } from "./status-DlKvVJBE.mjs";
-import { i as createStatusMeasurer, n as workspacePhase, r as applyStatusMeasures, s as mergeState } from "./warm-progress-CpGv3Wb6.mjs";
-import { r as workspaceRecordingEnabled } from "./recordings-BIXOzVnr.mjs";
+import { i as createStatusMeasurer, n as workspacePhase, r as applyStatusMeasures, s as mergeState } from "./warm-progress-DF4JRvYI.mjs";
+import { r as workspaceRecordingEnabled } from "./recordings-BNgsD1Tr.mjs";
 import { t as watchStdoutReader } from "./stdout-reader-C8yjre1x.mjs";
 import { t as triggerMaintenance } from "./trigger-Bemu8ytw.mjs";
-import { i as readSupervisorState } from "./stop-Bffozsac.mjs";
+import { i as readSupervisorState } from "./stop-BjizrQwv.mjs";
 import { createHash, randomUUID } from "node:crypto";
 import { mkdirSync, readFileSync, readdirSync, renameSync, rmSync, statSync, watch, writeFileSync } from "node:fs";
 import { join, posix, resolve } from "node:path";
@@ -36,12 +36,47 @@ import { closeSync as closeSync$1, existsSync as existsSync$1, fstatSync as fsta
 import { homedir, totalmem } from "os";
 import { basename as basename$1, dirname as dirname$1, join as join$1 } from "path";
 import { rotatedLogPath } from "@stim-cli/core";
-import { ERROR_SOURCES, archiveRoot, archivedUsage, bundleMarkerPlatform, countErrorEntries, gitMergeCacheDir, hostedIosPlacements, hostedIosRecords, hostedIosStatus, linkReplacedArchives, logFiles, macosAppState, parseHostedIosPlacement, queryLogs, readArchives, readBuildDetail, readBuildHistory, readDeviceIdleShutdowns, readIdleStop, readLastBuilds, readMacosRecord, recordMatches, sortByTs, unreadableHostedIos, withDerivedFacts, withGitChip, withStateReadCache } from "@stim-cli/core/state";
+import { DEVICE_RECLAIM_REASON, ERROR_SOURCES, archiveRoot, archivedUsage, bundleMarkerPlatform, countErrorEntries, gitMergeCacheDir, hostedAndroidPlacements, hostedAndroidRecords, hostedAndroidStatus, hostedIosPlacements, hostedIosRecords, hostedIosStatus, linkReplacedArchives, logFiles, macosAppState, parseHostedAndroidPlacement, parseHostedIosPlacement, queryLogs, readArchives, readBuildDetail, readBuildHistory, readDeviceIdleShutdowns, readDevicePlacement, readIdleStop, readLastBuilds, readMacosRecord, recordMatches, sortByTs, unreadableHostedAndroid, unreadableHostedIos, withDerivedFacts, withGitChip, withStateReadCache } from "@stim-cli/core/state";
 import chalk from "chalk";
+//#region src/device-host/hosted-native-status.ts
+function hostedNativeProbe(placement, probe, slot, platform) {
+	const label = platform === "ios" ? "iOS" : "Android";
+	const rerun = `stim ${platform} --remote ${placement.machine}${slot === "default" ? "" : ` --slot ${slot}`}`;
+	return {
+		state: probe.state === "ready" ? "ready" : probe.state === "stopped" ? "stopped" : "unverified",
+		...probe.state === "ready" ? {} : { warning: probe.state === "stopped" ? `The ${label} session on ${placement.machine} stopped or no longer exists. Run ${rerun} to launch it again, or stim stop to clear the placement.` : `${placement.machine} could not confirm its ${label} session${probe.state === "unknown" ? probe.notice ? `: ${probe.notice}` : "" : `: ${probe.reason.replace(/\.+$/, "")}`}. The placement stays recorded; run stim stop when the host answers.` }
+	};
+}
+//#endregion
+//#region src/device-host/hosted-android-status.ts
+function applyHostedAndroidProbe(placement, probe, slot = "default") {
+	const { state, warning } = hostedNativeProbe(placement, probe, slot, "android");
+	const host = {
+		...hostedAndroidStatus(placement),
+		state
+	};
+	return {
+		android: {
+			host,
+			name: host.device?.name,
+			serial: null,
+			owned: false,
+			physical: false,
+			state
+		},
+		...warning ? { warning } : {}
+	};
+}
+async function readHostedAndroidStatus(placements) {
+	return Object.fromEntries(await Promise.all(Object.entries(placements).map(async ([slot, placement]) => [slot, applyHostedAndroidProbe(placement, await probeHostedSession({
+		...placement,
+		platform: "android"
+	}), slot)])));
+}
+//#endregion
 //#region src/device-host/hosted-ios-status.ts
 function applyHostedIosProbe(placement, probe, slot = "default") {
-	const rerun = `stim ios --remote ${placement.machine}${slot === "default" ? "" : ` --slot ${slot}`}`;
-	const state = probe.state === "ready" ? "ready" : probe.state === "stopped" ? "stopped" : "unverified";
+	const { state, warning } = hostedNativeProbe(placement, probe, slot, "ios");
 	return {
 		ios: {
 			host: {
@@ -53,7 +88,7 @@ function applyHostedIosProbe(placement, probe, slot = "default") {
 			owned: false,
 			state
 		},
-		...probe.state === "ready" ? {} : { warning: probe.state === "stopped" ? `The iOS session on ${placement.machine} stopped or no longer exists. Run ${rerun} to launch it again, or stim stop to clear the placement.` : `${placement.machine} could not confirm its iOS session${probe.state === "unknown" ? probe.notice ? `: ${probe.notice}` : "" : `: ${probe.reason.replace(/\.+$/, "")}`}. The placement stays recorded; run stim stop when the host answers.` }
+		...warning ? { warning } : {}
 	};
 }
 async function readHostedIosStatus(placements) {
@@ -1003,7 +1038,7 @@ function physicalDeviceLine(device, now) {
 const WATCH_GIT_MAX_AGE_MS = 6e4;
 function iosStatusName(ios) {
 	const host = ios.host;
-	return host && !ios.udid ? `${host.device?.name ?? "iOS simulator"} (${host.device ? `iOS ${host.device.runtime.replace(/^iOS /, "")}` : "runtime pending"}) on ${host.machine}` : ios.name ?? ios.udid;
+	return host && !ios.udid ? `${host.device?.name ?? "iOS simulator"} (${host.device ? `iOS ${host.device.runtime.replace(/^iOS /, "")}` : "runtime pending"}) on ${host.machine}${host.selected === "auto" && host.reason ? ` (auto: ${host.reason})` : ""}` : ios.name ?? ios.udid;
 }
 function iosStatusLines(record, slotLabel) {
 	const out = [];
@@ -1024,6 +1059,48 @@ function iosStatusLines(record, slotLabel) {
 	}
 	return out;
 }
+function applyHostedAndroidStates(state, saved, factsBySlot) {
+	for (const [slot, record] of Object.entries(hostedAndroidRecords(saved))) if (!parseHostedAndroidPlacement(record)) state.warnings.push(unreadableHostedAndroid(slot));
+	for (const [slot, facts] of Object.entries(factsBySlot)) {
+		const local = slot === "default" ? state.android : state.slots?.find((entry) => entry.slot === slot)?.android;
+		const conflict = local && (local.state === "detected" || local.state === "unknown");
+		const android = conflict ? {
+			...local,
+			host: facts.android.host
+		} : facts.android;
+		if (conflict) state.warnings.push(`Slot ${slot} records both a local and hosted Android emulator (${facts.android.name} on ${facts.android.host?.machine}); run stim stop to reconcile them.`);
+		if (slot === "default") state.android = android;
+		else {
+			state.slots ??= [];
+			const savedSlot = state.slots.find((entry) => entry.slot === slot);
+			if (savedSlot) savedSlot.android = android;
+			else state.slots.push({
+				slot,
+				ios: null,
+				android
+			});
+		}
+		if (facts.warning) state.warnings.push(facts.warning);
+		state.live ||= facts.android.state === "ready";
+	}
+}
+function androidStatusLines(record, slotLabel) {
+	const out = [];
+	if (record?.host && !record.serial) {
+		const host = record.host;
+		out.push(`  android${slotLabel}: ${chalk.cyan(`${host.device?.name ?? "Android emulator"} on ${host.machine}${host.selected === "auto" && host.reason ? ` (auto: ${host.reason})` : ""}`)} ${host.state ?? "unverified"}`);
+	} else if (record) {
+		const kind = record.physical ? chalk.dim("(physical)") : chalk.dim("(emulator)");
+		const observed = record.state ? ` ${record.state}${record.serial ? ` (${record.serial})` : ""}` : "";
+		out.push(`  android${slotLabel}: ${chalk.cyan(record.name)} ${kind}${observed}${record.owned ? chalk.dim(" (owned)") : ""}${activitySuffix(record.activity)}${appSuffix(record.app)}${idleShutdownSuffix(record.idleShutdown)}`);
+		if (record.host) {
+			const host = record.host;
+			out.push(`  android${slotLabel}: ${chalk.cyan(`${host.device?.name ?? "Android emulator"} on ${host.machine}${host.selected === "auto" && host.reason ? ` (auto: ${host.reason})` : ""}`)} ${host.state ?? "unverified"}`);
+		}
+	}
+	if (record?.host?.agent.driver === "agent-device") out.push(chalk.dim(`    agent: ${record.host.agent.command}`));
+	return out;
+}
 function formatGb(mb) {
 	return `${(mb / 1024).toFixed(1)} GB`;
 }
@@ -1041,6 +1118,7 @@ async function readStatusFacts(gitMaxAgeMs, simctlListing, cachedArchives) {
 	const cfg = loadConfig$1();
 	const projects = Object.entries(cfg?.projects || {});
 	const iosReads = projects.map(([path]) => readHostedIosStatus(hostedIosPlacements(readWorkspaceState$1(path))));
+	const androidReads = projects.map(([path]) => readHostedAndroidStatus(hostedAndroidPlacements(readWorkspaceState$1(path))));
 	const macosReads = projects.map(([path]) => readHostedMacosStatus(readMacosRecord(path)));
 	const cwdRoot = findServerWorkspace(process.cwd())?.root ?? null;
 	const worktrees = linkedWorktrees([process.cwd(), ...projects.map(([path]) => path)]);
@@ -1158,6 +1236,7 @@ async function readStatusFacts(gitMaxAgeMs, simctlListing, cachedArchives) {
 				if (facts.warning) state.warnings.push(facts.warning);
 				state.live ||= facts.ios.state === "ready";
 			}
+			applyHostedAndroidStates(state, saved, await androidReads[i]);
 			const tunnel = readMetroTunnel(path);
 			if (state.metro && tunnel?.kind === "managed" && tunnel.port === state.metro.port && pidExists(tunnel.pid)) state.metro.tunnel = {
 				provider: tunnel.provider,
@@ -1176,6 +1255,8 @@ async function readStatusFacts(gitMaxAgeMs, simctlListing, cachedArchives) {
 				})),
 				recording: { enabled: workspaceRecordingEnabled(path, proj, cfg, process.env) }
 			});
+			const tutorial = detectTutorial(readAppJson(path));
+			if (tutorial) state.tutorial = tutorial;
 		}
 		const physicalDevices = physicalDeviceStates(leaseFiles, parseWorkspaceLeases(saved?.deviceLeases), {
 			root: path,
@@ -1228,6 +1309,19 @@ async function readStatusFacts(gitMaxAgeMs, simctlListing, cachedArchives) {
 function readLogDerivedFacts(states) {
 	const now = Date.now();
 	for (const state of states) {
+		const saved = readWorkspaceState$1(state.path);
+		for (const devices of [{
+			slot: "default",
+			ios: state.ios,
+			android: state.android
+		}, ...state.slots ?? []]) for (const platform of ["ios", "android"]) {
+			const device = devices[platform];
+			const placement = readDevicePlacement(saved, platform, devices.slot);
+			if (device) {
+				if (placement) device.devicePlacement = placement;
+				else delete device.devicePlacement;
+			}
+		}
 		if (state.metro) {
 			const bundle = metroBundleState(tailLines(join$1(workspaceLogsDir$1(state.path), "metro.ndjson")) ?? [], {
 				running: state.metro.running,
@@ -1399,11 +1493,7 @@ function renderStatus({ archived, archivedUsage: usage, projects, states, labelO
 		}, ...state.slots ?? []]) {
 			const slotLabel = deviceState.slot === "default" ? "" : ` [${deviceState.slot}]`;
 			out.push(...iosStatusLines(deviceState.ios, slotLabel));
-			if (deviceState.android) {
-				const kind = deviceState.android.physical ? chalk.dim("(physical)") : chalk.dim("(emulator)");
-				const observed = deviceState.android.state ? ` ${deviceState.android.state}${deviceState.android.serial ? ` (${deviceState.android.serial})` : ""}` : "";
-				out.push(`  android${slotLabel}: ${chalk.cyan(deviceState.android.name)} ${kind}${observed}${deviceState.android.owned ? chalk.dim(" (owned)") : ""}${activitySuffix(deviceState.android.activity)}${appSuffix(deviceState.android.app)}${idleShutdownSuffix(deviceState.android.idleShutdown)}`);
-			}
+			out.push(...androidStatusLines(deviceState.android, slotLabel));
 		}
 		if (state.macos) {
 			const host = state.macos.host;
@@ -1535,7 +1625,7 @@ function lastBuildText(report) {
 	return `${report.platform} ${report.status === "ok" ? source : `failed (${report.errorCode ?? "error"}), ${source}`}${took}${placement}`;
 }
 function idleShutdownSuffix(record) {
-	return record ? chalk.dim(` -- shut down after ${record.idleMinutes}m idle at ${record.at} (devices.idleShutdownMinutes)`) : "";
+	return record ? chalk.dim(` -- shut down after ${record.idleMinutes}m idle at ${record.at} (${record.reason === DEVICE_RECLAIM_REASON ? "reclaimed for a waiting run; devices.reclaimIdleMinutes" : "devices.idleShutdownMinutes"})`) : "";
 }
 function activitySuffix(activity) {
 	const label = activityLabel(activity, Date.now());

package/dist/{stop-Dt_dM16A.mjs → stop-BCwvvs7F.mjs}

@@ -1,3 +1,3 @@
-import { t as resolveSupervisorTarget } from "./ownership-hCkPzGmr.mjs";
-import { a as resolveCollectorTargets, c as stopWorkspaceNow, i as readSupervisorState, n as clearSupervisorState, o as runStop, r as readCollectorState, s as stopCommand, t as clearCollectorState } from "./stop-Bffozsac.mjs";
+import { t as resolveSupervisorTarget } from "./ownership-BMLqyBgJ.mjs";
+import { a as resolveCollectorTargets, c as stopWorkspaceNow, i as readSupervisorState, n as clearSupervisorState, o as runStop, r as readCollectorState, s as stopCommand, t as clearCollectorState } from "./stop-BjizrQwv.mjs";
 export { clearCollectorState, clearSupervisorState, stopCommand as default, readCollectorState, readSupervisorState, resolveCollectorTargets, resolveSupervisorTarget, runStop, stopWorkspaceNow };

package/dist/{stop-Bffozsac.mjs → stop-BjizrQwv.mjs}

@@ -1,22 +1,22 @@
 import { B as parseDeviceSlotKey, D as withConfigLock$1, E as upsertProject, H as projectDeviceSlots, V as parseDeviceSlotOption, W as validateDeviceSlot, o as clearSupervisor, p as getProject, z as deviceSlotPlatforms } from "./config-D0DbpZtM.mjs";
 import { n as ownership_claim_exports, t as process_identity_exports } from "./process-identity-BmRm1qV0.mjs";
-import { f as refuseNoProject, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-DnJMdEY-.mjs";
-import { a as findCommandWorkspace } from "./project-Du91Ilvc.mjs";
-import { l as resolveProjectMetro, o as pidExists, r as killMetroTree, u as signalProcessTree } from "./metro-BeK1ZPz1.mjs";
-import { c as writeWorkspaceState, n as clearWorkspaceStateKeys, o as withWorkspaceStateLock, r as readWorkspaceState$1, v as workspaceDir } from "./workspace-state-B8-aJ1_5.mjs";
-import { n as fileLeaseIo, u as releaseWorkspaceLeases } from "./device-lease-D-hLqx1b.mjs";
-import { a as clearRemoteSession, c as readMetroTunnel, i as clearManagedMetroTunnel, o as clearWorkspaceLaunches, s as clearWorkspaceSupervisor, u as readRemoteSession } from "./state-DcW6vOd_.mjs";
-import { a as teardownOwnedBrowser, i as teardownOwnedAvd, o as teardownOwnedIosSim } from "./teardown-CL6vDs2Y.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-BL7Q0HCO.mjs";
-import { i as stopTunnel, t as resolveSupervisorTarget } from "./ownership-hCkPzGmr.mjs";
-import { a as logVanishedSupervisor, l as withdrawDevServerStopRequest, s as requestDevServerStop } from "./stop-cause-CidxIqup.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-DiA16AsN.mjs";
-import { t as stopMacosApp } from "./stop-B0Yxtmiy.mjs";
-import { f as resolveEasCliBin } from "./remote-cache-C8-V13XN.mjs";
-import { i as endRecordedSession } from "./device-remote-D5WVWqOq.mjs";
-import { a as decideStopAction, c as nativeRunWaitNotice, i as clearNativeRunCancel, l as requestNativeRunCancel, n as NATIVE_RUN_WAIT_MS, o as describeNativeRunHolder, s as nativeRunHolder, t as NATIVE_RUN_LOCK } from "./native-run-NaBrRFtQ.mjs";
-import { r as stopHostedIos } from "./hosted-ios-CIWelIqf.mjs";
-import { hostedIosRecords, parseHostedIosPlacement } from "@stim-cli/core/state";
+import { f as refuseNoProject, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-CDAIFD-8.mjs";
+import { o as findCommandWorkspace } from "./project-D47Rh0ly.mjs";
+import { l as resolveProjectMetro, o as pidExists, r as killMetroTree, u as signalProcessTree } from "./metro-g8NqiJp-.mjs";
+import { a as updateWorkspaceState, c as writeWorkspaceState, n as clearWorkspaceStateKeys, o as withWorkspaceStateLock, r as readWorkspaceState$1, v as workspaceDir } from "./workspace-state-DqcCbpE7.mjs";
+import { n as fileLeaseIo, u as releaseWorkspaceLeases } from "./device-lease-DpoS36_u.mjs";
+import { a as clearRemoteSession, c as readMetroTunnel, i as clearManagedMetroTunnel, o as clearWorkspaceLaunches, s as clearWorkspaceSupervisor, u as readRemoteSession } from "./state-BKa8wNN5.mjs";
+import { g as teardownOwnedIosSim, h as teardownOwnedBrowser, i as stopTunnel, m as teardownOwnedAvd, t as resolveSupervisorTarget } from "./ownership-BMLqyBgJ.mjs";
+import { t as withWorkspaceProcessLock } from "./workspace-process-lock-2mNzOlaB.mjs";
+import { a as logVanishedSupervisor, l as withdrawDevServerStopRequest, s as requestDevServerStop } from "./stop-cause-rhmGfwvt.mjs";
+import { n as verifyCollectorOwnership } from "./ownership-DyRQru0q.mjs";
+import { t as stopMacosApp } from "./stop-Cr1d8DSE.mjs";
+import { i as stopHostedAndroid } from "./hosted-android-DwLS4Mse.mjs";
+import { f as resolveEasCliBin } from "./remote-cache-Ci4DQYYj.mjs";
+import { i as endRecordedSession } from "./device-remote-hFSkpfQu.mjs";
+import { a as decideStopAction, c as nativeRunWaitNotice, i as clearNativeRunCancel, l as requestNativeRunCancel, n as NATIVE_RUN_WAIT_MS, o as describeNativeRunHolder, s as nativeRunHolder, t as NATIVE_RUN_LOCK } from "./native-run-D1Q56rAD.mjs";
+import { r as stopHostedIos } from "./hosted-ios-aMo7Cljf.mjs";
+import { hostedAndroidDeviceName, hostedAndroidRecords, hostedIosRecords, hostedNativeRecords, isJsonObject, parseHostedNativePlacement } from "@stim-cli/core/state";
 import chalk from "chalk";
 //#region src/commands/stop.ts
 const DEFAULT_WAIT_MS = 1e4;
@@ -218,23 +218,23 @@ async function stopBrowserOnly({ root, project = void 0, teardownBrowser = (proj
 		summary: summarize(root, outcomes, ok)
 	};
 }
-async function stopWorkspaceHostedIos(root, slot, report, failed) {
+async function stopWorkspaceHostedNative(root, slot, report, failed) {
 	const devices = {};
 	let anyFailed = false;
-	for (const [name, record] of Object.entries(hostedIosRecords(readWorkspaceState$1(root)))) {
+	for (const platform of ["ios", "android"]) for (const [name, record] of Object.entries(hostedNativeRecords(readWorkspaceState$1(root), platform))) {
 		if (slot !== void 0 && name !== slot) continue;
-		const placement = parseHostedIosPlacement(record);
-		const label = placement ? `${placement.device?.name ?? "iOS simulator"} on ${placement.machine}` : `hosted iOS simulator for slot ${name}`;
+		const placement = parseHostedNativePlacement(record, platform);
+		const label = placement ? `${placement.device ? "udid" in placement.device ? placement.device.name : hostedAndroidDeviceName(placement.device) : `${platform} device`} on ${placement.machine}` : `hosted ${platform === "ios" ? "iOS simulator" : "Android emulator"} for slot ${name}`;
 		try {
-			await stopHostedIos(root, name);
-			devices[`ios:host:${name}`] = {
+			await (platform === "ios" ? stopHostedIos : stopHostedAndroid)(root, name);
+			devices[`${platform}:host:${name}`] = {
 				status: "shut-down",
 				label
 			};
 			report(chalk.dim(phaseLine("device", `stopped ${label}`)));
 		} catch (error) {
 			const reason = error.message;
-			devices[`ios:host:${name}`] = {
+			devices[`${platform}:host:${name}`] = {
 				status: "failed",
 				label,
 				reason
@@ -424,10 +424,25 @@ async function stopWorkspace({ root, project = void 0, state = void 0, collector
 		ok = false;
 		report(reason);
 	}, stopMacos);
-	const hosted = await stopWorkspaceHostedIos(root, hostedSlot, report, () => {
+	const hosted = await stopWorkspaceHostedNative(root, hostedSlot, report, () => {
 		ok = false;
 	});
 	Object.assign(outcomes.device, hosted.devices);
+	updateWorkspaceState(root, (workspace) => {
+		const slots = isJsonObject(workspace.deviceSlots) ? workspace.deviceSlots : {};
+		for (const name of ["default", ...Object.keys(slots)]) {
+			if (hostedSlot !== void 0 && name !== hostedSlot) continue;
+			const records = name === "default" ? workspace : slots[name];
+			if (!isJsonObject(records)) continue;
+			for (const platform of ["ios", "android"]) {
+				const hostOutcome = outcomes.device[`${platform}:host:${name}`];
+				if (hostOutcome?.status === "failed" || stillHolding && hostOutcome?.status !== "shut-down") continue;
+				if (outcomes.device[name === "default" || hostedSlot !== void 0 ? platform : `${platform}:${name}`]?.status === "failed") continue;
+				if (isJsonObject(records[platform])) delete records[platform].devicePlacement;
+			}
+		}
+		return workspace;
+	});
 	const remote = remoteDevice === void 0 ? readRemoteSession(root) : remoteDevice;
 	const sessionId = typeof remote?.sessionId === "string" ? remote.sessionId : null;
 	if (sessionId) {
@@ -875,12 +890,18 @@ function recordedDeviceSlots(root) {
 		const parsed = parseDeviceSlotKey(key);
 		if (parsed) slots.add(parsed.slot);
 	}
-	for (const slot of Object.keys(hostedIosRecords(readWorkspaceState$1(root)))) slots.add(slot);
+	for (const slot of Object.keys({
+		...hostedIosRecords(readWorkspaceState$1(root)),
+		...hostedAndroidRecords(readWorkspaceState$1(root))
+	})) slots.add(slot);
 	return [...slots].toSorted();
 }
 function workspaceDeviceSlots(root) {
 	const slots = projectDeviceSlots(getProject(root)).filter(({ platforms }) => Object.values(platforms).some(Boolean)).map(({ slot }) => slot);
-	for (const slot of Object.keys(hostedIosRecords(readWorkspaceState$1(root)))) if (!slots.includes(slot)) slots.push(slot);
+	for (const slot of Object.keys({
+		...hostedIosRecords(readWorkspaceState$1(root)),
+		...hostedAndroidRecords(readWorkspaceState$1(root))
+	})) if (!slots.includes(slot)) slots.push(slot);
 	if (typeof readRemoteSession(root)?.sessionId === "string" && !slots.includes("default")) slots.push("default");
 	return slots;
 }

package/dist/{stop-B0Yxtmiy.mjs → stop-Cr1d8DSE.mjs}

@@ -1,8 +1,8 @@
 import { n as ownership_claim_exports, t as process_identity_exports } from "./process-identity-BmRm1qV0.mjs";
-import { c as writeWorkspaceState, v as workspaceDir } from "./workspace-state-B8-aJ1_5.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-BL7Q0HCO.mjs";
-import { a as requiredMacosRecord, i as macosRuntimeClaim } from "./state-3DwSQIBK.mjs";
-import { n as stopHostedMacos } from "./hosted-macos-BSZyIb3y.mjs";
+import { c as writeWorkspaceState, v as workspaceDir } from "./workspace-state-DqcCbpE7.mjs";
+import { t as withWorkspaceProcessLock } from "./workspace-process-lock-2mNzOlaB.mjs";
+import { a as requiredMacosRecord, i as macosRuntimeClaim } from "./state-DyaNTgfR.mjs";
+import { n as stopHostedMacos } from "./hosted-macos-dlHXEeF5.mjs";
 import { readMacosRecord } from "@stim-cli/core/state";
 //#region src/macos/stop.ts
 async function stopProcess(record) {

package/dist/{stop-cause-CidxIqup.mjs → stop-cause-rhmGfwvt.mjs}

@@ -1,5 +1,5 @@
 import { t as process_identity_exports } from "./process-identity-BmRm1qV0.mjs";
-import { c as writeWorkspaceState, t as clearWorkspaceStateKey, x as workspaceLogsDir$1 } from "./workspace-state-B8-aJ1_5.mjs";
+import { c as writeWorkspaceState, t as clearWorkspaceStateKey, x as workspaceLogsDir$1 } from "./workspace-state-DqcCbpE7.mjs";
 import { r as createNdjsonWriter } from "./ndjson-PclOIwVY.mjs";
 import { join } from "node:path";
 import { LOG_ROTATE_BYTES } from "@stim-cli/core";

package/dist/supervisor-run.d.mts

@@ -1,6 +1,6 @@
 import { t as NdjsonWriter } from "./ndjson-Du3j0AQ9.mjs";
 import { a as readPidFile, i as clearWorkspaceSupervisor, n as MODE_EXPO, o as writePidFile, r as clearExpoMetroTunnel, t as MODE_BARE } from "./state-B4PQFXMW.mjs";
-import { DevServerStopRecord, DeviceActivity, IOS_SIMULATOR_APPS } from "@stim-cli/core/state";
+import { DevServerStopRecord, DeviceActivity, DeviceIdleShutdownRecord, IOS_SIMULATOR_APPS } from "@stim-cli/core/state";
 //#region src/supervisor/idle-stop.d.ts
 interface IdleProbe {
   lastActivityAt(): number;
@@ -22,8 +22,8 @@ interface DueDevice {
   device: OwnedDeviceActivity;
   idleForMs: number;
 }
-/** The workspace's booted owned simulators and emulators that have been idle for `idleMs` or more. */
-declare function dueIdleDevices(root: string, idleMs: number, now?: number): DueDevice[];
+/** Booted owned devices idle for `idleMs`, in one workspace or all registered workspaces when root is absent. */
+declare function dueIdleDevices(root: string | undefined, idleMs: number, now?: number): DueDevice[];
 interface IdleShutdownEvent {
   level: "info" | "warn";
   event: "device_idle_shutdown" | "device_idle_shutdown_failed";
@@ -34,7 +34,10 @@ interface IdleShutdownEvent {
  * and records why. The caller holds the workspace's native-run lock, so no `ios` or `android` run is booting or
  * installing on them.
  */
-declare function shutDownIdleDevices(root: string, idleMs: number, log: (event: IdleShutdownEvent) => void, now?: number): number;
+declare function shutDownIdleDevices(root: string, idleMs: number, log: (event: IdleShutdownEvent) => void, now?: number, { only, reason }?: {
+  only?: OwnedDeviceActivity;
+  reason?: DeviceIdleShutdownRecord["reason"];
+}): number;
 //#endregion
 //#region src/watchman.d.ts
 type WatchmanCommand = (args: string[], timeoutMs: number) => Promise<unknown>;

package/dist/supervisor-run.mjs

@@ -1,25 +1,26 @@
 import { B as parseDeviceSlotKey, H as projectDeviceSlots, T as setSupervisor, o as clearSupervisor, p as getProject } from "./config-D0DbpZtM.mjs";
 import { t as process_identity_exports } from "./process-identity-BmRm1qV0.mjs";
 import { t as relaunchWithLogFile } from "./detached-entry-CiTEgMR1.mjs";
-import { r as detectIsExpo } from "./project-Du91Ilvc.mjs";
-import { C as workspaceStateFile, a as updateWorkspaceState, c as writeWorkspaceState, n as clearWorkspaceStateKeys, o as withWorkspaceStateLock, r as readWorkspaceState$1, x as workspaceLogsDir$1 } from "./workspace-state-B8-aJ1_5.mjs";
-import { n as withIdleWorkspace } from "./in-use-DvBw0Kxo.mjs";
-import { r as createActivityReader } from "./activity-BxwdD81S.mjs";
-import { a as parseLease, r as leaseIsExpired, s as parseWorkspaceLeases, t as deviceLeasePath } from "./device-lease-D-hLqx1b.mjs";
-import { l as readPidFile, n as MODE_EXPO, p as writePidFile, r as clearExpoMetroTunnel, s as clearWorkspaceSupervisor, t as MODE_BARE } from "./state-DcW6vOd_.mjs";
-import { C as parseSubscriberNames, O as runWatchman, T as parseWatchRoots, s as workspaceBuildInProgress, w as parseTriggerCount } from "./idle-DYVymG92.mjs";
-import { z as ownedAvdSerialResolver } from "./android-B_NumVyQ.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-BL7Q0HCO.mjs";
+import { r as detectIsExpo } from "./project-D47Rh0ly.mjs";
+import { C as workspaceStateFile, a as updateWorkspaceState, c as writeWorkspaceState, n as clearWorkspaceStateKeys, o as withWorkspaceStateLock, r as readWorkspaceState$1, x as workspaceLogsDir$1 } from "./workspace-state-DqcCbpE7.mjs";
+import { n as withIdleWorkspace } from "./in-use-CvGOUn-x.mjs";
+import { m as workspaceDeviceLastUseAt, r as createActivityReader } from "./activity-IRvJY_ru.mjs";
+import { a as parseLease, r as leaseIsExpired, s as parseWorkspaceLeases, t as deviceLeasePath } from "./device-lease-DpoS36_u.mjs";
+import { l as readPidFile, n as MODE_EXPO, p as writePidFile, r as clearExpoMetroTunnel, s as clearWorkspaceSupervisor, t as MODE_BARE } from "./state-BKa8wNN5.mjs";
+import { n as parseTriggerCount, o as runWatchman, r as parseWatchRoots, t as parseSubscriberNames } from "./watchman-APYjXSQa.mjs";
+import { z as ownedAvdSerialResolver } from "./android-B_YNZy61.mjs";
+import { t as withWorkspaceProcessLock } from "./workspace-process-lock-2mNzOlaB.mjs";
+import { s as workspaceBuildInProgress } from "./idle-B2m-Ovod.mjs";
 import { t as describeError } from "./errors-B6W7FkxQ.mjs";
 import { r as createNdjsonWriter } from "./ndjson-PclOIwVY.mjs";
-import { c as vanishedSupervisorMessage, i as devServerStopRecord, r as devServerStopLevel, t as describeDevServerStop } from "./stop-cause-CidxIqup.mjs";
-import { l as probeHostedSession } from "./hosted-client-a-WmqE2L.mjs";
-import { t as clearHostedMetro } from "./metro-gateway-BJ-rxQAB.mjs";
-import { n as dueIdleDevices, r as shutDownIdleDevices } from "./idle-shutdown-CTsDnAde.mjs";
+import { c as vanishedSupervisorMessage, i as devServerStopRecord, r as devServerStopLevel, t as describeDevServerStop } from "./stop-cause-rhmGfwvt.mjs";
+import { l as probeHostedSession } from "./hosted-client-wk1W_CNW.mjs";
+import { t as clearHostedMetro } from "./metro-gateway-DmslUM30.mjs";
+import { n as dueIdleDevices, r as shutDownIdleDevices } from "./idle-shutdown-_3oOV1V_.mjs";
 import { existsSync, readFileSync, realpathSync, statSync } from "node:fs";
 import { dirname, isAbsolute, join, resolve, sep } from "node:path";
 import { LOG_ROTATE_BYTES, createMetroGateway } from "@stim-cli/core";
-import { DEV_SERVER_STOP_REQUEST_KEY, HOSTED_METRO_GATEWAYS_KEY, HOSTED_METRO_REQUESTS_KEY, IDLE_STOP_KEY, hostedIosPlacements, hostedMetroGateways, hostedMetroRequests, readDevServerStopRequest } from "@stim-cli/core/state";
+import { DEV_SERVER_STOP_REQUEST_KEY, HOSTED_METRO_GATEWAYS_KEY, HOSTED_METRO_REQUESTS_KEY, IDLE_STOP_KEY, hostedAndroidPlacements, hostedIosPlacements, hostedMetroGateways, hostedMetroRequests, hostedNativeRecords, parseHostedNativePlacement, readDevServerStopRequest } from "@stim-cli/core/state";
 import { fileURLToPath } from "node:url";
 //#region src/supervisor/hosted-metro.ts
 function reconcileHostedMetro(requests, active) {
@@ -68,12 +69,12 @@ function watchHostedMetro(root, metroPort, processToken) {
 		if (closed) return;
 		const state = readState();
 		if (state?.supervisor?.processToken !== processToken) return;
-		const placements = Object.values(hostedIosPlacements(state));
+		const placements = [...Object.values(hostedIosPlacements(state)), ...Object.values(hostedAndroidPlacements(state)).map((placement) => Object.assign({ platform: "android" }, placement))];
 		const sessions = new Set(placements.map((placement) => placement.session));
 		const requests = Object.fromEntries(Object.entries(hostedMetroRequests(state)).filter(([session]) => sessions.has(session)));
 		if (Object.keys(requests).length !== Object.keys(hostedMetroRequests(state)).length) updateWorkspaceState(root, (current) => {
 			if (current.supervisor?.processToken !== processToken) return current;
-			const recorded = new Set(Object.values(hostedIosPlacements(current)).map((placement) => placement.session));
+			const recorded = new Set([...Object.values(hostedIosPlacements(current)), ...Object.values(hostedAndroidPlacements(current))].map((placement) => placement.session));
 			return {
 				...current,
 				[HOSTED_METRO_REQUESTS_KEY]: Object.fromEntries(Object.entries(hostedMetroRequests(current)).filter(([session]) => recorded.has(session)))
@@ -215,8 +216,13 @@ function workspaceIdleProbe(root, { platform = process.platform } = {}) {
 		},
 		blocker() {
 			if (workspaceBuildInProgress(root)) return "a build is in progress";
-			const hosted = Object.values(hostedIosPlacements(readWorkspaceState$1(root)))[0];
-			if (hosted) return `its iOS simulator runs on ${hosted.machine}`;
+			for (const native of ["ios", "android"]) {
+				const records = Object.values(hostedNativeRecords(readWorkspaceState$1(root), native));
+				if (records.length) {
+					const placement = parseHostedNativePlacement(records[0], native);
+					return placement ? `its ${native === "ios" ? "iOS simulator" : "Android emulator"} runs on ${placement.machine}` : `its hosted ${native} placement is unreadable`;
+				}
+			}
 			const lease = heldDeviceLease(root, Date.now());
 			if (lease) return lease;
 			const readActivity = createActivityReader();
@@ -592,7 +598,7 @@ async function runSupervisor({ root, port, tunnel = false, resetCache = false, i
 		return writer.write(entry);
 	} });
 	try {
-		server = await (mode === "expo-child" ? startExpo || (await import("./server-expo-CVqO2c35.mjs")).startExpoServer : startBare || (await import("./server-bare-CpPGmnmO.mjs")).startBareServer)({
+		server = await (mode === "expo-child" ? startExpo || (await import("./server-expo-CeakhI8P.mjs")).startExpoServer : startBare || (await import("./server-bare-BkrSxSsZ.mjs")).startBareServer)({
 			root,
 			port,
 			logsDir,
@@ -650,7 +656,6 @@ async function runSupervisor({ root, port, tunnel = false, resetCache = false, i
 	});
 	closeHostedMetro = watchHostedMetro(root, port, processToken);
 	const deviceIdleMs = deviceIdleMinutes * 6e4;
-	const workspaceProbe = workspaceIdleProbe(root);
 	const shutDownIdleDevices = (idleMs) => deviceIdle.shutDown(root, idleMs, (entry) => writer.write({
 		src: "metro",
 		...entry
@@ -658,14 +663,7 @@ async function runSupervisor({ root, port, tunnel = false, resetCache = false, i
 	if (deviceIdleMinutes > 0) stopWatchingDevices = watchIdleDevices({
 		idleMs: deviceIdleMs,
 		now,
-		lastUseAt: () => {
-			let deviceLog = NaN;
-			try {
-				deviceLog = statSync(join(logsDir, "device.ndjson")).mtimeMs;
-			} catch {}
-			const times = [workspaceProbe.lastActivityAt(), deviceLog].filter(Number.isFinite);
-			return times.length ? Math.max(...times) : NaN;
-		},
+		lastUseAt: () => workspaceDeviceLastUseAt(root),
 		hasDue: () => deviceIdle.due(root, deviceIdleMs).length > 0,
 		onDue: async () => {
 			try {