stim 1.20.2 → 1.22.0

package/dist/{doctor-CB8oZKCk.mjs → doctor-D5_EzwfA.mjs}

@@ -1,22 +1,24 @@
-import { _ as loadConfig$1, p as getProject } from "./config-BYDxlMY3.mjs";
-import { Dt as repoRoot, I as projectSettingsContext } from "./settings-B717odTD.mjs";
-import { f as refuseNoProject, l as phaseLine } from "./command-output-BTy8hZ0F.mjs";
-import { d as projectRegistry } from "./project-_phNIJfs.mjs";
-import { J as inspectWatchmanMemory, Q as memorySweepIsScoped, a as inspectBudget, n as budgetLine } from "./budget-f7516Zk0.mjs";
-import { C as inspectDeviceHostMachines, b as inspectBuildMachines, d as simulatorRuntime, s as offloadCheck } from "./client-qQAaXSUs.mjs";
-import { I as memoryCulpritFindings, L as readMemoryCulprits, h as listIosRuntimesAsync, l as iosRuntimeMatches, x as pickDefaultIosCreation } from "./ios-RkW4pnQf.mjs";
-import { T as detectXcodeMajor } from "./toolchain-DxSsNssu.mjs";
-import { o as compareStimVersions, s as inspectStimVersions } from "./eas-session-ledger-Cm0Gwq2F.mjs";
-import { h as resolveDeviceType, v as resolveRuntime } from "./support-CwjbFs9H.mjs";
-import { r as maintenanceStatus, t as maintenanceLine } from "./status-BTA7kKiQ.mjs";
-import { a as writeIgnoreDirs, i as watchedCheckouts, n as inspectNestedWorktrees, r as nestedWorktreeFinding, s as recordDoctorRun } from "./doctor-watchman-BRyV2adA.mjs";
-import { i as runDoctor, o as readMachineSettings } from "./doctor-kfMBnUw6.mjs";
-import { dirname, join, sep } from "path";
+import { Y as doctorIo, _ as loadConfig$1, p as getProject } from "./config-DlrsduwG.mjs";
+import { f as refuseNoProject, l as phaseLine } from "./command-output-gwpm28fu.mjs";
+import { L as projectSettingsContextAsync, Mt as repoRoot } from "./settings-C7O8A6ZI.mjs";
+import { f as projectRegistry, t as NO_PROJECT_REFUSAL } from "./project-wM_XFTvE.mjs";
+import { c as inspectStimVersions, s as compareStimVersions } from "./eas-session-ledger-DlY_serQ.mjs";
+import { a as inspectBudget, cr as inspectWatchmanMemory, fr as memorySweepIsScoped, n as budgetLine } from "./budget-Cvwn54qV.mjs";
+import { L as memoryCulpritFindings, R as readMemoryCulpritsAsync, f as listAllIosSimsAsync, h as listIosRuntimesAsync, l as iosRuntimeMatches, x as pickDefaultIosCreation } from "./ios-hcBpnEGk.mjs";
+import { c as detectXcodeMajorAsync } from "./xcode-BXn9-xYx.mjs";
+import { s as offloadCheck } from "./client-OyRoEuSr.mjs";
+import { c as inspectBuildMachines, f as inspectDeviceHostMachines } from "./selection-DSMbWEX2.mjs";
+import { r as maintenanceStatus, t as maintenanceLine } from "./status-BRROykC8.mjs";
+import { a as writeIgnoreDirs, c as recordDoctorRun, i as watchedCheckouts, n as inspectNestedWorktrees, r as nestedWorktreeFinding } from "./doctor-watchman-N2wDotwQ.mjs";
+import { c as checkWorktreeStorageLayout, l as readMachineSettings, o as runDoctor } from "./doctor-Bo7BXLux.mjs";
+import { h as resolveDeviceType, v as resolveRuntime } from "./support-CNioewsd.mjs";
 import { isJsonObject, maintenanceNdjsonFile, readHostedAppMetadata, readHostedSessions } from "@stim-cli/core/state";
+import { dirname, join, sep } from "path";
+import chalk from "chalk";
 import { mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "fs";
-import { homedir } from "os";
 import { InvalidArgumentError } from "commander";
-import chalk from "chalk";
+import { homedir } from "os";
+import { discoverToolchain, projectNodeBin, projectNodePin } from "@stim-cli/core/toolchain";
 //#region src/diagnostics/sandbox.ts
 /**
 * What a sandboxed harness has to permit for Stim to work: its state
@@ -252,7 +254,7 @@ function runningHostedApps() {
 		return 0;
 	}
 }
-/** Notes installed hosted apps on this Mac while `hosting.agentDriver` starts no driver. */
+/** Notes installed hosted apps on this machine while `hosting.agentDriver` starts no driver. */
 function inspectHostedAgentDriver() {
 	const hosting = loadConfig$1()?.hosting;
 	return hostedAgentDriverFinding(isJsonObject(hosting) ? hosting.agentDriver : void 0, runningHostedApps());
@@ -274,7 +276,7 @@ async function iosTargetRuntime(root, settings) {
 		const runtime = resolveRuntime(null, settings);
 		if (runtime) return runtimes.find((each) => iosRuntimeMatches(each, runtime))?.identifier ?? null;
 		const udid = getProject(root)?.platforms?.ios?.deviceUdid;
-		const own = typeof udid === "string" ? simulatorRuntime(udid) : null;
+		const own = typeof udid === "string" ? (await listAllIosSimsAsync()).find((device) => device.udid === udid)?.runtime : null;
 		if (own) return own;
 		const deviceType = resolveDeviceType(null, settings) ?? void 0;
 		return pickDefaultIosCreation([], runtimes, { deviceType })?.runtimeId ?? null;
@@ -302,16 +304,49 @@ function stimVersionLines(report) {
 		phaseLine("installs", paths + versions)
 	];
 }
+const OVERRIDES = {
+	node: "put another node first on PATH",
+	JAVA_HOME: "set JAVA_HOME",
+	ANDROID_HOME: "set ANDROID_HOME"
+};
+function toolchainReport(root, env = process.env) {
+	const { entries } = discoverToolchain(env);
+	const pin = projectNodePin(root);
+	const pinned = pin ? projectNodeBin(root, env) : null;
+	return {
+		entries,
+		projectNode: pin ? {
+			pin: pin.file,
+			spec: pin.spec,
+			bin: pinned?.bin ?? null,
+			version: pinned?.version ?? null
+		} : null
+	};
+}
+function toolchainLine(entry) {
+	const where = entry.source === "environment" ? "from the environment" : entry.source === "discovered" ? `found from ${entry.from ?? "a standard location"}` : "not found";
+	const override = OVERRIDES[entry.name] ? `; ${OVERRIDES[entry.name]} to override` : "";
+	return phaseLine(entry.name, `${entry.value ?? "unset"} (${where}${override})`);
+}
+function toolchainLines(report) {
+	const project = report.projectNode;
+	return [...report.entries.map(toolchainLine), ...project ? [phaseLine("project node", project.bin ? `${project.version} at ${project.bin}, which ${project.pin} pins (${project.spec}); Metro runs on it when the node on PATH does not satisfy the pin` : `${project.pin} pins ${project.spec}, which no nvm, fnm, Volta, asdf or mise install provides; Metro runs on the node on PATH`)] : []];
+}
 function budgetLines(budget) {
 	return budget ? [phaseLine("budget", budgetLine(budget))] : [];
 }
-function doctorSuccessLines(platform, stim, budget = null, projectLines = []) {
+function doctorSuccessLines(platform, stim, budget = null, projectLines = [], toolchain = []) {
 	return [
 		`Doctor (${doctorTarget(platform)})`,
 		phaseLine("result", "PASS"),
 		phaseLine("findings", "0"),
 		...stimVersionLines(stim),
 		...budgetLines(budget),
+		...toolchain.length ? [
+			"",
+			"Toolchain",
+			...toolchain
+		] : [],
 		"",
 		"Shared",
 		phaseLine("settings", "every Stim setting type, machine config paths, companions and inert keys"),
@@ -367,18 +402,133 @@ function applySandboxFix(root, env = process.env) {
 	console.error(chalk.green(`${result.status === "created" ? "Wrote" : "Updated"} ${target}`));
 	console.error(chalk.dim("Added writes to Stim's state directory, the simulator XPC service, and local port binding. Claude Code reads project settings from the directory a session starts in, so this file only counts for sessions rooted there. Restart the session for it to take effect."));
 }
+async function prepareDoctor(root, platform, registry, operation) {
+	const settingsContext = await projectSettingsContextAsync(root, void 0, {
+		env: operation?.env ?? process.env,
+		signal: operation?.signal
+	});
+	const machineSettings = readMachineSettings(settingsContext);
+	const settings = machineSettings.corrupt ? null : machineSettings.settings;
+	const selected = registry.selectDoctor(root, platform);
+	return {
+		settingsContext,
+		machineSettings,
+		settings,
+		selected,
+		doctors: await selected.load()
+	};
+}
+async function readDoctorReport(operation, platform, version, requestAccess = false) {
+	const found = projectRegistry.findProjectRoot(operation.projectRoot);
+	if (!found) throw Object.assign(new Error(NO_PROJECT_REFUSAL.message), NO_PROJECT_REFUSAL);
+	const root = found;
+	const prepared = await prepareDoctor(root, platform, projectRegistry, operation);
+	return assembleDoctorReport(root, {
+		platform,
+		fix: requestAccess
+	}, version, prepared, (runningVersion) => inspectStimVersions(runningVersion, {
+		operation,
+		cwd: root,
+		env: operation.env,
+		runningPath: ""
+	}), process.platform, operation);
+}
+async function assembleDoctorReport(root, opts, version, prepared, inspectVersions, host, operation) {
+	const { settingsContext, machineSettings, settings, selected, doctors } = prepared;
+	const env = operation?.env ?? process.env;
+	const io = doctorIo(operation);
+	const stim = await inspectVersions(version);
+	const { findings, context } = await runDoctor(root, {
+		xcodeMajor: selected.platforms.includes("ios") && host === "darwin" ? await detectXcodeMajorAsync() : null,
+		platform: opts.platform,
+		platforms: selected.platforms,
+		host,
+		machineSettings,
+		repoRoot: settingsContext.repoRoot,
+		remoteEnv: env,
+		operation,
+		tailnetStatus: io.status
+	}, doctors.map((doctor) => doctor.inspect));
+	findings.unshift(...await checkWorktreeStorageLayout(context));
+	if (selected.problem) findings.unshift({
+		level: "cost",
+		...selected.problem.kind === "not-an-app" ? { code: "not-an-app" } : {},
+		title: selected.problem.kind === "unreadable" ? "The project could not be read" : "This directory has no supported app for this operation",
+		detail: selected.problem.message,
+		fix: selected.problem.remedy
+	});
+	for (const doctor of doctors) if (doctor.inspectAsync) findings.push(...await doctor.inspectAsync(context));
+	if (detectHarness(env)) {
+		const sandbox = sandboxFinding(settingsContext.repoRoot ?? root, {
+			env,
+			home: env.HOME ?? env.USERPROFILE,
+			stimHome: operation?.home ?? env.STIM_HOME
+		});
+		if (sandbox) findings.push(sandbox);
+	}
+	const shadowed = shadowedStimFinding(stim);
+	if (shadowed) findings.push(shadowed);
+	const budget = await inspectBudget(root, void 0, env, operation);
+	findings.push(...budget.findings);
+	const watchmanMemory = withoutUnhandledRejection(inspectWatchmanMemory(env, operation));
+	const tickets = /* @__PURE__ */ new Map();
+	const deviceHosts = withoutUnhandledRejection(inspectDeviceHostMachines({
+		fix: opts.fix === true,
+		version,
+		tickets,
+		operation
+	}, io));
+	const nestedWorktrees = await inspectNestedWorktrees(root);
+	const watched = withoutUnhandledRejection(watchedCheckouts(nestedWorktrees.map((entry) => entry.checkout)));
+	const targetInspectors = doctors.flatMap((doctor) => {
+		const inspect = doctor.offloadTargets?.(context, () => iosTargetRuntime(root, settings));
+		return inspect ? [inspect] : [];
+	});
+	const remoteMachinesInspection = withoutUnhandledRejection(inspectBuildMachines({
+		fix: opts.fix === true,
+		version,
+		tickets,
+		operation,
+		check: targetInspectors.length ? offloadCheck(root, async () => (await Promise.all(targetInspectors.map((inspect) => inspect()))).flat()) : null
+	}, io));
+	const watchman = await watchmanMemory;
+	if (watchman) findings.push(watchman);
+	if (!memorySweepIsScoped(env)) findings.push(...memoryCulpritFindings(await readMemoryCulpritsAsync()));
+	const watchedRoots = await watched;
+	for (const entry of nestedWorktrees) findings.push(nestedWorktreeFinding(entry, watchedRoots.has(entry.checkout)));
+	const remoteMachines = await remoteMachinesInspection;
+	findings.push(...remoteMachines.findings);
+	const deviceHostMachines = await deviceHosts;
+	const reported = new Set(remoteMachines.findings.map((each) => each.title));
+	findings.push(...deviceHostMachines.findings.filter((each) => !reported.has(each.title)));
+	const agentDriver = inspectHostedAgentDriver();
+	if (agentDriver) findings.push(agentDriver);
+	const toolchain = host === "darwin" ? toolchainReport(root, env) : null;
+	const maintenance = maintenanceStatus(env);
+	return {
+		project: root,
+		platform: opts.platform ?? null,
+		stim,
+		budget: budget.report,
+		maintenance: {
+			...maintenance,
+			logPath: maintenanceNdjsonFile()
+		},
+		remoteMachines: remoteMachines.machines,
+		deviceHosts: deviceHostMachines.machines,
+		toolchain,
+		findings
+	};
+}
 function doctorCommand(program, version, inspectVersions = inspectStimVersions, host = process.platform, registry = projectRegistry) {
-	program.command("doctor").description("Inspect the source checkout and report project state that can make native worktrees slow or invalid. The checkout is left untouched unless --fix is passed; --platform filters native findings. Each run in a supported native app is recorded in Stim state so guide can say when doctor is due.").option("--json", "print the findings as JSON").option("--platform <platform>", "report shared findings plus only this native platform: ios or android", parseDoctorPlatform).option("--fix", "repair the sandbox allowance when the report names it, and stale Android .cxx configurations in a React Native or Expo checkout; add linked worktrees nested in a checkout to its .watchmanconfig ignore_dirs; ask each remote Mac in remote.machines for build and device-host approval. Stop native builds first. Generated CMake output must be ignored and untracked; custom launcher settings and source files are preserved.").action(async (opts) => {
+	program.command("doctor").description("Inspect the source checkout and report project state that can make native worktrees slow or invalid. The checkout is left untouched unless --fix is passed; --platform filters native findings. Each run in a supported native app is recorded in Stim state so guide can say when doctor is due.").option("--json", "print the findings as JSON").option("--platform <platform>", "report shared findings plus only this native platform: ios or android", parseDoctorPlatform).option("--fix", "repair the sandbox allowance when the report names it, and stale Android .cxx configurations in a React Native or Expo checkout; add linked worktrees nested in a checkout to its .watchmanconfig ignore_dirs; ask each remote machine in remote.machines for build and device-host approval. Stop native builds first. Generated CMake output must be ignored and untracked; custom launcher settings and source files are preserved.").action(async (opts) => {
 		const root = registry.findProjectRoot(process.cwd());
 		if (!root) {
 			refuseNoProject({ json: Boolean(opts.json) });
 			return;
 		}
-		const settingsContext = projectSettingsContext(root);
-		const machineSettings = readMachineSettings(settingsContext);
-		const settings = machineSettings.corrupt ? null : machineSettings.settings;
-		const selected = registry.selectDoctor(root, opts.platform);
-		const doctors = await selected.load();
+		const prepared = await prepareDoctor(root, opts.platform, registry);
+		const { settingsContext, settings, selected, doctors } = prepared;
 		if (opts.fix) {
 			if (sandboxFinding(repoRoot(root) ?? root)) applySandboxFix(root);
 			for (const doctor of doctors) {
@@ -393,7 +543,7 @@ function doctorCommand(program, version, inspectVersions = inspectStimVersions,
 					process.exitCode = 1;
 				}
 			}
-			const nestedToFix = inspectNestedWorktrees(root);
+			const nestedToFix = await inspectNestedWorktrees(root);
 			const watchedToFix = await watchedCheckouts(nestedToFix.map((entry) => entry.checkout));
 			for (const entry of nestedToFix) {
 				let result;
@@ -414,80 +564,21 @@ function doctorCommand(program, version, inspectVersions = inspectStimVersions,
 				}
 			}
 		}
-		const stim = await inspectVersions(version);
-		const { findings, context } = runDoctor(root, {
-			xcodeMajor: selected.platforms.includes("ios") && host === "darwin" ? detectXcodeMajor() : null,
-			platform: opts.platform,
-			platforms: selected.platforms,
-			host,
-			machineSettings,
-			repoRoot: settingsContext.repoRoot
-		}, doctors.map((doctor) => doctor.inspect));
-		if (selected.problem) findings.unshift({
-			level: "cost",
-			...selected.problem.kind === "not-an-app" ? { code: "not-an-app" } : {},
-			title: selected.problem.kind === "unreadable" ? "The project could not be read" : "This directory has no supported app for this operation",
-			detail: selected.problem.message,
-			fix: selected.problem.remedy
-		});
-		for (const doctor of doctors) if (doctor.inspectAsync) findings.push(...await doctor.inspectAsync(context));
-		if (detectHarness()) {
-			const sandbox = sandboxFinding(repoRoot(root) ?? root);
-			if (sandbox) findings.push(sandbox);
-		}
-		const shadowed = shadowedStimFinding(stim);
-		if (shadowed) findings.push(shadowed);
-		const budget = await inspectBudget(root);
-		findings.push(...budget.findings);
-		const watchmanMemory = withoutUnhandledRejection(inspectWatchmanMemory());
-		const deviceHosts = withoutUnhandledRejection(inspectDeviceHostMachines({ fix: opts.fix === true }));
-		const nestedWorktrees = inspectNestedWorktrees(root);
-		const watched = withoutUnhandledRejection(watchedCheckouts(nestedWorktrees.map((entry) => entry.checkout)));
-		const targetInspectors = doctors.flatMap((doctor) => {
-			const inspect = doctor.offloadTargets?.(context, () => iosTargetRuntime(root, settings));
-			return inspect ? [inspect] : [];
-		});
-		const remoteMachinesInspection = withoutUnhandledRejection(inspectBuildMachines({
-			fix: opts.fix === true,
-			check: targetInspectors.length ? offloadCheck(root, async () => (await Promise.all(targetInspectors.map((inspect) => inspect()))).flat()) : null
-		}));
-		const watchman = await watchmanMemory;
-		if (watchman) findings.push(watchman);
-		if (!memorySweepIsScoped()) findings.push(...memoryCulpritFindings(readMemoryCulprits()));
-		const watchedRoots = await watched;
-		for (const entry of nestedWorktrees) findings.push(nestedWorktreeFinding(entry, watchedRoots.has(entry.checkout)));
-		const remoteMachines = await remoteMachinesInspection;
-		findings.push(...remoteMachines.findings);
-		const deviceHostMachines = await deviceHosts;
-		const reported = new Set(remoteMachines.findings.map((each) => each.title));
-		findings.push(...deviceHostMachines.findings.filter((each) => !reported.has(each.title)));
-		const agentDriver = inspectHostedAgentDriver();
-		if (agentDriver) findings.push(agentDriver);
-		const maintenance = maintenanceStatus();
+		const report = await assembleDoctorReport(root, opts, version, prepared, inspectVersions, host);
+		const { findings, stim, toolchain, maintenance } = report;
+		const budget = { report: report.budget };
 		const maintenanceLines = [
 			phaseLine("maintenance.mode", maintenance.mode),
 			phaseLine("maintenance log", maintenanceNdjsonFile()),
 			phaseLine("last pass", maintenanceLine(maintenance, false) ?? "no pass has run yet")
 		];
 		if (opts.json) {
-			console.log(JSON.stringify({
-				project: root,
-				platform: opts.platform ?? null,
-				stim,
-				budget: budget.report,
-				maintenance: {
-					...maintenance,
-					logPath: maintenanceNdjsonFile()
-				},
-				remoteMachines: remoteMachines.machines,
-				deviceHosts: deviceHostMachines.machines,
-				findings
-			}));
+			console.log(JSON.stringify(report));
 			recordDoctorRun(root, opts.platform, version, void 0, selected.platforms);
 			return;
 		}
 		if (findings.length === 0) {
-			const lines = [...doctorSuccessLines(opts.platform, stim, budget.report, doctors.flatMap((doctor) => doctor.successLines?.(opts.platform) ?? [])), ...maintenanceLines];
+			const lines = [...doctorSuccessLines(opts.platform, stim, budget.report, doctors.flatMap((doctor) => doctor.successLines?.(opts.platform) ?? []), toolchain ? toolchainLines(toolchain) : []), ...maintenanceLines];
 			for (const [index, line] of lines.entries()) if (index === 1) console.log(chalk.green(line));
 			else if (line && !line.startsWith("  ")) console.log(chalk.bold(line));
 			else console.log(chalk.dim(line));
@@ -501,6 +592,10 @@ function doctorCommand(program, version, inspectVersions = inspectStimVersions,
 			...budgetLines(budget.report),
 			...maintenanceLines
 		]) console.log(chalk.dim(line));
+		if (toolchain) {
+			console.log(chalk.bold("\nToolchain"));
+			for (const line of toolchainLines(toolchain)) console.log(chalk.dim(line));
+		}
 		for (const f of ordered) {
 			const tag = f.level === "cost" ? chalk.yellow("costs time") : chalk.dim("note");
 			console.log(`\n${tag}  ${chalk.bold(f.title)}`);
@@ -512,4 +607,4 @@ function doctorCommand(program, version, inspectVersions = inspectStimVersions,
 	});
 }
 //#endregion
-export { applySandboxFix, doctorCommand as default, doctorSuccessLines, parseDoctorPlatform, shadowedStimFinding };
+export { readDoctorReport as a, parseDoctorPlatform as i, doctorCommand as n, shadowedStimFinding as o, doctorSuccessLines as r, toolchainReport as s, applySandboxFix as t };

package/dist/doctor-fingerprint-DZLoYFVb.mjs

@@ -0,0 +1,16 @@
+import { t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { fileURLToPath } from "node:url";
+//#region src/doctor-fingerprint.ts
+async function readDoctorFingerprint(operation, request) {
+	const output = await getExecutor().runFileAsync(process.execPath, [fileURLToPath(new URL("../dist/doctor-fingerprint.mjs", import.meta.url))], {
+		cwd: operation.cwd,
+		env: Object.fromEntries(Object.entries(operation.env).filter((entry) => entry[1] !== void 0)),
+		input: JSON.stringify(request),
+		timeoutMs: 6e4,
+		killSignal: "SIGKILL",
+		signal: operation.signal
+	});
+	return JSON.parse(output);
+}
+//#endregion
+export { readDoctorFingerprint as t };

package/dist/doctor-fingerprint.mjs

@@ -0,0 +1,19 @@
+import { l as fingerprintProject } from "./build-cache-Dv7RN200.mjs";
+import * as fingerprint from "@expo/fingerprint";
+//#region bin/doctor-fingerprint.ts
+let input = "";
+for await (const chunk of process.stdin) input += String(chunk);
+const { root, cold, ...options } = JSON.parse(input);
+let result = null;
+try {
+	result = await fingerprintProject(root, {
+		...options,
+		...cold ? { createFingerprint: (projectRoot, requestOptions) => fingerprint.createFingerprintAsync(projectRoot, {
+			...requestOptions,
+			useRNCoreAutolinkingFromExpo: true
+		}) } : {}
+	});
+} catch {}
+process.stdout.write(JSON.stringify(result));
+//#endregion
+export {};

package/dist/doctor-thjWAV0z.mjs

@@ -0,0 +1,2 @@
+import { a as readDoctorReport, i as parseDoctorPlatform, n as doctorCommand, o as shadowedStimFinding, r as doctorSuccessLines, s as toolchainReport, t as applySandboxFix } from "./doctor-D5_EzwfA.mjs";
+export { applySandboxFix, doctorCommand as default, doctorSuccessLines, parseDoctorPlatform, readDoctorReport, shadowedStimFinding, toolchainReport };

package/dist/{doctor-watchman-BRyV2adA.mjs → doctor-watchman-N2wDotwQ.mjs}

@@ -1,9 +1,8 @@
-import { E as upsertProject, d as getConfigDir, p as getProject } from "./config-BYDxlMY3.mjs";
-import { r as gitQuiet } from "./git-DDfFzkMm.mjs";
-import { Dt as repoRoot, St as listWorktrees } from "./settings-B717odTD.mjs";
-import { d as projectRegistry } from "./project-_phNIJfs.mjs";
-import { o as runWatchman, r as parseWatchRoots } from "./watchman-CPQFZLXY.mjs";
-import { o as compareStimVersions } from "./eas-session-ledger-Cm0Gwq2F.mjs";
+import { E as upsertProject, O as withConfigLockAsync$1, d as getConfigDir, p as getProject } from "./config-DlrsduwG.mjs";
+import { l as gitQuietAsync } from "./operation-exec-BW0em61G.mjs";
+import { Et as listWorktreesAsync, Nt as repoRootAsync } from "./settings-C7O8A6ZI.mjs";
+import { f as projectRegistry } from "./project-wM_XFTvE.mjs";
+import { d as parseWatchRoots, m as runWatchman, s as compareStimVersions } from "./eas-session-ledger-DlY_serQ.mjs";
 import { mkdirSync, readFileSync, realpathSync, renameSync, rmSync, unlinkSync, writeFileSync } from "node:fs";
 import { dirname, isAbsolute, join, relative, sep } from "node:path";
 import { isJsonObject } from "@stim-cli/core/state";
@@ -13,6 +12,7 @@ const DOCTOR_STALE_MS = 7 * DAY_MS;
 const UPDATE_CHECK_INTERVAL_MS = DAY_MS;
 const UPDATE_CHECK_TIMEOUT_MS = 2e3;
 const LATEST_URL = "https://registry.npmjs.org/stim/latest";
+/** Records CLI history best-effort; storage failures do not fail the CLI report. */
 function recordDoctorRun(projectRoot, platform, version, now = /* @__PURE__ */ new Date(), platforms) {
 	const run = {
 		at: now.toISOString(),
@@ -21,13 +21,28 @@ function recordDoctorRun(projectRoot, platform, version, now = /* @__PURE__ */ n
 	try {
 		const targets = platforms ?? projectRegistry.selectDoctor(projectRoot, platform).platforms;
 		if (targets.length === 0) return;
-		upsertProject(projectRoot, (existing) => {
-			const doctorRuns = { ...existing.doctorRuns };
-			for (const target of targets) doctorRuns[target] = run;
-			return { doctorRuns };
-		});
+		writeDoctorRun(projectRoot, targets, run);
 	} catch {}
 }
+/** Records a completed check, rejecting unavailable state and honoring cancellation while waiting for its lock. */
+async function recordDoctorCheck(projectRoot, platform, version, signal) {
+	signal.throwIfAborted();
+	const targets = projectRegistry.selectDoctor(projectRoot, platform).platforms;
+	if (targets.length === 0) return;
+	await withConfigLockAsync$1(() => {
+		writeDoctorRun(projectRoot, targets, {
+			at: (/* @__PURE__ */ new Date()).toISOString(),
+			version
+		});
+	}, signal);
+}
+function writeDoctorRun(projectRoot, targets, run) {
+	upsertProject(projectRoot, (existing) => {
+		const doctorRuns = { ...existing.doctorRuns };
+		for (const target of targets) doctorRuns[target] = run;
+		return { doctorRuns };
+	});
+}
 function doctorDueReason(record, running, now) {
 	const at = record ? Date.parse(record.at) : NaN;
 	if (!record || Number.isNaN(at)) return "never run";
@@ -194,24 +209,28 @@ function canonical(path) {
 		return null;
 	}
 }
-function inspectNestedWorktrees(projectRoot) {
-	const worktrees = listWorktrees(repoRoot(projectRoot) ?? projectRoot).filter((entry) => !entry.prunable && !entry.bare).flatMap((entry) => canonical(entry.path) ?? []);
-	return worktrees.flatMap((checkout) => {
+async function inspectNestedWorktrees(projectRoot) {
+	const worktrees = (await listWorktreesAsync(await repoRootAsync(projectRoot) ?? projectRoot)).filter((entry) => !entry.prunable && !entry.bare).flatMap((entry) => canonical(entry.path) ?? []);
+	const entries = [];
+	for (const checkout of worktrees) {
 		const configPath = join(checkout, ".watchmanconfig");
 		const config = readWatchmanConfig(configPath);
-		const { nested, add } = nestedWorktreeIgnores(checkout, worktrees, ignoreDirsOf(config), (dir) => Boolean(gitQuiet(checkout, [
+		let { nested, add } = nestedWorktreeIgnores(checkout, worktrees, ignoreDirsOf(config), () => false);
+		const [parent] = add;
+		if (parent && add.length === 1 && parent !== nested[0] && Boolean(await gitQuietAsync(checkout, [
 			"ls-files",
 			"--",
-			dir
-		]) ?? true));
-		return nested.length > 0 ? [{
+			parent
+		]) ?? true)) add = nested;
+		if (nested.length > 0) entries.push({
 			checkout,
 			configPath,
 			config,
 			nested,
 			add
-		}] : [];
-	});
+		});
+	}
+	return entries;
 }
 async function watchedCheckouts(checkouts, watchman = runWatchman) {
 	if (checkouts.length === 0) return /* @__PURE__ */ new Set();
@@ -256,4 +275,4 @@ function writeIgnoreDirs(entry) {
 	return { status: entry.config.kind === "absent" ? "created" : "updated" };
 }
 //#endregion
-export { writeIgnoreDirs as a, watchedCheckouts as i, inspectNestedWorktrees as n, guideStatus as o, nestedWorktreeFinding as r, recordDoctorRun as s, WATCHMAN_NESTED_WORKTREES as t };
+export { writeIgnoreDirs as a, recordDoctorRun as c, watchedCheckouts as i, inspectNestedWorktrees as n, guideStatus as o, nestedWorktreeFinding as r, recordDoctorCheck as s, WATCHMAN_NESTED_WORKTREES as t };

package/dist/{eas-build-JyfqyHfC.mjs → eas-build-CwknaQYj.mjs}

@@ -1,10 +1,9 @@
-import { j as ownership_claim_exports } from "./config-BYDxlMY3.mjs";
-import { t as getExecutor } from "./exec-DqKo9GKJ.mjs";
-import { g as releaseBuildLock, m as acquireBuildLock } from "./device-lease-BX1sJQ2E.mjs";
-import { f as resolveEasCliBin } from "./remote-cache-OyOyVIS3.mjs";
-import { g as easCliUpgradeRemedy, h as easCliSupport, s as readInstalledEasCliVersion } from "./device-remote-xRT0Vmo9.mjs";
-import { existsSync, realpathSync, statSync } from "node:fs";
+import { t as getExecutor, x as ownership_claim_exports } from "./exec-DEoAhcze.mjs";
+import { a as killOnAbort, f as throwIfCancelled, r as childEnvironment } from "./operation-exec-BW0em61G.mjs";
+import { Zn as remoteCliInvocation, nr as easCliUpgradeRemedy, qn as resolveEasCliBin, tr as easCliSupport } from "./budget-Cvwn54qV.mjs";
+import { M as acquireBuildLock, P as releaseBuildLock } from "./activity-CMLmzp7o.mjs";
 import { createHash } from "node:crypto";
+import { existsSync, realpathSync, statSync } from "node:fs";
 //#region src/engine/eas-build.ts
 const MIN_EAS_CLI_BUILD_DOWNLOAD_VERSION = "18.9.0";
 function isEasBuildFailure(result) {
@@ -45,31 +44,63 @@ function selectEasBuild(builds, { platform, profile, fingerprint, projectId, phy
 	}
 	return null;
 }
-async function lookUpEasBuild({ root, platform, profile, note, physical = false, readEasCliVersion = readInstalledEasCliVersion }) {
+async function lookUpEasBuild({ context, root, platform, profile, note, physical = false, env, signal, readEasCliVersion }) {
+	throwIfCancelled(signal, "EAS development build");
 	const retry = "the same Stim command";
 	const buildCommand = `npx eas-cli build --platform ${platform} --profile ${shellArg(profile)}`;
 	const cli = resolveEasCliBin(root);
 	if (!cli) throw new EasFailure("STIM_EAS_UNAVAILABLE", "EAS CLI is not installed.", "Install eas-cli, run eas login, then retry.");
-	const easCli = easCliSupport(readEasCliVersion(cli.file, root), MIN_EAS_CLI_BUILD_DOWNLOAD_VERSION);
-	if (!easCli.supported) throw new EasFailure("STIM_EAS_UNAVAILABLE", easCli.version ? `eas-cli ${easCli.version} (${cli.file}) cannot download a build by ID; --eas-profile needs eas-cli ${MIN_EAS_CLI_BUILD_DOWNLOAD_VERSION} or later.` : `Could not read an eas-cli version from \`${cli.file} --version\`; --eas-profile needs eas-cli ${MIN_EAS_CLI_BUILD_DOWNLOAD_VERSION} or later.`, `${easCliUpgradeRemedy(MIN_EAS_CLI_BUILD_DOWNLOAD_VERSION)}, then retry ${retry}.`);
 	let profileEnv = {};
-	const run = (args, timeoutMs = 12e4) => {
+	const command = async (args, timeoutMs = 12e4) => {
+		throwIfCancelled(signal, "EAS development build");
 		try {
-			return JSON.parse(getExecutor().runFile(cli.file, [
+			const environment = env ? childEnvironment({
+				...env,
+				...profileEnv
+			}) : {
+				env: profileEnv,
+				omitEnv: []
+			};
+			const invocation = remoteCliInvocation(cli.file, args, "eas-cli");
+			const output = await getExecutor().runFileAsync(invocation.file, invocation.args, {
+				cwd: root,
+				timeoutMs,
+				...environment,
+				omitEnv: [...environment.omitEnv, ...args[0] === "--version" ? ["AGENT_DEVICE_DAEMON_BASE_URL", "AGENT_DEVICE_DAEMON_AUTH_TOKEN"] : []],
+				onSpawn: killOnAbort(signal),
+				declareFor: context
+			});
+			throwIfCancelled(signal, "EAS development build");
+			return output;
+		} catch (error) {
+			throwIfCancelled(signal, "EAS development build");
+			throw error;
+		}
+	};
+	let version;
+	try {
+		version = readEasCliVersion ? await readEasCliVersion(cli.file, root) : await command(["--version"], 3e4);
+	} catch {
+		throwIfCancelled(signal, "EAS development build");
+		version = null;
+	}
+	throwIfCancelled(signal, "EAS development build");
+	const easCli = easCliSupport(version, MIN_EAS_CLI_BUILD_DOWNLOAD_VERSION);
+	if (!easCli.supported) throw new EasFailure("STIM_EAS_UNAVAILABLE", easCli.version ? `eas-cli ${easCli.version} (${cli.file}) cannot download a build by ID; --eas-profile needs eas-cli ${MIN_EAS_CLI_BUILD_DOWNLOAD_VERSION} or later.` : `Could not read an eas-cli version from \`${cli.file} --version\`; --eas-profile needs eas-cli ${MIN_EAS_CLI_BUILD_DOWNLOAD_VERSION} or later.`, `${easCliUpgradeRemedy(MIN_EAS_CLI_BUILD_DOWNLOAD_VERSION)}, then retry ${retry}.`);
+	const run = async (args, timeoutMs = 12e4) => {
+		try {
+			return JSON.parse(await command([
 				...args,
 				"--json",
 				"--non-interactive"
-			], {
-				cwd: root,
-				timeoutMs,
-				env: profileEnv
-			}));
+			], timeoutMs));
 		} catch {
+			throwIfCancelled(signal, "EAS development build");
 			throw new EasFailure("STIM_EAS_UNAVAILABLE", `EAS ${args[0]} failed or returned invalid JSON.`, `Run npx eas-cli ${args.map(shellArg).join(" ")} to inspect the error, then retry ${retry}.`);
 		}
 	};
 	note(`eas   resolving profile ${profile}`);
-	const config = object(run([
+	const config = object(await run([
 		"config",
 		"--platform",
 		platform,
@@ -83,7 +114,7 @@ async function lookUpEasBuild({ root, platform, profile, note, physical = false,
 	if (typeof projectId !== "string" || !projectId) throw new EasFailure("STIM_BAD_ARG", "The Expo app is not linked to an EAS project.", "Link the intended EAS project with eas init, then retry.");
 	if (platform === "ios" ? buildProfile.buildConfiguration !== void 0 && buildProfile.buildConfiguration !== "Debug" : buildProfile.gradleCommand !== void 0 && (typeof buildProfile.gradleCommand !== "string" || !/^:app:assemble\w*Debug$/.test(buildProfile.gradleCommand))) throw new EasFailure("STIM_BAD_ARG", `EAS profile ${profile} overrides the development build configuration.`, "Use ios.buildConfiguration: Debug or an android.gradleCommand that assembles a single Debug APK, or remove the override.");
 	note(`eas   fingerprinting ${platform} with profile ${profile}`);
-	const fingerprint = object(run([
+	const fingerprint = object(await run([
 		"fingerprint:generate",
 		"--platform",
 		platform,
@@ -92,7 +123,7 @@ async function lookUpEasBuild({ root, platform, profile, note, physical = false,
 	])).hash;
 	if (typeof fingerprint !== "string" || !/^[a-f0-9]{40,64}$/.test(fingerprint)) throw new EasFailure("STIM_EAS_UNAVAILABLE", "EAS returned no valid native fingerprint.", `Run npx eas-cli fingerprint:generate --platform ${platform} --build-profile ${shellArg(profile)} to inspect the result.`);
 	note(`eas   looking for ${fingerprint.slice(0, 8)}`);
-	const buildId = selectEasBuild(run([
+	const buildId = selectEasBuild(await run([
 		"build:list",
 		"--platform",
 		platform,
@@ -171,6 +202,7 @@ async function planEasDevelopmentBuild(args) {
 			missing: found.buildId ? null : found.missing
 		};
 	} catch (error) {
+		throwIfCancelled(args.signal, "EAS development build");
 		return easFailure(error, "the same Stim command");
 	}
 }
@@ -202,7 +234,7 @@ async function resolveEasDevelopmentBuild(args) {
 		});
 		if (!lock.acquired) throw new EasFailure("STIM_EAS_UNAVAILABLE", `Another run holds the EAS artifact claim at ${lock.path}.`, `Wait for that run to finish, then retry ${retry}.`);
 		args.note(`eas   resolving artifact for build ${buildId}`);
-		const result = object(run([
+		const result = object(await run([
 			"build:download",
 			"--build-id",
 			buildId
@@ -219,6 +251,7 @@ async function resolveEasDevelopmentBuild(args) {
 			cacheHit: "remote"
 		};
 	} catch (error) {
+		throwIfCancelled(args.signal, "EAS development build");
 		return easFailure(error, retry);
 	} finally {
 		releaseBuildLock(lock);