stim 1.6.0 → 1.7.0

package/dist/{ownership-CVY9cqCr.mjs → ownership-D5vkdm8H.mjs}

@@ -1,8 +1,8 @@
-import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { u as getConfigDir, w as process_identity_exports } from "./config-DMP7L7H6.mjs";
-import { t as createLineReader } from "./process-output-C7IlIzd7.mjs";
-import { r as pidExists } from "./metro-ato6ef3J.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-Bz19_R9R.mjs";
+import { t as getExecutor } from "./exec-B29XNuhP.mjs";
+import { u as getConfigDir, w as process_identity_exports } from "./config-B7iyKWkL.mjs";
+import { t as createLineReader } from "./process-output-Dl5uKE03.mjs";
+import { i as pidExists, o as signalProcessTree } from "./metro-C7bcJ0uo.mjs";
+import { t as withWorkspaceProcessLock } from "./workspace-process-lock-BYfZz_S-.mjs";
 import { closeSync, mkdirSync, openSync, readFileSync, unlinkSync } from "node:fs";
 import { createHash, randomUUID } from "node:crypto";
 import { basename, join, resolve, sep } from "node:path";
@@ -324,13 +324,14 @@ function resumeChildPipes(child) {
 	child.stdout?.resume?.();
 	child.stderr?.resume?.();
 }
-async function signalAndWaitForExit(child, signal, { timeoutMs, now, sleep, isAlive }) {
+async function signalAndWaitForExit(child, signal, { timeoutMs, now, sleep, isAlive, platform }) {
 	let exited = false;
 	const onExit = () => {
 		exited = true;
 	};
 	child.once("exit", onExit);
 	try {
+		if (platform === "win32" && child.pid) signalProcessTree(child.pid, signal, { platform });
 		child.kill(signal);
 	} catch (err) {
 		child.removeListener("exit", onExit);
@@ -343,7 +344,7 @@ async function signalAndWaitForExit(child, signal, { timeoutMs, now, sleep, isAl
 	child.removeListener("exit", onExit);
 	return hasExited();
 }
-async function terminateChild(child, { alreadyExited, timeoutMs, now, sleep, isAlive }) {
+async function terminateChild(child, { alreadyExited, timeoutMs, now, sleep, isAlive, platform = process.platform }) {
 	if (alreadyExited) {
 		closeChildPipes(child);
 		return true;
@@ -352,7 +353,8 @@ async function terminateChild(child, { alreadyExited, timeoutMs, now, sleep, isA
 		timeoutMs,
 		now,
 		sleep,
-		isAlive
+		isAlive,
+		platform
 	})) {
 		closeChildPipes(child);
 		return true;
@@ -361,7 +363,8 @@ async function terminateChild(child, { alreadyExited, timeoutMs, now, sleep, isA
 		timeoutMs,
 		now,
 		sleep,
-		isAlive
+		isAlive,
+		platform
 	});
 	closeChildPipes(child);
 	return killed;
@@ -371,13 +374,10 @@ function describe(err) {
 }
 const STOP_TIMEOUT_MS = 5e3;
 const STOP_POLL_MS = 100;
-function defaultKill(pid) {
-	process.kill(pid, "SIGTERM");
-}
 function isEsrch(err) {
 	return err?.code === "ESRCH";
 }
-async function stopTunnel(record, { isAlive = pidExists, inspectIdentity = process_identity_exports.inspectProcessIdentity, kill = defaultKill, now = Date.now, sleep = defaultSleep, timeoutMs = STOP_TIMEOUT_MS } = {}) {
+async function stopTunnel(record, { isAlive = pidExists, inspectIdentity = process_identity_exports.inspectProcessIdentity, platform = process.platform, kill = (pid) => signalProcessTree(pid, "SIGTERM", { platform }), now = Date.now, sleep = defaultSleep, timeoutMs = STOP_TIMEOUT_MS } = {}) {
 	const missing = () => {
 		removeRecordedTunnelLogFile(record?.logFile);
 		return { status: "missing" };

package/dist/{ports-A6uTJSPj.mjs → ports-BIbJaKNW.mjs}

@@ -1,6 +1,6 @@
-import { f as getProject } from "./config-DMP7L7H6.mjs";
-import { a as findProjectRoot } from "./project-B_SDt4ip.mjs";
-import { n as getNamedPort, t as clearNamedPorts } from "./named-ports-DH9SXd0f.mjs";
+import { f as getProject } from "./config-B7iyKWkL.mjs";
+import { a as findProjectRoot } from "./project-DDZWf_16.mjs";
+import { n as getNamedPort, t as clearNamedPorts } from "./named-ports-DzMOlmaX.mjs";
 //#region src/commands/ports.ts
 async function inProject(action) {
 	try {

package/dist/{process-output-C7IlIzd7.mjs → process-output-Dl5uKE03.mjs}

@@ -10,7 +10,7 @@ function createLineReader(onLine) {
 			buffered += String(chunk);
 			const parts = buffered.split("\n");
 			buffered = parts.pop() ?? "";
-			for (const part of parts) onLine(part);
+			for (const part of parts) onLine(part.endsWith("\r") ? part.slice(0, -1) : part);
 		},
 		flush() {
 			if (!buffered) return;

package/dist/{project-B_SDt4ip.mjs → project-DDZWf_16.mjs}

@@ -1,9 +1,9 @@
-import { c as findEnclosingWorktreeRoot, f as getProject } from "./config-DMP7L7H6.mjs";
-import { g as repoRoot } from "./worktree-DJnBbQZ9.mjs";
+import { c as findEnclosingWorktreeRoot, f as getProject } from "./config-B7iyKWkL.mjs";
+import { g as repoRoot } from "./worktree-FG_ZKKdb.mjs";
 import { existsSync, readFileSync, readdirSync, realpathSync } from "fs";
 import { basename, dirname, join, resolve } from "path";
 import { createRequire } from "module";
-//#region src/project.ts
+//#region src/workspace/project.ts
 const requireFromHere = createRequire(import.meta.url);
 function resolvePackageJson(projectRoot, name) {
 	try {

package/dist/{reclaim-WXTbXPX4.mjs → reclaim-D614jI6_.mjs}

@@ -1,15 +1,15 @@
-import { E as ownership_claim_exports, L as projectDeviceSlots, T as acquireAvdClaim, f as getProject, v as removeProject, w as process_identity_exports } from "./config-DMP7L7H6.mjs";
-import { h as workspaceDir, r as readWorkspaceState } from "./workspace-state-WVwWw_hB.mjs";
-import { a as clearRemoteSession, i as clearManagedMetroTunnel, s as readMetroTunnel, u as readRemoteSessionId } from "./state-CnWzvCWP.mjs";
-import { i as resolveProjectMetro, n as killMetroTree, r as pidExists } from "./metro-ato6ef3J.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-CD_XnpDu.mjs";
-import { S as resolveEasCliBin, l as parkedMaxSetting, n as teardownOwnedIosSim, t as teardownOwnedAvd } from "./teardown-sm1FwF6V.mjs";
-import { l as releaseWorkspaceLeases } from "./device-lease-DBW-IL4p.mjs";
-import { i as endRecordedSession } from "./device-remote-D9wN3CdE.mjs";
-import { t as clearNamedPorts } from "./named-ports-DH9SXd0f.mjs";
-import { r as stopTunnel, t as resolveSupervisorTarget } from "./ownership-CVY9cqCr.mjs";
+import { E as ownership_claim_exports, R as projectDeviceSlots, T as acquireAvdClaim, f as getProject, v as removeProject, w as process_identity_exports } from "./config-B7iyKWkL.mjs";
+import { h as workspaceDir, r as readWorkspaceState } from "./workspace-state-BT5E3SA2.mjs";
+import { a as clearRemoteSession, i as clearManagedMetroTunnel, s as readMetroTunnel, u as readRemoteSessionId } from "./state-DZobzxLW.mjs";
+import { a as resolveProjectMetro, i as pidExists, n as killMetroTree } from "./metro-C7bcJ0uo.mjs";
+import { n as verifyCollectorOwnership } from "./ownership-Cp52QAK1.mjs";
+import { S as resolveEasCliBin, l as parkedMaxSetting, n as teardownOwnedIosSim, t as teardownOwnedAvd } from "./teardown-5J5UXz2P.mjs";
+import { l as releaseWorkspaceLeases } from "./device-lease-Ffz_M5t0.mjs";
+import { i as endRecordedSession } from "./device-remote-BprxZp-m.mjs";
+import { t as clearNamedPorts } from "./named-ports-DzMOlmaX.mjs";
+import { r as stopTunnel, t as resolveSupervisorTarget } from "./ownership-D5vkdm8H.mjs";
 import { existsSync, rmSync } from "node:fs";
-//#region src/reclaim.ts
+//#region src/devices/reclaim.ts
 async function reapCollectors(root, { verify = verifyCollectorOwnership, collectors }) {
 	const skippedDevices = [];
 	const failedDevices = [];

package/dist/{reload-xlQvHKfN.mjs → reload-ChW46VDb.mjs}

@@ -1,12 +1,12 @@
-import { F as deviceSlotPlatforms, I as parseDeviceSlotKey, f as getProject } from "./config-DMP7L7H6.mjs";
-import { a as findProjectRoot } from "./project-B_SDt4ip.mjs";
-import { d as readWorkspaceLaunches } from "./state-CnWzvCWP.mjs";
-import { i as resolveProjectMetro } from "./metro-ato6ef3J.mjs";
-import { l as phaseLine } from "./command-output-BuIb_ZOI.mjs";
-import { N as resolveOwnedAvdSerial } from "./android-BkYmndPp.mjs";
-import { u as androidAppProcess, y as iosAppProcess } from "./app-install--PAocWvq.mjs";
-import { x as resolveOwnedIosSim } from "./ios-Deh5js5V.mjs";
-import { n as nativeRunCommand } from "./slot-launch-BYjnljAs.mjs";
+import { I as deviceSlotPlatforms, L as parseDeviceSlotKey, f as getProject } from "./config-B7iyKWkL.mjs";
+import { a as findProjectRoot } from "./project-DDZWf_16.mjs";
+import { d as readWorkspaceLaunches } from "./state-DZobzxLW.mjs";
+import { a as resolveProjectMetro } from "./metro-C7bcJ0uo.mjs";
+import { I as resolveOwnedAvdSerial } from "./android-DWssqHQ8.mjs";
+import { l as phaseLine } from "./command-output-B3ycpsYv.mjs";
+import { u as androidAppProcess, y as iosAppProcess } from "./app-install-DJg7bVv-.mjs";
+import { x as resolveOwnedIosSim } from "./ios-lEJ5pKsq.mjs";
+import { n as nativeRunCommand } from "./slot-launch-DbLvyrup.mjs";
 import chalk from "chalk";
 import { WebSocket } from "ws";
 //#region src/engine/reload.ts

package/dist/{server-bare-CCLb90FS.mjs → server-bare-BQkyxa_b.mjs}

@@ -1,6 +1,6 @@
 import { i as __require, t as __commonJSMin } from "./rolldown-runtime-BsOwBuO_.mjs";
 import { n as supervisorError } from "./errors-B6W7FkxQ.mjs";
-import { C as projectMetroSharedCache } from "./settings-CGHTt5vb.mjs";
+import { C as projectMetroSharedCache } from "./settings-BXXorVM2.mjs";
 import { a as metroStoreRoot, o as registerMetroStore, t as appendCacheStore } from "./metro-store-CDDZHtPl.mjs";
 import { createRequire } from "node:module";
 import { isAbsolute, join, relative, sep } from "node:path";

package/dist/{server-expo-CX-zkgWl.mjs → server-expo-BVAA1OqJ.mjs}

@@ -1,9 +1,9 @@
-import { t as getExecutor } from "./exec-CyylIdq9.mjs";
+import { t as getExecutor } from "./exec-B29XNuhP.mjs";
 import { r as createNdjsonWriter } from "./ndjson-BZwI1NBv.mjs";
-import { l as resolvePackageJson } from "./project-B_SDt4ip.mjs";
+import { l as resolvePackageJson } from "./project-DDZWf_16.mjs";
 import { n as supervisorError } from "./errors-B6W7FkxQ.mjs";
-import { n as stripAnsi, t as createLineReader } from "./process-output-C7IlIzd7.mjs";
-import { C as projectMetroSharedCache } from "./settings-CGHTt5vb.mjs";
+import { n as stripAnsi, t as createLineReader } from "./process-output-Dl5uKE03.mjs";
+import { C as projectMetroSharedCache } from "./settings-BXXorVM2.mjs";
 import { a as metroStoreRoot, i as metroStoreConfirmedRoot, n as expoMetroConfigPath, o as registerMetroStore, r as expoMetroStoreEnv } from "./metro-store-CDDZHtPl.mjs";
 import { accessSync, constants, existsSync, readFileSync } from "node:fs";
 import { dirname, join, parse } from "node:path";
@@ -14,10 +14,20 @@ function delay(ms) {
 		if (typeof timer.unref === "function") timer.unref();
 	});
 }
-function expoBinPath(root) {
+function resolveExpoBin(root) {
 	const fromPackage = expoBinFromPackage(resolvePackageJson(root, "expo"));
-	if (fromPackage) return fromPackage;
-	return findBinUpward(root, "expo");
+	if (fromPackage) return {
+		path: fromPackage,
+		source: "package"
+	};
+	const shim = findBinUpward(root, "expo");
+	return shim ? {
+		path: shim,
+		source: "shim"
+	} : null;
+}
+function expoBinPath(root) {
+	return resolveExpoBin(root)?.path ?? null;
 }
 function expoSdkMajor(root) {
 	const packageJsonPath = resolvePackageJson(root, "expo");
@@ -192,12 +202,13 @@ function resolveMetroStoreInjection(root, { log, env }) {
 	});
 	return additions;
 }
-async function startExpoServer({ root, port, logsDir, writer = null, spawnFn = null, killTimeoutMs = 5e3, tunnel = false, resetCache = false, onTunnelUrl = null }) {
-	const bin = expoBinPath(root);
-	if (!bin) {
+async function startExpoServer({ root, port, logsDir, writer = null, spawnFn = null, killTimeoutMs = 5e3, tunnel = false, resetCache = false, onTunnelUrl = null, platform = process.platform }) {
+	const resolved = resolveExpoBin(root);
+	if (!resolved) {
 		const refusal = expoBinRefusal(root);
 		throw supervisorError("STIM_EXPO_BIN", refusal.message, refusal.remedy);
 	}
+	const bin = resolved.path;
 	const log = writer || createNdjsonWriter(join(logsDir, "metro.ndjson"));
 	const spawn = spawnFn || ((cmd, args, opts) => getExecutor().spawn(cmd, args, opts));
 	const args = [
@@ -211,7 +222,8 @@ async function startExpoServer({ root, port, logsDir, writer = null, spawnFn = n
 		log,
 		env: process.env
 	});
-	const child = spawn(bin, args, {
+	const [command, commandArgs] = platform === "win32" && resolved.source === "package" ? [process.execPath, [bin, ...args]] : [bin, args];
+	const child = spawn(command, commandArgs, {
 		cwd: root,
 		stdio: [
 			"ignore",

package/dist/server-expo-YDDG3eP7.mjs

@@ -0,0 +1,2 @@
+import { p as startExpoServer } from "./server-expo-BVAA1OqJ.mjs";
+export { startExpoServer };

package/dist/{settings-CGHTt5vb.mjs → settings-BXXorVM2.mjs}

@@ -1,5 +1,5 @@
-import { d as getConfigPath, g as loadConfig, m as getRepoSettings, p as getProjectSettings } from "./config-DMP7L7H6.mjs";
-import { g as repoRoot, s as gitCommonDir } from "./worktree-DJnBbQZ9.mjs";
+import { d as getConfigPath, g as loadConfig, m as getRepoSettings, p as getProjectSettings } from "./config-B7iyKWkL.mjs";
+import { g as repoRoot, s as gitCommonDir } from "./worktree-FG_ZKKdb.mjs";
 import { createHash } from "node:crypto";
 import { isAbsolute } from "node:path";
 import { existsSync, readFileSync, realpathSync, statSync } from "fs";
@@ -177,7 +177,7 @@ function detectProviders(onPath) {
 	return MANAGED_PROVIDERS.filter((p) => onPath(p));
 }
 //#endregion
-//#region src/settings.ts
+//#region src/workspace/settings.ts
 function isPlainObject(v) {
 	return v !== null && typeof v === "object" && !Array.isArray(v);
 }

package/dist/{slot-launch-BYjnljAs.mjs → slot-launch-DbLvyrup.mjs}

@@ -1,7 +1,7 @@
-import { f as getProject } from "./config-DMP7L7H6.mjs";
-import { r as readWorkspaceState } from "./workspace-state-WVwWw_hB.mjs";
-import { h as deviceShellArg } from "./app-install--PAocWvq.mjs";
-import { n as fileLeaseIo } from "./device-lease-DBW-IL4p.mjs";
+import { f as getProject } from "./config-B7iyKWkL.mjs";
+import { r as readWorkspaceState } from "./workspace-state-BT5E3SA2.mjs";
+import { h as deviceShellArg } from "./app-install-DJg7bVv-.mjs";
+import { n as fileLeaseIo } from "./device-lease-Ffz_M5t0.mjs";
 //#region src/engine/slot-launch.ts
 function launchSlotScope(root, slot = "default") {
 	if (slot !== "default") return slot;

package/dist/{start-DHYAyGzm.mjs → start-TTVILlUi.mjs}

@@ -1,20 +1,21 @@
-import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { S as upsertProject, a as clearSupervisor, f as getProject, w as process_identity_exports } from "./config-DMP7L7H6.mjs";
-import { _ as workspaceLogsDir, c as ensureWorkspaceStorage, f as supervisorLogFile, o as writeWorkspaceState, r as readWorkspaceState } from "./workspace-state-WVwWw_hB.mjs";
-import { g as repoRoot, s as gitCommonDir } from "./worktree-DJnBbQZ9.mjs";
-import { a as findProjectRoot, i as detectIsExpo, n as detectAndroidPackage, r as detectBundleId, t as appProjectProblem } from "./project-B_SDt4ip.mjs";
+import { t as getExecutor } from "./exec-B29XNuhP.mjs";
+import { S as upsertProject, a as clearSupervisor, f as getProject, w as process_identity_exports } from "./config-B7iyKWkL.mjs";
+import { _ as workspaceLogsDir, c as ensureWorkspaceStorage, f as supervisorLogFile, o as writeWorkspaceState, r as readWorkspaceState } from "./workspace-state-BT5E3SA2.mjs";
+import { g as repoRoot, s as gitCommonDir } from "./worktree-FG_ZKKdb.mjs";
+import { a as findProjectRoot, i as detectIsExpo, n as detectAndroidPackage, r as detectBundleId, t as appProjectProblem } from "./project-DDZWf_16.mjs";
 import { n as supervisorError } from "./errors-B6W7FkxQ.mjs";
-import { i as clearManagedMetroTunnel, o as clearWorkspaceSupervisor, s as readMetroTunnel } from "./state-CnWzvCWP.mjs";
-import { r as reserveMetroPort } from "./ports-BZprTJRa.mjs";
-import { i as resolveProjectMetro, n as killMetroTree, r as pidExists } from "./metro-ato6ef3J.mjs";
-import { g as stepTimer, l as phaseLine } from "./command-output-BuIb_ZOI.mjs";
-import { A as resolveSettings, D as remoteDeviceSettingError, E as remoteAndroidSetting, F as tunnelModeSetting, I as unknownSettingKeys, L as PUBLIC_METRO_ENV, N as settingShapeErrors, O as remoteIosSetting, R as detectProviders, S as ngrokUrlSetting, T as publicUrlSetting, a as SETTING_SHAPE_REMEDY, b as metroTunnelSettingError, d as cacheProviderSettingError, k as resolveCacheProviderConfig, z as planMetroReach } from "./settings-CGHTt5vb.mjs";
-import { n as workspaceProcessLockError, t as withWorkspaceProcessLock } from "./workspace-process-lock-Bz19_R9R.mjs";
+import { n as windowsLauncherArgs } from "./detached-entry-Bpo6ZY_I.mjs";
+import { i as clearManagedMetroTunnel, o as clearWorkspaceSupervisor, s as readMetroTunnel } from "./state-DZobzxLW.mjs";
+import { a as resolveProjectMetro, i as pidExists, l as reserveMetroPort, n as killMetroTree, o as signalProcessTree } from "./metro-C7bcJ0uo.mjs";
+import { A as resolveSettings, D as remoteDeviceSettingError, E as remoteAndroidSetting, F as tunnelModeSetting, I as unknownSettingKeys, L as PUBLIC_METRO_ENV, N as settingShapeErrors, O as remoteIosSetting, R as detectProviders, S as ngrokUrlSetting, T as publicUrlSetting, a as SETTING_SHAPE_REMEDY, b as metroTunnelSettingError, d as cacheProviderSettingError, k as resolveCacheProviderConfig, z as planMetroReach } from "./settings-BXXorVM2.mjs";
+import { g as stepTimer, l as phaseLine } from "./command-output-B3ycpsYv.mjs";
+import { n as workspaceProcessLockError, t as withWorkspaceProcessLock } from "./workspace-process-lock-BYfZz_S-.mjs";
 import { t as spawnEntry } from "./spawn-entry-nCE6m770.mjs";
-import { c as queryLogs } from "./logs-query-Cdp5aaCH.mjs";
-import { a as withManagedRemoteWorktreeLock, i as terminateChild, n as startTunnelSequence, r as stopTunnel, s as withManagedTunnelLock, t as resolveSupervisorTarget } from "./ownership-CVY9cqCr.mjs";
-import { mkdirSync, openSync, readFileSync } from "node:fs";
+import { c as queryLogs } from "./logs-query-BGL-Pl12.mjs";
+import { a as withManagedRemoteWorktreeLock, i as terminateChild, n as startTunnelSequence, r as stopTunnel, s as withManagedTunnelLock, t as resolveSupervisorTarget } from "./ownership-D5vkdm8H.mjs";
+import { appendFileSync, mkdirSync, openSync, readFileSync } from "node:fs";
 import { dirname } from "node:path";
+import { EventEmitter } from "node:events";
 import { CACHE_PROVIDER_ENV, cacheProviderEnv } from "@stim-cli/cache";
 import chalk from "chalk";
 //#region src/supervisor/cache-reset.ts
@@ -104,10 +105,20 @@ const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 function startCommand(program) {
 	registerStart(program);
 }
+function recordedSupervisorProcess(pid) {
+	return Object.assign(new EventEmitter(), {
+		pid,
+		stdout: null,
+		stderr: null,
+		kill: (signal = "SIGTERM") => pid !== void 0 && signalProcessTree(pid, typeof signal === "number" ? "SIGTERM" : signal),
+		unref() {}
+	});
+}
+const RECORDED_SUPERVISOR_WAIT_MS = 15e3;
 function providersOnPath() {
 	return detectProviders((bin) => {
 		try {
-			return Boolean(getExecutor().runQuiet(`command -v ${bin}`, { timeoutMs: 5e3 }));
+			return Boolean(getExecutor().findExecutable(bin));
 		} catch {
 			return false;
 		}
@@ -129,7 +140,8 @@ const DEFAULT_START_DEPS = {
 	}),
 	withWorktreeLock: withManagedRemoteWorktreeLock,
 	withTunnelLock: withManagedTunnelLock,
-	clearTunnelRecord: clearManagedMetroTunnel
+	clearTunnelRecord: clearManagedMetroTunnel,
+	platform: process.platform
 };
 function normalizeManagedTunnelUrl(url) {
 	return url.trim().replace(/\/+$/, "");
@@ -272,27 +284,8 @@ function registerStart(program, overrides = {}) {
 			let spawnedChild = null;
 			let spawnedTs = null;
 			let childExit = null;
-			const spawnSupervisor = (origin) => {
-				mkdirSync(logsDir, { recursive: true });
+			const spawnDirect = (supervisorArgs, childEnv) => {
 				const fd = openSync(logFile, "a");
-				spawnedTs = Date.now();
-				const supervisorArgs = [
-					supervisorEntry(),
-					"--root",
-					root,
-					"--port",
-					String(port),
-					...tunnel ? ["--tunnel"] : [],
-					...opts.resetCache ? ["--reset-cache"] : []
-				];
-				const childEnv = {
-					...process.env,
-					...origin ? {
-						[PUBLIC_METRO_ENV]: origin,
-						EXPO_PACKAGER_PROXY_URL: origin
-					} : {}
-				};
-				childEnv[CACHE_PROVIDER_ENV] = cacheProviderEnv(cacheProvider);
 				const child = getExecutor().spawn(process.execPath, supervisorArgs, {
 					cwd: root,
 					detached: true,
@@ -317,6 +310,86 @@ function registerStart(program, overrides = {}) {
 						error: err
 					};
 				});
+				return child;
+			};
+			const recordedSupervisorPid = async (since) => {
+				const deadline = Date.now() + RECORDED_SUPERVISOR_WAIT_MS;
+				while (Date.now() < deadline) {
+					const record = readWorkspaceState(root)?.supervisor;
+					if (record?.pid && record.port === port && Date.parse(String(record.startedAt)) >= since && pidExists(record.pid)) return record.pid;
+					await sleep(25);
+				}
+				return null;
+			};
+			const spawnThroughWindowsShell = async (supervisorArgs, childEnv) => {
+				const [entry, ...args] = supervisorArgs;
+				const launcher = windowsLauncherArgs({
+					entry,
+					args,
+					cwd: root,
+					logFile
+				});
+				const since = Date.now();
+				const shell = getExecutor().spawn(launcher.file, launcher.args, {
+					cwd: root,
+					stdio: [
+						"ignore",
+						"ignore",
+						"pipe"
+					],
+					env: {
+						...childEnv,
+						...launcher.env
+					},
+					windowsHide: true
+				});
+				const stderr = [];
+				shell.stderr?.on("data", (chunk) => stderr.push(String(chunk)));
+				const exit = await new Promise((resolve) => {
+					shell.on?.("close", (code, signal) => resolve({
+						code,
+						signal
+					}));
+					shell.on?.("error", (error) => resolve({
+						code: null,
+						signal: null,
+						error
+					}));
+				});
+				const launcherFailed = exit.code !== 0 || exit.error;
+				const pid = launcherFailed ? null : await recordedSupervisorPid(since);
+				if (pid === null) {
+					const reason = launcherFailed ? `the supervisor launcher exited (${exit.error ? exit.error.message : `code ${exit.code}`})` : `the supervisor did not record itself within ${RECORDED_SUPERVISOR_WAIT_MS / 1e3}s`;
+					appendFileSync(logFile, `Stim start: ${reason}.\n${stderr.join("")}`);
+					childExit = {
+						code: exit.code,
+						signal: exit.signal,
+						...exit.error ? { error: exit.error } : {}
+					};
+				}
+				return recordedSupervisorProcess(pid ?? void 0);
+			};
+			const spawnSupervisor = async (origin) => {
+				mkdirSync(logsDir, { recursive: true });
+				spawnedTs = Date.now();
+				const supervisorArgs = [
+					supervisorEntry(),
+					"--root",
+					root,
+					"--port",
+					String(port),
+					...tunnel ? ["--tunnel"] : [],
+					...opts.resetCache ? ["--reset-cache"] : []
+				];
+				const childEnv = {
+					...process.env,
+					...origin ? {
+						[PUBLIC_METRO_ENV]: origin,
+						EXPO_PACKAGER_PROXY_URL: origin
+					} : {}
+				};
+				childEnv[CACHE_PROVIDER_ENV] = cacheProviderEnv(cacheProvider);
+				const child = d.platform === "win32" ? await spawnThroughWindowsShell(supervisorArgs, childEnv) : spawnDirect(supervisorArgs, childEnv);
 				out(chalk.dim(phaseLine("metro", `starting on port ${port} (${isExpo ? "expo-child" : "bare-inproc"}, supervisor pid ${child.pid})`)));
 				spawnedChild = child;
 				return child;
@@ -476,7 +549,7 @@ function registerStart(program, overrides = {}) {
 							}
 							let child;
 							try {
-								child = spawnSupervisor(tracking.record.url);
+								child = await spawnSupervisor(tracking.record.url);
 							} catch (err) {
 								return { failed: {
 									code: "STIM_SUPERVISOR_EXITED",
@@ -648,7 +721,7 @@ function registerStart(program, overrides = {}) {
 				return;
 			}
 			if (managedTunnelExited()) return failExitedManagedTunnel();
-			const child = spawnedChild ?? spawnSupervisor(publicOrigin);
+			const child = spawnedChild ?? await spawnSupervisor(publicOrigin);
 			const attemptStartedTs = spawnedTs ?? Date.now();
 			if (!await waitForMetro({
 				root,

package/dist/{state-CnWzvCWP.mjs → state-DZobzxLW.mjs}

@@ -1,5 +1,5 @@
-import { I as parseDeviceSlotKey, P as deviceSlotKey, w as process_identity_exports } from "./config-DMP7L7H6.mjs";
-import { a as withWorkspaceStateLock, i as updateWorkspaceState, p as supervisorPidFile, r as readWorkspaceState, t as clearWorkspaceStateKey, y as workspaceStateFile } from "./workspace-state-WVwWw_hB.mjs";
+import { F as deviceSlotKey, L as parseDeviceSlotKey, w as process_identity_exports } from "./config-B7iyKWkL.mjs";
+import { a as withWorkspaceStateLock, i as updateWorkspaceState, p as supervisorPidFile, r as readWorkspaceState, t as clearWorkspaceStateKey, y as workspaceStateFile } from "./workspace-state-BT5E3SA2.mjs";
 import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
 //#region src/supervisor/state.ts

package/dist/{stats-Fo9ACIv7.mjs → stats-BYcZ6n1h.mjs}

@@ -1,4 +1,4 @@
-import { C as withConfigLock, u as getConfigDir } from "./config-DMP7L7H6.mjs";
+import { C as withConfigLock, u as getConfigDir } from "./config-B7iyKWkL.mjs";
 import { readFileSync, realpathSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, relative, resolve } from "node:path";
 const PLATFORMS = ["ios", "android"];

package/dist/{stats-DHrO0frH.mjs → stats-CLg5RuDS.mjs}

@@ -1,7 +1,7 @@
-import { g as repoRoot, s as gitCommonDir } from "./worktree-DJnBbQZ9.mjs";
-import { a as findProjectRoot } from "./project-B_SDt4ip.mjs";
-import { o as formatLongDuration } from "./command-output-BuIb_ZOI.mjs";
-import { a as statsProjectKey, r as readStats } from "./stats-Fo9ACIv7.mjs";
+import { g as repoRoot, s as gitCommonDir } from "./worktree-FG_ZKKdb.mjs";
+import { a as findProjectRoot } from "./project-DDZWf_16.mjs";
+import { o as formatLongDuration } from "./command-output-B3ycpsYv.mjs";
+import { a as statsProjectKey, r as readStats } from "./stats-BYcZ6n1h.mjs";
 import chalk from "chalk";
 //#region src/commands/stats.ts
 const PLATFORMS = ["ios", "android"];

package/dist/{status-QeLZb8SM.mjs → status-DUNy_HZs.mjs}

@@ -1,18 +1,17 @@
-import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { L as projectDeviceSlots, M as volumeRootFor, g as loadConfig, u as getConfigDir } from "./config-DMP7L7H6.mjs";
-import { _ as workspaceLogsDir } from "./workspace-state-WVwWw_hB.mjs";
-import { v as resolveSourceCheckout } from "./worktree-DJnBbQZ9.mjs";
-import { a as findProjectRoot, c as projectShortcut } from "./project-B_SDt4ip.mjs";
-import { t as isMetroRunning } from "./ports-BZprTJRa.mjs";
-import { i as resolveProjectMetro } from "./metro-ato6ef3J.mjs";
-import { a as formatElapsed, r as clockTime, u as plural } from "./command-output-BuIb_ZOI.mjs";
-import { N as resolveOwnedAvdSerial } from "./android-BkYmndPp.mjs";
-import { a as POOL_SETTING_REMEDY, l as parkedMaxSetting, u as readParked } from "./teardown-sm1FwF6V.mjs";
-import { u as listAllIosSims } from "./ios-Deh5js5V.mjs";
-import { i as listLeaseFiles } from "./device-lease-DBW-IL4p.mjs";
-import { c as queryLogs } from "./logs-query-Cdp5aaCH.mjs";
-import { t as resolveSupervisorTarget } from "./ownership-CVY9cqCr.mjs";
-import { i as readSupervisorState } from "./stop-DsdOx9Hj.mjs";
+import { t as getExecutor } from "./exec-B29XNuhP.mjs";
+import { M as volumeRootFor, R as projectDeviceSlots, g as loadConfig, u as getConfigDir } from "./config-B7iyKWkL.mjs";
+import { _ as workspaceLogsDir } from "./workspace-state-BT5E3SA2.mjs";
+import { v as resolveSourceCheckout } from "./worktree-FG_ZKKdb.mjs";
+import { a as findProjectRoot, c as projectShortcut } from "./project-DDZWf_16.mjs";
+import { a as resolveProjectMetro, s as isMetroRunning } from "./metro-C7bcJ0uo.mjs";
+import { I as resolveOwnedAvdSerial } from "./android-DWssqHQ8.mjs";
+import { a as formatElapsed, r as clockTime, u as plural } from "./command-output-B3ycpsYv.mjs";
+import { a as POOL_SETTING_REMEDY, l as parkedMaxSetting, u as readParked } from "./teardown-5J5UXz2P.mjs";
+import { u as listAllIosSims } from "./ios-lEJ5pKsq.mjs";
+import { i as listLeaseFiles } from "./device-lease-Ffz_M5t0.mjs";
+import { c as queryLogs } from "./logs-query-BGL-Pl12.mjs";
+import { t as resolveSupervisorTarget } from "./ownership-D5vkdm8H.mjs";
+import { i as readSupervisorState } from "./stop-ZrfODZ51.mjs";
 import { existsSync } from "fs";
 import { totalmem } from "os";
 import chalk from "chalk";

package/dist/{stop-CHTaw65F.mjs → stop-CnUpnFT5.mjs}

@@ -1,3 +1,3 @@
-import { t as resolveSupervisorTarget } from "./ownership-CVY9cqCr.mjs";
-import { a as resolveCollectorTargets, i as readSupervisorState, n as clearSupervisorState, o as runStop, r as readCollectorState, s as stopCommand, t as clearCollectorState } from "./stop-DsdOx9Hj.mjs";
+import { t as resolveSupervisorTarget } from "./ownership-D5vkdm8H.mjs";
+import { a as resolveCollectorTargets, i as readSupervisorState, n as clearSupervisorState, o as runStop, r as readCollectorState, s as stopCommand, t as clearCollectorState } from "./stop-ZrfODZ51.mjs";
 export { clearCollectorState, clearSupervisorState, stopCommand as default, readCollectorState, readSupervisorState, resolveCollectorTargets, resolveSupervisorTarget, runStop };

package/dist/{stop-DsdOx9Hj.mjs → stop-ZrfODZ51.mjs}

@@ -1,15 +1,15 @@
-import { C as withConfigLock, F as deviceSlotPlatforms, I as parseDeviceSlotKey, L as projectDeviceSlots, S as upsertProject, a as clearSupervisor, f as getProject, w as process_identity_exports, z as validateDeviceSlot } from "./config-DMP7L7H6.mjs";
-import { a as withWorkspaceStateLock, h as workspaceDir, n as clearWorkspaceStateKeys, o as writeWorkspaceState, r as readWorkspaceState } from "./workspace-state-WVwWw_hB.mjs";
-import { a as findProjectRoot } from "./project-B_SDt4ip.mjs";
-import { a as clearRemoteSession, i as clearManagedMetroTunnel, l as readRemoteSession, o as clearWorkspaceSupervisor, s as readMetroTunnel } from "./state-CnWzvCWP.mjs";
-import { i as resolveProjectMetro, n as killMetroTree, r as pidExists } from "./metro-ato6ef3J.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-CD_XnpDu.mjs";
-import { f as releasedLeaseFact, l as phaseLine, u as plural } from "./command-output-BuIb_ZOI.mjs";
-import { S as resolveEasCliBin, n as teardownOwnedIosSim, t as teardownOwnedAvd } from "./teardown-sm1FwF6V.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-Bz19_R9R.mjs";
-import { l as releaseWorkspaceLeases } from "./device-lease-DBW-IL4p.mjs";
-import { i as endRecordedSession } from "./device-remote-D9wN3CdE.mjs";
-import { r as stopTunnel, t as resolveSupervisorTarget } from "./ownership-CVY9cqCr.mjs";
+import { B as validateDeviceSlot, C as withConfigLock, I as deviceSlotPlatforms, L as parseDeviceSlotKey, R as projectDeviceSlots, S as upsertProject, a as clearSupervisor, f as getProject, w as process_identity_exports } from "./config-B7iyKWkL.mjs";
+import { a as withWorkspaceStateLock, h as workspaceDir, n as clearWorkspaceStateKeys, o as writeWorkspaceState, r as readWorkspaceState } from "./workspace-state-BT5E3SA2.mjs";
+import { a as findProjectRoot } from "./project-DDZWf_16.mjs";
+import { a as clearRemoteSession, i as clearManagedMetroTunnel, l as readRemoteSession, o as clearWorkspaceSupervisor, s as readMetroTunnel } from "./state-DZobzxLW.mjs";
+import { a as resolveProjectMetro, i as pidExists, n as killMetroTree, o as signalProcessTree } from "./metro-C7bcJ0uo.mjs";
+import { n as verifyCollectorOwnership } from "./ownership-Cp52QAK1.mjs";
+import { f as releasedLeaseFact, l as phaseLine, u as plural } from "./command-output-B3ycpsYv.mjs";
+import { S as resolveEasCliBin, n as teardownOwnedIosSim, t as teardownOwnedAvd } from "./teardown-5J5UXz2P.mjs";
+import { t as withWorkspaceProcessLock } from "./workspace-process-lock-BYfZz_S-.mjs";
+import { l as releaseWorkspaceLeases } from "./device-lease-Ffz_M5t0.mjs";
+import { i as endRecordedSession } from "./device-remote-BprxZp-m.mjs";
+import { r as stopTunnel, t as resolveSupervisorTarget } from "./ownership-D5vkdm8H.mjs";
 import chalk from "chalk";
 //#region src/commands/stop.ts
 const DEFAULT_WAIT_MS = 1e4;
@@ -143,7 +143,7 @@ async function runStop(options) {
 	result.summary = summarize(root, result.outcomes, result.ok);
 	return result;
 }
-async function stopWorkspace({ root, project = void 0, state = void 0, collectors = void 0, signalCollector = (pid) => process.kill(pid, "SIGTERM"), verifyCollector = verifyCollectorOwnership, clearCollectors = clearCollectorState, isAlive = pidExists, killGroup = killMetroTree, inspectIdentity = process_identity_exports.inspectProcessIdentity, waitForDeath = void 0, waitMs = DEFAULT_WAIT_MS, resolveMetro = resolveProjectMetro, teardownIos = teardownOwnedIosSim, teardownAvd = teardownOwnedAvd, 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, inspectIdentity = process_identity_exports.inspectProcessIdentity, waitForDeath = void 0, waitMs = DEFAULT_WAIT_MS, resolveMetro = resolveProjectMetro, teardownIos = teardownOwnedIosSim, teardownAvd = teardownOwnedAvd, 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;

package/dist/supervisor-run.mjs

@@ -1,9 +1,10 @@
-import { a as clearSupervisor, w as process_identity_exports, x as setSupervisor } from "./config-DMP7L7H6.mjs";
+import { a as clearSupervisor, w as process_identity_exports, x as setSupervisor } from "./config-B7iyKWkL.mjs";
 import { r as createNdjsonWriter } from "./ndjson-BZwI1NBv.mjs";
-import { _ as workspaceLogsDir, a as withWorkspaceStateLock, o as writeWorkspaceState, r as readWorkspaceState } from "./workspace-state-WVwWw_hB.mjs";
-import { i as detectIsExpo } from "./project-B_SDt4ip.mjs";
+import { _ as workspaceLogsDir, a as withWorkspaceStateLock, o as writeWorkspaceState, r as readWorkspaceState } from "./workspace-state-BT5E3SA2.mjs";
+import { i as detectIsExpo } from "./project-DDZWf_16.mjs";
 import { t as describeError } from "./errors-B6W7FkxQ.mjs";
-import { c as readPidFile, f as writePidFile, n as MODE_EXPO, o as clearWorkspaceSupervisor, r as clearExpoMetroTunnel, t as MODE_BARE } from "./state-CnWzvCWP.mjs";
+import { t as relaunchWithLogFile } from "./detached-entry-Bpo6ZY_I.mjs";
+import { c as readPidFile, f as writePidFile, n as MODE_EXPO, o as clearWorkspaceSupervisor, r as clearExpoMetroTunnel, t as MODE_BARE } from "./state-DZobzxLW.mjs";
 import { existsSync, realpathSync } from "node:fs";
 import { isAbsolute, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -104,7 +105,7 @@ async function runSupervisor({ root, port, tunnel = false, resetCache = false, i
 	};
 	let server;
 	try {
-		server = await (mode === "expo-child" ? startExpo || (await import("./server-expo-CjeTJ273.mjs")).startExpoServer : startBare || (await import("./server-bare-CCLb90FS.mjs")).startBareServer)({
+		server = await (mode === "expo-child" ? startExpo || (await import("./server-expo-YDDG3eP7.mjs")).startExpoServer : startBare || (await import("./server-bare-BQkyxa_b.mjs")).startBareServer)({
 			root,
 			port,
 			logsDir,
@@ -179,6 +180,7 @@ async function runSupervisor({ root, port, tunnel = false, resetCache = false, i
 	};
 }
 async function main(argv = process.argv.slice(2)) {
+	if (relaunchWithLogFile(argv)) return;
 	const parsed = parseArgs(argv);
 	if (parsed.error) {
 		console.error(`Stim supervisor: ${parsed.error}`);