stim 1.21.0 → 1.22.0

package/dist/{build-CoPzQRNw.mjs → build-CabC3G23.mjs}

@@ -1,35 +1,36 @@
-import { d as withDrainingCancellation } from "./exec-_UbtCQcG.mjs";
+import { h as withDrainingCancellation } from "./exec-DEoAhcze.mjs";
 import { d as workspaceDir, m as workspaceLogsDir } from "./paths-DQtTgsBf.mjs";
-import { E as upsertProject, p as getProject, u as getConcurrencyLimits } from "./config-CYcBF478.mjs";
-import { l as phaseLine } from "./command-output-B1UrjZHL.mjs";
-import { i as recordWorkspaceUse } from "./workspace-state-Cjuigeeu.mjs";
-import { $t as cancelledError, G as resolveCacheProviderConfig, J as resolveProjectSettingsAsync, a as SETTING_SHAPE_REMEDY, en as throwIfCancelled } from "./settings-CsJDEXgK.mjs";
-import { f as projectRegistry, v as detectIsExpo } from "./project-BZNjmW_8.mjs";
+import { E as upsertProject, p as getProject, u as getConcurrencyLimits } from "./config-DlrsduwG.mjs";
+import { l as phaseLine } from "./command-output-gwpm28fu.mjs";
+import { d as cancelledError, f as throwIfCancelled } from "./operation-exec-BW0em61G.mjs";
+import { i as recordWorkspaceUse } from "./workspace-state-U08dEzhG.mjs";
+import { G as resolveCacheProviderConfig, J as resolveProjectSettingsAsync, a as SETTING_SHAPE_REMEDY } from "./settings-C7O8A6ZI.mjs";
+import { f as projectRegistry, v as detectIsExpo } from "./project-wM_XFTvE.mjs";
 import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
-import { B as recordFinishedBuild, Bn as checkEasAuth, H as tapBuildLog, J as recordRunStats, Jn as resolveRemote, U as createRunRecorder, V as startBuildProgress, W as readRunEstimates, Y as statsProjectKey, Yn as uploadRemote } from "./budget-Bs6SxxzO.mjs";
-import { d as runCancellationSignal, f as withNativeBuildRun } from "./native-run-DY_RLx3C.mjs";
-import { F as acquireBuildSlot, L as releaseBuildSlot } from "./workspaces-BccMFmGQ.mjs";
-import { F as waitForBuild, M as acquireBuildLock, P as releaseBuildLock } from "./activity-BzVfHSrY.mjs";
-import { p as providerUploadOutcome } from "./build-cache-DmyR9Zzc.mjs";
-import { O as hostSystemImageArch } from "./android-DUYkNF4u.mjs";
-import { m as listIosRuntimes } from "./ios-CpByZy12.mjs";
-import { s as workspaceShareURL } from "./stim-desktop-C12we7lz.mjs";
+import { B as recordFinishedBuild, Bn as checkEasAuth, H as tapBuildLog, J as recordRunStats, Jn as resolveRemote, U as createRunRecorder, V as startBuildProgress, W as readRunEstimates, Y as statsProjectKey, Yn as uploadRemote } from "./budget-Cvwn54qV.mjs";
+import { d as runCancellationSignal, f as withNativeBuildRun } from "./native-run-NwUuxbkg.mjs";
+import { I as acquireBuildSlot, R as releaseBuildSlot } from "./workspaces-CpANmBlq.mjs";
+import { F as waitForBuild, M as acquireBuildLock, P as releaseBuildLock } from "./activity-CMLmzp7o.mjs";
+import { p as providerUploadOutcome } from "./build-cache-Dv7RN200.mjs";
+import { k as hostSystemImageArch } from "./android-C7sVmyI9.mjs";
+import { m as listIosRuntimes } from "./ios-hcBpnEGk.mjs";
+import { s as workspaceShareURL } from "./stim-desktop-D5OGpYZM.mjs";
 import { d as optimizationBuildProfile, l as artifactCachePolicy } from "./errors-ccaPc4ox.mjs";
-import { p as readBundleId } from "./xcode-Zlx3qjEs.mjs";
-import { f as setRemoteLogSink } from "./client-UXD70ZbM.mjs";
-import { s as resolveBuildPlacement } from "./selection-CSl9i5qU.mjs";
-import { c as iosProjectPathError, g as resolveIosBuildSetup, m as resolveConfiguration, x as simulatorBuildArch, y as resolveSchemeSelection } from "./support-Dlu37g6H.mjs";
-import { n as ensureWorkspaceStorageSafely } from "./native-runtime-Dg1Q7tfF.mjs";
-import { t as acquireAndroidArtifact } from "./artifact-DAuZ-FNU.mjs";
-import { i as persistLastBuild, n as finishAndroidUpload, s as resolveAndroidBuildPlan } from "./result-DNiS-tTP.mjs";
-import { a as lastBuildRecord } from "./ios-project-WuwwBdvW.mjs";
-import { t as acquireIosArtifact } from "./artifact-B8T3S5gi.mjs";
+import { p as readBundleId } from "./xcode-BXn9-xYx.mjs";
+import { h as setRemoteLogSink } from "./client-OyRoEuSr.mjs";
+import { s as resolveBuildPlacement } from "./selection-DSMbWEX2.mjs";
+import { c as iosProjectPathError, g as resolveIosBuildSetup, m as resolveConfiguration, x as simulatorBuildArch, y as resolveSchemeSelection } from "./support-CNioewsd.mjs";
+import { n as ensureWorkspaceStorageSafely } from "./native-runtime-B7KIafpM.mjs";
+import { t as acquireAndroidArtifact } from "./artifact-DJPy518Y.mjs";
+import { i as persistLastBuild, n as finishAndroidUpload, s as resolveAndroidBuildPlan } from "./result-D2Ykz_iD.mjs";
+import { a as lastBuildRecord } from "./ios-project-CZhKODF3.mjs";
+import { t as acquireIosArtifact } from "./artifact-8EY8SAPw.mjs";
 import { constants, promises } from "node:fs";
 import { basename, join } from "node:path";
 import { hostSimulatorArch } from "@stim-cli/core";
 import { loadCacheProvider } from "@stim-cli/cache";
 //#region src/commands/android/build.ts
-async function buildAndroidOperation(context, root, options, { cacheArtifacts = true } = {}) {
+async function buildAndroidOperation(context, root, options, { artifactScope, cachePolicy } = {}) {
 	const note = (line) => context.output("stderr", `${line}\n`);
 	const selected = projectRegistry.selectAndroid(root);
 	if ("problem" in selected) throw Object.assign(new Error(selected.problem.message), {
@@ -132,12 +133,15 @@ async function buildAndroidOperation(context, root, options, { cacheArtifacts =
 				writer,
 				recipe: integration.artifact({
 					operation: context,
-					cacheArtifacts,
+					artifactScope,
 					root,
 					buildLog,
 					writer,
 					settings,
-					buildPlan: plan.plan.build,
+					buildPlan: {
+						...plan.plan.build,
+						...cachePolicy ? { cache: cachePolicy } : {}
+					},
 					target: { abi },
 					phase,
 					out: note,
@@ -148,7 +152,10 @@ async function buildAndroidOperation(context, root, options, { cacheArtifacts =
 					})
 				}),
 				targetOffloadRefusal: null,
-				buildPlan: plan.plan.build,
+				buildPlan: {
+					...plan.plan.build,
+					...cachePolicy ? { cache: cachePolicy } : {}
+				},
 				cacheProviderConfig: plan.plan.cacheProviderConfig,
 				requestedBuildCache: options.buildCache !== false,
 				easBuild: null,

package/dist/{build-cache-DmyR9Zzc.mjs → build-cache-Dv7RN200.mjs}

@@ -1,8 +1,8 @@
-import { d as withDrainingCancellation, t as getExecutor } from "./exec-_UbtCQcG.mjs";
+import { h as withDrainingCancellation, t as getExecutor } from "./exec-DEoAhcze.mjs";
 import { i as sharedBuildCache } from "./paths-DQtTgsBf.mjs";
-import { Gt as childEnvironment, en as throwIfCancelled, m as defaultAndroidLayout, qt as killOnAbort } from "./settings-CsJDEXgK.mjs";
-import { r as gitQuiet, t as git } from "./git-C3iTsJaZ.mjs";
-import { r as register } from "./cache-manifest-DkkqguoK.mjs";
+import { a as killOnAbort, c as gitQuiet, f as throwIfCancelled, o as git, r as childEnvironment } from "./operation-exec-BW0em61G.mjs";
+import { m as defaultAndroidLayout } from "./settings-C7O8A6ZI.mjs";
+import { r as register } from "./cache-manifest-DSeQjt-Q.mjs";
 import { createHash } from "node:crypto";
 import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { join } from "node:path";

package/dist/{build-plan-CaFskB7_.mjs → build-plan-DUC8Ka9y.mjs}

@@ -1,10 +1,11 @@
-import { i as formatDuration, l as phaseLine, m as shortHash, u as plural } from "./command-output-B1UrjZHL.mjs";
-import { Xt as removeTemporaryEntry, Yt as makeTemporaryDirectory } from "./settings-CsJDEXgK.mjs";
-import { G as readStats, L as estimateBuild, Vn as easAuthNote } from "./budget-Bs6SxxzO.mjs";
-import { o as entryDir, t as artifactIn } from "./build-cache-DmyR9Zzc.mjs";
-import { i as staleNativeDirRefusal, s as predictBuildMiss } from "./prebuild-uD_ipCxF.mjs";
+import { y as trackReportResource } from "./exec-DEoAhcze.mjs";
+import { i as formatDuration, l as phaseLine, m as shortHash, u as plural } from "./command-output-gwpm28fu.mjs";
+import { Ht as makeTemporaryDirectory, Wt as removeTemporaryEntryAsync } from "./settings-C7O8A6ZI.mjs";
+import { G as readStats, L as estimateBuild, Vn as easAuthNote } from "./budget-Cvwn54qV.mjs";
+import { o as entryDir, t as artifactIn } from "./build-cache-Dv7RN200.mjs";
+import { a as staleNativeDirRefusal, c as predictBuildMiss } from "./prebuild-D4JoEAEs.mjs";
 import chalk from "chalk";
-import { resolveTieredBuild } from "@stim-cli/cache";
+import { PROVIDER_LOAD_TIMEOUT_ENV, PROVIDER_LOAD_TIMEOUT_MS, buildResolveTimeoutMs, resolveTieredBuild, timeoutFromEnv } from "@stim-cli/cache";
 //#region src/commands/build-plan.ts
 const DISCARD = {
 	file: "",
@@ -28,16 +29,53 @@ async function providerHit({ root, platform, cacheKey, providerConfig }, deps) {
 		deps.note(chalk.yellow(phaseLine("cache", `provider not checked: ${error?.message || error}`)));
 		return null;
 	}
+	let pending = Promise.resolve();
+	const cleanupFailure = Object.assign(/* @__PURE__ */ new Error(`Cache provider cleanup did not finish within 35 seconds. Retained ${destinationDir}.`), {
+		code: "STIM_CLAIM_UNAVAILABLE",
+		reportCleanup: true,
+		remedy: "Confirm that no cache work is still using the retained download directory before inspecting its permissions and removing it."
+	});
+	let cleanup;
+	let close;
+	const closed = new Promise((resolve) => {
+		close = resolve;
+	});
+	const finish = () => cleanup ??= finishProviderDownload(pending, destinationDir, cleanupFailure).finally(() => close());
+	trackReportResource(deps.operation, closed, finish, deps.operation?.signal, cleanupFailure);
 	try {
 		const found = await resolveTieredBuild({
 			local: {
 				resolve: () => null,
 				store: () => null
 			},
-			loadProvider: () => deps.loadCacheProvider({
-				projectRoot: root,
-				config: providerConfig
-			}),
+			loadProvider: async () => {
+				const loaded = await deps.loadCacheProvider({
+					projectRoot: root,
+					config: providerConfig,
+					...deps.operation ? { env: deps.operation.env } : {},
+					timeoutMs: timeoutFromEnv(PROVIDER_LOAD_TIMEOUT_ENV, PROVIDER_LOAD_TIMEOUT_MS, deps.operation?.env)
+				});
+				const capability = loaded?.provider?.builds;
+				if (!capability) return loaded;
+				return {
+					...loaded,
+					provider: {
+						...loaded.provider,
+						builds: {
+							store: capability.store.bind(capability),
+							resolve: (request) => {
+								const resolving = Promise.resolve().then(() => capability.resolve(request));
+								pending = resolving.then(() => void 0, (cause) => {
+									if (cause instanceof Error && "reportCleanup" in cause) throw cause;
+								});
+								return resolving;
+							}
+						}
+					}
+				};
+			},
+			signal: deps.operation?.signal,
+			timeoutMs: buildResolveTimeoutMs(deps.operation?.env),
 			target: {
 				projectRoot: root,
 				platform,
@@ -48,13 +86,31 @@ async function providerHit({ root, platform, cacheKey, providerConfig }, deps) {
 		});
 		return found ? found.providerName ?? "the cache provider" : null;
 	} finally {
-		removeTemporaryEntry(destinationDir);
+		await finish();
+	}
+}
+async function finishProviderDownload(pending, destinationDir, cleanupFailure) {
+	let timer;
+	if (!await Promise.race([pending.then(() => true), new Promise((resolve) => {
+		timer = setTimeout(() => resolve(false), 35e3);
+	})]).finally(() => clearTimeout(timer))) throw cleanupFailure;
+	try {
+		await removeTemporaryEntryAsync(destinationDir);
+	} catch (cause) {
+		throw Object.assign(new Error(`Cache provider download cleanup failed. Retained ${destinationDir}.`, { cause }), {
+			code: "STIM_CLAIM_UNAVAILABLE",
+			reportCleanup: true,
+			remedy: "Check the retained directory permissions and remove it before retrying."
+		});
 	}
 }
 async function expoRemoteHit(lookup, deps) {
 	if (!lookup.expoRemote) return null;
 	const { root, platform, isExpo, fingerprint } = lookup;
-	const loaded = await deps.loadProjectProvider(root, { isExpo });
+	const loaded = await deps.loadProjectProvider(root, {
+		isExpo,
+		context: deps.operation
+	});
 	if (loaded?.unavailable) {
 		deps.note(chalk.yellow(phaseLine("cache", `provider not usable: ${loaded.unavailable}`)));
 		return null;
@@ -63,6 +119,7 @@ async function expoRemoteHit(lookup, deps) {
 	const name = loaded.name ?? "the build cache provider";
 	if (name === "eas") {
 		const auth = await deps.checkEasAuth({
+			context: deps.operation,
 			projectRoot: root,
 			owner: loaded.owner || null
 		});
@@ -71,6 +128,7 @@ async function expoRemoteHit(lookup, deps) {
 		if (auth?.code === "logged-out") return null;
 	}
 	const hit = await deps.resolveRemote({
+		context: deps.operation,
 		provider: loaded.provider,
 		platform,
 		projectRoot: root,
@@ -84,6 +142,7 @@ async function expoRemoteHit(lookup, deps) {
 }
 async function planCachedBuild(lookup, deps) {
 	const { root, platform, isExpo, fingerprint, sources, cacheKey, cachePolicy } = lookup;
+	deps.operation?.signal.throwIfAborted();
 	let cacheHit = false;
 	let provider = null;
 	if (cachePolicy.read) {
@@ -93,15 +152,16 @@ async function planCachedBuild(lookup, deps) {
 			if (provider) cacheHit = "remote";
 		}
 	}
+	deps.operation?.signal.throwIfAborted();
 	let prebuild = null;
 	let refusal = null;
 	let missReason;
 	if (!cacheHit) {
-		prebuild = deps.planPrebuild(root, platform, {
+		prebuild = await deps.planPrebuild(root, platform, {
 			isExpo,
 			fingerprint,
 			sources
-		});
+		}, deps.operation?.signal);
 		if (prebuild === "refuse") refusal = staleNativeDirRefusal(platform);
 		else if (cachePolicy.read) missReason = predictBuildMiss({
 			root,

package/dist/{cache-manifest-DkkqguoK.mjs → cache-manifest-DSeQjt-Q.mjs}

@@ -1,4 +1,4 @@
-import { d as getConfigDir } from "./config-CYcBF478.mjs";
+import { d as getConfigDir } from "./config-DlrsduwG.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-DkkqguoK.mjs";
+import { a as unregister, i as registeredCaches, n as readManifest, r as register, t as manifestPath } from "./cache-manifest-DSeQjt-Q.mjs";
 export { manifestPath, readManifest, register, registeredCaches, unregister };

package/dist/{ccache-BJRZ9pG3.mjs → ccache-Btwc36-I.mjs}

@@ -1,10 +1,10 @@
-import { t as getExecutor } from "./exec-_UbtCQcG.mjs";
+import { t as getExecutor } from "./exec-DEoAhcze.mjs";
 import { a as sharedCcache, m as workspaceLogsDir } from "./paths-DQtTgsBf.mjs";
-import { _ as loadConfig } from "./config-CYcBF478.mjs";
-import { l as phaseLine } from "./command-output-B1UrjZHL.mjs";
-import { m as defaultAndroidLayout } from "./settings-CsJDEXgK.mjs";
-import { r as register } from "./cache-manifest-DkkqguoK.mjs";
-import { o as machineNumber } from "./budget-Bs6SxxzO.mjs";
+import { _ as loadConfig } from "./config-DlrsduwG.mjs";
+import { l as phaseLine } from "./command-output-gwpm28fu.mjs";
+import { m as defaultAndroidLayout } from "./settings-C7O8A6ZI.mjs";
+import { r as register } from "./cache-manifest-DSeQjt-Q.mjs";
+import { o as machineNumber } from "./budget-Cvwn54qV.mjs";
 import { readFileSync, realpathSync } from "node:fs";
 import { isAbsolute, join, relative } from "node:path";
 import chalk from "chalk";

package/dist/{cdp-CWmIUMbw.mjs → cdp-3fwICjzi.mjs}

@@ -1,4 +1,4 @@
-import { $t as cancelledError, en as throwIfCancelled } from "./settings-CsJDEXgK.mjs";
+import { d as cancelledError, f as throwIfCancelled } from "./operation-exec-BW0em61G.mjs";
 import { WebSocket } from "ws";
 //#region src/web/cdp.ts
 const COMMAND_TIMEOUT_MS = 15e3;

package/dist/{chrome-B6tfCta1.mjs → chrome-Bbw689-6.mjs}

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

package/dist/{cli-0DYf8QhQ.mjs → cli-CHZa9Lvk.mjs}

@@ -1,27 +1,27 @@
-import { _ as debugLog } from "./exec-_UbtCQcG.mjs";
-import { y as refuseRelativeStimPaths } from "./config-CYcBF478.mjs";
+import { b as debugLog } from "./exec-DEoAhcze.mjs";
+import { y as refuseRelativeStimPaths } from "./config-DlrsduwG.mjs";
 import { readFileSync } from "node:fs";
 import { runId } from "@stim-cli/core/state";
 import { Command } from "commander";
 //#region bin/cli.ts
 const commands = /* @__PURE__ */ new Map([
-	["doctor", () => import("./doctor-BLHCYxzi.mjs")],
-	["worktree", () => import("./worktree-CK2MpJW5.mjs")],
-	["start", () => import("./start-RChynRDp.mjs")],
-	["ports", () => import("./ports-D-MmCTdv.mjs")],
-	["stop", () => import("./stop-Bk_1qiV6.mjs")],
-	["ios", () => import("./ios-CQ68hG9s.mjs")],
-	["android", () => import("./android-CV_GCELZ.mjs")],
-	["web", () => import("./web-DknQETPs.mjs")],
-	["macos", () => import("./macos-B65--pPd.mjs")],
-	["reload", () => import("./reload-DzjSl5P_.mjs")],
-	["device", () => import("./device-DCxH7_By.mjs")],
-	["logs", () => import("./logs-CMm05HxN.mjs")],
-	["settings", () => import("./settings-T1gtc3bf.mjs")],
-	["status", () => import("./status-CSi6tlRq.mjs")],
-	["stats", () => import("./stats-53T7OTb9.mjs")],
-	["gc", () => import("./gc-C-WwL0yi.mjs")],
-	["guide", () => import("./guide-Yqwt2bd6.mjs")]
+	["doctor", () => import("./doctor-thjWAV0z.mjs")],
+	["worktree", () => import("./worktree-ZqZVjD9K.mjs")],
+	["start", () => import("./start-Br-oxqMD.mjs")],
+	["ports", () => import("./ports-Cy1RkmuQ.mjs")],
+	["stop", () => import("./stop-DTZ9uTw3.mjs")],
+	["ios", () => import("./ios-Ds1clbIt.mjs")],
+	["android", () => import("./android-DGkNqa_c.mjs")],
+	["web", () => import("./web-CZ07gd77.mjs")],
+	["macos", () => import("./macos-DVlSSyUg.mjs")],
+	["reload", () => import("./reload-D7AVlb8N.mjs")],
+	["device", () => import("./device-DklWZLqb.mjs")],
+	["logs", () => import("./logs-jTS_lHSo.mjs")],
+	["settings", () => import("./settings-DpR-1Wnn.mjs")],
+	["status", () => import("./status-EvrK72L2.mjs")],
+	["stats", () => import("./stats-D3GerlFW.mjs")],
+	["gc", () => import("./gc-DnNDQyaP.mjs")],
+	["guide", () => import("./guide-Br0LEfKy.mjs")]
 ]);
 const pkg = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf-8"));
 const program = new Command();
@@ -52,7 +52,7 @@ try {
 			}));
 		}
 		try {
-			const { triggerMaintenance } = await import("./trigger-Bf3uDcpv.mjs");
+			const { triggerMaintenance } = await import("./trigger-yb_nFzPF.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-0DYf8QhQ.mjs");
+} else import("./cli-CHZa9Lvk.mjs");
 //#endregion
 export {};