stim 1.18.0 → 1.20.0

package/dist/{launch-verify-hskNcWkZ.mjs → launch-verify-BzRdbuO1.mjs}

@@ -1,8 +1,8 @@
-import { t as getExecutor } from "./exec-DWhCZDGm.mjs";
-import { s as isAppLaunchError } from "./command-output-CBtzyIgF.mjs";
-import { o as readNdjsonGenerations } from "./ndjson-LGZAMsqa.mjs";
-import { f as deviceShellArg, n as ANDROID_DISABLE_AUTO_LAUNCH_EXTRA, s as androidAppProcess } from "./app-install-D-PUENug.mjs";
-import { t as DEV_MENU_LAUNCH_ARGS } from "./ios-device-Bn7jWDB1.mjs";
+import { t as getExecutor } from "./exec-B81Qodjn.mjs";
+import { s as isAppLaunchError } from "./command-output-BjPN99ZB.mjs";
+import { s as readNdjsonGenerations } from "./ndjson-GOnbyvso.mjs";
+import { t as DEV_MENU_LAUNCH_ARGS } from "./ios-device-B1B14xND.mjs";
+import { f as deviceShellArg, n as ANDROID_DISABLE_AUTO_LAUNCH_EXTRA, s as androidAppProcess } from "./app-install-0LgaQRT7.mjs";
 import { join } from "node:path";
 //#region src/engine/app-readiness.ts
 const APP_READINESS_TIMEOUT_MS = 3e4;
@@ -121,7 +121,7 @@ function nativeLaunchFailure({ readCrashes, since, platform, processAlive, mode,
 		waitedMs
 	} : null;
 }
-async function verifyLaunch({ slot, appPid, platformShared, logsDir, since, metroPort = null, platform = null, mode = null, requireBundleResponse, timeoutMs = VERIFY_TIMEOUT_MS, stabilityMs = STABILITY_WINDOW_MS, pollMs = VERIFY_POLL_MS, readRecords = null, readDeviceRecords = null, readClientRecords = null, readNativeCrashes = null, processAlive = null, onReadinessPending = null, now = Date.now, sleep = (ms) => new Promise((r) => setTimeout(r, ms)) } = {}) {
+async function verifyLaunch({ slot, appPid, platformShared, logsDir, since, metroPort = null, platform = null, mode = null, requireBundleResponse, timeoutMs = VERIFY_TIMEOUT_MS, stabilityMs = STABILITY_WINDOW_MS, pollMs = VERIFY_POLL_MS, readRecords = null, readDeviceRecords = null, readClientRecords = null, readNativeCrashes = null, processAlive = null, onReadinessPending = null, onActivity, now = Date.now, sleep = (ms) => new Promise((r) => setTimeout(r, ms)) } = {}) {
 	const delivered = (record) => deliveryOwner(record, {
 		slot,
 		appPid,
@@ -140,6 +140,13 @@ async function verifyLaunch({ slot, appPid, platformShared, logsDir, since, metr
 	let runtimeLoadingAt = null;
 	let runtimeStartedAt = null;
 	let nextCrashCheck = startedAt + 1e3;
+	let bundlingAt = null;
+	let reported = null;
+	const report = (name, at) => {
+		if (name === reported) return;
+		reported = name;
+		onActivity?.(name, at);
+	};
 	while (true) {
 		const metroRecords = read().filter((record) => after(record, since));
 		const bundleRecords = metroRecords.filter((record) => (!requireBundleResponse || String(record.event).startsWith("bundle_response_")) && delivered(record));
@@ -161,6 +168,7 @@ async function verifyLaunch({ slot, appPid, platformShared, logsDir, since, metr
 			const request = bundleRecords.find((record) => record.event === "bundle_response_started" && typeof record.requestId === "string" && isBundleProof(record, since, platform));
 			if (request) {
 				deliveryId = request.requestId;
+				bundlingAt = request;
 				proof = null;
 				stabilityDeadline = null;
 			}
@@ -193,6 +201,7 @@ async function verifyLaunch({ slot, appPid, platformShared, logsDir, since, metr
 				onReadinessPending?.();
 			}
 		}
+		report(...launchActivity(pendingAt, proof, bundlingAt));
 		const ready = pendingAt !== null && signals.some((record) => Number(record.ts) >= pendingAt && Number(record.ts) <= readinessDeadline && appReadinessSignal(record, platform) === "ready");
 		const bundleErrors = bundleRecords.filter((record) => isFatalLaunchError(record, platform) || deliveryId !== null && record.event === "bundle_response_failed" && record.requestId === deliveryId && isBundleProof(record, since, platform));
 		if (bundleErrors.length) {
@@ -257,6 +266,11 @@ async function verifyLaunch({ slot, appPid, platformShared, logsDir, since, metr
 		await sleep(Math.min(pollMs, Math.max(0, (runtimeWaiting ? bundleDeadline : proof && pendingAt !== null ? readinessDeadline : stabilityDeadline ?? bundleDeadline) - now())));
 	}
 }
+function launchActivity(pendingAt, proof, bundling) {
+	if (pendingAt !== null) return ["waiting-ready", pendingAt];
+	if (proof) return [null, Number(proof.ts)];
+	return bundling ? ["bundling", Number(bundling.ts)] : [null, 0];
+}
 function deliveryOwner(record, { slot, appPid, platformShared }) {
 	if (slot === void 0) return "this";
 	if (typeof record.clientPid === "number" && appPid) return record.clientPid === appPid ? "this" : "other";
@@ -306,7 +320,12 @@ function isIosConnectionRefusal(record, platform) {
 }
 function isFatalLaunchError(record, platform) {
 	if (platform && recordPlatform(record) !== platform) return false;
-	return record.event === "bundle_build_failed" || record.event === "bundling_error" || record.event === "transformer_error" || (record.event === "expo_stdout" || record.event === "expo_stderr") && typeof record.msg === "string" && /\bBundling failed\b/.test(record.msg);
+	return record.event === "bundle_build_failed" || record.event === "bundling_error" || record.event === "transformer_error" || [
+		"expo_stdout",
+		"expo_stderr",
+		"command_stdout",
+		"command_stderr"
+	].includes(String(record.event)) && typeof record.msg === "string" && /\bBundling failed\b/.test(record.msg);
 }
 function isBundleReadyProof(record, since = 0, platform = null) {
 	if (!isBundleProof(record, since, platform)) return false;

package/dist/{logs-1Ylc1Ri6.mjs → logs-DHaRNfg7.mjs}

@@ -1,15 +1,15 @@
 import { t as process_identity_exports } from "./process-identity-Biv3arCO.mjs";
-import { f as refuseNoProject, l as phaseLine, v as launchErrorPreview } from "./command-output-CBtzyIgF.mjs";
-import { H as projectDeviceSlots, V as parseDeviceSlotOption, _ as loadConfig$1, g as isPathPrefix } from "./config-CgYMahz7.mjs";
-import { o as findCommandWorkspace } from "./project-C3ChRLZy.mjs";
-import { r as readWorkspaceState$1, x as workspaceLogsDir$1 } from "./workspace-state-C59dqG-Z.mjs";
-import { n as agentDeviceLiveness, u as readAgentDeviceRecords } from "./activity-BxnkDZDi.mjs";
-import { n as SOURCES, t as LEVELS } from "./ndjson-LGZAMsqa.mjs";
-import { o as connectHost } from "./hosted-client-C-rMtppF.mjs";
-import { n as pullHostedNativeLogs, t as pullHostedMacosLogs } from "./hosted-logs-DN8Iz4mJ.mjs";
-import { n as readHostedIos, t as readHostedAndroid } from "./ios-state-B2pES6Vs.mjs";
-import { i as captureWorkspaceCrashes, t as errorDiagnostics } from "./error-diagnostics-BRXOqDzG.mjs";
-import "./hosted-macos-B-wEjlwG.mjs";
+import { H as projectDeviceSlots, V as parseDeviceSlotOption, _ as loadConfig$1, g as isPathPrefix } from "./config-D0LhTY3S.mjs";
+import { r as readWorkspaceState$1, w as workspaceLogsDir$1 } from "./workspace-state-CSIFuuDa.mjs";
+import { f as refuseNoProject, l as phaseLine, v as launchErrorPreview } from "./command-output-BjPN99ZB.mjs";
+import { n as findCommandWorkspace } from "./project-B8_duAzW.mjs";
+import { n as SOURCES, t as LEVELS } from "./ndjson-GOnbyvso.mjs";
+import { n as agentDeviceLiveness, u as readAgentDeviceRecords } from "./activity-BrGh9EAI.mjs";
+import { s as connectHost } from "./hosted-client-Io01s5By.mjs";
+import { n as pullHostedNativeLogs, t as pullHostedMacosLogs } from "./hosted-logs-DP-ABU_M.mjs";
+import { n as readHostedIos, t as readHostedAndroid } from "./ios-state-CjrL2qv-.mjs";
+import { i as captureWorkspaceCrashes, t as errorDiagnostics } from "./error-diagnostics-Du7I_GuY.mjs";
+import "./hosted-macos-Aziw9T_9.mjs";
 import { t as watchStdoutReader } from "./stdout-reader-C8yjre1x.mjs";
 import { realpathSync } from "node:fs";
 import { dirname, join, relative, resolve, sep } from "node:path";

package/dist/macos-C0iljhsN.mjs

@@ -0,0 +1,2 @@
+import { n as runMacos, t as macosCommand } from "./macos-V_3Ui7g4.mjs";
+export { macosCommand as default, runMacos };

package/dist/{macos-DF6C7wUU.mjs → macos-V_3Ui7g4.mjs}

@@ -1,93 +1,37 @@
 import { t as process_identity_exports } from "./process-identity-Biv3arCO.mjs";
-import { t as getExecutor } from "./exec-DWhCZDGm.mjs";
+import { t as getExecutor } from "./exec-B81Qodjn.mjs";
 import { t as spawnEntry } from "./spawn-entry-Dcb7sDUz.mjs";
-import { l as phaseLine } from "./command-output-CBtzyIgF.mjs";
-import { E as upsertProject, u as getConcurrencyLimits } from "./config-CgYMahz7.mjs";
-import { s as gitCommonDir, y as repoRoot } from "./worktree-CsKYexJM.mjs";
-import { s as findProjectRoot$1, u as ownedDeviceLabel } from "./project-C3ChRLZy.mjs";
-import { c as writeWorkspaceState, g as workspaceAgentDeviceDir, i as recordWorkspaceUse, u as ensureWorkspaceStorage, v as workspaceDir, x as workspaceLogsDir$1 } from "./workspace-state-C59dqG-Z.mjs";
-import { F as recordFinishedBuild, I as startBuildProgress, L as tapBuildLog, O as NO_BUILD_PROGRESS, P as recordBuildPhase } from "./budget-DIhL2BKx.mjs";
-import { N as releaseBuildSlot, j as acquireBuildSlot } from "./workspaces-xXItD8Dj.mjs";
+import { E as upsertProject, u as getConcurrencyLimits } from "./config-D0LhTY3S.mjs";
+import { K as resolveProjectSettings, Q as settingShapeErrors, a as SETTING_SHAPE_REMEDY } from "./settings-Bbztm4oV.mjs";
+import { c as writeWorkspaceState, i as recordWorkspaceUse, p as ensureWorkspaceStorage, w as workspaceLogsDir$1, x as workspaceDir, y as workspaceAgentDeviceDir } from "./workspace-state-CSIFuuDa.mjs";
+import { l as phaseLine } from "./command-output-BjPN99ZB.mjs";
+import { d as projectRegistry, o as ownedDeviceLabel, r as findProjectRoot } from "./project-B8_duAzW.mjs";
 import { a as spawnDeclared } from "./spawn-claims-Kqiifsk2.mjs";
-import { E as sanitizeDeviceLabel } from "./ios-B3SbOWdw.mjs";
-import { F as resolveSettings, i as SETTING_SHAPE_REMEDY, z as settingShapeErrors } from "./settings-CQyMElEP.mjs";
-import { a as withWorkspaceProcessLock } from "./named-ports-BFIz1Shz.mjs";
-import { a as requiredMacosRecord, n as macosLogFile, r as macosProcess, t as macosDir } from "./state-xnqpx3AD.mjs";
-import { r as createNdjsonWriter } from "./ndjson-LGZAMsqa.mjs";
-import { _ as resolveBuildPlacement, a as offloadBuild, c as placementLoad, d as setRemoteLogSink, f as OffloadRefusal, h as parseBuildMachineOption, i as closeOffload, l as remotePhaseText, m as namedBuildMachine, n as buildPlacementCandidates, r as chooseBuildMachine, s as offloadPlacement } from "./client-DzhapoMB.mjs";
-import { i as macosToolchain } from "./toolchain-Bnyd_K3A.mjs";
-import { o as connectHost } from "./hosted-client-C-rMtppF.mjs";
-import { t as buildPlacementRecord } from "./placement-log-BcPhRwR4.mjs";
-import { f as withNativeBuildRun } from "./native-run-B06FkmZx.mjs";
-import { t as placeHostedMacos } from "./hosted-macos-B-wEjlwG.mjs";
-import { t as logLines } from "./run-vhtDgpHO.mjs";
-import { i as validateInfoPlist, n as setBundleName, r as stageBundle, t as resolveBundleExtras } from "./stage-g_WqWeaE.mjs";
-import { n as stopMacosAppHeld } from "./stop-BGhKMOuH.mjs";
+import { F as acquireBuildSlot, L as releaseBuildSlot } from "./workspaces-D2xSHBDY.mjs";
+import { Dt as recordFinishedBuild, Et as recordBuildPhase, Ot as startBuildProgress, kt as tapBuildLog, yt as NO_BUILD_PROGRESS } from "./budget-BONq9vXY.mjs";
+import { a as withWorkspaceProcessLock } from "./named-ports-C2lvoPsb.mjs";
+import { S as withNativeBuildRun } from "./tailnet-CoJUb2tB.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-BLy1Pw2V.mjs";
+import { D as sanitizeDeviceLabel } from "./ios-CXLIUxXJ.mjs";
+import { i as macosProcess, n as macosDir, o as requiredMacosRecord, r as macosLogFile } from "./state-Boo0IMJq.mjs";
+import { t as buildPlacementRecord } from "./placement-log-reFbjqEr.mjs";
+import { s as connectHost } from "./hosted-client-Io01s5By.mjs";
+import { t as placeHostedMacos } from "./hosted-macos-Aziw9T_9.mjs";
+import { i as validateInfoPlist, t as resolveBundleExtras } from "./stage-BNKKdDNc.mjs";
+import { r as stopMacosAppHeld, t as stopBundleInstances } from "./stop-WQPQHLuy.mjs";
 import { closeSync, existsSync, mkdirSync, mkdtempSync, openSync, realpathSync, renameSync, rmSync } from "node:fs";
-import { join, relative, resolve } from "node:path";
+import { join } from "node:path";
 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/app-name.ts
-const DOT = String.fromCodePoint(183);
-const ELLIPSIS = String.fromCodePoint(8230);
-const LABEL_MAX = 24;
-const PRODUCT_MAX = 40;
-function clip(text, max) {
-	const chars = [...text];
-	return chars.length <= max ? text : `${chars.slice(0, max - 1).join("")}${ELLIPSIS}`;
-}
-/** The visible app name for a run: `<product> <dot> <label>`, or just the product when the label is empty. */
-function macosAppName(product, label) {
-	const name = clip(product.replace(/[\p{Cc}/:\\]+/gu, " ").trim(), PRODUCT_MAX) || "App";
-	const suffix = clip(sanitizeDeviceLabel(label), LABEL_MAX);
-	return suffix ? `${name} ${DOT} ${suffix}` : name;
-}
-function workspaceAppName(root, product) {
-	return macosAppName(product, ownedDeviceLabel(root));
-}
-//#endregion
 //#region src/macos/build.ts
-async function tool(root, args, writer, note, capture = false) {
-	const child = spawnDeclared(() => getExecutor().spawn("swift", args, {
-		cwd: root,
-		detached: true,
-		stdio: [
-			"ignore",
-			"pipe",
-			"pipe"
-		]
-	}));
-	let stdout = "";
-	child.stdout?.on("data", (chunk) => {
-		if (capture) stdout += chunk.toString("utf8");
-	});
-	const write = (msg) => {
-		writer.write({
-			src: "build",
-			platform: "macos",
-			level: "debug",
-			msg
-		});
-		note(msg);
-	};
-	if (child.stdout) logLines(child.stdout, write);
-	if (child.stderr) logLines(child.stderr, write);
-	await new Promise((done, reject) => {
-		child.once("error", reject);
-		child.once("close", (code) => code === 0 ? done() : reject(/* @__PURE__ */ new Error(`swift ${args[0]} failed (${code}). See stim logs --source build.`)));
-	});
-	return stdout.trim();
-}
-async function buildMacosBundle({ root, product, infoPlist, bundle, bundleId, displayName, scratch, writer, note, record, buildMachine, resources, assetCatalog, progress = NO_BUILD_PROGRESS }) {
+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"
 	}));
-	validateInfoPlist(root, product, infoPlist);
-	const repository = realpathSync(repoRoot(root) ?? root);
-	const extras = resolveBundleExtras(root, repository, resources, assetCatalog);
 	const write = (msg) => {
 		writer.write({
 			src: "build",
@@ -113,6 +57,7 @@ async function buildMacosBundle({ root, product, infoPlist, bundle, bundleId, di
 			}
 		}));
 		if (namedBuildMachine(buildMachine)) throw new OffloadRefusal(buildMachine, reason);
+		requireLocalBuild(buildMachine);
 		offloadFallback = reason;
 		if (record) record.offloadFallback = reason;
 		writer.write({
@@ -141,10 +86,11 @@ async function buildMacosBundle({ root, product, infoPlist, bundle, bundleId, di
 	let choice = null;
 	try {
 		try {
-			const { mode, machines } = buildPlacementCandidates(buildMachine);
+			const { mode, machines, localEnabled } = buildPlacementCandidates(buildMachine);
 			const here = machineCapacity();
 			const placement = offloadPlacement({
 				mode,
+				localEnabled,
 				machines: machines.length,
 				here,
 				unsupported: null,
@@ -153,10 +99,7 @@ async function buildMacosBundle({ root, product, infoPlist, bundle, bundleId, di
 			if (placement.offload) {
 				const chosen = await chooseBuildMachine({
 					projectRoot: root,
-					target: {
-						platform: "macos",
-						local: macosToolchain()
-					},
+					target: recipe.offload.target(),
 					mode,
 					here,
 					machines,
@@ -179,14 +122,7 @@ async function buildMacosBundle({ root, product, infoPlist, bundle, bundleId, di
 				write(`placement: ${choice.machine} (${placement.reason}${placementLoad(choice)})`);
 				const outcome = await offloadBuild({
 					choice,
-					request: {
-						platform: "macos",
-						product,
-						infoPlist: relative(root, resolve(root, infoPlist)),
-						bundleId,
-						resources: Object.fromEntries(Object.entries(extras.resources).map(([destination, source]) => [destination, relative(repository, source)])),
-						assetCatalog: extras.assetCatalog ? relative(repository, extras.assetCatalog) : null
-					},
+					request: recipe.offload.request(bundleId),
 					stagingDir: join(staging, "offload"),
 					onPhase: (phase, line) => note(remotePhaseText(phase, line, choice.machine)),
 					onEnter: (phase) => {
@@ -211,30 +147,7 @@ async function buildMacosBundle({ root, product, infoPlist, bundle, bundleId, di
 				progress.place(null);
 				if (!outcome.ok) throw new Error(`${outcome.machine}: ${outcome.reason}`);
 				progress.step("install");
-				const executable = join(outcome.artifactPath, "Contents", "MacOS", product);
-				const plist = JSON.parse(getExecutor().runFile("plutil", [
-					"-convert",
-					"json",
-					"-o",
-					"-",
-					join(outcome.artifactPath, "Contents", "Info.plist")
-				]));
-				if (plist.CFBundleIdentifier !== bundleId || plist.CFBundleExecutable !== product || !existsSync(executable)) throw new Error("The fetched macOS bundle does not match the requested identity and executable.");
-				for (const destination of [...Object.keys(extras.resources), ...extras.assetCatalog ? ["Assets.car"] : []]) if (!existsSync(join(outcome.artifactPath, "Contents", "Resources", destination))) throw new Error(`The fetched macOS bundle lacks declared resource ${destination}.`);
-				if (displayName !== void 0) {
-					setBundleName(join(outcome.artifactPath, "Contents", "Info.plist"), displayName);
-					getExecutor().runFile("codesign", [
-						"--force",
-						"--sign",
-						"-",
-						outcome.artifactPath
-					]);
-				}
-				getExecutor().runFile("codesign", [
-					"--verify",
-					"--strict",
-					outcome.artifactPath
-				]);
+				recipe.validateFetched(outcome.artifactPath, bundleId, displayName);
 				promote(outcome.artifactPath);
 				if (record) {
 					record.offloadedTo = outcome.machine;
@@ -264,36 +177,24 @@ async function buildMacosBundle({ root, product, infoPlist, bundle, bundleId, di
 		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");
-			await tool(root, [
-				"build",
-				"-c",
-				"debug",
-				"--product",
-				product,
-				"--scratch-path",
+			const bin = await recipe.compile({
 				scratch,
-				"--jobs",
-				"2"
-			], writer, note);
-			const bin = await tool(root, [
-				"build",
-				"-c",
-				"debug",
-				"--scratch-path",
-				scratch,
-				"--show-bin-path"
-			], writer, () => {}, true);
+				writer,
+				note
+			});
 			progress.step("install");
-			const staged = join(staging, `${product}.app`);
-			stageBundle(root, product, infoPlist, bin, staged, bundleId, extras, displayName);
+			const staged = join(staging, `${recipe.product}.app`);
+			recipe.stage(bin, staged, bundleId, displayName);
 			promote(staged);
 			return {
 				bundleId,
@@ -314,6 +215,55 @@ async function buildMacosBundle({ root, product, infoPlist, bundle, bundleId, di
 	}
 }
 //#endregion
+//#region src/macos/app-name.ts
+const DOT = String.fromCodePoint(183);
+const ELLIPSIS = String.fromCodePoint(8230);
+const LABEL_MAX = 24;
+const PRODUCT_MAX = 40;
+function clip(text, max) {
+	const chars = [...text];
+	return chars.length <= max ? text : `${chars.slice(0, max - 1).join("")}${ELLIPSIS}`;
+}
+/** The visible app name for a run: `<product> <dot> <label>`, or just the product when the label is empty. */
+function macosAppName(product, label) {
+	const name = clip(product.replace(/[\p{Cc}/:\\]+/gu, " ").trim(), PRODUCT_MAX) || "App";
+	const suffix = clip(sanitizeDeviceLabel(label), LABEL_MAX);
+	return suffix ? `${name} ${DOT} ${suffix}` : name;
+}
+function workspaceAppName(root, product) {
+	return macosAppName(product, ownedDeviceLabel(root));
+}
+//#endregion
+//#region src/macos/plan.ts
+function planMacos(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 [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);
+	return {
+		platform: "macos",
+		product: macos.product,
+		buildMachine: selected.selected,
+		fingerprint: null,
+		cacheKey: null,
+		cacheHit: false,
+		provider: null,
+		cacheSkipped: false,
+		prebuild: null,
+		outcome: null,
+		expectedMs: null,
+		basis: 0
+	};
+}
+//#endregion
 //#region src/commands/macos.ts
 /**
 * Builds the Debug app and launches it here, or with `remote` on that approved remote Mac. A named host never falls
@@ -325,19 +275,18 @@ async function runMacos(root, note = console.error, remote, buildMachineFlag) {
 	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" });
 	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 settings = resolveSettings({
-		projectPath: root,
-		gitCommonDir: gitCommonDir(root),
-		repoRoot: repoRoot(root)
+	const operation = projectRegistry.selectMacos(root);
+	if ("problem" in operation) throw Object.assign(new Error(operation.problem.message), {
+		code: "STIM_NO_PROJECT",
+		remedy: operation.problem.remedy
 	});
+	const { settings } = resolveProjectSettings(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 buildMachine = selected.selected;
-	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" });
+	const macos = (await operation.load()).prepare(settings);
 	ensureWorkspaceStorage(root);
 	return withNativeBuildRun(root, {
 		command: "macos",
@@ -353,7 +302,7 @@ async function runMacos(root, note = console.error, remote, buildMachineFlag) {
 		return withWorkspaceProcessLock(workspaceDir(root), "macos-launch", async () => {
 			const previous = requiredMacosRecord(root);
 			if (previous?.host && previous.host.machine !== remote) throw new Error(`This workspace's macOS app runs on ${previous.host.machine}. Run stim stop first, then stim macos${remote ? ` --remote ${remote}` : ""}.`);
-			if (remote && !validHostedAppArguments(macos.arguments ?? [])) throw new Error("macos.arguments is too large for a hosted app: at most 32 arguments of 1024 characters (8192 in total), without NUL or line breaks.");
+			if (remote && !validHostedAppArguments(macos.arguments)) throw new Error("macos.arguments is too large for a hosted app: at most 32 arguments of 1024 characters (8192 in total), without NUL or line breaks.");
 			if (remote) (await connectHost(remote)).connection.close();
 			if (!previous?.host) await stopMacosAppHeld(root);
 			upsertProject(root, {});
@@ -365,7 +314,7 @@ async function runMacos(root, note = console.error, remote, buildMachineFlag) {
 				bundleId: "",
 				executable: join(bundle, "Contents", "MacOS", macos.product),
 				launchId: randomUUID(),
-				arguments: macos.arguments ?? [],
+				arguments: macos.arguments,
 				supervisor: macosProcess(process.pid),
 				build: {
 					state: "running",
@@ -377,7 +326,7 @@ async function runMacos(root, note = console.error, remote, buildMachineFlag) {
 					hostLaunched: previous.hostLaunched ?? false
 				} : {}
 			};
-			const handoff = await buildBundle(root, macos.infoPlist, record, remote !== void 0, note, macos, progress);
+			const handoff = await buildBundle(root, macos, record, remote !== void 0, note, progress);
 			progress.step("launch");
 			const launched = () => {
 				try {
@@ -403,7 +352,7 @@ async function runMacos(root, note = console.error, remote, buildMachineFlag) {
 					bundle: record.bundle,
 					bundleId: record.bundleId,
 					handoff,
-					arguments: macos.arguments ?? [],
+					arguments: macos.arguments,
 					recorded: previous?.host,
 					reserved: (reserved) => {
 						placement = reserved;
@@ -443,19 +392,18 @@ async function runMacos(root, note = console.error, remote, buildMachineFlag) {
 		}).finally(() => progress.clear());
 	}, { write: note });
 }
-async function buildBundle(root, infoPlist, record, hosted, note, extras, progress = NO_BUILD_PROGRESS) {
+async function buildBundle(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 });
 	const writer = tapBuildLog(createNdjsonWriter(macosLogFile(root), { maxBytes: LOG_ROTATE_BYTES }), progress);
 	try {
-		const { bundleId: base } = validateInfoPlist(root, record.product, infoPlist);
+		const base = recipe.bundleId;
 		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({
 			root,
-			product: record.product,
-			infoPlist,
+			recipe,
 			bundle: record.bundle,
 			bundleId,
 			displayName,
@@ -464,9 +412,7 @@ async function buildBundle(root, infoPlist, record, hosted, note, extras, progre
 			note,
 			progress,
 			record: record.build,
-			buildMachine: record.build.buildMachine,
-			resources: extras.resources,
-			assetCatalog: extras.assetCatalog
+			buildMachine: record.build.buildMachine
 		});
 		record.bundleId = built.bundleId;
 		record.displayName = displayName;
@@ -528,6 +474,7 @@ function recordMacosBuild(root, build, compileSteps) {
 	});
 }
 async function launchHere(root, record) {
+	await stopBundleInstances(root);
 	const fd = openSync(join(workspaceLogsDir$1(root), "macos-supervisor.log"), "a");
 	let child;
 	try {
@@ -580,8 +527,31 @@ 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 payload; build output goes to stderr").option("--remote <machine>", "run it on this approved remote Mac from remote.machines").action(async (options) => {
-		const root = findProjectRoot$1(process.cwd());
+	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());
+		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);
+				if (options.json) console.log(JSON.stringify(plan));
+				else {
+					console.log(phaseLine("plan", `macos ${plan.product}: SwiftPM Debug build, then stage and launch`));
+					console.log(phaseLine("build", `selection: ${plan.buildMachine}; worker availability is not checked`));
+					console.log(phaseLine("expect", "unknown: SwiftPM determines incremental work when the build runs"));
+				}
+			} catch (error) {
+				const failure = {
+					code: error.code ?? "STIM_BAD_ARG",
+					message: error instanceof Error ? error.message : String(error),
+					remedy: error.remedy ?? "Check the macOS project settings in stim guide macos."
+				};
+				console.error(failure.message);
+				if (options.json) console.log(JSON.stringify(failure));
+				process.exitCode = 1;
+			}
+			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 remedy = error.remedy;
@@ -595,4 +565,4 @@ function macosCommand(program) {
 	});
 }
 //#endregion
-export { runMacos as n, macosCommand as t };
+export { runMacos as n, buildMacosBundle as r, macosCommand as t };

package/dist/macos-run.mjs

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

package/dist/maintenance-run.mjs

@@ -1,13 +1,13 @@
-import { M as isOnMountedVolume, N as listMountedVolumes, _ as loadConfig$1, j as formatBytes } from "./config-CgYMahz7.mjs";
-import { a as unregister, n as readManifest } from "./cache-manifest-BI7ozfmH.mjs";
-import { Qt as pruneCache, Zt as discoverCaches, l as resolveBudget, pt as planCacheEmptying, r as cacheLabel, st as emptyCaches } from "./budget-DIhL2BKx.mjs";
-import { F as takeGcResults, I as canonicalPath, a as collectWorkspaceOutputs, i as collectOrphanedWorkspaces, o as deleteOrphanedWorkspaces, r as clearWorkspaceOutputs } from "./workspaces-xXItD8Dj.mjs";
-import { D as projectMaintenancePinned } from "./settings-CQyMElEP.mjs";
-import { r as createNdjsonWriter } from "./ndjson-LGZAMsqa.mjs";
-import { t as relaunchWithLogFile } from "./detached-entry-BLfcgc4O.mjs";
+import { M as isOnMountedVolume, N as listMountedVolumes, _ as loadConfig$1, j as formatBytes } from "./config-D0LhTY3S.mjs";
+import { a as unregister, n as readManifest } from "./cache-manifest-qA3dT2x2.mjs";
+import { T as canonicalPath, a as collectWorkspaceOutputs, i as collectOrphanedWorkspaces, o as deleteOrphanedWorkspaces, r as clearWorkspaceOutputs, w as takeGcResults } from "./workspaces-D2xSHBDY.mjs";
+import { N as emptyCaches, at as discoverCaches, l as resolveBudget, ot as pruneCache, r as cacheLabel, z as planCacheEmptying } from "./budget-BONq9vXY.mjs";
+import { r as createNdjsonWriter } from "./ndjson-GOnbyvso.mjs";
+import { t as relaunchWithLogFile } from "./detached-entry-BXq4fIl-.mjs";
+import { F as memoryCulpritAdvice, N as memoryCulpritsUnder } from "./ios-CXLIUxXJ.mjs";
 import { t as resolveMaintenanceSettings } from "./settings-Djl-mpjX.mjs";
 import { r as due, t as capChildLog } from "./attempt-DW-mQqM7.mjs";
-import { a as recentUse, d as measureDisk, f as measurePressure, i as cacheEntryProtection, m as sizeScanDeferred, p as measureSizes, r as triggeringRoot, s as removeWorktrees, t as plannedMaintenance, u as cacheBlocked } from "./preview-D5V07Nrl.mjs";
+import { a as maintenancePinned, c as removeWorktrees, d as cacheBlocked, f as measureDisk, h as sizeScanDeferred, i as cacheEntryProtection, m as measureSizes, o as recentUse, p as measurePressure, r as triggeringRoot, t as plannedMaintenance } from "./preview-BaBJ72Al.mjs";
 import { appendFileSync, existsSync, mkdirSync, renameSync, statSync, unlinkSync, writeFileSync } from "node:fs";
 import { basename, join, resolve, sep } from "node:path";
 import { MAINTENANCE_LOG_NAME, maintenanceChildLogFile, maintenanceDir, maintenanceNdjsonFile, maintenanceRunClaims, maintenanceStateFile, readMaintenanceState, sharedCompilationCache, workspaceLogsDir } from "@stim-cli/core/state";
@@ -123,7 +123,7 @@ async function clearOutputs(action, context) {
 	const root = action.workspace;
 	if (!root) return kept("the action names no workspace");
 	if (root === context.protectedRoot) return kept("the command that started this pass runs in it");
-	if (projectMaintenancePinned(root)) return kept("pinned by maintenance.keep");
+	if (maintenancePinned(root)) return kept("pinned by maintenance.keep");
 	const recent = recentUse(root, context.settings);
 	if (recent) return kept(recent);
 	const olderThan = action.olderThanDays ?? null;
@@ -150,7 +150,7 @@ async function removeWorktree(action, context) {
 	if (!sweep || !worktree) return kept("it is not in this pass's worktree check");
 	const path = canonicalPath(worktree.path);
 	if (context.protectedRoot === path || context.protectedRoot.startsWith(`${path}${sep}`)) return kept("the command that started this pass runs inside it");
-	if (worktree.keys.some(projectMaintenancePinned)) return kept("pinned by maintenance.keep");
+	if (worktree.keys.some(maintenancePinned)) return kept("pinned by maintenance.keep");
 	const { results } = await quietly(() => removeWorktrees({
 		...sweep,
 		worktrees: [worktree]
@@ -343,6 +343,8 @@ async function runMaintenance(trigger) {
 				if (check === "worktree" || check === "sweep") continue;
 				if (check === "pressure") {
 					state.pressure = measurePressure(settings, state.pressure, state.lastAt[check]);
+					const culprits = settings.memoryPressureLevel === "off" ? null : memoryCulpritsUnder(state.pressure.memory.level);
+					if (culprits) state.pressure.memory.culprits = culprits;
 					const floor = Math.max(budget.minFreeDiskMb, budget.hardFloorDiskMb);
 					for (const disk of state.pressure.disk) record("maintenance_check", "debug", `Disk free on ${disk.volume}: ${(disk.freeMb / 1024).toFixed(1)}G`, { check: {
 						kind: "disk-free",
@@ -356,6 +358,7 @@ async function runMaintenance(trigger) {
 						threshold: state.pressure.memory.availableBytes === null ? settings.memoryPressureLevel : settings.minAvailableMemoryGb ?? "10% of RAM",
 						unit: state.pressure.memory.availableBytes === null ? "level" : "GiB"
 					} });
+					for (const culprit of state.pressure.memory.culprits ?? []) record("maintenance_check", "info", memoryCulpritAdvice([culprit]), { culprit });
 				} else {
 					measuredSizes = true;
 					state.sizes = measureSizes(state.lastAt[check], (target, workspace) => {