stim 1.3.1 → 1.5.0

package/dist/{server-bare-DEzPZLvf.mjs → server-bare-H3pAhbMs.mjs}

@@ -1,15 +1,12 @@
-import { p as readWorkspaceState } from "./state-B3XA2wp2.mjs";
+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-DEJf6_kJ.mjs";
+import { C as projectMetroSharedCache } from "./settings-kO2ZqIKy.mjs";
 import { a as metroStoreRoot, o as registerMetroStore, t as appendCacheStore } from "./metro-store-CDDZHtPl.mjs";
 import { createRequire } from "node:module";
-import { dirname, isAbsolute, join, relative, sep } from "node:path";
-//#region \0rolldown/runtime.js
-var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
-var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
+import { isAbsolute, join, relative, sep } from "node:path";
 //#endregion
-//#region shim/bundle-response.cjs
-var require_bundle_response = /* @__PURE__ */ __commonJSMin(((exports, module) => {
+//#region src/supervisor/server-bare.ts
+var import_bundle_response = (/* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const { randomUUID } = __require("node:crypto");
 	function bundleResponseMiddleware(write) {
 		return (req, res, next) => {
@@ -55,29 +52,7 @@ var require_bundle_response = /* @__PURE__ */ __commonJSMin(((exports, module) =
 		};
 	}
 	module.exports = { bundleResponseMiddleware };
-}));
-//#endregion
-//#region shim/metro-cache-generation.cjs
-var require_metro_cache_generation = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const { createHash } = __require("node:crypto");
-	const { mkdirSync } = __require("node:fs");
-	const { join: join$1 } = __require("node:path");
-	function applyMetroCacheGeneration(config, generation, directory) {
-		if (!generation) return config;
-		const fileMapCacheDirectory = join$1(directory, generation);
-		mkdirSync(fileMapCacheDirectory, { recursive: true });
-		return {
-			...config,
-			cacheVersion: createHash("sha256").update(JSON.stringify([config.cacheVersion ?? "1.0", generation])).digest("hex"),
-			fileMapCacheDirectory
-		};
-	}
-	module.exports = { applyMetroCacheGeneration };
-}));
-//#endregion
-//#region src/supervisor/server-bare.ts
-var import_bundle_response = require_bundle_response();
-var import_metro_cache_generation = require_metro_cache_generation();
+})))();
 const BARE_PACKAGES = [
 	"metro",
 	"@react-native/dev-middleware",
@@ -269,13 +244,14 @@ function closeHttpServer(httpServer, timeoutMs) {
 		}
 	});
 }
-async function startBareServer({ root, port, logsDir, writer = null, deps = null, reporterFactory = void 0, cacheStore = void 0, fileStore = void 0, closeTimeoutMs = 5e3 }) {
+async function startBareServer({ root, port, logsDir, writer = null, deps = null, reporterFactory = void 0, cacheStore = void 0, fileStore = void 0, closeTimeoutMs = 5e3, resetCache = false }) {
 	const { metro, devMiddleware, serverApi } = deps || resolveBareDeps(root);
 	const makeReporter = reporterFactory === void 0 ? loadNdjsonReporter(root) : reporterFactory;
-	const config = (0, import_metro_cache_generation.applyMetroCacheGeneration)(await metro.loadConfig({
+	const config = await metro.loadConfig({
 		cwd: root,
-		port
-	}), readWorkspaceState(root)?.metroCacheGeneration, join(dirname(logsDir), "metro-file-map"));
+		port,
+		resetCache
+	});
 	if (installSharedCacheStore({
 		root,
 		config,

package/dist/server-expo-CSwUVYOa.mjs

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

package/dist/{server-expo-DizT4OMk.mjs → server-expo-Ds8_mfng.mjs}

@@ -1,10 +1,9 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
 import { r as createNdjsonWriter } from "./ndjson-BZwI1NBv.mjs";
-import { p as readWorkspaceState } from "./state-B3XA2wp2.mjs";
-import { l as resolvePackageJson } from "./project-fKmuIaMI.mjs";
+import { l as resolvePackageJson } from "./project-B_SDt4ip.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-DEJf6_kJ.mjs";
+import { C as projectMetroSharedCache } from "./settings-kO2ZqIKy.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";
@@ -193,7 +192,7 @@ function resolveMetroStoreInjection(root, { log, env }) {
 	});
 	return additions;
 }
-async function startExpoServer({ root, port, logsDir, writer = null, spawnFn = null, killTimeoutMs = 5e3, tunnel = false, onTunnelUrl = null }) {
+async function startExpoServer({ root, port, logsDir, writer = null, spawnFn = null, killTimeoutMs = 5e3, tunnel = false, resetCache = false, onTunnelUrl = null }) {
 	const bin = expoBinPath(root);
 	if (!bin) {
 		const refusal = expoBinRefusal(root);
@@ -201,22 +200,17 @@ async function startExpoServer({ root, port, logsDir, writer = null, spawnFn = n
 	}
 	const log = writer || createNdjsonWriter(join(logsDir, "metro.ndjson"));
 	const spawn = spawnFn || ((cmd, args, opts) => getExecutor().spawn(cmd, args, opts));
-	const args = tunnel ? [
+	const args = [
 		"start",
 		"--port",
 		String(port),
-		"--tunnel"
-	] : [
-		"start",
-		"--port",
-		String(port)
+		...tunnel ? ["--tunnel"] : [],
+		...resetCache ? ["--clear"] : []
 	];
 	const storeEnv = resolveMetroStoreInjection(root, {
 		log,
 		env: process.env
 	});
-	const generation = readWorkspaceState(root)?.metroCacheGeneration;
-	if (generation && !storeEnv) throw supervisorError("STIM_BAD_ARG", "The saved Metro cache reset requires the Expo config adapter.", "Use Expo SDK 54 or newer and repair the Stim installation before starting this app.");
 	const child = spawn(bin, args, {
 		cwd: root,
 		stdio: [
@@ -230,8 +224,6 @@ async function startExpoServer({ root, port, logsDir, writer = null, spawnFn = n
 			FORCE_COLOR: "0",
 			...expoProxyEnv(process.env),
 			...storeEnv,
-			STIM_METRO_CACHE_GENERATION: generation ?? "",
-			STIM_METRO_FILE_MAP: join(dirname(logsDir), "metro-file-map"),
 			...tunnel ? { EXPO_UNSTABLE_TUNNEL_V2: "1" } : {}
 		}
 	});

package/dist/{settings-DEJf6_kJ.mjs → settings-kO2ZqIKy.mjs}

@@ -1,5 +1,5 @@
-import { d as getConfigPath, g as loadConfig, m as getRepoSettings, p as getProjectSettings } from "./config-CcefMY2Q.mjs";
-import { g as repoRoot, s as gitCommonDir } from "./worktree-Eq6TLH8N.mjs";
+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 { createHash } from "node:crypto";
 import { isAbsolute } from "node:path";
 import { existsSync, readFileSync, realpathSync, statSync } from "fs";

package/dist/{slot-launch-CZklomj6.mjs → slot-launch-BpHiHH6A.mjs}

@@ -1,7 +1,7 @@
-import { f as getProject } from "./config-CcefMY2Q.mjs";
-import { p as readWorkspaceState } from "./state-B3XA2wp2.mjs";
-import { h as deviceShellArg } from "./app-install-DIp9riNx.mjs";
-import { n as fileLeaseIo } from "./device-lease-CJwK7OZr.mjs";
+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-r7yEQ1R8.mjs";
 //#region src/engine/slot-launch.ts
 function launchSlotScope(root, slot = "default") {
 	if (slot !== "default") return slot;

package/dist/{start-B5G4NjiA.mjs → start-DiEfqEWk.mjs}

@@ -1,26 +1,24 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { E as inspectProcessIdentity, O as waitForProcessExit, S as upsertProject, T as captureProcessToken, a as clearSupervisor, f as getProject } from "./config-CcefMY2Q.mjs";
-import { C as supervisorLogFile, D as workspaceLogsDir, _ as writeWorkspaceState, c as readMetroTunnel, i as clearManagedMetroTunnel, p as readWorkspaceState, s as clearWorkspaceSupervisor, y as ensureWorkspaceStorage } from "./state-B3XA2wp2.mjs";
-import { g as repoRoot, s as gitCommonDir } from "./worktree-Eq6TLH8N.mjs";
-import { a as findProjectRoot, i as detectIsExpo, n as detectAndroidPackage, r as detectBundleId, t as appProjectProblem } from "./project-fKmuIaMI.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 { n as supervisorError } from "./errors-B6W7FkxQ.mjs";
-import { i as resolveProjectMetro, n as killMetroTree, o as reserveMetroPort, r as pidExists } from "./metro-CORqXyTL.mjs";
-import { g as stepTimer, l as phaseLine } from "./command-output-8wHMEde0.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-DEJf6_kJ.mjs";
-import { n as expoMetroConfigPath } from "./metro-store-CDDZHtPl.mjs";
-import { o as expoSdkMajor } from "./server-expo-DizT4OMk.mjs";
-import { n as workspaceProcessLockError, t as withWorkspaceProcessLock } from "./workspace-process-lock-IBj1Towr.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-kO2ZqIKy.mjs";
+import { n as workspaceProcessLockError, t as withWorkspaceProcessLock } from "./workspace-process-lock-Bz19_R9R.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-DXcol4oU.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 { randomUUID } from "node:crypto";
 import { dirname } from "node:path";
 import { CACHE_PROVIDER_ENV, cacheProviderEnv } from "@stim-cli/cache";
 import chalk from "chalk";
 //#region src/supervisor/cache-reset.ts
-async function resetMetroCache(root) {
-	if (detectIsExpo(root) && ((expoSdkMajor(root) ?? 0) < 54 || !expoMetroConfigPath())) throw supervisorError("STIM_BAD_ARG", "An isolated Metro cache reset requires Expo SDK 54 or newer and the Stim Metro config adapter.", "Upgrade Expo or repair the Stim installation before retrying. The running server was not changed.");
+async function stopOwnedMetroForReset(root) {
 	const project = getProject(root);
 	const port = project?.metroPort;
 	const target = resolveSupervisorTarget({
@@ -35,12 +33,11 @@ async function resetMetroCache(root) {
 			pid: target.pid,
 			processToken: target.processToken
 		};
-		if (!killMetroTree(target.pid, target.processToken) || !await waitForProcessExit(expected, 1e4)) throw supervisorError("STIM_SUPERVISOR_EXITED", "The owned Metro supervisor could not be stopped for a cache reset.", "Inspect `stim status` and `stim logs`, then retry. No cache reset was recorded.");
+		if (!killMetroTree(target.pid, target.processToken) || !await (0, process_identity_exports.waitForProcessExit)(expected, 1e4)) throw supervisorError("STIM_SUPERVISOR_EXITED", "The owned Metro supervisor could not be stopped for a cache reset.", "Inspect `stim status` and `stim logs`, then retry. No cache reset was recorded.");
 		if (port && !(await resolveProjectMetro(port, root)).missing) throw supervisorError("STIM_SUPERVISOR_EXITED", `Port ${port} is still occupied after stopping Metro.`, "Inspect the listener before retrying. Stim does not terminate unrecorded processes.");
 		clearWorkspaceSupervisor(root, expected);
 		clearSupervisor(root, expected);
 	}
-	writeWorkspaceState(root, { metroCacheGeneration: randomUUID() });
 }
 //#endregion
 //#region src/commands/start.ts
@@ -62,7 +59,7 @@ function parseWait(value) {
 	if (!Number.isFinite(seconds) || seconds <= 0) return { error: `Invalid --wait value ${JSON.stringify(value)}. Pass a number of seconds, e.g. --wait 90.` };
 	return { seconds };
 }
-function liveSupervisor({ state, project, port, isAlive = pidExists, inspectIdentity = inspectProcessIdentity } = {}) {
+function liveSupervisor({ state, project, port, isAlive = pidExists, inspectIdentity = process_identity_exports.inspectProcessIdentity } = {}) {
 	const target = resolveSupervisorTarget({
 		state: state?.supervisor,
 		record: project?.supervisor,
@@ -142,7 +139,7 @@ function registerStart(program, overrides = {}) {
 		...DEFAULT_START_DEPS,
 		...overrides
 	};
-	program.command("start").description("Start this workspace's dev server under a detached supervisor and wait until it verifies as this project's. Idempotent: a healthy dev server on the reserved port is a no-op. Structured logs land in the global workspace logs directory.").option("--json", "Emit the facts as a single JSON line on stdout; every other line goes to stderr").option("--wait <seconds>", `How long to wait for the dev server to answer (default ${DEFAULT_WAIT_SECONDS})`).option("--remote", "Prepare the dev server for a remote device").option("--reset-cache", "Restart owned Metro with fresh per-app transform and file-map cache state").action(async (opts) => {
+	program.command("start").description("Start this workspace's dev server under a detached supervisor and wait until it verifies as this project's. Idempotent: a healthy dev server on the reserved port is a no-op. Structured logs land in the global workspace logs directory.").option("--json", "Emit the facts as a single JSON line on stdout; every other line goes to stderr").option("--wait <seconds>", `How long to wait for the dev server to answer (default ${DEFAULT_WAIT_SECONDS})`).option("--remote", "Prepare the dev server for a remote device").option("--reset-cache", "Restart owned Metro and clear this app's Metro caches").action(async (opts) => {
 		const json = Boolean(opts.json);
 		const waitTimer = stepTimer();
 		const out = (line) => {
@@ -240,7 +237,7 @@ function registerStart(program, overrides = {}) {
 			});
 			if (opts.resetCache) {
 				try {
-					await resetMetroCache(root);
+					await stopOwnedMetroForReset(root);
 				} catch (error) {
 					const failure = error;
 					return fail({
@@ -249,7 +246,7 @@ function registerStart(program, overrides = {}) {
 						remedy: failure.remedy
 					});
 				}
-				note(phaseLine("cache", "fresh Metro cache state for this app; shared cache entries and devices preserved"));
+				note(phaseLine("cache", "clearing this app's Metro transform and file-map caches; devices preserved"));
 			}
 			const logsDir = workspaceLogsDir(root);
 			const logFile = supervisorLogFile(root);
@@ -285,7 +282,8 @@ function registerStart(program, overrides = {}) {
 					root,
 					"--port",
 					String(port),
-					...tunnel ? ["--tunnel"] : []
+					...tunnel ? ["--tunnel"] : [],
+					...opts.resetCache ? ["--reset-cache"] : []
 				];
 				const childEnv = {
 					...process.env,
@@ -488,7 +486,7 @@ function registerStart(program, overrides = {}) {
 							}
 							const handoffRecord = {
 								pid: child.pid,
-								processToken: child.pid ? captureProcessToken(child.pid) : null,
+								processToken: child.pid ? (0, process_identity_exports.captureProcessToken)(child.pid) : null,
 								port,
 								mode: isExpo ? "expo-child" : "bare-inproc",
 								startedAt: new Date(spawnedTs ?? Date.now()).toISOString()

package/dist/state-CnWzvCWP.mjs

@@ -0,0 +1,131 @@
+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 { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { dirname } from "node:path";
+//#region src/supervisor/state.ts
+const MODE_BARE = "bare-inproc";
+const MODE_EXPO = "expo-child";
+function readMetroTunnel(root) {
+	const record = readWorkspaceState(root)?.metroTunnel;
+	if (!record || typeof record !== "object") return null;
+	const kind = record.kind;
+	const url = record.url;
+	if (typeof url !== "string" || url.length === 0) return null;
+	if (kind === "expo") return {
+		kind: "expo",
+		url
+	};
+	if (kind === "managed") {
+		const provider = record.provider;
+		const pid = record.pid;
+		const port = record.port;
+		const startedAt = record.startedAt;
+		const processToken = record.processToken;
+		const logFile = record.logFile;
+		if (provider !== "ngrok" && provider !== "cloudflared" || typeof pid !== "number" || typeof port !== "number") return null;
+		return {
+			kind: "managed",
+			provider,
+			pid,
+			url,
+			port,
+			startedAt: typeof startedAt === "string" ? startedAt : "",
+			processToken: typeof processToken === "string" && processToken.length > 0 ? processToken : null,
+			...typeof logFile === "string" && logFile.length > 0 ? { logFile } : {}
+		};
+	}
+	return null;
+}
+function parseWorkspaceLaunchRecord(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+	const record = value;
+	if (typeof record.appId !== "string" || record.appId.length === 0) return null;
+	if (typeof record.deviceId !== "string" || record.deviceId.length === 0) return null;
+	if (record.metroPort !== null && typeof record.metroPort !== "number") return null;
+	if (typeof record.release !== "boolean") return null;
+	if (typeof record.launchedAt !== "string") return null;
+	return record;
+}
+function readWorkspaceLaunches(root) {
+	const launches = readWorkspaceState(root)?.launches;
+	if (!launches || typeof launches !== "object" || Array.isArray(launches)) return {};
+	const records = {};
+	for (const [key, value] of Object.entries(launches)) {
+		const record = parseWorkspaceLaunchRecord(value);
+		if (parseDeviceSlotKey(key) && record) records[key] = record;
+	}
+	return records;
+}
+function writeWorkspaceLaunch(root, platform, record, slot = "default") {
+	updateWorkspaceState(root, (state) => {
+		const launches = state.launches && typeof state.launches === "object" ? state.launches : {};
+		return {
+			...state,
+			launches: {
+				...launches,
+				[deviceSlotKey(platform, slot)]: record
+			}
+		};
+	});
+}
+function readRemoteSession(root) {
+	const record = readWorkspaceState(root)?.remoteDevice;
+	if (!record || typeof record !== "object") return null;
+	const id = record.sessionId;
+	if (typeof id !== "string" || id.length === 0) return null;
+	const platform = record.platform;
+	const startedAt = record.startedAt;
+	return {
+		platform: platform === "ios" || platform === "android" ? platform : null,
+		sessionId: id,
+		startedAt: typeof startedAt === "string" ? startedAt : null
+	};
+}
+function readRemoteSessionId(root) {
+	return readRemoteSession(root)?.sessionId ?? null;
+}
+function clearRemoteSession(root, expectedSessionId) {
+	clearWorkspaceStateKey(root, "remoteDevice", (value) => {
+		if (typeof value !== "object" || value === null) return false;
+		return value.sessionId === expectedSessionId;
+	});
+}
+function clearWorkspaceSupervisor(root, expected) {
+	return withWorkspaceStateLock(root, () => {
+		const current = readWorkspaceState(root)?.supervisor;
+		if (current && expected !== void 0 && !(0, process_identity_exports.sameProcessRecord)(current, expected)) return false;
+		clearWorkspaceStateKey(root, "supervisor", () => true);
+		clearExpoMetroTunnel(root);
+		if (expected === void 0 || readPidFile(root) === expected?.pid) rmSync(supervisorPidFile(root), { force: true });
+		return true;
+	});
+}
+function clearExpoMetroTunnel(root) {
+	clearWorkspaceStateKey(root, "metroTunnel", (value) => {
+		return typeof value === "object" && value !== null && value.kind === "expo";
+	});
+}
+function clearManagedMetroTunnel(root, expected) {
+	if (!existsSync(workspaceStateFile(root))) return true;
+	return clearWorkspaceStateKey(root, "metroTunnel", (value) => {
+		if (typeof value !== "object" || value === null) return false;
+		const record = value;
+		return record.kind === "managed" && record.provider === expected.provider && record.pid === expected.pid && record.url === expected.url && record.port === expected.port && record.startedAt === expected.startedAt && (record.processToken ?? null) === (expected.processToken ?? null) && (record.logFile ?? null) === (expected.logFile ?? null);
+	});
+}
+function writePidFile(root, pid) {
+	const file = supervisorPidFile(root);
+	mkdirSync(dirname(file), { recursive: true });
+	writeFileSync(file, `${pid}\n`);
+	return file;
+}
+function readPidFile(root) {
+	try {
+		const pid = parseInt(readFileSync(supervisorPidFile(root), "utf-8").trim(), 10);
+		return Number.isFinite(pid) ? pid : null;
+	} catch {
+		return null;
+	}
+}
+//#endregion
+export { clearRemoteSession as a, readPidFile as c, readWorkspaceLaunches as d, writePidFile as f, clearManagedMetroTunnel as i, readRemoteSession as l, MODE_EXPO as n, clearWorkspaceSupervisor as o, writeWorkspaceLaunch as p, clearExpoMetroTunnel as r, readMetroTunnel as s, MODE_BARE as t, readRemoteSessionId as u };

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

@@ -1,7 +1,7 @@
-import { g as repoRoot, s as gitCommonDir } from "./worktree-Eq6TLH8N.mjs";
-import { a as findProjectRoot } from "./project-fKmuIaMI.mjs";
-import { o as formatLongDuration } from "./command-output-8wHMEde0.mjs";
-import { a as statsProjectKey, r as readStats } from "./stats-BR-kwj0B.mjs";
+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 chalk from "chalk";
 //#region src/commands/stats.ts
 const PLATFORMS = ["ios", "android"];

package/dist/{stats-BR-kwj0B.mjs → stats-Fo9ACIv7.mjs}

@@ -1,4 +1,4 @@
-import { C as withConfigLock, u as getConfigDir } from "./config-CcefMY2Q.mjs";
+import { C as withConfigLock, u as getConfigDir } from "./config-DMP7L7H6.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/{status-CI9clRSb.mjs → status-J5LAXpag.mjs}

@@ -1,17 +1,18 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { P as volumeRootFor, g as loadConfig, u as getConfigDir, z as projectDeviceSlots } from "./config-CcefMY2Q.mjs";
-import { D as workspaceLogsDir } from "./state-B3XA2wp2.mjs";
-import { f as listWorktrees } from "./worktree-Eq6TLH8N.mjs";
-import { a as findProjectRoot, c as projectShortcut } from "./project-fKmuIaMI.mjs";
-import { a as isMetroRunning, i as resolveProjectMetro } from "./metro-CORqXyTL.mjs";
-import { a as formatElapsed, r as clockTime, u as plural } from "./command-output-8wHMEde0.mjs";
-import { N as resolveOwnedAvdSerial } from "./android-hMj83VpN.mjs";
-import { a as POOL_SETTING_REMEDY, c as parkedMaxSetting, l as readParked } from "./teardown--gESs9ck.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-DJWiTBkz.mjs";
+import { a as POOL_SETTING_REMEDY, l as parkedMaxSetting, u as readParked } from "./teardown-CAVcWeRD.mjs";
 import { u as listAllIosSims } from "./ios-Deh5js5V.mjs";
-import { i as listLeaseFiles } from "./device-lease-CJwK7OZr.mjs";
+import { i as listLeaseFiles } from "./device-lease-r7yEQ1R8.mjs";
 import { c as queryLogs } from "./logs-query-Cdp5aaCH.mjs";
-import { t as resolveSupervisorTarget } from "./ownership-DXcol4oU.mjs";
-import { i as readSupervisorState } from "./stop-CjlgDk0a.mjs";
+import { t as resolveSupervisorTarget } from "./ownership-CVY9cqCr.mjs";
+import { i as readSupervisorState } from "./stop-0jJNahwN.mjs";
 import { existsSync } from "fs";
 import { totalmem } from "os";
 import chalk from "chalk";
@@ -212,7 +213,9 @@ function statusCommand(program) {
 			simsAvailable = false;
 			simctlError = String(e?.message || e).split("\n")[0] ?? "";
 		}
-		const worktrees = listWorktrees(process.cwd()).slice(1);
+		const source = resolveSourceCheckout(process.cwd());
+		const sourcePath = "path" in source ? source.path : null;
+		const worktrees = source.entries.filter((entry) => !entry.bare && entry.path !== sourcePath);
 		const states = [];
 		const labelOnlyRoots = [];
 		for (const [path, proj] of projects) {

package/dist/{stop-CjlgDk0a.mjs → stop-0jJNahwN.mjs}

@@ -1,14 +1,15 @@
-import { C as withConfigLock, D as sameProcessRecord, E as inspectProcessIdentity, L as deviceSlotPlatforms, O as waitForProcessExit, R as parseDeviceSlotKey, S as upsertProject, V as validateDeviceSlot, a as clearSupervisor, f as getProject, z as projectDeviceSlots } from "./config-CcefMY2Q.mjs";
-import { T as workspaceDir, _ as writeWorkspaceState, a as clearRemoteSession, c as readMetroTunnel, i as clearManagedMetroTunnel, m as withWorkspaceStateLock, o as clearWorkspaceStateKeys, p as readWorkspaceState, s as clearWorkspaceSupervisor, u as readRemoteSession } from "./state-B3XA2wp2.mjs";
-import { a as findProjectRoot } from "./project-fKmuIaMI.mjs";
-import { i as resolveProjectMetro, n as killMetroTree, r as pidExists } from "./metro-CORqXyTL.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-8O073GIC.mjs";
-import { f as releasedLeaseFact, l as phaseLine, u as plural } from "./command-output-8wHMEde0.mjs";
-import { n as teardownOwnedIosSim, t as teardownOwnedAvd, x as resolveEasCliBin } from "./teardown--gESs9ck.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-IBj1Towr.mjs";
-import { l as releaseWorkspaceLeases } from "./device-lease-CJwK7OZr.mjs";
-import { i as endRecordedSession } from "./device-remote-DAA0Zm6Z.mjs";
-import { r as stopTunnel, t as resolveSupervisorTarget } from "./ownership-DXcol4oU.mjs";
+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-CAVcWeRD.mjs";
+import { t as withWorkspaceProcessLock } from "./workspace-process-lock-Bz19_R9R.mjs";
+import { l as releaseWorkspaceLeases } from "./device-lease-r7yEQ1R8.mjs";
+import { i as endRecordedSession } from "./device-remote-BTUqbl0i.mjs";
+import { r as stopTunnel, t as resolveSupervisorTarget } from "./ownership-CVY9cqCr.mjs";
 import chalk from "chalk";
 //#region src/commands/stop.ts
 const DEFAULT_WAIT_MS = 1e4;
@@ -34,7 +35,7 @@ function clearCollectorState(root, expected) {
 			clearWorkspaceStateKeys(root, ["collectors"]);
 			return true;
 		}
-		for (const [platform, record] of Object.entries(expected ?? {})) if (sameProcessRecord(current[platform], record)) delete current[platform];
+		for (const [platform, record] of Object.entries(expected ?? {})) if ((0, process_identity_exports.sameProcessRecord)(current[platform], record)) delete current[platform];
 		if (Object.keys(current).length) writeWorkspaceState(root, { collectors: current });
 		else clearWorkspaceStateKeys(root, ["collectors"]);
 		return Object.keys(current).length === 0;
@@ -142,12 +143,12 @@ 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 = 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) => 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) }) {
 	const proj = project === void 0 ? getProject(root) : project;
 	const sup = state === void 0 ? readSupervisorState(root) : state;
 	const collectorRecords = collectors === void 0 ? readCollectorState(root) : collectors;
 	const reservedPort = typeof proj?.metroPort === "number" ? proj.metroPort : null;
-	const waiter = waitForDeath ?? ((pid, processToken) => waitForProcessExit({
+	const waiter = waitForDeath ?? ((pid, processToken) => (0, process_identity_exports.waitForProcessExit)({
 		pid,
 		processToken
 	}, waitMs));

package/dist/{stop-CQhffpmX.mjs → stop-CM1fejKW.mjs}

@@ -1,3 +1,3 @@
-import { t as resolveSupervisorTarget } from "./ownership-DXcol4oU.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-CjlgDk0a.mjs";
+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-0jJNahwN.mjs";
 export { clearCollectorState, clearSupervisorState, stopCommand as default, readCollectorState, readSupervisorState, resolveCollectorTargets, resolveSupervisorTarget, runStop };

package/dist/supervisor-run.d.mts

@@ -1,34 +1,10 @@
 import { t as NdjsonWriter } from "./ndjson-DvHSsNU9.mjs";
-//#region src/process-identity.d.ts
-interface ProcessRecord {
-  pid?: unknown;
-  processToken?: unknown;
-}
+import * as import__stim_cli_core_process_identity from "@stim-cli/core/process-identity";
 //#endregion
 //#region src/supervisor/state.d.ts
 declare const MODE_BARE = "bare-inproc";
 declare const MODE_EXPO = "expo-child";
-interface WorkspaceState {
-  metroCacheGeneration?: string;
-  supervisor?: Record<string, unknown>;
-  collectors?: Record<string, unknown>;
-  lastBuild?: Record<string, unknown>;
-  launches?: Record<string, WorkspaceLaunchRecord>;
-  remoteDevice?: Record<string, unknown>;
-  metroTunnel?: Record<string, unknown>;
-  [key: string]: unknown;
-}
-interface WorkspaceLaunchRecord {
-  appId: string;
-  deviceId: string;
-  metroPort: number | null;
-  release: boolean;
-  launchedAt: string;
-}
-declare function readWorkspaceState(root: string): WorkspaceState | null;
-declare function withWorkspaceStateLock<T>(root: string, fn: () => T): T;
-declare function writeWorkspaceState(root: string, patch: WorkspaceState): WorkspaceState;
-declare function clearWorkspaceSupervisor(root: string, expected?: ProcessRecord | null): boolean;
+declare function clearWorkspaceSupervisor(root: string, expected?: process_identity_d_exports.ProcessRecord | null): boolean;
 declare function clearExpoMetroTunnel(root: string): void;
 declare function writePidFile(root: string, pid: number): string;
 declare function readPidFile(root: string): number | null;
@@ -38,6 +14,7 @@ interface ParsedSupervisorArgs {
   root?: string;
   port?: number;
   tunnel?: boolean;
+  resetCache?: boolean;
   error?: string;
 }
 declare function parseArgs(argv: string[]): ParsedSupervisorArgs;
@@ -58,12 +35,14 @@ type ServerStarter = (opts: {
   logsDir: string;
   writer?: NdjsonWriter | null;
   tunnel?: boolean;
+  resetCache?: boolean;
   onTunnelUrl?: ((url: string) => void) | null;
 }) => Promise<ServerHandle>;
 interface RunSupervisorOptions {
   root: string;
   port: number;
   tunnel?: boolean;
+  resetCache?: boolean;
   isExpo?: (projectRoot: string) => boolean;
   startBare?: ServerStarter | null;
   startExpo?: ServerStarter | null;
@@ -72,7 +51,7 @@ interface RunSupervisorOptions {
   attachSignals?: boolean;
   stderr?: (line: string) => void;
 }
-declare function runSupervisor({ root, port, tunnel, isExpo, startBare, startExpo, now, onExit, attachSignals, stderr }: RunSupervisorOptions): Promise<{
+declare function runSupervisor({ root, port, tunnel, resetCache, isExpo, startBare, startExpo, now, onExit, attachSignals, stderr }: RunSupervisorOptions): Promise<{
   mode: string;
   server: ServerHandle | undefined;
   shutdown: (code: number, event: string, msg: string) => Promise<void>;
@@ -80,4 +59,4 @@ declare function runSupervisor({ root, port, tunnel, isExpo, startBare, startExp
 } | null>;
 declare function main(argv?: string[]): Promise<void>;
 //#endregion
-export { MODE_BARE, MODE_EXPO, RunSupervisorOptions, ServerExitInfo, ServerHandle, type WorkspaceState, clearExpoMetroTunnel, clearWorkspaceSupervisor, main, parseArgs, readPidFile, readWorkspaceState, runSupervisor, withWorkspaceStateLock, writePidFile, writeWorkspaceState };
+export { MODE_BARE, MODE_EXPO, RunSupervisorOptions, ServerExitInfo, ServerHandle, clearExpoMetroTunnel, clearWorkspaceSupervisor, main, parseArgs, readPidFile, runSupervisor, writePidFile };