stim 1.20.2 → 1.21.0

package/dist/prebuild-uD_ipCxF.mjs

@@ -0,0 +1,449 @@
+import { s as spawnDeclared, t as getExecutor } from "./exec-_UbtCQcG.mjs";
+import { i as sharedBuildCache } from "./paths-DQtTgsBf.mjs";
+import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
+import { o as updateWorkspaceState, r as readWorkspaceState$1 } from "./workspace-state-Cjuigeeu.mjs";
+import { bt as gitCommonDirOnDisk } from "./settings-CsJDEXgK.mjs";
+import { t as git } from "./git-C3iTsJaZ.mjs";
+import { v as detectIsExpo } from "./project-BZNjmW_8.mjs";
+import { Zn as remoteCliInvocation } from "./budget-Bs6SxxzO.mjs";
+import { a as diffFingerprintSources, v as storedSources } from "./build-cache-DmyR9Zzc.mjs";
+import { i as expoBinRefusal, r as expoBinPath } from "./server-expo-DT_F_uVI.mjs";
+import { existsSync, realpathSync } from "node:fs";
+import { dirname, join, relative } from "node:path";
+import { ambientContext } from "@stim-cli/core";
+import { LAST_BUILD_KEYS, loadConfig, readWorkspaceState } from "@stim-cli/core/state";
+import * as expoFingerprint from "@expo/fingerprint";
+//#region src/cache/miss-reason.ts
+const MISS_CHANGE_CAP = 20;
+function recordedBuilds(state, platform) {
+	const builds = [];
+	for (const value of [state?.[LAST_BUILD_KEYS[platform]], state?.lastBuild]) {
+		const record = value;
+		if (record?.platform !== platform) continue;
+		const startedAt = typeof record.startedAt === "string" ? record.startedAt : "";
+		if (typeof record.fingerprint === "string" && typeof record.cacheKey === "string") builds.push({
+			fingerprint: record.fingerprint,
+			cacheKey: record.cacheKey,
+			startedAt
+		});
+		const carried = record.missReason?.baseline;
+		if (typeof carried?.fingerprint === "string" && typeof carried.cacheKey === "string") builds.push({
+			fingerprint: carried.fingerprint,
+			cacheKey: carried.cacheKey,
+			startedAt
+		});
+	}
+	return builds;
+}
+function projectIdentity(root) {
+	let real;
+	try {
+		real = realpathSync.native(root);
+	} catch {
+		return null;
+	}
+	for (let dir = real;; dir = dirname(dir)) {
+		if (existsSync(join(dir, ".git"))) {
+			const common = gitCommonDirOnDisk(dir);
+			return common ? `${common}\n${relative(dir, real)}` : null;
+		}
+		if (dirname(dir) === dir) return null;
+	}
+}
+function findMissBaseline(root, platform, { readState = readWorkspaceState, projectRoots = () => Object.keys(loadConfig()?.projects ?? {}), identity = projectIdentity, sourcesOf = (p, key) => storedSources(p, key, sharedBuildCache()) } = {}) {
+	for (const build of recordedBuilds(readState(root), platform)) {
+		const sources = sourcesOf(platform, build.cacheKey);
+		if (sources) return {
+			fingerprint: build.fingerprint,
+			cacheKey: build.cacheKey,
+			sources,
+			from: "workspace"
+		};
+	}
+	const project = identity(root);
+	if (!project) return null;
+	const others = [];
+	for (const other of projectRoots()) {
+		if (other === root || identity(other) !== project) continue;
+		others.push(...recordedBuilds(readState(other), platform));
+	}
+	for (const build of others.toSorted((a, b) => (Date.parse(b.startedAt) || 0) - (Date.parse(a.startedAt) || 0))) {
+		const sources = sourcesOf(platform, build.cacheKey);
+		if (sources) return {
+			fingerprint: build.fingerprint,
+			cacheKey: build.cacheKey,
+			sources,
+			from: "project"
+		};
+	}
+	return null;
+}
+const CATEGORY_RANK = {
+	"native-dependency": 0,
+	"app-config": 1,
+	"config-plugin": 2,
+	package: 3,
+	"native-dir": 4,
+	file: 5,
+	"app-asset": 6,
+	other: 7,
+	"package-scripts": 8,
+	autolinking: 9
+};
+function packageIn(path) {
+	return [...path.matchAll(/(?:^|\/)node_modules\/((?:@[^/]+\/)?[^/]+)/g)].at(-1)?.[1] ?? null;
+}
+function describeChange({ name, change, reasons }) {
+	const pkg = packageIn(name);
+	if (name === "expoConfig" || reasons.includes("expoConfig")) return {
+		category: "app-config",
+		label: "app config changed"
+	};
+	if (pkg && reasons.some((reason) => /^(expo|rncore)Autolinking(Ios|Android)?$/.test(reason))) return {
+		category: "native-dependency",
+		label: `native dependency ${change}: ${pkg}`
+	};
+	if (pkg && reasons.includes("expoConfigPlugins")) return {
+		category: "config-plugin",
+		label: `config plugin ${change}: ${pkg}`
+	};
+	if (/^(expoAutolinkingConfig|rncoreAutolinkingConfig)(:|$)/.test(name)) return {
+		category: "autolinking",
+		label: "autolinking config changed"
+	};
+	if (name.startsWith("package:")) return {
+		category: "package",
+		label: `${name.slice(8)} ${change}`
+	};
+	if (name === "packageJson:scripts") return {
+		category: "package-scripts",
+		label: "package.json scripts changed"
+	};
+	if (reasons.includes("expoConfigExternalFile")) return {
+		category: "app-asset",
+		label: `app asset ${change}: ${name}`
+	};
+	if (reasons.includes("bareNativeDir")) return {
+		category: "native-dir",
+		label: `${name}/ ${change}`
+	};
+	if (reasons.length || name.includes("/") || name.includes(".")) return {
+		category: "file",
+		label: `${name} ${change}`
+	};
+	return {
+		category: "other",
+		label: `${name} ${change}`
+	};
+}
+function rekeyPrefix(rekeyedBy) {
+	return rekeyedBy.length ? `${rekeyedBy.join(" and ")} changed native inputs; ` : "";
+}
+function missReasonFromChanges({ changes, baseline, rekeyedBy = [] }) {
+	const prefix = rekeyPrefix(rekeyedBy);
+	if (!baseline) return {
+		kind: "no-baseline",
+		summary: `${prefix}no earlier build of this project in the cache to compare with`,
+		changes: [],
+		changeCount: 0,
+		baseline: null,
+		rekeyedBy
+	};
+	if (!changes.length) return {
+		kind: "same-sources",
+		summary: `${prefix}native inputs match the last build; no cached app for this configuration or target`,
+		changes: [],
+		changeCount: 0,
+		baseline,
+		rekeyedBy
+	};
+	const described = changes.map((change, index) => ({
+		change,
+		index,
+		...describeChange(change)
+	})).toSorted((a, b) => CATEGORY_RANK[a.category] - CATEGORY_RANK[b.category] || a.index - b.index);
+	const dependencyMoved = described.some((entry) => entry.category === "native-dependency");
+	const labels = [...new Set(described.filter((entry) => !(dependencyMoved && entry.category === "autolinking")).map((entry) => entry.label))];
+	const more = labels.length > 1 ? ` (+${labels.length - 1} more)` : "";
+	return {
+		kind: "changed",
+		summary: `${prefix}${labels[0]}${more}`,
+		changes: described.slice(0, MISS_CHANGE_CAP).map(({ change, category }) => ({
+			source: change.name,
+			change: change.change,
+			category
+		})),
+		changeCount: changes.length,
+		baseline,
+		rekeyedBy
+	};
+}
+function explainBuildMiss({ root, platform, current, rekeyedBy = [], baselineDeps, differ = expoFingerprint.diffFingerprints }) {
+	const baseline = findMissBaseline(root, platform, baselineDeps);
+	const changes = baseline ? diffFingerprintSources({
+		previous: baseline.sources,
+		previousHash: baseline.fingerprint,
+		current,
+		differ
+	}) : [];
+	return {
+		reason: missReasonFromChanges({
+			changes,
+			baseline: baseline ? {
+				fingerprint: baseline.fingerprint,
+				cacheKey: baseline.cacheKey,
+				from: baseline.from
+			} : null,
+			rekeyedBy
+		}),
+		changedNames: changes.map((change) => change.name),
+		previousHash: baseline?.fingerprint ?? null
+	};
+}
+function predictBuildMiss({ root, platform, current, prebuild }) {
+	const { reason } = explainBuildMiss({
+		root,
+		platform,
+		current
+	});
+	const baseline = reason.baseline && {
+		fingerprint: reason.baseline.fingerprint,
+		from: reason.baseline.from
+	};
+	if (!prebuild || !baseline) return {
+		...reason,
+		baseline
+	};
+	const dir = platform === "ios" ? "ios/" : "android/";
+	return {
+		...reason,
+		kind: "prebuild-pending",
+		summary: `${reason.summary} (before prebuild ${prebuild}s ${dir})`,
+		baseline
+	};
+}
+function skippedMissReason(summary) {
+	return {
+		kind: "cache-skipped",
+		summary,
+		changes: [],
+		changeCount: 0,
+		baseline: null,
+		rekeyedBy: []
+	};
+}
+function fingerprintErrorMissReason(message) {
+	return {
+		kind: "fingerprint-error",
+		summary: `fingerprinting failed: ${message}`,
+		changes: [],
+		changeCount: 0,
+		baseline: null,
+		rekeyedBy: []
+	};
+}
+//#endregion
+//#region src/engine/prebuild.ts
+const PREBUILD_ERROR = "STIM_PREBUILD_FAILED";
+const LAST_LINES = 20;
+function nativeDirName(platform) {
+	return platform === "android" ? "android" : "ios";
+}
+function nativeDir(root, platform) {
+	return join(root, nativeDirName(platform));
+}
+function nativeDirInFingerprint(sources, platform) {
+	const dir = nativeDirName(platform);
+	return sources.some((source) => source.type === "dir" && source.filePath === dir && source.hash != null);
+}
+/**
+* @expo/fingerprint leaves a native directory out of the hash when git ignores it (CNG), so the cache
+* key only covers that directory when this workspace's recorded prebuild ran on the same fingerprint.
+*/
+function prebuildAction({ isExpo, nativeDirExists, nativeDirFingerprinted, nativeDirTracked, generatedFrom, fingerprint }) {
+	if (!isExpo) return "none";
+	if (!nativeDirExists) return "generate";
+	if (nativeDirFingerprinted || generatedFrom === fingerprint) return "none";
+	return nativeDirTracked ? "refuse" : "regenerate";
+}
+function prebuildRecord(state) {
+	const record = state?.prebuild;
+	return record && typeof record === "object" ? record : {};
+}
+function gitTracksNativeDir(root, platform) {
+	try {
+		return git(root, [
+			"ls-files",
+			"--",
+			nativeDirName(platform)
+		], { env: {
+			LC_ALL: "C",
+			LANGUAGE: "C"
+		} }).trim() !== "";
+	} catch (error) {
+		if (error?.code === "ENOENT") return false;
+		return !/not a git repository \(or any (of the parent directories|parent up to mount point)/.test(String(error?.message));
+	}
+}
+function planPrebuild(root, platform, { isExpo, fingerprint, sources }) {
+	const nativeDirExists = existsSync(nativeDir(root, platform));
+	const fingerprinted = nativeDirInFingerprint(sources, platform);
+	const generatedFrom = prebuildRecord(readWorkspaceState$1(root))[platform];
+	return prebuildAction({
+		isExpo,
+		nativeDirExists,
+		nativeDirFingerprinted: fingerprinted,
+		nativeDirTracked: nativeDirExists && !fingerprinted && gitTracksNativeDir(root, platform),
+		generatedFrom: typeof generatedFrom === "string" ? generatedFrom : null,
+		fingerprint
+	});
+}
+function recordPrebuild(root, platform, fingerprint) {
+	updateWorkspaceState(root, (state) => ({
+		...state,
+		prebuild: {
+			...prebuildRecord(state),
+			[platform]: fingerprint
+		}
+	}));
+}
+function staleNativeDirRefusal(platform) {
+	const dir = nativeDirName(platform);
+	return {
+		code: PREBUILD_ERROR,
+		message: `The fingerprint leaves ${dir}/ out of the cache key, and Stim cannot show that ${dir}/ was generated from the current app config. Git tracks files in it, or could not say whether it does, so Stim will not regenerate it with \`expo prebuild --clean\`.`,
+		remedy: `Stop excluding ${dir}/ from the fingerprint (check .fingerprintignore) so the cache key covers its files, or add ${dir}/ to .gitignore and untrack it so Stim regenerates it from the app config.`
+	};
+}
+function prebuildRefusal({ isExpo, platform, nativeDirExists }) {
+	if (nativeDirExists || isExpo) return null;
+	const dir = nativeDirName(platform);
+	return {
+		code: PREBUILD_ERROR,
+		message: `This project has no ${dir}/ directory and is not an Expo (CNG) project, so Stim cannot generate one.`,
+		remedy: `Check out or generate the native project (\`npx @react-native-community/cli init\` produced one originally), or add \`expo\` to the project so \`expo prebuild\` can create ${dir}/.`
+	};
+}
+function prebuildFailure(logWriter, result) {
+	logWriter?.write?.({
+		src: "build",
+		level: "error",
+		msg: result.reason || "Expo prebuild failed.",
+		event: "prebuild_failed"
+	});
+	return result;
+}
+async function runPrebuild(root, platform, logWriter, { spawnFn = null, now = Date.now, isExpo = null, clean = false } = {}) {
+	const dirExists = existsSync(nativeDir(root, platform));
+	const refusal = prebuildRefusal({
+		isExpo: isExpo === null ? detectIsExpo(root) : isExpo,
+		platform,
+		nativeDirExists: dirExists
+	});
+	if (refusal) return prebuildFailure(logWriter, {
+		failed: true,
+		code: refusal.code,
+		reason: refusal.message,
+		remedy: refusal.remedy,
+		error: refusal,
+		lastLines: []
+	});
+	const bin = expoBinPath(root);
+	if (!bin) {
+		const binRefusal = expoBinRefusal(root, "prebuild");
+		return prebuildFailure(logWriter, {
+			failed: true,
+			code: PREBUILD_ERROR,
+			reason: binRefusal.message,
+			remedy: binRefusal.remedy,
+			lastLines: []
+		});
+	}
+	const spawn = spawnFn || ((cmd, args, opts) => getExecutor().spawn(cmd, args, opts));
+	const startedAt = now();
+	const tail = [];
+	const push = (line) => {
+		const msg = stripAnsi(String(line)).trimEnd();
+		if (!msg.trim()) return;
+		tail.push(msg);
+		if (tail.length > LAST_LINES) tail.shift();
+		logWriter?.write?.({
+			src: "build",
+			level: "debug",
+			msg,
+			raw: true,
+			event: "prebuild"
+		});
+	};
+	let child;
+	try {
+		const invocation = remoteCliInvocation(bin, [
+			"prebuild",
+			"-p",
+			platform,
+			"--no-install",
+			...clean ? ["--clean"] : []
+		], "expo");
+		child = spawnDeclared(ambientContext(), () => spawn(invocation.file, invocation.args, {
+			cwd: root,
+			stdio: [
+				"ignore",
+				"pipe",
+				"pipe"
+			],
+			env: {
+				...ambientContext()?.env ?? process.env,
+				FORCE_COLOR: "0",
+				CI: "1"
+			}
+		}));
+	} catch (err) {
+		return prebuildFailure(logWriter, {
+			failed: true,
+			code: PREBUILD_ERROR,
+			reason: `Could not run \`expo prebuild\`: ${err?.message || err}`,
+			lastLines: []
+		});
+	}
+	const outReader = createLineReader(push);
+	const errReader = createLineReader(push);
+	child.stdout?.setEncoding?.("utf-8");
+	child.stderr?.setEncoding?.("utf-8");
+	child.stdout?.on("data", (chunk) => outReader.push(chunk));
+	child.stderr?.on("data", (chunk) => errReader.push(chunk));
+	const result = await waitForChild(child);
+	outReader.flush();
+	errReader.flush();
+	const durationMs = now() - startedAt;
+	if (result.error) return prebuildFailure(logWriter, {
+		failed: true,
+		code: PREBUILD_ERROR,
+		reason: `Could not run \`expo prebuild\`: ${result.error?.message || result.error}`,
+		lastLines: tail.slice(),
+		durationMs
+	});
+	if (result.code !== 0) {
+		const how = result.signal ? `signal ${result.signal}` : `exit code ${result.code}`;
+		return prebuildFailure(logWriter, {
+			failed: true,
+			code: PREBUILD_ERROR,
+			reason: `\`expo prebuild -p ${platform}\` failed (${how}).`,
+			lastLines: tail.slice(),
+			durationMs
+		});
+	}
+	if (!existsSync(nativeDir(root, platform))) return prebuildFailure(logWriter, {
+		failed: true,
+		code: PREBUILD_ERROR,
+		reason: `\`expo prebuild -p ${platform}\` succeeded but did not create ${nativeDirName(platform)}/.`,
+		lastLines: tail.slice(),
+		durationMs
+	});
+	return {
+		ok: true,
+		durationMs,
+		nativeDir: nativeDir(root, platform)
+	};
+}
+//#endregion
+export { explainBuildMiss as a, skippedMissReason as c, staleNativeDirRefusal as i, recordPrebuild as n, fingerprintErrorMissReason as o, runPrebuild as r, predictBuildMiss as s, planPrebuild as t };

package/dist/{project-_phNIJfs.mjs → project-BZNjmW_8.mjs}

@@ -1,10 +1,12 @@
-import { B as deviceSlotKey, H as parseDeviceSlotKey, _ as loadConfig$1, g as isPathPrefix, k as process_identity_exports, l as findEnclosingWorktreeRoot, p as getProject } from "./config-BYDxlMY3.mjs";
-import { $ as settingValueAt, Dt as repoRoot, G as resolveIosProjectDir, U as resolveAndroidLayout, rt as webSettings } from "./settings-B717odTD.mjs";
-import { E as workspaceStateFile, a as updateWorkspaceState, o as withWorkspaceStateLock, r as readWorkspaceState$1, t as clearWorkspaceStateKey, v as supervisorPidFile } from "./workspace-state-DJt_MMvf.mjs";
+import { p as process_identity_exports } from "./exec-_UbtCQcG.mjs";
+import { c as supervisorPidFile, g as workspaceStateFile$1 } from "./paths-DQtTgsBf.mjs";
+import { H as deviceSlotKey, W as parseDeviceSlotKey, _ as loadConfig$1, g as isPathPrefix, l as findEnclosingWorktreeRoot, p as getProject } from "./config-CYcBF478.mjs";
+import { c as withWorkspaceStateLock, o as updateWorkspaceState, r as readWorkspaceState$1, t as clearWorkspaceStateKey } from "./workspace-state-Cjuigeeu.mjs";
+import { Ft as repoRoot, K as resolveIosProjectDir, W as resolveAndroidLayout, at as webSettings, tt as settingValueAt } from "./settings-CsJDEXgK.mjs";
 import { existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { basename, dirname, isAbsolute, join, relative, resolve } from "node:path";
-import { basename as basename$1, dirname as dirname$1, join as join$1, resolve as resolve$1 } from "path";
 import { projectRootDirectories } from "@stim-cli/core/state";
+import { basename as basename$1, dirname as dirname$1, join as join$1, resolve as resolve$1 } from "path";
 import { existsSync as existsSync$1, readFileSync as readFileSync$1, realpathSync as realpathSync$1 } from "fs";
 import { DOMParser } from "@xmldom/xmldom";
 //#region src/supervisor/state.ts
@@ -133,7 +135,7 @@ function clearExpoMetroTunnel(root) {
 	});
 }
 function clearManagedMetroTunnel(root, expected) {
-	if (!existsSync(workspaceStateFile(root))) return true;
+	if (!existsSync(workspaceStateFile$1(root))) return true;
 	return clearWorkspaceStateKey(root, "metroTunnel", (value) => {
 		if (typeof value !== "object" || value === null) return false;
 		const record = value;
@@ -306,8 +308,8 @@ const nativeAndroidIntegration = {
 			application: true,
 			platforms: () => ["android"],
 			validate: (operation) => operation === "android" ? null : void 0,
-			android: async () => (await import("./native-android-D5qc3-_v.mjs")).nativeAndroidProject(root),
-			doctor: async () => (await import("./native-android-D5qc3-_v.mjs")).nativeAndroidDoctor(root)
+			android: async () => (await import("./native-android-JACyjTZs.mjs")).nativeAndroidProject(root),
+			doctor: async () => (await import("./native-android-JACyjTZs.mjs")).nativeAndroidDoctor(root)
 		};
 	}
 };
@@ -735,8 +737,8 @@ const nativeXcodeProjectIntegration = {
 			application: problem === null,
 			platforms: () => problem ? [] : ["ios"],
 			validate: (operation) => operation === "ios" ? problem : void 0,
-			ios: async () => (await import("./native-xcode-ios-Bbf30Gm0.mjs")).nativeXcodeIosProject(root),
-			doctor: async () => (await import("./native-xcode-ios-Bbf30Gm0.mjs")).nativeXcodeDoctor(root)
+			ios: async () => (await import("./native-xcode-ios-CXX39F7o.mjs")).nativeXcodeIosProject(root),
+			doctor: async () => (await import("./native-xcode-ios-CXX39F7o.mjs")).nativeXcodeDoctor(root)
 		};
 	}
 };
@@ -941,7 +943,7 @@ function createProjectRegistry(integrations) {
 //#region src/integrations/projects.ts
 const expo = {
 	mode: MODE_EXPO,
-	loadDevServer: async () => (await import("./server-expo-Bigriskl.mjs")).startExpoServer,
+	loadDevServer: async () => (await import("./server-expo-C-90EhcG.mjs")).startExpoServer,
 	platforms(root) {
 		const appJson = readAppJson(root);
 		const config = appJson?.expo ?? appJson;
@@ -961,7 +963,7 @@ const expo = {
 };
 const reactNative = {
 	mode: MODE_BARE,
-	loadDevServer: async () => (await import("./server-bare-R2m_gsH8.mjs")).startBareServer,
+	loadDevServer: async () => (await import("./server-bare-CxTrvDg8.mjs")).startBareServer,
 	platforms(root, { context, settings }) {
 		if (!declaresAppDependency(readPackageJson(root))) return [];
 		const platforms = [];
@@ -991,9 +993,9 @@ const projectRegistry = createProjectRegistry([
 				ownedRoots: problem === null ? [join(root, "ios"), join(root, "android")] : [],
 				platforms: (resolved) => nativeProjectIntegration(root).platforms(root, resolved),
 				validate: (operation) => operation === "ios" || operation === "android" || operation === "dev-server" ? problem : void 0,
-				ios: async (settings) => (await import("./react-native-ios-Dhq_eiYQ.mjs")).reactNativeIosProject(root, settings),
-				android: async (resolved) => (await import("./react-native-android-CM1XRDwv.mjs")).reactNativeAndroidProject(root, resolved),
-				doctor: async () => (await import("./react-native-doctor-CfRnFfjs.mjs")).reactNativeProjectDoctor(root)
+				ios: async (settings) => (await import("./react-native-ios-Bhq1rJeV.mjs")).reactNativeIosProject(root, settings),
+				android: async (resolved) => (await import("./react-native-android-DuzH0cn3.mjs")).reactNativeAndroidProject(root, resolved),
+				doctor: async () => (await import("./react-native-doctor-CQpuIMso.mjs")).reactNativeProjectDoctor(root)
 			};
 		}
 	},
@@ -1007,14 +1009,14 @@ const projectRegistry = createProjectRegistry([
 				application: true,
 				platforms: ({ settings }) => settingValueAt(settings, "macos.product") && settingValueAt(settings, "macos.infoPlist") ? ["macos"] : [],
 				validate: (operation) => operation === "macos" ? null : void 0,
-				macos: async () => (await import("./swiftpm-macos-DRNVJWlb.mjs")).swiftpmMacosProject(root),
+				macos: async () => (await import("./swiftpm-macos-p8WZbxKU.mjs")).swiftpmMacosProject(root),
 				doctor: async () => {
-					const { macosToolchain } = await import("./toolchain-BFkAcstd.mjs");
+					const { macosToolchain, macosToolchainAsync } = await import("./toolchain-DhKwp9iI.mjs");
 					return {
 						inspect: () => [],
-						offloadTargets: ({ options: { host = process.platform, platform } }) => host === "darwin" && platform === void 0 ? async () => [{
+						offloadTargets: ({ options: { host = process.platform, platform, operation } }) => host === "darwin" && platform === void 0 ? async () => [{
 							platform: "macos",
-							local: macosToolchain()
+							local: operation ? await macosToolchainAsync() : macosToolchain()
 						}] : null
 					};
 				}
@@ -1029,7 +1031,7 @@ const projectRegistry = createProjectRegistry([
 				application: false,
 				platforms: ({ settings }) => webSettings(settings).url !== null ? ["web"] : [],
 				validate: (operation) => operation === "web" ? null : void 0,
-				web: async () => (await import("./browser-web-CA-F1GQo.mjs")).browserWebProject(root)
+				web: async () => (await import("./browser-web-QQzVjz3O.mjs")).browserWebProject(root)
 			};
 		}
 	},
@@ -1062,7 +1064,7 @@ function literalPlatforms(text) {
 }
 //#endregion
 //#region src/workspace/project.ts
-const findProjectRoot = projectRegistry.findProjectRoot;
+const findProjectRoot$1 = projectRegistry.findProjectRoot;
 const projectProblem = projectRegistry.projectProblem;
 const isMobileProject = projectRegistry.isMobileProject;
 function projectShortcut(path, proj) {
@@ -1084,27 +1086,28 @@ const NO_PROJECT_REFUSAL = {
 	message: "No supported app project was found from this directory.",
 	remedy: "Run this from the directory of a supported app."
 };
-function findServerWorkspace(startDir, registry = projectRegistry) {
+function startServerWorkspace(startDir, registry) {
 	const nearest = registry.findProjectRoot(startDir);
-	if (!nearest) return null;
-	if (registry.keepsWorkspace(nearest)) return {
-		root: nearest,
-		from: null
-	};
-	if (Object.keys(getProject(nearest)?.ports ?? {}).length) return {
+	if (!nearest) return { found: null };
+	if (registry.keepsWorkspace(nearest)) return { found: {
 		root: nearest,
 		from: null
-	};
-	const top = repoRoot(nearest);
-	if (!top) return {
+	} };
+	if (Object.keys(getProject(nearest)?.ports ?? {}).length) return { found: {
 		root: nearest,
 		from: null
-	};
+	} };
+	return { nearest };
+}
+function sameRepositoryApps(nearest, top, registry) {
+	const worktree = expandedRealpath(top);
+	return Object.keys(loadConfig$1()?.projects ?? {}).filter((path) => path !== nearest && isPathPrefix(worktree, expandedRealpath(path)) && registry.isMobileProject(path));
+}
+function chooseServerWorkspace(nearest, top, candidates, owners) {
 	const worktree = expandedRealpath(top);
-	const apps = Object.keys(loadConfig$1()?.projects ?? {}).filter((path) => {
-		if (path === nearest || !isPathPrefix(worktree, expandedRealpath(path)) || !registry.isMobileProject(path)) return false;
-		const owner = repoRoot(path);
-		return owner !== null && expandedRealpath(owner) === worktree;
+	const apps = candidates.filter((_, index) => {
+		const owner = owners[index];
+		return owner !== null && owner !== void 0 && expandedRealpath(owner) === worktree;
 	});
 	return apps.length === 1 ? {
 		root: apps[0],
@@ -1114,9 +1117,34 @@ function findServerWorkspace(startDir, registry = projectRegistry) {
 		from: null
 	};
 }
+function findServerWorkspace(startDir, registry = projectRegistry) {
+	const start = startServerWorkspace(startDir, registry);
+	if ("found" in start) return start.found;
+	const top = repoRoot(start.nearest);
+	if (!top) return {
+		root: start.nearest,
+		from: null
+	};
+	const candidates = sameRepositoryApps(start.nearest, top, registry);
+	return chooseServerWorkspace(start.nearest, top, candidates, candidates.map(repoRoot));
+}
+/** `findCommandWorkspace` with the repository roots read by `repoRootOf`, so no Git call blocks the event loop. */
+async function findCommandWorkspaceAsync(startDir, repoRootOf, note) {
+	const start = startServerWorkspace(startDir, projectRegistry);
+	if ("found" in start) return start.found?.root ?? null;
+	const top = await repoRootOf(start.nearest);
+	if (!top) return start.nearest;
+	const candidates = sameRepositoryApps(start.nearest, top, projectRegistry);
+	const workspace = chooseServerWorkspace(start.nearest, top, candidates, await Promise.all(candidates.map(repoRootOf)));
+	if (workspace.from) noteWorkspace(workspace, note);
+	return workspace.root;
+}
+function noteWorkspace(workspace, note) {
+	note(`Using the Stim workspace ${workspace.root}: ${workspace.from} is not a React Native or Expo app.`);
+}
 function findCommandWorkspace(startDir, note = (line) => console.error(line)) {
 	const workspace = findServerWorkspace(startDir);
-	if (workspace?.from) note(`Using the Stim workspace ${workspace.root}: ${workspace.from} is not a React Native or Expo app.`);
+	if (workspace?.from) noteWorkspace(workspace, note);
 	return workspace?.root ?? null;
 }
 function expandedRealpath(path) {
@@ -1127,4 +1155,4 @@ function expandedRealpath(path) {
 	}
 }
 //#endregion
-export { clearWorkspaceSupervisor as A, MODE_BARE as C, clearManagedMetroTunnel as D, clearExpoMetroTunnel as E, readWorkspaceLaunches as F, workspaceDevServerMode as I, writePidFile as L, readPidFile as M, readRemoteSession as N, clearRemoteSession as O, readRemoteSessionId as P, writeWorkspaceLaunch as R, resolvePackageJson as S, MODE_EXPO as T, detectIsExpo as _, isMobileProject as a, readAppConfigText as b, projectShortcut as c, projectRegistry as d, NativeXcodeError as f, appProjectProblem as g, selectNativeXcodeProject as h, findServerWorkspace as i, readMetroTunnel as j, clearWorkspaceLaunches as k, detectPlatforms as l, pbxString as m, findCommandWorkspace as n, ownedDeviceLabel as o, pbxReferences as p, findProjectRoot as r, projectProblem as s, NO_PROJECT_REFUSAL as t, nativeProjectIntegration as u, detectTutorial as v, MODE_COMMAND as w, readAppJson as x, isPackageResolvable as y };
+export { clearWorkspaceLaunches as A, resolvePackageJson as C, clearExpoMetroTunnel as D, MODE_EXPO as E, readRemoteSessionId as F, readWorkspaceLaunches as I, workspaceDevServerMode as L, readMetroTunnel as M, readPidFile as N, clearManagedMetroTunnel as O, readRemoteSession as P, writePidFile as R, readAppJson as S, MODE_COMMAND as T, appProjectProblem as _, findServerWorkspace as a, isPackageResolvable as b, projectProblem as c, nativeProjectIntegration as d, projectRegistry as f, selectNativeXcodeProject as g, pbxString as h, findProjectRoot$1 as i, clearWorkspaceSupervisor as j, clearRemoteSession as k, projectShortcut as l, pbxReferences as m, findCommandWorkspace as n, isMobileProject as o, NativeXcodeError as p, findCommandWorkspaceAsync as r, ownedDeviceLabel as s, NO_PROJECT_REFUSAL as t, detectPlatforms as u, detectIsExpo as v, MODE_BARE as w, readAppConfigText as x, detectTutorial as y, writeWorkspaceLaunch as z };

package/dist/{pull-request-CQ8sPbZa.mjs → pull-request-Lfetn8Kr.mjs}

@@ -1,5 +1,5 @@
-import { t as getExecutor } from "./exec-DqKo9GKJ.mjs";
-import { n as gitAsync, r as gitQuiet } from "./git-DDfFzkMm.mjs";
+import { t as getExecutor } from "./exec-_UbtCQcG.mjs";
+import { n as gitAsync, r as gitQuiet } from "./git-C3iTsJaZ.mjs";
 //#region src/workspace/pull-request.ts
 const GH_TIMEOUT_MS = 2e4;
 const GH_ENV = {