stim 1.21.0 → 1.23.0

package/dist/api.mjs

@@ -1,29 +1,32 @@
-import { g as trackReportResource, h as runReport, u as operationState } from "./exec-_UbtCQcG.mjs";
-import { d as workspaceDir, m as workspaceLogsDir$1, n as ensureWorkspaceStorage } from "./paths-DQtTgsBf.mjs";
-import { E as upsertProject, p as getProject, y as refuseRelativeStimPaths } from "./config-CYcBF478.mjs";
-import { l as phaseLine } from "./command-output-B1UrjZHL.mjs";
-import { a as recordWorkspaceUseAsync, i as recordWorkspaceUse } from "./workspace-state-Cjuigeeu.mjs";
-import { $t as cancelledError, It as repoRootAsync, J as resolveProjectSettingsAsync, a as SETTING_SHAPE_REMEDY, en as throwIfCancelled, et as settingShapeErrors } from "./settings-CsJDEXgK.mjs";
-import { f as projectRegistry, r as findCommandWorkspaceAsync } from "./project-BZNjmW_8.mjs";
-import { n as macosDir } from "./state-XMziexv2.mjs";
+import { m as operationState, r as WorkspaceProcessCleanupError, v as runReport, x as ownership_claim_exports, y as trackReportResource } from "./exec-DEoAhcze.mjs";
+import { d as workspaceDir, m as workspaceLogsDir$1, n as ensureWorkspaceStorage, r as ensureWorkspaceStorageAsync } from "./paths-DQtTgsBf.mjs";
+import { E as upsertProject, p as getProject, q as validateDeviceSlot, y as refuseRelativeStimPaths } from "./config-DlrsduwG.mjs";
+import { l as phaseLine } from "./command-output-Db8BqzxH.mjs";
+import { d as cancelledError, f as throwIfCancelled } from "./operation-exec-BW0em61G.mjs";
+import { a as recordWorkspaceUseAsync, i as recordWorkspaceUse } from "./workspace-state-U08dEzhG.mjs";
+import { J as resolveProjectSettingsAsync, Nt as repoRootAsync, a as SETTING_SHAPE_REMEDY, et as settingShapeErrors, it as unknownSettingKeys, p as cacheProviderSettingError } from "./settings-C7O8A6ZI.mjs";
+import { c as projectProblem, f as projectRegistry, i as findProjectRoot$1, r as findCommandWorkspaceAsync, t as NO_PROJECT_REFUSAL } from "./project-CTLNHCfE.mjs";
+import { n as macosDir } from "./state-08I3hw3_.mjs";
 import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
-import { B as recordFinishedBuild, H as tapBuildLog, V as startBuildProgress } from "./budget-Bs6SxxzO.mjs";
-import { d as runCancellationSignal, f as withNativeBuildRun } from "./native-run-DY_RLx3C.mjs";
-import { c as ensureHomeIdentity, s as workspaceShareURL } from "./stim-desktop-C12we7lz.mjs";
-import { s as resolveBuildPlacement } from "./selection-CSl9i5qU.mjs";
-import { c as stopWorkspaceNow } from "./stop-CPzlM1L-.mjs";
-import { r as runReload } from "./reload-CmTRFJaX.mjs";
-import { s as recordDoctorCheck } from "./doctor-watchman-Cv1F10Kj.mjs";
-import { a as readDoctorReport } from "./doctor-Dhqebm0q.mjs";
-import { r as readGcReport } from "./gc-_-dCXdyL.mjs";
-import { r as readWorkspaceLogs, t as followWorkspaceLogs } from "./logs-BS00Anxf.mjs";
-import { t as readProjectStats } from "./stats-report-BFfMpWWF.mjs";
-import { n as buildAndroidOperation, t as buildIosOperation } from "./build-CoPzQRNw.mjs";
-import { i as runAndroidOperation } from "./android-BLgbNqox.mjs";
-import { r as runIosOperation } from "./ios-ubFsBzwq.mjs";
-import { i as buildMacosBundle, n as runMacos } from "./macos-C-0qJ6zq.mjs";
-import { t as runWeb } from "./web-CJmIj6AI.mjs";
-import { i as SettingsRefusal, o as readSettingsContext, s as readSettingsPayload, t as mutateSetting } from "./settings-write-HyVZ8eQ8.mjs";
+import { B as recordFinishedBuild, H as tapBuildLog, V as startBuildProgress } from "./budget-DnPX3DXj.mjs";
+import { d as runCancellationSignal, f as withNativeBuildRun } from "./native-run-BUTu8T7A.mjs";
+import { c as ensureHomeIdentity, s as workspaceShareURL } from "./stim-desktop-D5OGpYZM.mjs";
+import { s as resolveBuildPlacement } from "./selection-DSMbWEX2.mjs";
+import { c as stopWorkspaceNow } from "./stop-B2uLQfoM.mjs";
+import { r as runReload } from "./reload-DF9hqUUB.mjs";
+import { c as startDevServer } from "./start-bjfiScgz.mjs";
+import { s as recordDoctorCheck } from "./doctor-watchman-sy_RNhFt.mjs";
+import { a as readDoctorReport } from "./doctor-D2SN3Ltx.mjs";
+import { h as warmWorktreeTarget, m as removeWorktreeTarget } from "./worktree-8lqn_lBp.mjs";
+import { i as readGcReport, n as executeGc, o as withGcMaintenanceClaim } from "./gc-CDoogxAI.mjs";
+import { r as readWorkspaceLogs, t as followWorkspaceLogs } from "./logs-mxqsWpJs.mjs";
+import { t as readProjectStats } from "./stats-report-BzaPrRm6.mjs";
+import { n as buildAndroidOperation, t as buildIosOperation } from "./build-CqufZFqy.mjs";
+import { a as readAndroidBuildPlan, i as runAndroidOperation } from "./android-BoUJKbfz.mjs";
+import { i as readIosBuildPlan, r as runIosOperation } from "./ios-DZZbNYlY.mjs";
+import { a as buildMacosBundle, i as planMacos, n as runMacos } from "./macos-u0BoHKnO.mjs";
+import { t as runWeb } from "./web-CwREhjD-.mjs";
+import { i as SettingsRefusal, o as readSettingsContext, s as readSettingsPayload, t as mutateSetting } from "./settings-write-79mQRr9C.mjs";
 import { randomBytes } from "node:crypto";
 import { mkdirSync, mkdtempSync, readFileSync, realpathSync, rmSync } from "node:fs";
 import { stripVTControlCharacters } from "node:util";
@@ -31,6 +34,7 @@ import { homedir } from "node:os";
 import { isAbsolute, join, resolve } from "node:path";
 import { withAmbientContext } from "@stim-cli/core";
 import { RUN_ID_ENV, findProjectRoot, openLogDir, validRunId } from "@stim-cli/core/state";
+import { decodeSecret } from "@stim-cli/core/noise-session";
 //#region src/commands/macos-build.ts
 async function buildMacosOperation(context, root, options) {
 	const note = (line) => context.output("stderr", `${line}\n`);
@@ -121,10 +125,10 @@ async function buildMacosOperation(context, root, options) {
 					platform: "macos",
 					status: build.state,
 					configuration: "Debug",
-					fingerprint: null,
-					cacheKey: null,
-					cacheHit: false,
-					cacheSkipped: false,
+					fingerprint: build.fingerprint ?? null,
+					cacheKey: build.cacheKey ?? null,
+					cacheHit: build.cacheHit ? build.cacheSource === "provider" ? "remote" : "local" : false,
+					cacheSkipped: !build.cacheKey,
 					durationMs: build.durationMs,
 					startedAt: build.startedAt,
 					errorCode: build.errorCode,
@@ -154,8 +158,8 @@ var StimError = class extends Error {
 	code;
 	remedy;
 	details;
-	constructor({ code, message, remedy = null, details }) {
-		super(message);
+	constructor({ code, message, remedy = null, details }, options) {
+		super(message, options);
 		this.name = "StimError";
 		this.code = code;
 		this.remedy = remedy;
@@ -224,7 +228,7 @@ function createStim(options) {
 			dispose: () => signal?.removeEventListener("abort", abort)
 		};
 	};
-	const report = async (signal, work) => {
+	const beginReport = (signal) => {
 		const operation = begin(signal, true);
 		operation.context.env.STIM_HOME = clientContext.env.STIM_HOME;
 		for (const name of [
@@ -235,14 +239,23 @@ function createStim(options) {
 			const directory = operation.context.env[name]?.trim();
 			if (directory) operation.context.env[name] = resolve(operation.context.cwd, directory);
 		}
+		return operation;
+	};
+	const report = async (signal, work, timeoutMs) => {
+		const operation = beginReport(signal);
 		try {
-			return await read(operation, (context) => runReport(context, (request) => withAmbientContext(request, () => work(request))));
+			return await read(operation, (context) => runReport(context, (request) => withAmbientContext(request, () => work(request)), timeoutMs));
 		} finally {
 			operation.dispose();
 		}
 	};
 	return {
 		projectRoot,
+		start: ({ signal, ...request } = {}) => {
+			const operation = begin(signal, true);
+			operation.context.env.STIM_HOME = clientContext.env.STIM_HOME;
+			return lifecycle(operation, (context) => start(context, request));
+		},
 		identity: ({ signal } = {}) => read(begin(signal), (operation) => ensureHomeIdentity(operation.signal)),
 		doctor: async ({ signal, platform, record } = {}) => {
 			if (platform !== void 0 && platform !== "ios" && platform !== "android") return Promise.reject(new StimError({
@@ -256,6 +269,53 @@ function createStim(options) {
 				return result;
 			});
 		},
+		requestMachineAccess: async ({ signal, ticket } = {}) => {
+			if (ticket !== void 0 && (typeof ticket !== "string" || !decodeSecret(ticket.trim()))) throw new StimError({
+				code: "STIM_BAD_ARG",
+				message: "The setup ticket must encode 32 random bytes."
+			});
+			const result = await report(signal, (context) => {
+				context.env.STIM_ACCESS_TICKET = ticket?.trim();
+				return readDoctorReport(context, "ios", version, true);
+			}, 12e4);
+			return read(begin(signal), async (context) => {
+				await recordDoctorCheck(result.project, "ios", version, context.signal);
+				return result;
+			});
+		},
+		plan: ({ signal, ...request }) => report(signal, (context) => {
+			const task = Promise.resolve().then(async () => {
+				if (request.platform === "macos") try {
+					return await planMacos(context, findProjectRoot$1(context.projectRoot) ?? context.projectRoot);
+				} catch (cause) {
+					if (cause instanceof Error && "reportCleanup" in cause) throw cause;
+					context.signal.throwIfAborted();
+					const code = cause instanceof Error && "code" in cause && typeof cause.code === "string" ? cause.code : "STIM_BAD_ARG";
+					const remedy = cause instanceof Error && "remedy" in cause && typeof cause.remedy === "string" ? cause.remedy : "Check the macOS project settings in stim guide macos.";
+					throw new StimError({
+						code,
+						message: cause instanceof Error ? cause.message : String(cause),
+						remedy
+					});
+				}
+				if (request.platform !== "ios" && request.platform !== "android") throw new StimError({
+					code: "STIM_BAD_ARG",
+					message: "platform must be ios, android or macos."
+				});
+				const selectors = { slot: validateDeviceSlot(request.slot) };
+				const result = request.platform === "ios" ? await readIosBuildPlan(context, selectors) : await readAndroidBuildPlan(context, selectors);
+				context.signal.throwIfAborted();
+				if ("platform" in result) return result;
+				throw new StimError({
+					...result.refusal,
+					details: { lines: result.lines }
+				});
+			});
+			trackReportResource(context, task.then(() => void 0, (cause) => {
+				if (cause instanceof Error && "reportCleanup" in cause) throw cause;
+			}), () => {});
+			return task;
+		}),
 		gc: ({ signal, olderThan, cache, worktrees } = {}) => {
 			if (olderThan !== void 0 && !Number.isSafeInteger(olderThan)) return Promise.reject(new StimError({
 				code: "STIM_BAD_ARG",
@@ -274,6 +334,82 @@ function createStim(options) {
 				return result;
 			});
 		},
+		collectGarbage: ({ signal, olderThan, cache, worktrees, delete: deleting, idleMs } = {}) => {
+			const invalid = olderThan !== void 0 && !Number.isSafeInteger(olderThan) ? "olderThan must be a whole number of days." : cache !== void 0 && (typeof cache !== "string" || !cache.trim()) ? "cache must name a cache." : worktrees !== void 0 && typeof worktrees !== "boolean" ? "worktrees must be a boolean." : deleting !== void 0 && typeof deleting !== "boolean" ? "delete must be a boolean." : idleMs !== void 0 && (!Number.isSafeInteger(idleMs) || idleMs <= 0) ? "idleMs must be a positive whole number of milliseconds." : null;
+			if (invalid) return Promise.reject(new StimError({
+				code: "STIM_BAD_ARG",
+				message: invalid
+			}));
+			const operation = beginReport(signal);
+			const request = {
+				olderThan,
+				cache,
+				worktrees,
+				delete: deleting,
+				idle: idleMs,
+				json: true
+			};
+			return lifecycle(operation, (context) => withGcMaintenanceClaim(request, (claim) => runReport(context, (bounded) => withAmbientContext(bounded, () => {
+				const task = executeGc(request, {
+					operation: bounded,
+					easLedgerRoot: join(bounded.env.HOME || bounded.env.USERPROFILE || homedir(), ".stim", "machine", "eas")
+				}, (_stream, line) => bounded.output("stderr", `${line}\n`), claim).then(({ payload, exitCode }) => {
+					if ("code" in payload) throw new StimError(payload);
+					return {
+						report: payload,
+						exitCode
+					};
+				});
+				trackReportResource(bounded, task.then(() => void 0, (cause) => {
+					if (cause instanceof WorkspaceProcessCleanupError || cause instanceof Error && "reportCleanup" in cause) throw cause;
+				}), () => {});
+				return task;
+			}))).catch((cause) => {
+				if (cause instanceof WorkspaceProcessCleanupError) throw cause;
+				const failure = (0, ownership_claim_exports.claimFailure)(cause, null);
+				if (failure) throw new StimError(failure);
+				throw cause;
+			}));
+		},
+		warmWorktree: ({ signal, beforeWarm } = {}) => lifecycle(beginReport(signal), (context) => runReport(context, (bounded) => withAmbientContext(bounded, () => {
+			const task = warmWorktreeTarget({
+				cwd: bounded.cwd,
+				operation: bounded,
+				beforeWarm
+			});
+			trackReportResource(bounded, task.then(() => void 0, (cause) => {
+				if (cause instanceof WorkspaceProcessCleanupError || cause instanceof Error && "reportCleanup" in cause) throw cause;
+			}), () => {});
+			return task;
+		}), 54e5)),
+		removeWorktree: ({ signal, target, force, beforeRemove } = {}) => {
+			const invalid = target !== void 0 && (typeof target !== "string" || target.length === 0) ? "target must be a nonempty path." : force !== void 0 && typeof force !== "boolean" ? "force must be a boolean." : null;
+			if (invalid) return Promise.reject(new StimError({
+				code: "STIM_BAD_ARG",
+				message: invalid
+			}));
+			return lifecycle(beginReport(signal), (context) => runReport(context, (bounded) => withAmbientContext(bounded, () => {
+				let exitCode = 0;
+				const task = removeWorktreeTarget(resolve(bounded.cwd, target ?? "."), {
+					force,
+					beforeRemove,
+					operation: bounded,
+					output: {
+						error: (line) => bounded.output("stderr", `${line}\n`),
+						fail: () => {
+							exitCode = 1;
+						}
+					}
+				}).then((removed) => ({
+					removed,
+					exitCode
+				}));
+				trackReportResource(bounded, task.then(() => void 0, (cause) => {
+					if (cause instanceof WorkspaceProcessCleanupError || cause instanceof Error && "reportCleanup" in cause) throw cause;
+				}), () => {});
+				return task;
+			})));
+		},
 		settings: ({ signal } = {}) => read(begin(signal), async (operation) => readSettingsPayload(await readSettingsContext(operation.projectRoot, {
 			...operation.env,
 			STIM_HOME: clientContext.env.STIM_HOME
@@ -320,7 +456,8 @@ function createStim(options) {
 		build: (({ signal, ...request }) => lifecycle(begin(signal, true), (operation) => build(operation, request))),
 		run: (({ signal, ...request }) => lifecycle(begin(signal, true), (operation) => run(operation, request))),
 		stop: ({ signal, ...request } = {}) => read(begin(signal), async (operation) => {
-			const root = operation.projectRoot;
+			const root = findProjectRoot$1(operation.projectRoot) ?? operation.projectRoot;
+			request.beforeStop?.(root);
 			const logs = workspaceLogsDir$1(root);
 			let result;
 			try {
@@ -416,16 +553,17 @@ async function read({ context, callback }, operation) {
 		refuseRelativeStimPaths(context.env);
 		result = await withAmbientContext(context, () => operation(context));
 	} catch (error) {
-		if ("error" in callback) throw callback.error;
-		if (signal.aborted && !(error instanceof Error && "reportCleanup" in error)) throw cancelled();
+		const cleanupUnresolved = error instanceof Error && ("reportCleanup" in error || "code" in error && error.code === "STIM_CLAIM_UNAVAILABLE");
+		if ("error" in callback && !cleanupUnresolved) throw callback.error;
+		if (signal.aborted && !cleanupUnresolved) throw cancelled();
 		if (error instanceof StimError) throw error;
 		if (error instanceof Error && "code" in error && typeof error.code === "string" && error.code.startsWith("STIM_")) {
-			const remedy = error instanceof SettingsRefusal ? error.remedy : null;
+			const remedy = error instanceof SettingsRefusal ? error.remedy : cleanupUnresolved && "remedy" in error && typeof error.remedy === "string" ? error.remedy : null;
 			throw new StimError({
 				code: error.code,
 				message: error.message,
 				remedy
-			});
+			}, cleanupUnresolved ? { cause: error } : void 0);
 		}
 		throw error;
 	}
@@ -456,7 +594,7 @@ async function lifecycle(operation, work) {
 					remedy: failure?.remedy ?? null,
 					details: {
 						logs,
-						cause: failure?.details
+						cause: error instanceof WorkspaceProcessCleanupError ? { retainedClaimRoots: [...new Set(error.claims.map((claim) => claim.root))] } : failure?.details
 					}
 				});
 			}
@@ -465,6 +603,63 @@ async function lifecycle(operation, work) {
 		operation.dispose();
 	}
 }
+async function start(context, options) {
+	if (options.waitSeconds !== void 0 && (!Number.isSafeInteger(options.waitSeconds) || options.waitSeconds <= 0)) throw new StimError({
+		code: "STIM_BAD_ARG",
+		message: "waitSeconds must be a positive whole number."
+	});
+	const root = findProjectRoot$1(context.projectRoot);
+	if (!root) throw new StimError(NO_PROJECT_REFUSAL);
+	const problem = projectProblem(root, "dev-server");
+	if (problem) throw new StimError({
+		code: "STIM_NO_PROJECT",
+		...problem
+	});
+	options.beforeStart?.(root);
+	context.signal.throwIfAborted();
+	return withAmbientContext({
+		...context,
+		projectRoot: root
+	}, async () => {
+		const { context: settingsContext, settings } = await resolveProjectSettingsAsync(root, {
+			env: context.env,
+			signal: context.signal
+		});
+		const shapeErrors = settingShapeErrors(settings);
+		if (shapeErrors.length) throw new StimError({
+			code: "STIM_BAD_ARG",
+			message: shapeErrors.join("\n"),
+			remedy: SETTING_SHAPE_REMEDY
+		});
+		for (const key of unknownSettingKeys(settings)) note(context)(`Warning: setting "${key}" is not read by Stim and will be ignored.`);
+		const cacheError = cacheProviderSettingError(settings);
+		if (cacheError) note(context)(`Warning: ${cacheError} No cache provider is used.`);
+		await ensureWorkspaceStorageAsync(root, context.signal);
+		await recordWorkspaceUseAsync(root, /* @__PURE__ */ new Date(), context.env, context.cwd, context.signal);
+		const result = await startDevServer({
+			root,
+			settings,
+			settingsContext,
+			waitSeconds: options.waitSeconds,
+			remote: options.remote,
+			resetCache: options.resetCache,
+			out: (line) => context.output("stdout", `${line}\n`),
+			note: note(context)
+		});
+		if (!result.ok) {
+			for (const line of result.lines) note(context)(line);
+			throw new StimError({
+				...result.error,
+				details: {
+					lines: result.lines,
+					reclaimed: result.reclaimed,
+					...result.retainedClaimRoots ? { retainedClaimRoots: result.retainedClaimRoots } : {}
+				}
+			});
+		}
+		return result.facts;
+	});
+}
 async function reload(context, options) {
 	if (options.platform !== void 0 && ![
 		"ios",
@@ -540,7 +735,8 @@ async function run(context, options) {
 			if (!result.ok || !result.facts) throw new StimError({
 				code: result.error?.code ?? "STIM_RUN_FAILED",
 				message: result.error?.message ?? "The Android run failed.",
-				remedy: result.error?.remedy
+				remedy: result.error?.remedy,
+				details: result.error
 			});
 			return {
 				platform: "android",
@@ -548,7 +744,7 @@ async function run(context, options) {
 			};
 		}
 		case "macos": {
-			const record = await runMacos(context, root, note(context), void 0, options.remoteBuild);
+			const record = await runMacos(context, root, note(context), options.remote, options.remoteBuild);
 			return {
 				platform: "macos",
 				facts: {
@@ -557,7 +753,7 @@ async function run(context, options) {
 					bundleId: record.bundleId,
 					executable: record.executable,
 					pid: record.app?.pid ?? null,
-					launched: record.app !== void 0,
+					launched: record.hostLaunched ?? record.app !== void 0,
 					build: record.build,
 					logs: { dir: workspaceLogsDir$1(root) }
 				}
@@ -571,6 +767,7 @@ async function run(context, options) {
 				context
 			});
 			if (!result.ok) throw new StimError(result.error);
+			if (result.remedy) note(context)(result.remedy);
 			return {
 				platform: "web",
 				facts: result.facts

package/dist/{artifact-DAuZ-FNU.mjs → artifact-5RteZem7.mjs}

@@ -1,18 +1,18 @@
-import { d as withDrainingCancellation, f as ownership_claim_exports } from "./exec-_UbtCQcG.mjs";
+import { h as withDrainingCancellation, x as ownership_claim_exports } from "./exec-DEoAhcze.mjs";
 import { d as workspaceDir } from "./paths-DQtTgsBf.mjs";
-import { _ as stepTimer, i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-B1UrjZHL.mjs";
-import { en as throwIfCancelled } from "./settings-CsJDEXgK.mjs";
-import { Hn as isEasAuthFailureText, Ln as RESOLVE_TIMEOUT_MS, Vn as easAuthNote } from "./budget-Bs6SxxzO.mjs";
-import { d as runCancellationSignal, r as cancelledFailure } from "./native-run-DY_RLx3C.mjs";
-import { d as prepareProviderDownloadDir, f as providerDownloadPath } from "./build-cache-DmyR9Zzc.mjs";
-import { n as CCACHE_UNAVAILABLE, r as ccacheActivityLine, t as CCACHE_NOT_RUN } from "./ccache-BJRZ9pG3.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-UXD70ZbM.mjs";
-import { a as requireLocalBuild, r as namedBuildMachine, t as OffloadRefusal } from "./selection-CSl9i5qU.mjs";
-import { f as formatDiagnostic } from "./react-native-build-rhk4smwQ.mjs";
-import { c as skippedMissReason } from "./prebuild-uD_ipCxF.mjs";
-import { t as buildPlacementRecord } from "./placement-log-BqGbTa61.mjs";
-import { t as acquireArtifact } from "./acquire-artifact-CD4lbiWE.mjs";
-import { a as PLATFORM, h as displayPath } from "./support-67vraa1Q.mjs";
+import { _ as stepTimer, i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-Db8BqzxH.mjs";
+import { f as throwIfCancelled } from "./operation-exec-BW0em61G.mjs";
+import { Hn as isEasAuthFailureText, Ln as RESOLVE_TIMEOUT_MS, Vn as easAuthNote } from "./budget-DnPX3DXj.mjs";
+import { d as runCancellationSignal, r as cancelledFailure } from "./native-run-BUTu8T7A.mjs";
+import { d as prepareProviderDownloadDir, f as providerDownloadPath } from "./build-cache-Dv7RN200.mjs";
+import { n as CCACHE_UNAVAILABLE, r as ccacheActivityLine, t as CCACHE_NOT_RUN } from "./ccache-RcAy92gH.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-yyso1bwi.mjs";
+import { a as requireLocalBuild, r as namedBuildMachine, t as OffloadRefusal } from "./selection-DSMbWEX2.mjs";
+import { f as formatDiagnostic } from "./react-native-build-CmJkTljQ.mjs";
+import { l as skippedMissReason } from "./prebuild-BFm63bQ0.mjs";
+import { t as buildPlacementRecord } from "./placement-log-BnGgJRRZ.mjs";
+import { n as settleArtifactUploads, t as acquireArtifact } from "./acquire-artifact-ybouwJSR.mjs";
+import { a as PLATFORM, h as displayPath } from "./support-DTBV56gy.mjs";
 import { t as AndroidRecipeRefusal } from "./android-project-BCAAmMwz.mjs";
 import { rmSync } from "node:fs";
 import { join } from "node:path";
@@ -74,6 +74,7 @@ async function acquireAndroidArtifact({ context, root, buildLog, writer, recipe,
 	const loadTieredProvider = cachePolicy.remote && cacheProviderConfig ? () => providerLoad ??= loadCacheProviderModule({
 		projectRoot: root,
 		config: cacheProviderConfig,
+		env: context.env,
 		timeoutMs: timeoutFromEnv(PROVIDER_LOAD_TIMEOUT_ENV, PROVIDER_LOAD_TIMEOUT_MS, context.env)
 	}).then((loaded) => {
 		if (!loaded.provider || !recipe.providerCache) return loaded;
@@ -160,9 +161,9 @@ async function acquireAndroidArtifact({ context, root, buildLog, writer, recipe,
 	let abandonedRemote = false;
 	let uploadPending = null;
 	async function resolveRemoteArtifact() {
-		if (cacheIneligible || !recipe.legacyCache) return;
+		if (cacheIneligible || !recipe.expoCache) return;
 		if (!apkPath) {
-			const loaded = await recipe.legacyCache.load();
+			const loaded = await recipe.expoCache.load();
 			if (loaded?.unavailable) phase("cache", chalk.yellow(`provider not usable: ${loaded.unavailable}`));
 			else if (loaded?.provider) remote = loaded;
 			if (remote?.name === "eas") {
@@ -185,7 +186,7 @@ async function acquireAndroidArtifact({ context, root, buildLog, writer, recipe,
 				platform: PLATFORM,
 				projectRoot: root,
 				fingerprintHash: hash,
-				runOptions: recipe.legacyCache?.runOptions ?? null
+				runOptions: recipe.expoCache?.runOptions ?? null
 			});
 			if (hit?.appPath) {
 				let stored = null;
@@ -333,6 +334,14 @@ async function acquireAndroidArtifact({ context, root, buildLog, writer, recipe,
 		});
 		if (!placement.offload) {
 			hereReason = placement.reason;
+			if (placement.code === "this-mac-free" && cachePolicy.read && cachePolicy.remote && (recipe.offload?.uncachedArtifacts || recipe.offload && !recipe.offload.request.native)) return {
+				cacheOnly: true,
+				mode,
+				here,
+				code: placement.code,
+				reason: placement.reason,
+				machines
+			};
 			writer.write(buildPlacementRecord({
 				platform: PLATFORM,
 				buildMachine,
@@ -345,6 +354,7 @@ async function acquireAndroidArtifact({ context, root, buildLog, writer, recipe,
 			return null;
 		}
 		return {
+			cacheOnly: false,
 			mode,
 			here,
 			code: placement.code,
@@ -354,14 +364,17 @@ async function acquireAndroidArtifact({ context, root, buildLog, writer, recipe,
 	}
 	/** Asks the paired machines once the post-mutation key is known; null builds here. */
 	async function chooseMachine(candidate) {
+		const offload = recipe.offload;
 		let asked = [];
 		let target;
 		try {
-			target = await recipe.offload.target();
+			target = await offload.target();
 		} catch (error) {
+			if (candidate.cacheOnly) return null;
 			fallBack(error.message);
 			return null;
 		}
+		const request = offload.request;
 		const choice = await chooseBuildMachine({
 			projectRoot: root,
 			target,
@@ -370,9 +383,23 @@ async function acquireAndroidArtifact({ context, root, buildLog, writer, recipe,
 			note: (line) => phase("build", chalk.dim(`offload: ${line}`)),
 			machines: candidate.machines,
 			selected: buildMachine,
-			onCandidates: (each) => asked = each
+			onCandidates: (each) => asked = each,
+			cacheOnly: candidate.cacheOnly,
+			...cachePolicy.read && cachePolicy.remote && storeHash && !request.native ? { reactNativeArtifact: {
+				fingerprint: storeHash,
+				request
+			} } : {},
+			...cachePolicy.read && cachePolicy.remote && request.native?.provider === "gradle" && request.android.variant ? { gradleArtifact: {
+				sourceDigest: request.native.transfer.digest,
+				inputs: request.native.transfer.declaration,
+				android: {
+					...request.android,
+					variant: request.android.variant
+				}
+			} } : {}
 		});
 		if (typeof choice === "string") {
+			if (candidate.cacheOnly) return null;
 			const only = candidate.machines.length === 1 ? candidate.machines[0].machine : null;
 			if (only && choice.startsWith(`${only}: `)) fallbackMachine = only;
 			fallBack(choice, choice, {
@@ -473,6 +500,7 @@ async function acquireAndroidArtifact({ context, root, buildLog, writer, recipe,
 		throwIfCancelled(signal, "offloaded build cache copy");
 		step("compile");
 		if (!outcome.ok || !stored) {
+			if (candidate.cacheOnly) return false;
 			const why = reason ?? "the APK was not stored";
 			fallbackMachine = choice.machine;
 			fallBack(`${choice.machine}: ${why}`, `offload failed: ${why}`, {
@@ -492,9 +520,10 @@ async function acquireAndroidArtifact({ context, root, buildLog, writer, recipe,
 		if (uncached) {
 			record.fingerprint = null;
 			record.cacheKey = null;
-			record.cacheHit = false;
-			record.cacheSkipped = true;
+			record.cacheHit = outcome.cacheHit ? "remote" : false;
+			record.cacheSkipped = !outcome.cacheHit;
 		}
+		if (outcome.cacheHit) lateHit();
 		apkPath = stored;
 		handoff = outcome.handoff ?? null;
 		record.builtOn = outcome.machine;
@@ -506,13 +535,13 @@ async function acquireAndroidArtifact({ context, root, buildLog, writer, recipe,
 			buildMs: timings.totalMs
 		});
 		ccacheActivity = outcome.ccache;
-		phase("build", `built on ${outcome.machine} in ${formatDuration(timings.totalMs)}: offer ${formatDuration(timings.offerMs)}, sync ${formatDuration(timings.syncMs)}, build ${formatDuration(timings.workerMs)}, fetch ${formatDuration(timings.fetchMs)}`);
+		phase("build", `${outcome.cacheHit ? "reused from" : "built on"} ${outcome.machine} in ${formatDuration(timings.totalMs)}: offer ${formatDuration(timings.offerMs)}, sync ${formatDuration(timings.syncMs)}, build ${formatDuration(timings.workerMs)}, fetch ${formatDuration(timings.fetchMs)}`);
 		phase("cache", `compilation cache on ${outcome.machine} ${ccacheActivityLine(ccacheActivity)}`);
 		writer.write({
 			src: "build",
 			level: "info",
 			event: "offload_done",
-			msg: `built on ${outcome.machine}`,
+			msg: `${outcome.cacheHit ? "reused from" : "built on"} ${outcome.machine}`,
 			timings
 		});
 		return true;
@@ -574,7 +603,7 @@ async function acquireAndroidArtifact({ context, root, buildLog, writer, recipe,
 			explainMiss(rekeyedBy);
 			step("compile");
 		}
-		if (offload) stats.setPlacement({
+		if (offload && !offload.cacheOnly) stats.setPlacement({
 			decision: "fell-back",
 			slotWaitMs,
 			deviceSlotWaitMs: stats.deviceSlotWaitMs(),
@@ -664,16 +693,19 @@ async function acquireAndroidArtifact({ context, root, buildLog, writer, recipe,
 				phase("cache", chalk.yellow(`could not store the build: ${err?.message || err}`));
 			}
 		}
-		if (remote) uploadPending = uploadRemoteBuild({
-			context,
-			logWriter: writer,
-			provider: remote.provider,
-			platform: PLATFORM,
-			projectRoot: root,
-			fingerprintHash: storeHash,
-			buildPath: artifactPath,
-			runOptions: recipe.legacyCache?.runOptions ?? null
-		});
+		if (remote) {
+			uploadPending = uploadRemoteBuild({
+				context,
+				logWriter: writer,
+				provider: remote.provider,
+				platform: PLATFORM,
+				projectRoot: root,
+				fingerprintHash: storeHash,
+				buildPath: artifactPath,
+				runOptions: recipe.expoCache?.runOptions ?? null
+			});
+			uploadPending.catch(() => {});
+		}
 	}
 	const acquired = await acquireArtifact({
 		platform: PLATFORM,
@@ -719,7 +751,7 @@ async function acquireAndroidArtifact({ context, root, buildLog, writer, recipe,
 			};
 		},
 		settleFailed: async () => {
-			await Promise.allSettled([uploadPending, providerUpload]);
+			await settleArtifactUploads(uploadPending, providerUpload);
 		},
 		refuse: (error) => {
 			if (error instanceof OffloadRefusal) {
@@ -759,11 +791,8 @@ async function acquireAndroidArtifact({ context, root, buildLog, writer, recipe,
 			handoff,
 			androidPackage,
 			release: async () => {
-				try {
-					await Promise.allSettled([providerUpload, remote?.provider && "easCli" in remote.provider ? uploadPending : null]);
-				} finally {
-					acquired.release();
-				}
+				await settleArtifactUploads(providerUpload, uploadPending);
+				acquired.release();
 			},
 			waitedForBuild,
 			ccache: ccacheActivity,