stim 1.16.0 → 1.17.0

package/dist/{support-D4aYJniO.mjs → support-BJPgYCu-.mjs}

@@ -1,10 +1,10 @@
-import { h as shortUdid, l as phaseLine } from "./command-output-DnJMdEY-.mjs";
-import { x as workspaceLogsDir } from "./workspace-state-B8-aJ1_5.mjs";
-import { k as parseIosSimulatorApp } from "./ios-BaInn3sW.mjs";
-import { x as describeDiagnostic } from "./toolchain-DkUflduf.mjs";
-import { c as unknownIosDeviceTypeRefusal, l as unknownIosRuntimeRefusal, r as layerNote } from "./device-capacity-BHwxNBlu.mjs";
-import { l as parseDeviceWait } from "./device-lease-run-CqjShqWW.mjs";
-import { t as IosDeviceMismatchError } from "./device-ios-BadmeL2V.mjs";
+import { h as shortUdid, l as phaseLine } from "./command-output-CDAIFD-8.mjs";
+import { x as workspaceLogsDir } from "./workspace-state-DqcCbpE7.mjs";
+import { k as parseIosSimulatorApp } from "./ios-DSfnPfse.mjs";
+import { x as describeDiagnostic } from "./toolchain-CNIBTIOv.mjs";
+import { d as unknownIosDeviceTypeRefusal, f as unknownIosRuntimeRefusal, o as layerNote, t as DEFAULT_DEVICE_SLOT_WAIT_MS } from "./device-capacity-D0GWHnTM.mjs";
+import { l as parseDeviceWait } from "./device-lease-run-B8YltIH_.mjs";
+import { t as IosDeviceMismatchError } from "./device-ios-Bc7vbGwl.mjs";
 import { basename, join } from "node:path";
 import chalk from "chalk";
 function buildLogFile(root) {
@@ -44,7 +44,7 @@ function resolveDeviceType(flag, settings) {
 function resolveRuntime(flag, settings) {
 	return (typeof flag === "string" && flag.trim() !== "" ? flag.trim() : null) || iosStringSetting(settings, "runtime");
 }
-function resolveSimulatorAppFlag(flag, physical, remoteBackend) {
+function resolveSimulatorAppFlag(flag, physical, remoteBackend, automatic = false) {
 	if (flag === void 0) return {};
 	let simulatorApp;
 	try {
@@ -55,7 +55,7 @@ function resolveSimulatorAppFlag(flag, physical, remoteBackend) {
 			message: error.message
 		} };
 	}
-	if (physical || remoteBackend) return { refusal: {
+	if (physical || remoteBackend && !automatic) return { refusal: {
 		code: "STIM_BAD_ARG",
 		message: "--simulator-app only applies to a local owned iOS simulator.",
 		remedy: "Drop --simulator-app when using a physical or remote device."
@@ -175,27 +175,52 @@ function printDiagnostics(note, result) {
 }
 function resolveIosWait(opts, physical) {
 	const noWait = opts.wait === false;
-	const waitFlagged = opts.wait !== void 0;
 	if (opts.waitConflict) return { failure: {
 		code: "STIM_BAD_ARG",
 		message: "--wait and --no-wait ask for opposite things.",
-		remedy: "Pass `--wait <seconds>` to wait for the lease, or `--no-wait` to install without one."
-	} };
-	if (waitFlagged && !physical) return { failure: {
-		code: "STIM_BAD_ARG",
-		message: "--wait and --no-wait only apply to a `--device` run.",
-		remedy: "This workspace owns its simulator, so nothing contends for it. Drop the flag, or pass `--device`."
+		remedy: "Pass only one of `--wait <seconds>` and `--no-wait`."
 	} };
 	const waitParsed = parseDeviceWait(noWait ? void 0 : opts.wait);
 	if ("error" in waitParsed) return { failure: {
 		code: "STIM_BAD_ARG",
 		message: waitParsed.error,
-		remedy: "Pass a whole number of seconds, e.g. --wait 90. `--wait 0` refuses a leased device at once."
+		remedy: "Pass a whole number of seconds, e.g. --wait 90. `--wait 0` refuses a busy lease or device slot at once."
 	} };
 	return {
 		waitSeconds: waitParsed.seconds,
-		noWait
+		noWait,
+		checkCapacity: !physical && (noWait || waitParsed.seconds === 0),
+		deviceSlotWaitMs: noWait ? 0 : opts.wait === void 0 && !physical ? DEFAULT_DEVICE_SLOT_WAIT_MS : waitParsed.seconds * 1e3
+	};
+}
+function createIosDeviceWaitRun(stats, progress, signal) {
+	const controller = new AbortController();
+	let waiting = false;
+	let boot;
+	let outcome;
+	return {
+		policy: {
+			signal: signal ? AbortSignal.any([controller.signal, signal]) : controller.signal,
+			waitingFor(info) {
+				waiting = info !== null;
+				progress.waitingFor(info, "device-slot");
+			},
+			onWait: stats.addDeviceSlotWaitMs
+		},
+		record(next) {
+			if (waiting) outcome = next;
+			else stats.record(next);
+		},
+		booting(pending) {
+			boot ??= pending?.done;
+		},
+		async finish() {
+			const queued = waiting;
+			controller.abort();
+			if (queued) await boot?.catch(() => {});
+			if (outcome) stats.record(outcome);
+		}
 	};
 }
 //#endregion
-export { simulatorBuildArch as _, deviceShortName as a, isReleaseConfiguration as c, printDiagnostics as d, resolveConfiguration as f, resolveSimulatorAppFlag as g, resolveRuntime as h, deviceModelRefusal as i, ownedSimFailure as l, resolveIosWait as m, buildLogFile as n, iosConfigurationSetting as o, resolveDeviceType as p, deviceLabel as r, iosProviderRunOptions as s, appNameFromPath as t, podAction as u, xcodeFailureReport as v };
+export { resolveSimulatorAppFlag as _, deviceModelRefusal as a, iosProviderRunOptions as c, podAction as d, printDiagnostics as f, resolveRuntime as g, resolveIosWait as h, deviceLabel as i, isReleaseConfiguration as l, resolveDeviceType as m, buildLogFile as n, deviceShortName as o, resolveConfiguration as p, createIosDeviceWaitRun as r, iosConfigurationSetting as s, appNameFromPath as t, ownedSimFailure as u, simulatorBuildArch as v, xcodeFailureReport as y };

package/dist/{support-CAP8qDUF.mjs → support-F9-sr0Oi.mjs}

@@ -1,8 +1,8 @@
 import { t as getExecutor } from "./exec-CaErVv7t.mjs";
-import { C as emulatorFailureRemedy, D as hostSystemImageArch, K as profileNeedsFoldFeature, N as memoizeEmulatorProbe, S as emulatorDiskSpaceRemedy, T as findBuildTool, W as pickDefaultSystemImage, c as androidPoolNoCandidatesRefusal, l as androidSystemImageAbi, o as androidHome, s as androidPoolCandidates, w as extractEmulatorFailure } from "./android-B_NumVyQ.mjs";
-import { C as pickDevClientScheme } from "./app-install-CKWdbXIX.mjs";
-import { o as unknownAndroidDeviceProfileRefusal, r as layerNote, s as unknownAndroidSystemImageRefusal } from "./device-capacity-BHwxNBlu.mjs";
-import { t as devClientScheme } from "./dev-client-CroAIjjj.mjs";
+import { C as emulatorFailureRemedy, D as hostSystemImageArch, K as profileNeedsFoldFeature, N as memoizeEmulatorProbe, S as emulatorDiskSpaceRemedy, T as findBuildTool, W as pickDefaultSystemImage, c as androidPoolNoCandidatesRefusal, l as androidSystemImageAbi, o as androidHome, s as androidPoolCandidates, w as extractEmulatorFailure } from "./android-B_YNZy61.mjs";
+import { l as unknownAndroidDeviceProfileRefusal, o as layerNote, u as unknownAndroidSystemImageRefusal } from "./device-capacity-D0GWHnTM.mjs";
+import { T as pickDevClientScheme } from "./app-install-VPkI5WEg.mjs";
+import { t as devClientScheme } from "./dev-client-B-XC4uRH.mjs";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { relative } from "node:path";
 //#region src/commands/android/support.ts
@@ -297,8 +297,8 @@ async function pooledAndroidDevice({ root, selectPool, listDevices, isEmulatorDe
 		owned: false
 	} };
 }
-function androidBuildOptions({ release, physical, device, variant, deviceAbi, compiler, buildProfile, targetAbiOnly = true }) {
-	let abi = null;
+function androidBuildOptions({ release, physical, device, variant, deviceAbi, compiler, buildProfile, targetAbiOnly = true, hostedAbi = null }) {
+	let abi = targetAbiOnly ? hostedAbi : null;
 	if (targetAbiOnly && !release && physical && device.serial) abi = deviceAbi(device.serial);
 	if (targetAbiOnly && !release && !physical) abi = androidSystemImageAbi(device.systemImage);
 	const runOptions = {};

package/dist/{toolchain-DkUflduf.mjs → toolchain-CNIBTIOv.mjs}

@@ -1,13 +1,13 @@
 import { t as getExecutor } from "./exec-CaErVv7t.mjs";
 import { r as register } from "./cache-manifest-DnUHBJaU.mjs";
 import { t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { a as formatElapsed, l as phaseLine } from "./command-output-DnJMdEY-.mjs";
-import { Z as resolveOptimizations } from "./settings-oTSkkNrM.mjs";
-import { p as resolvePackageJson } from "./project-Du91Ilvc.mjs";
-import { _ as workspaceDerivedData, f as sharedCcache$1, p as sharedCompilationCache$1, x as workspaceLogsDir$1 } from "./workspace-state-B8-aJ1_5.mjs";
+import { a as formatElapsed, l as phaseLine } from "./command-output-CDAIFD-8.mjs";
+import { Z as resolveOptimizations } from "./settings-Cfd-0r2d.mjs";
+import { m as resolvePackageJson } from "./project-D47Rh0ly.mjs";
+import { _ as workspaceDerivedData, f as sharedCcache$1, p as sharedCompilationCache$1, x as workspaceLogsDir$1 } from "./workspace-state-DqcCbpE7.mjs";
 import { a as spawnDeclared } from "./spawn-claims-D0XfSe8u.mjs";
-import { o as androidHome } from "./android-B_NumVyQ.mjs";
-import { t as cleanLine } from "./server-expo-MC0rHlOC.mjs";
+import { o as androidHome } from "./android-B_YNZy61.mjs";
+import { t as cleanLine } from "./server-expo-CHTyXD0G.mjs";
 import { createRequire } from "node:module";
 import { createHash } from "node:crypto";
 import { existsSync, readFileSync, readdirSync, realpathSync, statSync } from "node:fs";
@@ -452,7 +452,7 @@ function compilationPrefixMappings(workspaceRoot, derivedDataPath) {
 	const mappings = [prefixMapping(source)];
 	const rel = relative(source, derived);
 	if (rel === ".." || rel.startsWith(`..${sep}`) || isAbsolute(rel)) mappings.push(`${derived}=/^derived-data`);
-	return mappings.join(" ");
+	return mappings.map((mapping) => /[\s"\\]/.test(mapping) ? `"${mapping.replace(/["\\]/g, "\\$&")}"` : mapping).join(" ");
 }
 function ccacheEnabled(podfileProperties) {
 	if (!podfileProperties || typeof podfileProperties !== "object") return false;

package/dist/{warm-progress-CpGv3Wb6.mjs → warm-progress-DF4JRvYI.mjs}

@@ -1,9 +1,9 @@
 import { t as getExecutor } from "./exec-CaErVv7t.mjs";
 import { n as ownership_claim_exports } from "./process-identity-BmRm1qV0.mjs";
 import { o as pullRequestLookups } from "./pull-request-pxnDCQzn.mjs";
-import { at as gitCommonDirOnDisk } from "./settings-oTSkkNrM.mjs";
-import { D as discoverAgentSessions, E as attributeAgentSessions, T as agentKey, a as updateWorkspaceState, u as ensureWorkspaceStorage, v as workspaceDir, w as withDirLock } from "./workspace-state-B8-aJ1_5.mjs";
-import { I as ownedAvdDirectory } from "./android-B_NumVyQ.mjs";
+import { at as gitCommonDirOnDisk } from "./settings-Cfd-0r2d.mjs";
+import { D as discoverAgentSessions, E as attributeAgentSessions, T as agentKey, a as updateWorkspaceState, u as ensureWorkspaceStorage, v as workspaceDir, w as withDirLock } from "./workspace-state-DqcCbpE7.mjs";
+import { I as ownedAvdDirectory } from "./android-B_YNZy61.mjs";
 import { randomUUID } from "node:crypto";
 import { existsSync, mkdirSync, realpathSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { basename, dirname, join } from "node:path";

package/dist/watchman-APYjXSQa.mjs

@@ -0,0 +1,48 @@
+import { t as getExecutor } from "./exec-CaErVv7t.mjs";
+//#region src/watchman.ts
+/** Runs one watchman command with `--no-spawn`, so Stim never starts a daemon, and parses its JSON answer. */
+const runWatchman = async (args, timeoutMs) => JSON.parse(await getExecutor().runFileAsync("watchman", ["--no-spawn", ...args], { timeoutMs }));
+function parseWatchRoots(payload) {
+	const roots = payload?.roots;
+	if (!Array.isArray(roots)) return null;
+	return roots.filter((root) => typeof root === "string");
+}
+function parseSubscriberNames(payload) {
+	if (!payload || typeof payload !== "object" || "error" in payload) return null;
+	const subscribers = payload.subscribers;
+	if (subscribers === void 0) return [];
+	if (!Array.isArray(subscribers)) return null;
+	const names = [];
+	for (const subscriber of subscribers) {
+		const name = subscriber?.info?.name;
+		if (typeof name !== "string") return null;
+		names.push(name);
+	}
+	return names;
+}
+function parseTriggerCount(payload) {
+	const triggers = payload?.triggers;
+	return Array.isArray(triggers) ? triggers.length : null;
+}
+function parseWatchmanPid(payload) {
+	const pid = payload?.pid;
+	return typeof pid === "number" && Number.isInteger(pid) && pid > 0 ? pid : null;
+}
+/** The connected clients in a `debug-status` answer, or null when the answer does not list them. */
+function parseWatchmanClients(payload) {
+	if (!payload || typeof payload !== "object" || "error" in payload) return null;
+	const clients = payload.clients;
+	if (!Array.isArray(clients)) return null;
+	const parsed = [];
+	for (const client of clients) {
+		const peer = client?.peer;
+		if (typeof peer?.pid !== "number") return null;
+		parsed.push({
+			pid: peer.pid,
+			name: typeof peer.name === "string" ? peer.name : null
+		});
+	}
+	return parsed;
+}
+//#endregion
+export { parseWatchmanPid as a, parseWatchmanClients as i, parseTriggerCount as n, runWatchman as o, parseWatchRoots as r, parseSubscriberNames as t };

package/dist/{web-DWUaMp8P.mjs → web-exQtGkoc.mjs}

@@ -1,23 +1,22 @@
 import { t as getExecutor } from "./exec-CaErVv7t.mjs";
 import { E as upsertProject, p as getProject } from "./config-D0DbpZtM.mjs";
 import { n as windowsLauncherArgs } from "./detached-entry-CiTEgMR1.mjs";
-import { f as refuseNoProject, l as phaseLine } from "./command-output-DnJMdEY-.mjs";
-import { P as resolveSettings, R as settingShapeErrors, S as metroPortSetting, U as webSettings, a as SETTING_SHAPE_REMEDY, gt as repoRoot, it as gitCommonDir } from "./settings-oTSkkNrM.mjs";
-import { a as findCommandWorkspace, c as isPackageResolvable, r as detectIsExpo } from "./project-Du91Ilvc.mjs";
-import { l as resolveProjectMetro } from "./metro-BeK1ZPz1.mjs";
-import { i as recordWorkspaceUse, r as readWorkspaceState, v as workspaceDir, x as workspaceLogsDir } from "./workspace-state-B8-aJ1_5.mjs";
-import { d as webLogFile, o as readWebRecord, p as webSupervisorLogFile, r as cdpEndpoint, s as updateWebRecord } from "./state-C1jB7Q8q.mjs";
+import { f as refuseNoProject, l as phaseLine } from "./command-output-CDAIFD-8.mjs";
+import { P as resolveSettings, R as settingShapeErrors, U as webSettings, gt as repoRoot, i as SETTING_SHAPE_REMEDY, it as gitCommonDir, x as metroPortSetting } from "./settings-Cfd-0r2d.mjs";
+import { l as isPackageResolvable, o as findCommandWorkspace, r as detectIsExpo } from "./project-D47Rh0ly.mjs";
+import { l as resolveProjectMetro } from "./metro-g8NqiJp-.mjs";
+import { i as recordWorkspaceUse, r as readWorkspaceState, v as workspaceDir, x as workspaceLogsDir } from "./workspace-state-DqcCbpE7.mjs";
+import { d as webLogFile, o as readWebRecord, p as webSupervisorLogFile, r as cdpEndpoint, s as updateWebRecord } from "./state-PeQiJuIu.mjs";
 import { a as workspaceLinks, i as workspaceLinkLine } from "./stim-desktop-Cnz8CPnl.mjs";
-import { r as teardownBrowserHeld } from "./teardown-CL6vDs2Y.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-BL7Q0HCO.mjs";
-import { i as reserveBrowserPort, n as getNamedPort } from "./named-ports-Bk_YXEmE.mjs";
-import { t as resolveSupervisorTarget } from "./ownership-hCkPzGmr.mjs";
+import { p as teardownBrowserHeld, t as resolveSupervisorTarget } from "./ownership-BMLqyBgJ.mjs";
+import { t as withWorkspaceProcessLock } from "./workspace-process-lock-2mNzOlaB.mjs";
+import { i as reserveBrowserPort, n as getNamedPort } from "./named-ports-C8m8EQs2.mjs";
 import { o as readNdjsonGenerations } from "./ndjson-PclOIwVY.mjs";
 import { a as findChrome, t as CHROME_INSTALL_REMEDY } from "./chrome-BrcVWQyD.mjs";
 import { t as spawnEntry } from "./spawn-entry-jw19m8Nl.mjs";
-import { c as readMetroRecords } from "./launch-verify-2DBRizjo.mjs";
-import { o as resolveWorkspaceMetroPort } from "./start-ClDfwXa4.mjs";
-import { a as sleep, n as ensureWorkspaceStorageSafely } from "./native-runtime-DBzRnEKS.mjs";
+import { c as readMetroRecords } from "./launch-verify-lTnWZikR.mjs";
+import { o as resolveWorkspaceMetroPort } from "./start-uee1wWjY.mjs";
+import { a as sleep, n as ensureWorkspaceStorageSafely } from "./native-runtime-DhJI3IVQ.mjs";
 import { n as sendToOwnedPage, t as liveWebRecord } from "./page-QF_Ke10s.mjs";
 import { randomUUID } from "node:crypto";
 import { mkdirSync, openSync } from "node:fs";

package/dist/web-run.mjs

@@ -1,10 +1,10 @@
 import { t as getExecutor } from "./exec-CaErVv7t.mjs";
 import { n as ownership_claim_exports, t as process_identity_exports } from "./process-identity-BmRm1qV0.mjs";
 import { t as relaunchWithLogFile } from "./detached-entry-CiTEgMR1.mjs";
-import { u as signalProcessTree } from "./metro-BeK1ZPz1.mjs";
-import { _ as removeSingletonFiles, c as webClaimRoot, d as webLogFile, f as webProfileDir, g as liveProfileHolder, h as chromeProcessState, i as clearWebRecord, l as webDir, m as writeWebRecord, n as browserLogFile, s as updateWebRecord } from "./state-C1jB7Q8q.mjs";
-import { c as probeWebDrivers } from "./activity-BxwdD81S.mjs";
-import { r as recordCreatedDevice } from "./created-devices-D5owjN4C.mjs";
+import { u as signalProcessTree } from "./metro-g8NqiJp-.mjs";
+import { _ as removeSingletonFiles, c as webClaimRoot, d as webLogFile, f as webProfileDir, g as liveProfileHolder, h as chromeProcessState, i as clearWebRecord, l as webDir, m as writeWebRecord, n as browserLogFile, s as updateWebRecord } from "./state-PeQiJuIu.mjs";
+import { c as probeWebDrivers } from "./activity-IRvJY_ru.mjs";
+import { r as recordCreatedDevice } from "./created-devices-CpvzBL25.mjs";
 import { r as createNdjsonWriter } from "./ndjson-PclOIwVY.mjs";
 import { t as connectOwnedBrowser } from "./cdp-Dq_ypAlJ.mjs";
 import { i as chromeArgs, n as DESKTOP_PAGE, r as PHONE_SCREEN } from "./chrome-BrcVWQyD.mjs";

package/dist/{workspace-process-lock-BL7Q0HCO.mjs → workspace-process-lock-2mNzOlaB.mjs}

@@ -1,10 +1,10 @@
 import { n as ownership_claim_exports } from "./process-identity-BmRm1qV0.mjs";
 import { n as declareSpawnsOn, o as stopDeclaringSpawnsOn } from "./spawn-claims-D0XfSe8u.mjs";
 import { join } from "node:path";
+import { setTimeout } from "node:timers/promises";
 //#region src/engine/workspace-process-lock.ts
 const DEFAULT_WAIT_MS = 6e4;
 const POLL_MS = 25;
-const defaultSleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 function workspaceProcessLockError(err) {
 	const code = err?.code;
 	if (code === "STIM_LOCK_REFUSED") return "refused";
@@ -14,10 +14,11 @@ function workspaceProcessLockError(err) {
 function workspaceProcessLockPath(root, name, external) {
 	return external ? join(root, `${name}.lock`) : join(root, ".stim", `${name}.lock`);
 }
-async function withWorkspaceProcessLock(root, name, fn, { now = Date.now, sleep = defaultSleep, waitMs = DEFAULT_WAIT_MS, ownerPurpose, details = {}, onHeld, rejectOwnerPurposes = [], external = false, declareSpawns = false } = {}) {
+async function withWorkspaceProcessLock(root, name, fn, { now = Date.now, signal, sleep = (ms) => setTimeout(ms, void 0, { signal }), waitMs = DEFAULT_WAIT_MS, ownerPurpose, details = {}, onHeld, rejectOwnerPurposes = [], external = false, declareSpawns = false } = {}) {
 	const path = workspaceProcessLockPath(root, name, external);
 	const deadline = now() + waitMs;
 	for (;;) {
+		signal?.throwIfAborted();
 		const attempt = (0, ownership_claim_exports.tryAcquireClaim)({
 			root: path,
 			mode: "exclusive",

package/dist/{workspace-state-B8-aJ1_5.mjs → workspace-state-DqcCbpE7.mjs}

@@ -3,7 +3,7 @@ import { t as process_identity_exports } from "./process-identity-BmRm1qV0.mjs";
 import { existsSync, mkdirSync, readFileSync, realpathSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { dirname, isAbsolute, join, relative } from "node:path";
 import { join as join$1, resolve as resolve$1 } from "path";
-import { buildCacheRoot as sharedBuildCache, withDirLock as withDirLock$1, workspaceId, workspaceName as workspaceName$1, workspaceStateDir as workspaceDir } from "@stim-cli/core";
+import { buildCacheRoot as sharedBuildCache, withDirLock as withDirLock$1, workspaceId as workspaceId$1, workspaceName as workspaceName$1, workspaceStateDir as workspaceDir } from "@stim-cli/core";
 import { WORKSPACE_AGENT_KEY, emulatorLogFile, readJsonObject, readWorkspaceState, readWorkspaceState as readWorkspaceState$1, sharedCcache as sharedCcache$1, sharedCompilationCache as sharedCompilationCache$1, supervisorLogFile, supervisorPidFile, workspaceAgentDeviceDir, workspaceDerivedData, workspaceLastUsed, workspaceLogErrorIndex, workspaceLogsDir as workspaceLogsDir$1, workspaceMetadataFile, workspaceStateFile, workspaceStateLock } from "@stim-cli/core/state";
 import { homedir } from "node:os";
 import { readFile, readdir } from "node:fs/promises";
@@ -368,4 +368,4 @@ function recordWorkspaceUse(root, now = /* @__PURE__ */ new Date(), env = proces
 	} catch {}
 }
 //#endregion
-export { workspaceStateFile as C, discoverAgentSessions as D, attributeAgentSessions as E, workspaceName$1 as S, agentKey as T, workspaceDerivedData as _, updateWorkspaceState as a, workspaceLogErrorIndex as b, writeWorkspaceState as c, sharedBuildCache as d, sharedCcache$1 as f, workspaceAgentDeviceDir as g, supervisorPidFile as h, recordWorkspaceUse as i, emulatorLogFile as l, supervisorLogFile as m, clearWorkspaceStateKeys as n, withWorkspaceStateLock as o, sharedCompilationCache$1 as p, readWorkspaceState$1 as r, workspaceLastUsed as s, clearWorkspaceStateKey as t, ensureWorkspaceStorage as u, workspaceDir as v, withDirLock$1 as w, workspaceLogsDir$1 as x, workspaceId as y };
+export { workspaceStateFile as C, discoverAgentSessions as D, attributeAgentSessions as E, workspaceName$1 as S, agentKey as T, workspaceDerivedData as _, updateWorkspaceState as a, workspaceLogErrorIndex as b, writeWorkspaceState as c, sharedBuildCache as d, sharedCcache$1 as f, workspaceAgentDeviceDir as g, supervisorPidFile as h, recordWorkspaceUse as i, emulatorLogFile as l, supervisorLogFile as m, clearWorkspaceStateKeys as n, withWorkspaceStateLock as o, sharedCompilationCache$1 as p, readWorkspaceState$1 as r, workspaceLastUsed as s, clearWorkspaceStateKey as t, ensureWorkspaceStorage as u, workspaceDir as v, withDirLock$1 as w, workspaceLogsDir$1 as x, workspaceId$1 as y };

package/dist/{workspaces-BV4pdHFz.mjs → workspaces-Bcib97-6.mjs}

@@ -1,7 +1,7 @@
 import { M as isOnMountedVolume, N as listMountedVolumes, P as measuredDirectorySize, _ as loadConfig$1, d as getConfigDir, g as isPathPrefix, j as formatBytes } from "./config-D0DbpZtM.mjs";
-import { S as workspaceName, s as workspaceLastUsed } from "./workspace-state-B8-aJ1_5.mjs";
-import { i as recordGcResult, n as withIdleWorkspace, o as canonicalPath, r as workspaceInUse, t as emptyWorkspaceDir } from "./in-use-DvBw0Kxo.mjs";
-import { a as teardownOwnedBrowser } from "./teardown-CL6vDs2Y.mjs";
+import { S as workspaceName, s as workspaceLastUsed } from "./workspace-state-DqcCbpE7.mjs";
+import { i as recordGcResult, n as withIdleWorkspace, o as canonicalPath, r as workspaceInUse, t as emptyWorkspaceDir } from "./in-use-CvGOUn-x.mjs";
+import { h as teardownOwnedBrowser } from "./ownership-BMLqyBgJ.mjs";
 import { existsSync, lstatSync, readdirSync, rmSync, statSync } from "fs";
 import { basename, isAbsolute, join, relative } from "path";
 import { isJsonObject, readJsonFile } from "@stim-cli/core/state";

package/dist/{worktree-jnG8Iph5.mjs → worktree-Dc98cE6_.mjs}

@@ -1,2 +1,2 @@
-import { a as porcelainPath, c as registerWarm, d as removalRemedy, f as removeWorktreeTarget, i as matchWorktreeEntry, l as removalBlockers, m as worktreeCommand, n as excludePodChurn, o as reclaimKeys, p as warmedWorkspace, r as excludeWatchmanCookies, s as registerRemove, t as dependencyInstallCommand, u as removalPath } from "./worktree-K-xj9Db0.mjs";
+import { a as porcelainPath, c as registerWarm, d as removalRemedy, f as removeWorktreeTarget, i as matchWorktreeEntry, l as removalBlockers, m as worktreeCommand, n as excludePodChurn, o as reclaimKeys, p as warmedWorkspace, r as excludeWatchmanCookies, s as registerRemove, t as dependencyInstallCommand, u as removalPath } from "./worktree-ZpZR3S1k.mjs";
 export { worktreeCommand as default, dependencyInstallCommand, excludePodChurn, excludeWatchmanCookies, matchWorktreeEntry, porcelainPath, reclaimKeys, registerRemove, registerWarm, removalBlockers, removalPath, removalRemedy, removeWorktreeTarget, warmedWorkspace };

package/dist/{worktree-K-xj9Db0.mjs → worktree-ZpZR3S1k.mjs}

@@ -2,33 +2,33 @@ import { t as getExecutor } from "./exec-CaErVv7t.mjs";
 import { E as upsertProject, H as projectDeviceSlots, S as removeProject, _ as loadConfig$1, a as clearDevice, d as getConfigDir, g as isPathPrefix, k as acquireAvdClaim, p as getProject } from "./config-D0DbpZtM.mjs";
 import { n as ownership_claim_exports, t as process_identity_exports } from "./process-identity-BmRm1qV0.mjs";
 import { a as pullRequestLookup, r as endedPullRequest } from "./pull-request-pxnDCQzn.mjs";
-import { a as formatElapsed, h as shortUdid, i as formatDuration, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-DnJMdEY-.mjs";
-import { $ as cloneIgnoredEntries, A as readCommittedSettings, H as unknownSettingKeys, P as resolveSettings, Q as branchExists, R as settingShapeErrors, St as warmWorktreePaths, _t as resolveFullRef, a as SETTING_SHAPE_REMEDY, at as gitCommonDirOnDisk, bt as sourceCheckoutOf, ct as hasUncommittedWork, dt as listWorktrees, et as deleteBranch, ft as locallyKnownUpstream, ht as removeWorktree, it as gitCommonDir, lt as isPodInstallChurn, mt as readWorktreeExclude, ot as hasPopulatedSubmodules, pt as podsOutOfSync, rt as dirtyPaths, st as hasRemote, tt as depsOutOfSync, xt as unpushedCommits, yt as restoreFile } from "./settings-oTSkkNrM.mjs";
-import { n as appProjectProblem, o as findProjectRoot$1 } from "./project-Du91Ilvc.mjs";
-import { l as resolveProjectMetro, o as pidExists, r as killMetroTree, u as signalProcessTree } from "./metro-BeK1ZPz1.mjs";
-import { g as workspaceAgentDeviceDir, i as recordWorkspaceUse, r as readWorkspaceState$1, v as workspaceDir } from "./workspace-state-B8-aJ1_5.mjs";
-import { o as readWebRecord } from "./state-C1jB7Q8q.mjs";
-import { a as machineNumber } from "./budget-DjrURfQn.mjs";
-import { n as withIdleWorkspace, t as emptyWorkspaceDir } from "./in-use-DvBw0Kxo.mjs";
-import { t as agentDeviceDaemon } from "./activity-BxwdD81S.mjs";
-import { u as releaseWorkspaceLeases } from "./device-lease-D-hLqx1b.mjs";
-import { a as clearRemoteSession, c as readMetroTunnel, d as readRemoteSessionId, i as clearManagedMetroTunnel, u as readRemoteSession } from "./state-DcW6vOd_.mjs";
-import { ft as parkedMaxSetting, ot as POOL_SETTING_REMEDY } from "./android-B_NumVyQ.mjs";
+import { a as formatElapsed, h as shortUdid, i as formatDuration, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-CDAIFD-8.mjs";
+import { $ as cloneIgnoredEntries, A as readCommittedSettings, H as unknownSettingKeys, P as resolveSettings, Q as branchExists, R as settingShapeErrors, St as warmWorktreePaths, _t as resolveFullRef, at as gitCommonDirOnDisk, bt as sourceCheckoutOf, ct as hasUncommittedWork, dt as listWorktrees, et as deleteBranch, ft as locallyKnownUpstream, ht as removeWorktree, i as SETTING_SHAPE_REMEDY, it as gitCommonDir, lt as isPodInstallChurn, mt as readWorktreeExclude, ot as hasPopulatedSubmodules, pt as podsOutOfSync, rt as dirtyPaths, st as hasRemote, tt as depsOutOfSync, xt as unpushedCommits, yt as restoreFile } from "./settings-Cfd-0r2d.mjs";
+import { n as appProjectProblem, s as findProjectRoot$1 } from "./project-D47Rh0ly.mjs";
+import { l as resolveProjectMetro, o as pidExists, r as killMetroTree, u as signalProcessTree } from "./metro-g8NqiJp-.mjs";
+import { g as workspaceAgentDeviceDir, i as recordWorkspaceUse, r as readWorkspaceState$1, v as workspaceDir } from "./workspace-state-DqcCbpE7.mjs";
+import { o as readWebRecord } from "./state-PeQiJuIu.mjs";
+import { a as machineNumber } from "./budget-DM984mnd.mjs";
+import { n as withIdleWorkspace, t as emptyWorkspaceDir } from "./in-use-CvGOUn-x.mjs";
+import { t as agentDeviceDaemon } from "./activity-IRvJY_ru.mjs";
+import { u as releaseWorkspaceLeases } from "./device-lease-DpoS36_u.mjs";
+import { a as clearRemoteSession, c as readMetroTunnel, d as readRemoteSessionId, i as clearManagedMetroTunnel, u as readRemoteSession } from "./state-BKa8wNN5.mjs";
+import { ft as parkedMaxSetting, ot as POOL_SETTING_REMEDY } from "./android-B_YNZy61.mjs";
 import { a as workspaceLinks, i as workspaceLinkLine } from "./stim-desktop-Cnz8CPnl.mjs";
-import { a as teardownOwnedBrowser, i as teardownOwnedAvd, o as teardownOwnedIosSim } from "./teardown-CL6vDs2Y.mjs";
-import { t as clearNamedPorts } from "./named-ports-Bk_YXEmE.mjs";
-import { i as stopTunnel, l as withManagedTunnelRemovalLock, s as withManagedRemoteWorktreeRemovalLock, t as resolveSupervisorTarget } from "./ownership-hCkPzGmr.mjs";
-import { l as withdrawDevServerStopRequest, s as requestDevServerStop } from "./stop-cause-CidxIqup.mjs";
-import { C as podInstallCommand, u as HEARTBEAT_INTERVAL_MS } from "./toolchain-DkUflduf.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-DiA16AsN.mjs";
-import { t as stopMacosApp } from "./stop-B0Yxtmiy.mjs";
-import { a as runPodInstall, i as runCaptured, n as podsAreStale, r as readPodState, t as DEPS_ERROR } from "./deps-urbmfXig.mjs";
-import { f as resolveEasCliBin } from "./remote-cache-C8-V13XN.mjs";
-import { i as endRecordedSession } from "./device-remote-D5WVWqOq.mjs";
-import { n as hasInstalledDependencies, r as installedNpmTreeIsValid, t as dependencyState } from "./dependency-state-B6cMXZab.mjs";
-import { a as forgetStatusMeasures, s as mergeState, t as startWarmProgress } from "./warm-progress-CpGv3Wb6.mjs";
-import { r as workspaceRecordingEnabled } from "./recordings-BIXOzVnr.mjs";
-import { r as stopHostedIos } from "./hosted-ios-CIWelIqf.mjs";
+import { g as teardownOwnedIosSim, h as teardownOwnedBrowser, i as stopTunnel, l as withManagedTunnelRemovalLock, m as teardownOwnedAvd, s as withManagedRemoteWorktreeRemovalLock, t as resolveSupervisorTarget } from "./ownership-BMLqyBgJ.mjs";
+import { t as clearNamedPorts } from "./named-ports-C8m8EQs2.mjs";
+import { l as withdrawDevServerStopRequest, s as requestDevServerStop } from "./stop-cause-rhmGfwvt.mjs";
+import { C as podInstallCommand, u as HEARTBEAT_INTERVAL_MS } from "./toolchain-CNIBTIOv.mjs";
+import { n as verifyCollectorOwnership } from "./ownership-DyRQru0q.mjs";
+import { t as stopMacosApp } from "./stop-Cr1d8DSE.mjs";
+import { a as runPodInstall, i as runCaptured, n as podsAreStale, r as readPodState, t as DEPS_ERROR } from "./deps-DNWaQs4V.mjs";
+import { i as stopHostedAndroid } from "./hosted-android-DwLS4Mse.mjs";
+import { f as resolveEasCliBin } from "./remote-cache-Ci4DQYYj.mjs";
+import { i as endRecordedSession } from "./device-remote-hFSkpfQu.mjs";
+import { n as hasInstalledDependencies, r as installedNpmTreeIsValid, t as dependencyState } from "./dependency-state-CLcBHH2M.mjs";
+import { a as forgetStatusMeasures, s as mergeState, t as startWarmProgress } from "./warm-progress-DF4JRvYI.mjs";
+import { r as workspaceRecordingEnabled } from "./recordings-BNgsD1Tr.mjs";
+import { r as stopHostedIos } from "./hosted-ios-aMo7Cljf.mjs";
 import { createHash, randomUUID } from "node:crypto";
 import { chmodSync, existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, utimesSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, relative } from "node:path";
@@ -37,6 +37,7 @@ import { basename as basename$1, dirname as dirname$1, isAbsolute as isAbsolute$
 import { withDirLock, workspaceName } from "@stim-cli/core";
 import { LAST_BUILD_KEYS, archiveDir, archiveEnabled, archiveLock, archiveRoot, archivedUsage, countErrorEntries, endedAgentSessionOf, listRecordedDevices, loadConfig, queryLogs, readArchives, readBuildHistory, readJsonObject, readLastBuilds, readMacosRecord, readPullRequestCache, readWorkspaceState, recordingEnabled, sortByTs } from "@stim-cli/core/state";
 import { claimRemoveCommand, clearFreeClaimSet, readClaimSet, releaseClaim, tryAcquireClaim } from "@stim-cli/core/ownership-claim";
+import { homedir } from "node:os";
 import chalk from "chalk";
 //#region src/archive.ts
 const DAY = 864e5;
@@ -183,7 +184,7 @@ function gitFacts(root) {
 		merged: null,
 		pullRequest: null
 	};
-	if (!existsSync(root)) return empty;
+	if (!existsSync(root)) return cachedFacts(root) ?? empty;
 	const exec = getExecutor();
 	const run = (args) => exec.runFileQuiet("git", [
 		"-C",
@@ -229,14 +230,32 @@ function gitFacts(root) {
 		head: summary?.[0] ?? null,
 		subject: summary?.[1] ?? null,
 		merged,
-		pullRequest: pr ? {
-			number: pr.number,
-			state: pr.state,
-			title: pr.title,
-			url: pr.url
-		} : null
+		pullRequest: archivedPullRequest(pr)
 	};
 }
+function archivedPullRequest(pr) {
+	return pr ? {
+		number: pr.number,
+		state: pr.state,
+		title: pr.title,
+		url: pr.url
+	} : null;
+}
+function cachedFacts(root) {
+	for (let path = root; !existsSync(path); path = dirname(path)) {
+		const cached = readPullRequestCache(path);
+		if (!cached) continue;
+		return {
+			repository: null,
+			branch: cached.branch,
+			head: cached.head,
+			subject: null,
+			merged: cached.pullRequest?.state === "merged" ? true : null,
+			pullRequest: archivedPullRequest(cached.pullRequest)
+		};
+	}
+	return null;
+}
 function archiveWorkspace(root, removedBy, state = readWorkspaceState(root)) {
 	writeArchive(root, removedBy, state);
 	try {
@@ -825,12 +844,12 @@ async function reclaimIdleProject(path, workspaceExisted, { archive, deleteOwned
 	};
 	skippedDevices.push(...skippedCollectors);
 	failedDevices.push(...failedCollectors);
-	try {
-		await stopHostedIos(path);
+	for (const platform of ["ios", "android"]) try {
+		await (platform === "ios" ? stopHostedIos : stopHostedAndroid)(path);
 	} catch (error) {
 		const failed = {
-			platform: "ios",
-			name: "hosted iOS simulator",
+			platform,
+			name: `hosted ${platform} device`,
 			reason: error.message
 		};
 		failedDevices.push(failed);
@@ -920,6 +939,66 @@ async function reclaimIdleProject(path, workspaceExisted, { archive, deleteOwned
 	};
 }
 //#endregion
+//#region src/workspace/service-guard.ts
+const SERVICE_IN_USE = { code: "STIM_WORKTREE_SERVICE" };
+function serviceUseOf(plist, file, folder, canonical) {
+	if (typeof plist !== "object" || plist === null) return null;
+	const job = plist;
+	if (typeof job.StimService !== "object" || job.StimService === null || !Array.isArray(job.ProgramArguments)) return null;
+	const argument = job.ProgramArguments.find((value) => typeof value === "string" && value.startsWith("/") && isPathPrefix(folder, canonical(value)));
+	if (argument === void 0) return null;
+	return {
+		label: typeof job.Label === "string" ? job.Label : file,
+		plist: file,
+		argument
+	};
+}
+/** The first installed stim-server service that runs from inside `folder`, or null. macOS only. */
+function serviceRunningFrom(folder, canonical, agentsDir = join(homedir(), "Library", "LaunchAgents")) {
+	if (process.platform !== "darwin") return null;
+	let names;
+	try {
+		names = readdirSync(agentsDir).filter((name) => name.endsWith(".plist"));
+	} catch (error) {
+		return error.code === "ENOENT" ? null : {
+			label: "unknown",
+			plist: agentsDir,
+			argument: null
+		};
+	}
+	for (const name of names) {
+		const file = join(agentsDir, name);
+		const label = name.replace(/\.plist$/, "");
+		try {
+			if (!readFileSync(file).includes("StimService")) continue;
+		} catch {
+			return {
+				label,
+				plist: file,
+				argument: null
+			};
+		}
+		try {
+			const json = getExecutor().runFile("plutil", [
+				"-convert",
+				"json",
+				"-o",
+				"-",
+				file
+			], { timeoutMs: 5e3 });
+			const use = serviceUseOf(JSON.parse(json), file, folder, canonical);
+			if (use) return use;
+		} catch {
+			return {
+				label,
+				plist: file,
+				argument: null
+			};
+		}
+	}
+	return null;
+}
+//#endregion
 //#region src/engine/warm-claim.ts
 const WARM_CLAIM_LABEL = "worktree warm";
 const WARM_CLAIM_POLL_MS = 250;
@@ -2078,9 +2157,13 @@ function hasRegisteredProjectUnder(rootPath) {
 	const cfg = loadConfig$1();
 	return Object.keys(cfg?.projects ?? {}).some((key) => isPathPrefix(rootPath, key));
 }
+function projectAtOrAbove(root, path) {
+	const here = nativeCanonicalPath(path);
+	return Object.keys(loadConfig$1()?.projects ?? {}).filter((key) => isPathPrefix(nativeCanonicalPath(root), nativeCanonicalPath(key)) && isPathPrefix(nativeCanonicalPath(key), here)).toSorted((a, b) => b.length - a.length)[0] ?? null;
+}
 async function reclaimEnvironment(root, why) {
 	await withManagedRemoteWorktreeRemovalLock(root, () => withReclaimLocks(root, async (lockedKeys) => {
-		const result = await reclaimAll(root, lockedKeys);
+		const result = await reclaimAll(root, lockedKeys, { removedBy: "worktree-remove" });
 		for (const line of poolLines(result)) console.error(line);
 		for (const device of result.deletedDevices) console.error(chalk.dim(phaseLine("device", `deleted ${device}`)));
 		for (const session of result.stoppedSessions) console.error(chalk.dim(phaseLine("device", `stopped remote session ${session}`)));
@@ -2255,7 +2338,18 @@ async function runRemove(target, opts, onRemoved) {
 		return;
 	}
 	if (entry.path === source.path) {
-		if (entry.path !== path) console.error(chalk.dim(`${path} is inside the source checkout ${entry.path}; reclaiming its environment.`));
+		if (nativeCanonicalPath(entry.path) !== nativeCanonicalPath(path)) {
+			const project = projectAtOrAbove(entry.path, path);
+			if (!project) {
+				console.error(chalk.red(`Refusing to reclaim from ${path}: no Stim project is registered at or above it.`));
+				console.error(chalk.dim(`  Run it from the project folder, or from ${entry.path} to reclaim every project under it.`));
+				process.exitCode = 1;
+				return;
+			}
+			console.error(chalk.dim(`${path} is inside the source checkout ${entry.path}; reclaiming only the project ${project}.`));
+			await reclaimEnvironment(project, "it is the source checkout");
+			return;
+		}
 		await reclaimEnvironment(entry.path, "it is the source checkout");
 		return;
 	}
@@ -2269,6 +2363,13 @@ async function runRemove(target, opts, onRemoved) {
 		process.exitCode = 1;
 		return;
 	}
+	const service = serviceRunningFrom(path, nativeCanonicalPath);
+	if (service) {
+		console.error(chalk.red(service.argument ? `Refusing to remove ${path}: it runs the stim-server service ${service.label} (${service.argument}). ${SERVICE_IN_USE.code}` : `Refusing to remove ${path}: could not read ${service.plist} to check whether the stim-server service ${service.label} runs from it. ${SERVICE_IN_USE.code}`));
+		console.error(chalk.dim(`Reinstall the service from another build with \`stim-server service install --label ${service.label}\`, or remove it with \`stim-server service uninstall --label ${service.label}\`, then retry.`));
+		process.exitCode = 1;
+		return;
+	}
 	const project = getProject(path);
 	const branch = entry.branch;
 	const ownsBranch = Boolean(branch && project?.worktreeBranchOwned === true && project.worktreeBranch === branch);
@@ -2371,7 +2472,7 @@ async function runRemove(target, opts, onRemoved) {
 	}));
 }
 function registerRemove(worktree) {
-	worktree.command("remove [target]").description("Remove a worktree, its unused Stim-created branch, build artifacts, owned devices, and Metro port. Defaults to the current workspace. On the source checkout it reclaims the environment only and leaves the tree in place.").option("--force", "remove even when the worktree holds uncommitted or unpushed work or initialized submodules").action(async (target, opts) => {
+	worktree.command("remove [target]").description("Remove a worktree, its unused Stim-created branch, build artifacts, owned devices, and Metro port. Defaults to the current workspace. On the source checkout it reclaims the environment only and leaves the tree in place; from a subfolder it reclaims only the project at or above that folder, with the projects nested under it.").option("--force", "remove even when the worktree holds uncommitted or unpushed work or initialized submodules").action(async (target, opts) => {
 		await removeWorktreeTarget(target, { force: opts.force });
 	});
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stim",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "description": "Stim: fast, isolated React Native environments for coding agents",
   "keywords": [
     "agent",
@@ -48,9 +48,9 @@
   },
   "dependencies": {
     "@expo/fingerprint": "^0.20.10",
-    "@stim-cli/cache": "^1.16.0",
-    "@stim-cli/core": "^1.16.0",
-    "@stim-cli/metro": "^1.16.0",
+    "@stim-cli/cache": "^1.17.0",
+    "@stim-cli/core": "^1.17.0",
+    "@stim-cli/metro": "^1.17.0",
     "chalk": "^6.0.0",
     "commander": "^15.0.0",
     "cross-spawn": "^7.0.6",
@@ -58,7 +58,7 @@
     "ws": "^8.21.3"
   },
   "devDependencies": {
-    "@stim-cli/expo-build-cache": "1.16.0",
+    "@stim-cli/expo-build-cache": "1.17.0",
     "@types/cross-spawn": "^6.0.6",
     "@types/which": "^3.0.4",
     "@types/ws": "^8.18.1",