stim 1.18.0 → 1.20.0

package/dist/{status-DCjZeE-K.mjs → status-DARMkc9q.mjs}

@@ -1,42 +1,41 @@
 import { t as process_identity_exports } from "./process-identity-Biv3arCO.mjs";
-import { t as getExecutor } from "./exec-DWhCZDGm.mjs";
-import { a as formatElapsed, i as formatDuration, r as clockTime, u as plural } from "./command-output-CBtzyIgF.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-CgYMahz7.mjs";
-import { c as gitCommonDirOnDisk, p as linkedWorktreesOnDisk, s as gitCommonDir, y as repoRoot } from "./worktree-CsKYexJM.mjs";
-import { a as detectTutorial, c as findServerWorkspace, d as projectShortcut, i as detectIsExpo, p as readAppJson } from "./project-C3ChRLZy.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-Dh8T4Ytd.mjs";
-import { b as workspaceLogErrorIndex, r as readWorkspaceState$1, x as workspaceLogsDir$1 } from "./workspace-state-C59dqG-Z.mjs";
-import { a as readWebPage, o as readWebRecord, u as webFacts } from "./state-BG-aAk4k.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-Dcr0Qexd.mjs";
-import { A as buildReport, B as readStats$1, D as ACTIVE_BUILD_KEY, Ht as readMetroTunnel, Kt as readWorkspaceLaunches, N as parseActiveBuild, W as statsProjectKey$1, Wt as readRemoteSession, Xt as readFootprints, Yt as attributeMachineUsage, _ as metroLastStop, j as buildStatusLine, k as activeBuildState, o as machineNumber, p as describeMetroLastStop } from "./budget-DIhL2BKx.mjs";
-import { m as resolveSupervisorTarget } from "./workspaces-xXItD8Dj.mjs";
-import { d as readWebActivity, f as tailLines, i as createDeviceProcessTables, r as createActivityReader } from "./activity-BxnkDZDi.mjs";
-import { i as listLeaseFiles, r as leaseIsExpired, s as parseWorkspaceLeases } from "./device-lease-Co-EwifR.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-DC3ZLuw0.mjs";
-import { f as listAllIosSimsAsync, y as parseSimctlList } from "./ios-B3SbOWdw.mjs";
-import { F as resolveSettings } from "./settings-CQyMElEP.mjs";
-import { a as parseNdjsonLine } from "./ndjson-LGZAMsqa.mjs";
-import { l as probeHostedSession } from "./hosted-client-C-rMtppF.mjs";
-import { m as hasMetroReverse } from "./app-install-D-PUENug.mjs";
-import { m as readEasSessionLedger$1, p as easMachineStateRoot$1 } from "./device-remote-tHbd1fKy.mjs";
-import { d as readIosDevices, s as isReachable } from "./ios-device-vOaByMhw.mjs";
-import "./hosted-macos-B-wEjlwG.mjs";
-import { i as readSupervisorState } from "./stop-BTjs3xbc.mjs";
-import { i as createStatusMeasurer, n as workspacePhase, r as applyStatusMeasures, s as mergeState } from "./warm-progress-CjB-MP6H.mjs";
-import { r as workspaceRecordingEnabled } from "./recordings-BAWltsVt.mjs";
-import { t as detectPlatforms } from "./projects-DD7dBTCj.mjs";
-import { n as maintenanceLines, r as maintenanceStatus } from "./status-BEeL6IKz.mjs";
+import { t as getExecutor } from "./exec-B81Qodjn.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-D0LhTY3S.mjs";
+import { Et as repoRoot, bt as linkedWorktreesOnDisk, ht as gitCommonDirOnDisk, mt as gitCommonDir, q as resolveSettings } from "./settings-Bbztm4oV.mjs";
+import { i as listLeaseFiles, r as leaseIsExpired, s as parseWorkspaceLeases } from "./device-lease-DHOBXGgS.mjs";
+import { C as workspaceLogErrorIndex, r as readWorkspaceState$1, w as workspaceLogsDir$1 } from "./workspace-state-CSIFuuDa.mjs";
+import { a as formatElapsed, i as formatDuration, r as clockTime, u as plural } from "./command-output-BjPN99ZB.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-B8_duAzW.mjs";
+import { F as ownedAvdDeviceProfile, O as listAdbDevices, at as POOL_SETTING_REMEDY, dt as parkedMaxSetting, ft as readParked, z as ownedAvdSerialResolver } from "./android-BsYNR81W.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-D_j9sN-B.mjs";
+import { P as resolveSupervisorTarget } from "./workspaces-D2xSHBDY.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-BONq9vXY.mjs";
+import { a as parseNdjsonLine } from "./ndjson-GOnbyvso.mjs";
+import { a as readWebPage, o as readWebRecord, u as webFacts } from "./state-DI84A-uu.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-CQl51YZu.mjs";
+import { d as readWebActivity, f as tailLines, i as createDeviceProcessTables, r as createActivityReader } from "./activity-BrGh9EAI.mjs";
+import { b as parseSimctlList, f as listAllIosSimsAsync } from "./ios-CXLIUxXJ.mjs";
+import { m as hasMetroReverse } from "./app-install-0LgaQRT7.mjs";
+import { u as probeHostedSession } from "./hosted-client-Io01s5By.mjs";
+import { r as readEasSessionLedger$1 } from "./eas-session-ledger-DZlC-Fq3.mjs";
+import { d as readIosDevices, s as isReachable } from "./ios-device-BreZOpM0.mjs";
+import "./hosted-macos-Aziw9T_9.mjs";
+import { i as readSupervisorState } from "./stop-iNemHsJC.mjs";
+import { i as createStatusMeasurer, n as workspacePhase, r as applyStatusMeasures, s as mergeState } from "./warm-progress-C3ASD6z5.mjs";
+import { r as workspaceRecordingEnabled } from "./recordings-Bk-VivUV.mjs";
+import { n as maintenanceLines, r as maintenanceStatus } from "./status-BDGHwkCs.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-DvmI3SmN.mjs";
 import { t as watchStdoutReader } from "./stdout-reader-C8yjre1x.mjs";
-import { t as triggerMaintenance } from "./trigger-CJMhwXe8.mjs";
-import { mkdirSync, readFileSync, readdirSync, renameSync, rmSync, statSync, watch, writeFileSync } from "node:fs";
+import { t as triggerMaintenance } from "./trigger-C0MWBi8O.mjs";
+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 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 { rotatedLogPath } from "@stim-cli/core";
 import { homedir, totalmem } from "os";
 import { createHash, randomUUID } from "node:crypto";
+import chalk from "chalk";
 //#region src/device-host/hosted-native-status.ts
 function hostedNativeProbe(placement, probe, slot, platform) {
 	const label = platform === "ios" ? "iOS" : "Android";
@@ -118,252 +117,6 @@ async function readHostedMacosStatus(record, options) {
 	return applyHostedMacosProbe(record, await probeHostedSession(record.host, options));
 }
 //#endregion
-//#region src/status-watch.ts
-const WATCH_FALLBACK_MS = 3e4;
-const WATCH_LIGHT_INTERVAL_MS = 15e3;
-const WATCH_SIMCTL_INTERVAL_MS = 5e3;
-const ADB_RESTART_MIN_MS = 1e3;
-const ADB_RESTART_MAX_MS = 6e4;
-const SIMCTL_TIMEOUT_MS = 1e4;
-/**
-* Coalesces change signals into refreshes: a burst of full triggers runs `run('full')` once after `debounceMs` of
-* quiet, at most one run is in flight, and a trigger that arrives during a run causes exactly one more run after it.
-* A `light` trigger runs `run('light')` no sooner than `debounceMs` from the trigger and `lightIntervalMs` from the
-* start of the previous run, unless a queued full run covers it; later light triggers do not postpone it.
-*/
-function createRefreshScheduler({ debounceMs, lightIntervalMs = 0, run }) {
-	let timer = null;
-	let queued = "full";
-	let running = false;
-	let pending = null;
-	let stopped = false;
-	let lastRunAt = -Infinity;
-	const fire = async () => {
-		timer = null;
-		running = true;
-		lastRunAt = Date.now();
-		try {
-			await run(queued);
-		} finally {
-			running = false;
-			if (pending) {
-				const next = pending;
-				pending = null;
-				trigger(next);
-			}
-		}
-	};
-	function trigger(kind = "full", delayMs = debounceMs) {
-		if (stopped) return;
-		if (running) {
-			pending = pending === "full" ? "full" : kind;
-			return;
-		}
-		if (kind === "light") {
-			if (timer) return;
-			queued = "light";
-			timer = setTimeout(() => void fire(), Math.max(delayMs, lastRunAt + lightIntervalMs - Date.now()));
-			return;
-		}
-		if (timer) clearTimeout(timer);
-		queued = "full";
-		timer = setTimeout(() => void fire(), delayMs);
-	}
-	return {
-		trigger,
-		stop() {
-			stopped = true;
-			if (timer) clearTimeout(timer);
-			timer = null;
-		}
-	};
-}
-/**
-* Which refresh a change to `name` in a watched `$STIM_HOME` directory needs: `light` for a log append or a running
-* build's detail, which can change only the log-derived fields, `full` for anything else that can change the payload,
-* 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":
-			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";
-	}
-}
-/** A stable summary of every simulator's state, or null when the listing is unreadable. */
-function simulatorSignature(simctlJson) {
-	try {
-		return parseSimctlList(simctlJson, { includeUnavailable: true }).map((sim) => `${sim.udid}:${sim.state}`).toSorted().join(",");
-	} catch {
-		return null;
-	}
-}
-/**
-* Calls `onChange` when anything `stim status` reports may have changed:
-* `$STIM_HOME` files, adb device arrivals and departures, and simulator
-* state. simctl has no push API reachable from Node, so it is polled.
-*/
-function watchStatusSources({ home, onChange, platform = process.platform, simctlIntervalMs = WATCH_SIMCTL_INTERVAL_MS }) {
-	let stopped = false;
-	const watchers = /* @__PURE__ */ new Map();
-	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"]
-		]);
-		let names = [];
-		try {
-			names = readdirSync(join(home, "workspaces"));
-		} catch {}
-		for (const name of names) {
-			const dir = join(home, "workspaces", name);
-			dirs.set(dir, "workspace");
-			dirs.set(join(dir, "logs"), "logs");
-		}
-		return dirs;
-	};
-	const reconcile = () => {
-		if (stopped) return;
-		const desired = desiredDirs();
-		for (const [dir, watcher] of watchers) if (!desired.has(dir)) {
-			watcher.close();
-			watchers.delete(dir);
-		}
-		for (const [dir, kind] of desired) {
-			if (watchers.has(dir)) continue;
-			try {
-				const watcher = watch(dir, (_event, name) => {
-					const change = statusChange(kind, name === null ? null : String(name));
-					if (!change) return;
-					if (kind === "home" || kind === "workspaces" || kind === "workspace") {
-						listingStaleBefore = Date.now();
-						reconcile();
-					}
-					onChange(change);
-				});
-				watcher.on("error", () => {
-					watcher.close();
-					watchers.delete(dir);
-				});
-				watchers.set(dir, watcher);
-			} catch {}
-		}
-	};
-	const adb = trackAdbDevices(() => onChange("full"));
-	let simctl = null;
-	let listing = null;
-	let listingStaleBefore = 0;
-	let simTimer = null;
-	if (platform === "darwin") {
-		let last = null;
-		const check = () => {
-			if (simctl || stopped) return;
-			const startedAt = Date.now();
-			let out = "";
-			const child = getExecutor().spawn("xcrun", [
-				"simctl",
-				"list",
-				"devices",
-				"--json"
-			], {
-				stdio: [
-					"ignore",
-					"pipe",
-					"ignore"
-				],
-				timeout: SIMCTL_TIMEOUT_MS,
-				killSignal: "SIGKILL"
-			});
-			simctl = child;
-			child.stdout?.on("data", (chunk) => out += chunk.toString());
-			child.on("error", () => {
-				simctl = null;
-			});
-			child.on("close", () => {
-				simctl = null;
-				const signature = simulatorSignature(out);
-				if (signature === null || stopped) return;
-				listing = {
-					at: startedAt,
-					json: out
-				};
-				if (last !== null && signature !== last) onChange("full");
-				last = signature;
-			});
-		};
-		check();
-		simTimer = setInterval(check, simctlIntervalMs);
-	}
-	reconcile();
-	return {
-		reconcile,
-		simulatorListing: () => listing && listing.at > listingStaleBefore && Date.now() - listing.at <= 2 * simctlIntervalMs ? listing.json : null,
-		stop() {
-			stopped = true;
-			for (const watcher of watchers.values()) watcher.close();
-			watchers.clear();
-			if (simTimer) clearInterval(simTimer);
-			simctl?.kill("SIGKILL");
-			adb.stop();
-		}
-	};
-}
-/**
-* Runs `adb track-devices` and calls `onChange` on every device list it
-* reports. adb exits when its server restarts, so the tracker restarts with a
-* doubling delay that resets once a run lasts a minute.
-*/
-function trackAdbDevices(onChange) {
-	const exec = getExecutor();
-	const resolved = androidToolPath("adb");
-	const adb = resolved === "adb" ? exec.findExecutable("adb") : resolved;
-	if (!adb) return { stop() {} };
-	let child = null;
-	let restart = null;
-	let delay = ADB_RESTART_MIN_MS;
-	let stopped = false;
-	const start = () => {
-		restart = null;
-		if (stopped) return;
-		const startedAt = Date.now();
-		const current = exec.spawn(adb, ["track-devices"], { stdio: [
-			"ignore",
-			"pipe",
-			"ignore"
-		] });
-		child = current;
-		current.stdout?.on("data", () => onChange());
-		current.on("error", () => {});
-		current.on("close", () => {
-			if (child === current) child = null;
-			if (stopped) return;
-			if (Date.now() - startedAt >= ADB_RESTART_MAX_MS) delay = ADB_RESTART_MIN_MS;
-			restart = setTimeout(start, delay);
-			delay = Math.min(delay * 2, ADB_RESTART_MAX_MS);
-		});
-	};
-	start();
-	return { stop() {
-		stopped = true;
-		if (restart) clearTimeout(restart);
-		child?.kill("SIGTERM");
-	} };
-}
-//#endregion
 //#region src/diagnostics/error-index.ts
 const INDEX_VERSION = 7;
 const HEAD_BYTES = 1024;
@@ -556,6 +309,7 @@ function writeIndex(file, index) {
 //#endregion
 //#region src/workspace/git-summary.ts
 const GIT_TIMEOUT_MS = 3e3;
+const GIT_CONCURRENCY = 6;
 const MERGE_BUDGET_MS = 250;
 const MERGE_TIMEOUT_BACKOFF_MS = 3e5;
 const ORIGIN_PREFIX = "refs/remotes/origin/";
@@ -596,7 +350,11 @@ function inPrivacyProtectedFolder(path, home) {
 		"Library/CloudStorage"
 	].map((dir) => posix.join(home, dir)), "/Volumes"].some((dir) => path === dir || path.startsWith(`${dir}/`));
 }
+const gitQueue = [];
+let gitRunning = 0;
 async function git(path, args) {
+	if (gitRunning < GIT_CONCURRENCY) gitRunning++;
+	else await new Promise((proceed) => gitQueue.push(proceed));
 	try {
 		return await getExecutor().runFileAsync("git", [
 			"--no-optional-locks",
@@ -606,6 +364,10 @@ async function git(path, args) {
 		], { timeoutMs: GIT_TIMEOUT_MS });
 	} catch {
 		return null;
+	} finally {
+		const next = gitQueue.shift();
+		if (next) next();
+		else gitRunning--;
 	}
 }
 async function defaultBranchOf(repository) {
@@ -752,7 +514,7 @@ function gitFilesStamp(worktree, refs) {
 	};
 }
 /**
-* Reads every worktree's git summary in parallel, each git call bounded by a timeout. A worktree `skip` rejects, or
+* Reads every worktree's git summary, at most six git calls at a time, each bounded by a timeout once it starts. A worktree `skip` rejects, or
 * one git cannot answer in time, maps to null. After every read, merge verdicts missing from the cache are judged one
 * at a time; no new judgement starts 250 ms after the first, and a verdict for the same HEAD judged at an older
 * default-branch commit stands in, because a merged branch stays merged. A judgement that timed out is not retried
@@ -791,7 +553,8 @@ async function readWorktreeGit(worktrees, { skip, maxAgeMs = 0 }) {
 			status: out === null ? null : parseGitStatus(out),
 			target,
 			files,
-			refs
+			refs,
+			at: Date.now()
 		};
 	}));
 	const budget = {};
@@ -803,7 +566,7 @@ async function readWorktreeGit(worktrees, { skip, maxAgeMs = 0 }) {
 		}
 		if (!read.status) {
 			if (read.files?.missing) recent.set(read.path, {
-				at: now,
+				at: read.at,
 				files: read.files.stamp,
 				refs: read.refs,
 				git: null
@@ -823,7 +586,7 @@ async function readWorktreeGit(worktrees, { skip, maxAgeMs = 0 }) {
 		};
 		const settled = !merge?.deferred && refs.upstream === read.refs.upstream && refs.target === read.refs.target;
 		recent.set(read.path, {
-			at: now,
+			at: read.at,
 			files: settled ? read.files?.stamp ?? null : null,
 			refs,
 			git: summary
@@ -1100,6 +863,14 @@ function androidStatusLines(record, slotLabel) {
 	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"]) {
+		const at = proj.doctorRuns?.[platform]?.at;
+		if (typeof at === "string") runs[platform] = { at };
+	}
+	return Object.keys(runs).length ? runs : void 0;
+}
 function formatGb(mb) {
 	return `${(mb / 1024).toFixed(1)} GB`;
 }
@@ -1133,7 +904,8 @@ async function readStatusFacts(gitMaxAgeMs, simctlListing, cachedArchives) {
 		};
 	}));
 	processes.catch(() => {});
-	const gitRead = readGitInto(worktrees, orphanWorktrees, gitMaxAgeMs);
+	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])),
@@ -1247,15 +1019,23 @@ async function readStatusFacts(gitMaxAgeMs, simctlListing, cachedArchives) {
 				state.live ||= macos.state === "running" || macos.state === "orphaned" || macos.build.state === "running";
 			}
 			Object.assign(state, builds, workspacePhase(state.live, saved, { now: leaseNow }), {
-				platforms: detectPlatforms(path, resolveSettings({
-					projectPath: path,
-					gitCommonDir: gitCommonDirOnDisk(path),
-					repoRoot: state.worktree?.path ?? path
-				})),
+				platforms: (() => {
+					const context = {
+						projectPath: path,
+						gitCommonDir: gitCommonDirOnDisk(path),
+						repoRoot: state.worktree?.path ?? path
+					};
+					return detectPlatforms(path, {
+						context,
+						settings: resolveSettings(context)
+					});
+				})(),
 				recording: { enabled: workspaceRecordingEnabled(path, proj, cfg, process.env) }
 			});
 			const tutorial = detectTutorial(readAppJson(path));
 			if (tutorial) state.tutorial = tutorial;
+			const doctorRuns = doctorRunTimes(proj);
+			if (doctorRuns) state.doctorRuns = doctorRuns;
 		}
 		const physicalDevices = physicalDeviceStates(leaseFiles, parseWorkspaceLeases(saved?.deviceLeases), {
 			root: path,
@@ -1266,6 +1046,7 @@ async function readStatusFacts(gitMaxAgeMs, simctlListing, cachedArchives) {
 		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] : [])));
 	applyStatusMeasures(states, worktrees);
 	readLogDerivedFacts(states);
 	const tables = createDeviceProcessTables();
@@ -1351,6 +1132,8 @@ function readLogDerivedFacts(states) {
 			const detail = record.phase === "compile" ? readBuildDetail(state.path, record.claim.claimId) : null;
 			if (detail) state.build.detail = detail;
 			else delete state.build.detail;
+			const activity = bundlingActivity(state.build.activity, state.build.platform, state.metro?.bundle);
+			if (activity) state.build.activity = activity;
 		}
 	}
 }
@@ -1407,7 +1190,7 @@ async function refreshLightFacts(snapshot, machine) {
 		busy: true
 	});
 }
-function renderStatus({ archived, archivedUsage: usage, 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, settle = (payload) => payload) {
 	const out = [];
 	const totalMemoryMb = Math.round(totalmem() / 1048576);
 	const cap = capacity(states, totalMemoryMb);
@@ -1424,7 +1207,7 @@ function renderStatus({ archived, archivedUsage: usage, projects, states, labelO
 	});
 	const maintenance = maintenanceStatus();
 	if (json) {
-		out.push(JSON.stringify({
+		const payload = {
 			environments: states.map((state, i) => withDerivedFacts(labelOnlyRoots[i] ? {
 				...state,
 				labelOnly: true
@@ -1437,7 +1220,8 @@ function renderStatus({ archived, archivedUsage: usage, projects, states, labelO
 			simctlAvailable: simsAvailable,
 			machine,
 			maintenance
-		}));
+		};
+		out.push(JSON.stringify(settle(payload)));
 		return out;
 	}
 	out.push(...maintenanceLines(maintenance).map((line) => chalk.dim(line)));
@@ -1541,6 +1325,7 @@ function renderStatus({ archived, archivedUsage: usage, projects, states, labelO
 }
 async function watchStatus(json) {
 	let last = null;
+	let lastPayload = null;
 	let archiveStamp = null;
 	let archives;
 	let snapshot = null;
@@ -1552,6 +1337,7 @@ async function watchStatus(json) {
 		run: async (kind) => {
 			triggerMaintenance("status-watch");
 			let text;
+			let payload = null;
 			try {
 				if (kind === "light" && snapshot) await refreshLightFacts(snapshot, json);
 				else {
@@ -1566,7 +1352,7 @@ async function watchStatus(json) {
 					snapshot = await readStatus(WATCH_GIT_MAX_AGE_MS, sources?.simulatorListing(), archives);
 				}
 				measurer.schedule(snapshot.states, snapshot.worktrees);
-				text = renderStatus(snapshot, json).join("\n");
+				text = renderStatus(snapshot, json, (full) => payload = watchPayload(lastPayload, full)).join("\n");
 			} catch (error) {
 				console.error(chalk.red(String(error?.message || error)));
 				return;
@@ -1575,6 +1361,7 @@ async function watchStatus(json) {
 			}
 			if (text === last) return;
 			last = text;
+			lastPayload = payload;
 			process.stdout.write(`${!json && process.stdout.isTTY ? "\x1B[2J\x1B[H" : ""}${text}\n`);
 		}
 	});
@@ -1598,11 +1385,11 @@ async function watchStatus(json) {
 	scheduler.trigger("full", 0);
 	await new Promise(() => {});
 }
-async function readGitInto(worktrees, orphans, maxAgeMs) {
+async function readGitInto(worktrees, orphans, maxAgeMs, only) {
 	const home = homedir();
 	const byPath = await readWorktreeGit(worktrees, {
 		maxAgeMs,
-		skip: (w) => process.platform === "darwin" && orphans.includes(w) && inPrivacyProtectedFolder(w.path, home)
+		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;
 }
@@ -1789,8 +1576,7 @@ function readVolumes(projectPath) {
 	])];
 	const volumes = [];
 	for (const volume of roots) {
-		const quoted = `'${volume.replace(/'/g, "'\\''")}'`;
-		const disk = parseDfFree(getExecutor().runQuiet(`df -k ${quoted}`, { timeoutMs: 5e3 }));
+		const disk = parseDfFree(getExecutor().runFileQuiet("df", ["-k", volume], { timeoutMs: 5e3 }));
 		if (disk) volumes.push({
 			volume,
 			disk