stim 1.25.0 → 1.26.0

package/dist/{hosted-logs-CWKGYWNX.mjs → hosted-logs-BfbmDM4M.mjs}

@@ -1,11 +1,11 @@
 import { t as getExecutor } from "./exec-VFRpu1iA.mjs";
-import { d as workspaceDir, m as workspaceLogsDir$1 } from "./paths-DQtTgsBf.mjs";
-import { B as deviceSlotFileKey, et as parseMachine$1, q as validateDeviceSlot } from "./config-BZhXY15H.mjs";
-import { l as phaseLine } from "./command-output-BBvS1H6v.mjs";
-import { n as macosDir } from "./state-DPaM3u5K.mjs";
-import { n as androidLogGroups, r as isAndroidCrashText } from "./android-saBeB4lr.mjs";
-import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
-import { c as call } from "./hosted-client-rsRqysJc.mjs";
+import { E as workspaceDir, k as workspaceLogsDir$1 } from "./workspace-state-pUg3_RRA.mjs";
+import { B as deviceSlotFileKey, nt as parseMachine$1, q as validateDeviceSlot } from "./config-BktkY_zC.mjs";
+import { l as phaseLine } from "./command-output-BF5AR2dL.mjs";
+import { n as macosDir } from "./state-C4OdpOTF.mjs";
+import { n as androidLogGroups, r as isAndroidCrashText } from "./android-B5P81yI-.mjs";
+import { r as createNdjsonWriter, s as readNdjsonGenerations$1 } from "./ndjson-CgE_o3Dl.mjs";
+import { c as call } from "./hosted-client-fHO8yqzc.mjs";
 import { mkdirSync, readFileSync, realpathSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { LOG_ROTATE_BYTES, ambientWrite, withDirLockAsync } from "@stim-cli/core";
@@ -205,10 +205,10 @@ async function pullHostedMacosLogs(root, placement, host, target = MACOS, maxPag
 		if (!isJsonObject(result) || !cursor || !Array.isArray(result.records) || !result.records.every(isJsonObject) || typeof result.more !== "boolean") throw new Error(`${host.machine} answered device-host.logs.query with an unexpected result.`);
 		signal?.throwIfAborted();
 		await commitPage(root, placement.session, before, result.records, cursor, target);
-		if (!result.more) return;
 		const nextCheckpoint = typeof result.checkpoint === "number" ? result.checkpoint : void 0;
+		if (!result.more) return nextCheckpoint;
 		if (sameCursor(cursor, before) && nextCheckpoint === checkpoint) {
-			if (target.platform === "macos" && !final) return;
+			if (target.platform === "macos" && !final) return void 0;
 			throw new Error("Hosted native logs made no progress; keeping the logs already copied here.");
 		}
 		checkpoint = nextCheckpoint;
@@ -217,10 +217,16 @@ async function pullHostedMacosLogs(root, placement, host, target = MACOS, maxPag
 }
 async function pullHostedNativeLogs(root, slot, placement, host, final = false, platform = "ios", signal) {
 	if (!host.connection.supports(platform === "ios" ? "hosted-ios-data" : "hosted-android-data")) throw new Error(`${host.machine} needs a newer stim-server to collect hosted ${platform === "ios" ? "iOS" : "Android"} native logs.`);
-	await pullHostedMacosLogs(root, placement, host, {
+	return await pullHostedMacosLogs(root, placement, host, {
 		platform,
 		slot
 	}, final ? 1024 : MAX_PAGES, final, signal);
 }
+function readHostedNativeLogs(root, platform, slot) {
+	return readNdjsonGenerations$1(hostLogFile(root, {
+		platform,
+		slot
+	}));
+}
 //#endregion
-export { removeAgentAccess as a, agentAccess as i, pullHostedNativeLogs as n, closeAgentConnection as r, pullHostedMacosLogs as t };
+export { agentAccess as a, closeAgentConnection as i, pullHostedNativeLogs as n, removeAgentAccess as o, readHostedNativeLogs as r, pullHostedMacosLogs as t };

package/dist/hosted-logs-sync-B0pvmOk-.mjs

@@ -0,0 +1,195 @@
+import { n as pullHostedNativeLogs, r as readHostedNativeLogs, t as pullHostedMacosLogs } from "./hosted-logs-BfbmDM4M.mjs";
+import { l as phaseLine } from "./command-output-BF5AR2dL.mjs";
+import { l as connectHost } from "./hosted-client-fHO8yqzc.mjs";
+import { n as readHostedIos, t as readHostedAndroid } from "./ios-state-Cw7-WQf2.mjs";
+import "./hosted-macos-CPl0OZ9h.mjs";
+import { watch } from "node:fs";
+import { dirname, relative, resolve, sep } from "node:path";
+import { ambientWrite, configDir } from "@stim-cli/core";
+import { readMacosRecord, workspaceStateFile } from "@stim-cli/core/state";
+//#region src/device-host/hosted-logs-sync.ts
+const WATCH_RECHECK_MS = 100;
+function warn(context, machine, error) {
+	const text = `${warning(machine, error)}\n`;
+	if (context) context.output("stderr", text);
+	else ambientWrite("stderr", text);
+}
+function warning(machine, error) {
+	const message = error.message.replace(/\.$/, "");
+	const hint = message.includes("refused device-host.logs.query") ? ` If ${machine} runs an older stim-server, update it.` : "";
+	return phaseLine("device", `Could not read the app's logs from ${machine}: ${message}. Showing the logs already copied here.${hint}`);
+}
+async function syncHostedMacosLogs(root, placement, slot, warnings, platform = "ios", context) {
+	let host;
+	const cancel = () => host?.connection.close();
+	context?.signal.addEventListener("abort", cancel, { once: true });
+	try {
+		host = await connectHost(placement.machine, void 0, false, context?.signal);
+		if (slot !== void 0) await pullHostedNativeLogs(root, slot, placement, host, false, platform, context?.signal);
+		else await pullHostedMacosLogs(root, placement, host, void 0, void 0, false, context?.signal);
+		return true;
+	} catch (error) {
+		context?.signal.throwIfAborted();
+		if (!warnings?.has(placement.machine)) {
+			warn(context, placement.machine, error);
+			warnings?.add(placement.machine);
+		}
+		return false;
+	} finally {
+		context?.signal.removeEventListener("abort", cancel);
+		host?.connection.close();
+	}
+}
+function followHostedMacosLogs(root, { failing = false, intervalMs = 500, retryMs = 5e3, slot, platform = "ios", context, onPulled, onFailed } = {}) {
+	let host;
+	const controller = new AbortController();
+	const signal = context ? AbortSignal.any([context.signal, controller.signal]) : controller.signal;
+	const cancel = () => host?.connection.close();
+	signal.addEventListener("abort", cancel, { once: true });
+	let retryAt = 0;
+	let stopped = false;
+	let running = false;
+	const tick = async () => {
+		if (running || stopped || signal.aborted || Date.now() < retryAt) return;
+		running = true;
+		try {
+			const placement = slot !== void 0 ? (platform === "ios" ? readHostedIos(root) : readHostedAndroid(root))[slot] : readMacosRecord(root)?.host;
+			if (!placement) {
+				host?.connection.close();
+				host = void 0;
+				return;
+			}
+			host ??= await connectHost(placement.machine, void 0, false, signal);
+			const through = slot !== void 0 ? await pullHostedNativeLogs(root, slot, placement, host, false, platform, signal) : await pullHostedMacosLogs(root, placement, host, void 0, void 0, false, signal);
+			failing = false;
+			onPulled?.(through);
+		} catch (error) {
+			host?.connection.close();
+			host = void 0;
+			if (signal.aborted) return;
+			onFailed?.();
+			if (!failing) warn(context, (slot !== void 0 ? (platform === "ios" ? readHostedIos(root) : readHostedAndroid(root))[slot] : readMacosRecord(root)?.host)?.machine ?? "the host", error);
+			failing = true;
+			retryAt = Date.now() + retryMs;
+		} finally {
+			running = false;
+		}
+	};
+	const timer = setInterval(() => void tick(), intervalMs);
+	return () => {
+		stopped = true;
+		controller.abort();
+		signal.removeEventListener("abort", cancel);
+		clearInterval(timer);
+		host?.connection.close();
+	};
+}
+/** Copies a hosted slot's native logs while its launch is verified; a failed copy stops holding the launch windows. */
+function followHostedLaunchLogs(root, slot, platform, since, context) {
+	let through = null;
+	let failed = false;
+	const stop = followHostedMacosLogs(root, {
+		slot,
+		platform,
+		context,
+		onPulled: (covered) => {
+			failed = false;
+			if (covered !== void 0) through = Math.max(through ?? covered, covered);
+		},
+		onFailed: () => {
+			failed = true;
+		}
+	});
+	const records = () => readHostedNativeLogs(root, platform, slot);
+	return {
+		readDeviceRecords: records,
+		readNativeCrashes: () => records().filter((record) => record.event === "native_crash" && Number(record.ts) >= since),
+		deviceLogsThrough: () => failed ? Number.POSITIVE_INFINITY : through,
+		stop
+	};
+}
+async function syncHostedLogs(root, context) {
+	const macos = readMacosRecord(root)?.host;
+	const warnings = /* @__PURE__ */ new Set();
+	return (await Promise.all([
+		...macos ? [syncHostedMacosLogs(root, macos, void 0, warnings, "ios", context)] : [],
+		...Object.entries(readHostedIos(root)).map(([slot, placement]) => syncHostedMacosLogs(root, placement, slot, warnings, "ios", context)),
+		...Object.entries(readHostedAndroid(root)).map(([slot, placement]) => syncHostedMacosLogs(root, placement, slot, warnings, "android", context))
+	])).every(Boolean);
+}
+function followHostedLogs(root, failing, context) {
+	const stops = /* @__PURE__ */ new Map();
+	let closed = false;
+	const refresh = () => {
+		if (closed) return;
+		const active = /* @__PURE__ */ new Set();
+		if (readMacosRecord(root)?.host) {
+			active.add("macos");
+			if (!stops.has("macos")) stops.set("macos", followHostedMacosLogs(root, {
+				failing,
+				context
+			}));
+		}
+		for (const platform of ["ios", "android"]) for (const slot of Object.keys(platform === "ios" ? readHostedIos(root) : readHostedAndroid(root))) {
+			const key = `${platform}:${slot}`;
+			active.add(key);
+			if (!stops.has(key)) stops.set(key, followHostedMacosLogs(root, {
+				failing,
+				slot,
+				platform,
+				context
+			}));
+		}
+		for (const [key, stop] of stops) {
+			if (active.has(key)) continue;
+			stop();
+			stops.delete(key);
+		}
+	};
+	const stateFile = workspaceStateFile(root);
+	const home = resolve(configDir());
+	let watcher = null;
+	let recheck;
+	const observe = () => {
+		if (closed) return;
+		watcher?.close();
+		watcher = null;
+		clearTimeout(recheck);
+		let directory = dirname(stateFile);
+		for (;;) try {
+			const entry = relative(directory, stateFile).split(sep)[0];
+			const next = watch(directory, (_event, name) => {
+				if (name !== null && name.toString() !== entry) return;
+				if (directory !== dirname(stateFile)) observe();
+				refresh();
+			});
+			next.on("error", () => {
+				next.close();
+				if (watcher === next) watcher = null;
+			});
+			next.unref();
+			watcher = next;
+			recheck = setTimeout(refresh, WATCH_RECHECK_MS);
+			recheck.unref();
+			return;
+		} catch (error) {
+			if (directory === home || !(error instanceof Error && "code" in error && error.code === "ENOENT")) return;
+			directory = dirname(directory);
+		}
+	};
+	observe();
+	refresh();
+	const timer = setInterval(() => {
+		observe();
+		refresh();
+	}, 1e4);
+	return () => {
+		closed = true;
+		watcher?.close();
+		clearTimeout(recheck);
+		clearInterval(timer);
+		for (const stop of stops.values()) stop();
+	};
+}
+//#endregion
+export { followHostedLogs as n, syncHostedLogs as r, followHostedLaunchLogs as t };

package/dist/{hosted-macos-d0pv9Tth.mjs → hosted-macos-CPl0OZ9h.mjs}

@@ -1,9 +1,9 @@
 import { o as cancellableSleep } from "./exec-VFRpu1iA.mjs";
-import { a as removeAgentAccess, i as agentAccess, r as closeAgentConnection, t as pullHostedMacosLogs } from "./hosted-logs-CWKGYWNX.mjs";
-import { l as phaseLine } from "./command-output-BBvS1H6v.mjs";
-import { n as macosDir } from "./state-DPaM3u5K.mjs";
-import { d as runCancellationSignal } from "./native-run-D5OJsGwA.mjs";
-import { _ as unknownSession, a as SESSION_TIMEOUT_MS, c as call, d as hostedSession, g as stoppedSession, h as sha256, i as RESERVE_TIMEOUT_MS, l as connectHost, m as settle, o as attach, r as PREPARE_TIMEOUT_MS, s as bundleManifest, t as INSTALL_TIMEOUT_MS, u as heldNoLonger, v as upload } from "./hosted-client-rsRqysJc.mjs";
+import { a as agentAccess, i as closeAgentConnection, o as removeAgentAccess, t as pullHostedMacosLogs } from "./hosted-logs-BfbmDM4M.mjs";
+import { l as phaseLine } from "./command-output-BF5AR2dL.mjs";
+import { n as macosDir } from "./state-C4OdpOTF.mjs";
+import { d as runCancellationSignal } from "./native-run-BfIDFKLH.mjs";
+import { _ as unknownSession, a as SESSION_TIMEOUT_MS, c as call, d as hostedSession, g as stoppedSession, h as sha256, i as RESERVE_TIMEOUT_MS, l as connectHost, m as settle, o as attach, r as PREPARE_TIMEOUT_MS, s as bundleManifest, t as INSTALL_TIMEOUT_MS, u as heldNoLonger, v as upload } from "./hosted-client-fHO8yqzc.mjs";
 import { randomUUID } from "node:crypto";
 import { join } from "node:path";
 import { ambientContext, ambientWrite } from "@stim-cli/core";

package/dist/{hosted-native-BxTizGU2.mjs → hosted-native-CpDB3-PO.mjs}

@@ -1,11 +1,10 @@
 import { o as cancellableSleep } from "./exec-VFRpu1iA.mjs";
-import { d as workspaceDir } from "./paths-DQtTgsBf.mjs";
-import { a as removeAgentAccess, i as agentAccess, n as pullHostedNativeLogs, r as closeAgentConnection } from "./hosted-logs-CWKGYWNX.mjs";
-import { l as withWorkspaceStateLockAsync, r as readWorkspaceState$1 } from "./workspace-state-CPSp3mav.mjs";
-import { d as runCancellationSignal } from "./native-run-D5OJsGwA.mjs";
-import { _ as unknownSession, a as SESSION_TIMEOUT_MS, c as call, d as hostedSession, g as stoppedSession, h as sha256, i as RESERVE_TIMEOUT_MS, l as connectHost, m as settle, n as OFFER_TIMEOUT_MS, o as attach, p as requireHostedAppMode, r as PREPARE_TIMEOUT_MS, s as bundleManifest, t as INSTALL_TIMEOUT_MS, u as heldNoLonger, v as upload } from "./hosted-client-rsRqysJc.mjs";
-import { a as requireHostedMetro, i as requestHostedMetro, n as closeHostedMetro } from "./metro-gateway-Bp9gJQAN.mjs";
-import { s as writeHostedNative } from "./ios-state-CT9nV5SP.mjs";
+import { E as workspaceDir, l as withWorkspaceStateLockAsync, r as readWorkspaceState$1 } from "./workspace-state-pUg3_RRA.mjs";
+import { a as agentAccess, i as closeAgentConnection, n as pullHostedNativeLogs, o as removeAgentAccess } from "./hosted-logs-BfbmDM4M.mjs";
+import { d as runCancellationSignal } from "./native-run-BfIDFKLH.mjs";
+import { _ as unknownSession, a as SESSION_TIMEOUT_MS, c as call, d as hostedSession, g as stoppedSession, h as sha256, i as RESERVE_TIMEOUT_MS, l as connectHost, m as settle, n as OFFER_TIMEOUT_MS, o as attach, p as requireHostedAppMode, r as PREPARE_TIMEOUT_MS, s as bundleManifest, t as INSTALL_TIMEOUT_MS, u as heldNoLonger, v as upload } from "./hosted-client-fHO8yqzc.mjs";
+import { a as requireHostedMetro, i as requestHostedMetro, n as closeHostedMetro } from "./metro-gateway-B6_PgD0L.mjs";
+import { s as writeHostedNative } from "./ios-state-Cw7-WQf2.mjs";
 import { randomUUID } from "node:crypto";
 import { readFileSync } from "node:fs";
 import { join } from "node:path";

package/dist/{idle-shutdown-BIyfl0Zj.mjs → idle-shutdown-FfxL1KdG.mjs}

@@ -1,11 +1,14 @@
-import { V as deviceSlotKey, _ as loadConfig$1 } from "./config-BZhXY15H.mjs";
-import { o as formatLongDuration } from "./command-output-BBvS1H6v.mjs";
-import { r as readWorkspaceState$1, s as updateWorkspaceStateAsync } from "./workspace-state-CPSp3mav.mjs";
-import { A as workspaceBuildInProgress, T as collectOwnedDeviceActivity } from "./budget-HyShrIpL.mjs";
+import { k as workspaceLogsDir$1, r as readWorkspaceState$1, s as updateWorkspaceStateAsync } from "./workspace-state-pUg3_RRA.mjs";
+import { V as deviceSlotKey, _ as loadConfig$1 } from "./config-BktkY_zC.mjs";
+import { o as formatLongDuration } from "./command-output-BF5AR2dL.mjs";
+import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
+import { P as workspaceBuildInProgress, k as collectOwnedDeviceActivity } from "./budget-k2mZGvvk.mjs";
 import { t as canonicalPath } from "./paths-BsJMoPP2.mjs";
-import { A as teardownOwnedIosSim, O as teardownOwnedAvd } from "./workspaces-C9w4aeXF.mjs";
-import { _ as workspaceDeviceLastUseAt } from "./activity-BpjwrQXU.mjs";
-import { d as listAllIosSims } from "./ios-BQzvJlzw.mjs";
+import { A as teardownOwnedIosSim, O as teardownOwnedAvd } from "./workspaces-g2lhdBXF.mjs";
+import { _ as workspaceDeviceLastUseAt } from "./activity-Lnb_EoRY.mjs";
+import { d as listAllIosSims } from "./ios-WxpDJ5T1.mjs";
+import { join } from "node:path";
+import { LOG_ROTATE_BYTES } from "@stim-cli/core";
 import { DEVICE_IDLE_SHUTDOWN_KEY, DEVICE_RECLAIM_REASON, readDeviceIdleShutdowns } from "@stim-cli/core/state";
 //#region src/devices/idle-shutdown.ts
 const SIM_LIST_TIMEOUT_MS = 1e4;
@@ -58,6 +61,15 @@ function dueIdleDevices(root, idleMs, now = Date.now()) {
 		}];
 	});
 }
+/** Appends an idle shutdown record to the workspace's metro.ndjson, where the supervisor writes its own. */
+function writeIdleShutdownEvent(root, event) {
+	const writer = createNdjsonWriter(join(workspaceLogsDir$1(root), "metro.ndjson"), { maxBytes: LOG_ROTATE_BYTES });
+	writer.write({
+		src: "metro",
+		...event
+	});
+	writer.close();
+}
 /**
 * Shuts down, through centralized teardown, each of the workspace's owned devices that is still idle for `idleMs`,
 * and records why. The caller holds the workspace's native-run lock, so no `ios` or `android` run is booting or
@@ -108,7 +120,8 @@ async function shutDownIdleDevices(root, idleMs, log, now = Date.now(), { only,
 		} else if (outcome.status !== "missing") log({
 			level: "warn",
 			event: "device_idle_shutdown_failed",
-			msg: `could not shut down idle ${what}: ${outcome.reason}`
+			msg: `could not shut down idle ${what}: ${outcome.reason}`,
+			...outcome.status === "skipped" ? { skipped: true } : {}
 		});
 	}
 	return shutDown;
@@ -127,4 +140,4 @@ async function clearDeviceIdleShutdown(root, platform, slot = "default") {
 	});
 }
 //#endregion
-export { dueIdleDevices as n, shutDownIdleDevices as r, clearDeviceIdleShutdown as t };
+export { writeIdleShutdownEvent as i, dueIdleDevices as n, shutDownIdleDevices as r, clearDeviceIdleShutdown as t };

package/dist/{ios-Dvt97HgQ.mjs → ios-B7-lToDu.mjs}

@@ -1,9 +1,9 @@
-import { h as shortUdid, i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-BBvS1H6v.mjs";
-import { Mn as pickDevClientScheme, Pn as schemesFromInfoPlist } from "./budget-HyShrIpL.mjs";
-import { f as podAction, h as resolveDeviceType, i as deviceLabel, m as resolveConfiguration, n as buildLogFile, s as iosConfigurationSetting, t as appNameFromPath, u as isReleaseConfiguration, v as resolveRuntime } from "./support-qKcbgmI5.mjs";
-import { n as ensureWorkspaceStorageSafely } from "./native-runtime-B9w_Qyz3.mjs";
-import { t as devClientScheme } from "./dev-client-CHoXXZeg.mjs";
-import { a as lastBuildRecord, i as iosFacts, n as cacheDescription, s as writeLastBuild } from "./ios-project-DCUDo06I.mjs";
-import { n as registerIos, r as runIosOperation, t as iosCommand } from "./ios-BRVM8b0P.mjs";
-import { a as collectorEntry, o as replaceCollector } from "./launch-DscF1QfM.mjs";
+import { h as shortUdid, i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-BF5AR2dL.mjs";
+import { In as pickDevClientScheme, Rn as schemesFromInfoPlist } from "./budget-k2mZGvvk.mjs";
+import { f as podAction, h as resolveDeviceType, i as deviceLabel, m as resolveConfiguration, n as buildLogFile, s as iosConfigurationSetting, t as appNameFromPath, u as isReleaseConfiguration, v as resolveRuntime } from "./support-CVOCp0Ft.mjs";
+import { n as ensureWorkspaceStorageSafely } from "./native-runtime-Dq3RBcON.mjs";
+import { t as devClientScheme } from "./dev-client-DXR_tPVY.mjs";
+import { a as lastBuildRecord, i as iosFacts, n as cacheDescription, s as writeLastBuild } from "./ios-project-Ty5pHl9O.mjs";
+import { d as replaceCollector, u as collectorEntry } from "./dependencies-Dw6wfQdv.mjs";
+import { n as registerIos, r as runIosOperation, t as iosCommand } from "./ios-ftxdQbJS.mjs";
 export { appNameFromPath, buildLogFile, cacheDescription, collectorEntry, iosCommand as default, devClientScheme, deviceLabel, ensureWorkspaceStorageSafely, formatDuration, iosConfigurationSetting, iosFacts, isReleaseConfiguration, lastBuildRecord, phaseLine, pickDevClientScheme, podAction, registerIos, replaceCollector, resolveConfiguration, resolveDeviceType, resolveRuntime, runIosOperation, schemesFromInfoPlist, shortHash, shortUdid, writeLastBuild };

package/dist/{ios-BQzvJlzw.mjs → ios-WxpDJ5T1.mjs}

@@ -1,10 +1,10 @@
 import { l as WorkspaceProcessCleanupError, n as isTimeoutError, o as cancellableSleep, t as getExecutor } from "./exec-VFRpu1iA.mjs";
-import { P as formatBytes, _ as loadConfig$1 } from "./config-BZhXY15H.mjs";
+import { P as formatBytes, _ as loadConfig$1 } from "./config-BktkY_zC.mjs";
 import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
 import { n as runOperationFileQuiet, t as runOperationFile } from "./operation-exec-CUZifp6Z.mjs";
-import { i as stimDesktopInstalledAsync, n as settingDefault, t as STIM_DESKTOP_OPEN_OPTIONS } from "./stim-desktop-DS0mzR8U.mjs";
-import { dt as isStimOwnedSim } from "./android-Cjcj8MCw.mjs";
-import { a as recordCreatedDeviceAsync, n as forgetCreatedDeviceAsync } from "./created-devices-D2Aca-xu.mjs";
+import { i as stimDesktopInstalledAsync, n as settingDefault, t as STIM_DESKTOP_OPEN_OPTIONS } from "./stim-desktop-6Dqp-gjX.mjs";
+import { Ct as forgetCreatedDeviceAsync, Et as recordCreatedDeviceAsync, dt as isStimOwnedSim } from "./android-DTAcRwBC.mjs";
+import { n as signedTailFor } from "./apk-signed-tail-B46U9hXc.mjs";
 import { createHash } from "node:crypto";
 import { closeSync, existsSync, lstatSync, mkdtempSync, openSync, readSync, readdirSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir, totalmem } from "node:os";
@@ -14,6 +14,9 @@ import { IOS_SIMULATOR_APPS, isJsonObject, settingDefinition } from "@stim-cli/c
 const READ_CHUNK_BYTES = 1048576;
 const DEVICE_PATH_TIMEOUT_MS = 3e4;
 const DEVICE_HASH_TIMEOUT_MS = 12e4;
+const APKSIGNER_TIMEOUT_MS = 12e4;
+const PACKAGE_NAME = /^[A-Za-z_][A-Za-z0-9_]*(\.[A-Za-z_][A-Za-z0-9_]*)+$/;
+const EMPTY_INPUT_SHA256 = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855";
 const SHA256_HEX = /^[0-9a-f]{64}$/;
 function parseInstalledApkPath(text) {
 	if (typeof text !== "string") return null;
@@ -31,6 +34,30 @@ function parseDeviceSha256(text) {
 	const first = text.trim().split(/\s+/)[0] ?? "";
 	return SHA256_HEX.test(first) ? first : null;
 }
+function deviceTailProbeScript(packageName, tailBytes) {
+	return `for p in $(pm path ${packageName} | sed -n "s/^package://p"); do echo "path $p"; stat -c "size %s" "$p"; tail -c ${tailBytes} "$p" | sha256sum; done`;
+}
+const TAIL_PROBE = /^path \/.*\nsize (\d+)\n(\S+) {2}-$/gm;
+function parseDeviceTailProbe(text) {
+	if (typeof text !== "string") return null;
+	const lines = text.split("\n").map((line) => line.trim()).filter(Boolean);
+	if (lines.length === 0) return { installs: 0 };
+	const probes = [];
+	for (const [, size, digest] of lines.join("\n").matchAll(TAIL_PROBE)) {
+		const tailSha256 = parseDeviceSha256(digest);
+		if (!size || !tailSha256 || tailSha256 === EMPTY_INPUT_SHA256) return null;
+		probes.push({
+			size: Number(size),
+			tailSha256
+		});
+	}
+	if (probes.length * 3 !== lines.length) return null;
+	const [only, ...others] = probes;
+	return only && others.length === 0 ? {
+		installs: 1,
+		...only
+	} : { installs: "split" };
+}
 function parseAppContainerPath(text) {
 	if (typeof text !== "string") return null;
 	const lines = text.split("\n").map((line) => line.trim()).filter(Boolean);
@@ -90,8 +117,32 @@ function hashBundle(dir) {
 	};
 	return walk(dir, "") ? digest.digest("hex") : null;
 }
+async function deviceHoldsSignedTail({ serial, packageName }, tail, e) {
+	let probe;
+	try {
+		probe = parseDeviceTailProbe(await e.runFileAsync("adb", [
+			"-s",
+			serial,
+			"shell",
+			deviceTailProbeScript(packageName, tail.size - tail.tailOffset)
+		], { timeoutMs: DEVICE_PATH_TIMEOUT_MS }));
+	} catch {
+		return false;
+	}
+	if (!probe) return null;
+	if (probe.installs !== 1) return false;
+	return probe.size === tail.size && probe.tailSha256 === tail.tailSha256;
+}
 async function deviceHoldsApk({ serial, packageName, apkPath }, { exec = null } = {}) {
 	const e = exec || getExecutor();
+	const tail = PACKAGE_NAME.test(packageName) ? await signedTailFor(apkPath, (file, args) => e.runFileAsync(file, args, { timeoutMs: APKSIGNER_TIMEOUT_MS })) : null;
+	if (tail) {
+		const held = await deviceHoldsSignedTail({
+			serial,
+			packageName
+		}, tail, e);
+		if (held !== null) return held;
+	}
 	let path;
 	try {
 		path = parseInstalledApkPath(await e.runFileAsync("adb", [
@@ -554,6 +605,22 @@ const BOOTSTATUS_ATTEMPT_FLOOR_MS = 1e3;
 const BOOT_STATE_LIST_TIMEOUT_MS = 3e4;
 const SPRINGBOARD_QUERY_TIMEOUT_MS = 1e4;
 const SPRINGBOARD_POLL_MS = 250;
+async function readSpringBoardPid(udid) {
+	try {
+		const output = await getExecutor().runFileAsync("xcrun", [
+			"simctl",
+			"spawn",
+			udid,
+			"notifyutil",
+			"-g",
+			"com.apple.springboard.finishedstartup"
+		], { timeoutMs: SPRINGBOARD_QUERY_TIMEOUT_MS });
+		const pid = Number(/^com\.apple\.springboard\.finishedstartup (\d+)$/m.exec(output)?.[1] ?? 0);
+		return pid > 0 ? pid : null;
+	} catch {
+		return null;
+	}
+}
 async function waitForSpringBoard(udid, deadline) {
 	for (;;) {
 		let output = null;
@@ -1101,4 +1168,4 @@ function parseIosRuntimes(out) {
 	}] : []);
 }
 //#endregion
-export { waitForSpringBoard as A, memoryCulpritFindings as B, resetIosKeychain as C, sanitizeDeviceLabel as D, resolveOwnedIosSim as E, memoryCulpritsUnderAsync as F, deviceHoldsApk as H, readHostMemoryPressure as I, readHostMemoryPressureAsync as L, parseIosSimulatorApp as M, hostMemoryPressureAdvice as N, shutdownIosSim as O, memoryCulpritsUnder as P, reportMemoryCulprits as R, renameIosSim as S, resolveIosCreation as T, deviceHoldsBundle as U, readMemoryCulpritsAsync as V, ownedSimName as _, createOwnedIosSim as a, parseSimctlList as b, eraseIosSim as c, listAllIosSims as d, listAllIosSimsAsync as f, listUserApps as g, listIosRuntimesAsync as h, createIosSimSnapshot as i, configuredIosSimulatorViewer as j, uninstallIosApp as k, iosRuntimeMatches as l, listIosRuntimes as m, bootIosSim as n, deleteIosSim as o, listIosDeviceTypesAsync as p, clearIosAppData as r, deleteParkedIosSim as s, IOS_BOOT_TIMEOUT_MS as t, iosSimulatorFailureAdvice as u, parkedSimName as v, resetIosPrivacy as w, pickDefaultIosCreation as x, parseRuntimeVersion as y, memoryCulpritAdvice as z };
+export { uninstallIosApp as A, memoryCulpritAdvice as B, renameIosSim as C, resolveOwnedIosSim as D, resolveIosCreation as E, memoryCulpritsUnder as F, readMemoryCulpritsAsync as H, memoryCulpritsUnderAsync as I, readHostMemoryPressure as L, configuredIosSimulatorViewer as M, parseIosSimulatorApp as N, sanitizeDeviceLabel as O, hostMemoryPressureAdvice as P, readHostMemoryPressureAsync as R, readSpringBoardPid as S, resetIosPrivacy as T, deviceHoldsApk as U, memoryCulpritFindings as V, deviceHoldsBundle as W, ownedSimName as _, createOwnedIosSim as a, parseSimctlList as b, eraseIosSim as c, listAllIosSims as d, listAllIosSimsAsync as f, listUserApps as g, listIosRuntimesAsync as h, createIosSimSnapshot as i, waitForSpringBoard as j, shutdownIosSim as k, iosRuntimeMatches as l, listIosRuntimes as m, bootIosSim as n, deleteIosSim as o, listIosDeviceTypesAsync as p, clearIosAppData as r, deleteParkedIosSim as s, IOS_BOOT_TIMEOUT_MS as t, iosSimulatorFailureAdvice as u, parkedSimName as v, resetIosKeychain as w, pickDefaultIosCreation as x, parseRuntimeVersion as y, reportMemoryCulprits as z };

package/dist/{ios-device-CKSvk0bu.mjs → ios-device-CsyryvpT.mjs}

@@ -1,5 +1,5 @@
 import { t as getExecutor } from "./exec-VFRpu1iA.mjs";
-import { fn as INSTALL_ERROR, gn as appProcessFromPid } from "./budget-HyShrIpL.mjs";
+import { bn as appProcessFromPid, gn as INSTALL_ERROR } from "./budget-k2mZGvvk.mjs";
 import { n as TOOL_ERROR_PREFIX } from "./ios-device-B6HK951C.mjs";
 import { mkdtempSync, readFileSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";