stim 1.36.0 → 1.38.0

package/dist/{artifact-C3srrGVU.mjs → artifact-Dc1GsK7o.mjs}

@@ -1,16 +1,16 @@
-import { D as ownership_claim_exports, d as throwIfCancelled, w as withDrainingCancellation } from "./exec-CGuDzt40.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 { C as CCACHE_UNAVAILABLE, Gn as RESOLVE_TIMEOUT_MS, S as CCACHE_NOT_RUN, Xn as isEasAuthFailureText, Yn as easAuthNote, w as ccacheActivityLine } from "./device-capacity-CpAVcKgq.mjs";
-import { _t as runCancellationSignal, lt as cancelledFailure } from "./toolchain-DCnWAxQL.mjs";
-import { S as providerDownloadPath, x as prepareProviderDownloadDir } from "./build-cache-BW8T4oD2.mjs";
-import { c as offloadPlacement, i as closeOffload, l as placementLoad, n as buildPlacementCandidates, o as offloadBuild, r as chooseBuildMachine, u as remotePhaseText } from "./client-KSWIeQLA.mjs";
-import { A as fingerprintMismatchRemedy, D as OffloadRefusal, F as requireLocalBuild, M as namedBuildMachine, O as automaticBuild, j as missingPackageManagerRemedy } from "./support-BJbXovoO.mjs";
-import { f as formatDiagnostic } from "./react-native-build-CJega_NM.mjs";
-import { u as skippedMissReason } from "./prebuild-Di2IhUue.mjs";
-import { a as PLATFORM, h as displayPath } from "./support-Vckdzrmk.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 { D as ownership_claim_exports, d as throwIfCancelled, w as withDrainingCancellation } from "./exec-L37dbiIb.mjs";
+import { E as workspaceDir } from "./workspace-state-CHEN_xzy.mjs";
+import { _ as stepTimer, i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-DsjhOzJ3.mjs";
+import { $n as isEasAuthFailureText, C as CCACHE_UNAVAILABLE, Jn as RESOLVE_TIMEOUT_MS, Qn as easAuthNote, S as CCACHE_NOT_RUN, w as ccacheActivityLine } from "./device-capacity-D_IlxZRL.mjs";
+import { mt as runCancellationSignal, ot as cancelledFailure } from "./toolchain-CZvtCZ-m.mjs";
+import { S as providerDownloadPath, x as prepareProviderDownloadDir } from "./build-cache-CJ65Efv7.mjs";
+import { c as offloadPlacement, i as closeOffload, l as placementLoad, n as buildPlacementCandidates, o as offloadBuild, r as chooseBuildMachine, s as offloadCheck, u as remotePhaseText } from "./client-qwmHFSga.mjs";
+import { A as fingerprintMismatchRemedy, D as OffloadRefusal, F as requireLocalBuild, M as namedBuildMachine, O as automaticBuild, j as missingPackageManagerRemedy, tt as predictedRefusal } from "./support-BeVRaMWT.mjs";
+import { f as formatDiagnostic } from "./react-native-build-CFYTYmG4.mjs";
+import { i as skippedMissReason } from "./miss-reason-CeHvzeVm.mjs";
+import { a as PLATFORM, h as displayPath } from "./support-DBKG3Yyb.mjs";
+import { n as settleArtifactUploads, r as retainFailedTranscript, t as acquireArtifact } from "./acquire-artifact-QKPDkesw.mjs";
+import { t as buildPlacementRecord } from "./placement-log-CM0DSELs.mjs";
 import { t as AndroidRecipeRefusal } from "./android-project-BCAAmMwz.mjs";
 import { rmSync } from "node:fs";
 import { join } from "node:path";
@@ -311,8 +311,7 @@ async function acquireAndroidArtifact({ context, root, buildLog, writer, recipe,
 		}
 		return true;
 	}
-	/** Whether this build should leave this machine, before any machine is asked; null builds here. */
-	function placeBuild() {
+	async function placeBuild() {
 		if (cacheIneligible && !recipe.offload?.supportsUncachedArtifacts) {
 			if (namedBuildMachine(buildMachine)) throw new OffloadRefusal(buildMachine, cacheIneligible);
 			hereReason = cacheIneligible;
@@ -349,6 +348,21 @@ async function acquireAndroidArtifact({ context, root, buildLog, writer, recipe,
 			if (buildMachine !== "local") phase("build", `placement: here (${placement.reason})`);
 			return null;
 		}
+		const named = machines.find((each) => each.machine === buildMachine);
+		const offload = recipe.offload;
+		if (placement.code === "named" && named && offload) {
+			const check = await offloadCheck(root, async () => [await offload.target()])(named).catch((error) => {
+				throwIfCancelled(signal, "Android build");
+				fallBack(error instanceof Error ? error.message : String(error));
+				return null;
+			});
+			if (!check) return null;
+			const predicted = predictedRefusal(buildMachine, check.problems);
+			if (predicted) fallBack(predicted.reason, predicted.reason, {
+				machine: buildMachine,
+				remedy: predicted.remedy
+			});
+		}
 		return {
 			cacheOnly: false,
 			here,

package/dist/{artifact-platform-DqCWUieN.mjs → artifact-platform-BaGL1i1X.mjs}

@@ -1,4 +1,4 @@
-import { t as getExecutor } from "./exec-CGuDzt40.mjs";
+import { t as getExecutor } from "./exec-L37dbiIb.mjs";
 import { join } from "node:path";
 //#region src/macos/artifact-platform.ts
 async function validateMacosArtifactPlatform(context, bundle, product, signal, nodeArch = process.arch) {

package/dist/{artifact-ubNdxo_K.mjs → artifact-sGoFVK1q.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-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 { D as ownership_claim_exports, d as throwIfCancelled, w as withDrainingCancellation } from "./exec-L37dbiIb.mjs";
+import { E as workspaceDir } from "./workspace-state-CHEN_xzy.mjs";
+import { _ as stepTimer, i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-DsjhOzJ3.mjs";
+import { $n as isEasAuthFailureText, Jn as RESOLVE_TIMEOUT_MS, Qn as easAuthNote } from "./device-capacity-D_IlxZRL.mjs";
+import { D as COMPILATION_CACHE_NOT_RUN, M as compilationCacheActivityLine, mt as runCancellationSignal, ot as cancelledFailure } from "./toolchain-CZvtCZ-m.mjs";
+import { C as providerUploadOutcome, D as storedAppId, S as providerDownloadPath, x as prepareProviderDownloadDir } from "./build-cache-CJ65Efv7.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-qwmHFSga.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-BeVRaMWT.mjs";
+import { i as skippedMissReason, o as settleFingerprintCheck } from "./miss-reason-CeHvzeVm.mjs";
+import { n as settleArtifactUploads, r as retainFailedTranscript, t as acquireArtifact } from "./acquire-artifact-QKPDkesw.mjs";
+import { t as buildPlacementRecord } from "./placement-log-CM0DSELs.mjs";
+import { r as finishIosUpload, t as IosRecipeRefusal } from "./ios-project-Bsm-eqwv.mjs";
 import { rmSync } from "node:fs";
 import { join } from "node:path";
 import { machineCapacity } from "@stim-cli/core/state";

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

@@ -1,10 +1,10 @@
-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 { m as getProject, v as loadConfig$1 } from "./config-CNmN-ndb.mjs";
+import { F as peekBudget, d as peekDeviceSlots, t as DEFAULT_DEVICE_SLOT_WAIT_MS } from "./device-capacity-D_IlxZRL.mjs";
+import { z as readHostMemoryPressureAsync } from "./ios-DQEzde6f.mjs";
+import { I as resolveBuildMachine, M as namedBuildMachine, it as hostingMachines } from "./support-BeVRaMWT.mjs";
+import { h as requireHostedAppMode, l as call, u as connectHost } from "./hosted-client-B_h_bTlz.mjs";
+import { c as writeHostedNativeAsync, r as readHostedNative } from "./ios-state-tzD0s7pt.mjs";
+import { i as prepareHostedNative } from "./hosted-native-B6ur_0OJ.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-B63vLrj6.mjs → browser-web-7Oj57Roa.mjs}

@@ -1,20 +1,20 @@
-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-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 { 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-L37dbiIb.mjs";
+import { E as workspaceDir, k as workspaceLogsDir$1, l as withWorkspaceStateLockAsync, r as readWorkspaceState$1 } from "./workspace-state-CHEN_xzy.mjs";
+import { l as phaseLine } from "./command-output-DsjhOzJ3.mjs";
+import { m as getProject } from "./config-CNmN-ndb.mjs";
+import { N as metroPortSetting, a as SETTING_SHAPE_REMEDY, ct as webSettings } from "./settings-Cz8kQJzr.mjs";
+import { b as isPackageResolvable, v as detectIsExpo } from "./project-DIo71tGq.mjs";
+import { d as resolveProjectMetro } from "./metro-Cj6W4qOO.mjs";
 import { c as readNdjsonGenerations$1 } from "./ndjson-CrjIsGzw.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-YpT_JpQQ.mjs";
+import { mn as readMetroRecords } from "./device-capacity-D_IlxZRL.mjs";
+import { f as webLogFile, m as webSupervisorLogFile, o as readWebRecord, s as updateWebRecord } from "./state-C2vELPyr.mjs";
+import { pt as teardownBrowserHeld, x as resolveSupervisorTarget } from "./workspaces-BgAYIccE.mjs";
+import { i as reserveBrowserPort, n as getNamedPort } from "./named-ports-DZ8DrkH1.mjs";
+import { n as sendToOwnedPage, t as liveWebRecord } from "./page-CoN9al_x.mjs";
+import { o as resolveWorkspaceMetroPort } from "./start-DI0ofPO-.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";
+import { n as windowsLauncherArgs } from "./detached-entry-VqFeEE9W.mjs";
+import { a as findChrome, t as CHROME_INSTALL_REMEDY } from "./chrome-DL5znvmo.mjs";
 import { randomUUID } from "node:crypto";
 import { mkdirSync, openSync, statSync, watch } from "node:fs";
 import { ambientEnv } from "@stim-cli/core";

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

@@ -1,32 +1,32 @@
-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-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 { d as throwIfCancelled, u as cancelledError, w as withDrainingCancellation } from "./exec-L37dbiIb.mjs";
+import { E as workspaceDir, a as recordWorkspaceUseAsync, k as workspaceLogsDir } from "./workspace-state-CHEN_xzy.mjs";
+import { l as phaseLine } from "./command-output-DsjhOzJ3.mjs";
+import { A as withConfigLockAsync, O as upsertProject, m as getProject, u as getConcurrencyLimits } from "./config-CNmN-ndb.mjs";
+import { J as resolveCacheProviderConfig, Z as resolveProjectSettingsAsync, a as SETTING_SHAPE_REMEDY } from "./settings-Cz8kQJzr.mjs";
+import { f as projectRegistry, v as detectIsExpo } from "./project-DIo71tGq.mjs";
+import { s as workspaceShareURL } from "./stim-desktop-DWGAfaud.mjs";
+import { j as hostSystemImageArch } from "./android-27_JgJ1T.mjs";
 import { i as createNdjsonWriter } from "./ndjson-CrjIsGzw.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 { Zn as checkEasAuth, ar as resolveRemote, or as uploadRemote } from "./device-capacity-D_IlxZRL.mjs";
+import { $ as startBuildProgress, Ct as acquireBuildSlot, Et as releaseBuildSlot, Z as recordFinishedBuild, at as readRunEstimates, et as tapBuildLog, it as createRunRecorder, lt as recordRunStats, ut as statsProjectKey } from "./workspaces-BgAYIccE.mjs";
+import { ht as withNativeBuildRun, mt as runCancellationSignal, z as readBundleId } from "./toolchain-CZvtCZ-m.mjs";
+import { F as waitForBuild, M as acquireBuildLock, P as releaseBuildLock } from "./activity-CANftndU.mjs";
+import { C as providerUploadOutcome, D as storedAppId } from "./build-cache-CJ65Efv7.mjs";
+import { m as listIosRuntimes } from "./ios-DQEzde6f.mjs";
 import { d as optimizationBuildProfile, l as artifactCachePolicy } from "./errors-DHm_U5gv.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 { C as setRemoteLogSink } from "./client-qwmHFSga.mjs";
+import { L as resolveBuildPlacement, c as iosProjectPathError, g as resolveIosBuildSetup, m as resolveConfiguration, x as simulatorBuildArch, y as resolveSchemeSelection } from "./support-BeVRaMWT.mjs";
+import { a as resolveEasDevelopmentBuild, r as isEasBuildFailure } from "./eas-build-4rg9WpEg.mjs";
+import { o as settleFingerprintCheck } from "./miss-reason-CeHvzeVm.mjs";
+import { n as ensureWorkspaceStorageSafely } from "./native-runtime-BfvvAJLd.mjs";
+import { i as recordedBuildKey, n as pruneArtifactCopies, r as recordBuild } from "./recorded-build-B4prJjSD.mjs";
+import { E as resolveVariant } from "./support-DBKG3Yyb.mjs";
+import { t as acquireAndroidArtifact } from "./artifact-Dc1GsK7o.mjs";
+import { a as persistLastBuild, l as resolveAndroidBuildPlan, n as finishAndroidUpload } from "./result-C-ISEJ5F.mjs";
+import { o as lastBuildRecord } from "./ios-project-Bsm-eqwv.mjs";
+import { t as acquireIosArtifact } from "./artifact-sGoFVK1q.mjs";
 import { constants, promises } from "node:fs";
-import { basename, join } from "node:path";
+import { basename, dirname, join } from "node:path";
 import { hostSimulatorArch } from "@stim-cli/core";
 import chalk from "chalk";
 import { loadCacheProvider } from "@stim-cli/cache";
@@ -269,6 +269,7 @@ async function buildAndroidOperation(context, root, options, { artifactScope, ca
 					appPath: built.apkPath,
 					bundleId: built.androidPackage
 				});
+				await pruneArtifactCopies(root, "android", dirname(built.apkPath), (line) => phase("artifacts", chalk.yellow(line)));
 				stats.record({
 					failed: false,
 					cacheHit: record.cacheHit === "local" || record.cacheHit === "remote" ? record.cacheHit : false,
@@ -321,8 +322,7 @@ async function buildIosOperation(context, root, options) {
 	const arch = options.arch === "all" ? null : options.arch ?? simulatorBuildArch({
 		physical: false,
 		remoteArch: null,
-		hostArch: hostSimulatorArch(),
-		configuration
+		hostArch: hostSimulatorArch()
 	});
 	const cache = artifactCachePolicy(optimizations, options.buildCache !== false, integration.runtimeKind(configuration) === "embedded-js");
 	const phase = (label, line) => note(phaseLine(label, line));
@@ -551,6 +551,7 @@ async function buildIosOperation(context, root, options) {
 					appPath: built.appPath,
 					bundleId: built.bundleId
 				});
+				await pruneArtifactCopies(root, "ios", dirname(built.appPath), (line) => phase("artifacts", chalk.yellow(line)));
 				stats.record({
 					failed: false,
 					durationMs: Date.now() - started,

package/dist/{build-cache-BW8T4oD2.mjs → build-cache-CJ65Efv7.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-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-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 { d as throwIfCancelled, t as getExecutor, w as withDrainingCancellation } from "./exec-L37dbiIb.mjs";
+import { y as sharedBuildCache } from "./workspace-state-CHEN_xzy.mjs";
+import { a as killOnAbort, c as gitQuiet, o as git, r as childEnvironment, s as gitAsync } from "./operation-exec-DNynwpqO.mjs";
+import { m as defaultAndroidLayout } from "./settings-Cz8kQJzr.mjs";
+import { r as register } from "./cache-manifest-BO0TIcPV.mjs";
+import { r as writeSignedTail, t as computeSignedTail } from "./apk-signed-tail-DHMkXs4s.mjs";
 import { createHash } from "node:crypto";
 import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { join } from "node:path";
@@ -181,7 +181,10 @@ const FINGERPRINT_PLATFORMS = /* @__PURE__ */ new Set(["ios", "android"]);
 const DEFAULT_FINGERPRINT_IGNORES = [
 	"**/android/local.properties",
 	"**/android/.idea/**",
-	"**/*.xcodeproj/xcuserdata/**/*"
+	"**/*.xcodeproj/xcuserdata/**/*",
+	"**/.git",
+	"**/.git/**",
+	"**/.expo/**"
 ];
 /**
 * `react-native bundle` output, ignored only while an ignore pattern matches it: a committed copy can be a native

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

@@ -1,10 +1,11 @@
-import { a as trackReportResource } from "./exec-CGuDzt40.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 { a as trackReportResource } from "./exec-L37dbiIb.mjs";
+import { i as formatDuration, l as phaseLine, m as shortHash, u as plural } from "./command-output-DsjhOzJ3.mjs";
+import { an as makeTemporaryDirectory, sn as removeTemporaryEntryAsync } from "./settings-Cz8kQJzr.mjs";
+import { Qn as easAuthNote } from "./device-capacity-D_IlxZRL.mjs";
+import { J as estimateBuild, ot as readStats } from "./workspaces-BgAYIccE.mjs";
+import { c as entryDir, t as artifactIn } from "./build-cache-CJ65Efv7.mjs";
+import { R as staleNativeDirRefusal } from "./worktree-kGPE9Pcw.mjs";
+import { r as predictBuildMiss } from "./miss-reason-CeHvzeVm.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-CxWkZmUr.mjs → cache-manifest-BO0TIcPV.mjs}

@@ -1,4 +1,4 @@
-import { d as getConfigDir } from "./config-BA3TgoIP.mjs";
+import { d as getConfigDir } from "./config-CNmN-ndb.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-CxWkZmUr.mjs";
+import { a as unregister, i as registeredCaches, n as readManifest, r as register, t as manifestPath } from "./cache-manifest-BO0TIcPV.mjs";
 export { manifestPath, readManifest, register, registeredCaches, unregister };

package/dist/{cdp-C216kOAn.mjs → cdp-CgT47_9A.mjs}

@@ -1,4 +1,4 @@
-import { d as throwIfCancelled, u as cancelledError } from "./exec-CGuDzt40.mjs";
+import { d as throwIfCancelled, u as cancelledError } from "./exec-L37dbiIb.mjs";
 import { WebSocket } from "ws";
 //#region src/web/cdp.ts
 const COMMAND_TIMEOUT_MS = 15e3;

package/dist/{chrome-C8sC5tdl.mjs → chrome-DL5znvmo.mjs}

@@ -1,4 +1,4 @@
-import { t as getExecutor } from "./exec-CGuDzt40.mjs";
+import { t as getExecutor } from "./exec-L37dbiIb.mjs";
 import { existsSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";

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

@@ -1,28 +1,28 @@
-import { E as debugLog } from "./exec-CGuDzt40.mjs";
-import { b as refuseRelativeStimPaths } from "./config-BA3TgoIP.mjs";
+import { E as debugLog } from "./exec-L37dbiIb.mjs";
+import { b as refuseRelativeStimPaths } from "./config-CNmN-ndb.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-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")]
+	["doctor", () => import("./doctor-BAA3zN5U.mjs")],
+	["worktree", () => import("./worktree-C0YZ6mnk.mjs")],
+	["start", () => import("./start-BZWr85b2.mjs")],
+	["ports", () => import("./ports-CKORWlC0.mjs")],
+	["stop", () => import("./stop-B2zDplJa.mjs")],
+	["ios", () => import("./ios-Bi0bQiZ_.mjs")],
+	["android", () => import("./android-Biwc4Dck.mjs")],
+	["web", () => import("./web-DDL3usMb.mjs")],
+	["macos", () => import("./macos-C5liDnbP.mjs")],
+	["reload", () => import("./reload-DANrKhQR.mjs")],
+	["device", () => import("./device-CxMwX0VO.mjs")],
+	["logs", () => import("./logs-B0etn-BD.mjs")],
+	["remote", () => import("./remote-BWuq9qHV.mjs")],
+	["settings", () => import("./settings-BthPoY3t.mjs")],
+	["status", () => import("./status-BG2S-a1d.mjs")],
+	["stats", () => import("./stats-BDljWVWU.mjs")],
+	["gc", () => import("./gc-BQ5dXnC7.mjs")],
+	["guide", () => import("./guide-DqJCc4vW.mjs")]
 ]);
 const pkg = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf-8"));
 const program = new Command();
@@ -54,7 +54,7 @@ try {
 			}));
 		}
 		try {
-			const { triggerMaintenance } = await import("./trigger-D8B7QR0q.mjs");
+			const { triggerMaintenance } = await import("./trigger-Bp3lruF2.mjs");
 			triggerMaintenance(action.name());
 		} catch {}
 	});

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-COdXswmc.mjs");
+} else import("./cli-BSlwv9hI.mjs");
 //#endregion
 export {};

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

@@ -1,13 +1,13 @@
-import { C as operationState, E as debugLog, d as throwIfCancelled, r as reportSignal, t as getExecutor } from "./exec-CGuDzt40.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-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-DCnWAxQL.mjs";
+import { C as operationState, E as debugLog, d as throwIfCancelled, r as reportSignal, t as getExecutor } from "./exec-L37dbiIb.mjs";
+import { H as openAuthenticated, J as sayHello, q as resolveEndpoint, v as loadConfig$1 } from "./config-CNmN-ndb.mjs";
+import { o as git, s as gitAsync } from "./operation-exec-DNynwpqO.mjs";
+import { C as CCACHE_UNAVAILABLE, S as CCACHE_NOT_RUN, at as maintenanceLogger, jr as discoverCaches, ot as emptyCaches, pt as planCacheEmptying } from "./device-capacity-D_IlxZRL.mjs";
 import { t as resolveMaintenanceSettings } from "./settings-D9LtQaUw.mjs";
-import { D as OffloadRefusal, M as namedBuildMachine, R as workerFailureReason, et as pairedMachines, u as isReleaseConfiguration } from "./support-BJbXovoO.mjs";
+import { t as canonicalPath } from "./paths-BsJMoPP2.mjs";
+import { D as COMPILATION_CACHE_NOT_RUN, O as COMPILATION_CACHE_UNAVAILABLE, _ as toolchainNotes, a as buildsOnlyOnWorker, c as iosToolchainAsync, g as toolchainMismatches, mt as runCancellationSignal, o as cocoapodsDifference, w as readRubyVersion, y as workerToolchain } from "./toolchain-CZvtCZ-m.mjs";
+import { D as OffloadRefusal, M as namedBuildMachine, R as workerFailureReason, et as pairedMachines, u as isReleaseConfiguration } from "./support-BeVRaMWT.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 { a as sourceManifest, i as nativeTransferManifest, n as gitVisiblePaths, r as nativeFileDigest, t as checkNativeTransferMembership } from "./native-source-D2ZfiQ6U.mjs";
 import { t as BuildArtifactCache } from "./build-artifact-cache-D7B6seMj.mjs";
 import { createHash, webcrypto } from "node:crypto";
 import { closeSync, existsSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, rmSync, writeSync } from "node:fs";
@@ -988,7 +988,7 @@ async function probeMachine(credential, identity, { connectMs = CONNECT_TIMEOUT_
 		...native === "xcode" && identity.artifact && connection.supports("build-artifact-cache") ? { artifact: identity.artifact } : {},
 		...identity.swiftpmArtifact && queriesPeerCache(connection, "swiftpm-peer-cache") ? { swiftpmArtifact: identity.swiftpmArtifact } : {},
 		...identity.reactNativeArtifact && queriesPeerCache(connection, "react-native-peer-cache") ? { reactNativeArtifact: identity.reactNativeArtifact } : {},
-		...native === "gradle" && identity.gradleArtifact && connection.supports("native-gradle-peer-cache") ? { gradleArtifact: identity.gradleArtifact } : {}
+		...native === "gradle" && identity.gradleArtifact && queriesGradlePeerCache(connection, identity.gradleArtifact) ? { gradleArtifact: identity.gradleArtifact } : {}
 	}, offerMs);
 	const failure = replyError(reply);
 	if (failure || !("result" in reply)) {
@@ -1009,7 +1009,7 @@ async function probeMachine(credential, identity, { connectMs = CONNECT_TIMEOUT_
 	return {
 		credential,
 		connection,
-		offer: identity.swiftpmArtifact && !queriesPeerCache(connection, "swiftpm-peer-cache") || identity.reactNativeArtifact && !queriesPeerCache(connection, "react-native-peer-cache") || native === "gradle" && (!identity.gradleArtifact || !connection.supports("native-gradle-peer-cache")) ? {
+		offer: identity.swiftpmArtifact && !queriesPeerCache(connection, "swiftpm-peer-cache") || identity.reactNativeArtifact && !queriesPeerCache(connection, "react-native-peer-cache") || native === "gradle" && (!identity.gradleArtifact || !queriesGradlePeerCache(connection, identity.gradleArtifact)) ? {
 			...offer,
 			artifact: null
 		} : offer
@@ -1032,7 +1032,8 @@ async function chooseBuildMachine({ projectRoot, target, here, note, machines =
 	const rubyVersion = readRubyVersion(projectRoot) ?? void 0;
 	const gradleQuery = gradleArtifact ? {
 		...gradleArtifact,
-		project: identity.project
+		project: identity.project,
+		...target.platform === "android" && target.local.jdk ? { jdk: target.local.jdk } : {}
 	} : void 0;
 	const reactNativeQuery = reactNativeArtifact ? reactNativeBuildQuery(reactNativeArtifact.request, reactNativeArtifact.fingerprint, identity.project, target.local) : null;
 	const swiftpmQuery = swiftpmArtifact?.artifactInputs ? swiftpmArtifactQuery({
@@ -1129,6 +1130,9 @@ function rebuiltFingerprint(choice, request, fingerprint, expected) {
 function queriesPeerCache(connection, feature) {
 	return connection.supports(feature) && connection.supports("build-compat");
 }
+function queriesGradlePeerCache(connection, query) {
+	return connection.supports("native-gradle-peer-cache") && (!query.jdk || connection.supports("native-gradle-peer-jdk"));
+}
 function macosBuildParameters(request, peerCache) {
 	return {
 		...request.cacheArtifact === true && peerCache ? { cacheArtifact: true } : {},
@@ -1175,7 +1179,7 @@ async function peerArtifact(choice, request, fingerprint) {
 	const query = choice.gradleArtifact;
 	if (query) {
 		if (request.platform !== "android" || request.native?.provider !== "gradle" || !request.native.cache?.read || !request.native.cache.remote || query.project !== choice.identity.project || query.sourceDigest !== request.native.transfer.digest || !isDeepStrictEqual(query.inputs, request.native.transfer.declaration) || !isDeepStrictEqual(query.android, request.android)) throw new Error("The Gradle artifact query does not match the build request.");
-		return choice.connection.supports("native-gradle-peer-cache") ? matchingArtifact(choice.offer, "native-gradle") : null;
+		return queriesGradlePeerCache(choice.connection, query) ? matchingArtifact(choice.offer, "native-gradle") : null;
 	}
 	if (request.platform === "ios" && request.native && typeof fingerprint === "string" && choice.connection.supports("build-artifact-cache")) return matchingArtifact(choice.offer, {
 		fingerprint,

package/dist/collector-run.mjs

@@ -1,12 +1,12 @@
-import { T as process_identity_exports } from "./exec-CGuDzt40.mjs";
-import { k as workspaceLogsDir } from "./workspace-state-BhwAJBgA.mjs";
+import { T as process_identity_exports } from "./exec-L37dbiIb.mjs";
+import { k as workspaceLogsDir } from "./workspace-state-CHEN_xzy.mjs";
 import { t as createLineReader } from "./process-output-Fpl8PYi8.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 { ft as deviceSlotKey, vt as validateDeviceSlot } from "./config-CNmN-ndb.mjs";
+import { c as watchAppPid, i as parseLogcatLine, o as startAndroidLogcat, s as waitForAppPid, t as androidClockOffset } from "./android-DGLG_VQ3.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-C3y8wLSl.mjs";
-import { n as parseLogStreamLine, r as startIosLogStream, t as appNameFromBundleId } from "./ios-Qam0bT9n.mjs";
+import { a as startIosDeviceConsole, i as parseDeviceConsoleLine } from "./ios-device-ygijU78G.mjs";
+import { a as unregisterCollector, i as registerCollector, r as readCollectors, t as collectorProcessTitle } from "./ownership-BLgOimfp.mjs";
+import { n as parseLogStreamLine, r as startIosLogStream, t as appNameFromBundleId } from "./ios-2Qr4_Zu2.mjs";
 import { existsSync } from "node:fs";
 import { isAbsolute, join, resolve } from "node:path";
 import { LOG_ROTATE_BYTES } from "@stim-cli/core";

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

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

package/dist/{config-BA3TgoIP.mjs → config-CNmN-ndb.mjs}

@@ -1,5 +1,5 @@
-import { D as ownership_claim_exports, T as process_identity_exports, a as trackReportResource, f as WorkspaceProcessCleanupError, r as reportSignal, t as getExecutor } from "./exec-CGuDzt40.mjs";
-import { t as runOperationFile } from "./operation-exec-DKlBcKAL.mjs";
+import { D as ownership_claim_exports, T as process_identity_exports, a as trackReportResource, f as WorkspaceProcessCleanupError, r as reportSignal, t as getExecutor } from "./exec-L37dbiIb.mjs";
+import { t as runOperationFile } from "./operation-exec-DNynwpqO.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, wrongTailnet } from "@stim-cli/core/state";