stim 1.26.0 → 1.27.0

package/dist/{cdp-BG3FJCCx.mjs → cdp-C3svvXiE.mjs}

@@ -1,4 +1,4 @@
-import { c as throwIfCancelled, s as cancelledError } from "./exec-VFRpu1iA.mjs";
+import { c as throwIfCancelled, s as cancelledError } from "./exec-aULwtNly.mjs";
 import { WebSocket } from "ws";
 //#region src/web/cdp.ts
 const COMMAND_TIMEOUT_MS = 15e3;

package/dist/{chrome-BvV8ssI3.mjs → chrome-DyDWurWG.mjs}

@@ -1,4 +1,4 @@
-import { t as getExecutor } from "./exec-VFRpu1iA.mjs";
+import { t as getExecutor } from "./exec-aULwtNly.mjs";
 import { existsSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";

package/dist/{cli-BBKFGOFl.mjs → cli-ftXDLto1.mjs}

@@ -1,27 +1,27 @@
-import { E as debugLog } from "./exec-VFRpu1iA.mjs";
-import { y as refuseRelativeStimPaths } from "./config-BktkY_zC.mjs";
+import { E as debugLog } from "./exec-aULwtNly.mjs";
+import { y as refuseRelativeStimPaths } from "./config-Cn94Jc0g.mjs";
 import { readFileSync } from "node:fs";
-import { runId } from "@stim-cli/core/state";
+import { runId, trace } from "@stim-cli/core/state";
 import { Command } from "commander";
 //#region bin/cli.ts
 const commands = /* @__PURE__ */ new Map([
-	["doctor", () => import("./doctor-Cp-BhzTS.mjs")],
-	["worktree", () => import("./worktree-Bm4cb-nU.mjs")],
-	["start", () => import("./start-C_wefNKB.mjs")],
-	["ports", () => import("./ports-C2_w1Z0Z.mjs")],
-	["stop", () => import("./stop-CmdNhGlC.mjs")],
-	["ios", () => import("./ios-B7-lToDu.mjs")],
-	["android", () => import("./android-CSbLRD53.mjs")],
-	["web", () => import("./web-BFLueSh-.mjs")],
-	["macos", () => import("./macos-B0VEV3Gf.mjs")],
-	["reload", () => import("./reload-C9OduiNc.mjs")],
-	["device", () => import("./device-BcYeHSFu.mjs")],
-	["logs", () => import("./logs-s1dRIG1E.mjs")],
-	["settings", () => import("./settings-OaGQF-ri.mjs")],
-	["status", () => import("./status-B9M7x4CZ.mjs")],
-	["stats", () => import("./stats-tEpEEH-u.mjs")],
-	["gc", () => import("./gc-C_79zvz4.mjs")],
-	["guide", () => import("./guide-D7K0X6KG.mjs")]
+	["doctor", () => import("./doctor-Dbx1ZpD2.mjs")],
+	["worktree", () => import("./worktree-JGUd_53L.mjs")],
+	["start", () => import("./start-DcqnF9p8.mjs")],
+	["ports", () => import("./ports-uUrghqWN.mjs")],
+	["stop", () => import("./stop-x1Yu3He4.mjs")],
+	["ios", () => import("./ios-Bk4mWbtS.mjs")],
+	["android", () => import("./android--HBgpvpW.mjs")],
+	["web", () => import("./web-Je6abcpz.mjs")],
+	["macos", () => import("./macos-BGmTpnv9.mjs")],
+	["reload", () => import("./reload-DJBeF_rC.mjs")],
+	["device", () => import("./device-BJm0irrq.mjs")],
+	["logs", () => import("./logs-aJQb-RDg.mjs")],
+	["settings", () => import("./settings-CMHhQNwI.mjs")],
+	["status", () => import("./status-Bj7ZYvvc.mjs")],
+	["stats", () => import("./stats-GxuCbles.mjs")],
+	["gc", () => import("./gc-BRwAY3qT.mjs")],
+	["guide", () => import("./guide-_rfEh_zM.mjs")]
 ]);
 const pkg = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf-8"));
 const program = new Command();
@@ -37,9 +37,10 @@ try {
 		for (const module of modules) module.default(program, pkg.version);
 	}
 	program.hook("preAction", async (_command, action) => {
+		const path = [];
+		for (let each = action; each?.parent; each = each.parent) path.unshift(each.name());
+		trace.command(`stim ${path.join(" ")}`, { version: pkg.version });
 		if (debugLog.enabled()) {
-			const path = [];
-			for (let each = action; each?.parent; each = each.parent) path.unshift(each.name());
 			const started = Date.now();
 			debugLog.log("run_start", {
 				version: pkg.version,
@@ -52,7 +53,7 @@ try {
 			}));
 		}
 		try {
-			const { triggerMaintenance } = await import("./trigger-DzJu208Q.mjs");
+			const { triggerMaintenance } = await import("./trigger-qp2ji5wE.mjs");
 			triggerMaintenance(action.name());
 		} catch {}
 	});

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-BBKFGOFl.mjs");
+} else import("./cli-ftXDLto1.mjs");
 //#endregion
 export {};

package/dist/{client-D9CaRks-.mjs → client-xsdxrhWA.mjs}

@@ -1,21 +1,19 @@
-import { C as reportSignal, E as debugLog, b as operationState, c as throwIfCancelled, t as getExecutor } from "./exec-VFRpu1iA.mjs";
-import { _ as loadConfig$1, at as resolveEndpoint, et as openAuthenticated, ot as sayHello } from "./config-BktkY_zC.mjs";
-import { o as git, s as gitAsync } from "./operation-exec-CUZifp6Z.mjs";
-import { Dr as discoverCaches, E as maintenanceLogger, ct as planCacheEmptying, nt as emptyCaches } from "./budget-k2mZGvvk.mjs";
+import { C as reportSignal, E as debugLog, b as operationState, c as throwIfCancelled, t as getExecutor } from "./exec-aULwtNly.mjs";
+import { _ as loadConfig$1, ot as resolveEndpoint, st as sayHello, tt as openAuthenticated } from "./config-Cn94Jc0g.mjs";
+import { o as git, s as gitAsync } from "./operation-exec-Dp4FuIGR.mjs";
+import { G as planCacheEmptying, R as maintenanceLogger, n as CCACHE_UNAVAILABLE, t as CCACHE_NOT_RUN, ur as discoverCaches, z as emptyCaches } from "./ccache-BWTze1Ls.mjs";
 import { t as canonicalPath } from "./paths-BsJMoPP2.mjs";
-import { d as runCancellationSignal } from "./native-run-BfIDFKLH.mjs";
+import { A as COMPILATION_CACHE_UNAVAILABLE, E as readRubyVersion, a as cocoapodsDifference, k as COMPILATION_CACHE_NOT_RUN, ot as runCancellationSignal, s as iosToolchainAsync, v as toolchainMismatches, x as workerToolchain, y as toolchainNotes } from "./toolchain-CbCG6C5Z.mjs";
 import { t as resolveMaintenanceSettings } from "./settings-Djl-mpjX.mjs";
-import { n as CCACHE_UNAVAILABLE, t as CCACHE_NOT_RUN } from "./ccache-Bx5TbxwG.mjs";
-import { A as COMPILATION_CACHE_UNAVAILABLE, E as readRubyVersion, a as cocoapodsDifference, k as COMPILATION_CACHE_NOT_RUN, s as iosToolchainAsync, v as toolchainMismatches, x as workerToolchain, y as toolchainNotes } from "./toolchain-J4J8MrAr.mjs";
-import { f as pairedMachines, i as namedBuildMachine, t as OffloadRefusal, u as workerFailureReason } from "./selection-BNPBZ6T5.mjs";
+import { f as workerFailureReason, m as pairedMachines, o as namedBuildMachine, t as OffloadRefusal } from "./selection-Bs8phwhN.mjs";
 import { n as fingerprintNativeInputs, r as manifestDigest } from "./native-inputs-TRTTTRxt.mjs";
-import { a as sourceManifest, i as nativeTransferManifest, n as gitVisiblePaths, r as nativeFileDigest, t as checkNativeTransferMembership } from "./native-source-D-4Dh4JU.mjs";
+import { a as sourceManifest, i as nativeTransferManifest, n as gitVisiblePaths, r as nativeFileDigest, t as checkNativeTransferMembership } from "./native-source-D1AzWiuP.mjs";
 import { createHash, webcrypto } from "node:crypto";
 import { closeSync, existsSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, rmSync, writeSync } from "node:fs";
 import { isDeepStrictEqual } from "node:util";
 import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { ambientContext, dependencyLockfile, reactNativeArtifactIdentity, reactNativeArtifactQuery, swiftpmArtifactQuery } from "@stim-cli/core";
-import { OFFLOAD_MODES, automaticMachineEnabled, isJsonObject, maintenanceDir, requireAutomaticMachine, runId, saturation } from "@stim-cli/core/state";
+import { automaticMachineEnabled, isJsonObject, maintenanceDir, mayRunHere, placementWord, requireAutomaticMachine, runId, saturation } from "@stim-cli/core/state";
 import { WebSocket } from "ws";
 import { setTimeout as setTimeout$1 } from "node:timers/promises";
 import { access, lstat, readFile, readlink, realpath } from "node:fs/promises";
@@ -393,16 +391,12 @@ const PAGE_BYTES = 49152;
 const CHUNK_BYTES = 61440;
 const MAX_BUFFERED = 8388608;
 const DIGEST_BYTES = 32;
-function offloadMode(env = ambientContext()?.env ?? process.env) {
-	const raw = env.STIM_REMOTE_BUILD_MODE || loadConfig$1()?.remote?.buildMode;
-	return OFFLOAD_MODES.includes(raw) ? raw : "auto";
-}
 function buildPlacementCandidates(selected) {
 	const config = loadConfig$1();
+	const word = placementWord(selected);
 	return {
-		localEnabled: selected !== "auto" || automaticMachineEnabled("build", "local", config),
-		mode: selected === "local" ? "off" : offloadMode(),
-		machines: selected === "local" ? [] : namedBuildMachine(selected) ? pairedMachines([selected]).slice(0, 1) : pairedMachines().filter((entry) => automaticMachineEnabled("build", entry.machine, config))
+		localEnabled: word === null || word === "local" || mayRunHere(word) && automaticMachineEnabled("build", "local", config),
+		machines: word === "local" ? [] : word === null ? pairedMachines([selected]).slice(0, 1) : pairedMachines().filter((entry) => automaticMachineEnabled("build", entry.machine, config))
 	};
 }
 function remotePhaseText(name, msg, machine) {
@@ -426,10 +420,12 @@ function placementLoad(choice) {
 /**
 * Whether a build may go to a remote machine at all, before any machine is asked. `auto` keeps the build here while
 * this machine has a free `concurrency.maxBuilds` slot and its load per core is under `server.maxLoadPerCore`.
-* A named selection ignores local capacity and mode, and refuses an unsupported build or missing pairing.
+* `remote` always tries the remote machines first and `remote-only` never builds here. A named selection ignores
+* local capacity, and refuses an unsupported build or missing pairing.
 */
-function offloadPlacement({ mode, machines, here, unsupported, localEnabled = true, selected = "auto" }) {
-	if (namedBuildMachine(selected)) {
+function offloadPlacement({ machines, here, unsupported, localEnabled = true, selected = "auto" }) {
+	const word = placementWord(selected);
+	if (word === null) {
 		if (unsupported) throw new OffloadRefusal(selected, `${unsupported}, so a named remote machine cannot take it`);
 		if (machines === 0) throw new OffloadRefusal(selected, "no remote machine is paired");
 		return {
@@ -438,25 +434,21 @@ function offloadPlacement({ mode, machines, here, unsupported, localEnabled = tr
 			reason: `selected with --remote-build ${selected}`
 		};
 	}
-	if (selected === "local") return {
+	if (word === "local") return {
 		offload: false,
 		code: "local-selected",
 		reason: "--remote-build local"
 	};
-	if (!localEnabled) {
-		const reason = mode === "off" ? "remote.buildMode is off" : unsupported ?? (machines === 0 ? "no enabled remote machine is paired" : null);
-		if (reason) throw new OffloadRefusal("auto", `${reason}; local is disabled in remote.buildPoolDisabled`);
+	if (!localEnabled || !mayRunHere(word)) {
+		const why = word === "remote-only" ? "remote-only never builds here" : "local is disabled in remote.buildPoolDisabled";
+		const reason = unsupported ?? (machines === 0 ? "no enabled remote machine is paired" : null);
+		if (reason) throw new OffloadRefusal(selected, `${reason}; ${why}`);
 		return {
 			offload: true,
-			code: "local-disabled",
-			reason: "local is disabled in remote.buildPoolDisabled"
+			code: word === "remote-only" ? "remote-only" : "local-disabled",
+			reason: why
 		};
 	}
-	if (mode === "off") return {
-		offload: false,
-		code: "mode-off",
-		reason: "remote.buildMode is off"
-	};
 	if (machines === 0) return {
 		offload: false,
 		code: "no-remote-mac",
@@ -467,10 +459,10 @@ function offloadPlacement({ mode, machines, here, unsupported, localEnabled = tr
 		code: "unsupported",
 		reason: unsupported
 	};
-	if (mode === "force") return {
+	if (word === "remote") return {
 		offload: true,
-		code: "forced",
-		reason: "remote.buildMode is force"
+		code: "remote",
+		reason: "remote machines come first"
 	};
 	const busy = saturation(here);
 	return busy ? {
@@ -521,14 +513,15 @@ function offerProblems(offer, target, named = false) {
 	return problems;
 }
 /**
-* The asked machines that can take the build, best first, and one reason per machine that cannot. A machine with any
-* `offerProblems` never takes it. In `auto`, a machine must also be expected to build faster than this machine: while
-* every local build slot is busy any machine that accepts will do, otherwise its load per core must be lower than
-* this machine's. A named selection considers only that machine and skips this local-capacity gating.
-* A machine that reports no load (a stim-server older than capacity) takes an `auto` build only while
-* every local slot is busy. Matching dependency installations rank first, then load.
+* The asked machines that can take the build, in the order they should be tried, and one reason per machine that
+* cannot. A machine with any `offerProblems` never takes it, nor does one whose load per core is at or above its own
+* `server.maxLoadPerCore` (this machine's setting stands in for a stim-server that does not report it). Machines that
+* can take it keep the order of `remote.machines`, so the first one with a free slot under its load threshold gets
+* the build; only a machine that already holds the exact completed artifact goes ahead of that order. A named
+* selection considers only that machine. In `auto` a machine that reports no load (a stim-server older than capacity)
+* takes the build only while every local slot is busy.
 */
-function pickOffer({ mode, here, offers, target, localEnabled = true, selected = "auto", artifact, cacheOnly = false }) {
+function pickOffer({ here, offers, target, localEnabled = true, selected = "auto", artifact, cacheOnly = false }) {
 	const slotsFull = here.maxBuilds > 0 && here.builds >= here.maxBuilds;
 	const reasons = [];
 	const candidates = [];
@@ -548,8 +541,7 @@ function pickOffer({ mode, here, offers, target, localEnabled = true, selected =
 		if (matchingArtifact(offer, artifact) && (artifact !== "swiftpm" || toolchainMismatches(target, offer.toolchain).length === 0)) {
 			ranked.push({
 				index,
-				score: Number.POSITIVE_INFINITY,
-				load: 0
+				cached: true
 			});
 			candidates.push({
 				machine,
@@ -561,16 +553,13 @@ function pickOffer({ mode, here, offers, target, localEnabled = true, selected =
 		if (cacheOnly) return skip(machine, "artifact-miss", "no matching completed artifact");
 		const problems = offerProblems(offer, target, namedBuildMachine(selected));
 		if (problems.length) return skip(machine, problemCode(problems[0]), problems.map((problem) => problem.reason).join("; "), problems.map((problem) => problem.code));
-		const load = offer.capacity.loadPerCore;
-		if (selected === "auto" && localEnabled && mode === "auto" && !slotsFull) {
-			if (typeof load !== "number") return skip(machine, "load", "capacity unknown (older stim-server) while this machine has a free slot");
-			if (load >= here.loadPerCore) return skip(machine, "load", `no less loaded (load ${load}/core there, ${here.loadPerCore}/core here)`);
-		}
-		const score = Number(offer.warm.dependencies);
+		const { loadPerCore: load, maxLoadPerCore } = offer.capacity;
+		const ceiling = maxLoadPerCore ?? here.maxLoadPerCore;
+		if (typeof load === "number" && !namedBuildMachine(selected) && load >= ceiling) return skip(machine, "load", `saturated: load ${load}/core there, at or above ${ceiling}/core`);
+		if (selected === "auto" && localEnabled && !slotsFull && typeof load !== "number") return skip(machine, "load", "capacity unknown (older stim-server) while this machine has a free slot");
 		ranked.push({
 			index,
-			score,
-			load: typeof load === "number" ? load : Number.POSITIVE_INFINITY
+			cached: false
 		});
 		const notes = toolchainNotes(target, offer.toolchain).map((each) => each.reason);
 		candidates.push({
@@ -579,7 +568,7 @@ function pickOffer({ mode, here, offers, target, localEnabled = true, selected =
 			msg: [typeof load === "number" ? `can take the build (load ${load}/core there)` : "can take the build", ...notes].join("; ")
 		});
 	});
-	ranked.sort((a, b) => b.score - a.score || a.load - b.load);
+	ranked.sort((a, b) => Number(b.cached) - Number(a.cached));
 	return {
 		order: ranked.map((each) => each.index),
 		reasons,
@@ -962,7 +951,7 @@ async function probeMachine(credential, identity, { connectMs = CONNECT_TIMEOUT_
 * Asks every paired machine for an offer in parallel and keeps the connection to the one `pickOffer` chooses, or
 * returns why none takes the build. A named selection probes only its credential and skips auto load gating.
 */
-async function chooseBuildMachine({ projectRoot, target, mode, here, note, machines = pairedMachines(), selected = "auto", onCandidates, artifact, gradleArtifact, reactNativeArtifact, swiftpmArtifact, cacheOnly = false }) {
+async function chooseBuildMachine({ projectRoot, target, here, note, machines = pairedMachines(), selected = "auto", onCandidates, artifact, gradleArtifact, reactNativeArtifact, swiftpmArtifact, cacheOnly = false }) {
 	const started = Date.now();
 	let identity;
 	try {
@@ -1001,9 +990,8 @@ async function chooseBuildMachine({ projectRoot, target, mode, here, note, machi
 		...swiftpmQuery ? { swiftpmArtifact: swiftpmQuery } : {}
 	})));
 	const { order, reasons, candidates } = pickOffer({
-		localEnabled: selected !== "auto" || automaticMachineEnabled("build", "local"),
+		localEnabled: buildPlacementCandidates(selected).localEnabled,
 		selected,
-		mode,
 		here,
 		target,
 		artifact: swiftpmQuery ? "swiftpm" : reactNativeQuery ? `react-native-${reactNativeQuery.platform}` : gradleQuery ? "native-gradle" : artifact,
@@ -1031,13 +1019,12 @@ async function chooseBuildMachine({ projectRoot, target, mode, here, note, machi
 	});
 	return {
 		...first,
-		mode,
+		selected,
 		here,
 		target,
 		offerMs: Date.now() - started,
 		identity,
 		runnersUp: rest,
-		automatic: selected === "auto",
 		cacheOnly,
 		...gradleQuery ? { gradleArtifact: gradleQuery } : {},
 		...reactNativeQuery ? { reactNativeArtifact: reactNativeQuery } : {},
@@ -1383,11 +1370,10 @@ async function offloadBuild(input) {
 			});
 			if ("failure" in probe) return fail(probe.failure);
 			const placement = pickOffer({
-				mode: choice.mode,
 				here: choice.here,
 				target: choice.target,
-				selected: choice.automatic ? "auto" : choice.machine,
-				localEnabled: !choice.automatic || automaticMachineEnabled("build", "local"),
+				selected: choice.selected,
+				localEnabled: buildPlacementCandidates(choice.selected).localEnabled,
 				offers: [{
 					machine: choice.machine,
 					offer: probe.offer
@@ -1463,7 +1449,7 @@ async function offloadBuild(input) {
 			return true;
 		};
 		for (;;) {
-			if (choice.automatic && !automaticMachineEnabled("build", choice.machine)) {
+			if (!namedBuildMachine(choice.selected) && !automaticMachineEnabled("build", choice.machine)) {
 				const reason = `${choice.machine} is disabled in remote.buildPoolDisabled`;
 				if (moveOn(reason)) continue;
 				return fail(reason);
@@ -1498,7 +1484,7 @@ async function offloadBuild(input) {
 			workerStarted = Date.now();
 			early = [];
 			choice.connection.onProgress((event) => job === null ? early.push(event) : handle(event));
-			if (choice.automatic) requireAutomaticMachine("build", choice.machine);
+			if (!namedBuildMachine(choice.selected)) requireAutomaticMachine("build", choice.machine);
 			checkCancelled();
 			const reply = await choice.connection.request("build.start", {
 				repo: identity.repo,

package/dist/collector-run.d.mts

@@ -1,10 +1,6 @@
 import { n as NdjsonWriter, t as Executor } from "./exec-DnYc4HGH.mjs";
 import { ChildProcess } from "node:child_process";
 //#region src/collector/android.d.ts
-declare function androidClockOffset(serial: string, { exec, now }?: {
-  exec?: Executor;
-  now?: () => number;
-}): number | null;
 interface PidResolution {
   ok?: boolean;
   pid?: number;
@@ -13,19 +9,21 @@ interface PidResolution {
 }
 interface PidWatcher {
   stop(): void;
-  probe(): number | null;
+  probe(): Promise<number | null>;
   readonly pid: number | null;
 }
-declare function watchAppPid({ serial, packageName, pid, intervalMs, exec, onChange, resolve, setTimer, clearTimer }: {
+declare function watchAppPid({ serial, packageName, pid, intervalMs, exec, signal, onChange, resolve, setTimer, clearTimer }: {
   serial: string;
   packageName: string;
   pid: number | null;
   intervalMs?: number | null;
   exec?: Executor | null;
+  signal?: AbortSignal;
   onChange: (nextPid: number) => void | Promise<void>;
   resolve?: (serial: string, packageName: string, opts: {
     exec?: Executor | null;
-  }) => number | null;
+    signal?: AbortSignal;
+  }) => number | null | Promise<number | null>;
   setTimer?: (fn: () => void, ms: number) => ReturnType<typeof setTimeout>;
   clearTimer?: (t: ReturnType<typeof setTimeout>) => void;
 }): PidWatcher;
@@ -83,10 +81,13 @@ interface RunCollectorOptions {
   pidTimeoutMs?: number;
   pidOf?: ((serial: string, packageName: string, opts: {
     exec?: Executor | null;
-  }) => number | null) | null;
+  }) => number | null | Promise<number | null>) | null;
   pidWatchMs?: number | null;
   watchPid?: typeof watchAppPid;
-  resolveClockOffset?: typeof androidClockOffset;
+  resolveClockOffset?: (serial: string, opts: {
+    now?: () => number;
+    signal?: AbortSignal;
+  }) => number | null | Promise<number | null>;
   now?: () => number;
   onExit?: (code: number) => void;
   attachSignals?: boolean;

package/dist/collector-run.mjs

@@ -1,12 +1,12 @@
-import { S as process_identity_exports } from "./exec-VFRpu1iA.mjs";
-import { k as workspaceLogsDir } from "./workspace-state-pUg3_RRA.mjs";
-import { V as deviceSlotKey, q as validateDeviceSlot } from "./config-BktkY_zC.mjs";
+import { S as process_identity_exports } from "./exec-aULwtNly.mjs";
+import { k as workspaceLogsDir } from "./workspace-state-BjqdjnJR.mjs";
+import { V as deviceSlotKey, q as validateDeviceSlot } from "./config-Cn94Jc0g.mjs";
 import { t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { c as watchAppPid, i as parseLogcatLine, o as startAndroidLogcat, s as waitForAppPid, t as androidClockOffset } from "./android-B5P81yI-.mjs";
-import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
-import { a as startIosDeviceConsole, i as parseDeviceConsoleLine } from "./ios-device-B6HK951C.mjs";
-import { a as unregisterCollector, i as registerCollector, r as readCollectors, t as collectorProcessTitle } from "./ownership-BjYvMNX_.mjs";
-import { n as parseLogStreamLine, r as startIosLogStream, t as appNameFromBundleId } from "./ios-ENC4sRPA.mjs";
+import { c as watchAppPid, i as parseLogcatLine, o as startAndroidLogcat, s as waitForAppPid, t as androidClockOffset } from "./android-Deb9X3_Y.mjs";
+import { i as createNdjsonWriter } from "./ndjson-Dy2W4vRa.mjs";
+import { a as startIosDeviceConsole, i as parseDeviceConsoleLine } from "./ios-device-CiBA-er9.mjs";
+import { a as unregisterCollector, i as registerCollector, r as readCollectors, t as collectorProcessTitle } from "./ownership-Bx-0cku-.mjs";
+import { n as parseLogStreamLine, r as startIosLogStream, t as appNameFromBundleId } from "./ios-CsRVik64.mjs";
 import { existsSync } from "node:fs";
 import { isAbsolute, join, resolve } from "node:path";
 import { LOG_ROTATE_BYTES } from "@stim-cli/core";
@@ -130,11 +130,13 @@ async function runCollector({ slot = "default", platform, root, udid = null, app
 		return null;
 	}
 	let finished = false;
+	const shutdown = new AbortController();
 	let captured = 0;
 	let watcher = null;
 	const finish = (code, level, msg, event, { signalled = false } = {}) => {
 		if (finished) return;
 		finished = true;
+		shutdown.abort();
 		watcher?.stop();
 		if (physical && captured === 0 && !signalled) writer.write({
 			...attribution,
@@ -187,7 +189,8 @@ async function runCollector({ slot = "default", platform, root, udid = null, app
 		}) : await waitForAppPid({
 			serial,
 			packageName,
-			timeoutMs: pidTimeoutMs
+			timeoutMs: pidTimeoutMs,
+			signal: shutdown.signal
 		});
 		if (!resolved.ok) {
 			finish(1, "error", `device log collector could not attach: ${resolved.reason}`, "collector_failed");
@@ -214,8 +217,11 @@ async function runCollector({ slot = "default", platform, root, udid = null, app
 		})
 	});
 	const parse = platform === "ios" ? physical ? parseDeviceConsoleLine : parseLogStreamLine : parseLogcatLine;
-	const attach = (streamPid) => {
-		const clockOffsetMs = platform === "android" ? resolveClockOffset(serial, { now }) : null;
+	const readClockOffset = async () => platform === "android" ? await resolveClockOffset(serial, {
+		now,
+		signal: shutdown.signal
+	}) : null;
+	const attach = (streamPid, clockOffsetMs) => {
 		if (platform === "android") writer.write({
 			...attribution,
 			src: "device",
@@ -284,17 +290,21 @@ async function runCollector({ slot = "default", platform, root, udid = null, app
 		spawned.on("exit", (code, signal) => {
 			if (spawned !== child) return;
 			flushReaders();
-			const next = platform === "android" ? watcher?.probe() : null;
-			if (next && next !== pid) {
-				reattach(next, "the log stream ended");
-				return;
-			}
-			const how = signal ? `signal ${signal}` : `exit code ${code}`;
-			if (physical && code) {
-				finish(1, "error", `the devicectl console ended with ${how}; treat the run as failed`, "collector_failed");
-				return;
-			}
-			finish(0, "info", `device log stream ended (${how}); the app or device is gone`, "collector_stopped");
+			const settle = (next) => {
+				if (spawned !== child) return;
+				if (next && next !== pid) {
+					reattach(next, "the log stream ended");
+					return;
+				}
+				const how = signal ? `signal ${signal}` : `exit code ${code}`;
+				if (physical && code) {
+					finish(1, "error", `the devicectl console ended with ${how}; treat the run as failed`, "collector_failed");
+					return;
+				}
+				finish(0, "info", `device log stream ended (${how}); the app or device is gone`, "collector_stopped");
+			};
+			if (platform === "android" && watcher) watcher.probe().then(settle);
+			else settle(null);
 		});
 		spawned.on("error", (err) => {
 			if (spawned !== child) return;
@@ -302,12 +312,13 @@ async function runCollector({ slot = "default", platform, root, udid = null, app
 		});
 		return spawned;
 	};
-	const reattach = (nextPid, why = "the app restarted") => {
-		if (finished) return;
+	const reattach = async (nextPid, why = "the app restarted") => {
+		if (finished || nextPid === pid) return;
 		const previous = pid;
 		flushReaders();
 		killChild(child);
 		child = null;
+		pid = nextPid;
 		writer.write({
 			...attribution,
 			src: "device",
@@ -316,15 +327,18 @@ async function runCollector({ slot = "default", platform, root, udid = null, app
 			event: "collector_reattached",
 			msg: `${why}: ${packageName} is now pid ${nextPid} on ${serial} (was ${previous}); reattaching the log stream`
 		});
-		pid = nextPid;
+		const clockOffsetMs = await readClockOffset();
+		if (finished || pid !== nextPid) return;
 		try {
-			child = attach(nextPid);
+			child = attach(nextPid, clockOffsetMs);
 		} catch (err) {
 			finish(1, "error", `device log collector could not reattach to pid ${nextPid}: ${describe(err)}`, "collector_failed");
 		}
 	};
+	const initialClockOffsetMs = await readClockOffset();
+	if (finished) return null;
 	try {
-		child = attach(pid);
+		child = attach(pid, initialClockOffsetMs);
 	} catch (err) {
 		finish(1, "error", `device log collector could not start: ${describe(err)}`, "collector_failed");
 		return null;
@@ -334,6 +348,7 @@ async function runCollector({ slot = "default", platform, root, udid = null, app
 		packageName,
 		pid,
 		intervalMs: pidWatchMs,
+		signal: shutdown.signal,
 		resolve: pidOf || void 0,
 		onChange: (nextPid) => reattach(nextPid)
 	});

package/dist/{command-output-BF5AR2dL.mjs → command-output-Dj-WT4BP.mjs}

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

package/dist/{config-BktkY_zC.mjs → config-Cn94Jc0g.mjs}

@@ -1,8 +1,8 @@
-import { C as reportSignal, D as ownership_claim_exports, S as process_identity_exports, T as trackReportResource, l as WorkspaceProcessCleanupError, t as getExecutor } from "./exec-VFRpu1iA.mjs";
-import { t as runOperationFile } from "./operation-exec-CUZifp6Z.mjs";
+import { C as reportSignal, D as ownership_claim_exports, S as process_identity_exports, T as trackReportResource, l as WorkspaceProcessCleanupError, t as getExecutor } from "./exec-aULwtNly.mjs";
+import { t as runOperationFile } from "./operation-exec-Dp4FuIGR.mjs";
 import { join } from "node:path";
 import { ambientEnv, configDir, ensurePrivateDir } from "@stim-cli/core";
-import { allMetroPorts, cannotHost, clientIdentity, configCorruptRepair, endpoint, findEnclosingWorktreeRoot, findPeer as findPeer$1, getConcurrencyLimits, getConfigPath, getConfigPath as getConfigPath$1, getProject, getProjectSettings, getRepoSettings, isJsonObject, isPathPrefix, loadConfig, loadConfig as loadConfig$1, machineEndpoint, parseMachine, parseMachine as parseMachine$1, validateAutomaticPool, withConfigLock, withConfigLock as withConfigLock$1, withConfigLockAsync, withConfigLockAsync as withConfigLockAsync$1 } from "@stim-cli/core/state";
+import { allMetroPorts, cannotHost, clientIdentity, configCorruptRepair, endpoint, endpoint as endpoint$1, findEnclosingWorktreeRoot, findPeer, findPeer as findPeer$1, getConcurrencyLimits, getConfigPath, getConfigPath as getConfigPath$1, getProject, getProjectSettings, getRepoSettings, isJsonObject, isPathPrefix as isPathPrefix$1, loadConfig, loadConfig as loadConfig$1, machineEndpoint, parseMachine, parseMachine as parseMachine$1, validateAutomaticPool, withConfigLock, withConfigLock as withConfigLock$1, withConfigLockAsync, withConfigLockAsync as withConfigLockAsync$1 } from "@stim-cli/core/state";
 import { dirname as dirname$1, isAbsolute as isAbsolute$1, join as join$1, normalize, parse, sep as sep$1 } from "path";
 import { request } from "node:https";
 import { WebSocket } from "ws";
@@ -548,6 +548,25 @@ async function diagnoseOutcome(io, input) {
 		pinged
 	});
 }
+/**
+* The diagnosis `stim doctor` gives for a machine that resolved to a tailnet peer but did not connect, without
+* doctor's `tailscale ping`: the connection has already waited out its timeout. Reads `tailscale status` only here,
+* after the failure. Null when Tailscale no longer lists the machine.
+*/
+async function diagnoseConnectFailure(machine, failure, signal) {
+	const parsed = parseMachine(machine);
+	if (!parsed) return null;
+	const peer = findPeer(await tailscaleStatusAsync(signal), parsed.name);
+	if (typeof peer === "string") return null;
+	return diagnoseOutcome({ startup: peerStartup }, {
+		entry: machine,
+		peer,
+		port: parsed.port,
+		target: endpoint(peer, parsed.port),
+		reason: failure.failure,
+		...failure.transport ? { transport: failure.transport } : {}
+	});
+}
 /** Why `status` is null, as a diagnosis of the Tailscale layer; falls back to the daemon being unavailable. */
 async function diagnoseTailscale(io) {
 	const reading = readTailscale(io.rawStatus ? await io.rawStatus() : null);
@@ -1258,4 +1277,4 @@ function allConsolePortsAndSerials({ isMounted = isOnMountedVolume } = {}) {
 	return result;
 }
 //#endregion
-export { findPeer$1 as $, writeConfigSettingAsync as A, deviceSlotFileKey as B, saveConfig as C, withConfigLock$1 as D, upsertProject as E, isOnMountedVolume as F, projectDeviceSlots as G, deviceSlotPlatforms as H, listMountedVolumes as I, SERVER_OUTDATED as J, removeSlotDevice as K, measuredDirectorySizeAsync as L, directorySize as M, directorySizeAsync as N, withConfigLockAsync$1 as O, formatBytes as P, endpoint as Q, volumeRootFor as R, removeProject as S, setSupervisor as T, parseDeviceSlotKey as U, deviceSlotKey as V, parseDeviceSlotOption as W, diagnoseTailscale as X, diagnoseOutcome as Y, doctorIo as Z, loadConfig$1 as _, clearDevice as a, resolveEndpoint as at, releaseAndroidConsolePort as b, ensureConfig as c, tailscaleStatusAsync as ct, getConfigDir as d, readHostPermissions as dt, openAuthenticated as et, getConfigPath$1 as f, isPathPrefix as g, getRepoSettings as h, clearAndroidBootPending as i, realIo as it, acquireAvdClaim as j, writeConfigSetting as k, findEnclosingWorktreeRoot as l, diagnosisFinding as lt, getProjectSettings as m, allMetroPorts as n, parseMachine$1 as nt, clearSupervisor as o, sayHello as ot, getProject as p, validateDeviceSlot as q, claimMetroPort as r, reachMachine as rt, configCorruptRepair as s, setupRemedy as st, allConsolePortsAndSerials as t, outdatedServer as tt, getConcurrencyLimits as u, notOnTailnetDiagnosis as ut, recordIosSchemeApprovals as v, setDevice as w, releaseMetroPort as x, refuseRelativeStimPaths as y, assignSlotDevice as z };
+export { endpoint$1 as $, writeConfigSettingAsync as A, deviceSlotFileKey as B, saveConfig as C, withConfigLock$1 as D, upsertProject as E, isOnMountedVolume as F, projectDeviceSlots as G, deviceSlotPlatforms as H, listMountedVolumes as I, SERVER_OUTDATED as J, removeSlotDevice as K, measuredDirectorySizeAsync as L, directorySize as M, directorySizeAsync as N, withConfigLockAsync$1 as O, formatBytes as P, doctorIo as Q, volumeRootFor as R, removeProject as S, setSupervisor as T, parseDeviceSlotKey as U, deviceSlotKey as V, parseDeviceSlotOption as W, diagnoseOutcome as X, diagnoseConnectFailure as Y, diagnoseTailscale as Z, loadConfig$1 as _, clearDevice as a, realIo as at, releaseAndroidConsolePort as b, ensureConfig as c, setupRemedy as ct, getConfigDir as d, notOnTailnetDiagnosis as dt, findPeer$1 as et, getConfigPath$1 as f, readHostPermissions as ft, isPathPrefix$1 as g, getRepoSettings as h, clearAndroidBootPending as i, reachMachine as it, acquireAvdClaim as j, writeConfigSetting as k, findEnclosingWorktreeRoot as l, tailscaleStatusAsync as lt, getProjectSettings as m, allMetroPorts as n, outdatedServer as nt, clearSupervisor as o, resolveEndpoint as ot, getProject as p, validateDeviceSlot as q, claimMetroPort as r, parseMachine$1 as rt, configCorruptRepair as s, sayHello as st, allConsolePortsAndSerials as t, openAuthenticated as tt, getConcurrencyLimits as u, diagnosisFinding as ut, recordIosSchemeApprovals as v, setDevice as w, releaseMetroPort as x, refuseRelativeStimPaths as y, assignSlotDevice as z };