stim 1.20.2 → 1.22.0

package/dist/{status-WgFbkRzj.mjs → status-WBDajew2.mjs}

@@ -1,41 +1,39 @@
-import { B as deviceSlotKey, H as parseDeviceSlotKey, L as volumeRootFor, N as formatBytes, W as projectDeviceSlots, _ as loadConfig$1, d as getConfigDir, k as process_identity_exports } from "./config-BYDxlMY3.mjs";
-import { t as getExecutor } from "./exec-DqKo9GKJ.mjs";
-import { n as gitAsync } from "./git-DDfFzkMm.mjs";
-import { Dt as repoRoot, gt as gitCommonDirOnDisk, ht as gitCommonDir, it as workspaceHiddenSetting, q as resolveSettings, xt as linkedWorktreesOnDisk } from "./settings-B717odTD.mjs";
-import { i as listLeaseFiles, r as leaseIsExpired, s as parseWorkspaceLeases } from "./device-lease-BX1sJQ2E.mjs";
-import { C as workspaceLogErrorIndex, r as readWorkspaceState$1, w as workspaceLogsDir$1 } from "./workspace-state-DJt_MMvf.mjs";
-import { a as formatElapsed, i as formatDuration, r as clockTime, u as plural } from "./command-output-BTy8hZ0F.mjs";
-import { F as readWorkspaceLaunches, N as readRemoteSession, _ as detectIsExpo, c as projectShortcut, i as findServerWorkspace, j as readMetroTunnel, l as detectPlatforms, v as detectTutorial, x as readAppJson } from "./project-_phNIJfs.mjs";
-import { F as ownedAvdDeviceProfile, O as listAdbDevices, at as POOL_SETTING_REMEDY, dt as parkedMaxSetting, ft as readParked, z as ownedAvdSerialResolver } from "./android-Mz_Inn3w.mjs";
-import { a as listeningPidsByPort, c as processCwd, i as listeningPids, l as processCwds, p as isMetroRunning, s as pidExists, u as resolveProjectMetro } from "./metro-DnCEjCxs.mjs";
-import { P as resolveSupervisorTarget } from "./workspaces-C36s2jb9.mjs";
-import { Ct as bundlingActivity, It as statsProjectKey$1, Mt as readStats$1, St as buildStatusLine, Tt as parseActiveBuild, bt as activeBuildState, it as readFootprints, mt as metroLastStop, o as machineNumber, rt as attributeMachineUsage, ut as describeMetroLastStop, vt as ACTIVE_BUILD_KEY, xt as buildReport } from "./budget-f7516Zk0.mjs";
-import { a as parseNdjsonLine } from "./ndjson-GOnbyvso.mjs";
-import { a as readWebPage, o as readWebRecord, u as webFacts } from "./state-D1Icyjlu.mjs";
-import { C as statusActivity, E as withWebFacts, S as remoteDeviceState, T as unprovisionedWorktrees, _ as gitSummaryText, b as poolLine, c as activityLabel, d as capacity, f as deviceLeaseLines, h as environmentState, l as addReverseMissingIssue, m as diskLine, p as deviceLeaseStates, u as applyMachineMemory, v as metroReverseTargets, w as tightVolumes, x as remoteDeviceLine, y as parseDfFree } from "./watchman-CPQFZLXY.mjs";
-import { d as readWebActivity, f as tailLines, i as createDeviceProcessTables, r as createActivityReader } from "./activity-BSV745Kz.mjs";
-import { b as parseSimctlList, f as listAllIosSimsAsync } from "./ios-RkW4pnQf.mjs";
-import { h as hasMetroReverse } from "./app-install-BIKtMfPq.mjs";
-import { d as probeHostedSession } from "./hosted-client-ZEKpS9vw.mjs";
-import { r as readEasSessionLedger$1 } from "./eas-session-ledger-Cm0Gwq2F.mjs";
-import { d as readIosDevices, s as isReachable } from "./ios-device-D7pi2Sca.mjs";
-import "./hosted-macos-BACVAVqE.mjs";
-import { i as readSupervisorState } from "./stop-BNmBMi1F.mjs";
-import { i as createStatusMeasurer, n as workspacePhase, r as applyStatusMeasures, s as mergeState } from "./warm-progress-BuY-Fvfn.mjs";
-import { r as workspaceRecordingEnabled } from "./recordings-D0d5aQt0.mjs";
-import { n as maintenanceLines, r as maintenanceStatus } from "./status-BTA7kKiQ.mjs";
-import { a as watchStatusSources, i as watchPayload, n as WATCH_LIGHT_INTERVAL_MS, r as createRefreshScheduler, t as WATCH_FALLBACK_MS } from "./status-watch-C23ILtf9.mjs";
+import { g as process_identity_exports, t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { m as workspaceLogsDir$1, p as workspaceLogErrorIndex } from "./paths-DQtTgsBf.mjs";
+import { G as projectDeviceSlots, P as formatBytes, R as volumeRootFor, U as parseDeviceSlotKey, V as deviceSlotKey, _ as loadConfig$1, d as getConfigDir } from "./config-DlrsduwG.mjs";
+import { a as formatElapsed, i as formatDuration, r as clockTime, u as plural } from "./command-output-gwpm28fu.mjs";
+import { s as gitAsync } from "./operation-exec-BW0em61G.mjs";
+import { r as readWorkspaceState$1 } from "./workspace-state-U08dEzhG.mjs";
+import { Mt as repoRoot, Y as resolveSettings, _t as gitCommonDir, ot as workspaceHiddenSetting, wt as linkedWorktreesOnDisk, yt as gitCommonDirOnDisk } from "./settings-C7O8A6ZI.mjs";
+import { I as readWorkspaceLaunches, M as readMetroTunnel, P as readRemoteSession, S as readAppJson, a as findServerWorkspace, l as projectShortcut, u as detectPlatforms, v as detectIsExpo, y as detectTutorial } from "./project-wM_XFTvE.mjs";
+import { a as parseNdjsonLine } from "./ndjson-CgE_o3Dl.mjs";
+import { c as pidExists, d as resolveProjectMetro, h as isMetroRunning, i as listeningPids, l as processCwd, o as listeningPidsByPort, u as processCwds } from "./metro-DiXtA3Ty.mjs";
+import { a as readWebPage, o as readWebRecord, u as webFacts } from "./state--smjFSTL.mjs";
+import { A as remoteDeviceState, C as environmentState, D as parseDfFree, E as metroReverseTargets, M as tightVolumes, N as unprovisionedWorktrees, O as poolLine, P as withWebFacts, S as diskLine, T as gitSummaryText, _ as addReverseMissingIssue, b as deviceLeaseLines, g as activityLabel, j as statusActivity, k as remoteDeviceLine, r as readEasSessionLedger$1, v as applyMachineMemory, x as deviceLeaseStates, y as capacity } from "./eas-session-ledger-DlY_serQ.mjs";
+import { F as buildStatusLine, G as readStats$1, I as bundlingActivity, N as activeBuildState, P as buildReport, R as parseActiveBuild, Y as statsProjectKey$1, h as describeMetroLastStop, j as ACTIVE_BUILD_KEY, o as machineNumber, vn as hasMetroReverse, vr as attributeMachineUsage, y as metroLastStop, yr as readFootprints } from "./budget-Cvwn54qV.mjs";
+import { h as resolveSupervisorTarget } from "./workspaces-CpANmBlq.mjs";
+import { a as createDeviceProcessTables, b as leaseIsExpired, h as tailLines, m as readWebActivity, r as createActivityReader, w as parseWorkspaceLeases, x as listLeaseFiles } from "./activity-CMLmzp7o.mjs";
+import { A as listAdbDevices, B as ownedAvdDeviceProfile, W as ownedAvdSerialResolver, _t as parkedMaxSetting, dt as POOL_SETTING_REMEDY, vt as readParked } from "./android-C7sVmyI9.mjs";
+import { b as parseSimctlList, f as listAllIosSimsAsync } from "./ios-hcBpnEGk.mjs";
+import { f as probeHostedSession } from "./hosted-client-DZAPrcro.mjs";
+import "./hosted-macos-_awYSpfv.mjs";
+import { i as readSupervisorState } from "./stop-Mv6W9FAk.mjs";
+import { n as maintenanceLines, r as maintenanceStatus } from "./status-BRROykC8.mjs";
+import { f as mergeState, i as createStatusMeasurer, n as workspacePhase, r as applyStatusMeasures } from "./warm-progress-CA3TgT3-.mjs";
+import { r as workspaceRecordingEnabled } from "./recordings-CQmfzAh7.mjs";
+import { d as readIosDevices, s as isReachable } from "./ios-device--h_-8ENa.mjs";
+import { t as triggerMaintenance } from "./trigger-Cbyc41d_.mjs";
+import { a as createRefreshScheduler, c as watchStatusSources, n as WATCH_LIGHT_INTERVAL_MS, o as watchChangeKey, r as WATCH_MACHINE_INTERVAL_MS, s as watchPayload, t as WATCH_FALLBACK_MS } from "./status-watch-Bg_u-pwR.mjs";
 import { t as watchStdoutReader } from "./stdout-reader-C8yjre1x.mjs";
-import { t as triggerMaintenance } from "./trigger-CigAYjeL.mjs";
+import { createHash, randomUUID } from "node:crypto";
 import { mkdirSync, readFileSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { join, posix, resolve } from "node:path";
-import { basename as basename$1, dirname as dirname$1, join as join$1 } from "path";
-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 { 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 { rotatedLogPath } from "@stim-cli/core";
-import { homedir, totalmem } from "os";
-import { createHash, randomUUID } from "node:crypto";
+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 { basename as basename$1, dirname as dirname$1, join as join$1 } from "path";
 import chalk from "chalk";
+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, userInfo } from "os";
 //#region src/device-host/hosted-native-status.ts
 function hostedNativeProbe(placement, probe, slot, platform) {
 	const label = platform === "ios" ? "iOS" : "Android";
@@ -502,7 +500,8 @@ function gitFilesStamp(worktree, refs) {
 * default-branch commit stands in, because a merged branch stays merged. A judgement that timed out is not retried
 * for the same HEAD and target for five minutes. With `maxAgeMs`, a summary made that recently in this process is
 * reused while the git files it depends on are unchanged, so a change that is not staged can take up to `maxAgeMs`
-* to show; so is the null of a worktree whose directory is gone.
+* to show; so is the null of a worktree whose directory is gone. Deferred merge verdicts are retried independently
+* of the cached counts without renewing their age.
 */
 async function readWorktreeGit(worktrees, { skip, maxAgeMs = 0 }) {
 	const now = Date.now();
@@ -520,7 +519,7 @@ async function readWorktreeGit(worktrees, { skip, maxAgeMs = 0 }) {
 		const files = maxAgeMs > 0 ? gitFilesStamp(worktree, refs) : null;
 		if (memo && memo.files !== null && memo.files === files?.stamp && now - memo.at < maxAgeMs) return {
 			path: worktree.path,
-			memo: memo.git
+			memo
 		};
 		const repository = worktree.repository;
 		if (repository && !targets.has(repository)) targets.set(repository, defaultBranchOf(repository));
@@ -543,7 +542,16 @@ async function readWorktreeGit(worktrees, { skip, maxAgeMs = 0 }) {
 	const summaries = /* @__PURE__ */ new Map();
 	for (const read of reads) {
 		if ("memo" in read) {
-			summaries.set(read.path, read.memo ?? null);
+			const memo = read.memo;
+			if (memo?.git && memo.pendingMerge) {
+				const merge = mergedInto(read.path, memo.pendingMerge.head, memo.pendingMerge.target, budget);
+				memo.git = {
+					...memo.git,
+					mergedInto: merge.into
+				};
+				if (!merge.deferred) delete memo.pendingMerge;
+			}
+			summaries.set(read.path, memo?.git ?? null);
 			continue;
 		}
 		if (!read.status) {
@@ -566,12 +574,16 @@ async function readWorktreeGit(worktrees, { skip, maxAgeMs = 0 }) {
 			upstream: counts.upstream,
 			target: read.target?.ref ?? null
 		};
-		const settled = !merge?.deferred && refs.upstream === read.refs.upstream && refs.target === read.refs.target;
+		const settled = refs.upstream === read.refs.upstream && refs.target === read.refs.target;
 		recent.set(read.path, {
 			at: read.at,
 			files: settled ? read.files?.stamp ?? null : null,
 			refs,
-			git: summary
+			git: summary,
+			...merge?.deferred && head && read.target ? { pendingMerge: {
+				head,
+				target: read.target
+			} } : {}
 		});
 		summaries.set(read.path, summary);
 	}
@@ -778,31 +790,11 @@ function physicalDeviceLine(device, now) {
 	return `${device.platform}${slot}: ${name} (physical${model}) ${device.connection} -- leased until ${clockTime(device.lease.expiresAt)} (${remaining} left)`;
 }
 //#endregion
-//#region src/commands/status.ts
-const WATCH_GIT_MAX_AGE_MS = 6e4;
+//#region src/status-read.ts
 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)) {
@@ -828,23 +820,6 @@ function applyHostedAndroidStates(state, saved, factsBySlot) {
 		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 doctorRunTimes(proj) {
 	const runs = {};
 	for (const platform of ["ios", "android"]) {
@@ -853,48 +828,55 @@ function doctorRunTimes(proj) {
 	}
 	return Object.keys(runs).length ? runs : void 0;
 }
-function formatGb(mb) {
-	return `${(mb / 1024).toFixed(1)} GB`;
-}
-function statusCommand(program) {
-	program.command("status").description("Show every environment on this machine: devices, ports, what is actually running, and anything stuck.").option("--json", "print the state as JSON").option("--watch", "keep running and print the state again each time it changes").action(async (opts) => {
-		if (opts.watch) return watchStatus(Boolean(opts.json));
-		const json = Boolean(opts.json);
-		for (const line of renderStatus(await readStatus(0), json)) console.log(line);
-	});
+/**
+* Probes that read everything when asked. `simctlListing`, when given, answers `simulators` without running simctl,
+* `gitMaxAgeMs` reuses git summaries read that recently, and `archives` answers `archives` without reading them.
+*/
+function liveProbes({ simctlListing = null, gitMaxAgeMs = 0, archives } = {}) {
+	return {
+		simulators: () => simctlListing === null ? listAllIosSimsAsync() : Promise.resolve().then(() => parseSimctlList(simctlListing)),
+		metro: readMetroFacts,
+		hostedIos: readHostedIosStatus,
+		hostedAndroid: readHostedAndroidStatus,
+		hostedMacos: readHostedMacosStatus,
+		git: (worktrees, skip) => readWorktreeGit(worktrees, {
+			maxAgeMs: gitMaxAgeMs,
+			skip
+		}),
+		androidRuntime: androidRuntimeReader(),
+		physicalDevice: physicalDeviceReader(),
+		deviceTables: createDeviceProcessTables,
+		metroReverses: (serial) => getExecutor().runFileQuiet("adb", [
+			"-s",
+			serial,
+			"reverse",
+			"--list"
+		], { timeoutMs: 5e3 }),
+		footprints: readFootprints,
+		archives: () => archives ?? readArchives()
+	};
 }
-function readStatus(gitMaxAgeMs, simctlListing = null, archives) {
-	return withStateReadCache(() => readStatusFacts(gitMaxAgeMs, simctlListing, archives));
+/**
+* Reads the status of every environment. With `git: 'all'` it reads the git summary of every worktree before
+* composing; with `'live'` only those of live environments, after composing; with `'none'` no git summary.
+*/
+function readStatus({ probes = liveProbes(), git = "live", cwd = process.cwd() } = {}) {
+	return withStateReadCache(() => readStatusFacts(probes, git, cwd));
 }
-async function readStatusFacts(gitMaxAgeMs, simctlListing, cachedArchives) {
+async function readStatusFacts(probes, gitScope, cwd) {
 	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)]);
+	const iosReads = projects.map(([path]) => probes.hostedIos(hostedIosPlacements(readWorkspaceState$1(path))));
+	const androidReads = projects.map(([path]) => probes.hostedAndroid(hostedAndroidPlacements(readWorkspaceState$1(path))));
+	const macosReads = projects.map(([path]) => probes.hostedMacos(readMacosRecord(path)));
+	const cwdRoot = findServerWorkspace(cwd)?.root ?? null;
+	const { worktrees, commonDirs } = linkedWorktrees([cwd, ...projects.map(([path]) => path)]);
 	const orphanWorktrees = unprovisionedWorktrees(worktrees, projects.map(([p]) => p));
-	const simsRead = simctlListing === null ? listAllIosSimsAsync() : Promise.resolve().then(() => parseSimctlList(simctlListing));
+	const simsRead = probes.simulators();
 	simsRead.catch(() => {});
-	const ports = await portLookup(projects.flatMap(([, proj]) => proj.metroPort ? [proj.metroPort] : []));
-	const processes = Promise.all(projects.map(async ([path, proj]) => {
-		const metro = proj.metroPort ? await resolveOnPort(proj.metroPort, path, ports) : null;
-		return {
-			metro,
-			supervisor: await supervisorFacts(path, proj, metro, ports)
-		};
-	}));
+	const processes = probes.metro(projects);
 	processes.catch(() => {});
-	const watching = gitMaxAgeMs > 0;
-	const gitRead = watching ? readGitInto(worktrees, orphanWorktrees, gitMaxAgeMs) : null;
-	const androidRuntimeOf = androidRuntimeReader();
-	const devices = projects.map(([, proj]) => ({
-		androidRuntimes: Object.fromEntries(projectDeviceSlots(proj).slice(1).map(({ slot, platforms }) => [slot, platforms.android?.owned && platforms.android.avdName ? androidRuntimeOf(platforms.android.avdName) : null])),
-		androidRuntime: proj.platforms?.android?.owned && proj.platforms.android.avdName ? androidRuntimeOf(proj.platforms.android.avdName) : null,
-		androidDeviceProfiles: Object.fromEntries(projectDeviceSlots(proj).slice(1).map(({ slot, platforms }) => [slot, platforms.android?.owned && platforms.android.avdName ? ownedAvdDeviceProfile(platforms.android.avdName) : null])),
-		androidDeviceProfile: proj.platforms?.android?.owned && proj.platforms.android.avdName ? ownedAvdDeviceProfile(proj.platforms.android.avdName) : null
-	}));
+	const gitRead = gitScope === "all" ? readGitInto(probes, worktrees, orphanWorktrees) : null;
 	const logs = projects.map(([path]) => logFacts(path));
 	const simsByUdid = {};
 	let simsAvailable = true;
@@ -906,6 +888,12 @@ async function readStatusFacts(gitMaxAgeMs, simctlListing, cachedArchives) {
 		simctlError = String(e?.message || e).split("\n")[0] ?? "";
 	}
 	const running = await processes;
+	const devices = projects.map(([, proj]) => ({
+		androidRuntimes: Object.fromEntries(projectDeviceSlots(proj).slice(1).map(({ slot, platforms }) => [slot, platforms.android?.owned && platforms.android.avdName ? probes.androidRuntime(platforms.android.avdName) : null])),
+		androidRuntime: proj.platforms?.android?.owned && proj.platforms.android.avdName ? probes.androidRuntime(proj.platforms.android.avdName) : null,
+		androidDeviceProfiles: Object.fromEntries(projectDeviceSlots(proj).slice(1).map(({ slot, platforms }) => [slot, platforms.android?.owned && platforms.android.avdName ? ownedAvdDeviceProfile(platforms.android.avdName) : null])),
+		androidDeviceProfile: proj.platforms?.android?.owned && proj.platforms.android.avdName ? ownedAvdDeviceProfile(proj.platforms.android.avdName) : null
+	}));
 	await gitRead;
 	const history = readStats$1().record?.history;
 	const states = [];
@@ -919,7 +907,6 @@ async function readStatusFacts(gitMaxAgeMs, simctlListing, cachedArchives) {
 		now: leaseNow
 	});
 	const roots = [];
-	const readPhysicalDevice = physicalDeviceReader();
 	const simulatorUdids = new Set([...Object.keys(simsByUdid), ...projects.flatMap(([, proj]) => projectDeviceSlots(proj).flatMap(({ platforms }) => platforms.ios?.deviceUdid ?? []))].map((udid) => udid.toUpperCase()));
 	for (const [i, [path, proj]] of projects.entries()) {
 		const { metro, supervisor } = running[i];
@@ -1024,20 +1011,20 @@ async function readStatusFacts(gitMaxAgeMs, simctlListing, cachedArchives) {
 			root: path,
 			now: leaseNow,
 			simulatorUdids,
-			read: readPhysicalDevice
+			read: (platform, id) => probes.physicalDevice(platform, id)
 		});
 		if (state && physicalDevices.length) state.physicalDevices = physicalDevices;
 		labelOnlyRoots.push(Boolean(proj.worktreeRoot && !proj.bundleId && !state?.metro && !state?.ios && !state?.android && !state?.web && !state?.macos));
 	}
-	if (!watching) await readGitInto(worktrees, orphanWorktrees, gitMaxAgeMs, new Set(states.flatMap((state) => state.live && state.worktree ? [state.worktree.path] : [])));
+	if (gitScope === "live") await readGitInto(probes, worktrees, orphanWorktrees, new Set(states.flatMap((state) => state.live && state.worktree ? [state.worktree.path] : [])));
 	applyStatusMeasures(states, worktrees);
 	readLogDerivedFacts(states);
-	const tables = createDeviceProcessTables();
+	const tables = probes.deviceTables();
 	readDeviceProcesses(states, tables, {
 		projects,
 		launchesByState
 	});
-	readMetroReverses(states, launchesByState);
+	readMetroReverses(states, launchesByState, probes);
 	const sims = Object.values(simsByUdid);
 	const simNames = Object.fromEntries(sims.map((sim) => [sim.udid.toUpperCase(), sim.name]));
 	const machine = await readMachineUsage({
@@ -1045,9 +1032,10 @@ async function readStatusFacts(gitMaxAgeMs, simctlListing, cachedArchives) {
 		roots,
 		simNames,
 		tables,
-		busy: sims.some((sim) => sim.state === "Booted")
+		busy: sims.some((sim) => sim.state === "Booted"),
+		probes
 	});
-	const archives = cachedArchives ?? readArchives();
+	const archives = probes.archives();
 	const maxCount = machineNumber("archive.maxCount", cfg, process.env);
 	return {
 		archived: linkReplacedArchives(archives.slice(0, maxCount.value ?? 200), states.map((state) => state.path)),
@@ -1065,7 +1053,9 @@ async function readStatusFacts(gitMaxAgeMs, simctlListing, cachedArchives) {
 		tables,
 		machine,
 		roots,
-		simNames
+		simNames,
+		probes,
+		gitCommonDirs: commonDirs
 	};
 }
 /** Sets the facts status derives from workspace logs, the running build's record and its detail file. */
@@ -1120,11 +1110,6 @@ function readLogDerivedFacts(states) {
 		}
 	}
 }
-function phaseMarker({ phase, live, warmStep }) {
-	if (phase === "warming") return chalk.cyan(` [warming: ${warmStep}]`);
-	if (phase === "ready") return chalk.green(" [ready]");
-	return live ? "" : chalk.dim(" [idle]");
-}
 function browserPids(web) {
 	if (!web) return [];
 	const chrome = web.record.chromeProcess?.pid;
@@ -1136,10 +1121,10 @@ function browserPids(web) {
 * `memoryMb` from them. Reads both only when a simulator is booted, a workspace is live or a build runs, so an idle
 * machine runs no `ps` and keeps the estimate.
 */
-async function readMachineUsage({ states, roots, simNames, tables, busy }) {
+async function readMachineUsage({ states, roots, simNames, tables, busy, probes }) {
 	const processes = busy || states.some((state) => state.live || state.build?.state === "running") ? tables.host() : null;
 	if (!processes) return null;
-	const footprints = await readFootprints();
+	const footprints = await probes.footprints();
 	const machine = attributeMachineUsage({
 		processes,
 		footprints,
@@ -1151,338 +1136,112 @@ async function readMachineUsage({ states, roots, simNames, tables, busy }) {
 	return machine;
 }
 /**
-* Rereads only the error counts, device activity and machine usage. With `machine`, and when the snapshot measured
-* machine usage, it reads the host process table again; it reuses every other subprocess fact of the full read.
+* Rereads the log-derived facts and the cached measures. With `tables` it also rereads the process tables and the
+* device activity they show; with `machine` as well, and when the snapshot measured machine usage, the host process
+* table and machine usage. It reuses every other subprocess fact of the full read.
 */
-async function refreshLightFacts(snapshot, machine) {
-	const fresh = createDeviceProcessTables();
-	snapshot.tables = {
-		host: machine && snapshot.machine ? fresh.host : snapshot.tables.host,
-		android: snapshot.tables.android,
-		tcpConnections: fresh.tcpConnections,
-		clients: fresh.host
-	};
+async function refreshLightFacts(snapshot, { tables, machine }) {
+	if (tables) {
+		const fresh = snapshot.probes.deviceTables();
+		snapshot.tables = {
+			host: machine && snapshot.machine ? fresh.host : snapshot.tables.host,
+			android: snapshot.tables.android,
+			tcpConnections: fresh.tcpConnections,
+			clients: fresh.host
+		};
+	}
 	withStateReadCache(() => {
 		for (const state of snapshot.states) state.logs = logFacts(state.path);
 		applyStatusMeasures(snapshot.states, snapshot.worktrees);
 		readLogDerivedFacts(snapshot.states);
-		readDeviceProcesses(snapshot.states, snapshot.tables, null);
+		if (tables) readDeviceProcesses(snapshot.states, snapshot.tables, null);
 	});
 	if (machine && snapshot.machine) snapshot.machine = await readMachineUsage({
 		...snapshot,
 		busy: true
 	});
 }
-function renderStatus({ archived, archivedUsage: usage, projects, states, labelOnlyRoots, leases, leaseNow, orphanWorktrees, simsAvailable, simctlError, cwdRoot, machine }, json, settle = (payload) => payload) {
-	const out = [];
-	const totalMemoryMb = Math.round(totalmem() / 1048576);
-	const cap = capacity(states, totalMemoryMb);
-	const pools = ["ios", "android"].map((platform) => {
-		const { max, error } = parkedMaxSetting(platform);
-		return {
-			error,
-			line: poolLine({
-				platform,
-				parked: readParked(platform).length,
-				max
-			})
-		};
-	});
-	const maintenance = maintenanceStatus();
-	if (json) {
-		const payload = {
-			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,
-			maintenance
+async function readGitInto(probes, worktrees, orphans, only) {
+	const home = homedir();
+	const byPath = await probes.git(worktrees, (w) => only !== void 0 && !only.has(w.path) || process.platform === "darwin" && orphans.includes(w) && inPrivacyProtectedFolder(w.path, home));
+	for (const worktree of worktrees) worktree.git = byPath.get(worktree.path) ?? null;
+}
+function readDeviceProcesses(states, tables, apps) {
+	const readActivity = createActivityReader({ tables });
+	const readAppProcess = createAppProcessReader(tables);
+	for (const [i, state] of states.entries()) {
+		const appIdOn = (platform, slot, deviceId) => {
+			if (!apps) return void 0;
+			const project = apps.projects[i][1];
+			const launch = apps.launchesByState[i][deviceSlotKey(platform, slot)];
+			return launch?.deviceId === deviceId ? launch.appId : platform === "ios" ? project.bundleId : project.androidPackage;
 		};
-		out.push(JSON.stringify(settle(payload)));
-		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) {
-			if (pool.error) out.push(chalk.yellow(`${pool.error} ${POOL_SETTING_REMEDY}`));
-			if (pool.line) out.push(chalk.dim(pool.line));
-		}
-		for (const line of deviceLeaseLines(leases, leaseNow)) out.push(line);
-		return out;
-	}
-	if (!simsAvailable) out.push(chalk.yellow(`simctl could not be read (${simctlError}), so no iOS sim below could be checked.`));
-	for (const [i, [path, proj]] of projects.entries()) {
-		const state = states[i];
-		if (!state) continue;
-		const shortcut = projectShortcut(path, proj);
-		const marker = path === cwdRoot ? chalk.bold.cyan(`* ${shortcut}`) : shortcut;
-		const idle = phaseMarker(state);
-		out.push(`\n${marker}${idle} ${chalk.dim(`(${path})`)}`);
-		out.push(labelOnlyRoots[i] ? chalk.dim("  worktree root (holds the label; the app registers its own entry)") : chalk.dim(`  app: ${proj.bundleId ?? "?"} (${proj.isExpo ?? detectIsExpo(path) ? "expo" : "bare"})`));
-		if (state.metro) {
-			const label = state.metro.running ? chalk.green(`running (pid ${state.metro.pid})`) : state.metro.idleStop ? chalk.dim(`stopped (idle) after ${state.metro.idleStop.idleMinutes}m; \`stim start\`, \`ios\` or \`android\` restarts it`) : state.metro.lastStop ? chalk.dim(`not running${state.metro.lastStop.reason === "vanished" ? "" : ` since ${state.metro.lastStop.at}`}; ${describeMetroLastStop(state.metro.lastStop)}`) : chalk.dim("not running");
-			out.push(`  metro: port ${state.metro.port} ${label}`);
-			if (state.metro.tunnel) {
-				const { provider, url } = state.metro.tunnel;
-				out.push(`  tunnel: ${provider}${provider === "tailscale" ? " (tailnet-only)" : ""} ${url}`);
-			}
-		}
-		if (state.supervisor) {
-			const health = state.supervisor.healthy ? chalk.green("healthy") : chalk.yellow("not answering");
-			const mode = state.supervisor.mode ? chalk.dim(` (${state.supervisor.mode})`) : "";
-			out.push(`  supervisor: pid ${state.supervisor.pid}${mode} ${health}`);
-		}
-		if (state.build) {
-			const line = `  ${buildStatusLine(state.build, Date.now())}`;
-			out.push(state.build.state === "running" ? line : chalk.yellow(line));
-		}
-		out.push(...lastBuildsLines(state.lastBuilds));
-		if (state.worktree?.git) out.push(chalk.dim(`  git: ${gitSummaryText(state.worktree.git)}`));
-		for (const agent of state.agents ?? []) out.push(chalk.dim(`  agent: ${agentLine(agent)}`));
-		if (state.logs) {
-			const n = state.logs.errorsSinceMarker;
-			const errs = n > 0 ? chalk.yellow(` (${n} error${n === 1 ? "" : "s"} since the last marker)`) : "";
-			out.push(chalk.dim(`  logs: ${state.logs.dir}`) + errs);
-		}
-		for (const deviceState of [{
+		for (const device of [{
 			slot: "default",
 			ios: state.ios,
 			android: state.android
 		}, ...state.slots ?? []]) {
-			const slotLabel = deviceState.slot === "default" ? "" : ` [${deviceState.slot}]`;
-			out.push(...iosStatusLines(deviceState.ios, slotLabel));
-			out.push(...androidStatusLines(deviceState.android, slotLabel));
-		}
-		if (state.macos) {
-			const host = state.macos.host;
-			const where = host ? ` on ${host.machine} as ${host.bundleId}${chalk.dim(` (session ${host.session})`)}` : "";
-			const build = state.macos.build;
-			const placement = build.buildMachine === void 0 ? "" : `; build placement ${build.buildMachine}, built on ${build.builtOn ?? "none"}`;
-			out.push(`  macOS ${state.macos.product}: ${state.macos.state}${where}; build ${build.state}${placement}`);
-			if (host?.agent.driver === "agent-device") out.push(chalk.dim(`    agent: ${host.agent.command}`));
+			const base = {
+				slot: device.slot,
+				workspace: state.path
+			};
+			if (device.ios?.state === "Booted") {
+				const id = device.ios.udid;
+				device.ios.activity = statusActivity(readActivity({
+					...base,
+					platform: "ios",
+					id
+				}));
+				const appId = device.ios.owned ? appIdOn("ios", device.slot, id) : void 0;
+				if (appId) device.ios.app = readAppProcess({
+					platform: "ios",
+					id,
+					appId
+				});
+			}
+			if (device.android && !device.android.physical && device.android.serial) {
+				const id = device.android.serial;
+				device.android.activity = statusActivity(readActivity({
+					...base,
+					platform: "android",
+					id
+				}));
+				const appId = device.android.owned ? appIdOn("android", device.slot, id) : void 0;
+				if (appId) device.android.app = readAppProcess({
+					platform: "android",
+					id,
+					appId
+				});
+			}
 		}
-		if (state.web) {
-			const browser = state.web.running ? chalk.green(`running (pid ${state.web.pid}, DevTools ${state.web.cdpEndpoint})`) : chalk.dim("not running");
-			const page = state.web.page;
-			const failed = page?.state === "failed" ? ` -- ${chalk.yellow(`page failed: ${page.error}`)}` : "";
-			out.push(`  web: ${chalk.cyan(page?.url ?? state.web.url)} ${browser}${state.web.headless ? "" : chalk.dim(" (headed)")}${activitySuffix(state.web.activity)}${failed}`);
+		const web = state.web;
+		const port = web?.cdpEndpoint ? Number(new URL(web.cdpEndpoint).port) : null;
+		if (web?.running && port) {
+			web.page = readWebPage(state.path);
+			const ownPids = [web.pid, web.supervisorPid].filter((pid) => pid !== null);
+			web.activity = statusActivity(readWebActivity({
+				port,
+				ownPids,
+				workspace: state.path
+			}, tables));
 		}
-		for (const device of state.physicalDevices ?? []) out.push(`  ${physicalDeviceLine(device, leaseNow)}`);
-		for (const remote of state.remoteDevices ?? []) out.push(`  ${remoteDeviceLine(remote)}`);
-		for (const w of state.warnings) out.push(chalk.yellow(`  ! ${w}`));
-		for (const note of state.issues.filter((issue) => issue.severity === "info")) out.push(chalk.dim(`  - ${note.message}`));
-	}
-	for (const pool of pools) {
-		if (pool.error) out.push(chalk.yellow(`\n${pool.error} ${POOL_SETTING_REMEDY}`));
-		if (pool.line) out.push(chalk.dim(`\n${pool.line}`));
-	}
-	const leaseLines = deviceLeaseLines(leases, leaseNow);
-	if (leaseLines.length) {
-		out.push("");
-		for (const line of leaseLines) out.push(line);
 	}
-	if (orphanWorktrees.length) {
-		out.push(chalk.dim(`\nWorktrees with no environment (${orphanWorktrees.length}):`));
-		for (const w of orphanWorktrees) out.push(chalk.dim(`  ${orphanWorktreeLine(w)}`));
+}
+function readMetroReverses(states, launchesByState, probes) {
+	for (const [i, state] of states.entries()) for (const target of metroReverseTargets(state, launchesByState[i])) {
+		const listing = probes.metroReverses(target.serial);
+		if (listing !== null && !hasMetroReverse(listing, target.metroPort)) addReverseMissingIssue(state, target);
 	}
-	out.push(chalk.dim(machine?.memorySource === "footprint" ? `\n${cap.liveCount} active environment(s) use ${formatGb(cap.committedMb)} of ${formatGb(cap.totalMemoryMb)}.` : `\n${cap.liveCount} active environment(s), roughly ${formatGb(cap.committedMb)} of ${formatGb(cap.totalMemoryMb)} committed.`));
-	const volumes = readVolumes(cwdRoot || process.cwd());
-	const line = diskLine(volumes);
-	if (line) {
-		const tight = tightVolumes(volumes);
-		if (tight.length) {
-			const which = tight.map((v) => v.volume).join(" and ");
-			out.push(chalk.yellow(`${line} A single iOS build can exhaust ${which} -- run \`stim gc\` before starting another environment.`));
-		} else out.push(chalk.dim(line));
-	}
-	if (cap.overCapacity) out.push(chalk.yellow("Over comfortable capacity. A machine that swaps is slower than one working in sequence -- release one before starting another."));
-	return out;
-}
-async function watchStatus(json) {
-	let last = null;
-	let lastPayload = null;
-	let archiveStamp = null;
-	let archives;
-	let snapshot = null;
-	let sources = null;
-	const measurer = createStatusMeasurer({ updated: () => scheduler.trigger("light") });
-	const scheduler = createRefreshScheduler({
-		debounceMs: 250,
-		lightIntervalMs: WATCH_LIGHT_INTERVAL_MS,
-		run: async (kind) => {
-			triggerMaintenance("status-watch");
-			let text;
-			let payload = null;
-			try {
-				if (kind === "light" && snapshot) await refreshLightFacts(snapshot, json);
-				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, (full) => payload = watchPayload(lastPayload, full)).join("\n");
-			} catch (error) {
-				console.error(chalk.red(String(error?.message || error)));
-				return;
-			} finally {
-				sources?.reconcile();
-			}
-			if (text === last) return;
-			last = text;
-			lastPayload = payload;
-			process.stdout.write(`${!json && process.stdout.isTTY ? "\x1B[2J\x1B[H" : ""}${text}\n`);
-		}
-	});
-	const fallback = setInterval(() => scheduler.trigger("full"), WATCH_FALLBACK_MS);
-	const machine = setInterval(() => json && snapshot?.machine && scheduler.trigger("light"), WATCH_LIGHT_INTERVAL_MS);
-	const finish = () => {
-		clearInterval(fallback);
-		clearInterval(machine);
-		stopReader();
-		scheduler.stop();
-		sources?.stop();
-		process.exit(0);
-	};
-	const stopReader = watchStdoutReader(finish);
-	process.on("SIGINT", finish);
-	process.on("SIGTERM", finish);
-	sources = watchStatusSources({
-		home: getConfigDir(),
-		onChange: (kind) => scheduler.trigger(kind)
-	});
-	scheduler.trigger("full", 0);
-	await new Promise(() => {});
-}
-async function readGitInto(worktrees, orphans, maxAgeMs, only) {
-	const home = homedir();
-	const byPath = await readWorktreeGit(worktrees, {
-		maxAgeMs,
-		skip: (w) => only !== void 0 && !only.has(w.path) || process.platform === "darwin" && orphans.includes(w) && inPrivacyProtectedFolder(w.path, home)
-	});
-	for (const worktree of worktrees) worktree.git = byPath.get(worktree.path) ?? null;
-}
-function agentLine({ tool, title, sessionId, lastActiveAt }) {
-	const at = lastActiveAt ? `, active ${lastActiveAt}` : "";
-	return `${tool === "codex" ? "Codex" : "Claude Code"} ${title ? `"${title}"` : sessionId}${at}`;
-}
-function orphanWorktreeLine(w) {
-	return `${w.path}${w.branch ? ` [${w.branch}]` : ""}${w.git ? ` -- ${gitSummaryText(w.git)}` : ""}`;
-}
-function lastBuildsLines(reports) {
-	const texts = Object.values(reports ?? {}).map(lastBuildText);
-	return texts.length ? [chalk.dim(`  last build: ${texts.join(", ")}`)] : [];
-}
-function lastBuildText(report) {
-	const source = report.cacheHit ? `${report.cacheHit} cache` : report.status === "ok" ? "compiled" : "no cache hit";
-	const took = report.durationMs === null ? "" : ` in ${formatDuration(report.durationMs)}`;
-	const placement = report.buildMachine === void 0 ? "" : `; build placement ${report.buildMachine}, built on ${report.builtOn ?? (report.cacheHit ? "none (cache)" : "none")}`;
-	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} (${record.reason === DEVICE_RECLAIM_REASON ? "reclaimed for a waiting run; devices.reclaimIdleMinutes" : "devices.idleShutdownMinutes"})`) : "";
-}
-function activitySuffix(activity) {
-	const label = activityLabel(activity, Date.now());
-	return label ? ` -- ${activity?.state === "driven" ? chalk.magenta(label) : chalk.dim(label)}` : "";
-}
-function readDeviceProcesses(states, tables, apps) {
-	const readActivity = createActivityReader({ tables });
-	const readAppProcess = createAppProcessReader(tables);
-	for (const [i, state] of states.entries()) {
-		const appIdOn = (platform, slot, deviceId) => {
-			if (!apps) return void 0;
-			const project = apps.projects[i][1];
-			const launch = apps.launchesByState[i][deviceSlotKey(platform, slot)];
-			return launch?.deviceId === deviceId ? launch.appId : platform === "ios" ? project.bundleId : project.androidPackage;
-		};
-		for (const device of [{
-			slot: "default",
-			ios: state.ios,
-			android: state.android
-		}, ...state.slots ?? []]) {
-			const base = {
-				slot: device.slot,
-				workspace: state.path
-			};
-			if (device.ios?.state === "Booted") {
-				const id = device.ios.udid;
-				device.ios.activity = statusActivity(readActivity({
-					...base,
-					platform: "ios",
-					id
-				}));
-				const appId = device.ios.owned ? appIdOn("ios", device.slot, id) : void 0;
-				if (appId) device.ios.app = readAppProcess({
-					platform: "ios",
-					id,
-					appId
-				});
-			}
-			if (device.android && !device.android.physical && device.android.serial) {
-				const id = device.android.serial;
-				device.android.activity = statusActivity(readActivity({
-					...base,
-					platform: "android",
-					id
-				}));
-				const appId = device.android.owned ? appIdOn("android", device.slot, id) : void 0;
-				if (appId) device.android.app = readAppProcess({
-					platform: "android",
-					id,
-					appId
-				});
-			}
-		}
-		const web = state.web;
-		const port = web?.cdpEndpoint ? Number(new URL(web.cdpEndpoint).port) : null;
-		if (web?.running && port) {
-			web.page = readWebPage(state.path);
-			const ownPids = [web.pid, web.supervisorPid].filter((pid) => pid !== null);
-			web.activity = statusActivity(readWebActivity({
-				port,
-				ownPids,
-				workspace: state.path
-			}, tables));
-		}
-	}
-}
-function readMetroReverses(states, launchesByState) {
-	for (const [i, state] of states.entries()) for (const target of metroReverseTargets(state, launchesByState[i])) {
-		const listing = getExecutor().runFileQuiet("adb", [
-			"-s",
-			target.serial,
-			"reverse",
-			"--list"
-		], { timeoutMs: 5e3 });
-		if (listing !== null && !hasMetroReverse(listing, target.metroPort)) addReverseMissingIssue(state, target);
-	}
-}
-function appSuffix(app) {
-	if (!app) return "";
-	if (app.state === "running") return chalk.dim(` -- ${app.id} running`);
-	if (app.state === "stopped") return ` -- ${chalk.yellow(`${app.id} not running`)}`;
-	return chalk.dim(` -- ${app.id} process unknown`);
 }
 function linkedWorktrees(paths) {
-	return [...new Set(paths.flatMap((path) => gitCommonDirOnDisk(path) ?? []))].flatMap((common) => {
-		const repository = basename$1(common) === ".git" ? dirname$1(common) : common;
-		return linkedWorktreesOnDisk(common).map((entry) => Object.assign(entry, { repository }));
-	});
+	const commonDirs = [...new Set(paths.flatMap((path) => gitCommonDirOnDisk(path) ?? []))];
+	return {
+		worktrees: commonDirs.flatMap((common) => {
+			const repository = basename$1(common) === ".git" ? dirname$1(common) : common;
+			return linkedWorktreesOnDisk(common).map((entry) => Object.assign(entry, { repository }));
+		}),
+		commonDirs
+	};
 }
 function workspaceBuilds(path, saved, history) {
 	const lastBuilds = readLastBuilds(saved);
@@ -1551,21 +1310,15 @@ function readAndroidRuntime(resolveSerial) {
 		};
 	}
 }
-function readVolumes(projectPath) {
-	const roots = [.../* @__PURE__ */ new Set([
-		"/",
-		volumeRootFor(getConfigDir()),
-		volumeRootFor(projectPath)
-	])];
-	const volumes = [];
-	for (const volume of roots) {
-		const disk = parseDfFree(getExecutor().runFileQuiet("df", ["-k", volume], { timeoutMs: 5e3 }));
-		if (disk) volumes.push({
-			volume,
-			disk
-		});
-	}
-	return volumes;
+async function readMetroFacts(projects) {
+	const ports = await portLookup(projects.flatMap(([, proj]) => proj.metroPort ? [proj.metroPort] : []));
+	return Promise.all(projects.map(async ([path, proj]) => {
+		const metro = proj.metroPort ? await resolveOnPort(proj.metroPort, path, ports) : null;
+		return {
+			metro,
+			supervisor: await supervisorFacts(path, proj, metro, ports)
+		};
+	}));
 }
 async function portLookup(metroPorts) {
 	const ports = [...new Set(metroPorts)];
@@ -1626,4 +1379,353 @@ function logFacts(path) {
 	}
 }
 //#endregion
-export { statusCommand as default, readVolumes };
+//#region src/commands/status.ts
+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 && "command" in ios.host.agent) out.push(chalk.dim(`    agent: ${ios.host.agent.command}`));
+	}
+	return out;
+}
+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 && "command" in record.host.agent) out.push(chalk.dim(`    agent: ${record.host.agent.command}`));
+	return out;
+}
+function formatGb(mb) {
+	return `${(mb / 1024).toFixed(1)} GB`;
+}
+function phaseMarker({ phase, live, warmStep }) {
+	if (phase === "warming") return chalk.cyan(` [warming: ${warmStep}]`);
+	if (phase === "ready") return chalk.green(" [ready]");
+	return live ? "" : chalk.dim(" [idle]");
+}
+const WATCH_GIT_MAX_AGE_MS = 6e4;
+function statusCommand(program) {
+	program.command("status").description("Show every environment on this machine: devices, ports, what is actually running, and anything stuck.").option("--json", "print the state as JSON").option("--watch", "keep running and print the state again each time it changes").action(async (opts) => {
+		if (opts.watch) return watchStatus(Boolean(opts.json));
+		const json = Boolean(opts.json);
+		for (const line of renderStatus(await readStatus(), json)) console.log(line);
+	});
+}
+function renderStatus({ archived, archivedUsage: usage, projects, states, labelOnlyRoots, leases, leaseNow, orphanWorktrees, simsAvailable, simctlError, cwdRoot, machine }, json, settle = (payload) => payload, cwd = process.cwd()) {
+	const out = [];
+	const totalMemoryMb = Math.round(totalmem() / 1048576);
+	const cap = capacity(states, totalMemoryMb);
+	const pools = ["ios", "android"].map((platform) => {
+		const { max, error } = parkedMaxSetting(platform);
+		return {
+			error,
+			line: poolLine({
+				platform,
+				parked: readParked(platform).length,
+				max
+			})
+		};
+	});
+	const maintenance = maintenanceStatus();
+	if (json) {
+		const payload = {
+			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,
+			maintenance
+		};
+		out.push(JSON.stringify(settle(payload)));
+		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) {
+			if (pool.error) out.push(chalk.yellow(`${pool.error} ${POOL_SETTING_REMEDY}`));
+			if (pool.line) out.push(chalk.dim(pool.line));
+		}
+		for (const line of deviceLeaseLines(leases, leaseNow)) out.push(line);
+		return out;
+	}
+	if (!simsAvailable) out.push(chalk.yellow(`simctl could not be read (${simctlError}), so no iOS sim below could be checked.`));
+	for (const [i, [path, proj]] of projects.entries()) {
+		const state = states[i];
+		if (!state) continue;
+		const shortcut = projectShortcut(path, proj);
+		const marker = path === cwdRoot ? chalk.bold.cyan(`* ${shortcut}`) : shortcut;
+		const idle = phaseMarker(state);
+		out.push(`\n${marker}${idle} ${chalk.dim(`(${path})`)}`);
+		out.push(labelOnlyRoots[i] ? chalk.dim("  worktree root (holds the label; the app registers its own entry)") : chalk.dim(`  app: ${proj.bundleId ?? "?"} (${proj.isExpo ?? detectIsExpo(path) ? "expo" : "bare"})`));
+		if (state.metro) {
+			const label = state.metro.running ? chalk.green(`running (pid ${state.metro.pid})`) : state.metro.idleStop ? chalk.dim(`stopped (idle) after ${state.metro.idleStop.idleMinutes}m; \`stim start\`, \`ios\` or \`android\` restarts it`) : state.metro.lastStop ? chalk.dim(`not running${state.metro.lastStop.reason === "vanished" ? "" : ` since ${state.metro.lastStop.at}`}; ${describeMetroLastStop(state.metro.lastStop)}`) : chalk.dim("not running");
+			out.push(`  metro: port ${state.metro.port} ${label}`);
+			if (state.metro.tunnel) {
+				const { provider, url } = state.metro.tunnel;
+				out.push(`  tunnel: ${provider}${provider === "tailscale" ? " (tailnet-only)" : ""} ${url}`);
+			}
+		}
+		if (state.supervisor) {
+			const health = state.supervisor.healthy ? chalk.green("healthy") : chalk.yellow("not answering");
+			const mode = state.supervisor.mode ? chalk.dim(` (${state.supervisor.mode})`) : "";
+			out.push(`  supervisor: pid ${state.supervisor.pid}${mode} ${health}`);
+		}
+		if (state.build) {
+			const line = `  ${buildStatusLine(state.build, Date.now())}`;
+			out.push(state.build.state === "running" ? line : chalk.yellow(line));
+		}
+		out.push(...lastBuildsLines(state.lastBuilds));
+		if (state.worktree?.git) out.push(chalk.dim(`  git: ${gitSummaryText(state.worktree.git)}`));
+		for (const agent of state.agents ?? []) out.push(chalk.dim(`  agent: ${agentLine(agent)}`));
+		if (state.logs) {
+			const n = state.logs.errorsSinceMarker;
+			const errs = n > 0 ? chalk.yellow(` (${n} error${n === 1 ? "" : "s"} since the last marker)`) : "";
+			out.push(chalk.dim(`  logs: ${state.logs.dir}`) + errs);
+		}
+		for (const deviceState of [{
+			slot: "default",
+			ios: state.ios,
+			android: state.android
+		}, ...state.slots ?? []]) {
+			const slotLabel = deviceState.slot === "default" ? "" : ` [${deviceState.slot}]`;
+			out.push(...iosStatusLines(deviceState.ios, slotLabel));
+			out.push(...androidStatusLines(deviceState.android, slotLabel));
+		}
+		if (state.macos) {
+			const host = state.macos.host;
+			const where = host ? ` on ${host.machine} as ${host.bundleId}${chalk.dim(` (session ${host.session})`)}` : "";
+			const build = state.macos.build;
+			const placement = build.buildMachine === void 0 ? "" : `; build placement ${build.buildMachine}, built on ${build.builtOn ?? "none"}`;
+			out.push(`  macOS ${state.macos.product}: ${state.macos.state}${where}; build ${build.state}${placement}`);
+			if (host && "command" in host.agent) out.push(chalk.dim(`    agent: ${host.agent.command}`));
+		}
+		if (state.web) {
+			const browser = state.web.running ? chalk.green(`running (pid ${state.web.pid}, DevTools ${state.web.cdpEndpoint})`) : chalk.dim("not running");
+			const page = state.web.page;
+			const failed = page?.state === "failed" ? ` -- ${chalk.yellow(`page failed: ${page.error}`)}` : "";
+			out.push(`  web: ${chalk.cyan(page?.url ?? state.web.url)} ${browser}${state.web.headless ? "" : chalk.dim(" (headed)")}${activitySuffix(state.web.activity)}${failed}`);
+		}
+		for (const device of state.physicalDevices ?? []) out.push(`  ${physicalDeviceLine(device, leaseNow)}`);
+		for (const remote of state.remoteDevices ?? []) out.push(`  ${remoteDeviceLine(remote)}`);
+		for (const w of state.warnings) out.push(chalk.yellow(`  ! ${w}`));
+		for (const note of state.issues.filter((issue) => issue.severity === "info")) out.push(chalk.dim(`  - ${note.message}`));
+	}
+	for (const pool of pools) {
+		if (pool.error) out.push(chalk.yellow(`\n${pool.error} ${POOL_SETTING_REMEDY}`));
+		if (pool.line) out.push(chalk.dim(`\n${pool.line}`));
+	}
+	const leaseLines = deviceLeaseLines(leases, leaseNow);
+	if (leaseLines.length) {
+		out.push("");
+		for (const line of leaseLines) out.push(line);
+	}
+	if (orphanWorktrees.length) {
+		out.push(chalk.dim(`\nWorktrees with no environment (${orphanWorktrees.length}):`));
+		for (const w of orphanWorktrees) out.push(chalk.dim(`  ${orphanWorktreeLine(w)}`));
+	}
+	out.push(chalk.dim(machine?.memorySource === "footprint" ? `\n${cap.liveCount} active environment(s) use ${formatGb(cap.committedMb)} of ${formatGb(cap.totalMemoryMb)}.` : `\n${cap.liveCount} active environment(s), roughly ${formatGb(cap.committedMb)} of ${formatGb(cap.totalMemoryMb)} committed.`));
+	const volumes = readVolumes(cwdRoot || cwd);
+	const line = diskLine(volumes);
+	if (line) {
+		const tight = tightVolumes(volumes);
+		if (tight.length) {
+			const which = tight.map((v) => v.volume).join(" and ");
+			out.push(chalk.yellow(`${line} A single iOS build can exhaust ${which} -- run \`stim gc\` before starting another environment.`));
+		} else out.push(chalk.dim(line));
+	}
+	if (cap.overCapacity) out.push(chalk.yellow("Over comfortable capacity. A machine that swaps is slower than one working in sequence -- release one before starting another."));
+	return out;
+}
+function watchedPids({ roots, states }) {
+	return [...roots.flatMap((root) => [
+		...root.supervisorPid ? [root.supervisorPid] : [],
+		...root.build ? [root.build.pid] : [],
+		...root.browserPids,
+		...root.macosPids ?? []
+	]), ...states.flatMap((state) => state.metro?.running && state.metro.pid ? [state.metro.pid] : [])];
+}
+/**
+* Reads status now and again on every change until stopped, and calls `emit` with each new rendering: the JSON payload
+* with `json`, the human view otherwise. `emit` never sees the same rendering twice in a row. `cwd` stands for the
+* directory status runs in, which marks the current workspace.
+*/
+function runStatusWatch({ json, cwd = process.cwd(), emit, failed }) {
+	let last = null;
+	let lastPayload = null;
+	let archiveStamp = null;
+	let archives;
+	let snapshot = null;
+	let sources = null;
+	let tablesAt = 0;
+	let machineDue = false;
+	const measurer = createStatusMeasurer({ updated: () => scheduler.trigger("light") });
+	const scheduler = createRefreshScheduler({
+		debounceMs: 250,
+		lightIntervalMs: WATCH_LIGHT_INTERVAL_MS,
+		run: async (kind) => {
+			triggerMaintenance("status-watch", { warn: false });
+			let text;
+			let payload = null;
+			try {
+				const now = Date.now();
+				if (kind === "light" && snapshot) {
+					const machine = json && machineDue;
+					const tables = machine || now - tablesAt >= 5e3;
+					machineDue = false;
+					await refreshLightFacts(snapshot, {
+						tables,
+						machine
+					});
+					if (tables) tablesAt = now;
+				} else {
+					let stamp = null;
+					try {
+						stamp = statSync$1(archiveRoot()).mtimeMs;
+					} catch {}
+					if (archives === void 0 || stamp !== archiveStamp) {
+						archives = readArchives();
+						archiveStamp = stamp;
+					}
+					const first = snapshot === null;
+					snapshot = await readStatus({
+						git: first ? "none" : "all",
+						cwd,
+						probes: liveProbes({
+							simctlListing: sources?.simulatorListing(),
+							gitMaxAgeMs: WATCH_GIT_MAX_AGE_MS,
+							archives
+						})
+					});
+					tablesAt = now;
+					machineDue = false;
+					sources?.watchRepositories(snapshot.gitCommonDirs);
+					sources?.watchProcesses(watchedPids(snapshot));
+					if (first) scheduler.trigger("full", 0);
+				}
+				measurer.schedule(snapshot.states, snapshot.worktrees);
+				text = renderStatus(snapshot, json, (full) => payload = watchPayload(lastPayload, full), cwd).join("\n");
+			} catch (error) {
+				failed(String(error?.message || error));
+				return;
+			} finally {
+				sources?.reconcile();
+			}
+			const key = json && payload ? watchChangeKey(payload) : text;
+			if (key === last) return;
+			last = key;
+			lastPayload = payload;
+			emit(text);
+		}
+	});
+	const fallback = setInterval(() => scheduler.trigger("full"), WATCH_FALLBACK_MS);
+	const machine = setInterval(() => {
+		if (!json || !snapshot?.machine) return;
+		machineDue = true;
+		scheduler.trigger("light");
+	}, WATCH_MACHINE_INTERVAL_MS);
+	sources = watchStatusSources({
+		home: getConfigDir(),
+		deviceSet: process.platform === "darwin" ? join$1(userInfo().homedir, "Library", "Developer", "CoreSimulator", "Devices") : null,
+		onChange: (kind) => scheduler.trigger(kind)
+	});
+	scheduler.trigger("full", 0);
+	return { stop() {
+		clearInterval(fallback);
+		clearInterval(machine);
+		scheduler.stop();
+		sources?.stop();
+	} };
+}
+async function watchStatus(json) {
+	const finish = () => {
+		stopReader();
+		watch.stop();
+		process.exit(0);
+	};
+	process.on("SIGINT", finish);
+	process.on("SIGTERM", finish);
+	const watch = runStatusWatch({
+		json,
+		emit: (text) => process.stdout.write(`${!json && process.stdout.isTTY ? "\x1B[2J\x1B[H" : ""}${text}\n`),
+		failed: (message) => console.error(chalk.red(message))
+	});
+	const stopReader = watchStdoutReader(finish);
+	await new Promise(() => {});
+}
+function agentLine({ tool, title, sessionId, lastActiveAt }) {
+	const at = lastActiveAt ? `, active ${lastActiveAt}` : "";
+	return `${tool === "codex" ? "Codex" : "Claude Code"} ${title ? `"${title}"` : sessionId}${at}`;
+}
+function orphanWorktreeLine(w) {
+	return `${w.path}${w.branch ? ` [${w.branch}]` : ""}${w.git ? ` -- ${gitSummaryText(w.git)}` : ""}`;
+}
+function lastBuildsLines(reports) {
+	const texts = Object.values(reports ?? {}).map(lastBuildText);
+	return texts.length ? [chalk.dim(`  last build: ${texts.join(", ")}`)] : [];
+}
+function lastBuildText(report) {
+	const source = report.cacheHit ? `${report.cacheHit} cache` : report.status === "ok" ? "compiled" : "no cache hit";
+	const took = report.durationMs === null ? "" : ` in ${formatDuration(report.durationMs)}`;
+	const placement = report.buildMachine === void 0 ? "" : `; build placement ${report.buildMachine}, built on ${report.builtOn ?? (report.cacheHit ? "none (cache)" : "none")}`;
+	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} (${record.reason === DEVICE_RECLAIM_REASON ? "reclaimed for a waiting run; devices.reclaimIdleMinutes" : "devices.idleShutdownMinutes"})`) : "";
+}
+function activitySuffix(activity) {
+	const label = activityLabel(activity, Date.now());
+	return label ? ` -- ${activity?.state === "driven" ? chalk.magenta(label) : chalk.dim(label)}` : "";
+}
+function appSuffix(app) {
+	if (!app) return "";
+	if (app.state === "running") return chalk.dim(` -- ${app.id} running`);
+	if (app.state === "stopped") return ` -- ${chalk.yellow(`${app.id} not running`)}`;
+	return chalk.dim(` -- ${app.id} process unknown`);
+}
+function readVolumes(projectPath) {
+	const roots = [.../* @__PURE__ */ new Set([
+		"/",
+		volumeRootFor(getConfigDir()),
+		volumeRootFor(projectPath)
+	])];
+	const volumes = [];
+	for (const volume of roots) {
+		const disk = parseDfFree(getExecutor().runFileQuiet("df", ["-k", volume], { timeoutMs: 5e3 }));
+		if (disk) volumes.push({
+			volume,
+			disk
+		});
+	}
+	return volumes;
+}
+//#endregion
+export { runStatusWatch as n, statusCommand as r, readVolumes as t };