stim 1.20.2 → 1.21.0

package/dist/{ios-device-D7pi2Sca.mjs → ios-device-CwFMehUS.mjs}

@@ -1,9 +1,9 @@
-import { t as getExecutor } from "./exec-DqKo9GKJ.mjs";
-import { n as TOOL_ERROR_PREFIX } from "./ios-device-B5veSDDQ.mjs";
-import { i as INSTALL_ERROR, l as appProcessFromPid } from "./app-install-BIKtMfPq.mjs";
+import { t as getExecutor } from "./exec-_UbtCQcG.mjs";
+import { ln as INSTALL_ERROR, pn as appProcessFromPid } from "./budget-Bs6SxxzO.mjs";
+import { n as TOOL_ERROR_PREFIX } from "./ios-device-CXGP1bsD.mjs";
 import { mkdtempSync, readFileSync, rmSync } from "node:fs";
-import { join } from "node:path";
 import { tmpdir } from "node:os";
+import { join } from "node:path";
 //#region src/engine/ios-device.ts
 const DEVICECTL_TIMEOUT_MS = 3e4;
 function text(value) {
@@ -44,8 +44,27 @@ function parseDevicectlDevices(payload) {
 	}
 	return out;
 }
-function listIosDevices({ exec = null } = {}) {
-	return readIosDevices({ exec }) ?? [];
+async function listIosDevices({ exec = null } = {}) {
+	const executor = exec || getExecutor();
+	const dir = mkdtempSync(join(tmpdir(), "stim-devicectl-"));
+	const out = join(dir, "devices.json");
+	try {
+		await executor.runFileAsync("xcrun", [
+			"devicectl",
+			"list",
+			"devices",
+			"-j",
+			out
+		], { timeoutMs: DEVICECTL_TIMEOUT_MS });
+		return parseDevicectlDevices(readFileSync(out, "utf-8"));
+	} catch {
+		return [];
+	} finally {
+		rmSync(dir, {
+			recursive: true,
+			force: true
+		});
+	}
 }
 /** devicectl's device list, or null when devicectl failed or did not answer within `timeoutMs`. */
 function readIosDevices({ exec = null, timeoutMs = DEVICECTL_TIMEOUT_MS } = {}) {
@@ -91,18 +110,18 @@ function isWirelessIosDevice(device) {
 function isPhysical(device) {
 	return isIosHardware(device) && isReachable(device) && (isWired(device) || isWirelessIosDevice(device));
 }
-function notUsableRefusal(device) {
+function notUsableRefusal(device, wording) {
 	if (!isIosHardware(device)) return {
-		error: `${describe(device)} is a ${[device.reality, device.platform].filter(Boolean).join(" ")} device, and \`ios --device\` installs only on a physical iPhone or iPad.`,
-		remedy: NOT_A_PHONE_REMEDY
+		error: `${describe(device)} is a ${[device.reality, device.platform].filter(Boolean).join(" ")} device, and ${wording.physicalOnly}.`,
+		remedy: wording.notAPhone
 	};
 	if (!isReachable(device)) return {
 		error: `${describe(device)} is paired, but devicectl reports it unavailable: it cannot reach the phone right now.`,
 		remedy: UNREACHABLE_REMEDY
 	};
 	return {
-		error: `${describe(device)} is reached over ${device.transportType}, and Stim installs on a phone only over a cable or Wi-Fi.`,
-		remedy: NOT_A_PHONE_REMEDY
+		error: `${describe(device)} is reached over ${device.transportType}, and ${wording.transportOnly}.`,
+		remedy: wording.notAPhone
 	};
 }
 function describe(device) {
@@ -142,15 +161,21 @@ function iosPoolNoCandidatesRefusal(devices) {
 	}
 	return resolveIosPhysicalDevice(null, listed);
 }
-function pickOne(devices) {
+function pickOne(devices, severalRemedy) {
 	if (devices.length === 1) return unhealthy(devices[0]) ?? selected(devices[0]);
 	if (devices.length > 1) return {
 		error: `Several devices are connected: ${devices.map(describe).join(", ")}.`,
-		remedy: "Name the one to build for with `stim ios --device <udid>`."
+		remedy: severalRemedy
 	};
 	return null;
 }
-function resolveIosPhysicalDevice(requested, devices) {
+const IOS_RUN_WORDING = {
+	several: "Name the one to build for with `stim ios --device <udid>`.",
+	notAPhone: NOT_A_PHONE_REMEDY,
+	physicalOnly: "`ios --device` installs only on a physical iPhone or iPad",
+	transportOnly: "Stim installs on a phone only over a cable or Wi-Fi"
+};
+function resolveIosPhysicalDevice(requested, devices, wording = IOS_RUN_WORDING) {
 	const listed = Array.isArray(devices) ? devices : [];
 	const physical = listed.filter(isPhysical);
 	if (requested) {
@@ -158,13 +183,13 @@ function resolveIosPhysicalDevice(requested, devices) {
 		const match = physical.find(same);
 		if (match) return unhealthy(match) ?? selected(match);
 		const other = listed.find(same);
-		if (other) return notUsableRefusal(other);
+		if (other) return notUsableRefusal(other, wording);
 		return {
 			error: physical.length ? `${requested} is not connected. devicectl reports these devices: ${physical.map(describe).join(", ")}.` : `${requested} is not connected, and devicectl reports no device over a cable or Wi-Fi at all.`,
 			remedy: "Check the cable and `xcrun devicectl list devices`, then retry with a UDID it lists."
 		};
 	}
-	const chosen = pickOne(physical);
+	const chosen = pickOne(physical, wording.several);
 	if (chosen) return chosen;
 	return {
 		error: "No physical iOS device is connected.",
@@ -237,7 +262,7 @@ function wirelessInstallFailure(error, { udid, appPath, wireless }) {
 * second install, each with the same bound; `beforeStep` runs before each of those two
 * so the caller can extend its device lease.
 */
-function installIosDeviceApp({ udid, appPath, bundleId = null, wireless = false }, { exec = null, beforeStep = () => {} } = {}) {
+async function installIosDeviceApp({ udid, appPath, bundleId = null, wireless = false }, { exec = null, beforeStep = () => {} } = {}) {
 	const e = exec || getExecutor();
 	const timeoutMs = iosDeviceBounds(wireless).installMs;
 	const target = {
@@ -245,8 +270,8 @@ function installIosDeviceApp({ udid, appPath, bundleId = null, wireless = false
 		appPath,
 		wireless
 	};
-	const install = () => {
-		e.runFile("xcrun", [
+	const install = async () => {
+		await e.runFileAsync("xcrun", [
 			"devicectl",
 			"device",
 			"install",
@@ -257,7 +282,7 @@ function installIosDeviceApp({ udid, appPath, bundleId = null, wireless = false
 		], { timeoutMs });
 	};
 	try {
-		install();
+		await install();
 		return {
 			ok: true,
 			appPath
@@ -278,7 +303,7 @@ function installIosDeviceApp({ udid, appPath, bundleId = null, wireless = false
 		};
 		try {
 			beforeStep();
-			e.runFile("xcrun", [
+			await e.runFileAsync("xcrun", [
 				"devicectl",
 				"device",
 				"uninstall",
@@ -301,7 +326,7 @@ function installIosDeviceApp({ udid, appPath, bundleId = null, wireless = false
 		}
 		try {
 			beforeStep();
-			install();
+			await install();
 		} catch (retryErr) {
 			return wirelessInstallFailure(retryErr, target) ?? {
 				failed: true,
@@ -348,12 +373,12 @@ function deviceProcessPid(processes, appName) {
 	for (const entry of processes) if (entry.executable.includes(marker)) return entry.pid;
 	return null;
 }
-function iosDeviceProcess({ udid, appName }, { exec = null } = {}) {
+async function iosDeviceProcess({ udid, appName }, { exec = null } = {}) {
 	const executor = exec || getExecutor();
 	const dir = mkdtempSync(join(tmpdir(), "stim-devicectl-"));
 	const out = join(dir, "processes.json");
 	try {
-		executor.runFile("xcrun", [
+		await executor.runFileAsync("xcrun", [
 			"devicectl",
 			"device",
 			"info",
@@ -427,7 +452,7 @@ async function awaitIosDeviceLaunch({ udid, bundleId, appName, collectorPid = nu
 	for (;;) {
 		const records = collectorRecordsFor(readRecords(), collectorPid);
 		const ended = records.find((entry) => typeof entry.event === "string" && COLLECTOR_ENDED_EVENTS.has(entry.event));
-		const running = probeProcess();
+		const running = await probeProcess();
 		if (running.state === "running") return { pid: running.pid };
 		if (ended) {
 			const evidence = launchEvidence(records);
@@ -482,7 +507,7 @@ async function verifyIosDeviceReleaseLaunch({ udid, appName, waitMs = 3e3, probe
 	}));
 	const startedAt = now();
 	await sleep(Math.max(0, waitMs));
-	const running = probeProcess();
+	const running = await probeProcess();
 	const waitedMs = now() - startedAt;
 	if (running.state === "unknown") return {
 		verified: false,

package/dist/{ios-project-K9hY_Jab.mjs → ios-project-WuwwBdvW.mjs}

@@ -1,11 +1,9 @@
-import { y as workspaceAgentDeviceDir } from "./workspace-state-DJt_MMvf.mjs";
-import { i as formatDuration, l as phaseLine } from "./command-output-BTy8hZ0F.mjs";
-import { i as workspaceLinkLine } from "./stim-desktop-BzBN2Em2.mjs";
-import { Dt as recordFinishedBuild } from "./budget-f7516Zk0.mjs";
-import { a as easAuthNote, n as UPLOAD_TIMEOUT_MS, r as cacheLevel, s as isEasAuthFailureText } from "./remote-cache-OyOyVIS3.mjs";
-import "./launch-verify-B6Q8hZP-.mjs";
-import { S as compilationCacheActivityLine, _ as COMPILATION_CACHE_NOT_RUN } from "./toolchain-DxSsNssu.mjs";
-import { i as deviceLabel } from "./support-CwjbFs9H.mjs";
+import { l as workspaceAgentDeviceDir } from "./paths-DQtTgsBf.mjs";
+import { i as formatDuration, l as phaseLine } from "./command-output-B1UrjZHL.mjs";
+import { B as recordFinishedBuild, Hn as isEasAuthFailureText, Rn as UPLOAD_TIMEOUT_MS, Vn as easAuthNote, zn as cacheLevel } from "./budget-Bs6SxxzO.mjs";
+import { a as workspaceLinkLine } from "./stim-desktop-C12we7lz.mjs";
+import { o as compilationCacheActivityLine, t as COMPILATION_CACHE_NOT_RUN } from "./xcode-Zlx3qjEs.mjs";
+import { i as deviceLabel } from "./support-Dlu37g6H.mjs";
 import { buildDiagnostics } from "@stim-cli/core/state";
 import chalk from "chalk";
 //#region src/commands/ios/result.ts
@@ -93,7 +91,9 @@ async function finishIosUpload(uploadPending, remote, phase, note) {
 	}
 	return false;
 }
-function reportIosResult({ devicePlacement, host, slot, root, json, release, runtimeKind = release ? "embedded-js" : "metro", configuration, buildScheme = null, metroCheck, metroPort, logsDir, device, udid, appPath, bundleId, installSkipped, elapsed, startedAt, storeHash, storeKey, cacheHit, missReason, compilationCache, useBuildCache, waitedForBuild, launchState, launchWarning, providerName, buildMachine = "auto", builtOn, offloadedTo = null, offloadFallback = null, closeWriter, webPreviewUrl, lease, recordRun, reclaimed = [], devServer = null, links }) {
+function reportIosResult({ output, devicePlacement, host, slot, root, json, release, runtimeKind = release ? "embedded-js" : "metro", configuration, buildScheme = null, metroCheck, metroPort, logsDir, device, udid, appPath, bundleId, installSkipped, elapsed, startedAt, storeHash, storeKey, cacheHit, missReason, compilationCache, useBuildCache, waitedForBuild, launchState, launchWarning, providerName, buildMachine = "auto", builtOn, offloadedTo = null, offloadFallback = null, closeWriter, webPreviewUrl, lease, recordRun, reclaimed = [], devServer = null, links }) {
+	const emit = (line) => output("stdout", `${line}\n`);
+	const note = (line) => output("stderr", `${line}\n`);
 	const durationMs = elapsed();
 	recordRun({
 		failed: false,
@@ -153,7 +153,7 @@ function reportIosResult({ devicePlacement, host, slot, root, json, release, run
 	});
 	if (devicePlacement) facts.devicePlacement = devicePlacement;
 	if (host) facts.host = host;
-	if (json) console.log(JSON.stringify({
+	if (json) emit(JSON.stringify({
 		...facts,
 		...links ? { links } : {},
 		...reclaimed.length ? { reclaimed } : {}
@@ -164,7 +164,7 @@ function reportIosResult({ devicePlacement, host, slot, root, json, release, run
 		const deviceName = device?.deviceName ?? device?.name ?? udid;
 		const cacheResult = useBuildCache ? cacheDescription(cacheHit, providerName, offloadedTo) : `bypassed; ${cacheDescription(false, null, offloadedTo)}`;
 		const metroResult = runtimeKind === "process" ? "native process (no Metro)" : runtimeKind === "embedded-js" ? `embedded (${configuration})` : !metroCheck ? `check skipped on port ${metroPort}` : launchState === "unverified" ? `state unverified on port ${metroPort}` : `running on port ${metroPort}${devServer ? ` (started: ${devServer.reason})` : ""}`;
-		console.log([
+		emit([
 			outcome,
 			phaseLine("device", host ? `${deviceName} (iOS ${device.runtime?.replace(/^iOS /, "")}) on ${host.machine}` : `${deviceName} (${udid})`),
 			phaseLine("app", bundleId),
@@ -174,8 +174,8 @@ function reportIosResult({ devicePlacement, host, slot, root, json, release, run
 			phaseLine("logs", logsDir),
 			phaseLine("agent-device", `AGENT_DEVICE_STATE_DIR=${workspaceAgentDeviceDir(root)}`)
 		].join("\n"));
-		if (facts.webPreviewUrl) console.error(chalk.dim(`Watch this device: ${facts.webPreviewUrl}`));
-		if (links) console.error(chalk.dim(workspaceLinkLine(links)));
+		if (facts.webPreviewUrl) note(chalk.dim(`Watch this device: ${facts.webPreviewUrl}`));
+		if (links) note(chalk.dim(workspaceLinkLine(links)));
 	}
 	return facts;
 }

package/dist/{ios-nOLJGVdy.mjs → ios-qNJt4dFm.mjs}

@@ -1,4 +1,4 @@
-import { t as getExecutor } from "./exec-DqKo9GKJ.mjs";
+import { t as getExecutor } from "./exec-_UbtCQcG.mjs";
 //#region src/collector/ios.ts
 const MESSAGE_TYPE_LEVEL = {
 	Debug: "debug",