stim 1.24.0 → 1.26.0

package/dist/{selection-BLtvaqxc.mjs → selection-BNPBZ6T5.mjs}

@@ -1,6 +1,7 @@
 import { C as reportSignal, b as operationState } from "./exec-VFRpu1iA.mjs";
-import { v as withDirLock$1 } from "./paths-DQtTgsBf.mjs";
-import { $ as outdatedServer, X as endpoint, Z as findPeer$1, _ as loadConfig$1, at as setupRemedy, d as getConfigDir, et as parseMachine$1, nt as realIo, ot as tailscaleStatusAsync, st as readHostPermissions, tt as reachMachine } from "./config-BZhXY15H.mjs";
+import { M as withDirLock$1 } from "./workspace-state-pUg3_RRA.mjs";
+import { $ as findPeer$1, Q as endpoint, X as diagnoseTailscale, Y as diagnoseOutcome, _ as loadConfig$1, ct as tailscaleStatusAsync, d as getConfigDir, dt as readHostPermissions, it as realIo, lt as diagnosisFinding, nt as parseMachine$1, rt as reachMachine, st as setupRemedy, tt as outdatedServer, ut as notOnTailnetDiagnosis } from "./config-BktkY_zC.mjs";
+import { o as cocoapodsInstall } from "./toolchain-J4J8MrAr.mjs";
 import { releaseClaim, tryAcquireClaim } from "@stim-cli/core/ownership-claim";
 import { mkdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { hostname } from "node:os";
@@ -126,7 +127,17 @@ async function inspectDeviceHostMachines({ fix, version = "<version>", tickets =
 			machines: []
 		};
 		const status = await io.status();
-		if (!isJsonObject(status)) return unavailable("tailscale-off", note$1("Remote machines are unreachable", "remote.machines names remote machines, but Tailscale is not running."));
+		if (!isJsonObject(status)) {
+			const diagnosis = await diagnoseTailscale(io);
+			return {
+				findings: [note$1("Remote machines are unreachable", `remote.machines names remote machines. ${diagnosis.message}`, diagnosis.remedy)],
+				machines: entries.map((machine) => ({
+					machine,
+					state: "tailscale-off",
+					diagnosis
+				}))
+			};
+		}
 		const self = isJsonObject(status.Self) ? status.Self : {};
 		const deviceName = (typeof self.HostName === "string" && self.HostName ? self.HostName : hostname()).replace(/[\p{Cc}\p{Cf}]/gu, "").trim().slice(0, 64) || "Mac";
 		const inspected = {
@@ -146,20 +157,24 @@ async function inspectDeviceHostMachines({ fix, version = "<version>", tickets =
 			}
 			const current = await io.status();
 			if (!isJsonObject(current)) {
+				const diagnosis = await diagnoseTailscale(io);
 				inspected.machines.push({
 					machine,
-					state: "tailscale-off"
+					state: "tailscale-off",
+					diagnosis
 				});
-				inspected.findings.push(note$1(`Remote machine ${machine} is unreachable`, "Tailscale stopped before this connection."));
+				inspected.findings.push(diagnosisFinding("device-host-machine", machine, diagnosis));
 				continue;
 			}
 			const peer = findPeer$1(current, parsed.name);
 			if (peer === "missing" || peer === "ambiguous") {
+				const diagnosis = notOnTailnetDiagnosis(machine, peer === "ambiguous");
 				inspected.machines.push({
 					machine,
-					state: "not-on-tailnet"
+					state: "not-on-tailnet",
+					diagnosis
 				});
-				inspected.findings.push(note$1(`Remote machine ${machine} is not on this tailnet`, peer === "missing" ? "No peer has that name." : "Several peers match that name."));
+				inspected.findings.push(diagnosisFinding("device-host-machine", machine, diagnosis));
 				continue;
 			}
 			const nodeRoute = `${peer.nodeId}:${parsed.port}`;
@@ -251,16 +266,40 @@ async function inspectDeviceHostMachines({ fix, version = "<version>", tickets =
 				const outdated = outdatedServer(machine, version, outcome.command);
 				inspected.machines.push({
 					...known,
-					state: "outdated"
+					state: "outdated",
+					diagnosis: {
+						layer: "compat",
+						code: "server-outdated",
+						title: "Server is outdated",
+						message: outdated.detail,
+						remedy: outdated.fix
+					}
 				});
 				inspected.findings.push(note$1(outdated.title, outdated.detail, outdated.fix));
 				continue;
 			}
+			if (outcome.state === "unreachable") {
+				const diagnosis = await diagnoseOutcome(io, {
+					entry: machine,
+					peer,
+					port: parsed.port,
+					target: endpoint(peer, parsed.port),
+					reason: outcome.reason,
+					transport: outcome.transport
+				});
+				inspected.machines.push({
+					...known,
+					state: "unreachable",
+					diagnosis
+				});
+				inspected.findings.push(diagnosisFinding("device-host-machine", machine, diagnosis));
+				continue;
+			}
 			inspected.machines.push({
 				...known,
 				state: outcome.state
 			});
-			inspected.findings.push(outcome.state === "key-changed" ? note$1(`Remote machine ${machine} answered with a different server key`, "Stim refuses to connect to a stim-server that does not prove it holds the key pinned at approval.", `If that machine or its Stim home was replaced, remove ${machine} from remote.machines, run \`stim doctor --fix\`, then add it back and run \`stim doctor --fix\` again.`) : outcome.state === "lapsed" ? note$1(`Hosting request to ${machine} lapsed`, `${machine} did not approve this machine before its setup ticket expired at ${outcome.credential.expiresAt}.`, "Run `stim doctor --fix` to make a new ticket.") : outcome.state === "revoked" ? note$1(`Remote machine ${machine} no longer accepts this machine for device hosting`, `${outcome.reason} The pinned key is preserved.`, "Run `stim doctor --fix` to ask again.") : note$1(`Remote machine ${machine} did not confirm hosting access`, outcome.reason, `Check stim-server and its tailnet serve route on ${machine}, then run doctor again.`));
+			inspected.findings.push(outcome.state === "key-changed" ? note$1(`Remote machine ${machine} answered with a different server key`, "Stim refuses to connect to a stim-server that does not prove it holds the key pinned at approval.", `If that machine or its Stim home was replaced, remove ${machine} from remote.machines, run \`stim doctor --fix\`, then add it back and run \`stim doctor --fix\` again.`) : outcome.state === "lapsed" ? note$1(`Hosting request to ${machine} lapsed`, `${machine} did not approve this machine before its setup ticket expired at ${outcome.credential.expiresAt}.`, "Run `stim doctor --fix` to make a new ticket.") : note$1(`Remote machine ${machine} no longer accepts this machine for device hosting`, `${outcome.reason} The pinned key is preserved.`, "Run `stim doctor --fix` to ask again."));
 		}
 		return inspected;
 	} finally {
@@ -312,12 +351,12 @@ function note(title, detail, fix = null) {
 const PROBLEM_TITLES = {
 	unreachable: "does not answer a build offer",
 	checkout: "cannot build an app outside a git checkout",
-	"stim-build": "runs another Stim build",
+	"stim-build": "runs an incompatible Stim build",
 	arch: "has another CPU architecture",
 	xcode: "has another Xcode",
 	"macos-sdk": "has another macOS SDK",
 	"simulator-sdk": "has another simulator SDK",
-	cocoapods: "has another CocoaPods",
+	cocoapods: "has no CocoaPods, or another version",
 	bundler: "has no Bundler",
 	runtime: "has no simulator for this project's iOS runtime",
 	jdk: "runs another JDK major version",
@@ -329,37 +368,69 @@ const PROBLEM_TITLES = {
 	busy: "is too busy to take builds",
 	platform: "cannot build this platform"
 };
-function problemFix(code, entry) {
+const NOTE_TITLES = {
+	ndk: "downloads this project's NDK on its first Android build",
+	"build-tools": "downloads this project's Android build-tools on its first Android build",
+	"compile-sdk": "downloads this project's Android compile platform on its first Android build"
+};
+function commandFix(problem, entry) {
+	return problem.commands?.length && problem.lead ? [`On ${entry}, ${problem.lead}:`, ...problem.commands].join("\n") : null;
+}
+function problemFix(problem, entry) {
+	const { code } = problem;
+	if (problem.followsFrom) return `Fix the ${problem.followsFrom} problem on ${entry} first; this follows from it.`;
 	switch (code) {
 		case "unreachable": return `Check that stim-server runs on ${entry} and that its tailscale serve route answers, then run \`stim doctor\` again. To keep it running there, run \`stim-server service install --serve\` on ${entry}.`;
 		case "checkout": return "Offload syncs the files git lists; run Stim from a git checkout of the app.";
-		case "stim-build": return `Update stim-server on ${entry} to the same Stim build as this machine: there, run \`stim-server service update --release <version>\` for this machine's release, or \`--from <dir>\` with the packed packages of this machine's checkout.`;
+		case "stim-build": return `Update stim-server on ${entry} to a Stim release with the same build compatibility version as this machine (an older stim-server needs the same Stim build): there, run \`stim-server service update --release <version>\` for this machine's release, or \`--from <dir>\` with the packed packages of this machine's checkout.`;
 		case "arch": return "Use a remote machine with the same CPU architecture as this machine.";
 		case "xcode":
 		case "simulator-sdk":
-		case "macos-sdk": return `Install and select the same Xcode on ${entry} and this Mac (\`xcode-select -p\` on each).`;
-		case "cocoapods": return `Install the same CocoaPods version on ${entry}, on the PATH its stim-server's login shell sets.`;
+		case "macos-sdk": return commandFix(problem, entry) ?? `Install and select the same Xcode on ${entry} and this Mac (\`xcode-select -p\` on each).`;
+		case "cocoapods": return commandFix(problem, entry) ?? `Install the same CocoaPods version on ${entry}, on the PATH its stim-server sets. A build sent there with --remote-build ${entry} still runs; a version that differs rewrites the COCOAPODS line of a committed Podfile.lock.`;
 		case "bundler": return `Install Bundler (\`gem install bundler\`) on ${entry}, on the PATH its stim-server's login shell sets.`;
-		case "runtime": return `Install that iOS simulator runtime on ${entry} with at least one iPhone simulator, or set ios.runtime here to one ${entry} has.`;
-		case "jdk": return `Start stim-server on ${entry} with JAVA_HOME at a JDK of the same major version as this machine's.`;
+		case "runtime": return commandFix(problem, entry) ?? `Install that iOS simulator runtime on ${entry} with at least one iPhone simulator, or set ios.runtime here to one ${entry} has.`;
+		case "jdk": return commandFix(problem, entry) ?? `Start stim-server on ${entry} with JAVA_HOME at a JDK of the same major version as this machine's.`;
 		case "android-sdk":
 		case "ndk":
 		case "build-tools":
-		case "compile-sdk": return `Install the missing package with sdkmanager in the Android SDK stim-server on ${entry} uses (its ANDROID_HOME, else ~/Library/Android/sdk on macOS or ~/Android/Sdk on Linux).`;
+		case "compile-sdk": return commandFix(problem, entry) ?? `Install the missing package with sdkmanager in the Android SDK stim-server on ${entry} uses (its ANDROID_HOME, else ~/Library/Android/sdk on macOS or ~/Android/Sdk on Linux).`;
 		case "disk": return `Free space on ${entry}'s worker root (server.workerRoot there).`;
 		case "platform": return `iOS and macOS builds need a Mac; ${entry} can take Android builds only.`;
 		case "busy": return `Builds stay on this machine until ${entry} has capacity. On ${entry}, server.maxLoadPerCore sets the load it accepts and concurrency.maxBuilds how many of its own builds it runs; it takes one offloaded build at a time.`;
 	}
 }
 const TRANSIENT = /* @__PURE__ */ new Set(["unreachable", "busy"]);
-function offloadFindings(entry, problems) {
-	return problems.map((problem) => ({
+const UNPREDICTABLE = /* @__PURE__ */ new Set([
+	"unreachable",
+	"busy",
+	"disk",
+	"checkout",
+	"cocoapods"
+]);
+/** Why a build on the machine named for it cannot work, from the toolchain differences found before this machine changes the checkout. */
+function predictedRefusal(entry, problems) {
+	const known = problems.filter((problem) => !UNPREDICTABLE.has(problem.code));
+	if (known.length === 0) return null;
+	return {
+		reason: known.map((problem) => problem.reason).join("; "),
+		remedy: known.map((problem) => problemFix(problem, entry)).join("\n")
+	};
+}
+function offloadFindings(entry, problems, notes) {
+	return [...problems.map((problem) => ({
 		code: `build-machine-${problem.code}`,
 		level: TRANSIENT.has(problem.code) ? "note" : "cost",
 		title: `Remote machine ${entry} ${PROBLEM_TITLES[problem.code]}`,
-		detail: `Builds fall back to this machine: ${problem.reason}.`,
-		fix: problemFix(problem.code, entry)
-	}));
+		detail: `Builds fall back to this machine: ${problem.reason}.${problem.code === "cocoapods" ? ` A build sent there with --remote-build ${entry} still runs.` : ""}`,
+		fix: problemFix(problem, entry)
+	})), ...notes.map((each) => ({
+		code: `build-machine-${each.code}`,
+		level: "note",
+		title: `Remote machine ${entry} ${NOTE_TITLES[each.code] ?? "needs a first-build download"}`,
+		detail: `The build goes there anyway: ${each.reason}.`,
+		fix: commandFix(each, entry)
+	}))];
 }
 async function inspectMachine(entry, status, deviceName, fix, version, tickets, io, check, operation) {
 	const parsed = parseMachine$1(entry);
@@ -372,13 +443,14 @@ async function inspectMachine(entry, status, deviceName, fix, version, tickets,
 	};
 	const peer = findPeer$1(status, parsed.name);
 	if (peer === "missing" || peer === "ambiguous") {
-		const detail = peer === "missing" ? "No peer on this tailnet has that name." : "Several peers match that name.";
+		const diagnosis = notOnTailnetDiagnosis(entry, peer === "ambiguous");
 		return {
 			report: {
 				machine: entry,
-				state: "not-on-tailnet"
+				state: "not-on-tailnet",
+				diagnosis
 			},
-			finding: note(`Remote machine ${entry} is not on this tailnet`, detail)
+			finding: diagnosisFinding("build-machine", entry, diagnosis)
 		};
 	}
 	const credential = readBuildMachines().find((each) => each.machine === entry);
@@ -459,21 +531,40 @@ async function inspectMachine(entry, status, deviceName, fix, version, tickets,
 		};
 		case "outdated": {
 			const outdated = outdatedServer(entry, version, outcome.command);
+			const diagnosis = {
+				layer: "compat",
+				code: "server-outdated",
+				title: "Server is outdated",
+				message: outdated.detail,
+				remedy: outdated.fix
+			};
 			return {
 				report: {
 					...paired,
-					state: "outdated"
+					state: "outdated",
+					diagnosis
 				},
 				finding: note(outdated.title, outdated.detail, outdated.fix)
 			};
 		}
-		case "unreachable": return {
-			report: {
-				...paired,
-				state: "unreachable"
-			},
-			finding: note(`Could not reach remote machine ${entry}`, outcome.reason, `Check that stim-server runs on ${entry}. To keep it running there, run \`stim-server service install --serve\` on ${entry}.`)
-		};
+		case "unreachable": {
+			const diagnosis = await diagnoseOutcome(io, {
+				entry,
+				peer,
+				port: parsed.port,
+				target: endpoint(peer, parsed.port),
+				reason: outcome.reason,
+				transport: outcome.transport
+			});
+			return {
+				report: {
+					...paired,
+					state: "unreachable",
+					diagnosis
+				},
+				finding: diagnosisFinding("build-machine", entry, diagnosis)
+			};
+		}
 	}
 	const permissions = readHostPermissions(outcome.result.host);
 	const host = permissions ? { host: permissions } : {};
@@ -485,7 +576,7 @@ async function inspectMachine(entry, status, deviceName, fix, version, tickets,
 		},
 		finding: null
 	};
-	const { capacity, problems } = await check(outcome.credential);
+	const { capacity, problems, notes = [] } = await check(outcome.credential);
 	return {
 		report: {
 			...paired,
@@ -494,10 +585,11 @@ async function inspectMachine(entry, status, deviceName, fix, version, tickets,
 			offloadable: problems.length === 0,
 			reasons: problems.map((problem) => problem.reason),
 			problems,
+			...notes.length ? { notes } : {},
 			...capacity ? { capacity } : {}
 		},
 		finding: null,
-		extra: offloadFindings(entry, problems)
+		extra: offloadFindings(entry, problems, notes)
 	};
 }
 /**
@@ -519,13 +611,17 @@ async function inspectBuildMachines({ fix, check = null, version = "<version>",
 		machines: []
 	};
 	const status = await io.status();
-	if (!isJsonObject(status)) return {
-		findings: [note("Remote machines are unreachable", "remote.machines names remote machines, but Tailscale is not running.")],
-		machines: entries.map((machine) => ({
-			machine,
-			state: "tailscale-off"
-		}))
-	};
+	if (!isJsonObject(status)) {
+		const diagnosis = await diagnoseTailscale(io);
+		return {
+			findings: [note("Remote machines are unreachable", `remote.machines names remote machines. ${diagnosis.message}`, diagnosis.remedy)],
+			machines: entries.map((machine) => ({
+				machine,
+				state: "tailscale-off",
+				diagnosis
+			}))
+		};
+	}
 	const self = isJsonObject(status.Self) ? status.Self : {};
 	const deviceName = (typeof self.HostName === "string" && self.HostName ? self.HostName : hostname()).replace(/[\p{Cc}\p{Cf}]/gu, "").trim().slice(0, 64) || "Mac";
 	const inspection = {
@@ -547,6 +643,23 @@ const FINGERPRINT_MISMATCH_REMEDY = "The build Mac fingerprints the synced check
 function fingerprintMismatchRemedy(reason) {
 	return reason.startsWith("fingerprint-mismatch: the checkout there ") ? FINGERPRINT_MISMATCH_REMEDY : void 0;
 }
+const PODS_FAILED_PREFIX = "pod install failed: ";
+/** The reason a failed worker job is reported with: a `pods-failed` code reads as a failed pod install. */
+function workerFailureReason(code, message) {
+	return code === "pods-failed" ? `${PODS_FAILED_PREFIX}${String(message ?? "")}` : `${String(code ?? "failed")}: ${String(message ?? "")}`;
+}
+/** The remedy for a worker whose `pod install` failed, naming the install when it has no CocoaPods; undefined for any other reason. */
+function podsFailedRemedy(machine, reason, localCocoapods) {
+	if (!reason.startsWith(PODS_FAILED_PREFIX)) return void 0;
+	const retry = "run the same command again, or rerun with --remote-build auto or --remote-build local";
+	if (!reason.includes("CocoaPods is not installed: no `pod` executable on PATH.")) return `Fix the pod install error on ${machine} (run pod install in its checkout under server.workerRoot there to see all of it), then ${retry}.`;
+	const { lead, commands } = cocoapodsInstall(localCocoapods);
+	return [
+		`On ${machine}, ${lead}:`,
+		...commands,
+		`Then ${retry}.`
+	].join("\n");
+}
 var OffloadRefusal = class extends Error {
 	code = "STIM_OFFLOAD_REFUSED";
 	remedy;
@@ -623,4 +736,4 @@ function resolveBuildPlacement(flag) {
 	}
 }
 //#endregion
-export { parseBuildMachineOption as a, resolveBuildPlacement as c, configuredMachines as d, hostingMachines as f, namedBuildMachine as i, inspectBuildMachines as l, buildPlacementSettings as n, requireLocalBuild as o, inspectDeviceHostMachines as p, fingerprintMismatchRemedy as r, resolveBuildMachine as s, OffloadRefusal as t, pairedMachines as u };
+export { parseBuildMachineOption as a, resolveBuildMachine as c, inspectBuildMachines as d, pairedMachines as f, inspectDeviceHostMachines as g, hostingMachines as h, namedBuildMachine as i, resolveBuildPlacement as l, configuredMachines as m, buildPlacementSettings as n, podsFailedRemedy as o, predictedRefusal as p, fingerprintMismatchRemedy as r, requireLocalBuild as s, OffloadRefusal as t, workerFailureReason as u };

package/dist/{server-bare-Z1ToVLPn.mjs → server-bare-A75rDIdD.mjs}

@@ -1,6 +1,6 @@
 import { O as __commonJSMin, k as __require, t as getExecutor } from "./exec-VFRpu1iA.mjs";
-import { q as resolveProjectSettings } from "./settings-RKwY33wv.mjs";
-import { c as registerMetroStore, f as resolveMetroSharedCache, n as supervisorError, r as appendCacheStore, s as metroStoreRoot } from "./errors-ccaPc4ox.mjs";
+import { J as resolveProjectSettings } from "./settings-CosW5X-S.mjs";
+import { c as registerMetroStore, f as resolveMetroSharedCache, n as supervisorError, r as appendCacheStore, s as metroStoreRoot } from "./errors-DHm_U5gv.mjs";
 import { createRequire } from "node:module";
 import { isAbsolute, join, relative, sep } from "node:path";
 //#endregion
@@ -14,6 +14,12 @@ var import_bundle_response = (/* @__PURE__ */ __commonJSMin(((exports, module) =
 	]);
 	const PROGRESS_PART = /^\{"done":(\d+),"total":(\d+),"percent":(\d+)\}$/;
 	const PROGRESS_INTERVAL_MS = 1e3;
+	const MANIFEST_PATHS = /* @__PURE__ */ new Set([
+		"/",
+		"/manifest",
+		"/index.exp"
+	]);
+	const observedServers = /* @__PURE__ */ new WeakSet();
 	function clientPidFromLsof(output, clientPort, serverPort) {
 		const connection = new RegExp(`:${clientPort}->\\S*:${serverPort}$`);
 		let pid = null;
@@ -30,9 +36,54 @@ var import_bundle_response = (/* @__PURE__ */ __commonJSMin(((exports, module) =
 			"-Fpn"
 		])).then((output) => clientPidFromLsof(output, remotePort, localPort)).catch(() => null);
 	}
-	function bundleResponseMiddleware(write, { runLsof } = {}) {
+	function manifestPlatform(req) {
+		if (req.method !== "GET") return null;
+		let url;
+		try {
+			url = new URL(req.url, "http://localhost");
+		} catch {
+			return null;
+		}
+		if (!MANIFEST_PATHS.has(url.pathname)) return null;
+		const platform = url.searchParams.get("platform") || req.headers["expo-platform"] || req.headers["exponent-platform"];
+		return platform === "ios" || platform === "android" ? platform : null;
+	}
+	function observeManifestRequests(server, write) {
+		if (!server || observedServers.has(server)) return;
+		observedServers.add(server);
+		server.prependListener("request", (req, res) => {
+			const platform = manifestPlatform(req);
+			if (!platform || req.headers["x-stim-metro-warmup"] === "1") return;
+			const requestId = randomUUID();
+			const emit = (stage, statusCode) => {
+				try {
+					write({
+						ts: Date.now(),
+						src: "metro",
+						level: "debug",
+						event: `manifest_request_${stage}`,
+						platform,
+						requestId,
+						...statusCode ? { statusCode } : {},
+						msg: `${platform} manifest request ${stage}`
+					});
+				} catch {}
+			};
+			emit("started");
+			let ended = false;
+			const finish = (complete) => {
+				if (ended) return;
+				ended = true;
+				emit(complete && res.statusCode === 200 ? "finished" : "failed", res.statusCode);
+			};
+			res.once("finish", () => finish(true));
+			res.once("close", () => finish(false));
+		});
+	}
+	function bundleResponseMiddleware(write, { runLsof, manifests = false } = {}) {
 		return (req, res, next) => {
 			if (req.method === "GET" && req.url === "/_stim/metro-warmup") {
+				if (manifests) observeManifestRequests(req.socket.server, write);
 				res.end("ready");
 				return;
 			}
@@ -59,6 +110,7 @@ var import_bundle_response = (/* @__PURE__ */ __commonJSMin(((exports, module) =
 						requestId,
 						...progress ?? { statusCode },
 						msg: progress ? `${platform} bundle ${progress.percent}%` : `${platform} bundle ${kind} ${stage}`,
+						...stage === "started" && !prefetch ? { url: `${url.pathname}${url.search}` } : {},
 						...pid ? { clientPid: pid } : {}
 					});
 				} catch {}

package/dist/{server-command-C0pmjNdG.mjs → server-command-CssKFOD7.mjs}

@@ -1,9 +1,9 @@
 import { t as getExecutor } from "./exec-VFRpu1iA.mjs";
-import { n as METRO_COMMAND_PORT } from "./settings-RKwY33wv.mjs";
-import { T as MODE_COMMAND } from "./project-Dz-hWkb-.mjs";
-import { f as signalProcessTree } from "./metro-Bu8LBfzS.mjs";
+import { n as METRO_COMMAND_PORT } from "./settings-CosW5X-S.mjs";
+import { T as MODE_COMMAND } from "./project-BUu6Is4k.mjs";
+import { f as signalProcessTree } from "./metro-CjC10t6E.mjs";
 import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
-import { g as projectNodeLine, p as recordFromLine, v as withProjectNode, y as superviseChildServer } from "./server-expo-Tt_hLRpy.mjs";
+import { g as projectNodeLine, p as recordFromLine, v as withProjectNode, y as superviseChildServer } from "./server-expo-eQfOdydb.mjs";
 import { join } from "node:path";
 import { LOG_ROTATE_BYTES } from "@stim-cli/core";
 //#region src/supervisor/server-command.ts

package/dist/{server-expo-Tt_hLRpy.mjs → server-expo-eQfOdydb.mjs}

@@ -1,9 +1,9 @@
 import { o as cancellableSleep, t as getExecutor } from "./exec-VFRpu1iA.mjs";
 import { n as stripAnsi, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { q as resolveProjectSettings } from "./settings-RKwY33wv.mjs";
-import { C as resolvePackageJson } from "./project-Dz-hWkb-.mjs";
+import { J as resolveProjectSettings } from "./settings-CosW5X-S.mjs";
+import { C as resolvePackageJson } from "./project-BUu6Is4k.mjs";
 import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
-import { a as expoMetroStoreEnv, c as registerMetroStore, f as resolveMetroSharedCache, i as expoMetroConfigPath, n as supervisorError, o as metroStoreConfirmedRoot, s as metroStoreRoot } from "./errors-ccaPc4ox.mjs";
+import { a as expoMetroStoreEnv, c as registerMetroStore, f as resolveMetroSharedCache, i as expoMetroConfigPath, n as supervisorError, o as metroStoreConfirmedRoot, s as metroStoreRoot } from "./errors-DHm_U5gv.mjs";
 import { accessSync, constants, existsSync, readFileSync } from "node:fs";
 import { delimiter, dirname, join } from "node:path";
 import { LOG_ROTATE_BYTES } from "@stim-cli/core";
@@ -249,7 +249,7 @@ function recordFromLine(line, { stream = "stdout", source = "expo" } = {}) {
 	if (!msg.trim()) return null;
 	if (stream === "stderr" && msg.startsWith("stim-bundle-response: ")) try {
 		const record = JSON.parse(msg.slice(22));
-		if (record.src === "metro" && /^bundle_(response|prefetch)_(started|progress|finished|failed)$/.test(record.event) && ["ios", "android"].includes(record.platform) && typeof record.requestId === "string" && Number.isFinite(record.ts)) return record;
+		if (record.src === "metro" && /^(?:bundle_(?:response|prefetch)_(?:started|progress|finished|failed)|manifest_request_(?:started|finished|failed))$/.test(record.event) && ["ios", "android"].includes(record.platform) && typeof record.requestId === "string" && Number.isFinite(record.ts)) return record;
 	} catch {}
 	const confirmed = metroStoreConfirmedRoot(msg);
 	if (confirmed) return {
@@ -286,7 +286,7 @@ function parseExpoWaitingOnUrl(line) {
 	if (HTTP_SCHEME_RE.test(url)) return url;
 	return URL_SCHEME_RE.test(url) ? url.replace(/^[^:]+:/, "https:") : url;
 }
-function resolveMetroStoreInjection(root, { log, env, settings }) {
+function resolveMetroStoreInjection(root, { log, env, settings, port }) {
 	const sharedCache = resolveMetroSharedCache(settings);
 	if (!sharedCache) log.write({
 		src: "metro",
@@ -317,6 +317,7 @@ function resolveMetroStoreInjection(root, { log, env, settings }) {
 	const storeRoot = sharedCache ? metroStoreRoot(root) : "";
 	const additions = expoMetroStoreEnv({
 		root,
+		port,
 		storeRoot,
 		adapterPath,
 		existingOverride: env.EXPO_OVERRIDE_METRO_CONFIG
@@ -350,7 +351,8 @@ async function startExpoServer({ root, port, logsDir, writer = null, spawnFn = n
 	const storeEnv = resolveMetroStoreInjection(root, {
 		log,
 		env: process.env,
-		settings: settings ?? resolveProjectSettings(root).settings
+		settings: settings ?? resolveProjectSettings(root).settings,
+		port
 	});
 	const [command, commandArgs] = platform === "win32" && resolved.source === "package" ? [process.execPath, [bin, ...args]] : [bin, args];
 	const node = withProjectNode(root, process.env);

package/dist/server-expo-wvcj5tiZ.mjs

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