stim 1.21.0 → 1.22.0

package/dist/{eas-build-BomfRnFT.mjs → eas-build-CwknaQYj.mjs}

@@ -1,7 +1,7 @@
-import { f as ownership_claim_exports, t as getExecutor } from "./exec-_UbtCQcG.mjs";
-import { Gt as childEnvironment, en as throwIfCancelled, qt as killOnAbort } from "./settings-CsJDEXgK.mjs";
-import { Zn as remoteCliInvocation, nr as easCliUpgradeRemedy, qn as resolveEasCliBin, tr as easCliSupport } from "./budget-Bs6SxxzO.mjs";
-import { M as acquireBuildLock, P as releaseBuildLock } from "./activity-BzVfHSrY.mjs";
+import { t as getExecutor, x as ownership_claim_exports } from "./exec-DEoAhcze.mjs";
+import { a as killOnAbort, f as throwIfCancelled, r as childEnvironment } from "./operation-exec-BW0em61G.mjs";
+import { Zn as remoteCliInvocation, nr as easCliUpgradeRemedy, qn as resolveEasCliBin, tr as easCliSupport } from "./budget-Cvwn54qV.mjs";
+import { M as acquireBuildLock, P as releaseBuildLock } from "./activity-CMLmzp7o.mjs";
 import { createHash } from "node:crypto";
 import { existsSync, realpathSync, statSync } from "node:fs";
 //#region src/engine/eas-build.ts

package/dist/{eas-fallback-DJwZpy0c.mjs → eas-fallback-CSgAulr5.mjs}

@@ -1,14 +1,15 @@
-import { t as getExecutor } from "./exec-_UbtCQcG.mjs";
-import { _ as loadConfig$1, p as getProject } from "./config-CYcBF478.mjs";
-import { Gt as childEnvironment, ct as detectProviders, en as throwIfCancelled, lt as planMetroReach } from "./settings-CsJDEXgK.mjs";
-import { M as readMetroTunnel, P as readRemoteSession } from "./project-BZNjmW_8.mjs";
-import { $n as MIN_EAS_CLI_DEVICE_VERSION, Hn as isEasAuthFailureText, Ht as readInstalledEasCliVersionAsync, Qn as remoteCommand, er as MIN_EAS_CLI_SIMULATOR_VERSION, qn as resolveEasCliBin, s as peekBudget, tr as easCliSupport } from "./budget-Bs6SxxzO.mjs";
-import { P as readHostMemoryPressure } from "./ios-CpByZy12.mjs";
-import { d as hostingMachines, o as resolveBuildMachine, r as namedBuildMachine } from "./selection-CSl9i5qU.mjs";
-import { c as call, l as connectHost, p as requireHostedAppMode } from "./hosted-client-DB_gBPfY.mjs";
-import { r as readHostedNative, s as writeHostedNative } from "./ios-state-DvFX-K_l.mjs";
-import { n as prepareHostedNative } from "./hosted-native-Ksyjgzq-.mjs";
-import { c as peekDeviceSlots } from "./device-capacity-CMlqEcvw.mjs";
+import { t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { _ as loadConfig$1, p as getProject } from "./config-DlrsduwG.mjs";
+import { f as throwIfCancelled, r as childEnvironment } from "./operation-exec-BW0em61G.mjs";
+import { ct as detectProviders, lt as planMetroReach } from "./settings-C7O8A6ZI.mjs";
+import { M as readMetroTunnel, P as readRemoteSession } from "./project-wM_XFTvE.mjs";
+import { $n as MIN_EAS_CLI_DEVICE_VERSION, Hn as isEasAuthFailureText, Ht as readInstalledEasCliVersionAsync, Qn as remoteCommand, er as MIN_EAS_CLI_SIMULATOR_VERSION, qn as resolveEasCliBin, s as peekBudget, tr as easCliSupport } from "./budget-Cvwn54qV.mjs";
+import { F as readHostMemoryPressureAsync } from "./ios-hcBpnEGk.mjs";
+import { d as hostingMachines, o as resolveBuildMachine, r as namedBuildMachine } from "./selection-DSMbWEX2.mjs";
+import { c as call, l as connectHost, p as requireHostedAppMode } from "./hosted-client-DZAPrcro.mjs";
+import { r as readHostedNative, s as writeHostedNative } from "./ios-state-Dtw5K2aI.mjs";
+import { n as prepareHostedNative } from "./hosted-native-BdzE668-.mjs";
+import { c as peekDeviceSlots } from "./device-capacity-DK5_EwRS.mjs";
 import { ambientEnv } from "@stim-cli/core";
 import { automaticMachineEnabled, isJsonObject, machineCapacity, parseHostedChoice, parseHostedNativeOffer } from "@stim-cli/core/state";
 //#region src/device-host/placement.ts
@@ -122,16 +123,20 @@ function decideDevicePlacement(inputs) {
 }
 //#endregion
 //#region src/device-host/auto-placement.ts
-async function probeHost(machine, platform, selectors, appMode) {
+async function probeHost(machine, platform, selectors, appMode, signal) {
 	let host;
 	const deadline = Date.now() + 3e3;
+	const cancel = () => host?.connection.close();
 	try {
-		host = await connectHost(machine, 3e3, true);
+		host = await connectHost(machine, 3e3, true, signal);
+		signal?.addEventListener("abort", cancel, { once: true });
+		signal?.throwIfAborted();
 		requireHostedAppMode(host, platform, appMode);
 		const offer = await call(host, "device-host.offer", {
 			platform,
 			...selectors
 		}, Math.max(1, deadline - Date.now()));
+		signal?.throwIfAborted();
 		const resources = isJsonObject(offer.resources) ? offer.resources : {};
 		const parsed = parseHostedNativeOffer({
 			...offer,
@@ -165,11 +170,13 @@ async function probeHost(machine, platform, selectors, appMode) {
 			} } : {}
 		};
 	} catch (error) {
+		signal?.throwIfAborted();
 		return { probe: {
 			machine,
 			failure: error instanceof Error ? error.message : String(error)
 		} };
 	} finally {
+		signal?.removeEventListener("abort", cancel);
 		host?.connection.close();
 	}
 }
@@ -212,11 +219,11 @@ function viaEas(code, reason, skipped) {
 		skipped
 	};
 }
-async function automaticDevicePlacement({ root, slot, platform, selectors, appMode, buildMachine, noWait, eas }, { machines = hostingMachines, read = readHostedNative, write = writeHostedNative, resume = prepareHostedNative, peek = () => peekDeviceSlots({
+async function automaticDevicePlacement({ root, slot, platform, selectors, appMode, buildMachine, noWait, eas, signal }, { machines = () => hostingMachines(void 0, signal), read = readHostedNative, write = writeHostedNative, resume = prepareHostedNative, peek = () => peekDeviceSlots({
 	platform,
 	project: getProject(root),
 	slot
-}), capacity = machineCapacity, memory = readHostMemoryPressure, probe = probeHost, budget = (projectRoot) => peekBudget(projectRoot, {}, ambientEnv()) } = {}) {
+}), capacity = machineCapacity, memory = () => readHostMemoryPressureAsync(void 0, void 0, signal), probe = probeHost, budget = (projectRoot) => peekBudget(projectRoot, {}, ambientEnv(), signal) } = {}) {
 	const recorded = read(root, platform, slot)[slot];
 	if (recorded) {
 		const target = await resume(recorded.machine, selectors, recorded, platform, true, appMode);
@@ -238,7 +245,8 @@ async function automaticDevicePlacement({ root, slot, platform, selectors, appMo
 		...local("sticky", decideDevicePlacement({ sticky: { local: true } }).reason),
 		sticky: true
 	};
-	const configured = machines();
+	const configured = await machines();
+	signal?.throwIfAborted();
 	if (configured === null) throw Object.assign(/* @__PURE__ */ new Error("remote.machines is invalid. Run stim guide settings and correct it."), { code: "STIM_HOSTING_REFUSED" });
 	const config = loadConfig$1();
 	const entries = configured.filter((machine) => automaticMachineEnabled("device", machine, config));
@@ -249,10 +257,11 @@ async function automaticDevicePlacement({ root, slot, platform, selectors, appMo
 		localEnabled: automaticMachineEnabled("device", "local", config),
 		loadPerCore: load.loadPerCore,
 		maxLoadPerCore: load.maxLoadPerCore,
-		memoryPressure: memory(),
+		memoryPressure: await memory(),
 		devices,
 		budgetRefusal: await budget(root)
 	};
+	signal?.throwIfAborted();
 	const inputs = (offers) => ({
 		platform,
 		here,
@@ -265,7 +274,7 @@ async function automaticDevicePlacement({ root, slot, platform, selectors, appMo
 		failure: "not probed"
 	}));
 	const early = decideDevicePlacement(inputs(notProbed));
-	const probes = early.kind === "local" && early.skipped.length === 0 ? [] : await Promise.all(entries.map((machine) => probe(machine, platform, selectors, appMode)));
+	const probes = early.kind === "local" && early.skipped.length === 0 ? [] : await Promise.all(entries.map((machine) => probe(machine, platform, selectors, appMode, signal)));
 	const offers = probes.length ? probes.map((each) => each.probe) : notProbed;
 	let decision = decideDevicePlacement(inputs(offers));
 	if ((decision.kind === "local" || decision.kind === "refused") && decision.atCapacity && eas) decision = decideDevicePlacement({

package/dist/{eas-session-ledger-op6A54yi.mjs → eas-session-ledger-DlY_serQ.mjs}

@@ -1,9 +1,9 @@
-import { m as reportSignal, t as getExecutor } from "./exec-_UbtCQcG.mjs";
+import { _ as reportSignal, t as getExecutor } from "./exec-DEoAhcze.mjs";
 import { l as workspaceAgentDeviceDir, v as withDirLock$1, y as withDirLockAsync$1 } from "./paths-DQtTgsBf.mjs";
-import { H as deviceSlotKey, K as projectDeviceSlots } from "./config-CYcBF478.mjs";
-import { a as formatElapsed, o as formatLongDuration, r as clockTime, u as plural } from "./command-output-B1UrjZHL.mjs";
-import { n as isInsideProject } from "./metro-DEXpIhHC.mjs";
-import { r as cdpEndpoint } from "./state-C4ZtUisW.mjs";
+import { G as projectDeviceSlots, V as deviceSlotKey } from "./config-DlrsduwG.mjs";
+import { a as formatElapsed, o as formatLongDuration, r as clockTime, u as plural } from "./command-output-gwpm28fu.mjs";
+import { n as isInsideProject } from "./metro-DiXtA3Ty.mjs";
+import { r as cdpEndpoint } from "./state--smjFSTL.mjs";
 import { accessSync, constants, existsSync, mkdirSync, realpathSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { delimiter, dirname, join, resolve } from "node:path";
 import { workspaceId } from "@stim-cli/core";
@@ -713,10 +713,11 @@ function removeEasSessionClaim(sessionId, root = easMachineStateRoot(), when = (
 	});
 }
 /** Removes a matching EAS session claim after asynchronously acquiring the ownership ledger lock. */
-async function removeEasSessionClaimAsync(sessionId, root = easMachineStateRoot(), when = () => true) {
+async function removeEasSessionClaimAsync(sessionId, root = easMachineStateRoot(), when = () => true, signal) {
+	signal?.throwIfAborted();
 	if (!existsSync(easSessionLedgerFile(root))) return false;
 	assertEasMachineRootWritable(root);
-	return withDirLockAsync$1(easSessionLedgerLock(root), () => removeEasSessionClaim(sessionId, root, when));
+	return withDirLockAsync$1(easSessionLedgerLock(root), () => removeEasSessionClaim(sessionId, root, when), { signal });
 }
 //#endregion
 export { remoteDeviceState as A, environmentState as C, parseDfFree as D, metroReverseTargets as E, tightVolumes as M, unprovisionedWorktrees as N, poolLine as O, withWebFacts as P, diskLine as S, gitSummaryText as T, addReverseMissingIssue as _, removeEasSessionClaim as a, deviceLeaseLines as b, inspectStimVersions as c, parseWatchRoots as d, parseWatchmanClients as f, activityLabel as g, RECENT_LAUNCH_MS as h, recordEasSessionClaim as i, statusActivity as j, remoteDeviceLine as k, parseSubscriberNames as l, runWatchman as m, easMachineStateRoot$1 as n, removeEasSessionClaimAsync as o, parseWatchmanPid as p, readEasSessionLedger$1 as r, compareStimVersions as s, assertEasMachineRootWritable as t, parseTriggerCount as u, applyMachineMemory as v, formatSpace as w, deviceLeaseStates as x, capacity as y };

package/dist/{error-diagnostics-Bf0rZvG9.mjs → error-diagnostics-DBWO2rxE.mjs}

@@ -1,14 +1,14 @@
-import { t as getExecutor } from "./exec-_UbtCQcG.mjs";
+import { t as getExecutor } from "./exec-DEoAhcze.mjs";
 import { v as withDirLock$1 } from "./paths-DQtTgsBf.mjs";
-import { H as deviceSlotKey, U as deviceSlotPlatforms, p as getProject } from "./config-CYcBF478.mjs";
-import { v as launchErrorPreview } from "./command-output-B1UrjZHL.mjs";
-import { r as readWorkspaceState$1 } from "./workspace-state-Cjuigeeu.mjs";
-import { I as readWorkspaceLaunches } from "./project-BZNjmW_8.mjs";
-import { f as resolveProjectMetro } from "./metro-DEXpIhHC.mjs";
-import { S as parseLease, v as deviceLeasePath, y as fileLeaseIo } from "./activity-BzVfHSrY.mjs";
-import { o as androidHome, u as androidToolCwd } from "./android-DUYkNF4u.mjs";
-import { r as deviceConsoleLevel } from "./ios-device-CXGP1bsD.mjs";
-import { n as parseLogcatLine } from "./android-BEJ8Jpl7.mjs";
+import { H as deviceSlotPlatforms, V as deviceSlotKey, p as getProject } from "./config-DlrsduwG.mjs";
+import { v as launchErrorPreview } from "./command-output-gwpm28fu.mjs";
+import { r as readWorkspaceState$1 } from "./workspace-state-U08dEzhG.mjs";
+import { I as readWorkspaceLaunches } from "./project-wM_XFTvE.mjs";
+import { d as resolveProjectMetro } from "./metro-DiXtA3Ty.mjs";
+import { S as parseLease, v as deviceLeasePath, y as fileLeaseIo } from "./activity-CMLmzp7o.mjs";
+import { o as androidHome, u as androidToolCwd } from "./android-C7sVmyI9.mjs";
+import { r as deviceConsoleLevel } from "./ios-device-BXZ0c7Kb.mjs";
+import { n as parseLogcatLine } from "./android-DR5lZ2Az.mjs";
 import { createHash, randomUUID } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";

package/dist/{exec-_UbtCQcG.mjs → exec-DEoAhcze.mjs}

@@ -1,7 +1,8 @@
 import { createRequire } from "node:module";
+import { join } from "node:path";
 import { ambientContext, ambientEnv } from "@stim-cli/core";
 import { createDebugLog, runId } from "@stim-cli/core/state";
-import { basename, delimiter, resolve } from "path";
+import { basename as basename$1, delimiter as delimiter$1, resolve as resolve$1 } from "path";
 import { execSync } from "child_process";
 import spawn from "cross-spawn";
 import which from "which";
@@ -35,6 +36,11 @@ var __copyProps = (to, from, except, desc) => {
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
 //#endregion
+//#region src/ownership-claim.ts
+var ownership_claim_exports = /* @__PURE__ */ __exportAll({});
+import * as import__stim_cli_core_ownership_claim from "@stim-cli/core/ownership-claim";
+__reExport(ownership_claim_exports, import__stim_cli_core_ownership_claim);
+//#endregion
 //#region src/debug-log.ts
 const debugLog = createDebugLog("cli", { base: () => ({ runId: runId() }) });
 //#endregion
@@ -43,21 +49,22 @@ const reports = /* @__PURE__ */ new WeakMap();
 function reportSignal(context) {
 	return context && reports.has(context) ? context.signal : void 0;
 }
-function trackReportResource(context, closed, cancel, signal = context?.signal) {
+function trackReportResource(context, closed, cancel, signal = context?.signal, cleanupFailure) {
 	const state = context && reports.get(context);
 	if (!context || !state || !signal) return;
 	const { pending } = state;
 	const abort = () => {
 		const cancelled = Promise.resolve().then(cancel);
-		pending.add(cancelled);
+		pending.set(cancelled, cleanupFailure);
 		cancelled.then(() => pending.delete(cancelled), (error) => {
 			state.failure ??= error;
 			pending.delete(cancelled);
 			pending.delete(closed);
 			signal.removeEventListener("abort", abort);
+			state.abort(error);
 		});
 	};
-	pending.add(closed);
+	pending.set(closed, cleanupFailure);
 	const settled = () => {
 		signal.removeEventListener("abort", abort);
 		pending.delete(closed);
@@ -65,11 +72,12 @@ function trackReportResource(context, closed, cancel, signal = context?.signal)
 	closed.then(settled, (error) => {
 		state.failure ??= error;
 		settled();
+		state.abort(error);
 	});
 	signal.addEventListener("abort", abort, { once: true });
 	if (signal.aborted) abort();
 }
-async function runReport(context, work) {
+async function runReport(context, work, timeoutMs = 6e4) {
 	const controller = new AbortController();
 	const signal = AbortSignal.any([context.signal, controller.signal]);
 	const operation = {
@@ -79,14 +87,17 @@ async function runReport(context, work) {
 			if (!signal.aborted) context.output(stream, text);
 		})
 	};
-	const pending = /* @__PURE__ */ new Set();
-	const state = { pending };
+	const pending = /* @__PURE__ */ new Map();
+	const state = {
+		pending,
+		abort: (reason) => controller.abort(reason)
+	};
 	reports.set(operation, state);
-	const deadline = performance.now() + 6e4;
+	const deadline = performance.now() + timeoutMs;
 	const expire = () => {
-		controller.abort(Object.assign(/* @__PURE__ */ new Error("The report exceeded its 60 second budget."), { code: "STIM_REPORT_TIMEOUT" }));
+		controller.abort(Object.assign(/* @__PURE__ */ new Error(`The report exceeded its ${timeoutMs / 1e3} second budget.`), { code: "STIM_REPORT_TIMEOUT" }));
 	};
-	const timer = setTimeout(expire, 6e4);
+	const timer = setTimeout(expire, timeoutMs);
 	let rejectCancellation;
 	const cancelled = new Promise((_, reject) => {
 		rejectCancellation = reject;
@@ -109,7 +120,7 @@ async function runReport(context, work) {
 		controller.abort();
 		const cleanupDeadline = performance.now() + 35e3;
 		const expireCleanup = () => {
-			state.failure ??= Object.assign(/* @__PURE__ */ new Error("Report cleanup did not finish within 35 seconds."), {
+			state.failure ??= [...pending.values()].find((failure) => failure !== void 0) ?? Object.assign(/* @__PURE__ */ new Error("Report cleanup did not finish within 35 seconds."), {
 				code: "STIM_CLAIM_UNAVAILABLE",
 				reportCleanup: true
 			});
@@ -117,7 +128,7 @@ async function runReport(context, work) {
 		let cleanupTimer;
 		try {
 			await Promise.race([(async () => {
-				while (pending.size) await Promise.allSettled(pending);
+				while (pending.size) await Promise.allSettled(pending.keys());
 			})(), new Promise((resolve) => {
 				cleanupTimer = setTimeout(() => {
 					expireCleanup();
@@ -139,11 +150,6 @@ var process_identity_exports = /* @__PURE__ */ __exportAll({});
 import * as import__stim_cli_core_process_identity from "@stim-cli/core/process-identity";
 __reExport(process_identity_exports, import__stim_cli_core_process_identity);
 //#endregion
-//#region src/ownership-claim.ts
-var ownership_claim_exports = /* @__PURE__ */ __exportAll({});
-import * as import__stim_cli_core_ownership_claim from "@stim-cli/core/ownership-claim";
-__reExport(ownership_claim_exports, import__stim_cli_core_ownership_claim);
-//#endregion
 //#region src/engine/operation-state.ts
 const states = /* @__PURE__ */ new WeakMap();
 let detached;
@@ -209,7 +215,8 @@ function stopDeclaringSpawnsOn(context, claim) {
 * the caller's process group, so a terminal interrupt still reaches it; the claim follows the child
 * itself. A claim that cannot be marked stops the spawn rather than letting it run unprotected. A claim
 * records one child, so declared spawns must not overlap. `until: 'close'` also holds the declaration
-* while a launcher's child retains its stdio pipes after the launcher exits.
+* while a launcher's child retains its stdio pipes after the launcher exits. A promise holds the declaration until
+* cleanup resolves; a rejection keeps the child record for recovery.
 */
 function spawnDeclared(context, spawn, { until = "exit" } = {}) {
 	const { declaring, running, refusal } = operationState(context);
@@ -235,7 +242,6 @@ function spawnDeclared(context, spawn, { until = "exit" } = {}) {
 		return child;
 	}
 	running.add(child);
-	child.once(until, () => running.delete(child));
 	const captured = (0, process_identity_exports.captureProcessIdentity)(pid);
 	if (captured.ok) for (const claim of claims) try {
 		(0, ownership_claim_exports.setClaimChild)(claim, {
@@ -243,7 +249,12 @@ function spawnDeclared(context, spawn, { until = "exit" } = {}) {
 			processToken: captured.token
 		});
 	} catch {}
-	child.once(until, forget);
+	const settled = () => {
+		running.delete(child);
+		forget();
+	};
+	if (typeof until === "string") child.once(until, settled);
+	else until.then(settled, () => {});
 	return child;
 }
 /** Refuse every later `spawnDeclared` of `context`'s operation with `reason` until `allowDeclaredSpawns`. */
@@ -268,14 +279,81 @@ function signalDeclaredSpawns(context, signal) {
 	return signalled;
 }
 //#endregion
+//#region src/engine/workspace-process-lock.ts
+const DEFAULT_WAIT_MS = 6e4;
+const POLL_MS = 25;
+var WorkspaceProcessCleanupError = class extends Error {
+	code = "STIM_CLAIM_UNAVAILABLE";
+	claims;
+	remedy;
+	constructor(claims, message, remedy) {
+		super(`${message} Its ownership claims remain held at ${claims.map((claim) => claim.path).join(", ")}.`);
+		this.claims = claims;
+		this.remedy = `${remedy} After verifying no child remains, remove only these claims: ${claims.map((claim) => (0, ownership_claim_exports.claimRemoveCommand)(claim.path)).join("; ")}`;
+	}
+};
+function workspaceProcessLockError(err) {
+	const code = err?.code;
+	if (code === "STIM_LOCK_REFUSED") return "refused";
+	if (code === "STIM_LOCK_TIMEOUT") return "timeout";
+	return null;
+}
+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, signal, sleep = (ms) => setTimeout$1(ms, void 0, { signal }), waitMs = DEFAULT_WAIT_MS, ownerPurpose, details = {}, onHeld, rejectOwnerPurposes = [], external = false, declareSpawnsFor } = {}) {
+	const path = workspaceProcessLockPath(root, name, external);
+	const deadline = now() + waitMs;
+	for (;;) {
+		signal?.throwIfAborted();
+		const attempt = (0, ownership_claim_exports.tryAcquireClaim)({
+			root: path,
+			mode: "exclusive",
+			label: `${name} lock`,
+			details: ownerPurpose ? {
+				...details,
+				purpose: ownerPurpose
+			} : details
+		});
+		if (attempt.pending) (0, ownership_claim_exports.releaseClaim)(attempt.pending);
+		if (attempt.acquired) {
+			if (declareSpawnsFor) declareSpawnsOn(declareSpawnsFor, attempt.acquired);
+			let retained = false;
+			try {
+				return await fn(attempt.acquired);
+			} catch (cause) {
+				retained = cause instanceof WorkspaceProcessCleanupError && cause.claims.includes(attempt.acquired);
+				throw cause;
+			} finally {
+				if (declareSpawnsFor) stopDeclaringSpawnsOn(declareSpawnsFor, attempt.acquired);
+				if (!retained) (0, ownership_claim_exports.releaseClaim)(attempt.acquired);
+			}
+		}
+		const holder = attempt.held ?? attempt.waitingFor?.[0];
+		const purpose = holder?.details.purpose;
+		if (typeof purpose === "string" && rejectOwnerPurposes.includes(purpose)) {
+			const error = /* @__PURE__ */ new Error(`The ${name} lock at ${path} is held for ${purpose}.`);
+			error.code = "STIM_LOCK_REFUSED";
+			throw error;
+		}
+		if (holder && onHeld) await onHeld(holder);
+		if (now() >= deadline) {
+			const error = /* @__PURE__ */ new Error(`Timed out waiting for the ${name} lock at ${path}.`);
+			error.code = "STIM_LOCK_TIMEOUT";
+			throw error;
+		}
+		await sleep(POLL_MS);
+	}
+}
+//#endregion
 //#region src/exec.ts
 const MAX_BUFFER = 67108864;
-function spawnReportProbe(file, args, opts) {
-	if (process.platform !== "win32" || !reportSignal(ambientContext()) || !executableIn(file, opts.env ?? ambientEnv(), opts.cwd ?? process.cwd())) return spawn(file, args, opts);
+function spawnReportProbe(file, args, opts, containProcessTree = false) {
+	if (process.platform !== "win32" || !containProcessTree && !reportSignal(ambientContext()) || !executableIn(file, opts.env ?? ambientEnv(), opts.cwd ?? process.cwd())) return spawn(file, args, opts);
 	const env = opts.env ?? ambientEnv();
 	const systemRoot = process.env.SystemRoot ?? process.env.SYSTEMROOT;
 	if (!systemRoot) throw new Error("SystemRoot is required to contain Windows report probes.");
-	return spawn(resolve(systemRoot, "System32", "WindowsPowerShell", "v1.0", "powershell.exe"), [
+	return spawn(resolve$1(systemRoot, "System32", "WindowsPowerShell", "v1.0", "powershell.exe"), [
 		"-NoLogo",
 		"-NoProfile",
 		"-NonInteractive",
@@ -313,8 +391,7 @@ function reportChild(child, signal, failed) {
 		child.once("close", () => {
 			ended = true;
 			finishNativeClose();
-			if (report) cancel().then(resolve, reject);
-			else resolve();
+			cancel().then(resolve, reject);
 		});
 	});
 	const pid = child.pid;
@@ -334,15 +411,15 @@ function reportChild(child, signal, failed) {
 		return "unknown";
 	};
 	const refuse = (message) => {
-		const error = Object.assign(new Error(message), {
+		const failure = Object.assign(new Error(message), {
 			code: "STIM_CLAIM_UNAVAILABLE",
 			reportCleanup: true
 		});
+		const error = failed?.(failure) ?? failure;
 		child.stdin?.destroy();
 		child.stdout?.destroy();
 		child.stderr?.destroy();
 		child.unref();
-		failed?.(error);
 		rejectClosed(error);
 		throw error;
 	};
@@ -394,6 +471,11 @@ function reportChild(child, signal, failed) {
 			clearTimeout(timer);
 			if (!ended) refuse(`Report child ${pid} did not close within the cleanup budget.`);
 		}
+		if (pid !== void 0 && process.platform !== "win32") {
+			const deadline = performance.now() + 1e3;
+			while ((0, ownership_claim_exports.processGroupAlive)(pid) && performance.now() < deadline) await setTimeout$1(25);
+			if ((0, ownership_claim_exports.processGroupAlive)(pid)) refuse(`Report child ${pid} still has descendants after cleanup.`);
+		}
 	})();
 	if (report) trackReportResource(context, closed, cancel, signal);
 	else {
@@ -406,7 +488,10 @@ function reportChild(child, signal, failed) {
 		closed.then(settled, settled);
 		if (callerSignal.aborted) abort();
 	}
-	return cancel;
+	return {
+		cancel,
+		closed
+	};
 }
 function budgetMs(timeoutMs) {
 	if (timeoutMs === "unbounded") return void 0;
@@ -431,10 +516,10 @@ function executableIn(file, env, cwd) {
 	const value = (name) => env[name] ?? (windows ? Object.entries(env).find(([key, field]) => field !== void 0 && key.toUpperCase() === name)?.[1] : void 0);
 	const directory = typeof cwd === "string" ? cwd : fileURLToPath(cwd);
 	const path = file.includes("/") || windows && file.includes("\\");
-	const directories = path ? [""] : (value("PATH") ?? "").split(delimiter);
+	const directories = path ? [""] : (value("PATH") ?? "").split(delimiter$1);
 	if (windows && !path) directories.unshift(directory);
 	for (const entry of directories) {
-		const candidate = resolve(directory, entry.replace(/^"(.*)"$/, "$1"), file);
+		const candidate = resolve$1(directory, entry.replace(/^"(.*)"$/, "$1"), file);
 		const found = which.sync(candidate, {
 			nothrow: true,
 			path: "",
@@ -447,7 +532,7 @@ function executableIn(file, env, cwd) {
 function refuseUnsafeBatchArguments(file, args, env = ambientEnv(), cwd = ambientContext()?.cwd ?? process.cwd()) {
 	if (process.platform !== "win32") return;
 	const target = executableIn(file, env, cwd) ?? file;
-	if (isUnsafeBatchSpawn(target, args)) throw new Error(`Refusing to run ${basename(target)}: an argument contains a character cmd.exe could misinterpret (a double quote or a line break).`);
+	if (isUnsafeBatchSpawn(target, args)) throw new Error(`Refusing to run ${basename$1(target)}: an argument contains a character cmd.exe could misinterpret (a double quote or a line break).`);
 }
 function redactError(error, values) {
 	const secrets = values?.filter(Boolean) ?? [];
@@ -524,7 +609,7 @@ const defaultExecutor = {
 		if (detachedSilent) return "";
 		return untrimmed ? String(result.stdout) : String(result.stdout).trim();
 	},
-	runFileAsync(file, args = [], { timeoutMs, killSignal, cwd, env, omitEnv, input, untrimmed, rejectStderr, onSpawn, declareFor, detachedSilent, redact, signal: callSignal }) {
+	runFileAsync(file, args = [], { timeoutMs, killSignal, cwd, env, omitEnv, input, untrimmed, rejectStderr, onSpawn, declareFor, detachedSilent, containProcessTree, cleanupOnExit, redact, signal: callSignal }) {
 		const command = [file, ...args].join(" ");
 		return new Promise((resolve, reject) => {
 			const report = callSignal ?? reportSignal(ambientContext());
@@ -550,20 +635,38 @@ const defaultExecutor = {
 				opts.env = childEnv;
 			}
 			refuseUnsafeBatchArguments(file, args, opts.env, opts.cwd);
-			const start = () => spawnReportProbe(file, args, opts);
-			const child = declareFor ? spawnDeclared(declareFor, start) : start();
+			const claims = declareFor ? [...operationState(declareFor).declaring] : [];
+			let clearDeclaration;
+			let retainDeclaration;
+			const declaration = claims.length > 0 && report ? new Promise((resolveDeclaration, rejectDeclaration) => {
+				clearDeclaration = resolveDeclaration;
+				retainDeclaration = rejectDeclaration;
+			}) : void 0;
+			const start = () => spawnReportProbe(file, args, opts, containProcessTree || Boolean(report));
+			const child = declareFor ? spawnDeclared(declareFor, start, declaration ? { until: declaration } : {}) : start();
+			let lifetime;
 			let cancel;
 			let timer;
 			try {
-				cancel = reportChild(child, report, (error) => {
+				lifetime = reportChild(child, report, (error) => {
+					const failure = claims.length ? Object.assign(new WorkspaceProcessCleanupError(claims, error.message, "Verify the child and its descendants have stopped."), { reportCleanup: true }) : error;
 					clearTimeout(timer);
-					reject(error);
+					return failure;
+				});
+				cancel = lifetime?.cancel;
+				if (cleanupOnExit && cancel) child.once("exit", () => {
+					clearTimeout(timer);
+					cancel?.().catch(reject);
 				});
+				lifetime?.closed.catch(reject);
+				if (declaration) lifetime?.closed.then(clearDeclaration, retainDeclaration);
 				onSpawn?.(child);
 			} catch (error) {
-				if (cancel) cancel().catch(reject);
-				else if (!report) child.kill("SIGKILL");
-				reject(error);
+				if (cancel) cancel().then(() => lifetime?.closed).then(() => reject(error), reject);
+				else {
+					if (!report) child.kill("SIGKILL");
+					reject(error);
+				}
 				return;
 			}
 			if (input !== void 0) {
@@ -610,8 +713,9 @@ const defaultExecutor = {
 				clearTimeout(timer);
 				reject(redactError(error, redact));
 			});
-			child.on("close", (status, signal) => {
+			const finish = async (status, signal) => {
 				clearTimeout(timer);
+				await lifetime?.closed;
 				const discardOutput = (timedOut || overflowed || report?.aborted) && redact?.some(Boolean);
 				const out = discardOutput ? "" : Buffer.concat(stdout).toString("utf-8");
 				const err = discardOutput ? "" : Buffer.concat(stderr).toString("utf-8");
@@ -626,6 +730,9 @@ const defaultExecutor = {
 				else if (overflowed) reject(redactError(Object.assign(/* @__PURE__ */ new Error(`Command output exceeded ${MAX_BUFFER} bytes: ${command}`), result, { code: "ENOBUFS" }), redact));
 				else if (status !== 0 || rejectStderr && err.trim()) reject(redactError(Object.assign(/* @__PURE__ */ new Error(`Command failed: ${command}${err ? `\n${err}` : ""}`), result), redact));
 				else resolve(detachedSilent ? "" : untrimmed ? out : out.trim());
+			};
+			child.on("close", (status, signal) => {
+				finish(status, signal).catch(reject);
 			});
 		});
 	},
@@ -660,16 +767,17 @@ const defaultExecutor = {
 		} : opts;
 		if (report && process.platform !== "win32") childOpts.detached = true;
 		refuseUnsafeBatchArguments(cmd, args, childOpts.env ?? ambientEnv(), childOpts.cwd);
+		const claims = report ? [...operationState(context).declaring] : [];
 		const child = spawnReportProbe(cmd, args, childOpts);
-		reportChild(child);
+		reportChild(child, void 0, (error) => claims.length ? Object.assign(new WorkspaceProcessCleanupError(claims, error.message, "Verify the child and its descendants have stopped."), { reportCleanup: true }) : error);
 		return child;
 	},
-	findExecutable(name) {
-		return executableIn(name, ambientEnv(), ambientContext()?.cwd ?? process.cwd());
+	findExecutable(name, options = {}) {
+		return executableIn(name, options.env ?? ambientEnv(), options.cwd ?? ambientContext()?.cwd ?? process.cwd());
 	}
 };
 /** The program a call runs, without its arguments: those can carry tokens. */
-const programOf = (command) => basename(command.trim().split(/\s+/)[0] ?? "");
+const programOf = (command) => basename$1(command.trim().split(/\s+/)[0] ?? "");
 function outcomeOf(error) {
 	const { status, signal, code } = error ?? {};
 	return {
@@ -713,11 +821,11 @@ function timedSync(fn, program) {
 let active = {
 	...defaultExecutor,
 	run: timedSync((cmd, opts) => defaultExecutor.run(cmd, opts), programOf),
-	runFile: timedSync((file, args, opts) => defaultExecutor.runFile(file, args, opts), (file) => basename(file)),
+	runFile: timedSync((file, args, opts) => defaultExecutor.runFile(file, args, opts), (file) => basename$1(file)),
 	async runFileAsync(file, args, opts) {
 		if (!debugLog.enabled()) return defaultExecutor.runFileAsync(file, args, opts);
 		const id = ++executionId;
-		const name = basename(file);
+		const name = basename$1(file);
 		const started = performance.now();
 		debugLog.log("exec.start", {
 			program: name,
@@ -747,4 +855,4 @@ function getExecutor() {
 	return active;
 }
 //#endregion
-export { debugLog as _, refuseDeclaredSpawns as a, stopDeclaringSpawnsOn as c, withDrainingCancellation as d, ownership_claim_exports as f, trackReportResource as g, runReport as h, declareSpawnsOn as i, isTermination as l, reportSignal as m, isTimeoutError as n, signalDeclaredSpawns as o, process_identity_exports as p, allowDeclaredSpawns as r, spawnDeclared as s, getExecutor as t, operationState as u, __commonJSMin as v, __require as y };
+export { __require as C, __commonJSMin as S, reportSignal as _, workspaceProcessLockError as a, debugLog as b, declareSpawnsOn as c, spawnDeclared as d, stopDeclaringSpawnsOn as f, process_identity_exports as g, withDrainingCancellation as h, withWorkspaceProcessLock as i, refuseDeclaredSpawns as l, operationState as m, isTimeoutError as n, workspaceProcessLockPath as o, isTermination as p, WorkspaceProcessCleanupError as r, allowDeclaredSpawns as s, getExecutor as t, signalDeclaredSpawns as u, runReport as v, ownership_claim_exports as x, trackReportResource as y };

package/dist/{exec-H20xSg2T.d.mts → exec-DnYc4HGH.d.mts}

@@ -15,6 +15,12 @@ interface NdjsonWriter {
   readonly dropped: number;
   readonly lastError: Error | null;
 }
+declare function createNdjsonWriter(file: string, { truncate, fields, maxBytes, now }?: {
+  truncate?: boolean;
+  fields?: Record<string, unknown>;
+  maxBytes?: number;
+  now?: () => number;
+}): NdjsonWriter;
 //#endregion
 //#region src/exec.d.ts
 interface ExecOptions {
@@ -26,7 +32,7 @@ interface ExecOptions {
   cwd?: string;
   env?: Record<string, string>;
   omitEnv?: readonly string[];
-  /** Text written to the child's stdin; `runFile` only. */
+  /** Text written to the child's stdin. */
   input?: string;
   /** `runFileAsync` only: called with the child right after it starts; a throw kills the child and rejects the call. */
   onSpawn?: (child: ChildProcess) => void;
@@ -40,6 +46,10 @@ interface ExecOptions {
   rejectStderr?: boolean;
   /** `runFile` and `runFileAsync`: run in its own session with all stdio ignored and return ''; the child reports through a file, so a background process it leaves behind cannot hold a pipe open. */
   detachedSilent?: boolean;
+  /** `runFileAsync` only: put the Windows child tree in a kill-on-close Job Object. */
+  containProcessTree?: boolean;
+  /** `runFileAsync` with a cancellation signal: begin verified tree cleanup at leader exit, before inherited pipes close. */
+  cleanupOnExit?: boolean;
   /**
    * Exact values replaced with `***` in every string field of a thrown error.
    * Async calls that time out or overflow discard captured output when any nonempty redaction value is supplied.
@@ -58,8 +68,11 @@ interface Executor {
   spawn(cmd: string, args?: readonly string[], opts?: SpawnOptions): ChildProcess;
   /** The cancellation signal of the current bounded report, including while a child is queued. */
   reportSignal?(): AbortSignal | undefined;
-  /** Absolute path of `name` on PATH, or null. Windows resolves PATH through PATHEXT. */
-  findExecutable(name: string): string | null;
+  /** Absolute path of `name` on PATH, or null. Options override the operation's cwd/environment; Windows uses PATHEXT. */
+  findExecutable(name: string, options?: {
+    cwd?: string;
+    env?: NodeJS.ProcessEnv;
+  }): string | null;
 }
 //#endregion
-export { NdjsonWriter as n, Executor as t };
+export { NdjsonWriter as n, createNdjsonWriter as r, Executor as t };