stim 1.23.1 → 1.24.0

package/dist/{macos-C67FZ2ft.mjs → macos-CCfhb-jT.mjs}

@@ -1,37 +1,39 @@
-import { d as spawnDeclared, h as withDrainingCancellation, i as withWorkspaceProcessLock, t as getExecutor } from "./exec-DEoAhcze.mjs";
-import { d as workspaceDir, l as workspaceAgentDeviceDir, m as workspaceLogsDir$1, n as ensureWorkspaceStorage } from "./paths-DQtTgsBf.mjs";
-import { E as upsertProject, u as getConcurrencyLimits } from "./config-DlrsduwG.mjs";
-import { l as phaseLine } from "./command-output-YKGWivpG.mjs";
-import { f as throwIfCancelled } from "./operation-exec-BW0em61G.mjs";
-import { d as writeWorkspaceState, i as recordWorkspaceUse } from "./workspace-state-U08dEzhG.mjs";
-import { J as resolveProjectSettingsAsync, a as SETTING_SHAPE_REMEDY, et as settingShapeErrors } from "./settings-C7O8A6ZI.mjs";
-import { f as projectRegistry, i as findProjectRoot$1, s as ownedDeviceLabel } from "./project-DhCtQWWU.mjs";
-import { i as macosProcess, n as macosDir, o as requiredMacosRecord, r as macosLogFile } from "./state-08I3hw3_.mjs";
+import { _ as spawnDeclared, c as throwIfCancelled, t as getExecutor, u as withWorkspaceProcessLock, x as withDrainingCancellation } from "./exec-VFRpu1iA.mjs";
+import { d as workspaceDir, l as workspaceAgentDeviceDir, m as workspaceLogsDir$1, r as ensureWorkspaceStorageAsync } from "./paths-DQtTgsBf.mjs";
+import { E as upsertProject, O as withConfigLockAsync$1, u as getConcurrencyLimits } from "./config-BZhXY15H.mjs";
+import { l as phaseLine } from "./command-output-DxC0k2rk.mjs";
+import { a as recordWorkspaceUseAsync, f as writeWorkspaceStateAsync } from "./workspace-state-CeBpIZgr.mjs";
+import { J as resolveProjectSettingsAsync, a as SETTING_SHAPE_REMEDY, et as settingShapeErrors } from "./settings-RKwY33wv.mjs";
+import { f as projectRegistry, i as findProjectRoot$1, s as ownedDeviceLabel } from "./project-Dz-hWkb-.mjs";
+import { i as macosProcess, n as macosDir, o as requiredMacosRecord, r as macosLogFile } from "./state-BfAltYJP.mjs";
 import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
-import { B as recordFinishedBuild, Fn as processContext, H as tapBuildLog, In as runProcessOperation, M as NO_BUILD_PROGRESS, V as startBuildProgress, z as recordBuildPhase } from "./budget-3ivAK99e.mjs";
-import { d as runCancellationSignal, f as withNativeBuildRun } from "./native-run-Dv88i0aU.mjs";
-import { I as acquireBuildSlot, R as releaseBuildSlot } from "./workspaces-e41xsjKr.mjs";
-import { D as sanitizeDeviceLabel } from "./ios-hcBpnEGk.mjs";
-import { c as offloadPlacement, h as setRemoteLogSink, i as closeOffload, l as placementLoad, n as buildPlacementCandidates, o as offloadBuild, r as chooseBuildMachine, u as remotePhaseText } from "./client-B4MMzfo_.mjs";
-import { a as requireLocalBuild, i as parseBuildMachineOption, r as namedBuildMachine, s as resolveBuildPlacement, t as OffloadRefusal } from "./selection-DSMbWEX2.mjs";
-import { l as connectHost } from "./hosted-client-Bt-tndxV.mjs";
-import { t as placeHostedMacos } from "./hosted-macos-BJusKvqL.mjs";
-import { r as stopMacosAppHeld, t as stopBundleInstances } from "./stop-CR5689oB.mjs";
+import { B as recordFinishedBuild, H as startBuildProgress, Ln as processContext, M as NO_BUILD_PROGRESS, Rn as runProcessOperation, U as tapBuildLog, z as recordBuildPhase } from "./budget-dPGuhNai.mjs";
+import { d as runCancellationSignal, f as withNativeBuildRun } from "./native-run-BmH7U8pr.mjs";
+import { L as acquireBuildSlot, z as releaseBuildSlot } from "./workspaces-CSV2Orf4.mjs";
+import { D as sanitizeDeviceLabel } from "./ios-CVUFFZ6C.mjs";
+import { S as setRemoteLogSink, c as offloadPlacement, i as closeOffload, l as placementLoad, n as buildPlacementCandidates, o as offloadBuild, r as chooseBuildMachine, u as remotePhaseText } from "./client-18-ZowoT.mjs";
+import { a as parseBuildMachineOption, c as resolveBuildPlacement, i as namedBuildMachine, o as requireLocalBuild, t as OffloadRefusal } from "./selection-BLtvaqxc.mjs";
+import { l as connectHost } from "./hosted-client-BBTVe3X6.mjs";
+import { t as placeHostedMacos } from "./hosted-macos-CXjsUNBR.mjs";
+import { r as stopMacosAppHeld, t as stopBundleInstances } from "./stop-DhclRwOO.mjs";
 import { t as spawnEntry } from "./spawn-entry-jw19m8Nl.mjs";
-import { t as buildPlacementRecord } from "./placement-log-BnGgJRRZ.mjs";
-import { t as reidentifyBundle } from "./stage-C4u17aES.mjs";
-import { t as validateMacosArtifactPlatform } from "./artifact-platform-CXcmX_j3.mjs";
-import { t as waitForMacosRegistration } from "./registration-BcRgF6Ox.mjs";
+import { t as buildPlacementRecord } from "./placement-log-DUvqqsB-.mjs";
+import { t as reidentifyBundle } from "./stage-ERTMh88n.mjs";
+import { t as validateMacosArtifactPlatform } from "./artifact-platform-CMRc0M_r.mjs";
+import { t as waitForMacosRegistration } from "./registration-CN6nlhcD.mjs";
 import { createHash, randomUUID } from "node:crypto";
 import { closeSync, existsSync, openSync, promises, realpathSync, renameSync } from "node:fs";
 import { join } from "node:path";
 import { LOG_ROTATE_BYTES, ambientEnv } from "@stim-cli/core";
 import { machineCapacity, validHostedAppArguments } from "@stim-cli/core/state";
 //#region src/macos/build.ts
-async function buildMacosBundle({ context, root, recipe, bundle, bundleId, displayName, scratch, writer, note, record, buildMachine, progress = NO_BUILD_PROGRESS }) {
+async function buildMacosBundle({ context, root, recipe, bundle, bundleId, displayName, scratch, writer, note, record, buildMachine, hostServerKey, progress = NO_BUILD_PROGRESS }) {
 	const signal = runCancellationSignal(context) ?? context.signal;
 	return withDrainingCancellation(context, signal, async () => {
 		throwIfCancelled(signal, "macOS build");
+		const { mode, machines, localEnabled } = buildPlacementCandidates(buildMachine);
+		const builder = namedBuildMachine(buildMachine) ? machines[0] : void 0;
+		const runsOnWorker = hostServerKey !== void 0 && builder?.serverKey === hostServerKey;
 		if (record) record.buildMachine = buildMachine;
 		setRemoteLogSink(context, (entry) => writer.write({
 			...entry,
@@ -116,7 +118,7 @@ async function buildMacosBundle({ context, root, recipe, bundle, bundleId, displ
 		};
 		try {
 			if (record) record.cacheHit = false;
-			if (recipe.cache) try {
+			if (recipe.cache && !runsOnWorker) try {
 				identity = await recipe.cache.identity();
 				if (record) {
 					record.fingerprint = identity.hash;
@@ -150,7 +152,6 @@ async function buildMacosBundle({ context, root, recipe, bundle, bundleId, displ
 			}
 			let cacheOnly = false;
 			try {
-				const { mode, machines, localEnabled } = buildPlacementCandidates(buildMachine);
 				const peer = recipe.cache?.peer?.() ?? null;
 				const request = {
 					...recipe.offload.request(bundleId),
@@ -172,7 +173,7 @@ async function buildMacosBundle({ context, root, recipe, bundle, bundleId, displ
 				if (placement.offload || cacheOnly) {
 					const chosen = await chooseBuildMachine({
 						projectRoot: root,
-						target: await recipe.offload.target(),
+						target: await recipe.offload.target(runsOnWorker),
 						mode,
 						here,
 						machines,
@@ -224,7 +225,7 @@ async function buildMacosBundle({ context, root, recipe, bundle, bundleId, displ
 					progress.step("install");
 					if (outcome.cacheHit) {
 						await reidentifyBundle(context, outcome.artifactPath, bundleId, displayName);
-						await validateMacosArtifactPlatform(context, outcome.artifactPath, recipe.product, signal);
+						await validateMacosArtifactPlatform(context, outcome.artifactPath, recipe.product, signal, runsOnWorker ? chosen.offer.toolchain.arch : void 0);
 					}
 					await recipe.validateFetched(outcome.artifactPath, bundleId, displayName);
 					throwIfCancelled(signal, "macOS build");
@@ -345,7 +346,7 @@ async function planMacos(context, root, buildMachineFlag) {
 	if (selected.failure) throw Object.assign(new Error(selected.failure.message), selected.failure);
 	const macos = settings.macos;
 	if (!macos?.product || !macos.infoPlist) throw Object.assign(/* @__PURE__ */ new Error("Set macos.product and macos.infoPlist explicitly in .stim.json. See stim guide macos."), { code: "STIM_BAD_ARG" });
-	const { swiftpmMacosProject } = await import("./swiftpm-macos-DbwGCpZg.mjs");
+	const { swiftpmMacosProject } = await import("./swiftpm-macos-BVCP5mO4.mjs");
 	const recipe = await swiftpmMacosProject(root).prepare(context, settings);
 	let identity = null;
 	let cacheHit = false;
@@ -398,7 +399,7 @@ async function runMacos(context, root, note = console.error, remote, buildMachin
 	if (selected.failure) throw Object.assign(new Error(selected.failure.message), selected.failure);
 	const buildMachine = selected.selected;
 	const macos = await (await operation.load()).prepare(context, settings);
-	ensureWorkspaceStorage(root);
+	await ensureWorkspaceStorageAsync(root, context.signal);
 	return withNativeBuildRun(context, root, {
 		command: "macos",
 		platform: "macos"
@@ -414,10 +415,15 @@ async function runMacos(context, root, note = console.error, remote, buildMachin
 			const previous = requiredMacosRecord(root);
 			if (previous?.host && previous.host.machine !== remote) throw new Error(`This workspace's macOS app runs on ${previous.host.machine}. Run stim stop first, then stim macos${remote ? ` --remote ${remote}` : ""}.`);
 			if (remote && !validHostedAppArguments(macos.arguments)) throw new Error("macos.arguments is too large for a hosted app: at most 32 arguments of 1024 characters (8192 in total), without NUL or line breaks.");
-			if (remote) (await connectHost(remote)).connection.close();
+			let hostServerKey;
+			if (remote) {
+				const probe = await connectHost(remote);
+				hostServerKey = probe.credential.serverKey;
+				probe.connection.close();
+			}
 			if (!previous?.host) await stopMacosAppHeld(root);
-			upsertProject(root, {});
-			recordWorkspaceUse(root, /* @__PURE__ */ new Date(), context.env, context.cwd);
+			await withConfigLockAsync$1(() => upsertProject(root, {}));
+			await recordWorkspaceUseAsync(root, /* @__PURE__ */ new Date(), context.env, context.cwd, context.signal);
 			const bundle = join(macosDir(root), `${macos.product}.app`);
 			const record = {
 				product: macos.product,
@@ -437,7 +443,7 @@ async function runMacos(context, root, note = console.error, remote, buildMachin
 					hostLaunched: previous.hostLaunched ?? false
 				} : {}
 			};
-			const handoff = await buildBundle(context, root, macos, record, remote !== void 0, note, progress);
+			const handoff = await buildBundle(context, root, macos, record, remote !== void 0, hostServerKey, note, progress);
 			progress.step("launch");
 			const launched = () => {
 				try {
@@ -452,7 +458,7 @@ async function runMacos(context, root, note = console.error, remote, buildMachin
 				return here;
 			}
 			const connection = await connectHost(remote);
-			const write = (patch) => writeWorkspaceState(root, { macos: {
+			const write = (patch) => writeWorkspaceStateAsync(root, { macos: {
 				...record,
 				...patch
 			} });
@@ -467,7 +473,7 @@ async function runMacos(context, root, note = console.error, remote, buildMachin
 					recorded: previous?.host,
 					reserved: (reserved) => {
 						placement = reserved;
-						write({
+						return write({
 							host: reserved,
 							hostLaunched: false
 						});
@@ -481,11 +487,11 @@ async function runMacos(context, root, note = console.error, remote, buildMachin
 					host: run.placement,
 					hostLaunched: run.launched
 				};
-				writeWorkspaceState(root, { macos: placed });
+				await writeWorkspaceStateAsync(root, { macos: placed });
 				launched();
 				return placed;
 			} catch (error) {
-				write({
+				await write({
 					supervisor: void 0,
 					...placement ? {
 						host: placement,
@@ -503,10 +509,10 @@ async function runMacos(context, root, note = console.error, remote, buildMachin
 		}).finally(() => progress.clear());
 	}, { write: note });
 }
-async function buildBundle(context, root, recipe, record, hosted, note, progress = NO_BUILD_PROGRESS) {
+async function buildBundle(context, root, recipe, record, hosted, hostServerKey, note, progress = NO_BUILD_PROGRESS) {
 	const started = Date.parse(record.build.startedAt);
 	const scratch = join(macosDir(root), "build");
-	writeWorkspaceState(root, { macos: record });
+	await writeWorkspaceStateAsync(root, { macos: record });
 	const writer = tapBuildLog(createNdjsonWriter(macosLogFile(root), { maxBytes: LOG_ROTATE_BYTES }), progress);
 	try {
 		const base = recipe.bundleId;
@@ -524,7 +530,8 @@ async function buildBundle(context, root, recipe, record, hosted, note, progress
 			note,
 			progress,
 			record: record.build,
-			buildMachine: record.build.buildMachine
+			buildMachine: record.build.buildMachine,
+			hostServerKey
 		});
 		record.bundleId = built.bundleId;
 		record.displayName = displayName;
@@ -536,7 +543,7 @@ async function buildBundle(context, root, recipe, record, hosted, note, progress
 			finishedAt: (/* @__PURE__ */ new Date()).toISOString(),
 			durationMs: Date.now() - started
 		};
-		writeWorkspaceState(root, { macos: record });
+		await writeWorkspaceStateAsync(root, { macos: record });
 		recordMacosBuild(root, record.build, progress.steps());
 		return built.handoff;
 	} catch (error) {
@@ -555,7 +562,7 @@ async function buildBundle(context, root, recipe, record, hosted, note, progress
 			error: message,
 			..."code" in Object(error) && typeof error.code === "string" ? { errorCode: error.code } : {}
 		};
-		writeWorkspaceState(root, { macos: {
+		await writeWorkspaceStateAsync(root, { macos: {
 			...record,
 			supervisor: void 0,
 			build

package/dist/macos-run.mjs

@@ -1,2 +1,2 @@
-import { n as runMacosSupervisor, t as logLines } from "./run-DidHghD1.mjs";
+import { n as runMacosSupervisor, t as logLines } from "./run-BIwoU44q.mjs";
 export { logLines, runMacosSupervisor };

package/dist/maintenance-run.mjs

@@ -1,11 +1,11 @@
-import { P as formatBytes } from "./config-DlrsduwG.mjs";
-import { Tt as deviceSweepIsScoped, u as resolveBudget } from "./budget-3ivAK99e.mjs";
-import { I as memoryCulpritAdvice, N as memoryCulpritsUnder } from "./ios-hcBpnEGk.mjs";
-import { v as maintenanceLogger } from "./client-B4MMzfo_.mjs";
+import { P as formatBytes } from "./config-BZhXY15H.mjs";
+import { Dt as deviceSweepIsScoped, u as resolveBudget } from "./budget-dPGuhNai.mjs";
+import { N as memoryCulpritsUnder, R as memoryCulpritAdvice } from "./ios-CVUFFZ6C.mjs";
+import { T as maintenanceLogger } from "./client-18-ZowoT.mjs";
 import { t as resolveMaintenanceSettings } from "./settings-Djl-mpjX.mjs";
-import { t as relaunchWithLogFile } from "./detached-entry-BwNEtIrP.mjs";
-import { A as levelFloors, C as measureDisk, D as measureSizes, M as lowestFree, O as sizeScanDeferred, T as measurePressure, j as levelStillShort, k as diskPressureLevel } from "./worktree-B4Nj3EGS.mjs";
-import { i as plannedMaintenance, m as measureOwnedDevices, n as diskRecovered, o as triggeringRoot, r as executeAction } from "./act-vxiMwdf5.mjs";
+import { t as relaunchWithLogFile } from "./detached-entry-KmieOKgN.mjs";
+import { D as measureDisk, F as levelStillShort, I as lowestFree, M as sizeScanDeferred, N as diskPressureLevel, P as levelFloors, j as measureSizes, k as measurePressure } from "./worktree-Dw8kfacb.mjs";
+import { i as plannedMaintenance, m as measureOwnedDevices, n as diskRecovered, o as triggeringRoot, r as executeAction } from "./act-Cyvm8xYc.mjs";
 import { r as due, t as capChildLog } from "./attempt-DW-mQqM7.mjs";
 import { releaseClaim, tryAcquireClaim } from "@stim-cli/core/ownership-claim";
 import { randomBytes } from "node:crypto";

package/dist/{metro-DiXtA3Ty.mjs → metro-Bu8LBfzS.mjs}

@@ -1,7 +1,7 @@
-import { g as process_identity_exports, r as WorkspaceProcessCleanupError, t as getExecutor } from "./exec-DEoAhcze.mjs";
-import { F as isOnMountedVolume, I as listMountedVolumes, O as withConfigLockAsync, _ as loadConfig, n as allMetroPorts, r as claimMetroPort, x as releaseMetroPort } from "./config-DlrsduwG.mjs";
-import { t as runOperationFile } from "./operation-exec-BW0em61G.mjs";
-import { r as readWorkspaceState } from "./workspace-state-U08dEzhG.mjs";
+import { S as process_identity_exports, l as WorkspaceProcessCleanupError, t as getExecutor } from "./exec-VFRpu1iA.mjs";
+import { F as isOnMountedVolume, I as listMountedVolumes, O as withConfigLockAsync, _ as loadConfig, n as allMetroPorts, r as claimMetroPort, x as releaseMetroPort } from "./config-BZhXY15H.mjs";
+import { t as runOperationFile } from "./operation-exec-CUZifp6Z.mjs";
+import { r as readWorkspaceState } from "./workspace-state-CeBpIZgr.mjs";
 import { sep } from "path";
 import { existsSync, readlinkSync, realpathSync } from "fs";
 import { readFile } from "node:fs/promises";

package/dist/{metro-gateway-CKZqKqx7.mjs → metro-gateway-DtsOy-0P.mjs}

@@ -1,8 +1,7 @@
-import { g as process_identity_exports } from "./exec-DEoAhcze.mjs";
+import { S as process_identity_exports, c as throwIfCancelled, s as cancelledError } from "./exec-VFRpu1iA.mjs";
 import { g as workspaceStateFile$1 } from "./paths-DQtTgsBf.mjs";
-import { ot as tailscaleStatusAsync } from "./config-DlrsduwG.mjs";
-import { d as cancelledError, f as throwIfCancelled } from "./operation-exec-BW0em61G.mjs";
-import { l as withWorkspaceStateLockAsync, o as updateWorkspaceState, r as readWorkspaceState$1, s as updateWorkspaceStateAsync } from "./workspace-state-U08dEzhG.mjs";
+import { ot as tailscaleStatusAsync } from "./config-BZhXY15H.mjs";
+import { l as withWorkspaceStateLockAsync, o as updateWorkspaceState, r as readWorkspaceState$1, s as updateWorkspaceStateAsync } from "./workspace-state-CeBpIZgr.mjs";
 import { randomBytes, randomUUID } from "node:crypto";
 import { statSync, watch } from "node:fs";
 import { HOSTED_METRO_REQUESTS_KEY, findPeer, hostedMetroGateways, hostedMetroRequests, isJsonObject, parseMachine } from "@stim-cli/core/state";

package/dist/{named-ports-DkEzOfzO.mjs → named-ports-BWDuU5oQ.mjs}

@@ -1,6 +1,6 @@
-import { g as process_identity_exports, i as withWorkspaceProcessLock, t as getExecutor } from "./exec-DEoAhcze.mjs";
-import { C as saveConfig, O as withConfigLockAsync, _ as loadConfig, c as ensureConfig, d as getConfigDir, p as getProject } from "./config-DlrsduwG.mjs";
-import { f as signalProcessTree, m as createPortProbe, s as parseNetstatPids } from "./metro-DiXtA3Ty.mjs";
+import { S as process_identity_exports, t as getExecutor, u as withWorkspaceProcessLock } from "./exec-VFRpu1iA.mjs";
+import { C as saveConfig, O as withConfigLockAsync, _ as loadConfig, c as ensureConfig, d as getConfigDir, p as getProject } from "./config-BZhXY15H.mjs";
+import { f as signalProcessTree, m as createPortProbe, s as parseNetstatPids } from "./metro-Bu8LBfzS.mjs";
 import { realpathSync } from "node:fs";
 //#region src/named-ports.ts
 const FIRST_PORT = 8900;

package/dist/{native-android-_MWSs3PP.mjs → native-android-96BBizbq.mjs}

@@ -1,21 +1,21 @@
-import { t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { t as getExecutor } from "./exec-VFRpu1iA.mjs";
 import { d as workspaceDir, i as sharedBuildCache } from "./paths-DQtTgsBf.mjs";
-import { H as deviceSlotPlatforms, p as getProject, q as validateDeviceSlot } from "./config-DlrsduwG.mjs";
-import { tt as settingValueAt } from "./settings-C7O8A6ZI.mjs";
-import { r as register } from "./cache-manifest-DSeQjt-Q.mjs";
-import { Y as statsProjectKey } from "./budget-3ivAK99e.mjs";
-import { d as runCancellationSignal } from "./native-run-Dv88i0aU.mjs";
-import { h as resolveBuild, o as entryDir, t as artifactIn } from "./build-cache-Dv7RN200.mjs";
-import { B as ownedAvdDeviceProfile, E as findBuildTool, I as listInstalledSystemImages, K as ownedAvdSystemImage, V as ownedAvdDirectory, X as pickDefaultSystemImage, l as androidSystemImageAbi, o as androidHome } from "./android-C7sVmyI9.mjs";
-import { o as resolveCcache } from "./ccache-CH2EWGPB.mjs";
-import { r as androidToolchainAsync } from "./toolchain-B9hCFCQw.mjs";
-import { a as nativeGradleTransfer, t as gradleOffloadInputs } from "./native-gradle-inputs-Dnh84Zbd.mjs";
-import { d as buildGradle, l as androidSdkRefusal } from "./react-native-build-CelbTO_y.mjs";
-import { l as skippedMissReason, o as explainBuildMiss } from "./prebuild-BligW0QS.mjs";
-import { c as resolveAndroidRunPlan } from "./result-utnBea7x.mjs";
-import { n as androidProcessRuntime } from "./launch-D-zq8SHG.mjs";
-import { n as planFlagRefusal, r as planPayload } from "./build-plan-BmbdHQbr.mjs";
-import { a as nativeGradleWorkerArtifactIdentity, n as gradleArtifactInputs, r as nativeGradleArtifactSnapshot, t as NATIVE_GRADLE_CACHE_LIMIT } from "./native-gradle-artifact-inputs-DHFnmrVf.mjs";
+import { H as deviceSlotPlatforms, p as getProject, q as validateDeviceSlot } from "./config-BZhXY15H.mjs";
+import { tt as settingValueAt } from "./settings-RKwY33wv.mjs";
+import { B as ownedAvdDeviceProfile, E as findBuildTool, I as listInstalledSystemImages, K as ownedAvdSystemImage, V as ownedAvdDirectory, X as pickDefaultSystemImage, l as androidSystemImageAbi, o as androidHome } from "./android-882m4hxX.mjs";
+import { r as register } from "./cache-manifest-BPXRONJz.mjs";
+import { Z as statsProjectKey } from "./budget-dPGuhNai.mjs";
+import { d as runCancellationSignal } from "./native-run-BmH7U8pr.mjs";
+import { s as entryDir, t as artifactIn, y as resolveBuild } from "./build-cache-HFUQ9eLz.mjs";
+import { o as resolveCcache } from "./ccache-CCn1S6qG.mjs";
+import { h as gradleOffloadInputs, y as nativeGradleTransfer } from "./client-18-ZowoT.mjs";
+import { r as androidToolchainAsync } from "./toolchain-D3bmRMia.mjs";
+import { d as buildGradle, l as androidSdkRefusal } from "./react-native-build-AuCu-aAP.mjs";
+import { s as explainBuildMiss, u as skippedMissReason } from "./prebuild-DmVCf5xb.mjs";
+import { u as resolveAndroidRunPlan } from "./result-DqBrb12U.mjs";
+import { n as androidProcessRuntime } from "./launch-SfzGH_s9.mjs";
+import { n as planFlagRefusal, r as planPayload } from "./build-plan-JsDUq4w1.mjs";
+import { a as nativeGradleWorkerArtifactIdentity, n as gradleArtifactInputs, r as nativeGradleArtifactSnapshot, t as NATIVE_GRADLE_CACHE_LIMIT } from "./native-gradle-artifact-inputs-BcLYBZil.mjs";
 import { createHash } from "node:crypto";
 import { createReadStream, createWriteStream, existsSync, readFileSync, statSync } from "node:fs";
 import { tmpdir } from "node:os";

package/dist/{native-gradle-artifact-inputs-DHFnmrVf.mjs → native-gradle-artifact-inputs-BcLYBZil.mjs}

@@ -1,9 +1,9 @@
-import { t as getExecutor } from "./exec-DEoAhcze.mjs";
-import { r as childEnvironment } from "./operation-exec-BW0em61G.mjs";
-import { n as buildCacheKey } from "./build-cache-Dv7RN200.mjs";
-import { o as androidHome } from "./android-C7sVmyI9.mjs";
+import { t as getExecutor } from "./exec-VFRpu1iA.mjs";
+import { r as childEnvironment } from "./operation-exec-CUZifp6Z.mjs";
+import { o as androidHome } from "./android-882m4hxX.mjs";
+import { n as buildCacheKey } from "./build-cache-HFUQ9eLz.mjs";
+import { _ as nativeGradleLocalSourceDigest, h as gradleOffloadInputs } from "./client-18-ZowoT.mjs";
 import { n as fingerprintNativeInputs } from "./native-inputs-TRTTTRxt.mjs";
-import { r as nativeGradleLocalSourceDigest, t as gradleOffloadInputs } from "./native-gradle-inputs-Dnh84Zbd.mjs";
 import { createHash } from "node:crypto";
 import { homedir } from "node:os";
 import { dirname, join, resolve } from "node:path";

package/dist/{native-run-Dv88i0aU.mjs → native-run-BmH7U8pr.mjs}

@@ -1,7 +1,7 @@
-import { i as withWorkspaceProcessLock, l as refuseDeclaredSpawns, m as operationState, p as isTermination, s as allowDeclaredSpawns, u as signalDeclaredSpawns, x as ownership_claim_exports } from "./exec-DEoAhcze.mjs";
+import { D as ownership_claim_exports, b as operationState, g as signalDeclaredSpawns, h as refuseDeclaredSpawns, p as allowDeclaredSpawns, u as withWorkspaceProcessLock, y as isTermination } from "./exec-VFRpu1iA.mjs";
 import { d as workspaceDir } from "./paths-DQtTgsBf.mjs";
-import { a as formatElapsed, l as phaseLine } from "./command-output-YKGWivpG.mjs";
-import { o as updateWorkspaceState, r as readWorkspaceState, t as clearWorkspaceStateKey } from "./workspace-state-U08dEzhG.mjs";
+import { a as formatElapsed, l as phaseLine } from "./command-output-DxC0k2rk.mjs";
+import { l as withWorkspaceStateLockAsync, o as updateWorkspaceState, r as readWorkspaceState, t as clearWorkspaceStateKey } from "./workspace-state-CeBpIZgr.mjs";
 import { t as canonicalPath } from "./paths-BsJMoPP2.mjs";
 import { existsSync, mkdirSync } from "node:fs";
 import { basename, dirname, join } from "node:path";
@@ -226,12 +226,12 @@ function cancelOnAbort({ context, root, claim, write, controller }) {
 	requestListeners.set(claim.claimId, onRequest);
 	const watch = setInterval(onRequest, REQUEST_POLL_MS);
 	watch.unref();
-	return () => {
+	return async () => {
 		clearInterval(watch);
 		requestListeners.delete(claim.claimId);
 		context.signal.removeEventListener("abort", onAbort);
 		allowDeclaredSpawns(context);
-		clearNativeRunCancel(root, claim.claimId);
+		await withWorkspaceStateLockAsync(root, () => clearNativeRunCancel(root, claim.claimId)).catch(() => {});
 	};
 }
 /**
@@ -257,7 +257,7 @@ function withNativeBuildRun(context, root, details, fn, { write }) {
 		try {
 			return await fn(claim);
 		} finally {
-			dispose();
+			await dispose();
 			state.runSignal = void 0;
 		}
 	}, {

package/dist/{native-runtime-DBRfY_PN.mjs → native-runtime-DgtJkzIa.mjs}

@@ -1,14 +1,14 @@
-import { n as ensureWorkspaceStorage } from "./paths-DQtTgsBf.mjs";
-import { l as phaseLine } from "./command-output-YKGWivpG.mjs";
-import { r as readWorkspaceState$1 } from "./workspace-state-U08dEzhG.mjs";
-import { j as metroPortSetting } from "./settings-C7O8A6ZI.mjs";
-import { d as resolveProjectMetro } from "./metro-DiXtA3Ty.mjs";
-import { Yt as LAUNCH_UNVERIFIED, qt as LAUNCH_BUNDLING } from "./budget-3ivAK99e.mjs";
-import { c as startDevServer } from "./start-CU8mCPC7.mjs";
+import { r as ensureWorkspaceStorageAsync } from "./paths-DQtTgsBf.mjs";
+import { l as phaseLine } from "./command-output-DxC0k2rk.mjs";
+import { r as readWorkspaceState$1 } from "./workspace-state-CeBpIZgr.mjs";
+import { j as metroPortSetting } from "./settings-RKwY33wv.mjs";
+import { d as resolveProjectMetro } from "./metro-Bu8LBfzS.mjs";
+import { Yt as LAUNCH_BUNDLING, Zt as LAUNCH_UNVERIFIED } from "./budget-dPGuhNai.mjs";
+import { c as startDevServer } from "./start-BKGrEhzG.mjs";
 import { readIdleStop } from "@stim-cli/core/state";
 import chalk from "chalk";
 //#region src/commands/native-runtime.ts
-async function ensureDevServer({ root, port, settings, settingsContext, remote, env, note, resolve = resolveProjectMetro, start = startDevServer, readState = readWorkspaceState$1 }) {
+async function ensureDevServer({ root, port, settings, settingsContext, remote, hostedPorts, env, note, resolve = resolveProjectMetro, start = startDevServer, readState = readWorkspaceState$1 }) {
 	const pin = metroPortSetting(settings, env);
 	const canReuse = !pin.error && (pin.port === null || pin.port === port);
 	const held = port === null || !canReuse ? null : (await resolve(port, root)).metro;
@@ -26,6 +26,7 @@ async function ensureDevServer({ root, port, settings, settingsContext, remote,
 		settings,
 		settingsContext,
 		remote,
+		hostedPorts,
 		out: note,
 		note
 	});
@@ -52,7 +53,7 @@ async function ensureDevServer({ root, port, settings, settingsContext, remote,
 }
 async function ensureWorkspaceStorageSafely(root, { note = (_line) => {} } = {}) {
 	try {
-		return ensureWorkspaceStorage(root);
+		return await ensureWorkspaceStorageAsync(root);
 	} catch (err) {
 		note(chalk.dim(`Could not prepare this workspace's Stim state: ${err?.message || err}`));
 		throw err;

package/dist/{native-source-Y0yLhFyQ.mjs → native-source-D-4Dh4JU.mjs}

@@ -1,4 +1,4 @@
-import { s as gitAsync } from "./operation-exec-BW0em61G.mjs";
+import { s as gitAsync } from "./operation-exec-CUZifp6Z.mjs";
 import { n as fingerprintNativeInputs, r as manifestDigest } from "./native-inputs-TRTTTRxt.mjs";
 import { createHash } from "node:crypto";
 import { createReadStream } from "node:fs";
@@ -85,10 +85,13 @@ async function nativeFileDigest(path, signal) {
 		sha256: hash.digest("hex")
 	};
 }
-/** The exact source a build needs: tracked and untracked, not ignored, as `git ls-files -co --exclude-standard`. */
-async function sourceManifest(repoRoot, strict = false, signal) {
+/**
+* The exact source a build needs: tracked and untracked, not ignored, as `git ls-files -co --exclude-standard`, and
+* the repository-relative `ignored` paths it also reads.
+*/
+async function sourceManifest(repoRoot, strict = false, signal, ignored = []) {
 	const files = [];
-	for (const path of await gitVisiblePaths(repoRoot, signal)) {
+	for (const path of /* @__PURE__ */ new Set([...await gitVisiblePaths(repoRoot, signal), ...ignored])) {
 		signal?.throwIfAborted();
 		const absolute = join(repoRoot, path);
 		let stat;

package/dist/{native-xcode-inputs-CqViUh3r.mjs → native-xcode-inputs-irplbQb0.mjs}

@@ -1,6 +1,6 @@
 import { d as workspaceDir, u as workspaceDerivedData } from "./paths-DQtTgsBf.mjs";
-import { a as killOnAbort, l as gitQuietAsync, r as childEnvironment } from "./operation-exec-BW0em61G.mjs";
-import { h as pbxString, m as pbxReferences } from "./project-DhCtQWWU.mjs";
+import { a as killOnAbort, l as gitQuietAsync, r as childEnvironment } from "./operation-exec-CUZifp6Z.mjs";
+import { h as pbxString, m as pbxReferences } from "./project-Dz-hWkb-.mjs";
 import { n as fingerprintNativeInputs, t as NativeInputError } from "./native-inputs-TRTTTRxt.mjs";
 import { createHash } from "node:crypto";
 import { existsSync, readFileSync, realpathSync } from "node:fs";

package/dist/{native-xcode-ios-vFgqL_yS.mjs → native-xcode-ios-BY-6hh6M.mjs}

@@ -1,22 +1,22 @@
-import { t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { t as getExecutor } from "./exec-VFRpu1iA.mjs";
 import { o as sharedCompilationCache } from "./paths-DQtTgsBf.mjs";
-import { G as resolveCacheProviderConfig, Nt as repoRootAsync, U as remoteIosSetting, et as settingShapeErrors } from "./settings-C7O8A6ZI.mjs";
-import { g as selectNativeXcodeProject, h as pbxString, p as NativeXcodeError } from "./project-DhCtQWWU.mjs";
-import { r as register } from "./cache-manifest-DSeQjt-Q.mjs";
-import { Fn as processContext, Y as statsProjectKey } from "./budget-3ivAK99e.mjs";
-import { d as runCancellationSignal } from "./native-run-Dv88i0aU.mjs";
-import { n as buildCacheKey, s as filesystemBuildCapability } from "./build-cache-Dv7RN200.mjs";
+import { G as resolveCacheProviderConfig, Nt as repoRootAsync, U as remoteIosSetting, et as settingShapeErrors } from "./settings-RKwY33wv.mjs";
+import { g as selectNativeXcodeProject, h as pbxString, p as NativeXcodeError } from "./project-Dz-hWkb-.mjs";
+import { r as register } from "./cache-manifest-BPXRONJz.mjs";
+import { Ln as processContext, Z as statsProjectKey } from "./budget-dPGuhNai.mjs";
+import { d as runCancellationSignal } from "./native-run-BmH7U8pr.mjs";
+import { l as filesystemBuildCapability, n as buildCacheKey } from "./build-cache-HFUQ9eLz.mjs";
 import { l as artifactCachePolicy, p as resolveOptimizations } from "./errors-ccaPc4ox.mjs";
-import { a as buildXcode, l as parseSwiftVersion, r as HEARTBEAT_INTERVAL_MS, s as compilationCacheSettings, u as parseXcodeMajor } from "./xcode-Rq744mBF.mjs";
-import { a as nativeTransferRefusal } from "./client-B4MMzfo_.mjs";
-import { _ as runCaptured, a as iosToolchainAsync, h as readPodState, m as podsAreStale, v as runPodInstall } from "./toolchain-B9hCFCQw.mjs";
-import { a as deviceModelRefusal, h as resolveDeviceType, m as resolveConfiguration, v as resolveRuntime, x as simulatorBuildArch, y as resolveSchemeSelection } from "./support-TWuQlHQo.mjs";
-import { r as gateProfileForDevice } from "./ios-signing-BtAffm0A.mjs";
-import { l as skippedMissReason, o as explainBuildMiss } from "./prebuild-BligW0QS.mjs";
-import { n as planFlagRefusal, t as planCachedBuild } from "./build-plan-BmbdHQbr.mjs";
-import { t as IosRecipeRefusal } from "./ios-project-CSZYI1iu.mjs";
-import { i as DEFAULT_DEPS, r as iosProcessRuntime } from "./launch-CP2wDCVd.mjs";
-import { a as nativeXcodeSources, i as nativeXcodePackages, n as nativeXcodeInputSnapshot, t as nativeXcodeHasPackages } from "./native-xcode-inputs-CqViUh3r.mjs";
+import { a as buildXcode, l as parseSwiftVersion, r as HEARTBEAT_INTERVAL_MS, s as compilationCacheSettings, u as parseXcodeMajor } from "./xcode-DHu41qQ4.mjs";
+import { a as nativeTransferRefusal } from "./client-18-ZowoT.mjs";
+import { _ as runCaptured, a as iosToolchainAsync, h as readPodState, m as podsAreStale, v as runPodInstall } from "./toolchain-D3bmRMia.mjs";
+import { a as deviceModelRefusal, h as resolveDeviceType, m as resolveConfiguration, v as resolveRuntime, x as simulatorBuildArch, y as resolveSchemeSelection } from "./support-B1W-hmC2.mjs";
+import { r as gateProfileForDevice } from "./ios-signing-4c_qXvQm.mjs";
+import { s as explainBuildMiss, u as skippedMissReason } from "./prebuild-DmVCf5xb.mjs";
+import { n as planFlagRefusal, t as planCachedBuild } from "./build-plan-JsDUq4w1.mjs";
+import { t as IosRecipeRefusal } from "./ios-project-KYqeJURj.mjs";
+import { i as DEFAULT_DEPS, r as iosProcessRuntime } from "./launch-BVlyQw3T.mjs";
+import { a as nativeXcodeSources, i as nativeXcodePackages, n as nativeXcodeInputSnapshot, t as nativeXcodeHasPackages } from "./native-xcode-inputs-irplbQb0.mjs";
 import { existsSync } from "node:fs";
 import { join } from "node:path";
 //#region src/integrations/native-xcode-ios.ts
@@ -322,7 +322,7 @@ function nativeRecipe(root, context) {
 				platform: "ios",
 				native: "xcode",
 				local: {
-					...await iosToolchainAsync(root, "xcode"),
+					...await iosToolchainAsync(root, null),
 					...context.target.hostedArchitecture ? { arch: context.target.hostedArchitecture === "x86_64" ? "x64" : "arm64" } : {}
 				},
 				runtime,

package/dist/offload-worker.d.mts

@@ -1,6 +1,6 @@
 import { c as IosToolchain, g as CompilationCacheActivity, h as CcacheActivity, i as AndroidBuildOptions, l as WorkerToolchain, p as Optimizations, r as SwiftpmArtifactToolchain, t as NativeGradleArtifactReceipt } from "./android-project-DVWyCbWU.mjs";
 import { StimContext } from "@stim-cli/core";
-import { BuildReactNativeArtifactQuery, BuildStartParams, BuildSwiftpmArtifactQuery } from "@stim-cli/core/protocol";
+import { BuildFingerprintSource, BuildReactNativeArtifactQuery, BuildStartParams, BuildSwiftpmArtifactQuery } from "@stim-cli/core/protocol";
 //#region src/offload/react-native-artifact.d.ts
 type ArtifactTools = (IosToolchain & {
   os: string;
@@ -76,7 +76,6 @@ interface WorkerJob {
   } | null;
   swiftpmCache: string;
   project: string;
-  packageName: string | null;
   isExpo: boolean;
   configuration: string | null;
   scheme: string | null;
@@ -84,6 +83,12 @@ interface WorkerJob {
   runtime: string | null;
   android: AndroidBuildOptions | null;
   expectedFingerprint: string | null;
+  /** The client's sources of `expectedFingerprint`, when its stim-server forwards them. */
+  expectedSources?: BuildFingerprintSource[];
+  /** The paths the client's git ignored for `expectedFingerprint`, which this checkout's git may not. */
+  expectedIgnored?: string[];
+  /** The top-level entries the client counted although an ignore pattern matches them; this checkout has no index. */
+  expectedTracked?: string[];
   cacheArtifact?: boolean;
   stimBuild?: string;
   native?: BuildStartParams["native"];