stim 1.18.0 → 1.19.0

package/dist/{device-lease-Co-EwifR.mjs → device-lease-Cu7PtQpZ.mjs}

@@ -1,9 +1,9 @@
 import { n as ownership_claim_exports } from "./process-identity-Biv3arCO.mjs";
-import { t as getExecutor } from "./exec-DWhCZDGm.mjs";
-import { a as formatElapsed, i as formatDuration, m as shortHash } from "./command-output-CBtzyIgF.mjs";
-import { B as parseDeviceSlotKey, R as deviceSlotKey, W as validateDeviceSlot, d as getConfigDir } from "./config-CgYMahz7.mjs";
-import { c as writeWorkspaceState, d as sharedBuildCache, n as clearWorkspaceStateKeys, o as withWorkspaceStateLock, r as readWorkspaceState, w as withDirLock$1 } from "./workspace-state-C59dqG-Z.mjs";
-import { r as register } from "./cache-manifest-BI7ozfmH.mjs";
+import { t as getExecutor } from "./exec-i8GDPwq9.mjs";
+import { a as formatElapsed, i as formatDuration, m as shortHash } from "./command-output-Bt8ygHE7.mjs";
+import { B as parseDeviceSlotKey, R as deviceSlotKey, W as validateDeviceSlot, d as getConfigDir } from "./config-DC5jEtd1.mjs";
+import { c as writeWorkspaceState, d as sharedBuildCache, n as clearWorkspaceStateKeys, o as withWorkspaceStateLock, r as readWorkspaceState, w as withDirLock$1 } from "./workspace-state-CR9X86xJ.mjs";
+import { r as register } from "./cache-manifest-DiwKSyv9.mjs";
 import { n as declareSpawnsOn, o as stopDeclaringSpawnsOn } from "./spawn-claims-Kqiifsk2.mjs";
 import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { join } from "node:path";

package/dist/{device-lease-run-w1xhCqIW.mjs → device-lease-run-D38SnZtt.mjs}

@@ -1,7 +1,7 @@
-import { a as formatElapsed, r as clockTime } from "./command-output-CBtzyIgF.mjs";
-import { R as deviceSlotKey } from "./config-CgYMahz7.mjs";
-import { a as parseLease, c as raiseLease, l as releaseRunLease, n as fileLeaseIo, p as takeLease, r as leaseIsExpired, t as deviceLeasePath } from "./device-lease-Co-EwifR.mjs";
-import { a as VERIFY_TIMEOUT_MS, m as APP_READINESS_TIMEOUT_MS } from "./launch-verify-hskNcWkZ.mjs";
+import { a as formatElapsed, r as clockTime } from "./command-output-Bt8ygHE7.mjs";
+import { R as deviceSlotKey } from "./config-DC5jEtd1.mjs";
+import { a as parseLease, c as raiseLease, l as releaseRunLease, n as fileLeaseIo, p as takeLease, r as leaseIsExpired, t as deviceLeasePath } from "./device-lease-Cu7PtQpZ.mjs";
+import { a as VERIFY_TIMEOUT_MS, m as APP_READINESS_TIMEOUT_MS } from "./launch-verify-DCveSE6d.mjs";
 //#region src/engine/device-lease-run.ts
 const LEASE_STEP_FLOOR_MS = 6e4;
 const DEBUG_VERIFY_STEP_MS = VERIFY_TIMEOUT_MS + APP_READINESS_TIMEOUT_MS;

package/dist/{device-pool-F5WvRPtD.mjs → device-pool-CP4rAsHx.mjs}

@@ -1,6 +1,6 @@
-import { R as deviceSlotKey } from "./config-CgYMahz7.mjs";
-import { a as parseLease, f as selectPoolDevice, n as fileLeaseIo, r as leaseIsExpired, t as deviceLeasePath } from "./device-lease-Co-EwifR.mjs";
-import { i as DEVICE_WAIT_POLL_MS, n as DEVICE_BUSY, o as leaseExpiryText } from "./device-lease-run-w1xhCqIW.mjs";
+import { R as deviceSlotKey } from "./config-DC5jEtd1.mjs";
+import { a as parseLease, f as selectPoolDevice, n as fileLeaseIo, r as leaseIsExpired, t as deviceLeasePath } from "./device-lease-Cu7PtQpZ.mjs";
+import { i as DEVICE_WAIT_POLL_MS, n as DEVICE_BUSY, o as leaseExpiryText } from "./device-lease-run-D38SnZtt.mjs";
 //#region src/engine/device-pool.ts
 function heldPoolId(root, platform, now, io = fileLeaseIo, slot = "default") {
 	const record = io.readHolder(root)[deviceSlotKey(platform, slot)];

package/dist/{device-remote-tHbd1fKy.mjs → device-remote-B5GiUifk.mjs}

@@ -1,18 +1,17 @@
-import { t as getExecutor } from "./exec-DWhCZDGm.mjs";
-import { a as formatElapsed } from "./command-output-CBtzyIgF.mjs";
-import { d as getConfigDir } from "./config-CgYMahz7.mjs";
-import { u as ownedDeviceLabel } from "./project-C3ChRLZy.mjs";
-import { o as pidExists } from "./metro-Dh8T4Ytd.mjs";
-import { C as workspaceStateFile, v as workspaceDir, w as withDirLock, x as workspaceLogsDir$1, y as workspaceId } from "./workspace-state-C59dqG-Z.mjs";
-import { Ht as readMetroTunnel, Wt as readRemoteSession, zt as clearRemoteSession } from "./budget-DIhL2BKx.mjs";
-import { S as probePublicHttp } from "./workspaces-xXItD8Dj.mjs";
-import { E as sanitizeDeviceLabel } from "./ios-B3SbOWdw.mjs";
-import { q as planMetroReach } from "./settings-CQyMElEP.mjs";
-import { a as withWorkspaceProcessLock } from "./named-ports-BFIz1Shz.mjs";
-import { i as INSTALL_ERROR, o as LAUNCH_ERROR, u as devClientDeepLink } from "./app-install-D-PUENug.mjs";
-import { c as readMetroRecords, o as isBundleProof } from "./launch-verify-hskNcWkZ.mjs";
-import { t as compareStimVersions } from "./stim-installations-aR_WsNOA.mjs";
-import { c as nativeRunWaitNotice } from "./native-run-B06FkmZx.mjs";
+import { t as getExecutor } from "./exec-i8GDPwq9.mjs";
+import { a as formatElapsed } from "./command-output-Bt8ygHE7.mjs";
+import { d as getConfigDir } from "./config-DC5jEtd1.mjs";
+import { C as workspaceStateFile, v as workspaceDir, w as withDirLock, x as workspaceLogsDir$1, y as workspaceId } from "./workspace-state-CR9X86xJ.mjs";
+import { C as clearRemoteSession, E as readMetroTunnel, O as readRemoteSession, o as ownedDeviceLabel } from "./project-B5eQ1USs.mjs";
+import { J as planMetroReach } from "./settings-CxgngUZk.mjs";
+import { s as pidExists } from "./metro-DI2AjPF_.mjs";
+import { S as probePublicHttp } from "./workspaces-Djb2gfi9.mjs";
+import { E as sanitizeDeviceLabel } from "./ios-BWbHFZVz.mjs";
+import { a as withWorkspaceProcessLock } from "./named-ports-B4iWH4E-.mjs";
+import { v as nativeRunWaitNotice } from "./client-CuUo8Nvg.mjs";
+import { i as INSTALL_ERROR, o as LAUNCH_ERROR, u as devClientDeepLink } from "./app-install-CFI4ptUL.mjs";
+import { c as readMetroRecords, o as isBundleProof } from "./launch-verify-DCveSE6d.mjs";
+import { t as compareStimVersions } from "./stim-installations-DbmUjsLv.mjs";
 import { existsSync, mkdirSync, realpathSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import { easMachineStateRoot, easMachineStateRoot as easMachineStateRoot$1, easSessionLedgerFile, easSessionLedgerLock, readEasSessionLedger, readEasSessionLedger as readEasSessionLedger$1, readJsonObject, validEasSessionClaim } from "@stim-cli/core/state";
@@ -1321,4 +1320,4 @@ function bundleEntryPoint(root, isExpo) {
 	return local ? normalized : `node_modules/${normalized}`;
 }
 //#endregion
-export { listOwnedSessionsArgs as C, verifyStoppedSession as D, stopSessionArgs as E, readRemoteSimulatorArch as O, isDefinitiveMissingSessionError as S, parseSessionListPage as T, easCliSupport as _, ensureMetroReachable as a, getSessionArgs as b, remoteAndroidDeps as c, withRemoteSessionLock as d, withEasProjectLock as f, MIN_EAS_CLI_SIMULATOR_VERSION as g, removeEasSessionClaim as h, endRecordedSession as i, gateMetroOrigin as k, remoteIosDeps as l, readEasSessionLedger$1 as m, binOnPath as n, ensureRemoteBootOwned as o, easMachineStateRoot$1 as p, bundleEntryPoint as r, readInstalledEasCliVersion as s, REMOTE_SESSION_ERROR as t, resolveRemoteContext as u, easCliUpgradeRemedy as v, ownedSessionName as w, inspectSessionForTeardown as x, findOrphanedOwnedSessions as y };
+export { gateMetroOrigin as A, isDefinitiveMissingSessionError as C, stopSessionArgs as D, parseSessionListPage as E, verifyStoppedSession as O, inspectSessionForTeardown as S, ownedSessionName as T, MIN_EAS_CLI_SIMULATOR_VERSION as _, ensureMetroReachable as a, findOrphanedOwnedSessions as b, remoteAndroidDeps as c, withRemoteSessionLock as d, withEasProjectLock as f, MIN_EAS_CLI_DEVICE_VERSION as g, removeEasSessionClaim as h, endRecordedSession as i, readRemoteSimulatorArch as k, remoteIosDeps as l, readEasSessionLedger$1 as m, binOnPath as n, ensureRemoteBootOwned as o, easMachineStateRoot$1 as p, bundleEntryPoint as r, readInstalledEasCliVersion as s, REMOTE_SESSION_ERROR as t, resolveRemoteContext as u, easCliSupport as v, listOwnedSessionsArgs as w, getSessionArgs as x, easCliUpgradeRemedy as y };

package/dist/{doctor-B9ckYUoU.mjs → doctor-PRJH94v6.mjs}

@@ -1,29 +1,29 @@
-import { t as getExecutor } from "./exec-DWhCZDGm.mjs";
-import { d as quotedPath, f as refuseNoProject, l as phaseLine, u as plural } from "./command-output-CBtzyIgF.mjs";
-import { _ as loadConfig$1, p as getProject, s as configCorruptRepair, u as getConcurrencyLimits } from "./config-CgYMahz7.mjs";
-import { D as makeTemporaryDirectory, E as filesystemDevice, a as dirtyFingerprintFiles, h as locallyKnownUpstream, k as temporaryRoot, m as listWorktrees, s as gitCommonDir, x as resolveSourceCheckout, y as repoRoot } from "./worktree-CsKYexJM.mjs";
-import { i as detectIsExpo, l as isPackageResolvable, n as appProjectProblem, s as findProjectRoot$1 } from "./project-C3ChRLZy.mjs";
-import { _ as workspaceDerivedData, d as sharedBuildCache } from "./workspace-state-C59dqG-Z.mjs";
-import { St as inspectWatchmanMemory, a as inspectBudget, n as budgetLine } from "./budget-DIhL2BKx.mjs";
-import { M as listBuildSlots } from "./workspaces-xXItD8Dj.mjs";
-import { C as diffFingerprintSources, D as fingerprintProject, h as listBuildLocks } from "./device-lease-Co-EwifR.mjs";
-import { D as hostSystemImageArch, ft as parkedMaxSetting, o as androidHome, ot as POOL_SETTING_REMEDY } from "./android-DC3ZLuw0.mjs";
-import { M as readHostMemoryPressure, b as pickDefaultIosCreation, j as hostMemoryPressureAdvice, l as iosRuntimeMatches, m as listIosRuntimes } from "./ios-B3SbOWdw.mjs";
-import { F as resolveSettings, L as settingOrigin, M as remoteAndroidSetting, N as remoteIosSetting, Q as resolveOptimizations, U as unknownSettingKeys, V as settingsLayers, W as webSettings, X as compilerCacheFallbackMessage, i as SETTING_SHAPE_REMEDY, k as projectOptimizations, n as PATH_SETTINGS, r as SETTINGS_WITH_RESOLVE_TIME_FALLBACK, v as iosSimSlimProfileSetting, y as mergeSettingsLayers, z as settingShapeErrors } from "./settings-CQyMElEP.mjs";
-import { o as offloadCheck, u as simulatorRuntime, v as inspectBuildMachines, w as realIo, x as inspectDeviceHostMachines } from "./client-DzhapoMB.mjs";
-import { i as countLiveOwnedDevices } from "./device-capacity-EUOOYr8T.mjs";
-import { N as projectCmakeLauncher, O as bundlerPin, b as detectXcodeMajor, i as macosToolchain, k as podInstallCommand, n as androidToolchain, r as iosToolchain, t as androidRequirements, v as ccacheEnabled } from "./toolchain-Bnyd_K3A.mjs";
-import { f as resolveEasCliBin, i as checkEasAuth$1, l as ownerFromConfig, u as providerFromConfig } from "./remote-cache-BGg7aGIZ.mjs";
-import { _ as easCliSupport, g as MIN_EAS_CLI_SIMULATOR_VERSION, s as readInstalledEasCliVersion, v as easCliUpgradeRemedy } from "./device-remote-tHbd1fKy.mjs";
-import { n as inspectStimVersions, t as compareStimVersions } from "./stim-installations-aR_WsNOA.mjs";
-import { n as simslimIsOnPath, r as MIN_EAS_CLI_BUILD_DOWNLOAD_VERSION } from "./simslim-EHBQ2R4G.mjs";
-import { d as androidPathRoomRemedy, l as androidPathRoom, n as apkOutputsDir, t as androidSdkRefusal, u as androidPathRoomMessage } from "./gradle-C6GKnunQ.mjs";
-import { r as resolveAndroidCompilerCache, t as readAndroidCasToolchain } from "./android-cas-BBFyr9CA.mjs";
-import { g as resolveRuntime, m as resolveDeviceType } from "./support-BaayeYCf.mjs";
-import { a as findChrome, t as CHROME_INSTALL_REMEDY } from "./chrome-DJnmnS5q.mjs";
-import { n as hasInstalledDependencies, r as installedNpmTreeIsValid, t as dependencyState } from "./dependency-state-xKoOypBm.mjs";
+import { t as getExecutor } from "./exec-i8GDPwq9.mjs";
+import { d as quotedPath, f as refuseNoProject, l as phaseLine, u as plural } from "./command-output-Bt8ygHE7.mjs";
+import { _ as loadConfig$1, p as getProject, s as configCorruptRepair, u as getConcurrencyLimits } from "./config-DC5jEtd1.mjs";
+import { _ as workspaceDerivedData, d as sharedBuildCache } from "./workspace-state-CR9X86xJ.mjs";
+import { f as appProjectProblem, h as isPackageResolvable, p as detectIsExpo, r as findProjectRoot } from "./project-B5eQ1USs.mjs";
+import { B as settingShapeErrors, Et as compilerCacheFallbackMessage, G as webSettings, H as settingsLayers, I as resolveSettings, M as remoteAndroidSetting, Ot as resolveOptimizations, P as remoteIosSetting, R as settingOrigin, St as makeTemporaryDirectory, W as unknownSettingKeys, et as dirtyFingerprintFiles, gt as resolveSourceCheckout, i as SETTING_SHAPE_REMEDY, k as projectOptimizations, lt as listWorktrees, mt as repoRoot, n as PATH_SETTINGS, nt as gitCommonDir, r as SETTINGS_WITH_RESOLVE_TIME_FALLBACK, ut as locallyKnownUpstream, v as iosSimSlimProfileSetting, wt as temporaryRoot, xt as filesystemDevice, y as mergeSettingsLayers } from "./settings-CxgngUZk.mjs";
+import { St as inspectWatchmanMemory, a as inspectBudget, n as budgetLine } from "./budget-Dz-kyXLv.mjs";
+import { N as listBuildSlots } from "./workspaces-Djb2gfi9.mjs";
+import { C as diffFingerprintSources, D as fingerprintProject, h as listBuildLocks } from "./device-lease-Cu7PtQpZ.mjs";
+import { D as hostSystemImageArch, ft as parkedMaxSetting, o as androidHome, ot as POOL_SETTING_REMEDY } from "./android-BdQC6zs1.mjs";
+import { M as readHostMemoryPressure, b as pickDefaultIosCreation, j as hostMemoryPressureAdvice, l as iosRuntimeMatches, m as listIosRuntimes } from "./ios-BWbHFZVz.mjs";
+import { L as realIo, P as inspectDeviceHostMachines, j as inspectBuildMachines, o as offloadCheck, u as simulatorRuntime } from "./client-CuUo8Nvg.mjs";
+import { i as countLiveOwnedDevices } from "./device-capacity-BoN1jQkO.mjs";
+import { a as projectCmakeLauncher } from "./manifest-CX0d1IkZ.mjs";
+import { A as bundlerPin, i as macosToolchain, j as podInstallCommand, n as androidToolchain, r as iosToolchain, t as androidRequirements, x as detectXcodeMajor } from "./toolchain-C3xSoyUl.mjs";
+import { f as resolveEasCliBin, i as checkEasAuth$1, l as ownerFromConfig, u as providerFromConfig } from "./remote-cache-N3hAEaAL.mjs";
+import { _ as androidPathRoomMessage, a as apkOutputsDir, c as ccacheEnabled, g as androidPathRoom, p as androidSdkRefusal, v as androidPathRoomRemedy } from "./device-ios-B2ruohE-.mjs";
+import { _ as MIN_EAS_CLI_SIMULATOR_VERSION, s as readInstalledEasCliVersion, v as easCliSupport, y as easCliUpgradeRemedy } from "./device-remote-B5GiUifk.mjs";
+import { n as inspectStimVersions, t as compareStimVersions } from "./stim-installations-DbmUjsLv.mjs";
+import { n as simslimIsOnPath, r as MIN_EAS_CLI_BUILD_DOWNLOAD_VERSION } from "./simslim-D9LkJxIO.mjs";
+import { r as resolveAndroidCompilerCache, t as readAndroidCasToolchain } from "./android-cas-C87geAg-.mjs";
+import { g as resolveRuntime, m as resolveDeviceType } from "./support-CNqYkV0y.mjs";
+import { n as hasInstalledDependencies, r as installedNpmTreeIsValid, t as dependencyState } from "./dependency-state-DKaS1OM9.mjs";
+import { a as findChrome, t as CHROME_INSTALL_REMEDY } from "./chrome-BTUOo8p2.mjs";
 import { r as maintenanceStatus, t as maintenanceLine } from "./status-BEeL6IKz.mjs";
-import { n as recordDoctorRun } from "./guide-status-Bhf9SJXc.mjs";
+import { a as writeIgnoreDirs, i as watchedCheckouts, n as inspectNestedWorktrees, r as nestedWorktreeFinding, s as recordDoctorRun } from "./doctor-watchman-wZhyTdp4.mjs";
 import { existsSync, lstatSync, readFileSync, readdirSync, realpathSync, rmSync } from "node:fs";
 import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { dirname as dirname$1, isAbsolute as isAbsolute$1, join as join$1, relative as relative$1, resolve as resolve$1, sep as sep$1 } from "path";
@@ -1149,7 +1149,8 @@ function checkAndroidSdk(projectRoot, platform) {
 	const refusal = androidSdkRefusal({
 		sdkPath,
 		sdkExists: existsSync$1(sdkPath),
-		hasLocalProperties: existsSync$1(join$1(androidDir, "local.properties"))
+		hasLocalProperties: existsSync$1(join$1(androidDir, "local.properties")),
+		localPropertiesPath: "android/local.properties"
 	});
 	if (!refusal) return null;
 	return {
@@ -1435,7 +1436,7 @@ function doctorSuccessLines(platform, stim, budget = null) {
 		...budgetLines(budget),
 		"",
 		"Project",
-		phaseLine("project", "source checkout, dependencies, local upstream"),
+		phaseLine("project", "source checkout, dependencies, local upstream, nested worktrees Watchman would crawl"),
 		phaseLine("settings", "every Stim setting type, machine config paths, companions and inert keys")
 	];
 	if (platform !== "android") {
@@ -1509,8 +1510,8 @@ function applySandboxFix(root, env = process.env) {
 	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."));
 }
 function doctorCommand(program, version, inspectVersions = inspectStimVersions, host = process.platform) {
-	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 React Native or Expo 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 this checkout; 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) => {
-		const root = findProjectRoot$1(process.cwd());
+	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 React Native or Expo 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 this 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) => {
+		const root = findProjectRoot(process.cwd());
 		if (!root) {
 			refuseNoProject({ json: Boolean(opts.json) });
 			return;
@@ -1526,6 +1527,26 @@ function doctorCommand(program, version, inspectVersions = inspectStimVersions,
 				console.error(phaseLine("cache", `CMake cleanup failed: ${error.message}`));
 				process.exitCode = 1;
 			}
+			const nestedToFix = inspectNestedWorktrees(root);
+			const watchedToFix = await watchedCheckouts(nestedToFix.map((entry) => entry.checkout));
+			for (const entry of nestedToFix) {
+				let result;
+				try {
+					result = writeIgnoreDirs(entry);
+				} catch (error) {
+					result = {
+						status: "refused",
+						reason: `${entry.configPath} could not be written: ${error.message}`
+					};
+				}
+				if (result.status === "refused") {
+					console.error(phaseLine("checkout", `kept ${result.reason}; add ${entry.add.join(", ")} to ignore_dirs by hand`));
+					process.exitCode = 1;
+				} else {
+					console.error(phaseLine("checkout", `${result.status} ${entry.configPath}: ignore_dirs ${entry.add.join(", ")}`));
+					if (watchedToFix.has(entry.checkout)) console.error(phaseLine("checkout", `Watchman watches ${entry.checkout} and reads the file only when it adds a root: run \`watchman watch-del ${entry.checkout}\`, then restart watchman to free its memory`));
+				}
+			}
 		}
 		const stim = await inspectVersions(version);
 		const findings = runDoctor(root, {
@@ -1547,6 +1568,9 @@ function doctorCommand(program, version, inspectVersions = inspectStimVersions,
 		findings.push(...budget.findings);
 		const watchman = await inspectWatchmanMemory();
 		if (watchman) findings.push(watchman);
+		const nestedWorktrees = inspectNestedWorktrees(root);
+		const watched = await watchedCheckouts(nestedWorktrees.map((entry) => entry.checkout));
+		for (const entry of nestedWorktrees) findings.push(nestedWorktreeFinding(entry, watched.has(entry.checkout)));
 		const checksIos = opts.platform !== "android" && host === "darwin";
 		const checksAndroid = opts.platform === "android" || opts.platform === void 0 && (existsSync(join(root, "android")) || detectIsExpo(root));
 		const checksMacos = host === "darwin" && opts.platform === void 0 && existsSync(join(root, "Package.swift"));

package/dist/doctor-watchman-wZhyTdp4.mjs

@@ -0,0 +1,259 @@
+import { t as getExecutor } from "./exec-i8GDPwq9.mjs";
+import { E as upsertProject, d as getConfigDir, p as getProject } from "./config-DC5jEtd1.mjs";
+import { f as appProjectProblem } from "./project-B5eQ1USs.mjs";
+import { lt as listWorktrees, mt as repoRoot } from "./settings-CxgngUZk.mjs";
+import { o as runWatchman, r as parseWatchRoots } from "./watchman-BL1IdOtq.mjs";
+import { t as compareStimVersions } from "./stim-installations-DbmUjsLv.mjs";
+import { mkdirSync, readFileSync, realpathSync, renameSync, rmSync, unlinkSync, writeFileSync } from "node:fs";
+import { dirname, isAbsolute, join, relative, sep } from "node:path";
+//#region src/guide-status.ts
+const DAY_MS = 864e5;
+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";
+const PLATFORMS = ["ios", "android"];
+function recordDoctorRun(projectRoot, platform, version, now = /* @__PURE__ */ new Date()) {
+	const run = {
+		at: now.toISOString(),
+		version
+	};
+	try {
+		if (appProjectProblem(projectRoot)) return;
+		upsertProject(projectRoot, (existing) => {
+			const doctorRuns = { ...existing.doctorRuns };
+			for (const target of platform ? [platform] : PLATFORMS) doctorRuns[target] = run;
+			return { doctorRuns };
+		});
+	} catch {}
+}
+function doctorDueReason(record, running, now) {
+	const at = record ? Date.parse(record.at) : NaN;
+	if (!record || Number.isNaN(at)) return "never run";
+	if (record.version !== running) return `last run with stim ${record.version}`;
+	const age = now.getTime() - at;
+	if (age > DOCTOR_STALE_MS) return `last run ${Math.floor(age / DAY_MS)} days ago`;
+	return null;
+}
+function updateCacheFile() {
+	return join(getConfigDir(), "update-check.json");
+}
+function readUpdateCache() {
+	try {
+		const parsed = JSON.parse(readFileSync(updateCacheFile(), "utf-8"));
+		if (typeof parsed?.checkedAt !== "string") return null;
+		return {
+			checkedAt: parsed.checkedAt,
+			latest: typeof parsed.latest === "string" ? parsed.latest : null
+		};
+	} catch {
+		return null;
+	}
+}
+function writeUpdateCache(cache) {
+	const target = updateCacheFile();
+	const tmp = `${target}.${process.pid}.${Math.random().toString(36).slice(2)}.tmp`;
+	try {
+		mkdirSync(getConfigDir(), { recursive: true });
+		writeFileSync(tmp, `${JSON.stringify(cache)}\n`);
+		renameSync(tmp, target);
+	} catch {
+		try {
+			unlinkSync(tmp);
+		} catch {}
+	}
+}
+async function fetchLatest(fetchImpl) {
+	const res = await fetchImpl(LATEST_URL, { signal: AbortSignal.timeout(UPDATE_CHECK_TIMEOUT_MS) });
+	if (!res.ok) return null;
+	const body = await res.json();
+	return typeof body.version === "string" ? body.version : null;
+}
+async function checkForUpdate(running, { now = /* @__PURE__ */ new Date(), fetch: fetchImpl = fetch } = {}) {
+	if (process.env.STIM_NO_UPDATE_CHECK) return null;
+	const cached = readUpdateCache();
+	const checkedAt = cached ? Date.parse(cached.checkedAt) : NaN;
+	let latest = cached?.latest ?? null;
+	if (Number.isNaN(checkedAt) || now.getTime() - checkedAt > UPDATE_CHECK_INTERVAL_MS) {
+		try {
+			latest = await fetchLatest(fetchImpl);
+		} catch {
+			latest = null;
+		}
+		writeUpdateCache({
+			checkedAt: now.toISOString(),
+			latest
+		});
+	}
+	if (!latest) return null;
+	const comparison = compareStimVersions(latest, running);
+	return comparison !== null && comparison > 0 ? latest : null;
+}
+function renderGuideStatus({ running, doctor, latest }) {
+	const lines = [];
+	if (doctor.length) {
+		const named = doctor.map((due) => `${due.platform} (${due.reason})`).join(" and ");
+		const command = doctor.length === 1 ? `stim doctor --platform ${doctor[0]?.platform}` : "stim doctor";
+		lines.push(`  Doctor is due for ${named}.`, `  Run before native work:  ${command}`);
+	}
+	if (latest) lines.push(`  stim ${latest} is available (running ${running}):  npm install -g stim@latest`);
+	if (!lines.length) return null;
+	return ["STATUS", ...lines].join("\n");
+}
+async function guideStatus({ projectRoot, running, now = /* @__PURE__ */ new Date(), fetch: fetchImpl = fetch }) {
+	const doctor = [];
+	if (projectRoot && !appProjectProblem(projectRoot)) {
+		let runs = null;
+		try {
+			runs = getProject(projectRoot)?.doctorRuns ?? {};
+		} catch {}
+		if (runs) for (const platform of PLATFORMS) {
+			const reason = doctorDueReason(runs[platform], running, now);
+			if (reason) doctor.push({
+				platform,
+				reason
+			});
+		}
+	}
+	return renderGuideStatus({
+		running,
+		doctor,
+		latest: await checkForUpdate(running, {
+			now,
+			fetch: fetchImpl
+		})
+	});
+}
+//#endregion
+//#region src/diagnostics/doctor-watchman.ts
+const WATCHMAN_NESTED_WORKTREES = "watchman-nested-worktrees";
+function isPlainObject(value) {
+	return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function ignoreDirsOf(config) {
+	if (config.kind !== "object" || !Array.isArray(config.value.ignore_dirs)) return [];
+	return config.value.ignore_dirs.filter((entry) => typeof entry === "string");
+}
+function covered(path, ignoreDirs) {
+	return ignoreDirs.some((entry) => path === entry || path.startsWith(`${entry}/`));
+}
+/**
+* Watchman joins each ignore_dirs entry to the root without normalizing it, so `.worktrees/` or `./.worktrees`
+* ignores nothing; only an entry spelled exactly as the relative path, or as one of its ancestors, covers it.
+*/
+function nestedWorktreeIgnores(checkout, worktrees, ignoreDirs, holdsSource) {
+	const nested = worktrees.map((path) => relative(checkout, path)).filter((rel) => rel !== "" && rel !== ".." && !rel.startsWith(`..${sep}`) && !isAbsolute(rel)).map((rel) => rel.split(sep).join("/")).filter((rel) => !covered(rel, ignoreDirs)).toSorted();
+	const parents = new Set(nested.map((rel) => dirname(rel)));
+	const [parent] = parents;
+	return {
+		nested,
+		add: parents.size === 1 && parent !== void 0 && parent !== "." && !holdsSource(parent) ? [parent] : nested
+	};
+}
+function mergeIgnoreDirs(config, add) {
+	if (config.kind === "invalid") return { refusal: config.reason };
+	const existing = config.kind === "object" ? config.value : {};
+	if ("ignore_dirs" in existing && !Array.isArray(existing.ignore_dirs)) return { refusal: "holds an ignore_dirs that is not an array" };
+	const current = Array.isArray(existing.ignore_dirs) ? existing.ignore_dirs : [];
+	return { value: {
+		...existing,
+		ignore_dirs: [.../* @__PURE__ */ new Set([...current, ...add])]
+	} };
+}
+function readWatchmanConfig(path) {
+	let raw;
+	try {
+		raw = readFileSync(path, "utf-8");
+	} catch (error) {
+		const code = error.code;
+		return code === "ENOENT" ? { kind: "absent" } : {
+			kind: "invalid",
+			reason: `cannot be read (${code})`
+		};
+	}
+	let parsed;
+	try {
+		parsed = JSON.parse(raw);
+	} catch {
+		parsed = null;
+	}
+	return isPlainObject(parsed) ? {
+		kind: "object",
+		value: parsed
+	} : {
+		kind: "invalid",
+		reason: "is not a JSON object"
+	};
+}
+function canonical(path) {
+	try {
+		return realpathSync(path);
+	} catch {
+		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) => {
+		const configPath = join(checkout, ".watchmanconfig");
+		const config = readWatchmanConfig(configPath);
+		const { nested, add } = nestedWorktreeIgnores(checkout, worktrees, ignoreDirsOf(config), (dir) => Boolean(getExecutor().runFileQuiet("git", [
+			"-C",
+			checkout,
+			"ls-files",
+			"--",
+			dir
+		]) ?? true));
+		return nested.length > 0 ? [{
+			checkout,
+			configPath,
+			config,
+			nested,
+			add
+		}] : [];
+	});
+}
+async function watchedCheckouts(checkouts, watchman = runWatchman) {
+	if (checkouts.length === 0) return /* @__PURE__ */ new Set();
+	try {
+		const roots = parseWatchRoots(await watchman(["watch-list"], 5e3)) ?? [];
+		const canonicalRoots = new Set(roots.map((root) => canonical(root) ?? root));
+		return new Set(checkouts.filter((checkout) => canonicalRoots.has(checkout)));
+	} catch {
+		return /* @__PURE__ */ new Set();
+	}
+}
+function list(items) {
+	return items.map((item) => `\`${item}\``).join(", ");
+}
+function nestedWorktreeFinding(entry, watched) {
+	const count = entry.nested.length;
+	const now = watched ? ` Watchman watches ${entry.checkout} now; \`watchman watch-del ${entry.checkout}\` and a watchman restart free that memory.` : "";
+	const merge = mergeIgnoreDirs(entry.config, entry.add);
+	const fix = "refusal" in merge ? `${entry.configPath} ${merge.refusal}, so Stim will not edit it. Add ${list(entry.add)} to its ignore_dirs by hand, then commit it.` : `Run \`stim doctor --fix\` to add ${list(entry.add)} to ignore_dirs in ${entry.configPath}, then commit that file. Watchman reads it only when it adds a root, so an existing root needs \`watchman watch-del ${entry.checkout}\` before the ignore applies.`;
+	return {
+		code: WATCHMAN_NESTED_WORKTREES,
+		level: "cost",
+		title: `${count} linked worktree${count === 1 ? " sits" : "s sit"} inside a checkout that Watchman would crawl`,
+		detail: `${list(entry.nested)} ${count === 1 ? "is" : "are"} inside ${entry.checkout}, and its .watchmanconfig does not ignore them. A Watchman root at that checkout, as Jest or a Metro started there registers, crawls every worktree's files, node_modules and build output, which grows the shared daemon's memory and its recrawls.${now}`,
+		fix
+	};
+}
+function writeIgnoreDirs(entry) {
+	const merge = mergeIgnoreDirs(entry.config, entry.add);
+	if ("refusal" in merge) return {
+		status: "refused",
+		reason: `${entry.configPath} ${merge.refusal}`
+	};
+	const tmp = `${entry.configPath}.${process.pid}.${Math.random().toString(36).slice(2)}.tmp`;
+	try {
+		writeFileSync(tmp, `${JSON.stringify(merge.value, null, 2)}\n`);
+		renameSync(tmp, entry.configPath);
+	} catch (error) {
+		rmSync(tmp, { force: true });
+		throw error;
+	}
+	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 };

package/dist/{error-diagnostics-BRXOqDzG.mjs → error-diagnostics--v5HGOU0.mjs}

@@ -1,13 +1,13 @@
-import { t as getExecutor } from "./exec-DWhCZDGm.mjs";
-import { v as launchErrorPreview } from "./command-output-CBtzyIgF.mjs";
-import { R as deviceSlotKey, p as getProject, z as deviceSlotPlatforms } from "./config-CgYMahz7.mjs";
-import { l as resolveProjectMetro } from "./metro-Dh8T4Ytd.mjs";
-import { r as readWorkspaceState$1, w as withDirLock } from "./workspace-state-C59dqG-Z.mjs";
-import { Kt as readWorkspaceLaunches } from "./budget-DIhL2BKx.mjs";
-import { a as parseLease, n as fileLeaseIo, t as deviceLeasePath } from "./device-lease-Co-EwifR.mjs";
-import { o as androidHome, u as androidToolCwd } from "./android-DC3ZLuw0.mjs";
-import { r as deviceConsoleLevel } from "./ios-device-Bn7jWDB1.mjs";
-import { n as parseLogcatLine, t as androidClockOffset } from "./android-CBwCNicO.mjs";
+import { t as getExecutor } from "./exec-i8GDPwq9.mjs";
+import { v as launchErrorPreview } from "./command-output-Bt8ygHE7.mjs";
+import { R as deviceSlotKey, p as getProject, z as deviceSlotPlatforms } from "./config-DC5jEtd1.mjs";
+import { r as readWorkspaceState$1, w as withDirLock } from "./workspace-state-CR9X86xJ.mjs";
+import { A as readWorkspaceLaunches } from "./project-B5eQ1USs.mjs";
+import { u as resolveProjectMetro } from "./metro-DI2AjPF_.mjs";
+import { a as parseLease, n as fileLeaseIo, t as deviceLeasePath } from "./device-lease-Cu7PtQpZ.mjs";
+import { o as androidHome, u as androidToolCwd } from "./android-BdQC6zs1.mjs";
+import { r as deviceConsoleLevel } from "./ios-device-CrW8aMb5.mjs";
+import { n as parseLogcatLine, t as androidClockOffset } from "./android-DE5g_5gv.mjs";
 import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, statSync, unlinkSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, resolve, sep } from "node:path";
 import { NATIVE_CRASH_LOG_PREFIX, attachExpoErrorContext, readLogRecords, readLogTimeline } from "@stim-cli/core/state";

package/dist/{exec-DWhCZDGm.mjs → exec-i8GDPwq9.mjs}

@@ -36,7 +36,7 @@ const defaultExecutor = {
 			throw nameTimeout(error, cmd, timeoutMs);
 		}
 	},
-	runFile(file, args = [], { timeoutMs, killSignal, cwd, env, omitEnv, input, untrimmed } = {}) {
+	runFile(file, args = [], { timeoutMs, killSignal, cwd, env, omitEnv, input, untrimmed, rejectStderr } = {}) {
 		const opts = {
 			encoding: "utf-8",
 			stdio: [
@@ -60,14 +60,14 @@ const defaultExecutor = {
 		}
 		const result = spawn.sync(file, args, opts);
 		if (result.error) throw nameTimeout(Object.assign(result.error, result), [file, ...args].join(" "), timeoutMs);
-		if (result.status !== 0) {
+		if (result.status !== 0 || rejectStderr && String(result.stderr ?? "").trim()) {
 			const stderr = String(result.stderr ?? "");
 			const message = `Command failed: ${[file, ...args].join(" ")}${stderr ? `\n${stderr}` : ""}`;
 			throw Object.assign(new Error(message), result);
 		}
 		return untrimmed ? String(result.stdout) : String(result.stdout).trim();
 	},
-	runFileAsync(file, args = [], { timeoutMs, killSignal, cwd, env, omitEnv } = {}) {
+	runFileAsync(file, args = [], { timeoutMs, killSignal, cwd, env, omitEnv, rejectStderr, onSpawn } = {}) {
 		const command = [file, ...args].join(" ");
 		return new Promise((resolve, reject) => {
 			const opts = { stdio: [
@@ -85,6 +85,13 @@ const defaultExecutor = {
 				opts.env = childEnv;
 			}
 			const child = spawn(file, args, opts);
+			try {
+				onSpawn?.(child);
+			} catch (error) {
+				child.kill("SIGKILL");
+				reject(error);
+				return;
+			}
 			const stdout = [];
 			const stderr = [];
 			let timedOut = false;
@@ -109,7 +116,7 @@ const defaultExecutor = {
 					stderr: err
 				};
 				if (timedOut) reject(nameTimeout(Object.assign(new Error(command), result, { code: "ETIMEDOUT" }), command, timeoutMs));
-				else if (status !== 0) reject(Object.assign(/* @__PURE__ */ new Error(`Command failed: ${command}${err ? `\n${err}` : ""}`), result));
+				else if (status !== 0 || rejectStderr && err.trim()) reject(Object.assign(/* @__PURE__ */ new Error(`Command failed: ${command}${err ? `\n${err}` : ""}`), result));
 				else resolve(out.trim());
 			});
 		});
@@ -146,21 +153,30 @@ function outcomeOf(error) {
 		...code ? { code } : {}
 	};
 }
+let executionId = 0;
 function timedSync(fn, program) {
 	return (...args) => {
 		if (!debugLog.enabled()) return fn(...args);
+		const id = ++executionId;
+		const name = program(...args);
 		const started = performance.now();
+		debugLog.log("exec.start", {
+			program: name,
+			executionId: id
+		});
 		try {
 			const out = fn(...args);
 			debugLog.log("exec", {
-				program: program(...args),
+				program: name,
+				executionId: id,
 				ms: Math.round(performance.now() - started),
 				ok: true
 			});
 			return out;
 		} catch (error) {
 			debugLog.log("exec", {
-				program: program(...args),
+				program: name,
+				executionId: id,
 				ms: Math.round(performance.now() - started),
 				...outcomeOf(error)
 			});
@@ -174,18 +190,26 @@ let active = {
 	runFile: timedSync((file, args, opts) => defaultExecutor.runFile(file, args, opts), (file) => basename(file)),
 	async runFileAsync(file, args, opts) {
 		if (!debugLog.enabled()) return defaultExecutor.runFileAsync(file, args, opts);
+		const id = ++executionId;
+		const name = basename(file);
 		const started = performance.now();
+		debugLog.log("exec.start", {
+			program: name,
+			executionId: id
+		});
 		try {
 			const out = await defaultExecutor.runFileAsync(file, args, opts);
 			debugLog.log("exec", {
-				program: basename(file),
+				program: name,
+				executionId: id,
 				ms: Math.round(performance.now() - started),
 				ok: true
 			});
 			return out;
 		} catch (error) {
 			debugLog.log("exec", {
-				program: basename(file),
+				program: name,
+				executionId: id,
 				ms: Math.round(performance.now() - started),
 				...outcomeOf(error)
 			});