stim 1.26.0 → 1.28.0

package/dist/{logs-s1dRIG1E.mjs → logs-BGsW7iPe.mjs}

@@ -1,18 +1,19 @@
-import { k as workspaceLogsDir$1, r as readWorkspaceState$1 } from "./workspace-state-pUg3_RRA.mjs";
-import { W as parseDeviceSlotOption, _ as loadConfig$1, g as isPathPrefix } from "./config-BktkY_zC.mjs";
-import { f as refuseNoProject, v as launchErrorPreview } from "./command-output-BF5AR2dL.mjs";
-import { n as findCommandWorkspace } from "./project-BUu6Is4k.mjs";
-import { n as SOURCES$1, t as LEVELS$1 } from "./ndjson-CgE_o3Dl.mjs";
-import { i as followAgentActions, n as openWorkspaceLogs } from "./logs-dQDki6Tt.mjs";
-import { t as errorDiagnostics } from "./error-diagnostics-BOOm9Db7.mjs";
-import { n as followHostedLogs } from "./hosted-logs-sync-B0pvmOk-.mjs";
+import { k as workspaceLogsDir$1, r as readWorkspaceState$1 } from "./workspace-state-kIZrdlSg.mjs";
+import { W as parseDeviceSlotOption, _ as loadConfig$1, g as isPathPrefix$1 } from "./config-Cn94Jc0g.mjs";
+import { f as refuseNoProject, v as launchErrorPreview } from "./command-output-C8R1KIvi.mjs";
+import { n as findCommandWorkspace } from "./project-Sui52ywT.mjs";
+import { n as SOURCES$1, t as LEVELS$1 } from "./ndjson-Dy2W4vRa.mjs";
+import { i as followAgentActions, n as openWorkspaceLogs } from "./logs-DI5ILkYB.mjs";
+import { t as errorDiagnostics } from "./error-diagnostics-D1QfyJzQ.mjs";
+import { n as followHostedLogs } from "./hosted-logs-sync-B0c53W_c.mjs";
 import { t as watchStdoutReader } from "./stdout-reader-C8yjre1x.mjs";
 import { realpathSync } from "node:fs";
 import { relative, sep } from "node:path";
 import { configDir } from "@stim-cli/core";
-import { buildCriteria, compileGrep, fileSizes, followLogs, gcLogDir, logFiles, parseSince, queryLogs, readGcLog, recordMatches, runId, sortByTs } from "@stim-cli/core/state";
+import { buildCriteria, buildLedgerDir, compileGrep, fileSizes, followLogs, gcLogDir, logFiles, parseSince, queryLogs, readBuildLedger, readGcLog, recordMatches, runId, sortByTs } from "@stim-cli/core/state";
 import chalk from "chalk";
 //#region src/commands/logs.ts
+const MACHINE_SOURCES = ["gc", "builds"];
 const LEVEL_WIDTH = 5;
 const SRC_WIDTH = 6;
 const INDENT = "    ";
@@ -58,7 +59,8 @@ function validateSources(sources) {
 	if (sources === void 0 || sources === null) return { sources: void 0 };
 	const list = Array.isArray(sources) ? sources : [sources];
 	if (list.includes("gc") && list.length > 1) return { error: "--source gc reads the machine-wide gc log and cannot be combined with other sources." };
-	if (list.includes("all")) return { sources: SOURCES$1.filter((source) => source !== "gc") };
+	if (list.includes("builds") && list.length > 1) return { error: "--source builds reads the machine-wide build ledger and cannot be combined with other sources." };
+	if (list.includes("all")) return { sources: SOURCES$1.filter((source) => !MACHINE_SOURCES.includes(source)) };
 	const unknown = list.filter((s) => !SOURCES$1.includes(s));
 	if (unknown.length > 0) return { error: `Unknown --source value(s): ${unknown.join(", ")}. Use one or more of: ${SOURCES$1.join(", ")}, or all.` };
 	return { sources: list };
@@ -69,7 +71,7 @@ function validateLevel(level) {
 }
 const ERRORS_PRINT_CAP = 20;
 function nearestRegisteredLogsProject(root, candidates) {
-	return candidates.filter((candidate) => candidate !== root && isPathPrefix(root, candidate)).toSorted((a, b) => {
+	return candidates.filter((candidate) => candidate !== root && isPathPrefix$1(root, candidate)).toSorted((a, b) => {
 		const depth = (path) => relative(root, path).split(sep).length;
 		return depth(a) - depth(b) || a.length - b.length || a.localeCompare(b);
 	})[0] ?? null;
@@ -98,11 +100,12 @@ const LEVEL_COLOURS = {
 	fatal: chalk.bgRed
 };
 function logsCommand(program) {
-	program.command("logs").description("Query this workspace's merged NDJSON log timeline (bundler, client, device, build, agent actions, maintenance). Prints and exits; an existing timeline with nothing matching is a successful, empty result. Use --follow to stream.").option("--slot <name>", "Only this device slot's records, plus the shared Metro and app client records once it has launched", parseDeviceSlotOption).option("--source <s...>", "Only these sources: metro, client, device, build, agent, maintenance, placement, or all; gc alone reads the machine-wide gc log of what gc and maintenance cleared").option("--level <l>", `Minimum level: ${LEVELS$1.join(", ")}`).option("--since <d>", "Only records newer than this, e.g. 30s, 5m, 2h").option("--grep <re>", "Only records whose message matches this regular expression").option("--tail <n>", "Only the last n matching records").option("--errors", "Errors and fatals since the last marker, from metro, client and build, plus confirmed native app-crash reports and stim web browser errors. Add --source maintenance for maintenance failures, or --source device or --source all for general device errors.").option("--follow", "Keep streaming new records until interrupted").option("--json", "Emit the raw records, one per line (valid NDJSON; zero matches is zero bytes, exit 0)").action(async (opts) => {
+	program.command("logs").description("Query this workspace's merged NDJSON log timeline (bundler, client, device, build, agent actions, maintenance). Prints and exits; an existing timeline with nothing matching is a successful, empty result. Use --follow to stream.").option("--slot <name>", "Only this device slot's records, plus the shared Metro and app client records once it has launched", parseDeviceSlotOption).option("--source <s...>", "Only these sources: metro, client, device, build, agent, maintenance, placement, or all; gc alone reads the machine-wide gc log of what gc and maintenance cleared, and builds alone reads the machine-wide ledger of native builds").option("--level <l>", `Minimum level: ${LEVELS$1.join(", ")}`).option("--since <d>", "Only records newer than this, e.g. 30s, 5m, 2h").option("--grep <re>", "Only records whose message matches this regular expression").option("--tail <n>", "Only the last n matching records").option("--errors", "Errors and fatals since the last marker, from metro, client and build, plus confirmed native app-crash reports and stim web browser errors. Add --source maintenance for maintenance failures, or --source device or --source all for general device errors.").option("--follow", "Keep streaming new records until interrupted").option("--json", "Emit the raw records, one per line (valid NDJSON; zero matches is zero bytes, exit 0)").action(async (opts) => {
 		const requested = [opts.source ?? []].flat();
-		if (requested.length === 1 && requested[0] === "gc") {
+		const [only] = requested;
+		if (requested.length === 1 && only !== void 0 && MACHINE_SOURCES.includes(only)) {
 			const { minLevel, tail } = validateOptions(opts);
-			printGcLog(opts, opts.errors ? "error" : minLevel, tail);
+			printMachineLog(only === "gc" ? GC_LOG : BUILD_LEDGER, opts, opts.errors ? "error" : minLevel, tail);
 			return;
 		}
 		const root = findCommandWorkspace(process.cwd());
@@ -257,27 +260,49 @@ function validateOptions(opts) {
 		tail
 	};
 }
-function printGcLog(opts, minLevel, tail) {
-	const emit = (record) => console.log(opts.json ? JSON.stringify(record) : formatRecord(record, { paint: record.level ? LEVEL_COLOURS[record.level] : void 0 }));
+const GC_LOG = {
+	source: "gc",
+	dir: gcLogDir,
+	read: readGcLog
+};
+const BUILD_LEDGER = {
+	source: "builds",
+	dir: buildLedgerDir,
+	read: readBuildLedger,
+	key: (record) => `${record.id}:${record.ts}`
+};
+function printMachineLog(log, opts, minLevel, tail) {
+	const printed = /* @__PURE__ */ new Set();
+	const emit = (record) => {
+		if (opts.follow && log.key) {
+			const key = log.key(record);
+			if (printed.has(key)) return;
+			printed.add(key);
+		}
+		console.log(opts.json ? JSON.stringify(record) : formatRecord(record, { paint: record.level ? LEVEL_COLOURS[record.level] : void 0 }));
+	};
 	const query = {
-		sources: ["gc"],
+		sources: [log.source],
 		minLevel,
 		since: opts.since,
 		grep: opts.grep
 	};
-	const offsets = opts.follow ? fileSizes(gcLogDir()) : null;
+	const dir = log.dir();
+	const offsets = opts.follow ? fileSizes(dir) : null;
+	const all = log.read();
 	const records = queryLogs({
 		...query,
-		records: readGcLog(),
+		records: all,
 		tail
 	});
 	for (const record of records) emit(record);
+	if (opts.follow && log.key) for (const record of all) printed.add(log.key(record));
 	if (!opts.follow) {
-		if (records.length === 0 && !opts.json) console.error(chalk.dim(`No matching log records in ${gcLogDir()}`));
+		if (records.length === 0 && !opts.json) console.error(chalk.dim(`No matching log records in ${dir}`));
 		return;
 	}
 	const stop = followLogs({
-		dir: gcLogDir(),
+		dir,
 		offsets,
 		criteria: buildCriteria(query),
 		onRecord: emit

package/dist/{logs-dQDki6Tt.mjs → logs-DI5ILkYB.mjs}

@@ -1,9 +1,9 @@
-import { S as process_identity_exports } from "./exec-VFRpu1iA.mjs";
-import { k as workspaceLogsDir$1 } from "./workspace-state-pUg3_RRA.mjs";
-import { G as projectDeviceSlots, _ as loadConfig$1 } from "./config-BktkY_zC.mjs";
-import { f as readAgentDeviceRecordsAsync, n as agentDeviceLiveness, o as envDir } from "./activity-Lnb_EoRY.mjs";
-import { i as captureWorkspaceCrashes } from "./error-diagnostics-BOOm9Db7.mjs";
-import { n as followHostedLogs, r as syncHostedLogs } from "./hosted-logs-sync-B0pvmOk-.mjs";
+import { S as process_identity_exports } from "./exec-aULwtNly.mjs";
+import { k as workspaceLogsDir$1 } from "./workspace-state-kIZrdlSg.mjs";
+import { G as projectDeviceSlots, _ as loadConfig$1 } from "./config-Cn94Jc0g.mjs";
+import { f as readAgentDeviceRecordsAsync, n as agentDeviceLiveness, o as envDir } from "./activity-DRMg4_mD.mjs";
+import { o as captureWorkspaceCrashes } from "./error-diagnostics-D1QfyJzQ.mjs";
+import { n as followHostedLogs, r as syncHostedLogs } from "./hosted-logs-sync-B0c53W_c.mjs";
 import { readdirSync, statSync, watch } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join, relative, resolve, sep } from "node:path";
@@ -264,7 +264,7 @@ async function readWorkspaceLogs(context, options = {}) {
 		await view.close();
 	}
 }
-const WORKSPACE_SOURCES = SOURCES.filter((source) => source !== "gc");
+const WORKSPACE_SOURCES = SOURCES.filter((source) => source !== "gc" && source !== "builds");
 function validateLogOptions(options) {
 	const invalid = (options.tail !== void 0 && (!Number.isSafeInteger(options.tail) || options.tail < 0) ? "tail must be a non-negative integer." : options.sources?.some((source) => !WORKSPACE_SOURCES.includes(source)) ? `sources must contain only ${WORKSPACE_SOURCES.join(", ")}.` : options.minLevel !== void 0 && !LEVELS.includes(options.minLevel) ? `minLevel must be one of ${LEVELS.join(", ")}.` : void 0) ?? (options.since !== void 0 ? parseSince(options.since).error : void 0) ?? (options.grep !== void 0 ? compileGrep(options.grep).error : void 0);
 	if (invalid) throw Object.assign(new Error(invalid), { code: "STIM_BAD_ARG" });

package/dist/{macos-DBBPNnIA.mjs → macos-Bo9st9Di.mjs}

@@ -1,36 +1,37 @@
-import { _ as spawnDeclared, c as throwIfCancelled, t as getExecutor, u as withWorkspaceProcessLock, x as withDrainingCancellation } from "./exec-VFRpu1iA.mjs";
-import { E as workspaceDir, a as recordWorkspaceUseAsync, f as writeWorkspaceStateAsync, k as workspaceLogsDir$1, v as ensureWorkspaceStorageAsync, w as workspaceAgentDeviceDir } from "./workspace-state-pUg3_RRA.mjs";
-import { E as upsertProject, O as withConfigLockAsync$1, u as getConcurrencyLimits } from "./config-BktkY_zC.mjs";
-import { l as phaseLine } from "./command-output-BF5AR2dL.mjs";
-import { Y as resolveProjectSettingsAsync, a as SETTING_SHAPE_REMEDY, tt as settingShapeErrors } from "./settings-CosW5X-S.mjs";
-import { f as projectRegistry, i as findProjectRoot$1, s as ownedDeviceLabel } from "./project-BUu6Is4k.mjs";
-import { i as macosProcess, n as macosDir, o as requiredMacosRecord, r as macosLogFile } from "./state-C4OdpOTF.mjs";
-import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
-import { Hn as processContext, I as NO_BUILD_PROGRESS, K as startBuildProgress, U as recordBuildPhase, Un as runProcessOperation, W as recordFinishedBuild, q as tapBuildLog } from "./budget-k2mZGvvk.mjs";
-import { d as runCancellationSignal, f as withNativeBuildRun } from "./native-run-BfIDFKLH.mjs";
-import { L as acquireBuildSlot, z as releaseBuildSlot } from "./workspaces-g2lhdBXF.mjs";
-import { O as sanitizeDeviceLabel } from "./ios-WxpDJ5T1.mjs";
-import { S as setRemoteLogSink, c as offloadPlacement, i as closeOffload, l as placementLoad, n as buildPlacementCandidates, o as offloadBuild, r as chooseBuildMachine, u as remotePhaseText } from "./client-D9CaRks-.mjs";
-import { a as parseBuildMachineOption, i as namedBuildMachine, l as resolveBuildPlacement, s as requireLocalBuild, t as OffloadRefusal } from "./selection-BNPBZ6T5.mjs";
-import { l as connectHost } from "./hosted-client-fHO8yqzc.mjs";
-import { t as placeHostedMacos } from "./hosted-macos-CPl0OZ9h.mjs";
-import { r as stopMacosAppHeld, t as stopBundleInstances } from "./stop-ySNQHXMG.mjs";
+import { _ as spawnDeclared, c as throwIfCancelled, t as getExecutor, u as withWorkspaceProcessLock, x as withDrainingCancellation } from "./exec-aULwtNly.mjs";
+import { E as workspaceDir, a as recordWorkspaceUseAsync, f as writeWorkspaceStateAsync, k as workspaceLogsDir$1, v as ensureWorkspaceStorageAsync, w as workspaceAgentDeviceDir } from "./workspace-state-kIZrdlSg.mjs";
+import { E as upsertProject, O as withConfigLockAsync$1, u as getConcurrencyLimits } from "./config-Cn94Jc0g.mjs";
+import { l as phaseLine } from "./command-output-C8R1KIvi.mjs";
+import { Z as resolveProjectSettingsAsync, a as SETTING_SHAPE_REMEDY, it as settingValueAt, rt as settingShapeErrors } from "./settings-CY5JZlNN.mjs";
+import { f as projectRegistry, i as findProjectRoot$1, s as ownedDeviceLabel } from "./project-Sui52ywT.mjs";
+import { i as macosProcess, n as macosDir, o as requiredMacosRecord, r as macosLogFile } from "./state-BXC1Lfxw.mjs";
+import { i as createNdjsonWriter } from "./ndjson-Dy2W4vRa.mjs";
+import { En as runProcessOperation, Tn as processContext } from "./ccache-Bm_A1xX9.mjs";
+import { $ as tapBuildLog, H as NO_BUILD_PROGRESS, Q as startBuildProgress, St as acquireBuildSlot, Tt as releaseBuildSlot, X as recordFinishedBuild, Y as recordBuildPhase, tt as errorRemedy } from "./workspaces-CmOcceDN.mjs";
+import { ot as runCancellationSignal, st as withNativeBuildRun } from "./toolchain-mLA_km-b.mjs";
+import { O as sanitizeDeviceLabel } from "./ios-B1DYuOjh.mjs";
+import { S as setRemoteLogSink, c as offloadPlacement, i as closeOffload, l as placementLoad, n as buildPlacementCandidates, o as offloadBuild, r as chooseBuildMachine, u as remotePhaseText } from "./client-YxCer6ab.mjs";
+import { d as resolveBuildPlacement, l as requireLocalBuild, n as automaticBuild, o as namedBuildMachine, s as parseBuildMachineOption, t as OffloadRefusal } from "./selection-CXgM_VK_.mjs";
+import { l as connectHost } from "./hosted-client-DDRm9hPJ.mjs";
+import { t as placeHostedMacos } from "./hosted-macos-B7-8Pv4H.mjs";
+import { i as stopMacosAppHeld, t as stopBundleInstances } from "./stop-DQvE-P76.mjs";
 import { t as spawnEntry } from "./spawn-entry-jw19m8Nl.mjs";
-import { t as buildPlacementRecord } from "./placement-log-DIFPQAXp.mjs";
-import { t as reidentifyBundle } from "./stage-jKQ7CP_B.mjs";
-import { t as validateMacosArtifactPlatform } from "./artifact-platform-CMRc0M_r.mjs";
-import { t as waitForMacosRegistration } from "./registration-CN6nlhcD.mjs";
+import { t as buildPlacementRecord } from "./placement-log-Cvhta5ib.mjs";
+import { n as devicePlacementLine, t as automaticDevicePlacement } from "./auto-placement-BVqs8AJi.mjs";
+import { t as reidentifyBundle } from "./stage-CmugrSG5.mjs";
+import { t as validateMacosArtifactPlatform } from "./artifact-platform-BO2Uvk_A.mjs";
+import { t as waitForMacosRegistration } from "./registration-BwCe64PH.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, validHostedAppArguments } from "@stim-cli/core/state";
+import { machineCapacity, placementWord, validHostedAppArguments } from "@stim-cli/core/state";
 //#region src/macos/build.ts
 async function buildMacosBundle({ context, root, recipe, bundle, bundleId, displayName, scratch, writer, note, record, buildMachine, hostServerKey, progress = NO_BUILD_PROGRESS }) {
 	const signal = runCancellationSignal(context) ?? context.signal;
 	return withDrainingCancellation(context, signal, async () => {
 		throwIfCancelled(signal, "macOS build");
-		const { mode, machines, localEnabled } = buildPlacementCandidates(buildMachine);
+		const { machines, localEnabled } = buildPlacementCandidates(buildMachine);
 		const builder = namedBuildMachine(buildMachine) ? machines[0] : void 0;
 		const runsOnWorker = hostServerKey !== void 0 && builder?.serverKey === hostServerKey;
 		if (record) record.buildMachine = buildMachine;
@@ -63,7 +64,7 @@ async function buildMacosBundle({ context, root, recipe, bundle, bundleId, displ
 				}
 			}));
 			if (namedBuildMachine(buildMachine)) throw new OffloadRefusal(buildMachine, reason);
-			requireLocalBuild(buildMachine);
+			requireLocalBuild(buildMachine, reason);
 			offloadFallback = reason;
 			if (record) record.offloadFallback = reason;
 			writer.write({
@@ -161,7 +162,6 @@ async function buildMacosBundle({ context, root, recipe, bundle, bundleId, displ
 				};
 				const here = machineCapacity();
 				const placement = offloadPlacement({
-					mode,
 					localEnabled,
 					machines: machines.length,
 					here,
@@ -173,7 +173,6 @@ async function buildMacosBundle({ context, root, recipe, bundle, bundleId, displ
 					const chosen = await chooseBuildMachine({
 						projectRoot: root,
 						target: await recipe.offload.target(runsOnWorker),
-						mode,
 						here,
 						machines,
 						selected: buildMachine,
@@ -268,7 +267,7 @@ async function buildMacosBundle({ context, root, recipe, bundle, bundleId, displ
 			try {
 				slot = await acquireBuildSlot({
 					signal,
-					automatic: buildMachine === "auto",
+					automatic: automaticBuild(buildMachine),
 					max: getConcurrencyLimits().maxBuilds,
 					root,
 					logFile: writer.file,
@@ -345,7 +344,7 @@ async function planMacos(context, root, 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" });
-	const { swiftpmMacosProject } = await import("./swiftpm-macos-x6HPpl_2.mjs");
+	const { swiftpmMacosProject } = await import("./swiftpm-macos-BhF2stxY.mjs");
 	const recipe = await swiftpmMacosProject(root).prepare(context, settings);
 	let identity = null;
 	let cacheHit = false;
@@ -374,13 +373,11 @@ async function planMacos(context, root, buildMachineFlag) {
 //#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
-* back to a local launch.
+* Builds the Debug app and launches it where `remoteFlag` or `macos.remote` says: here, on one named approved remote
+* Mac with no fallback, or on the Mac an automatic placement word chooses. A recorded hosted app keeps its Mac.
 */
-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" });
+async function runMacos(context, root, note = console.error, remoteFlag, buildMachineFlag) {
+	refuseDeviceBackend(remoteFlag);
 	if (process.platform !== "darwin") throw new Error("stim macos requires a Mac with Swift installed.");
 	root = realpathSync(root);
 	const operation = projectRegistry.selectMacos(root);
@@ -397,6 +394,9 @@ async function runMacos(context, root, note = console.error, remote, buildMachin
 	const selected = resolveBuildPlacement(buildMachineFlag);
 	if (selected.failure) throw Object.assign(new Error(selected.failure.message), selected.failure);
 	const buildMachine = selected.selected;
+	const configured = settingValueAt(settings, "macos.remote");
+	const requested = remoteFlag ?? (typeof configured === "string" ? configured : void 0);
+	refuseDeviceBackend(requested);
 	const macos = await (await operation.load()).prepare(context, settings);
 	await ensureWorkspaceStorageAsync(root, context.signal);
 	return withNativeBuildRun(context, root, {
@@ -412,6 +412,14 @@ async function runMacos(context, root, note = console.error, remote, buildMachin
 		});
 		return withWorkspaceProcessLock(workspaceDir(root), "macos-launch", async () => {
 			const previous = requiredMacosRecord(root);
+			const remote = await macosHost({
+				requested,
+				previous,
+				root,
+				buildMachine,
+				note,
+				signal: context.signal
+			});
 			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.");
 			let hostServerKey;
@@ -508,6 +516,29 @@ async function runMacos(context, root, note = console.error, remote, buildMachin
 		}).finally(() => progress.clear());
 	}, { write: note });
 }
+function refuseDeviceBackend(requested) {
+	if (requested !== void 0 && ["eas", "proxy"].includes(requested.trim().toLowerCase())) throw Object.assign(/* @__PURE__ */ new Error("stim macos --remote and macos.remote take local, auto, remote, remote-only or a remote Mac name from remote.machines; macOS has no eas or proxy backend."), { code: "STIM_BAD_ARG" });
+}
+async function macosHost({ requested, previous, root, buildMachine, note, signal }) {
+	if (requested === void 0) return void 0;
+	const word = placementWord(requested);
+	if (word === "local") return void 0;
+	if (word === null) return requested.trim();
+	if (previous?.host) return previous.host.machine;
+	const placed = await automaticDevicePlacement({
+		root,
+		slot: "default",
+		platform: "macos",
+		placement: word,
+		selectors: {},
+		buildMachine,
+		noWait: false,
+		onWait: (line) => note(phaseLine("placement:", line)),
+		signal
+	});
+	note(phaseLine("placement:", devicePlacementLine(placed.placement, placed.skipped)));
+	return placed.placement.decision === "hosted" ? placed.placement.machine : void 0;
+}
 async function buildBundle(context, root, recipe, record, hosted, hostServerKey, note, progress = NO_BUILD_PROGRESS) {
 	const started = Date.parse(record.build.startedAt);
 	const scratch = join(macosDir(root), "build");
@@ -566,13 +597,13 @@ async function buildBundle(context, root, recipe, record, hosted, hostServerKey,
 			supervisor: void 0,
 			build
 		} });
-		recordMacosBuild(root, build, progress.steps());
+		recordMacosBuild(root, build, progress.steps(), errorRemedy(error));
 		throw error;
 	} finally {
 		writer.close();
 	}
 }
-function recordMacosBuild(root, build, compileSteps) {
+function recordMacosBuild(root, build, compileSteps, remedy) {
 	recordFinishedBuild(root, {
 		platform: "macos",
 		status: build.state === "ok" ? "ok" : "failed",
@@ -588,7 +619,11 @@ function recordMacosBuild(root, build, compileSteps) {
 		builtOn: build.builtOn,
 		offloadedTo: build.offloadedTo,
 		offloadFallback: build.offloadFallback,
-		...compileSteps === null ? {} : { compileSteps }
+		...compileSteps === null ? {} : { compileSteps },
+		...build.error ? { ledger: {
+			message: build.error,
+			remedy
+		} } : {}
 	});
 }
 const LAUNCH_SERVICES_CALL_MS = 2e3;
@@ -659,7 +694,7 @@ 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) => {
+	program.command("macos").description("Build and launch an owned Swift Package macOS Debug app.").option("--remote-build <value>", "Build on local, auto, remote (remote machines first), remote-only (never here), 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 <placement>", "run it here (local), on the Mac a placement word chooses (auto, remote, remote-only), or on one approved remote Mac from remote.machines").action(async (options) => {
 		const root = findProjectRoot$1(process.cwd());
 		if (options.plan) {
 			try {

package/dist/{macos-B0VEV3Gf.mjs → macos-C12RMJQF.mjs}

@@ -1,2 +1,2 @@
-import { n as runMacos, r as waitForLaunchServices, t as macosCommand } from "./macos-DBBPNnIA.mjs";
+import { n as runMacos, r as waitForLaunchServices, t as macosCommand } from "./macos-Bo9st9Di.mjs";
 export { macosCommand as default, runMacos, waitForLaunchServices };

package/dist/macos-run.mjs

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

package/dist/maintenance-run.mjs

@@ -1,10 +1,10 @@
-import { P as formatBytes } from "./config-BktkY_zC.mjs";
-import { E as maintenanceLogger, T as openGcLog, jt as deviceSweepIsScoped, u as resolveBudget, w as maintenanceItem } from "./budget-k2mZGvvk.mjs";
-import { B as memoryCulpritAdvice, F as memoryCulpritsUnder } from "./ios-WxpDJ5T1.mjs";
+import { P as formatBytes } from "./config-Cn94Jc0g.mjs";
+import { A as diskPressureLevel, I as maintenanceItem, L as openGcLog, M as levelStillShort, N as lowestFree, R as maintenanceLogger, _ as resolveBudget, j as levelFloors, mt as deviceSweepIsScoped } from "./ccache-Bm_A1xX9.mjs";
+import { I as memoryCulpritsUnder, V as memoryCulpritAdvice } from "./ios-B1DYuOjh.mjs";
 import { t as resolveMaintenanceSettings } from "./settings-Djl-mpjX.mjs";
-import { t as relaunchWithLogFile } from "./detached-entry-KmieOKgN.mjs";
-import { D as measureDisk, F as levelStillShort, I as lowestFree, M as sizeScanDeferred, N as diskPressureLevel, P as levelFloors, j as measureSizes, k as measurePressure } from "./worktree-BKuklFh_.mjs";
-import { i as plannedMaintenance, m as measureOwnedDevices, n as diskRecovered, o as triggeringRoot, r as executeAction } from "./act-C-BqJEpu.mjs";
+import { C as sizeScanDeferred, S as measureSizes, b as measurePressure, v as measureDisk } from "./worktree-2dk5edza.mjs";
+import { t as relaunchWithLogFile } from "./detached-entry-BPlSaCwC.mjs";
+import { g as measureOwnedDevices, i as plannedMaintenance, n as diskRecovered, o as triggeringRoot, r as executeAction } from "./act-8iswyfRa.mjs";
 import { r as due, t as capChildLog } from "./attempt-ClyJlZPT.mjs";
 import { releaseClaim, tryAcquireClaim } from "@stim-cli/core/ownership-claim";
 import { randomBytes } from "node:crypto";
@@ -318,7 +318,7 @@ async function runMaintenance(trigger) {
 					},
 					...action.workspace && action.kind !== "would-remove-worktree" ? { workspace: action.workspace } : {}
 				};
-				if (outcome.status === "done") record("maintenance_action", action.kind === "would-remove-worktree" ? "warn" : "info", `${describeDone(action)} (${formatBytes(outcome.bytes)}): ${action.reason}`, fields);
+				if (outcome.status === "done") record("maintenance_action", action.kind === "would-remove-worktree" ? "warn" : "info", `${describeDone(action)} (${formatBytes(outcome.bytes)}): ${action.kind === "would-remove-worktree" ? outcome.detail : action.reason}`, fields);
 				else if (outcome.status === "failed") {
 					failures.push(`${describeDone(action)} failed: ${outcome.detail}`);
 					record("maintenance_failure", "error", `Could not process ${action.target}: ${outcome.detail}`, {

package/dist/{metro-CjC10t6E.mjs → metro-BnhXV2Mj.mjs}

@@ -1,7 +1,7 @@
-import { S as process_identity_exports, l as WorkspaceProcessCleanupError, t as getExecutor } from "./exec-VFRpu1iA.mjs";
-import { r as readWorkspaceState } from "./workspace-state-pUg3_RRA.mjs";
-import { F as isOnMountedVolume, I as listMountedVolumes, O as withConfigLockAsync, _ as loadConfig, n as allMetroPorts, r as claimMetroPort, x as releaseMetroPort } from "./config-BktkY_zC.mjs";
-import { t as runOperationFile } from "./operation-exec-CUZifp6Z.mjs";
+import { S as process_identity_exports, l as WorkspaceProcessCleanupError, t as getExecutor } from "./exec-aULwtNly.mjs";
+import { r as readWorkspaceState } from "./workspace-state-kIZrdlSg.mjs";
+import { F as isOnMountedVolume, I as listMountedVolumes, O as withConfigLockAsync, _ as loadConfig, n as allMetroPorts, r as claimMetroPort, x as releaseMetroPort } from "./config-Cn94Jc0g.mjs";
+import { t as runOperationFile } from "./operation-exec-Dp4FuIGR.mjs";
 import { sep } from "path";
 import { existsSync, readlinkSync, realpathSync } from "fs";
 import { readFile } from "node:fs/promises";

package/dist/{metro-gateway-B6_PgD0L.mjs → metro-request-DXyKjVDF.mjs}

@@ -1,10 +1,8 @@
-import { S as process_identity_exports, c as throwIfCancelled, s as cancelledError } from "./exec-VFRpu1iA.mjs";
-import { j as workspaceStateFile$1, l as withWorkspaceStateLockAsync, o as updateWorkspaceState, r as readWorkspaceState$1, s as updateWorkspaceStateAsync } from "./workspace-state-pUg3_RRA.mjs";
-import { ct as tailscaleStatusAsync } from "./config-BktkY_zC.mjs";
-import { randomBytes, randomUUID } from "node:crypto";
+import { S as process_identity_exports, c as throwIfCancelled, s as cancelledError } from "./exec-aULwtNly.mjs";
+import { j as workspaceStateFile$1, l as withWorkspaceStateLockAsync, o as updateWorkspaceState, r as readWorkspaceState$1, s as updateWorkspaceStateAsync } from "./workspace-state-kIZrdlSg.mjs";
+import { randomUUID } from "node:crypto";
 import { statSync, watch } from "node:fs";
-import { HOSTED_METRO_REQUESTS_KEY, findPeer, hostedMetroGateways, hostedMetroRequests, isJsonObject, parseMachine } from "@stim-cli/core/state";
-import { isIP } from "node:net";
+import { HOSTED_METRO_REQUESTS_KEY, hostedMetroLinks, hostedMetroRequests, isJsonObject } from "@stim-cli/core/state";
 //#region src/workspace/workspace-state-watch.ts
 /** Filesystem events are hints; callers retain their own bounded repair and state verification. */
 function watchWorkspaceState(root, changed) {
@@ -58,8 +56,8 @@ function watchWorkspaceState(root, changed) {
 	};
 }
 //#endregion
-//#region src/device-host/metro-gateway.ts
-async function waitForGateway(root, read, { waitMs, signal, what }) {
+//#region src/device-host/metro-request.ts
+async function waitForSupervisor(root, read, { waitMs, signal, what }) {
 	throwIfCancelled(signal, what);
 	const startedAt = Date.now();
 	const deadline = startedAt + waitMs;
@@ -101,38 +99,23 @@ async function waitForGateway(root, read, { waitMs, signal, what }) {
 		if (onAbort) signal?.removeEventListener("abort", onAbort);
 	}
 }
-function gatewayAddresses(credential, status) {
-	const machine = parseMachine(credential.machine);
-	const peer = machine ? findPeer(status, machine.name) : "missing";
-	if (typeof peer === "string") throw new Error(`${credential.machine} no longer resolves to one tailnet peer. Run stim doctor.`);
-	const self = isJsonObject(status) && isJsonObject(status.Self) ? status.Self : null;
-	const address = (Array.isArray(self?.TailscaleIPs) ? self.TailscaleIPs : []).find((ip) => typeof ip === "string" && isIP(ip) === isIP(peer.address) && isIP(ip) !== 0);
-	if (!address) throw new Error("This machine has no Tailscale address compatible with the hosting Mac.");
-	return {
-		address,
-		peer: peer.address
-	};
-}
 function requireHostedMetro(root) {
 	const supervisor = readWorkspaceState$1(root)?.supervisor;
-	if (supervisor?.hostedMetro === true && (0, process_identity_exports.inspectProcessIdentity)(supervisor) === "same") return;
-	throw Object.assign(/* @__PURE__ */ new Error("Hosted Debug runs require a running Metro supervisor with private gateway support. Run stim stop; stim start, then retry."), {
+	if (supervisor?.hostedMetroLinks === true && (0, process_identity_exports.inspectProcessIdentity)(supervisor) === "same") return;
+	throw Object.assign(/* @__PURE__ */ new Error("Hosted Debug runs require a running Metro supervisor that links Metro to the hosting machine. Run stim stop; stim start, then retry."), {
 		code: "STIM_HOSTING_REFUSED",
 		remedy: "Run stim stop; stim start, then retry."
 	});
 }
 async function requestHostedMetro(root, session, credential, signal) {
-	throwIfCancelled(signal, "hosted Metro gateway");
+	throwIfCancelled(signal, "hosted Metro link");
 	requireHostedMetro(root);
-	const addresses = gatewayAddresses(credential, await tailscaleStatusAsync(signal));
-	throwIfCancelled(signal, "hosted Metro gateway");
-	requireHostedMetro(root);
-	const previous = hostedMetroRequests(readWorkspaceState$1(root))[session];
-	const request = previous && previous.address === addresses.address && previous.peer === addresses.peer ? previous : {
+	const recorded = readWorkspaceState$1(root);
+	const previous = hostedMetroRequests(recorded)[session];
+	const answer = hostedMetroLinks(recorded)[session];
+	const request = previous?.machine === credential.machine && answer?.id === previous.id && answer.processToken === recorded?.supervisor?.processToken && answer.ready ? previous : {
 		id: randomUUID(),
-		machine: credential.machine,
-		...addresses,
-		secret: randomBytes(32).toString("hex")
+		machine: credential.machine
 	};
 	await updateWorkspaceStateAsync(root, (state) => ({
 		...state,
@@ -141,24 +124,20 @@ async function requestHostedMetro(root, session, credential, signal) {
 			[session]: request
 		}
 	}), signal);
-	const opened = await waitForGateway(root, () => {
+	if (await waitForSupervisor(root, () => {
 		const state = readWorkspaceState$1(root);
-		const gateway = hostedMetroGateways(state)[session];
-		if (gateway?.id === request.id && gateway.processToken === state?.supervisor?.processToken) {
-			if (gateway.error) throw new Error(gateway.error);
-			if (gateway.port) return {
-				gatewayPort: gateway.port,
-				secret: request.secret
-			};
+		const links = hostedMetroLinks(state)[session];
+		if (links?.id === request.id && links.processToken === state?.supervisor?.processToken) {
+			if (links.error) throw new Error(links.error);
+			if (links.ready) return true;
 		}
 		return null;
 	}, {
 		waitMs: 15e3,
 		signal,
-		what: "hosted Metro gateway"
-	});
-	if (opened) return opened;
-	throw new Error(`The Metro supervisor did not open a private gateway for ${credential.machine}. Run stim stop; stim start, then retry.`);
+		what: "hosted Metro link"
+	})) return;
+	throw new Error(`The Metro supervisor did not link Metro to ${credential.machine}. Run stim doctor, then stim stop; stim start and retry.`);
 }
 function clearHostedMetro(root, session) {
 	updateWorkspaceState(root, (state) => {
@@ -172,17 +151,17 @@ function clearHostedMetro(root, session) {
 }
 async function closeHostedMetro(root, session, signal) {
 	await withWorkspaceStateLockAsync(root, () => clearHostedMetro(root, session), signal);
-	if (!await waitForGateway(root, () => {
+	if (!await waitForSupervisor(root, () => {
 		const state = readWorkspaceState$1(root);
-		const gateway = hostedMetroGateways(state)[session];
+		const links = hostedMetroLinks(state)[session];
 		const supervisor = state?.supervisor;
-		if (!gateway?.port || !supervisor || gateway.processToken !== supervisor.processToken) return true;
+		if (!links?.ready || !supervisor || links.processToken !== supervisor.processToken) return true;
 		return (0, process_identity_exports.inspectProcessIdentity)(supervisor) === "gone" ? true : null;
 	}, {
 		waitMs: 5e3,
 		signal,
 		what: "close hosted Metro"
-	})) throw new Error("The Metro supervisor did not close its private gateway. Restart Metro, then retry stim stop.");
+	})) throw new Error("The Metro supervisor did not close its Metro links. Restart Metro, then retry stim stop.");
 }
 function hostedMetroSettings(settings, hosted) {
 	return hosted ? {

package/dist/{named-ports-BG0j1X4g.mjs → named-ports-Phoi2POD.mjs}

@@ -1,6 +1,6 @@
-import { S as process_identity_exports, t as getExecutor, u as withWorkspaceProcessLock } from "./exec-VFRpu1iA.mjs";
-import { C as saveConfig, O as withConfigLockAsync, _ as loadConfig, c as ensureConfig, d as getConfigDir, p as getProject } from "./config-BktkY_zC.mjs";
-import { f as signalProcessTree, m as createPortProbe, s as parseNetstatPids } from "./metro-CjC10t6E.mjs";
+import { S as process_identity_exports, t as getExecutor, u as withWorkspaceProcessLock } from "./exec-aULwtNly.mjs";
+import { C as saveConfig, O as withConfigLockAsync, _ as loadConfig, c as ensureConfig, d as getConfigDir, p as getProject } from "./config-Cn94Jc0g.mjs";
+import { f as signalProcessTree, m as createPortProbe, s as parseNetstatPids } from "./metro-BnhXV2Mj.mjs";
 import { realpathSync } from "node:fs";
 //#region src/named-ports.ts
 const FIRST_PORT = 8900;

package/dist/{native-android-CL2NGiik.mjs → native-android-vxgtLD7w.mjs}

@@ -1,21 +1,20 @@
-import { t as getExecutor } from "./exec-VFRpu1iA.mjs";
-import { E as workspaceDir, y as sharedBuildCache } from "./workspace-state-pUg3_RRA.mjs";
-import { H as deviceSlotPlatforms, p as getProject, q as validateDeviceSlot } from "./config-BktkY_zC.mjs";
-import { nt as settingValueAt } from "./settings-CosW5X-S.mjs";
-import { B as ownedAvdDeviceProfile, E as findBuildTool, I as listInstalledSystemImages, K as ownedAvdSystemImage, V as ownedAvdDirectory, X as pickDefaultSystemImage, l as androidSystemImageAbi, o as androidHome } from "./android-DTAcRwBC.mjs";
-import { r as register } from "./cache-manifest-BEZ9Bpl1.mjs";
-import { tt as statsProjectKey } from "./budget-k2mZGvvk.mjs";
-import { d as runCancellationSignal } from "./native-run-BfIDFKLH.mjs";
-import { S as resolveBuild, s as entryDir, t as artifactIn } from "./build-cache-DrXNCy3T.mjs";
-import { o as resolveCcache } from "./ccache-Bx5TbxwG.mjs";
-import { r as androidToolchainAsync } from "./toolchain-J4J8MrAr.mjs";
-import { h as gradleOffloadInputs, y as nativeGradleTransfer } from "./client-D9CaRks-.mjs";
-import { d as buildGradle, l as androidSdkRefusal } from "./react-native-build-oNwqF5Wb.mjs";
-import { s as explainBuildMiss, u as skippedMissReason } from "./prebuild-gmouvmJZ.mjs";
-import { u as resolveAndroidRunPlan } from "./result-7F5hEwQJ.mjs";
-import { n as androidProcessRuntime } from "./launch-DOp8RjDz.mjs";
-import { n as planFlagRefusal, r as planPayload } from "./build-plan-DrMMdayj.mjs";
-import { a as nativeGradleWorkerArtifactIdentity, n as gradleArtifactInputs, r as nativeGradleArtifactSnapshot, t as NATIVE_GRADLE_CACHE_LIMIT } from "./native-gradle-artifact-inputs-btSUulme.mjs";
+import { t as getExecutor } from "./exec-aULwtNly.mjs";
+import { E as workspaceDir, y as sharedBuildCache } from "./workspace-state-kIZrdlSg.mjs";
+import { H as deviceSlotPlatforms, p as getProject, q as validateDeviceSlot } from "./config-Cn94Jc0g.mjs";
+import { it as settingValueAt } from "./settings-CY5JZlNN.mjs";
+import { B as ownedAvdDeviceProfile, E as findBuildTool, I as listInstalledSystemImages, K as ownedAvdSystemImage, V as ownedAvdDirectory, X as pickDefaultSystemImage, l as androidSystemImageAbi, o as androidHome } from "./android-CsPs-7Mg.mjs";
+import { s as resolveCcache } from "./ccache-Bm_A1xX9.mjs";
+import { r as register } from "./cache-manifest-DEjqGGat.mjs";
+import { lt as statsProjectKey } from "./workspaces-CmOcceDN.mjs";
+import { ot as runCancellationSignal, r as androidToolchainAsync } from "./toolchain-mLA_km-b.mjs";
+import { C as resolveBuild, s as entryDir, t as artifactIn } from "./build-cache-CZULpXVl.mjs";
+import { h as gradleOffloadInputs, y as nativeGradleTransfer } from "./client-YxCer6ab.mjs";
+import { d as buildGradle, l as androidSdkRefusal } from "./react-native-build-jUHnIfZ9.mjs";
+import { s as explainBuildMiss, u as skippedMissReason } from "./prebuild-k8d_tqOq.mjs";
+import { u as resolveAndroidRunPlan } from "./result-BIcXREyC.mjs";
+import { n as androidProcessRuntime } from "./launch-DoySmhjz.mjs";
+import { n as planFlagRefusal, r as planPayload } from "./build-plan-CxoYfxsc.mjs";
+import { a as nativeGradleWorkerArtifactIdentity, n as gradleArtifactInputs, r as nativeGradleArtifactSnapshot, t as NATIVE_GRADLE_CACHE_LIMIT } from "./native-gradle-artifact-inputs-BN96IVw8.mjs";
 import { createHash } from "node:crypto";
 import { createReadStream, createWriteStream, existsSync, readFileSync, statSync } from "node:fs";
 import { tmpdir } from "node:os";

package/dist/{native-gradle-artifact-inputs-btSUulme.mjs → native-gradle-artifact-inputs-BN96IVw8.mjs}

@@ -1,8 +1,8 @@
-import { t as getExecutor } from "./exec-VFRpu1iA.mjs";
-import { r as childEnvironment } from "./operation-exec-CUZifp6Z.mjs";
-import { o as androidHome } from "./android-DTAcRwBC.mjs";
-import { n as buildCacheKey } from "./build-cache-DrXNCy3T.mjs";
-import { _ as nativeGradleLocalSourceDigest, h as gradleOffloadInputs } from "./client-D9CaRks-.mjs";
+import { t as getExecutor } from "./exec-aULwtNly.mjs";
+import { r as childEnvironment } from "./operation-exec-Dp4FuIGR.mjs";
+import { o as androidHome } from "./android-CsPs-7Mg.mjs";
+import { n as buildCacheKey } from "./build-cache-CZULpXVl.mjs";
+import { _ as nativeGradleLocalSourceDigest, h as gradleOffloadInputs } from "./client-YxCer6ab.mjs";
 import { n as fingerprintNativeInputs } from "./native-inputs-TRTTTRxt.mjs";
 import { createHash } from "node:crypto";
 import { homedir } from "node:os";