stim 1.32.0 → 1.34.0

package/dist/{client-lDmA-5jx.mjs → client-kU37gURU.mjs}

@@ -1,22 +1,23 @@
-import { C as reportSignal, E as debugLog, b as operationState, c as throwIfCancelled, t as getExecutor } from "./exec-aULwtNly.mjs";
-import { ct as resolveEndpoint, lt as sayHello, rt as openAuthenticated, v as loadConfig$1 } from "./config-D5qNWJEP.mjs";
-import { o as git, s as gitAsync } from "./operation-exec-Dp4FuIGR.mjs";
-import { G as planCacheEmptying, R as maintenanceLogger, n as CCACHE_UNAVAILABLE, t as CCACHE_NOT_RUN, ur as discoverCaches, z as emptyCaches } from "./ccache-BrwGIxmV.mjs";
+import { C as operationState, E as debugLog, d as throwIfCancelled, r as reportSignal, t as getExecutor } from "./exec-CGuDzt40.mjs";
+import { K as resolveEndpoint, V as openAuthenticated, q as sayHello, v as loadConfig$1 } from "./config-BW0fAtoK.mjs";
+import { o as git, s as gitAsync } from "./operation-exec-DKlBcKAL.mjs";
+import { G as planCacheEmptying, R as maintenanceLogger, n as CCACHE_UNAVAILABLE, sr as discoverCaches, t as CCACHE_NOT_RUN, z as emptyCaches } from "./ccache-ChBMXlBq.mjs";
 import { t as canonicalPath } from "./paths-BsJMoPP2.mjs";
-import { A as COMPILATION_CACHE_NOT_RUN, D as readRubyVersion, S as workerToolchain, b as toolchainNotes, c as iosToolchainAsync, j as COMPILATION_CACHE_UNAVAILABLE, o as cocoapodsDifference, st as runCancellationSignal, y as toolchainMismatches } from "./toolchain-Bnm8vUCV.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-CYonNjd_.mjs";
 import { t as resolveMaintenanceSettings } from "./settings-D9LtQaUw.mjs";
-import { f as workerFailureReason, m as pairedMachines, o as namedBuildMachine, t as OffloadRefusal } from "./selection-C4ZQz_ER.mjs";
+import { f as workerFailureReason, m as pairedMachines, o as namedBuildMachine, t as OffloadRefusal } from "./selection-CH-MUVGD.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-D1AzWiuP.mjs";
+import { a as sourceManifest, i as nativeTransferManifest, n as gitVisiblePaths, r as nativeFileDigest, t as checkNativeTransferMembership } from "./native-source-ChAGj7R1.mjs";
+import { t as BuildArtifactCache } from "./build-artifact-cache-D7B6seMj.mjs";
 import { createHash, webcrypto } from "node:crypto";
 import { closeSync, existsSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, rmSync, writeSync } from "node:fs";
 import { isDeepStrictEqual } from "node:util";
 import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { ambientContext, dependencyLockfile, reactNativeArtifactIdentity, reactNativeArtifactQuery, swiftpmArtifactQuery } from "@stim-cli/core";
 import { automaticMachineEnabled, isJsonObject, maintenanceDir, mayRunHere, placementWord, requireAutomaticMachine, runId, saturation } from "@stim-cli/core/state";
-import { WebSocket } from "ws";
 import { setTimeout as setTimeout$1 } from "node:timers/promises";
-import { access, lstat, readFile, readlink, realpath } from "node:fs/promises";
+import { WebSocket } from "ws";
+import { access, lstat, readFile, readlink, realpath, rename, rm } from "node:fs/promises";
 //#region src/cache/compilation-cache-corruption.ts
 const COMPILATION_CACHE_CORRUPT = "STIM_COMPILATION_CACHE_CORRUPT";
 async function emptyCompilationCache(dir) {
@@ -368,6 +369,38 @@ function reactNativeArtifactReceipt(query, toolchain) {
 		receipt
 	};
 }
+/**
+* The development app stim-server retained for `query`, placed at `out/app.tgz` and unpacked beside it as a build
+* leaves it, when the client allows a reused artifact and `query` carries a fingerprint other than the one the client
+* looked up; null otherwise or on a miss.
+*/
+async function reusedReactNativeArtifact(job, query, out, signal) {
+	if (!job.reuseArtifact || !job.artifactCache || query.fingerprint === job.expectedFingerprint) return null;
+	const cache = new BuildArtifactCache(job.artifactCache);
+	const cached = await cache.lookupReactNative(query, signal);
+	if (!cached) return null;
+	await rm(out, {
+		recursive: true,
+		force: true
+	});
+	const fetched = await cache.fetch(cached, out, signal);
+	if (!fetched) return null;
+	const archive = join(out, "app.tgz");
+	await rename(fetched.path, archive);
+	await getExecutor().runFileAsync("tar", [
+		"-xf",
+		archive,
+		"-C",
+		out
+	], { timeoutMs: 6e5 });
+	const { name, size, sha256 } = fetched.artifact;
+	return {
+		path: archive,
+		name,
+		size,
+		sha256
+	};
+}
 //#endregion
 //#region src/offload/client.ts
 const CONNECT_TIMEOUT_MS = 1e4;
@@ -922,6 +955,7 @@ const NATIVE_BUILD_FEATURE = {
 };
 const unsupportedNative = (provider) => `This worker does not support native ${provider === "xcode" ? "Xcode" : "Gradle"} builds.`;
 const ANDROID_PACKAGE = /^[A-Za-z_][\w]*(?:\.[A-Za-z_][\w]*)+$/;
+const FINGERPRINT = /^[0-9a-f]{40,128}$/;
 function nativeTransferInput(native) {
 	return native?.provider === "xcode" ? native.snapshot : native?.transfer;
 }
@@ -1071,6 +1105,25 @@ function startJdk(choice) {
 function startCompat(choice) {
 	return choice.connection.supports("build-compat") ? { compat: choice.target.local.compat } : {};
 }
+function leavesPodsToWorker(choice, request) {
+	const { target } = choice;
+	return request.platform === "ios" && !request.native && target.platform === "ios" && buildsOnlyOnWorker(target.local);
+}
+function startPods(choice, request) {
+	if (request.platform !== "ios" || !leavesPodsToWorker(choice, request)) return {};
+	return {
+		podsOnWorker: true,
+		...request.reuseArtifact === true && choice.connection.supports("build-reuse-artifact") ? { reuseArtifact: true } : {}
+	};
+}
+/**
+* The fingerprint the machine built under after its own pod install, when it differs from the requested one; null
+* when it reports another fingerprint it may not.
+*/
+function rebuiltFingerprint(choice, request, fingerprint, expected) {
+	if (request.platform === "macos" || fingerprint === expected) return void 0;
+	return leavesPodsToWorker(choice, request) && typeof fingerprint === "string" && FINGERPRINT.test(fingerprint) ? fingerprint : null;
+}
 /** Peer artifact queries carry `compat`, which a stim-server without `build-compat` refuses. */
 function queriesPeerCache(connection, feature) {
 	return connection.supports(feature) && connection.supports("build-compat");
@@ -1552,7 +1605,8 @@ async function offloadBuild(input) {
 				},
 				stimBuild: choice.target.local.stimBuild,
 				...startCompat(choice),
-				...startJdk(choice)
+				...startJdk(choice),
+				...startPods(choice, request)
 			});
 			checkCancelled();
 			if ("result" in reply) {
@@ -1578,6 +1632,8 @@ async function offloadBuild(input) {
 		const workerMs = cacheHit ? 0 : Date.now() - workerStarted;
 		if (result.ok !== true) return keepCorruptCacheMessage(fail(workerFailureReason(result.code, result.message)), result);
 		if (!cacheHit && native && (result.sourceDigest !== sourceDigest || result.fingerprint !== expectedFingerprint)) return fail("The worker returned a different native source or artifact identity.");
+		const rebuilt = rebuiltFingerprint(choice, request, result.fingerprint, expectedFingerprint);
+		if (rebuilt === null) return fail("The worker returned a different fingerprint.");
 		if (native?.provider === "gradle" && !ANDROID_PACKAGE.test(String(result.androidPackage ?? ""))) return fail("The worker returned no verified native APK package.");
 		const artifact = result.artifact;
 		const name = typeof artifact?.name === "string" ? artifact.name : "";
@@ -1622,7 +1678,7 @@ async function offloadBuild(input) {
 		keepStaging = true;
 		return {
 			ok: true,
-			...cacheHit ? { cacheHit: true } : {},
+			...rebuilt ? { builtFingerprint: rebuilt } : {},
 			machine,
 			artifactPath,
 			...typeof declared.handoff === "string" && /^[0-9a-f]{64}$/.test(declared.handoff) ? { handoff: {
@@ -1630,7 +1686,7 @@ async function offloadBuild(input) {
 				token: declared.handoff,
 				sha256: digest
 			} } : {},
-			...offloadCacheActivity(request.platform, result.compilationCache, cacheHit),
+			...offloadCacheActivity(request.platform, result.compilationCache, cacheHit || result.reused === true),
 			...native?.provider === "gradle" ? { androidPackage: result.androidPackage } : {},
 			timings: {
 				offerMs: choice.offerMs,
@@ -1657,6 +1713,7 @@ async function offloadBuild(input) {
 }
 function offloadCacheActivity(platform, activity, cacheHit) {
 	if (cacheHit) return {
+		cacheHit: true,
 		compilationCache: COMPILATION_CACHE_NOT_RUN,
 		ccache: CCACHE_NOT_RUN
 	};
@@ -1803,4 +1860,4 @@ function offloadCheck(projectRoot, targets) {
 	};
 }
 //#endregion
-export { COMPILATION_CACHE_CORRUPT as C, setRemoteLogSink as S, nativeGradleLocalSourceDigest as _, nativeTransferRefusal as a, validateGradleManifest as b, offloadPlacement as c, simulatorRuntime as d, reactNativeArtifactReceipt as f, gradleStateDirectories as g, gradleOffloadInputs as h, closeOffload as i, placementLoad as l, reactNativeBuildQuery as m, buildPlacementCandidates as n, offloadBuild as o, reactNativeArtifactToolchain as p, chooseBuildMachine as r, offloadCheck as s, BuildConnection as t, remotePhaseText as u, nativeGradleOutputs as v, clearCorruptCompilationCache as w, verifyGradleTransfer as x, nativeGradleTransfer as y };
+export { setRemoteLogSink as C, verifyGradleTransfer as S, clearCorruptCompilationCache as T, gradleStateDirectories as _, nativeTransferRefusal as a, nativeGradleTransfer as b, offloadPlacement as c, simulatorRuntime as d, reactNativeArtifactReceipt as f, gradleOffloadInputs as g, reusedReactNativeArtifact as h, closeOffload as i, placementLoad as l, reactNativeBuildQuery as m, buildPlacementCandidates as n, offloadBuild as o, reactNativeArtifactToolchain as p, chooseBuildMachine as r, offloadCheck as s, BuildConnection as t, remotePhaseText as u, nativeGradleLocalSourceDigest as v, COMPILATION_CACHE_CORRUPT as w, validateGradleManifest as x, nativeGradleOutputs as y };

package/dist/collector-run.mjs

@@ -1,12 +1,12 @@
-import { S as process_identity_exports } from "./exec-aULwtNly.mjs";
-import { k as workspaceLogsDir } from "./workspace-state-3bF4TB8P.mjs";
-import { H as deviceSlotKey, J as validateDeviceSlot } from "./config-D5qNWJEP.mjs";
+import { T as process_identity_exports } from "./exec-CGuDzt40.mjs";
+import { k as workspaceLogsDir } from "./workspace-state-BdZ-QgmB.mjs";
 import { t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { c as watchAppPid, i as parseLogcatLine, o as startAndroidLogcat, s as waitForAppPid, t as androidClockOffset } from "./android-BeeC15Ve.mjs";
+import { _t as validateDeviceSlot, dt as deviceSlotKey } from "./config-BW0fAtoK.mjs";
+import { c as watchAppPid, i as parseLogcatLine, o as startAndroidLogcat, s as waitForAppPid, t as androidClockOffset } from "./android-B2DSKg-A.mjs";
 import { i as createNdjsonWriter } from "./ndjson-CrjIsGzw.mjs";
-import { a as startIosDeviceConsole, i as parseDeviceConsoleLine } from "./ios-device-CiBA-er9.mjs";
-import { a as unregisterCollector, i as registerCollector, r as readCollectors, t as collectorProcessTitle } from "./ownership-CCfiBfOP.mjs";
-import { n as parseLogStreamLine, r as startIosLogStream, t as appNameFromBundleId } from "./ios-CsRVik64.mjs";
+import { a as startIosDeviceConsole, i as parseDeviceConsoleLine } from "./ios-device-DLdEDWJj.mjs";
+import { a as unregisterCollector, i as registerCollector, r as readCollectors, t as collectorProcessTitle } from "./ownership-hC7xvvxF.mjs";
+import { n as parseLogStreamLine, r as startIosLogStream, t as appNameFromBundleId } from "./ios-Qam0bT9n.mjs";
 import { existsSync } from "node:fs";
 import { isAbsolute, join, resolve } from "node:path";
 import { LOG_ROTATE_BYTES } from "@stim-cli/core";

package/dist/{command-output-CfPW1bKP.mjs → command-output-DjExb_tZ.mjs}

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