stim 1.4.0 → 1.6.0

package/dist/{worktree-BvcAIMdJ.mjs → worktree-CCNPg_f0.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-6vdGngKa.mjs";
-import { b as unpushedCommits, c as hasRemote, d as isPodInstallChurn, f as listWorktrees, g as removeWorktree, h as readWorktreeExclude, i as depsOutOfSync, l as hasUncommittedWork, m as podsOutOfSync, n as cloneIgnoredEntries, o as dirtyPaths, p as locallyKnownUpstream, r as deleteBranch, s as gitCommonDir, t as branchExists, u as isMainWorkingTree, v as resolveFullRef, x as warmWorktreePaths, y as restoreFile } from "./worktree-DWNx4tUg.mjs";
-import { a as findProjectRoot } from "./project-CBFCwnN5.mjs";
-import { l as readRemoteSession, s as readMetroTunnel } from "./state-CDbvmZdt.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-DwfltIXQ.mjs";
-import { a as POOL_SETTING_REMEDY, l as parkedMaxSetting } from "./teardown-KsPpvldq.mjs";
-import { h as podInstallCommand, n as HEARTBEAT_INTERVAL_MS } from "./xcode-D9tVItl-.mjs";
-import { n as hasInstalledDependencies, r as installedNpmTreeIsValid, t as dependencyState } from "./dependency-state-BMirHEPD.mjs";
-import { c as withManagedTunnelRemovalLock, o as withManagedRemoteWorktreeRemovalLock } from "./ownership-C08Yzrp7.mjs";
-import { n as reclaimProject } from "./reclaim-DpDVo-AP.mjs";
-import { a as runPodInstall, i as runCaptured, n as podsAreStale, r as readPodState, t as DEPS_ERROR } from "./deps-Ck4wuTwa.mjs";
+import { A as resolveSettings, I as unknownSettingKeys, N as settingShapeErrors, a as SETTING_SHAPE_REMEDY } from "./settings-CGHTt5vb.mjs";
+import { a as POOL_SETTING_REMEDY, l as parkedMaxSetting } from "./teardown-sm1FwF6V.mjs";
+import { h as podInstallCommand, n as HEARTBEAT_INTERVAL_MS } from "./xcode-DUF7jrXj.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-WXTbXPX4.mjs";
+import { a as runPodInstall, i as runCaptured, n as podsAreStale, r as readPodState, t as DEPS_ERROR } from "./deps-C1zGnr61.mjs";
 import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { createHash, randomUUID } from "node:crypto";
 import { join, relative } from "node:path";
@@ -1237,7 +1237,19 @@ async function runRemove(target, opts = {}) {
 		process.exitCode = 1;
 		return;
 	}
-	if (isMainWorkingTree(entry.path)) {
+	if (entry.bare) {
+		console.error(chalk.red(`Refusing to remove ${path}: ${entry.path} is the bare repository, not a worktree.`));
+		console.error(chalk.dim("  Pass a worktree path, e.g. as printed by `git worktree list`."));
+		process.exitCode = 1;
+		return;
+	}
+	const source = sourceCheckoutOf(worktrees);
+	if ("refusal" in source) {
+		console.error(chalk.red(`Refusing to remove ${path}: ${source.refusal}`));
+		process.exitCode = 1;
+		return;
+	}
+	if (entry.path === source.path) {
 		if (entry.path !== path) console.error(chalk.dim(`${path} is inside the source checkout ${entry.path}; reclaiming its environment.`));
 		await reclaimEnvironment(entry.path, "it is the source checkout");
 		return;
@@ -1257,7 +1269,7 @@ async function runRemove(target, opts = {}) {
 	}
 	const deleteOwnedBranch = Boolean(ownsBranch && approvedBranchSha && inspection.unpushed?.length === 0);
 	const retainedBranchReason = !branch ? null : !ownsBranch ? "Stim did not create it" : inspection.unpushed === null ? "Stim could not verify whether it has unique commits" : inspection.unpushed.length > 0 ? `it has ${plural(inspection.unpushed.length, "unique commit")}` : null;
-	const branchDeleteCwd = worktrees.find((candidate) => isMainWorkingTree(candidate.path))?.path;
+	const branchDeleteCwd = source.path;
 	await withManagedRemoteWorktreeRemovalLock(path, () => withReclaimLocks(path, async (lockedKeys) => {
 		const result = await reclaimAll(path, lockedKeys, { preserveRootProject: true });
 		if (result.keptEntries.length) {
@@ -1289,13 +1301,6 @@ async function runRemove(target, opts = {}) {
 				worktreeRemovalComplete: true,
 				worktreePendingBranchSha: approvedBranchSha
 			});
-			if (!branchDeleteCwd) {
-				console.error(chalk.yellow(phaseLine("branch", `kept ${branch} (Stim could not find the source checkout)`)));
-				console.error(chalk.dim(`  Retry with: stim worktree remove ${path}`));
-				process.exitCode = 1;
-				finish();
-				return;
-			}
 			const checkedOutAt = listWorktrees(branchDeleteCwd).find((candidate) => candidate.branch === branch && resolve$1(candidate.path) !== resolve$1(path))?.path;
 			if (checkedOutAt) {
 				console.error(chalk.yellow(phaseLine("branch", `kept ${branch} (it is checked out at ${checkedOutAt})`)));

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

@@ -1,5 +1,5 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { g as loadConfig, u as getConfigDir } from "./config-6vdGngKa.mjs";
+import { g as loadConfig, u as getConfigDir } from "./config-DMP7L7H6.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";
@@ -103,19 +103,6 @@ function gitCommonDir(cwd) {
 	]);
 	return out ? out.trim() : null;
 }
-function isMainWorkingTree(path) {
-	const out = getExecutor().runFileQuiet("git", [
-		"-C",
-		path,
-		"rev-parse",
-		"--path-format=absolute",
-		"--git-dir",
-		"--git-common-dir"
-	]);
-	if (!out) return false;
-	const [gitDir, commonDir] = out.trim().split("\n").map((line) => line.trim());
-	return Boolean(gitDir) && gitDir === commonDir;
-}
 function repoRoot(cwd) {
 	const out = getExecutor().runFileQuiet("git", [
 		"-C",
@@ -159,16 +146,15 @@ function warmWorktreePaths(cwd) {
 	const currentRoot = repoRoot(cwd);
 	if (!currentRoot) throw new Error("Not a git repository.");
 	const target = realpathSync$1(currentRoot);
-	if (isMainWorkingTree(target)) throw new Error("Run stim worktree warm from a linked worktree, not the source checkout.");
-	const entries = listWorktrees(target);
-	const current = entries.find((entry) => canonicalPath(entry.path) === target);
-	const main = entries.find((entry) => isMainWorkingTree(entry.path));
-	if (!current || !main) throw new Error("Could not identify the linked worktree and its source checkout.");
-	const root = realpathSync$1(main.path);
+	const source = resolveSourceCheckout(target);
+	if ("refusal" in source) throw new Error(source.refusal);
+	if (!source.entries.find((entry) => canonicalPath(entry.path) === target)) throw new Error("Could not identify the linked worktree and its source checkout.");
+	const root = realpathSync$1(source.path);
+	if (root === target) throw new Error("Run stim worktree warm from a linked worktree, not the source checkout.");
 	const sourceRoot = repoRoot(root);
 	const sourceCommon = gitCommonDir(root);
 	const targetCommon = gitCommonDir(target);
-	if (root === target || !sourceRoot || realpathSync$1(sourceRoot) !== root || !sourceCommon || !targetCommon || realpathSync$1(sourceCommon) !== realpathSync$1(targetCommon)) throw new Error("Could not verify that the source checkout belongs to this linked worktree.");
+	if (!sourceRoot || realpathSync$1(sourceRoot) !== root || !sourceCommon || !targetCommon || realpathSync$1(sourceCommon) !== realpathSync$1(targetCommon)) throw new Error("Could not verify that the source checkout belongs to this linked worktree.");
 	return {
 		root,
 		target,
@@ -556,6 +542,7 @@ function parseWorktrees(out) {
 		current = { path: 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;
 	if (current.path) entries.push(current);
 	return entries;
 }
@@ -569,5 +556,45 @@ function listWorktrees(cwd) {
 	]);
 	return out ? parseWorktrees(out) : [];
 }
+function selectSourceCheckout(entries, bareHead) {
+	const first = entries[0];
+	if (!first) return { refusal: "Git lists no worktrees for this repository." };
+	if (!first.bare) return { path: first.path };
+	const bare = first.path;
+	const checkouts = entries.filter((entry) => !entry.bare && !entry.prunable);
+	const listed = checkouts.map((entry) => `${entry.branch ?? "detached"} (${entry.path})`).join(", ") || "none";
+	const pointHead = `  git -C ${bare} symbolic-ref HEAD refs/heads/<branch>`;
+	if (!bareHead) return { refusal: `The bare repository at ${bare} has a detached HEAD, so Stim cannot tell which worktree is the source checkout. Point HEAD at the source branch, then retry:\n${pointHead}\nChecked-out branches: ${listed}` };
+	const matches = checkouts.filter((entry) => entry.branch === bareHead);
+	const [only] = matches;
+	if (only && matches.length === 1) return { path: only.path };
+	if (!only) {
+		const stale = entries.find((entry) => entry.prunable && entry.branch === bareHead);
+		const beside = checkouts[0] ? dirname$1(checkouts[0].path) : bare;
+		return { refusal: `The bare repository at ${bare} points HEAD at ${bareHead}, but no worktree has ${bareHead} checked out, so Stim has no source checkout to copy from. ${stale ? `Its worktree at ${stale.path} is missing. Recreate it, then retry:\n  git -C ${bare} worktree prune\n  git -C ${bare} worktree add ${stale.path} ${bareHead}\n` : `Create one, then retry:\n  git -C ${bare} worktree add ${join$1(beside, bareHead)} ${bareHead}\n`}Or point HEAD at a branch that is checked out (${listed}):\n${pointHead}` };
+	}
+	return { refusal: `The bare repository at ${bare} points HEAD at ${bareHead}, which is checked out in more than one worktree: ${matches.map((entry) => entry.path).join(", ")}. Remove the extra worktrees, or point HEAD at a branch checked out once, then retry:\n${pointHead}` };
+}
+function bareHeadBranch(bare) {
+	const out = getExecutor().runFileQuiet("git", [
+		"-C",
+		bare,
+		"symbolic-ref",
+		"--quiet",
+		"HEAD"
+	])?.trim();
+	return out?.startsWith("refs/heads/") ? out.slice(11) : null;
+}
+function sourceCheckoutOf(entries) {
+	const first = entries[0];
+	return selectSourceCheckout(entries, first?.bare ? bareHeadBranch(first.path) : null);
+}
+function resolveSourceCheckout(cwd) {
+	const entries = listWorktrees(cwd);
+	return {
+		entries,
+		...sourceCheckoutOf(entries)
+	};
+}
 //#endregion
-export { makeTemporaryDirectory as C, filesystemDevice as S, temporaryRoot as T, repoRoot as _, dirtyFingerprintFiles as a, unpushedCommits as b, hasRemote as c, isPodInstallChurn as d, listWorktrees as f, removeWorktree as g, readWorktreeExclude as h, depsOutOfSync as i, hasUncommittedWork as l, podsOutOfSync as m, cloneIgnoredEntries as n, dirtyPaths as o, locallyKnownUpstream as p, deleteBranch as r, gitCommonDir as s, branchExists as t, isMainWorkingTree as u, resolveFullRef as v, removeTemporaryEntry as w, warmWorktreePaths as x, restoreFile as y };
+export { filesystemDevice as C, temporaryRoot as E, warmWorktreePaths as S, removeTemporaryEntry as T, resolveFullRef as _, dirtyFingerprintFiles as a, sourceCheckoutOf as b, hasRemote as c, listWorktrees as d, locallyKnownUpstream as f, repoRoot as g, removeWorktree as h, depsOutOfSync as i, hasUncommittedWork as l, readWorktreeExclude as m, cloneIgnoredEntries as n, dirtyPaths as o, podsOutOfSync as p, deleteBranch as r, gitCommonDir as s, branchExists as t, isPodInstallChurn as u, resolveSourceCheckout as v, makeTemporaryDirectory as w, unpushedCommits as x, restoreFile as y };

package/dist/{xcode-D9tVItl-.mjs → xcode-DUF7jrXj.mjs}

@@ -1,10 +1,11 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { r as register } from "./cache-manifest-D02TpYjA.mjs";
-import { d as sharedCompilationCache, m as workspaceDerivedData } from "./workspace-state-Do1e2mOH.mjs";
+import { r as register } from "./cache-manifest-uoOKhgUD.mjs";
+import { d as sharedCompilationCache, m as workspaceDerivedData } from "./workspace-state-WVwWw_hB.mjs";
+import { l as resolvePackageJson } from "./project-B_SDt4ip.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-DwfltIXQ.mjs";
-import { t as cleanLine } from "./server-expo-D4P7iTvf.mjs";
+import { U as resolveOptimizations } from "./settings-CGHTt5vb.mjs";
+import { t as cleanLine } from "./server-expo-CX-zkgWl.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.4.0",
+  "version": "1.6.0",
   "description": "Stim: fast, isolated React Native environments for coding agents",
   "keywords": [
     "agent",
@@ -42,15 +42,15 @@
   },
   "dependencies": {
     "@expo/fingerprint": "^0.20.10",
-    "@stim-cli/cache": "^1.4.0",
-    "@stim-cli/core": "^1.4.0",
-    "@stim-cli/metro": "^1.4.0",
+    "@stim-cli/cache": "^1.6.0",
+    "@stim-cli/core": "^1.6.0",
+    "@stim-cli/metro": "^1.6.0",
     "chalk": "^5.4.1",
     "commander": "^13.1.0",
     "ws": "^8.21.3"
   },
   "devDependencies": {
-    "@stim-cli/expo-build-cache": "1.4.0",
+    "@stim-cli/expo-build-cache": "1.6.0",
     "@types/ws": "^8.18.1",
     "unique-pid": "0.1.1"
   },

package/shim/expo-metro-config.cjs

@@ -6,7 +6,6 @@ const path = require('node:path');
 const { createRequire } = require('node:module');
 const { pathToFileURL } = require('node:url');
 const { bundleResponseMiddleware } = require('./bundle-response.cjs');
-const { applyMetroCacheGeneration } = require('./metro-cache-generation.cjs');
 
 const projectRoot = process.env.STIM_PROJECT_ROOT;
 const storeRoot = process.env.STIM_METRO_STORE;
@@ -125,24 +124,19 @@ function appendStore(config, defaultConfig) {
   const server = { ...defaultConfig.server, ...output.server };
   const enhanceMiddleware = server.enhanceMiddleware;
 
-  const observed = applyMetroCacheGeneration(
-    {
-      ...output,
-      cacheVersion: output.cacheVersion ?? defaultConfig.cacheVersion,
-      server: {
-        ...server,
-        enhanceMiddleware(middleware, metroServer) {
-          const enhanced = enhanceMiddleware ? enhanceMiddleware(middleware, metroServer) : middleware;
-          const observe = bundleResponseMiddleware((record) =>
-            process.stderr.write(`stim-bundle-response: ${JSON.stringify(record)}\n`),
-          );
-          return (req, res, next) => observe(req, res, () => enhanced(req, res, next));
-        },
+  const observed = {
+    ...output,
+    server: {
+      ...server,
+      enhanceMiddleware(middleware, metroServer) {
+        const enhanced = enhanceMiddleware ? enhanceMiddleware(middleware, metroServer) : middleware;
+        const observe = bundleResponseMiddleware((record) =>
+          process.stderr.write(`stim-bundle-response: ${JSON.stringify(record)}\n`),
+        );
+        return (req, res, next) => observe(req, res, () => enhanced(req, res, next));
       },
     },
-    process.env.STIM_METRO_CACHE_GENERATION,
-    process.env.STIM_METRO_FILE_MAP,
-  );
+  };
   if (!storeRoot) return observed;
   return {
     ...observed,

package/dist/server-expo-Dho5Raiw.mjs

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

package/shim/metro-cache-generation.cjs

@@ -1,20 +0,0 @@
-'use strict';
-
-const { createHash } = require('node:crypto');
-const { mkdirSync } = require('node:fs');
-const { join } = require('node:path');
-
-function applyMetroCacheGeneration(config, generation, directory) {
-  if (!generation) return config;
-  const fileMapCacheDirectory = join(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 };

package/shim/metro-cache-generation.d.cts

@@ -1,5 +0,0 @@
-export function applyMetroCacheGeneration<T extends { cacheVersion?: string }>(
-  config: T,
-  generation: string | undefined,
-  directory: string,
-): T;