stim 1.2.0 → 1.3.0

package/dist/{workspace-process-lock-BKfdys1q.mjs → workspace-process-lock-3NcQnZ0X.mjs}

@@ -1,4 +1,4 @@
-import { f as releaseClaim, h as tryAcquireClaim } from "./ownership-claim-7zRxxTfZ.mjs";
+import { f as releaseClaim, h as tryAcquireClaim } from "./ownership-claim-Bf2CAfw3.mjs";
 import { join } from "node:path";
 //#region src/engine/workspace-process-lock.ts
 const DEFAULT_WAIT_MS = 6e4;

package/dist/{worktree-BPTbI-LN.mjs → worktree-DxTgN1CJ.mjs}

@@ -1,17 +1,17 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { S as upsertProject, f as getProject, g as loadConfig, h as isPathPrefix, u as getConfigDir, v as removeProject, w as captureProcessIdentity } from "./config-CMtIaTk9.mjs";
-import { c as readMetroTunnel, u as readRemoteSession } from "./state-CZ-ER-8d.mjs";
-import { _ as resolveFullRef, b as warmWorktreePaths, c as hasRemote, d as isPodInstallChurn, f as listWorktrees, h as removeWorktree, i as depsOutOfSync, l as hasUncommittedWork, m as readWorktreeExclude, n as cloneIgnoredEntries, o as dirtyPaths, p as podsOutOfSync, r as deleteBranch, s as gitCommonDir, t as branchExists, u as isMainWorkingTree, v as restoreFile, y as unpushedCommits } from "./worktree-C79xx_kM.mjs";
-import { a as findProjectRoot } from "./project-BBTVABUz.mjs";
-import { v as POOL_SETTING_REMEDY, x as parkedMaxSetting } from "./remote-cache-DDmJ1Roq.mjs";
-import { A as resolveSettings, I as unknownSettingKeys, N as settingShapeErrors, a as SETTING_SHAPE_REMEDY } from "./settings-DwU1_U_q.mjs";
+import { S as upsertProject, f as getProject, g as loadConfig, h as isPathPrefix, u as getConfigDir, v as removeProject, w as captureProcessIdentity } from "./config-CcefMY2Q.mjs";
+import { c as readMetroTunnel, u as readRemoteSession } from "./state-B3XA2wp2.mjs";
+import { _ as resolveFullRef, b as warmWorktreePaths, c as hasRemote, d as isPodInstallChurn, f as listWorktrees, h as removeWorktree, i as depsOutOfSync, l as hasUncommittedWork, m as readWorktreeExclude, n as cloneIgnoredEntries, o as dirtyPaths, p as podsOutOfSync, r as deleteBranch, s as gitCommonDir, t as branchExists, u as isMainWorkingTree, v as restoreFile, y as unpushedCommits } from "./worktree-Eq6TLH8N.mjs";
+import { a as findProjectRoot } from "./project-fKmuIaMI.mjs";
 import { a as formatElapsed, f as releasedLeaseFact, i as formatDuration, l as phaseLine, m as shortUdid, u as plural } from "./command-output-8wHMEde0.mjs";
-import { a as clearClaimChild, c as isClaimUnavailable, d as readClaimSet, f as releaseClaim, h as tryAcquireClaim, i as claimRemoveCommand, l as markClaimChildPending, m as settleClaim, p as setClaimChild, r as claimFailure, s as isClaimRefusal, u as processGroupAlive } from "./ownership-claim-7zRxxTfZ.mjs";
-import { g as podInstallCommand, r as HEARTBEAT_INTERVAL_MS } from "./xcode-DeKCribl.mjs";
-import { a as installedNpmTreeIsValid, i as hasInstalledDependencies, o as locallyKnownUpstream, t as dependencyState } from "./doctor-CqPeMsSm.mjs";
-import { c as withManagedTunnelRemovalLock, o as withManagedRemoteWorktreeRemovalLock } from "./ownership-CYOyqxUo.mjs";
-import { n as reclaimProject } from "./reclaim-C5Jmuahx.mjs";
-import { a as runPodInstall, i as runCaptured, n as podsAreStale, r as readPodState, t as DEPS_ERROR } from "./deps-BLBsTNDS.mjs";
+import { a as clearClaimChild, c as isClaimUnavailable, d as readClaimSet, f as releaseClaim, h as tryAcquireClaim, i as claimRemoveCommand, l as markClaimChildPending, m as settleClaim, p as setClaimChild, r as claimFailure, s as isClaimRefusal, u as processGroupAlive } from "./ownership-claim-Bf2CAfw3.mjs";
+import { A as resolveSettings, I as unknownSettingKeys, N as settingShapeErrors, a as SETTING_SHAPE_REMEDY } from "./settings-DEJf6_kJ.mjs";
+import { a as POOL_SETTING_REMEDY, c as parkedMaxSetting } from "./teardown-ClFp1Aax.mjs";
+import { g as podInstallCommand, r as HEARTBEAT_INTERVAL_MS } from "./xcode-D7sAp-Zy.mjs";
+import { a as installedNpmTreeIsValid, i as hasInstalledDependencies, o as locallyKnownUpstream, t as dependencyState } from "./doctor-Bmv86UUW.mjs";
+import { c as withManagedTunnelRemovalLock, o as withManagedRemoteWorktreeRemovalLock } from "./ownership-BpCKiRlQ.mjs";
+import { n as reclaimProject } from "./reclaim-iW9Cad7k.mjs";
+import { a as runPodInstall, i as runCaptured, n as podsAreStale, r as readPodState, t as DEPS_ERROR } from "./deps-Spz8ozgo.mjs";
 import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { createHash, randomUUID } from "node:crypto";
 import { join, relative } from "node:path";

package/dist/{worktree-C79xx_kM.mjs → worktree-Eq6TLH8N.mjs}

@@ -1,5 +1,5 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { g as loadConfig, u as getConfigDir } from "./config-CMtIaTk9.mjs";
+import { g as loadConfig, u as getConfigDir } from "./config-CcefMY2Q.mjs";
 import { accessSync, chmodSync, constants, lstatSync, mkdirSync, mkdtempSync, readdirSync, realpathSync, rmSync, statSync } from "node:fs";
 import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { chmodSync as chmodSync$1, existsSync as existsSync$1, lstatSync as lstatSync$1, mkdirSync as mkdirSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, realpathSync as realpathSync$1, utimesSync } from "fs";

package/dist/{xcode-DeKCribl.mjs → xcode-D7sAp-Zy.mjs}

@@ -1,18 +1,18 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { C as withConfigLock, E as inspectProcessIdentity, _ as releaseAndroidConsolePort, b as setDevice, g as loadConfig, i as clearDevice, t as allConsolePortsAndSerials, u as getConfigDir, w as captureProcessIdentity, y as saveConfig } from "./config-CMtIaTk9.mjs";
-import { r as register } from "./cache-manifest-Cu4_Znw9.mjs";
-import { E as workspaceId, S as sharedCompilationCache, w as workspaceDerivedData } from "./state-CZ-ER-8d.mjs";
-import { s as ownedDeviceLabel } from "./project-BBTVABUz.mjs";
+import { C as withConfigLock, E as inspectProcessIdentity, L as deviceSlotPlatforms, _ as releaseAndroidConsolePort, b as setDevice, g as loadConfig, i as clearDevice, t as allConsolePortsAndSerials, u as getConfigDir, w as captureProcessIdentity, y as saveConfig, z as projectDeviceSlots } from "./config-CcefMY2Q.mjs";
+import { r as register } from "./cache-manifest-CXR-Y8pH.mjs";
+import { E as workspaceId, S as sharedCompilationCache, w as workspaceDerivedData } from "./state-B3XA2wp2.mjs";
+import { s as ownedDeviceLabel } from "./project-fKmuIaMI.mjs";
 import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-C7IlIzd7.mjs";
-import { r as pidExists } from "./metro-COslRK_F.mjs";
-import { C as selectParked, S as readParked, _ as teardownParkedIosSim, b as dropParked, g as teardownParkedAvd, m as teardownOwnedAvd, x as parkedMaxSetting, y as adoptParked } from "./remote-cache-DDmJ1Roq.mjs";
-import { U as resolveOptimizations, l as androidDataPartitionSizeGbSetting, o as androidAvdConfigSetting, v as iosSimSlimProfileSetting } from "./settings-DwU1_U_q.mjs";
+import { r as pidExists } from "./metro-CORqXyTL.mjs";
 import { a as formatElapsed, l as phaseLine } from "./command-output-8wHMEde0.mjs";
-import { E as readHostMemoryPressure, T as hostMemoryPressureAdvice, _ as renameIosSim, b as resolveIosCreation, c as iosRuntimeMatches, d as listIosDeviceTypes, g as parseRuntimeVersion, i as createOwnedIosSim, l as iosSimulatorFailureAdvice, m as ownedSimName, n as bootIosSim, u as listAllIosSims, v as resetIosKeychain, x as resolveOwnedIosSim, y as resetIosPrivacy } from "./ios-D1h1Di39.mjs";
-import { f as releaseClaim, h as tryAcquireClaim, i as claimRemoveCommand, l as markClaimChildPending, n as ClaimRefusedError, p as setClaimChild, u as processGroupAlive } from "./ownership-claim-7zRxxTfZ.mjs";
-import { A as pickDefaultSystemImage, D as ownedAvdName, E as ownedAvdMatchesConfiguration, L as waitForBoot, N as resolveOwnedAvdSerial, O as ownedAvdSystemImage, b as listAvds, c as avdPoolConfiguration, d as configureNewOwnedAvd, f as createOwnedAvd, o as assertOwnedAvdStopped, u as bootAndroidEmulator, v as getAvdNameForSerial, w as nextConsolePort, x as listInstalledSystemImages, y as listAdbDevices } from "./android-K63_0UfF.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-BKfdys1q.mjs";
-import { t as cleanLine } from "./server-expo-C3ktAwUG.mjs";
+import { f as releaseClaim, h as tryAcquireClaim, i as claimRemoveCommand, l as markClaimChildPending, n as ClaimRefusedError, p as setClaimChild, u as processGroupAlive } from "./ownership-claim-Bf2CAfw3.mjs";
+import { A as pickDefaultSystemImage, D as ownedAvdName, E as ownedAvdMatchesConfiguration, L as waitForBoot, N as resolveOwnedAvdSerial, O as ownedAvdSystemImage, b as listAvds, c as avdPoolConfiguration, d as configureNewOwnedAvd, f as createOwnedAvd, o as assertOwnedAvdStopped, u as bootAndroidEmulator, v as getAvdNameForSerial, w as nextConsolePort, x as listInstalledSystemImages, y as listAdbDevices } from "./android-BqVIJoG7.mjs";
+import { U as resolveOptimizations, l as androidDataPartitionSizeGbSetting, o as androidAvdConfigSetting, v as iosSimSlimProfileSetting } from "./settings-DEJf6_kJ.mjs";
+import { t as cleanLine } from "./server-expo-DizT4OMk.mjs";
+import { c as parkedMaxSetting, i as teardownParkedIosSim, l as readParked, o as adoptParked, r as teardownParkedAvd, s as dropParked, t as teardownOwnedAvd, u as selectParked } from "./teardown-ClFp1Aax.mjs";
+import { t as withWorkspaceProcessLock } from "./workspace-process-lock-3NcQnZ0X.mjs";
+import { E as readHostMemoryPressure, T as hostMemoryPressureAdvice, _ as renameIosSim, b as resolveIosCreation, c as iosRuntimeMatches, d as listIosDeviceTypes, g as parseRuntimeVersion, i as createOwnedIosSim, l as iosSimulatorFailureAdvice, m as ownedSimName, n as bootIosSim, u as listAllIosSims, v as resetIosKeychain, x as resolveOwnedIosSim, y as resetIosPrivacy } from "./ios-Deh5js5V.mjs";
 import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { createHash, randomUUID } from "node:crypto";
 import { basename, isAbsolute, join, relative, resolve, sep } from "node:path";
@@ -161,9 +161,12 @@ function simslimIsOnPath() {
 }
 //#endregion
 //#region src/engine/device.ts
-function startIosBoot(udid, configure) {
+function startIosBoot(udid, configure, label, out) {
 	const done = (async () => {
-		await bootIosSim(udid);
+		await bootIosSim(udid, {
+			label,
+			out
+		});
 		await configure();
 	})();
 	done.catch(() => {});
@@ -172,11 +175,13 @@ function startIosBoot(udid, configure) {
 		done
 	};
 }
-async function ensureOwnedDevice({ platform, project, projectPath, settingsRoot = projectPath, label = ownedDeviceLabel(projectPath), settings, flags = {}, note = () => {}, out = () => {}, logFile = null, alive = pidExists, configureAvd = configureNewOwnedAvd, teardownAvd = teardownOwnedAvd, reconcileIosSimulator = reconcileSimSlim }) {
-	const record = project?.platforms?.[platform] ?? null;
+async function ensureOwnedDevice({ platform, project, projectPath, slot, settingsRoot = projectPath, label = ownedDeviceLabel(projectPath), settings, flags = {}, note = () => {}, out = () => {}, logFile = null, alive = pidExists, configureAvd = configureNewOwnedAvd, teardownAvd = teardownOwnedAvd, reconcileIosSimulator = reconcileSimSlim }) {
+	if (slot && slot !== "default") label = `${label}-${slot}`;
+	const record = deviceSlotPlatforms(project, slot)?.[platform] ?? null;
 	if (platform === "ios") return ensureOwnedIosDevice({
 		record,
 		projectPath,
+		slot,
 		settingsRoot,
 		label,
 		settings,
@@ -188,6 +193,7 @@ async function ensureOwnedDevice({ platform, project, projectPath, settingsRoot
 	return ensureOwnedAndroidDevice({
 		record,
 		projectPath,
+		slot,
 		settingsRoot,
 		label,
 		settings,
@@ -200,7 +206,7 @@ async function ensureOwnedDevice({ platform, project, projectPath, settingsRoot
 		teardownAvd
 	});
 }
-async function ensureOwnedIosDevice({ record, projectPath, settingsRoot, label, settings, flags, note, out, reconcileIosSimulator }) {
+async function ensureOwnedIosDevice({ record, projectPath, slot, settingsRoot, label, settings, flags, note, out, reconcileIosSimulator }) {
 	const memoryAdvice = hostMemoryPressureAdvice(readHostMemoryPressure());
 	if (memoryAdvice) out(chalk.yellow(phaseLine("memory", memoryAdvice)));
 	const simslimProfile = iosSimSlimProfileSetting(settings, settingsRoot);
@@ -233,6 +239,7 @@ async function ensureOwnedIosDevice({ record, projectPath, settingsRoot, label,
 					return configureOwnedIosSim({
 						record: updated,
 						projectPath,
+						slot,
 						profile: simslimProfile,
 						out,
 						reconcileIosSimulator
@@ -246,7 +253,7 @@ async function ensureOwnedIosDevice({ record, projectPath, settingsRoot, label,
 					out(chalk.dim(phaseLine("device", `booting ${name} (${sim.udid})`)));
 					return {
 						...updated,
-						booting: startIosBoot(sim.udid, configure),
+						booting: startIosBoot(sim.udid, configure, name, out),
 						...facts
 					};
 				}
@@ -265,6 +272,12 @@ async function ensureOwnedIosDevice({ record, projectPath, settingsRoot, label,
 				return record;
 			}
 		}
+		withConfigLock(() => {
+			const current = deviceSlotPlatforms(loadConfig()?.projects?.[projectPath], slot)?.ios;
+			if (!current) return;
+			if (current.deviceUdid !== record.deviceUdid || current.owned !== record.owned) throw new Error("The simulator assignment changed during recovery. Run `stim ios` again.");
+			clearDevice(projectPath, "ios", slot);
+		});
 	}
 	const choice = resolveIosCreation({
 		deviceType: flags.deviceType || settings.ios?.deviceType,
@@ -272,6 +285,7 @@ async function ensureOwnedIosDevice({ record, projectPath, settingsRoot, label,
 	});
 	const adopted = parkedMaxSetting("ios").max > 0 ? await withIosDeviceNameLock(() => takeParkedIosSim({
 		projectPath,
+		slot,
 		label,
 		choice,
 		out
@@ -283,11 +297,12 @@ async function ensureOwnedIosDevice({ record, projectPath, settingsRoot, label,
 			await configureOwnedIosSim({
 				record: adopted,
 				projectPath,
+				slot,
 				profile: simslimProfile,
 				out,
 				reconcileIosSimulator
 			});
-		});
+		}, adopted.deviceName, out);
 		return {
 			...adopted,
 			booting,
@@ -305,7 +320,7 @@ async function ensureOwnedIosDevice({ record, projectPath, settingsRoot, label,
 			deviceUdid: result.udid,
 			owned: true,
 			deviceName: result.name
-		});
+		}, slot);
 		return result;
 	});
 	const newRecord = {
@@ -316,10 +331,11 @@ async function ensureOwnedIosDevice({ record, projectPath, settingsRoot, label,
 	const booting = startIosBoot(created.udid, () => configureOwnedIosSim({
 		record: newRecord,
 		projectPath,
+		slot,
 		profile: simslimProfile,
 		out,
 		reconcileIosSimulator
-	}));
+	}), created.name, out);
 	return {
 		...newRecord,
 		created: true,
@@ -333,8 +349,8 @@ function withIosDeviceNameLock(fn) {
 }
 function ownedIosNameSuffix(label, model, projectPath, udid) {
 	const names = new Set(listAllIosSims({ includeUnavailable: true }).filter((sim) => sim.udid !== udid).map((sim) => sim.name));
-	for (const project of Object.values(loadConfig()?.projects ?? {})) {
-		const record = project.platforms?.ios;
+	for (const project of Object.values(loadConfig()?.projects ?? {})) for (const { platforms } of projectDeviceSlots(project)) {
+		const record = platforms.ios;
 		if (record?.deviceUdid !== udid && record?.deviceName) names.add(record.deviceName);
 	}
 	for (const parked of readParked("ios")) if (parked.udid !== udid) names.add(parked.name);
@@ -357,7 +373,7 @@ function resetAdoptedSim(udid, out) {
 	resetIosPrivacy(udid);
 	resetIosKeychain(udid);
 }
-function takeParkedIosSim({ projectPath, label, choice, out }) {
+function takeParkedIosSim({ projectPath, slot, label, choice, out }) {
 	const candidates = selectParked(readParked("ios"), {
 		deviceTypeIdentifier: choice.deviceTypeId,
 		runtimeIdentifier: choice.runtimeId
@@ -393,6 +409,7 @@ function takeParkedIosSim({ projectPath, label, choice, out }) {
 		if (!adoptParked({
 			platform: "ios",
 			projectPath,
+			slot,
 			udid: parked.udid,
 			device
 		})) continue;
@@ -403,10 +420,10 @@ function takeParkedIosSim({ projectPath, label, choice, out }) {
 	}
 	return null;
 }
-function clearIosAdoptionPending(projectPath) {
+function clearIosAdoptionPending(projectPath, slot = "default") {
 	withConfigLock(() => {
 		const cfg = loadConfig();
-		const ios = cfg?.projects?.[projectPath]?.platforms?.ios;
+		const ios = deviceSlotPlatforms(cfg?.projects?.[projectPath], slot)?.ios;
 		if (!cfg || !ios?.adoptionPending) return;
 		delete ios.adopted;
 		delete ios.adoptionPending;
@@ -414,7 +431,7 @@ function clearIosAdoptionPending(projectPath) {
 		saveConfig(cfg);
 	});
 }
-async function configureOwnedIosSim({ record, projectPath, profile, out, reconcileIosSimulator }) {
+async function configureOwnedIosSim({ record, projectPath, slot, profile, out, reconcileIosSimulator }) {
 	if (profile) out(chalk.dim(phaseLine("device", `applying the SimSlim profile to ${record.deviceUdid}`)));
 	else if (record.simslimManaged) out(chalk.dim(phaseLine("device", `restoring stock simulator services on ${record.deviceUdid}`)));
 	const previouslyManaged = Boolean(record.simslimManaged);
@@ -423,7 +440,7 @@ async function configureOwnedIosSim({ record, projectPath, profile, out, reconci
 			...record,
 			simslimManaged: true
 		};
-		setDevice(projectPath, "ios", pending);
+		setDevice(projectPath, "ios", pending, slot);
 		record = pending;
 	}
 	const result = await reconcileIosSimulator({
@@ -435,15 +452,12 @@ async function configureOwnedIosSim({ record, projectPath, profile, out, reconci
 	const updated = { ...record };
 	if (result.managed) updated.simslimManaged = true;
 	else delete updated.simslimManaged;
-	setDevice(projectPath, "ios", updated);
+	setDevice(projectPath, "ios", updated, slot);
 	return updated;
 }
-function findOtherProjectOwningAvd(avdName, projectPath) {
+function findOtherProjectOwningAvd(avdName, projectPath, selectedSlot = "default") {
 	const cfg = loadConfig();
-	for (const [path, proj] of Object.entries(cfg?.projects || {})) {
-		if (path === projectPath) continue;
-		if (proj?.platforms?.android?.avdName === avdName) return path;
-	}
+	for (const [path, proj] of Object.entries(cfg?.projects || {})) if (projectDeviceSlots(proj).some(({ slot, platforms }) => (path !== projectPath || slot !== selectedSlot) && platforms.android?.avdName?.toLowerCase() === avdName.toLowerCase())) return path;
 	return null;
 }
 var AvdRecoveryError = class extends Error {
@@ -453,7 +467,7 @@ var AvdRecoveryError = class extends Error {
 		this.remedy = remedy;
 	}
 };
-async function ensureOwnedAndroidDevice({ record, projectPath, settingsRoot, label, settings, flags, note, out, logFile, alive, configureAvd, teardownAvd }) {
+async function ensureOwnedAndroidDevice({ record, projectPath, slot, settingsRoot, label, settings, flags, note, out, logFile, alive, configureAvd, teardownAvd }) {
 	const avdConfig = androidAvdConfigSetting(settings, settingsRoot);
 	const configuration = avdPoolConfiguration(androidDataPartitionSizeGbSetting(settings), avdConfig);
 	if (record?.setupIncomplete && record.avdName) {
@@ -462,7 +476,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, settingsRoot, lab
 			owner: { projectPath }
 		});
 		if (cleanup.status === "failed" || cleanup.status === "skipped") throw new Error(`Owned AVD ${record.avdName} has incomplete setup and could not be deleted (${cleanup.reason || cleanup.status}). Fix the cause, then retry; Stim kept the device record for cleanup.`);
-		clearDevice(projectPath, "android");
+		clearDevice(projectPath, "android", slot);
 		record = null;
 	}
 	if (record?.avdName) {
@@ -479,7 +493,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, settingsRoot, lab
 					owned: true,
 					deviceName: record.deviceName ?? record.avdName
 				};
-				setDevice(projectPath, "android", updated);
+				setDevice(projectPath, "android", updated, slot);
 				return {
 					...updated,
 					systemImage: ownedAvdSystemImage(record.avdName)
@@ -491,6 +505,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, settingsRoot, lab
 						avdName: record.avdName,
 						metadata: record,
 						projectPath,
+						slot,
 						deviceName: record.deviceName,
 						out,
 						logFile,
@@ -543,6 +558,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, settingsRoot, lab
 			if (!adoptParked({
 				platform: "android",
 				projectPath,
+				slot,
 				udid: parked.udid,
 				device: adopted
 			})) continue;
@@ -550,6 +566,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, settingsRoot, lab
 				...await bootOwnedAvdOnFreshPort({
 					avdName: parked.name,
 					projectPath,
+					slot,
 					metadata: adopted,
 					out,
 					logFile,
@@ -564,9 +581,9 @@ async function ensureOwnedAndroidDevice({ record, projectPath, settingsRoot, lab
 	let fresh = false;
 	try {
 		created = withConfigLock(() => {
-			const current = loadConfig()?.projects?.[projectPath]?.platforms?.android;
+			const current = deviceSlotPlatforms(loadConfig()?.projects?.[projectPath], slot)?.android;
 			if (current?.avdName && current.avdName !== record?.avdName) throw new Error(`Another Stim run assigned AVD ${current.avdName} to this workspace. Retry to use it.`);
-			if (readParked("android").some((entry) => entry.name === ownedAvdName(label)) || findOtherProjectOwningAvd(ownedAvdName(label), projectPath)) label = `${label}-${randomUUID().slice(0, 8)}`;
+			if (readParked("android").some((entry) => entry.name === ownedAvdName(label)) || findOtherProjectOwningAvd(ownedAvdName(label), projectPath, slot)) label = `${label}-${randomUUID().slice(0, 8)}`;
 			const result = createOwnedAvd(label, { systemImage: flags.systemImage || settings.android?.systemImage });
 			setDevice(projectPath, "android", {
 				avdName: result.avdName,
@@ -574,7 +591,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, settingsRoot, lab
 				deviceName: result.avdName,
 				setupIncomplete: true,
 				poolConfiguration: configuration
-			});
+			}, slot);
 			return result;
 		});
 		fresh = true;
@@ -586,9 +603,9 @@ async function ensureOwnedAndroidDevice({ record, projectPath, settingsRoot, lab
 				if (!listAvds().includes(avdName)) throw new AvdRecoveryError(`AVD ${avdName} already exists on disk but is not listed by the emulator. ${message}`, "Run `npx stim gc` to inspect orphaned owned AVDs, then `npx stim gc --delete` to reclaim those safe to delete. Retry `stim android` after cleanup; keep any AVD that GC cannot verify.", e);
 				created = withConfigLock(() => {
 					if (readParked("android").some((entry) => entry.name === avdName)) throw new Error(`AVD ${avdName} was parked by another Stim run. Retry to adopt it safely.`, { cause: e });
-					const owner = findOtherProjectOwningAvd(avdName, projectPath);
+					const owner = findOtherProjectOwningAvd(avdName, projectPath, slot);
 					if (owner) throw new Error(`AVD ${avdName} already exists and is owned by another project (${owner}). Retry to allocate a distinct owned emulator.`, { cause: e });
-					const current = loadConfig()?.projects?.[projectPath]?.platforms?.android;
+					const current = deviceSlotPlatforms(loadConfig()?.projects?.[projectPath], slot)?.android;
 					if (current?.avdName) {
 						const state = current.setupIncomplete ? "has incomplete setup" : "was registered";
 						throw new Error(`AVD ${current.avdName} ${state} by another concurrent Stim run. Retry after that run finishes so the recorded device is resolved safely.`, { cause: e });
@@ -602,7 +619,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, settingsRoot, lab
 						deviceName: avdName,
 						...resolved.serial ? { consolePort: Number(resolved.serial.replace(/^emulator-/, "")) } : {}
 					};
-					setDevice(projectPath, "android", recovered);
+					setDevice(projectPath, "android", recovered, slot);
 					return {
 						...recovered,
 						systemImage: ownedAvdSystemImage(avdName),
@@ -633,7 +650,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, settingsRoot, lab
 			owner: { projectPath }
 		});
 		const kept = cleanup.status === "failed" || cleanup.status === "skipped";
-		if (!kept) clearDevice(projectPath, "android");
+		if (!kept) clearDevice(projectPath, "android", slot);
 		const orphan = kept ? ` The owned AVD remains tracked for cleanup (${cleanup.reason || cleanup.status}); fix the cause, then retry or run \`stim gc --delete\`.` : "";
 		throw new Error(`Created owned AVD ${created.avdName}, but could not configure its AVD settings: ${String(error?.message || error)}${orphan}`, { cause: error });
 	}
@@ -642,6 +659,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, settingsRoot, lab
 			avdName: created.avdName,
 			metadata: fresh ? { poolConfiguration: configuration } : void 0,
 			projectPath,
+			slot,
 			deviceName: created.avdName,
 			out,
 			logFile,
@@ -651,7 +669,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, settingsRoot, lab
 		systemImage: created.systemImage
 	};
 }
-function claimAndroidConsolePort({ projectPath, avdName, deviceName, livePorts = [], metadata }, { lock = withConfigLock, recordedPorts = () => allConsolePortsAndSerials().androidConsolePorts, record = setDevice } = {}) {
+function claimAndroidConsolePort({ projectPath, slot, avdName, deviceName, livePorts = [], metadata }, { lock = withConfigLock, recordedPorts = () => allConsolePortsAndSerials().androidConsolePorts, record = setDevice } = {}) {
 	return lock(() => {
 		const consolePort = nextConsolePort([...recordedPorts(), ...livePorts]);
 		const claim = {
@@ -662,7 +680,7 @@ function claimAndroidConsolePort({ projectPath, avdName, deviceName, livePorts =
 			owned: true,
 			deviceName: deviceName ?? avdName
 		};
-		record(projectPath, "android", claim);
+		record(projectPath, "android", claim, slot);
 		return claim;
 	});
 }
@@ -670,9 +688,10 @@ function liveAndroidConsolePorts() {
 	const adbLive = listAdbDevices();
 	return [...adbLive.emulators.map((e) => e.consolePort), ...adbLive.unhealthy.map((u) => u.consolePort).filter((p) => p != null)];
 }
-async function bootOwnedAvdOnFreshPort({ avdName, metadata, projectPath, deviceName, out, logFile = null, alive = pidExists }) {
+async function bootOwnedAvdOnFreshPort({ avdName, metadata, projectPath, slot, deviceName, out, logFile = null, alive = pidExists }) {
 	const claim = claimAndroidConsolePort({
 		projectPath,
+		slot,
 		avdName,
 		deviceName,
 		livePorts: liveAndroidConsolePorts(),
@@ -691,7 +710,7 @@ async function bootOwnedAvdOnFreshPort({ avdName, metadata, projectPath, deviceN
 			serial
 		};
 	} catch (error) {
-		releaseAndroidConsolePort(projectPath, claim.consolePort);
+		releaseAndroidConsolePort(projectPath, claim.consolePort, slot);
 		throw error;
 	}
 }
@@ -706,25 +725,26 @@ function liveOwnedDeviceCount({ sims = [], adbEmulators = [], config = null } =
 	let count = 0;
 	for (const sim of sims) if (sim?.state === "Booted" && sim.name?.startsWith("stim-")) count++;
 	const livePorts = new Set(adbEmulators.map((e) => e.consolePort));
-	for (const proj of Object.values(config?.projects || {})) {
-		const android = proj?.platforms?.android;
+	for (const proj of Object.values(config?.projects || {})) for (const { platforms } of projectDeviceSlots(proj)) {
+		const android = platforms.android;
 		if (android?.owned && android.avdName && typeof android.consolePort === "number" && livePorts.has(android.consolePort)) count++;
 	}
 	return count;
 }
-function workspaceHasLiveDevice({ platform, project, sims = [], adbEmulators = [] } = {}) {
+function workspaceHasLiveDevice({ platform, project, slot = "default", sims = [], adbEmulators = [] } = {}) {
 	if (!platform) return false;
-	const record = project?.platforms?.[platform];
+	const record = deviceSlotPlatforms(project, slot)?.[platform];
 	if (!record) return false;
 	if (platform === "ios") return sims.some((s) => s.udid === record.deviceUdid && s.state === "Booted");
 	return typeof record.consolePort === "number" && adbEmulators.some((e) => e.consolePort === record.consolePort);
 }
-function deviceCapacityRefusal({ platform, project, max, sims = [], adb = null, config = null } = {}) {
+function deviceCapacityRefusal({ platform, project, slot = "default", max, sims = [], adb = null, config = null } = {}) {
 	if (!max || max <= 0) return null;
 	const adbEmulators = adb?.emulators || [];
 	if (workspaceHasLiveDevice({
 		platform,
 		project,
+		slot,
 		sims,
 		adbEmulators
 	})) return null;
@@ -740,7 +760,7 @@ function deviceCapacityRefusal({ platform, project, max, sims = [], adb = null,
 		remedy: "stop an environment (stim stop) or raise concurrency.maxDevices"
 	};
 }
-function checkDeviceCapacity({ platform, project, max, sims = listAllIosSims, adb = listAdbDevices, config = loadConfig } = {}) {
+function checkDeviceCapacity({ platform, project, slot = "default", max, sims = listAllIosSims, adb = listAdbDevices, config = loadConfig } = {}) {
 	if (!max || max <= 0) return null;
 	let simList = [];
 	let adbRes = {
@@ -761,6 +781,7 @@ function checkDeviceCapacity({ platform, project, max, sims = listAllIosSims, ad
 	return deviceCapacityRefusal({
 		platform,
 		project,
+		slot,
 		max,
 		sims: simList,
 		adb: adbRes,
@@ -839,7 +860,8 @@ async function ensureIosBooted({ device, timeoutMs, pollMs, out }) {
 				"simctl",
 				"spawn",
 				udid,
-				"/usr/bin/true"
+				"launchctl",
+				"list"
 			], { timeoutMs: 3e4 });
 			return {
 				ok: true,
@@ -886,7 +908,11 @@ async function ensureIosBooted({ device, timeoutMs, pollMs, out }) {
 	out(chalk.dim(phaseLine("device", `booting ${sim.name} (${udid})`)));
 	const bootDeadline = Date.now() + timeoutMs;
 	try {
-		await bootIosSim(udid, { timeoutMs });
+		await bootIosSim(udid, {
+			timeoutMs,
+			label: sim.name,
+			out
+		});
 	} catch (e) {
 		return {
 			failed: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stim",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Stim: fast, isolated React Native environments for coding agents",
   "keywords": [
     "agent",
@@ -42,16 +42,16 @@
   },
   "dependencies": {
     "@expo/fingerprint": "^0.20.10",
-    "@stim-cli/cache": "^1.2.0",
-    "@stim-cli/core": "^1.2.0",
-    "@stim-cli/metro": "^1.2.0",
+    "@stim-cli/cache": "^1.3.0",
+    "@stim-cli/core": "^1.3.0",
+    "@stim-cli/metro": "^1.3.0",
     "chalk": "^5.4.1",
     "commander": "^13.1.0",
     "unique-pid": "0.1.1",
     "ws": "^8.21.3"
   },
   "devDependencies": {
-    "@stim-cli/expo-build-cache": "1.2.0",
+    "@stim-cli/expo-build-cache": "1.3.0",
     "@types/ws": "^8.18.1"
   },
   "engines": {