stim 1.1.0 → 1.3.0

package/dist/{dev-client-Bvky1hya.mjs → dev-client-BjisHDB5.mjs}

@@ -1,15 +1,252 @@
-import { t as getExecutor } from "./exec-bsN9MJXb.mjs";
-import { y as ensureWorkspaceStorage } from "./state-IYEY-zi8.mjs";
-import { C as removeTemporaryEntry, S as makeTemporaryDirectory } from "./worktree-Dx3ZC5lS.mjs";
-import { i as detectIsExpo, o as isPackageResolvable } from "./project-COj6nzzh.mjs";
+import { t as getExecutor } from "./exec-CyylIdq9.mjs";
+import { y as ensureWorkspaceStorage } from "./state-B3XA2wp2.mjs";
+import { C as removeTemporaryEntry, S as makeTemporaryDirectory } from "./worktree-Eq6TLH8N.mjs";
+import { i as detectIsExpo, o as isPackageResolvable } from "./project-fKmuIaMI.mjs";
 import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-C7IlIzd7.mjs";
-import { t as NOT_OURS_FOREIGN_CWD } from "./metro-B01H3EuD.mjs";
-import { i as LAUNCH_BUNDLING, s as LAUNCH_UNVERIFIED } from "./app-install-oZIQRbdD.mjs";
-import { f as startBuildHeartbeat, p as tailLines, r as HEARTBEAT_INTERVAL_MS } from "./xcode-CDB6fytw.mjs";
-import { i as expoBinRefusal, r as expoBinPath, t as cleanLine } from "./server-expo-BEMr_m6p.mjs";
-import { existsSync, mkdirSync, readFileSync, readdirSync } from "node:fs";
+import { t as NOT_OURS_FOREIGN_CWD } from "./metro-CORqXyTL.mjs";
+import { r as claimFailure } from "./ownership-claim-Bf2CAfw3.mjs";
+import { V as releaseBuildLock, z as acquireBuildLock } from "./android-BqVIJoG7.mjs";
+import { i as expoBinRefusal, r as expoBinPath, t as cleanLine } from "./server-expo-DizT4OMk.mjs";
+import { x as resolveEasCliBin } from "./teardown-ClFp1Aax.mjs";
+import { i as LAUNCH_BUNDLING, s as LAUNCH_UNVERIFIED } from "./app-install-DIp9riNx.mjs";
+import { f as startBuildHeartbeat, p as tailLines, r as HEARTBEAT_INTERVAL_MS } from "./xcode-D7sAp-Zy.mjs";
+import { existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, statSync } from "node:fs";
+import { createHash } from "node:crypto";
 import { basename, join } from "node:path";
 import chalk from "chalk";
+import { request } from "node:http";
+//#region src/engine/eas-build.ts
+function isEasBuildFailure(result) {
+	return result?.ok === false;
+}
+function easOptionRefusal({ profile, isExpo, buildSelector, buildCache }) {
+	if (profile === void 0) return null;
+	if (profile.trim() && isExpo && buildSelector === void 0 && buildCache !== false) return null;
+	return {
+		code: "STIM_BAD_ARG",
+		message: "--eas-profile requires an Expo project and a non-empty development profile.",
+		remedy: "Use --eas-profile <name> without --scheme, --configuration, --variant, or --no-build-cache."
+	};
+}
+function object(value) {
+	return value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
+}
+function shellArg(value) {
+	return /^[a-zA-Z0-9_.-]+$/.test(value) ? value : `'${value.replaceAll("'", "'\\''")}'`;
+}
+function easDeviceBuildRemedy(profile) {
+	return `If the device is not registered, run npx eas-cli device:create. With approval for cloud build costs and signing changes, run npx eas-cli build --platform ios --profile ${shellArg(profile)} to produce a build with a valid profile for this device, then retry the same Stim command.`;
+}
+var EasFailure = class extends Error {
+	code;
+	remedy;
+	constructor(code, message, remedy) {
+		super(message);
+		this.code = code;
+		this.remedy = remedy;
+	}
+};
+function selectEasBuild(builds, { platform, profile, fingerprint, projectId, physical = false }) {
+	if (!Array.isArray(builds)) throw new Error("EAS build:list did not return an array.");
+	for (const value of builds) {
+		const build = object(value);
+		if (typeof build.id === "string" && build.id.length > 0 && build.status === "FINISHED" && build.platform === platform.toUpperCase() && build.buildProfile === profile && object(build.fingerprint).hash === fingerprint && object(build.project).id === projectId && (platform !== "ios" || build.isForIosSimulator === !physical) && build.distribution === "INTERNAL" && typeof object(build.artifacts).applicationArchiveUrl === "string") return build.id;
+	}
+	return null;
+}
+async function resolveEasDevelopmentBuild({ root, platform, profile, note, isExpo = true, physical = false, selectors = [], buildCache }) {
+	if (profile === void 0) return null;
+	const refusal = easOptionRefusal({
+		profile,
+		isExpo,
+		buildSelector: selectors.find((value) => value != null) ?? void 0,
+		buildCache
+	});
+	if (refusal) return {
+		ok: false,
+		...refusal
+	};
+	const retry = "the same Stim command";
+	const buildCommand = `npx eas-cli build --platform ${platform} --profile ${shellArg(profile)}`;
+	let lock = null;
+	try {
+		const cli = resolveEasCliBin(root);
+		if (!cli) throw new EasFailure("STIM_EAS_UNAVAILABLE", "EAS CLI is not installed.", "Install eas-cli, run eas login, then retry.");
+		let profileEnv = {};
+		const run = (args, timeoutMs = 12e4) => {
+			try {
+				return JSON.parse(getExecutor().runFile(cli.file, [
+					...args,
+					"--json",
+					"--non-interactive"
+				], {
+					cwd: root,
+					timeoutMs,
+					env: profileEnv
+				}));
+			} catch {
+				throw new EasFailure("STIM_EAS_UNAVAILABLE", `EAS ${args[0]} failed or returned invalid JSON.`, `Run npx eas-cli ${args.map(shellArg).join(" ")} to inspect the error, then retry ${retry}.`);
+			}
+		};
+		note(`eas   resolving profile ${profile}`);
+		const config = object(run([
+			"config",
+			"--platform",
+			platform,
+			"--profile",
+			profile
+		]));
+		const buildProfile = object(config.buildProfile);
+		profileEnv = object(buildProfile.env);
+		const projectId = object(object(object(config.appConfig).extra).eas).projectId;
+		if (buildProfile.developmentClient !== true || buildProfile.distribution !== "internal" || platform === "ios" && buildProfile.simulator === true !== !physical) throw new EasFailure("STIM_BAD_ARG", `EAS profile ${profile} is not an internal development build for this ${platform} target.`, `Set developmentClient: true and distribution: internal${platform === "ios" ? `, with ios.simulator: ${!physical}` : ""} in that eas.json profile.`);
+		if (typeof projectId !== "string" || !projectId) throw new EasFailure("STIM_BAD_ARG", "The Expo app is not linked to an EAS project.", "Link the intended EAS project with eas init, then retry.");
+		if (platform === "ios" ? buildProfile.buildConfiguration !== void 0 && buildProfile.buildConfiguration !== "Debug" : buildProfile.gradleCommand !== void 0 && (typeof buildProfile.gradleCommand !== "string" || !/^:app:assemble\w*Debug$/.test(buildProfile.gradleCommand))) throw new EasFailure("STIM_BAD_ARG", `EAS profile ${profile} overrides the development build configuration.`, "Use ios.buildConfiguration: Debug or an android.gradleCommand that assembles a single Debug APK, or remove the override.");
+		note(`eas   fingerprinting ${platform} with profile ${profile}`);
+		const fingerprint = object(run([
+			"fingerprint:generate",
+			"--platform",
+			platform,
+			"--build-profile",
+			profile
+		])).hash;
+		if (typeof fingerprint !== "string" || !/^[a-f0-9]{40,64}$/.test(fingerprint)) throw new EasFailure("STIM_EAS_UNAVAILABLE", "EAS returned no valid native fingerprint.", `Run npx eas-cli fingerprint:generate --platform ${platform} --build-profile ${shellArg(profile)} to inspect the result.`);
+		note(`eas   looking for ${fingerprint.slice(0, 8)}`);
+		const buildId = selectEasBuild(run([
+			"build:list",
+			"--platform",
+			platform,
+			"--build-profile",
+			profile,
+			"--fingerprint-hash",
+			fingerprint,
+			"--status",
+			"finished",
+			...platform === "ios" && !physical ? ["--simulator"] : ["--distribution", "internal"],
+			"--limit",
+			"1"
+		]), {
+			platform,
+			profile,
+			fingerprint,
+			projectId,
+			physical
+		});
+		if (!buildId) throw new EasFailure("STIM_EAS_BUILD_MISSING", `No compatible EAS ${platform} build exists for profile ${profile} and fingerprint ${fingerprint}.`, `A cloud build may incur charges. With approval to run it, use ${buildCommand}, then retry ${retry}.`);
+		const cacheKey = `eas-${createHash("sha256").update(JSON.stringify({
+			projectId,
+			buildId
+		})).digest("hex")}-debug-${physical && platform === "ios" ? "device" : "sim"}`;
+		lock = acquireBuildLock({
+			platform,
+			key: cacheKey,
+			root
+		});
+		if (!lock.acquired) throw new EasFailure("STIM_EAS_UNAVAILABLE", `Another run holds the EAS artifact claim at ${lock.path}.`, `Wait for that run to finish, then retry ${retry}.`);
+		note(`eas   resolving artifact for build ${buildId}`);
+		const result = object(run([
+			"build:download",
+			"--build-id",
+			buildId
+		], 6e5));
+		if (typeof result.path !== "string" || !existsSync(result.path)) throw new Error("EAS returned no downloaded artifact.");
+		const path = realpathSync(result.path);
+		if (platform === "ios" ? !path.endsWith(".app") || !statSync(path).isDirectory() : !path.endsWith(".apk") || !statSync(path).isFile()) throw new Error("EAS returned an unexpected artifact path or type.");
+		note(`eas   artifact ready ${fingerprint.slice(0, 8)}`);
+		return {
+			ok: true,
+			path,
+			fingerprint,
+			cacheKey,
+			cacheHit: "remote"
+		};
+	} catch (error) {
+		const claim = claimFailure(error, null);
+		if (claim) return {
+			ok: false,
+			code: claim.code,
+			message: claim.message,
+			remedy: claim.remedy
+		};
+		if (error instanceof EasFailure) return {
+			ok: false,
+			code: error.code,
+			message: error.message,
+			remedy: error.remedy
+		};
+		return {
+			ok: false,
+			code: "STIM_EAS_UNAVAILABLE",
+			message: `Could not resolve the EAS development build: ${error.message}`,
+			remedy: `Retry ${retry}. No cloud build was started.`
+		};
+	} finally {
+		releaseBuildLock(lock);
+	}
+}
+//#endregion
+//#region src/engine/metro-warmup.ts
+const WARMUP_TIMEOUT_MS = 6e4;
+async function requestLocal(url, platform, prefetch) {
+	return new Promise((resolve) => {
+		const req = request(url, { headers: {
+			accept: "application/json",
+			"expo-platform": platform,
+			...prefetch ? { "x-stim-metro-warmup": "1" } : {}
+		} });
+		const timer = setTimeout(() => req.destroy(), WARMUP_TIMEOUT_MS);
+		timer.unref();
+		req.on("socket", (socket) => socket.unref());
+		req.on("error", () => resolve(null));
+		req.on("close", () => {
+			clearTimeout(timer);
+			resolve(null);
+		});
+		req.on("response", (res) => {
+			let body = "";
+			res.setEncoding("utf8");
+			res.on("data", (chunk) => {
+				if (!prefetch) body += chunk;
+			});
+			res.on("error", () => resolve(null));
+			res.on("end", () => resolve(res.statusCode === 200 ? body : null));
+		});
+		req.end();
+	});
+}
+async function warmMetro({ port, platform, isExpo, appId, bundleUrl }) {
+	try {
+		const origin = `http://127.0.0.1:${port}`;
+		if (await requestLocal(new URL("/_stim/metro-warmup", origin), platform, false) !== "ready") return;
+		const url = new URL("/index.bundle", origin);
+		url.search = new URLSearchParams({
+			platform,
+			dev: "true",
+			lazy: "true",
+			minify: "false",
+			...platform === "ios" ? { inlineSourceMap: "false" } : {},
+			modulesOnly: "false",
+			runModule: "true",
+			excludeSource: "true",
+			sourcePaths: "url-server",
+			...appId ? { app: appId } : {}
+		}).toString();
+		if (!bundleUrl && isExpo) {
+			const body = await requestLocal(new URL(origin), platform, false);
+			if (body === null) return;
+			const manifest = JSON.parse(body);
+			bundleUrl = manifest.launchAsset?.url ?? manifest.bundleUrl;
+			if (typeof bundleUrl !== "string") return;
+		}
+		if (bundleUrl) {
+			const bundle = new URL(bundleUrl, origin);
+			url.pathname = bundle.pathname;
+			url.search = bundle.search;
+		}
+		await requestLocal(url, platform, true);
+	} catch {}
+}
+//#endregion
 //#region src/commands/native-runtime.ts
 const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 const GATE_RETRY_DELAYS_MS = [
@@ -72,6 +309,9 @@ function launchOutcomeRecord({ launchState, release, bundleId, configuration, me
 		msg
 	};
 }
+function isPhysicalDeviceRequest(flag) {
+	return flag !== null && flag !== void 0 && flag !== false;
+}
 //#endregion
 //#region src/engine/prebuild.ts
 const PREBUILD_ERROR = "STIM_PREBUILD_FAILED";
@@ -554,4 +794,4 @@ function readJson(file) {
 	}
 }
 //#endregion
-export { swapJsBundle as a, ensureWorkspaceStorageSafely as c, noMetroMessage as d, noMetroRemedy as f, detectEntryFile as i, gateShouldRetry as l, sleep as m, pickDevClientScheme as n, needsPrebuild as o, resolveMetroWithRetry as p, schemesFromInfoPlist as r, runPrebuild as s, devClientScheme as t, launchOutcomeRecord as u };
+export { easDeviceBuildRemedy as _, swapJsBundle as a, ensureWorkspaceStorageSafely as c, launchOutcomeRecord as d, noMetroMessage as f, warmMetro as g, sleep as h, detectEntryFile as i, gateShouldRetry as l, resolveMetroWithRetry as m, pickDevClientScheme as n, needsPrebuild as o, noMetroRemedy as p, schemesFromInfoPlist as r, runPrebuild as s, devClientScheme as t, isPhysicalDeviceRequest as u, isEasBuildFailure as v, resolveEasDevelopmentBuild as y };

package/dist/{device-DJKv5Qej.mjs → device-BkiW-gkk.mjs}

@@ -1,9 +1,10 @@
-import { a as findProjectRoot } from "./project-COj6nzzh.mjs";
+import { V as validateDeviceSlot } from "./config-CcefMY2Q.mjs";
+import { a as findProjectRoot } from "./project-fKmuIaMI.mjs";
 import { r as clockTime } from "./command-output-8wHMEde0.mjs";
-import { f as takeLease, l as releaseWorkspaceLeases, n as fileLeaseIo, o as parseLeaseDuration } from "./device-lease-D-G3SgVe.mjs";
-import { d as waitForDevice, s as parseDeviceWait, t as selectFromPool } from "./device-pool-BlHXnYYs.mjs";
-import { E as physicalDeviceModel, O as probeEmulatorSerial, _ as listAdbDevices, b as memoizeEmulatorProbe, i as androidPoolNoCandidatesRefusal, j as resolvePhysicalDevice, r as androidPoolCandidates } from "./android-xmyGBNy5.mjs";
-import { c as listIosDevices, o as iosPoolCandidates, s as iosPoolNoCandidatesRefusal, u as resolveIosPhysicalDevice } from "./ios-device-CdSm0GDw.mjs";
+import { C as memoizeEmulatorProbe, P as resolvePhysicalDevice, i as androidPoolNoCandidatesRefusal, j as probeEmulatorSerial, k as physicalDeviceModel, r as androidPoolCandidates, y as listAdbDevices } from "./android-BqVIJoG7.mjs";
+import { f as takeLease, l as releaseWorkspaceLeases, n as fileLeaseIo, o as parseLeaseDuration } from "./device-lease-BJYybF-2.mjs";
+import { d as waitForDevice, s as parseDeviceWait, t as selectFromPool } from "./device-pool-CPbLGfrB.mjs";
+import { c as listIosDevices, o as iosPoolCandidates, s as iosPoolNoCandidatesRefusal, u as resolveIosPhysicalDevice } from "./ios-device-CWOM_S44.mjs";
 import chalk from "chalk";
 //#region src/commands/device.ts
 const DEFAULT_FOR = "5m";
@@ -24,7 +25,7 @@ const DEFAULT_DEPS = {
 	note: (line) => console.error(line)
 };
 function grantLine(facts, durationText) {
-	return `locked ${facts.deviceName ? `${facts.deviceName} (${facts.id})` : facts.id} for ${facts.holder} until ${clockTime(facts.expiresAt)} (${durationText}). Renew: stim device lock ${facts.platform} --for ${durationText}. Release: stim device unlock.`;
+	return `locked ${facts.deviceName ? `${facts.deviceName} (${facts.id})` : facts.id} for ${facts.holder} until ${clockTime(facts.expiresAt)} (${durationText}). Renew: stim device lock ${facts.platform}${facts.slot ? ` --slot ${facts.slot}` : ""} --for ${durationText}. Release: stim device unlock${facts.slot ? ` --slot ${facts.slot}` : ""}.`;
 }
 function releasedLine(lease) {
 	return `unlocked ${lease.deviceName ? `${lease.deviceName} (${lease.id})` : lease.id} -- the ${lease.platform} lease ran until ${clockTime(lease.expiresAt)}.`;
@@ -59,9 +60,10 @@ function resolveDevice(platform, requested, d) {
 function isFailure(value) {
 	return "code" in value;
 }
-async function poolDevice(platform, idLabel, waitSeconds, deadline, root, d) {
+async function poolDevice(platform, idLabel, waitSeconds, deadline, root, d, slot) {
 	const isEmulator = memoizeEmulatorProbe(d.probeEmulatorSerial);
 	const pooled = await d.selectFromPool({
+		...slot ? { slot } : {},
 		root,
 		platform,
 		idLabel,
@@ -140,10 +142,11 @@ async function runLock(platformArg, idArg, opts = {}, overrides = {}) {
 	const idLabel = platform === "ios" ? "udid" : "serial";
 	const deadline = d.now() + wait.seconds * 1e3;
 	const lastLine = { at: null };
-	const device = idArg ? resolveDevice(platform, idArg, d) : await poolDevice(platform, idLabel, wait.seconds, deadline, root, d);
+	const device = idArg ? resolveDevice(platform, idArg, d) : await poolDevice(platform, idLabel, wait.seconds, deadline, root, d, opts.slot);
 	if (isFailure(device)) return report(device);
 	for (;;) {
 		const outcome = await d.waitForDevice({
+			...opts.slot ? { slot: opts.slot } : {},
 			root,
 			platform,
 			id: device.id,
@@ -161,6 +164,7 @@ async function runLock(platformArg, idArg, opts = {}, overrides = {}) {
 			lease: outcome.refusal.lease
 		});
 		const taken = d.takeLease({
+			...opts.slot ? { slot: opts.slot } : {},
 			root,
 			platform,
 			id: device.id,
@@ -182,6 +186,7 @@ async function runLock(platformArg, idArg, opts = {}, overrides = {}) {
 		});
 		if (taken.status === "held") continue;
 		const facts = {
+			...taken.lease.slot ? { slot: taken.lease.slot } : {},
 			platform,
 			id: taken.lease.id,
 			deviceName: taken.lease.deviceName,
@@ -224,7 +229,10 @@ async function runUnlock(platformArg, opts = {}, overrides = {}) {
 		message: "Not in a React Native project (no package.json found).",
 		remedy: "Run this from the app directory -- the one holding package.json."
 	});
-	const released = d.releaseLeases(root, { platform }, d.io);
+	const released = d.releaseLeases(root, {
+		platform,
+		...opts.slot ? { slot: opts.slot } : {}
+	}, d.io);
 	if (released.length === 0) d.note(chalk.dim(`No ${platform ? `${platform} ` : ""}device lease to release for ${root}. \`stim status\` lists every lease on this machine.`));
 	if (json) d.out(JSON.stringify(released.map((lease) => ({
 		...lease,
@@ -235,10 +243,10 @@ async function runUnlock(platformArg, opts = {}, overrides = {}) {
 }
 function registerDevice(program, deps = {}) {
 	const device = program.command("device").description("Lease a connected physical device to this workspace, and give it back");
-	device.command("lock").argument("<platform>", "ios or android").argument("[id]", "the UDID or serial to lease; without one, the first free connected device is used").description("Lease a connected physical device to this workspace for a declared time, so another workspace's `--device` run waits instead of installing over it. Nothing but this command and a `--device` run moves the expiry.").option("--for <duration>", `How long to hold it: a whole number of seconds or minutes from 10s to 30m (default ${DEFAULT_FOR})`).option("--wait <seconds>", "How long to wait for a device another workspace holds, before refusing with STIM_DEVICE_BUSY (default 60, 0 refuses at once)").option("--json", "print the lease as JSON on stdout").action(async (platform, id, opts) => {
+	device.command("lock").argument("<platform>", "ios or android").argument("[id]", "the UDID or serial to lease; without one, the first free connected device is used").description("Lease a connected physical device to this workspace for a declared time, so another workspace's `--device` run waits instead of installing over it. Nothing but this command and a `--device` run moves the expiry.").option("--for <duration>", `How long to hold it: a whole number of seconds or minutes from 10s to 30m (default ${DEFAULT_FOR})`).option("--wait <seconds>", "How long to wait for a device another workspace holds, before refusing with STIM_DEVICE_BUSY (default 60, 0 refuses at once)").option("--slot <name>", "Use this workspace device slot", validateDeviceSlot).option("--json", "print the lease as JSON on stdout").action(async (platform, id, opts) => {
 		if ("code" in await runLock(platform, id, opts, deps)) process.exit(1);
 	});
-	device.command("unlock").argument("[platform]", "ios or android; without one, every lease this workspace holds is released").description("Release the device lease or leases this workspace holds. Releasing nothing is not an error.").option("--json", "print the released leases as JSON on stdout").action(async (platform, opts) => {
+	device.command("unlock").argument("[platform]", "ios or android; without one, every lease this workspace holds is released").description("Release the device lease or leases this workspace holds. Releasing nothing is not an error.").option("--slot <name>", "Use this workspace device slot", validateDeviceSlot).option("--json", "print the released leases as JSON on stdout").action(async (platform, opts) => {
 		const result = await runUnlock(platform, opts, deps);
 		if (!Array.isArray(result)) process.exit(1);
 	});

package/dist/{device-lease-D-G3SgVe.mjs → device-lease-BJYybF-2.mjs}

@@ -1,6 +1,6 @@
-import { k as withDirLock, u as getConfigDir } from "./config-D7uu8Gbq.mjs";
-import { _ as writeWorkspaceState, o as clearWorkspaceStateKeys, p as readWorkspaceState } from "./state-IYEY-zi8.mjs";
-import { a as segment } from "./build-lock-vE45ZzJZ.mjs";
+import { I as deviceSlotKey, R as parseDeviceSlotKey, V as validateDeviceSlot, k as withDirLock, u as getConfigDir } from "./config-CcefMY2Q.mjs";
+import { _ as writeWorkspaceState, m as withWorkspaceStateLock, o as clearWorkspaceStateKeys, p as readWorkspaceState } from "./state-B3XA2wp2.mjs";
+import { H as segment } from "./android-BqVIJoG7.mjs";
 import { mkdirSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { randomBytes } from "node:crypto";
 import { join } from "node:path";
@@ -21,6 +21,7 @@ function deviceLeaseLockPath(platform, id) {
 	return join(deviceLocksDir(), `${leaseStem(platform, id)}${LOCK_SUFFIX}`);
 }
 const fileLeaseIo = {
+	withHolderLock: withWorkspaceStateLock,
 	now: () => Date.now(),
 	readLease(path) {
 		try {
@@ -83,8 +84,17 @@ function parseLease(raw) {
 	const token = text(entry.token);
 	const expiresAt = text(entry.expiresAt);
 	if (!id || !holder || !token || !expiresAt || !Number.isFinite(Date.parse(expiresAt))) return null;
+	if (entry.slot !== void 0) {
+		if (typeof entry.slot !== "string") return null;
+		try {
+			validateDeviceSlot(entry.slot);
+		} catch {
+			return null;
+		}
+	}
 	return {
 		version: 1,
+		...typeof entry.slot === "string" ? { slot: entry.slot } : {},
 		platform: entry.platform,
 		id,
 		deviceName: text(entry.deviceName),
@@ -98,7 +108,7 @@ function parseWorkspaceLeases(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return {};
 	const leases = {};
 	for (const [platform, entry] of Object.entries(value)) {
-		if (!isPlatform(platform) || !entry || typeof entry !== "object") continue;
+		if (!parseDeviceSlotKey(platform) || !entry || typeof entry !== "object") continue;
 		const record = entry;
 		const id = text(record.id);
 		const token = text(record.token);
@@ -145,70 +155,74 @@ function writeLease(lease, io) {
 	io.writeLease(deviceLeasePath(lease.platform, lease.id), `${JSON.stringify(lease, null, 2)}\n`);
 	return lease;
 }
-function takeLease({ root, platform, id, deviceName = null, kind, durationMs = DEFAULT_LEASE_MS }, io = fileLeaseIo) {
-	const previous = io.readHolder(root)[platform];
-	if (previous && previous.id !== id) releaseHeld(root, platform, previous, io);
-	for (const entry of listLeaseFiles(io)) {
-		const other = entry.lease;
-		if (!other || other.platform !== platform || other.holder !== root || other.id === id) continue;
-		releaseByRoot(root, platform, other.id, io);
-	}
-	const declared = previous?.kind === "declared" && previous.id === id;
-	const path = deviceLeasePath(platform, id);
-	const result = io.withLeaseLock(deviceLeaseLockPath(platform, id), () => {
-		const now = io.now();
-		const raw = io.readLease(path);
-		const current = parseLease(raw);
-		if (raw !== null && !current) return {
-			status: "unreadable",
-			path
-		};
-		const asked = now + durationMs;
-		if (current && !leaseIsExpired(current, now)) {
-			if (current.holder !== root) return {
-				status: "held",
-				lease: current
+function takeLease({ root, platform, slot = "default", id, deviceName = null, kind, durationMs = DEFAULT_LEASE_MS }, io = fileLeaseIo) {
+	return withHolderLock(io, root, () => {
+		const key = deviceSlotKey(platform, slot);
+		const previous = io.readHolder(root)[key];
+		if (previous && previous.id !== id) releaseHeld(root, platform, previous, io, slot);
+		for (const entry of listLeaseFiles(io)) {
+			const other = entry.lease;
+			if (!other || other.platform !== platform || other.holder !== root || (other.slot ?? "default") !== slot || other.id === id) continue;
+			releaseByRoot(root, platform, other.id, io);
+		}
+		const declared = previous?.kind === "declared" && previous.id === id;
+		const path = deviceLeasePath(platform, id);
+		const result = io.withLeaseLock(deviceLeaseLockPath(platform, id), () => {
+			const now = io.now();
+			const raw = io.readLease(path);
+			const current = parseLease(raw);
+			if (raw !== null && !current) return {
+				status: "unreadable",
+				path
 			};
-			const floor = declared && kind === "run" ? Math.max(asked, Date.parse(current.expiresAt)) : asked;
+			const asked = now + durationMs;
+			if (current && !leaseIsExpired(current, now)) {
+				if (current.holder !== root || (current.slot ?? "default") !== slot) return {
+					status: "held",
+					lease: current
+				};
+				const floor = declared && kind === "run" ? Math.max(asked, Date.parse(current.expiresAt)) : asked;
+				return {
+					status: "set",
+					lease: writeLease({
+						...current,
+						deviceName: deviceName ?? current.deviceName,
+						expiresAt: new Date(floor).toISOString()
+					}, io)
+				};
+			}
+			const expiresAt = new Date(asked).toISOString();
 			return {
-				status: "set",
+				status: "taken",
 				lease: writeLease({
-					...current,
-					deviceName: deviceName ?? current.deviceName,
-					expiresAt: new Date(floor).toISOString()
+					version: 1,
+					...slot === "default" ? {} : { slot },
+					platform,
+					id,
+					deviceName,
+					holder: root,
+					token: randomBytes(12).toString("hex"),
+					grantedAt: new Date(now).toISOString(),
+					expiresAt
 				}, io)
 			};
+		});
+		if (result.status === "taken" || result.status === "set") {
+			const recorded = result.status === "set" && declared ? "declared" : kind;
+			io.writeHolder(root, {
+				...io.readHolder(root),
+				[key]: {
+					id,
+					token: result.lease.token,
+					kind: recorded
+				}
+			});
 		}
-		const expiresAt = new Date(asked).toISOString();
-		return {
-			status: "taken",
-			lease: writeLease({
-				version: 1,
-				platform,
-				id,
-				deviceName,
-				holder: root,
-				token: randomBytes(12).toString("hex"),
-				grantedAt: new Date(now).toISOString(),
-				expiresAt
-			}, io)
-		};
+		return result;
 	});
-	if (result.status === "taken" || result.status === "set") {
-		const recorded = result.status === "set" && declared ? "declared" : kind;
-		io.writeHolder(root, {
-			...io.readHolder(root),
-			[platform]: {
-				id,
-				token: result.lease.token,
-				kind: recorded
-			}
-		});
-	}
-	return result;
 }
-function raiseLease({ root, platform, minMs }, io = fileLeaseIo) {
-	const record = io.readHolder(root)[platform];
+function raiseLease({ root, platform, slot = "default", minMs }, io = fileLeaseIo) {
+	const record = io.readHolder(root)[deviceSlotKey(platform, slot)];
 	if (!record) return { status: "none" };
 	const path = deviceLeasePath(platform, record.id);
 	return io.withLeaseLock(deviceLeaseLockPath(platform, record.id), () => {
@@ -239,7 +253,8 @@ function summarize(lease) {
 		expiresAt: lease.expiresAt
 	};
 }
-function releaseHeld(root, platform, record, io) {
+function releaseHeld(root, platform, record, io, slot = "default") {
+	const key = deviceSlotKey(platform, slot);
 	const path = deviceLeasePath(platform, record.id);
 	const released = io.withLeaseLock(deviceLeaseLockPath(platform, record.id), () => {
 		const current = parseLease(io.readLease(path));
@@ -248,8 +263,8 @@ function releaseHeld(root, platform, record, io) {
 		return current;
 	});
 	const held = io.readHolder(root);
-	if (held[platform]?.token === record.token) {
-		delete held[platform];
+	if (held[key]?.token === record.token) {
+		delete held[key];
 		io.writeHolder(root, held);
 	}
 	return released;
@@ -263,27 +278,33 @@ function releaseByRoot(root, platform, id, io) {
 		return current;
 	});
 }
-function releaseRunLease({ root, platform }, io = fileLeaseIo) {
-	const record = io.readHolder(root)[platform];
-	if (!record || record.kind !== "run") return null;
-	const released = releaseHeld(root, platform, record, io);
-	return released ? summarize(released) : null;
+function releaseRunLease({ root, platform, slot = "default" }, io = fileLeaseIo) {
+	return withHolderLock(io, root, () => {
+		const record = io.readHolder(root)[deviceSlotKey(platform, slot)];
+		if (!record || record.kind !== "run") return null;
+		const released = releaseHeld(root, platform, record, io, slot);
+		return released ? summarize(released) : null;
+	});
 }
-function releaseWorkspaceLeases(root, { platform = null } = {}, io = fileLeaseIo) {
-	const released = [];
-	for (const [name, record] of Object.entries(io.readHolder(root))) {
-		if (!isPlatform(name) || platform && name !== platform) continue;
-		const lease = releaseHeld(root, name, record, io);
-		if (lease) released.push(summarize(lease));
-	}
-	for (const entry of listLeaseFiles(io)) {
-		const lease = entry.lease;
-		if (!lease || lease.holder !== root) continue;
-		if (platform && lease.platform !== platform) continue;
-		const byRoot = releaseByRoot(root, lease.platform, lease.id, io);
-		if (byRoot) released.push(summarize(byRoot));
-	}
-	return released;
+function releaseWorkspaceLeases(root, { platform = null, slot = null } = {}, io = fileLeaseIo) {
+	return withHolderLock(io, root, () => {
+		const released = [];
+		for (const [name, record] of Object.entries(io.readHolder(root))) {
+			const parsed = parseDeviceSlotKey(name);
+			if (!parsed || platform && parsed.platform !== platform || slot !== null && parsed.slot !== slot) continue;
+			const lease = releaseHeld(root, parsed.platform, record, io, parsed.slot);
+			if (lease) released.push(summarize(lease));
+		}
+		for (const entry of listLeaseFiles(io)) {
+			const lease = entry.lease;
+			if (!lease || lease.holder !== root) continue;
+			if (platform && lease.platform !== platform) continue;
+			if (slot !== null && (lease.slot ?? "default") !== slot) continue;
+			const byRoot = releaseByRoot(root, lease.platform, lease.id, io);
+			if (byRoot) released.push(summarize(byRoot));
+		}
+		return released;
+	});
 }
 function removeExpiredLease(entry, io = fileLeaseIo) {
 	const lease = entry.lease;
@@ -331,5 +352,8 @@ function selectPoolDevice({ candidates, leases, held = null, now }) {
 		holders
 	};
 }
+function withHolderLock(io, root, fn) {
+	return io.withHolderLock ? io.withHolderLock(root, fn) : fn();
+}
 //#endregion
 export { parseLease as a, releaseRunLease as c, selectPoolDevice as d, takeLease as f, listLeaseFiles as i, releaseWorkspaceLeases as l, fileLeaseIo as n, parseLeaseDuration as o, leaseIsExpired as r, raiseLease as s, deviceLeasePath as t, removeExpiredLease as u };