stim 1.19.0 → 1.20.1

package/dist/status-watch-ZaVqRdtW.mjs

@@ -0,0 +1,296 @@
+import { t as getExecutor } from "./exec-B81Qodjn.mjs";
+import { d as androidToolPath } from "./android-DE8-JfGW.mjs";
+import { b as parseSimctlList } from "./ios-o896T9PE.mjs";
+import { n as easMachineStateRoot } from "./eas-session-ledger-DJDeL4Uq.mjs";
+import { readdirSync, watch } from "node:fs";
+import { join } from "node:path";
+//#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(), "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");
+	} };
+}
+function ownerKey(owner) {
+	return JSON.stringify([
+		owner.kind,
+		owner.name,
+		owner.workspace,
+		owner.slot ?? null,
+		owner.id,
+		owner.owned
+	]);
+}
+function ownerSteady(before, after) {
+	return Math.abs(after.cpuPercent - before.cpuPercent) < 5 && Math.abs(after.memoryMb - before.memoryMb) < 16;
+}
+/**
+* The payload `status --watch --json` prints. A usage figure keeps its value from the `previous` printed payload until it moves by a step: an owner's `cpuPercent`
+* and `memoryMb`, an environment's `memoryMb` and `capacity.committedMb`. An owner's row is kept whole, `residentMb`
+* and `processes` included, until one of its two figures moves, so a Mac whose processes only jitter prints no new line.
+*/
+function watchPayload(previous, next) {
+	const payload = { ...next };
+	if (!previous) return payload;
+	if (previous.machine && next.machine && previous.machine.memorySource === next.machine.memorySource) {
+		const before = new Map(previous.machine.owners.map((owner) => [ownerKey(owner), owner]));
+		payload.machine = {
+			...next.machine,
+			owners: next.machine.owners.map((owner) => {
+				const old = before.get(ownerKey(owner));
+				return old && ownerSteady(old, owner) ? old : owner;
+			})
+		};
+	}
+	const memory = new Map(previous.environments.map((env) => [env.path, env]));
+	payload.environments = payload.environments.map((env) => {
+		const old = memory.get(env.path);
+		return old && old.memorySource === env.memorySource && Math.abs(env.memoryMb - old.memoryMb) < 16 ? {
+			...env,
+			memoryMb: old.memoryMb
+		} : env;
+	});
+	const { capacity } = previous;
+	if (capacity.overCapacity === next.capacity.overCapacity && capacity.liveCount === next.capacity.liveCount && capacity.totalMemoryMb === next.capacity.totalMemoryMb && Math.abs(next.capacity.committedMb - capacity.committedMb) < 16) payload.capacity = capacity;
+	return payload;
+}
+//#endregion
+export { watchStatusSources as a, watchPayload as i, WATCH_LIGHT_INTERVAL_MS as n, createRefreshScheduler as r, WATCH_FALLBACK_MS as t };

package/dist/{stim-desktop-C65jk_q2.mjs → stim-desktop-8GQX2OV8.mjs}

@@ -1,4 +1,4 @@
-import { t as getExecutor } from "./exec-i8GDPwq9.mjs";
+import { t as getExecutor } from "./exec-B81Qodjn.mjs";
 //#region src/devices/stim-desktop.ts
 const LAUNCH_SERVICES_LOOKUP = `ObjC.import('AppKit'); const url = $.NSWorkspace.sharedWorkspace.URLForApplicationWithBundleIdentifier('dev.stim.desktop'); url.isNil() ? '' : url.path.js`;
 const SCHEME_HANDLER_LOOKUP = `ObjC.import('AppKit'); const url = $.NSWorkspace.sharedWorkspace.URLForApplicationToOpenURL($.NSURL.URLWithString('stim-desktop://workspace')); url.isNil() ? '' : url.path.js`;

package/dist/{stop-zDlknFoz.mjs → stop-BO80KJoT.mjs}

@@ -1,22 +1,22 @@
 import { n as ownership_claim_exports, t as process_identity_exports } from "./process-identity-Biv3arCO.mjs";
-import { n as debugLog } from "./exec-i8GDPwq9.mjs";
-import { f as refuseNoProject, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-Bt8ygHE7.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-DC5jEtd1.mjs";
-import { a as updateWorkspaceState, c as writeWorkspaceState, n as clearWorkspaceStateKeys, o as withWorkspaceStateLock, r as readWorkspaceState$1, v as workspaceDir } from "./workspace-state-CR9X86xJ.mjs";
-import { C as clearRemoteSession, E as readMetroTunnel, O as readRemoteSession, S as clearManagedMetroTunnel, T as clearWorkspaceSupervisor, n as findCommandWorkspace, w as clearWorkspaceLaunches } from "./project-B5eQ1USs.mjs";
-import { d as signalProcessTree, r as killMetroTree, s as pidExists, u as resolveProjectMetro } from "./metro-DI2AjPF_.mjs";
-import { b as withdrawDevServerStopRequest, g as logVanishedSupervisor, v as requestDevServerStop } from "./budget-Dz-kyXLv.mjs";
-import { D as teardownOwnedAvd, O as teardownOwnedBrowser, g as stopTunnel, k as teardownOwnedIosSim, m as resolveSupervisorTarget } from "./workspaces-Djb2gfi9.mjs";
-import { n as fileLeaseIo, u as releaseWorkspaceLeases } from "./device-lease-Cu7PtQpZ.mjs";
-import { a as withWorkspaceProcessLock } from "./named-ports-B4iWH4E-.mjs";
-import { t as macosAppPresent } from "./state-Tp4uImDS.mjs";
-import { _ as nativeRunHolder, d as NATIVE_RUN_LOCK, f as NATIVE_RUN_WAIT_MS, g as describeNativeRunHolder, h as decideStopAction, m as clearNativeRunCancel, v as nativeRunWaitNotice, y as requestNativeRunCancel } from "./client-CuUo8Nvg.mjs";
-import { i as stopHostedAndroid } from "./hosted-android-Bs7fytj7.mjs";
-import { f as resolveEasCliBin } from "./remote-cache-N3hAEaAL.mjs";
-import { i as endRecordedSession } from "./device-remote-B5GiUifk.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-EB0ySdGK.mjs";
-import { r as stopHostedIos } from "./hosted-ios-Bik035eL.mjs";
-import { n as stopMacosApp } from "./stop-D0UIpZuh.mjs";
+import { n as debugLog } from "./exec-B81Qodjn.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-D0LhTY3S.mjs";
+import { n as fileLeaseIo, u as releaseWorkspaceLeases } from "./device-lease-C309csaB.mjs";
+import { a as updateWorkspaceState, c as writeWorkspaceState, n as clearWorkspaceStateKeys, o as withWorkspaceStateLock, r as readWorkspaceState$1, x as workspaceDir } from "./workspace-state-CvgTFe-h.mjs";
+import { f as refuseNoProject, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-CPDq_90S.mjs";
+import { A as clearWorkspaceSupervisor, D as clearManagedMetroTunnel, N as readRemoteSession, O as clearRemoteSession, j as readMetroTunnel, k as clearWorkspaceLaunches, n as findCommandWorkspace, w as MODE_COMMAND } from "./project-DX8fXyw_.mjs";
+import { d as signalProcessTree, r as killMetroTree, s as pidExists, u as resolveProjectMetro } from "./metro-_ZIE3Axg.mjs";
+import { D as stopTunnel, P as resolveSupervisorTarget, b as teardownOwnedIosSim, v as teardownOwnedAvd, y as teardownOwnedBrowser } from "./workspaces-C4kqIOlx.mjs";
+import { _t as withdrawDevServerStopRequest, ht as requestDevServerStop, pt as logVanishedSupervisor } from "./budget-RFbwFpG5.mjs";
+import { a as withWorkspaceProcessLock } from "./named-ports-O1TIl7tx.mjs";
+import { _ as nativeRunHolder, d as NATIVE_RUN_LOCK, f as NATIVE_RUN_WAIT_MS, g as describeNativeRunHolder, h as decideStopAction, m as clearNativeRunCancel, v as nativeRunWaitNotice, y as requestNativeRunCancel } from "./tailnet-D7-tE_ug.mjs";
+import { f as resolveEasCliBin } from "./remote-cache-fxcl5C-L.mjs";
+import { t as macosAppPresent } from "./state-BUpAmt2r.mjs";
+import { i as stopHostedAndroid } from "./hosted-android-C-D8Dj0_.mjs";
+import { i as endRecordedSession } from "./device-remote-DjsNw8DD.mjs";
+import { n as verifyCollectorOwnership } from "./ownership-BrjepDiv.mjs";
+import { r as stopHostedIos } from "./hosted-ios-Chx9XQyI.mjs";
+import { n as stopMacosApp } from "./stop-Cftw_sXJ.mjs";
 import { hostedAndroidDeviceName, hostedAndroidRecords, hostedIosRecords, hostedNativeRecords, isJsonObject, parseHostedNativePlacement } from "@stim-cli/core/state";
 import chalk from "chalk";
 //#region src/commands/stop.ts
@@ -263,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, hostedSlot, 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, group) => signalProcessTree(pid, "SIGTERM", { group }), 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;
@@ -646,6 +646,7 @@ async function stopSupervisor(target, { root, killGroup, waiter, report }) {
 	const reason = `supervisor pid ${target.pid} did not exit within ${Math.round(DEFAULT_WAIT_MS / 1e3)}s of SIGTERM`;
 	report(chalk.red(phaseLine("stop", reason)));
 	report(chalk.dim(phaseLine("", `inspect it with \`ps -p ${target.pid}\`, or signal it yourself: kill -9 -${target.pid}`)));
+	if (target.mode === "command-child") report(chalk.dim(phaseLine("", "metro.command runs in its own process group: once the supervisor is gone, run stim stop again to stop it")));
 	return {
 		status: "timeout",
 		pid: target.pid,
@@ -678,7 +679,7 @@ async function stopMetro(port, root, { server, supervisorGone, signalServer, ins
 		report(chalk.dim(phaseLine("metro", `sending SIGTERM to dev server pid ${serverPid} left by the supervisor`)));
 		let signalled = false;
 		try {
-			signalled = signalServer(serverPid);
+			signalled = signalServer(serverPid, server?.mode === MODE_COMMAND);
 		} catch {}
 		if (signalled ? await waiter(serverPid, serverProcessToken) : ["gone", "different"].includes(inspectIdentity(serverRecord))) {
 			report(chalk.green(phaseLine("metro", `dev server pid ${serverPid}`)));

package/dist/{stop-DRipAg-e.mjs → stop-BU7JaFCg.mjs}

@@ -1,3 +1,3 @@
-import { m as resolveSupervisorTarget } from "./workspaces-Djb2gfi9.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-zDlknFoz.mjs";
+import { P as resolveSupervisorTarget } from "./workspaces-C4kqIOlx.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-BO80KJoT.mjs";
 export { clearCollectorState, clearSupervisorState, stopCommand as default, readCollectorState, readSupervisorState, resolveCollectorTargets, resolveSupervisorTarget, runStop, stopWorkspaceNow };

package/dist/{stop-D0UIpZuh.mjs → stop-Cftw_sXJ.mjs}

@@ -1,9 +1,9 @@
 import { n as ownership_claim_exports, t as process_identity_exports } from "./process-identity-Biv3arCO.mjs";
-import { c as writeWorkspaceState, v as workspaceDir } from "./workspace-state-CR9X86xJ.mjs";
-import { C as runningBundleInstances } from "./workspaces-Djb2gfi9.mjs";
-import { a as withWorkspaceProcessLock } from "./named-ports-B4iWH4E-.mjs";
-import { a as macosRuntimeClaim, o as requiredMacosRecord } from "./state-Tp4uImDS.mjs";
-import { n as stopHostedMacos } from "./hosted-macos-DABm3ScO.mjs";
+import { c as writeWorkspaceState, x as workspaceDir } from "./workspace-state-CvgTFe-h.mjs";
+import { m as runningBundleInstances } from "./workspaces-C4kqIOlx.mjs";
+import { a as withWorkspaceProcessLock } from "./named-ports-O1TIl7tx.mjs";
+import { a as macosRuntimeClaim, o as requiredMacosRecord } from "./state-BUpAmt2r.mjs";
+import { n as stopHostedMacos } from "./hosted-macos-ckTjN-0V.mjs";
 import { readMacosRecord } from "@stim-cli/core/state";
 //#region src/macos/stop.ts
 const APP_EXIT_MS = 5e3;

package/dist/supervisor-run.d.mts

@@ -1,4 +1,4 @@
-import { a as readPidFile, i as clearWorkspaceSupervisor, n as MODE_EXPO, o as writePidFile, r as clearExpoMetroTunnel, t as MODE_BARE } from "./state-lKh8shBp.mjs";
+import { a as clearWorkspaceSupervisor, i as clearExpoMetroTunnel, n as MODE_BARE, o as readPidFile, r as MODE_EXPO, s as writePidFile, t as SettingsObject } from "./settings-vk3mJGSm.mjs";
 import { t as NdjsonWriter } from "./ndjson-Du3j0AQ9.mjs";
 import { DevServerStopRecord, DeviceActivity, DeviceIdleShutdownRecord, IOS_SIMULATOR_APPS } from "@stim-cli/core/state";
 //#region src/supervisor/types.d.ts
@@ -21,6 +21,7 @@ type ServerStarter = (opts: {
   tunnel?: boolean;
   resetCache?: boolean;
   onTunnelUrl?: ((url: string) => void) | null;
+  settings?: SettingsObject;
 }) => Promise<ServerHandle>;
 //#endregion
 //#region src/supervisor/idle-stop.d.ts
@@ -91,13 +92,17 @@ interface RunSupervisorOptions {
   isExpo?: (projectRoot: string) => boolean;
   startBare?: ServerStarter | null;
   startExpo?: ServerStarter | null;
+  startCommand?: ((opts: Parameters<ServerStarter>[0] & {
+    command: readonly string[];
+  }) => Promise<ServerHandle>) | null;
+  settings?: SettingsObject | null;
   now?: () => number;
   onExit?: (code: number) => void;
   attachSignals?: boolean;
   stderr?: (line: string) => void;
   watchman?: WatchmanCommand;
 }
-declare function runSupervisor({ root, port, tunnel, resetCache, idleStopMinutes, idleProbe, deviceIdleMinutes, deviceIdle, isExpo, startBare, startExpo, now, onExit, attachSignals, stderr, watchman }: RunSupervisorOptions): Promise<{
+declare function runSupervisor({ root, port, tunnel, resetCache, idleStopMinutes, idleProbe, deviceIdleMinutes, deviceIdle, isExpo, startBare, startExpo, startCommand, settings: settingsOverride, now, onExit, attachSignals, stderr, watchman }: RunSupervisorOptions): Promise<{
   mode: string;
   server: ServerHandle | undefined;
   shutdown: (code: number, event: string, msg: string, stop?: DevServerStopRecord) => Promise<void>;

package/dist/supervisor-run.mjs

@@ -1,20 +1,21 @@
 import { t as process_identity_exports } from "./process-identity-Biv3arCO.mjs";
-import { B as parseDeviceSlotKey, H as projectDeviceSlots, T as setSupervisor, o as clearSupervisor, p as getProject } from "./config-DC5jEtd1.mjs";
-import { C as workspaceStateFile, a as updateWorkspaceState, c as writeWorkspaceState, n as clearWorkspaceStateKeys, o as withWorkspaceStateLock, r as readWorkspaceState$1, x as workspaceLogsDir$1 } from "./workspace-state-CR9X86xJ.mjs";
-import { D as readPidFile, T as clearWorkspaceSupervisor, b as MODE_EXPO, j as writePidFile, p as detectIsExpo, u as nativeProjectIntegration, x as clearExpoMetroTunnel, y as MODE_BARE } from "./project-B5eQ1USs.mjs";
-import { n as parseTriggerCount, o as runWatchman, r as parseWatchRoots, t as parseSubscriberNames } from "./watchman-BL1IdOtq.mjs";
-import { E as workspaceBuildInProgress, f as describeDevServerStop, h as devServerStopRecord, m as devServerStopLevel, y as vanishedSupervisorMessage } from "./budget-Dz-kyXLv.mjs";
-import { f as withIdleWorkspace } from "./workspaces-Djb2gfi9.mjs";
-import { m as workspaceDeviceLastUseAt, r as createActivityReader } from "./activity-BSw0x84R.mjs";
-import { a as parseLease, r as leaseIsExpired, s as parseWorkspaceLeases, t as deviceLeasePath } from "./device-lease-Cu7PtQpZ.mjs";
-import { z as ownedAvdSerialResolver } from "./android-BdQC6zs1.mjs";
-import { a as withWorkspaceProcessLock } from "./named-ports-B4iWH4E-.mjs";
-import { s as describeError } from "./metro-store-BAHFcJm6.mjs";
-import { r as createNdjsonWriter } from "./ndjson-LGZAMsqa.mjs";
-import { n as dueIdleDevices, r as shutDownIdleDevices } from "./idle-shutdown-DYiMBn34.mjs";
-import { l as probeHostedSession } from "./hosted-client-C5G4h_OJ.mjs";
-import { t as clearHostedMetro } from "./metro-gateway-BxpJLIwh.mjs";
-import { t as relaunchWithLogFile } from "./detached-entry-pB_IPfV4.mjs";
+import { B as parseDeviceSlotKey, H as projectDeviceSlots, T as setSupervisor, o as clearSupervisor, p as getProject } from "./config-D0LhTY3S.mjs";
+import { J as runnableMetroCommand, K as resolveProjectSettings } from "./settings-Bbztm4oV.mjs";
+import { a as parseLease, r as leaseIsExpired, s as parseWorkspaceLeases, t as deviceLeasePath } from "./device-lease-C309csaB.mjs";
+import { E as workspaceStateFile, a as updateWorkspaceState, c as writeWorkspaceState, n as clearWorkspaceStateKeys, o as withWorkspaceStateLock, r as readWorkspaceState$1, w as workspaceLogsDir$1 } from "./workspace-state-CvgTFe-h.mjs";
+import { A as clearWorkspaceSupervisor, C as MODE_BARE, E as clearExpoMetroTunnel, L as writePidFile, M as readPidFile, T as MODE_EXPO, _ as detectIsExpo, u as nativeProjectIntegration, w as MODE_COMMAND } from "./project-DX8fXyw_.mjs";
+import { z as ownedAvdSerialResolver } from "./android-DE8-JfGW.mjs";
+import { f as withIdleWorkspace } from "./workspaces-C4kqIOlx.mjs";
+import { dt as devServerStopLevel, ft as devServerStopRecord, g as workspaceBuildInProgress, gt as vanishedSupervisorMessage, lt as describeDevServerStop } from "./budget-RFbwFpG5.mjs";
+import { a as withWorkspaceProcessLock } from "./named-ports-O1TIl7tx.mjs";
+import { r as createNdjsonWriter } from "./ndjson-GOnbyvso.mjs";
+import { t as describeError } from "./errors-DzkMYh8Q.mjs";
+import { t as relaunchWithLogFile } from "./detached-entry-BXq4fIl-.mjs";
+import { n as parseTriggerCount, o as runWatchman, r as parseWatchRoots, t as parseSubscriberNames } from "./watchman-CqmaGcIb.mjs";
+import { m as workspaceDeviceLastUseAt, r as createActivityReader } from "./activity-BaMpUQ4-.mjs";
+import { n as dueIdleDevices, r as shutDownIdleDevices } from "./idle-shutdown-DhAUyf5s.mjs";
+import { u as probeHostedSession } from "./hosted-client--hNFgixu.mjs";
+import { t as clearHostedMetro } from "./metro-gateway-BzlQZQmU.mjs";
 import { existsSync, readFileSync, realpathSync, statSync } from "node:fs";
 import { dirname, isAbsolute, join, resolve, sep } from "node:path";
 import { DEV_SERVER_STOP_REQUEST_KEY, HOSTED_METRO_GATEWAYS_KEY, HOSTED_METRO_REQUESTS_KEY, IDLE_STOP_KEY, hostedAndroidPlacements, hostedIosPlacements, hostedMetroGateways, hostedMetroRequests, hostedNativeRecords, parseHostedNativePlacement, readDevServerStopRequest } from "@stim-cli/core/state";
@@ -157,7 +158,7 @@ function trackDevServerActivity(now) {
 				if (typeof requestId === "string") open.add(requestId);
 			} else if (event === "bundle_response_finished" || event === "bundle_response_failed") {
 				if (typeof requestId === "string") open.delete(requestId);
-			} else if (event !== "expo_stdout") return;
+			} else if (event !== "expo_stdout" && event !== "command_stdout") return;
 			last = now();
 		},
 		lastActivityAt: () => open.size > 0 ? now() : last
@@ -463,12 +464,14 @@ const DEVICE_IDLE_OPS = {
 	due: dueIdleDevices,
 	shutDown: shutDownIdleDevices
 };
-async function runSupervisor({ root, port, tunnel = false, resetCache = false, idleStopMinutes = 0, idleProbe, deviceIdleMinutes = 0, deviceIdle = DEVICE_IDLE_OPS, isExpo = detectIsExpo, startBare = null, startExpo = null, now = Date.now, onExit = (code) => process.exit(code), attachSignals = true, stderr = (line) => console.error(line), watchman = runWatchman }) {
+async function runSupervisor({ root, port, tunnel = false, resetCache = false, idleStopMinutes = 0, idleProbe, deviceIdleMinutes = 0, deviceIdle = DEVICE_IDLE_OPS, isExpo = detectIsExpo, startBare = null, startExpo = null, startCommand = null, settings: settingsOverride = null, now = Date.now, onExit = (code) => process.exit(code), attachSignals = true, stderr = (line) => console.error(line), watchman = runWatchman }) {
 	root = realpathSync(root);
 	const logsDir = workspaceLogsDir$1(root);
 	const writer = createNdjsonWriter(join(logsDir, "metro.ndjson"), { maxBytes: LOG_ROTATE_BYTES });
 	const integration = nativeProjectIntegration(root, isExpo);
-	const mode = integration.mode;
+	const settings = settingsOverride ?? resolveProjectSettings(root).settings;
+	const command = runnableMetroCommand(settings);
+	const mode = command ? MODE_COMMAND : integration.mode;
 	const startedAt = new Date(now()).toISOString();
 	const processToken = (0, process_identity_exports.captureProcessToken)(process.pid);
 	if (!processToken) {
@@ -597,13 +600,22 @@ async function runSupervisor({ root, port, tunnel = false, resetCache = false, i
 		return writer.write(entry);
 	} });
 	try {
-		server = await ((mode === "expo-child" ? startExpo : startBare) ?? await integration.loadDevServer())({
+		let start;
+		if (command) {
+			const startServer = startCommand ?? (await import("./server-command-DnJYLnr4.mjs")).startCommandServer;
+			start = (opts) => startServer({
+				...opts,
+				command
+			});
+		} else start = (mode === "expo-child" ? startExpo : startBare) ?? await integration.loadDevServer();
+		server = await start({
 			root,
 			port,
 			logsDir,
 			writer: serverWriter,
 			tunnel,
 			resetCache,
+			settings,
 			onTunnelUrl: (url) => {
 				try {
 					withWorkspaceStateLock(root, () => {

package/dist/{support-DsNaFg6D.mjs → support-Ca6PZbpr.mjs}

@@ -1,8 +1,8 @@
-import { t as getExecutor } from "./exec-i8GDPwq9.mjs";
-import { C as emulatorFailureRemedy, D as hostSystemImageArch, K as profileNeedsFoldFeature, N as memoizeEmulatorProbe, S as emulatorDiskSpaceRemedy, T as findBuildTool, W as pickDefaultSystemImage, c as androidPoolNoCandidatesRefusal, l as androidSystemImageAbi, o as androidHome, s as androidPoolCandidates, w as extractEmulatorFailure } from "./android-BdQC6zs1.mjs";
-import { l as unknownAndroidDeviceProfileRefusal, o as layerNote, u as unknownAndroidSystemImageRefusal } from "./device-capacity-BoN1jQkO.mjs";
-import { T as pickDevClientScheme } from "./app-install-CFI4ptUL.mjs";
-import { t as devClientScheme } from "./dev-client-CDY_zAmD.mjs";
+import { t as getExecutor } from "./exec-B81Qodjn.mjs";
+import { C as emulatorFailureRemedy, D as hostSystemImageArch, K as profileNeedsFoldFeature, N as memoizeEmulatorProbe, S as emulatorDiskSpaceRemedy, T as findBuildTool, W as pickDefaultSystemImage, c as androidPoolNoCandidatesRefusal, l as androidSystemImageAbi, o as androidHome, s as androidPoolCandidates, w as extractEmulatorFailure } from "./android-DE8-JfGW.mjs";
+import { T as pickDevClientScheme } from "./app-install-Cg9YJy3x.mjs";
+import { l as unknownAndroidDeviceProfileRefusal, o as layerNote, u as unknownAndroidSystemImageRefusal } from "./device-capacity-DrwHwR97.mjs";
+import { t as devClientScheme } from "./dev-client-BqYjMIaC.mjs";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { relative } from "node:path";
 //#region src/commands/android/support.ts
@@ -297,12 +297,22 @@ async function pooledAndroidDevice({ root, selectPool, listDevices, isEmulatorDe
 		owned: false
 	} };
 }
-function androidBuildOptions({ release, physical, device, variant, deviceAbi, compiler, buildProfile, targetAbiOnly = true, hostedAbi = null }) {
+function androidGradleProject(layout) {
+	return layout.custom ? `${layout.gradleRootRelative} ${layout.module}` : null;
+}
+function androidJobLayout(layout) {
+	return layout.custom ? {
+		gradleRoot: layout.gradleRootRelative,
+		module: layout.module
+	} : {};
+}
+function androidBuildOptions({ release, physical, device, variant, deviceAbi, compiler, buildProfile, targetAbiOnly = true, hostedAbi = null, gradleProject = null }) {
 	let abi = targetAbiOnly ? hostedAbi : null;
 	if (targetAbiOnly && !release && physical && device.serial) abi = deviceAbi(device.serial);
 	if (targetAbiOnly && !release && !physical) abi = androidSystemImageAbi(device.systemImage);
 	const runOptions = {};
 	if (variant) runOptions.variant = variant;
+	if (gradleProject) runOptions.gradleProject = gradleProject;
 	if (abi) runOptions.abi = abi;
 	if (compiler) runOptions.compiler = compiler;
 	if (buildProfile) runOptions.buildProfile = buildProfile;
@@ -313,4 +323,4 @@ function androidBuildOptions({ release, physical, device, variant, deviceAbi, co
 	};
 }
 //#endregion
-export { resolveSystemImage as C, resolveDeviceProfile as S, systemImageRefusal as T, isReleaseVariant as _, PLATFORM as a, pooledAndroidDevice as b, androidSystemImageSetting as c, apkPackage as d, deviceProfileRefusal as f, foldableImageRefusal as g, findAapt as h, NO_FINGERPRINT as i, androidVariantSetting as l, dumpApkManifest as m, LAUNCH_FAILED as n, androidBuildOptions as o, displayPath as p, NO_DEVICE as r, androidDevClientScheme as s, INSTALL_FAILED as t, apkDevClientFacts as u, noDeviceDiagnostic as v, resolveVariant as w, remoteAvdFlagRefusal as x, parseXmltree as y };
+export { remoteAvdFlagRefusal as C, systemImageRefusal as D, resolveVariant as E, pooledAndroidDevice as S, resolveSystemImage as T, findAapt as _, PLATFORM as a, noDeviceDiagnostic as b, androidGradleProject as c, androidVariantSetting as d, apkDevClientFacts as f, dumpApkManifest as g, displayPath as h, NO_FINGERPRINT as i, androidJobLayout as l, deviceProfileRefusal as m, LAUNCH_FAILED as n, androidBuildOptions as o, apkPackage as p, NO_DEVICE as r, androidDevClientScheme as s, INSTALL_FAILED as t, androidSystemImageSetting as u, foldableImageRefusal as v, resolveDeviceProfile as w, parseXmltree as x, isReleaseVariant as y };