stim 1.24.0 → 1.26.0

package/dist/{build-cache-HFUQ9eLz.mjs → build-cache-DrXNCy3T.mjs}

@@ -1,13 +1,14 @@
 import { c as throwIfCancelled, t as getExecutor, x as withDrainingCancellation } from "./exec-VFRpu1iA.mjs";
-import { i as sharedBuildCache } from "./paths-DQtTgsBf.mjs";
+import { y as sharedBuildCache } from "./workspace-state-pUg3_RRA.mjs";
 import { a as killOnAbort, c as gitQuiet, o as git, r as childEnvironment, s as gitAsync } from "./operation-exec-CUZifp6Z.mjs";
-import { m as defaultAndroidLayout } from "./settings-RKwY33wv.mjs";
-import { r as register } from "./cache-manifest-BPXRONJz.mjs";
+import { m as defaultAndroidLayout } from "./settings-CosW5X-S.mjs";
+import { r as register } from "./cache-manifest-BEZ9Bpl1.mjs";
+import { r as writeSignedTail, t as computeSignedTail } from "./apk-signed-tail-B46U9hXc.mjs";
 import { createHash } from "node:crypto";
 import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { join } from "node:path";
 import { artifactIn, buildCacheKey, resolveArtifact, storeArtifactAsync } from "@stim-cli/core";
-import { isAbsolute as isAbsolute$1, join as join$1, posix as posix$1, relative as relative$1, resolve as resolve$1, sep as sep$1 } from "path";
+import { basename as basename$1, isAbsolute as isAbsolute$1, join as join$1, posix as posix$1, relative as relative$1, resolve as resolve$1, sep as sep$1 } from "path";
 import { existsSync as existsSync$1, lstatSync as lstatSync$1, mkdirSync as mkdirSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, realpathSync as realpathSync$1, rmSync as rmSync$1, statSync as statSync$1 } from "fs";
 import { readdir, writeFile } from "node:fs/promises";
 import { isDeepStrictEqual } from "util";
@@ -293,6 +294,58 @@ function androidProjectFingerprintOptions(projectRoot, layout, exists = existsSy
 		].map((dir) => `${moduleRel}/${dir}/**/*`)
 	};
 }
+const LOCKFILES = [
+	"pnpm-lock.yaml",
+	"yarn.lock",
+	"package-lock.json",
+	"bun.lock",
+	"bun.lockb"
+];
+/**
+* The patches of a monorepo's install root, which @expo/fingerprint does not see: its patch sourcer reads only the
+* app's own `patches/`, and its default preset hashes an installed package by name and version, so a patch applied
+* from the workspace root would leave the key unchanged.
+*/
+function workspacePatchSources(projectRoot) {
+	let dir = resolve$1(projectRoot);
+	for (;;) {
+		if (LOCKFILES.some((name) => existsSync$1(join$1(dir, name)))) break;
+		const parent = resolve$1(dir, "..");
+		if (parent === dir || existsSync$1(join$1(dir, ".git"))) return [];
+		dir = parent;
+	}
+	const sources = ["patches", ".yarn/patches"].filter((name) => (name === "patches" ? dir !== resolve$1(projectRoot) : true) && existsSync$1(join$1(dir, name))).map((name) => ({
+		type: "dir",
+		filePath: relative$1(projectRoot, join$1(dir, name)).split(sep$1).join("/"),
+		reasons: ["workspacePatches"]
+	}));
+	const patched = pnpmPatchedDependencies(join$1(dir, "pnpm-lock.yaml"));
+	if (patched) sources.push({
+		type: "contents",
+		id: "pnpmPatchedDependencies",
+		contents: patched,
+		reasons: ["workspacePatches"]
+	});
+	return sources;
+}
+/** The lockfile's `patchedDependencies` block, which pnpm rewrites with each patch's hash wherever the patch lives. */
+function pnpmPatchedDependencies(lockfile) {
+	let text;
+	try {
+		text = readFileSync$1(lockfile, "utf8");
+	} catch {
+		return null;
+	}
+	const lines = text.split(/\r?\n/);
+	const start = lines.indexOf("patchedDependencies:");
+	if (start === -1) return null;
+	const block = [];
+	for (const line of lines.slice(start + 1)) {
+		if (line && !/^\s/.test(line)) break;
+		if (line.trim()) block.push(line.trim());
+	}
+	return block.length ? block.join("\n") : null;
+}
 /**
 * The bundle output and, with `ios.projectPath` '.', the top-level entries that git ignores here for an iOS
 * fingerprint, as the paths a build worker needs to ignore the same ones: it has no .git/info/exclude or global
@@ -319,7 +372,12 @@ async function fingerprintOptions(projectRoot, { platform, iosProjectPath = "ios
 	const ignoredAtAppRoot = (names) => new Set([...ignoredHere(names)].filter((name) => !trackedPaths.includes(name)));
 	const platforms = platform && FINGERPRINT_PLATFORMS.has(platform) ? { platforms: [platform] } : void 0;
 	const ios = platform === "ios" ? iosProjectFingerprintOptions(projectRoot, iosProjectPath, { ignored: (_, names) => ignoredAtAppRoot(names) }) : androidLayout?.custom ? androidProjectFingerprintOptions(projectRoot, androidLayout) : {};
-	if (ios.extraSources) ios.extraSources = [...(await loadConfigAsync(projectRoot, true))?.extraSources ?? [], ...ios.extraSources];
+	const patches = workspacePatchSources(projectRoot);
+	if (ios.extraSources || patches.length) ios.extraSources = [
+		...(await loadConfigAsync(projectRoot, true))?.extraSources ?? [],
+		...ios.extraSources ?? [],
+		...patches
+	];
 	const bundleOutput = platform === "android" ? [] : [...ignoredHere(Object.keys(BUNDLE_OUTPUT_IGNORES), true)].map((path) => BUNDLE_OUTPUT_IGNORES[path]);
 	return {
 		...platforms,
@@ -345,14 +403,13 @@ async function fingerprintProject(projectRoot, { createFingerprint = expoFingerp
 		sources: Array.isArray(result?.sources) ? result.sources : []
 	};
 }
-/** The env files @expo/env loads for the config, in the mode @expo/fingerprint's config loader sets. */
+/** The env files @expo/env loads for the config: @expo/fingerprint 0.21 evaluates it in development mode. */
 function expoEnvFiles(env = {}) {
 	if (/^(1|true)$/i.test(env.EXPO_NO_DOTENV ?? "")) return [];
-	const mode = env.NODE_ENV || "development";
 	return [
-		`.env.${mode}.local`,
-		...mode === "test" ? [] : [".env.local"],
-		`.env.${mode}`,
+		".env.development.local",
+		".env.local",
+		".env.development",
 		".env"
 	];
 }
@@ -457,12 +514,29 @@ async function storeBuild(platform, key, buildPath, rootOrOptions = {}) {
 			}),
 			overwrite: Boolean(options.overwrite),
 			writeMetadata: async (staging) => {
+				if (platform === "android" && buildPath.endsWith(".apk")) try {
+					const tail = await computeSignedTail(join$1(staging, basename$1(buildPath)), (file, args) => getExecutor().runFileAsync(file, args, {
+						timeoutMs: 12e4,
+						...env ? childEnvironment(env) : {},
+						onSpawn: killOnAbort(signal),
+						declareFor: options.context
+					}));
+					if (tail) await writeSignedTail(staging, tail);
+				} catch {
+					throwIfCancelled(signal, "build cache copy");
+				}
 				if (Array.isArray(options.sources)) try {
 					await writeFile(join$1(staging, SOURCES_FILE), JSON.stringify(options.sources.map(withoutContents)));
 				} catch {}
 				if (options.assetManifest) try {
 					await writeFile(join$1(staging, ASSET_MANIFEST_FILE), JSON.stringify(options.assetManifest));
 				} catch {}
+				if (options.readAppId) try {
+					const appId = await options.readAppId(buildPath);
+					if (appId) await writeFile(join$1(staging, APP_ID_FILE), JSON.stringify({ appId }));
+				} catch {
+					throwIfCancelled(signal, "build cache copy");
+				}
 			}
 		}));
 	} catch (error) {
@@ -496,12 +570,13 @@ function prepareProviderDownloadDir(dir, registeredBy) {
 		});
 	} catch {}
 }
-function filesystemBuildCapability({ root, context, sources, assetManifest, resolve = resolveBuild, store = storeBuild } = {}) {
+function filesystemBuildCapability({ root, context, sources, assetManifest, readAppId, resolve = resolveBuild, store = storeBuild } = {}) {
 	const stored = {
 		...context === void 0 ? {} : { context },
 		...root === void 0 ? {} : { root },
 		...sources === void 0 ? {} : { sources },
-		...assetManifest === void 0 ? {} : { assetManifest }
+		...assetManifest === void 0 ? {} : { assetManifest },
+		...readAppId === void 0 ? {} : { readAppId }
 	};
 	return {
 		resolve: ({ platform, key }) => root === void 0 ? resolve(platform, key) : resolve(platform, key, root),
@@ -529,6 +604,7 @@ function providerUploadOutcome(result, name, env) {
 	};
 }
 const SOURCES_FILE = "fingerprint-sources.json";
+const APP_ID_FILE = "app-id.json";
 function withoutContents(source) {
 	return source.type === "contents" ? {
 		...source,
@@ -543,6 +619,16 @@ function storedSources(platform, key, root = sharedBuildCache()) {
 		return null;
 	}
 }
+/** The bundle id or Android package read from the entry's artifact when it was stored, or null for older entries. */
+function storedAppId(platform, key, root = sharedBuildCache()) {
+	try {
+		const parsed = JSON.parse(readFileSync$1(join$1(entryDir(platform, key, root), APP_ID_FILE), "utf-8"));
+		if (parsed && typeof parsed === "object" && "appId" in parsed && typeof parsed.appId === "string" && parsed.appId) return parsed.appId;
+		return null;
+	} catch {
+		return null;
+	}
+}
 function storedAssetManifest(platform, key, root = sharedBuildCache()) {
 	try {
 		return parseAssetManifest(readFileSync$1(join$1(entryDir(platform, key, root), ASSET_MANIFEST_FILE), "utf-8"));
@@ -570,6 +656,28 @@ function diffItemChange(item) {
 		reasons: sourceReasons(source)
 	};
 }
+/** The installed package a source path lies in: the name after its last `node_modules/`. */
+function packageIn(path) {
+	return [...path.matchAll(/(?:^|\/)node_modules\/((?:@[^/]+\/)?[^/]+)/g)].at(-1)?.[1] ?? null;
+}
+/** A package that moved, such as a version bump of a pnpm store directory, is one change rather than a removal and an addition. */
+function mergeMovedPackages(changes) {
+	const added = /* @__PURE__ */ new Map();
+	for (const change of changes) {
+		const pkg = change.change === "added" ? packageIn(change.name) : null;
+		if (pkg && !added.has(pkg)) added.set(pkg, change);
+	}
+	const moved = /* @__PURE__ */ new Set();
+	const kept = changes.filter((change) => {
+		const pkg = change.change === "removed" ? packageIn(change.name) : null;
+		const counterpart = pkg ? added.get(pkg) : void 0;
+		if (!counterpart || moved.has(counterpart)) return true;
+		moved.add(counterpart);
+		return false;
+	});
+	for (const change of moved) change.change = "changed";
+	return kept;
+}
 function compareSourceLists(previous, current) {
 	const previousByName = /* @__PURE__ */ new Map();
 	for (const source of previous) {
@@ -603,7 +711,7 @@ function compareSourceLists(previous, current) {
 		change: "removed",
 		reasons: before.reasons
 	});
-	return changes;
+	return mergeMovedPackages(changes);
 }
 function diffFingerprintSources({ previous, previousHash = null, current, differ = null }) {
 	if (typeof differ === "function") try {
@@ -615,16 +723,8 @@ function diffFingerprintSources({ previous, previousHash = null, current, differ
 			hash: current.hash
 		});
 		if (Array.isArray(items)) {
-			const changes = [];
 			const seen = /* @__PURE__ */ new Set();
-			for (const item of items) {
-				const change = diffItemChange(item);
-				if (change !== null && !seen.has(change.name)) {
-					seen.add(change.name);
-					changes.push(change);
-				}
-			}
-			return changes;
+			return mergeMovedPackages(items.map(diffItemChange).filter((change) => change !== null)).filter((change) => !seen.has(change.name) && Boolean(seen.add(change.name)));
 		}
 	} catch {}
 	return compareSourceLists(previous, current.sources);
@@ -732,4 +832,4 @@ function fingerprintDiffRecord({ changed, previousHash, hash }) {
 	};
 }
 //#endregion
-export { trackedFingerprintPaths as C, captureAssetManifest as D, assetDiffReason as E, compareAssetManifests as O, storedSources as S, untrackedNativeFiles as T, providerUploadOutcome as _, configInputsChanged as a, storeBuild as b, expoConfigContents as c, fingerprintProject as d, gitignoredFingerprintInputs as f, providerDownloadPath as g, prepareProviderDownloadDir as h, compareSourceLists as i, readAssetManifest as k, filesystemBuildCapability as l, inputsChangedDuringBuild as m, buildCacheKey as n, diffFingerprintSources as o, ignoredFingerprintPaths as p, changedDuringBuildLine as r, entryDir as s, artifactIn as t, fingerprintDiffRecord as u, refingerprintAfterMutation as v, untrackedMissLine as w, storedAssetManifest as x, resolveBuild as y };
+export { assetDiffReason as A, storeBuild as C, trackedFingerprintPaths as D, storedSources as E, compareAssetManifests as M, readAssetManifest as N, untrackedMissLine as O, resolveBuild as S, storedAssetManifest as T, packageIn as _, configInputsChanged as a, providerUploadOutcome as b, expoConfigContents as c, fingerprintDiffRecord as d, fingerprintOptions as f, inputsChangedDuringBuild as g, ignoredFingerprintPaths as h, compareSourceLists as i, captureAssetManifest as j, untrackedNativeFiles as k, expoEnvFiles as l, gitignoredFingerprintInputs as m, buildCacheKey as n, diffFingerprintSources as o, fingerprintProject as p, changedDuringBuildLine as r, entryDir as s, artifactIn as t, filesystemBuildCapability as u, prepareProviderDownloadDir as v, storedAppId as w, refingerprintAfterMutation as x, providerDownloadPath as y };

package/dist/{build-plan-JsDUq4w1.mjs → build-plan-DrMMdayj.mjs}

@@ -1,9 +1,9 @@
 import { T as trackReportResource } from "./exec-VFRpu1iA.mjs";
-import { i as formatDuration, l as phaseLine, m as shortHash, u as plural } from "./command-output-DxC0k2rk.mjs";
-import { Ht as makeTemporaryDirectory, Wt as removeTemporaryEntryAsync } from "./settings-RKwY33wv.mjs";
-import { L as estimateBuild, Un as easAuthNote, q as readStats } from "./budget-dPGuhNai.mjs";
-import { s as entryDir, t as artifactIn } from "./build-cache-HFUQ9eLz.mjs";
-import { l as predictBuildMiss, o as staleNativeDirRefusal } from "./prebuild-DmVCf5xb.mjs";
+import { i as formatDuration, l as phaseLine, m as shortHash, u as plural } from "./command-output-BF5AR2dL.mjs";
+import { Gt as removeTemporaryEntryAsync, Ut as makeTemporaryDirectory } from "./settings-CosW5X-S.mjs";
+import { Jn as easAuthNote, V as estimateBuild, Z as readStats } from "./budget-k2mZGvvk.mjs";
+import { s as entryDir, t as artifactIn } from "./build-cache-DrXNCy3T.mjs";
+import { l as predictBuildMiss, o as staleNativeDirRefusal } from "./prebuild-gmouvmJZ.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-BPXRONJz.mjs → cache-manifest-BEZ9Bpl1.mjs}

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

package/dist/{ccache-CCn1S6qG.mjs → ccache-Bx5TbxwG.mjs}

@@ -1,10 +1,10 @@
 import { t as getExecutor } from "./exec-VFRpu1iA.mjs";
-import { a as sharedCcache, m as workspaceLogsDir } from "./paths-DQtTgsBf.mjs";
-import { _ as loadConfig } from "./config-BZhXY15H.mjs";
-import { l as phaseLine } from "./command-output-DxC0k2rk.mjs";
-import { m as defaultAndroidLayout } from "./settings-RKwY33wv.mjs";
-import { r as register } from "./cache-manifest-BPXRONJz.mjs";
-import { o as machineNumber } from "./budget-dPGuhNai.mjs";
+import { b as sharedCcache, k as workspaceLogsDir } from "./workspace-state-pUg3_RRA.mjs";
+import { _ as loadConfig } from "./config-BktkY_zC.mjs";
+import { l as phaseLine } from "./command-output-BF5AR2dL.mjs";
+import { m as defaultAndroidLayout } from "./settings-CosW5X-S.mjs";
+import { r as register } from "./cache-manifest-BEZ9Bpl1.mjs";
+import { o as machineNumber } from "./budget-k2mZGvvk.mjs";
 import { readFileSync, realpathSync } from "node:fs";
 import { isAbsolute, join, relative } from "node:path";
 import chalk from "chalk";

package/dist/{cli-xqAidP7O.mjs → cli-BBKFGOFl.mjs}

@@ -1,27 +1,27 @@
 import { E as debugLog } from "./exec-VFRpu1iA.mjs";
-import { y as refuseRelativeStimPaths } from "./config-BZhXY15H.mjs";
+import { y as refuseRelativeStimPaths } from "./config-BktkY_zC.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-BZ6oxNum.mjs")],
-	["worktree", () => import("./worktree-DEDUzO_L.mjs")],
-	["start", () => import("./start-Bmg_qmHi.mjs")],
-	["ports", () => import("./ports-D-E_OiAO.mjs")],
-	["stop", () => import("./stop-BFu7X_Do.mjs")],
-	["ios", () => import("./ios-BItP6lkn.mjs")],
-	["android", () => import("./android-DcztblCT.mjs")],
-	["web", () => import("./web-BdOFlTJr.mjs")],
-	["macos", () => import("./macos-B3BveDrU.mjs")],
-	["reload", () => import("./reload-Ck9RJeSq.mjs")],
-	["device", () => import("./device-4RUugw5X.mjs")],
-	["logs", () => import("./logs-ovlU7m7N.mjs")],
-	["settings", () => import("./settings-kkt0vP4w.mjs")],
-	["status", () => import("./status-Pw-807f0.mjs")],
-	["stats", () => import("./stats-B-ckuiUg.mjs")],
-	["gc", () => import("./gc-DDWEAj0w.mjs")],
-	["guide", () => import("./guide-Bggftwc5.mjs")]
+	["doctor", () => import("./doctor-Cp-BhzTS.mjs")],
+	["worktree", () => import("./worktree-Bm4cb-nU.mjs")],
+	["start", () => import("./start-C_wefNKB.mjs")],
+	["ports", () => import("./ports-C2_w1Z0Z.mjs")],
+	["stop", () => import("./stop-CmdNhGlC.mjs")],
+	["ios", () => import("./ios-B7-lToDu.mjs")],
+	["android", () => import("./android-CSbLRD53.mjs")],
+	["web", () => import("./web-BFLueSh-.mjs")],
+	["macos", () => import("./macos-B0VEV3Gf.mjs")],
+	["reload", () => import("./reload-C9OduiNc.mjs")],
+	["device", () => import("./device-BcYeHSFu.mjs")],
+	["logs", () => import("./logs-s1dRIG1E.mjs")],
+	["settings", () => import("./settings-OaGQF-ri.mjs")],
+	["status", () => import("./status-B9M7x4CZ.mjs")],
+	["stats", () => import("./stats-tEpEEH-u.mjs")],
+	["gc", () => import("./gc-C_79zvz4.mjs")],
+	["guide", () => import("./guide-D7K0X6KG.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-BLsHgAGR.mjs");
+			const { triggerMaintenance } = await import("./trigger-DzJu208Q.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-xqAidP7O.mjs");
+} else import("./cli-BBKFGOFl.mjs");
 //#endregion
 export {};

package/dist/{client-18-ZowoT.mjs → client-D9CaRks-.mjs}

@@ -1,69 +1,24 @@
 import { C as reportSignal, E as debugLog, b as operationState, c as throwIfCancelled, t as getExecutor } from "./exec-VFRpu1iA.mjs";
-import { Q as openAuthenticated, _ as loadConfig$1, it as sayHello, rt as resolveEndpoint } from "./config-BZhXY15H.mjs";
+import { _ as loadConfig$1, at as resolveEndpoint, et as openAuthenticated, ot as sayHello } from "./config-BktkY_zC.mjs";
 import { o as git, s as gitAsync } from "./operation-exec-CUZifp6Z.mjs";
-import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
-import { Q as emptyCaches, Sr as discoverCaches, it as planCacheEmptying } from "./budget-dPGuhNai.mjs";
+import { Dr as discoverCaches, E as maintenanceLogger, ct as planCacheEmptying, nt as emptyCaches } from "./budget-k2mZGvvk.mjs";
 import { t as canonicalPath } from "./paths-BsJMoPP2.mjs";
-import { d as runCancellationSignal } from "./native-run-BmH7U8pr.mjs";
-import { n as CCACHE_UNAVAILABLE, t as CCACHE_NOT_RUN } from "./ccache-CCn1S6qG.mjs";
-import { n as COMPILATION_CACHE_UNAVAILABLE, t as COMPILATION_CACHE_NOT_RUN } from "./xcode-DHu41qQ4.mjs";
+import { d as runCancellationSignal } from "./native-run-BfIDFKLH.mjs";
 import { t as resolveMaintenanceSettings } from "./settings-Djl-mpjX.mjs";
-import { a as iosToolchainAsync, d as toolchainMismatches, f as workerToolchain, g as readRubyVersion } from "./toolchain-D3bmRMia.mjs";
-import { i as namedBuildMachine, t as OffloadRefusal, u as pairedMachines } from "./selection-BLtvaqxc.mjs";
+import { n as CCACHE_UNAVAILABLE, t as CCACHE_NOT_RUN } from "./ccache-Bx5TbxwG.mjs";
+import { A as COMPILATION_CACHE_UNAVAILABLE, E as readRubyVersion, a as cocoapodsDifference, k as COMPILATION_CACHE_NOT_RUN, s as iosToolchainAsync, v as toolchainMismatches, x as workerToolchain, y as toolchainNotes } from "./toolchain-J4J8MrAr.mjs";
+import { f as pairedMachines, i as namedBuildMachine, t as OffloadRefusal, u as workerFailureReason } from "./selection-BNPBZ6T5.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-D-4Dh4JU.mjs";
 import { createHash, webcrypto } from "node:crypto";
-import { closeSync, existsSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, rmSync, statSync, unlinkSync, writeSync } from "node:fs";
+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 { LOG_ROTATE_BYTES, ambientContext, dependencyLockfile, reactNativeArtifactIdentity, reactNativeArtifactQuery, rotatedLogPath, swiftpmArtifactQuery, withDirLock } from "@stim-cli/core";
-import { MAINTENANCE_LOG_NAME, OFFLOAD_MODES, automaticMachineEnabled, isJsonObject, maintenanceDir, maintenanceNdjsonFile, requireAutomaticMachine, runId, saturation, workspaceLogsDir } from "@stim-cli/core/state";
+import { ambientContext, dependencyLockfile, reactNativeArtifactIdentity, reactNativeArtifactQuery, swiftpmArtifactQuery } from "@stim-cli/core";
+import { OFFLOAD_MODES, automaticMachineEnabled, isJsonObject, maintenanceDir, 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";
-//#region src/maintenance/log.ts
-function maintenanceLogger(settings, pass, trigger) {
-	const file = maintenanceNdjsonFile();
-	const rotated = rotatedLogPath(file);
-	withDirLock(`${file}.lock`, () => {
-		try {
-			if (Date.now() - statSync(rotated).mtimeMs > settings.logRetentionDays * 864e5) unlinkSync(rotated);
-		} catch {}
-	});
-	const writer = createNdjsonWriter(file, { maxBytes: settings.logMaxMb * 1024 ** 2 });
-	return {
-		write(event, level, msg, fields = {}) {
-			if (level === "debug" && !settings.logChecks) return null;
-			const record = {
-				...fields,
-				ts: Date.now(),
-				src: "maintenance",
-				level,
-				msg,
-				event,
-				pass,
-				trigger,
-				mode: settings.mode === "on" ? "on" : "report"
-			};
-			if (!writer.write(record)) throw writer.lastError ?? /* @__PURE__ */ new Error(`Could not append ${file}`);
-			if (typeof fields.workspace === "string" && [
-				"maintenance_action",
-				"maintenance_failure",
-				"maintenance_skip"
-			].includes(event)) {
-				const workspace = createNdjsonWriter(join(workspaceLogsDir(fields.workspace), MAINTENANCE_LOG_NAME), { maxBytes: LOG_ROTATE_BYTES });
-				try {
-					if (!workspace.write(record)) throw workspace.lastError ?? /* @__PURE__ */ new Error("Could not append workspace maintenance log");
-				} finally {
-					workspace.close();
-				}
-			}
-			return record;
-		},
-		close: () => writer.close()
-	};
-}
-//#endregion
 //#region src/cache/compilation-cache-corruption.ts
 const COMPILATION_CACHE_CORRUPT = "STIM_COMPILATION_CACHE_CORRUPT";
 async function emptyCompilationCache(dir) {
@@ -387,9 +342,10 @@ async function reactNativeArtifactToolchain(platform, root, iosDirectory) {
 			os: process.platform
 		} : null;
 	}
-	const { stimBuild, os, arch, jdk, androidSdk } = workerToolchain(null, "gradle");
-	return stimBuild && jdk && androidSdk ? {
+	const { stimBuild, compat, os, arch, jdk, androidSdk } = workerToolchain(null, "gradle");
+	return stimBuild && compat !== void 0 && jdk && androidSdk ? {
 		stimBuild,
+		compat,
 		os,
 		arch,
 		jdk,
@@ -540,8 +496,10 @@ function matchingArtifact(offer, identity) {
 }
 const gb = (bytes) => (bytes / 1024 ** 3).toFixed(1);
 /** Every reason a machine's offer cannot take this build, in either mode; empty when it can. */
-function offerProblems(offer, target) {
+function offerProblems(offer, target, named = false) {
 	const problems = toolchainMismatches(target, offer.toolchain);
+	const pods = !named && target.platform === "ios" && !problems.some(({ code }) => code === "platform") ? cocoapodsDifference(target, offer.toolchain) : null;
+	if (pods) problems.push(pods);
 	const capacity = offer.capacity;
 	const { running, max, diskFreeBytes, minDiskFreeBytes, declined } = capacity;
 	if (diskFreeBytes !== null && diskFreeBytes < minDiskFreeBytes) problems.push({
@@ -601,7 +559,7 @@ function pickOffer({ mode, here, offers, target, localEnabled = true, selected =
 			return;
 		}
 		if (cacheOnly) return skip(machine, "artifact-miss", "no matching completed artifact");
-		const problems = offerProblems(offer, target);
+		const problems = offerProblems(offer, target, namedBuildMachine(selected));
 		if (problems.length) return skip(machine, problemCode(problems[0]), problems.map((problem) => problem.reason).join("; "), problems.map((problem) => problem.code));
 		const load = offer.capacity.loadPerCore;
 		if (selected === "auto" && localEnabled && mode === "auto" && !slotsFull) {
@@ -614,10 +572,11 @@ function pickOffer({ mode, here, offers, target, localEnabled = true, selected =
 			score,
 			load: typeof load === "number" ? load : Number.POSITIVE_INFINITY
 		});
+		const notes = toolchainNotes(target, offer.toolchain).map((each) => each.reason);
 		candidates.push({
 			machine,
 			code: "accepted",
-			msg: typeof load === "number" ? `can take the build (load ${load}/core there)` : "can take the build"
+			msg: [typeof load === "number" ? `can take the build (load ${load}/core there)` : "can take the build", ...notes].join("; ")
 		});
 	});
 	ranked.sort((a, b) => b.score - a.score || a.load - b.load);
@@ -970,8 +929,8 @@ async function probeMachine(credential, identity, { connectMs = CONNECT_TIMEOUT_
 		...identity.dependencies && connection.supports("build-dependency-cache") ? { dependencies: identity.dependencies } : {},
 		...native ? { native } : identity.rubyVersion ? { rubyVersion: identity.rubyVersion } : {},
 		...native === "xcode" && identity.artifact && connection.supports("build-artifact-cache") ? { artifact: identity.artifact } : {},
-		...identity.swiftpmArtifact && connection.supports("swiftpm-peer-cache") ? { swiftpmArtifact: identity.swiftpmArtifact } : {},
-		...identity.reactNativeArtifact && connection.supports("react-native-peer-cache") ? { reactNativeArtifact: identity.reactNativeArtifact } : {},
+		...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 } : {}
 	}, offerMs);
 	const failure = replyError(reply);
@@ -993,7 +952,7 @@ async function probeMachine(credential, identity, { connectMs = CONNECT_TIMEOUT_
 	return {
 		credential,
 		connection,
-		offer: identity.swiftpmArtifact && !connection.supports("swiftpm-peer-cache") || identity.reactNativeArtifact && !connection.supports("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 || !connection.supports("native-gradle-peer-cache")) ? {
 			...offer,
 			artifact: null
 		} : offer
@@ -1022,7 +981,7 @@ async function chooseBuildMachine({ projectRoot, target, mode, here, note, machi
 	const swiftpmQuery = swiftpmArtifact?.artifactInputs ? swiftpmArtifactQuery({
 		project: identity.project,
 		sourceDigest: manifestDigest(await sourceManifest(identity.repoRoot, true, runCancellationSignal(ambientContext()) ?? ambientContext()?.signal)),
-		stimBuild: target.local.stimBuild,
+		compat: target.local.compat,
 		inputs: swiftpmArtifact.artifactInputs,
 		build: {
 			product: swiftpmArtifact.product,
@@ -1085,6 +1044,17 @@ async function chooseBuildMachine({ projectRoot, target, mode, here, note, machi
 		...swiftpmQuery ? { swiftpmArtifact: swiftpmQuery } : {}
 	};
 }
+function startJdk(choice) {
+	const { target, connection } = choice;
+	return target.platform === "android" && target.local.jdk && connection.supports("build-jdk") ? { jdk: target.local.jdk } : {};
+}
+function startCompat(choice) {
+	return choice.connection.supports("build-compat") ? { compat: choice.target.local.compat } : {};
+}
+/** 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");
+}
 function macosBuildParameters(request, peerCache) {
 	return {
 		...request.cacheArtifact === true && peerCache ? { cacheArtifact: true } : {},
@@ -1120,13 +1090,13 @@ async function peerArtifact(choice, request, fingerprint) {
 				assetCatalog: request.assetCatalog ?? null
 			}
 		}))) throw new Error("The SwiftPM artifact query does not match the build request.");
-		if (!choice.connection.supports("swiftpm-peer-cache") || manifestDigest(await sourceManifest(choice.identity.repoRoot, true, runCancellationSignal(ambientContext()) ?? ambientContext()?.signal)) !== swiftpm.sourceDigest) return null;
+		if (!queriesPeerCache(choice.connection, "swiftpm-peer-cache") || manifestDigest(await sourceManifest(choice.identity.repoRoot, true, runCancellationSignal(ambientContext()) ?? ambientContext()?.signal)) !== swiftpm.sourceDigest) return null;
 		return matchingArtifact(choice.offer, "swiftpm");
 	}
 	const reactNative = choice.reactNativeArtifact;
 	if (reactNative) {
 		if (typeof fingerprint !== "string" || !isDeepStrictEqual(reactNative, reactNativeBuildQuery(request, fingerprint, choice.identity.project, choice.target.local))) throw new Error("The React Native artifact query does not match the build request.");
-		return choice.connection.supports("react-native-peer-cache") ? matchingArtifact(choice.offer, `react-native-${reactNative.platform}`) : null;
+		return queriesPeerCache(choice.connection, "react-native-peer-cache") ? matchingArtifact(choice.offer, `react-native-${reactNative.platform}`) : null;
 	}
 	const query = choice.gradleArtifact;
 	if (query) {
@@ -1550,18 +1520,20 @@ async function offloadBuild(input) {
 						...choice.connection.supports("native-gradle-artifact-cache") ? { cache: native.cache } : {}
 					}
 				} } : {},
-				...request.platform === "macos" ? macosBuildParameters(request, choice.connection.supports("swiftpm-peer-cache")) : {
+				...request.platform === "macos" ? macosBuildParameters(request, queriesPeerCache(choice.connection, "swiftpm-peer-cache")) : {
 					configuration: request.platform === "ios" ? request.configuration : null,
 					scheme: request.platform === "ios" ? request.scheme : null,
 					iosProjectPath: request.platform === "ios" ? request.iosProjectPath ?? null : null,
 					runtime: request.platform === "ios" ? request.runtime : null,
 					packageName: packageName(join(identity.repoRoot, identity.project)),
 					isExpo: request.isExpo,
-					...!native && request.cacheArtifact === true && choice.connection.supports("react-native-peer-cache") ? { cacheArtifact: true } : {},
+					...!native && request.cacheArtifact === true && queriesPeerCache(choice.connection, "react-native-peer-cache") ? { cacheArtifact: true } : {},
 					optimizations: request.platform === "ios" && isJsonObject(request.optimizations) ? request.optimizations : null,
 					...request.platform === "android" ? { android: request.android } : {}
 				},
-				stimBuild: choice.target.local.stimBuild
+				stimBuild: choice.target.local.stimBuild,
+				...startCompat(choice),
+				...startJdk(choice)
 			});
 			checkCancelled();
 			if ("result" in reply) {
@@ -1585,7 +1557,7 @@ async function offloadBuild(input) {
 		const { connection, machine } = choice;
 		connection.onProgress(null);
 		const workerMs = cacheHit ? 0 : Date.now() - workerStarted;
-		if (result.ok !== true) return keepCorruptCacheMessage(fail(`${String(result.code ?? "failed")}: ${String(result.message ?? "")}`), result);
+		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.");
 		if (native?.provider === "gradle" && !ANDROID_PACKAGE.test(String(result.androidPackage ?? ""))) return fail("The worker returned no verified native APK package.");
 		const artifact = result.artifact;
@@ -1736,6 +1708,16 @@ function machineProblems(offer, targets) {
 	}
 	return problems;
 }
+/** What a build on a machine that would take it does beyond the match, for each of `targets`, labeled like `machineProblems`. */
+function machineNotes(offer, targets) {
+	const notes = [];
+	if (machineProblems(offer, targets).length) return notes;
+	for (const target of targets) for (const note of toolchainNotes(target, offer.toolchain)) notes.push(targets.length > 1 ? {
+		...note,
+		reason: `${PLATFORM_LABEL[target.platform]}: ${note.reason}`
+	} : note);
+	return notes;
+}
 const DOCTOR_CONNECT_MS = 5e3;
 const DOCTOR_OFFER_MS = 8e3;
 const PLATFORM_LABEL = {
@@ -1793,11 +1775,13 @@ function offloadCheck(projectRoot, targets) {
 		};
 		probe.connection.close();
 		resolved ??= targets();
+		const judged = await resolved;
 		return {
 			capacity: probe.offer.capacity,
-			problems: machineProblems(probe.offer, await resolved)
+			problems: machineProblems(probe.offer, judged),
+			notes: machineNotes(probe.offer, judged)
 		};
 	};
 }
 //#endregion
-export { COMPILATION_CACHE_CORRUPT as C, setRemoteLogSink as S, maintenanceLogger as T, 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 { 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 };

package/dist/collector-run.mjs

@@ -1,11 +1,11 @@
 import { S as process_identity_exports } from "./exec-VFRpu1iA.mjs";
-import { m as workspaceLogsDir } from "./paths-DQtTgsBf.mjs";
-import { V as deviceSlotKey, q as validateDeviceSlot } from "./config-BZhXY15H.mjs";
+import { k as workspaceLogsDir } from "./workspace-state-pUg3_RRA.mjs";
+import { V as deviceSlotKey, q as validateDeviceSlot } from "./config-BktkY_zC.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-CX5IcRuf.mjs";
+import { c as watchAppPid, i as parseLogcatLine, o as startAndroidLogcat, s as waitForAppPid, t as androidClockOffset } from "./android-B5P81yI-.mjs";
 import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
 import { a as startIosDeviceConsole, i as parseDeviceConsoleLine } from "./ios-device-B6HK951C.mjs";
-import { a as unregisterCollector, i as registerCollector, r as readCollectors, t as collectorProcessTitle } from "./ownership-DxlZGDcV.mjs";
+import { a as unregisterCollector, i as registerCollector, r as readCollectors, t as collectorProcessTitle } from "./ownership-BjYvMNX_.mjs";
 import { n as parseLogStreamLine, r as startIosLogStream, t as appNameFromBundleId } from "./ios-ENC4sRPA.mjs";
 import { existsSync } from "node:fs";
 import { isAbsolute, join, resolve } from "node:path";

package/dist/{command-output-DxC0k2rk.mjs → command-output-BF5AR2dL.mjs}

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