stim 1.5.0 → 1.7.0

package/dist/{doctor-Di_B26uh.mjs → doctor-CTAx9gMu.mjs}

@@ -1,28 +1,29 @@
-import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { g as loadConfig, l as getConcurrencyLimits, o as configCorruptRepair } from "./config-DMP7L7H6.mjs";
-import { l as sharedBuildCache, m as workspaceDerivedData } from "./workspace-state-WVwWw_hB.mjs";
-import { C as filesystemDevice, E as temporaryRoot, a as dirtyFingerprintFiles, d as listWorktrees, f as locallyKnownUpstream, g as repoRoot, s as gitCommonDir, v as resolveSourceCheckout, w as makeTemporaryDirectory } from "./worktree-DJnBbQZ9.mjs";
-import { a as findProjectRoot, i as detectIsExpo, t as appProjectProblem } from "./project-B_SDt4ip.mjs";
-import { d as quotedPath, l as phaseLine, u as plural } from "./command-output-BuIb_ZOI.mjs";
-import { B as listBuildLocks, Z as fingerprintProject, q as diffFingerprintSources, y as listAdbDevices } from "./android-DJWiTBkz.mjs";
-import { A as resolveSettings, E as remoteAndroidSetting, I as unknownSettingKeys, M as settingOrigin, N as settingShapeErrors, O as remoteIosSetting, P as settingsLayers, U as resolveOptimizations, V as compilerCacheFallbackMessage, a as SETTING_SHAPE_REMEDY, i as SETTINGS_WITH_RESOLVE_TIME_FALLBACK, n as PATH_SETTINGS, v as iosSimSlimProfileSetting, w as projectOptimizations, y as mergeSettingsLayers } from "./settings-kO2ZqIKy.mjs";
-import { S as resolveEasCliBin, a as POOL_SETTING_REMEDY, b as ownerFromConfig, h as checkEasAuth$1, l as parkedMaxSetting, x as providerFromConfig } from "./teardown-CAVcWeRD.mjs";
-import { E as readHostMemoryPressure, T as hostMemoryPressureAdvice, u as listAllIosSims } from "./ios-Deh5js5V.mjs";
-import { n as listBuildSlots } from "./build-slots-CuPszJDu.mjs";
-import { a as liveOwnedDeviceCount, d as simslimIsOnPath } from "./device-DvKJ454A.mjs";
-import { d as projectCmakeLauncher, i as apkOutputsDir, r as resolveAndroidCompilerCache, t as readAndroidCasToolchain } from "./android-cas-CSS8gjR7.mjs";
-import { h as podInstallCommand, i as ccacheEnabled, o as detectXcodeMajor } from "./xcode-BqDeRkpT.mjs";
-import { i as inspectStimVersions, n as recordDoctorRun, r as compareStimVersions } from "./guide-status-BF6RsJJp.mjs";
-import { n as hasInstalledDependencies, r as installedNpmTreeIsValid, t as dependencyState } from "./dependency-state-CTL8A9p3.mjs";
+import { t as getExecutor } from "./exec-B29XNuhP.mjs";
+import { g as loadConfig, l as getConcurrencyLimits, o as configCorruptRepair } from "./config-B7iyKWkL.mjs";
+import { l as sharedBuildCache, m as workspaceDerivedData } from "./workspace-state-BT5E3SA2.mjs";
+import { C as filesystemDevice, E as temporaryRoot, a as dirtyFingerprintFiles, d as listWorktrees, f as locallyKnownUpstream, g as repoRoot, s as gitCommonDir, v as resolveSourceCheckout, w as makeTemporaryDirectory } from "./worktree-FG_ZKKdb.mjs";
+import { a as findProjectRoot, i as detectIsExpo, t as appProjectProblem } from "./project-DDZWf_16.mjs";
+import { A as resolveSettings, E as remoteAndroidSetting, I as unknownSettingKeys, M as settingOrigin, N as settingShapeErrors, O as remoteIosSetting, P as settingsLayers, U as resolveOptimizations, V as compilerCacheFallbackMessage, a as SETTING_SHAPE_REMEDY, i as SETTINGS_WITH_RESOLVE_TIME_FALLBACK, n as PATH_SETTINGS, v as iosSimSlimProfileSetting, w as projectOptimizations, y as mergeSettingsLayers } from "./settings-BXXorVM2.mjs";
+import { S as listAdbDevices, x as hostSystemImageArch } from "./android-DWssqHQ8.mjs";
+import { d as quotedPath, l as phaseLine, u as plural } from "./command-output-B3ycpsYv.mjs";
+import { m as fingerprintProject, r as listBuildLocks, u as diffFingerprintSources } from "./build-lock-CgtsB6TV.mjs";
+import { S as resolveEasCliBin, a as POOL_SETTING_REMEDY, b as ownerFromConfig, h as checkEasAuth$1, l as parkedMaxSetting, x as providerFromConfig } from "./teardown-5J5UXz2P.mjs";
+import { E as readHostMemoryPressure, T as hostMemoryPressureAdvice, u as listAllIosSims } from "./ios-lEJ5pKsq.mjs";
+import { n as listBuildSlots } from "./build-slots-C-oAHRT1.mjs";
+import { a as liveOwnedDeviceCount, d as simslimIsOnPath } from "./device-CLeDp-KH.mjs";
+import { d as projectCmakeLauncher, g as androidPathRoomRemedy, h as androidPathRoomMessage, i as apkOutputsDir, m as androidPathRoom, r as resolveAndroidCompilerCache, t as readAndroidCasToolchain } from "./android-cas-SWIjzeuL.mjs";
+import { h as podInstallCommand, i as ccacheEnabled, o as detectXcodeMajor } from "./xcode-B6YaWeg0.mjs";
+import { i as inspectStimVersions, n as recordDoctorRun, r as compareStimVersions } from "./guide-status-Craq9z0t.mjs";
+import { n as hasInstalledDependencies, r as installedNpmTreeIsValid, t as dependencyState } from "./dependency-state-D0M7oKA7.mjs";
 import { existsSync, lstatSync, readFileSync, readdirSync, realpathSync, rmSync } from "node:fs";
 import { InvalidArgumentError } from "commander";
 import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { existsSync as existsSync$1, lstatSync as lstatSync$1, mkdirSync as mkdirSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, realpathSync as realpathSync$1, renameSync as renameSync$1, rmSync as rmSync$1, writeFileSync as writeFileSync$1 } from "fs";
 import { homedir } from "os";
-import { dirname as dirname$1, isAbsolute as isAbsolute$1, join as join$1, relative as relative$1, resolve as resolve$1 } from "path";
+import { dirname as dirname$1, isAbsolute as isAbsolute$1, join as join$1, relative as relative$1, resolve as resolve$1, sep as sep$1 } from "path";
 import * as expoFingerprint from "@expo/fingerprint";
 import chalk from "chalk";
-//#region src/sandbox.ts
+//#region src/diagnostics/sandbox.ts
 /**
 * What a sandboxed harness has to permit for Stim to work: its state
 * directory, the XPC service simctl talks to, and the port adb's server binds.
@@ -111,8 +112,12 @@ function nested(source, ...keys) {
 }
 /** Whether an allowWrite entry covers the Stim home, including as a parent. */
 function covers(entry, target, home) {
-	const e = expandHome(entry.replace(/\/+\*+$/, "").replace(/\/+$/, ""), home);
-	const t = expandHome(target.replace(/\/+$/, ""), home);
+	const posix = (value) => {
+		const expanded = expandHome(value, home);
+		return sep$1 === "/" ? expanded : expanded.replaceAll(sep$1, "/");
+	};
+	const e = posix(entry.replace(/\/+\*+$/, "").replace(/\/+$/, ""));
+	const t = posix(target.replace(/\/+$/, ""));
 	return e === t || t.startsWith(`${e}/`);
 }
 /**
@@ -224,8 +229,8 @@ function sandboxFinding(settingsRoot, { env = process.env, home = homedir(), sti
 	};
 }
 //#endregion
-//#region src/doctor-storage.ts
-function checkStorageLayout(projectRoot, { platform, device = filesystemDevice, stagingRoot = temporaryRoot } = {}) {
+//#region src/diagnostics/doctor-storage.ts
+function checkStorageLayout(projectRoot, { platform, host = process.platform, device = filesystemDevice, stagingRoot = temporaryRoot } = {}) {
 	const findings = [];
 	const temporaryFix = "Unset STIM_TMPDIR / machine tempDir to select same-volume staging automatically, or point the override at a writable directory on the relevant volume outside Git working trees.";
 	const check = (operation, paths, fix) => {
@@ -244,7 +249,7 @@ function checkStorageLayout(projectRoot, { platform, device = filesystemDevice,
 		const cache = sharedBuildCache();
 		check("Cached app/APK staging", [cache, stagingRoot(join(cache, "artifact.app"))], temporaryFix);
 		const cacheFix = "Place STIM_BUILD_CACHE / machine caches.buildCache on the build-output volume, or accept the full-copy cost of keeping the cache on a separate volume.";
-		if (platform === "ios" || platform !== "android" && existsSync(join(projectRoot, "ios"))) {
+		if ((platform === "ios" || platform !== "android" && existsSync(join(projectRoot, "ios"))) && host === "darwin") {
 			const output = join(workspaceDerivedData(projectRoot), "Build", "Products");
 			check("iOS build-cache storage", [output, cache], cacheFix);
 			check("iOS device app staging", [output, stagingRoot(join(output, "artifact.app"))], temporaryFix);
@@ -261,7 +266,7 @@ function checkStorageLayout(projectRoot, { platform, device = filesystemDevice,
 	return findings;
 }
 //#endregion
-//#region src/doctor-ios-architectures.ts
+//#region src/diagnostics/doctor-ios-architectures.ts
 const COMPILED_PRODUCTS = /* @__PURE__ */ new Set([
 	"com.apple.product-type.application",
 	"com.apple.product-type.application.on-demand-install-capable",
@@ -397,7 +402,7 @@ function inspectIosDebugArchitectures(projectRoot) {
 	return findings;
 }
 //#endregion
-//#region src/doctor-cxx.ts
+//#region src/diagnostics/doctor-cxx.ts
 function parseCmakeCacheLauncher(source) {
 	if (typeof source !== "string") return null;
 	return /^CMAKE_CXX_COMPILER_LAUNCHER(?::[A-Z]+)?=(.*)$/m.exec(source)?.[1]?.trim() || null;
@@ -474,7 +479,7 @@ function repairCxxLauncherState(root) {
 		refused: []
 	};
 	if (selectedCompilerCache(root) !== "ccache") return result;
-	if (!getExecutor().runQuiet("command -v ccache", { timeoutMs: 5e3 })) return result;
+	if (!getExecutor().findExecutable("ccache")) return result;
 	const appOverrides = declaredLauncher(join(root, "android", "app"));
 	const targets = readCxxLauncherStates(root).filter(({ launcher }) => {
 		if (!launcher) return true;
@@ -530,7 +535,7 @@ function repairCxxLauncherState(root) {
 	return result;
 }
 //#endregion
-//#region src/doctor-config.ts
+//#region src/diagnostics/doctor-config.ts
 function readMachineSettings(context) {
 	try {
 		const layers = settingsLayers(context);
@@ -639,7 +644,7 @@ function missingPath(value, projectRoot, exists, trim = false) {
 	return opened === opened.trim() ? path : JSON.stringify(path);
 }
 //#endregion
-//#region src/doctor.ts
+//#region src/diagnostics/doctor.ts
 function finding(level, title, detail, fix) {
 	return {
 		level,
@@ -768,7 +773,7 @@ function seedFindings(mainRoot, upstream) {
 	if (defaultBranch !== null && defaultBranch !== branch) findings.push(finding("note", `The source checkout is on ${branch}, not the default branch ${defaultBranch}`, `Every worktree warmed from here carries ${branch}'s dependencies. \`stim worktree warm --refresh\` warns and continues; it never switches a branch under another checkout.`, `Run \`git -C ${quotedRoot} checkout ${defaultBranch}\`.`));
 	return findings;
 }
-function checkMainCheckout(projectRoot, { npmTreeValid, brokenPods = void 0, upstream = void 0, linkedWorktrees = void 0, platform } = {}) {
+function checkMainCheckout(projectRoot, { npmTreeValid, brokenPods = void 0, upstream = void 0, linkedWorktrees = void 0, platform, localIos = platform !== "android" } = {}) {
 	const mainRoot = mainCheckoutProjectRoot(projectRoot);
 	const findings = [];
 	const dependencies = dependencyState(mainRoot);
@@ -783,7 +788,7 @@ function checkMainCheckout(projectRoot, { npmTreeValid, brokenPods = void 0, ups
 	const podfileLock = join$1(mainRoot, "ios", "Podfile.lock");
 	const podManifest = join$1(mainRoot, "ios", "Pods", "Manifest.lock");
 	const podsRoot = join$1(mainRoot, "ios", "Pods");
-	if (platform !== "android" && existsSync$1(podfileLock)) {
+	if (localIos && existsSync$1(podfileLock)) {
 		let podsState = null;
 		if (!existsSync$1(podManifest)) podsState = "missing";
 		else try {
@@ -803,7 +808,7 @@ function checkMainCheckout(projectRoot, { npmTreeValid, brokenPods = void 0, ups
 			findings.push(finding("cost", "The source checkout CocoaPods state has broken links", `${broken.length} symlink${broken.length === 1 ? "" : "s"} under ios/Pods point to missing files. Worktrees copy these broken links and can fail during compilation. First: ${broken[0]}.`, `Run \`${podCommand}\` before creating native worktrees.`));
 		}
 	}
-	const coldPlatforms = [platform !== "android" && existsSync$1(join$1(mainRoot, "ios")) && !hasIosWarmOutput(mainRoot) ? "iOS" : null, platform !== "ios" && existsSync$1(join$1(mainRoot, "android")) && !existsSync$1(join$1(mainRoot, "android", "build")) && !existsSync$1(join$1(mainRoot, "android", "app", "build")) ? "Android" : null].filter((coldPlatform) => coldPlatform !== null);
+	const coldPlatforms = [localIos && existsSync$1(join$1(mainRoot, "ios")) && !hasIosWarmOutput(mainRoot) ? "iOS" : null, platform !== "ios" && existsSync$1(join$1(mainRoot, "android")) && !existsSync$1(join$1(mainRoot, "android", "build")) && !existsSync$1(join$1(mainRoot, "android", "app", "build")) ? "Android" : null].filter((coldPlatform) => coldPlatform !== null);
 	if (coldPlatforms.length) findings.push(finding("note", `The source checkout has no ${coldPlatforms.join(" or ")} warm build output`, "The shared Stim artifact or compilation cache can still be warm. Building the source checkout once gives later native worktrees the strongest warm starting point.", `When more native worktrees are expected, run \`stim start\`, \`stim ${coldPlatforms[0] === "iOS" ? "ios" : "android"}\`, and \`stim stop\` from ${mainRoot}.`));
 	if (linkedWorktrees === void 0 ? hasLinkedWorktree(projectRoot) : linkedWorktrees) findings.push(...seedFindings(mainRoot, upstream === void 0 ? locallyKnownUpstream(mainRoot) : upstream));
 	return findings;
@@ -846,7 +851,7 @@ function checkCcacheConflict(podfileSource, podfileProperties) {
 }
 function checkCcacheInstalled(onPath) {
 	if (onPath) return null;
-	return finding("cost", "ccache is not on PATH, so Android C++ recompiles in every worktree", "Stim resolves the launcher with `command -v ccache` -- the same PATH lookup the build itself uses -- and found nothing, so it passes no CMAKE_C_COMPILER_LAUNCHER / CMAKE_CXX_COMPILER_LAUNCHER to Gradle and every AGP CMake task compiles without one. Those tasks are uncacheable by Gradle, so not one C++ object crosses a worktree. Measured on trailhead (arm64, fresh worktree): 49.6s without the launcher against 34.2s with it.", "brew install ccache, then delete android/app/.cxx and node_modules/**/android/.cxx once so CMake reconfigures with the launcher. The shell that runs Stim must have the install location on PATH -- agent shells often lack /opt/homebrew/bin.");
+	return finding("cost", "ccache is not on PATH, so Android C++ recompiles in every worktree", "Stim resolves the launcher with a PATH lookup for `ccache` -- the same lookup the build itself uses -- and found nothing, so it passes no CMAKE_C_COMPILER_LAUNCHER / CMAKE_CXX_COMPILER_LAUNCHER to Gradle and every AGP CMake task compiles without one. Those tasks are uncacheable by Gradle, so not one C++ object crosses a worktree. Measured on trailhead (arm64, fresh worktree): 49.6s without the launcher against 34.2s with it.", "brew install ccache, then delete android/app/.cxx and node_modules/**/android/.cxx once so CMake reconfigures with the launcher. The shell that runs Stim must have the install location on PATH -- agent shells often lack /opt/homebrew/bin.");
 }
 function launcherPath(launcher) {
 	const command = launcher?.split(";")[0]?.trim();
@@ -868,7 +873,7 @@ function checkCxxCompilerLauncher({ states, ccacheOnPath, launcherExists = exist
 }
 function ccacheIsOnPath() {
 	try {
-		return Boolean(getExecutor().runQuiet("command -v ccache", { timeoutMs: 5e3 }));
+		return Boolean(getExecutor().findExecutable("ccache"));
 	} catch {
 		return false;
 	}
@@ -915,7 +920,25 @@ function checkSimSlim({ configured = false, profileError = null, onPath = false
 	if (onPath) return null;
 	return finding("cost", "A SimSlim profile is configured, but SimSlim is not installed", "`stim ios` needs the `simslim` command to apply the profile to its owned simulator.", "brew install mobai-app/tap/simslim");
 }
-function runDoctor(projectRoot, { readFile = readFileSync$1, xcodeMajor = null, easAuth = checkEasAuth$1, concurrency = getConcurrencyLimits, liveDevices = null, activeBuilds = null, remoteEnv = process.env, lookupAgentDevice = null, lookupEasCli = null, lookupSimSlim = null, memoryPressure = readHostMemoryPressure, lookupCcache = null, platform } = {}) {
+function checkIosHost(platform, host) {
+	if (platform !== "ios" || host === "darwin") return null;
+	return finding("note", `iOS runs through EAS on this ${host} host`, "Xcode, CocoaPods and simctl exist only on macOS, so `stim ios` cannot build or boot a simulator here. `stim ios --remote eas --eas-profile <simulator profile>` downloads a finished EAS development build and runs it on an EAS Simulator session driven through agent-device; Metro stays on this machine behind a tunnel.", "Install eas-cli and agent-device, then run `stim start --remote` and `stim ios --remote eas --eas-profile <profile>`. Read `stim guide metro` for the remote device backends.");
+}
+function checkXcodeEnvLineEndings(projectRoot, platform, host) {
+	if (platform === "android" || host !== "win32") return null;
+	const xcodeEnv = join$1(projectRoot, "ios", ".xcode.env");
+	if (!existsSync$1(xcodeEnv)) return null;
+	let content;
+	try {
+		content = readFileSync$1(xcodeEnv, "utf-8");
+	} catch {
+		return null;
+	}
+	if (!content.includes("\r")) return null;
+	return finding("cost", "ios/.xcode.env has CRLF line endings", "An EAS build uploads the working-tree bytes of ios/.xcode.env, and Xcode sources that file with sh on the build worker, where each carriage return becomes part of the line and the build fails with `: command not found`. On Windows the usual cause is core.autocrlf=true rewriting the file at checkout.", "Run `git config core.autocrlf input` then `git checkout -- ios/.xcode.env`, or add `ios/.xcode.env text eol=lf` to .gitattributes and check the file out again.");
+}
+function runDoctor(projectRoot, { readFile = readFileSync$1, xcodeMajor = null, easAuth = checkEasAuth$1, concurrency = getConcurrencyLimits, liveDevices = null, activeBuilds = null, remoteEnv = process.env, lookupAgentDevice = null, lookupEasCli = null, lookupSimSlim = null, memoryPressure = readHostMemoryPressure, lookupCcache = null, platform, host = process.platform } = {}) {
+	const localIos = platform !== "android" && host === "darwin";
 	const read = (rel) => {
 		const p = join$1(projectRoot, rel);
 		if (!existsSync$1(p)) return null;
@@ -982,12 +1005,12 @@ function runDoctor(projectRoot, { readFile = readFileSync$1, xcodeMajor = null,
 	}
 	let simslimProfile = null;
 	let simslimProfileError = null;
-	if (platform !== "android") try {
+	if (localIos) try {
 		simslimProfile = iosSimSlimProfileSetting(projectSettings, projectRoot);
 	} catch (error) {
 		simslimProfileError = String(error?.message || error);
 	}
-	const simslimFinding = platform === "android" || !simslimProfile && !simslimProfileError && remoteIosSetting(projectSettings) ? null : checkSimSlim({
+	const simslimFinding = !localIos || !simslimProfile && !simslimProfileError && remoteIosSetting(projectSettings) ? null : checkSimSlim({
 		configured: Boolean(simslimProfile),
 		profileError: simslimProfileError,
 		onPath: simslimProfile ? lookupSimSlim ? lookupSimSlim() : simslimIsOnPath() : false
@@ -1002,16 +1025,25 @@ function runDoctor(projectRoot, { readFile = readFileSync$1, xcodeMajor = null,
 		agentDeviceOnPath,
 		easCliResolvable
 	})).filter((remoteFinding) => remoteFinding !== null);
-	const memoryAdvice = platform !== "android" && !remoteIosSetting(projectSettings) ? hostMemoryPressureAdvice(memoryPressure()) : null;
+	const memoryAdvice = localIos && !remoteIosSetting(projectSettings) ? hostMemoryPressureAdvice(memoryPressure()) : null;
 	return [
 		checkAppProject(projectRoot),
-		...checkMainCheckout(projectRoot, { platform }),
-		...platform === "android" ? [] : inspectIosDebugArchitectures(mainCheckoutProjectRoot(projectRoot)),
-		...checkStorageLayout(projectRoot, { platform }),
+		checkIosHost(platform, host),
+		checkXcodeEnvLineEndings(projectRoot, platform, host),
+		...checkMainCheckout(projectRoot, {
+			platform,
+			localIos
+		}),
+		...localIos ? inspectIosDebugArchitectures(mainCheckoutProjectRoot(projectRoot)) : [],
+		...checkStorageLayout(projectRoot, {
+			platform,
+			host
+		}),
 		optimizations?.metroSharedCache ? checkMetroCache(metroConfig) : null,
-		platform === "android" || !optimizations?.ios.compilationCache ? null : checkCompilationCache(podfile, xcodeMajor),
-		platform === "android" || !optimizations?.ios.compilationCache ? null : checkCcacheConflict(podfile, podfileProperties),
+		localIos && optimizations?.ios.compilationCache ? checkCompilationCache(podfile, xcodeMajor) : null,
+		localIos && optimizations?.ios.compilationCache ? checkCcacheConflict(podfile, podfileProperties) : null,
 		...platform === "ios" || optimizations?.android.compilerCache !== "ccache" ? [] : androidCcacheFindings(projectRoot, platform, lookupCcache),
+		checkAndroidPathRoom(projectRoot, platform, host),
 		remoteBuildCache ? checkBuildCacheProvider(appConfig, sdkMajor, isExpo, dynamicConfig) : null,
 		easFinding,
 		concurrencyFinding,
@@ -1028,6 +1060,17 @@ function runDoctor(projectRoot, { readFile = readFileSync$1, xcodeMajor = null,
 		})
 	].filter((f) => Boolean(f));
 }
+function checkAndroidPathRoom(projectRoot, platform, host, hostArch = process.arch) {
+	const room = platform === "ios" ? null : androidPathRoom(projectRoot, {
+		abi: hostSystemImageArch(hostArch),
+		platform: host
+	});
+	if (!room) return null;
+	return {
+		code: "android-path-room",
+		...finding("cost", "The project path leaves no room for Android native object paths", `${androidPathRoomMessage(room)} \`stim android\` refuses to build here with STIM_PATH_TOO_LONG, because Gradle would fail deep inside ninja instead.`, androidPathRoomRemedy(room))
+	};
+}
 function androidCcacheFindings(projectRoot, platform, lookupCcache) {
 	if (platform !== "android" && !existsSync$1(join$1(projectRoot, "android"))) return [];
 	const onPath = lookupCcache ? lookupCcache() : ccacheIsOnPath();
@@ -1050,7 +1093,7 @@ function checkAppProject(projectRoot) {
 }
 function agentDeviceIsOnPath() {
 	try {
-		return Boolean(getExecutor().runQuiet("command -v agent-device", { timeoutMs: 5e3 }));
+		return Boolean(getExecutor().findExecutable("agent-device"));
 	} catch {
 		return true;
 	}
@@ -1338,7 +1381,7 @@ function applySandboxFix(root, env = process.env) {
 	console.error(chalk.green(`${result.status === "created" ? "Wrote" : "Updated"} ${target}`));
 	console.error(chalk.dim("Added writes to Stim's state directory, the simulator XPC service, and local port binding. Claude Code reads project settings from the directory a session starts in, so this file only counts for sessions rooted there. Restart the session for it to take effect."));
 }
-function doctorCommand(program, version, inspectVersions = inspectStimVersions) {
+function doctorCommand(program, version, inspectVersions = inspectStimVersions, host = process.platform) {
 	program.command("doctor").description("Inspect the source checkout and report project state that can make native worktrees slow or invalid. The checkout is left untouched unless --fix is passed; --platform filters native findings. Each run is recorded in Stim state so guide can say when doctor is due.").option("--json", "print the findings as JSON").option("--platform <platform>", "report shared findings plus only this native platform: ios or android", parseDoctorPlatform).option("--fix", "repair the sandbox allowance when the report names it, and stale Android .cxx configurations in this checkout. Stop native builds first. Generated CMake output must be ignored and untracked; custom launcher settings and source files are preserved.").action(async (opts) => {
 		const root = findProjectRoot(process.cwd());
 		if (!root) {
@@ -1360,8 +1403,9 @@ function doctorCommand(program, version, inspectVersions = inspectStimVersions)
 		}
 		const stim = await inspectVersions(version);
 		const findings = runDoctor(root, {
-			xcodeMajor: opts.platform === "android" ? null : detectXcodeMajor(),
-			platform: opts.platform
+			xcodeMajor: opts.platform !== "android" && host === "darwin" ? detectXcodeMajor() : null,
+			platform: opts.platform,
+			host
 		});
 		const parity = await detectFingerprintParity(root, { platform: opts.platform });
 		if (parity) findings.push(parity);

package/dist/{error-diagnostics-CTePWAzW.mjs → error-diagnostics-D1Kaf-eT.mjs}

@@ -1,19 +1,19 @@
-import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { D as withDirLock, F as deviceSlotPlatforms, P as deviceSlotKey, f as getProject } from "./config-DMP7L7H6.mjs";
-import { r as readWorkspaceState } from "./workspace-state-WVwWw_hB.mjs";
-import { d as readWorkspaceLaunches } from "./state-CnWzvCWP.mjs";
-import { n as deviceConsoleLevel } from "./ios-device-D3pzTKQE.mjs";
-import { i as resolveProjectMetro } from "./metro-ato6ef3J.mjs";
-import { n as parseLogcatLine, t as androidClockOffset } from "./android-BW8i_YxU.mjs";
-import { _ as launchErrorPreview } from "./command-output-BuIb_ZOI.mjs";
-import { n as androidHome } from "./android-DJWiTBkz.mjs";
-import { a as parseLease, n as fileLeaseIo, t as deviceLeasePath } from "./device-lease-r7yEQ1R8.mjs";
-import { l as readLogRecords, t as attachExpoErrorContext } from "./logs-query-Cdp5aaCH.mjs";
+import { t as getExecutor } from "./exec-B29XNuhP.mjs";
+import { D as withDirLock, F as deviceSlotKey, I as deviceSlotPlatforms, f as getProject } from "./config-B7iyKWkL.mjs";
+import { r as readWorkspaceState } from "./workspace-state-BT5E3SA2.mjs";
+import { d as readWorkspaceLaunches } from "./state-DZobzxLW.mjs";
+import { n as deviceConsoleLevel } from "./ios-device-CFXA46ez.mjs";
+import { a as resolveProjectMetro } from "./metro-C7bcJ0uo.mjs";
+import { r as androidHome, s as androidToolCwd } from "./android-DWssqHQ8.mjs";
+import { n as parseLogcatLine, t as androidClockOffset } from "./android-DeYdjjBP.mjs";
+import { _ as launchErrorPreview } from "./command-output-B3ycpsYv.mjs";
+import { a as parseLease, n as fileLeaseIo, t as deviceLeasePath } from "./device-lease-Ffz_M5t0.mjs";
+import { l as readLogRecords, t as attachExpoErrorContext } from "./logs-query-BGL-Pl12.mjs";
 import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, statSync, unlinkSync, writeFileSync } from "node:fs";
 import { createHash, randomUUID } from "node:crypto";
 import { basename, dirname, join, resolve, sep } from "node:path";
 import { homedir } from "node:os";
-//#region src/diagnostic-store.ts
+//#region src/diagnostics/diagnostic-store.ts
 /** Publishes an immutable diagnostic snapshot atomically; existing evidence wins. */
 function writeDiagnosticOnce(path, content) {
 	mkdirSync(dirname(path), { recursive: true });
@@ -34,7 +34,7 @@ function writeDiagnosticOnce(path, content) {
 	});
 }
 //#endregion
-//#region src/native-crash.ts
+//#region src/diagnostics/native-crash.ts
 const IOS_CRASH_REPORT_RETRY = "iOS crash reports can take about a minute or longer to appear. Run `stim logs --errors` again for the native stack.";
 /** Accepts only a report for this app, simulator and launch window. */
 function parseIosCrash(text, target) {
@@ -329,7 +329,10 @@ function captureNativeCrashes(target, logsDir) {
 				"time,epoch",
 				"-t",
 				"2000"
-			], { timeoutMs: 3e3 });
+			], {
+				timeoutMs: 3e3,
+				cwd: androidToolCwd()
+			});
 			const deadline = Date.now() + 4e3;
 			if (text) records = parseAndroidCrashes(text, target, offset).map((record) => symbolicateAndroid(record, target.root, deadline));
 		}
@@ -384,7 +387,10 @@ function captureWorkspaceCrashes(root, logsDir) {
 						"emu",
 						"avd",
 						"name"
-					], { timeoutMs: 2e3 })?.split("\n")[0]?.trim() !== configured.avdName) continue;
+					], {
+						timeoutMs: 2e3,
+						cwd: androidToolCwd()
+					})?.split("\n")[0]?.trim() !== configured.avdName) continue;
 				}
 			}
 			captureNativeCrashes({
@@ -402,7 +408,7 @@ function captureWorkspaceCrashes(root, logsDir) {
 	}
 }
 //#endregion
-//#region src/error-symbolication.ts
+//#region src/diagnostics/error-symbolication.ts
 const LOCATION = /https?:\/\/[^\s)'"\\]+?:\d+:\d+/g;
 function frameFromLocation(location) {
 	const match = /^(https?:\/\/.+):(\d+):(\d+)$/.exec(location);
@@ -490,7 +496,7 @@ async function symbolicateErrors(records, { port, timeoutMs = 2e3, request = fet
 	}
 }
 //#endregion
-//#region src/error-diagnostics.ts
+//#region src/diagnostics/error-diagnostics.ts
 function key(record) {
 	return createHash("sha256").update(JSON.stringify(record)).digest("hex");
 }

package/dist/{exec-CyylIdq9.mjs → exec-B29XNuhP.mjs}

@@ -1,4 +1,6 @@
-import { execFileSync, execSync, spawn } from "child_process";
+import { execSync } from "child_process";
+import spawn from "cross-spawn";
+import which from "which";
 //#region src/exec.ts
 const MAX_BUFFER = 67108864;
 let active = {
@@ -38,7 +40,14 @@ let active = {
 			for (const key of omitEnv ?? []) delete childEnv[key];
 			opts.env = childEnv;
 		}
-		return String(execFileSync(file, args, opts)).trim();
+		const result = spawn.sync(file, args, opts);
+		if (result.error) throw Object.assign(result.error, result);
+		if (result.status !== 0) {
+			const stderr = String(result.stderr ?? "");
+			const message = `Command failed: ${[file, ...args].join(" ")}${stderr ? `\n${stderr}` : ""}`;
+			throw Object.assign(new Error(message), result);
+		}
+		return String(result.stdout).trim();
 	},
 	runQuiet(cmd, opts) {
 		try {
@@ -56,6 +65,9 @@ let active = {
 	},
 	spawn(cmd, args = [], opts = {}) {
 		return spawn(cmd, args, opts);
+	},
+	findExecutable(name) {
+		return which.sync(name, { nothrow: true });
 	}
 };
 function getExecutor() {

package/dist/{gc-C20dWw_8.mjs → gc-CX0KRfLG.mjs}

@@ -1,25 +1,26 @@
-import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { A as isOnMountedVolume, C as withConfigLock, E as ownership_claim_exports, F as deviceSlotPlatforms, L as projectDeviceSlots, M as volumeRootFor, O as directorySize, f as getProject, g as loadConfig, i as clearDevice, j as listMountedVolumes, k as formatBytes, u as getConfigDir, v as removeProject } from "./config-DMP7L7H6.mjs";
-import { i as registeredCaches } from "./cache-manifest-uoOKhgUD.mjs";
-import { h as workspaceDir, y as workspaceStateFile } from "./workspace-state-WVwWw_hB.mjs";
-import { g as repoRoot, s as gitCommonDir } from "./worktree-DJnBbQZ9.mjs";
-import { a as findProjectRoot, i as detectIsExpo } from "./project-B_SDt4ip.mjs";
-import { m as shortUdid, o as formatLongDuration, u as plural } from "./command-output-BuIb_ZOI.mjs";
-import { B as listBuildLocks, S as listOrphanedAvdDirectories, T as ownedAvdDirectory, b as listAvds } from "./android-DJWiTBkz.mjs";
-import { A as resolveSettings, N as settingShapeErrors, a as SETTING_SHAPE_REMEDY } from "./settings-kO2ZqIKy.mjs";
-import { S as resolveEasCliBin, a as POOL_SETTING_REMEDY, i as teardownParkedIosSim, l as parkedMaxSetting, n as teardownOwnedIosSim, r as teardownParkedAvd, s as dropParked, t as teardownOwnedAvd, u as readParked } from "./teardown-CAVcWeRD.mjs";
-import { d as listIosDeviceTypes, g as parseRuntimeVersion, u as listAllIosSims } from "./ios-Deh5js5V.mjs";
-import { i as listLeaseFiles, r as leaseIsExpired, u as removeExpiredLease } from "./device-lease-r7yEQ1R8.mjs";
-import { n as listBuildSlots } from "./build-slots-CuPszJDu.mjs";
-import { C as verifyStoppedSession, S as stopSessionArgs, _ as inspectSessionForTeardown, d as withEasProjectLock, f as easMachineStateRoot, g as getSessionArgs, h as findOrphanedOwnedSessions, m as removeEasSessionClaim, p as readEasSessionLedger, u as withRemoteSessionLock, v as isDefinitiveMissingSessionError, x as parseSessionListPage, y as listOwnedSessionsArgs } from "./device-remote-BTUqbl0i.mjs";
-import { n as reclaimProject, t as describeDereferenced } from "./reclaim-C_rB25f4.mjs";
+import { t as getExecutor } from "./exec-B29XNuhP.mjs";
+import { A as isOnMountedVolume, C as withConfigLock, E as ownership_claim_exports, I as deviceSlotPlatforms, M as volumeRootFor, O as directorySize, R as projectDeviceSlots, f as getProject, g as loadConfig, i as clearDevice, j as listMountedVolumes, k as formatBytes, u as getConfigDir, v as removeProject } from "./config-B7iyKWkL.mjs";
+import { i as registeredCaches } from "./cache-manifest-CYJi8-Hx.mjs";
+import { h as workspaceDir, y as workspaceStateFile } from "./workspace-state-BT5E3SA2.mjs";
+import { g as repoRoot, s as gitCommonDir } from "./worktree-FG_ZKKdb.mjs";
+import { a as findProjectRoot, i as detectIsExpo } from "./project-DDZWf_16.mjs";
+import { A as resolveSettings, N as settingShapeErrors, a as SETTING_SHAPE_REMEDY } from "./settings-BXXorVM2.mjs";
+import { C as listAvds, O as ownedAvdDirectory, T as listOrphanedAvdDirectories } from "./android-DWssqHQ8.mjs";
+import { m as shortUdid, o as formatLongDuration, u as plural } from "./command-output-B3ycpsYv.mjs";
+import { r as listBuildLocks } from "./build-lock-CgtsB6TV.mjs";
+import { S as resolveEasCliBin, a as POOL_SETTING_REMEDY, i as teardownParkedIosSim, l as parkedMaxSetting, n as teardownOwnedIosSim, r as teardownParkedAvd, s as dropParked, t as teardownOwnedAvd, u as readParked } from "./teardown-5J5UXz2P.mjs";
+import { d as listIosDeviceTypes, g as parseRuntimeVersion, u as listAllIosSims } from "./ios-lEJ5pKsq.mjs";
+import { i as listLeaseFiles, r as leaseIsExpired, u as removeExpiredLease } from "./device-lease-Ffz_M5t0.mjs";
+import { n as listBuildSlots } from "./build-slots-C-oAHRT1.mjs";
+import { C as verifyStoppedSession, S as stopSessionArgs, _ as inspectSessionForTeardown, d as withEasProjectLock, f as easMachineStateRoot, g as getSessionArgs, h as findOrphanedOwnedSessions, m as removeEasSessionClaim, p as readEasSessionLedger, u as withRemoteSessionLock, v as isDefinitiveMissingSessionError, x as parseSessionListPage, y as listOwnedSessionsArgs } from "./device-remote-BprxZp-m.mjs";
+import { n as reclaimProject, t as describeDereferenced } from "./reclaim-D614jI6_.mjs";
 import { InvalidArgumentError } from "commander";
 import { existsSync, readFileSync, readdirSync, realpathSync, rmSync, statSync } from "fs";
 import { homedir, tmpdir } from "os";
 import { basename, dirname, isAbsolute, join, relative, resolve } from "path";
 import { METRO_NAMED_CACHE_LAYOUT } from "@stim-cli/core";
 import chalk from "chalk";
-//#region src/caches.ts
+//#region src/cache/caches.ts
 function xcodeDerivedDataRoot() {
 	return join(homedir(), "Library", "Developer", "Xcode", "DerivedData");
 }