stim 1.20.2 → 1.21.0

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

@@ -1,48 +1,54 @@
-import { E as upsertProject, p as getProject, u as getConcurrencyLimits } from "./config-BYDxlMY3.mjs";
-import { K as resolveProjectSettings, W as resolveCacheProviderConfig, a as SETTING_SHAPE_REMEDY } from "./settings-B717odTD.mjs";
-import { _ as waitForBuild, g as releaseBuildLock, j as providerUploadOutcome, m as acquireBuildLock } from "./device-lease-BX1sJQ2E.mjs";
-import { i as recordWorkspaceUse, w as workspaceLogsDir, x as workspaceDir } from "./workspace-state-DJt_MMvf.mjs";
-import { l as phaseLine } from "./command-output-BTy8hZ0F.mjs";
-import { _ as detectIsExpo, d as projectRegistry } from "./project-_phNIJfs.mjs";
-import { D as hostSystemImageArch } from "./android-Mz_Inn3w.mjs";
-import { F as acquireBuildSlot, L as releaseBuildSlot } from "./workspaces-C36s2jb9.mjs";
-import { At as createRunRecorder, Dt as recordFinishedBuild, Ft as recordRunStats, It as statsProjectKey, Ot as startBuildProgress, jt as readRunEstimates, kt as tapBuildLog } from "./budget-f7516Zk0.mjs";
-import { S as withNativeBuildRun, x as runCancellationSignal } from "./tailnet-Dh-qiYzG.mjs";
-import { n as cancelledError, r as throwIfCancelled } from "./cancellation-C_22VQTH.mjs";
-import { r as createNdjsonWriter } from "./ndjson-GOnbyvso.mjs";
-import { d as optimizationBuildProfile, l as artifactCachePolicy } from "./errors-DzkMYh8Q.mjs";
-import { i as checkEasAuth, m as uploadRemote, p as resolveRemote } from "./remote-cache-OyOyVIS3.mjs";
-import { f as setRemoteLogSink, y as resolveBuildPlacement } from "./client-qQAaXSUs.mjs";
-import { m as listIosRuntimes } from "./ios-RkW4pnQf.mjs";
-import { n as ensureWorkspaceStorageSafely } from "./native-runtime-k8dTIrbK.mjs";
-import { A as readBundleId } from "./toolchain-DxSsNssu.mjs";
-import { n as resolveAndroidBuildPlan } from "./plan-C4TjdPsR.mjs";
-import { t as acquireAndroidArtifact } from "./artifact-D3czlUvT.mjs";
-import { i as persistLastBuild, n as finishAndroidUpload } from "./result-CaJg5Iat.mjs";
-import { c as iosProjectPathError, g as resolveIosBuildSetup, m as resolveConfiguration, x as simulatorBuildArch, y as resolveSchemeSelection } from "./support-CwjbFs9H.mjs";
-import { a as lastBuildRecord } from "./ios-project-K9hY_Jab.mjs";
-import { t as acquireIosArtifact } from "./artifact-HSwkIWEQ.mjs";
-import { constants, copyFileSync, cpSync, mkdirSync, mkdtempSync, rmSync } from "node:fs";
+import { d as withDrainingCancellation } from "./exec-_UbtCQcG.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 { 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 { 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 { constants, promises } from "node:fs";
 import { basename, join } from "node:path";
-import { loadCacheProvider } from "@stim-cli/cache";
 import { hostSimulatorArch } from "@stim-cli/core";
+import { loadCacheProvider } from "@stim-cli/cache";
 //#region src/commands/android/build.ts
-const note$1 = (line) => console.error(line);
-async function buildAndroidOperation(root, options) {
+async function buildAndroidOperation(context, root, options, { cacheArtifacts = true } = {}) {
+	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), {
 		code: "STIM_NO_PROJECT",
 		remedy: selected.problem.remedy
 	});
-	const { context: settingsContext, settings } = resolveProjectSettings(root);
+	const { context: settingsContext, settings } = await resolveProjectSettingsAsync(root, {
+		env: context.env,
+		signal: runCancellationSignal(context) ?? context.signal
+	});
 	const integration = await selected.load({
 		context: settingsContext,
 		settings
 	});
-	const phase = (label, line) => note$1(phaseLine(label, line));
+	const phase = (label, line) => note(phaseLine(label, line));
 	const plan = resolveAndroidBuildPlan({
 		settings,
 		settingsContext,
+		env: context.env,
 		variant: options.variant ?? null,
 		buildCache: options.buildCache !== false
 	}, {
@@ -62,13 +68,13 @@ async function buildAndroidOperation(root, options) {
 		"all"
 	].includes(options.abi)) throw Object.assign(/* @__PURE__ */ new Error("Android build abi must be arm64-v8a, armeabi-v7a, x86, x86_64 or all."), { code: "STIM_BAD_ARG" });
 	const abi = options.abi === "all" ? null : options.abi ?? (plan.plan.build.targetAbiOnly && !plan.plan.build.release ? hostSystemImageArch() : null);
-	await ensureWorkspaceStorageSafely(root, { note: note$1 });
-	return withNativeBuildRun(root, {
+	await ensureWorkspaceStorageSafely(root, { note });
+	return withDrainingCancellation(context, context.signal, () => withNativeBuildRun(context, root, {
 		command: "build",
 		platform: "android"
 	}, async (claim) => {
 		if (!getProject(root)) upsertProject(root, {});
-		recordWorkspaceUse(root);
+		recordWorkspaceUse(root, /* @__PURE__ */ new Date(), context.env, context.cwd);
 		const started = Date.now();
 		const startedAt = new Date(started).toISOString();
 		const progress = startBuildProgress({
@@ -76,7 +82,7 @@ async function buildAndroidOperation(root, options) {
 			platform: "android",
 			slot: "default",
 			claim,
-			note: note$1
+			note
 		});
 		const logs = workspaceLogsDir(root);
 		const buildLog = join(logs, "build-artifact-android.ndjson");
@@ -84,7 +90,7 @@ async function buildAndroidOperation(root, options) {
 			truncate: true,
 			fields: { platform: "android" }
 		}), progress);
-		setRemoteLogSink((entry) => writer.write(entry));
+		setRemoteLogSink(context, (entry) => writer.write(entry));
 		const projectKey = statsProjectKey({
 			root,
 			commonDir: settingsContext.gitCommonDir,
@@ -94,7 +100,7 @@ async function buildAndroidOperation(root, options) {
 			platform: "android",
 			write: recordRunStats,
 			now: Date.now,
-			note: note$1,
+			note,
 			phases: () => progress.durations(),
 			deviceSetup: () => false
 		});
@@ -106,7 +112,8 @@ async function buildAndroidOperation(root, options) {
 		};
 		let artifact;
 		let directory;
-		let succeeded = false;
+		let built = null;
+		let failureAfterCleanup = null;
 		const finishRecord = (status, errorCode) => persistLastBuild({
 			root,
 			record,
@@ -114,15 +121,18 @@ async function buildAndroidOperation(root, options) {
 			durationMs: Date.now() - started,
 			status,
 			errorCode,
-			out: note$1,
+			out: note,
 			recordBuild: (at, entry) => recordFinishedBuild(at, entry, { artifactOnly: true })
 		});
 		try {
 			const acquired = await acquireAndroidArtifact({
+				context,
 				root,
 				buildLog,
 				writer,
 				recipe: integration.artifact({
+					operation: context,
+					cacheArtifacts,
 					root,
 					buildLog,
 					writer,
@@ -130,7 +140,7 @@ async function buildAndroidOperation(root, options) {
 					buildPlan: plan.plan.build,
 					target: { abi },
 					phase,
-					out: note$1,
+					out: note,
 					step: progress.step,
 					estimates: () => readRunEstimates({
 						projectKey,
@@ -142,12 +152,12 @@ async function buildAndroidOperation(root, options) {
 				cacheProviderConfig: plan.plan.cacheProviderConfig,
 				requestedBuildCache: options.buildCache !== false,
 				easBuild: null,
-				androidPackage: integration.appIds().androidPackage,
+				androidPackage: (await integration.appIds()).androidPackage,
 				record,
 				maxBuilds: getConcurrencyLimits().maxBuilds,
 				progress: {
 					phase,
-					out: note$1,
+					out: note,
 					stats,
 					step: progress.step,
 					miss: progress.miss,
@@ -170,29 +180,22 @@ async function buildAndroidOperation(root, options) {
 			});
 			if (!acquired.ok) throw Object.assign(new Error(acquired.failure.message ?? "Android build failed."), acquired.failure, { details: acquired.failure.extra });
 			artifact = acquired.artifact;
-			throwIfCancelled(runCancellationSignal(), "Android build");
+			throwIfCancelled(runCancellationSignal(context), "Android build");
 			if (!artifact.apkPath) throw Object.assign(/* @__PURE__ */ new Error("The Android build produced no APK."), { code: "STIM_BUILD_FAILED" });
 			const artifacts = join(workspaceDir(root), "artifacts");
-			mkdirSync(artifacts, { recursive: true });
-			directory = mkdtempSync(join(artifacts, "android-"));
+			await promises.mkdir(artifacts, { recursive: true });
+			directory = await promises.mkdtemp(join(artifacts, "android-"));
 			const apkPath = join(directory, "app.apk");
-			copyFileSync(artifact.apkPath, apkPath, constants.COPYFILE_FICLONE);
+			await promises.copyFile(artifact.apkPath, apkPath, constants.COPYFILE_FICLONE);
+			throwIfCancelled(runCancellationSignal(context), "Android build");
 			await finishAndroidUpload(artifact.uploadPending, artifact.remote, phase);
-			const uploaded = providerUploadOutcome(artifact.providerUpload ? await artifact.providerUpload : null, artifact.providerName);
+			const uploaded = providerUploadOutcome(artifact.providerUpload ? await artifact.providerUpload : null, artifact.providerName, context.env);
 			if (uploaded) phase("cache", uploaded.line);
-			throwIfCancelled(runCancellationSignal(), "Android build");
+			const links = { workspace: await workspaceShareURL(root, { platform: "android" }, runCancellationSignal(context) ?? context.signal) };
+			throwIfCancelled(runCancellationSignal(context), "Android build");
 			record.appPath = apkPath;
 			record.bundleId = artifact.androidPackage;
-			finishRecord("ok");
-			stats.record({
-				failed: false,
-				cacheHit: record.cacheHit === "local" || record.cacheHit === "remote" ? record.cacheHit : false,
-				durationMs: Date.now() - started,
-				offloadedTo: record.offloadedTo,
-				waited: artifact.waitedForBuild
-			});
-			succeeded = true;
-			return {
+			built = {
 				apkPath,
 				androidPackage: artifact.androidPackage,
 				variant: plan.plan.build.variant ?? "debug",
@@ -204,10 +207,11 @@ async function buildAndroidOperation(root, options) {
 				builtOn: record.builtOn ?? null,
 				ccache: artifact.ccache,
 				durationMs: Date.now() - started,
-				logs: { dir: logs }
+				logs: { dir: logs },
+				links
 			};
 		} catch (error) {
-			const failure = runCancellationSignal()?.aborted ? cancelledError("Android build", error) : error;
+			const failure = runCancellationSignal(context)?.aborted ? cancelledError("Android build", error) : error;
 			finishRecord("failed", failure.code);
 			stats.record({
 				failed: true,
@@ -215,33 +219,56 @@ async function buildAndroidOperation(root, options) {
 			});
 			throw failure;
 		} finally {
-			artifact?.release();
-			if (!succeeded && directory) rmSync(directory, {
+			await artifact?.release();
+			failureAfterCleanup = built && runCancellationSignal(context)?.aborted ? cancelledError("Android build") : null;
+			if (failureAfterCleanup) {
+				finishRecord("failed", failureAfterCleanup.code);
+				stats.record({
+					failed: true,
+					durationMs: Date.now() - started
+				});
+			}
+			if ((!built || failureAfterCleanup) && directory) await promises.rm(directory, {
 				recursive: true,
 				force: true
 			});
+			if (built && !failureAfterCleanup) {
+				finishRecord("ok");
+				stats.record({
+					failed: false,
+					cacheHit: record.cacheHit === "local" || record.cacheHit === "remote" ? record.cacheHit : false,
+					durationMs: Date.now() - started,
+					offloadedTo: record.offloadedTo,
+					waited: artifact?.waitedForBuild
+				});
+			}
 			writer.close();
 			progress.clear();
 		}
-	}, { write: (line) => phase("lock", line) });
+		if (failureAfterCleanup) throw failureAfterCleanup;
+		return built;
+	}, { write: (line) => phase("lock", line) }));
 }
 //#endregion
 //#region src/commands/ios/build.ts
-const note = (line) => console.error(line);
-async function buildIosOperation(root, options) {
+async function buildIosOperation(context, root, options) {
+	const note = (line) => context.output("stderr", `${line}\n`);
 	const selected = projectRegistry.selectIos(root);
 	if ("problem" in selected) throw Object.assign(new Error(selected.problem.message), {
 		code: "STIM_NO_PROJECT",
 		remedy: selected.problem.remedy
 	});
-	const { context, settings } = resolveProjectSettings(root);
+	const { context: settingsContext, settings } = await resolveProjectSettingsAsync(root, {
+		env: context.env,
+		signal: runCancellationSignal(context) ?? context.signal
+	});
 	const projectPathError = iosProjectPathError(settings, root, () => detectIsExpo(root));
 	if (projectPathError) throw Object.assign(new Error(projectPathError), {
 		code: "STIM_BAD_ARG",
 		remedy: SETTING_SHAPE_REMEDY
 	});
 	const integration = await selected.load(settings);
-	const setup = resolveIosBuildSetup(options.remoteBuild, settings, (label, message) => note(phaseLine(label, message)));
+	const setup = resolveIosBuildSetup(options.remoteBuild, settings, (label, message) => note(phaseLine(label, message)), context.env);
 	if (!setup.ok) {
 		const { failure } = setup;
 		throw Object.assign(new Error(failure.message ?? failure.code), failure, { details: failure });
@@ -249,7 +276,7 @@ async function buildIosOperation(root, options) {
 	const { buildMachine, optimizations } = setup;
 	const configuration = resolveConfiguration(options.configuration, settings);
 	const buildScheme = resolveSchemeSelection(options, settings);
-	const problem = integration.schemeProblem(buildScheme, configuration);
+	const problem = await integration.schemeProblem(buildScheme, configuration);
 	if (problem) throw Object.assign(new Error(problem.message ?? problem.code), problem);
 	if (options.arch !== void 0 && ![
 		"arm64",
@@ -265,12 +292,12 @@ async function buildIosOperation(root, options) {
 	const cache = artifactCachePolicy(optimizations, options.buildCache !== false, integration.runtimeKind(configuration) === "embedded-js");
 	const phase = (label, line) => note(phaseLine(label, line));
 	await ensureWorkspaceStorageSafely(root, { note });
-	return withNativeBuildRun(root, {
+	return withDrainingCancellation(context, context.signal, () => withNativeBuildRun(context, root, {
 		command: "build",
 		platform: "ios"
 	}, async (claim) => {
 		if (!getProject(root)) upsertProject(root, {});
-		recordWorkspaceUse(root);
+		recordWorkspaceUse(root, /* @__PURE__ */ new Date(), context.env, context.cwd);
 		const started = Date.now();
 		const startedAt = new Date(started).toISOString();
 		const progress = startBuildProgress({
@@ -286,11 +313,11 @@ async function buildIosOperation(root, options) {
 			truncate: true,
 			fields: { platform: "ios" }
 		}), progress);
-		setRemoteLogSink((entry) => writer.write(entry));
+		setRemoteLogSink(context, (entry) => writer.write(entry));
 		const projectKey = statsProjectKey({
 			root,
-			commonDir: context.gitCommonDir,
-			repoRoot: context.repoRoot
+			commonDir: settingsContext.gitCommonDir,
+			repoRoot: settingsContext.repoRoot
 		});
 		const stats = createRunRecorder({
 			platform: "ios",
@@ -304,7 +331,8 @@ async function buildIosOperation(root, options) {
 		progress.estimate(projectKey);
 		let artifact;
 		let directory;
-		let succeeded = false;
+		let built = null;
+		let failureAfterCleanup = null;
 		const finish = (status, appPath, errorCode) => {
 			try {
 				recordFinishedBuild(root, lastBuildRecord({
@@ -330,12 +358,14 @@ async function buildIosOperation(root, options) {
 		};
 		try {
 			const acquired = await acquireIosArtifact({
+				context,
 				root,
 				logFile,
 				configuration,
 				buildMachine,
 				physical: false,
 				recipe: integration.artifact({
+					operation: context,
 					root,
 					logFile,
 					configuration,
@@ -366,7 +396,7 @@ async function buildIosOperation(root, options) {
 				}),
 				cache: {
 					policy: cache,
-					providerConfig: resolveCacheProviderConfig(context),
+					providerConfig: resolveCacheProviderConfig(settingsContext),
 					disabledByFlag: options.buildCache === false
 				},
 				easBuild: null,
@@ -397,29 +427,26 @@ async function buildIosOperation(root, options) {
 			});
 			if (!acquired.ok) throw Object.assign(new Error(acquired.failure.message ?? "The iOS build failed."), acquired.failure);
 			artifact = acquired.artifact;
-			artifact.bundleId ??= readBundleId(artifact.path) ?? integration.bundleId();
-			throwIfCancelled(runCancellationSignal(), "iOS build");
+			artifact.bundleId ??= await readBundleId(artifact.path) ?? await integration.bundleId();
+			throwIfCancelled(runCancellationSignal(context), "iOS build");
 			const artifacts = join(workspaceDir(root), "artifacts");
-			mkdirSync(artifacts, { recursive: true });
-			directory = mkdtempSync(join(artifacts, "ios-"));
+			await promises.mkdir(artifacts, { recursive: true });
+			directory = await promises.mkdtemp(join(artifacts, "ios-"));
 			const appPath = join(directory, basename(artifact.path));
-			cpSync(artifact.path, appPath, {
+			await promises.cp(artifact.path, appPath, {
 				recursive: true,
 				verbatimSymlinks: true,
-				mode: constants.COPYFILE_FICLONE
+				mode: constants.COPYFILE_FICLONE,
+				filter: () => {
+					throwIfCancelled(runCancellationSignal(context), "iOS build");
+					return true;
+				}
 			});
+			throwIfCancelled(runCancellationSignal(context), "iOS build");
 			await artifact.completeUploads();
-			throwIfCancelled(runCancellationSignal(), "iOS build");
-			finish("ok", appPath);
-			stats.record({
-				failed: false,
-				durationMs: Date.now() - started,
-				cacheHit: artifact.cache.hit === "local" || artifact.cache.hit === "remote" ? artifact.cache.hit : false,
-				offloadedTo: artifact.cache.offloadedTo,
-				waited: artifact.cache.waitedForBuild
-			});
-			succeeded = true;
-			return {
+			const links = { workspace: await workspaceShareURL(root, { platform: "ios" }, runCancellationSignal(context) ?? context.signal) };
+			throwIfCancelled(runCancellationSignal(context), "iOS build");
+			built = {
 				appPath,
 				bundleId: artifact.bundleId,
 				configuration: configuration ?? "Debug",
@@ -432,10 +459,11 @@ async function buildIosOperation(root, options) {
 				builtOn: artifact.cache.builtOn ?? null,
 				compilationCache: artifact.cache.compilation,
 				durationMs: Date.now() - started,
-				logs: { dir: logs }
+				logs: { dir: logs },
+				links
 			};
 		} catch (error) {
-			const failure = runCancellationSignal()?.aborted ? cancelledError("iOS build", error) : error;
+			const failure = runCancellationSignal(context)?.aborted ? cancelledError("iOS build", error) : error;
 			finish("failed", void 0, failure.code);
 			stats.record({
 				failed: true,
@@ -443,15 +471,35 @@ async function buildIosOperation(root, options) {
 			});
 			throw failure;
 		} finally {
-			artifact?.release();
-			if (!succeeded && directory) rmSync(directory, {
+			await artifact?.release();
+			failureAfterCleanup = built && runCancellationSignal(context)?.aborted ? cancelledError("iOS build") : null;
+			if (failureAfterCleanup) {
+				finish("failed", void 0, failureAfterCleanup.code);
+				stats.record({
+					failed: true,
+					durationMs: Date.now() - started
+				});
+			}
+			if ((!built || failureAfterCleanup) && directory) await promises.rm(directory, {
 				recursive: true,
 				force: true
 			});
+			if (built && !failureAfterCleanup) {
+				finish("ok", built.appPath);
+				stats.record({
+					failed: false,
+					durationMs: Date.now() - started,
+					cacheHit: artifact?.cache.hit === "local" || artifact?.cache.hit === "remote" ? artifact?.cache.hit : false,
+					offloadedTo: artifact?.cache.offloadedTo,
+					waited: artifact?.cache.waitedForBuild
+				});
+			}
 			writer.close();
 			progress.clear();
 		}
-	}, { write: (line) => phase("lock", line) });
+		if (failureAfterCleanup) throw failureAfterCleanup;
+		return built;
+	}, { write: (line) => phase("lock", line) }));
 }
 //#endregion
 export { buildAndroidOperation as n, buildIosOperation as t };