stim 1.5.0 → 1.7.0

package/dist/{xcode-BqDeRkpT.mjs → xcode-B6YaWeg0.mjs}

@@ -1,10 +1,11 @@
-import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { r as register } from "./cache-manifest-uoOKhgUD.mjs";
-import { d as sharedCompilationCache, m as workspaceDerivedData } from "./workspace-state-WVwWw_hB.mjs";
-import { t as createLineReader } from "./process-output-C7IlIzd7.mjs";
-import { a as formatElapsed, l as phaseLine } from "./command-output-BuIb_ZOI.mjs";
-import { U as resolveOptimizations } from "./settings-kO2ZqIKy.mjs";
-import { t as cleanLine } from "./server-expo-Ds8_mfng.mjs";
+import { t as getExecutor } from "./exec-B29XNuhP.mjs";
+import { r as register } from "./cache-manifest-CYJi8-Hx.mjs";
+import { d as sharedCompilationCache, m as workspaceDerivedData } from "./workspace-state-BT5E3SA2.mjs";
+import { l as resolvePackageJson } from "./project-DDZWf_16.mjs";
+import { t as createLineReader } from "./process-output-Dl5uKE03.mjs";
+import { U as resolveOptimizations } from "./settings-BXXorVM2.mjs";
+import { a as formatElapsed, l as phaseLine } from "./command-output-B3ycpsYv.mjs";
+import { t as cleanLine } from "./server-expo-BVAA1OqJ.mjs";
 import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { createHash } from "node:crypto";
 import { basename, isAbsolute, join, relative, resolve, sep } from "node:path";
@@ -332,18 +333,73 @@ function readPodfileProperties(root) {
 		return null;
 	}
 }
-function compilationCacheSettings({ workspaceRoot, derivedDataPath, casPath, xcodeMajor, ccache = false, optimizations = resolveOptimizations({}, {}).ios }) {
+const SWIFT_PREFIX_MAPPING_MIN_SWIFT = {
+	major: 6,
+	minor: 4
+};
+function swiftPrefixMappingSupported(version) {
+	if (!version) return false;
+	const min = SWIFT_PREFIX_MAPPING_MIN_SWIFT;
+	return version.major > min.major || version.major === min.major && version.minor >= min.minor;
+}
+const SWIFT_CACHE_MIN_REACT_NATIVE = {
+	major: 0,
+	minor: 87
+};
+function reactNativeSupportsSwiftCache(version) {
+	if (!version) return false;
+	const min = SWIFT_CACHE_MIN_REACT_NATIVE;
+	return version.major > min.major || version.major === min.major && version.minor >= min.minor;
+}
+function parseReactNativeVersion(packageJson) {
+	if (!packageJson || typeof packageJson !== "object") return null;
+	const raw = packageJson.version;
+	const m = typeof raw === "string" ? /^(\d+)\.(\d+)\./.exec(raw) : null;
+	if (!m || m[1] === void 0 || m[2] === void 0) return null;
+	return {
+		major: parseInt(m[1], 10),
+		minor: parseInt(m[2], 10)
+	};
+}
+function detectReactNativeVersion(root) {
+	const file = resolvePackageJson(root, "react-native");
+	if (!file) return null;
+	try {
+		return parseReactNativeVersion(JSON.parse(readFileSync(file, "utf-8")));
+	} catch {
+		return null;
+	}
+}
+function compilationCacheSettings({ workspaceRoot, derivedDataPath, casPath, xcodeMajor, swiftVersion = null, reactNativeVersion = null, ccache = false, optimizations = resolveOptimizations({}, {}).ios }) {
 	if (xcodeMajor === null || xcodeMajor === void 0) return [];
 	if (xcodeMajor < 26) return [];
 	if (ccache) return [];
+	const swiftMappable = swiftPrefixMappingSupported(swiftVersion);
+	const auto = swiftMappable && reactNativeSupportsSwiftCache(reactNativeVersion);
+	const swift = optimizations.compilationCache && (optimizations.swiftCompilationCache ?? auto);
+	const mappings = optimizations.prefixMapping ? compilationPrefixMappings(workspaceRoot, derivedDataPath) : "";
 	return [
 		`COMPILATION_CACHE_ENABLE_CACHING=${optimizations.compilationCache ? "YES" : "NO"}`,
 		`COMPILATION_CACHE_CAS_PATH=${casPath}`,
-		`SWIFT_ENABLE_COMPILE_CACHE=${optimizations.compilationCache && optimizations.swiftCompilationCache ? "YES" : "NO"}`,
+		`SWIFT_ENABLE_COMPILE_CACHE=${swift ? "YES" : "NO"}`,
 		`CLANG_ENABLE_PREFIX_MAPPING=${optimizations.prefixMapping ? "YES" : "NO"}`,
-		`CLANG_OTHER_PREFIX_MAPPINGS=${optimizations.prefixMapping ? compilationPrefixMappings(workspaceRoot, derivedDataPath) : ""}`
+		`CLANG_OTHER_PREFIX_MAPPINGS=${mappings}`,
+		...swift && swiftMappable && optimizations.prefixMapping ? ["SWIFT_ENABLE_PREFIX_MAPPING=YES", `SWIFT_OTHER_PREFIX_MAPPINGS=${mappings}`] : ["SWIFT_ENABLE_PREFIX_MAPPING=NO"]
 	];
 }
+function parseSwiftVersion(output) {
+	const m = /\bSwift version (\d+)\.(\d+)/.exec(String(output || ""));
+	if (!m || m[1] === void 0 || m[2] === void 0) return null;
+	const major = parseInt(m[1], 10);
+	const minor = parseInt(m[2], 10);
+	return Number.isFinite(major) && Number.isFinite(minor) ? {
+		major,
+		minor
+	} : null;
+}
+function detectSwiftVersion(exec = null) {
+	return parseSwiftVersion((exec || getExecutor()).runQuiet("xcrun swift --version", { timeoutMs: 1e4 }));
+}
 function parseXcodeMajor(output) {
 	const m = /^Xcode\s+(\d+)/m.exec(String(output || ""));
 	if (!m) return null;
@@ -356,12 +412,19 @@ function detectXcodeMajor(exec = null) {
 	return parseXcodeMajor((exec || getExecutor()).runQuiet("xcodebuild -version", { timeoutMs: 1e4 }));
 }
 function resolveCompilationCacheSettings({ root, derivedDataPath, exec = null, casPath = sharedCompilationCache(), optimizations = resolveOptimizations({}, {}).ios, onNote = (line) => console.error(line) }) {
+	const xcodeMajor = detectXcodeMajor(exec);
+	const ccache = ccacheEnabled(readPodfileProperties(root));
+	const probe = xcodeMajor !== null && xcodeMajor >= 26 && !ccache && optimizations.compilationCache && optimizations.swiftCompilationCache !== false;
+	const swiftVersion = probe ? detectSwiftVersion(exec) : null;
+	const reactNativeVersion = probe ? detectReactNativeVersion(root) : null;
 	const settings = compilationCacheSettings({
 		workspaceRoot: root,
 		derivedDataPath,
 		casPath,
-		xcodeMajor: detectXcodeMajor(exec),
-		ccache: ccacheEnabled(readPodfileProperties(root)),
+		xcodeMajor,
+		swiftVersion,
+		reactNativeVersion,
+		ccache,
 		optimizations
 	});
 	if (settings.length > 0 && optimizations.compilationCache) {
@@ -371,7 +434,8 @@ function resolveCompilationCacheSettings({ root, derivedDataPath, exec = null, c
 			prune: "atomic",
 			note: "shared Xcode compilation cache"
 		});
-		onNote(chalk.dim(phaseLine("cache", `compilation cache on (CAS at ${casPath})`)));
+		const swift = settings.includes("SWIFT_ENABLE_COMPILE_CACHE=YES") ? settings.includes("SWIFT_ENABLE_PREFIX_MAPPING=YES") ? "Swift on" : "Swift on, unmapped" : swiftVersion && !swiftPrefixMappingSupported(swiftVersion) ? `Swift off, ${swiftVersion.major}.${swiftVersion.minor} < ${SWIFT_PREFIX_MAPPING_MIN_SWIFT.major}.${SWIFT_PREFIX_MAPPING_MIN_SWIFT.minor}` : swiftVersion && reactNativeVersion && !reactNativeSupportsSwiftCache(reactNativeVersion) ? `Swift off, react-native ${reactNativeVersion.major}.${reactNativeVersion.minor} < ${SWIFT_CACHE_MIN_REACT_NATIVE.major}.${SWIFT_CACHE_MIN_REACT_NATIVE.minor}` : "Swift off";
+		onNote(chalk.dim(phaseLine("cache", `compilation cache on (CAS at ${casPath}, ${swift})`)));
 	}
 	return settings;
 }
@@ -567,8 +631,12 @@ function parseCompilationCacheActivity(line) {
 		hitRatePercent: Number(match[3])
 	};
 }
+const SWIFT_CACHING_NEEDS_EXPLICIT_MODULES = /warning: swift compiler caching requires explicit module build/;
 function compilationCacheActivityLine(activity) {
-	if (activity.status === "reported") return `${activity.hits}/${activity.cacheableTasks} hits (${activity.hitRatePercent}%)`;
+	if (activity.status === "reported") {
+		const swift = activity.swiftTargetsWithoutExplicitModules ? `; Swift excluded: ${activity.swiftTargetsWithoutExplicitModules} targets build without explicit modules (SWIFT_ENABLE_EXPLICIT_MODULES=NO)` : "";
+		return `${activity.hits}/${activity.cacheableTasks} hits (${activity.hitRatePercent}%)${swift}`;
+	}
 	if (activity.status === "not-run") return "not run; artifact cache supplied the app";
 	return "unavailable; Xcode did not report reliable statistics";
 }
@@ -648,6 +716,7 @@ async function buildIos({ root, udid = null, logWriter, project = null, scheme =
 	});
 	const transcript = [];
 	let compilationCacheActivity = COMPILATION_CACHE_UNAVAILABLE;
+	let swiftTargetsWithoutExplicitModules = 0;
 	const onLine = (line) => {
 		const msg = cleanLine(line);
 		transcript.push(msg);
@@ -657,8 +726,13 @@ async function buildIos({ root, udid = null, logWriter, project = null, scheme =
 			level: "debug",
 			msg
 		});
-		const activity = parseCompilationCacheActivity(msg);
-		if (activity) {
+		if (SWIFT_CACHING_NEEDS_EXPLICIT_MODULES.test(msg)) swiftTargetsWithoutExplicitModules += 1;
+		const parsed = parseCompilationCacheActivity(msg);
+		if (parsed) {
+			const activity = swiftTargetsWithoutExplicitModules ? {
+				...parsed,
+				swiftTargetsWithoutExplicitModules
+			} : parsed;
 			compilationCacheActivity = activity;
 			logWriter.write({
 				src: "build",
@@ -667,7 +741,8 @@ async function buildIos({ root, udid = null, logWriter, project = null, scheme =
 				event: "compilation_cache",
 				hits: activity.hits,
 				cacheableTasks: activity.cacheableTasks,
-				hitRatePercent: activity.hitRatePercent
+				hitRatePercent: activity.hitRatePercent,
+				...swiftTargetsWithoutExplicitModules ? { swiftTargetsWithoutExplicitModules } : {}
 			});
 		}
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stim",
-  "version": "1.5.0",
+  "version": "1.7.0",
   "description": "Stim: fast, isolated React Native environments for coding agents",
   "keywords": [
     "agent",
@@ -42,20 +42,24 @@
   },
   "dependencies": {
     "@expo/fingerprint": "^0.20.10",
-    "@stim-cli/cache": "^1.5.0",
-    "@stim-cli/core": "^1.5.0",
-    "@stim-cli/metro": "^1.5.0",
-    "chalk": "^5.4.1",
-    "commander": "^13.1.0",
+    "@stim-cli/cache": "^1.7.0",
+    "@stim-cli/core": "^1.7.0",
+    "@stim-cli/metro": "^1.7.0",
+    "chalk": "^6.0.0",
+    "commander": "^15.0.0",
+    "cross-spawn": "^7.0.6",
+    "which": "^5.0.0",
     "ws": "^8.21.3"
   },
   "devDependencies": {
-    "@stim-cli/expo-build-cache": "1.5.0",
+    "@stim-cli/expo-build-cache": "1.7.0",
+    "@types/cross-spawn": "^6.0.6",
+    "@types/which": "^3.0.4",
     "@types/ws": "^8.18.1",
     "unique-pid": "0.1.1"
   },
   "engines": {
-    "node": "^20.19.4 || >=22.12.0"
+    "node": ">=22.12.0"
   },
   "scripts": {
     "test": "node --test test/*.test.js",

package/shim/android-optimizations.gradle

@@ -7,6 +7,12 @@ gradle.beforeProject { project ->
                 def profile = System.getenv("STIM_ANDROID_NATIVE_PROFILE")
                 def staging = android.externalNativeBuild.cmake.buildStagingDirectory ?: new File(project.projectDir, ".cxx")
                 android.externalNativeBuild.cmake.buildStagingDirectory = new File(staging, "stim-" + profile)
+                // Windows caps a path at 260 characters and the SDK's ninja is not long-path aware, so the
+                // staging directory added above has to buy its room back: CMake replaces the mangled absolute
+                // source directory in an over-long object path with a hash of it.
+                if (System.getProperty("os.name").toLowerCase().startsWith("windows")) {
+                    android.defaultConfig.externalNativeBuild.cmake.arguments.add("-DCMAKE_OBJECT_PATH_MAX=240")
+                }
                 def configs = [android.defaultConfig] + android.buildTypes.toList() + android.productFlavors.toList()
                 def pch = System.getenv("STIM_ANDROID_PCH")
                 def ccache = System.getenv("STIM_ANDROID_CCACHE")

package/dist/metro-ato6ef3J.mjs

@@ -1,99 +0,0 @@
-import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { w as process_identity_exports } from "./config-DMP7L7H6.mjs";
-import { r as readWorkspaceState } from "./workspace-state-WVwWw_hB.mjs";
-import { t as isMetroRunning } from "./ports-BZprTJRa.mjs";
-import { readlinkSync, realpathSync } from "fs";
-import { sep } from "path";
-//#region src/metro.ts
-/**
-* True when some process with this pid exists right now. It cannot tell a recycled pid from the
-* process that first held it, so it is only valid for a pid this run spawned and still holds a
-* handle on. For a pid read from a record on disk, decide with `inspectProcessIdentity` on that
-* record's process token, or take an ownership claim (`ownership-claim.ts`): this answer would keep
-* a dead holder's record looking live until some unrelated process exits.
-*/
-function pidExists(pid) {
-	if (!Number.isSafeInteger(pid) || pid <= 0) return false;
-	try {
-		process.kill(pid, 0);
-		return true;
-	} catch (error) {
-		return error.code !== "ESRCH";
-	}
-}
-function parseLsofPids(out) {
-	if (!out) return [];
-	return String(out).split("\n").map((s) => parseInt(s.trim(), 10)).filter((n) => Number.isFinite(n));
-}
-function parseLsofCwd(out) {
-	if (!out) return null;
-	const lines = String(out).split("\n");
-	const idx = lines.findIndex((l) => l === "fcwd");
-	if (idx === -1) return null;
-	const nLine = lines.slice(idx + 1).find((l) => l.startsWith("n"));
-	return nLine ? nLine.slice(1) : null;
-}
-function processCwd(pid) {
-	if (process.platform === "linux") try {
-		return readlinkSync(`/proc/${pid}/cwd`);
-	} catch {}
-	return parseLsofCwd(getExecutor().runQuiet(`lsof -a -p ${pid} -d cwd -Fn`));
-}
-function canonicalPath(path) {
-	try {
-		return realpathSync(path);
-	} catch {
-		return path;
-	}
-}
-function isInsideProject(cwd, projectPath) {
-	if (!cwd || !projectPath) return false;
-	const a = canonicalPath(cwd);
-	const b = canonicalPath(projectPath);
-	return a === b || a.startsWith(b.endsWith(sep) ? b : b + sep);
-}
-const NOT_OURS_UNRESPONSIVE = "unresponsive";
-const NOT_OURS_UNREADABLE_CWD = "unreadable-cwd";
-const NOT_OURS_FOREIGN_CWD = "foreign-cwd";
-async function resolveProjectMetro(port, projectPath, { probe = isMetroRunning } = {}) {
-	const pid = parseLsofPids(getExecutor().runQuiet(`lsof -nP -iTCP:${port} -sTCP:LISTEN -t`))[0];
-	if (pid === void 0) return { missing: true };
-	if (!await probe(port)) return {
-		notOurs: `pid ${pid} on port ${port} does not answer Metro's /status`,
-		kind: NOT_OURS_UNRESPONSIVE,
-		pid
-	};
-	const cwd = processCwd(pid);
-	if (!cwd) return {
-		notOurs: `pid ${pid} on port ${port}: working directory could not be read`,
-		kind: NOT_OURS_UNREADABLE_CWD,
-		pid
-	};
-	if (!isInsideProject(cwd, projectPath)) return {
-		notOurs: `pid ${pid} on port ${port} runs from ${cwd}, outside ${projectPath}`,
-		kind: NOT_OURS_FOREIGN_CWD,
-		pid
-	};
-	const supervisor = readWorkspaceState(canonicalPath(projectPath))?.supervisor;
-	const owned = supervisor?.port === port && (0, process_identity_exports.inspectProcessIdentity)(supervisor) === "same";
-	return { metro: {
-		pid,
-		leader: owned ? supervisor.pid : pid,
-		cwd,
-		...owned ? { processToken: supervisor.processToken } : {}
-	} };
-}
-function killMetroTree(leader, processToken) {
-	if (!leader || leader === process.pid || (0, process_identity_exports.inspectProcessIdentity)({
-		pid: leader,
-		processToken
-	}) !== "same") return false;
-	try {
-		process.kill(-leader, "SIGTERM");
-		return true;
-	} catch {
-		return false;
-	}
-}
-//#endregion
-export { resolveProjectMetro as i, killMetroTree as n, pidExists as r, NOT_OURS_FOREIGN_CWD as t };

package/dist/ports-BZprTJRa.mjs

@@ -1,90 +0,0 @@
-import { A as isOnMountedVolume, g as loadConfig, j as listMountedVolumes, n as allMetroPorts, r as claimMetroPort, v as removeProject } from "./config-DMP7L7H6.mjs";
-import { existsSync } from "fs";
-import { request } from "http";
-import { connect } from "net";
-//#region src/ports.ts
-function isMetroRunning(port) {
-	return new Promise((resolve) => {
-		const req = request({
-			hostname: "localhost",
-			port,
-			path: "/status",
-			timeout: 2e3
-		}, (res) => {
-			let data = "";
-			res.on("data", (chunk) => {
-				data += chunk;
-			});
-			res.on("end", () => resolve(data.includes("packager-status:running")));
-		});
-		req.on("error", () => resolve(false));
-		req.on("timeout", () => {
-			req.destroy();
-			resolve(false);
-		});
-		req.end();
-	});
-}
-function isPortFree(port, { timeoutMs = 400 } = {}) {
-	return new Promise((resolve) => {
-		const sock = connect({
-			port,
-			host: "127.0.0.1"
-		});
-		const done = (free) => {
-			sock.removeAllListeners();
-			sock.destroy();
-			resolve(free);
-		};
-		sock.setTimeout(timeoutMs);
-		sock.once("connect", () => done(false));
-		sock.once("error", () => done(true));
-		sock.once("timeout", () => done(false));
-	});
-}
-const FIRST_PORT = 8082;
-async function computeNextPort(isFree = isPortFree) {
-	const taken = new Set(allMetroPorts());
-	for (let port = FIRST_PORT; port < 8282; port++) {
-		if (taken.has(port)) continue;
-		if (await isFree(port)) return port;
-	}
-	throw new Error(`Found no free Metro port between ${FIRST_PORT} and 8281. Free one up, or stop a stale bundler (\`stim status\`, \`stim stop <port>\`).`);
-}
-async function findReclaimablePort(excludeProjectPath, probe = isMetroRunning, { isMounted = isOnMountedVolume, mountedVolumes } = {}) {
-	const cfg = loadConfig();
-	if (!cfg?.projects) return null;
-	const mounted = mountedVolumes || listMountedVolumes();
-	const candidates = [];
-	for (const [path, proj] of Object.entries(cfg.projects)) {
-		if (path === excludeProjectPath) continue;
-		if (Object.keys(proj.ports ?? {}).length) continue;
-		if (existsSync(path)) continue;
-		if (!isMounted(path, mounted)) continue;
-		if (typeof proj.metroPort === "number") candidates.push({
-			port: proj.metroPort,
-			ownerPath: path
-		});
-	}
-	for (const c of candidates) if (!await probe(c.port)) return c;
-	return null;
-}
-async function allocatePort(projectPath, probe = isMetroRunning, isFree = isPortFree) {
-	const reclaim = await findReclaimablePort(projectPath, probe);
-	if (reclaim && await isFree(reclaim.port)) {
-		removeProject(reclaim.ownerPath);
-		return reclaim.port;
-	}
-	return computeNextPort(isFree);
-}
-const RESERVE_ATTEMPTS = 5;
-async function reserveMetroPort(projectPath, probe = isMetroRunning, isFree = isPortFree) {
-	for (let attempt = 0; attempt < RESERVE_ATTEMPTS; attempt++) {
-		const port = await allocatePort(projectPath, probe, isFree);
-		const claimed = claimMetroPort(projectPath, port);
-		if (claimed !== null) return claimed;
-	}
-	throw new Error(`Could not reserve a Metro port after ${RESERVE_ATTEMPTS} attempts: another Stim run claimed each one first. Retry.`);
-}
-//#endregion
-export { isPortFree as n, reserveMetroPort as r, isMetroRunning as t };

package/dist/server-expo-CSwUVYOa.mjs

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