stim 1.16.0 → 1.17.1

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

@@ -1,24 +1,33 @@
 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 { 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 { a as runtimeMismatch, n as deviceTypeMismatch } from "./device-capacity-BHwxNBlu.mjs";
+import { n as ownership_claim_exports } from "./process-identity-BmRm1qV0.mjs";
+import { l as phaseLine } from "./command-output-CDAIFD-8.mjs";
+import { v as iosSimSlimProfileSetting } from "./settings-Cfd-0r2d.mjs";
+import { y as workspaceId } from "./workspace-state-DqcCbpE7.mjs";
+import { ct as dropParked, ft as parkedMaxSetting, ht as selectParked, pt as readParked, st as adoptParked } from "./android-B_YNZy61.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-DSfnPfse.mjs";
+import { v as teardownParkedIosSim } from "./ownership-BMLqyBgJ.mjs";
+import { t as withWorkspaceProcessLock } from "./workspace-process-lock-2mNzOlaB.mjs";
+import { a as deviceTypeMismatch, c as runtimeMismatch, n as DeviceAdmissionRefusal, p as withDeviceBootAdmission } from "./device-capacity-ZC4XSZ4R.mjs";
 import chalk from "chalk";
 //#region src/engine/device-ios.ts
-function startIosBoot(udid, configure, label, out, simulatorApp) {
-	const done = (async () => {
+function startIosBoot(udid, configure, label, out, simulatorApp, root, deviceSlotWait) {
+	const done = withDeviceBootAdmission({
+		platform: "ios",
+		key: udid
+	}, async () => {
+		out(chalk.dim(phaseLine("device", `booting ${label} (${udid})`)));
 		await bootIosSim(udid, {
 			label,
 			out,
 			simulatorApp
 		});
 		await configure();
-	})();
+	}, {
+		...deviceSlotWait,
+		root,
+		out
+	});
 	done.catch(() => {});
 	return {
 		udid,
@@ -34,7 +43,8 @@ async function ensureOwnedIosDevice({ record, projectPath, slot, settingsRoot, l
 	const simslimProfile = iosSimSlimProfileSetting(settings, settingsRoot);
 	if (record?.deviceUdid) {
 		if (record.owned) {
-			const resolved = resolveOwnedIosSim(record.deviceUdid);
+			const listed = listAllIosSims({ includeUnavailable: true });
+			const resolved = resolveOwnedIosSim(record.deviceUdid, listed);
 			if (resolved.notOwned) note(chalk.yellow(`Note: recorded sim is now named "${resolved.notOwned}", not Stim-owned -- creating a fresh owned sim instead of booting it.`));
 			else if (resolved.missing) {} else {
 				const sim = resolved.sim;
@@ -48,7 +58,7 @@ async function ensureOwnedIosDevice({ record, projectPath, slot, settingsRoot, l
 					model: deviceTypes.find((d) => d.identifier === sim.deviceTypeIdentifier)?.name ?? null,
 					runtime: parseRuntimeVersion(sim.runtime)
 				};
-				const name = await withIosDeviceNameLock(() => renameToOwnedName(sim, label, model, projectPath));
+				const name = ownedIosName(sim, label, model, projectPath, listed) === sim.name ? sim.name : await withIosDeviceNameLock(() => renameToOwnedName(sim, label, model, projectPath));
 				const updated = {
 					deviceUdid: sim.udid,
 					owned: true,
@@ -74,17 +84,15 @@ async function ensureOwnedIosDevice({ record, projectPath, slot, settingsRoot, l
 					deviceType: model.model,
 					runtime: model.runtime
 				};
-				if (sim.state !== "Booted") {
-					out(chalk.dim(phaseLine("device", `booting ${name} (${sim.udid})`)));
-					return {
-						...updated,
-						booting: startIosBoot(sim.udid, configure, name, out, flags.simulatorApp),
-						...facts
-					};
-				}
+				if (sim.state !== "Booted") return {
+					...updated,
+					booting: startIosBoot(sim.udid, configure, name, out, flags.simulatorApp, projectPath, flags.deviceSlotWait),
+					...facts
+				};
 				return {
 					...await configure(),
-					...facts
+					...facts,
+					booted: sim.udid
 				};
 			}
 		} else {
@@ -116,7 +124,6 @@ async function ensureOwnedIosDevice({ record, projectPath, slot, settingsRoot, l
 		out
 	})) : null;
 	if (adopted) {
-		out(chalk.dim(phaseLine("device", `booting ${adopted.deviceName} (${adopted.deviceUdid})`)));
 		const booting = startIosBoot(adopted.deviceUdid, async () => {
 			resetAdoptedSim(adopted.deviceUdid, out);
 			await configureOwnedIosSim({
@@ -127,7 +134,7 @@ async function ensureOwnedIosDevice({ record, projectPath, slot, settingsRoot, l
 				out,
 				reconcileIosSimulator
 			});
-		}, adopted.deviceName, out, flags.simulatorApp);
+		}, adopted.deviceName, out, flags.simulatorApp, projectPath, flags.deviceSlotWait);
 		return {
 			...adopted,
 			booting,
@@ -160,7 +167,7 @@ async function ensureOwnedIosDevice({ record, projectPath, slot, settingsRoot, l
 		profile: simslimProfile,
 		out,
 		reconcileIosSimulator
-	}), created.name, out, flags.simulatorApp);
+	}), created.name, out, flags.simulatorApp, projectPath, flags.deviceSlotWait);
 	return {
 		...newRecord,
 		created: true,
@@ -172,8 +179,8 @@ async function ensureOwnedIosDevice({ record, projectPath, slot, settingsRoot, l
 function withIosDeviceNameLock(fn) {
 	return withWorkspaceProcessLock(getConfigDir(), "ios-device-names", async () => fn(), { external: true });
 }
-function ownedIosNameSuffix(label, model, projectPath, udid) {
-	const names = new Set(listAllIosSims({ includeUnavailable: true }).filter((sim) => sim.udid !== udid).map((sim) => sim.name));
+function ownedIosNameSuffix(label, model, projectPath, udid, listed = listAllIosSims({ includeUnavailable: true })) {
+	const names = new Set(listed.filter((sim) => sim.udid !== udid).map((sim) => sim.name));
 	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);
@@ -183,8 +190,11 @@ function ownedIosNameSuffix(label, model, projectPath, udid) {
 	for (let attempt = 0; names.has(ownedSimName(label, model, suffix)); attempt++) suffix = ` ${workspaceId(projectPath)}${attempt ? `-${attempt}` : ""}`;
 	return suffix;
 }
+function ownedIosName(sim, label, model, projectPath, listed) {
+	return ownedSimName(label, model, ownedIosNameSuffix(label, model, projectPath, sim.udid, listed));
+}
 function renameToOwnedName(sim, label, model, projectPath) {
-	const wanted = ownedSimName(label, model, ownedIosNameSuffix(label, model, projectPath, sim.udid));
+	const wanted = ownedIosName(sim, label, model, projectPath);
 	if (sim.name === wanted) return wanted;
 	try {
 		renameIosSim(sim.udid, wanted);
@@ -284,7 +294,7 @@ async function configureOwnedIosSim({ record, projectPath, slot, profile, out, r
 	setDevice(projectPath, "ios", updated, slot);
 	return updated;
 }
-async function ensureIosBooted({ device, simulatorApp, timeoutMs, pollMs, out }) {
+async function ensureIosBooted({ device, projectPath, deviceSlotWait, simulatorApp, timeoutMs, pollMs, out }) {
 	const udid = device?.deviceUdid;
 	if (!udid) return {
 		failed: true,
@@ -315,13 +325,15 @@ async function ensureIosBooted({ device, simulatorApp, timeoutMs, pollMs, out })
 		try {
 			await booting.done;
 		} catch (e) {
-			return {
-				failed: true,
-				reason: `Could not boot simulator ${udid}: ${e?.message || e}`
-			};
+			return bootFailure(udid, e);
 		}
 		return ready();
 	}
+	const readiness = device?.booted === udid ? ready() : null;
+	if (readiness?.ok) {
+		if (simulatorApp !== void 0) configuredIosSimulatorViewer(simulatorApp).open(udid);
+		return readiness;
+	}
 	let resolved;
 	try {
 		resolved = resolveOwnedIosSim(udid);
@@ -341,24 +353,30 @@ async function ensureIosBooted({ device, simulatorApp, timeoutMs, pollMs, out })
 	};
 	const sim = resolved.sim;
 	if (sim.state === "Booted") {
-		const result = ready();
+		const result = readiness ?? ready();
 		if (result.ok && simulatorApp !== void 0) configuredIosSimulatorViewer(simulatorApp).open(udid);
 		return result;
 	}
-	out(chalk.dim(phaseLine("device", `booting ${sim.name} (${udid})`)));
 	const bootDeadline = Date.now() + timeoutMs;
 	try {
-		await bootIosSim(udid, {
-			timeoutMs,
-			label: sim.name,
-			out,
-			simulatorApp
+		await withDeviceBootAdmission({
+			platform: "ios",
+			key: udid
+		}, () => {
+			out(chalk.dim(phaseLine("device", `booting ${sim.name} (${udid})`)));
+			return bootIosSim(udid, {
+				timeoutMs,
+				label: sim.name,
+				out,
+				simulatorApp
+			});
+		}, {
+			...deviceSlotWait,
+			root: projectPath,
+			out
 		});
 	} catch (e) {
-		return {
-			failed: true,
-			reason: `Could not boot simulator ${udid}: ${e?.message || e}`
-		};
+		return bootFailure(udid, e);
 	}
 	const deadline = Math.max(bootDeadline, Date.now() + 2 * pollMs);
 	while (Date.now() < deadline) {
@@ -374,6 +392,19 @@ async function ensureIosBooted({ device, simulatorApp, timeoutMs, pollMs, out })
 		reason: `Simulator ${udid} did not reach the Booted state within ${Math.round(timeoutMs / 1e3)}s.`
 	};
 }
+function bootFailure(udid, error) {
+	const refusal = error instanceof DeviceAdmissionRefusal ? error : (0, ownership_claim_exports.claimFailure)(error, "stim ios");
+	if (refusal) return {
+		failed: true,
+		code: refusal.code,
+		reason: refusal.message,
+		remedy: refusal.remedy
+	};
+	return {
+		failed: true,
+		reason: `Could not boot simulator ${udid}: ${error?.message || error}`
+	};
+}
 function sleep(ms) {
 	return new Promise((r) => setTimeout(r, ms));
 }

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

@@ -2,8 +2,8 @@ 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 { 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 { a as formatElapsed, i as formatDuration, m as shortHash } from "./command-output-CDAIFD-8.mjs";
+import { c as writeWorkspaceState, d as sharedBuildCache, n as clearWorkspaceStateKeys, o as withWorkspaceStateLock, r as readWorkspaceState, w as withDirLock$1 } from "./workspace-state-DqcCbpE7.mjs";
 import { n as declareSpawnsOn, o as stopDeclaringSpawnsOn } from "./spawn-claims-D0XfSe8u.mjs";
 import { createHash, randomBytes } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";

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

@@ -1,7 +1,7 @@
 import { R as deviceSlotKey } from "./config-D0DbpZtM.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";
+import { a as formatElapsed, r as clockTime } from "./command-output-CDAIFD-8.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-DpoS36_u.mjs";
+import { a as VERIFY_TIMEOUT_MS, m as APP_READINESS_TIMEOUT_MS } from "./launch-verify-lTnWZikR.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;

package/dist/{device-pool-CUaEWMMm.mjs → device-pool-3o7s5lo4.mjs}

@@ -1,6 +1,6 @@
 import { R as deviceSlotKey } from "./config-D0DbpZtM.mjs";
-import { a as parseLease, f as selectPoolDevice, n as fileLeaseIo, r as leaseIsExpired, t as deviceLeasePath } from "./device-lease-D-hLqx1b.mjs";
-import { i as DEVICE_WAIT_POLL_MS, n as DEVICE_BUSY, o as leaseExpiryText } from "./device-lease-run-CqjShqWW.mjs";
+import { a as parseLease, f as selectPoolDevice, n as fileLeaseIo, r as leaseIsExpired, t as deviceLeasePath } from "./device-lease-DpoS36_u.mjs";
+import { i as DEVICE_WAIT_POLL_MS, n as DEVICE_BUSY, o as leaseExpiryText } from "./device-lease-run-B8YltIH_.mjs";
 //#region src/engine/device-pool.ts
 function heldPoolId(root, platform, now, io = fileLeaseIo, slot = "default") {
 	const record = io.readHolder(root)[deviceSlotKey(platform, slot)];

package/dist/{device-remote-D5WVWqOq.mjs → device-remote-hFSkpfQu.mjs}

@@ -1,18 +1,18 @@
 import { t as getExecutor } from "./exec-CaErVv7t.mjs";
 import { d as getConfigDir } from "./config-D0DbpZtM.mjs";
-import { a as formatElapsed } from "./command-output-DnJMdEY-.mjs";
-import { K as planMetroReach } from "./settings-oTSkkNrM.mjs";
-import { l as ownedDeviceLabel } from "./project-Du91Ilvc.mjs";
-import { o as pidExists } from "./metro-BeK1ZPz1.mjs";
-import { C as workspaceStateFile, v as workspaceDir, w as withDirLock, x as workspaceLogsDir$1, y as workspaceId } from "./workspace-state-B8-aJ1_5.mjs";
-import { a as clearRemoteSession, c as readMetroTunnel, u as readRemoteSession } from "./state-DcW6vOd_.mjs";
-import { T as sanitizeDeviceLabel } from "./ios-BaInn3sW.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-BL7Q0HCO.mjs";
-import { u as probePublicHttp } from "./ownership-hCkPzGmr.mjs";
-import { i as INSTALL_ERROR, o as LAUNCH_ERROR, u as devClientDeepLink } from "./app-install-CKWdbXIX.mjs";
-import { c as readMetroRecords, o as isBundleProof } from "./launch-verify-2DBRizjo.mjs";
+import { a as formatElapsed } from "./command-output-CDAIFD-8.mjs";
+import { K as planMetroReach } from "./settings-Cfd-0r2d.mjs";
+import { u as ownedDeviceLabel } from "./project-D47Rh0ly.mjs";
+import { o as pidExists } from "./metro-g8NqiJp-.mjs";
+import { C as workspaceStateFile, v as workspaceDir, w as withDirLock, x as workspaceLogsDir$1, y as workspaceId } from "./workspace-state-DqcCbpE7.mjs";
+import { a as clearRemoteSession, c as readMetroTunnel, u as readRemoteSession } from "./state-BKa8wNN5.mjs";
+import { T as sanitizeDeviceLabel } from "./ios-DSfnPfse.mjs";
+import { u as probePublicHttp } from "./ownership-BMLqyBgJ.mjs";
+import { t as withWorkspaceProcessLock } from "./workspace-process-lock-2mNzOlaB.mjs";
+import { i as INSTALL_ERROR, o as LAUNCH_ERROR, u as devClientDeepLink } from "./app-install-VPkI5WEg.mjs";
+import { c as readMetroRecords, o as isBundleProof } from "./launch-verify-lTnWZikR.mjs";
 import { t as compareStimVersions } from "./stim-installations-QMEI32v1.mjs";
-import { c as nativeRunWaitNotice } from "./native-run-NaBrRFtQ.mjs";
+import { c as nativeRunWaitNotice } from "./native-run-D1Q56rAD.mjs";
 import { existsSync, mkdirSync, realpathSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import { easMachineStateRoot, easMachineStateRoot as easMachineStateRoot$1, easSessionLedgerFile, easSessionLedgerLock, readEasSessionLedger, readEasSessionLedger as readEasSessionLedger$1, readJsonObject, validEasSessionClaim } from "@stim-cli/core/state";

package/dist/{doctor-Cimf-gGB.mjs → doctor-BF_435OC.mjs}

@@ -1,29 +1,28 @@
 import { t as getExecutor } from "./exec-CaErVv7t.mjs";
 import { _ as loadConfig$1, p as getProject, s as configCorruptRepair, u as getConcurrencyLimits } from "./config-D0DbpZtM.mjs";
-import { d as quotedPath, f as refuseNoProject, l as phaseLine, u as plural } from "./command-output-DnJMdEY-.mjs";
-import { B as settingsLayers, Ct as filesystemDevice, Et as temporaryRoot, H as unknownSettingKeys, I as settingOrigin, M as remoteIosSetting, O as projectOptimizations, P as resolveSettings, R as settingShapeErrors, U as webSettings, Y as compilerCacheFallbackMessage, Z as resolveOptimizations, a as SETTING_SHAPE_REMEDY, b as mergeSettingsLayers, dt as listWorktrees, ft as locallyKnownUpstream, gt as repoRoot, i as SETTINGS_WITH_RESOLVE_TIME_FALLBACK, it as gitCommonDir, j as remoteAndroidSetting, n as PATH_SETTINGS, nt as dirtyFingerprintFiles, vt as resolveSourceCheckout, wt as makeTemporaryDirectory, y as iosSimSlimProfileSetting } from "./settings-oTSkkNrM.mjs";
-import { c as isPackageResolvable, n as appProjectProblem, o as findProjectRoot$1, r as detectIsExpo } from "./project-Du91Ilvc.mjs";
-import { _ as workspaceDerivedData, d as sharedBuildCache } from "./workspace-state-B8-aJ1_5.mjs";
-import { i as inspectBudget, n as budgetLine, z as inspectWatchmanMemory } from "./budget-DjrURfQn.mjs";
-import { C as diffFingerprintSources, D as fingerprintProject, h as listBuildLocks } from "./device-lease-D-hLqx1b.mjs";
-import { n as listBuildSlots } from "./build-slots-rUk77xqh.mjs";
-import { D as hostSystemImageArch, O as listAdbDevices, ft as parkedMaxSetting, o as androidHome, ot as POOL_SETTING_REMEDY } from "./android-B_NumVyQ.mjs";
-import { A as hostMemoryPressureAdvice, c as iosRuntimeMatches, j as readHostMemoryPressure, p as listIosRuntimes, u as listAllIosSims, y as pickDefaultIosCreation } from "./ios-BaInn3sW.mjs";
-import { C as podInstallCommand, D as projectCmakeLauncher, S as bundlerPin, f as ccacheEnabled, i as macosToolchain, m as detectXcodeMajor, n as androidToolchain, r as iosToolchain, t as androidRequirements } from "./toolchain-DkUflduf.mjs";
-import { b as realIo, h as inspectBuildMachines, o as offloadCheck, u as simulatorRuntime } from "./client-BTY686R6.mjs";
-import { n as inspectDeviceHostMachines } from "./machines-BIBUdhpj.mjs";
+import { d as quotedPath, f as refuseNoProject, l as phaseLine, u as plural } from "./command-output-CDAIFD-8.mjs";
+import { B as settingsLayers, Ct as filesystemDevice, Et as temporaryRoot, H as unknownSettingKeys, I as settingOrigin, M as remoteIosSetting, O as projectOptimizations, P as resolveSettings, R as settingShapeErrors, U as webSettings, Y as compilerCacheFallbackMessage, Z as resolveOptimizations, dt as listWorktrees, ft as locallyKnownUpstream, gt as repoRoot, i as SETTING_SHAPE_REMEDY, it as gitCommonDir, j as remoteAndroidSetting, n as PATH_SETTINGS, nt as dirtyFingerprintFiles, r as SETTINGS_WITH_RESOLVE_TIME_FALLBACK, v as iosSimSlimProfileSetting, vt as resolveSourceCheckout, wt as makeTemporaryDirectory, y as mergeSettingsLayers } from "./settings-Cfd-0r2d.mjs";
+import { l as isPackageResolvable, n as appProjectProblem, r as detectIsExpo, s as findProjectRoot$1 } from "./project-D47Rh0ly.mjs";
+import { _ as workspaceDerivedData, d as sharedBuildCache } from "./workspace-state-DqcCbpE7.mjs";
+import { V as inspectWatchmanMemory, i as inspectBudget, n as budgetLine } from "./budget-CUDz870h.mjs";
+import { C as diffFingerprintSources, D as fingerprintProject, h as listBuildLocks } from "./device-lease-DpoS36_u.mjs";
+import { n as listBuildSlots } from "./build-slots-41v_d2x9.mjs";
+import { D as hostSystemImageArch, ft as parkedMaxSetting, o as androidHome, ot as POOL_SETTING_REMEDY } from "./android-B_YNZy61.mjs";
+import { A as hostMemoryPressureAdvice, c as iosRuntimeMatches, j as readHostMemoryPressure, p as listIosRuntimes, y as pickDefaultIosCreation } from "./ios-DSfnPfse.mjs";
+import { C as podInstallCommand, D as projectCmakeLauncher, S as bundlerPin, f as ccacheEnabled, i as macosToolchain, m as detectXcodeMajor, n as androidToolchain, r as iosToolchain, t as androidRequirements } from "./toolchain-CdrxgUeA.mjs";
+import { S as realIo, g as inspectBuildMachines, o as offloadCheck, u as simulatorRuntime, y as inspectDeviceHostMachines } from "./client-CxNotugx.mjs";
 import { a as findChrome, t as CHROME_INSTALL_REMEDY } from "./chrome-BrcVWQyD.mjs";
-import { i as liveOwnedDeviceCount } from "./device-capacity-BHwxNBlu.mjs";
-import { d as androidPathRoomRemedy, l as androidPathRoom, n as apkOutputsDir, t as androidSdkRefusal, u as androidPathRoomMessage } from "./gradle-BsO1MdsH.mjs";
-import { h as resolveRuntime, p as resolveDeviceType } from "./support-D4aYJniO.mjs";
-import { f as resolveEasCliBin, i as checkEasAuth$1, l as ownerFromConfig, u as providerFromConfig } from "./remote-cache-C8-V13XN.mjs";
-import { _ as easCliSupport, g as MIN_EAS_CLI_SIMULATOR_VERSION, s as readInstalledEasCliVersion, v as easCliUpgradeRemedy } from "./device-remote-D5WVWqOq.mjs";
+import { i as countLiveOwnedDevices } from "./device-capacity-ZC4XSZ4R.mjs";
+import { d as androidPathRoomRemedy, l as androidPathRoom, n as apkOutputsDir, t as androidSdkRefusal, u as androidPathRoomMessage } from "./gradle-bsBRy6i9.mjs";
+import { g as resolveRuntime, m as resolveDeviceType } from "./support-BE-tbOP9.mjs";
+import { f as resolveEasCliBin, i as checkEasAuth$1, l as ownerFromConfig, u as providerFromConfig } from "./remote-cache-Ci4DQYYj.mjs";
+import { _ as easCliSupport, g as MIN_EAS_CLI_SIMULATOR_VERSION, s as readInstalledEasCliVersion, v as easCliUpgradeRemedy } from "./device-remote-hFSkpfQu.mjs";
 import { n as inspectStimVersions, t as compareStimVersions } from "./stim-installations-QMEI32v1.mjs";
-import { n as simslimIsOnPath, r as MIN_EAS_CLI_BUILD_DOWNLOAD_VERSION } from "./simslim-B8-7AoTI.mjs";
-import { r as resolveAndroidCompilerCache, t as readAndroidCasToolchain } from "./android-cas-8U4DPqeR.mjs";
+import { n as simslimIsOnPath, r as MIN_EAS_CLI_BUILD_DOWNLOAD_VERSION } from "./simslim-BWNrc3M3.mjs";
+import { r as resolveAndroidCompilerCache, t as readAndroidCasToolchain } from "./android-cas-ZFpjJBL_.mjs";
 import { r as maintenanceStatus, t as maintenanceLine } from "./status-DlKvVJBE.mjs";
-import { n as recordDoctorRun } from "./guide-status-CjEZMAD4.mjs";
-import { n as hasInstalledDependencies, r as installedNpmTreeIsValid, t as dependencyState } from "./dependency-state-B6cMXZab.mjs";
+import { n as recordDoctorRun } from "./guide-status-Du-ZQ3FD.mjs";
+import { n as hasInstalledDependencies, r as installedNpmTreeIsValid, t as dependencyState } from "./dependency-state-CLcBHH2M.mjs";
 import { existsSync, lstatSync, readFileSync, readdirSync, realpathSync, rmSync } from "node:fs";
 import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { existsSync as existsSync$1, lstatSync as lstatSync$1, mkdirSync as mkdirSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, realpathSync as realpathSync$1, renameSync as renameSync$1, rmSync as rmSync$1, writeFileSync as writeFileSync$1 } from "fs";
@@ -673,13 +672,13 @@ function checkOffloadCandidate(placements, machines, peers, now) {
 	if (average <= 18e4) return null;
 	return {
 		code: "offload-candidate",
-		...finding("note", "Builds could run on another Mac", `Cold builds averaged ~${Math.round(average / 6e4)} min over ${cold.length} builds this week.`, "In Stim Desktop, open Settings > Build machines > Add.")
+		...finding("note", "Builds could run on another Mac", `Cold builds averaged ~${Math.round(average / 6e4)} min over ${cold.length} builds this week.`, "In Stim Desktop, open Settings > Remote Macs > Add.")
 	};
 }
 function readOffloadCandidate(tailnetStatus, now, host) {
 	if (host !== "darwin") return null;
 	try {
-		const entries = loadConfig$1()?.offload?.machines;
+		const entries = loadConfig$1()?.remote?.machines;
 		const machines = Array.isArray(entries) ? entries.filter((entry) => typeof entry === "string") : [];
 		const placements = readStats().record?.placements ?? [];
 		if (machines.length || placements.length < 3) return null;
@@ -940,7 +939,7 @@ function checkEasAuth({ provider, owner = null, auth = null } = {}) {
 }
 function checkConcurrency({ maxBuilds = 0, maxDevices = 0, liveDevices = 0, activeBuilds = 0 } = {}) {
 	if (!maxBuilds && !maxDevices) return null;
-	return finding("note", "Concurrency limits are set", `${`maxBuilds ${maxBuilds || "unlimited"}, maxDevices ${maxDevices || "unlimited"}`}. Right now ${liveDevices} Stim device(s) are booted and ${activeBuilds} build slot(s) are in use on this machine. At the device cap a new \`stim ios\`/\`android\` is refused with STIM_AT_CAPACITY (stop an environment or raise it); at the build cap a compile waits for a free slot.`, null);
+	return finding("note", "Concurrency limits are set", `${`maxBuilds ${maxBuilds || "unlimited"}, maxDevices ${maxDevices || "unlimited"}`}. Right now ${typeof liveDevices === "number" ? `${liveDevices} Stim device(s) are booted` : `the number of booted Stim devices is unknown (${liveDevices.unknown})`} and ${activeBuilds} build slot(s) are in use on this machine. At the device cap a new \`stim ios\`/\`android\` waits in FIFO order for 600s (--wait changes it; --no-wait refuses with STIM_AT_CAPACITY); at the build cap a compile waits for a free slot.`, null);
 }
 function readProjectEasCliVersion(projectRoot) {
 	const bin = resolveEasCliBin(projectRoot);
@@ -998,7 +997,8 @@ function checkXcodeEnvLineEndings(projectRoot, platform, host) {
 }
 function configuredRemoteBackends(projectSettings, platform) {
 	const iosTarget = remoteIosSetting(projectSettings);
-	return [.../* @__PURE__ */ new Set([...platform !== "android" ? [iosTarget?.kind === "backend" ? iosTarget.backend : null] : [], ...platform !== "ios" ? [remoteAndroidSetting(projectSettings)] : []])].filter((backend) => backend !== null);
+	const androidTarget = remoteAndroidSetting(projectSettings);
+	return [.../* @__PURE__ */ new Set([...platform !== "android" ? [iosTarget?.kind === "backend" ? iosTarget.backend : null] : [], ...platform !== "ios" ? [androidTarget?.kind === "backend" ? androidTarget.backend : null] : []])].filter((backend) => backend !== null);
 }
 function runDoctor(projectRoot, { readFile = readFileSync$1, xcodeMajor = null, easAuth = checkEasAuth$1, concurrency = getConcurrencyLimits, liveDevices = null, activeBuilds = null, remoteEnv = process.env, lookupAgentDevice = null, lookupEasCli = null, lookupSimSlim = null, memoryPressure = readHostMemoryPressure, lookupCcache = null, lookupChrome, tailnetStatus = realIo.status, now = Date.now, platform, host = process.platform } = {}) {
 	const localIos = platform !== "android" && host === "darwin";
@@ -1039,7 +1039,7 @@ function runDoctor(projectRoot, { readFile = readFileSync$1, xcodeMajor = null,
 	if (limits && (limits.maxBuilds || limits.maxDevices)) concurrencyFinding = checkConcurrency({
 		maxBuilds: limits.maxBuilds,
 		maxDevices: limits.maxDevices,
-		liveDevices: liveDevices ? liveDevices() : countLiveDevices(),
+		liveDevices: liveDevices ? liveDevices() : countLiveOwnedDevices(),
 		activeBuilds: activeBuilds ? activeBuilds() : countActiveBuilds()
 	});
 	const settingShapeFindings = settingShapeErrors(projectSettings).map((error) => finding("cost", "A setting has the wrong type", error, SETTING_SHAPE_REMEDY));
@@ -1183,29 +1183,6 @@ function agentDeviceIsOnPath() {
 		return true;
 	}
 }
-function countLiveDevices() {
-	let sims = [];
-	let adb = {
-		emulators: [],
-		physical: [],
-		unhealthy: []
-	};
-	let config = null;
-	try {
-		sims = listAllIosSims() || [];
-	} catch {}
-	try {
-		adb = listAdbDevices() || adb;
-	} catch {}
-	try {
-		config = loadConfig$1();
-	} catch {}
-	return liveOwnedDeviceCount({
-		sims,
-		adbEmulators: adb.emulators || [],
-		config
-	});
-}
 function countActiveBuilds() {
 	try {
 		return listBuildSlots().filter((s) => s.alive).length;
@@ -1371,14 +1348,18 @@ function hostedAgentDriverFinding(driver, apps) {
 		code: "hosted-agent-driver",
 		level: "note",
 		title: `${apps === 1 ? "A hosted app runs" : `${apps} hosted apps run`} with no agent driver`,
-		detail: "The client's coding agent cannot drive these apps because `hosting.agentDriver` is none, so stim-server starts no driver. agent-device confines macOS control to one macos-app lease and iOS control to one simulator through its daemon policy.",
-		fix: "stim settings set hosting.agentDriver agent-device, with agent-device 0.21.20 or later"
+		detail: "The client's coding agent cannot drive these apps because `hosting.agentDriver` is none, so stim-server starts no driver. agent-device confines macOS control to one macos-app lease and iOS or Android control to one device through its daemon policy.",
+		fix: "stim settings set hosting.agentDriver agent-device, with agent-device 0.21.22 or later"
 	};
 }
 function runningHostedApps() {
 	try {
 		return readHostedSessions().filter((session) => {
-			if (!["macos", "ios"].includes(session.platform) || session.state !== "ready" || !session.appAttempt) return false;
+			if (![
+				"macos",
+				"ios",
+				"android"
+			].includes(session.platform) || session.state !== "ready" || !session.appAttempt) return false;
 			try {
 				return readHostedAppMetadata(session.id, session.appAttempt).state === "installed";
 			} catch {
@@ -1389,7 +1370,7 @@ function runningHostedApps() {
 		return 0;
 	}
 }
-/** Notes installed hosted macOS and iOS apps on this Mac while `hosting.agentDriver` starts no driver. */
+/** Notes installed hosted apps on this Mac while `hosting.agentDriver` starts no driver. */
 function inspectHostedAgentDriver() {
 	const hosting = loadConfig$1()?.hosting;
 	return hostedAgentDriverFinding(isJsonObject(hosting) ? hosting.agentDriver : void 0, runningHostedApps());
@@ -1525,7 +1506,7 @@ function applySandboxFix(root, env = process.env) {
 	console.error(chalk.dim("Added writes to Stim's state directory, the simulator XPC service, and local port binding. Claude Code reads project settings from the directory a session starts in, so this file only counts for sessions rooted there. Restart the session for it to take effect."));
 }
 function doctorCommand(program, version, inspectVersions = inspectStimVersions, host = process.platform) {
-	program.command("doctor").description("Inspect the source checkout and report project state that can make native worktrees slow or invalid. The checkout is left untouched unless --fix is passed; --platform filters native findings. Each run in a React Native or Expo app is recorded in Stim state so guide can say when doctor is due.").option("--json", "print the findings as JSON").option("--platform <platform>", "report shared findings plus only this native platform: ios or android", parseDoctorPlatform).option("--fix", "repair the sandbox allowance when the report names it, and stale Android .cxx configurations in this checkout; ask each machine in offload.machines for build access. Stop native builds first. Generated CMake output must be ignored and untracked; custom launcher settings and source files are preserved.").action(async (opts) => {
+	program.command("doctor").description("Inspect the source checkout and report project state that can make native worktrees slow or invalid. The checkout is left untouched unless --fix is passed; --platform filters native findings. Each run in a React Native or Expo app is recorded in Stim state so guide can say when doctor is due.").option("--json", "print the findings as JSON").option("--platform <platform>", "report shared findings plus only this native platform: ios or android", parseDoctorPlatform).option("--fix", "repair the sandbox allowance when the report names it, and stale Android .cxx configurations in this checkout; ask each remote Mac in remote.machines for build and device-host approval. Stop native builds first. Generated CMake output must be ignored and untracked; custom launcher settings and source files are preserved.").action(async (opts) => {
 		const root = findProjectRoot$1(process.cwd());
 		if (!root) {
 			refuseNoProject({ json: Boolean(opts.json) });
@@ -1583,13 +1564,14 @@ function doctorCommand(program, version, inspectVersions = inspectStimVersions,
 				local: macosToolchain()
 			}] : []
 		];
-		const buildMachines = await inspectBuildMachines({
+		const remoteMachines = await inspectBuildMachines({
 			fix: opts.fix === true,
 			check: checksIos || checksAndroid || checksMacos ? offloadCheck(root, offloadTargets) : null
 		});
-		findings.push(...buildMachines.findings);
+		findings.push(...remoteMachines.findings);
 		const deviceHosts = await inspectDeviceHostMachines({ fix: opts.fix === true });
-		findings.push(...deviceHosts.findings);
+		const reported = new Set(remoteMachines.findings.map((each) => each.title));
+		findings.push(...deviceHosts.findings.filter((each) => !reported.has(each.title)));
 		const agentDriver = inspectHostedAgentDriver();
 		if (agentDriver) findings.push(agentDriver);
 		const maintenance = maintenanceStatus();
@@ -1608,7 +1590,7 @@ function doctorCommand(program, version, inspectVersions = inspectStimVersions,
 					...maintenance,
 					logPath: maintenanceNdjsonFile()
 				},
-				buildMachines: buildMachines.machines,
+				remoteMachines: remoteMachines.machines,
 				deviceHosts: deviceHosts.machines,
 				findings
 			}));

package/dist/{error-diagnostics-B9L4Ae0x.mjs → error-diagnostics-C-NMnhrk.mjs}

@@ -1,13 +1,13 @@
 import { t as getExecutor } from "./exec-CaErVv7t.mjs";
 import { R as deviceSlotKey, p as getProject, z as deviceSlotPlatforms } from "./config-D0DbpZtM.mjs";
-import { v as launchErrorPreview } from "./command-output-DnJMdEY-.mjs";
-import { l as resolveProjectMetro } from "./metro-BeK1ZPz1.mjs";
-import { r as readWorkspaceState$1, w as withDirLock } from "./workspace-state-B8-aJ1_5.mjs";
-import { a as parseLease, n as fileLeaseIo, t as deviceLeasePath } from "./device-lease-D-hLqx1b.mjs";
-import { f as readWorkspaceLaunches } from "./state-DcW6vOd_.mjs";
-import { o as androidHome, u as androidToolCwd } from "./android-B_NumVyQ.mjs";
+import { v as launchErrorPreview } from "./command-output-CDAIFD-8.mjs";
+import { l as resolveProjectMetro } from "./metro-g8NqiJp-.mjs";
+import { r as readWorkspaceState$1, w as withDirLock } from "./workspace-state-DqcCbpE7.mjs";
+import { a as parseLease, n as fileLeaseIo, t as deviceLeasePath } from "./device-lease-DpoS36_u.mjs";
+import { f as readWorkspaceLaunches } from "./state-BKa8wNN5.mjs";
+import { o as androidHome, u as androidToolCwd } from "./android-B_YNZy61.mjs";
 import { r as deviceConsoleLevel } from "./ios-device-Ee7sDXfp.mjs";
-import { n as parseLogcatLine, t as androidClockOffset } from "./android-r2rBL8kV.mjs";
+import { n as parseLogcatLine, t as androidClockOffset } from "./android-DE4v59Mb.mjs";
 import { createHash, randomUUID } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, statSync, unlinkSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, resolve, sep } from "node:path";