stim 1.20.2 → 1.21.0

package/dist/{macos-Ch5VJmcS.mjs → macos-C-0qJ6zq.mjs}

@@ -1,217 +1,226 @@
-import { E as upsertProject, k as process_identity_exports, u as getConcurrencyLimits } from "./config-BYDxlMY3.mjs";
-import { t as getExecutor } from "./exec-DqKo9GKJ.mjs";
-import { t as spawnEntry } from "./spawn-entry-Dcb7sDUz.mjs";
-import { K as resolveProjectSettings, Q as settingShapeErrors, a as SETTING_SHAPE_REMEDY } from "./settings-B717odTD.mjs";
-import { c as writeWorkspaceState, i as recordWorkspaceUse, p as ensureWorkspaceStorage, w as workspaceLogsDir$1, x as workspaceDir, y as workspaceAgentDeviceDir } from "./workspace-state-DJt_MMvf.mjs";
-import { l as phaseLine } from "./command-output-BTy8hZ0F.mjs";
-import { d as projectRegistry, o as ownedDeviceLabel, r as findProjectRoot } from "./project-_phNIJfs.mjs";
-import { a as spawnDeclared } from "./spawn-claims-DVS5RkMS.mjs";
-import { F as acquireBuildSlot, L as releaseBuildSlot } from "./workspaces-C36s2jb9.mjs";
-import { Dt as recordFinishedBuild, Et as recordBuildPhase, Ot as startBuildProgress, kt as tapBuildLog, yt as NO_BUILD_PROGRESS } from "./budget-f7516Zk0.mjs";
-import { a as withWorkspaceProcessLock } from "./named-ports-4WopRPg-.mjs";
-import { S as withNativeBuildRun } from "./tailnet-Dh-qiYzG.mjs";
-import { r as createNdjsonWriter } from "./ndjson-GOnbyvso.mjs";
-import { _ as requireLocalBuild, c as offloadPlacement, f as setRemoteLogSink, g as parseBuildMachineOption, h as namedBuildMachine, i as closeOffload, l as placementLoad, n as buildPlacementCandidates, o as offloadBuild, p as OffloadRefusal, r as chooseBuildMachine, u as remotePhaseText, y as resolveBuildPlacement } from "./client-qQAaXSUs.mjs";
-import { D as sanitizeDeviceLabel } from "./ios-RkW4pnQf.mjs";
-import { i as macosProcess, n as macosDir, o as requiredMacosRecord, r as macosLogFile } from "./state-CG_OFoaA.mjs";
-import { t as buildPlacementRecord } from "./placement-log-MOfPVgaM.mjs";
-import { c as connectHost } from "./hosted-client-ZEKpS9vw.mjs";
-import { t as placeHostedMacos } from "./hosted-macos-BACVAVqE.mjs";
-import { i as validateInfoPlist, t as resolveBundleExtras } from "./stage-KNTQopqv.mjs";
-import { r as stopMacosAppHeld, t as stopBundleInstances } from "./stop-DPEhunlw.mjs";
-import { closeSync, existsSync, mkdirSync, mkdtempSync, openSync, realpathSync, renameSync, rmSync } from "node:fs";
+import { d as withDrainingCancellation, p as process_identity_exports, s as spawnDeclared, t as getExecutor } from "./exec-_UbtCQcG.mjs";
+import { d as workspaceDir, l as workspaceAgentDeviceDir, m as workspaceLogsDir$1, n as ensureWorkspaceStorage } from "./paths-DQtTgsBf.mjs";
+import { E as upsertProject, u as getConcurrencyLimits } from "./config-CYcBF478.mjs";
+import { l as phaseLine } from "./command-output-B1UrjZHL.mjs";
+import { d as writeWorkspaceState, i as recordWorkspaceUse } from "./workspace-state-Cjuigeeu.mjs";
+import { J as resolveProjectSettingsAsync, a as SETTING_SHAPE_REMEDY, en as throwIfCancelled, et as settingShapeErrors } from "./settings-CsJDEXgK.mjs";
+import { f as projectRegistry, i as findProjectRoot$1, s as ownedDeviceLabel } from "./project-BZNjmW_8.mjs";
+import { i as macosProcess, n as macosDir, o as requiredMacosRecord, r as macosLogFile } from "./state-XMziexv2.mjs";
+import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
+import { B as recordFinishedBuild, Fn as processContext, H as tapBuildLog, In as runProcessOperation, M as NO_BUILD_PROGRESS, V as startBuildProgress, z as recordBuildPhase } from "./budget-Bs6SxxzO.mjs";
+import { d as runCancellationSignal, f as withNativeBuildRun } from "./native-run-DY_RLx3C.mjs";
+import { F as acquireBuildSlot, L as releaseBuildSlot } from "./workspaces-BccMFmGQ.mjs";
+import { D as sanitizeDeviceLabel } from "./ios-CpByZy12.mjs";
+import { t as withWorkspaceProcessLock } from "./workspace-process-lock-1_1OoVW5.mjs";
+import { c as offloadPlacement, f as setRemoteLogSink, i as closeOffload, l as placementLoad, n as buildPlacementCandidates, o as offloadBuild, r as chooseBuildMachine, u as remotePhaseText } from "./client-UXD70ZbM.mjs";
+import { a as requireLocalBuild, i as parseBuildMachineOption, r as namedBuildMachine, s as resolveBuildPlacement, t as OffloadRefusal } from "./selection-CSl9i5qU.mjs";
+import { l as connectHost } from "./hosted-client-DB_gBPfY.mjs";
+import { t as placeHostedMacos } from "./hosted-macos-QI141yKk.mjs";
+import { r as stopMacosAppHeld, t as stopBundleInstances } from "./stop-D7h6jAXQ.mjs";
+import { t as spawnEntry } from "./spawn-entry-jw19m8Nl.mjs";
+import { t as buildPlacementRecord } from "./placement-log-BqGbTa61.mjs";
+import { i as validateInfoPlist, t as resolveBundleExtras } from "./stage-BIS0ydsV.mjs";
+import { createHash, randomUUID } from "node:crypto";
+import { closeSync, existsSync, openSync, promises, realpathSync, renameSync } from "node:fs";
 import { join } from "node:path";
+import { LOG_ROTATE_BYTES, ambientEnv } from "@stim-cli/core";
 import { machineCapacity, readMacosRecord, validHostedAppArguments } from "@stim-cli/core/state";
-import { LOG_ROTATE_BYTES } from "@stim-cli/core";
-import { createHash, randomUUID } from "node:crypto";
 //#region src/macos/build.ts
-async function buildMacosBundle({ root, recipe, bundle, bundleId, displayName, scratch, writer, note, record, buildMachine, progress = NO_BUILD_PROGRESS }) {
-	if (record) record.buildMachine = buildMachine;
-	setRemoteLogSink((entry) => writer.write({
-		...entry,
-		platform: "macos"
-	}));
-	const write = (msg) => {
-		writer.write({
-			src: "build",
-			platform: "macos",
-			level: "info",
-			msg
-		});
-		note(msg);
-	};
-	let offloadFallback = null;
-	let asked = [];
-	let failedMachine;
-	const fallBack = (reason) => {
-		writer.write(buildPlacementRecord({
-			platform: "macos",
-			buildMachine,
-			candidates: asked,
-			event: "placement_fallback",
-			fallback: {
-				code: failedMachine ? "offload-failed" : "no-remote-mac-took-it",
-				reason,
-				machine: failedMachine
-			}
+async function buildMacosBundle({ context, root, recipe, bundle, bundleId, displayName, scratch, writer, note, record, buildMachine, progress = NO_BUILD_PROGRESS }) {
+	const signal = runCancellationSignal(context) ?? context.signal;
+	return withDrainingCancellation(context, signal, async () => {
+		throwIfCancelled(signal, "macOS build");
+		if (record) record.buildMachine = buildMachine;
+		setRemoteLogSink(context, (entry) => writer.write({
+			...entry,
+			platform: "macos"
 		}));
-		if (namedBuildMachine(buildMachine)) throw new OffloadRefusal(buildMachine, reason);
-		requireLocalBuild(buildMachine);
-		offloadFallback = reason;
-		if (record) record.offloadFallback = reason;
-		writer.write({
-			src: "build",
-			platform: "macos",
-			level: "warn",
-			event: "offload_failed",
-			msg: reason
-		});
-		write(`${reason} -> building here`);
-		write(`placement: here (${reason})`);
-	};
-	mkdirSync(macosDir(root), { recursive: true });
-	const staging = mkdtempSync(join(macosDir(root), "staging-"));
-	const promote = (path) => {
-		const backup = join(staging, "previous.app");
-		const previous = existsSync(bundle);
-		if (previous) renameSync(bundle, backup);
-		try {
-			renameSync(path, bundle);
-		} catch (error) {
-			if (previous) renameSync(backup, bundle);
-			throw error;
-		}
-	};
-	let choice = null;
-	try {
-		try {
-			const { mode, machines, localEnabled } = buildPlacementCandidates(buildMachine);
-			const here = machineCapacity();
-			const placement = offloadPlacement({
-				mode,
-				localEnabled,
-				machines: machines.length,
-				here,
-				unsupported: null,
-				selected: buildMachine
+		const write = (msg) => {
+			writer.write({
+				src: "build",
+				platform: "macos",
+				level: "info",
+				msg
+			});
+			note(msg);
+		};
+		let offloadFallback = null;
+		let asked = [];
+		let failedMachine;
+		const fallBack = (reason) => {
+			writer.write(buildPlacementRecord({
+				platform: "macos",
+				buildMachine,
+				candidates: asked,
+				event: "placement_fallback",
+				fallback: {
+					code: failedMachine ? "offload-failed" : "no-remote-mac-took-it",
+					reason,
+					machine: failedMachine
+				}
+			}));
+			if (namedBuildMachine(buildMachine)) throw new OffloadRefusal(buildMachine, reason);
+			requireLocalBuild(buildMachine);
+			offloadFallback = reason;
+			if (record) record.offloadFallback = reason;
+			writer.write({
+				src: "build",
+				platform: "macos",
+				level: "warn",
+				event: "offload_failed",
+				msg: reason
 			});
-			if (placement.offload) {
-				const chosen = await chooseBuildMachine({
-					projectRoot: root,
-					target: recipe.offload.target(),
+			write(`${reason} -> building here`);
+			write(`placement: here (${reason})`);
+		};
+		await promises.mkdir(macosDir(root), { recursive: true });
+		const staging = await promises.mkdtemp(join(macosDir(root), "staging-"));
+		const promote = (path) => {
+			const backup = join(staging, "previous.app");
+			const previous = existsSync(bundle);
+			if (previous) renameSync(bundle, backup);
+			try {
+				renameSync(path, bundle);
+			} catch (error) {
+				if (previous) renameSync(backup, bundle);
+				throw error;
+			}
+		};
+		let choice = null;
+		try {
+			try {
+				const { mode, machines, localEnabled } = buildPlacementCandidates(buildMachine);
+				const here = machineCapacity();
+				const placement = offloadPlacement({
 					mode,
+					localEnabled,
+					machines: machines.length,
 					here,
-					machines,
-					selected: buildMachine,
-					note: (line) => write(`offload: ${line}`),
-					onCandidates: (each) => asked = each
+					unsupported: null,
+					selected: buildMachine
 				});
-				if (typeof chosen === "string") throw new Error(chosen);
-				choice = chosen;
-				failedMachine = chosen.machine;
+				if (placement.offload) {
+					const chosen = await chooseBuildMachine({
+						projectRoot: root,
+						target: await recipe.offload.target(),
+						mode,
+						here,
+						machines,
+						selected: buildMachine,
+						note: (line) => write(`offload: ${line}`),
+						onCandidates: (each) => asked = each
+					});
+					if (typeof chosen === "string") throw new Error(chosen);
+					choice = chosen;
+					failedMachine = chosen.machine;
+					writer.write(buildPlacementRecord({
+						platform: "macos",
+						buildMachine,
+						candidates: asked,
+						chose: {
+							machine: chosen.machine,
+							reason: `${placement.reason}${placementLoad(chosen)}`
+						}
+					}));
+					write(`placement: ${choice.machine} (${placement.reason}${placementLoad(choice)})`);
+					const outcome = await offloadBuild({
+						choice,
+						request: recipe.offload.request(bundleId),
+						stagingDir: join(staging, "offload"),
+						onPhase: (phase, line) => note(remotePhaseText(phase, line, choice.machine)),
+						onEnter: (phase) => {
+							if (record && [
+								"compile",
+								"build",
+								"prebuild",
+								"pods"
+							].includes(phase)) record.builtOn = choice.machine;
+							progress.place({
+								host: choice.machine,
+								phase
+							});
+							progress.step(phase === "fetch" ? "install" : "compile");
+						},
+						onRecord: (entry) => writer.write({
+							...entry,
+							offloadedTo: choice.machine
+						}),
+						note: write
+					});
+					progress.place(null);
+					if (!outcome.ok) throw new Error(`${outcome.machine}: ${outcome.reason}`);
+					progress.step("install");
+					await recipe.validateFetched(outcome.artifactPath, bundleId, displayName);
+					throwIfCancelled(signal, "macOS build");
+					promote(outcome.artifactPath);
+					if (record) {
+						record.offloadedTo = outcome.machine;
+						record.builtOn = outcome.machine;
+					}
+					return {
+						bundleId,
+						offloadedTo: outcome.machine,
+						offloadFallback: null,
+						handoff: outcome.handoff ?? null
+					};
+				}
 				writer.write(buildPlacementRecord({
 					platform: "macos",
 					buildMachine,
-					candidates: asked,
-					chose: {
-						machine: chosen.machine,
-						reason: `${placement.reason}${placementLoad(chosen)}`
+					stays: {
+						code: placement.code,
+						reason: placement.reason
 					}
 				}));
-				write(`placement: ${choice.machine} (${placement.reason}${placementLoad(choice)})`);
-				const outcome = await offloadBuild({
-					choice,
-					request: recipe.offload.request(bundleId),
-					stagingDir: join(staging, "offload"),
-					onPhase: (phase, line) => note(remotePhaseText(phase, line, choice.machine)),
-					onEnter: (phase) => {
-						if (record && [
-							"compile",
-							"build",
-							"prebuild",
-							"pods"
-						].includes(phase)) record.builtOn = choice.machine;
-						progress.place({
-							host: choice.machine,
-							phase
-						});
-						progress.step(phase === "fetch" ? "install" : "compile");
-					},
-					onRecord: (entry) => writer.write({
-						...entry,
-						offloadedTo: choice.machine
-					}),
-					note: write
+				write(`placement: here (${placement.reason})`);
+			} catch (error) {
+				throwIfCancelled(signal, "macOS build");
+				fallBack(error instanceof Error ? error.message : String(error));
+			} finally {
+				if (choice) closeOffload(choice);
+			}
+			let slot;
+			try {
+				slot = await acquireBuildSlot({
+					signal,
+					automatic: buildMachine === "auto",
+					max: getConcurrencyLimits().maxBuilds,
+					root,
+					logFile: writer.file,
+					out: note,
+					waitingFor: (info) => progress.waitingFor(info, "build-slot")
+				});
+				requireLocalBuild(buildMachine);
+				if (record) record.builtOn = "here";
+				progress.step("compile");
+				const bin = await recipe.compile({
+					scratch,
+					writer,
+					note
 				});
-				progress.place(null);
-				if (!outcome.ok) throw new Error(`${outcome.machine}: ${outcome.reason}`);
 				progress.step("install");
-				recipe.validateFetched(outcome.artifactPath, bundleId, displayName);
-				promote(outcome.artifactPath);
-				if (record) {
-					record.offloadedTo = outcome.machine;
-					record.builtOn = outcome.machine;
-				}
+				const staged = join(staging, `${recipe.product}.app`);
+				await recipe.stage(bin, staged, bundleId, displayName);
+				throwIfCancelled(signal, "macOS build");
+				promote(staged);
 				return {
 					bundleId,
-					offloadedTo: outcome.machine,
-					offloadFallback: null,
-					handoff: outcome.handoff ?? null
+					offloadedTo: null,
+					offloadFallback,
+					handoff: null
 				};
+			} finally {
+				releaseBuildSlot(slot);
 			}
-			writer.write(buildPlacementRecord({
-				platform: "macos",
-				buildMachine,
-				stays: {
-					code: placement.code,
-					reason: placement.reason
-				}
-			}));
-			write(`placement: here (${placement.reason})`);
-		} catch (error) {
-			fallBack(error instanceof Error ? error.message : String(error));
-		} finally {
-			if (choice) closeOffload(choice);
-		}
-		let slot;
-		try {
-			slot = await acquireBuildSlot({
-				automatic: buildMachine === "auto",
-				max: getConcurrencyLimits().maxBuilds,
-				root,
-				logFile: writer.file,
-				out: note,
-				waitingFor: (info) => progress.waitingFor(info, "build-slot")
-			});
-			requireLocalBuild(buildMachine);
-			if (record) record.builtOn = "here";
-			progress.step("compile");
-			const bin = await recipe.compile({
-				scratch,
-				writer,
-				note
-			});
-			progress.step("install");
-			const staged = join(staging, `${recipe.product}.app`);
-			recipe.stage(bin, staged, bundleId, displayName);
-			promote(staged);
-			return {
-				bundleId,
-				offloadedTo: null,
-				offloadFallback,
-				handoff: null
-			};
 		} finally {
-			releaseBuildSlot(slot);
+			try {
+				await promises.rm(staging, {
+					recursive: true,
+					force: true
+				});
+			} catch {}
 		}
-	} finally {
-		try {
-			rmSync(staging, {
-				recursive: true,
-				force: true
-			});
-		} catch {}
-	}
+	});
 }
 //#endregion
 //#region src/macos/app-name.ts
@@ -234,19 +243,19 @@ function workspaceAppName(root, product) {
 }
 //#endregion
 //#region src/macos/plan.ts
-function planMacos(root, buildMachineFlag) {
+async function planMacos(context, root, buildMachineFlag) {
 	if (process.platform !== "darwin") throw new Error("stim macos requires a Mac with Swift installed.");
 	root = realpathSync(root);
 	if (!existsSync(join(root, "Package.swift"))) throw new Error("Run stim macos from the directory containing Package.swift.");
-	const { context, settings } = resolveProjectSettings(root);
+	const { context: projectContext, settings } = await resolveProjectSettingsAsync(root);
 	const [shape] = settingShapeErrors(settings);
 	if (shape) throw new Error(`${shape} ${SETTING_SHAPE_REMEDY}`);
 	const selected = resolveBuildPlacement(buildMachineFlag);
 	if (selected.failure) throw Object.assign(new Error(selected.failure.message), selected.failure);
 	const macos = settings.macos;
 	if (!macos?.product || !macos.infoPlist) throw Object.assign(/* @__PURE__ */ new Error("Set macos.product and macos.infoPlist explicitly in .stim.json. See stim guide macos."), { code: "STIM_BAD_ARG" });
-	validateInfoPlist(root, macos.product, macos.infoPlist);
-	resolveBundleExtras(root, context.repoRoot ?? root, macos.resources, macos.assetCatalog);
+	await validateInfoPlist(context, root, macos.product, macos.infoPlist);
+	resolveBundleExtras(root, projectContext.repoRoot ?? root, macos.resources, macos.assetCatalog);
 	return {
 		platform: "macos",
 		product: macos.product,
@@ -268,7 +277,7 @@ function planMacos(root, buildMachineFlag) {
 * Builds the Debug app and launches it here, or with `remote` on that approved remote Mac. A named host never falls
 * back to a local launch.
 */
-async function runMacos(root, note = console.error, remote, buildMachineFlag) {
+async function runMacos(context, root, note = console.error, remote, buildMachineFlag) {
 	const backend = remote?.trim().toLowerCase();
 	if (backend === "eas" || backend === "proxy") throw Object.assign(/* @__PURE__ */ new Error("stim macos --remote takes a remote Mac name from remote.machines; macOS has no eas or proxy backend."), { code: "STIM_BAD_ARG" });
 	if (backend === "auto") throw Object.assign(/* @__PURE__ */ new Error("stim macos --remote auto is not available yet: automatic placement has not shipped. Name a hosting Mac from remote.machines."), { code: "STIM_BAD_ARG" });
@@ -279,15 +288,18 @@ async function runMacos(root, note = console.error, remote, buildMachineFlag) {
 		code: "STIM_NO_PROJECT",
 		remedy: operation.problem.remedy
 	});
-	const { settings } = resolveProjectSettings(root);
+	const { settings } = await resolveProjectSettingsAsync(root, {
+		env: context.env,
+		signal: runCancellationSignal(context) ?? context.signal
+	});
 	const [shape] = settingShapeErrors(settings);
 	if (shape) throw new Error(`${shape} ${SETTING_SHAPE_REMEDY}`);
 	const selected = resolveBuildPlacement(buildMachineFlag);
 	if (selected.failure) throw Object.assign(new Error(selected.failure.message), selected.failure);
 	const buildMachine = selected.selected;
-	const macos = (await operation.load()).prepare(settings);
+	const macos = await (await operation.load()).prepare(context, settings);
 	ensureWorkspaceStorage(root);
-	return withNativeBuildRun(root, {
+	return withNativeBuildRun(context, root, {
 		command: "macos",
 		platform: "macos"
 	}, async (claim) => {
@@ -305,7 +317,7 @@ async function runMacos(root, note = console.error, remote, buildMachineFlag) {
 			if (remote) (await connectHost(remote)).connection.close();
 			if (!previous?.host) await stopMacosAppHeld(root);
 			upsertProject(root, {});
-			recordWorkspaceUse(root);
+			recordWorkspaceUse(root, /* @__PURE__ */ new Date(), context.env, context.cwd);
 			const bundle = join(macosDir(root), `${macos.product}.app`);
 			const record = {
 				product: macos.product,
@@ -325,7 +337,7 @@ async function runMacos(root, note = console.error, remote, buildMachineFlag) {
 					hostLaunched: previous.hostLaunched ?? false
 				} : {}
 			};
-			const handoff = await buildBundle(root, macos, record, remote !== void 0, note, progress);
+			const handoff = await buildBundle(context, root, macos, record, remote !== void 0, note, progress);
 			progress.step("launch");
 			const launched = () => {
 				try {
@@ -335,7 +347,7 @@ async function runMacos(root, note = console.error, remote, buildMachineFlag) {
 				}
 			};
 			if (!remote) {
-				const here = await launchHere(root, record, note);
+				const here = await launchHere(context, root, record, note);
 				launched();
 				return here;
 			}
@@ -386,12 +398,12 @@ async function runMacos(root, note = console.error, remote, buildMachineFlag) {
 			}
 		}, {
 			external: true,
-			declareSpawns: true,
+			declareSpawnsFor: context,
 			ownerPurpose: "build and launch macOS app"
 		}).finally(() => progress.clear());
 	}, { write: note });
 }
-async function buildBundle(root, recipe, record, hosted, note, progress = NO_BUILD_PROGRESS) {
+async function buildBundle(context, root, recipe, record, hosted, note, progress = NO_BUILD_PROGRESS) {
 	const started = Date.parse(record.build.startedAt);
 	const scratch = join(macosDir(root), "build");
 	writeWorkspaceState(root, { macos: record });
@@ -401,6 +413,7 @@ async function buildBundle(root, recipe, record, hosted, note, progress = NO_BUI
 		const bundleId = hosted ? base : `${base}.stim.${createHash("sha256").update(root).digest("hex").slice(0, 12)}`;
 		const displayName = workspaceAppName(root, record.product);
 		const built = await buildMacosBundle({
+			context,
 			root,
 			recipe,
 			bundle: record.bundle,
@@ -486,12 +499,12 @@ async function waitForLaunchServices(record, deadline) {
 	}
 	return "timeout";
 }
-async function launchHere(root, record, note) {
+async function launchHere(context, root, record, note) {
 	await stopBundleInstances(root);
 	const fd = openSync(join(workspaceLogsDir$1(root), "macos-supervisor.log"), "a");
 	let child;
 	try {
-		child = spawnDeclared(() => getExecutor().spawn(process.execPath, [
+		child = spawnDeclared(context, () => getExecutor().spawn(process.execPath, [
 			spawnEntry("macos-run"),
 			root,
 			record.launchId
@@ -504,7 +517,7 @@ async function launchHere(root, record, note) {
 				fd
 			],
 			env: {
-				...process.env,
+				...ambientEnv(),
 				STIM_BACKGROUND_LAUNCH: "1"
 			}
 		}));
@@ -544,12 +557,12 @@ function launchPayload(root, record) {
 }
 function macosCommand(program) {
 	program.command("macos").description("Build and launch an owned Swift Package macOS Debug app.").option("--remote-build <value>", "Build on auto, local, or one named machine; a name refuses without fallback", parseBuildMachineOption).option("--json", "print one launch or plan payload; build output goes to stderr").option("--plan", "validate the next SwiftPM Debug build without building or launching").option("--remote <machine>", "run it on this approved remote Mac from remote.machines").action(async (options) => {
-		const root = findProjectRoot(process.cwd());
+		const root = findProjectRoot$1(process.cwd());
 		if (options.plan) {
 			try {
 				if (!root) throw new Error("Run stim macos from the Swift Package directory.");
 				if (options.remote !== void 0) throw Object.assign(/* @__PURE__ */ new Error("--remote selects a launch host and does not apply to --plan."), { code: "STIM_BAD_ARG" });
-				const plan = planMacos(root, options.remoteBuild);
+				const plan = await planMacos(processContext(root, new AbortController().signal), root, options.remoteBuild);
 				if (options.json) console.log(JSON.stringify(plan));
 				else {
 					console.log(phaseLine("plan", `macos ${plan.product}: SwiftPM Debug build, then stage and launch`));
@@ -569,7 +582,7 @@ function macosCommand(program) {
 			return;
 		}
 		if (!root) throw new Error("Run stim macos from the Swift Package directory.");
-		const record = await runMacos(root, console.error, options.remote, options.remoteBuild).catch((error) => {
+		const { value: record } = await runProcessOperation(root, (context) => runMacos(context, root, console.error, options.remote, options.remoteBuild)).catch((error) => {
 			const remedy = error.remedy;
 			if (typeof remedy === "string") console.error(`remedy: ${remedy}`);
 			throw error;

package/dist/macos-run.mjs

@@ -1,2 +1,2 @@
-import { n as runMacosSupervisor, t as logLines } from "./run-BtPgpKks.mjs";
+import { n as runMacosSupervisor, t as logLines } from "./run-D23HmJMs.mjs";
 export { logLines, runMacosSupervisor };