stim 1.15.0 → 1.16.0

package/dist/{build-plan-aeGMFX7e.mjs → build-plan-DjeSb2Xl.mjs}

@@ -1,25 +1,24 @@
 import { t as getExecutor } from "./exec-CaErVv7t.mjs";
 import { D as withConfigLock$1, H as projectDeviceSlots, _ as loadConfig$1, a as clearDevice, b as releaseAndroidConsolePort, i as clearAndroidBootPending, k as acquireAvdClaim, t as allConsolePortsAndSerials, w as setDevice, z as deviceSlotPlatforms } from "./config-D0DbpZtM.mjs";
-import { m as sharedBuildCache } from "./workspace-state-CL2V2Ons.mjs";
-import { D as makeTemporaryDirectory, O as removeTemporaryEntry, c as gitCommonDirOnDisk } from "./worktree-C0c5Udwa.mjs";
-import { c as ownedDeviceLabel } from "./project-CV3tDFHl.mjs";
 import { r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { i as formatDuration, l as phaseLine, m as shortHash, u as plural } from "./command-output-CliHHn7a.mjs";
-import { C as diffFingerprintSources, I as storedSources, w as entryDir, y as artifactIn } from "./device-lease-W5Pi1q38.mjs";
-import { A as listAvds, B as ownedAvdSystemImage, E as getAvdNameForSerial, F as ownedAvdDeviceProfile, J as resolveOwnedAvdSerial, L as ownedAvdMatchesConfiguration, O as listAdbDevices, P as nextConsolePort, R as ownedAvdName, W as pickDefaultSystemImage, b as createOwnedAvd, dt as parkedMaxSetting, f as assertOwnedAvdStopped, ft as readParked, g as avdPoolConfiguration, j as listInstalledSystemImages, lt as isLegacyDeletionClaim, n as OWNED_AVD_CONFIG_DEFAULTS, ot as adoptParked, t as DEFAULT_AVD_DEVICE_PROFILE, tt as waitForBoot, v as bootAndroidEmulator, y as configureNewOwnedAvd } from "./android-Db2eEMaf.mjs";
-import { o as pidExists } from "./metro-Di8EN2Tb.mjs";
-import { l as androidDataPartitionSizeGbSetting, o as androidAvdConfigSetting } from "./settings-CduVcoxj.mjs";
-import { i as teardownOwnedAvd, s as teardownParkedAvd } from "./teardown-BYuQafiA.mjs";
-import { j as readHostMemoryPressure, u as listAllIosSims } from "./ios-3CtCRhwr.mjs";
-import { o as estimateBuild, p as readStats } from "./build-progress-C2Jv1AtA.mjs";
-import { t as clearDeviceIdleShutdown } from "./idle-shutdown-B5LPaNyY.mjs";
-import { i as liveOwnedDeviceCount } from "./device-capacity-DMuKC7nx.mjs";
-import { b as tailLines, u as HEARTBEAT_INTERVAL_MS, y as startBuildHeartbeat } from "./toolchain-DmeYjXD9.mjs";
-import { t as cleanLine } from "./server-expo-DhtX6bom.mjs";
-import { i as staleNativeDirRefusal } from "./prebuild-BvxDlD6C.mjs";
-import { i as ensureOwnedIosDevice, r as ensureIosBooted } from "./device-ios-DMQBUPus.mjs";
-import { a as easAuthNote } from "./remote-cache-CO2elm_b.mjs";
-import { t as reconcileSimSlim } from "./simslim-Ciluxlq4.mjs";
+import { i as formatDuration, l as phaseLine, m as shortHash, u as plural } from "./command-output-DnJMdEY-.mjs";
+import { Tt as removeTemporaryEntry, at as gitCommonDirOnDisk, l as androidDataPartitionSizeGbSetting, o as androidAvdConfigSetting, wt as makeTemporaryDirectory } from "./settings-oTSkkNrM.mjs";
+import { l as ownedDeviceLabel } from "./project-Du91Ilvc.mjs";
+import { o as pidExists } from "./metro-BeK1ZPz1.mjs";
+import { d as sharedBuildCache } from "./workspace-state-B8-aJ1_5.mjs";
+import { C as diffFingerprintSources, I as storedSources, w as entryDir, y as artifactIn } from "./device-lease-D-hLqx1b.mjs";
+import { b as readStats$1, p as estimateBuild } from "./idle-DYVymG92.mjs";
+import { A as listAvds, B as ownedAvdSystemImage, E as getAvdNameForSerial, F as ownedAvdDeviceProfile, J as resolveOwnedAvdSerial, L as ownedAvdMatchesConfiguration, O as listAdbDevices, P as nextConsolePort, R as ownedAvdName, W as pickDefaultSystemImage, b as createOwnedAvd, f as assertOwnedAvdStopped, ft as parkedMaxSetting, g as avdPoolConfiguration, j as listInstalledSystemImages, n as OWNED_AVD_CONFIG_DEFAULTS, pt as readParked, st as adoptParked, t as DEFAULT_AVD_DEVICE_PROFILE, tt as waitForBoot, ut as isLegacyDeletionClaim, v as bootAndroidEmulator, y as configureNewOwnedAvd } from "./android-B_NumVyQ.mjs";
+import { j as readHostMemoryPressure, u as listAllIosSims } from "./ios-BaInn3sW.mjs";
+import { i as teardownOwnedAvd, s as teardownParkedAvd } from "./teardown-CL6vDs2Y.mjs";
+import { b as tailLines, u as HEARTBEAT_INTERVAL_MS, y as startBuildHeartbeat } from "./toolchain-DkUflduf.mjs";
+import { t as cleanLine } from "./server-expo-MC0rHlOC.mjs";
+import { t as clearDeviceIdleShutdown } from "./idle-shutdown-CTsDnAde.mjs";
+import { i as liveOwnedDeviceCount } from "./device-capacity-BHwxNBlu.mjs";
+import { i as staleNativeDirRefusal } from "./prebuild-D2fsca_Z.mjs";
+import { i as ensureOwnedIosDevice, r as ensureIosBooted } from "./device-ios-BadmeL2V.mjs";
+import { a as easAuthNote } from "./remote-cache-C8-V13XN.mjs";
+import { t as reconcileSimSlim } from "./simslim-B8-7AoTI.mjs";
 import { randomUUID } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, rmSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, relative } from "node:path";
@@ -1467,7 +1466,7 @@ async function planCachedBuild(lookup, deps) {
 function planPayload({ platform, slot, projectKey }, found) {
 	const { refusal, missReason, ...rest } = found;
 	const outcome = refusal ? null : found.cacheHit ? "hit" : "cold";
-	const estimate = outcome ? estimateBuild(readStats().record?.history?.[projectKey], platform, outcome) : {
+	const estimate = outcome ? estimateBuild(readStats$1().record?.history?.[projectKey], platform, outcome) : {
 		expectedMs: null,
 		basis: 0
 	};

package/dist/{build-slots-Df1ApSuH.mjs → build-slots-rUk77xqh.mjs}

@@ -1,6 +1,6 @@
 import { n as ownership_claim_exports } from "./process-identity-BmRm1qV0.mjs";
+import { a as formatElapsed } from "./command-output-DnJMdEY-.mjs";
 import { n as declareSpawnsOn, o as stopDeclaringSpawnsOn } from "./spawn-claims-D0XfSe8u.mjs";
-import { a as formatElapsed } from "./command-output-CliHHn7a.mjs";
 import { readdirSync, statSync } from "node:fs";
 import { join } from "node:path";
 import { buildSlotsDir, tryAcquireBuildSlotClaim } from "@stim-cli/core/state";
@@ -60,13 +60,18 @@ async function acquireBuildSlot({ max, root = null, logFile = null, now = Date.n
 	};
 	const started = now();
 	let lastProgress = started;
+	let waited = false;
 	for (;;) {
 		const got = tryAcquireBuildSlot({
 			max,
 			root,
 			logFile
 		});
-		if (got) return got;
+		if (got) return {
+			...got,
+			slotWaitMs: waited ? Math.max(0, Math.round(now() - started)) : 0
+		};
+		waited = true;
 		const elapsed = now() - started;
 		if (elapsed >= ceilingMs) {
 			const err = /* @__PURE__ */ new Error(`Waited ${formatElapsed(elapsed)} for one of ${max} build slots, and every slot is held by a process that is still running, or by a holder Stim cannot identify. Slots live under ` + buildSlotsDir() + "; remove a slot directory whose builder is not really building, or raise concurrency.maxBuilds.");

package/dist/{cli-0cX5s4NM.mjs → cli-BkYZ_6hy.mjs}

@@ -3,23 +3,23 @@ import { readFileSync } from "node:fs";
 import { Command } from "commander";
 //#region bin/cli.ts
 const commands = /* @__PURE__ */ new Map([
-	["doctor", () => import("./doctor-BcE5xsBn.mjs")],
-	["worktree", () => import("./worktree-BT_uULFx.mjs")],
-	["start", () => import("./start-CPO4wRg7.mjs")],
-	["ports", () => import("./ports-DddwttKM.mjs")],
-	["stop", () => import("./stop-CceYh1yG.mjs")],
-	["ios", () => import("./ios-Chob8ny7.mjs")],
-	["android", () => import("./android-Cu_L4RpL.mjs")],
-	["web", () => import("./web-k6w8-HnE.mjs")],
-	["macos", () => import("./macos-BwtbUtTN.mjs")],
-	["reload", () => import("./reload-ChPiwvot.mjs")],
-	["device", () => import("./device-BZ1IyS5A.mjs")],
-	["logs", () => import("./logs-h9h6MUvE.mjs")],
-	["settings", () => import("./settings-DbL6uhH8.mjs")],
-	["status", () => import("./status-DYXxNOT0.mjs")],
-	["stats", () => import("./stats-DBLLFmKd.mjs")],
-	["gc", () => import("./gc-BuL1Genr.mjs")],
-	["guide", () => import("./guide-cCSGRFd3.mjs")]
+	["doctor", () => import("./doctor-Cimf-gGB.mjs")],
+	["worktree", () => import("./worktree-jnG8Iph5.mjs")],
+	["start", () => import("./start-CX8Ig-U2.mjs")],
+	["ports", () => import("./ports-R2k4Knz3.mjs")],
+	["stop", () => import("./stop-Dt_dM16A.mjs")],
+	["ios", () => import("./ios-aq3QoGI3.mjs")],
+	["android", () => import("./android-Ift4kVvt.mjs")],
+	["web", () => import("./web-DWUaMp8P.mjs")],
+	["macos", () => import("./macos-CSYEAFmF.mjs")],
+	["reload", () => import("./reload-rM9jV1fz.mjs")],
+	["device", () => import("./device-DZQjF7H5.mjs")],
+	["logs", () => import("./logs-CHEVK8zD.mjs")],
+	["settings", () => import("./settings-ZkDzkzvB.mjs")],
+	["status", () => import("./status-Cs7VLg9D.mjs")],
+	["stats", () => import("./stats-CEZ_i5je.mjs")],
+	["gc", () => import("./gc-Bqy4bjEu.mjs")],
+	["guide", () => import("./guide-B_uyKTxW.mjs")]
 ]);
 const pkg = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf-8"));
 const program = new Command();
@@ -33,6 +33,12 @@ try {
 		const modules = await Promise.all([...commands.values()].map((load) => load()));
 		for (const module of modules) module.default(program, pkg.version);
 	}
+	program.hook("preAction", async (_command, action) => {
+		try {
+			const { triggerMaintenance } = await import("./trigger-CXts6qt1.mjs");
+			triggerMaintenance(action.name());
+		} catch {}
+	});
 	await program.parseAsync();
 } catch (err) {
 	const code = err?.code;

package/dist/cli.mjs

@@ -4,6 +4,6 @@ const encode = (version) => version.split(".", 3).reduce((sum, part) => sum * 1e
 if (encode(process.versions.node) < encode("22.12.0")) {
 	process.stderr.write(`STIM_NODE_UNSUPPORTED: Stim needs Node 22.12.0 or later; this is Node ${process.versions.node} at ${process.execPath}. To run Stim where a project pins an older Node, see https://stim.appandflow.com/docs/requirements#older-node-pins\n`);
 	process.exitCode = 1;
-} else import("./cli-0cX5s4NM.mjs");
+} else import("./cli-BkYZ_6hy.mjs");
 //#endregion
 export {};

package/dist/{client-C2IS36Qf.mjs → client-BTY686R6.mjs}

@@ -1,14 +1,31 @@
 import { t as getExecutor } from "./exec-CaErVv7t.mjs";
 import { _ as loadConfig$1, d as getConfigDir } from "./config-D0DbpZtM.mjs";
-import { E as withDirLock } from "./workspace-state-CL2V2Ons.mjs";
-import { T as CCACHE_UNAVAILABLE, a as toolchainMismatches, l as COMPILATION_CACHE_UNAVAILABLE, s as manifestDigest } from "./toolchain-DmeYjXD9.mjs";
+import { w as withDirLock } from "./workspace-state-B8-aJ1_5.mjs";
+import { T as CCACHE_UNAVAILABLE, a as toolchainMismatches, l as COMPILATION_CACHE_UNAVAILABLE, s as manifestDigest } from "./toolchain-DkUflduf.mjs";
 import { createHash } from "node:crypto";
 import { closeSync, existsSync, lstatSync, mkdirSync, openSync, readFileSync, readlinkSync, realpathSync, renameSync, rmSync, writeFileSync, writeSync } from "node:fs";
 import { basename, dirname, join, relative } from "node:path";
 import { InvalidArgumentError } from "commander";
-import { OFFLOAD_MODES, buildMachinesFile, buildMachinesLock, endpoint, findPeer, isJsonObject, parseMachine, parseMachine as parseMachine$1, pinnedEndpoint, readBuildMachines, saturation } from "@stim-cli/core/state";
+import { OFFLOAD_MODES, buildMachinesFile, buildMachinesLock, endpoint, findPeer as findPeer$1, isJsonObject, parseMachine, parseMachine as parseMachine$1, pinnedEndpoint, readBuildMachines, saturation } from "@stim-cli/core/state";
 import { hostname } from "node:os";
 import { WebSocket } from "ws";
+//#region src/offload/access-ticket.ts
+function readAccessTicket() {
+	const ticket = process.env.STIM_ACCESS_TICKET?.trim();
+	return ticket && /^[A-Za-z0-9_-]{43}$/.test(ticket) ? {
+		ticket,
+		ticketHash: createHash("sha256").update(ticket).digest("hex")
+	} : void 0;
+}
+function readHostPermissions(value) {
+	const host = value;
+	return host && typeof host.name === "string" && typeof host.screenRecording === "boolean" && typeof host.accessibility === "boolean" ? {
+		name: host.name,
+		screenRecording: host.screenRecording,
+		accessibility: host.accessibility
+	} : void 0;
+}
+//#endregion
 //#region src/offload/tailnet.ts
 const MAC_APP_TAILSCALE = "/Applications/Tailscale.app/Contents/MacOS/Tailscale";
 const HELLO_TIMEOUT_MS = 1e4;
@@ -164,9 +181,11 @@ function offloadFindings(entry, problems) {
 	}));
 }
 async function requestAccess(entry, peer, port, deviceName, io) {
+	const ticket = readAccessTicket();
 	const reply = await io.hello(endpoint(peer, port), {
 		request: "build",
-		deviceName
+		deviceName,
+		...ticket ? { setupTicket: ticket.ticket } : {}
 	});
 	if (!("result" in reply) || !reply.result.approval || !reply.result.deviceToken) {
 		const reason = "failed" in reply ? reply.failed : "error" in reply ? reply.error.message : "it granted no request";
@@ -186,7 +205,8 @@ async function requestAccess(entry, peer, port, deviceName, io) {
 		deviceId: reply.result.device.id,
 		deviceToken: reply.result.deviceToken,
 		state: "pending",
-		requestedAt: (/* @__PURE__ */ new Date()).toISOString()
+		requestedAt: (/* @__PURE__ */ new Date()).toISOString(),
+		...ticket ? { ticketHash: ticket.ticketHash } : {}
 	};
 	updateCredentials((credentials) => [...credentials.filter((each) => each.machine !== entry), credential]);
 	return {
@@ -209,7 +229,7 @@ async function inspectMachine(entry, status, deviceName, fix, io, check) {
 		},
 		finding: note(`Build machine ${entry} is not a tailnet name`, "Expected `name` or `name:port`.")
 	};
-	const peer = findPeer(status, parsed.name);
+	const peer = findPeer$1(status, parsed.name);
 	if (peer === "missing" || peer === "ambiguous") {
 		const detail = peer === "missing" ? "No peer on this tailnet has that name." : "Several peers match that name.";
 		return {
@@ -251,6 +271,8 @@ async function inspectMachine(entry, status, deviceName, fix, io, check) {
 	};
 	const reply = await io.hello(endpoint(peer, parsed.port), { deviceToken: credential.deviceToken });
 	if ("result" in reply && reply.result.capabilities.includes("build")) {
+		const permissions = readHostPermissions(reply.result.host);
+		const host = permissions ? { host: permissions } : {};
 		if (credential.state !== "approved") updateCredentials((credentials) => credentials.map((each) => each.machine === entry ? {
 			...each,
 			state: "approved"
@@ -258,7 +280,8 @@ async function inspectMachine(entry, status, deviceName, fix, io, check) {
 		if (!check) return {
 			report: {
 				...paired,
-				state: "approved"
+				state: "approved",
+				...host
 			},
 			finding: null
 		};
@@ -270,6 +293,7 @@ async function inspectMachine(entry, status, deviceName, fix, io, check) {
 			report: {
 				...paired,
 				state: "approved",
+				...host,
 				offloadable: problems.length === 0,
 				reasons: problems.map((problem) => problem.reason),
 				problems,
@@ -279,13 +303,17 @@ async function inspectMachine(entry, status, deviceName, fix, io, check) {
 			extra: offloadFindings(entry, problems)
 		};
 	}
-	if ("error" in reply && reply.error.code === "approval-pending") return {
-		report: {
-			...paired,
-			state: "pending"
-		},
-		finding: note(`Build machine ${entry} has not approved this Mac yet`, `Requested at ${credential.requestedAt}.`, approval(entry, credential.deviceId))
-	};
+	if ("error" in reply && reply.error.code === "approval-pending") {
+		const ticket = fix && credential.state !== "approved" ? readAccessTicket() : void 0;
+		if (ticket && credential.ticketHash !== ticket.ticketHash) return requestAccess(entry, peer, parsed.port, deviceName, io);
+		return {
+			report: {
+				...paired,
+				state: "pending"
+			},
+			finding: note(`Build machine ${entry} has not approved this Mac yet`, `Requested at ${credential.requestedAt}.`, approval(entry, credential.deviceId))
+		};
+	}
 	if ("error" in reply && reply.error.code === "unauthorized") {
 		if (fix) return requestAccess(entry, peer, parsed.port, deviceName, io);
 		return {
@@ -309,7 +337,7 @@ async function inspectMachine(entry, status, deviceName, fix, io, check) {
 * Doctor findings and a report for each `offload.machines` entry. The worker's node is pinned when access is
 * requested; a later connection goes only to the current MagicDNS name of that same node, checked before the token
 * is sent. With `fix`, requests access from a named machine this Mac holds no pairing for, requests again when the
-* pinned node forgot this Mac, and forgets pairings of machines no longer named. With `check`, each approved
+* pinned node forgot this Mac or, with `STIM_ACCESS_TICKET` set, when a pending request carries another ticket, and forgets pairings of machines no longer named. With `check`, each approved
 * machine is asked for one build offer and reports every reason it would not take this project's build.
 */
 async function inspectBuildMachines({ fix, check = null }, io = realIo, entries = configuredMachines()) {
@@ -591,8 +619,10 @@ var BuildConnection = class BuildConnection {
 	ended = false;
 	keepalive;
 	socket;
-	constructor(socket) {
+	features;
+	constructor(socket, features) {
 		this.socket = socket;
+		this.features = features;
 		closeOnExit(socket);
 		this.keepalive = setInterval(() => {
 			if (this.watched && Date.now() - this.heard > SILENT_MS) return void socket.terminate();
@@ -647,14 +677,15 @@ var BuildConnection = class BuildConnection {
 				headers: { Host: target.host }
 			};
 			const socket = new WebSocket(target.url, options);
-			const fail = (reason, refused = false) => {
+			const fail = (reason, refused = false, code) => {
 				clearTimeout(timer);
 				socket.removeAllListeners();
 				socket.on("error", () => {});
 				socket.terminate();
 				resolve({
 					failure: reason,
-					refused
+					refused,
+					...code ? { code } : {}
 				});
 			};
 			const timer = setTimeout(() => fail("no reply in time"), timeoutMs);
@@ -683,13 +714,17 @@ var BuildConnection = class BuildConnection {
 				} catch {
 					return fail("the reply was not a hello result");
 				}
-				if (isJsonObject(reply) && isJsonObject(reply.error)) return fail(String(reply.error.message), TURNED_AWAY.has(String(reply.error.code)));
+				if (isJsonObject(reply) && isJsonObject(reply.error)) return fail(String(reply.error.message), TURNED_AWAY.has(String(reply.error.code)), String(reply.error.code));
 				const capabilities = isJsonObject(reply) && isJsonObject(reply.result) ? reply.result.capabilities : null;
-				if (!Array.isArray(capabilities) || !capabilities.includes(capability)) return fail(`it has not granted this Mac ${capability === "build" ? "build" : "hosting"} access`, true);
-				resolve(new BuildConnection(socket));
+				if (!Array.isArray(capabilities) || !capabilities.includes(capability)) return fail(`it has not granted this Mac ${capability === "build" ? "build" : "hosting"} access`, true, "forbidden");
+				const features = isJsonObject(reply) && isJsonObject(reply.result) ? reply.result.features : null;
+				resolve(new BuildConnection(socket, Array.isArray(features) ? features.filter((each) => typeof each === "string") : []));
 			});
 		});
 	}
+	supports(feature) {
+		return this.features.includes(feature);
+	}
 	request(method, params, timeoutMs = REQUEST_TIMEOUT_MS) {
 		if (this.closed) return Promise.resolve({ error: {
 			code: "closed",
@@ -1330,4 +1365,4 @@ function offloadCheck(projectRoot, targets) {
 	};
 }
 //#endregion
-export { findPeer as _, offloadBuild as a, realIo as b, placementLoad as c, OffloadRefusal as d, namedBuildMachine as f, endpoint as g, inspectBuildMachines as h, closeOffload as i, remotePhaseText as l, resolveBuildPlacement as m, buildPlacementCandidates as n, offloadCheck as o, parseBuildMachineOption as p, chooseBuildMachine as r, offloadPlacement as s, BuildConnection as t, simulatorRuntime as u, parseMachine$1 as v, pinnedEndpoint$1 as y };
+export { readHostPermissions as S, findPeer$1 as _, offloadBuild as a, realIo as b, placementLoad as c, OffloadRefusal as d, namedBuildMachine as f, endpoint as g, inspectBuildMachines as h, closeOffload as i, remotePhaseText as l, resolveBuildPlacement as m, buildPlacementCandidates as n, offloadCheck as o, parseBuildMachineOption as p, chooseBuildMachine as r, offloadPlacement as s, BuildConnection as t, simulatorRuntime as u, parseMachine$1 as v, readAccessTicket as x, pinnedEndpoint$1 as y };

package/dist/collector-run.mjs

@@ -1,203 +1,16 @@
-import { t as getExecutor } from "./exec-CaErVv7t.mjs";
 import { R as deviceSlotKey, W as validateDeviceSlot } from "./config-D0DbpZtM.mjs";
 import { t as process_identity_exports } from "./process-identity-BmRm1qV0.mjs";
-import { r as createNdjsonWriter } from "./ndjson-CDY9IkVC.mjs";
-import { C as workspaceLogsDir } from "./workspace-state-CL2V2Ons.mjs";
 import { t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
+import { x as workspaceLogsDir } from "./workspace-state-B8-aJ1_5.mjs";
+import { r as createNdjsonWriter } from "./ndjson-PclOIwVY.mjs";
 import { a as startIosDeviceConsole, i as parseDeviceConsoleLine } from "./ios-device-Ee7sDXfp.mjs";
-import { a as unregisterCollector, i as registerCollector, r as readCollectors, t as collectorProcessTitle } from "./ownership-BkYxUtuj.mjs";
-import { a as watchAppPid, i as waitForAppPid, n as parseLogcatLine, r as startAndroidLogcat, t as androidClockOffset } from "./android-CYmq0jNi.mjs";
+import { n as parseLogStreamLine, r as startIosLogStream, t as appNameFromBundleId } from "./ios-Cr1h5gnO.mjs";
+import { a as unregisterCollector, i as registerCollector, r as readCollectors, t as collectorProcessTitle } from "./ownership-DiA16AsN.mjs";
+import { a as watchAppPid, i as waitForAppPid, n as parseLogcatLine, r as startAndroidLogcat, t as androidClockOffset } from "./android-r2rBL8kV.mjs";
 import { existsSync } from "node:fs";
 import { isAbsolute, join, resolve } from "node:path";
 import { LOG_ROTATE_BYTES } from "@stim-cli/core";
 import { fileURLToPath } from "node:url";
-//#region src/collector/ios.ts
-const MESSAGE_TYPE_LEVEL = {
-	Debug: "debug",
-	Info: "info",
-	Default: "info",
-	Error: "error",
-	Fault: "fatal"
-};
-function levelFromMessageType(messageType) {
-	return MESSAGE_TYPE_LEVEL[messageType] ?? "info";
-}
-const NOISE_RULES = [
-	{
-		id: "network",
-		subsystem: "com.apple.network"
-	},
-	{
-		id: "network-default-subsystem",
-		messagePrefix: [
-			"nw_socket",
-			"nw_connection",
-			"nw_protocol",
-			"nw_endpoint",
-			"nw_path",
-			"nw_resolver",
-			"nw_flow",
-			"nw_read_request",
-			"nw_write_request",
-			"tcp_input"
-		]
-	},
-	{
-		id: "sectrust",
-		subsystem: "com.apple.securityd"
-	},
-	{
-		id: "sectrust-default-subsystem",
-		messagePrefix: [
-			"SecTrust",
-			"SecOSStatus",
-			"TrustResultType"
-		]
-	},
-	{
-		id: "webkit",
-		subsystem: "com.apple.WebKit"
-	},
-	{
-		id: "webkit-default-subsystem",
-		messagePrefix: [
-			"WebPrivacy",
-			"GPUProcessProxy",
-			"WebProcessProxy"
-		]
-	},
-	{
-		id: "audio-factory",
-		messageIncludes: ["AddInstanceForFactory"]
-	},
-	{
-		id: "coreui",
-		subsystem: "com.apple.coreui"
-	},
-	{
-		id: "coreui-default-subsystem",
-		messagePrefix: [
-			"CUICatalog:",
-			"CoreUI:",
-			"CoreThemeDefinition"
-		]
-	},
-	{
-		id: "uiscene-deprecation",
-		messageIncludes: [
-			"UIScene lifecycle will soon be required",
-			"`UIScene` lifecycle will soon be required",
-			"must migrate to UIScene",
-			"migrate to UIScene lifecycle"
-		]
-	},
-	{
-		id: "react-native-focus-cache",
-		exactSubsystem: "com.apple.UIKit",
-		category: "UIFocus",
-		messageEquals: "RCTScrollViewComponentView implements focusItemsInRect: - caching for linear focus movement is limited as long as this view is on screen."
-	},
-	{
-		id: "cfnetwork-performance-diagnostic",
-		exactSubsystem: "com.apple.runtime-issues",
-		category: "CFNetwork Performance Diagnostic",
-		level: "warn"
-	}
-];
-function ruleMatches(rule, { subsystem, category, message }) {
-	if (rule.subsystem && subsystem !== rule.subsystem && !subsystem.startsWith(`${rule.subsystem}.`)) return false;
-	if (rule.exactSubsystem && subsystem !== rule.exactSubsystem) return false;
-	if (rule.category && category !== rule.category) return false;
-	if (rule.messageEquals && message !== rule.messageEquals) return false;
-	if (rule.messagePrefix && !rule.messagePrefix.some((p) => message.startsWith(p))) return false;
-	if (rule.messageIncludes && !rule.messageIncludes.some((p) => message.includes(p))) return false;
-	return true;
-}
-function matchingNoiseRule(event) {
-	const subsystem = typeof event?.subsystem === "string" ? event.subsystem : "";
-	const category = typeof event?.category === "string" ? event.category : "";
-	const message = typeof event?.eventMessage === "string" ? event.eventMessage : "";
-	return NOISE_RULES.find((rule) => ruleMatches(rule, {
-		subsystem,
-		category,
-		message
-	}));
-}
-function levelForEvent(event) {
-	const level = levelFromMessageType(event?.messageType);
-	if (level !== "error" && level !== "fatal") return level;
-	const rule = matchingNoiseRule(event);
-	return rule ? rule.level ?? "info" : level;
-}
-function procFromImagePath(path) {
-	if (typeof path !== "string" || !path) return null;
-	const parts = path.split("/");
-	return parts[parts.length - 1] || null;
-}
-function tsFromEvent(event, now = Date.now) {
-	const parsed = Date.parse(event?.timestamp);
-	return Number.isFinite(parsed) ? parsed : now();
-}
-function recordFromLogEvent(event, { now = Date.now } = {}) {
-	if (!event || typeof event !== "object") return null;
-	const eventType = event.eventType;
-	if (eventType && eventType !== "logEvent") return null;
-	const msg = typeof event.eventMessage === "string" ? event.eventMessage : "";
-	if (!msg.trim()) return null;
-	const record = {
-		ts: tsFromEvent(event, now),
-		src: "device",
-		level: levelForEvent(event),
-		msg
-	};
-	const proc = procFromImagePath(event.processImagePath);
-	if (proc) record.proc = proc;
-	if (typeof event.subsystem === "string") record.subsystem = event.subsystem;
-	if (typeof event.category === "string") record.category = event.category;
-	return record;
-}
-function parseLogStreamLine(line, { now = Date.now } = {}) {
-	if (typeof line !== "string") return null;
-	const trimmed = line.trim();
-	if (!trimmed || trimmed[0] !== "{") return null;
-	let event;
-	try {
-		event = JSON.parse(trimmed);
-	} catch {
-		return null;
-	}
-	return recordFromLogEvent(event, { now });
-}
-function logStreamArgs(udid, appName, executableName) {
-	return [
-		"simctl",
-		"spawn",
-		udid,
-		"log",
-		"stream",
-		"--style",
-		"ndjson",
-		"--predicate",
-		`processImagePath ENDSWITH "/${appName}.app/${executableName && executableName.trim() !== "" ? executableName.trim() : appName}"`,
-		"--level",
-		"info"
-	];
-}
-function appNameFromBundleId(bundleId) {
-	const parts = String(bundleId || "").split(".");
-	return parts[parts.length - 1] || String(bundleId || "");
-}
-function startIosLogStream({ udid, appName, executableName = null, spawnFn = null }) {
-	return (spawnFn || ((cmd, args, opts) => getExecutor().spawn(cmd, args, opts)))("xcrun", logStreamArgs(udid, appName, executableName), {
-		stdio: [
-			"ignore",
-			"pipe",
-			"pipe"
-		],
-		detached: false
-	});
-}
-//#endregion
 //#region src/collector/run.ts
 const PLATFORMS = ["ios", "android"];
 function parseArgs(argv) {

package/dist/{command-output-CliHHn7a.mjs → command-output-DnJMdEY-.mjs}

@@ -1,5 +1,5 @@
-import { t as NO_PROJECT_REFUSAL } from "./project-CV3tDFHl.mjs";
 import { n as stripAnsi } from "./process-output-Fpl8PYi8.mjs";
+import { t as NO_PROJECT_REFUSAL } from "./project-Du91Ilvc.mjs";
 import { quotedPath } from "@stim-cli/core";
 import chalk from "chalk";
 //#region src/diagnostics/launch-error-preview.ts

package/dist/{created-devices-BwVb3liH.mjs → created-devices-D5owjN4C.mjs}

@@ -1,5 +1,5 @@
 import { d as getConfigDir } from "./config-D0DbpZtM.mjs";
-import { E as withDirLock } from "./workspace-state-CL2V2Ons.mjs";
+import { w as withDirLock } from "./workspace-state-B8-aJ1_5.mjs";
 import { mkdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { createdDevicesFile, createdDevicesLock, readCreatedDevices, readCreatedDevices as readCreatedDevices$1 } from "@stim-cli/core/state";
 //#region src/devices/created-devices.ts

package/dist/{dependency-state-BmsjKZ2H.mjs → dependency-state-B6cMXZab.mjs}

@@ -1,5 +1,5 @@
 import { t as getExecutor } from "./exec-CaErVv7t.mjs";
-import { y as repoRoot } from "./worktree-C0c5Udwa.mjs";
+import { gt as repoRoot } from "./settings-oTSkkNrM.mjs";
 import { existsSync } from "node:fs";
 import { dirname, join, relative } from "node:path";
 //#region src/dependency-state.ts

package/dist/{deps-BFlKbOIp.mjs → deps-urbmfXig.mjs}

@@ -1,7 +1,7 @@
 import { t as getExecutor } from "./exec-CaErVv7t.mjs";
-import { a as spawnDeclared } from "./spawn-claims-D0XfSe8u.mjs";
 import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { S as bundlerPin, u as HEARTBEAT_INTERVAL_MS, y as startBuildHeartbeat } from "./toolchain-DmeYjXD9.mjs";
+import { a as spawnDeclared } from "./spawn-claims-D0XfSe8u.mjs";
+import { S as bundlerPin, u as HEARTBEAT_INTERVAL_MS, y as startBuildHeartbeat } from "./toolchain-DkUflduf.mjs";
 import { existsSync, readFileSync } from "node:fs";
 import { delimiter, dirname, join, relative, resolve, sep } from "node:path";
 import { homedir } from "node:os";

package/dist/{dev-client-CjzLoNs0.mjs → dev-client-CroAIjjj.mjs}

@@ -1,5 +1,5 @@
-import { t as getExecutor } from "./exec-CaErVv7t.mjs";
-import { f as resolvePackageJson, s as isPackageResolvable } from "./project-CV3tDFHl.mjs";
+import { c as isPackageResolvable, p as resolvePackageJson } from "./project-Du91Ilvc.mjs";
+import { C as pickDevClientScheme, w as readBundleSchemes } from "./app-install-CKWdbXIX.mjs";
 import { dirname, join } from "node:path";
 import { isJsonObject, readJsonObject } from "@stim-cli/core/state";
 //#region src/commands/dev-client.ts
@@ -14,43 +14,6 @@ function devClientScheme(root, appPath = null, { exec = null } = {}) {
 	if (typeof scheme !== "string" || scheme.trim() === "") return void 0;
 	return scheme.trim();
 }
-function schemesFromInfoPlist(plist) {
-	const types = plist?.CFBundleURLTypes;
-	if (!Array.isArray(types)) return [];
-	const out = [];
-	for (const type of types) {
-		const schemes = type?.CFBundleURLSchemes;
-		if (Array.isArray(schemes)) out.push(...schemes.filter((s) => typeof s === "string" && s.trim() !== ""));
-	}
-	return out;
-}
-function readBundleSchemes(appPath, { exec = null } = {}) {
-	if (typeof appPath !== "string" || appPath.trim() === "") return [];
-	const e = exec || getExecutor();
-	let out;
-	try {
-		out = e.runFile("plutil", [
-			"-convert",
-			"json",
-			"-o",
-			"-",
-			join(appPath, "Info.plist")
-		]);
-	} catch {
-		return [];
-	}
-	try {
-		return schemesFromInfoPlist(JSON.parse(String(out)));
-	} catch {
-		return [];
-	}
-}
-const THIRD_PARTY_SCHEME = /^(?:fb\d+|com\.googleusercontent\.apps\.|msauth\.|msauthv2|twitterkit-|db-[a-z0-9]+$|spotify|snapchat|com\.facebook)/i;
-function pickDevClientScheme(schemes) {
-	const all = (Array.isArray(schemes) ? schemes : []).filter((s) => typeof s === "string" && s.trim() !== "").map((s) => s.trim()).filter((s) => !/^(?:https?|mailto|tel|sms|itms(?:-apps)?)$/i.test(s));
-	const expo = all.filter((s) => s.startsWith("exp+"));
-	return (expo.length ? expo : all.filter((s) => !THIRD_PARTY_SCHEME.test(s))).toSorted((a, b) => b.length - a.length)[0] ?? null;
-}
 function hasDevClient(root) {
 	const pkg = readJsonObject(join(root, "package.json"));
 	if ([pkg?.dependencies, pkg?.devDependencies].some((deps) => isJsonObject(deps) && "expo-dev-client" in deps)) return true;
@@ -77,4 +40,4 @@ function installedDevLauncherVersion(root) {
 	return typeof version === "string" ? version : null;
 }
 //#endregion
-export { schemesFromInfoPlist as i, devClientTakesDevMenuParams as n, pickDevClientScheme as r, devClientScheme as t };
+export { devClientTakesDevMenuParams as n, devClientScheme as t };