stim 1.35.0 → 1.36.0

package/dist/{artifact-2NIRz6SC.mjs → artifact-ubNdxo_K.mjs}

@@ -1,15 +1,15 @@
 import { D as ownership_claim_exports, d as throwIfCancelled, w as withDrainingCancellation } from "./exec-CGuDzt40.mjs";
-import { E as workspaceDir } from "./workspace-state-BdZ-QgmB.mjs";
-import { _ as stepTimer, i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-CGxrQ3Bd.mjs";
-import { Gn as RESOLVE_TIMEOUT_MS, Xn as isEasAuthFailureText, Yn as easAuthNote } from "./device-capacity-C0PiTyRb.mjs";
-import { A as COMPILATION_CACHE_NOT_RUN, F as compilationCacheActivityLine, _t as runCancellationSignal, lt as cancelledFailure } from "./toolchain-DRQyCvlp.mjs";
-import { C as providerUploadOutcome, D as storedAppId, S as providerDownloadPath, x as prepareProviderDownloadDir } from "./build-cache-_fkewiwH.mjs";
-import { T as clearCorruptCompilationCache, c as offloadPlacement, i as closeOffload, l as placementLoad, n as buildPlacementCandidates, o as offloadBuild, r as chooseBuildMachine, s as offloadCheck, u as remotePhaseText, w as COMPILATION_CACHE_CORRUPT } from "./client-Dy0eJJtz.mjs";
-import { A as fingerprintMismatchRemedy, D as OffloadRefusal, F as requireLocalBuild, M as namedBuildMachine, O as automaticBuild, P as podsFailedRemedy, S as xcodeFailureReport, et as predictedRefusal, j as missingPackageManagerRemedy, p as printDiagnostics, u as isReleaseConfiguration } from "./support-DW575Dnx.mjs";
-import { f as settleFingerprintCheck, u as skippedMissReason } from "./prebuild-BptrXmh_.mjs";
-import { t as buildPlacementRecord } from "./placement-log-D0DZLcJk.mjs";
-import { n as settleArtifactUploads, t as acquireArtifact } from "./acquire-artifact-0E_iw7Rf.mjs";
-import { r as finishIosUpload, t as IosRecipeRefusal } from "./ios-project-PXBDoaii.mjs";
+import { E as workspaceDir } from "./workspace-state-BhwAJBgA.mjs";
+import { _ as stepTimer, i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-T3cDctRE.mjs";
+import { Gn as RESOLVE_TIMEOUT_MS, Xn as isEasAuthFailureText, Yn as easAuthNote } from "./device-capacity-CpAVcKgq.mjs";
+import { A as COMPILATION_CACHE_NOT_RUN, F as compilationCacheActivityLine, _t as runCancellationSignal, lt as cancelledFailure } from "./toolchain-DCnWAxQL.mjs";
+import { C as providerUploadOutcome, D as storedAppId, S as providerDownloadPath, x as prepareProviderDownloadDir } from "./build-cache-BW8T4oD2.mjs";
+import { T as clearCorruptCompilationCache, c as offloadPlacement, i as closeOffload, l as placementLoad, n as buildPlacementCandidates, o as offloadBuild, r as chooseBuildMachine, s as offloadCheck, u as remotePhaseText, w as COMPILATION_CACHE_CORRUPT } from "./client-KSWIeQLA.mjs";
+import { A as fingerprintMismatchRemedy, D as OffloadRefusal, F as requireLocalBuild, M as namedBuildMachine, O as automaticBuild, P as podsFailedRemedy, S as xcodeFailureReport, j as missingPackageManagerRemedy, p as printDiagnostics, tt as predictedRefusal, u as isReleaseConfiguration } from "./support-BJbXovoO.mjs";
+import { f as settleFingerprintCheck, u as skippedMissReason } from "./prebuild-Di2IhUue.mjs";
+import { n as settleArtifactUploads, r as retainFailedTranscript, t as acquireArtifact } from "./acquire-artifact-DGTHCd0Q.mjs";
+import { t as buildPlacementRecord } from "./placement-log-B8RCSzOm.mjs";
+import { r as finishIosUpload, t as IosRecipeRefusal } from "./ios-project-Cz0S1Sz-.mjs";
 import { rmSync } from "node:fs";
 import { join } from "node:path";
 import { machineCapacity } from "@stim-cli/core/state";
@@ -622,15 +622,16 @@ async function acquireIosArtifact({ context, root, logFile, recipe, physical, co
 		if (!result.ok) {
 			phase("build", `FAILED after ${formatDuration(result.durationMs)}`);
 			printDiagnostics(note, result);
+			const transcript = retainFailedTranscript(logFile);
 			const report = result.compilationCacheCorruption ? await clearCorruptCompilationCache(result.compilationCacheCorruption, root) : {
 				code: result.code,
-				...xcodeFailureReport(result, logFile)
+				...xcodeFailureReport(result, transcript)
 			};
 			fail({
 				code: report.code,
 				message: report.message,
 				remedy: report.remedy,
-				logPath: logFile,
+				logPath: transcript,
 				build: {
 					...buildFailure,
 					diagnostics: result.diagnostics
@@ -858,5 +859,33 @@ async function acquireIosArtifact({ context, root, logFile, recipe, physical, co
 		}
 	};
 }
+async function acquireIosArtifactOrRecorded(recorded, request, d) {
+	return recorded ? recordedIosArtifact(recorded) : acquireIosArtifact(request, d);
+}
+function recordedIosArtifact(recorded) {
+	return {
+		ok: true,
+		artifact: {
+			path: recorded.appPath,
+			bundleId: recorded.bundleId,
+			cache: {
+				identity: null,
+				hit: false,
+				providerName: null,
+				buildMachine: "local",
+				offloadedTo: null,
+				offloadFallback: null,
+				readEnabled: false,
+				missReason: null,
+				waitedForBuild: null,
+				compilation: COMPILATION_CACHE_NOT_RUN
+			},
+			failureFields: {},
+			completeUploads: async () => false,
+			release: () => {},
+			cancelFingerprintCheck: () => {}
+		}
+	};
+}
 //#endregion
-export { acquireIosArtifact as t };
+export { acquireIosArtifactOrRecorded as n, acquireIosArtifact as t };

package/dist/{auto-placement-CBdWa87P.mjs → auto-placement-CKFpFCuq.mjs}

@@ -1,10 +1,10 @@
-import { m as getProject, v as loadConfig$1 } from "./config-BW0fAtoK.mjs";
-import { F as peekBudget, d as peekDeviceSlots, t as DEFAULT_DEVICE_SLOT_WAIT_MS } from "./device-capacity-C0PiTyRb.mjs";
-import { z as readHostMemoryPressureAsync } from "./ios-BdZdNsAj.mjs";
-import { I as resolveBuildMachine, M as namedBuildMachine, nt as hostingMachines } from "./support-DW575Dnx.mjs";
-import { h as requireHostedAppMode, l as call, u as connectHost } from "./hosted-client-Bb89P6an.mjs";
-import { c as writeHostedNativeAsync, r as readHostedNative } from "./ios-state-CWsBysyN.mjs";
-import { i as prepareHostedNative } from "./hosted-native-C9xQYYFb.mjs";
+import { m as getProject, v as loadConfig$1 } from "./config-BA3TgoIP.mjs";
+import { F as peekBudget, d as peekDeviceSlots, t as DEFAULT_DEVICE_SLOT_WAIT_MS } from "./device-capacity-CpAVcKgq.mjs";
+import { z as readHostMemoryPressureAsync } from "./ios-BhfpRfNf.mjs";
+import { I as resolveBuildMachine, M as namedBuildMachine, it as hostingMachines } from "./support-BJbXovoO.mjs";
+import { h as requireHostedAppMode, l as call, u as connectHost } from "./hosted-client-DMOOu8vD.mjs";
+import { c as writeHostedNativeAsync, r as readHostedNative } from "./ios-state-Avwz2cbZ.mjs";
+import { i as prepareHostedNative } from "./hosted-native-BiiUG_Q6.mjs";
 import { ambientEnv } from "@stim-cli/core";
 import { automaticMachineEnabled, isJsonObject, machineCapacity, mayRunHere, parseHostedChoice, parseHostedNativeOffer, prefersRemote } from "@stim-cli/core/state";
 import { setTimeout } from "node:timers/promises";

package/dist/{browser-web-CNlRugJv.mjs → browser-web-B63vLrj6.mjs}

@@ -1,17 +1,17 @@
 import { D as ownership_claim_exports, T as process_identity_exports, d as throwIfCancelled, f as WorkspaceProcessCleanupError, p as withWorkspaceProcessLock, t as getExecutor, u as cancelledError } from "./exec-CGuDzt40.mjs";
-import { E as workspaceDir, k as workspaceLogsDir$1, l as withWorkspaceStateLockAsync, r as readWorkspaceState$1 } from "./workspace-state-BdZ-QgmB.mjs";
-import { l as phaseLine } from "./command-output-CGxrQ3Bd.mjs";
-import { m as getProject } from "./config-BW0fAtoK.mjs";
-import { N as metroPortSetting, a as SETTING_SHAPE_REMEDY, ct as webSettings } from "./settings-B5IBDfTx.mjs";
-import { b as isPackageResolvable, v as detectIsExpo } from "./project-Dqqj3IkW.mjs";
-import { d as resolveProjectMetro } from "./metro-B5PVz0Wv.mjs";
+import { E as workspaceDir, k as workspaceLogsDir$1, l as withWorkspaceStateLockAsync, r as readWorkspaceState$1 } from "./workspace-state-BhwAJBgA.mjs";
+import { l as phaseLine } from "./command-output-T3cDctRE.mjs";
+import { m as getProject } from "./config-BA3TgoIP.mjs";
+import { N as metroPortSetting, a as SETTING_SHAPE_REMEDY, ct as webSettings } from "./settings-Bap-qjnp.mjs";
+import { b as isPackageResolvable, v as detectIsExpo } from "./project-Clk1JAWL.mjs";
+import { d as resolveProjectMetro } from "./metro-DM3yJL1M.mjs";
 import { c as readNdjsonGenerations$1 } from "./ndjson-CrjIsGzw.mjs";
-import { dn as readMetroRecords } from "./device-capacity-C0PiTyRb.mjs";
-import { f as webLogFile, m as webSupervisorLogFile, o as readWebRecord, s as updateWebRecord } from "./state-CtmYTRWm.mjs";
-import { ft as teardownBrowserHeld, x as resolveSupervisorTarget } from "./workspaces-CY3KSdC0.mjs";
-import { i as reserveBrowserPort, n as getNamedPort } from "./named-ports-CA0nB9Yw.mjs";
+import { dn as readMetroRecords } from "./device-capacity-CpAVcKgq.mjs";
+import { f as webLogFile, m as webSupervisorLogFile, o as readWebRecord, s as updateWebRecord } from "./state-B9VFI6r0.mjs";
+import { ft as teardownBrowserHeld, x as resolveSupervisorTarget } from "./workspaces-Dh5N70qW.mjs";
+import { i as reserveBrowserPort, n as getNamedPort } from "./named-ports-BvB_CO9B.mjs";
 import { n as sendToOwnedPage, t as liveWebRecord } from "./page-Dj8IqvGM.mjs";
-import { o as resolveWorkspaceMetroPort } from "./start-DIFiT2P5.mjs";
+import { o as resolveWorkspaceMetroPort } from "./start-YpT_JpQQ.mjs";
 import { t as spawnEntry } from "./spawn-entry-jw19m8Nl.mjs";
 import { n as windowsLauncherArgs } from "./detached-entry-tfrgGVWb.mjs";
 import { a as findChrome, t as CHROME_INSTALL_REMEDY } from "./chrome-C8sC5tdl.mjs";

package/dist/{build-CNE3Wo5-.mjs → build-B_Dx9SKJ.mjs}

@@ -1,27 +1,30 @@
 import { d as throwIfCancelled, u as cancelledError, w as withDrainingCancellation } from "./exec-CGuDzt40.mjs";
-import { E as workspaceDir, a as recordWorkspaceUseAsync, k as workspaceLogsDir } from "./workspace-state-BdZ-QgmB.mjs";
-import { l as phaseLine } from "./command-output-CGxrQ3Bd.mjs";
-import { D as upsertProject, k as withConfigLockAsync, m as getProject, u as getConcurrencyLimits } from "./config-BW0fAtoK.mjs";
-import { J as resolveCacheProviderConfig, Z as resolveProjectSettingsAsync, a as SETTING_SHAPE_REMEDY } from "./settings-B5IBDfTx.mjs";
-import { f as projectRegistry, v as detectIsExpo } from "./project-Dqqj3IkW.mjs";
-import { s as workspaceShareURL } from "./stim-desktop-_WTria-r.mjs";
-import { j as hostSystemImageArch } from "./android-Iq0M2t2d.mjs";
+import { E as workspaceDir, a as recordWorkspaceUseAsync, k as workspaceLogsDir } from "./workspace-state-BhwAJBgA.mjs";
+import { l as phaseLine } from "./command-output-T3cDctRE.mjs";
+import { A as withConfigLockAsync, O as upsertProject, m as getProject, u as getConcurrencyLimits } from "./config-BA3TgoIP.mjs";
+import { J as resolveCacheProviderConfig, Z as resolveProjectSettingsAsync, a as SETTING_SHAPE_REMEDY } from "./settings-Bap-qjnp.mjs";
+import { f as projectRegistry, v as detectIsExpo } from "./project-Clk1JAWL.mjs";
+import { s as workspaceShareURL } from "./stim-desktop-D0P_bzmd.mjs";
+import { j as hostSystemImageArch } from "./android-SJx1V3R3.mjs";
 import { i as createNdjsonWriter } from "./ndjson-CrjIsGzw.mjs";
-import { Jn as checkEasAuth, nr as resolveRemote, rr as uploadRemote } from "./device-capacity-C0PiTyRb.mjs";
-import { $ as tapBuildLog, Q as startBuildProgress, St as acquireBuildSlot, Tt as releaseBuildSlot, X as recordFinishedBuild, ct as recordRunStats, it as readRunEstimates, lt as statsProjectKey, rt as createRunRecorder } from "./workspaces-CY3KSdC0.mjs";
-import { H as readBundleId, _t as runCancellationSignal, vt as withNativeBuildRun } from "./toolchain-DRQyCvlp.mjs";
-import { F as waitForBuild, M as acquireBuildLock, P as releaseBuildLock } from "./activity-BQpJpAjA.mjs";
-import { C as providerUploadOutcome, D as storedAppId } from "./build-cache-_fkewiwH.mjs";
-import { m as listIosRuntimes } from "./ios-BdZdNsAj.mjs";
+import { Jn as checkEasAuth, nr as resolveRemote, rr as uploadRemote } from "./device-capacity-CpAVcKgq.mjs";
+import { $ as tapBuildLog, Q as startBuildProgress, St as acquireBuildSlot, Tt as releaseBuildSlot, X as recordFinishedBuild, ct as recordRunStats, it as readRunEstimates, lt as statsProjectKey, rt as createRunRecorder } from "./workspaces-Dh5N70qW.mjs";
+import { H as readBundleId, _t as runCancellationSignal, vt as withNativeBuildRun } from "./toolchain-DCnWAxQL.mjs";
+import { F as waitForBuild, M as acquireBuildLock, P as releaseBuildLock } from "./activity-BpdDvA8Q.mjs";
+import { C as providerUploadOutcome, D as storedAppId } from "./build-cache-BW8T4oD2.mjs";
+import { m as listIosRuntimes } from "./ios-BhfpRfNf.mjs";
 import { d as optimizationBuildProfile, l as artifactCachePolicy } from "./errors-DHm_U5gv.mjs";
-import { C as setRemoteLogSink } from "./client-Dy0eJJtz.mjs";
-import { L as resolveBuildPlacement, c as iosProjectPathError, g as resolveIosBuildSetup, m as resolveConfiguration, x as simulatorBuildArch, y as resolveSchemeSelection } from "./support-DW575Dnx.mjs";
-import { f as settleFingerprintCheck } from "./prebuild-BptrXmh_.mjs";
-import { n as ensureWorkspaceStorageSafely } from "./native-runtime-oDqT4UES.mjs";
-import { t as acquireAndroidArtifact } from "./artifact-BG4h_WTC.mjs";
-import { a as persistLastBuild, l as resolveAndroidBuildPlan, n as finishAndroidUpload } from "./result-DK6nTO-M.mjs";
-import { o as lastBuildRecord } from "./ios-project-PXBDoaii.mjs";
-import { t as acquireIosArtifact } from "./artifact-2NIRz6SC.mjs";
+import { C as setRemoteLogSink } from "./client-KSWIeQLA.mjs";
+import { L as resolveBuildPlacement, c as iosProjectPathError, g as resolveIosBuildSetup, m as resolveConfiguration, x as simulatorBuildArch, y as resolveSchemeSelection } from "./support-BJbXovoO.mjs";
+import { a as resolveEasDevelopmentBuild, r as isEasBuildFailure } from "./eas-build-Xf5Jd6LR.mjs";
+import { f as settleFingerprintCheck } from "./prebuild-Di2IhUue.mjs";
+import { n as ensureWorkspaceStorageSafely } from "./native-runtime-C3_NkUlW.mjs";
+import { n as recordBuild, r as recordedBuildKey } from "./recorded-build-BuGL_fnm.mjs";
+import { E as resolveVariant } from "./support-Vckdzrmk.mjs";
+import { t as acquireAndroidArtifact } from "./artifact-C3srrGVU.mjs";
+import { a as persistLastBuild, l as resolveAndroidBuildPlan, n as finishAndroidUpload } from "./result-BkDpN5Mz.mjs";
+import { o as lastBuildRecord } from "./ios-project-Cz0S1Sz-.mjs";
+import { t as acquireIosArtifact } from "./artifact-ubNdxo_K.mjs";
 import { constants, promises } from "node:fs";
 import { basename, join } from "node:path";
 import { hostSimulatorArch } from "@stim-cli/core";
@@ -48,6 +51,7 @@ async function buildAndroidOperation(context, root, options, { artifactScope, ca
 		settings,
 		settingsContext,
 		env: context.env,
+		easProfile: options.easProfile,
 		variant: options.variant ?? null,
 		buildCache: options.buildCache !== false
 	}, {
@@ -111,6 +115,20 @@ async function buildAndroidOperation(context, root, options, { artifactScope, ca
 			buildMachine: placement.selected,
 			configuration: plan.plan.build.variant
 		};
+		const easBuild = await resolveEasDevelopmentBuild({
+			context,
+			root,
+			platform: "android",
+			profile: options.easProfile,
+			note,
+			isExpo: integration.isExpo,
+			physical: false,
+			selectors: [options.variant],
+			buildCache: options.buildCache,
+			env: context.env,
+			signal: runCancellationSignal(context) ?? context.signal
+		});
+		if (isEasBuildFailure(easBuild)) throw Object.assign(new Error(easBuild.message ?? easBuild.code), easBuild, { details: easBuild });
 		let artifact;
 		let directory;
 		let built = null;
@@ -159,7 +177,7 @@ async function buildAndroidOperation(context, root, options, { artifactScope, ca
 				},
 				cacheProviderConfig: plan.plan.cacheProviderConfig,
 				requestedBuildCache: options.buildCache !== false,
-				easBuild: null,
+				easBuild,
 				androidPackage: (await integration.appIds()).androidPackage,
 				record,
 				maxBuilds: getConcurrencyLimits().maxBuilds,
@@ -244,6 +262,13 @@ async function buildAndroidOperation(context, root, options, { artifactScope, ca
 			});
 			if (built && !failureAfterCleanup) {
 				finishRecord("ok");
+				recordBuild(root, recordedBuildKey({
+					platform: "android",
+					configuration: resolveVariant(options.variant, settings)
+				}), {
+					appPath: built.apkPath,
+					bundleId: built.androidPackage
+				});
 				stats.record({
 					failed: false,
 					cacheHit: record.cacheHit === "local" || record.cacheHit === "remote" ? record.cacheHit : false,
@@ -284,7 +309,7 @@ async function buildIosOperation(context, root, options) {
 		throw Object.assign(new Error(failure.message ?? failure.code), failure, { details: failure });
 	}
 	const { buildMachine, optimizations } = setup;
-	const configuration = resolveConfiguration(options.configuration, settings);
+	const configuration = options.easProfile !== void 0 ? null : resolveConfiguration(options.configuration, settings);
 	const buildScheme = resolveSchemeSelection(options, settings);
 	const problem = await integration.schemeProblem(buildScheme, configuration);
 	if (problem) throw Object.assign(new Error(problem.message ?? problem.code), problem);
@@ -341,6 +366,20 @@ async function buildIosOperation(context, root, options) {
 		});
 		stats.setProject(projectKey);
 		progress.estimate(projectKey);
+		const easBuild = await resolveEasDevelopmentBuild({
+			context,
+			root,
+			platform: "ios",
+			profile: options.easProfile,
+			note,
+			isExpo: integration.isExpo,
+			physical: false,
+			selectors: [options.scheme, options.configuration],
+			buildCache: options.buildCache,
+			env: context.env,
+			signal: runCancellationSignal(context) ?? context.signal
+		});
+		if (isEasBuildFailure(easBuild)) throw Object.assign(new Error(easBuild.message ?? easBuild.code), easBuild, { details: easBuild });
 		let artifact;
 		let directory;
 		let built = null;
@@ -399,6 +438,7 @@ async function buildIosOperation(context, root, options) {
 					},
 					device: null,
 					optimizations: optimizations.ios,
+					easProfile: options.easProfile,
 					cache,
 					phase,
 					note,
@@ -415,7 +455,7 @@ async function buildIosOperation(context, root, options) {
 					providerConfig: resolveCacheProviderConfig(settingsContext),
 					disabledByFlag: options.buildCache === false
 				},
-				easBuild: null,
+				easBuild,
 				maxBuilds: getConcurrencyLimits().maxBuilds,
 				progress: {
 					phase,
@@ -503,6 +543,14 @@ async function buildIosOperation(context, root, options) {
 			});
 			if (built && !failureAfterCleanup) {
 				finish("ok", built.appPath);
+				recordBuild(root, recordedBuildKey({
+					platform: "ios",
+					scheme: resolveSchemeSelection({ scheme: options.scheme }, settings),
+					configuration: resolveConfiguration(options.configuration, settings)
+				}), {
+					appPath: built.appPath,
+					bundleId: built.bundleId
+				});
 				stats.record({
 					failed: false,
 					durationMs: Date.now() - started,

package/dist/{build-cache-_fkewiwH.mjs → build-cache-BW8T4oD2.mjs}

@@ -1,9 +1,9 @@
 import { d as throwIfCancelled, t as getExecutor, w as withDrainingCancellation } from "./exec-CGuDzt40.mjs";
-import { y as sharedBuildCache } from "./workspace-state-BdZ-QgmB.mjs";
+import { y as sharedBuildCache } from "./workspace-state-BhwAJBgA.mjs";
 import { a as killOnAbort, c as gitQuiet, o as git, r as childEnvironment, s as gitAsync } from "./operation-exec-DKlBcKAL.mjs";
-import { m as defaultAndroidLayout } from "./settings-B5IBDfTx.mjs";
-import { r as register } from "./cache-manifest-8JX9S1QJ.mjs";
-import { r as writeSignedTail, t as computeSignedTail } from "./apk-signed-tail-CPpA-3vu.mjs";
+import { m as defaultAndroidLayout } from "./settings-Bap-qjnp.mjs";
+import { r as register } from "./cache-manifest-CxWkZmUr.mjs";
+import { r as writeSignedTail, t as computeSignedTail } from "./apk-signed-tail-eZyXIrnc.mjs";
 import { createHash } from "node:crypto";
 import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { join } from "node:path";

package/dist/{build-plan-BSgR9yKo.mjs → build-plan-CeIooJqn.mjs}

@@ -1,10 +1,10 @@
 import { a as trackReportResource } from "./exec-CGuDzt40.mjs";
-import { i as formatDuration, l as phaseLine, m as shortHash, u as plural } from "./command-output-CGxrQ3Bd.mjs";
-import { an as makeTemporaryDirectory, sn as removeTemporaryEntryAsync } from "./settings-B5IBDfTx.mjs";
-import { Yn as easAuthNote } from "./device-capacity-C0PiTyRb.mjs";
-import { at as readStats, q as estimateBuild } from "./workspaces-CY3KSdC0.mjs";
-import { c as entryDir, t as artifactIn } from "./build-cache-_fkewiwH.mjs";
-import { l as predictBuildMiss, o as staleNativeDirRefusal } from "./prebuild-BptrXmh_.mjs";
+import { i as formatDuration, l as phaseLine, m as shortHash, u as plural } from "./command-output-T3cDctRE.mjs";
+import { an as makeTemporaryDirectory, sn as removeTemporaryEntryAsync } from "./settings-Bap-qjnp.mjs";
+import { Yn as easAuthNote } from "./device-capacity-CpAVcKgq.mjs";
+import { at as readStats, q as estimateBuild } from "./workspaces-Dh5N70qW.mjs";
+import { c as entryDir, t as artifactIn } from "./build-cache-BW8T4oD2.mjs";
+import { l as predictBuildMiss, o as staleNativeDirRefusal } from "./prebuild-Di2IhUue.mjs";
 import chalk from "chalk";
 import { PROVIDER_LOAD_TIMEOUT_ENV, PROVIDER_LOAD_TIMEOUT_MS, buildResolveTimeoutMs, resolveTieredBuild, timeoutFromEnv } from "@stim-cli/cache";
 //#region src/commands/build-plan.ts

package/dist/{cache-manifest-8JX9S1QJ.mjs → cache-manifest-CxWkZmUr.mjs}

@@ -1,4 +1,4 @@
-import { d as getConfigDir } from "./config-BW0fAtoK.mjs";
+import { d as getConfigDir } from "./config-BA3TgoIP.mjs";
 import { cacheDirRefusal, readCacheManifest, updateCacheManifest } from "@stim-cli/core";
 import { join, resolve } from "path";
 import { existsSync } from "fs";

package/dist/cache-manifest.mjs

@@ -1,2 +1,2 @@
-import { a as unregister, i as registeredCaches, n as readManifest, r as register, t as manifestPath } from "./cache-manifest-8JX9S1QJ.mjs";
+import { a as unregister, i as registeredCaches, n as readManifest, r as register, t as manifestPath } from "./cache-manifest-CxWkZmUr.mjs";
 export { manifestPath, readManifest, register, registeredCaches, unregister };

package/dist/{cli-DK24VzHi.mjs → cli-COdXswmc.mjs}

@@ -1,27 +1,28 @@
 import { E as debugLog } from "./exec-CGuDzt40.mjs";
-import { b as refuseRelativeStimPaths } from "./config-BW0fAtoK.mjs";
+import { b as refuseRelativeStimPaths } from "./config-BA3TgoIP.mjs";
 import { readFileSync } from "node:fs";
 import { runId, trace } from "@stim-cli/core/state";
 import { Command } from "commander";
 //#region bin/cli.ts
 const commands = /* @__PURE__ */ new Map([
-	["doctor", () => import("./doctor-BBAb8NLe.mjs")],
-	["worktree", () => import("./worktree-D6myrQ2H.mjs")],
-	["start", () => import("./start-GkRBR1e3.mjs")],
-	["ports", () => import("./ports-C1_1Qgdy.mjs")],
-	["stop", () => import("./stop-QFOqgICJ.mjs")],
-	["ios", () => import("./ios-BCKxjpRp.mjs")],
-	["android", () => import("./android-CjcJE7uA.mjs")],
-	["web", () => import("./web-D1m1LKEz.mjs")],
-	["macos", () => import("./macos-C_e9f5-5.mjs")],
-	["reload", () => import("./reload-CXgce4Yo.mjs")],
-	["device", () => import("./device-mOFYiHiw.mjs")],
-	["logs", () => import("./logs-DwI3Rkpf.mjs")],
-	["settings", () => import("./settings-DcmVICCn.mjs")],
-	["status", () => import("./status-Dost__Vn.mjs")],
-	["stats", () => import("./stats-Dz08IopP.mjs")],
-	["gc", () => import("./gc-CvMEytXz.mjs")],
-	["guide", () => import("./guide-BWozWG7D.mjs")]
+	["doctor", () => import("./doctor-C-46SkBe.mjs")],
+	["worktree", () => import("./worktree-DLm4s2Ib.mjs")],
+	["start", () => import("./start-CVzivp35.mjs")],
+	["ports", () => import("./ports-DhOSyWm9.mjs")],
+	["stop", () => import("./stop-BiI4_VFG.mjs")],
+	["ios", () => import("./ios-BZuhvLGr.mjs")],
+	["android", () => import("./android-B0qTdwnt.mjs")],
+	["web", () => import("./web-Dpj70t4p.mjs")],
+	["macos", () => import("./macos-CduEmWAK.mjs")],
+	["reload", () => import("./reload-BvDuvygc.mjs")],
+	["device", () => import("./device-DNTWFFB1.mjs")],
+	["logs", () => import("./logs-B-DMy1K0.mjs")],
+	["remote", () => import("./remote-PD6CM0xp.mjs")],
+	["settings", () => import("./settings-C_Xu4RNZ.mjs")],
+	["status", () => import("./status-CIvU5-TF.mjs")],
+	["stats", () => import("./stats-COoePEri.mjs")],
+	["gc", () => import("./gc-8Qm_K1iy.mjs")],
+	["guide", () => import("./guide-CuvHRP53.mjs")]
 ]);
 const pkg = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf-8"));
 const program = new Command();

package/dist/cli.mjs

@@ -4,6 +4,6 @@ const encode = (version) => version.split(".", 3).reduce((sum, part) => sum * 1e
 if (encode(process.versions.node) < encode("22.12.0")) {
 	process.stderr.write(`STIM_NODE_UNSUPPORTED: Stim needs Node 22.12.0 or later; this is Node ${process.versions.node} at ${process.execPath}. To run Stim where a project pins an older Node, see https://stim.appandflow.com/docs/requirements#older-node-pins\n`);
 	process.exitCode = 1;
-} else import("./cli-DK24VzHi.mjs");
+} else import("./cli-COdXswmc.mjs");
 //#endregion
 export {};

package/dist/{client-Dy0eJJtz.mjs → client-KSWIeQLA.mjs}

@@ -1,11 +1,11 @@
 import { C as operationState, E as debugLog, d as throwIfCancelled, r as reportSignal, t as getExecutor } from "./exec-CGuDzt40.mjs";
-import { K as resolveEndpoint, V as openAuthenticated, q as sayHello, v as loadConfig$1 } from "./config-BW0fAtoK.mjs";
+import { H as openAuthenticated, J as sayHello, q as resolveEndpoint, v as loadConfig$1 } from "./config-BA3TgoIP.mjs";
 import { o as git, s as gitAsync } from "./operation-exec-DKlBcKAL.mjs";
-import { C as CCACHE_UNAVAILABLE, Or as discoverCaches, S as CCACHE_NOT_RUN, at as maintenanceLogger, ft as planCacheEmptying, ot as emptyCaches } from "./device-capacity-C0PiTyRb.mjs";
+import { C as CCACHE_UNAVAILABLE, Or as discoverCaches, S as CCACHE_NOT_RUN, at as maintenanceLogger, ft as planCacheEmptying, ot as emptyCaches } from "./device-capacity-CpAVcKgq.mjs";
 import { t as canonicalPath } from "./paths-BsJMoPP2.mjs";
-import { A as COMPILATION_CACHE_NOT_RUN, D as readRubyVersion, S as workerToolchain, _t as runCancellationSignal, a as buildsOnlyOnWorker, b as toolchainNotes, c as iosToolchainAsync, j as COMPILATION_CACHE_UNAVAILABLE, o as cocoapodsDifference, y as toolchainMismatches } from "./toolchain-DRQyCvlp.mjs";
+import { A as COMPILATION_CACHE_NOT_RUN, D as readRubyVersion, S as workerToolchain, _t as runCancellationSignal, a as buildsOnlyOnWorker, b as toolchainNotes, c as iosToolchainAsync, j as COMPILATION_CACHE_UNAVAILABLE, o as cocoapodsDifference, y as toolchainMismatches } from "./toolchain-DCnWAxQL.mjs";
 import { t as resolveMaintenanceSettings } from "./settings-D9LtQaUw.mjs";
-import { $ as pairedMachines, D as OffloadRefusal, M as namedBuildMachine, R as workerFailureReason, u as isReleaseConfiguration } from "./support-DW575Dnx.mjs";
+import { D as OffloadRefusal, M as namedBuildMachine, R as workerFailureReason, et as pairedMachines, u as isReleaseConfiguration } from "./support-BJbXovoO.mjs";
 import { n as fingerprintNativeInputs, r as manifestDigest } from "./native-inputs-TRTTTRxt.mjs";
 import { a as sourceManifest, i as nativeTransferManifest, n as gitVisiblePaths, r as nativeFileDigest, t as checkNativeTransferMembership } from "./native-source-ChAGj7R1.mjs";
 import { t as BuildArtifactCache } from "./build-artifact-cache-D7B6seMj.mjs";

package/dist/collector-run.mjs

@@ -1,11 +1,11 @@
 import { T as process_identity_exports } from "./exec-CGuDzt40.mjs";
-import { k as workspaceLogsDir } from "./workspace-state-BdZ-QgmB.mjs";
+import { k as workspaceLogsDir } from "./workspace-state-BhwAJBgA.mjs";
 import { t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { _t as validateDeviceSlot, dt as deviceSlotKey } from "./config-BW0fAtoK.mjs";
-import { c as watchAppPid, i as parseLogcatLine, o as startAndroidLogcat, s as waitForAppPid, t as androidClockOffset } from "./android-B2DSKg-A.mjs";
+import { ft as deviceSlotKey, vt as validateDeviceSlot } from "./config-BA3TgoIP.mjs";
+import { c as watchAppPid, i as parseLogcatLine, o as startAndroidLogcat, s as waitForAppPid, t as androidClockOffset } from "./android-5wkcMFDG.mjs";
 import { i as createNdjsonWriter } from "./ndjson-CrjIsGzw.mjs";
 import { a as startIosDeviceConsole, i as parseDeviceConsoleLine } from "./ios-device-DLdEDWJj.mjs";
-import { a as unregisterCollector, i as registerCollector, r as readCollectors, t as collectorProcessTitle } from "./ownership-hC7xvvxF.mjs";
+import { a as unregisterCollector, i as registerCollector, r as readCollectors, t as collectorProcessTitle } from "./ownership-C3y8wLSl.mjs";
 import { n as parseLogStreamLine, r as startIosLogStream, t as appNameFromBundleId } from "./ios-Qam0bT9n.mjs";
 import { existsSync } from "node:fs";
 import { isAbsolute, join, resolve } from "node:path";

package/dist/{command-output-CGxrQ3Bd.mjs → command-output-T3cDctRE.mjs}

@@ -1,5 +1,5 @@
 import { n as stripAnsi } from "./process-output-Fpl8PYi8.mjs";
-import { t as NO_PROJECT_REFUSAL } from "./project-Dqqj3IkW.mjs";
+import { t as NO_PROJECT_REFUSAL } from "./project-Clk1JAWL.mjs";
 import { quotedPath as quotedPath$1 } from "@stim-cli/core";
 import chalk from "chalk";
 //#region src/diagnostics/launch-error-preview.ts

package/dist/{config-BW0fAtoK.mjs → config-BA3TgoIP.mjs}

@@ -2,7 +2,7 @@ import { D as ownership_claim_exports, T as process_identity_exports, a as track
 import { t as runOperationFile } from "./operation-exec-DKlBcKAL.mjs";
 import { join } from "node:path";
 import { ambientEnv, configDir, ensurePrivateDir } from "@stim-cli/core";
-import { DEFAULT_SERVER_PORT, allMetroPorts, cannotHost, clientIdentity, configCorruptRepair, endpoint, endpoint as endpoint$1, findEnclosingWorktreeRoot, findPeer, findPeer as findPeer$1, getConcurrencyLimits, getConfigPath, getConfigPath as getConfigPath$1, getPlatformDeviceLimits, getProject, getProjectSettings, getRepoSettings, isJsonObject, isPathPrefix as isPathPrefix$1, loadConfig, loadConfig as loadConfig$1, machineEndpoint, parseMachine, parseMachine as parseMachine$1, validateAutomaticPool, withConfigLock, withConfigLock as withConfigLock$1, withConfigLockAsync, withConfigLockAsync as withConfigLockAsync$1 } from "@stim-cli/core/state";
+import { DEFAULT_SERVER_PORT, allMetroPorts, cannotHost, clientIdentity, configCorruptRepair, endpoint, endpoint as endpoint$1, findEnclosingWorktreeRoot, findPeer, findPeer as findPeer$1, getConcurrencyLimits, getConfigPath, getConfigPath as getConfigPath$1, getPlatformDeviceLimits, getProject, getProjectSettings, getRepoSettings, isJsonObject, isPathPrefix as isPathPrefix$1, loadConfig, loadConfig as loadConfig$1, machineEndpoint, parseMachine, parseMachine as parseMachine$1, validateAutomaticPool, withConfigLock, withConfigLock as withConfigLock$1, withConfigLockAsync, withConfigLockAsync as withConfigLockAsync$1, wrongTailnet } from "@stim-cli/core/state";
 import { dirname as dirname$1, isAbsolute as isAbsolute$1, join as join$1, normalize, parse, sep as sep$1 } from "path";
 import { existsSync, lstatSync, readdirSync, readlinkSync, renameSync, statSync, unlinkSync, writeFileSync } from "fs";
 import { InvalidArgumentError } from "commander";
@@ -353,7 +353,20 @@ function tailscaleDiagnosis(code) {
 		};
 	}
 }
-function notOnTailnetDiagnosis(entry, ambiguous) {
+const tailnetLabel = (tailnet) => tailnet.suffix ? `${tailnet.name} (${tailnet.suffix})` : tailnet.name;
+/** A machine that is not on the tailnet this Mac is signed in to now, but was on the one it was signed in to at approval. */
+function wrongTailnetDiagnosis(entry, wrong) {
+	const owner = wrong.owner ? `, or to ${wrong.owner}, the tailnet that owns ${entry}` : "";
+	return {
+		layer: "peer",
+		code: "peer-wrong-tailnet",
+		title: "Other Tailscale account",
+		message: `This Mac asked ${entry} for access while it was signed in to the Tailscale tailnet ${tailnetLabel(wrong.recorded)}. This Mac is signed in to ${tailnetLabel(wrong.current)} now, and no peer there is named ${entry}.`,
+		remedy: `Switch Tailscale on this Mac to ${tailnetLabel(wrong.recorded)}${owner}, then run \`stim doctor\` again.`
+	};
+}
+function notOnTailnetDiagnosis(entry, ambiguous, wrong) {
+	if (wrong && !ambiguous) return wrongTailnetDiagnosis(entry, wrong);
 	return {
 		layer: "peer",
 		code: ambiguous ? "peer-ambiguous" : "peer-not-found",
@@ -498,7 +511,7 @@ function unconfirmedKeyFinding(code, entry, fingerprint) {
 		level: "note",
 		title: `Remote machine ${entry} needs its server key confirmed`,
 		detail: `${entry} approved this machine and answered with the stim-server key fingerprint ${fingerprint}. On the local network nothing vouches for that key, so Stim pins it only after a person checks it against the fingerprint \`stim-server setup\` printed there. Until then this machine does not use ${entry}.`,
-		fix: `Run \`stim doctor --fix\` in a terminal here and answer y only if the fingerprint matches. If it does not, another machine answered at that address: do not confirm, and check the address in remote.machines.`
+		fix: `Run \`stim remote list\` in a terminal here and answer y only if the fingerprint matches. If it does not, another machine answered at that address: do not confirm, and check the address in remote.machines.`
 	};
 }
 function diagnosisFinding(code, entry, diagnosis) {
@@ -637,7 +650,7 @@ function outdatedServer(entry, version, command) {
 	return {
 		title: `Remote machine ${entry} runs an older stim-server`,
 		detail: `The stim-server on ${entry} speaks an older protocol than this Stim, so it cannot authenticate this machine.`,
-		fix: command ? `${update}, then run this there to approve this machine: ${command}\nAfter approving, run \`stim doctor\` on this machine to reconnect.` : `${update}, then run \`stim doctor --fix\` here.`
+		fix: command ? `${update}, then run this there to approve this machine: ${command}\nAfter approving, run \`stim remote list\` on this machine to reconnect.` : `${update}, then run \`stim remote add ${entry}\` here.`
 	};
 }
 /**
@@ -883,9 +896,19 @@ async function diagnoseTailscale(io) {
 	const reading = readTailscale(io.rawStatus ? await io.rawStatus() : null);
 	return tailscaleDiagnosis(reading.running ? "tailscale-unavailable" : reading.code);
 }
-/** Where to reach a paired machine now, or why Stim cannot; the handshake then checks its pinned key. */
+/**
+* Where to reach a paired machine now, or why Stim cannot; the handshake then checks its pinned key. A machine
+* missing from the tailnet this Mac is signed in to says so when the credential recorded another tailnet.
+*/
 async function resolveEndpoint(credential, status = () => tailscaleStatusAsync(signal), signal) {
-	return machineEndpoint(credential.machine, parseMachine(credential.machine)?.transport === "tailscale" ? await status() : null);
+	const parsed = parseMachine(credential.machine);
+	const current = parsed?.transport === "tailscale" ? await status() : null;
+	const found = machineEndpoint(credential.machine, current);
+	if (typeof found !== "string" || parsed?.transport !== "tailscale" || findPeer(current, parsed.name) !== "missing") return found;
+	const wrong = wrongTailnet(credential, current);
+	if (!wrong) return found;
+	const { message, remedy } = wrongTailnetDiagnosis(credential.machine, wrong);
+	return `${message} ${remedy}`.replace(/\.$/, "");
 }
 /**
 * Shows a local network machine's server key fingerprint and asks a person whether it matches the one
@@ -910,7 +933,7 @@ function keyConfirmer(ask) {
 }
 /** The remedy for a pending request: the printed setup command, or where the person finds it. */
 function setupRemedy(entry, command) {
-	return command ? `A person on ${entry} runs this there to approve this machine: ${command}\nAfter approving, run \`stim doctor\` on this machine to reconnect.` : `A person on ${entry} runs the \`stim-server setup\` command Stim Desktop showed for this machine.`;
+	return command ? `A person on ${entry} runs this there to approve this machine: ${command}\nAfter approving, run \`stim remote list\` on this machine to reconnect.` : `A person on ${entry} runs the \`stim-server setup\` command Stim Desktop showed for this machine.`;
 }
 function setupCommand(machine, ticket, expiresAt, flags, version) {
 	const parsed = parseMachine(machine);
@@ -928,10 +951,12 @@ function newPending(input, ticket, expiresAt, now) {
 		state: "pending",
 		requestedAt: new Date(now).toISOString(),
 		ticket,
-		...expiresAt ? { expiresAt } : {}
+		...expiresAt ? { expiresAt } : {},
+		...input.tailnet ? { tailnet: input.tailnet } : {}
 	};
 }
 function approved(input, reply, requestedAt) {
+	const tailnet = input.credential?.tailnet ?? input.tailnet;
 	return {
 		state: "approved",
 		credential: {
@@ -941,7 +966,8 @@ function approved(input, reply, requestedAt) {
 			state: "approved",
 			requestedAt,
 			serverKey: reply.serverKey,
-			deviceId: reply.result.device.id
+			deviceId: reply.result.device.id,
+			...tailnet ? { tailnet } : {}
 		},
 		result: reply.result
 	};
@@ -1318,6 +1344,29 @@ async function writeConfigSettingAsync(target, dottedKey, value, signal) {
 	const status = target.scope === "machine" && (dottedKey === "remote.machines" || localDevicePoolOff(dottedKey, value)) ? await tailscaleStatusAsync(signal) : null;
 	return withConfigLockAsync(() => applyConfigSetting(target, dottedKey, value, status), signal);
 }
+/**
+* Replaces machine-scope `remote.machines` with `change` applied to the list read under the config lock, so a
+* concurrent writer's entries are kept. `status` is the `tailscale status` the automatic device pool check reads.
+* Returns the list before and after; null before when the setting is not a list of strings, in which case nothing is
+* written.
+*/
+async function updateRemoteMachinesAsync(change, status, signal) {
+	signal?.throwIfAborted();
+	return withConfigLockAsync(() => {
+		const remote = loadConfig()?.remote;
+		const current = remote === void 0 ? [] : isJsonObject(remote) ? remote.machines === void 0 ? [] : remote.machines : null;
+		if (!Array.isArray(current) || !current.every((each) => typeof each === "string")) return {
+			before: null,
+			after: []
+		};
+		const after = change(current);
+		if (after.length !== current.length || after.some((each, at) => each !== current[at])) applyConfigSetting({ scope: "machine" }, "remote.machines", after, status);
+		return {
+			before: current,
+			after
+		};
+	}, signal);
+}
 function applyConfigSetting(target, dottedKey, value, status) {
 	const cfg = value === void 0 ? loadConfig() : ensureConfig();
 	const settings = cfg ? targetSettings(cfg, target, value !== void 0) : null;
@@ -1389,4 +1438,4 @@ function allConsolePortsAndSerials({ isMounted = isOnMountedVolume } = {}) {
 	return result;
 }
 //#endregion
-export { unconfirmedKeyFinding as $, writeConfigSetting as A, keyConfirmer as B, removeProject as C, upsertProject as D, setSupervisor as E, diagnoseOutcome as F, realIo as G, outdatedServer as H, diagnoseTailscale as I, setupRemedy as J, resolveEndpoint as K, doctorIo as L, acquireAvdClaim as M, SERVER_OUTDATED as N, withConfigLock$1 as O, diagnoseConnectFailure as P, notOnTailnetDiagnosis as Q, endpoint$1 as R, releaseMetroPort as S, setDevice as T, parseMachine$1 as U, openAuthenticated as V, reachMachine as W, diagnoseLocalUnreachable as X, tailscaleStatusAsync as Y, diagnosisFinding as Z, isPathPrefix$1 as _, validateDeviceSlot as _t, clearDevice as a, isOnMountedVolume as at, refuseRelativeStimPaths as b, ensureConfig as c, volumeRootFor as ct, getConfigDir as d, deviceSlotKey as dt, readHostPermissions as et, getConfigPath$1 as f, deviceSlotPlatforms as ft, getRepoSettings as g, removeSlotDevice as gt, getProjectSettings as h, projectDeviceSlots as ht, clearAndroidBootPending as i, isAbsentPath as it, writeConfigSettingAsync as j, withConfigLockAsync$1 as k, findEnclosingWorktreeRoot as l, assignSlotDevice as lt, getProject as m, parseDeviceSlotOption as mt, allMetroPorts as n, directorySizeAsync as nt, clearSupervisor as o, listMountedVolumes as ot, getPlatformDeviceLimits as p, parseDeviceSlotKey as pt, sayHello as q, claimMetroPort as r, formatBytes as rt, configCorruptRepair as s, measuredDirectorySizeAsync as st, allConsolePortsAndSerials as t, directorySize as tt, getConcurrencyLimits as u, deviceSlotFileKey as ut, loadConfig$1 as v, saveConfig as w, releaseAndroidConsolePort as x, recordIosSchemeApprovals as y, findPeer$1 as z };
+export { notOnTailnetDiagnosis as $, withConfigLockAsync$1 as A, findPeer$1 as B, removeProject as C, updateRemoteMachinesAsync as D, setSupervisor as E, diagnoseConnectFailure as F, reachMachine as G, openAuthenticated as H, diagnoseOutcome as I, sayHello as J, realIo as K, diagnoseTailscale as L, writeConfigSettingAsync as M, acquireAvdClaim as N, upsertProject as O, SERVER_OUTDATED as P, diagnosisFinding as Q, doctorIo as R, releaseMetroPort as S, setDevice as T, outdatedServer as U, keyConfirmer as V, parseMachine$1 as W, tailscaleStatusAsync as X, setupRemedy as Y, diagnoseLocalUnreachable as Z, isPathPrefix$1 as _, removeSlotDevice as _t, clearDevice as a, isAbsentPath as at, refuseRelativeStimPaths as b, ensureConfig as c, measuredDirectorySizeAsync as ct, getConfigDir as d, deviceSlotFileKey as dt, unconfirmedKeyFinding as et, getConfigPath$1 as f, deviceSlotKey as ft, getRepoSettings as g, projectDeviceSlots as gt, getProjectSettings as h, parseDeviceSlotOption as ht, clearAndroidBootPending as i, formatBytes as it, writeConfigSetting as j, withConfigLock$1 as k, findEnclosingWorktreeRoot as l, volumeRootFor as lt, getProject as m, parseDeviceSlotKey as mt, allMetroPorts as n, directorySize as nt, clearSupervisor as o, isOnMountedVolume as ot, getPlatformDeviceLimits as p, deviceSlotPlatforms as pt, resolveEndpoint as q, claimMetroPort as r, directorySizeAsync as rt, configCorruptRepair as s, listMountedVolumes as st, allConsolePortsAndSerials as t, readHostPermissions as tt, getConcurrencyLimits as u, assignSlotDevice as ut, loadConfig$1 as v, validateDeviceSlot as vt, saveConfig as w, releaseAndroidConsolePort as x, recordIosSchemeApprovals as y, endpoint$1 as z };