stim 1.5.0 → 1.7.0

package/dist/{start-DiEfqEWk.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-kO2ZqIKy.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-J5LAXpag.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-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-r7yEQ1R8.mjs";
-import { c as queryLogs } from "./logs-query-Cdp5aaCH.mjs";
-import { t as resolveSupervisorTarget } from "./ownership-CVY9cqCr.mjs";
-import { i as readSupervisorState } from "./stop-0jJNahwN.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-CM1fejKW.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-0jJNahwN.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-0jJNahwN.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-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 { 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-CSwUVYOa.mjs")).startExpoServer : startBare || (await import("./server-bare-H3pAhbMs.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}`);

package/dist/{teardown-CAVcWeRD.mjs → teardown-5J5UXz2P.mjs}

@@ -1,13 +1,13 @@
-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-DMP7L7H6.mjs";
+import { t as getExecutor } from "./exec-B29XNuhP.mjs";
+import { C as withConfigLock, E as ownership_claim_exports, I as deviceSlotPlatforms, N as assignSlotDevice, R as projectDeviceSlots, T as acquireAvdClaim, d as getConfigPath, g as loadConfig, s as ensureConfig, u as getConfigDir, y as saveConfig, z as removeSlotDevice } from "./config-B7iyKWkL.mjs";
 import { r as createNdjsonWriter } from "./ndjson-BZwI1NBv.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-DJWiTBkz.mjs";
-import { n as expoBinFromPackage, r as expoBinPath, s as findBinUpward } from "./server-expo-Ds8_mfng.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 { _ as workspaceLogsDir } from "./workspace-state-BT5E3SA2.mjs";
+import { l as resolvePackageJson } from "./project-DDZWf_16.mjs";
+import { n as stripAnsi } from "./process-output-Dl5uKE03.mjs";
+import { I as resolveOwnedAvdSerial, O as ownedAvdDirectory, R as shutdownAndroidEmulator, T as listOrphanedAvdDirectories, c as assertOwnedAvdStopped, d as avdStorageRoots, h as deleteAvd, j as ownedAvdSystemImage, k as ownedAvdMatchesConfiguration, l as avdPathExists, z as waitForAndroidEmulatorShutdown } from "./android-DWssqHQ8.mjs";
+import { l as phaseLine } from "./command-output-B3ycpsYv.mjs";
+import { n as expoBinFromPackage, r as expoBinPath, s as findBinUpward } from "./server-expo-BVAA1OqJ.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-lEJ5pKsq.mjs";
 import { createRequire } from "node:module";
 import { existsSync, lstatSync, readFileSync, renameSync, rmSync } from "node:fs";
 import { randomUUID } from "node:crypto";
@@ -202,7 +202,7 @@ function easAuthNote(status) {
 	if (code === "wrong-account") return `eas is authenticated as ${account}, and this project's owner is ${owner} -- run \`eas login\` as a member of ${owner} (or set EXPO_TOKEN); consulting the EAS cache anyway`;
 	return null;
 }
-function resolveEasCliBin(projectRoot, { lookupPath = null, timeoutMs = 5e3 } = {}) {
+function resolveEasCliBin(projectRoot, { lookupPath = null } = {}) {
 	const fromPackage = expoBinFromPackage(resolvePackageJson(projectRoot, EAS_CLI_PACKAGE), EAS_CLI_BIN);
 	if (fromPackage) return {
 		file: fromPackage,
@@ -213,7 +213,7 @@ function resolveEasCliBin(projectRoot, { lookupPath = null, timeoutMs = 5e3 } =
 		file: shim,
 		source: "project"
 	};
-	const onPath = lookupPath ? lookupPath() : getExecutor().runQuiet(`command -v ${EAS_CLI_BIN}`, { timeoutMs });
+	const onPath = lookupPath ? lookupPath() : getExecutor().findExecutable(EAS_CLI_BIN);
 	const file = (String(onPath || "").split("\n")[0] ?? "").trim();
 	return file ? {
 		file,
@@ -720,7 +720,7 @@ function dropParked(platform, udid) {
 	return removeParkedAfter(platform, udid, () => {}) !== null;
 }
 //#endregion
-//#region src/agent-device-cleanup.ts
+//#region src/devices/agent-device-cleanup.ts
 function parseAgentDeviceSessions(output) {
 	const result = JSON.parse(output);
 	if (result?.success !== true || !Array.isArray(result.data?.sessions)) throw new Error("agent-device did not return a successful session list");
@@ -763,10 +763,7 @@ function closeOwnedDeviceSessions(device, stillOwned) {
 		"stim-teardown-inventory"
 	]));
 	try {
-		if (!exec.runQuiet("command -v agent-device", {
-			timeoutMs: 2e3,
-			killSignal: "SIGKILL"
-		})) return;
+		if (!exec.findExecutable("agent-device")) return;
 		const sessions = list().filter((session) => session.platform === device.platform && session.id === device.id);
 		for (const session of sessions) try {
 			if (!list().some((current) => current.name === session.name && current.platform === session.platform && current.id === session.id && current.createdAt === session.createdAt)) continue;
@@ -791,7 +788,7 @@ function closeOwnedDeviceSessions(device, stillOwned) {
 	}
 }
 //#endregion
-//#region src/teardown.ts
+//#region src/devices/teardown.ts
 function teardownParkedAvd(avdName) {
 	try {
 		return removeParkedAfter("android", avdName, () => {

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

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

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

@@ -1,9 +1,9 @@
-import { D as withDirLock, u as getConfigDir } from "./config-DMP7L7H6.mjs";
+import { D as withDirLock, u as getConfigDir } from "./config-B7iyKWkL.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";
 import { buildCacheRoot as sharedBuildCache, workspaceId, workspaceName as workspaceName$1, workspaceStateDir as workspaceDir } from "@stim-cli/core";
-//#region src/paths.ts
+//#region src/workspace/paths.ts
 const WORKSPACE_METADATA_FILE_NAME = "workspace.json";
 function workspaceMetadataFile(projectRoot) {
 	return join$1(workspaceDir(projectRoot), WORKSPACE_METADATA_FILE_NAME);
@@ -66,7 +66,7 @@ function sharedCcache() {
 	return join$1(getConfigDir(), "ccache");
 }
 //#endregion
-//#region src/workspace-state.ts
+//#region src/workspace/workspace-state.ts
 function readWorkspaceState(root) {
 	try {
 		const parsed = JSON.parse(readFileSync(workspaceStateFile(root), "utf-8"));

package/dist/{worktree-CeUKDAQw.mjs → worktree-BfE4lzHK.mjs}

@@ -1,16 +1,16 @@
-import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { E as ownership_claim_exports, S as upsertProject, f as getProject, g as loadConfig, h as isPathPrefix, u as getConfigDir, v as removeProject, w as process_identity_exports } from "./config-DMP7L7H6.mjs";
-import { S as warmWorktreePaths, _ as resolveFullRef, b as sourceCheckoutOf, c as hasRemote, d as listWorktrees, f as locallyKnownUpstream, h as removeWorktree, i as depsOutOfSync, l as hasUncommittedWork, m as readWorktreeExclude, n as cloneIgnoredEntries, o as dirtyPaths, p as podsOutOfSync, r as deleteBranch, s as gitCommonDir, t as branchExists, u as isPodInstallChurn, x as unpushedCommits, y as restoreFile } from "./worktree-DJnBbQZ9.mjs";
-import { a as findProjectRoot } from "./project-B_SDt4ip.mjs";
-import { l as readRemoteSession, s as readMetroTunnel } from "./state-CnWzvCWP.mjs";
-import { a as formatElapsed, f as releasedLeaseFact, i as formatDuration, l as phaseLine, m as shortUdid, u as plural } from "./command-output-BuIb_ZOI.mjs";
-import { A as resolveSettings, I as unknownSettingKeys, N as settingShapeErrors, a as SETTING_SHAPE_REMEDY } from "./settings-kO2ZqIKy.mjs";
-import { a as POOL_SETTING_REMEDY, l as parkedMaxSetting } from "./teardown-CAVcWeRD.mjs";
-import { h as podInstallCommand, n as HEARTBEAT_INTERVAL_MS } from "./xcode-BqDeRkpT.mjs";
-import { n as hasInstalledDependencies, r as installedNpmTreeIsValid, t as dependencyState } from "./dependency-state-CTL8A9p3.mjs";
-import { c as withManagedTunnelRemovalLock, o as withManagedRemoteWorktreeRemovalLock } from "./ownership-CVY9cqCr.mjs";
-import { n as reclaimProject } from "./reclaim-C_rB25f4.mjs";
-import { a as runPodInstall, i as runCaptured, n as podsAreStale, r as readPodState, t as DEPS_ERROR } from "./deps-BAGOnrc7.mjs";
+import { t as getExecutor } from "./exec-B29XNuhP.mjs";
+import { E as ownership_claim_exports, S as upsertProject, f as getProject, g as loadConfig, h as isPathPrefix, u as getConfigDir, v as removeProject, w as process_identity_exports } from "./config-B7iyKWkL.mjs";
+import { S as warmWorktreePaths, _ as resolveFullRef, b as sourceCheckoutOf, c as hasRemote, d as listWorktrees, f as locallyKnownUpstream, h as removeWorktree, i as depsOutOfSync, l as hasUncommittedWork, m as readWorktreeExclude, n as cloneIgnoredEntries, o as dirtyPaths, p as podsOutOfSync, r as deleteBranch, s as gitCommonDir, t as branchExists, u as isPodInstallChurn, x as unpushedCommits, y as restoreFile } from "./worktree-FG_ZKKdb.mjs";
+import { a as findProjectRoot } from "./project-DDZWf_16.mjs";
+import { l as readRemoteSession, s as readMetroTunnel } from "./state-DZobzxLW.mjs";
+import { A as resolveSettings, I as unknownSettingKeys, N as settingShapeErrors, a as SETTING_SHAPE_REMEDY } from "./settings-BXXorVM2.mjs";
+import { a as formatElapsed, f as releasedLeaseFact, i as formatDuration, l as phaseLine, m as shortUdid, u as plural } from "./command-output-B3ycpsYv.mjs";
+import { a as POOL_SETTING_REMEDY, l as parkedMaxSetting } from "./teardown-5J5UXz2P.mjs";
+import { h as podInstallCommand, n as HEARTBEAT_INTERVAL_MS } from "./xcode-B6YaWeg0.mjs";
+import { n as hasInstalledDependencies, r as installedNpmTreeIsValid, t as dependencyState } from "./dependency-state-D0M7oKA7.mjs";
+import { c as withManagedTunnelRemovalLock, o as withManagedRemoteWorktreeRemovalLock } from "./ownership-D5vkdm8H.mjs";
+import { n as reclaimProject } from "./reclaim-D614jI6_.mjs";
+import { a as runPodInstall, i as runCaptured, n as podsAreStale, r as readPodState, t as DEPS_ERROR } from "./deps-oCXVNEqQ.mjs";
 import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { createHash, randomUUID } from "node:crypto";
 import { join, relative } from "node:path";
@@ -198,7 +198,7 @@ async function withWarmClaim(options, fn) {
 	}
 }
 //#endregion
-//#region src/worktree-refresh.ts
+//#region src/workspace/worktree-refresh.ts
 const DIRTY_PATHS_SHOWN = 5;
 const FETCH_TIMEOUT_MS = 12e4;
 function mainCheckoutRefusal(root, state) {
@@ -1278,9 +1278,14 @@ async function runRemove(target, opts = {}) {
 		}
 		restorePodChurn(path, inspection.podChurn);
 		try {
-			removeWorktree(path, { force: opts.force });
+			removeWorktree(path, {
+				from: source.path,
+				force: opts.force
+			});
 		} catch (error) {
-			console.error(chalk.red(`git worktree remove failed: ${String(error?.message || error)}`));
+			const message = String(error?.message || error);
+			console.error(chalk.red(`git worktree remove failed: ${message}`));
+			if (process.platform === "win32" && /Permission denied/i.test(message)) console.error(chalk.dim("Another process holds a file or directory inside the worktree. An adb server or emulator started from it keeps its working directory open; `adb kill-server` releases the server, and Sysinternals handle.exe lists other holders."));
 			console.error(chalk.dim(`The directory and Stim ownership record for ${path} were kept.`));
 			printRemovalCleanup(result, true);
 			process.exitCode = 1;

package/dist/{worktree-DJnBbQZ9.mjs → worktree-FG_ZKKdb.mjs}

@@ -1,5 +1,5 @@
-import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { g as loadConfig, u as getConfigDir } from "./config-DMP7L7H6.mjs";
+import { t as getExecutor } from "./exec-B29XNuhP.mjs";
+import { g as loadConfig, u as getConfigDir } from "./config-B7iyKWkL.mjs";
 import { accessSync, chmodSync, constants, lstatSync, mkdirSync, mkdtempSync, readdirSync, realpathSync, rmSync, statSync } from "node:fs";
 import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { chmodSync as chmodSync$1, existsSync as existsSync$1, lstatSync as lstatSync$1, mkdirSync as mkdirSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, realpathSync as realpathSync$1, utimesSync } from "fs";
@@ -84,7 +84,7 @@ function removeTemporaryEntry(path) {
 	});
 }
 //#endregion
-//#region src/worktree.ts
+//#region src/workspace/worktree.ts
 const CARRY_SKIP_BASENAMES = /* @__PURE__ */ new Set([
 	".DerivedData",
 	".DS_Store",
@@ -93,6 +93,9 @@ const CARRY_SKIP_BASENAMES = /* @__PURE__ */ new Set([
 function isCarrySkipped(rel) {
 	return /(^|\/)android\/build\/generated\/autolinking(\/|$)/.test(rel) || String(rel).split("/").some((seg) => CARRY_SKIP_BASENAMES.has(seg));
 }
+function nativePath(path) {
+	return sep$1 === "/" ? path : path.replaceAll("/", sep$1);
+}
 function gitCommonDir(cwd) {
 	const out = getExecutor().runFileQuiet("git", [
 		"-C",
@@ -101,7 +104,7 @@ function gitCommonDir(cwd) {
 		"--path-format=absolute",
 		"--git-common-dir"
 	]);
-	return out ? out.trim() : null;
+	return out ? nativePath(out.trim()) : null;
 }
 function repoRoot(cwd) {
 	const out = getExecutor().runFileQuiet("git", [
@@ -110,7 +113,7 @@ function repoRoot(cwd) {
 		"rev-parse",
 		"--show-toplevel"
 	]);
-	return out ? out.trim() : null;
+	return out ? nativePath(out.trim()) : null;
 }
 function locallyKnownUpstream(projectRoot) {
 	try {
@@ -440,7 +443,7 @@ function isPodInstallChurn(paths) {
 	if (!paths || paths.length === 0) return false;
 	return paths.every((line) => /(?:^|\/)(?:Podfile\.lock|project\.pbxproj)$/.test(line.slice(3).trim()));
 }
-const SAFE_BRANCH_NAME = /^[A-Za-z0-9._/-]+$/;
+const SAFE_BRANCH_NAME = /^[A-Za-z0-9@._/-]+$/;
 function unpushedCommits(dir) {
 	const exec = getExecutor();
 	const branch = exec.runFileQuiet("git", [
@@ -511,10 +514,11 @@ function resolveFullRef(cwd, ref) {
 		return null;
 	}
 }
-function removeWorktree(path, { force = false } = {}) {
+function removeWorktree(path, { from, force = false, platform = process.platform }) {
 	const args = [
+		...platform === "win32" ? ["-c", "core.longpaths=true"] : [],
 		"-C",
-		path,
+		from,
 		"worktree",
 		"remove",
 		...force ? ["--force"] : [],
@@ -539,7 +543,7 @@ function parseWorktrees(out) {
 	let current = {};
 	for (const line of out.split("\n")) if (line.startsWith("worktree ")) {
 		if (current.path) entries.push(current);
-		current = { path: line.slice(9) };
+		current = { path: nativePath(line.slice(9)) };
 	} else if (line.startsWith("branch ")) current.branch = line.slice(7).replace("refs/heads/", "");
 	else if (line === "prunable" || line.startsWith("prunable ")) current.prunable = true;
 	else if (line === "bare") current.bare = true;