stim 1.15.0 → 1.17.0

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

@@ -1,40 +1,100 @@
 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 } from "./config-D0DbpZtM.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 parseNdjsonLine } from "./ndjson-CDY9IkVC.mjs";
-import { C as workspaceLogsDir, S as workspaceLogErrorIndex, r as readWorkspaceState$1 } from "./workspace-state-CL2V2Ons.mjs";
-import { c as gitCommonDirOnDisk, p as linkedWorktreesOnDisk, s as gitCommonDir, y as repoRoot } from "./worktree-C0c5Udwa.mjs";
-import { l as projectShortcut, o as findServerWorkspace, r as detectIsExpo } from "./project-CV3tDFHl.mjs";
-import { c as readMetroTunnel, f as readWorkspaceLaunches, u as readRemoteSession } from "./state-CaeaHbDA.mjs";
-import { c as tailLines, n as createActivityReader, r as createDeviceProcessTables, s as readWebActivity } from "./activity-B2-kb7k0.mjs";
-import { a as formatElapsed, i as formatDuration, r as clockTime } from "./command-output-CliHHn7a.mjs";
-import { i as listLeaseFiles, r as leaseIsExpired, s as parseWorkspaceLeases } from "./device-lease-W5Pi1q38.mjs";
-import { F as ownedAvdDeviceProfile, O as listAdbDevices, at as POOL_SETTING_REMEDY, d as androidToolPath, dt as parkedMaxSetting, ft as readParked, z as ownedAvdSerialResolver } from "./android-Db2eEMaf.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-Di8EN2Tb.mjs";
-import { a as readWebPage, o as readWebRecord, u as webFacts } from "./state-DFm77wRn.mjs";
-import { d as listAllIosSimsAsync, v as parseSimctlList } from "./ios-3CtCRhwr.mjs";
-import { a as buildStatusLine, h as statsProjectKey$1, i as buildReport, p as readStats, r as activeBuildState, s as parseActiveBuild, t as ACTIVE_BUILD_KEY } from "./build-progress-C2Jv1AtA.mjs";
-import { n as describeMetroLastStop, o as metroLastStop, u as resolveSupervisorTarget } from "./stop-cause-CZ_Mr-v9.mjs";
-import { m as hasMetroReverse } from "./app-install-CAAplXAt.mjs";
-import { r as probeHostedMacos } from "./hosted-macos-DwowNU7W.mjs";
-import { m as readEasSessionLedger$1, p as easMachineStateRoot$1 } from "./device-remote-9ulPsdhY.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-l84Gbvp2.mjs";
-import { n as attributeMachineUsage, r as readFootprints } from "./machine-usage-D_YYMzfR.mjs";
-import { d as readIosDevices, s as isReachable } from "./ios-device-DERmMmk-.mjs";
-import { n as mergeState } from "./merge-state-BnxLNQiM.mjs";
-import { i as createStatusMeasurer, n as workspacePhase, r as applyStatusMeasures } from "./warm-progress-DVHLN4uC.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-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-DF4JRvYI.mjs";
+import { r as workspaceRecordingEnabled } from "./recordings-BNgsD1Tr.mjs";
 import { t as watchStdoutReader } from "./stdout-reader-C8yjre1x.mjs";
-import { r as workspaceRecordingEnabled } from "./recordings-GEXp4iBT.mjs";
-import { i as readSupervisorState } from "./stop-Bad61z_2.mjs";
+import { t as triggerMaintenance } from "./trigger-Bemu8ytw.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";
-import { closeSync as closeSync$1, existsSync as existsSync$1, fstatSync as fstatSync$1, openSync as openSync$1, readFileSync as readFileSync$1, readSync as readSync$1, renameSync as renameSync$1, rmSync as rmSync$1, writeFileSync as writeFileSync$1 } from "fs";
+import { closeSync as closeSync$1, existsSync as existsSync$1, fstatSync as fstatSync$1, openSync as openSync$1, readFileSync as readFileSync$1, readSync as readSync$1, renameSync as renameSync$1, rmSync as rmSync$1, statSync as statSync$1, writeFileSync as writeFileSync$1 } from "fs";
 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, bundleMarkerPlatform, countErrorEntries, gitMergeCacheDir, logFiles, macosAppState, queryLogs, readBuildDetail, readBuildHistory, readDeviceIdleShutdowns, readIdleStop, readLastBuilds, readMacosRecord, recordMatches, sortByTs, 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 { state, warning } = hostedNativeProbe(placement, probe, slot, "ios");
+	return {
+		ios: {
+			host: {
+				...hostedIosStatus(placement),
+				state
+			},
+			name: placement.device?.name ?? null,
+			udid: "",
+			owned: false,
+			state
+		},
+		...warning ? { warning } : {}
+	};
+}
+async function readHostedIosStatus(placements) {
+	return Object.fromEntries(await Promise.all(Object.entries(placements).map(async ([slot, placement]) => [slot, applyHostedIosProbe(placement, await probeHostedSession(placement), slot)])));
+}
+//#endregion
 //#region src/device-host/hosted-macos-status.ts
 function applyHostedMacosProbe(record, probe) {
 	if (!record.host || probe.state === "ready") return { record };
@@ -56,7 +116,7 @@ function applyHostedMacosProbe(record, probe) {
 }
 async function readHostedMacosStatus(record, options) {
 	if (!record?.host || record.supervisor || !record.hostLaunched) return { record };
-	return applyHostedMacosProbe(record, await probeHostedMacos(record.host, options));
+	return applyHostedMacosProbe(record, await probeHostedSession(record.host, options));
 }
 //#endregion
 //#region src/status-watch.ts
@@ -125,14 +185,18 @@ function createRefreshScheduler({ debounceMs, lightIntervalMs = 0, run }) {
 * null for none. A null name means the platform did not report one.
 */
 function statusChange(dir, name) {
+	if (dir === "archive" && (name?.startsWith(".incoming-") || name?.startsWith(".removing-") || name?.startsWith(".lock"))) return null;
 	if (name?.includes(".lock")) return null;
 	if (dir === "logs") return "light";
 	if (name === null) return "full";
 	switch (dir) {
-		case "home": return name.startsWith("config.json") || name === "workspaces" || name === "device-locks" ? "full" : null;
+		case "home":
+			if (name === "maintenance") return "light";
+			return name.startsWith("config.json") || name === "archive" || name === "workspaces" || name === "device-locks" ? "full" : null;
 		case "workspace":
 			if (name.startsWith("build-detail.json")) return "light";
 			return name.startsWith("state.json") || name.startsWith("ended-agents.json") || name === "logs" ? "full" : null;
+		case "maintenance": return name === "state.json" ? "light" : null;
 		case "eas": return name.startsWith("sessions.json") ? "full" : null;
 		default: return "full";
 	}
@@ -156,7 +220,9 @@ function watchStatusSources({ home, onChange, platform = process.platform, simct
 	const desiredDirs = () => {
 		const dirs = /* @__PURE__ */ new Map([
 			[home, "home"],
+			[join(home, "archive"), "archive"],
 			[join(home, "workspaces"), "workspaces"],
+			[join(home, "maintenance"), "maintenance"],
 			[join(home, "device-locks"), "leases"],
 			[easMachineStateRoot$1(), "eas"]
 		]);
@@ -970,6 +1036,71 @@ function physicalDeviceLine(device, now) {
 //#endregion
 //#region src/commands/status.ts
 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}${host.selected === "auto" && host.reason ? ` (auto: ${host.reason})` : ""}` : ios.name ?? ios.udid;
+}
+function iosStatusLines(record, slotLabel) {
+	const out = [];
+	const host = record?.udid ? record.host : void 0;
+	const iosDevices = [record, ...host ? [{
+		host,
+		name: host.device?.name ?? null,
+		udid: "",
+		owned: false,
+		state: host.state ?? "unverified"
+	}] : []];
+	for (const ios of iosDevices) {
+		if (!ios) continue;
+		const booted = ios.state === "Booted" ? chalk.green("booted") : chalk.dim(ios.state.toLowerCase());
+		const owned = ios.owned ? chalk.dim(" (owned)") : "";
+		out.push(`  ios${slotLabel}: ${chalk.cyan(iosStatusName(ios))} ${booted}${owned}${activitySuffix(ios.activity)}${appSuffix(ios.app)}${idleShutdownSuffix(ios.idleShutdown)}`);
+		if (!ios.udid && ios.host?.agent.driver === "agent-device") out.push(chalk.dim(`    agent: ${ios.host.agent.command}`));
+	}
+	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`;
 }
@@ -980,12 +1111,14 @@ function statusCommand(program) {
 		for (const line of renderStatus(await readStatus(0), json)) console.log(line);
 	});
 }
-function readStatus(gitMaxAgeMs, simctlListing = null) {
-	return withStateReadCache(() => readStatusFacts(gitMaxAgeMs, simctlListing));
+function readStatus(gitMaxAgeMs, simctlListing = null, archives) {
+	return withStateReadCache(() => readStatusFacts(gitMaxAgeMs, simctlListing, archives));
 }
-async function readStatusFacts(gitMaxAgeMs, simctlListing) {
+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)]);
@@ -1021,7 +1154,7 @@ async function readStatusFacts(gitMaxAgeMs, simctlListing) {
 	}
 	const running = await processes;
 	await gitRead;
-	const history = readStats().record?.history;
+	const history = readStats$1().record?.history;
 	const states = [];
 	const labelOnlyRoots = [];
 	const launchesByState = [];
@@ -1080,6 +1213,30 @@ async function readStatusFacts(gitMaxAgeMs, simctlListing) {
 		}), web));
 		const state = states[states.length - 1];
 		if (state) {
+			for (const [slot, record] of Object.entries(hostedIosRecords(saved))) if (!parseHostedIosPlacement(record)) state.warnings.push(unreadableHostedIos(slot));
+			for (const [slot, facts] of Object.entries(await iosReads[i])) {
+				const local = slot === "default" ? state.ios : state.slots?.find((entry) => entry.slot === slot)?.ios;
+				const conflict = local?.udid && (local.state === "Booted" || local.state === "unknown");
+				const ios = conflict ? {
+					...local,
+					host: facts.ios.host
+				} : facts.ios;
+				if (conflict) state.warnings.push(`Slot ${slot} records both a local and hosted iOS simulator (${iosStatusName(facts.ios)}); run stim stop to reconcile them.`);
+				if (slot === "default") state.ios = ios;
+				else {
+					state.slots ??= [];
+					const savedSlot = state.slots.find((entry) => entry.slot === slot);
+					if (savedSlot) savedSlot.ios = ios;
+					else state.slots.push({
+						slot,
+						ios,
+						android: null
+					});
+				}
+				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,
@@ -1090,7 +1247,16 @@ async function readStatusFacts(gitMaxAgeMs, simctlListing) {
 				if (macosFacts.warning) state.warnings.push(macosFacts.warning);
 				state.live ||= macos.state === "running" || macos.state === "orphaned" || macos.build.state === "running";
 			}
-			Object.assign(state, builds, workspacePhase(state.live, saved, { now: leaseNow }), { recording: { enabled: workspaceRecordingEnabled(path, proj, cfg, process.env) } });
+			Object.assign(state, builds, workspacePhase(state.live, saved, { now: leaseNow }), {
+				platforms: detectPlatforms(path, resolveSettings({
+					projectPath: path,
+					gitCommonDir: gitCommonDirOnDisk(path),
+					repoRoot: state.worktree?.path ?? path
+				})),
+				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,
@@ -1118,7 +1284,11 @@ async function readStatusFacts(gitMaxAgeMs, simctlListing) {
 		tables,
 		busy: sims.some((sim) => sim.state === "Booted")
 	});
+	const archives = cachedArchives ?? readArchives();
+	const maxCount = machineNumber("archive.maxCount", cfg, process.env);
 	return {
+		archived: linkReplacedArchives(archives.slice(0, maxCount.value ?? 200), states.map((state) => state.path)),
+		archivedUsage: archivedUsage(archives),
 		projects,
 		states,
 		labelOnlyRoots,
@@ -1139,8 +1309,21 @@ async function readStatusFacts(gitMaxAgeMs, simctlListing) {
 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(state.path), "metro.ndjson")) ?? [], {
+			const bundle = metroBundleState(tailLines(join$1(workspaceLogsDir$1(state.path), "metro.ndjson")) ?? [], {
 				running: state.metro.running,
 				now
 			});
@@ -1225,7 +1408,7 @@ async function refreshLightFacts(snapshot, machine) {
 		busy: true
 	});
 }
-function renderStatus({ projects, states, labelOnlyRoots, leases, leaseNow, orphanWorktrees, simsAvailable, simctlError, cwdRoot, machine }, json) {
+function renderStatus({ archived, archivedUsage: usage, projects, states, labelOnlyRoots, leases, leaseNow, orphanWorktrees, simsAvailable, simctlError, cwdRoot, machine }, json) {
 	const out = [];
 	const totalMemoryMb = Math.round(totalmem() / 1048576);
 	const cap = capacity(states, totalMemoryMb);
@@ -1240,20 +1423,26 @@ function renderStatus({ projects, states, labelOnlyRoots, leases, leaseNow, orph
 			})
 		};
 	});
+	const maintenance = maintenanceStatus();
 	if (json) {
 		out.push(JSON.stringify({
 			environments: states.map((state, i) => withDerivedFacts(labelOnlyRoots[i] ? {
 				...state,
 				labelOnly: true
 			} : state)),
+			archived,
+			archivedUsage: usage,
 			capacity: cap,
 			deviceLeases: leases,
 			unprovisionedWorktrees: orphanWorktrees.map(withGitChip),
 			simctlAvailable: simsAvailable,
-			machine
+			machine,
+			maintenance
 		}));
 		return out;
 	}
+	out.push(...maintenanceLines(maintenance).map((line) => chalk.dim(line)));
+	if (usage.count) out.push(`Archived: ${plural(usage.count, "workspace")}, ${formatBytes(usage.bytes)}`);
 	if (projects.length === 0 && orphanWorktrees.length === 0) {
 		out.push(chalk.dim("No projects registered."));
 		for (const pool of pools) {
@@ -1303,16 +1492,8 @@ function renderStatus({ projects, states, labelOnlyRoots, leases, leaseNow, orph
 			android: state.android
 		}, ...state.slots ?? []]) {
 			const slotLabel = deviceState.slot === "default" ? "" : ` [${deviceState.slot}]`;
-			if (deviceState.ios) {
-				const booted = deviceState.ios.state === "Booted" ? chalk.green("booted") : chalk.dim(deviceState.ios.state.toLowerCase());
-				const owned = deviceState.ios.owned ? chalk.dim(" (owned)") : "";
-				out.push(`  ios${slotLabel}: ${chalk.cyan(deviceState.ios.name ?? deviceState.ios.udid)} ${booted}${owned}${activitySuffix(deviceState.ios.activity)}${appSuffix(deviceState.ios.app)}${idleShutdownSuffix(deviceState.ios.idleShutdown)}`);
-			}
-			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(...iosStatusLines(deviceState.ios, slotLabel));
+			out.push(...androidStatusLines(deviceState.android, slotLabel));
 		}
 		if (state.macos) {
 			const host = state.macos.host;
@@ -1361,6 +1542,8 @@ function renderStatus({ projects, states, labelOnlyRoots, leases, leaseNow, orph
 }
 async function watchStatus(json) {
 	let last = null;
+	let archiveStamp = null;
+	let archives;
 	let snapshot = null;
 	let sources = null;
 	const measurer = createStatusMeasurer({ updated: () => scheduler.trigger("light") });
@@ -1368,10 +1551,21 @@ async function watchStatus(json) {
 		debounceMs: 250,
 		lightIntervalMs: WATCH_LIGHT_INTERVAL_MS,
 		run: async (kind) => {
+			triggerMaintenance("status-watch");
 			let text;
 			try {
 				if (kind === "light" && snapshot) await refreshLightFacts(snapshot, json);
-				else snapshot = await readStatus(WATCH_GIT_MAX_AGE_MS, sources?.simulatorListing());
+				else {
+					let stamp = null;
+					try {
+						stamp = statSync$1(archiveRoot()).mtimeMs;
+					} catch {}
+					if (archives === void 0 || stamp !== archiveStamp) {
+						archives = readArchives();
+						archiveStamp = stamp;
+					}
+					snapshot = await readStatus(WATCH_GIT_MAX_AGE_MS, sources?.simulatorListing(), archives);
+				}
 				measurer.schedule(snapshot.states, snapshot.worktrees);
 				text = renderStatus(snapshot, json).join("\n");
 			} catch (error) {
@@ -1431,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());
@@ -1649,7 +1843,7 @@ async function supervisorFacts(path, proj, metroResolution, lookup) {
 	};
 }
 function logFacts(path) {
-	const dir = workspaceLogsDir(path);
+	const dir = workspaceLogsDir$1(path);
 	if (!existsSync$1(dir)) return null;
 	try {
 		return {

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

@@ -1,3 +1,3 @@
-import { u as resolveSupervisorTarget } from "./stop-cause-CZ_Mr-v9.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-Bad61z_2.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-Bad61z_2.mjs → stop-BjizrQwv.mjs}

@@ -1,28 +1,31 @@
-import { B as parseDeviceSlotKey, D as withConfigLock, 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 { 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 { b as workspaceDir, c as writeWorkspaceState, n as clearWorkspaceStateKeys, o as withWorkspaceStateLock, r as readWorkspaceState } from "./workspace-state-CL2V2Ons.mjs";
-import { i as findCommandWorkspace } from "./project-CV3tDFHl.mjs";
-import { a as clearRemoteSession, c as readMetroTunnel, i as clearManagedMetroTunnel, o as clearWorkspaceLaunches, s as clearWorkspaceSupervisor, u as readRemoteSession } from "./state-CaeaHbDA.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-BL7Q0HCO.mjs";
-import { f as refuseNoProject, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-CliHHn7a.mjs";
-import { n as fileLeaseIo, u as releaseWorkspaceLeases } from "./device-lease-W5Pi1q38.mjs";
-import { l as resolveProjectMetro, o as pidExists, r as killMetroTree, u as signalProcessTree } from "./metro-Di8EN2Tb.mjs";
-import { a as teardownOwnedBrowser, i as teardownOwnedAvd, o as teardownOwnedIosSim } from "./teardown-BYuQafiA.mjs";
-import { a as logVanishedSupervisor, l as withdrawDevServerStopRequest, p as stopTunnel, s as requestDevServerStop, u as resolveSupervisorTarget } from "./stop-cause-CZ_Mr-v9.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-BkYxUtuj.mjs";
-import { t as stopMacosApp } from "./stop-Bvf1MflS.mjs";
-import { f as resolveEasCliBin } from "./remote-cache-CO2elm_b.mjs";
-import { i as endRecordedSession } from "./device-remote-9ulPsdhY.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-DFDoIRbY.mjs";
+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;
 function readSupervisorState(root) {
-	const sup = readWorkspaceState(root)?.supervisor;
+	const sup = readWorkspaceState$1(root)?.supervisor;
 	return sup && typeof sup === "object" ? sup : null;
 }
 function readCollectorState(root) {
-	const collectors = readWorkspaceState(root)?.collectors;
+	const collectors = readWorkspaceState$1(root)?.collectors;
 	return collectors && typeof collectors === "object" ? collectors : {};
 }
 function clearSupervisorState(root, expected) {
@@ -34,7 +37,7 @@ function clearSupervisorState(root, expected) {
 }
 function clearCollectorState(root, expected) {
 	return withWorkspaceStateLock(root, () => {
-		const current = { ...readWorkspaceState(root)?.collectors };
+		const current = { ...readWorkspaceState$1(root)?.collectors };
 		if (expected === void 0) {
 			clearWorkspaceStateKeys(root, ["collectors"]);
 			return true;
@@ -156,6 +159,7 @@ async function runStop(options) {
 		clearRegistration: async () => true,
 		teardownBrowser: null,
 		stopMacos: false,
+		hostedSlot: slot,
 		releaseLeases: (projectRoot) => releaseWorkspaceLeases(projectRoot, { slot })
 	});
 	result.outcomes.port = {
@@ -214,8 +218,39 @@ async function stopBrowserOnly({ root, project = void 0, teardownBrowser = (proj
 		summary: summarize(root, outcomes, ok)
 	};
 }
+async function stopWorkspaceHostedNative(root, slot, report, failed) {
+	const devices = {};
+	let anyFailed = false;
+	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 = 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 (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[`${platform}:host:${name}`] = {
+				status: "failed",
+				label,
+				reason
+			};
+			report(chalk.red(phaseLine("device", reason)));
+			failed();
+			anyFailed = true;
+		}
+	}
+	return {
+		devices,
+		failed: anyFailed
+	};
+}
 async function stopWorkspaceMacos(root, failed, enabled) {
-	if (enabled === false || readWorkspaceState(root)?.macos === void 0) return void 0;
+	if (enabled === false || readWorkspaceState$1(root)?.macos === void 0) return void 0;
 	try {
 		await stopMacosApp(root);
 		return { status: "stopped" };
@@ -228,7 +263,7 @@ async function stopWorkspaceMacos(root, failed, enabled) {
 		};
 	}
 }
-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, teardownBrowser = (projectRoot) => teardownOwnedBrowser(projectRoot), stopMacos, 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, teardownBrowser = (projectRoot) => teardownOwnedBrowser(projectRoot), stopMacos, hostedSlot, 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;
@@ -389,6 +424,25 @@ async function stopWorkspace({ root, project = void 0, state = void 0, collector
 		ok = false;
 		report(reason);
 	}, stopMacos);
+	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) {
@@ -795,7 +849,7 @@ function summarize(root, outcomes, ok) {
 	return `${ok ? "Stopped" : "Stopped with problems"}: ${what} (${root})`;
 }
 function defaultFreePort(root, port) {
-	return withConfigLock(() => {
+	return withConfigLock$1(() => {
 		const current = getProject(root);
 		if (!current) return true;
 		if (current.supervisor || current.metroPort !== port) return false;
@@ -836,10 +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)),
+		...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)),
+		...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;
 }