stim 1.14.0 → 1.16.0

package/dist/{device-pool-BiyDyPP-.mjs → device-lease-run-CqjShqWW.mjs}

@@ -1,11 +1,12 @@
-import { z as deviceSlotKey } from "./config-lvc7d3C2.mjs";
-import { a as formatElapsed, r as clockTime } from "./command-output-DVcpw6eE.mjs";
-import { a as parseLease, c as raiseLease, f as selectPoolDevice, l as releaseRunLease, n as fileLeaseIo, p as takeLease, r as leaseIsExpired, t as deviceLeasePath } from "./device-lease-5c3WrVRm.mjs";
-import { a as VERIFY_TIMEOUT_MS, m as APP_READINESS_TIMEOUT_MS } from "./launch-verify-Deg4tB3Z.mjs";
+import { R as deviceSlotKey } from "./config-D0DbpZtM.mjs";
+import { a as formatElapsed, r as clockTime } from "./command-output-DnJMdEY-.mjs";
+import { a as parseLease, c as raiseLease, l as releaseRunLease, n as fileLeaseIo, p as takeLease, r as leaseIsExpired, t as deviceLeasePath } from "./device-lease-D-hLqx1b.mjs";
+import { a as VERIFY_TIMEOUT_MS, m as APP_READINESS_TIMEOUT_MS } from "./launch-verify-2DBRizjo.mjs";
 //#region src/engine/device-lease-run.ts
 const LEASE_STEP_FLOOR_MS = 6e4;
 const DEBUG_VERIFY_STEP_MS = VERIFY_TIMEOUT_MS + APP_READINESS_TIMEOUT_MS;
 const DEVICE_WAIT_POLL_MS = 2e3;
+const DEVICE_WAIT_LINE_MS = 3e4;
 const DEVICE_BUSY = "STIM_DEVICE_BUSY";
 const DEVICE_LOST = "STIM_DEVICE_LOST";
 function leaseStepMs(boundMs = 0) {
@@ -290,125 +291,4 @@ async function acquireRunLease({ root, platform, slot = "default", id, deviceNam
 	}
 }
 //#endregion
-//#region src/engine/device-pool.ts
-function heldPoolId(root, platform, now, io = fileLeaseIo, slot = "default") {
-	const record = io.readHolder(root)[deviceSlotKey(platform, slot)];
-	if (!record) return null;
-	const lease = parseLease(io.readLease(deviceLeasePath(platform, record.id)));
-	if (!lease || lease.token !== record.token || leaseIsExpired(lease, now)) return null;
-	return record.id;
-}
-function readPool(platform, candidates, io) {
-	const reading = {
-		usable: [],
-		leases: [],
-		unreadable: []
-	};
-	for (const candidate of candidates) {
-		const path = deviceLeasePath(platform, candidate.id);
-		const raw = io.readLease(path);
-		const lease = parseLease(raw);
-		if (raw !== null && !lease) {
-			reading.unreadable.push(path);
-			continue;
-		}
-		reading.usable.push(candidate);
-		if (lease) reading.leases.push(lease);
-	}
-	return reading;
-}
-function disconnectedHeldRefusal(id, idLabel) {
-	return {
-		code: "STIM_NO_DEVICE",
-		message: `This workspace leases ${id}, and it is not connected.`,
-		remedy: `Run \`stim device unlock\` to give it up, then run this command again. Naming another \`--device <${idLabel}>\` refuses the same way while this lease is held.`,
-		lease: null
-	};
-}
-const NO_LEASE_FACTS = {
-	platform: null,
-	id: null,
-	deviceName: null,
-	holder: null,
-	expiresAt: null
-};
-function unreadableSentence(unreadable) {
-	return unreadable.length ? ` Unreadable lease file, so no run may take that device around it: ${unreadable.join("; ")}.` : "";
-}
-function poolBusyRefusal(holders, leases, unreadable, now, waitSeconds, spare = [], idLabel = "id") {
-	const named = holders.map((holder) => `${holder.id} (${holder.holder}, until ${leaseExpiryText(holder.expiresAt, now)})`);
-	const first = holders[0];
-	const lease = first ? leases.find((entry) => entry.id === first.id) : void 0;
-	if (!first) return {
-		code: DEVICE_BUSY,
-		message: `Every connected device has an unreadable lease file, so Stim cannot tell who holds them: ${unreadable.join("; ")}.`,
-		remedy: "Read each file and, once you know no run depends on it, delete it. `stim gc` reports them on every run.",
-		lease: NO_LEASE_FACTS
-	};
-	return {
-		code: DEVICE_BUSY,
-		message: `Every connected device is leased by another workspace${waitSeconds > 0 ? `, and this run waited ${waitSeconds}s for one` : ""}: ${named.join("; ")}.${unreadableSentence(unreadable)}`,
-		remedy: (spare.length ? `Also connected and free: ${spare.join(", ")}. Name one with \`--device <${idLabel}>\` to use it now. ` : "") + "Wait longer with `--wait <seconds>`, connect another device, or pass `--no-wait` to install anyway -- which takes no lease and, when both workspaces build the same app id, terminates the holder's running app.",
-		lease: {
-			platform: lease?.platform ?? null,
-			id: first.id,
-			deviceName: lease?.deviceName ?? null,
-			holder: first.holder,
-			expiresAt: first.expiresAt
-		}
-	};
-}
-async function selectFromPool({ root, platform, slot = "default", idLabel, list, noCandidates, waitSeconds, deadline, noWait = false, now = Date.now, sleep = (ms) => new Promise((r) => setTimeout(r, ms)), warn = () => {}, io = fileLeaseIo }) {
-	const held = heldPoolId(root, platform, now(), io, slot);
-	const until = deadline ?? now() + waitSeconds * 1e3;
-	let lastLine = null;
-	for (;;) {
-		const { usable, leases, unreadable } = readPool(platform, list(), io);
-		const selection = selectPoolDevice({
-			candidates: usable,
-			leases,
-			held,
-			now: now()
-		});
-		if (selection.status === "selected") return selection;
-		if (selection.status === "held-disconnected") return {
-			status: "refused",
-			refusal: disconnectedHeldRefusal(selection.id, idLabel)
-		};
-		if (selection.status === "none") {
-			if (unreadable.length) return {
-				status: "refused",
-				refusal: poolBusyRefusal([], leases, unreadable, now(), waitSeconds)
-			};
-			const { message, remedy } = noCandidates();
-			return {
-				status: "refused",
-				refusal: {
-					code: "STIM_NO_DEVICE",
-					message,
-					remedy,
-					lease: null
-				}
-			};
-		}
-		const first = selection.holders[0];
-		if (noWait && first) {
-			const candidate = usable.find((entry) => entry.id === first.id);
-			if (candidate) return {
-				status: "selected",
-				candidate
-			};
-		}
-		if (now() >= until) return {
-			status: "refused",
-			refusal: poolBusyRefusal(selection.holders, leases, unreadable, now(), waitSeconds, selection.spare, idLabel)
-		};
-		if (lastLine === null || now() - lastLine >= 3e4) {
-			lastLine = now();
-			warn(`waiting for a free device; every connected one is leased: ${selection.holders.map((holder) => `${holder.id} (${holder.holder}, until ${leaseExpiryText(holder.expiresAt, now())})`).join("; ")}`);
-		}
-		await sleep(DEVICE_WAIT_POLL_MS);
-	}
-}
-//#endregion
-export { lostLine as a, releaseLeaseOnSignal as c, waitForDevice as d, leaseExpiryText as i, runLease as l, DEBUG_VERIFY_STEP_MS as n, lostRefusal as o, acquireRunLease as r, parseDeviceWait as s, selectFromPool as t, waitFlagConflict as u };
+export { acquireRunLease as a, lostRefusal as c, runLease as d, waitFlagConflict as f, DEVICE_WAIT_POLL_MS as i, parseDeviceWait as l, DEVICE_BUSY as n, leaseExpiryText as o, waitForDevice as p, DEVICE_WAIT_LINE_MS as r, lostLine as s, DEBUG_VERIFY_STEP_MS as t, releaseLeaseOnSignal as u };

package/dist/device-pool-CUaEWMMm.mjs

@@ -0,0 +1,125 @@
+import { R as deviceSlotKey } from "./config-D0DbpZtM.mjs";
+import { a as parseLease, f as selectPoolDevice, n as fileLeaseIo, r as leaseIsExpired, t as deviceLeasePath } from "./device-lease-D-hLqx1b.mjs";
+import { i as DEVICE_WAIT_POLL_MS, n as DEVICE_BUSY, o as leaseExpiryText } from "./device-lease-run-CqjShqWW.mjs";
+//#region src/engine/device-pool.ts
+function heldPoolId(root, platform, now, io = fileLeaseIo, slot = "default") {
+	const record = io.readHolder(root)[deviceSlotKey(platform, slot)];
+	if (!record) return null;
+	const lease = parseLease(io.readLease(deviceLeasePath(platform, record.id)));
+	if (!lease || lease.token !== record.token || leaseIsExpired(lease, now)) return null;
+	return record.id;
+}
+function readPool(platform, candidates, io) {
+	const reading = {
+		usable: [],
+		leases: [],
+		unreadable: []
+	};
+	for (const candidate of candidates) {
+		const path = deviceLeasePath(platform, candidate.id);
+		const raw = io.readLease(path);
+		const lease = parseLease(raw);
+		if (raw !== null && !lease) {
+			reading.unreadable.push(path);
+			continue;
+		}
+		reading.usable.push(candidate);
+		if (lease) reading.leases.push(lease);
+	}
+	return reading;
+}
+function disconnectedHeldRefusal(id, idLabel) {
+	return {
+		code: "STIM_NO_DEVICE",
+		message: `This workspace leases ${id}, and it is not connected.`,
+		remedy: `Run \`stim device unlock\` to give it up, then run this command again. Naming another \`--device <${idLabel}>\` refuses the same way while this lease is held.`,
+		lease: null
+	};
+}
+const NO_LEASE_FACTS = {
+	platform: null,
+	id: null,
+	deviceName: null,
+	holder: null,
+	expiresAt: null
+};
+function unreadableSentence(unreadable) {
+	return unreadable.length ? ` Unreadable lease file, so no run may take that device around it: ${unreadable.join("; ")}.` : "";
+}
+function poolBusyRefusal(holders, leases, unreadable, now, waitSeconds, spare = [], idLabel = "id") {
+	const named = holders.map((holder) => `${holder.id} (${holder.holder}, until ${leaseExpiryText(holder.expiresAt, now)})`);
+	const first = holders[0];
+	const lease = first ? leases.find((entry) => entry.id === first.id) : void 0;
+	if (!first) return {
+		code: DEVICE_BUSY,
+		message: `Every connected device has an unreadable lease file, so Stim cannot tell who holds them: ${unreadable.join("; ")}.`,
+		remedy: "Read each file and, once you know no run depends on it, delete it. `stim gc` reports them on every run.",
+		lease: NO_LEASE_FACTS
+	};
+	return {
+		code: DEVICE_BUSY,
+		message: `Every connected device is leased by another workspace${waitSeconds > 0 ? `, and this run waited ${waitSeconds}s for one` : ""}: ${named.join("; ")}.${unreadableSentence(unreadable)}`,
+		remedy: (spare.length ? `Also connected and free: ${spare.join(", ")}. Name one with \`--device <${idLabel}>\` to use it now. ` : "") + "Wait longer with `--wait <seconds>`, connect another device, or pass `--no-wait` to install anyway -- which takes no lease and, when both workspaces build the same app id, terminates the holder's running app.",
+		lease: {
+			platform: lease?.platform ?? null,
+			id: first.id,
+			deviceName: lease?.deviceName ?? null,
+			holder: first.holder,
+			expiresAt: first.expiresAt
+		}
+	};
+}
+async function selectFromPool({ root, platform, slot = "default", idLabel, list, noCandidates, waitSeconds, deadline, noWait = false, now = Date.now, sleep = (ms) => new Promise((r) => setTimeout(r, ms)), warn = () => {}, io = fileLeaseIo }) {
+	const held = heldPoolId(root, platform, now(), io, slot);
+	const until = deadline ?? now() + waitSeconds * 1e3;
+	let lastLine = null;
+	for (;;) {
+		const { usable, leases, unreadable } = readPool(platform, list(), io);
+		const selection = selectPoolDevice({
+			candidates: usable,
+			leases,
+			held,
+			now: now()
+		});
+		if (selection.status === "selected") return selection;
+		if (selection.status === "held-disconnected") return {
+			status: "refused",
+			refusal: disconnectedHeldRefusal(selection.id, idLabel)
+		};
+		if (selection.status === "none") {
+			if (unreadable.length) return {
+				status: "refused",
+				refusal: poolBusyRefusal([], leases, unreadable, now(), waitSeconds)
+			};
+			const { message, remedy } = noCandidates();
+			return {
+				status: "refused",
+				refusal: {
+					code: "STIM_NO_DEVICE",
+					message,
+					remedy,
+					lease: null
+				}
+			};
+		}
+		const first = selection.holders[0];
+		if (noWait && first) {
+			const candidate = usable.find((entry) => entry.id === first.id);
+			if (candidate) return {
+				status: "selected",
+				candidate
+			};
+		}
+		if (now() >= until) return {
+			status: "refused",
+			refusal: poolBusyRefusal(selection.holders, leases, unreadable, now(), waitSeconds, selection.spare, idLabel)
+		};
+		if (lastLine === null || now() - lastLine >= 3e4) {
+			lastLine = now();
+			warn(`waiting for a free device; every connected one is leased: ${selection.holders.map((holder) => `${holder.id} (${holder.holder}, until ${leaseExpiryText(holder.expiresAt, now())})`).join("; ")}`);
+		}
+		await sleep(DEVICE_WAIT_POLL_MS);
+	}
+}
+//#endregion
+export { selectFromPool as t };

package/dist/{device-remote-D87zEzaq.mjs → device-remote-D5WVWqOq.mjs}

@@ -1,20 +1,21 @@
-import { d as getConfigDir } from "./config-lvc7d3C2.mjs";
-import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
-import { A as workspaceId, F as withDirLock, M as workspaceLogsDir, P as workspaceStateFile, _ as updateWorkspaceState, a as pidExists, h as readWorkspaceState$1, k as workspaceDir, p as clearWorkspaceStateKey } from "./metro-CcEo8Fl8.mjs";
-import { c as ownedDeviceLabel } from "./project-CWlvEaeN.mjs";
-import { a as clearRemoteSession, c as readMetroTunnel, u as readRemoteSession } from "./state-DHqvsbqC.mjs";
-import { i as signalDeclaredSpawns, r as refuseDeclaredSpawns, t as allowDeclaredSpawns } from "./spawn-claims-Drw_o-Fb.mjs";
-import { a as withWorkspaceProcessLock } from "./named-ports-Blg8IxOh.mjs";
-import { a as formatElapsed } from "./command-output-DVcpw6eE.mjs";
-import { V as planMetroReach } from "./settings-D61iNOsB.mjs";
-import { y as probePublicHttp } from "./stop-cause-hjGBOZTG.mjs";
-import { C as sanitizeDeviceLabel } from "./ios-BwDPrnYQ.mjs";
-import { a as LAUNCH_ERROR, i as INSTALL_ERROR, l as devClientDeepLink } from "./app-install-BpgSgkJj.mjs";
-import { c as readMetroRecords, o as isBundleProof } from "./launch-verify-Deg4tB3Z.mjs";
-import { t as compareStimVersions } from "./stim-installations-CINXy_su.mjs";
+import { t as getExecutor } from "./exec-CaErVv7t.mjs";
+import { d as getConfigDir } from "./config-D0DbpZtM.mjs";
+import { a as formatElapsed } from "./command-output-DnJMdEY-.mjs";
+import { K as planMetroReach } from "./settings-oTSkkNrM.mjs";
+import { l as ownedDeviceLabel } from "./project-Du91Ilvc.mjs";
+import { o as pidExists } from "./metro-BeK1ZPz1.mjs";
+import { C as workspaceStateFile, v as workspaceDir, w as withDirLock, x as workspaceLogsDir$1, y as workspaceId } from "./workspace-state-B8-aJ1_5.mjs";
+import { a as clearRemoteSession, c as readMetroTunnel, u as readRemoteSession } from "./state-DcW6vOd_.mjs";
+import { T as sanitizeDeviceLabel } from "./ios-BaInn3sW.mjs";
+import { t as withWorkspaceProcessLock } from "./workspace-process-lock-BL7Q0HCO.mjs";
+import { u as probePublicHttp } from "./ownership-hCkPzGmr.mjs";
+import { i as INSTALL_ERROR, o as LAUNCH_ERROR, u as devClientDeepLink } from "./app-install-CKWdbXIX.mjs";
+import { c as readMetroRecords, o as isBundleProof } from "./launch-verify-2DBRizjo.mjs";
+import { t as compareStimVersions } from "./stim-installations-QMEI32v1.mjs";
+import { c as nativeRunWaitNotice } from "./native-run-NaBrRFtQ.mjs";
 import { existsSync, mkdirSync, realpathSync, renameSync, rmSync, writeFileSync } from "node:fs";
-import { easMachineStateRoot, easMachineStateRoot as easMachineStateRoot$1, easSessionLedgerFile, easSessionLedgerLock, readEasSessionLedger, readEasSessionLedger as readEasSessionLedger$1, readJsonObject, validEasSessionClaim } from "@stim-cli/core/state";
 import { dirname, join, resolve } from "node:path";
+import { easMachineStateRoot, easMachineStateRoot as easMachineStateRoot$1, easSessionLedgerFile, easSessionLedgerLock, readEasSessionLedger, readEasSessionLedger as readEasSessionLedger$1, readJsonObject, validEasSessionClaim } from "@stim-cli/core/state";
 //#region src/engine/metro-gate.ts
 const REMOTE_METRO_WRONG = "STIM_REMOTE_METRO_WRONG";
 const GATE_TIMEOUT_MS = 25e3;
@@ -145,6 +146,27 @@ function disconnectArgs(profilePath) {
 function closeArgs(profilePath) {
 	return withProfile(profilePath, ["close"]);
 }
+const HEALTH_TIMEOUT_MS = 3e3;
+function archField(value) {
+	if (!value || typeof value !== "object") return null;
+	const arch = value.hostArch;
+	return arch === "arm64" || arch === "x86_64" ? arch : null;
+}
+/** agent-device proxies report the daemon machine under `upstream`; a daemon reports itself at the top level. */
+function parseHealthHostArch(body) {
+	if (!body || typeof body !== "object") return null;
+	return archField(body.upstream) ?? archField(body);
+}
+async function readRemoteSimulatorArch(daemon, { fetch: fetchImpl = fetch, timeoutMs = HEALTH_TIMEOUT_MS } = {}) {
+	if (!daemon) return "arm64";
+	try {
+		const response = await fetchImpl(`${daemon.baseUrl.replace(/\/+$/, "")}/health`, { signal: AbortSignal.timeout(timeoutMs) });
+		if (!response.ok) return "arm64";
+		return parseHealthHostArch(await response.json()) ?? "arm64";
+	} catch {
+		return "arm64";
+	}
+}
 //#endregion
 //#region src/engine/eas-simulator.ts
 const OWNED_PREFIX = "stim-";
@@ -153,6 +175,7 @@ const LIVE_SESSION_STATUSES = /* @__PURE__ */ new Set(["NEW", "IN_PROGRESS"]);
 const TERMINAL_SESSION_STATUSES = /* @__PURE__ */ new Set(["STOPPED", "ERRORED"]);
 const SESSION_PLATFORMS = /* @__PURE__ */ new Set(["ios", "android"]);
 const MIN_EAS_CLI_SIMULATOR_VERSION = "21.6.0";
+const MIN_EAS_CLI_DEVICE_VERSION = "22.2.0";
 function easCliUpgradeRemedy(minimum) {
 	return `Upgrade eas-cli to ${minimum} or later (\`npm install --global eas-cli@latest\`, or the project's eas-cli dependency)`;
 }
@@ -171,7 +194,7 @@ function ownedSessionName(label) {
 function isOwnedSessionName(name) {
 	return typeof name === "string" && name.startsWith(OWNED_PREFIX);
 }
-function createSessionArgs({ label, platform, maxDurationMinutes = null }) {
+function createSessionArgs({ label, platform, maxDurationMinutes = null, device = null }) {
 	const args = [
 		"sim",
 		"--platform",
@@ -184,6 +207,7 @@ function createSessionArgs({ label, platform, maxDurationMinutes = null }) {
 		ownedSessionName(label)
 	];
 	if (maxDurationMinutes) args.push("--max-duration-minutes", String(maxDurationMinutes));
+	if (device) args.push("--device", device);
 	return args;
 }
 function getSessionArgs(sessionId) {
@@ -504,144 +528,6 @@ function withEasProjectLock(_root, fn, options = {}) {
 	});
 }
 //#endregion
-//#region src/engine/native-run.ts
-const NATIVE_RUN_LOCK = "native-run";
-const NATIVE_RUN_WAIT_MS = 18e5;
-const WAIT_HEARTBEAT_MS = 3e4;
-const CANCEL_REQUEST_KEY = "nativeRunCancel";
-function nativeRunHolder(holder) {
-	const { command, platform, slot } = holder.details;
-	return {
-		command: typeof command === "string" ? command : null,
-		platform: typeof platform === "string" ? platform : null,
-		slot: typeof slot === "string" ? slot : "default"
-	};
-}
-function describeNativeRunHolder(holder, now) {
-	const { command, slot } = nativeRunHolder(holder);
-	const started = Date.parse(holder.startedAt);
-	const facts = [`pid ${holder.owner.pid}`];
-	if (Number.isFinite(started)) facts.push(`running for ${formatElapsed(now - started)}`);
-	if (command === null) return `another Stim run (${facts.join(", ")})`;
-	return `\`stim ${command}${slot === "default" ? "" : ` --slot ${slot}`}\` (${facts.join(", ")})`;
-}
-/**
-* Report a wait on the native-run lock: one line as soon as a holder is seen, a line for each new
-* holder, and a heartbeat every WAIT_HEARTBEAT_MS while the same holder keeps it.
-*/
-function nativeRunWaitNotice({ write, now = Date.now, describe = describeNativeRunHolder }) {
-	let claimId = null;
-	let lastAt = 0;
-	return (holder, firstLine) => {
-		const at = now();
-		if (holder.claimId !== claimId) {
-			claimId = holder.claimId;
-			lastAt = at;
-			write(firstLine ?? `waiting for ${describe(holder, at)} in this workspace to finish`);
-			return;
-		}
-		if (at - lastAt < WAIT_HEARTBEAT_MS) return;
-		lastAt = at;
-		write(`still waiting for ${describe(holder, at)}`);
-	};
-}
-/**
-* What `stop` does about the run holding the native-run lock. A build is interrupted only when the stop
-* leaves it nothing to deploy to: the whole workspace stops, the build targets the stopped slot, or the
-* stopped slot is the workspace's only device. A build for another slot that stays is left running and
-* the stop proceeds without the lock. Only an owner whose identity is proven live is signalled.
-*/
-function decideStopAction({ stopSlot, holder, ownerIdentity, deviceSlots }) {
-	if (holder.command !== "ios" && holder.command !== "android") return { action: "wait" };
-	if (!(stopSlot === void 0 || holder.slot === stopSlot || deviceSlots.includes(stopSlot) && deviceSlots.every((slot) => slot === stopSlot))) return { action: "proceed" };
-	return ownerIdentity === "same" ? { action: "interrupt" } : { action: "refuse" };
-}
-function requestNativeRunCancel(root, claimId, pid = process.pid) {
-	updateWorkspaceState(root, (state) => ({
-		...state,
-		[CANCEL_REQUEST_KEY]: {
-			claimId,
-			pid,
-			at: (/* @__PURE__ */ new Date()).toISOString()
-		}
-	}));
-}
-function cancelRequestFor(root, claimId) {
-	const request = readWorkspaceState$1(root)?.[CANCEL_REQUEST_KEY];
-	if (request?.claimId !== claimId || typeof request.pid !== "number") return null;
-	return { pid: request.pid };
-}
-function clearNativeRunCancel(root, claimId) {
-	try {
-		clearWorkspaceStateKey(root, CANCEL_REQUEST_KEY, (value) => value?.claimId === claimId);
-	} catch {}
-}
-let cancelled = null;
-/** Why this process's native run was cancelled, or null while it was not. */
-function runCancellation() {
-	return cancelled;
-}
-function cancelledFailure(platform, { code, message }) {
-	if (cancelled === null) return null;
-	return {
-		code: "STIM_CANCELLED",
-		message: `The ${platform} run was ${cancelled} before it finished.`,
-		remedy: `Run \`stim ${platform}\` again when you want the app on a device.`,
-		lines: [`it stopped at ${code ?? "an unfinished step"}${message ? `: ${message}` : ""}`]
-	};
-}
-function cancelOnInterrupt({ root, claim, write, exit }) {
-	let signals = 0;
-	const onInterrupt = () => {
-		signals += 1;
-		if (signals > 1) {
-			exit(130);
-			return;
-		}
-		const request = cancelRequestFor(root, claim.claimId);
-		cancelled = request ? `cancelled by \`stim stop\` (pid ${request.pid})` : "cancelled by an interrupt";
-		refuseDeclaredSpawns(`the run was ${cancelled}`);
-		const signalled = signalDeclaredSpawns("SIGINT");
-		write(signalled > 0 ? `${cancelled}; stopping the running build tool` : request ? `${cancelled}; stopping before the next build tool or install` : cancelled);
-		if (signalled === 0 && !request) exit(130);
-	};
-	process.on("SIGINT", onInterrupt);
-	return () => {
-		process.off("SIGINT", onInterrupt);
-		allowDeclaredSpawns();
-		clearNativeRunCancel(root, claim.claimId);
-	};
-}
-/**
-* Run an `ios` or `android` invocation under the workspace's native-run lock: the claim records the
-* command, platform and slot, and a wait for another holder is reported on `write`. The first SIGINT
-* forwards the interrupt to the running declared build tool; a run `stim stop` cancelled between build
-* tools starts no further one; a terminal interrupt with no build tool running, or a second SIGINT, exits
-* with 130 at once.
-*/
-function withNativeBuildRun(root, details, fn, { write, exit = (code) => process.exit(code) }) {
-	const notice = nativeRunWaitNotice({ write });
-	return withWorkspaceProcessLock(workspaceDir(root), NATIVE_RUN_LOCK, async (claim) => {
-		const dispose = cancelOnInterrupt({
-			root,
-			claim,
-			write,
-			exit
-		});
-		try {
-			return await fn(claim);
-		} finally {
-			dispose();
-		}
-	}, {
-		external: true,
-		waitMs: NATIVE_RUN_WAIT_MS,
-		declareSpawns: true,
-		details: { ...details },
-		onHeld: (holder) => notice(holder)
-	});
-}
-//#endregion
 //#region src/engine/device-remote.ts
 const REMOTE_SESSION_ERROR = "STIM_NO_REMOTE_SESSION";
 const REMOTE_METRO_ERROR = "STIM_REMOTE_METRO_UNREACHABLE";
@@ -726,6 +612,12 @@ function remoteDeviceDeps(ctx) {
 				};
 				if (recorded) {
 					const existing = readLiveDaemon(ctx, recorded.sessionId);
+					if (existing && ctx.deviceType && recorded.deviceType !== ctx.deviceType) return {
+						failed: true,
+						code: "STIM_REMOTE_DEVICE_MISMATCH",
+						reason: `EAS Simulator session ${recorded.sessionId} runs ${recorded.deviceType ? `"${recorded.deviceType}"` : "the model EAS chose"}, not "${ctx.deviceType}". Stim will not reuse a session on a different model.`,
+						remedy: `Run \`stim stop\` to end that session, then run \`stim ${ctx.platform ?? "ios"} --remote eas --device-type "${ctx.deviceType}"\` again to start one on the requested model.`
+					};
 					if (existing) {
 						note(`Reusing EAS Simulator session ${recorded.sessionId}.`);
 						daemon = existing;
@@ -750,7 +642,8 @@ function remoteDeviceDeps(ctx) {
 					stdout = getExecutor().runFile(ctx.easBin, createSessionArgs({
 						label: ctx.label,
 						platform: ctx.platform ?? "ios",
-						maxDurationMinutes: ctx.maxDurationMinutes ?? null
+						maxDurationMinutes: ctx.maxDurationMinutes ?? null,
+						device: ctx.deviceType ?? null
 					}), {
 						...easEnv,
 						timeoutMs: EAS_SESSION_CREATE_TIMEOUT_MS,
@@ -926,7 +819,7 @@ function remoteDeviceDeps(ctx) {
 		failureRemedy: () => ctx.backend === "eas" && session?.id ? `EAS Simulator session ${session.id} is still running and billed until it reaches its time limit or \`stim stop\` ends it. Fix the error above and run this command again to reuse the session, or run \`stim stop\` to end it.` : "Check that the remote daemon is reachable and still has the device, then run this command again."
 	};
 }
-async function resolveRemoteContext({ root, backend, platform = "ios", easBin, env = process.env, lookupAgentDevice = defaultLookupAgentDevice, readEasCliVersion = readInstalledEasCliVersion, maxDurationMinutes = null }) {
+async function resolveRemoteContext({ root, backend, platform = "ios", easBin, env = process.env, lookupAgentDevice = defaultLookupAgentDevice, readEasCliVersion = readInstalledEasCliVersion, maxDurationMinutes = null, deviceType = null }) {
 	const agentDeviceBin = lookupAgentDevice();
 	if (!agentDeviceBin) return {
 		failed: "agent-device is not on PATH, and it is what drives a remote device.",
@@ -961,12 +854,18 @@ async function resolveRemoteContext({ root, backend, platform = "ios", easBin, e
 		code: "STIM_REMOTE_EAS_UNAVAILABLE"
 	};
 	else {
-		const { supported, version } = easCliSupport(readEasCliVersion(easBin, root), MIN_EAS_CLI_SIMULATOR_VERSION);
+		const versionOutput = readEasCliVersion(easBin, root);
+		const { supported, version } = easCliSupport(versionOutput, MIN_EAS_CLI_SIMULATOR_VERSION);
 		if (!supported) return {
 			failed: version ? `eas-cli ${version} (${easBin}) has no EAS Simulator commands; the eas backend needs eas-cli ${MIN_EAS_CLI_SIMULATOR_VERSION} or later.` : `Could not read an eas-cli version from \`${easBin} --version\`; the eas backend needs eas-cli ${MIN_EAS_CLI_SIMULATOR_VERSION} or later.`,
 			remedy: `${easCliUpgradeRemedy(MIN_EAS_CLI_SIMULATOR_VERSION)}, then run the device command with \`--remote eas\` again.`,
 			code: "STIM_REMOTE_EAS_UNAVAILABLE"
 		};
+		if (deviceType && !easCliSupport(versionOutput, "22.2.0").supported) return {
+			failed: `eas-cli ${version} (${easBin}) cannot choose the EAS Simulator model; --device-type on the eas backend needs eas-cli ${MIN_EAS_CLI_DEVICE_VERSION} or later.`,
+			remedy: `${easCliUpgradeRemedy(MIN_EAS_CLI_DEVICE_VERSION)}, or drop --device-type to let EAS pick the model.`,
+			code: "STIM_BAD_ARG"
+		};
 	}
 	return { ctx: {
 		root,
@@ -976,6 +875,7 @@ async function resolveRemoteContext({ root, backend, platform = "ios", easBin, e
 		easBin: easBin ?? "",
 		agentDeviceBin,
 		maxDurationMinutes,
+		deviceType: backend === "eas" ? deviceType : null,
 		publicMetroUrl: null,
 		existingDaemon
 	} };
@@ -1066,7 +966,7 @@ function withRemoteSessionLock(root, fn, options = {}) {
 	});
 }
 const EAS_START_HOLD_MS = 108e4 + Math.ceil(DAEMON_WAIT_MS / DAEMON_POLL_MS) * 35e3;
-async function ensureRemoteBootOwned({ root, platform, sessionName, startedAt, boot, createdSessionId, abandonCreatedSession, webPreviewUrl = () => null, writeState, register = () => {}, withProjectLock = withEasProjectLock, withLock = withRemoteSessionLock, removeEasSessionClaim: removeClaim = removeEasSessionClaim, ledgerRoot = easMachineStateRoot$1(), notice = () => {}, now = Date.now }) {
+async function ensureRemoteBootOwned({ root, platform, sessionName, startedAt, deviceType = null, boot, createdSessionId, abandonCreatedSession, webPreviewUrl = () => null, writeState, register = () => {}, withProjectLock = withEasProjectLock, withLock = withRemoteSessionLock, removeEasSessionClaim: removeClaim = removeEasSessionClaim, ledgerRoot = easMachineStateRoot$1(), notice = () => {}, now = Date.now }) {
 	const waitNotice = nativeRunWaitNotice({
 		write: notice,
 		now,
@@ -1098,7 +998,8 @@ async function ensureRemoteBootOwned({ root, platform, sessionName, startedAt, b
 						platform,
 						sessionId,
 						startedAt,
-						...preview ? { webPreviewUrl: preview } : {}
+						...preview ? { webPreviewUrl: preview } : {},
+						...deviceType ? { deviceType } : {}
 					} });
 					return booted;
 				} catch (err) {
@@ -1378,16 +1279,21 @@ async function ensureMetroReachable({ ctx, metroPort, isExpo, tunnelMode = "auto
 		gate = true;
 	} else {
 		const port = Number(metroPort);
-		const providerMatches = tunnelMode === "auto" || recorded?.kind === "managed" && recorded.provider === plan.start;
+		if (plan.start === "tailscale" && ctx.backend === "eas") return {
+			failed: "metro.tunnel is \"tailscale\", but an EAS Simulator is not on your tailnet and cannot reach it.",
+			remedy: "Use the proxy backend with a device on the same tailnet, or set metro.tunnel to \"auto\" or \"ngrok\".",
+			code: REMOTE_METRO_ERROR
+		};
+		const providerMatches = recorded?.kind === "managed" && recorded.provider === plan.start;
 		if (recorded && recorded.kind === "managed" && recorded.port === port && providerMatches && isTunnelAlive(recorded.pid)) resolvedUrl = recorded.url;
 		else return {
 			failed: `No live managed Metro tunnel is recorded for port ${port}.`,
 			remedy: "Run `stim start --remote`, then retry the device command."
 		};
-		gate = true;
+		gate = recorded.provider !== "tailscale";
 	}
 	if (gate && resolvedUrl) {
-		const logsDir = workspaceLogsDir(root);
+		const logsDir = workspaceLogsDir$1(root);
 		const result = await gateOrigin({
 			origin: resolvedUrl,
 			metroPort,
@@ -1415,4 +1321,4 @@ function bundleEntryPoint(root, isExpo) {
 	return local ? normalized : `node_modules/${normalized}`;
 }
 //#endregion
-export { findOrphanedOwnedSessions as A, withEasProjectLock as C, MIN_EAS_CLI_SIMULATOR_VERSION as D, removeEasSessionClaim as E, ownedSessionName as F, parseSessionListPage as I, stopSessionArgs as L, inspectSessionForTeardown as M, isDefinitiveMissingSessionError as N, easCliSupport as O, listOwnedSessionsArgs as P, verifyStoppedSession as R, withNativeBuildRun as S, readEasSessionLedger$1 as T, describeNativeRunHolder as _, ensureMetroReachable as a, requestNativeRunCancel as b, remoteAndroidDeps as c, withRemoteSessionLock as d, NATIVE_RUN_LOCK as f, decideStopAction as g, clearNativeRunCancel as h, endRecordedSession as i, getSessionArgs as j, easCliUpgradeRemedy as k, remoteIosDeps as l, cancelledFailure as m, binOnPath as n, ensureRemoteBootOwned as o, NATIVE_RUN_WAIT_MS as p, bundleEntryPoint as r, readInstalledEasCliVersion as s, REMOTE_SESSION_ERROR as t, resolveRemoteContext as u, nativeRunHolder as v, easMachineStateRoot$1 as w, runCancellation as x, nativeRunWaitNotice as y, gateMetroOrigin as z };
+export { listOwnedSessionsArgs as C, verifyStoppedSession as D, stopSessionArgs as E, readRemoteSimulatorArch as O, isDefinitiveMissingSessionError as S, parseSessionListPage as T, easCliSupport as _, ensureMetroReachable as a, getSessionArgs as b, remoteAndroidDeps as c, withRemoteSessionLock as d, withEasProjectLock as f, MIN_EAS_CLI_SIMULATOR_VERSION as g, removeEasSessionClaim as h, endRecordedSession as i, gateMetroOrigin as k, remoteIosDeps as l, readEasSessionLedger$1 as m, binOnPath as n, ensureRemoteBootOwned as o, easMachineStateRoot$1 as p, bundleEntryPoint as r, readInstalledEasCliVersion as s, REMOTE_SESSION_ERROR as t, resolveRemoteContext as u, easCliUpgradeRemedy as v, ownedSessionName as w, inspectSessionForTeardown as x, findOrphanedOwnedSessions as y };