stim 1.19.0 → 1.20.1

package/dist/{toolchain-C3xSoyUl.mjs → toolchain-SqehyPLw.mjs}

@@ -1,18 +1,18 @@
-import { t as getExecutor } from "./exec-i8GDPwq9.mjs";
+import { t as getExecutor } from "./exec-B81Qodjn.mjs";
+import { b as workspaceDerivedData } from "./workspace-state-CvgTFe-h.mjs";
 import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { a as formatElapsed, l as phaseLine } from "./command-output-Bt8ygHE7.mjs";
-import { _ as workspaceDerivedData } from "./workspace-state-CR9X86xJ.mjs";
-import { Ot as resolveOptimizations } from "./settings-CxgngUZk.mjs";
+import { a as formatElapsed, l as phaseLine } from "./command-output-CPDq_90S.mjs";
+import { o as androidHome } from "./android-DE8-JfGW.mjs";
 import { a as spawnDeclared } from "./spawn-claims-Kqiifsk2.mjs";
-import { o as androidHome } from "./android-BdQC6zs1.mjs";
-import { t as cleanLine } from "./server-expo-n3tUi3Em.mjs";
+import { p as resolveOptimizations } from "./errors-DzkMYh8Q.mjs";
+import { t as cleanLine } from "./server-expo-CUuzP9Mp.mjs";
 import { createRequire } from "node:module";
-import { existsSync, readFileSync, readdirSync, realpathSync, statSync } from "node:fs";
+import { existsSync, mkdtempSync, readFileSync, readdirSync, realpathSync, rmSync, statSync } from "node:fs";
 import { basename, delimiter, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { stimBuildDigest } from "@stim-cli/core/state";
 import { fileURLToPath } from "node:url";
-import { homedir } from "node:os";
 import { createHash } from "node:crypto";
+import { homedir, tmpdir } from "node:os";
 //#region src/engine/bundler.ts
 const COCOAPODS_SPEC = /^ {4}cocoapods \(/m;
 function bundlerPin(root) {
@@ -269,12 +269,12 @@ function resolveScheme(project, { exec = null, scheme: requested = null } = {})
 		return { error: {
 			code: "STIM_NO_SCHEME",
 			message: `No shared Xcode scheme named ${JSON.stringify(requested)} in ${project.path}. Available schemes: ${listing.schemes.join(", ") || "none"}.`,
-			remedy: "Pass an exact available name with --scheme, or share the intended app scheme in Xcode."
+			remedy: "Pass an exact available name with --scheme or set it in ios.scheme, or share the intended app scheme in Xcode."
 		} };
 	}
 	let scheme = pickScheme(listing.schemes, listing.name || project.name);
 	if (!scheme && project.dir) try {
-		const app = JSON.parse(readFileSync(join(project.dir, "..", "app.json"), "utf8"));
+		const app = JSON.parse(readFileSync(join(project.appRoot ?? join(project.dir, ".."), "app.json"), "utf8"));
 		scheme = pickScheme(listing.schemes, app?.name);
 	} catch {}
 	if (!scheme) {
@@ -282,7 +282,7 @@ function resolveScheme(project, { exec = null, scheme: requested = null } = {})
 		return { error: {
 			code: "STIM_NO_SCHEME",
 			message: `Could not select an app scheme in ${project.path} (schemes: ${found}).`,
-			remedy: listing.schemes.length > 0 ? "Pass --scheme <name> to select the intended shared app scheme. Stim does not guess between unmatched schemes." : "Share the app scheme in Xcode (Product > Scheme > Manage Schemes, tick Shared) so xcodebuild can see it."
+			remedy: listing.schemes.length > 0 ? "Pass --scheme <name>, or set ios.scheme, to select the intended shared app scheme. Stim does not guess between unmatched schemes." : "Share the app scheme in Xcode (Product > Scheme > Manage Schemes, tick Shared) so xcodebuild can see it."
 		} };
 	}
 	return {
@@ -554,7 +554,7 @@ function compilationCacheActivityLine(activity) {
 	if (activity.status === "not-run") return "not run; artifact cache supplied the app";
 	return "unavailable; Xcode did not report reliable statistics";
 }
-async function buildXcode({ root, udid = null, logWriter, project, scheme = null, configuration = "Debug", sdk = "iphonesimulator", destination = null, arch = null, derivedDataPath = null, extraArgs = [], compilationCache, startedAt: clockStart, now = () => Date.now(), exec = null, heartbeatMs = HEARTBEAT_INTERVAL_MS, estimateMs = null, onHeartbeat = (line) => console.error(line) }) {
+async function buildXcode({ root, udid = null, logWriter, project, scheme = null, configuration = "Debug", applicationTarget, sdk = "iphonesimulator", destination = null, arch = null, derivedDataPath = null, extraArgs = [], compilationCache, startedAt: clockStart, now = () => Date.now(), exec = null, heartbeatMs = HEARTBEAT_INTERVAL_MS, estimateMs = null, onHeartbeat = (line) => console.error(line) }) {
 	if (!root || typeof root !== "string") throw new TypeError("buildXcode requires {root}");
 	if (!logWriter || typeof logWriter.write !== "function") throw new TypeError("buildXcode requires {logWriter} with a write() method");
 	if (!udid && !destination) throw new TypeError("buildXcode requires {udid} (or an explicit {destination})");
@@ -783,6 +783,7 @@ async function buildXcode({ root, udid = null, logWriter, project, scheme = null
 		for (const item of Array.isArray(targets) ? targets : []) {
 			const settings = item?.buildSettings;
 			if (settings?.PRODUCT_TYPE !== "com.apple.product-type.application" || settings.PLATFORM_NAME !== sdk) continue;
+			if (applicationTarget && (settings.TARGET_NAME !== applicationTarget.name || typeof settings.PROJECT_FILE_PATH !== "string" || realpathSync(settings.PROJECT_FILE_PATH) !== realpathSync(applicationTarget.projectPath))) continue;
 			const dir = settings.TARGET_BUILD_DIR;
 			const name = settings.FULL_PRODUCT_NAME;
 			if (typeof dir !== "string" || !isAbsolute(dir) || typeof name !== "string" || basename(name) !== name || !name.endsWith(".app")) continue;
@@ -919,7 +920,7 @@ function extractRubyHead(lines) {
 	}
 	return null;
 }
-function podsAreStale(lockText, manifestText) {
+function podsAreStale(lockText, manifestText, dir = "ios/") {
 	const lock = normalize(lockText);
 	const manifest = normalize(manifestText);
 	if (lock === null && manifest === null) return {
@@ -928,15 +929,15 @@ function podsAreStale(lockText, manifestText) {
 	};
 	if (lock === null) return {
 		stale: true,
-		reason: "ios/Podfile.lock is missing but ios/Pods exists"
+		reason: `${dir}Podfile.lock is missing but ${dir}Pods exists`
 	};
 	if (manifest === null) return {
 		stale: true,
-		reason: "ios/Pods/Manifest.lock is missing (pods have never been installed here)"
+		reason: `${dir}Pods/Manifest.lock is missing (pods have never been installed here)`
 	};
 	if (lock !== manifest) return {
 		stale: true,
-		reason: "ios/Podfile.lock and ios/Pods/Manifest.lock differ"
+		reason: `${dir}Podfile.lock and ${dir}Pods/Manifest.lock differ`
 	};
 	return { stale: false };
 }
@@ -944,14 +945,13 @@ function normalize(text) {
 	if (typeof text !== "string") return null;
 	return text.replace(/\r\n/g, "\n").trimEnd();
 }
-function podfilePath(root) {
-	return join(root, "ios", "Podfile");
-}
-function readPodState(root) {
+function readPodState(root, directory = join(root, "ios")) {
+	const rel = relative(root, directory);
 	return {
-		hasPodfile: existsSync(podfilePath(root)),
-		lockText: readOrNull(join(root, "ios", "Podfile.lock")),
-		manifestText: readOrNull(join(root, "ios", "Pods", "Manifest.lock"))
+		hasPodfile: existsSync(join(directory, "Podfile")),
+		lockText: readOrNull(join(directory, "Podfile.lock")),
+		manifestText: readOrNull(join(directory, "Pods", "Manifest.lock")),
+		dir: rel ? `${rel}/` : ""
 	};
 }
 function readOrNull(file) {
@@ -964,7 +964,96 @@ function readOrNull(file) {
 function podEnv(root, options = {}) {
 	return podEnvForRuby(readRubyVersion(root), options);
 }
-function podEnvForRuby(version, { env = process.env, home = homedir(), exists = existsSync } = {}) {
+const LOGIN_ENV_BEGIN = "@@ruby-env-begin@@";
+const LOGIN_ENV_END = "@@ruby-env-end@@";
+const LOGIN_ENV_SCRIPT = `printf '\\n${LOGIN_ENV_BEGIN}\\nPATH=%s\\nGEM_HOME=%s\\nGEM_PATH=%s\\n${LOGIN_ENV_END}\\n' "\$PATH" "\$GEM_HOME" "\$GEM_PATH" > "\$1"`;
+function parseLoginRubyEnv(output) {
+	const lines = output.split("\n").map((line) => line.replace(/\r$/, ""));
+	const begin = lines.lastIndexOf(LOGIN_ENV_BEGIN);
+	const end = lines.indexOf(LOGIN_ENV_END, begin + 1);
+	if (begin < 0 || end < 0) return null;
+	const out = {};
+	for (const line of lines.slice(begin + 1, end)) {
+		const eq = line.indexOf("=");
+		if (eq < 0) continue;
+		const key = line.slice(0, eq);
+		const value = line.slice(eq + 1);
+		if (value && (key === "PATH" || key === "GEM_HOME" || key === "GEM_PATH")) out[key] = value;
+	}
+	return out;
+}
+const loginRubyEnvByShell = /* @__PURE__ */ new Map();
+const LOGIN_ENV_OPTIONS = {
+	timeoutMs: 1e4,
+	killSignal: "SIGKILL",
+	detachedSilent: true
+};
+function readLoginRubyEnv(shell = process.env.SHELL, platform = process.platform) {
+	if (platform !== "darwin" || !shell || !isAbsolute(shell)) return null;
+	if (loginRubyEnvByShell.has(shell)) return loginRubyEnvByShell.get(shell) ?? null;
+	let dir = null;
+	let parsed = null;
+	try {
+		dir = mkdtempSync(join(tmpdir(), "stim-ruby-env-"));
+		const file = join(dir, "env");
+		getExecutor().runFile(shell, [
+			"-lic",
+			LOGIN_ENV_SCRIPT,
+			"stim",
+			file
+		], LOGIN_ENV_OPTIONS);
+		parsed = parseLoginRubyEnv(readFileSync(file, "utf-8"));
+	} catch {
+		parsed = null;
+	} finally {
+		if (dir) rmSync(dir, {
+			recursive: true,
+			force: true
+		});
+	}
+	loginRubyEnvByShell.set(shell, parsed);
+	return parsed;
+}
+async function readLoginRubyEnvAsync(shell = process.env.SHELL, platform = process.platform) {
+	if (platform !== "darwin" || !shell || !isAbsolute(shell)) return null;
+	if (loginRubyEnvByShell.has(shell)) return loginRubyEnvByShell.get(shell) ?? null;
+	let dir = null;
+	let parsed = null;
+	try {
+		dir = mkdtempSync(join(tmpdir(), "stim-ruby-env-"));
+		const file = join(dir, "env");
+		await getExecutor().runFileAsync(shell, [
+			"-lic",
+			LOGIN_ENV_SCRIPT,
+			"stim",
+			file
+		], LOGIN_ENV_OPTIONS);
+		parsed = parseLoginRubyEnv(readFileSync(file, "utf-8"));
+	} catch {
+		parsed = null;
+	} finally {
+		if (dir) rmSync(dir, {
+			recursive: true,
+			force: true
+		});
+	}
+	loginRubyEnvByShell.set(shell, parsed);
+	return parsed;
+}
+function rubyPathEntries(login, callerPath, exists) {
+	const have = new Set((callerPath ?? "").split(delimiter));
+	const gemDirs = [login.GEM_HOME, ...(login.GEM_PATH ?? "").split(delimiter)].filter((dir) => !!dir);
+	return (login.PATH ?? "").split(delimiter).filter((entry) => {
+		if (!entry || have.has(entry)) return false;
+		if (gemDirs.some((gem) => entry === gem || entry.startsWith(gem + sep))) return true;
+		return exists(join(entry, "ruby")) || exists(join(entry, "pod"));
+	});
+}
+function prependPath(entries, existing) {
+	const seen = /* @__PURE__ */ new Set();
+	return [...entries, ...(existing ?? "").split(delimiter)].filter((entry) => entry && !seen.has(entry) && seen.add(entry)).join(delimiter);
+}
+function podEnvForRuby(version, { env = process.env, home = homedir(), exists = existsSync, loginEnv = readLoginRubyEnv } = {}) {
 	const out = {
 		...env,
 		FORCE_COLOR: "0",
@@ -972,8 +1061,7 @@ function podEnvForRuby(version, { env = process.env, home = homedir(), exists =
 		LANG: env.LANG ?? "en_US.UTF-8",
 		LC_ALL: env.LC_ALL ?? env.LANG ?? "en_US.UTF-8"
 	};
-	if (!version) return out;
-	const candidates = [
+	const candidates = version ? [
 		{ bin: join(home, ".rbenv", "versions", version, "bin") },
 		{
 			bin: join(home, ".rvm", "rubies", `ruby-${version}`, "bin"),
@@ -981,7 +1069,7 @@ function podEnvForRuby(version, { env = process.env, home = homedir(), exists =
 		},
 		{ bin: join(home, ".asdf", "installs", "ruby", version, "bin") },
 		{ bin: join(home, ".local", "share", "mise", "installs", "ruby", version, "bin") }
-	];
+	] : [];
 	for (const c of candidates) {
 		if (!exists(c.bin)) continue;
 		out.PATH = `${c.bin}${delimiter}${out.PATH ?? ""}`;
@@ -989,10 +1077,27 @@ function podEnvForRuby(version, { env = process.env, home = homedir(), exists =
 			out.GEM_HOME = c.gems;
 			out.GEM_PATH = c.gems;
 		}
-		break;
+		return out;
 	}
+	if (env.GEM_HOME) return out;
+	const login = loginEnv();
+	if (!login) return out;
+	const rubyPath = rubyPathEntries(login, out.PATH, exists);
+	if (rubyPath.length) out.PATH = prependPath(rubyPath, out.PATH);
+	if (login.GEM_HOME) out.GEM_HOME = login.GEM_HOME;
+	if (login.GEM_PATH) out.GEM_PATH = login.GEM_PATH;
 	return out;
 }
+async function podEnvForRubyAsync(version) {
+	let loginNeeded = false;
+	const withoutLogin = podEnvForRuby(version, { loginEnv: () => {
+		loginNeeded = true;
+		return null;
+	} });
+	if (!loginNeeded) return withoutLogin;
+	const login = await readLoginRubyEnvAsync();
+	return podEnvForRuby(version, { loginEnv: () => login });
+}
 function readRubyVersion(root, { read = readFileSync } = {}) {
 	try {
 		const first = String(read(join(root, ".ruby-version"), "utf-8")).split("\n").map((l) => l.trim()).find((l) => l && !l.startsWith("#"));
@@ -1163,12 +1268,12 @@ function gemInstallRemedy(root, pin) {
 	const version = readRubyVersion(root);
 	return `${version ? `This repo pins ruby ${version} (.ruby-version), so put that ruby on PATH (rbenv/rvm/asdf/mise) first. ` : ""}Bundler could not install the gems ${pin.lockfile} pins, so \`bundle exec pod install\` cannot run. Run \`cd ${root} && bundle install\` and fix what it reports, then run again.`;
 }
-async function runPodInstall(root, logWriter, { spawnFn = null, now = Date.now, heartbeatMs = HEARTBEAT_INTERVAL_MS, estimateMs = null, onHeartbeat = (line) => console.error(line) } = {}) {
-	const iosDir = join(root, "ios");
+async function runPodInstall(root, logWriter, { spawnFn = null, now = Date.now, heartbeatMs = HEARTBEAT_INTERVAL_MS, estimateMs = null, onHeartbeat = (line) => console.error(line), directory = join(root, "ios") } = {}) {
+	const iosDir = directory;
 	if (!existsSync(iosDir)) return {
 		failed: true,
 		code: DEPS_ERROR,
-		reason: `No ios/ directory in ${root}, so there is nothing to pod install.`,
+		reason: `No ${relative(root, iosDir) || "."}/ directory in ${root}, so there is nothing to pod install.`,
 		remedy: "Run `stim ios` on a project with native iOS sources, or let prebuild generate them.",
 		lastLines: []
 	};
@@ -1284,28 +1389,66 @@ const distDir = dirname(fileURLToPath(import.meta.url));
 function quiet(file, args) {
 	return getExecutor().runFileQuiet(file, args, { timeoutMs: 2e4 });
 }
-function iosToolchain(root) {
-	return iosToolchainForRuby(readRubyVersion(root));
+function iosToolchain(root, native) {
+	return iosToolchainForRuby(native ? null : readRubyVersion(root), native);
 }
-function iosToolchainForRuby(rubyVersion) {
-	const xcode = quiet("xcodebuild", ["-version"]);
+async function quietAsync(file, args) {
+	try {
+		return await getExecutor().runFileAsync(file, args, { timeoutMs: 2e4 });
+	} catch {
+		return null;
+	}
+}
+async function iosToolchainAsync(root) {
+	const rubyVersion = readRubyVersion(root);
+	const [xcode, simulatorSdk, cocoapods] = await Promise.all([
+		quietAsync("xcodebuild", ["-version"]),
+		quietAsync("xcrun", [
+			"--sdk",
+			"iphonesimulator",
+			"--show-sdk-version"
+		]),
+		cocoapodsVersionAsync(rubyVersion)
+	]);
+	return assembleIosToolchain(xcode, simulatorSdk, cocoapods);
+}
+function iosToolchainForRuby(rubyVersion, native) {
+	return assembleIosToolchain(quiet("xcodebuild", ["-version"]), quiet("xcrun", [
+		"--sdk",
+		"iphonesimulator",
+		"--show-sdk-version"
+	]), native ? null : cocoapodsVersion(rubyVersion));
+}
+function assembleIosToolchain(xcode, simulatorSdk, cocoapods) {
 	return {
 		stimBuild: stimBuildDigest(distDir),
 		arch: process.arch,
 		xcode: xcode ? xcode.trim().replace(/\n/g, " / ") : null,
-		simulatorSdk: quiet("xcrun", [
-			"--sdk",
-			"iphonesimulator",
-			"--show-sdk-version"
-		])?.trim() ?? null,
-		cocoapods: cocoapodsVersion(rubyVersion)
+		simulatorSdk: simulatorSdk?.trim() ?? null,
+		cocoapods
 	};
 }
+function podProbeEnv(env) {
+	return Object.fromEntries(Object.entries(env).filter((entry) => entry[1] !== void 0));
+}
+function podVersionLine(output) {
+	return output?.trim().split("\n").pop()?.trim() ?? null;
+}
 function cocoapodsVersion(rubyVersion) {
-	return getExecutor().runFileQuiet("pod", ["--version"], {
+	return podVersionLine(getExecutor().runFileQuiet("pod", ["--version"], {
 		timeoutMs: 2e4,
-		env: Object.fromEntries(Object.entries(podEnvForRuby(rubyVersion)).filter((entry) => entry[1] !== void 0))
-	})?.trim().split("\n").pop()?.trim() ?? null;
+		env: podProbeEnv(podEnvForRuby(rubyVersion))
+	}));
+}
+async function cocoapodsVersionAsync(rubyVersion) {
+	try {
+		return podVersionLine(await getExecutor().runFileAsync("pod", ["--version"], {
+			timeoutMs: 2e4,
+			env: podProbeEnv(await podEnvForRubyAsync(rubyVersion))
+		}));
+	} catch {
+		return null;
+	}
 }
 function macosToolchain() {
 	const xcode = quiet("xcodebuild", ["-version"]);
@@ -1396,7 +1539,17 @@ function sdkPackages() {
 		platforms
 	};
 }
-function workerToolchain(rubyVersion = null) {
+function workerToolchain(rubyVersion = null, native) {
+	if (native === "gradle") return {
+		...androidToolchain(),
+		xcode: null,
+		simulatorSdk: null,
+		cocoapods: null,
+		macosSdk: null,
+		bundler: null,
+		runtimes: [],
+		androidSdk: sdkPackages()
+	};
 	let listed = null;
 	try {
 		listed = JSON.parse(quiet("xcrun", [
@@ -1408,16 +1561,16 @@ function workerToolchain(rubyVersion = null) {
 		]) ?? "null");
 	} catch {}
 	return {
-		...iosToolchainForRuby(rubyVersion),
-		macosSdk: quiet("xcrun", [
+		...iosToolchainForRuby(rubyVersion, native),
+		macosSdk: native ? null : quiet("xcrun", [
 			"--sdk",
 			"macosx",
 			"--show-sdk-version"
 		])?.trim() ?? null,
-		bundler: quiet("bundle", ["--version"])?.trim() || null,
+		bundler: native ? null : quiet("bundle", ["--version"])?.trim() || null,
 		runtimes: iphoneRuntimes(listed),
-		jdk: localJdk(),
-		androidSdk: sdkPackages()
+		jdk: native ? null : localJdk(),
+		androidSdk: native ? null : sdkPackages()
 	};
 }
 /** The API level of an SDK `platforms/` directory: `android-37.0` and `android-37` are both 37. */
@@ -1485,12 +1638,12 @@ function toolchainMismatches(target, worker) {
 		code: "simulator-sdk",
 		reason: versionMismatch("simulator SDK", worker.simulatorSdk, ios.simulatorSdk)
 	});
-	if (target.cocoapodsPinned) {
+	if (!target.native && target.cocoapodsPinned) {
 		if (!worker.bundler) out.push({
 			code: "bundler",
 			reason: "no Bundler there to run the CocoaPods this project's Gemfile.lock pins"
 		});
-	} else if (worker.cocoapods !== ios.cocoapods) out.push({
+	} else if (!target.native && worker.cocoapods !== ios.cocoapods) out.push({
 		code: "cocoapods",
 		reason: versionMismatch("CocoaPods", worker.cocoapods, ios.cocoapods)
 	});
@@ -1501,4 +1654,4 @@ function toolchainMismatches(target, worker) {
 	return out;
 }
 //#endregion
-export { bundlerPin as A, readBundleExecutable as C, swiftPrefixMappingSupported as D, startBuildHeartbeat as E, tailLines as O, pickXcodeProject as S, resolveScheme as T, buildXcode as _, toolchainMismatches as a, detectSwiftVersion as b, podsAreStale as c, runCaptured as d, runPodInstall as f, SWIFT_PREFIX_MAPPING_MIN_SWIFT as g, HEARTBEAT_INTERVAL_MS as h, macosToolchain as i, podInstallCommand as j, describeDiagnostic as k, readPodState as l, COMPILATION_CACHE_UNAVAILABLE as m, androidToolchain as n, workerToolchain as o, COMPILATION_CACHE_NOT_RUN as p, iosToolchain as r, DEPS_ERROR as s, androidRequirements as t, readRubyVersion as u, compilationCacheActivityLine as v, readBundleId as w, detectXcodeMajor as x, compilationCacheSettings as y };
+export { readBundleId as A, compilationCacheSettings as C, parseXcodeMajor as D, parseSwiftVersion as E, describeDiagnostic as F, bundlerPin as I, podInstallCommand as L, startBuildHeartbeat as M, swiftPrefixMappingSupported as N, pickXcodeProject as O, tailLines as P, compilationCacheActivityLine as S, detectXcodeMajor as T, COMPILATION_CACHE_NOT_RUN as _, iphoneRuntimes as a, SWIFT_PREFIX_MAPPING_MIN_SWIFT as b, parseAndroidRequirements as c, DEPS_ERROR as d, podsAreStale as f, runPodInstall as g, runCaptured as h, iosToolchainAsync as i, resolveScheme as j, readBundleExecutable as k, toolchainMismatches as l, readRubyVersion as m, androidToolchain as n, jdkMajor as o, readPodState as p, iosToolchain as r, macosToolchain as s, androidRequirements as t, workerToolchain as u, COMPILATION_CACHE_UNAVAILABLE as v, detectSwiftVersion as w, buildXcode as x, HEARTBEAT_INTERVAL_MS as y };

package/dist/{trigger-CAhmG-4s.mjs → trigger-C0MWBi8O.mjs}

@@ -1,6 +1,6 @@
-import { t as getExecutor } from "./exec-i8GDPwq9.mjs";
+import { t as getExecutor } from "./exec-B81Qodjn.mjs";
 import { t as spawnEntry } from "./spawn-entry-Dcb7sDUz.mjs";
-import { n as windowsLauncherArgs } from "./detached-entry-pB_IPfV4.mjs";
+import { n as windowsLauncherArgs } from "./detached-entry-BXq4fIl-.mjs";
 import { t as resolveMaintenanceSettings } from "./settings-Djl-mpjX.mjs";
 import { n as stampAttempt, r as due, t as capChildLog } from "./attempt-DW-mQqM7.mjs";
 import { closeSync, openSync } from "node:fs";

package/dist/trigger-SHLOWJ4O.mjs

@@ -0,0 +1,2 @@
+import { t as triggerMaintenance } from "./trigger-C0MWBi8O.mjs";
+export { triggerMaintenance };

package/dist/{warm-progress-pFLB2e6P.mjs → warm-progress-5FAXkXIg.mjs}

@@ -1,16 +1,16 @@
 import { n as ownership_claim_exports } from "./process-identity-Biv3arCO.mjs";
-import { n as debugLog, t as getExecutor } from "./exec-i8GDPwq9.mjs";
-import { D as discoverAgentSessions, E as attributeAgentSessions, T as agentKey, a as updateWorkspaceState, u as ensureWorkspaceStorage, v as workspaceDir, w as withDirLock } from "./workspace-state-CR9X86xJ.mjs";
-import { ct as linkedWorktreesOnDisk, rt as gitCommonDirOnDisk } from "./settings-CxgngUZk.mjs";
-import { I as ownedAvdDirectory } from "./android-BdQC6zs1.mjs";
-import { o as pullRequestLookups } from "./pull-request-IHNdMnG8.mjs";
+import { n as debugLog, t as getExecutor } from "./exec-B81Qodjn.mjs";
+import { bt as linkedWorktreesOnDisk, ht as gitCommonDirOnDisk } from "./settings-Bbztm4oV.mjs";
+import { D as withDirLock, a as updateWorkspaceState, d as discoverAgentSessions, l as agentKey, p as ensureWorkspaceStorage, u as attributeAgentSessions, x as workspaceDir } from "./workspace-state-CvgTFe-h.mjs";
+import { I as ownedAvdDirectory } from "./android-DE8-JfGW.mjs";
+import { o as pullRequestLookups } from "./pull-request-vOhLNmIb.mjs";
 import { existsSync, mkdirSync, readdirSync, realpathSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, sep } from "node:path";
 import { ENDED_AGENT_RETENTION_MS, READY_PHASE_MS, WARM_KEY, agentSessionsCacheFile, diskUsageCacheFile, diskUsageFailureFile, diskUsageWalkClaims, pullRequestCacheFile, readAgentSessionsCache, readDiskUsage, readDiskUsageFailure, readEndedAgentSessions, readPullRequestCache, readWarmRecord, readWorkspaceAgent, readWorkspaceState, workspaceEndedAgentsFile, workspaceEndedAgentsLock } from "@stim-cli/core/state";
-import { homedir } from "node:os";
 import { clearClaimChild, markClaimChildPending, releaseClaim, setClaimChild, tryAcquireClaim } from "@stim-cli/core/ownership-claim";
 import { captureProcessIdentity } from "@stim-cli/core/process-identity";
 import { randomUUID } from "node:crypto";
+import { homedir } from "node:os";
 //#region src/workspace/merge-state.ts
 const FETCH_TIMEOUT_MS = 3e4;
 const FETCH_FRESH_MS = 6e5;

package/dist/{watchman-BL1IdOtq.mjs → watchman-CqmaGcIb.mjs}

@@ -1,9 +1,9 @@
-import { t as getExecutor } from "./exec-i8GDPwq9.mjs";
-import { a as formatElapsed, o as formatLongDuration, r as clockTime, u as plural } from "./command-output-Bt8ygHE7.mjs";
-import { H as projectDeviceSlots, R as deviceSlotKey } from "./config-DC5jEtd1.mjs";
-import { g as workspaceAgentDeviceDir } from "./workspace-state-CR9X86xJ.mjs";
-import { n as isInsideProject } from "./metro-DI2AjPF_.mjs";
-import { r as cdpEndpoint } from "./state-D2KtnALG.mjs";
+import { t as getExecutor } from "./exec-B81Qodjn.mjs";
+import { H as projectDeviceSlots, R as deviceSlotKey } from "./config-D0LhTY3S.mjs";
+import { y as workspaceAgentDeviceDir } from "./workspace-state-CvgTFe-h.mjs";
+import { a as formatElapsed, o as formatLongDuration, r as clockTime, u as plural } from "./command-output-CPDq_90S.mjs";
+import { n as isInsideProject } from "./metro-_ZIE3Axg.mjs";
+import { r as cdpEndpoint } from "./state-lqxdOH_g.mjs";
 import { basename, sep } from "path";
 import { ACTIVITY_RECENCY_BASES } from "@stim-cli/core/state";
 //#region src/status.ts

package/dist/{web-DbbrPUn0.mjs → web-BTjzE8mc.mjs}

@@ -1,11 +1,11 @@
-import { f as refuseNoProject, l as phaseLine } from "./command-output-Bt8ygHE7.mjs";
-import { E as upsertProject, p as getProject } from "./config-DC5jEtd1.mjs";
-import { i as recordWorkspaceUse, x as workspaceLogsDir } from "./workspace-state-CR9X86xJ.mjs";
-import { d as projectRegistry, n as findCommandWorkspace } from "./project-B5eQ1USs.mjs";
-import { B as settingShapeErrors, I as resolveSettings, i as SETTING_SHAPE_REMEDY, mt as repoRoot, nt as gitCommonDir } from "./settings-CxgngUZk.mjs";
-import { o as readWebRecord, r as cdpEndpoint } from "./state-D2KtnALG.mjs";
-import { a as workspaceLinks, i as workspaceLinkLine } from "./stim-desktop-C65jk_q2.mjs";
-import { n as ensureWorkspaceStorageSafely } from "./native-runtime-BGxsbfny.mjs";
+import { E as upsertProject, p as getProject } from "./config-D0LhTY3S.mjs";
+import { K as resolveProjectSettings, Q as settingShapeErrors, a as SETTING_SHAPE_REMEDY } from "./settings-Bbztm4oV.mjs";
+import { i as recordWorkspaceUse, w as workspaceLogsDir } from "./workspace-state-CvgTFe-h.mjs";
+import { f as refuseNoProject, l as phaseLine } from "./command-output-CPDq_90S.mjs";
+import { d as projectRegistry, n as findCommandWorkspace } from "./project-DX8fXyw_.mjs";
+import { a as workspaceLinks, i as workspaceLinkLine } from "./stim-desktop-8GQX2OV8.mjs";
+import { o as readWebRecord, r as cdpEndpoint } from "./state-lqxdOH_g.mjs";
+import { n as ensureWorkspaceStorageSafely } from "./native-runtime-D024BAvm.mjs";
 import { t as liveWebRecord } from "./page-Bv9s2KwY.mjs";
 import chalk from "chalk";
 //#region src/commands/web.ts
@@ -14,11 +14,7 @@ async function runWeb({ root, headed, note }) {
 	const startedAt = Date.now();
 	await ensureWorkspaceStorageSafely(root, { note });
 	if (!getProject(root)) upsertProject(root, {});
-	const settings = resolveSettings({
-		projectPath: root,
-		gitCommonDir: gitCommonDir(root),
-		repoRoot: repoRoot(root)
-	});
+	const { settings } = resolveProjectSettings(root);
 	const [shapeError] = settingShapeErrors(settings);
 	if (shapeError) return {
 		ok: false,

package/dist/web-CHN5gh34.mjs

@@ -0,0 +1,2 @@
+import { n as webCommand, t as runWeb } from "./web-BTjzE8mc.mjs";
+export { webCommand as default, runWeb };

package/dist/web-run.mjs

@@ -1,13 +1,13 @@
 import { n as ownership_claim_exports, t as process_identity_exports } from "./process-identity-Biv3arCO.mjs";
-import { t as getExecutor } from "./exec-i8GDPwq9.mjs";
-import { d as signalProcessTree } from "./metro-DI2AjPF_.mjs";
-import { _ as removeSingletonFiles, c as webClaimRoot, d as webLogFile, f as webProfileDir, g as liveProfileHolder, h as chromeProcessState, i as clearWebRecord, l as webDir, m as writeWebRecord, n as browserLogFile, s as updateWebRecord } from "./state-D2KtnALG.mjs";
-import { c as probeWebDrivers } from "./activity-BSw0x84R.mjs";
-import { r as recordCreatedDevice } from "./created-devices-D0s26Hx5.mjs";
-import { r as createNdjsonWriter } from "./ndjson-LGZAMsqa.mjs";
-import { t as relaunchWithLogFile } from "./detached-entry-pB_IPfV4.mjs";
+import { t as getExecutor } from "./exec-B81Qodjn.mjs";
+import { r as recordCreatedDevice } from "./created-devices-CXBMtoj5.mjs";
+import { d as signalProcessTree } from "./metro-_ZIE3Axg.mjs";
+import { r as createNdjsonWriter } from "./ndjson-GOnbyvso.mjs";
+import { t as relaunchWithLogFile } from "./detached-entry-BXq4fIl-.mjs";
+import { _ as removeSingletonFiles, c as webClaimRoot, d as webLogFile, f as webProfileDir, g as liveProfileHolder, h as chromeProcessState, i as clearWebRecord, l as webDir, m as writeWebRecord, n as browserLogFile, s as updateWebRecord } from "./state-lqxdOH_g.mjs";
+import { c as probeWebDrivers } from "./activity-BaMpUQ4-.mjs";
 import { t as connectOwnedBrowser } from "./cdp-Dq_ypAlJ.mjs";
-import { i as chromeArgs, n as DESKTOP_PAGE, r as PHONE_SCREEN } from "./chrome-BTUOo8p2.mjs";
+import { i as chromeArgs, n as DESKTOP_PAGE, r as PHONE_SCREEN } from "./chrome-Dp2lMLBe.mjs";
 import { existsSync, mkdirSync, openSync, realpathSync } from "node:fs";
 import { isAbsolute, resolve } from "node:path";
 import { WEB_VIEWPORTS } from "@stim-cli/core/state";
@@ -451,7 +451,7 @@ async function runWebSupervisor(options, { onExit = (code) => process.exit(code)
 	let cdp = null;
 	let finished = false;
 	let stopping = false;
-	const chromeGone = () => !chromeRecord || chromeProcessState(chromeRecord) === "gone";
+	const chromeGone = () => !chromeRecord || chromeProcessState(chromeRecord, profile) === "gone";
 	const finish = (code, level, event, msg) => {
 		if (finished) return;
 		finished = true;
@@ -484,7 +484,7 @@ async function runWebSupervisor(options, { onExit = (code) => process.exit(code)
 		} catch {}
 		const deadline = Date.now() + CHROME_EXIT_WAIT_MS;
 		while (!chromeGone() && Date.now() < deadline) await sleep(POLL_MS);
-		const state = chromeRecord ? chromeProcessState(chromeRecord) : "gone";
+		const state = chromeRecord ? chromeProcessState(chromeRecord, profile) : "gone";
 		if (chromeRecord && (state === "running" || state === "lingering")) {
 			try {
 				signalProcessTree(chromeRecord.pid, "SIGKILL", { group: true });