stim 1.18.0 → 1.19.0

package/dist/{stop-BTjs3xbc.mjs → stop-zDlknFoz.mjs}

@@ -1,20 +1,22 @@
 import { n as ownership_claim_exports, t as process_identity_exports } from "./process-identity-Biv3arCO.mjs";
-import { f as refuseNoProject, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-CBtzyIgF.mjs";
-import { B as parseDeviceSlotKey, D as withConfigLock$1, E as upsertProject, H as projectDeviceSlots, V as parseDeviceSlotOption, W as validateDeviceSlot, o as clearSupervisor, p as getProject, z as deviceSlotPlatforms } from "./config-CgYMahz7.mjs";
-import { o as findCommandWorkspace } from "./project-C3ChRLZy.mjs";
-import { l as resolveProjectMetro, o as pidExists, r as killMetroTree, u as signalProcessTree } from "./metro-Dh8T4Ytd.mjs";
-import { a as updateWorkspaceState, c as writeWorkspaceState, n as clearWorkspaceStateKeys, o as withWorkspaceStateLock, r as readWorkspaceState$1, v as workspaceDir } from "./workspace-state-C59dqG-Z.mjs";
-import { Bt as clearWorkspaceLaunches, Ht as readMetroTunnel, Rt as clearManagedMetroTunnel, Vt as clearWorkspaceSupervisor, Wt as readRemoteSession, b as withdrawDevServerStopRequest, g as logVanishedSupervisor, v as requestDevServerStop, zt as clearRemoteSession } from "./budget-DIhL2BKx.mjs";
-import { D as teardownOwnedBrowser, E as teardownOwnedAvd, O as teardownOwnedIosSim, g as stopTunnel, m as resolveSupervisorTarget } from "./workspaces-xXItD8Dj.mjs";
-import { n as fileLeaseIo, u as releaseWorkspaceLeases } from "./device-lease-Co-EwifR.mjs";
-import { a as withWorkspaceProcessLock } from "./named-ports-BFIz1Shz.mjs";
-import { i as stopHostedAndroid } from "./hosted-android-Bv285t_t.mjs";
-import { f as resolveEasCliBin } from "./remote-cache-BGg7aGIZ.mjs";
-import { i as endRecordedSession } from "./device-remote-tHbd1fKy.mjs";
-import { a as decideStopAction, c as nativeRunWaitNotice, i as clearNativeRunCancel, l as requestNativeRunCancel, n as NATIVE_RUN_WAIT_MS, o as describeNativeRunHolder, s as nativeRunHolder, t as NATIVE_RUN_LOCK } from "./native-run-B06FkmZx.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-D6Se7gg_.mjs";
-import { r as stopHostedIos } from "./hosted-ios-D5mNmtj4.mjs";
-import { t as stopMacosApp } from "./stop-BGhKMOuH.mjs";
+import { n as debugLog } from "./exec-i8GDPwq9.mjs";
+import { f as refuseNoProject, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-Bt8ygHE7.mjs";
+import { B as parseDeviceSlotKey, D as withConfigLock$1, E as upsertProject, H as projectDeviceSlots, V as parseDeviceSlotOption, W as validateDeviceSlot, o as clearSupervisor, p as getProject, z as deviceSlotPlatforms } from "./config-DC5jEtd1.mjs";
+import { a as updateWorkspaceState, c as writeWorkspaceState, n as clearWorkspaceStateKeys, o as withWorkspaceStateLock, r as readWorkspaceState$1, v as workspaceDir } from "./workspace-state-CR9X86xJ.mjs";
+import { C as clearRemoteSession, E as readMetroTunnel, O as readRemoteSession, S as clearManagedMetroTunnel, T as clearWorkspaceSupervisor, n as findCommandWorkspace, w as clearWorkspaceLaunches } from "./project-B5eQ1USs.mjs";
+import { d as signalProcessTree, r as killMetroTree, s as pidExists, u as resolveProjectMetro } from "./metro-DI2AjPF_.mjs";
+import { b as withdrawDevServerStopRequest, g as logVanishedSupervisor, v as requestDevServerStop } from "./budget-Dz-kyXLv.mjs";
+import { D as teardownOwnedAvd, O as teardownOwnedBrowser, g as stopTunnel, k as teardownOwnedIosSim, m as resolveSupervisorTarget } from "./workspaces-Djb2gfi9.mjs";
+import { n as fileLeaseIo, u as releaseWorkspaceLeases } from "./device-lease-Cu7PtQpZ.mjs";
+import { a as withWorkspaceProcessLock } from "./named-ports-B4iWH4E-.mjs";
+import { t as macosAppPresent } from "./state-Tp4uImDS.mjs";
+import { _ as nativeRunHolder, d as NATIVE_RUN_LOCK, f as NATIVE_RUN_WAIT_MS, g as describeNativeRunHolder, h as decideStopAction, m as clearNativeRunCancel, v as nativeRunWaitNotice, y as requestNativeRunCancel } from "./client-CuUo8Nvg.mjs";
+import { i as stopHostedAndroid } from "./hosted-android-Bs7fytj7.mjs";
+import { f as resolveEasCliBin } from "./remote-cache-N3hAEaAL.mjs";
+import { i as endRecordedSession } from "./device-remote-B5GiUifk.mjs";
+import { n as verifyCollectorOwnership } from "./ownership-EB0ySdGK.mjs";
+import { r as stopHostedIos } from "./hosted-ios-Bik035eL.mjs";
+import { n as stopMacosApp } from "./stop-D0UIpZuh.mjs";
 import { hostedAndroidDeviceName, hostedAndroidRecords, hostedIosRecords, hostedNativeRecords, isJsonObject, parseHostedNativePlacement } from "@stim-cli/core/state";
 import chalk from "chalk";
 //#region src/commands/stop.ts
@@ -249,10 +251,9 @@ async function stopWorkspaceHostedNative(root, slot, report, failed) {
 	};
 }
 async function stopWorkspaceMacos(root, failed, enabled) {
-	if (enabled === false || readWorkspaceState$1(root)?.macos === void 0) return void 0;
+	if (enabled === false || !macosAppPresent(root)) return void 0;
 	try {
-		await stopMacosApp(root);
-		return { status: "stopped" };
+		return await stopMacosApp(root) ? { status: "stopped" } : void 0;
 	} catch (error) {
 		const reason = error instanceof Error ? error.message : String(error);
 		failed(reason);
@@ -292,6 +293,7 @@ async function stopWorkspace({ root, project = void 0, state = void 0, collector
 	let ok = true;
 	let stillHolding = null;
 	let keepPort = null;
+	debugLog.log("stop.phase.start", { phase: "supervisor" });
 	const target = resolveSupervisorTarget({
 		state: sup,
 		record: proj?.supervisor ?? null,
@@ -329,6 +331,11 @@ async function stopWorkspace({ root, project = void 0, state = void 0, collector
 			stillHolding = outcomes.supervisor.reason;
 		}
 	}
+	debugLog.log("stop.phase.end", {
+		phase: "supervisor",
+		status: outcomes.supervisor.status
+	});
+	debugLog.log("stop.phase.start", { phase: "collectors" });
 	outcomes.collectors = await reapCollectors(root, collectorRecords, {
 		isAlive,
 		signal: signalCollector,
@@ -344,10 +351,22 @@ async function stopWorkspace({ root, project = void 0, state = void 0, collector
 	} else if (outcomes.collectors.entries.some((entry) => entry.status === "failed")) {
 		ok = false;
 		stillHolding ??= "a collector could not be stopped";
-	} else if (outcomes.collectors.entries.length && clearCollectors(root, collectorRecords) === false) {
-		ok = false;
-		stillHolding ??= "a replacement collector appeared during cleanup";
+	} else if (outcomes.collectors.entries.length) {
+		debugLog.log("stop.phase.start", { phase: "clear-collectors" });
+		const cleared = clearCollectors(root, collectorRecords);
+		debugLog.log("stop.phase.end", {
+			phase: "clear-collectors",
+			cleared
+		});
+		if (cleared === false) {
+			ok = false;
+			stillHolding ??= "a replacement collector appeared during cleanup";
+		}
 	}
+	debugLog.log("stop.phase.end", {
+		phase: "collectors",
+		status: outcomes.collectors.status
+	});
 	if (outcomes.supervisor.status === "stopped" || outcomes.supervisor.status === "timeout" || outcomes.supervisor.status === "unverified" || outcomes.supervisor.status === "failed") outcomes.metro = {
 		status: "skipped",
 		reason: "the supervisor owns the dev server on this port"
@@ -731,11 +750,25 @@ function shutDownDevices(project, workspace, { teardownIos, teardownAvd, report
 					reason: "Stim does not own this device"
 				};
 				report(chalk.dim(phaseLine("device", `${iosUdid} is not Stim-owned, leaving it running`)));
-			} else device[iosKey] = reportDevice(iosUdid, teardownIos(iosUdid, {
-				del: false,
-				label: iosName,
-				workspace
-			}), report, "ios");
+			} else {
+				debugLog.log("stop.device.start", {
+					platform: "ios",
+					slot,
+					deviceId: iosUdid
+				});
+				const result = teardownIos(iosUdid, {
+					del: false,
+					label: iosName,
+					workspace
+				});
+				debugLog.log("stop.device.end", {
+					platform: "ios",
+					slot,
+					deviceId: iosUdid,
+					status: result.status
+				});
+				device[iosKey] = reportDevice(iosUdid, result, report, "ios");
+			}
 		}
 		const android = platforms.android;
 		if (android?.avdName) {
@@ -747,10 +780,24 @@ function shutDownDevices(project, workspace, { teardownIos, teardownAvd, report
 					reason: "Stim does not own this device"
 				};
 				report(chalk.dim(phaseLine("device", `${android.avdName} is not Stim-owned, leaving it running`)));
-			} else device[androidKey] = reportDevice(android.avdName, teardownAvd(android.avdName, {
-				del: false,
-				workspace
-			}), report, "android");
+			} else {
+				debugLog.log("stop.device.start", {
+					platform: "android",
+					slot,
+					deviceId: android.avdName
+				});
+				const result = teardownAvd(android.avdName, {
+					del: false,
+					workspace
+				});
+				debugLog.log("stop.device.end", {
+					platform: "android",
+					slot,
+					deviceId: android.avdName,
+					status: result.status
+				});
+				device[androidKey] = reportDevice(android.avdName, result, report, "android");
+			}
 		}
 	}
 	return device;

package/dist/supervisor-run.mjs

@@ -1,20 +1,20 @@
 import { t as process_identity_exports } from "./process-identity-Biv3arCO.mjs";
-import { B as parseDeviceSlotKey, H as projectDeviceSlots, T as setSupervisor, o as clearSupervisor, p as getProject } from "./config-CgYMahz7.mjs";
-import { i as detectIsExpo } from "./project-C3ChRLZy.mjs";
-import { C as workspaceStateFile, a as updateWorkspaceState, c as writeWorkspaceState, n as clearWorkspaceStateKeys, o as withWorkspaceStateLock, r as readWorkspaceState$1, x as workspaceLogsDir$1 } from "./workspace-state-C59dqG-Z.mjs";
-import { E as workspaceBuildInProgress, Ft as MODE_BARE, It as MODE_EXPO, Lt as clearExpoMetroTunnel, Mt as parseTriggerCount, Nt as parseWatchRoots, Pt as runWatchman, Ut as readPidFile, Vt as clearWorkspaceSupervisor, f as describeDevServerStop, h as devServerStopRecord, jt as parseSubscriberNames, m as devServerStopLevel, qt as writePidFile, y as vanishedSupervisorMessage } from "./budget-DIhL2BKx.mjs";
-import { f as withIdleWorkspace } from "./workspaces-xXItD8Dj.mjs";
-import { m as workspaceDeviceLastUseAt, r as createActivityReader } from "./activity-BxnkDZDi.mjs";
-import { a as parseLease, r as leaseIsExpired, s as parseWorkspaceLeases, t as deviceLeasePath } from "./device-lease-Co-EwifR.mjs";
-import { z as ownedAvdSerialResolver } from "./android-DC3ZLuw0.mjs";
-import { a as withWorkspaceProcessLock } from "./named-ports-BFIz1Shz.mjs";
+import { B as parseDeviceSlotKey, H as projectDeviceSlots, T as setSupervisor, o as clearSupervisor, p as getProject } from "./config-DC5jEtd1.mjs";
+import { C as workspaceStateFile, a as updateWorkspaceState, c as writeWorkspaceState, n as clearWorkspaceStateKeys, o as withWorkspaceStateLock, r as readWorkspaceState$1, x as workspaceLogsDir$1 } from "./workspace-state-CR9X86xJ.mjs";
+import { D as readPidFile, T as clearWorkspaceSupervisor, b as MODE_EXPO, j as writePidFile, p as detectIsExpo, u as nativeProjectIntegration, x as clearExpoMetroTunnel, y as MODE_BARE } from "./project-B5eQ1USs.mjs";
+import { n as parseTriggerCount, o as runWatchman, r as parseWatchRoots, t as parseSubscriberNames } from "./watchman-BL1IdOtq.mjs";
+import { E as workspaceBuildInProgress, f as describeDevServerStop, h as devServerStopRecord, m as devServerStopLevel, y as vanishedSupervisorMessage } from "./budget-Dz-kyXLv.mjs";
+import { f as withIdleWorkspace } from "./workspaces-Djb2gfi9.mjs";
+import { m as workspaceDeviceLastUseAt, r as createActivityReader } from "./activity-BSw0x84R.mjs";
+import { a as parseLease, r as leaseIsExpired, s as parseWorkspaceLeases, t as deviceLeasePath } from "./device-lease-Cu7PtQpZ.mjs";
+import { z as ownedAvdSerialResolver } from "./android-BdQC6zs1.mjs";
+import { a as withWorkspaceProcessLock } from "./named-ports-B4iWH4E-.mjs";
 import { s as describeError } from "./metro-store-BAHFcJm6.mjs";
 import { r as createNdjsonWriter } from "./ndjson-LGZAMsqa.mjs";
-import { n as dueIdleDevices, r as shutDownIdleDevices } from "./idle-shutdown-jjtxAn5C.mjs";
-import { l as probeHostedSession } from "./hosted-client-C-rMtppF.mjs";
-import { t as clearHostedMetro } from "./metro-gateway-CEUw9RMH.mjs";
-import { t as relaunchWithLogFile } from "./detached-entry-BLfcgc4O.mjs";
-import { n as nativeProjectIntegration } from "./projects-DD7dBTCj.mjs";
+import { n as dueIdleDevices, r as shutDownIdleDevices } from "./idle-shutdown-DYiMBn34.mjs";
+import { l as probeHostedSession } from "./hosted-client-C5G4h_OJ.mjs";
+import { t as clearHostedMetro } from "./metro-gateway-BxpJLIwh.mjs";
+import { t as relaunchWithLogFile } from "./detached-entry-pB_IPfV4.mjs";
 import { existsSync, readFileSync, realpathSync, statSync } from "node:fs";
 import { dirname, isAbsolute, join, resolve, sep } from "node:path";
 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";

package/dist/{support-BaayeYCf.mjs → support-CNqYkV0y.mjs}

@@ -1,10 +1,10 @@
-import { h as shortUdid, l as phaseLine } from "./command-output-CBtzyIgF.mjs";
-import { x as workspaceLogsDir } from "./workspace-state-C59dqG-Z.mjs";
-import { A as parseIosSimulatorApp } from "./ios-B3SbOWdw.mjs";
-import { d as unknownIosDeviceTypeRefusal, f as unknownIosRuntimeRefusal, o as layerNote, t as DEFAULT_DEVICE_SLOT_WAIT_MS } from "./device-capacity-EUOOYr8T.mjs";
-import { D as describeDiagnostic } from "./toolchain-Bnyd_K3A.mjs";
-import { l as parseDeviceWait } from "./device-lease-run-w1xhCqIW.mjs";
-import { t as IosDeviceMismatchError } from "./device-ios-6MewKKnc.mjs";
+import { h as shortUdid, l as phaseLine } from "./command-output-Bt8ygHE7.mjs";
+import { x as workspaceLogsDir } from "./workspace-state-CR9X86xJ.mjs";
+import { A as parseIosSimulatorApp } from "./ios-BWbHFZVz.mjs";
+import { d as unknownIosDeviceTypeRefusal, f as unknownIosRuntimeRefusal, o as layerNote, t as DEFAULT_DEVICE_SLOT_WAIT_MS } from "./device-capacity-BoN1jQkO.mjs";
+import { k as describeDiagnostic } from "./toolchain-C3xSoyUl.mjs";
+import { t as IosDeviceMismatchError } from "./device-ios-B2ruohE-.mjs";
+import { l as parseDeviceWait } from "./device-lease-run-D38SnZtt.mjs";
 import { basename, join } from "node:path";
 import chalk from "chalk";
 function buildLogFile(root) {

package/dist/{support-Bwvbrq5-.mjs → support-DsNaFg6D.mjs}

@@ -1,8 +1,8 @@
-import { t as getExecutor } from "./exec-DWhCZDGm.mjs";
-import { C as emulatorFailureRemedy, D as hostSystemImageArch, K as profileNeedsFoldFeature, N as memoizeEmulatorProbe, S as emulatorDiskSpaceRemedy, T as findBuildTool, W as pickDefaultSystemImage, c as androidPoolNoCandidatesRefusal, l as androidSystemImageAbi, o as androidHome, s as androidPoolCandidates, w as extractEmulatorFailure } from "./android-DC3ZLuw0.mjs";
-import { l as unknownAndroidDeviceProfileRefusal, o as layerNote, u as unknownAndroidSystemImageRefusal } from "./device-capacity-EUOOYr8T.mjs";
-import { T as pickDevClientScheme } from "./app-install-D-PUENug.mjs";
-import { t as devClientScheme } from "./dev-client-CLnIH02x.mjs";
+import { t as getExecutor } from "./exec-i8GDPwq9.mjs";
+import { C as emulatorFailureRemedy, D as hostSystemImageArch, K as profileNeedsFoldFeature, N as memoizeEmulatorProbe, S as emulatorDiskSpaceRemedy, T as findBuildTool, W as pickDefaultSystemImage, c as androidPoolNoCandidatesRefusal, l as androidSystemImageAbi, o as androidHome, s as androidPoolCandidates, w as extractEmulatorFailure } from "./android-BdQC6zs1.mjs";
+import { l as unknownAndroidDeviceProfileRefusal, o as layerNote, u as unknownAndroidSystemImageRefusal } from "./device-capacity-BoN1jQkO.mjs";
+import { T as pickDevClientScheme } from "./app-install-CFI4ptUL.mjs";
+import { t as devClientScheme } from "./dev-client-CDY_zAmD.mjs";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { relative } from "node:path";
 //#region src/commands/android/support.ts

package/dist/swiftpm-macos-aJzPAj1t.mjs

@@ -0,0 +1,119 @@
+import { t as getExecutor } from "./exec-i8GDPwq9.mjs";
+import { mt as repoRoot } from "./settings-CxgngUZk.mjs";
+import { a as spawnDeclared } from "./spawn-claims-Kqiifsk2.mjs";
+import { i as macosToolchain } from "./toolchain-C3xSoyUl.mjs";
+import { i as validateInfoPlist, n as setBundleName, r as stageBundle, t as resolveBundleExtras } from "./stage-BgaZJVZY.mjs";
+import { t as logLines } from "./run-lAkle1-c.mjs";
+import { existsSync, realpathSync } from "node:fs";
+import { join, relative, resolve } from "node:path";
+//#region src/integrations/swiftpm-macos.ts
+function swiftpmMacosProject(root) {
+	return { prepare(settings) {
+		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 { product, infoPlist } = macos;
+		const { bundleId } = validateInfoPlist(root, product, infoPlist);
+		const repository = realpathSync(repoRoot(root) ?? root);
+		const extras = resolveBundleExtras(root, repository, macos.resources, macos.assetCatalog);
+		return {
+			product,
+			arguments: macos.arguments ?? [],
+			bundleId,
+			async compile({ scratch, writer, note }) {
+				await tool(root, [
+					"build",
+					"-c",
+					"debug",
+					"--product",
+					product,
+					"--scratch-path",
+					scratch,
+					"--jobs",
+					"2"
+				], writer, note);
+				return tool(root, [
+					"build",
+					"-c",
+					"debug",
+					"--scratch-path",
+					scratch,
+					"--show-bin-path"
+				], writer, () => {}, true);
+			},
+			stage: (bin, bundle, id, displayName) => stageBundle(root, product, infoPlist, bin, bundle, id, extras, displayName),
+			validateFetched(bundle, id, displayName) {
+				const executable = join(bundle, "Contents", "MacOS", product);
+				const plist = JSON.parse(getExecutor().runFile("plutil", [
+					"-convert",
+					"json",
+					"-o",
+					"-",
+					join(bundle, "Contents", "Info.plist")
+				]));
+				if (plist.CFBundleIdentifier !== id || plist.CFBundleExecutable !== product || !existsSync(executable)) throw new Error("The fetched macOS bundle does not match the requested identity and executable.");
+				for (const destination of [...Object.keys(extras.resources), ...extras.assetCatalog ? ["Assets.car"] : []]) if (!existsSync(join(bundle, "Contents", "Resources", destination))) throw new Error(`The fetched macOS bundle lacks declared resource ${destination}.`);
+				if (displayName !== void 0) {
+					setBundleName(join(bundle, "Contents", "Info.plist"), displayName);
+					getExecutor().runFile("codesign", [
+						"--force",
+						"--sign",
+						"-",
+						bundle
+					]);
+				}
+				getExecutor().runFile("codesign", [
+					"--verify",
+					"--strict",
+					bundle
+				]);
+			},
+			offload: {
+				target: () => ({
+					platform: "macos",
+					local: macosToolchain()
+				}),
+				request: (id) => ({
+					platform: "macos",
+					product,
+					infoPlist: relative(root, resolve(root, infoPlist)),
+					bundleId: id,
+					resources: Object.fromEntries(Object.entries(extras.resources).map(([destination, source]) => [destination, relative(repository, source)])),
+					assetCatalog: extras.assetCatalog ? relative(repository, extras.assetCatalog) : null
+				})
+			}
+		};
+	} };
+}
+async function tool(root, args, writer, note, capture = false) {
+	const child = spawnDeclared(() => getExecutor().spawn("swift", args, {
+		cwd: root,
+		detached: true,
+		stdio: [
+			"ignore",
+			"pipe",
+			"pipe"
+		]
+	}));
+	let stdout = "";
+	child.stdout?.on("data", (chunk) => {
+		if (capture) stdout += chunk.toString("utf8");
+	});
+	const write = (msg) => {
+		writer.write({
+			src: "build",
+			platform: "macos",
+			level: "debug",
+			msg
+		});
+		note(msg);
+	};
+	if (child.stdout) logLines(child.stdout, write);
+	if (child.stderr) logLines(child.stderr, write);
+	await new Promise((done, reject) => {
+		child.once("error", reject);
+		child.once("close", (code) => code === 0 ? done() : reject(/* @__PURE__ */ new Error(`swift ${args[0]} failed (${code}). See stim logs --source build.`)));
+	});
+	return stdout.trim();
+}
+//#endregion
+export { swiftpmMacosProject };