stim 1.21.0 → 1.23.0

package/dist/{state-C4ZtUisW.mjs → state--smjFSTL.mjs}

@@ -1,7 +1,8 @@
-import { f as ownership_claim_exports, p as process_identity_exports, t as getExecutor } from "./exec-_UbtCQcG.mjs";
+import { g as process_identity_exports, r as WorkspaceProcessCleanupError, t as getExecutor, x as ownership_claim_exports } from "./exec-DEoAhcze.mjs";
 import { d as workspaceDir, m as workspaceLogsDir$1 } from "./paths-DQtTgsBf.mjs";
-import { d as writeWorkspaceState, o as updateWorkspaceState, r as readWorkspaceState$1, t as clearWorkspaceStateKey } from "./workspace-state-Cjuigeeu.mjs";
-import { l as pidExists } from "./metro-DEXpIhHC.mjs";
+import { t as runOperationFile } from "./operation-exec-BW0em61G.mjs";
+import { d as writeWorkspaceState, o as updateWorkspaceState, r as readWorkspaceState$1, t as clearWorkspaceStateKey } from "./workspace-state-U08dEzhG.mjs";
+import { c as pidExists } from "./metro-DiXtA3Ty.mjs";
 import { readFileSync, readlinkSync, rmSync } from "node:fs";
 import { hostname } from "node:os";
 import { join } from "node:path";
@@ -69,18 +70,32 @@ function chromeProcessState(record, profile) {
 	return groupRunsProfile(listing, record.pid, profile) ? "lingering" : "gone";
 }
 /** Checks the owned Chrome process or surviving group without blocking on ps. */
-async function chromeProcessStateAsync(record, profile) {
+async function chromeProcessStateAsync(record, profile, operation) {
+	operation?.signal.throwIfAborted();
 	const state = chromeIdentityState(record);
 	if (state) return state;
-	const listing = await getExecutor().runFileQuietAsync("ps", [
+	let listing;
+	const args = [
 		"-A",
 		"-ww",
 		"-o",
 		"pgid=,command="
-	], {
+	];
+	const options = {
 		timeoutMs: 1e4,
 		killSignal: "SIGKILL"
-	});
+	};
+	if (operation) try {
+		listing = await runOperationFile(operation, getExecutor(), "ps", args, {
+			...options,
+			cwd: operation.cwd
+		});
+	} catch (error) {
+		if (error instanceof WorkspaceProcessCleanupError) throw error;
+		operation.signal.throwIfAborted();
+		return "unknown";
+	}
+	else listing = await getExecutor().runFileQuietAsync("ps", args, options);
 	if (listing === null) return "unknown";
 	return groupRunsProfile(listing, record.pid, profile) ? "lingering" : "gone";
 }

package/dist/{state-XMziexv2.mjs → state-08I3hw3_.mjs}

@@ -1,6 +1,6 @@
-import { p as process_identity_exports } from "./exec-_UbtCQcG.mjs";
+import { g as process_identity_exports } from "./exec-DEoAhcze.mjs";
 import { d as workspaceDir, m as workspaceLogsDir$1 } from "./paths-DQtTgsBf.mjs";
-import { o as updateWorkspaceState, r as readWorkspaceState$1 } from "./workspace-state-Cjuigeeu.mjs";
+import { o as updateWorkspaceState, r as readWorkspaceState$1 } from "./workspace-state-U08dEzhG.mjs";
 import { existsSync } from "node:fs";
 import { join } from "node:path";
 import { readMacosRecord } from "@stim-cli/core/state";

package/dist/{stats-53T7OTb9.mjs → stats-DioA6cBU.mjs}

@@ -1,8 +1,8 @@
-import { P as formatBytes } from "./config-CYcBF478.mjs";
-import { o as formatLongDuration } from "./command-output-B1UrjZHL.mjs";
-import { i as findProjectRoot$1 } from "./project-BZNjmW_8.mjs";
-import { i as getSwiftpmCacheUsage, n as swiftpmCacheLines, r as getAgentDeviceUsage, t as agentDeviceLines } from "./agent-device-usage-output-zh1vhbLp.mjs";
-import { t as readProjectStats } from "./stats-report-BFfMpWWF.mjs";
+import { P as formatBytes } from "./config-DlrsduwG.mjs";
+import { o as formatLongDuration } from "./command-output-Db8BqzxH.mjs";
+import { i as findProjectRoot$1 } from "./project-CTLNHCfE.mjs";
+import { i as getSwiftpmCacheUsage, n as swiftpmCacheLines, r as getAgentDeviceUsage, t as agentDeviceLines } from "./agent-device-usage-output-UJ5gC80l.mjs";
+import { t as readProjectStats } from "./stats-report-BzaPrRm6.mjs";
 import { archivedUsage, readArchives } from "@stim-cli/core/state";
 import chalk from "chalk";
 //#region src/commands/stats.ts

package/dist/{stats-report-BFfMpWWF.mjs → stats-report-BzaPrRm6.mjs}

@@ -1,4 +1,4 @@
-import { Kt as gitPath } from "./settings-CsJDEXgK.mjs";
+import { i as gitPath } from "./operation-exec-BW0em61G.mjs";
 import { readStatsReport, statsProjectKey } from "@stim-cli/core/state";
 //#region src/engine/stats-report.ts
 /** The stats report for the project at `root`, keyed like the run recorders; Git runs with `env` and dies when `signal` aborts. */

package/dist/{status-DqEUSSxs.mjs → status-BRROykC8.mjs}

@@ -1,7 +1,7 @@
-import { P as formatBytes } from "./config-CYcBF478.mjs";
+import { P as formatBytes } from "./config-DlrsduwG.mjs";
 import { t as resolveMaintenanceSettings } from "./settings-Djl-mpjX.mjs";
-import { maintenanceRunClaims, readMaintenanceState } from "@stim-cli/core/state";
 import { claimRemoveCommand, readClaimSet } from "@stim-cli/core/ownership-claim";
+import { maintenanceRunClaims, readMaintenanceState } from "@stim-cli/core/state";
 //#region src/maintenance/status.ts
 function maintenanceStatus(env = process.env) {
 	const state = readMaintenanceState();

package/dist/{status-CSi6tlRq.mjs → status-Eqx_20WC.mjs}

@@ -1,2 +1,2 @@
-import { n as runStatusWatch, r as statusCommand, t as readVolumes } from "./status-BL7jVyAB.mjs";
+import { n as runStatusWatch, r as statusCommand, t as readVolumes } from "./status-kzbeWk4x.mjs";
 export { statusCommand as default, readVolumes, runStatusWatch };

package/dist/{status-BL7jVyAB.mjs → status-kzbeWk4x.mjs}

@@ -1,29 +1,29 @@
-import { p as process_identity_exports, t as getExecutor } from "./exec-_UbtCQcG.mjs";
+import { g as process_identity_exports, t as getExecutor } from "./exec-DEoAhcze.mjs";
 import { m as workspaceLogsDir$1, p as workspaceLogErrorIndex } from "./paths-DQtTgsBf.mjs";
-import { H as deviceSlotKey, K as projectDeviceSlots, P as formatBytes, W as parseDeviceSlotKey, _ as loadConfig$1, d as getConfigDir, z as volumeRootFor } from "./config-CYcBF478.mjs";
-import { a as formatElapsed, i as formatDuration, r as clockTime, u as plural } from "./command-output-B1UrjZHL.mjs";
-import { r as readWorkspaceState$1 } from "./workspace-state-Cjuigeeu.mjs";
-import { Dt as linkedWorktreesOnDisk, Ft as repoRoot, Y as resolveSettings, bt as gitCommonDirOnDisk, ot as workspaceHiddenSetting, vt as gitCommonDir } from "./settings-CsJDEXgK.mjs";
-import { n as gitAsync } from "./git-C3iTsJaZ.mjs";
-import { I as readWorkspaceLaunches, M as readMetroTunnel, P as readRemoteSession, S as readAppJson, a as findServerWorkspace, l as projectShortcut, u as detectPlatforms, v as detectIsExpo, y as detectTutorial } from "./project-BZNjmW_8.mjs";
+import { G as projectDeviceSlots, P as formatBytes, R as volumeRootFor, U as parseDeviceSlotKey, V as deviceSlotKey, _ as loadConfig$1, d as getConfigDir } from "./config-DlrsduwG.mjs";
+import { a as formatElapsed, i as formatDuration, r as clockTime, u as plural } from "./command-output-Db8BqzxH.mjs";
+import { s as gitAsync } from "./operation-exec-BW0em61G.mjs";
+import { r as readWorkspaceState$1 } from "./workspace-state-U08dEzhG.mjs";
+import { Mt as repoRoot, Y as resolveSettings, _t as gitCommonDir, ot as workspaceHiddenSetting, wt as linkedWorktreesOnDisk, yt as gitCommonDirOnDisk } from "./settings-C7O8A6ZI.mjs";
+import { I as readWorkspaceLaunches, M as readMetroTunnel, P as readRemoteSession, S as readAppJson, a as findServerWorkspace, l as projectShortcut, u as detectPlatforms, v as detectIsExpo, y as detectTutorial } from "./project-CTLNHCfE.mjs";
 import { a as parseNdjsonLine } from "./ndjson-CgE_o3Dl.mjs";
-import { a as listeningPids, d as processCwds, f as resolveProjectMetro, g as isMetroRunning, l as pidExists, s as listeningPidsByPort, u as processCwd } from "./metro-DEXpIhHC.mjs";
-import { a as readWebPage, o as readWebRecord, u as webFacts } from "./state-C4ZtUisW.mjs";
-import { A as remoteDeviceState, C as environmentState, D as parseDfFree, E as metroReverseTargets, M as tightVolumes, N as unprovisionedWorktrees, O as poolLine, P as withWebFacts, S as diskLine, T as gitSummaryText, _ as addReverseMissingIssue, b as deviceLeaseLines, g as activityLabel, j as statusActivity, k as remoteDeviceLine, r as readEasSessionLedger$1, v as applyMachineMemory, x as deviceLeaseStates, y as capacity } from "./eas-session-ledger-op6A54yi.mjs";
-import { F as buildStatusLine, G as readStats$1, I as bundlingActivity, N as activeBuildState, P as buildReport, R as parseActiveBuild, Y as statsProjectKey$1, h as describeMetroLastStop, j as ACTIVE_BUILD_KEY, o as machineNumber, vn as hasMetroReverse, vr as attributeMachineUsage, y as metroLastStop, yr as readFootprints } from "./budget-Bs6SxxzO.mjs";
-import { m as resolveSupervisorTarget } from "./workspaces-BccMFmGQ.mjs";
-import { a as createDeviceProcessTables, b as leaseIsExpired, h as tailLines, m as readWebActivity, r as createActivityReader, w as parseWorkspaceLeases, x as listLeaseFiles } from "./activity-BzVfHSrY.mjs";
-import { H as ownedAvdSerialResolver, R as ownedAvdDeviceProfile, gt as readParked, ht as parkedMaxSetting, k as listAdbDevices, lt as POOL_SETTING_REMEDY } from "./android-DUYkNF4u.mjs";
-import { b as parseSimctlList, f as listAllIosSimsAsync } from "./ios-CpByZy12.mjs";
-import { f as probeHostedSession } from "./hosted-client-DB_gBPfY.mjs";
-import "./hosted-macos-QI141yKk.mjs";
-import { i as readSupervisorState } from "./stop-CPzlM1L-.mjs";
-import { n as maintenanceLines, r as maintenanceStatus } from "./status-DqEUSSxs.mjs";
-import { f as mergeState, i as createStatusMeasurer, n as workspacePhase, r as applyStatusMeasures } from "./warm-progress-BHX5r0Ei.mjs";
-import { r as workspaceRecordingEnabled } from "./recordings-DYteQSu4.mjs";
-import { d as readIosDevices, s as isReachable } from "./ios-device-CwFMehUS.mjs";
-import { t as triggerMaintenance } from "./trigger-BAahxUPq.mjs";
-import { a as createRefreshScheduler, c as watchStatusSources, n as WATCH_LIGHT_INTERVAL_MS, o as watchChangeKey, r as WATCH_MACHINE_INTERVAL_MS, s as watchPayload, t as WATCH_FALLBACK_MS } from "./status-watch-GDCfqpTE.mjs";
+import { c as pidExists, d as resolveProjectMetro, h as isMetroRunning, i as listeningPids, l as processCwd, o as listeningPidsByPort, u as processCwds } from "./metro-DiXtA3Ty.mjs";
+import { a as readWebPage, o as readWebRecord, u as webFacts } from "./state--smjFSTL.mjs";
+import { A as remoteDeviceState, C as environmentState, D as parseDfFree, E as metroReverseTargets, M as tightVolumes, N as unprovisionedWorktrees, O as poolLine, P as withWebFacts, S as diskLine, T as gitSummaryText, _ as addReverseMissingIssue, b as deviceLeaseLines, g as activityLabel, j as statusActivity, k as remoteDeviceLine, r as readEasSessionLedger$1, v as applyMachineMemory, x as deviceLeaseStates, y as capacity } from "./eas-session-ledger-BzzsX97d.mjs";
+import { F as buildStatusLine, G as readStats$1, I as bundlingActivity, N as activeBuildState, P as buildReport, R as parseActiveBuild, Y as statsProjectKey$1, h as describeMetroLastStop, j as ACTIVE_BUILD_KEY, o as machineNumber, vn as hasMetroReverse, vr as attributeMachineUsage, y as metroLastStop, yr as readFootprints } from "./budget-DnPX3DXj.mjs";
+import { h as resolveSupervisorTarget } from "./workspaces-BxzYlo3P.mjs";
+import { a as createDeviceProcessTables, b as leaseIsExpired, h as tailLines, m as readWebActivity, r as createActivityReader, w as parseWorkspaceLeases, x as listLeaseFiles } from "./activity-B5RtpFda.mjs";
+import { A as listAdbDevices, B as ownedAvdDeviceProfile, W as ownedAvdSerialResolver, _t as parkedMaxSetting, dt as POOL_SETTING_REMEDY, vt as readParked } from "./android-C7sVmyI9.mjs";
+import { b as parseSimctlList, f as listAllIosSimsAsync } from "./ios-hcBpnEGk.mjs";
+import { f as probeHostedSession } from "./hosted-client-ByuMMO5s.mjs";
+import "./hosted-macos-DdtYajZt.mjs";
+import { i as readSupervisorState } from "./stop-B2uLQfoM.mjs";
+import { n as maintenanceLines, r as maintenanceStatus } from "./status-BRROykC8.mjs";
+import { f as mergeState, i as createStatusMeasurer, n as workspacePhase, r as applyStatusMeasures } from "./warm-progress-CA3TgT3-.mjs";
+import { r as workspaceRecordingEnabled } from "./recordings-CQmfzAh7.mjs";
+import { d as readIosDevices, s as isReachable } from "./ios-device-JC3uWM4K.mjs";
+import { t as triggerMaintenance } from "./trigger-Cbyc41d_.mjs";
+import { a as createRefreshScheduler, c as watchStatusSources, n as WATCH_LIGHT_INTERVAL_MS, o as watchChangeKey, r as WATCH_MACHINE_INTERVAL_MS, s as watchPayload, t as WATCH_FALLBACK_MS } from "./status-watch-BIqqbJ6q.mjs";
 import { t as watchStdoutReader } from "./stdout-reader-C8yjre1x.mjs";
 import { createHash, randomUUID } from "node:crypto";
 import { mkdirSync, readFileSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
@@ -500,7 +500,8 @@ function gitFilesStamp(worktree, refs) {
 * default-branch commit stands in, because a merged branch stays merged. A judgement that timed out is not retried
 * for the same HEAD and target for five minutes. With `maxAgeMs`, a summary made that recently in this process is
 * reused while the git files it depends on are unchanged, so a change that is not staged can take up to `maxAgeMs`
-* to show; so is the null of a worktree whose directory is gone.
+* to show; so is the null of a worktree whose directory is gone. Deferred merge verdicts are retried independently
+* of the cached counts without renewing their age.
 */
 async function readWorktreeGit(worktrees, { skip, maxAgeMs = 0 }) {
 	const now = Date.now();
@@ -518,7 +519,7 @@ async function readWorktreeGit(worktrees, { skip, maxAgeMs = 0 }) {
 		const files = maxAgeMs > 0 ? gitFilesStamp(worktree, refs) : null;
 		if (memo && memo.files !== null && memo.files === files?.stamp && now - memo.at < maxAgeMs) return {
 			path: worktree.path,
-			memo: memo.git
+			memo
 		};
 		const repository = worktree.repository;
 		if (repository && !targets.has(repository)) targets.set(repository, defaultBranchOf(repository));
@@ -541,7 +542,16 @@ async function readWorktreeGit(worktrees, { skip, maxAgeMs = 0 }) {
 	const summaries = /* @__PURE__ */ new Map();
 	for (const read of reads) {
 		if ("memo" in read) {
-			summaries.set(read.path, read.memo ?? null);
+			const memo = read.memo;
+			if (memo?.git && memo.pendingMerge) {
+				const merge = mergedInto(read.path, memo.pendingMerge.head, memo.pendingMerge.target, budget);
+				memo.git = {
+					...memo.git,
+					mergedInto: merge.into
+				};
+				if (!merge.deferred) delete memo.pendingMerge;
+			}
+			summaries.set(read.path, memo?.git ?? null);
 			continue;
 		}
 		if (!read.status) {
@@ -564,12 +574,16 @@ async function readWorktreeGit(worktrees, { skip, maxAgeMs = 0 }) {
 			upstream: counts.upstream,
 			target: read.target?.ref ?? null
 		};
-		const settled = !merge?.deferred && refs.upstream === read.refs.upstream && refs.target === read.refs.target;
+		const settled = refs.upstream === read.refs.upstream && refs.target === read.refs.target;
 		recent.set(read.path, {
 			at: read.at,
 			files: settled ? read.files?.stamp ?? null : null,
 			refs,
-			git: summary
+			git: summary,
+			...merge?.deferred && head && read.target ? { pendingMerge: {
+				head,
+				target: read.target
+			} } : {}
 		});
 		summaries.set(read.path, summary);
 	}

package/dist/{status-watch-GDCfqpTE.mjs → status-watch-BIqqbJ6q.mjs}

@@ -1,10 +1,10 @@
-import { t as getExecutor } from "./exec-_UbtCQcG.mjs";
-import { l as pidExists } from "./metro-DEXpIhHC.mjs";
-import { n as easMachineStateRoot } from "./eas-session-ledger-op6A54yi.mjs";
-import { d as androidToolPath } from "./android-DUYkNF4u.mjs";
-import { b as parseSimctlList } from "./ios-CpByZy12.mjs";
-import { readdirSync, statSync, watch } from "node:fs";
-import { dirname, join } from "node:path";
+import { t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { c as pidExists } from "./metro-DiXtA3Ty.mjs";
+import { n as easMachineStateRoot } from "./eas-session-ledger-BzzsX97d.mjs";
+import { d as androidToolPath } from "./android-C7sVmyI9.mjs";
+import { b as parseSimctlList } from "./ios-hcBpnEGk.mjs";
+import { existsSync, readdirSync, statSync, watch } from "node:fs";
+import { basename, dirname, join } from "node:path";
 //#region src/status-watch.ts
 const WATCH_FALLBACK_MS = 3e4;
 const WATCH_LIGHT_INTERVAL_MS = 1e3;
@@ -131,6 +131,7 @@ function watchStatusSources({ home, deviceSet, onChange, platform = process.plat
 			[join(home, "device-locks"), "leases"],
 			[easMachineStateRoot(), "eas"]
 		]);
+		if (platform === "darwin") return dirs;
 		let names = [];
 		try {
 			names = readdirSync(join(home, "workspaces"));
@@ -152,10 +153,25 @@ function watchStatusSources({ home, deviceSet, onChange, platform = process.plat
 		for (const [dir, kind] of desired) {
 			if (watchers.has(dir)) continue;
 			try {
-				const watcher = watch(dir, (_event, name) => {
-					const change = statusChange(kind, name === null ? null : String(name));
+				const recursive = platform === "darwin" && kind === "workspaces";
+				const watcher = watch(dir, { recursive }, (_event, name) => {
+					let source = kind;
+					let filename = name === null ? null : String(name);
+					if (recursive && filename !== null) {
+						const [, entry, child, ...nested] = filename.split("/");
+						if (entry !== void 0) {
+							if (entry === "logs" && child !== void 0 && nested.length === 0) {
+								source = "logs";
+								filename = child;
+							} else if (child === void 0) {
+								source = "workspace";
+								filename = entry;
+							} else return;
+						}
+					}
+					const change = statusChange(source, filename);
 					if (!change) return;
-					if (kind === "home" || kind === "workspaces" || kind === "workspace") {
+					if (source === "home" || source === "workspaces" || source === "workspace") {
 						listingVersion++;
 						reconcile();
 					}
@@ -213,14 +229,24 @@ function watchStatusSources({ home, deviceSet, onChange, platform = process.plat
 			onChange("full");
 		};
 		const watchDir = (dir, listener) => {
-			if (deviceWatchers.has(dir)) return;
 			try {
-				const watcher = watch(dir, (_event, name) => listener(name === null ? null : String(name)));
+				const ino = statSync(dir, { bigint: true }).ino;
+				const current = deviceWatchers.get(dir);
+				if (current?.ino === ino) return;
+				current?.watcher.close();
+				deviceWatchers.delete(dir);
+				const watcher = watch(dir, (_event, name) => {
+					if (!stopped && deviceWatchers.get(dir)?.watcher === watcher) listener(name === null ? null : String(name));
+				});
 				watcher.on("error", () => {
+					if (deviceWatchers.get(dir)?.watcher !== watcher) return;
 					watcher.close();
 					deviceWatchers.delete(dir);
 				});
-				deviceWatchers.set(dir, watcher);
+				deviceWatchers.set(dir, {
+					watcher,
+					ino
+				});
 			} catch {}
 		};
 		const watchDeviceSet = () => {
@@ -232,13 +258,18 @@ function watchStatusSources({ home, deviceSet, onChange, platform = process.plat
 			const wanted = /* @__PURE__ */ new Set();
 			if (names) {
 				wanted.add(deviceSet);
-				for (const name of names) if (SIMULATOR_DIR.test(name)) wanted.add(join(deviceSet, name));
+				for (const name of names) {
+					if (!SIMULATOR_DIR.test(name)) continue;
+					const dir = join(deviceSet, name);
+					const plist = join(dir, "device.plist");
+					wanted.add(existsSync(plist) ? plist : dir);
+				}
 			} else {
 				let dir = dirname(deviceSet);
 				while (dirname(dir) !== dir && !isDirectory(dir)) dir = dirname(dir);
 				wanted.add(dir);
 			}
-			for (const [dir, watcher] of deviceWatchers) {
+			for (const [dir, { watcher }] of deviceWatchers) {
 				if (wanted.has(dir)) continue;
 				watcher.close();
 				deviceWatchers.delete(dir);
@@ -247,6 +278,7 @@ function watchStatusSources({ home, deviceSet, onChange, platform = process.plat
 				watchDeviceSet();
 				changed();
 			});
+			else if (basename(dir) === "device.plist") watchDir(dir, changed);
 			else if (dirname(dir) === deviceSet) watchDir(dir, (name) => {
 				if (name === null || name === "device.plist") changed();
 			});
@@ -317,7 +349,7 @@ function watchStatusSources({ home, deviceSet, onChange, platform = process.plat
 			repositories.clear();
 			clearInterval(processTimer);
 			if (simTimer) clearInterval(simTimer);
-			for (const watcher of deviceWatchers.values()) watcher.close();
+			for (const { watcher } of deviceWatchers.values()) watcher.close();
 			deviceWatchers.clear();
 			simctl?.kill("SIGKILL");
 			adb.stop();

package/dist/status-worker.mjs

@@ -1,4 +1,4 @@
-import { n as runStatusWatch } from "./status-BL7jVyAB.mjs";
+import { n as runStatusWatch } from "./status-kzbeWk4x.mjs";
 import { parentPort, workerData } from "node:worker_threads";
 //#region src/status-worker.ts
 const STOP_EXIT_MS = 500;

package/dist/{stim-desktop-C12we7lz.mjs → stim-desktop-D5OGpYZM.mjs}

@@ -1,5 +1,5 @@
-import { t as getExecutor } from "./exec-_UbtCQcG.mjs";
-import { C as saveConfig, c as ensureConfig } from "./config-CYcBF478.mjs";
+import { t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { C as saveConfig, c as ensureConfig } from "./config-DlrsduwG.mjs";
 import { randomUUID } from "node:crypto";
 import { workspaceId } from "@stim-cli/core";
 import { readHomeIdentity, withConfigLockAsync } from "@stim-cli/core/state";

package/dist/{stop-Bk_1qiV6.mjs → stop-B18d8KDw.mjs}

@@ -1,3 +1,3 @@
-import { m as resolveSupervisorTarget } from "./workspaces-BccMFmGQ.mjs";
-import { a as resolveCollectorTargets, c as stopWorkspaceNow, i as readSupervisorState, n as clearSupervisorState, o as runStop, r as readCollectorState, s as stopCommand, t as clearCollectorState } from "./stop-CPzlM1L-.mjs";
+import { h as resolveSupervisorTarget } from "./workspaces-BxzYlo3P.mjs";
+import { a as resolveCollectorTargets, c as stopWorkspaceNow, i as readSupervisorState, n as clearSupervisorState, o as runStop, r as readCollectorState, s as stopCommand, t as clearCollectorState } from "./stop-B2uLQfoM.mjs";
 export { clearCollectorState, clearSupervisorState, stopCommand as default, readCollectorState, readSupervisorState, resolveCollectorTargets, resolveSupervisorTarget, runStop, stopWorkspaceNow };

package/dist/{stop-CPzlM1L-.mjs → stop-B2uLQfoM.mjs}

@@ -1,20 +1,19 @@
-import { _ as debugLog, f as ownership_claim_exports, p as process_identity_exports } from "./exec-_UbtCQcG.mjs";
+import { b as debugLog, g as process_identity_exports, i as withWorkspaceProcessLock, x as ownership_claim_exports } from "./exec-DEoAhcze.mjs";
 import { d as workspaceDir } from "./paths-DQtTgsBf.mjs";
-import { E as upsertProject, G as parseDeviceSlotOption, J as validateDeviceSlot, K as projectDeviceSlots, O as withConfigLockAsync$1, U as deviceSlotPlatforms, W as parseDeviceSlotKey, o as clearSupervisor, p as getProject } from "./config-CYcBF478.mjs";
-import { f as refuseNoProject, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-B1UrjZHL.mjs";
-import { c as withWorkspaceStateLock, d as writeWorkspaceState, l as withWorkspaceStateLockAsync, n as clearWorkspaceStateKeys, r as readWorkspaceState$1, s as updateWorkspaceStateAsync } from "./workspace-state-Cjuigeeu.mjs";
-import { A as clearWorkspaceLaunches, M as readMetroTunnel, O as clearManagedMetroTunnel, P as readRemoteSession, T as MODE_COMMAND, j as clearWorkspaceSupervisor, k as clearRemoteSession, n as findCommandWorkspace } from "./project-BZNjmW_8.mjs";
-import { t as macosAppPresent } from "./state-XMziexv2.mjs";
-import { d as processCwds, f as resolveProjectMetro, g as isMetroRunning, i as killMetroTreeAsync, l as pidExists, m as signalProcessTreeAsync, o as listeningPidsAsync } from "./metro-DEXpIhHC.mjs";
-import { S as withdrawDevServerStopRequest, b as requestDevServerStop, qn as resolveEasCliBin, v as logVanishedSupervisor, zt as endRecordedSession } from "./budget-Bs6SxxzO.mjs";
-import { a as decideStopAction, c as nativeRunWaitNotice, i as clearNativeRunCancel, l as requestNativeRunCancel, n as NATIVE_RUN_WAIT_MS, o as describeNativeRunHolder, s as nativeRunHolder, t as NATIVE_RUN_LOCK } from "./native-run-DY_RLx3C.mjs";
-import { D as teardownOwnedBrowser, E as teardownOwnedAvd, O as teardownOwnedIosSim, g as stopTunnel, m as resolveSupervisorTarget } from "./workspaces-BccMFmGQ.mjs";
-import { O as releaseWorkspaceLeasesAsync, y as fileLeaseIo } from "./activity-BzVfHSrY.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-1_1OoVW5.mjs";
-import { i as stopHostedAndroid } from "./hosted-android-Bw-honsd.mjs";
-import { r as stopHostedIos } from "./hosted-ios-CUvOf4Vr.mjs";
-import { n as stopMacosApp } from "./stop-D7h6jAXQ.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-DEmM5vhh.mjs";
+import { E as upsertProject, G as projectDeviceSlots, H as deviceSlotPlatforms, O as withConfigLockAsync$1, U as parseDeviceSlotKey, W as parseDeviceSlotOption, o as clearSupervisor, p as getProject, q as validateDeviceSlot } from "./config-DlrsduwG.mjs";
+import { f as refuseNoProject, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-Db8BqzxH.mjs";
+import { c as withWorkspaceStateLock, d as writeWorkspaceState, l as withWorkspaceStateLockAsync, n as clearWorkspaceStateKeys, r as readWorkspaceState$1, s as updateWorkspaceStateAsync } from "./workspace-state-U08dEzhG.mjs";
+import { A as clearWorkspaceLaunches, M as readMetroTunnel, O as clearManagedMetroTunnel, P as readRemoteSession, T as MODE_COMMAND, j as clearWorkspaceSupervisor, k as clearRemoteSession, n as findCommandWorkspace } from "./project-CTLNHCfE.mjs";
+import { t as macosAppPresent } from "./state-08I3hw3_.mjs";
+import { a as listeningPidsAsync, c as pidExists, d as resolveProjectMetro, h as isMetroRunning, p as signalProcessTreeAsync, r as killMetroTreeAsync, u as processCwds } from "./metro-DiXtA3Ty.mjs";
+import { S as withdrawDevServerStopRequest, b as requestDevServerStop, qn as resolveEasCliBin, v as logVanishedSupervisor, zt as endRecordedSession } from "./budget-DnPX3DXj.mjs";
+import { a as decideStopAction, c as nativeRunWaitNotice, i as clearNativeRunCancel, l as requestNativeRunCancel, n as NATIVE_RUN_WAIT_MS, o as describeNativeRunHolder, s as nativeRunHolder, t as NATIVE_RUN_LOCK } from "./native-run-BUTu8T7A.mjs";
+import { D as teardownOwnedAvd, O as teardownOwnedBrowser, _ as stopTunnel, h as resolveSupervisorTarget, k as teardownOwnedIosSim } from "./workspaces-BxzYlo3P.mjs";
+import { O as releaseWorkspaceLeasesAsync, y as fileLeaseIo } from "./activity-B5RtpFda.mjs";
+import { i as stopHostedAndroid } from "./hosted-android-CkclQig_.mjs";
+import { r as stopHostedIos } from "./hosted-ios-DtYHeuYR.mjs";
+import { n as stopMacosApp } from "./stop-DzLJc7Ei.mjs";
+import { n as verifyCollectorOwnership } from "./ownership-C5fo5Edb.mjs";
 import { hostedAndroidDeviceName, hostedAndroidRecords, hostedIosRecords, hostedNativeRecords, isJsonObject, parseHostedNativePlacement } from "@stim-cli/core/state";
 import chalk from "chalk";
 //#region src/commands/stop.ts

package/dist/{stop-D7h6jAXQ.mjs → stop-DzLJc7Ei.mjs}

@@ -1,10 +1,9 @@
-import { f as ownership_claim_exports, p as process_identity_exports } from "./exec-_UbtCQcG.mjs";
+import { g as process_identity_exports, i as withWorkspaceProcessLock, x as ownership_claim_exports } from "./exec-DEoAhcze.mjs";
 import { d as workspaceDir } from "./paths-DQtTgsBf.mjs";
-import { d as writeWorkspaceState, l as withWorkspaceStateLockAsync } from "./workspace-state-Cjuigeeu.mjs";
-import { a as macosRuntimeClaim, o as requiredMacosRecord } from "./state-XMziexv2.mjs";
-import { S as runningBundleInstancesAsync } from "./workspaces-BccMFmGQ.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-1_1OoVW5.mjs";
-import { n as stopHostedMacos } from "./hosted-macos-QI141yKk.mjs";
+import { d as writeWorkspaceState, l as withWorkspaceStateLockAsync } from "./workspace-state-U08dEzhG.mjs";
+import { a as macosRuntimeClaim, o as requiredMacosRecord } from "./state-08I3hw3_.mjs";
+import { C as runningBundleInstancesAsync } from "./workspaces-BxzYlo3P.mjs";
+import { n as stopHostedMacos } from "./hosted-macos-DdtYajZt.mjs";
 import { readMacosRecord } from "@stim-cli/core/state";
 //#region src/macos/stop.ts
 const APP_EXIT_MS = 5e3;
@@ -16,57 +15,67 @@ function signal(pid, name) {
 		if (error.code !== "ESRCH") throw error;
 	}
 }
-async function stopProcesses(records, waitMs = APP_EXIT_MS) {
+async function stopProcesses(records, waitMs = APP_EXIT_MS, operation) {
 	let live = [...new Map(records.map((record) => [record.pid, record])).values()];
 	for (const name of ["SIGTERM", "SIGKILL"]) {
+		operation?.signal.throwIfAborted();
 		live = live.filter((record) => {
 			const identity = (0, process_identity_exports.inspectProcessIdentity)(record);
 			if (identity === "gone" || identity === "different") return false;
 			if (identity !== "same") throw Object.assign(/* @__PURE__ */ new Error(`Cannot verify macOS owner pid ${record.pid}; no signal was sent.`), { code: "STIM_MACOS_OWNER_UNVERIFIED" });
 			return true;
 		});
-		for (const record of live) signal(record.pid, name);
-		const exited = await Promise.all(live.map((record) => (0, process_identity_exports.waitForProcessExit)(record, waitMs)));
+		for (const record of live) {
+			operation?.signal.throwIfAborted();
+			signal(record.pid, name);
+		}
+		const exited = await Promise.all(live.map((record) => (0, process_identity_exports.waitForProcessExit)(record, waitMs, operation?.signal)));
 		live = live.filter((_, index) => !exited[index]);
 		if (!live.length) return;
 	}
 	throw new Error(`Owned macOS process ${live.map((record) => record.pid).join(", ")} did not exit.`);
 }
 /** Stops every running copy of the workspace's owned app bundle, including copies LaunchServices started. */
-async function stopBundleInstances(root) {
-	const instances = await runningBundleInstancesAsync(root);
-	await stopProcesses(instances);
+async function stopBundleInstances(root, operation) {
+	const instances = await runningBundleInstancesAsync(root, operation);
+	await stopProcesses(instances, void 0, operation);
 	return instances.length > 0;
 }
-async function stopMacosAppHeld(root) {
+async function stopMacosAppHeld(root, operation) {
+	operation?.signal.throwIfAborted();
 	const record = requiredMacosRecord(root);
-	if (record?.supervisor) await stopProcesses([record.supervisor], SUPERVISOR_EXIT_MS);
+	if (record?.supervisor) await stopProcesses([record.supervisor], SUPERVISOR_EXIT_MS, operation);
 	const app = readMacosRecord(root)?.app ?? record?.app;
-	if (app) await stopProcesses([app]);
-	const instances = await runningBundleInstancesAsync(root);
-	await stopProcesses(instances);
+	if (app) await stopProcesses([app], void 0, operation);
+	const instances = await runningBundleInstancesAsync(root, operation);
+	await stopProcesses(instances, void 0, operation);
+	operation?.signal.throwIfAborted();
 	if (!record) return instances.length > 0;
 	const claims = (0, ownership_claim_exports.readClaimSet)(macosRuntimeClaim(root));
 	if (claims.unresolved.length || claims.live.length) throw Object.assign(/* @__PURE__ */ new Error("The macOS runtime claim cannot be released; inspect its recorded owner before cleanup."), { code: "STIM_MACOS_OWNER_UNVERIFIED" });
 	return true;
 }
 /** Stops the workspace's app here, or its session on the hosting Mac, which must confirm the session stopped. */
-function stopMacosApp(root) {
+function stopMacosApp(root, operation) {
 	const stop = async () => {
+		operation?.signal.throwIfAborted();
 		const record = requiredMacosRecord(root);
-		if (!record?.host) return stopMacosAppHeld(root);
-		await stopHostedMacos(root, record.host);
+		if (!record?.host) return stopMacosAppHeld(root, operation);
+		await stopHostedMacos(root, record.host, operation?.signal);
+		operation?.signal.throwIfAborted();
 		const { host: _host, hostLaunched: _launched, ...stopped } = record;
 		await withWorkspaceStateLockAsync(root, () => writeWorkspaceState(root, { macos: {
 			...stopped,
 			supervisor: void 0
-		} }));
+		} }), operation?.signal);
 		return true;
 	};
 	return withWorkspaceProcessLock(workspaceDir(root), "macos-launch", stop, {
 		external: true,
 		waitMs: 0,
-		ownerPurpose: "stop macOS app"
+		ownerPurpose: "stop macOS app",
+		signal: operation?.signal,
+		declareSpawnsFor: operation
 	});
 }
 //#endregion

package/dist/supervisor-run.d.mts

@@ -1,6 +1,6 @@
-import { a as clearExpoMetroTunnel, c as writePidFile, n as MODE_BARE, o as clearWorkspaceSupervisor, r as MODE_EXPO, s as readPidFile, t as SettingsObject } from "./settings-DkdmlelE.mjs";
-import { n as NdjsonWriter } from "./exec-H20xSg2T.mjs";
-import { n as OwnedDeviceActivity } from "./idle-BVeRGroT.mjs";
+import { c as readPidFile, i as MODE_EXPO, l as writePidFile, n as SettingsObject, o as clearExpoMetroTunnel, r as MODE_BARE, s as clearWorkspaceSupervisor } from "./ios-CDvlmUs7.mjs";
+import { n as NdjsonWriter } from "./exec-DnYc4HGH.mjs";
+import { n as OwnedDeviceActivity } from "./idle-C4cZ757K.mjs";
 import { DevServerStopRecord, DeviceIdleShutdownRecord } from "@stim-cli/core/state";
 //#region src/watchman.d.ts
 type WatchmanCommand = (args: string[], timeoutMs: number) => Promise<unknown>;