stim 1.2.0 → 1.3.1

package/dist/{error-diagnostics-Dw8Gn3yw.mjs → error-diagnostics-DwhNBFDU.mjs}

@@ -1,13 +1,13 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { f as getProject, k as withDirLock } from "./config-CMtIaTk9.mjs";
-import { f as readWorkspaceLaunches, p as readWorkspaceState } from "./state-CZ-ER-8d.mjs";
+import { I as deviceSlotKey, L as deviceSlotPlatforms, f as getProject, k as withDirLock } from "./config-CcefMY2Q.mjs";
+import { f as readWorkspaceLaunches, p as readWorkspaceState } from "./state-B3XA2wp2.mjs";
 import { n as deviceConsoleLevel } from "./ios-device-D3pzTKQE.mjs";
-import { i as resolveProjectMetro } from "./metro-COslRK_F.mjs";
+import { i as resolveProjectMetro } from "./metro-CORqXyTL.mjs";
 import { n as parseLogcatLine, t as androidClockOffset } from "./android-BW8i_YxU.mjs";
 import { _ as launchErrorPreview } from "./command-output-8wHMEde0.mjs";
-import { a as parseLease, n as fileLeaseIo, t as deviceLeasePath } from "./device-lease-Dpik41RY.mjs";
-import { n as androidHome } from "./android-K63_0UfF.mjs";
-import { c as readLogRecords, t as attachExpoErrorContext } from "./logs-query-oqn47Ffx.mjs";
+import { n as androidHome } from "./android-hMj83VpN.mjs";
+import { a as parseLease, n as fileLeaseIo, t as deviceLeasePath } from "./device-lease-CJwK7OZr.mjs";
+import { l as readLogRecords, t as attachExpoErrorContext } from "./logs-query-Cdp5aaCH.mjs";
 import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, statSync, unlinkSync, writeFileSync } from "node:fs";
 import { createHash, randomUUID } from "node:crypto";
 import { basename, dirname, join, resolve, sep } from "node:path";
@@ -333,14 +333,18 @@ function captureNativeCrashes(target, logsDir) {
 			if (text) records = parseAndroidCrashes(text, target, offset).map((record) => symbolicateAndroid(record, target.root, deadline));
 		}
 	} catch {}
-	for (const record of records) try {
-		const key = createHash("sha256").update(JSON.stringify([
-			record.deviceId,
-			record.incident ?? record.deviceTs,
-			record.rawReport
-		])).digest("hex");
-		writeDiagnosticOnce(join(logsDir, `native-crash-${key}.ndjson`), `${JSON.stringify(record)}\n`);
-	} catch {}
+	for (const record of records) {
+		if (target.slot && target.slot !== "default") record.slot = target.slot;
+		try {
+			const key = createHash("sha256").update(JSON.stringify([
+				record.slot,
+				record.deviceId,
+				record.incident ?? record.deviceTs,
+				record.rawReport
+			])).digest("hex");
+			writeDiagnosticOnce(join(logsDir, `native-crash-${key}.ndjson`), `${JSON.stringify(record)}\n`);
+		} catch {}
+	}
 	return records;
 }
 function printNativeCrashReport(target, logsDir, emit, remote) {
@@ -350,45 +354,51 @@ function printNativeCrashReport(target, logsDir, emit, remote) {
 function captureWorkspaceCrashes(root, logsDir) {
 	const attempts = readLogRecords(logsDir).filter((record) => record.event === "launch_attempt");
 	const launches = readWorkspaceLaunches(root);
-	for (const platform of ["ios", "android"]) try {
-		const attempt = attempts.findLast((record) => record.platform === platform);
-		if (!attempt || attempt.remote) continue;
-		const { deviceId, appId } = attempt;
-		const since = attempt.ts;
-		const until = Date.now();
-		if (typeof deviceId !== "string" || typeof appId !== "string" || typeof since !== "number" || !Number.isFinite(since)) continue;
-		if (attempt.physical) {
-			const holder = fileLeaseIo.readHolder(root)[platform];
-			const lease = parseLease(fileLeaseIo.readLease(deviceLeasePath(platform, deviceId)));
-			if (holder?.id !== deviceId || !lease || lease.platform !== platform || lease.id !== deviceId || lease.holder !== root || lease.token !== holder.token || Date.parse(lease.expiresAt) <= until || !lease.grantedAt || !Number.isFinite(Date.parse(lease.grantedAt)) || Date.parse(lease.grantedAt) > since) continue;
-		} else {
-			const launch = launches[platform];
-			if (!launch || launch.deviceId !== deviceId || launch.appId !== appId || Date.parse(launch.launchedAt) !== since) continue;
-			const configured = getProject(root)?.platforms?.[platform];
-			if (!configured?.owned) continue;
-			if (platform === "ios" && configured.deviceUdid !== deviceId) continue;
-			if (platform === "android") {
-				if (!configured.avdName) continue;
-				if (getExecutor().runFileQuiet("adb", [
-					"-s",
-					deviceId,
-					"emu",
-					"avd",
-					"name"
-				], { timeoutMs: 2e3 })?.split("\n")[0]?.trim() !== configured.avdName) continue;
+	const latest = /* @__PURE__ */ new Map();
+	for (const attempt of attempts) if (attempt.platform === "ios" || attempt.platform === "android") latest.set(deviceSlotKey(attempt.platform, String(attempt.slot ?? "default")), attempt);
+	for (const [key, attempt] of latest) {
+		const platform = attempt.platform;
+		const slot = String(attempt.slot ?? "default");
+		try {
+			if (!attempt || attempt.remote) continue;
+			const { deviceId, appId } = attempt;
+			const since = attempt.ts;
+			const until = Date.now();
+			if (typeof deviceId !== "string" || typeof appId !== "string" || typeof since !== "number" || !Number.isFinite(since)) continue;
+			if (attempt.physical) {
+				const holder = fileLeaseIo.readHolder(root)[key];
+				const lease = parseLease(fileLeaseIo.readLease(deviceLeasePath(platform, deviceId)));
+				if (holder?.id !== deviceId || !lease || lease.platform !== platform || lease.id !== deviceId || lease.holder !== root || lease.token !== holder.token || Date.parse(lease.expiresAt) <= until || !lease.grantedAt || !Number.isFinite(Date.parse(lease.grantedAt)) || Date.parse(lease.grantedAt) > since) continue;
+			} else {
+				const launch = launches[key];
+				if (!launch || launch.deviceId !== deviceId || launch.appId !== appId || Date.parse(launch.launchedAt) !== since) continue;
+				const configured = deviceSlotPlatforms(getProject(root), slot)?.[platform];
+				if (!configured?.owned) continue;
+				if (platform === "ios" && configured.deviceUdid !== deviceId) continue;
+				if (platform === "android") {
+					if (!configured.avdName) continue;
+					if (getExecutor().runFileQuiet("adb", [
+						"-s",
+						deviceId,
+						"emu",
+						"avd",
+						"name"
+					], { timeoutMs: 2e3 })?.split("\n")[0]?.trim() !== configured.avdName) continue;
+				}
 			}
-		}
-		captureNativeCrashes({
-			root,
-			platform,
-			deviceId,
-			appId,
-			since: Number(since),
-			until,
-			physical: attempt?.physical === true,
-			appPath: attempt?.appPath ?? readWorkspaceState(root)?.lastBuild?.appPath
-		}, logsDir);
-	} catch {}
+			captureNativeCrashes({
+				root,
+				slot,
+				platform,
+				deviceId,
+				appId,
+				since: Number(since),
+				until,
+				physical: attempt?.physical === true,
+				appPath: attempt?.appPath ?? readWorkspaceState(root)?.lastBuild?.appPath
+			}, logsDir);
+		} catch {}
+	}
 }
 //#endregion
 //#region src/error-symbolication.ts

package/dist/{gc-B7KkDinF.mjs → gc-BRu62v4o.mjs}

@@ -1,20 +1,19 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { A as directorySize, M as isOnMountedVolume, N as listMountedVolumes, P as volumeRootFor, g as loadConfig, i as clearDevice, j as formatBytes, u as getConfigDir, v as removeProject } from "./config-CMtIaTk9.mjs";
-import { i as registeredCaches } from "./cache-manifest-Cu4_Znw9.mjs";
-import { T as workspaceDir, k as workspaceStateFile } 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 } from "./project-BBTVABUz.mjs";
-import { S as readParked, _ as teardownParkedIosSim, b as dropParked, d as resolveEasCliBin, g as teardownParkedAvd, h as teardownOwnedIosSim, m as teardownOwnedAvd, v as POOL_SETTING_REMEDY, x as parkedMaxSetting } from "./remote-cache-DDmJ1Roq.mjs";
-import { A as resolveSettings, N as settingShapeErrors, a as SETTING_SHAPE_REMEDY } from "./settings-DwU1_U_q.mjs";
+import { A as directorySize, M as isOnMountedVolume, N as listMountedVolumes, P as volumeRootFor, g as loadConfig, i as clearDevice, j as formatBytes, u as getConfigDir, v as removeProject, z as projectDeviceSlots } from "./config-CcefMY2Q.mjs";
+import { i as registeredCaches } from "./cache-manifest-CXR-Y8pH.mjs";
+import { T as workspaceDir, k as workspaceStateFile } from "./state-B3XA2wp2.mjs";
+import { g as repoRoot, s as gitCommonDir } from "./worktree-Eq6TLH8N.mjs";
+import { a as findProjectRoot, i as detectIsExpo } from "./project-fKmuIaMI.mjs";
 import { m as shortUdid, o as formatLongDuration, u as plural } from "./command-output-8wHMEde0.mjs";
-import { d as listIosDeviceTypes, g as parseRuntimeVersion, u as listAllIosSims } from "./ios-D1h1Di39.mjs";
-import { r as listBuildLocks } from "./build-lock-BsVoLDaq.mjs";
-import { d as readClaimSet, o as clearFreeClaimSet } from "./ownership-claim-7zRxxTfZ.mjs";
-import { i as listLeaseFiles, r as leaseIsExpired, u as removeExpiredLease } from "./device-lease-Dpik41RY.mjs";
-import { n as listBuildSlots } from "./build-slots-D0b6sJyo.mjs";
-import { S as listOrphanedAvdDirectories, T as ownedAvdDirectory, b as listAvds } from "./android-K63_0UfF.mjs";
-import { C as verifyStoppedSession, S as stopSessionArgs, _ as inspectSessionForTeardown, d as withEasProjectLock, f as easMachineStateRoot, g as getSessionArgs, h as findOrphanedOwnedSessions, m as removeEasSessionClaim, p as readEasSessionLedger, u as withRemoteSessionLock, v as isDefinitiveMissingSessionError, x as parseSessionListPage, y as listOwnedSessionsArgs } from "./device-remote-E81KAdXf.mjs";
-import { n as reclaimProject, t as describeDereferenced } from "./reclaim-C5Jmuahx.mjs";
+import { o as clearFreeClaimSet, u as readClaimSet } from "./ownership-claim-BtPtJVmq.mjs";
+import { B as listBuildLocks, S as listOrphanedAvdDirectories, T as ownedAvdDirectory, b as listAvds } from "./android-hMj83VpN.mjs";
+import { A as resolveSettings, N as settingShapeErrors, a as SETTING_SHAPE_REMEDY } from "./settings-DEJf6_kJ.mjs";
+import { a as POOL_SETTING_REMEDY, c as parkedMaxSetting, i as teardownParkedIosSim, l as readParked, n as teardownOwnedIosSim, r as teardownParkedAvd, s as dropParked, t as teardownOwnedAvd, x as resolveEasCliBin } from "./teardown--gESs9ck.mjs";
+import { d as listIosDeviceTypes, g as parseRuntimeVersion, u as listAllIosSims } from "./ios-Deh5js5V.mjs";
+import { i as listLeaseFiles, r as leaseIsExpired, u as removeExpiredLease } from "./device-lease-CJwK7OZr.mjs";
+import { n as listBuildSlots } from "./build-slots-C4AouyNz.mjs";
+import { C as verifyStoppedSession, S as stopSessionArgs, _ as inspectSessionForTeardown, d as withEasProjectLock, f as easMachineStateRoot, g as getSessionArgs, h as findOrphanedOwnedSessions, m as removeEasSessionClaim, p as readEasSessionLedger, u as withRemoteSessionLock, v as isDefinitiveMissingSessionError, x as parseSessionListPage, y as listOwnedSessionsArgs } from "./device-remote-DAA0Zm6Z.mjs";
+import { n as reclaimProject, t as describeDereferenced } from "./reclaim-CUmwucWG.mjs";
 import { InvalidArgumentError } from "commander";
 import { existsSync, readFileSync, readdirSync, realpathSync, rmSync, statSync } from "fs";
 import { homedir, tmpdir } from "os";
@@ -413,16 +412,18 @@ function findOrphanedDevices({ sims = [], avds = [], config, isMounted, deadProj
 	for (const [path, proj] of Object.entries(config?.projects || {})) {
 		if (dead.has(path)) continue;
 		const mounted = isMounted ? isMounted(path) : true;
-		const ios = proj?.platforms?.ios;
-		if (ios?.deviceUdid) referenced.set(ios.deviceUdid, {
-			path,
-			mounted
-		});
-		const android = proj?.platforms?.android;
-		if (android?.avdName) referenced.set(android.avdName, {
-			path,
-			mounted
-		});
+		for (const { platforms } of projectDeviceSlots(proj)) {
+			const ios = platforms.ios;
+			if (ios?.deviceUdid) referenced.set(ios.deviceUdid, {
+				path,
+				mounted
+			});
+			const android = platforms.android;
+			if (android?.avdName) referenced.set(android.avdName, {
+				path,
+				mounted
+			});
+		}
 	}
 	for (const sim of readParked("ios", { config })) referenced.set(sim.udid, {
 		path: "the simulator pool",
@@ -481,22 +482,26 @@ function findStaleProjectDevices({ config, sims = [], avds = [], olderThanDays,
 		const touched = lastTouched(path);
 		if (!Number.isFinite(touched) || touched >= cutoff) continue;
 		const idleDays = Math.floor((now - touched) / DAY_MS);
-		const ios = proj?.platforms?.ios;
-		if (ios?.owned && ios.deviceUdid && liveSims.has(ios.deviceUdid)) stale.push({
-			kind: "ios",
-			id: ios.deviceUdid,
-			name: liveSims.get(ios.deviceUdid),
-			project: path,
-			idleDays
-		});
-		const android = proj?.platforms?.android;
-		if (android?.owned && android.avdName && liveAvds.has(android.avdName)) stale.push({
-			kind: "android",
-			id: android.avdName,
-			name: android.avdName,
-			project: path,
-			idleDays
-		});
+		for (const { slot, platforms } of projectDeviceSlots(proj)) {
+			const ios = platforms.ios;
+			if (ios?.owned && ios.deviceUdid && liveSims.has(ios.deviceUdid)) stale.push({
+				kind: "ios",
+				id: ios.deviceUdid,
+				name: liveSims.get(ios.deviceUdid),
+				project: path,
+				...slot === "default" ? {} : { slot },
+				idleDays
+			});
+			const android = platforms.android;
+			if (android?.owned && android.avdName && liveAvds.has(android.avdName)) stale.push({
+				kind: "android",
+				id: android.avdName,
+				name: android.avdName,
+				project: path,
+				idleDays,
+				...slot === "default" ? {} : { slot }
+			});
+		}
 	}
 	return stale;
 }
@@ -507,20 +512,24 @@ function findStaleDeviceRecords({ config, sims = [], avds = [], deadProjects = [
 	const stale = [];
 	for (const [path, proj] of Object.entries(config?.projects || {})) {
 		if (dead.has(path)) continue;
-		const ios = proj?.platforms?.ios;
-		if (simsChecked && ios?.deviceUdid && !liveSims.has(ios.deviceUdid)) stale.push({
-			kind: "ios",
-			id: ios.deviceUdid,
-			project: path,
-			owned: Boolean(ios.owned)
-		});
-		const android = proj?.platforms?.android;
-		if (avdsChecked && android?.avdName && !liveAvds.has(android.avdName)) stale.push({
-			kind: "android",
-			id: android.avdName,
-			project: path,
-			owned: Boolean(android.owned)
-		});
+		for (const { slot, platforms } of projectDeviceSlots(proj)) {
+			const ios = platforms.ios;
+			if (simsChecked && ios?.deviceUdid && !liveSims.has(ios.deviceUdid)) stale.push({
+				kind: "ios",
+				id: ios.deviceUdid,
+				project: path,
+				...slot === "default" ? {} : { slot },
+				owned: Boolean(ios.owned)
+			});
+			const android = platforms.android;
+			if (avdsChecked && android?.avdName && !liveAvds.has(android.avdName)) stale.push({
+				kind: "android",
+				id: android.avdName,
+				project: path,
+				...slot === "default" ? {} : { slot },
+				owned: Boolean(android.owned)
+			});
+		}
 	}
 	return stale;
 }
@@ -704,12 +713,12 @@ function deleteProjectDevices(orphanedDevices, staleDevices, staleDeviceRecords)
 	for (const d of staleDevices) {
 		const status = reap(d);
 		if (status === "torn-down" || status === "missing") {
-			clearDevice(d.project, d.kind);
+			clearDevice(d.project, d.kind, d.slot);
 			console.log(chalk.dim(`  cleared the ${d.kind} record for ${d.project}`));
 		}
 	}
 	for (const r of staleDeviceRecords) {
-		clearDevice(r.project, r.kind);
+		clearDevice(r.project, r.kind, r.slot);
 		console.log(chalk.green(`Cleared the ${r.kind} record for ${r.project} (${r.id} is not on this machine)`));
 	}
 	return deleteFailures;