stim 1.2.0 → 1.3.0

package/dist/{reload-Z8nKifAk.mjs → reload-DazHDSFA.mjs}

@@ -1,11 +1,12 @@
-import { f as getProject } from "./config-CMtIaTk9.mjs";
-import { f as readWorkspaceLaunches } from "./state-CZ-ER-8d.mjs";
-import { a as findProjectRoot } from "./project-BBTVABUz.mjs";
-import { i as resolveProjectMetro } from "./metro-COslRK_F.mjs";
+import { L as deviceSlotPlatforms, R as parseDeviceSlotKey, f as getProject } from "./config-CcefMY2Q.mjs";
+import { f as readWorkspaceLaunches } from "./state-B3XA2wp2.mjs";
+import { a as findProjectRoot } from "./project-fKmuIaMI.mjs";
+import { i as resolveProjectMetro } from "./metro-CORqXyTL.mjs";
 import { l as phaseLine } from "./command-output-8wHMEde0.mjs";
-import { u as androidAppProcess, y as iosAppProcess } from "./app-install-NFxUahnH.mjs";
-import { x as resolveOwnedIosSim } from "./ios-D1h1Di39.mjs";
-import { N as resolveOwnedAvdSerial } from "./android-K63_0UfF.mjs";
+import { N as resolveOwnedAvdSerial } from "./android-BqVIJoG7.mjs";
+import { u as androidAppProcess, y as iosAppProcess } from "./app-install-DIp9riNx.mjs";
+import { x as resolveOwnedIosSim } from "./ios-Deh5js5V.mjs";
+import { n as nativeRunCommand } from "./slot-launch-cci0xvmC.mjs";
 import chalk from "chalk";
 import { WebSocket } from "ws";
 //#region src/engine/reload.ts
@@ -134,21 +135,22 @@ function failure(code, message, remedy) {
 function describe(error) {
 	return error instanceof Error ? error.message : String(error);
 }
-function processFailure(platform, record, d) {
+function processFailure(platform, record, d, slot = "default") {
 	const process = platform === "ios" ? d.iosProcess(record.deviceId, record.appId) : d.androidProcess(record.deviceId, record.appId);
 	if (process === void 0) {
 		const probe = platform === "ios" ? `xcrun simctl spawn ${record.deviceId} launchctl list` : `adb -s ${record.deviceId} shell pidof ${record.appId}`;
 		return failure("STIM_RELOAD_PROBE_FAILED", `Stim could not determine whether ${record.appId} is running on ${record.deviceId}.`, `Run \`${probe}\` and retry when the device tool responds.`);
 	}
-	if (process === null) return failure("STIM_RELOAD_STOPPED", `${record.appId} is not running on ${record.deviceId}.`, `Run \`stim ${platform}\` to launch it.`);
+	if (process === null) return failure("STIM_RELOAD_STOPPED", `${record.appId} is not running on ${record.deviceId}.`, `Run \`${nativeRunCommand(platform, slot)}\` to launch it.`);
 	return null;
 }
-function inspectTarget(platform, record, project, d) {
+function inspectTarget(platform, record, project, d, slot = "default") {
+	const runCommand = nativeRunCommand(platform, slot);
 	if (platform === "ios") {
 		const configured = project.platforms?.ios;
 		if (!configured?.owned || configured.deviceUdid !== record.deviceId) return {
 			platform,
-			error: failure("STIM_RELOAD_UNOWNED", `The recorded iOS launch on ${record.deviceId} is not this workspace's current owned simulator.`, "Run `stim ios` to launch the app on this workspace's owned simulator.")
+			error: failure("STIM_RELOAD_UNOWNED", `The recorded iOS launch on ${record.deviceId} is not this workspace's current owned simulator.`, `Run \`${runCommand}\` to launch the app on this workspace's owned simulator.`)
 		};
 		let resolved;
 		try {
@@ -161,15 +163,16 @@ function inspectTarget(platform, record, project, d) {
 		}
 		if (!resolved.sim || resolved.sim.state !== "Booted") return {
 			platform,
-			error: failure("STIM_RELOAD_STOPPED", `The recorded iOS app is not running on a booted owned simulator.`, "Run `stim ios` to boot, install, and launch it.")
+			error: failure("STIM_RELOAD_STOPPED", `The recorded iOS app is not running on a booted owned simulator.`, `Run \`${runCommand}\` to boot, install, and launch it.`)
 		};
-		const stopped = processFailure(platform, record, d);
+		const stopped = processFailure(platform, record, d, slot);
 		if (stopped) return {
 			platform,
 			error: stopped
 		};
 		return {
 			platform,
+			slot,
 			record,
 			deviceName: resolved.sim.name
 		};
@@ -177,7 +180,7 @@ function inspectTarget(platform, record, project, d) {
 	const configured = project.platforms?.android;
 	if (!configured?.owned || !configured.avdName) return {
 		platform,
-		error: failure("STIM_RELOAD_UNOWNED", `The recorded Android launch on ${record.deviceId} is not this workspace's current owned emulator.`, "Run `stim android` to launch the app on this workspace's owned emulator.")
+		error: failure("STIM_RELOAD_UNOWNED", `The recorded Android launch on ${record.deviceId} is not this workspace's current owned emulator.`, `Run \`${runCommand}\` to launch the app on this workspace's owned emulator.`)
 	};
 	let resolved;
 	try {
@@ -190,15 +193,16 @@ function inspectTarget(platform, record, project, d) {
 	}
 	if (!resolved.serial || resolved.serial !== record.deviceId) return {
 		platform,
-		error: failure("STIM_RELOAD_STOPPED", `The recorded Android app is not running on this workspace's owned emulator.`, "Run `stim android` to boot, install, and launch it.")
+		error: failure("STIM_RELOAD_STOPPED", `The recorded Android app is not running on this workspace's owned emulator.`, `Run \`${runCommand}\` to boot, install, and launch it.`)
 	};
-	const stopped = processFailure(platform, record, d);
+	const stopped = processFailure(platform, record, d, slot);
 	if (stopped) return {
 		platform,
 		error: stopped
 	};
 	return {
 		platform,
+		slot,
 		record,
 		deviceName: configured.avdName
 	};
@@ -217,12 +221,16 @@ async function runReload({ root, platform = null, deps = {} }) {
 		error: failure("STIM_NO_PROJECT", `No Stim environment is registered for ${root}.`, "Run `stim start` first.")
 	};
 	const launches = d.readLaunches(root);
-	const inspected = (platform ? [platform] : ["ios", "android"]).flatMap((candidate) => {
-		const record = launches[candidate];
-		return record ? [inspectTarget(candidate, record, project, d)] : [];
+	const inspected = Object.entries(launches).flatMap(([key, record]) => {
+		const parsed = parseDeviceSlotKey(key);
+		if (!parsed || platform && parsed.platform !== platform) return [];
+		return [inspectTarget(parsed.platform, record, {
+			...project,
+			platforms: deviceSlotPlatforms(project, parsed.slot)
+		}, d, parsed.slot)];
 	});
 	const live = inspected.filter((target) => !isTargetFailure(target));
-	if (live.length > 1) return {
+	if (new Set(live.map((target) => target.platform)).size > 1) return {
 		ok: false,
 		error: failure("STIM_RELOAD_AMBIGUOUS", "Both the iOS and Android apps are running.", "Choose one with `stim reload ios` or `stim reload android`.")
 	};
@@ -230,10 +238,10 @@ async function runReload({ root, platform = null, deps = {} }) {
 		ok: false,
 		error: inspected.find(isTargetFailure)?.error ?? failure("STIM_RELOAD_STOPPED", platform ? `No ${platform} app launch is recorded for this workspace.` : "No live app launch is recorded.", platform ? `Run \`stim ${platform}\` first.` : "Run `stim ios` or `stim android` first.")
 	};
-	const target = live[0];
+	const target = live.find((candidate) => !candidate.record.release && candidate.record.metroPort === project.metroPort) ?? live[0];
 	if (target.record.release) return {
 		ok: false,
-		error: failure("STIM_RELOAD_RELEASE", `${target.record.appId} was launched with an embedded release bundle.`, `Run \`stim ${target.platform}\` with a Debug configuration or variant before reloading JavaScript.`)
+		error: failure("STIM_RELOAD_RELEASE", `${target.record.appId} was launched with an embedded release bundle.`, `Run \`${nativeRunCommand(target.platform, target.slot)}\` with a Debug configuration or variant before reloading JavaScript.`)
 	};
 	const port = target.record.metroPort;
 	if (!port || project.metroPort !== port) return {
@@ -244,7 +252,7 @@ async function runReload({ root, platform = null, deps = {} }) {
 		ok: false,
 		error: failure("STIM_NO_METRO", `Port ${port} is not serving this workspace's Metro.`, "Run `stim start`, then retry.")
 	};
-	const stopped = processFailure(target.platform, target.record, d);
+	const stopped = processFailure(target.platform, target.record, d, target.slot);
 	if (stopped) return {
 		ok: false,
 		error: stopped
@@ -254,7 +262,7 @@ async function runReload({ root, platform = null, deps = {} }) {
 		appId: target.record.appId
 	});
 	if (!reloaded.ok) {
-		const stoppedAfterMetro = processFailure(target.platform, target.record, d);
+		const stoppedAfterMetro = processFailure(target.platform, target.record, d, target.slot);
 		if (stoppedAfterMetro) return {
 			ok: false,
 			error: stoppedAfterMetro

package/dist/{server-bare-DEk37Mz2.mjs → server-bare-DEzPZLvf.mjs}

@@ -1,6 +1,6 @@
-import { p as readWorkspaceState } from "./state-CZ-ER-8d.mjs";
+import { p as readWorkspaceState } from "./state-B3XA2wp2.mjs";
 import { n as supervisorError } from "./errors-B6W7FkxQ.mjs";
-import { C as projectMetroSharedCache } from "./settings-DwU1_U_q.mjs";
+import { C as projectMetroSharedCache } from "./settings-DEJf6_kJ.mjs";
 import { a as metroStoreRoot, o as registerMetroStore, t as appendCacheStore } from "./metro-store-CDDZHtPl.mjs";
 import { createRequire } from "node:module";
 import { dirname, isAbsolute, join, relative, sep } from "node:path";

package/dist/server-expo-44em5Pmg.mjs

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

package/dist/{server-expo-C3ktAwUG.mjs → server-expo-DizT4OMk.mjs}

@@ -1,10 +1,10 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { r as createNdjsonWriter } from "./ndjson-DcAtEx_K.mjs";
-import { p as readWorkspaceState } from "./state-CZ-ER-8d.mjs";
-import { l as resolvePackageJson } from "./project-BBTVABUz.mjs";
+import { r as createNdjsonWriter } from "./ndjson-BZwI1NBv.mjs";
+import { p as readWorkspaceState } from "./state-B3XA2wp2.mjs";
+import { l as resolvePackageJson } from "./project-fKmuIaMI.mjs";
 import { n as supervisorError } from "./errors-B6W7FkxQ.mjs";
 import { n as stripAnsi, t as createLineReader } from "./process-output-C7IlIzd7.mjs";
-import { C as projectMetroSharedCache } from "./settings-DwU1_U_q.mjs";
+import { C as projectMetroSharedCache } from "./settings-DEJf6_kJ.mjs";
 import { a as metroStoreRoot, i as metroStoreConfirmedRoot, n as expoMetroConfigPath, o as registerMetroStore, r as expoMetroStoreEnv } from "./metro-store-CDDZHtPl.mjs";
 import { accessSync, constants, existsSync, readFileSync } from "node:fs";
 import { dirname, join, parse } from "node:path";

package/dist/{settings-DwU1_U_q.mjs → settings-DEJf6_kJ.mjs}

@@ -1,5 +1,5 @@
-import { d as getConfigPath, g as loadConfig, m as getRepoSettings, p as getProjectSettings } from "./config-CMtIaTk9.mjs";
-import { g as repoRoot, s as gitCommonDir } from "./worktree-C79xx_kM.mjs";
+import { d as getConfigPath, g as loadConfig, m as getRepoSettings, p as getProjectSettings } from "./config-CcefMY2Q.mjs";
+import { g as repoRoot, s as gitCommonDir } from "./worktree-Eq6TLH8N.mjs";
 import { createHash } from "node:crypto";
 import { isAbsolute } from "node:path";
 import { existsSync, readFileSync, realpathSync, statSync } from "fs";

package/dist/slot-launch-cci0xvmC.mjs

@@ -0,0 +1,19 @@
+import { f as getProject } from "./config-CcefMY2Q.mjs";
+import { p as readWorkspaceState } from "./state-B3XA2wp2.mjs";
+import { h as deviceShellArg } from "./app-install-DIp9riNx.mjs";
+import { n as fileLeaseIo } from "./device-lease-BJYybF-2.mjs";
+//#region src/engine/slot-launch.ts
+function launchSlotScope(root, slot = "default") {
+	if (slot !== "default") return slot;
+	if (Object.keys(getProject(root)?.deviceSlots ?? {}).length) return slot;
+	const state = readWorkspaceState(root);
+	if (Object.keys({
+		...state?.collectors,
+		...fileLeaseIo.readHolder(root)
+	}).some((key) => key.includes(":"))) return slot;
+}
+function nativeRunCommand(platform, slot = "default", { physical, deviceId } = {}) {
+	return `stim ${platform}${slot === "default" ? "" : ` --slot ${slot}`}${physical && deviceId ? ` --device ${deviceShellArg(deviceId)}` : ""}`;
+}
+//#endregion
+export { nativeRunCommand as n, launchSlotScope as t };

package/dist/{start-BrY4EuIg.mjs → start-mObjQH2W.mjs}

@@ -1,23 +1,23 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { E as inspectProcessIdentity, O as waitForProcessExit, S as upsertProject, T as captureProcessToken, a as clearSupervisor, f as getProject } from "./config-CMtIaTk9.mjs";
-import { C as supervisorLogFile, D as workspaceLogsDir, _ as writeWorkspaceState, c as readMetroTunnel, i as clearManagedMetroTunnel, p as readWorkspaceState, s as clearWorkspaceSupervisor, y as ensureWorkspaceStorage } from "./state-CZ-ER-8d.mjs";
-import { g as repoRoot, s as gitCommonDir } from "./worktree-C79xx_kM.mjs";
-import { a as findProjectRoot, i as detectIsExpo, n as detectAndroidPackage, r as detectBundleId, t as appProjectProblem } from "./project-BBTVABUz.mjs";
+import { E as inspectProcessIdentity, O as waitForProcessExit, S as upsertProject, T as captureProcessToken, a as clearSupervisor, f as getProject } from "./config-CcefMY2Q.mjs";
+import { C as supervisorLogFile, D as workspaceLogsDir, _ as writeWorkspaceState, c as readMetroTunnel, i as clearManagedMetroTunnel, p as readWorkspaceState, s as clearWorkspaceSupervisor, y as ensureWorkspaceStorage } from "./state-B3XA2wp2.mjs";
+import { g as repoRoot, s as gitCommonDir } from "./worktree-Eq6TLH8N.mjs";
+import { a as findProjectRoot, i as detectIsExpo, n as detectAndroidPackage, r as detectBundleId, t as appProjectProblem } from "./project-fKmuIaMI.mjs";
 import { n as supervisorError } from "./errors-B6W7FkxQ.mjs";
-import { i as resolveProjectMetro, n as killMetroTree, o as reserveMetroPort, r as pidExists } from "./metro-COslRK_F.mjs";
-import { A as resolveSettings, D as remoteDeviceSettingError, E as remoteAndroidSetting, F as tunnelModeSetting, I as unknownSettingKeys, L as PUBLIC_METRO_ENV, N as settingShapeErrors, O as remoteIosSetting, R as detectProviders, S as ngrokUrlSetting, T as publicUrlSetting, a as SETTING_SHAPE_REMEDY, b as metroTunnelSettingError, d as cacheProviderSettingError, k as resolveCacheProviderConfig, z as planMetroReach } from "./settings-DwU1_U_q.mjs";
+import { i as resolveProjectMetro, n as killMetroTree, o as reserveMetroPort, r as pidExists } from "./metro-CORqXyTL.mjs";
 import { g as stepTimer, l as phaseLine } from "./command-output-8wHMEde0.mjs";
-import { n as workspaceProcessLockError, t as withWorkspaceProcessLock } from "./workspace-process-lock-BKfdys1q.mjs";
+import { A as resolveSettings, D as remoteDeviceSettingError, E as remoteAndroidSetting, F as tunnelModeSetting, I as unknownSettingKeys, L as PUBLIC_METRO_ENV, N as settingShapeErrors, O as remoteIosSetting, R as detectProviders, S as ngrokUrlSetting, T as publicUrlSetting, a as SETTING_SHAPE_REMEDY, b as metroTunnelSettingError, d as cacheProviderSettingError, k as resolveCacheProviderConfig, z as planMetroReach } from "./settings-DEJf6_kJ.mjs";
 import { n as expoMetroConfigPath } from "./metro-store-CDDZHtPl.mjs";
-import { o as expoSdkMajor } from "./server-expo-C3ktAwUG.mjs";
+import { o as expoSdkMajor } from "./server-expo-DizT4OMk.mjs";
+import { n as workspaceProcessLockError, t as withWorkspaceProcessLock } from "./workspace-process-lock-3NcQnZ0X.mjs";
 import { t as spawnEntry } from "./spawn-entry-nCE6m770.mjs";
-import { s as queryLogs } from "./logs-query-oqn47Ffx.mjs";
-import { a as withManagedRemoteWorktreeLock, i as terminateChild, n as startTunnelSequence, r as stopTunnel, s as withManagedTunnelLock, t as resolveSupervisorTarget } from "./ownership-CYOyqxUo.mjs";
+import { s as queryLogs } from "./logs-query-R-Cqc6Qv.mjs";
+import { a as withManagedRemoteWorktreeLock, i as terminateChild, n as startTunnelSequence, r as stopTunnel, s as withManagedTunnelLock, t as resolveSupervisorTarget } from "./ownership-BpCKiRlQ.mjs";
 import { mkdirSync, openSync, readFileSync } from "node:fs";
 import { randomUUID } from "node:crypto";
 import { dirname } from "node:path";
-import chalk from "chalk";
 import { CACHE_PROVIDER_ENV, cacheProviderEnv } from "@stim-cli/cache";
+import chalk from "chalk";
 //#region src/supervisor/cache-reset.ts
 async function resetMetroCache(root) {
 	if (detectIsExpo(root) && ((expoSdkMajor(root) ?? 0) < 54 || !expoMetroConfigPath())) throw supervisorError("STIM_BAD_ARG", "An isolated Metro cache reset requires Expo SDK 54 or newer and the Stim Metro config adapter.", "Upgrade Expo or repair the Stim installation before retrying. The running server was not changed.");

package/dist/{state-CZ-ER-8d.mjs → state-B3XA2wp2.mjs}

@@ -1,4 +1,4 @@
-import { D as sameProcessRecord, k as withDirLock, u as getConfigDir } from "./config-CMtIaTk9.mjs";
+import { D as sameProcessRecord, I as deviceSlotKey, R as parseDeviceSlotKey, k as withDirLock, u as getConfigDir } from "./config-CcefMY2Q.mjs";
 import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
 import { join as join$1, resolve as resolve$1 } from "path";
@@ -122,14 +122,14 @@ function parseWorkspaceLaunchRecord(value) {
 function readWorkspaceLaunches(root) {
 	const launches = readWorkspaceState(root)?.launches;
 	if (!launches || typeof launches !== "object" || Array.isArray(launches)) return {};
-	const ios = parseWorkspaceLaunchRecord(launches.ios);
-	const android = parseWorkspaceLaunchRecord(launches.android);
-	return {
-		...ios ? { ios } : {},
-		...android ? { android } : {}
-	};
+	const records = {};
+	for (const [key, value] of Object.entries(launches)) {
+		const record = parseWorkspaceLaunchRecord(value);
+		if (parseDeviceSlotKey(key) && record) records[key] = record;
+	}
+	return records;
 }
-function writeWorkspaceLaunch(root, platform, record) {
+function writeWorkspaceLaunch(root, platform, record, slot = "default") {
 	withWorkspaceStateLock(root, () => {
 		const state = readWorkspaceState(root) ?? {};
 		const launches = state.launches && typeof state.launches === "object" ? state.launches : {};
@@ -137,7 +137,7 @@ function writeWorkspaceLaunch(root, platform, record) {
 			...state,
 			launches: {
 				...launches,
-				[platform]: record
+				[deviceSlotKey(platform, slot)]: record
 			}
 		});
 	});

package/dist/{stats-BCWEVLrM.mjs → stats-BR-kwj0B.mjs}

@@ -1,4 +1,4 @@
-import { C as withConfigLock, u as getConfigDir } from "./config-CMtIaTk9.mjs";
+import { C as withConfigLock, u as getConfigDir } from "./config-CcefMY2Q.mjs";
 import { readFileSync, realpathSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, relative, resolve } from "node:path";
 const PLATFORMS = ["ios", "android"];

package/dist/{stats-BsF15Bti.mjs → stats-CaaQr4yN.mjs}

@@ -1,7 +1,7 @@
-import { g as repoRoot, s as gitCommonDir } from "./worktree-C79xx_kM.mjs";
-import { a as findProjectRoot } from "./project-BBTVABUz.mjs";
+import { g as repoRoot, s as gitCommonDir } from "./worktree-Eq6TLH8N.mjs";
+import { a as findProjectRoot } from "./project-fKmuIaMI.mjs";
 import { o as formatLongDuration } from "./command-output-8wHMEde0.mjs";
-import { a as statsProjectKey, r as readStats } from "./stats-BCWEVLrM.mjs";
+import { a as statsProjectKey, r as readStats } from "./stats-BR-kwj0B.mjs";
 import chalk from "chalk";
 //#region src/commands/stats.ts
 const PLATFORMS = ["ios", "android"];

package/dist/{status-DFI1Hfpg.mjs → status-BxQNqu9t.mjs}

@@ -1,17 +1,17 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { P as volumeRootFor, g as loadConfig, u as getConfigDir } from "./config-CMtIaTk9.mjs";
-import { D as workspaceLogsDir } from "./state-CZ-ER-8d.mjs";
-import { f as listWorktrees } from "./worktree-C79xx_kM.mjs";
-import { a as findProjectRoot, c as projectShortcut } from "./project-BBTVABUz.mjs";
-import { a as isMetroRunning, i as resolveProjectMetro } from "./metro-COslRK_F.mjs";
-import { S as readParked, v as POOL_SETTING_REMEDY, x as parkedMaxSetting } from "./remote-cache-DDmJ1Roq.mjs";
+import { P as volumeRootFor, g as loadConfig, u as getConfigDir, z as projectDeviceSlots } from "./config-CcefMY2Q.mjs";
+import { D as workspaceLogsDir } from "./state-B3XA2wp2.mjs";
+import { f as listWorktrees } from "./worktree-Eq6TLH8N.mjs";
+import { a as findProjectRoot, c as projectShortcut } from "./project-fKmuIaMI.mjs";
+import { a as isMetroRunning, i as resolveProjectMetro } from "./metro-CORqXyTL.mjs";
 import { a as formatElapsed, r as clockTime, u as plural } from "./command-output-8wHMEde0.mjs";
-import { u as listAllIosSims } from "./ios-D1h1Di39.mjs";
-import { i as listLeaseFiles } from "./device-lease-Dpik41RY.mjs";
-import { N as resolveOwnedAvdSerial } from "./android-K63_0UfF.mjs";
-import { s as queryLogs } from "./logs-query-oqn47Ffx.mjs";
-import { t as resolveSupervisorTarget } from "./ownership-CYOyqxUo.mjs";
-import { i as readSupervisorState } from "./stop-Btg770vV.mjs";
+import { N as resolveOwnedAvdSerial } from "./android-BqVIJoG7.mjs";
+import { a as POOL_SETTING_REMEDY, c as parkedMaxSetting, l as readParked } from "./teardown-ClFp1Aax.mjs";
+import { u as listAllIosSims } from "./ios-Deh5js5V.mjs";
+import { i as listLeaseFiles } from "./device-lease-BJYybF-2.mjs";
+import { s as queryLogs } from "./logs-query-R-Cqc6Qv.mjs";
+import { t as resolveSupervisorTarget } from "./ownership-BpCKiRlQ.mjs";
+import { i as readSupervisorState } from "./stop-DimGXEKY.mjs";
 import { existsSync } from "fs";
 import { totalmem } from "os";
 import chalk from "chalk";
@@ -24,14 +24,14 @@ function poolLine({ platform, parked, max }) {
 	const what = plural(parked, `parked ${platform === "ios" ? "iOS simulator" : "Android emulator"}`);
 	return max > 0 ? `pool: ${what} (max ${max})` : `pool: ${what} (parking off; gc --delete removes them)`;
 }
-function environmentState(project, { simsByUdid = {}, metro = null, worktrees = [], simsAvailable = true, androidRuntime = null, supervisor = null, logs = null } = {}) {
+function environmentState(project, { simsByUdid = {}, metro = null, worktrees = [], simsAvailable = true, androidRuntime = null, androidRuntimes = {}, supervisor = null, logs = null } = {}) {
 	const ios = project.platforms?.ios;
 	const android = project.platforms?.android;
 	const sim = ios ? simsByUdid[ios.deviceUdid] : null;
 	const simBooted = Boolean(sim && sim.state === "Booted");
 	const metroRunning = Boolean(metro?.metro);
 	const androidDetected = androidRuntime ? Boolean(androidRuntime.serial) : Boolean(android?.serial);
-	const live = simBooted || metroRunning || androidDetected;
+	let live = simBooted || metroRunning || androidDetected;
 	let memoryMb = 0;
 	if (simBooted) memoryMb += IOS_SIM_MB;
 	if (androidDetected) memoryMb += ANDROID_EMULATOR_MB;
@@ -48,8 +48,30 @@ function environmentState(project, { simsByUdid = {}, metro = null, worktrees =
 		if (androidRuntime.error) warnings.push(`could not check owned AVD ${android.avdName}: ${androidRuntime.error}`);
 	}
 	if (supervisor && supervisor.alive === false) warnings.push(`stale supervisor record for ${project.__path}`);
+	const slots = [];
+	for (const { slot, platforms } of projectDeviceSlots(project).slice(1)) {
+		const deviceState = environmentState({
+			...project,
+			platforms,
+			deviceSlots: void 0
+		}, {
+			simsByUdid,
+			simsAvailable,
+			metro,
+			androidRuntime: androidRuntimes[slot]
+		});
+		slots.push({
+			slot,
+			ios: deviceState.ios,
+			android: deviceState.android
+		});
+		memoryMb += deviceState.memoryMb - (metroRunning ? METRO_MB : 0);
+		live ||= deviceState.live;
+		warnings.push(...deviceState.warnings.map((warning) => `${slot}: ${warning}`));
+	}
 	return {
 		path: project.__path,
+		...slots.length ? { slots } : {},
 		live,
 		memoryMb,
 		warnings,
@@ -143,6 +165,7 @@ function deviceLeaseStates(entries, { root, now }) {
 		return {
 			path: entry.path,
 			platform: entry.platform,
+			...lease?.slot ? { slot: lease.slot } : {},
 			id: entry.id,
 			deviceName: lease?.deviceName ?? null,
 			holder: lease?.holder ?? null,
@@ -158,7 +181,7 @@ function deviceLeaseLines(states, now) {
 	if (states.length === 0) return [];
 	const lines = [`Device leases (${states.length}):`];
 	for (const state of states) {
-		const device = `${state.platform} ${state.id ?? state.path}${state.deviceName ? ` (${state.deviceName})` : ""}`;
+		const device = `${state.platform}${state.slot ? ` [${state.slot}]` : ""} ${state.id ?? state.path}${state.deviceName ? ` (${state.deviceName})` : ""}`;
 		if (!state.parsed || state.expiresAt === null) {
 			lines.push(`  ${device} -- unreadable lease file, so nothing may take the device: ${state.path}`);
 			continue;
@@ -204,6 +227,7 @@ function statusCommand(program) {
 				metro,
 				worktrees,
 				simsAvailable,
+				androidRuntimes: Object.fromEntries(projectDeviceSlots(proj).slice(1).map(({ slot, platforms }) => [slot, platforms.android?.owned && platforms.android.avdName ? readAndroidRuntime(platforms.android.avdName) : null])),
 				androidRuntime: proj.platforms?.android?.owned && proj.platforms.android.avdName ? readAndroidRuntime(proj.platforms.android.avdName) : null,
 				supervisor,
 				logs: logFacts(path)
@@ -274,15 +298,22 @@ function statusCommand(program) {
 				const errs = n > 0 ? chalk.yellow(` (${n} error${n === 1 ? "" : "s"} since the last marker)`) : "";
 				console.log(chalk.dim(`  logs: ${state.logs.dir}`) + errs);
 			}
-			if (state.ios) {
-				const booted = state.ios.state === "Booted" ? chalk.green("booted") : chalk.dim(state.ios.state.toLowerCase());
-				const owned = state.ios.owned ? chalk.dim(" (owned)") : "";
-				console.log(`  ios: ${chalk.cyan(state.ios.name ?? state.ios.udid)} ${booted}${owned}`);
-			}
-			if (state.android) {
-				const kind = state.android.physical ? chalk.dim("(physical)") : chalk.dim("(emulator)");
-				const observed = state.android.state ? ` ${state.android.state}${state.android.serial ? ` (${state.android.serial})` : ""}` : "";
-				console.log(`  android: ${chalk.cyan(state.android.name)} ${kind}${observed}${state.android.owned ? chalk.dim(" (owned)") : ""}`);
+			for (const deviceState of [{
+				slot: "default",
+				ios: state.ios,
+				android: state.android
+			}, ...state.slots ?? []]) {
+				const slotLabel = deviceState.slot === "default" ? "" : ` [${deviceState.slot}]`;
+				if (deviceState.ios) {
+					const booted = deviceState.ios.state === "Booted" ? chalk.green("booted") : chalk.dim(deviceState.ios.state.toLowerCase());
+					const owned = deviceState.ios.owned ? chalk.dim(" (owned)") : "";
+					console.log(`  ios${slotLabel}: ${chalk.cyan(deviceState.ios.name ?? deviceState.ios.udid)} ${booted}${owned}`);
+				}
+				if (deviceState.android) {
+					const kind = deviceState.android.physical ? chalk.dim("(physical)") : chalk.dim("(emulator)");
+					const observed = deviceState.android.state ? ` ${deviceState.android.state}${deviceState.android.serial ? ` (${deviceState.android.serial})` : ""}` : "";
+					console.log(`  android${slotLabel}: ${chalk.cyan(deviceState.android.name)} ${kind}${observed}${deviceState.android.owned ? chalk.dim(" (owned)") : ""}`);
+				}
 			}
 			for (const w of state.warnings) console.log(chalk.yellow(`  ! ${w}`));
 		}

package/dist/{stop-B7DR4awK.mjs → stop-CrHGcjrV.mjs}

@@ -1,3 +1,3 @@
-import { t as resolveSupervisorTarget } from "./ownership-CYOyqxUo.mjs";
-import { a as resolveCollectorTargets, i as readSupervisorState, n as clearSupervisorState, o as runStop, r as readCollectorState, s as stopCommand, t as clearCollectorState } from "./stop-Btg770vV.mjs";
+import { t as resolveSupervisorTarget } from "./ownership-BpCKiRlQ.mjs";
+import { a as resolveCollectorTargets, i as readSupervisorState, n as clearSupervisorState, o as runStop, r as readCollectorState, s as stopCommand, t as clearCollectorState } from "./stop-DimGXEKY.mjs";
 export { clearCollectorState, clearSupervisorState, stopCommand as default, readCollectorState, readSupervisorState, resolveCollectorTargets, resolveSupervisorTarget, runStop };

package/dist/{stop-Btg770vV.mjs → stop-DimGXEKY.mjs}

@@ -1,13 +1,14 @@
-import { C as withConfigLock, D as sameProcessRecord, E as inspectProcessIdentity, O as waitForProcessExit, S as upsertProject, a as clearSupervisor, f as getProject } from "./config-CMtIaTk9.mjs";
-import { _ as writeWorkspaceState, a as clearRemoteSession, c as readMetroTunnel, i as clearManagedMetroTunnel, m as withWorkspaceStateLock, o as clearWorkspaceStateKeys, p as readWorkspaceState, s as clearWorkspaceSupervisor, u as readRemoteSession } from "./state-CZ-ER-8d.mjs";
-import { a as findProjectRoot } from "./project-BBTVABUz.mjs";
-import { i as resolveProjectMetro, n as killMetroTree, r as pidExists } from "./metro-COslRK_F.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-CGPart6T.mjs";
-import { d as resolveEasCliBin, h as teardownOwnedIosSim, m as teardownOwnedAvd } from "./remote-cache-DDmJ1Roq.mjs";
+import { C as withConfigLock, D as sameProcessRecord, E as inspectProcessIdentity, L as deviceSlotPlatforms, O as waitForProcessExit, R as parseDeviceSlotKey, S as upsertProject, V as validateDeviceSlot, a as clearSupervisor, f as getProject, z as projectDeviceSlots } from "./config-CcefMY2Q.mjs";
+import { T as workspaceDir, _ as writeWorkspaceState, a as clearRemoteSession, c as readMetroTunnel, i as clearManagedMetroTunnel, m as withWorkspaceStateLock, o as clearWorkspaceStateKeys, p as readWorkspaceState, s as clearWorkspaceSupervisor, u as readRemoteSession } from "./state-B3XA2wp2.mjs";
+import { a as findProjectRoot } from "./project-fKmuIaMI.mjs";
+import { i as resolveProjectMetro, n as killMetroTree, r as pidExists } from "./metro-CORqXyTL.mjs";
+import { n as verifyCollectorOwnership } from "./ownership-8O073GIC.mjs";
 import { f as releasedLeaseFact, l as phaseLine, u as plural } from "./command-output-8wHMEde0.mjs";
-import { l as releaseWorkspaceLeases } from "./device-lease-Dpik41RY.mjs";
-import { i as endRecordedSession } from "./device-remote-E81KAdXf.mjs";
-import { r as stopTunnel, t as resolveSupervisorTarget } from "./ownership-CYOyqxUo.mjs";
+import { n as teardownOwnedIosSim, t as teardownOwnedAvd, x as resolveEasCliBin } from "./teardown-ClFp1Aax.mjs";
+import { t as withWorkspaceProcessLock } from "./workspace-process-lock-3NcQnZ0X.mjs";
+import { l as releaseWorkspaceLeases } from "./device-lease-BJYybF-2.mjs";
+import { i as endRecordedSession } from "./device-remote-AkYCKS8U.mjs";
+import { r as stopTunnel, t as resolveSupervisorTarget } from "./ownership-BpCKiRlQ.mjs";
 import chalk from "chalk";
 //#region src/commands/stop.ts
 const DEFAULT_WAIT_MS = 1e4;
@@ -101,7 +102,47 @@ function defaultTeardownRemoteSession(root, sessionId) {
 		easBin: resolveEasCliBin(root)?.file ?? null
 	});
 }
-async function runStop({ root, project = void 0, state = void 0, collectors = void 0, signalCollector = (pid) => process.kill(pid, "SIGTERM"), verifyCollector = verifyCollectorOwnership, clearCollectors = clearCollectorState, isAlive = pidExists, killGroup = killMetroTree, inspectIdentity = inspectProcessIdentity, waitForDeath = void 0, waitMs = DEFAULT_WAIT_MS, resolveMetro = resolveProjectMetro, teardownIos = teardownOwnedIosSim, teardownAvd = teardownOwnedAvd, remoteDevice = void 0, teardownRemoteSession = defaultTeardownRemoteSession, metroTunnel = void 0, stopMetroTunnel = stopTunnel, releaseLeases = releaseWorkspaceLeases, freePort = defaultFreePort, clearRegistration = defaultClearRegistration, clearState = clearSupervisorState, report = (line) => console.error(line) }) {
+async function runStop(options) {
+	if (options.slot === void 0) return stopWorkspace(options);
+	const slot = validateDeviceSlot(options.slot);
+	const root = options.root;
+	const project = options.project === void 0 ? getProject(root) : options.project;
+	const records = options.collectors === void 0 ? readCollectorState(root) : options.collectors;
+	const collectors = Object.fromEntries(Object.entries(records ?? {}).filter(([key]) => parseDeviceSlotKey(key)?.slot === slot));
+	const result = await stopWorkspace({
+		...options,
+		project: project ? {
+			...project,
+			platforms: deviceSlotPlatforms(project, slot),
+			deviceSlots: void 0,
+			supervisor: void 0,
+			metroPort: null
+		} : null,
+		state: null,
+		collectors,
+		remoteDevice: null,
+		metroTunnel: null,
+		clearCollectors: (projectRoot, expected) => withWorkspaceStateLock(projectRoot, () => {
+			clearCollectorState(projectRoot, expected);
+			return !Object.keys(readCollectorState(projectRoot)).some((key) => parseDeviceSlotKey(key)?.slot === slot);
+		}),
+		clearState: () => true,
+		clearRegistration: async () => true,
+		releaseLeases: (projectRoot) => releaseWorkspaceLeases(projectRoot, { slot })
+	});
+	result.outcomes.port = {
+		status: "kept",
+		port: project?.metroPort ?? null,
+		reason: "The workspace server is shared by all slots."
+	};
+	result.outcomes.metro = {
+		status: "skipped",
+		reason: "The workspace server is shared by all slots."
+	};
+	result.summary = summarize(root, result.outcomes, result.ok);
+	return result;
+}
+async function stopWorkspace({ root, project = void 0, state = void 0, collectors = void 0, signalCollector = (pid) => process.kill(pid, "SIGTERM"), verifyCollector = verifyCollectorOwnership, clearCollectors = clearCollectorState, isAlive = pidExists, killGroup = killMetroTree, inspectIdentity = inspectProcessIdentity, waitForDeath = void 0, waitMs = DEFAULT_WAIT_MS, resolveMetro = resolveProjectMetro, teardownIos = teardownOwnedIosSim, teardownAvd = teardownOwnedAvd, remoteDevice = void 0, teardownRemoteSession = defaultTeardownRemoteSession, metroTunnel = void 0, stopMetroTunnel = stopTunnel, releaseLeases = releaseWorkspaceLeases, freePort = defaultFreePort, clearRegistration = defaultClearRegistration, clearState = clearSupervisorState, report = (line) => console.error(line) }) {
 	const proj = project === void 0 ? getProject(root) : project;
 	const sup = state === void 0 ? readSupervisorState(root) : state;
 	const collectorRecords = collectors === void 0 ? readCollectorState(root) : collectors;
@@ -235,7 +276,7 @@ async function runStop({ root, project = void 0, state = void 0, collectors = vo
 			teardownAvd,
 			report
 		});
-		if ([outcomes.device.ios, outcomes.device.android].some((device) => device?.status === "failed")) ok = false;
+		if (Object.values(outcomes.device).some((device) => device?.status === "failed")) ok = false;
 	}
 	const remote = remoteDevice === void 0 ? readRemoteSession(root) : remoteDevice;
 	const sessionId = typeof remote?.sessionId === "string" ? remote.sessionId : null;
@@ -461,34 +502,38 @@ function shutDownDevices(project, { teardownIos, teardownAvd, report }) {
 		ios: null,
 		android: null
 	};
-	const ios = project?.platforms?.ios;
-	const iosUdid = ios?.deviceUdid;
-	const iosName = ios?.deviceName;
-	if (iosUdid) {
-		if (!ios?.owned) {
-			device.ios = {
-				status: "skipped",
-				kind: "not-owned",
-				label: iosUdid,
-				reason: "Stim does not own this device"
-			};
-			report(chalk.dim(phaseLine("device", `${iosUdid} is not Stim-owned, leaving it running`)));
-		} else device.ios = reportDevice(iosUdid, teardownIos(iosUdid, {
-			del: false,
-			label: iosName
-		}), report);
-	}
-	const android = project?.platforms?.android;
-	if (android?.avdName) {
-		if (!android.owned) {
-			device.android = {
-				status: "skipped",
-				kind: "not-owned",
-				label: android.avdName,
-				reason: "Stim does not own this device"
-			};
-			report(chalk.dim(phaseLine("device", `${android.avdName} is not Stim-owned, leaving it running`)));
-		} else device.android = reportDevice(android.avdName, teardownAvd(android.avdName, { del: false }), report);
+	for (const { slot, platforms } of projectDeviceSlots(project)) {
+		const iosKey = slot === "default" ? "ios" : `ios:${slot}`;
+		const androidKey = slot === "default" ? "android" : `android:${slot}`;
+		const ios = platforms.ios;
+		const iosUdid = ios?.deviceUdid;
+		const iosName = ios?.deviceName;
+		if (iosUdid) {
+			if (!ios?.owned) {
+				device[iosKey] = {
+					status: "skipped",
+					kind: "not-owned",
+					label: iosUdid,
+					reason: "Stim does not own this device"
+				};
+				report(chalk.dim(phaseLine("device", `${iosUdid} is not Stim-owned, leaving it running`)));
+			} else device[iosKey] = reportDevice(iosUdid, teardownIos(iosUdid, {
+				del: false,
+				label: iosName
+			}), report);
+		}
+		const android = platforms.android;
+		if (android?.avdName) {
+			if (!android.owned) {
+				device[androidKey] = {
+					status: "skipped",
+					kind: "not-owned",
+					label: android.avdName,
+					reason: "Stim does not own this device"
+				};
+				report(chalk.dim(phaseLine("device", `${android.avdName} is not Stim-owned, leaving it running`)));
+			} else device[androidKey] = reportDevice(android.avdName, teardownAvd(android.avdName, { del: false }), report);
+		}
 	}
 	return device;
 }
@@ -539,7 +584,7 @@ function summarize(root, outcomes, ok) {
 	if (outcomes.metro.status === "not-managed") parts.push(`external server on port ${outcomes.metro.port} left alone`);
 	if (outcomes.metro.status === "refused") parts.push(`port ${outcomes.metro.port} refused`);
 	if (outcomes.metro.status === "failed") parts.push(`port ${outcomes.metro.port} could not be freed`);
-	const devicesByPlatform = [["ios", outcomes.device.ios], ["android", outcomes.device.android]];
+	const devicesByPlatform = Object.entries(outcomes.device).filter(([key]) => key !== "remote");
 	for (const [platform, o] of devicesByPlatform) {
 		if (!o) continue;
 		if (o.status === "shut-down") parts.push(`${platform} ${o.label} shut down`);
@@ -571,13 +616,19 @@ async function defaultClearRegistration(root, expected) {
 	}
 }
 function stopCommand(program) {
-	program.command("stop").description("The inverse of `start`: halt this workspace's supervisor, shut the owned device down (never deleted), and free the reserved port. Non-destructive -- the device stays assigned, so coming back costs a boot. Acts on the current workspace.").option("--json", "print the per-step outcomes as JSON").action(async (opts) => {
+	program.command("stop").description("The inverse of `start`: halt this workspace's supervisor, shut the owned device down (never deleted), and free the reserved port. Non-destructive -- the device stays assigned, so coming back costs a boot. Acts on the current workspace.").option("--slot <name>", "Stop only this device slot, keeping the shared server running", validateDeviceSlot).option("--json", "print the per-step outcomes as JSON").action(async (opts) => {
 		const root = findProjectRoot(process.cwd());
 		if (!root) {
 			console.error(chalk.red("Not inside a project (no package.json found above the current directory)."));
 			process.exit(1);
 		}
-		const { ok, outcomes, summary } = await runStop({ root });
+		const { ok, outcomes, summary } = await withWorkspaceProcessLock(workspaceDir(root), "native-run", () => runStop({
+			root,
+			slot: opts.slot
+		}), {
+			external: true,
+			waitMs: 18e5
+		});
 		if (opts.json) console.log(JSON.stringify({
 			root,
 			ok,