stim 1.15.0 → 1.16.0

package/dist/{device-BZ1IyS5A.mjs → device-DZQjF7H5.mjs}

@@ -1,10 +1,11 @@
 import { H as projectDeviceSlots, R as deviceSlotKey, V as parseDeviceSlotOption, p as getProject } from "./config-D0DbpZtM.mjs";
-import { a as findProjectRoot, t as NO_PROJECT_REFUSAL } from "./project-CV3tDFHl.mjs";
-import { r as clockTime } from "./command-output-CliHHn7a.mjs";
-import { n as fileLeaseIo, o as parseLeaseDuration, p as takeLease, u as releaseWorkspaceLeases } from "./device-lease-W5Pi1q38.mjs";
-import { E as getAvdNameForSerial, G as probeEmulatorSerial, N as memoizeEmulatorProbe, O as listAdbDevices, U as physicalDeviceModel, Y as resolvePhysicalDevice, c as androidPoolNoCandidatesRefusal, s as androidPoolCandidates } from "./android-Db2eEMaf.mjs";
-import { d as waitForDevice, s as parseDeviceWait, t as selectFromPool } from "./device-pool-B2r38YjS.mjs";
-import { a as iosPoolCandidates, c as isWirelessIosDevice, f as resolveIosPhysicalDevice, l as listIosDevices, o as iosPoolNoCandidatesRefusal } from "./ios-device-DERmMmk-.mjs";
+import { r as clockTime } from "./command-output-DnJMdEY-.mjs";
+import { o as findProjectRoot, t as NO_PROJECT_REFUSAL } from "./project-Du91Ilvc.mjs";
+import { n as fileLeaseIo, o as parseLeaseDuration, p as takeLease, u as releaseWorkspaceLeases } from "./device-lease-D-hLqx1b.mjs";
+import { E as getAvdNameForSerial, G as probeEmulatorSerial, N as memoizeEmulatorProbe, O as listAdbDevices, U as physicalDeviceModel, Y as resolvePhysicalDevice, c as androidPoolNoCandidatesRefusal, s as androidPoolCandidates } from "./android-B_NumVyQ.mjs";
+import { l as parseDeviceWait, p as waitForDevice } from "./device-lease-run-CqjShqWW.mjs";
+import { t as selectFromPool } from "./device-pool-CUaEWMMm.mjs";
+import { a as iosPoolCandidates, c as isWirelessIosDevice, f as resolveIosPhysicalDevice, l as listIosDevices, o as iosPoolNoCandidatesRefusal } from "./ios-device-FfCN_C8p.mjs";
 import chalk from "chalk";
 //#region src/commands/device.ts
 const DEFAULT_FOR = "5m";

package/dist/{device-capacity-DMuKC7nx.mjs → device-capacity-BHwxNBlu.mjs}

@@ -1,6 +1,6 @@
 import { H as projectDeviceSlots, _ as loadConfig, z as deviceSlotPlatforms } from "./config-D0DbpZtM.mjs";
-import { O as listAdbDevices } from "./android-Db2eEMaf.mjs";
-import { _ as parseRuntimeVersion, c as iosRuntimeMatches, u as listAllIosSims } from "./ios-3CtCRhwr.mjs";
+import { O as listAdbDevices } from "./android-B_NumVyQ.mjs";
+import { _ as parseRuntimeVersion, c as iosRuntimeMatches, u as listAllIosSims } from "./ios-BaInn3sW.mjs";
 //#region src/engine/device-capacity.ts
 function liveOwnedDeviceCount({ sims = [], adbEmulators = [], config = null } = {}) {
 	let count = 0;

package/dist/device-host-worker.mjs

@@ -1,25 +1,196 @@
 import { t as getExecutor } from "./exec-CaErVv7t.mjs";
+import { D as withConfigLock$1, _ as loadConfig$1, c as ensureConfig } from "./config-D0DbpZtM.mjs";
 import { t as process_identity_exports } from "./process-identity-BmRm1qV0.mjs";
-import { c as writeWorkspaceState, p as ensureWorkspaceStorage } from "./workspace-state-CL2V2Ons.mjs";
-import { A as listAvds, D as hostSystemImageArch, E as getAvdNameForSerial, O as listAdbDevices, R as ownedAvdName, W as pickDefaultSystemImage, a as androidDeviceAbi, b as createOwnedAvd, d as androidToolPath, j as listInstalledSystemImages, k as listAvdDeviceProfiles, t as DEFAULT_AVD_DEVICE_PROFILE, tt as waitForBoot, v as bootAndroidEmulator } from "./android-Db2eEMaf.mjs";
-import { i as teardownOwnedAvd, o as teardownOwnedIosSim } from "./teardown-BYuQafiA.mjs";
-import { C as resolveIosCreation, i as createOwnedIosSim, j as readHostMemoryPressure, n as bootIosSim, u as listAllIosSims } from "./ios-3CtCRhwr.mjs";
-import { a as requiredMacosRecord, r as macosProcess } from "./state-BxCgeTQu.mjs";
-import { _ as installIosApp, b as launchAndroidReleaseApp, h as installAndroidApp, s as androidAppProcess, v as iosAppProcess, x as launchIosApp } from "./app-install-CAAplXAt.mjs";
-import { h as findAapt } from "./support-CDQbDkL5.mjs";
-import { n as stopMacosAppHeld } from "./stop-Bvf1MflS.mjs";
-import { t as spawnEntry } from "./spawn-entry-DncpJvWL.mjs";
+import { c as writeWorkspaceState, u as ensureWorkspaceStorage } from "./workspace-state-B8-aJ1_5.mjs";
+import { t as forgetCreatedDevice } from "./created-devices-D5owjN4C.mjs";
+import { A as listAvds, D as hostSystemImageArch, E as getAvdNameForSerial, O as listAdbDevices, R as ownedAvdName, W as pickDefaultSystemImage, _ as avdStorageRoots, a as androidDeviceAbi, b as createOwnedAvd, d as androidToolPath, h as avdPathExists, j as listInstalledSystemImages, k as listAvdDeviceProfiles, t as DEFAULT_AVD_DEVICE_PROFILE, tt as waitForBoot, v as bootAndroidEmulator } from "./android-B_NumVyQ.mjs";
+import { C as resolveIosCreation, i as createOwnedIosSim, j as readHostMemoryPressure, n as bootIosSim, u as listAllIosSims } from "./ios-BaInn3sW.mjs";
+import { i as teardownOwnedAvd, o as teardownOwnedIosSim } from "./teardown-CL6vDs2Y.mjs";
+import { a as requiredMacosRecord, r as macosProcess } from "./state-3DwSQIBK.mjs";
+import { r as createNdjsonWriter } from "./ndjson-PclOIwVY.mjs";
+import { n as parseLogStreamLine } from "./ios-Cr1h5gnO.mjs";
+import { _ as installIosApp, b as launchAndroidReleaseApp, h as installAndroidApp, s as androidAppProcess, v as iosAppProcess, x as launchIosApp } from "./app-install-CKWdbXIX.mjs";
+import { h as findAapt } from "./support-CAP8qDUF.mjs";
+import { n as stopMacosAppHeld } from "./stop-B0Yxtmiy.mjs";
+import { t as spawnEntry } from "./spawn-entry-jw19m8Nl.mjs";
 import { createHash, randomUUID } from "node:crypto";
 import { chmodSync, closeSync, copyFileSync, createReadStream, existsSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statfsSync, symlinkSync, writeFileSync } from "node:fs";
 import { dirname, isAbsolute, join, posix, relative, sep } from "node:path";
-import { configDir, withDirLock } from "@stim-cli/core";
-import { assertHostedDeviceLedger, hostedAppArea, hostedAppAttempt, hostedConsolePort, hostedMacosAppSlot, hostedMacosBundleId, isJsonObject, parseHostedOfferRequest, readHostedApp, readHostedDevice, readMacosRecord } from "@stim-cli/core/state";
+import { LOG_ROTATE_BYTES, configDir, withDirLock } from "@stim-cli/core";
+import { assertHostedDeviceLedger, hostedAppArea, hostedAppAttempt, hostedAppBlobs, hostedConsolePort, hostedIosLogsDir, hostedMacosAppSlot, hostedMacosBundleId, isJsonObject, parseHostedOfferRequest, readHostedApp, readHostedAppMetadata, readHostedDevice, readHostedIosLogsCheckpoint, readMacosRecord, readNdjsonGenerations } from "@stim-cli/core/state";
 import { availableParallelism, freemem, homedir, loadavg } from "node:os";
+//#region src/device-host/ios-logs.ts
+function logDate(ms) {
+	return new Date(ms).toISOString().replace("T", " ").replace(".000Z", "+0000");
+}
+/** Captures a bounded unified-log window only from this home's exact ledger-owned simulator. */
+function collectHostedIosLogs(home, session, attempt, since, final = false) {
+	const device = readHostedDevice(home);
+	assertHostedDeviceLedger(home, device.udid);
+	if (readHostedAppMetadata(session, attempt, home).state !== "installed") return false;
+	const directory = hostedIosLogsDir(home);
+	const previous = readHostedIosLogsCheckpoint(home);
+	const beginning = Math.floor(since / 1e3) * 1e3;
+	let newest;
+	if (!previous) {
+		for (const entry of readNdjsonGenerations(join(directory, "device.ndjson"))) if (typeof entry.ts === "number" && (newest === void 0 || entry.ts > newest)) newest = entry.ts;
+	}
+	const checkpoint = previous?.until ?? Math.max(beginning, Math.floor((newest ?? beginning) / 1e3) * 1e3);
+	let from = Math.max(beginning, previous ? checkpoint - 5e3 : checkpoint);
+	const now = Math.floor(Date.now() / 1e3) * 1e3;
+	if (now < checkpoint) return false;
+	const backlogMs = Math.max(1e3, now - checkpoint);
+	let windowMs = !final && previous?.windowMs ? Math.min(previous.windowMs * 2, backlogMs) : backlogMs;
+	let until = Math.min(now, checkpoint + windowMs);
+	let end = until === now ? until + 1e3 : until;
+	const deadline = Date.now() + 1e4;
+	const exec = getExecutor();
+	const executable = exec.runFile("/usr/libexec/PlistBuddy", [
+		"-c",
+		"Print :CFBundleExecutable",
+		join(hostedAppArea(session, attempt, home), "App.app", "Info.plist")
+	], {
+		timeoutMs: 2e3,
+		killSignal: "SIGKILL"
+	});
+	if (!executable || /["\\/\0\r\n]/.test(executable)) throw new Error("The app executable cannot form a log predicate.");
+	let output;
+	for (;;) {
+		const remaining = deadline - Date.now();
+		if (remaining <= 0) throw new Error("Hosted native log query exceeded its collection budget.");
+		try {
+			output = exec.runFile("xcrun", [
+				"simctl",
+				"spawn",
+				device.udid,
+				"log",
+				"show",
+				"--style",
+				"ndjson",
+				"--predicate",
+				`processImagePath ENDSWITH "/App.app/${executable}"`,
+				"--info",
+				"--start",
+				logDate(from),
+				"--end",
+				logDate(end)
+			], {
+				timeoutMs: Math.min(remaining, 4e3),
+				killSignal: "SIGKILL"
+			});
+			break;
+		} catch (error) {
+			const span = final ? until - from : until - checkpoint;
+			if (span <= 1e3) throw error;
+			windowMs = Math.max(1e3, Math.floor(span / 4 / 1e3) * 1e3);
+			if (final) from = Math.max(beginning, now - windowMs);
+			else until = Math.min(now, checkpoint + windowMs);
+			end = until === now ? until + 1e3 : until;
+			if (previous) {
+				mkdirSync(directory, {
+					recursive: true,
+					mode: 448
+				});
+				withDirLock(join(directory, "query.lock"), () => {
+					const temporary = join(directory, "checkpoint.json.tmp");
+					writeFileSync(temporary, JSON.stringify({
+						until: checkpoint,
+						boundary: previous.boundary,
+						windowMs
+					}), { mode: 384 });
+					renameSync(temporary, join(directory, "checkpoint.json"));
+				});
+			}
+		}
+	}
+	const seen = /* @__PURE__ */ new Map();
+	for (const digest of previous?.boundary ?? []) seen.set(digest, (seen.get(digest) ?? 0) + 1);
+	const boundary = [];
+	const records = [];
+	if (final && from > checkpoint) records.push({
+		ts: from,
+		src: "device",
+		platform: "ios",
+		level: "warn",
+		msg: `Hosted iOS native log gap: dropped interval [${new Date(checkpoint).toISOString()}, ${new Date(from).toISOString()}) to collect the final tail within its budget.`
+	});
+	for (const line of output.split("\n")) {
+		const parsed = parseLogStreamLine(line);
+		if (!parsed || typeof parsed.ts !== "number" || parsed.ts < from || parsed.ts > end) continue;
+		const entry = JSON.parse(line);
+		const digest = createHash("sha256").update(JSON.stringify(Object.entries(entry).toSorted(([a], [b]) => a.localeCompare(b)))).digest("hex");
+		if (parsed.ts >= until - 5e3) boundary.push(digest);
+		if (newest !== void 0 && parsed.ts <= newest) continue;
+		const count = seen.get(digest) ?? 0;
+		if (count) {
+			seen.set(digest, count - 1);
+			continue;
+		}
+		records.push({
+			...parsed,
+			platform: "ios"
+		});
+	}
+	mkdirSync(directory, {
+		recursive: true,
+		mode: 448
+	});
+	withDirLock(join(directory, "query.lock"), () => {
+		const writer = createNdjsonWriter(join(directory, "device.ndjson"), { maxBytes: LOG_ROTATE_BYTES });
+		try {
+			for (const entry of records) if (!writer.write(entry)) throw new Error("Could not persist hosted iOS native logs.");
+		} finally {
+			writer.close();
+		}
+		const temporary = join(directory, "checkpoint.json.tmp");
+		try {
+			writeFileSync(temporary, JSON.stringify({
+				until,
+				boundary,
+				...until < now ? { windowMs } : {}
+			}), { mode: 384 });
+			renameSync(temporary, join(directory, "checkpoint.json"));
+		} finally {
+			rmSync(temporary, { force: true });
+		}
+	});
+	return until < now;
+}
+//#endregion
 //#region src/device-host/app.ts
 function inside(root, path) {
 	const diff = relative(root, path);
 	return diff !== "" && diff !== ".." && !diff.startsWith(`..${process.platform === "win32" ? "\\" : "/"}`) && !isAbsolute(diff);
 }
+function removeHostedAppData(home) {
+	const area = realpathSync(join(home, ".."));
+	const assertInside = (path) => {
+		if (!inside(area, realpathSync(path))) throw new Error("Hosted app data resolves outside its private area.");
+	};
+	const remove = (path) => {
+		if (!lstatSync(path, { throwIfNoEntry: false })) return;
+		assertInside(path);
+		rmSync(path, {
+			recursive: true,
+			force: true
+		});
+	};
+	assertInside(home);
+	const apps = join(area, "apps");
+	if (existsSync(apps)) {
+		assertInside(apps);
+		for (const attempt of readdirSync(apps)) {
+			const directory = join(apps, attempt);
+			if (!lstatSync(directory).isDirectory()) continue;
+			assertInside(directory);
+			remove(join(directory, "App.app"));
+			remove(join(directory, "App.apk"));
+			remove(join(directory, "App.apk.tmp"));
+			remove(join(directory, "blobs"));
+		}
+	}
+	remove(join(area, "blobs"));
+}
 async function digest$1(path) {
 	const hash = createHash("sha256");
 	for await (const chunk of createReadStream(path)) hash.update(chunk);
@@ -42,9 +213,10 @@ function newer(value, supported) {
 async function materializeHostedApp(home, session, attempt) {
 	const record = readHostedApp(session, attempt, home);
 	const area = hostedAppArea(session, attempt, home);
+	const blobs = hostedAppBlobs(session, home);
 	const app = join(area, "App.app");
 	if (record.state !== "installing") throw new Error("This app attempt has not been admitted for installation.");
-	const manifest = join(area, "blobs", record.manifest.sha256);
+	const manifest = join(blobs, record.manifest.sha256);
 	if (lstatSync(manifest).size !== record.manifest.size || await digest$1(manifest) !== record.manifest.sha256) throw new Error("The hosted app manifest differs from its digest.");
 	rmSync(app, {
 		recursive: true,
@@ -52,7 +224,7 @@ async function materializeHostedApp(home, session, attempt) {
 	});
 	mkdirSync(app, { mode: 448 });
 	for (const file of record.files) {
-		const blob = join(area, "blobs", file.sha256);
+		const blob = join(blobs, file.sha256);
 		const stat = lstatSync(blob);
 		if (!stat.isFile() || stat.size !== file.size || await digest$1(blob) !== file.sha256) throw new Error(`App content is incomplete or differs from its digest: ${file.path}`);
 		if (file.kind === "link") continue;
@@ -65,7 +237,7 @@ async function materializeHostedApp(home, session, attempt) {
 		chmodSync(target, file.kind === "exec" ? 493 : 420);
 	}
 	for (const file of record.files.filter((each) => each.kind === "link")) {
-		const bytes = readFileSync(join(area, "blobs", file.sha256));
+		const bytes = readFileSync(join(blobs, file.sha256));
 		const target = bytes.toString("utf8");
 		const destination = posix.normalize(posix.join(posix.dirname(file.path), target));
 		if (!target || !Buffer.from(target).equals(bytes) || /[\\\0\r\n]/.test(target) || posix.isAbsolute(target) || destination === "." || destination === ".." || destination.startsWith("../") || file.path.startsWith(`${destination}/`)) throw new Error(`The app link escapes its bundle or forms an ancestor cycle: ${file.path}`);
@@ -201,7 +373,7 @@ async function runHostedDevice(mode, selectors, app) {
 			};
 		}
 		device = readHostedDevice(home);
-		assertHostedDeviceLedger(home, device.udid);
+		const ledger = assertHostedDeviceLedger(home, device.udid, "ios", { allowEmpty: mode === "stop" });
 		const current = inventory().find((sim) => sim.udid === device.udid);
 		if (mode === "install") {
 			if (!app || current?.state !== "Booted") throw new Error("Hosted app installation requires its booted owned simulator.");
@@ -212,14 +384,20 @@ async function runHostedDevice(mode, selectors, app) {
 				launched
 			};
 		}
-		if (!current) return {
-			state: "stopped",
-			device
-		};
-		const outcome = teardownOwnedIosSim(device.udid);
+		if (ledger === "empty") {
+			if (current) throw new Error("The hosted simulator remains without ledger ownership; it was kept.");
+			removeHostedAppData(home);
+			return {
+				state: "stopped",
+				device
+			};
+		}
+		const outcome = teardownOwnedIosSim(device.udid, { del: true });
 		if (outcome.status !== "torn-down" && outcome.status !== "missing") throw new Error(outcome.reason ?? "Hosted simulator teardown was not established.");
 		const after = inventory().find((sim) => sim.udid === device.udid);
-		if (after && after.state !== "Shutdown") throw new Error("Hosted simulator shutdown could not be verified.");
+		if (after) throw new Error(`Hosted simulator ${device.udid} is still listed (${after.state}); deletion could not be verified. If its runtime is unavailable, delete it with xcrun simctl delete and stop the session again.`);
+		forgetCreatedDevice("ios", device.udid);
+		removeHostedAppData(home);
 		return {
 			state: "stopped",
 			device
@@ -246,9 +424,9 @@ async function installHostedAndroidApp(home, session, attempt, device) {
 	if (record.state !== "installing") throw new Error("This app attempt has not been admitted for installation.");
 	const entry = record.files[0];
 	if (record.files.length !== 1 || !entry || entry.path !== "App.apk" || entry.kind !== "file") throw new Error("Hosted Android delivery requires a single file entry named App.apk.");
-	const manifest = join(area, "blobs", record.manifest.sha256);
+	const manifest = join(hostedAppBlobs(session, home), record.manifest.sha256);
 	if (lstatSync(manifest).size !== record.manifest.size || await digest(manifest) !== record.manifest.sha256) throw new Error("The hosted APK manifest differs from its digest.");
-	const blob = join(area, "blobs", entry.sha256);
+	const blob = join(hostedAppBlobs(session, home), entry.sha256);
 	const stat = lstatSync(blob);
 	if (!stat.isFile() || stat.size !== entry.size || await digest(blob) !== entry.sha256) throw new Error("APK content is incomplete or differs from its digest.");
 	const temporary = join(area, "App.apk.tmp");
@@ -381,10 +559,19 @@ async function runHostedAndroidDevice(mode, request, app) {
 			};
 		}
 		device = readHostedDevice(home, "android");
-		assertHostedDeviceLedger(home, device.avdName, "android");
-		const outcome = teardownOwnedAvd(device.avdName);
-		if (outcome.status !== "torn-down" && outcome.status !== "missing") throw new Error(outcome.reason ?? "Hosted Android shutdown was not established.");
+		const ledger = assertHostedDeviceLedger(home, device.avdName, "android", { allowEmpty: true });
+		if (ledger === "listed") {
+			withConfigLock$1(() => {
+				if (!loadConfig$1()) ensureConfig();
+			});
+			const outcome = teardownOwnedAvd(device.avdName, { del: true });
+			if (outcome.status !== "torn-down" && outcome.status !== "missing") throw new Error(outcome.reason ?? "Hosted Android deletion was not established.");
+		}
+		const name = device.avdName;
+		if (listAvds({ timeoutMs: 5e3 }).includes(name) || avdStorageRoots().some((root) => avdPathExists(join(root, `${name}.ini`)) || avdPathExists(join(root, `${name}.avd`)))) throw new Error("The hosted AVD or its data still exists; deletion could not be verified.");
 		if (getAvdNameForSerial(device.serial) === device.avdName) throw new Error("The hosted Android emulator is still running.");
+		if (ledger === "listed") forgetCreatedDevice("android", device.avdName);
+		removeHostedAppData(home);
 		return {
 			state: "stopped",
 			device
@@ -504,6 +691,7 @@ async function runHostedMacosApp(mode, request, app) {
 					removeAppData(area, join(directory, "blobs"));
 				}
 			}
+			removeAppData(area, join(home, "..", "blobs"));
 			return {
 				state: "stopped",
 				device
@@ -724,7 +912,8 @@ async function main() {
 		"prepare",
 		"stop",
 		"install",
-		"offer"
+		"offer",
+		"logs"
 	].includes(String(input.mode))) throw new Error("Invalid hosted worker request.");
 	if (input.mode === "offer") {
 		const request = parseHostedOfferRequest(input);
@@ -740,9 +929,15 @@ async function main() {
 		})}\n`);
 		return;
 	}
-	if (input.mode === "install" && (typeof input.session !== "string" || !/^[a-f0-9-]{36}$/.test(input.session) || !hostedAppAttempt(input.attempt))) throw new Error("Invalid hosted app request.");
+	if ((input.mode === "install" || input.mode === "logs") && (typeof input.session !== "string" || !/^[a-f0-9-]{36}$/.test(input.session) || !hostedAppAttempt(input.attempt))) throw new Error("Invalid hosted app request.");
 	if (input.metroPort !== void 0 && (typeof input.metroPort !== "number" || !Number.isInteger(input.metroPort) || input.metroPort < 1 || input.metroPort > 65535)) throw new Error("Invalid hosted Metro port.");
 	if (input.platform === "macos" && !hostedMacosAppSlot(input.appSlot)) throw new Error("Invalid hosted macOS app slot.");
+	if (input.mode === "logs") {
+		if (input.platform !== "ios" || !process.env.STIM_HOME || typeof input.since !== "number" || !Number.isFinite(input.since)) throw new Error("Invalid hosted iOS log request.");
+		const more = collectHostedIosLogs(process.env.STIM_HOME, input.session, input.attempt, input.since, input.final === true);
+		process.stdout.write(`${JSON.stringify({ more })}\n`);
+		return;
+	}
 	const result = input.platform === "macos" ? await runHostedMacosApp(input.mode, {
 		session: typeof input.session === "string" ? input.session : "",
 		appSlot: input.appSlot

package/dist/{device-ios-DMQBUPus.mjs → device-ios-BadmeL2V.mjs}

@@ -1,13 +1,13 @@
 import { t as getExecutor } from "./exec-CaErVv7t.mjs";
 import { C as saveConfig, D as withConfigLock, H as projectDeviceSlots, _ as loadConfig, a as clearDevice, d as getConfigDir, w as setDevice, z as deviceSlotPlatforms } from "./config-D0DbpZtM.mjs";
-import { x as workspaceId } from "./workspace-state-CL2V2Ons.mjs";
+import { l as phaseLine } from "./command-output-DnJMdEY-.mjs";
+import { y as iosSimSlimProfileSetting } from "./settings-oTSkkNrM.mjs";
+import { y as workspaceId } from "./workspace-state-B8-aJ1_5.mjs";
+import { ct as dropParked, ft as parkedMaxSetting, ht as selectParked, pt as readParked, st as adoptParked } from "./android-B_NumVyQ.mjs";
+import { A as hostMemoryPressureAdvice, C as resolveIosCreation, O as configuredIosSimulatorViewer, S as resetIosPrivacy, _ as parseRuntimeVersion, b as renameIosSim, f as listIosDeviceTypes, h as ownedSimName, i as createOwnedIosSim, j as readHostMemoryPressure, l as iosSimulatorFailureAdvice, n as bootIosSim, p as listIosRuntimes, u as listAllIosSims, w as resolveOwnedIosSim, x as resetIosKeychain } from "./ios-BaInn3sW.mjs";
+import { c as teardownParkedIosSim } from "./teardown-CL6vDs2Y.mjs";
 import { t as withWorkspaceProcessLock } from "./workspace-process-lock-BL7Q0HCO.mjs";
-import { l as phaseLine } from "./command-output-CliHHn7a.mjs";
-import { dt as parkedMaxSetting, ft as readParked, mt as selectParked, ot as adoptParked, st as dropParked } from "./android-Db2eEMaf.mjs";
-import { y as iosSimSlimProfileSetting } from "./settings-CduVcoxj.mjs";
-import { c as teardownParkedIosSim } from "./teardown-BYuQafiA.mjs";
-import { A as hostMemoryPressureAdvice, C as resolveIosCreation, O as configuredIosSimulatorViewer, S as resetIosPrivacy, _ as parseRuntimeVersion, b as renameIosSim, f as listIosDeviceTypes, h as ownedSimName, i as createOwnedIosSim, j as readHostMemoryPressure, l as iosSimulatorFailureAdvice, n as bootIosSim, p as listIosRuntimes, u as listAllIosSims, w as resolveOwnedIosSim, x as resetIosKeychain } from "./ios-3CtCRhwr.mjs";
-import { a as runtimeMismatch, n as deviceTypeMismatch } from "./device-capacity-DMuKC7nx.mjs";
+import { a as runtimeMismatch, n as deviceTypeMismatch } from "./device-capacity-BHwxNBlu.mjs";
 import chalk from "chalk";
 //#region src/engine/device-ios.ts
 function startIosBoot(udid, configure, label, out, simulatorApp) {

package/dist/{device-lease-W5Pi1q38.mjs → device-lease-D-hLqx1b.mjs}

@@ -2,9 +2,9 @@ import { t as getExecutor } from "./exec-CaErVv7t.mjs";
 import { B as parseDeviceSlotKey, R as deviceSlotKey, W as validateDeviceSlot, d as getConfigDir } from "./config-D0DbpZtM.mjs";
 import { n as ownership_claim_exports } from "./process-identity-BmRm1qV0.mjs";
 import { r as register } from "./cache-manifest-DnUHBJaU.mjs";
-import { E as withDirLock$1, c as writeWorkspaceState, m as sharedBuildCache, n as clearWorkspaceStateKeys, o as withWorkspaceStateLock, r as readWorkspaceState } from "./workspace-state-CL2V2Ons.mjs";
+import { a as formatElapsed, i as formatDuration, m as shortHash } from "./command-output-DnJMdEY-.mjs";
+import { c as writeWorkspaceState, d as sharedBuildCache, n as clearWorkspaceStateKeys, o as withWorkspaceStateLock, r as readWorkspaceState, w as withDirLock$1 } from "./workspace-state-B8-aJ1_5.mjs";
 import { n as declareSpawnsOn, o as stopDeclaringSpawnsOn } from "./spawn-claims-D0XfSe8u.mjs";
-import { a as formatElapsed, i as formatDuration, m as shortHash } from "./command-output-CliHHn7a.mjs";
 import { createHash, randomBytes } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { join } from "node:path";

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

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