stim 1.21.0 → 1.22.0

package/dist/supervisor-run.mjs

@@ -1,24 +1,23 @@
-import { p as process_identity_exports } from "./exec-_UbtCQcG.mjs";
+import { g as process_identity_exports, i as withWorkspaceProcessLock } from "./exec-DEoAhcze.mjs";
 import { g as workspaceStateFile$1, m as workspaceLogsDir$1 } from "./paths-DQtTgsBf.mjs";
-import { K as projectDeviceSlots, T as setSupervisor, W as parseDeviceSlotKey, o as clearSupervisor, p as getProject } from "./config-CYcBF478.mjs";
-import { c as withWorkspaceStateLock, d as writeWorkspaceState, n as clearWorkspaceStateKeys, o as updateWorkspaceState, r as readWorkspaceState$1 } from "./workspace-state-Cjuigeeu.mjs";
-import { X as runnableMetroCommand, q as resolveProjectSettings } from "./settings-CsJDEXgK.mjs";
-import { D as clearExpoMetroTunnel, E as MODE_EXPO, N as readPidFile, R as writePidFile, T as MODE_COMMAND, d as nativeProjectIntegration, j as clearWorkspaceSupervisor, v as detectIsExpo, w as MODE_BARE } from "./project-BZNjmW_8.mjs";
+import { G as projectDeviceSlots, T as setSupervisor, U as parseDeviceSlotKey, o as clearSupervisor, p as getProject } from "./config-DlrsduwG.mjs";
+import { c as withWorkspaceStateLock, d as writeWorkspaceState, n as clearWorkspaceStateKeys, o as updateWorkspaceState, r as readWorkspaceState$1 } from "./workspace-state-U08dEzhG.mjs";
+import { X as runnableMetroCommand, q as resolveProjectSettings } from "./settings-C7O8A6ZI.mjs";
+import { D as clearExpoMetroTunnel, E as MODE_EXPO, N as readPidFile, R as writePidFile, T as MODE_COMMAND, d as nativeProjectIntegration, j as clearWorkspaceSupervisor, v as detectIsExpo, w as MODE_BARE } from "./project-wM_XFTvE.mjs";
 import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
-import { d as parseWatchRoots, l as parseSubscriberNames, m as runWatchman, u as parseTriggerCount } from "./eas-session-ledger-op6A54yi.mjs";
-import { A as workspaceBuildInProgress, _ as devServerStopRecord, g as devServerStopLevel, m as describeDevServerStop, x as vanishedSupervisorMessage } from "./budget-Bs6SxxzO.mjs";
-import { f as withIdleWorkspace } from "./workspaces-BccMFmGQ.mjs";
-import { S as parseLease, _ as workspaceDeviceLastUseAt, b as leaseIsExpired, r as createActivityReader, v as deviceLeasePath, w as parseWorkspaceLeases } from "./activity-BzVfHSrY.mjs";
-import { H as ownedAvdSerialResolver } from "./android-DUYkNF4u.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-1_1OoVW5.mjs";
+import { d as parseWatchRoots, l as parseSubscriberNames, m as runWatchman, u as parseTriggerCount } from "./eas-session-ledger-DlY_serQ.mjs";
+import { A as workspaceBuildInProgress, _ as devServerStopRecord, g as devServerStopLevel, m as describeDevServerStop, x as vanishedSupervisorMessage } from "./budget-Cvwn54qV.mjs";
+import { f as withIdleWorkspace } from "./workspaces-CpANmBlq.mjs";
+import { S as parseLease, _ as workspaceDeviceLastUseAt, b as leaseIsExpired, r as createActivityReader, v as deviceLeasePath, w as parseWorkspaceLeases } from "./activity-CMLmzp7o.mjs";
+import { W as ownedAvdSerialResolver } from "./android-C7sVmyI9.mjs";
 import { t as describeError } from "./errors-ccaPc4ox.mjs";
-import { f as probeHostedSession } from "./hosted-client-DB_gBPfY.mjs";
-import { t as clearHostedMetro } from "./metro-gateway-BMJNlj3E.mjs";
-import { n as dueIdleDevices, r as shutDownIdleDevices } from "./idle-shutdown-DaKmZi0z.mjs";
-import { t as relaunchWithLogFile } from "./detached-entry-DFRyG1_o.mjs";
-import { t as triggerMaintenance } from "./trigger-BAahxUPq.mjs";
-import { existsSync, readFileSync, realpathSync, statSync, watch } from "node:fs";
-import { basename, dirname, isAbsolute, join, resolve, sep } from "node:path";
+import { f as probeHostedSession } from "./hosted-client-DZAPrcro.mjs";
+import { o as watchWorkspaceState, t as clearHostedMetro } from "./metro-gateway-CKZqKqx7.mjs";
+import { t as relaunchWithLogFile } from "./detached-entry-BwNEtIrP.mjs";
+import { n as dueIdleDevices, r as shutDownIdleDevices } from "./idle-shutdown-DDg3SdvY.mjs";
+import { t as triggerMaintenance } from "./trigger-Cbyc41d_.mjs";
+import { existsSync, readFileSync, realpathSync, statSync } from "node:fs";
+import { dirname, isAbsolute, join, resolve, sep } from "node:path";
 import { LOG_ROTATE_BYTES, createMetroGateway } from "@stim-cli/core";
 import { DEV_SERVER_STOP_REQUEST_KEY, HOSTED_METRO_GATEWAYS_KEY, HOSTED_METRO_REQUESTS_KEY, IDLE_STOP_KEY, hostedAndroidPlacements, hostedIosPlacements, hostedMetroGateways, hostedMetroRequests, hostedNativeRecords, parseHostedNativePlacement, readDevServerStopRequest } from "@stim-cli/core/state";
 import { fileURLToPath } from "node:url";
@@ -69,6 +68,7 @@ function watchHostedMetro(root, metroPort, processToken) {
 	});
 	const reconcile = async () => {
 		if (closed) return;
+		observer.refresh();
 		const state = readState();
 		if (state?.supervisor?.processToken !== processToken) return;
 		const placements = [...Object.values(hostedIosPlacements(state)), ...Object.values(hostedAndroidPlacements(state)).map((placement) => Object.assign({ platform: "android" }, placement))];
@@ -147,24 +147,13 @@ function watchHostedMetro(root, metroPort, processToken) {
 			return reconcile();
 		}).catch(() => {});
 	};
-	const stateFile = workspaceStateFile$1(root);
-	let watcher = null;
-	try {
-		watcher = watch(dirname(stateFile), (_event, name) => {
-			if (name === null || name.toString() === basename(stateFile)) tick();
-		});
-		watcher.on("error", () => {
-			watcher?.close();
-			watcher = null;
-		});
-		watcher.unref();
-	} catch {}
+	const observer = watchWorkspaceState(root, tick);
 	const timer = setInterval(tick, 1e4);
 	timer.unref();
 	tick();
 	return async () => {
 		closed = true;
-		watcher?.close();
+		observer.close();
 		clearTimeout(probeTimer);
 		clearInterval(timer);
 		await running;
@@ -594,10 +583,7 @@ async function runSupervisor({ root, port, tunnel = false, resetCache = false, i
 	const shutdown = async (code, event, msg, stop) => {
 		if (stopping || !server) return;
 		stopping = true;
-		stopWatchingIdle?.();
-		stopWatchingDevices?.();
-		clearInterval(maintenanceTimer);
-		await closeHostedMetro?.();
+		maintenanceTimer.ref();
 		await watchRoots.beforeClose();
 		try {
 			await server.close();
@@ -608,7 +594,13 @@ async function runSupervisor({ root, port, tunnel = false, resetCache = false, i
 				event: "server_close_failed",
 				msg: describeError(err)
 			});
+			stopping = false;
+			return;
 		}
+		await closeHostedMetro?.();
+		stopWatchingIdle?.();
+		stopWatchingDevices?.();
+		clearInterval(maintenanceTimer);
 		await watchRoots.afterClose();
 		finish(code, event, stop ? devServerStopLevel(stop) : code === 0 ? "info" : "error", msg, stop);
 	};
@@ -637,7 +629,7 @@ async function runSupervisor({ root, port, tunnel = false, resetCache = false, i
 	try {
 		let start;
 		if (command) {
-			const startServer = startCommand ?? (await import("./server-command-CtzloH3v.mjs")).startCommandServer;
+			const startServer = startCommand ?? (await import("./server-command-C6QjeupS.mjs")).startCommandServer;
 			start = (opts) => startServer({
 				...opts,
 				command

package/dist/{support-Dlu37g6H.mjs → support-CNioewsd.mjs}

@@ -1,13 +1,13 @@
 import { m as workspaceLogsDir } from "./paths-DQtTgsBf.mjs";
-import { h as shortUdid, l as phaseLine } from "./command-output-B1UrjZHL.mjs";
-import { a as SETTING_SHAPE_REMEDY, b as iosProjectDirSettingError, et as settingShapeErrors, it as unknownSettingKeys, p as cacheProviderSettingError, y as iosProjectDirSetting } from "./settings-CsJDEXgK.mjs";
-import { j as parseIosSimulatorApp } from "./ios-CpByZy12.mjs";
+import { h as shortUdid, l as phaseLine } from "./command-output-gwpm28fu.mjs";
+import { a as SETTING_SHAPE_REMEDY, b as iosProjectDirSettingError, et as settingShapeErrors, it as unknownSettingKeys, p as cacheProviderSettingError, y as iosProjectDirSetting } from "./settings-C7O8A6ZI.mjs";
+import { j as parseIosSimulatorApp } from "./ios-hcBpnEGk.mjs";
 import { p as resolveOptimizations } from "./errors-ccaPc4ox.mjs";
-import { y as describeDiagnostic } from "./xcode-Zlx3qjEs.mjs";
-import { s as resolveBuildPlacement } from "./selection-CSl9i5qU.mjs";
-import { l as parseDeviceWait } from "./device-lease-run-C8raGFoP.mjs";
-import { f as unknownIosDeviceTypeRefusal, p as unknownIosRuntimeRefusal, s as layerNote, t as DEFAULT_DEVICE_SLOT_WAIT_MS } from "./device-capacity-CMlqEcvw.mjs";
-import { t as IosDeviceMismatchError } from "./device-ios-DRUeKaFV.mjs";
+import { y as describeDiagnostic } from "./xcode-BXn9-xYx.mjs";
+import { s as resolveBuildPlacement } from "./selection-DSMbWEX2.mjs";
+import { l as parseDeviceWait } from "./device-lease-run-xJPQ_QQG.mjs";
+import { f as unknownIosDeviceTypeRefusal, p as unknownIosRuntimeRefusal, s as layerNote, t as DEFAULT_DEVICE_SLOT_WAIT_MS } from "./device-capacity-DK5_EwRS.mjs";
+import { t as IosDeviceMismatchError } from "./device-ios-DoB6KFCO.mjs";
 import { basename, join } from "node:path";
 import chalk from "chalk";
 function buildLogFile(root) {
@@ -115,7 +115,7 @@ function resolveSimulatorAppFlag(flag, physical, remoteBackend, automatic = fals
 	} };
 	return { simulatorApp };
 }
-function deviceModelRefusal({ slot, deviceTypeFlag, runtimeFlag, deviceType, runtime, deviceTypeOrigin = null, runtimeOrigin = null, physical, remoteBackend, hosted = false, listRuntimes }) {
+async function deviceModelRefusal({ slot, deviceTypeFlag, runtimeFlag, deviceType, runtime, deviceTypeOrigin = null, runtimeOrigin = null, physical, remoteBackend, hosted = false, listRuntimes, signal }) {
 	if (slot && slot !== "default" && remoteBackend) return {
 		code: "STIM_BAD_ARG",
 		message: "Named slots currently support local simulators and physical devices.",
@@ -145,7 +145,7 @@ function deviceModelRefusal({ slot, deviceTypeFlag, runtimeFlag, deviceType, run
 	if (!deviceType && !runtime) return null;
 	let runtimes;
 	try {
-		runtimes = listRuntimes();
+		runtimes = await listRuntimes({ signal });
 	} catch (error) {
 		return {
 			code: "STIM_NO_DEVICE",

package/dist/{support-67vraa1Q.mjs → support-yUiOjnVY.mjs}

@@ -1,9 +1,9 @@
-import { t as getExecutor } from "./exec-_UbtCQcG.mjs";
-import { qt as killOnAbort } from "./settings-CsJDEXgK.mjs";
-import { kn as pickDevClientScheme } from "./budget-Bs6SxxzO.mjs";
-import { C as emulatorFailureRemedy, I as memoizeEmulatorProbe, J as pickDefaultSystemImage, O as hostSystemImageArch, S as emulatorDiskSpaceRemedy, T as findBuildTool, X as profileNeedsFoldFeature, c as androidPoolNoCandidatesRefusal, l as androidSystemImageAbi, o as androidHome, s as androidPoolCandidates, w as extractEmulatorFailure } from "./android-DUYkNF4u.mjs";
-import { d as unknownAndroidSystemImageRefusal, s as layerNote, u as unknownAndroidDeviceProfileRefusal } from "./device-capacity-CMlqEcvw.mjs";
-import { t as devClientScheme } from "./dev-client-UOeESKm6.mjs";
+import { t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { a as killOnAbort } from "./operation-exec-BW0em61G.mjs";
+import { kn as pickDevClientScheme } from "./budget-Cvwn54qV.mjs";
+import { C as emulatorDiskSpaceRemedy, E as findBuildTool, Q as profileNeedsFoldFeature, R as memoizeEmulatorProbe, T as extractEmulatorFailure, X as pickDefaultSystemImage, c as androidPoolNoCandidatesRefusal, k as hostSystemImageArch, l as androidSystemImageAbi, o as androidHome, s as androidPoolCandidates, w as emulatorFailureRemedy } from "./android-C7sVmyI9.mjs";
+import { d as unknownAndroidSystemImageRefusal, s as layerNote, u as unknownAndroidDeviceProfileRefusal } from "./device-capacity-DK5_EwRS.mjs";
+import { t as devClientScheme } from "./dev-client-BSDR5h3F.mjs";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { relative } from "node:path";
 //#region src/commands/android/support.ts
@@ -74,7 +74,7 @@ function resolveDeviceProfile(flag, settings) {
 	const raw = android && typeof android === "object" && !Array.isArray(android) ? android["deviceProfile"] : void 0;
 	return fromFlag || (typeof raw === "string" && raw.trim() !== "" ? raw.trim() : null);
 }
-function deviceProfileRefusal({ flag, resolved, origin = null, physical, remoteBackend, listProfiles }) {
+async function deviceProfileRefusal({ flag, resolved, origin = null, physical, remoteBackend, listProfiles, signal }) {
 	if (typeof flag === "string" && flag.trim() === "") return {
 		code: "STIM_BAD_ARG",
 		message: "--device-profile was given an empty id.",
@@ -83,7 +83,7 @@ function deviceProfileRefusal({ flag, resolved, origin = null, physical, remoteB
 	if (physical || remoteBackend || !resolved) return null;
 	let profiles;
 	try {
-		profiles = listProfiles();
+		profiles = await listProfiles({ signal });
 	} catch (error) {
 		return {
 			code: NO_DEVICE,

package/dist/swiftpm-artifact-inputs-DFcGsXDP.mjs

@@ -0,0 +1,153 @@
+import { t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { s as gitAsync } from "./operation-exec-BW0em61G.mjs";
+import { n as buildCacheKey } from "./build-cache-Dv7RN200.mjs";
+import { n as fingerprintNativeInputs, r as manifestDigest } from "./native-inputs-TRTTTRxt.mjs";
+import { a as sourceManifest, r as nativeFileDigest } from "./native-source-Y0yLhFyQ.mjs";
+import { createHash } from "node:crypto";
+import { join, relative, resolve, sep } from "node:path";
+import { isJsonObject } from "@stim-cli/core/state";
+import { lstat, realpath } from "node:fs/promises";
+//#region src/integrations/swiftpm-artifact-inputs.ts
+const SWIFTPM_CACHE_LIMIT = "SwiftPM artifact caching requires macos.artifactInputs with complete: true and a complete declaration of pinned, repeatable inputs producing a relocatable app.";
+async function readSwiftpmArtifactToolchain(context, signal, cwd) {
+	const run = (file, args) => getExecutor().runFileAsync(file, args, {
+		cwd,
+		timeoutMs: 3e4,
+		signal,
+		declareFor: context
+	});
+	const swift = await run("swift", ["--version"]);
+	const sdkPath = context.env.SDKROOT ?? context.env.SWIFTPM_SDKROOT_macosx;
+	return {
+		swift,
+		sdk: await run("xcrun", [
+			"--sdk",
+			sdkPath === void 0 ? "macosx" : await realpath(sdkPath),
+			"--show-sdk-build-version"
+		]),
+		xcode: await run("xcodebuild", ["-version"]),
+		arch: process.arch
+	};
+}
+function repositoryPath(value) {
+	return typeof value === "string" && value.length > 0 && !value.includes("\\") && !value.includes(":") && !value.includes("\0") && !value.split("/").some((part) => !part || part === "." || part === ".." || part.toLowerCase() === ".git");
+}
+function swiftpmArtifactInputs(value) {
+	if (!isJsonObject(value) || value.complete !== true) throw new Error(SWIFTPM_CACHE_LIMIT);
+	const record = value;
+	if (Object.keys(record).some((key) => ![
+		"complete",
+		"ignored",
+		"outputs",
+		"localFiles",
+		"environment"
+	].includes(key))) throw new Error(SWIFTPM_CACHE_LIMIT);
+	const strings = (name, valid) => {
+		const values = record[name] ?? [];
+		if (!Array.isArray(values) || !values.every(valid)) throw new Error(SWIFTPM_CACHE_LIMIT);
+		return [...new Set(values)].toSorted();
+	};
+	return {
+		complete: true,
+		ignored: strings("ignored", repositoryPath),
+		outputs: strings("outputs", repositoryPath),
+		localFiles: strings("localFiles", (path) => typeof path === "string" && !!path && !path.includes("\0")),
+		environment: strings("environment", (name) => typeof name === "string" && /^[A-Za-z_][A-Za-z0-9_]*$/.test(name))
+	};
+}
+async function regularInput(repository, path, signal) {
+	const parts = path.split("/");
+	for (let index = 1; index <= parts.length; index++) {
+		signal?.throwIfAborted();
+		const entry = await lstat(join(repository, ...parts.slice(0, index)));
+		if (entry.isSymbolicLink()) throw new Error(`SwiftPM cache input ${path} contains a symbolic link.`);
+		if (index === parts.length ? !entry.isFile() : !entry.isDirectory()) throw new Error(`SwiftPM cache input ${path} must be an exact regular file with real directory parents.`);
+	}
+}
+const below = (path, directory) => path === directory || path.startsWith(`${directory}/`);
+async function swiftpmArtifactSnapshot(root, value, build, toolchain, env, signal) {
+	signal?.throwIfAborted();
+	const declaration = swiftpmArtifactInputs(value);
+	const repository = await realpath(await gitAsync(root, ["rev-parse", "--show-toplevel"], { signal }));
+	const project = relative(repository, await realpath(root)).split(sep).join("/");
+	if (project && !repositoryPath(project)) throw new Error("The SwiftPM project leaves its repository.");
+	if (Object.values(toolchain).some((version) => !version.trim())) throw new Error("The SwiftPM toolchain identity is unavailable.");
+	const files = new Map((await sourceManifest(repository, true, signal)).map((file) => [file.path, file]));
+	for (const path of declaration.ignored) {
+		await regularInput(repository, path, signal);
+		const info = await lstat(join(repository, path));
+		files.set(path, {
+			path,
+			kind: info.mode & 73 ? "exec" : "file",
+			...await nativeFileDigest(join(repository, path), signal)
+		});
+	}
+	for (const file of files.values()) {
+		if (!repositoryPath(file.path)) throw new Error("SwiftPM cache inputs must be repository-relative.");
+		await regularInput(repository, file.path, signal);
+		if (declaration.outputs.some((output) => below(file.path, output) || below(output, file.path))) throw new Error(`SwiftPM source ${file.path} overlaps a declared generated output; ignore generated outputs in Git.`);
+	}
+	const bundled = [
+		{
+			name: "info-plist",
+			path: resolve(root, build.infoPlist)
+		},
+		...Object.entries(build.resources).map(([destination, source]) => ({
+			name: `resource/${destination}`,
+			path: resolve(root, source)
+		})),
+		...build.assetCatalog ? [{
+			name: "asset-catalog",
+			path: resolve(root, build.assetCatalog)
+		}] : []
+	];
+	for (const input of bundled) if (!repositoryPath(relative(repository, await realpath(input.path)).split(sep).join("/"))) throw new Error("SwiftPM bundle inputs must stay inside the repository.");
+	for (const path of declaration.localFiles) {
+		const info = await lstat(resolve(root, path)).catch((error) => {
+			if (error instanceof Error && "code" in error && error.code === "ENOENT") return null;
+			throw error;
+		});
+		if (info && !info.isFile()) throw new Error("macos.artifactInputs.localFiles must name exact regular files.");
+	}
+	const local = await fingerprintNativeInputs([
+		...bundled,
+		{
+			name: "package-resolved",
+			path: join(root, "Package.resolved"),
+			optional: true
+		},
+		...declaration.localFiles.map((path, index) => ({
+			name: `local/${index}`,
+			path: resolve(root, path),
+			optional: true
+		}))
+	], {
+		parameters: Object.fromEntries([.../* @__PURE__ */ new Set([
+			...declaration.environment,
+			"DEVELOPER_DIR",
+			"TOOLCHAINS",
+			"SDKROOT",
+			"SWIFT_EXEC",
+			"MACOSX_DEPLOYMENT_TARGET"
+		])].toSorted().map((name) => [name, env[name] ?? null])),
+		signal
+	});
+	const hash = createHash("sha256").update("stim-swiftpm-artifact-v1\0").update(JSON.stringify({
+		project,
+		source: manifestDigest([...files.values()]),
+		local: local.hash,
+		declaration,
+		build: {
+			...build,
+			resources: Object.fromEntries(Object.entries(build.resources).toSorted(([a], [b]) => a.localeCompare(b)))
+		},
+		toolchain
+	})).digest("hex");
+	signal?.throwIfAborted();
+	return {
+		hash,
+		key: buildCacheKey("macos", hash, { configuration: "debug" })
+	};
+}
+//#endregion
+export { swiftpmArtifactInputs as n, swiftpmArtifactSnapshot as r, readSwiftpmArtifactToolchain as t };