stim 1.25.0 → 1.27.0

package/dist/{remote-BuZj6AyU.mjs → remote-y6n99WMW.mjs}

@@ -1,11 +1,12 @@
-import { l as WorkspaceProcessCleanupError } from "./exec-VFRpu1iA.mjs";
-import { H as deviceSlotPlatforms } from "./config-BZhXY15H.mjs";
-import { l as phaseLine } from "./command-output-BBvS1H6v.mjs";
-import { I as parseIosRemote, U as remoteEasFallbackSetting, W as remoteIosSetting, it as tunnelModeSetting, z as publicUrlSetting } from "./settings-B5tCoq9N.mjs";
-import "./budget-HyShrIpL.mjs";
-import { b as resolveSimulatorAppFlag } from "./support-qKcbgmI5.mjs";
-import { n as devicePlacementRecord } from "./placement-log-DjOXJRIH.mjs";
-import { r as devicePlacementLine } from "./eas-fallback-gaZi-dJL.mjs";
+import { l as WorkspaceProcessCleanupError } from "./exec-aULwtNly.mjs";
+import { H as deviceSlotPlatforms } from "./config-Cn94Jc0g.mjs";
+import { l as phaseLine } from "./command-output-Dj-WT4BP.mjs";
+import { B as publicUrlSetting, G as remoteIosSetting, L as parseIosRemote, W as remoteEasFallbackSetting, ot as tunnelModeSetting } from "./settings-BDVI8Ivc.mjs";
+import "./ccache-BWTze1Ls.mjs";
+import { ot as runCancellationSignal } from "./toolchain-CbCG6C5Z.mjs";
+import { b as resolveSimulatorAppFlag } from "./support-Be0UeVZU.mjs";
+import { n as devicePlacementRecord } from "./placement-log-BXUbiZM6.mjs";
+import { n as devicePlacementLine } from "./auto-placement-z-H5pJza.mjs";
 import chalk from "chalk";
 //#region src/commands/ios/remote.ts
 function deviceRemoteConflict(remote, physical) {
@@ -25,6 +26,7 @@ function resolveIosRemote({ opts, settings, physical, recorded }) {
 	} };
 	return {
 		machine,
+		...target?.kind === "machine" && target.placement ? { placement: target.placement } : {},
 		backend: !physical && target?.kind === "backend" ? target.backend : null,
 		recorded
 	};
@@ -68,7 +70,8 @@ function selectIosTarget({ root, slot, opts, settings, physical, appMode, metroC
 async function selectIosPlacement(args) {
 	const selection = selectIosTarget(args);
 	if ("failure" in selection || selection.machine !== "auto") return selection;
-	const { root, slot, d, opts, deviceType, runtime, noWait, phase, log, release, appMode, metroCheck } = args;
+	const { root, slot, d, opts, deviceType, runtime, noWait, waitMs, phase, log, release, appMode, metroCheck } = args;
+	const signal = runCancellationSignal(args.operation) ?? args.operation?.signal;
 	const viewer = resolveSimulatorAppFlag(opts.simulatorApp, args.physical, null);
 	if ("refusal" in viewer) return { failure: viewer.refusal };
 	const refusal = await args.validateSelectors();
@@ -86,11 +89,15 @@ async function selectIosPlacement(args) {
 			root,
 			slot,
 			platform: "ios",
+			placement: selection.placement,
 			...localSims ? { localSims } : {},
 			selectors: hostedIosSelectors(deviceType, runtime),
 			appMode,
 			buildMachine: opts.remoteBuild,
 			noWait,
+			...waitMs === void 0 ? {} : { waitMs },
+			onWait: (line) => phase("placement:", line),
+			signal,
 			...easFallback ? { eas: () => d.checkEasFallback({
 				root,
 				platform: "ios",
@@ -108,6 +115,7 @@ async function selectIosPlacement(args) {
 		phase("placement:", devicePlacementLine(placed.placement, placed.skipped));
 		log?.(devicePlacementRecord({
 			platform: "ios",
+			selected: selection.placement,
 			fromFlag: opts.remote !== void 0,
 			easFallback,
 			placed
@@ -137,6 +145,11 @@ async function selectIosPlacement(args) {
 			devicePlacement: placed.placement
 		};
 	} catch (error) {
+		if (signal?.aborted) return { failure: {
+			code: "STIM_CANCELLED",
+			message: "The run was cancelled while it waited for a remote machine.",
+			remedy: "Run the command again when you want the app on a device."
+		} };
 		return { failure: {
 			code: error.code ?? "STIM_HOSTING_REFUSED",
 			message: error.message,

package/dist/{result-CR2vk2cj.mjs → result-CTqBw2Te.mjs}

@@ -1,20 +1,20 @@
-import { l as workspaceAgentDeviceDir } from "./paths-DQtTgsBf.mjs";
-import { H as deviceSlotPlatforms, p as getProject } from "./config-BZhXY15H.mjs";
-import { i as formatDuration, l as phaseLine } from "./command-output-BBvS1H6v.mjs";
-import { G as resolveAndroidLayout, H as remoteAndroidSetting, I as parseIosRemote, K as resolveCacheProviderConfig, Q as settingFile, a as SETTING_SHAPE_REMEDY, at as unknownSettingKeys, d as androidLayoutSetting, et as settingOriginScope, f as androidLayoutSettingError, p as cacheProviderSettingError, rt as settingsLayers, s as androidAvdConfigSettingError, tt as settingShapeErrors, u as androidDataPartitionSizeGbSettingError } from "./settings-B5tCoq9N.mjs";
-import { v as detectIsExpo } from "./project-BiC68mIp.mjs";
-import { a as workspaceLinkLine } from "./stim-desktop-DS0mzR8U.mjs";
-import { B as ownedAvdDeviceProfile, I as listInstalledSystemImages, K as ownedAvdSystemImage, N as listAvdDeviceProfilesAsync, Q as profileNeedsFoldFeature, X as pickDefaultSystemImage, at as systemImageSupportsFold, k as hostSystemImageArch, l as androidSystemImageAbi, t as DEFAULT_AVD_DEVICE_PROFILE, vt as parkedMaxSetting } from "./android-Cjcj8MCw.mjs";
-import { B as recordFinishedBuild, Gn as isEasAuthFailureText, Hn as cacheLevel, Vn as UPLOAD_TIMEOUT_MS, Wn as easAuthNote } from "./budget-HyShrIpL.mjs";
+import { w as workspaceAgentDeviceDir } from "./workspace-state-BjqdjnJR.mjs";
+import { H as deviceSlotPlatforms, p as getProject } from "./config-Cn94Jc0g.mjs";
+import { i as formatDuration, l as phaseLine } from "./command-output-Dj-WT4BP.mjs";
+import { J as resolveCacheProviderConfig, L as parseIosRemote, U as remoteAndroidSetting, _ as inertSettingWarning, a as SETTING_SHAPE_REMEDY, at as settingsLayers, d as androidLayoutSetting, et as settingFile, f as androidLayoutSettingError, nt as settingOriginScope, p as cacheProviderSettingError, q as resolveAndroidLayout, rt as settingShapeErrors, s as androidAvdConfigSettingError, st as unknownSettingKeys, u as androidDataPartitionSizeGbSettingError } from "./settings-BDVI8Ivc.mjs";
+import { v as detectIsExpo } from "./project-DYj-HVx6.mjs";
+import { a as workspaceLinkLine } from "./stim-desktop-CbWo21kb.mjs";
+import { B as ownedAvdDeviceProfile, I as listInstalledSystemImages, K as ownedAvdSystemImage, N as listAvdDeviceProfilesAsync, Q as profileNeedsFoldFeature, X as pickDefaultSystemImage, at as systemImageSupportsFold, k as hostSystemImageArch, l as androidSystemImageAbi, t as DEFAULT_AVD_DEVICE_PROFILE, vt as parkedMaxSetting } from "./android-DriNoAVy.mjs";
+import { Mn as isEasAuthFailureText, On as UPLOAD_TIMEOUT_MS, jn as easAuthNote, kn as cacheLevel, n as CCACHE_UNAVAILABLE, r as ccacheActivityLine } from "./ccache-BWTze1Ls.mjs";
+import { q as recordFinishedBuild } from "./workspaces-DFbj07jp.mjs";
 import { d as optimizationBuildProfile, l as artifactCachePolicy, p as resolveOptimizations, u as compilerCacheFallbackMessage } from "./errors-DHm_U5gv.mjs";
-import { n as CCACHE_UNAVAILABLE, r as ccacheActivityLine } from "./ccache-h1FKhZeg.mjs";
-import { n as buildPlacementCandidates } from "./client-BQsmyp_-.mjs";
-import { c as readProductFlavors, s as productFlavorRefusal } from "./react-native-build-CwZB-agu.mjs";
-import { l as parseDeviceWait } from "./device-lease-run-ogEeJ62K.mjs";
-import { t as DEFAULT_DEVICE_SLOT_WAIT_MS } from "./device-capacity-ZYaRALv5.mjs";
-import { n as resolveAndroidCas, r as resolveAndroidCompilerCache } from "./android-cas-BVqh2Zep.mjs";
-import { r as isPhysicalDeviceRequest } from "./native-runtime-B9w_Qyz3.mjs";
-import { C as remoteAvdFlagRefusal, D as systemImageRefusal, E as resolveVariant, T as resolveSystemImage, a as PLATFORM, m as deviceProfileRefusal, v as foldableImageRefusal, w as resolveDeviceProfile, y as isReleaseVariant } from "./support-Cxj9CmII.mjs";
+import { n as buildPlacementCandidates } from "./client-xsdxrhWA.mjs";
+import { c as readProductFlavors, s as productFlavorRefusal } from "./react-native-build-DaK2IFyP.mjs";
+import { l as parseDeviceWait } from "./device-lease-run-DwsGfjUN.mjs";
+import { t as DEFAULT_DEVICE_SLOT_WAIT_MS } from "./device-capacity-6LP7QsaA.mjs";
+import { n as resolveAndroidCas, r as resolveAndroidCompilerCache } from "./android-cas-D5e6ecUg.mjs";
+import { r as isPhysicalDeviceRequest } from "./native-runtime-DqaIBO5w.mjs";
+import { C as remoteAvdFlagRefusal, D as systemImageRefusal, E as resolveVariant, T as resolveSystemImage, a as PLATFORM, m as deviceProfileRefusal, v as foldableImageRefusal, w as resolveDeviceProfile, y as isReleaseVariant } from "./support-CNg_YsOk.mjs";
 import { buildDiagnostics } from "@stim-cli/core/state";
 import chalk from "chalk";
 //#region src/commands/android/plan.ts
@@ -83,7 +83,7 @@ function resolveAndroidBuildPlan({ settings, settingsContext, env, easProfile, v
 	const layoutError = androidLayoutError(settings, root, bound, detectExpo);
 	if (layoutError) return fail("STIM_BAD_ARG", layoutError, SETTING_SHAPE_REMEDY);
 	const layout = resolveAndroidLayout(settings, root, bound);
-	for (const key of unknownSettingKeys(settings)) warn("setting", `Warning: setting "${key}" is not read by Stim and will be ignored.`);
+	for (const key of unknownSettingKeys(settings)) warn("setting", inertSettingWarning(settings, key));
 	let optimizations;
 	try {
 		optimizations = resolveOptimizations(settings, env);
@@ -197,6 +197,7 @@ async function resolveAndroidRunPlan({ settings, settingsContext, env, slot, sig
 	} : machine ? {
 		kind: "hosted",
 		machine,
+		...remoteTarget?.kind === "machine" && remoteTarget.placement ? { placement: remoteTarget.placement } : {},
 		systemImage,
 		deviceProfile
 	} : remoteBackend ? {
@@ -308,7 +309,7 @@ function androidFacts({ root, slot, serial, avdName = null, deviceName = null, s
 		...devServer ? { devServer } : {}
 	};
 }
-function lastBuildRecord({ devicePlacement, fingerprint, cacheKey, cacheHit, cacheSkipped = false, durationMs, appPath, bundleId, startedAt, status, errorCode = null, avdName = null, deviceName = null, missReason = null, diagnostics = null, configuration = null, buildMachine = "auto", builtOn, offloadedTo = null, offloadFallback = null }) {
+function lastBuildRecord({ devicePlacement, fingerprint, cacheKey, cacheHit, cacheSkipped = false, durationMs, appPath, bundleId, startedAt, status, errorCode = null, avdName = null, deviceName = null, missReason = null, diagnostics = null, configuration = null, buildMachine = "auto", builtOn, offloadedTo = null, offloadFallback = null, message = null, remedy = null, deviceSerial = null }) {
 	const record = {
 		platform: PLATFORM,
 		avdName: avdName ?? null,
@@ -333,6 +334,13 @@ function lastBuildRecord({ devicePlacement, fingerprint, cacheKey, cacheHit, cac
 	if (missReason && !cacheLevel(cacheHit)) record.missReason = missReason;
 	const recorded = status === "failed" ? buildDiagnostics(diagnostics) : [];
 	if (recorded.length) record.diagnostics = recorded;
+	const device = deviceName ?? avdName;
+	const ledger = {
+		...device && device !== deviceSerial ? { device: { name: device } } : {},
+		...message ? { message } : {},
+		...remedy ? { remedy } : {}
+	};
+	if (Object.keys(ledger).length) record.ledger = ledger;
 	return record;
 }
 async function finishAndroidUpload(uploadPending, remote, phase) {
@@ -426,14 +434,16 @@ function cacheOutcome(cacheHit, providerName = null, offloadedTo = null) {
 	if (cacheHit === "local") return "cache hit";
 	return offloadedTo ? `built on ${offloadedTo}` : "built";
 }
-function persistLastBuild({ recordBuild = recordFinishedBuild, root, record, startedAt, durationMs, status, errorCode = null, diagnostics = null, out }) {
+function persistLastBuild({ recordBuild = recordFinishedBuild, root, record, startedAt, durationMs, status, errorCode = null, diagnostics = null, message = null, remedy = null, out }) {
 	const lastBuild = lastBuildRecord({
 		...record,
 		startedAt,
 		durationMs,
 		status,
 		errorCode,
-		diagnostics
+		diagnostics,
+		message,
+		remedy
 	});
 	try {
 		recordBuild(root, lastBuild);
@@ -451,7 +461,8 @@ function persistThrownBuild({ acquired, error, ...args }) {
 	persistLastBuild({
 		...args,
 		status: "failed",
-		errorCode: typeof code === "string" ? code : void 0
+		errorCode: typeof code === "string" ? code : void 0,
+		message: error instanceof Error ? error.message : String(error)
 	});
 }
 //#endregion

package/dist/{run-BtzE09Dl.mjs → run-DaCeNKRm.mjs}

@@ -1,6 +1,6 @@
-import { D as ownership_claim_exports, S as process_identity_exports, t as getExecutor } from "./exec-VFRpu1iA.mjs";
-import { a as macosRuntimeClaim, i as macosProcess, r as macosLogFile, s as updateMacosRecord } from "./state-DPaM3u5K.mjs";
-import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
+import { D as ownership_claim_exports, S as process_identity_exports, t as getExecutor } from "./exec-aULwtNly.mjs";
+import { a as macosRuntimeClaim, i as macosProcess, r as macosLogFile, s as updateMacosRecord } from "./state-CZxLyetD.mjs";
+import { i as createNdjsonWriter } from "./ndjson-Dy2W4vRa.mjs";
 import { LOG_ROTATE_BYTES } from "@stim-cli/core";
 import { readMacosRecord } from "@stim-cli/core/state";
 import { StringDecoder } from "node:string_decoder";

package/dist/{selection-D5cxEl3t.mjs → selection-Bs8phwhN.mjs}

@@ -1,11 +1,12 @@
-import { C as reportSignal, b as operationState } from "./exec-VFRpu1iA.mjs";
-import { v as withDirLock$1 } from "./paths-DQtTgsBf.mjs";
-import { $ as outdatedServer, X as endpoint, Z as findPeer$1, _ as loadConfig$1, at as setupRemedy, d as getConfigDir, et as parseMachine$1, nt as realIo, ot as tailscaleStatusAsync, st as readHostPermissions, tt as reachMachine } from "./config-BZhXY15H.mjs";
+import { C as reportSignal, b as operationState } from "./exec-aULwtNly.mjs";
+import { M as withDirLock$1 } from "./workspace-state-BjqdjnJR.mjs";
+import { $ as endpoint$1, X as diagnoseOutcome, Z as diagnoseTailscale, _ as loadConfig$1, at as realIo, ct as setupRemedy, d as getConfigDir, dt as notOnTailnetDiagnosis, et as findPeer$1, ft as readHostPermissions, it as reachMachine, lt as tailscaleStatusAsync, nt as outdatedServer, rt as parseMachine$1, ut as diagnosisFinding } from "./config-Cn94Jc0g.mjs";
+import { o as cocoapodsInstall } from "./toolchain-CbCG6C5Z.mjs";
 import { releaseClaim, tryAcquireClaim } from "@stim-cli/core/ownership-claim";
 import { mkdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { hostname } from "node:os";
 import { ambientContext, ambientEnv, withDirLockAsync } from "@stim-cli/core";
-import { MACHINE_CREDENTIALS_VERSION, OFFLOAD_MODES, acceptsShape, automaticMachineEnabled, buildMachinesFile, buildMachinesLock, cannotHost, deviceHostMachinesClaims, deviceHostMachinesFile, deviceHostMachinesLock, isJsonObject, parseMachine, readBuildMachines, readDeviceHostMachines, settingDefinition } from "@stim-cli/core/state";
+import { MACHINE_CREDENTIALS_VERSION, acceptsShape, automaticMachineEnabled, buildMachinesFile, buildMachinesLock, cannotHost, deviceHostMachinesClaims, deviceHostMachinesFile, deviceHostMachinesLock, isJsonObject, parseMachine, placementWord, readBuildMachines, readDeviceHostMachines, settingDefinition } from "@stim-cli/core/state";
 import { InvalidArgumentError } from "commander";
 //#region src/device-host/machines.ts
 function note$1(title, detail, fix = null) {
@@ -126,7 +127,17 @@ async function inspectDeviceHostMachines({ fix, version = "<version>", tickets =
 			machines: []
 		};
 		const status = await io.status();
-		if (!isJsonObject(status)) return unavailable("tailscale-off", note$1("Remote machines are unreachable", "remote.machines names remote machines, but Tailscale is not running."));
+		if (!isJsonObject(status)) {
+			const diagnosis = await diagnoseTailscale(io);
+			return {
+				findings: [note$1("Remote machines are unreachable", `remote.machines names remote machines. ${diagnosis.message}`, diagnosis.remedy)],
+				machines: entries.map((machine) => ({
+					machine,
+					state: "tailscale-off",
+					diagnosis
+				}))
+			};
+		}
 		const self = isJsonObject(status.Self) ? status.Self : {};
 		const deviceName = (typeof self.HostName === "string" && self.HostName ? self.HostName : hostname()).replace(/[\p{Cc}\p{Cf}]/gu, "").trim().slice(0, 64) || "Mac";
 		const inspected = {
@@ -146,20 +157,24 @@ async function inspectDeviceHostMachines({ fix, version = "<version>", tickets =
 			}
 			const current = await io.status();
 			if (!isJsonObject(current)) {
+				const diagnosis = await diagnoseTailscale(io);
 				inspected.machines.push({
 					machine,
-					state: "tailscale-off"
+					state: "tailscale-off",
+					diagnosis
 				});
-				inspected.findings.push(note$1(`Remote machine ${machine} is unreachable`, "Tailscale stopped before this connection."));
+				inspected.findings.push(diagnosisFinding("device-host-machine", machine, diagnosis));
 				continue;
 			}
 			const peer = findPeer$1(current, parsed.name);
 			if (peer === "missing" || peer === "ambiguous") {
+				const diagnosis = notOnTailnetDiagnosis(machine, peer === "ambiguous");
 				inspected.machines.push({
 					machine,
-					state: "not-on-tailnet"
+					state: "not-on-tailnet",
+					diagnosis
 				});
-				inspected.findings.push(note$1(`Remote machine ${machine} is not on this tailnet`, peer === "missing" ? "No peer has that name." : "Several peers match that name."));
+				inspected.findings.push(diagnosisFinding("device-host-machine", machine, diagnosis));
 				continue;
 			}
 			const nodeRoute = `${peer.nodeId}:${parsed.port}`;
@@ -186,7 +201,7 @@ async function inspectDeviceHostMachines({ fix, version = "<version>", tickets =
 			const outcome = await reachMachine({
 				machine,
 				access: "device-host",
-				endpoint: endpoint(peer, parsed.port),
+				endpoint: endpoint$1(peer, parsed.port),
 				address: peer.dnsName,
 				credential,
 				other: () => readBuildMachines().find((each) => each.machine === machine),
@@ -251,16 +266,40 @@ async function inspectDeviceHostMachines({ fix, version = "<version>", tickets =
 				const outdated = outdatedServer(machine, version, outcome.command);
 				inspected.machines.push({
 					...known,
-					state: "outdated"
+					state: "outdated",
+					diagnosis: {
+						layer: "compat",
+						code: "server-outdated",
+						title: "Server is outdated",
+						message: outdated.detail,
+						remedy: outdated.fix
+					}
 				});
 				inspected.findings.push(note$1(outdated.title, outdated.detail, outdated.fix));
 				continue;
 			}
+			if (outcome.state === "unreachable") {
+				const diagnosis = await diagnoseOutcome(io, {
+					entry: machine,
+					peer,
+					port: parsed.port,
+					target: endpoint$1(peer, parsed.port),
+					reason: outcome.reason,
+					transport: outcome.transport
+				});
+				inspected.machines.push({
+					...known,
+					state: "unreachable",
+					diagnosis
+				});
+				inspected.findings.push(diagnosisFinding("device-host-machine", machine, diagnosis));
+				continue;
+			}
 			inspected.machines.push({
 				...known,
 				state: outcome.state
 			});
-			inspected.findings.push(outcome.state === "key-changed" ? note$1(`Remote machine ${machine} answered with a different server key`, "Stim refuses to connect to a stim-server that does not prove it holds the key pinned at approval.", `If that machine or its Stim home was replaced, remove ${machine} from remote.machines, run \`stim doctor --fix\`, then add it back and run \`stim doctor --fix\` again.`) : outcome.state === "lapsed" ? note$1(`Hosting request to ${machine} lapsed`, `${machine} did not approve this machine before its setup ticket expired at ${outcome.credential.expiresAt}.`, "Run `stim doctor --fix` to make a new ticket.") : outcome.state === "revoked" ? note$1(`Remote machine ${machine} no longer accepts this machine for device hosting`, `${outcome.reason} The pinned key is preserved.`, "Run `stim doctor --fix` to ask again.") : note$1(`Remote machine ${machine} did not confirm hosting access`, outcome.reason, `Check stim-server and its tailnet serve route on ${machine}, then run doctor again.`));
+			inspected.findings.push(outcome.state === "key-changed" ? note$1(`Remote machine ${machine} answered with a different server key`, "Stim refuses to connect to a stim-server that does not prove it holds the key pinned at approval.", `If that machine or its Stim home was replaced, remove ${machine} from remote.machines, run \`stim doctor --fix\`, then add it back and run \`stim doctor --fix\` again.`) : outcome.state === "lapsed" ? note$1(`Hosting request to ${machine} lapsed`, `${machine} did not approve this machine before its setup ticket expired at ${outcome.credential.expiresAt}.`, "Run `stim doctor --fix` to make a new ticket.") : note$1(`Remote machine ${machine} no longer accepts this machine for device hosting`, `${outcome.reason} The pinned key is preserved.`, "Run `stim doctor --fix` to ask again."));
 		}
 		return inspected;
 	} finally {
@@ -317,7 +356,7 @@ const PROBLEM_TITLES = {
 	xcode: "has another Xcode",
 	"macos-sdk": "has another macOS SDK",
 	"simulator-sdk": "has another simulator SDK",
-	cocoapods: "has another CocoaPods",
+	cocoapods: "has no CocoaPods, or another version",
 	bundler: "has no Bundler",
 	runtime: "has no simulator for this project's iOS runtime",
 	jdk: "runs another JDK major version",
@@ -329,7 +368,17 @@ const PROBLEM_TITLES = {
 	busy: "is too busy to take builds",
 	platform: "cannot build this platform"
 };
-function problemFix(code, entry) {
+const NOTE_TITLES = {
+	ndk: "downloads this project's NDK on its first Android build",
+	"build-tools": "downloads this project's Android build-tools on its first Android build",
+	"compile-sdk": "downloads this project's Android compile platform on its first Android build"
+};
+function commandFix(problem, entry) {
+	return problem.commands?.length && problem.lead ? [`On ${entry}, ${problem.lead}:`, ...problem.commands].join("\n") : null;
+}
+function problemFix(problem, entry) {
+	const { code } = problem;
+	if (problem.followsFrom) return `Fix the ${problem.followsFrom} problem on ${entry} first; this follows from it.`;
 	switch (code) {
 		case "unreachable": return `Check that stim-server runs on ${entry} and that its tailscale serve route answers, then run \`stim doctor\` again. To keep it running there, run \`stim-server service install --serve\` on ${entry}.`;
 		case "checkout": return "Offload syncs the files git lists; run Stim from a git checkout of the app.";
@@ -337,29 +386,53 @@ function problemFix(code, entry) {
 		case "arch": return "Use a remote machine with the same CPU architecture as this machine.";
 		case "xcode":
 		case "simulator-sdk":
-		case "macos-sdk": return `Install and select the same Xcode on ${entry} and this Mac (\`xcode-select -p\` on each).`;
-		case "cocoapods": return `Install the same CocoaPods version on ${entry}, on the PATH its stim-server's login shell sets.`;
+		case "macos-sdk": return commandFix(problem, entry) ?? `Install and select the same Xcode on ${entry} and this Mac (\`xcode-select -p\` on each).`;
+		case "cocoapods": return commandFix(problem, entry) ?? `Install the same CocoaPods version on ${entry}, on the PATH its stim-server sets. A build sent there with --remote-build ${entry} still runs; a version that differs rewrites the COCOAPODS line of a committed Podfile.lock.`;
 		case "bundler": return `Install Bundler (\`gem install bundler\`) on ${entry}, on the PATH its stim-server's login shell sets.`;
-		case "runtime": return `Install that iOS simulator runtime on ${entry} with at least one iPhone simulator, or set ios.runtime here to one ${entry} has.`;
-		case "jdk": return `Start stim-server on ${entry} with JAVA_HOME at a JDK of the same major version as this machine's.`;
+		case "runtime": return commandFix(problem, entry) ?? `Install that iOS simulator runtime on ${entry} with at least one iPhone simulator, or set ios.runtime here to one ${entry} has.`;
+		case "jdk": return commandFix(problem, entry) ?? `Start stim-server on ${entry} with JAVA_HOME at a JDK of the same major version as this machine's.`;
 		case "android-sdk":
 		case "ndk":
 		case "build-tools":
-		case "compile-sdk": return `Install the missing package with sdkmanager in the Android SDK stim-server on ${entry} uses (its ANDROID_HOME, else ~/Library/Android/sdk on macOS or ~/Android/Sdk on Linux).`;
+		case "compile-sdk": return commandFix(problem, entry) ?? `Install the missing package with sdkmanager in the Android SDK stim-server on ${entry} uses (its ANDROID_HOME, else ~/Library/Android/sdk on macOS or ~/Android/Sdk on Linux).`;
 		case "disk": return `Free space on ${entry}'s worker root (server.workerRoot there).`;
 		case "platform": return `iOS and macOS builds need a Mac; ${entry} can take Android builds only.`;
 		case "busy": return `Builds stay on this machine until ${entry} has capacity. On ${entry}, server.maxLoadPerCore sets the load it accepts and concurrency.maxBuilds how many of its own builds it runs; it takes one offloaded build at a time.`;
 	}
 }
 const TRANSIENT = /* @__PURE__ */ new Set(["unreachable", "busy"]);
-function offloadFindings(entry, problems) {
-	return problems.map((problem) => ({
+const UNPREDICTABLE = /* @__PURE__ */ new Set([
+	"unreachable",
+	"busy",
+	"disk",
+	"checkout",
+	"cocoapods"
+]);
+/** Why a build on the machine named for it cannot work, from the toolchain differences found before this machine changes the checkout. */
+function predictedRefusal(entry, problems) {
+	const known = problems.filter((problem) => !UNPREDICTABLE.has(problem.code));
+	if (known.length === 0) return null;
+	return {
+		reason: known.map((problem) => problem.reason).join("; "),
+		remedy: known.map((problem) => problemFix(problem, entry)).join("\n")
+	};
+}
+function offloadFindings(entry, problems, notes, operation) {
+	const selected = operation?.env.STIM_REMOTE_BUILD?.trim() || loadConfig$1()?.remote?.build;
+	const consequence = typeof selected === "string" && placementWord(selected) === "remote-only" ? "remote.build is remote-only, so automatic builds skip this machine and refuse rather than build on this Mac:" : "Builds fall back to this machine:";
+	return [...problems.map((problem) => ({
 		code: `build-machine-${problem.code}`,
 		level: TRANSIENT.has(problem.code) ? "note" : "cost",
 		title: `Remote machine ${entry} ${PROBLEM_TITLES[problem.code]}`,
-		detail: `Builds fall back to this machine: ${problem.reason}.`,
-		fix: problemFix(problem.code, entry)
-	}));
+		detail: `${consequence} ${problem.reason}.${problem.code === "cocoapods" ? ` A build sent there with --remote-build ${entry} still runs.` : ""}`,
+		fix: problemFix(problem, entry)
+	})), ...notes.map((each) => ({
+		code: `build-machine-${each.code}`,
+		level: "note",
+		title: `Remote machine ${entry} ${NOTE_TITLES[each.code] ?? "needs a first-build download"}`,
+		detail: `The build goes there anyway: ${each.reason}.`,
+		fix: commandFix(each, entry)
+	}))];
 }
 async function inspectMachine(entry, status, deviceName, fix, version, tickets, io, check, operation) {
 	const parsed = parseMachine$1(entry);
@@ -372,13 +445,14 @@ async function inspectMachine(entry, status, deviceName, fix, version, tickets,
 	};
 	const peer = findPeer$1(status, parsed.name);
 	if (peer === "missing" || peer === "ambiguous") {
-		const detail = peer === "missing" ? "No peer on this tailnet has that name." : "Several peers match that name.";
+		const diagnosis = notOnTailnetDiagnosis(entry, peer === "ambiguous");
 		return {
 			report: {
 				machine: entry,
-				state: "not-on-tailnet"
+				state: "not-on-tailnet",
+				diagnosis
 			},
-			finding: note(`Remote machine ${entry} is not on this tailnet`, detail)
+			finding: diagnosisFinding("build-machine", entry, diagnosis)
 		};
 	}
 	const credential = readBuildMachines().find((each) => each.machine === entry);
@@ -394,7 +468,7 @@ async function inspectMachine(entry, status, deviceName, fix, version, tickets,
 	const outcome = await reachMachine({
 		machine: entry,
 		access: "build",
-		endpoint: endpoint(peer, parsed.port),
+		endpoint: endpoint$1(peer, parsed.port),
 		address: peer.dnsName,
 		credential,
 		other,
@@ -459,21 +533,40 @@ async function inspectMachine(entry, status, deviceName, fix, version, tickets,
 		};
 		case "outdated": {
 			const outdated = outdatedServer(entry, version, outcome.command);
+			const diagnosis = {
+				layer: "compat",
+				code: "server-outdated",
+				title: "Server is outdated",
+				message: outdated.detail,
+				remedy: outdated.fix
+			};
 			return {
 				report: {
 					...paired,
-					state: "outdated"
+					state: "outdated",
+					diagnosis
 				},
 				finding: note(outdated.title, outdated.detail, outdated.fix)
 			};
 		}
-		case "unreachable": return {
-			report: {
-				...paired,
-				state: "unreachable"
-			},
-			finding: note(`Could not reach remote machine ${entry}`, outcome.reason, `Check that stim-server runs on ${entry}. To keep it running there, run \`stim-server service install --serve\` on ${entry}.`)
-		};
+		case "unreachable": {
+			const diagnosis = await diagnoseOutcome(io, {
+				entry,
+				peer,
+				port: parsed.port,
+				target: endpoint$1(peer, parsed.port),
+				reason: outcome.reason,
+				transport: outcome.transport
+			});
+			return {
+				report: {
+					...paired,
+					state: "unreachable",
+					diagnosis
+				},
+				finding: diagnosisFinding("build-machine", entry, diagnosis)
+			};
+		}
 	}
 	const permissions = readHostPermissions(outcome.result.host);
 	const host = permissions ? { host: permissions } : {};
@@ -485,7 +578,7 @@ async function inspectMachine(entry, status, deviceName, fix, version, tickets,
 		},
 		finding: null
 	};
-	const { capacity, problems } = await check(outcome.credential);
+	const { capacity, problems, notes = [] } = await check(outcome.credential);
 	return {
 		report: {
 			...paired,
@@ -494,10 +587,11 @@ async function inspectMachine(entry, status, deviceName, fix, version, tickets,
 			offloadable: problems.length === 0,
 			reasons: problems.map((problem) => problem.reason),
 			problems,
+			...notes.length ? { notes } : {},
 			...capacity ? { capacity } : {}
 		},
 		finding: null,
-		extra: offloadFindings(entry, problems)
+		extra: offloadFindings(entry, problems, notes, operation)
 	};
 }
 /**
@@ -519,13 +613,17 @@ async function inspectBuildMachines({ fix, check = null, version = "<version>",
 		machines: []
 	};
 	const status = await io.status();
-	if (!isJsonObject(status)) return {
-		findings: [note("Remote machines are unreachable", "remote.machines names remote machines, but Tailscale is not running.")],
-		machines: entries.map((machine) => ({
-			machine,
-			state: "tailscale-off"
-		}))
-	};
+	if (!isJsonObject(status)) {
+		const diagnosis = await diagnoseTailscale(io);
+		return {
+			findings: [note("Remote machines are unreachable", `remote.machines names remote machines. ${diagnosis.message}`, diagnosis.remedy)],
+			machines: entries.map((machine) => ({
+				machine,
+				state: "tailscale-off",
+				diagnosis
+			}))
+		};
+	}
 	const self = isJsonObject(status.Self) ? status.Self : {};
 	const deviceName = (typeof self.HostName === "string" && self.HostName ? self.HostName : hostname()).replace(/[\p{Cc}\p{Cf}]/gu, "").trim().slice(0, 64) || "Mac";
 	const inspection = {
@@ -547,20 +645,42 @@ const FINGERPRINT_MISMATCH_REMEDY = "The build Mac fingerprints the synced check
 function fingerprintMismatchRemedy(reason) {
 	return reason.startsWith("fingerprint-mismatch: the checkout there ") ? FINGERPRINT_MISMATCH_REMEDY : void 0;
 }
+const MISSING_PACKAGE_MANAGER = /^deps-failed: spawn (pnpm|yarn|npm) ENOENT/;
+/** The remedy for a worker whose dependency install could not start its package manager; undefined for any other reason. */
+function missingPackageManagerRemedy(machine, reason) {
+	const tool = MISSING_PACKAGE_MANAGER.exec(reason)?.[1];
+	if (!tool) return void 0;
+	return `${machine} has no ${tool} on the PATH of its stim-server service, and the app's lockfile needs it. ${tool === "npm" ? "Reinstall Node there, which ships npm" : `Install it with \`corepack enable ${tool}\` or \`npm install --global ${tool}\`, using sudo where Node is installed system-wide`}, then run the same command again, or rerun with --remote-build auto or --remote-build local.`;
+}
+const PODS_FAILED_PREFIX = "pod install failed: ";
+/** The reason a failed worker job is reported with: a `pods-failed` code reads as a failed pod install. */
+function workerFailureReason(code, message) {
+	return code === "pods-failed" ? `${PODS_FAILED_PREFIX}${String(message ?? "")}` : `${String(code ?? "failed")}: ${String(message ?? "")}`;
+}
+/** The remedy for a worker whose `pod install` failed, naming the install when it has no CocoaPods; undefined for any other reason. */
+function podsFailedRemedy(machine, reason, localCocoapods) {
+	if (!reason.startsWith(PODS_FAILED_PREFIX)) return void 0;
+	const retry = "run the same command again, or rerun with --remote-build auto or --remote-build local";
+	if (!reason.includes("CocoaPods is not installed: no `pod` executable on PATH.")) return `Fix the pod install error on ${machine} (run pod install in its checkout under server.workerRoot there to see all of it), then ${retry}.`;
+	const { lead, commands } = cocoapodsInstall(localCocoapods);
+	return [
+		`On ${machine}, ${lead}:`,
+		...commands,
+		`Then ${retry}.`
+	].join("\n");
+}
 var OffloadRefusal = class extends Error {
 	code = "STIM_OFFLOAD_REFUSED";
 	remedy;
-	constructor(machine, reason, remedy = "Run stim doctor --fix to ask for build access if not paired; it prints the stim-server setup command a person runs on the worker to approve this machine. Check stim settings get remote.machines, or rerun with --remote-build auto or --remote-build local.") {
+	constructor(machine, reason, remedy = "Run stim doctor --fix to ask for build access if not paired; it prints the stim-server setup command a person runs on the worker to approve this machine. Check stim settings get remote.machines, or rerun with --remote-build auto, remote or local.") {
 		super(reason.startsWith(`${machine}: `) ? reason : `${machine}: ${reason}`);
 		this.remedy = remedy;
 	}
 };
 function resolveBuildMachine(flag, env, setting) {
 	const selected = flag ?? (env?.trim() || void 0) ?? setting ?? "auto";
-	if (typeof selected !== "string" || !selected.trim() || !parseMachine(selected)) throw Object.assign(/* @__PURE__ */ new Error("--remote-build / remote.build must be auto, local, or a tailnet machine name."), { code: "STIM_BAD_ARG" });
-	const trimmed = selected.trim();
-	const reserved = trimmed.toLowerCase();
-	return reserved === "auto" || reserved === "local" ? reserved : trimmed;
+	if (typeof selected !== "string" || !selected.trim() || !parseMachine(selected)) throw Object.assign(/* @__PURE__ */ new Error("--remote-build / remote.build must be local, auto, remote, remote-only, or a tailnet machine name."), { code: "STIM_BAD_ARG" });
+	return placementWord(selected) ?? selected.trim();
 }
 function parseBuildMachineOption(value) {
 	try {
@@ -569,11 +689,18 @@ function parseBuildMachineOption(value) {
 		throw new InvalidArgumentError(error.message);
 	}
 }
-function requireLocalBuild(selected) {
-	if (selected === "auto" && !automaticMachineEnabled("build", "local")) throw new OffloadRefusal("auto", "local is disabled in remote.buildPoolDisabled; enable it or select a machine explicitly");
+function automaticBuild(selected) {
+	const word = placementWord(selected);
+	return word !== null && word !== "local";
+}
+function requireLocalBuild(selected, reason) {
+	const word = placementWord(selected);
+	const lead = reason ? `${reason}; ` : "";
+	if (word === "remote-only") throw new OffloadRefusal(selected, `${lead}remote-only never builds on this machine`);
+	if ((word === "auto" || word === "remote") && !automaticMachineEnabled("build", "local")) throw new OffloadRefusal(selected, `${lead}local is disabled in remote.buildPoolDisabled; enable it or select a machine explicitly`);
 }
 function namedBuildMachine(selected) {
-	return selected !== "auto" && selected !== "local";
+	return placementWord(selected) === null;
 }
 function requireConfiguredMachine(selected, machines) {
 	if (!namedBuildMachine(selected)) return selected;
@@ -590,16 +717,10 @@ const settingSource = (flag, env, setting) => flag !== void 0 ? "flag" : env?.tr
 /** The settings that decide where a build runs, with the layer each value came from, for this run's `--remote-build`. */
 function buildPlacementSettings(selected) {
 	const flag = operationState(ambientContext()).buildMachineFlag;
-	const remote = loadConfig$1()?.remote;
-	const rawMode = ambientEnv().STIM_REMOTE_BUILD_MODE || remote?.buildMode;
 	return [{
 		key: "remote.build",
 		value: selected,
-		from: settingSource(flag, ambientEnv().STIM_REMOTE_BUILD, remote?.build)
-	}, {
-		key: "remote.buildMode",
-		value: selected === "local" ? "off" : OFFLOAD_MODES.includes(rawMode) ? rawMode : "auto",
-		from: settingSource(void 0, ambientEnv().STIM_REMOTE_BUILD_MODE, remote?.buildMode)
+		from: settingSource(flag, ambientEnv().STIM_REMOTE_BUILD, loadConfig$1()?.remote?.build)
 	}];
 }
 function resolveBuildPlacement(flag) {
@@ -617,10 +738,10 @@ function resolveBuildPlacement(flag) {
 			failure: {
 				code: error.code,
 				message: error.message,
-				remedy: error instanceof OffloadRefusal ? error.remedy : "Pass --remote-build auto, local, or an entry from stim settings get remote.machines."
+				remedy: error instanceof OffloadRefusal ? error.remedy : "Pass --remote-build local, auto, remote, remote-only, or an entry from stim settings get remote.machines."
 			}
 		};
 	}
 }
 //#endregion
-export { parseBuildMachineOption as a, resolveBuildPlacement as c, configuredMachines as d, hostingMachines as f, namedBuildMachine as i, inspectBuildMachines as l, buildPlacementSettings as n, requireLocalBuild as o, inspectDeviceHostMachines as p, fingerprintMismatchRemedy as r, resolveBuildMachine as s, OffloadRefusal as t, pairedMachines as u };
+export { hostingMachines as _, missingPackageManagerRemedy as a, podsFailedRemedy as c, resolveBuildPlacement as d, workerFailureReason as f, configuredMachines as g, predictedRefusal as h, fingerprintMismatchRemedy as i, requireLocalBuild as l, pairedMachines as m, automaticBuild as n, namedBuildMachine as o, inspectBuildMachines as p, buildPlacementSettings as r, parseBuildMachineOption as s, OffloadRefusal as t, resolveBuildMachine as u, inspectDeviceHostMachines as v };

package/dist/{server-bare-CH9X0RLn.mjs → server-bare-BOh-iZEj.mjs}

@@ -1,5 +1,5 @@
-import { O as __commonJSMin, k as __require, t as getExecutor } from "./exec-VFRpu1iA.mjs";
-import { J as resolveProjectSettings } from "./settings-B5tCoq9N.mjs";
+import { O as __commonJSMin, k as __require, t as getExecutor } from "./exec-aULwtNly.mjs";
+import { X as resolveProjectSettings } from "./settings-BDVI8Ivc.mjs";
 import { c as registerMetroStore, f as resolveMetroSharedCache, n as supervisorError, r as appendCacheStore, s as metroStoreRoot } from "./errors-DHm_U5gv.mjs";
 import { createRequire } from "node:module";
 import { isAbsolute, join, relative, sep } from "node:path";