stim 1.20.2 → 1.21.0

package/dist/{simslim-CCr3rE-A.mjs → simslim-Cgk17SXV.mjs}

@@ -1,9 +1,9 @@
-import { d as getConfigDir, j as ownership_claim_exports, k as process_identity_exports } from "./config-BYDxlMY3.mjs";
-import { t as getExecutor } from "./exec-DqKo9GKJ.mjs";
+import { f as ownership_claim_exports, l as isTermination, p as process_identity_exports, t as getExecutor, u as operationState } from "./exec-_UbtCQcG.mjs";
+import { d as getConfigDir } from "./config-CYcBF478.mjs";
 import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
 import { join } from "node:path";
 //#region src/engine/simslim.ts
-async function reconcileSimSlim({ udid, profile, previouslyManaged = false, out = () => {}, spawn, timeoutMs = 72e4, cleanupMs = 1e4 }) {
+async function reconcileSimSlim({ udid, profile, previouslyManaged = false, out = () => {}, spawn, timeoutMs = 72e4, cleanupMs = 1e4, context }) {
 	if (!profile && !previouslyManaged) return {
 		managed: false,
 		profile: null
@@ -53,8 +53,12 @@ async function reconcileSimSlim({ udid, profile, previouslyManaged = false, out
 		cancellation ??= signal;
 		stopGroup();
 	};
-	const onInterrupt = () => cancel("SIGINT");
-	const onTerminate = () => cancel("SIGTERM");
+	const state = operationState(context);
+	const onAbort = () => {
+		state.handled = true;
+		state.draining = true;
+		cancel(isTermination(context?.signal.reason) ? "SIGTERM" : "SIGINT");
+	};
 	const groupAlive = () => child?.pid !== void 0 && (0, ownership_claim_exports.processGroupAlive)(child.pid);
 	const settled = () => result !== void 0 && !groupAlive();
 	const waitUntil = async (deadline, cancellable = false) => {
@@ -64,10 +68,10 @@ async function reconcileSimSlim({ udid, profile, previouslyManaged = false, out
 		}
 		return settled();
 	};
-	process.on("SIGINT", onInterrupt);
-	process.on("SIGTERM", onTerminate);
-	process.on("exit", stopGroup);
+	context?.signal.addEventListener("abort", onAbort);
+	state.exitCleanups.add(stopGroup);
 	try {
+		if (context?.signal.aborted) onAbort();
 		(0, ownership_claim_exports.markClaimChildPending)(claim);
 		try {
 			child = (spawn ?? ((cmd, childArgs, opts) => getExecutor().spawn(cmd, childArgs, opts)))("simslim", args, {
@@ -115,10 +119,8 @@ async function reconcileSimSlim({ udid, profile, previouslyManaged = false, out
 			child.stderr?.destroy?.();
 			child.unref();
 		}
-		process.off("SIGINT", onInterrupt);
-		process.off("SIGTERM", onTerminate);
-		process.off("exit", stopGroup);
-		if (cancellation) process.exit(cancellation === "SIGINT" ? 130 : 143);
+		context?.signal.removeEventListener("abort", onAbort);
+		state.exitCleanups.delete(stopGroup);
 	}
 	stdout.flush();
 	stderr.flush();

package/dist/{slot-launch-DPt0m9Nd.mjs → slot-launch-DF8VfT64.mjs}

@@ -1,9 +1,9 @@
-import { H as parseDeviceSlotKey, W as projectDeviceSlots, p as getProject } from "./config-BYDxlMY3.mjs";
-import { n as fileLeaseIo } from "./device-lease-BX1sJQ2E.mjs";
-import { r as readWorkspaceState$1 } from "./workspace-state-DJt_MMvf.mjs";
-import { E as getAvdNameForSerial, O as listAdbDevices } from "./android-Mz_Inn3w.mjs";
-import { d as listAllIosSims } from "./ios-RkW4pnQf.mjs";
-import { p as deviceShellArg } from "./app-install-BIKtMfPq.mjs";
+import { K as projectDeviceSlots, W as parseDeviceSlotKey, p as getProject } from "./config-CYcBF478.mjs";
+import { r as readWorkspaceState$1 } from "./workspace-state-Cjuigeeu.mjs";
+import { gn as deviceShellArg } from "./budget-Bs6SxxzO.mjs";
+import { y as fileLeaseIo } from "./activity-BzVfHSrY.mjs";
+import { A as listAdbDevicesAsync, D as getAvdNameForSerialAsync } from "./android-DUYkNF4u.mjs";
+import { f as listAllIosSimsAsync } from "./ios-CpByZy12.mjs";
 import { hostedNativeRecords } from "@stim-cli/core/state";
 //#region src/engine/slot-launch.ts
 function launchSlotScope(root, slot = "default") {
@@ -19,31 +19,26 @@ function launchSlotScope(root, slot = "default") {
 const DEVICE_LISTING_TIMEOUT_MS = 5e3;
 function ownedDeviceRunning(platform) {
 	let listing = null;
-	const list = () => {
+	const list = async () => {
 		if (platform === "android") {
-			const { emulators, unhealthy } = listAdbDevices({ timeoutMs: DEVICE_LISTING_TIMEOUT_MS });
+			const { emulators, unhealthy } = await listAdbDevicesAsync({ timeoutMs: DEVICE_LISTING_TIMEOUT_MS });
 			const names = [];
 			for (const entry of [...emulators, ...unhealthy.filter((candidate) => candidate.kind === "emulator")]) {
-				const name = getAvdNameForSerial(entry.serial, { timeoutMs: DEVICE_LISTING_TIMEOUT_MS });
+				const name = await getAvdNameForSerialAsync(entry.serial, { timeoutMs: DEVICE_LISTING_TIMEOUT_MS });
 				if (name === null) return () => true;
 				names.push(name);
 			}
 			return (device) => typeof device.avdName === "string" && names.includes(device.avdName);
 		}
-		const booted = new Set(listAllIosSims({ timeoutMs: DEVICE_LISTING_TIMEOUT_MS }).filter((sim) => sim.state === "Booted").map((sim) => sim.udid));
+		const booted = new Set((await listAllIosSimsAsync({ timeoutMs: DEVICE_LISTING_TIMEOUT_MS })).filter((sim) => sim.state === "Booted").map((sim) => sim.udid));
 		return (device) => typeof device.deviceUdid === "string" && booted.has(device.deviceUdid);
 	};
-	return (device) => {
-		try {
-			listing ??= list();
-			return listing(device);
-		} catch {
-			listing = () => true;
-			return true;
-		}
+	return async (device) => {
+		listing ??= list().catch(() => () => true);
+		return (await listing)(device);
 	};
 }
-function siblingPlatformSlots(root, platform, slot = "default", { deviceRunning = ownedDeviceRunning(platform) } = {}) {
+async function siblingPlatformSlots(root, platform, slot = "default", { deviceRunning = ownedDeviceRunning(platform) } = {}) {
 	const slots = /* @__PURE__ */ new Set();
 	const state = readWorkspaceState$1(root);
 	for (const hosted of Object.keys(hostedNativeRecords(state, platform))) slots.add(hosted);
@@ -56,7 +51,7 @@ function siblingPlatformSlots(root, platform, slot = "default", { deviceRunning
 	}
 	for (const { slot: other, platforms } of projectDeviceSlots(getProject(root))) {
 		const device = platforms[platform];
-		if (other !== slot && !slots.has(other) && device && deviceRunning(device)) slots.add(other);
+		if (other !== slot && !slots.has(other) && device && await deviceRunning(device)) slots.add(other);
 	}
 	slots.delete(slot);
 	return [...slots].toSorted();

package/dist/{spawn-entry-Dcb7sDUz.mjs → spawn-entry-jw19m8Nl.mjs}

@@ -2,7 +2,6 @@ import { basename, dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 //#region src/spawn-entry.ts
 const DEV_ENTRIES = {
-	"api-run": "./api-run.ts",
 	"supervisor-run": "./supervisor/run.ts",
 	"collector-run": "./collector/run.ts",
 	"web-run": "./web/run.ts",

package/dist/stage-BIS0ydsV.mjs

@@ -0,0 +1,183 @@
+import { d as withDrainingCancellation, t as getExecutor } from "./exec-_UbtCQcG.mjs";
+import { en as throwIfCancelled } from "./settings-CsJDEXgK.mjs";
+import { d as runCancellationSignal } from "./native-run-DY_RLx3C.mjs";
+import { existsSync, lstatSync, promises, readdirSync, realpathSync, statSync } from "node:fs";
+import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
+import { validMacosResourceDestination } from "@stim-cli/core";
+//#region src/macos/stage.ts
+async function validateInfoPlist(context, root, product, infoPlist) {
+	const source = resolve(root, infoPlist);
+	const inside = relative(realpathSync(root), realpathSync(source));
+	if (!lstatSync(source).isFile() || inside === ".." || inside.startsWith(`..${sep}`) || isAbsolute(inside)) throw new Error("macos.infoPlist must be a regular file inside the project, not a symbolic link. See stim guide macos.");
+	const plist = JSON.parse(await tool(context, "plutil", [
+		"-convert",
+		"json",
+		"-o",
+		"-",
+		source
+	], { timeoutMs: 1e4 }));
+	if (typeof plist.CFBundleIdentifier !== "string" || plist.CFBundleExecutable !== product) throw new Error("macos.infoPlist must name a CFBundleIdentifier and the selected product as CFBundleExecutable.");
+	if (plist.CFBundleURLTypes || plist.SUFeedURL) throw new Error("Use a development Info.plist without shared URL schemes or an update feed.");
+	if (plist.LSMinimumSystemVersion !== void 0 && typeof plist.LSMinimumSystemVersion !== "string") throw new Error("macos.infoPlist LSMinimumSystemVersion must be a string. See stim guide macos.");
+	return {
+		bundleId: plist.CFBundleIdentifier,
+		minimumSystemVersion: plist.LSMinimumSystemVersion
+	};
+}
+async function setBundleName(context, plistPath, name) {
+	for (const key of ["CFBundleDisplayName", "CFBundleName"]) await tool(context, "plutil", [
+		"-replace",
+		key,
+		"-string",
+		name,
+		plistPath
+	], { timeoutMs: 1e4 });
+}
+function resourceError(key, entry, reason) {
+	throw new Error(`${key} entry ${JSON.stringify(entry)}: ${reason}. See stim guide macos.`);
+}
+function containsSymlink(dir) {
+	return readdirSync(dir, { withFileTypes: true }).some((entry) => entry.isSymbolicLink() || entry.isDirectory() && containsSymlink(join(dir, entry.name)));
+}
+function overlaps(a, b) {
+	a = a.normalize("NFC").toLowerCase();
+	b = b.normalize("NFC").toLowerCase();
+	return a === b || a.startsWith(`${b}/`) || b.startsWith(`${a}/`);
+}
+function resolveBundleExtras(root, repository, resources = {}, assetCatalog) {
+	const boundary = realpathSync(repository);
+	const sourcePath = (key, entry) => {
+		if (typeof entry !== "string" || !entry || isAbsolute(entry) || entry.includes("\0")) resourceError(key, entry, "source must be a non-empty relative path");
+		let source;
+		try {
+			source = realpathSync(resolve(root, entry));
+		} catch {
+			resourceError(key, entry, "source does not exist");
+		}
+		const path = relative(boundary, source);
+		if (path === ".." || path.startsWith(`..${sep}`) || isAbsolute(path)) resourceError(key, entry, "source leaves the repository");
+		if (path === "") resourceError(key, entry, "source is the repository root");
+		const stat = statSync(source);
+		if (!stat.isFile() && !stat.isDirectory()) resourceError(key, entry, "source must be a regular file or directory");
+		if (stat.isDirectory() && containsSymlink(source)) resourceError(key, entry, "source directory contains a symbolic link");
+		return source;
+	};
+	let catalog;
+	if (assetCatalog !== void 0 && assetCatalog !== null) {
+		catalog = sourcePath("macos.assetCatalog", assetCatalog);
+		if (!catalog.endsWith(".xcassets") || !statSync(catalog).isDirectory()) resourceError("macos.assetCatalog", assetCatalog, "catalog must be a .xcassets directory");
+	}
+	if (!resources || typeof resources !== "object" || Array.isArray(resources)) resourceError("macos.resources", resources, "expected an object");
+	const entries = Object.entries(resources);
+	if (entries.length > 256) {
+		const [destination, source] = entries[256];
+		resourceError(`macos.resources[${JSON.stringify(destination)}]`, source, "at most 256 entries are allowed");
+	}
+	const reserved = catalog ? ["Assets.car"] : [];
+	const resolved = [];
+	for (const [destination, source] of entries) {
+		const key = `macos.resources[${JSON.stringify(destination)}]`;
+		if (!validMacosResourceDestination(destination)) resourceError(key, source, "invalid destination");
+		if (reserved.some((other) => overlaps(destination, other))) resourceError(key, source, "destination collides with another resource");
+		reserved.push(destination);
+		resolved.push([destination, sourcePath(key, source)]);
+	}
+	return {
+		resources: Object.fromEntries(resolved),
+		assetCatalog: catalog
+	};
+}
+async function stageBundle(context, root, product, infoPlist, bin, bundle, bundleId, extras = { resources: {} }, displayName) {
+	const signal = runCancellationSignal(context) ?? context.signal;
+	await withDrainingCancellation(context, signal, async () => {
+		throwIfCancelled(signal, "macOS bundle staging");
+		const { minimumSystemVersion } = await validateInfoPlist(context, root, product, infoPlist);
+		for (const entry of readdirSync(bin).filter((name) => name.endsWith(".bundle"))) for (const [destination, source] of Object.entries(extras.resources)) if (overlaps(destination, entry)) resourceError(`macos.resources[${JSON.stringify(destination)}]`, source, `destination collides with ${entry}`);
+		await promises.rm(bundle, {
+			recursive: true,
+			force: true
+		});
+		const contents = join(bundle, "Contents");
+		await promises.mkdir(join(contents, "MacOS"), { recursive: true });
+		await promises.mkdir(join(contents, "Resources"), { recursive: true });
+		await promises.mkdir(join(contents, "Frameworks"), { recursive: true });
+		const executable = join(contents, "MacOS", product);
+		await copy(context, join(bin, product), executable);
+		await copy(context, resolve(root, infoPlist), join(contents, "Info.plist"));
+		await tool(context, "/usr/libexec/PlistBuddy", [
+			"-c",
+			`Set :CFBundleIdentifier ${bundleId}`,
+			join(contents, "Info.plist")
+		], { timeoutMs: 1e4 });
+		if (displayName !== void 0) await setBundleName(context, join(contents, "Info.plist"), displayName);
+		for (const entry of readdirSync(bin)) if (entry.endsWith(".framework")) {
+			const target = join(contents, "Frameworks", entry);
+			await copy(context, join(bin, entry), target, {
+				recursive: true,
+				dereference: false,
+				verbatimSymlinks: true
+			});
+			await tool(context, "codesign", [
+				"--force",
+				"--sign",
+				"-",
+				target
+			], { timeoutMs: "unbounded" });
+		} else if (entry.endsWith(".bundle")) await copy(context, join(bin, entry), join(contents, "Resources", entry), { recursive: true });
+		const frameworkPath = "@executable_path/../Frameworks";
+		if (!(await tool(context, "otool", ["-l", executable], { timeoutMs: 3e4 })).includes(frameworkPath)) await tool(context, "install_name_tool", [
+			"-add_rpath",
+			frameworkPath,
+			executable
+		], { timeoutMs: 3e4 });
+		for (const [destination, source] of Object.entries(extras.resources)) {
+			const target = join(contents, "Resources", destination);
+			await promises.mkdir(dirname(target), { recursive: true });
+			await copy(context, source, target, { recursive: true });
+		}
+		if (extras.assetCatalog) {
+			await tool(context, "xcrun", [
+				"actool",
+				extras.assetCatalog,
+				"--compile",
+				join(contents, "Resources"),
+				"--platform",
+				"macosx",
+				...minimumSystemVersion === void 0 ? [] : ["--minimum-deployment-target", minimumSystemVersion],
+				"--output-partial-info-plist",
+				"/dev/null"
+			], { timeoutMs: "unbounded" });
+			if (!existsSync(join(contents, "Resources", "Assets.car"))) resourceError("macos.assetCatalog", extras.assetCatalog, "actool did not produce Assets.car");
+		}
+		await tool(context, "codesign", [
+			"--force",
+			"--sign",
+			"-",
+			bundle
+		], { timeoutMs: "unbounded" });
+	});
+}
+async function tool(context, file, args, options) {
+	const signal = runCancellationSignal(context) ?? context.signal;
+	throwIfCancelled(signal, "macOS bundle staging");
+	const result = await getExecutor().runFileAsync(file, args, {
+		...options,
+		declareFor: context
+	});
+	throwIfCancelled(signal, "macOS bundle staging");
+	return result;
+}
+async function copy(context, source, target, options = {}) {
+	const signal = runCancellationSignal(context) ?? context.signal;
+	throwIfCancelled(signal, "macOS bundle staging");
+	await promises.cp(source, target, {
+		...options,
+		filter: () => {
+			throwIfCancelled(signal, "macOS bundle staging");
+			return true;
+		}
+	});
+	throwIfCancelled(signal, "macOS bundle staging");
+}
+//#endregion
+export { validateInfoPlist as i, setBundleName as n, stageBundle as r, resolveBundleExtras as t };

package/dist/{start-BWqzODpb.mjs → start-7lpH7hmN.mjs}

@@ -1,26 +1,26 @@
-import { E as upsertProject, k as process_identity_exports, p as getProject } from "./config-BYDxlMY3.mjs";
-import { t as getExecutor } from "./exec-DqKo9GKJ.mjs";
-import { t as spawnEntry } from "./spawn-entry-Dcb7sDUz.mjs";
-import { A as metroIdleStopMinutesSetting, B as remoteAndroidSetting, G as resolveIosProjectDir, H as remoteIosSetting, K as resolveProjectSettings, L as publicUrlSetting, M as metroTunnelSettingError, O as metroCommandSetting, P as ngrokUrlSetting, Q as settingShapeErrors, U as resolveAndroidLayout, W as resolveCacheProviderConfig, a as SETTING_SHAPE_REMEDY, at as PUBLIC_METRO_ENV, h as deviceIdleShutdownMinutesSetting, j as metroPortSetting, k as metroCommandSettingError, m as defaultAndroidLayout, nt as unknownSettingKeys, ot as detectProviders, p as cacheProviderSettingError, st as planMetroReach, tt as tunnelModeSetting } from "./settings-B717odTD.mjs";
-import { _ as supervisorLogFile, c as writeWorkspaceState, i as recordWorkspaceUse, n as clearWorkspaceStateKeys, p as ensureWorkspaceStorage, r as readWorkspaceState$1, w as workspaceLogsDir$1, y as workspaceAgentDeviceDir } from "./workspace-state-DJt_MMvf.mjs";
-import { _ as stepTimer, l as phaseLine } from "./command-output-BTy8hZ0F.mjs";
-import { C as MODE_BARE, D as clearManagedMetroTunnel, T as MODE_EXPO, _ as detectIsExpo, b as readAppConfigText, j as readMetroTunnel, r as findProjectRoot, s as projectProblem, t as NO_PROJECT_REFUSAL, w as MODE_COMMAND, x as readAppJson } from "./project-_phNIJfs.mjs";
-import { a as workspaceLinks, i as workspaceLinkLine } from "./stim-desktop-BzBN2Em2.mjs";
-import { d as signalProcessTree, g as PortInspectionError, h as PORT_INSPECTION_REMEDY, m as reserveMetroPort, s as pidExists, u as resolveProjectMetro } from "./metro-DnCEjCxs.mjs";
-import { D as stopTunnel, E as startTunnelSequence, O as terminateChild, P as resolveSupervisorTarget, j as withManagedTunnelLock, k as withManagedRemoteWorktreeLock } from "./workspaces-C36s2jb9.mjs";
-import { ct as stopOwnedMetroForReset, t as budgetGate } from "./budget-f7516Zk0.mjs";
-import { a as withWorkspaceProcessLock, o as workspaceProcessLockError } from "./named-ports-4WopRPg-.mjs";
-import { t as cancellableSleep } from "./cancellation-C_22VQTH.mjs";
-import { i as levelRank } from "./ndjson-GOnbyvso.mjs";
-import { d as readProjectConfig } from "./remote-cache-OyOyVIS3.mjs";
-import { n as windowsLauncherArgs } from "./detached-entry-B9C_zeQC.mjs";
+import { p as process_identity_exports, t as getExecutor } from "./exec-_UbtCQcG.mjs";
+import { l as workspaceAgentDeviceDir, m as workspaceLogsDir$1, n as ensureWorkspaceStorage, s as supervisorLogFile } from "./paths-DQtTgsBf.mjs";
+import { E as upsertProject, p as getProject } from "./config-CYcBF478.mjs";
+import { _ as stepTimer, l as phaseLine } from "./command-output-B1UrjZHL.mjs";
+import { d as writeWorkspaceState, i as recordWorkspaceUse, n as clearWorkspaceStateKeys, r as readWorkspaceState$1 } from "./workspace-state-Cjuigeeu.mjs";
+import { A as metroIdleStopMinutesSetting, G as resolveCacheProviderConfig, J as resolveProjectSettingsAsync, K as resolveIosProjectDir, M as metroTunnelSettingError, O as metroCommandSetting, P as ngrokUrlSetting, Qt as cancellableSleep, R as publicUrlSetting, U as remoteIosSetting, V as remoteAndroidSetting, W as resolveAndroidLayout, a as SETTING_SHAPE_REMEDY, ct as detectProviders, en as throwIfCancelled, et as settingShapeErrors, h as deviceIdleShutdownMinutesSetting, it as unknownSettingKeys, j as metroPortSetting, k as metroCommandSettingError, lt as planMetroReach, m as defaultAndroidLayout, p as cacheProviderSettingError, rt as tunnelModeSetting, st as PUBLIC_METRO_ENV } from "./settings-CsJDEXgK.mjs";
+import { E as MODE_EXPO, M as readMetroTunnel, O as clearManagedMetroTunnel, S as readAppJson, T as MODE_COMMAND, c as projectProblem, i as findProjectRoot$1, t as NO_PROJECT_REFUSAL, v as detectIsExpo, w as MODE_BARE, x as readAppConfigText } from "./project-BZNjmW_8.mjs";
+import { i as levelRank } from "./ndjson-CgE_o3Dl.mjs";
+import { _ as reserveMetroPort, d as processCwds, f as resolveProjectMetro, g as isMetroRunning, l as pidExists, o as listeningPidsAsync, p as signalProcessTree, v as PORT_INSPECTION_REMEDY, y as PortInspectionError } from "./metro-DEXpIhHC.mjs";
+import { Kn as readProjectConfig, p as stopOwnedMetroForReset, t as budgetGate } from "./budget-Bs6SxxzO.mjs";
+import { _ as terminateChild, b as withManagedTunnelLock, g as stopTunnel, h as startTunnelSequence, m as resolveSupervisorTarget, v as withManagedRemoteWorktreeLock } from "./workspaces-BccMFmGQ.mjs";
+import { a as workspaceLinkLine, o as workspaceLinks } from "./stim-desktop-C12we7lz.mjs";
+import { n as workspaceProcessLockError, t as withWorkspaceProcessLock } from "./workspace-process-lock-1_1OoVW5.mjs";
+import { t as spawnEntry } from "./spawn-entry-jw19m8Nl.mjs";
+import { n as windowsLauncherArgs } from "./detached-entry-DFRyG1_o.mjs";
 import { appendFileSync, mkdirSync, openSync, readFileSync } from "node:fs";
 import { dirname } from "node:path";
-import { join as join$1 } from "path";
+import { ambientContext, ambientEnv } from "@stim-cli/core";
 import { IDLE_STOP_KEY, queryLogs } from "@stim-cli/core/state";
-import { CACHE_PROVIDER_ENV, cacheProviderEnv } from "@stim-cli/cache";
-import { existsSync as existsSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1 } from "fs";
+import { join as join$1 } from "path";
 import chalk from "chalk";
+import { existsSync as existsSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1 } from "fs";
+import { CACHE_PROVIDER_ENV, cacheProviderEnv } from "@stim-cli/cache";
 import { EventEmitter } from "node:events";
 //#region src/workspace/app-id.ts
 const ANDROID_PACKAGE_NAME = /^[A-Za-z0-9_]+(?:\.[A-Za-z0-9_]+)+$/;
@@ -42,8 +42,8 @@ function configString(config, platform, key) {
 function literalString(text, key) {
 	return text?.match(new RegExp(`${key}\\s*:\\s*["']([^"']+)["']`))?.[1] ?? null;
 }
-function idsFromConfig(projectRoot) {
-	const read = readProjectConfig(projectRoot);
+async function idsFromConfig(projectRoot) {
+	const read = await readProjectConfig(projectRoot);
 	if (!read.unavailable) return {
 		bundleId: configString(read.config, "ios", "bundleIdentifier"),
 		androidPackage: configString(read.config, "android", "package")
@@ -55,8 +55,8 @@ function idsFromConfig(projectRoot) {
 		androidPackage: configString(appJson, "android", "package") ?? literalString(text, "package")
 	};
 }
-function detectAppIds(projectRoot, iosDir = join$1(projectRoot, "ios"), androidModuleDir = defaultAndroidLayout(projectRoot).moduleDir) {
-	const ids = idsFromConfig(projectRoot);
+async function detectAppIds(projectRoot, iosDir = join$1(projectRoot, "ios"), androidModuleDir = defaultAndroidLayout(projectRoot).moduleDir) {
+	const ids = await idsFromConfig(projectRoot);
 	const problems = [];
 	const accept = androidPackageFilter(problems);
 	return {
@@ -65,11 +65,11 @@ function detectAppIds(projectRoot, iosDir = join$1(projectRoot, "ios"), androidM
 		androidPackageProblem: problems.length > 0 ? problems.join(" ") : null
 	};
 }
-function detectBundleId(projectRoot, iosDir = join$1(projectRoot, "ios")) {
-	return detectAppIds(projectRoot, iosDir).bundleId;
+async function detectBundleId(projectRoot, iosDir = join$1(projectRoot, "ios")) {
+	return (await detectAppIds(projectRoot, iosDir)).bundleId;
 }
-function detectAndroidPackage(projectRoot, androidModuleDir = defaultAndroidLayout(projectRoot).moduleDir) {
-	return detectAppIds(projectRoot, void 0, androidModuleDir).androidPackage;
+async function detectAndroidPackage(projectRoot, androidModuleDir = defaultAndroidLayout(projectRoot).moduleDir) {
+	return (await detectAppIds(projectRoot, void 0, androidModuleDir)).androidPackage;
 }
 function detectBundleIdFromPbxproj(iosDir) {
 	if (!existsSync$1(iosDir)) return null;
@@ -123,6 +123,23 @@ function detectAndroidPackageFromGradle(moduleDir, accept) {
 const DEFAULT_WAIT_SECONDS = 60;
 const POLL_MS = 500;
 const LOG_TAIL_LINES = 5;
+async function resolveStartupMetro(port, root) {
+	const signal = ambientContext()?.signal;
+	throwIfCancelled(signal, "Metro startup");
+	const result = await resolveProjectMetro(port, root, {
+		pidsOf: listeningPidsAsync,
+		cwdOf: async (pid) => (await processCwds([pid])).get(pid) ?? null,
+		probe: (candidate) => isMetroRunning(candidate, signal)
+	});
+	throwIfCancelled(signal, "Metro startup");
+	return result;
+}
+function waitForStartup(ms) {
+	return cancellableSleep(ms, {
+		signal: ambientContext()?.signal,
+		what: "Metro startup"
+	});
+}
 function writeNote(line) {
 	console.error(line);
 }
@@ -264,7 +281,7 @@ function registerStart(program, overrides = {}) {
 			remedy: "Pass a whole number of seconds, e.g. --wait 90."
 		});
 		const waitSeconds = wait.seconds;
-		const root = findProjectRoot(process.cwd());
+		const root = findProjectRoot$1(process.cwd());
 		if (!root) return fail(NO_PROJECT_REFUSAL);
 		const problem = projectProblem(root, "dev-server");
 		if (problem) return fail({
@@ -282,7 +299,7 @@ function registerStart(program, overrides = {}) {
 			});
 		}
 		recordWorkspaceUse(root);
-		const { context: settingsContext, settings } = resolveProjectSettings(root);
+		const { context: settingsContext, settings } = await resolveProjectSettingsAsync(root);
 		const [shapeError, ...moreShapeErrors] = settingShapeErrors(settings);
 		if (shapeError) return fail({
 			code: "STIM_BAD_ARG",
@@ -314,7 +331,7 @@ function registerStart(program, overrides = {}) {
 			facts: result.facts,
 			waited: result.waited,
 			reclaimed: result.reclaimed,
-			links: workspaceLinks(root)
+			links: await workspaceLinks(root)
 		});
 	});
 }
@@ -376,7 +393,7 @@ async function startDevServer({ root, settings, settingsContext, waitSeconds = D
 		if (tunnel) note(chalk.dim("note   requesting an Expo tunnel for this workspace's dev server"));
 		const managedRemote = remote && !tunnel && !publicUrl && tunnelMode !== "off";
 		const runStart = async () => {
-			const appIds = detectAppIds(root, resolveIosProjectDir(settings, root).dir, resolveAndroidLayout(settings, root, settingsContext.repoRoot ?? root).moduleDir);
+			const appIds = await detectAppIds(root, resolveIosProjectDir(settings, root).dir, resolveAndroidLayout(settings, root, settingsContext.repoRoot ?? root).moduleDir);
 			upsertProject(root, {
 				bundleId: appIds.bundleId ?? void 0,
 				androidPackage: appIds.androidPackage ?? void 0,
@@ -385,14 +402,15 @@ async function startDevServer({ root, settings, settingsContext, waitSeconds = D
 			const gateBudget = async () => {
 				const budget = await d.budgetGate({
 					root,
-					note
+					note,
+					env: ambientEnv()
 				});
 				reclaimed = budget.reclaimed;
 				if (budget.refusal) return fail(budget.refusal);
 			};
 			if (resetCache) {
 				await gateBudget();
-				const pin = metroPortSetting(settings);
+				const pin = metroPortSetting(settings, ambientEnv());
 				if (pin.port !== null || pin.error) {
 					const pinCheck = await resolveWorkspaceMetroPort(root, settings, note, "start", false);
 					if (typeof pinCheck !== "number") return fail(pinCheck);
@@ -413,7 +431,7 @@ async function startDevServer({ root, settings, settingsContext, waitSeconds = D
 			const logFile = supervisorLogFile(root);
 			const port = await resolvePort(root, settings, note, fail);
 			let publicOrigin = remote ? publicUrl : null;
-			let resolution = await resolveProjectMetro(port, root);
+			let resolution = await resolveStartupMetro(port, root);
 			let supervisor = liveSupervisor({
 				state: readWorkspaceState$1(root),
 				project: getProject(root),
@@ -539,7 +557,7 @@ async function startDevServer({ root, settings, settingsContext, waitSeconds = D
 					String(deviceIdleShutdownMinutesSetting(settings))
 				];
 				const childEnv = {
-					...process.env,
+					...ambientEnv(),
 					...origin ? {
 						[PUBLIC_METRO_ENV]: origin,
 						EXPO_PACKAGER_PROXY_URL: origin
@@ -612,7 +630,7 @@ async function startDevServer({ root, settings, settingsContext, waitSeconds = D
 									startedHere: false
 								};
 							} else {
-								const currentResolution = await resolveProjectMetro(port, root);
+								const currentResolution = await resolveStartupMetro(port, root);
 								const currentSupervisor = liveSupervisor({
 									state: readWorkspaceState$1(root),
 									project: getProject(root),
@@ -662,7 +680,7 @@ async function startDevServer({ root, settings, settingsContext, waitSeconds = D
 									startedHere: true
 								};
 							}
-							const currentResolution = await resolveProjectMetro(port, root);
+							const currentResolution = await resolveStartupMetro(port, root);
 							const currentSupervisor = liveSupervisor({
 								state: readWorkspaceState$1(root),
 								project: getProject(root),
@@ -739,6 +757,7 @@ async function startDevServer({ root, settings, settingsContext, waitSeconds = D
 							};
 						});
 					} catch (err) {
+						if (err instanceof Error && "code" in err && err.code === "STIM_CANCELLED") throw err;
 						return fail({
 							code: "STIM_REMOTE_METRO_UNREACHABLE",
 							message: `Could not acquire the managed Metro tunnel lock: ${err?.message || err}`,
@@ -749,7 +768,7 @@ async function startDevServer({ root, settings, settingsContext, waitSeconds = D
 					publicOrigin = acquisition.origin;
 					managedTunnel = acquisition.tunnel;
 					if (managedTunnel.record.provider === "tailscale") note(phaseLine("lan", `tailnet-only Metro: ${publicOrigin}`));
-					resolution = await resolveProjectMetro(port, root);
+					resolution = await resolveStartupMetro(port, root);
 					supervisor = liveSupervisor({
 						state: readWorkspaceState$1(root),
 						project: getProject(root),
@@ -991,7 +1010,7 @@ async function resolvePort(root, settings, note, fail) {
 	return typeof result === "number" ? result : fail(result);
 }
 async function resolveWorkspaceMetroPort(root, settings, note, command, reserve = true) {
-	const setting = metroPortSetting(settings);
+	const setting = metroPortSetting(settings, ambientEnv());
 	if (setting.error) return {
 		code: "STIM_BAD_ARG",
 		message: setting.error,
@@ -1022,7 +1041,7 @@ async function resolveWorkspaceMetroPort(root, settings, note, command, reserve
 		}
 	}
 	if (pinned !== null) {
-		const held = await resolveProjectMetro(pinned, root);
+		const held = await resolveStartupMetro(pinned, root);
 		if (held.notOurs) return {
 			code: "STIM_BAD_ARG",
 			message: `Port ${pinned} is held by something else (${held.notOurs}), and metro.port pins this workspace's Metro to it.`,
@@ -1030,7 +1049,7 @@ async function resolveWorkspaceMetroPort(root, settings, note, command, reserve
 		};
 		if (recorded === pinned) return recorded;
 	} else if (recorded) {
-		const held = await resolveProjectMetro(recorded, root);
+		const held = await resolveStartupMetro(recorded, root);
 		if (!held.notOurs) return recorded;
 		const fresh = await reservePort(root, null);
 		if (typeof fresh === "number" && fresh !== recorded) {
@@ -1058,12 +1077,12 @@ async function reservePort(root, pinned) {
 		};
 	}
 }
-async function waitForMetro({ root, port, seconds, aborted = () => false, probe = resolveProjectMetro }) {
+async function waitForMetro({ root, port, seconds, aborted = () => false, probe = resolveStartupMetro }) {
 	const deadline = Date.now() + seconds * 1e3;
 	while (Date.now() < deadline) {
 		if ((await probe(port, root)).metro) return true;
 		if (aborted()) return false;
-		await cancellableSleep(POLL_MS);
+		await waitForStartup(POLL_MS);
 	}
 	const last = await probe(port, root);
 	return Boolean(last.metro);
@@ -1073,7 +1092,7 @@ async function waitForExpoTunnel({ root, seconds, aborted = () => false }) {
 	while (Date.now() < deadline) {
 		if (aborted()) return false;
 		if (readMetroTunnel(root)?.kind === "expo") return true;
-		await cancellableSleep(POLL_MS);
+		await waitForStartup(POLL_MS);
 	}
 	return !aborted() && readMetroTunnel(root)?.kind === "expo";
 }

package/dist/{start-TXeMmmO2.mjs → start-RChynRDp.mjs}

@@ -1,2 +1,2 @@
-import { a as registerStart, c as startDevServer, d as supervisorSignalable, f as tailLines, i as readLogTail, l as startFacts, n as liveSupervisor, o as resolveWorkspaceMetroPort, p as wantsExpoOwnTunnel, r as parseWait, s as startCommand, t as failureEvidence, u as supervisorEntry } from "./start-BWqzODpb.mjs";
+import { a as registerStart, c as startDevServer, d as supervisorSignalable, f as tailLines, i as readLogTail, l as startFacts, n as liveSupervisor, o as resolveWorkspaceMetroPort, p as wantsExpoOwnTunnel, r as parseWait, s as startCommand, t as failureEvidence, u as supervisorEntry } from "./start-7lpH7hmN.mjs";
 export { startCommand as default, failureEvidence, liveSupervisor, parseWait, readLogTail, registerStart, resolveWorkspaceMetroPort, startDevServer, startFacts, supervisorEntry, supervisorSignalable, tailLines, wantsExpoOwnTunnel };