stim 1.4.0 → 1.6.0

package/dist/{reclaim-DpDVo-AP.mjs → reclaim-WXTbXPX4.mjs}

@@ -1,13 +1,13 @@
-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-6vdGngKa.mjs";
-import { h as workspaceDir, r as readWorkspaceState } from "./workspace-state-Do1e2mOH.mjs";
-import { a as clearRemoteSession, i as clearManagedMetroTunnel, s as readMetroTunnel, u as readRemoteSessionId } from "./state-CDbvmZdt.mjs";
-import { i as resolveProjectMetro, n as killMetroTree, r as pidExists } from "./metro-DFLmaVz8.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-BvSpZVBk.mjs";
-import { S as resolveEasCliBin, l as parkedMaxSetting, n as teardownOwnedIosSim, t as teardownOwnedAvd } from "./teardown-KsPpvldq.mjs";
-import { l as releaseWorkspaceLeases } from "./device-lease-DDJr85OK.mjs";
-import { i as endRecordedSession } from "./device-remote-CMfHhoc8.mjs";
-import { t as clearNamedPorts } from "./named-ports-BO7Zpjp0.mjs";
-import { r as stopTunnel, t as resolveSupervisorTarget } from "./ownership-C08Yzrp7.mjs";
+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 { existsSync, rmSync } from "node:fs";
 //#region src/reclaim.ts
 async function reapCollectors(root, { verify = verifyCollectorOwnership, collectors }) {

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

@@ -1,12 +1,12 @@
-import { F as deviceSlotPlatforms, I as parseDeviceSlotKey, f as getProject } from "./config-6vdGngKa.mjs";
-import { a as findProjectRoot } from "./project-CBFCwnN5.mjs";
-import { d as readWorkspaceLaunches } from "./state-CDbvmZdt.mjs";
-import { i as resolveProjectMetro } from "./metro-DFLmaVz8.mjs";
+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-BkM4qTaN.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-DeKen9e5.mjs";
+import { n as nativeRunCommand } from "./slot-launch-BYjnljAs.mjs";
 import chalk from "chalk";
 import { WebSocket } from "ws";
 //#region src/engine/reload.ts

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

@@ -1,12 +1,12 @@
 import { i as __require, t as __commonJSMin } from "./rolldown-runtime-BsOwBuO_.mjs";
-import { r as readWorkspaceState } from "./workspace-state-Do1e2mOH.mjs";
 import { n as supervisorError } from "./errors-B6W7FkxQ.mjs";
-import { C as projectMetroSharedCache } from "./settings-DwfltIXQ.mjs";
+import { C as projectMetroSharedCache } from "./settings-CGHTt5vb.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 shim/bundle-response.cjs
-var require_bundle_response = /* @__PURE__ */ __commonJSMin(((exports, module) => {
+import { isAbsolute, join, relative, sep } from "node:path";
+//#endregion
+//#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) => {
@@ -52,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",
@@ -266,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-D4P7iTvf.mjs → server-expo-CX-zkgWl.mjs}

@@ -1,10 +1,9 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
 import { r as createNdjsonWriter } from "./ndjson-BZwI1NBv.mjs";
-import { r as readWorkspaceState } from "./workspace-state-Do1e2mOH.mjs";
-import { l as resolvePackageJson } from "./project-CBFCwnN5.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-DwfltIXQ.mjs";
+import { C as projectMetroSharedCache } from "./settings-CGHTt5vb.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/server-expo-CjeTJ273.mjs

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

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

@@ -1,5 +1,5 @@
-import { d as getConfigPath, g as loadConfig, m as getRepoSettings, p as getProjectSettings } from "./config-6vdGngKa.mjs";
-import { _ as repoRoot, s as gitCommonDir } from "./worktree-DWNx4tUg.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";
@@ -29,7 +29,10 @@ function compilerCacheFallbackMessage({ fallback, compilerCache, file = null })
 	return `${fallback.key}${origin ? ` in ${origin}` : ""} ${fallback.reason}. ${backend}`;
 }
 function optimizationBuildProfile(platform, options) {
-	const selected = platform === "ios" ? options.ios : { pch: options.android.pch };
+	const selected = platform === "ios" ? {
+		...options.ios,
+		swiftCompilationCache: options.ios.swiftCompilationCache ?? false
+	} : { pch: options.android.pch };
 	const defaults = platform === "ios" ? {
 		compilationCache: true,
 		swiftCompilationCache: false,
@@ -82,7 +85,7 @@ function resolveOptimizations(settings = {}, env = process.env) {
 		metroWarmup: optimizationBoolean(settings, "metroWarmup"),
 		ios: {
 			compilationCache: optimizationBoolean(settings, "ios.compilationCache"),
-			swiftCompilationCache: optimizationBoolean(settings, "ios.swiftCompilationCache", false),
+			swiftCompilationCache: optimizationValue(settings, "ios.swiftCompilationCache") === void 0 ? null : optimizationBoolean(settings, "ios.swiftCompilationCache"),
 			prefixMapping: optimizationBoolean(settings, "ios.prefixMapping")
 		},
 		android: {

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

@@ -1,7 +1,7 @@
-import { f as getProject } from "./config-6vdGngKa.mjs";
-import { r as readWorkspaceState } from "./workspace-state-Do1e2mOH.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-DDJr85OK.mjs";
+import { n as fileLeaseIo } from "./device-lease-DBW-IL4p.mjs";
 //#region src/engine/slot-launch.ts
 function launchSlotScope(root, slot = "default") {
 	if (slot !== "default") return slot;

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

@@ -1,28 +1,24 @@
 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-6vdGngKa.mjs";
-import { _ as workspaceLogsDir, c as ensureWorkspaceStorage, f as supervisorLogFile, o as writeWorkspaceState, r as readWorkspaceState } from "./workspace-state-Do1e2mOH.mjs";
-import { _ as repoRoot, s as gitCommonDir } from "./worktree-DWNx4tUg.mjs";
-import { a as findProjectRoot, i as detectIsExpo, n as detectAndroidPackage, r as detectBundleId, t as appProjectProblem } from "./project-CBFCwnN5.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 clearManagedMetroTunnel, o as clearWorkspaceSupervisor, s as readMetroTunnel } from "./state-CDbvmZdt.mjs";
-import { r as reserveMetroPort } from "./ports-ClqG8GPt.mjs";
-import { i as resolveProjectMetro, n as killMetroTree, r as pidExists } from "./metro-DFLmaVz8.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-DwfltIXQ.mjs";
-import { n as expoMetroConfigPath } from "./metro-store-CDDZHtPl.mjs";
-import { o as expoSdkMajor } from "./server-expo-D4P7iTvf.mjs";
-import { n as workspaceProcessLockError, t as withWorkspaceProcessLock } from "./workspace-process-lock-UEIrvZMJ.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 { 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-C08Yzrp7.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({
@@ -42,7 +38,6 @@ async function resetMetroCache(root) {
 		clearWorkspaceSupervisor(root, expected);
 		clearSupervisor(root, expected);
 	}
-	writeWorkspaceState(root, { metroCacheGeneration: randomUUID() });
 }
 //#endregion
 //#region src/commands/start.ts
@@ -144,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) => {
@@ -242,7 +237,7 @@ function registerStart(program, overrides = {}) {
 			});
 			if (opts.resetCache) {
 				try {
-					await resetMetroCache(root);
+					await stopOwnedMetroForReset(root);
 				} catch (error) {
 					const failure = error;
 					return fail({
@@ -251,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);
@@ -287,7 +282,8 @@ function registerStart(program, overrides = {}) {
 					root,
 					"--port",
 					String(port),
-					...tunnel ? ["--tunnel"] : []
+					...tunnel ? ["--tunnel"] : [],
+					...opts.resetCache ? ["--reset-cache"] : []
 				];
 				const childEnv = {
 					...process.env,

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

@@ -1,5 +1,5 @@
-import { I as parseDeviceSlotKey, P as deviceSlotKey, w as process_identity_exports } from "./config-6vdGngKa.mjs";
-import { a as withWorkspaceStateLock, i as updateWorkspaceState, p as supervisorPidFile, r as readWorkspaceState, t as clearWorkspaceStateKey, y as workspaceStateFile } from "./workspace-state-Do1e2mOH.mjs";
+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

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

@@ -1,7 +1,7 @@
-import { _ as repoRoot, s as gitCommonDir } from "./worktree-DWNx4tUg.mjs";
-import { a as findProjectRoot } from "./project-CBFCwnN5.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-C59QLKm2.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-C59QLKm2.mjs → stats-Fo9ACIv7.mjs}

@@ -1,4 +1,4 @@
-import { C as withConfigLock, u as getConfigDir } from "./config-6vdGngKa.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-Y2ij3dm6.mjs → status-QeLZb8SM.mjs}

@@ -1,18 +1,18 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { L as projectDeviceSlots, M as volumeRootFor, g as loadConfig, u as getConfigDir } from "./config-6vdGngKa.mjs";
-import { _ as workspaceLogsDir } from "./workspace-state-Do1e2mOH.mjs";
-import { f as listWorktrees } from "./worktree-DWNx4tUg.mjs";
-import { a as findProjectRoot, c as projectShortcut } from "./project-CBFCwnN5.mjs";
-import { t as isMetroRunning } from "./ports-ClqG8GPt.mjs";
-import { i as resolveProjectMetro } from "./metro-DFLmaVz8.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-BkM4qTaN.mjs";
-import { a as POOL_SETTING_REMEDY, l as parkedMaxSetting, u as readParked } from "./teardown-KsPpvldq.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-DDJr85OK.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-C08Yzrp7.mjs";
-import { i as readSupervisorState } from "./stop-_P2OQwmZ.mjs";
+import { t as resolveSupervisorTarget } from "./ownership-CVY9cqCr.mjs";
+import { i as readSupervisorState } from "./stop-DsdOx9Hj.mjs";
 import { existsSync } from "fs";
 import { totalmem } from "os";
 import chalk from "chalk";
@@ -213,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-vKmmxhea.mjs → stop-CHTaw65F.mjs}

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

package/dist/{stop-_P2OQwmZ.mjs → stop-DsdOx9Hj.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-6vdGngKa.mjs";
-import { a as withWorkspaceStateLock, h as workspaceDir, n as clearWorkspaceStateKeys, o as writeWorkspaceState, r as readWorkspaceState } from "./workspace-state-Do1e2mOH.mjs";
-import { a as findProjectRoot } from "./project-CBFCwnN5.mjs";
-import { a as clearRemoteSession, i as clearManagedMetroTunnel, l as readRemoteSession, o as clearWorkspaceSupervisor, s as readMetroTunnel } from "./state-CDbvmZdt.mjs";
-import { i as resolveProjectMetro, n as killMetroTree, r as pidExists } from "./metro-DFLmaVz8.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-BvSpZVBk.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-KsPpvldq.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-UEIrvZMJ.mjs";
-import { l as releaseWorkspaceLeases } from "./device-lease-DDJr85OK.mjs";
-import { i as endRecordedSession } from "./device-remote-CMfHhoc8.mjs";
-import { r as stopTunnel, t as resolveSupervisorTarget } from "./ownership-C08Yzrp7.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 chalk from "chalk";
 //#region src/commands/stop.ts
 const DEFAULT_WAIT_MS = 1e4;

package/dist/supervisor-run.d.mts

@@ -14,6 +14,7 @@ interface ParsedSupervisorArgs {
   root?: string;
   port?: number;
   tunnel?: boolean;
+  resetCache?: boolean;
   error?: string;
 }
 declare function parseArgs(argv: string[]): ParsedSupervisorArgs;
@@ -34,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;
@@ -48,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>;

package/dist/supervisor-run.mjs

@@ -1,9 +1,9 @@
-import { a as clearSupervisor, w as process_identity_exports, x as setSupervisor } from "./config-6vdGngKa.mjs";
+import { a as clearSupervisor, w as process_identity_exports, x as setSupervisor } from "./config-DMP7L7H6.mjs";
 import { r as createNdjsonWriter } from "./ndjson-BZwI1NBv.mjs";
-import { _ as workspaceLogsDir, a as withWorkspaceStateLock, o as writeWorkspaceState, r as readWorkspaceState } from "./workspace-state-Do1e2mOH.mjs";
-import { i as detectIsExpo } from "./project-CBFCwnN5.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 { 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-CDbvmZdt.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 { existsSync, realpathSync } from "node:fs";
 import { isAbsolute, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -12,6 +12,7 @@ function parseArgs(argv) {
 	let root;
 	let port;
 	let tunnel = false;
+	let resetCache = false;
 	for (let i = 0; i < argv.length; i++) {
 		const arg = argv[i];
 		if (arg === "--root") {
@@ -26,19 +27,24 @@ function parseArgs(argv) {
 			tunnel = true;
 			continue;
 		}
-		return { error: `Unknown supervisor argument "${arg}". Usage: run.js --root <path> --port <n> [--tunnel]` };
+		if (arg === "--reset-cache") {
+			resetCache = true;
+			continue;
+		}
+		return { error: `Unknown supervisor argument "${arg}". Usage: run.js --root <path> --port <n> [--tunnel] [--reset-cache]` };
 	}
-	if (!root) return { error: "Missing --root. Usage: run.js --root <path> --port <n> [--tunnel]" };
+	if (!root) return { error: "Missing --root. Usage: run.js --root <path> --port <n> [--tunnel] [--reset-cache]" };
 	if (!isAbsolute(root)) return { error: `--root must be an absolute path, got "${root}".` };
 	const parsedPort = Number(port);
 	if (!Number.isInteger(parsedPort) || parsedPort <= 0 || parsedPort > 65535) return { error: `--port must be a TCP port number, got "${port}".` };
 	return {
 		root: resolve(root),
 		port: parsedPort,
-		tunnel
+		tunnel,
+		resetCache
 	};
 }
-async function runSupervisor({ root, port, tunnel = false, isExpo = detectIsExpo, startBare = null, startExpo = null, now = Date.now, onExit = (code) => process.exit(code), attachSignals = true, stderr = (line) => console.error(line) }) {
+async function runSupervisor({ root, port, tunnel = false, resetCache = false, isExpo = detectIsExpo, startBare = null, startExpo = null, now = Date.now, onExit = (code) => process.exit(code), attachSignals = true, stderr = (line) => console.error(line) }) {
 	root = realpathSync(root);
 	const logsDir = workspaceLogsDir(root);
 	const writer = createNdjsonWriter(join(logsDir, "metro.ndjson"));
@@ -98,12 +104,13 @@ async function runSupervisor({ root, port, tunnel = false, isExpo = detectIsExpo
 	};
 	let server;
 	try {
-		server = await (mode === "expo-child" ? startExpo || (await import("./server-expo-Dho5Raiw.mjs")).startExpoServer : startBare || (await import("./server-bare-Buk-k8tI.mjs")).startBareServer)({
+		server = await (mode === "expo-child" ? startExpo || (await import("./server-expo-CjeTJ273.mjs")).startExpoServer : startBare || (await import("./server-bare-CCLb90FS.mjs")).startBareServer)({
 			root,
 			port,
 			logsDir,
 			writer,
 			tunnel,
+			resetCache,
 			onTunnelUrl: (url) => {
 				try {
 					withWorkspaceStateLock(root, () => {
@@ -191,7 +198,8 @@ async function main(argv = process.argv.slice(2)) {
 	await runSupervisor({
 		root,
 		port: parsed.port,
-		tunnel: parsed.tunnel ?? false
+		tunnel: parsed.tunnel ?? false,
+		resetCache: parsed.resetCache ?? false
 	});
 }
 function invokedDirectly() {

package/dist/{teardown-KsPpvldq.mjs → teardown-sm1FwF6V.mjs}

@@ -1,12 +1,12 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { C as withConfigLock, E as ownership_claim_exports, F as deviceSlotPlatforms, L as projectDeviceSlots, N as assignSlotDevice, R as removeSlotDevice, T as acquireAvdClaim, d as getConfigPath, g as loadConfig, s as ensureConfig, u as getConfigDir, y as saveConfig } from "./config-6vdGngKa.mjs";
+import { C as withConfigLock, E as ownership_claim_exports, F as deviceSlotPlatforms, L as projectDeviceSlots, N as assignSlotDevice, R as removeSlotDevice, T as acquireAvdClaim, d as getConfigPath, g as loadConfig, s as ensureConfig, u as getConfigDir, y as saveConfig } from "./config-DMP7L7H6.mjs";
 import { r as createNdjsonWriter } from "./ndjson-BZwI1NBv.mjs";
-import { _ as workspaceLogsDir } from "./workspace-state-Do1e2mOH.mjs";
-import { l as resolvePackageJson } from "./project-CBFCwnN5.mjs";
+import { _ as workspaceLogsDir } from "./workspace-state-WVwWw_hB.mjs";
+import { l as resolvePackageJson } from "./project-B_SDt4ip.mjs";
 import { n as stripAnsi } from "./process-output-C7IlIzd7.mjs";
 import { l as phaseLine } from "./command-output-BuIb_ZOI.mjs";
-import { E as ownedAvdMatchesConfiguration, F as shutdownAndroidEmulator, I as waitForAndroidEmulatorShutdown, N as resolveOwnedAvdSerial, O as ownedAvdSystemImage, S as listOrphanedAvdDirectories, T as ownedAvdDirectory, l as avdStorageRoots, o as assertOwnedAvdStopped, p as deleteAvd, s as avdPathExists } from "./android-BkM4qTaN.mjs";
-import { n as expoBinFromPackage, r as expoBinPath, s as findBinUpward } from "./server-expo-D4P7iTvf.mjs";
+import { E as ownedAvdMatchesConfiguration, F as shutdownAndroidEmulator, I as waitForAndroidEmulatorShutdown, N as resolveOwnedAvdSerial, O as ownedAvdSystemImage, S as listOrphanedAvdDirectories, T as ownedAvdDirectory, l as avdStorageRoots, o as assertOwnedAvdStopped, p as deleteAvd, s as avdPathExists } from "./android-BkYmndPp.mjs";
+import { n as expoBinFromPackage, r as expoBinPath, s as findBinUpward } from "./server-expo-CX-zkgWl.mjs";
 import { C as shutdownIosSim, _ as renameIosSim, a as deleteIosSim, d as listIosDeviceTypes, g as parseRuntimeVersion, h as parkedSimName, o as deleteParkedIosSim, r as clearAppDataContainer, s as findAppDataContainer, x as resolveOwnedIosSim } from "./ios-Deh5js5V.mjs";
 import { createRequire } from "node:module";
 import { existsSync, lstatSync, readFileSync, renameSync, rmSync } from "node:fs";

package/dist/{workspace-process-lock-UEIrvZMJ.mjs → workspace-process-lock-Bz19_R9R.mjs}

@@ -1,4 +1,4 @@
-import { E as ownership_claim_exports } from "./config-6vdGngKa.mjs";
+import { E as ownership_claim_exports } from "./config-DMP7L7H6.mjs";
 import { join } from "node:path";
 //#region src/engine/workspace-process-lock.ts
 const DEFAULT_WAIT_MS = 6e4;

package/dist/{workspace-state-Do1e2mOH.mjs → workspace-state-WVwWw_hB.mjs}

@@ -1,4 +1,4 @@
-import { D as withDirLock, u as getConfigDir } from "./config-6vdGngKa.mjs";
+import { D as withDirLock, u as getConfigDir } from "./config-DMP7L7H6.mjs";
 import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
 import { join as join$1, resolve as resolve$1 } from "path";