stim 1.23.1 → 1.24.0

package/dist/{toolchain-B9hCFCQw.mjs → toolchain-D3bmRMia.mjs}

@@ -1,8 +1,8 @@
-import { d as spawnDeclared, t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { _ as spawnDeclared, t as getExecutor } from "./exec-VFRpu1iA.mjs";
 import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { a as killOnAbort } from "./operation-exec-BW0em61G.mjs";
-import { o as androidHome } from "./android-C7sVmyI9.mjs";
-import { b as bundlerPin, h as startBuildHeartbeat, r as HEARTBEAT_INTERVAL_MS } from "./xcode-Rq744mBF.mjs";
+import { a as killOnAbort } from "./operation-exec-CUZifp6Z.mjs";
+import { o as androidHome } from "./android-882m4hxX.mjs";
+import { b as bundlerPin, h as startBuildHeartbeat, r as HEARTBEAT_INTERVAL_MS } from "./xcode-DHu41qQ4.mjs";
 import { createRequire } from "node:module";
 import { existsSync, mkdtempSync, readFileSync, readdirSync, realpathSync, rmSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
@@ -211,18 +211,23 @@ function podEnvForRuby(version, { env = ambientEnv(), home = (process.platform =
 		{ bin: join(home, ".rbenv", "versions", version, "bin") },
 		{
 			bin: join(home, ".rvm", "rubies", `ruby-${version}`, "bin"),
-			gems: join(home, ".rvm", "gems", `ruby-${version}`)
+			rvm: `ruby-${version}`
 		},
 		{ 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 ?? ""}`;
-		if (c.gems && exists(c.gems)) {
-			out.GEM_HOME = c.gems;
-			out.GEM_PATH = c.gems;
+		if (c.rvm) {
+			const rvm = rvmRuby(join(home, ".rvm"), c.rvm, exists);
+			out.PATH = prependPath(rvm.bins, out.PATH);
+			if (exists(rvm.gems.home)) {
+				out.GEM_HOME = rvm.gems.home;
+				out.GEM_PATH = rvm.gems.path;
+			}
+			return out;
 		}
+		out.PATH = `${c.bin}${delimiter}${out.PATH ?? ""}`;
 		return out;
 	}
 	if (env.GEM_HOME) return out;
@@ -243,6 +248,22 @@ function podEnvForRuby(version, { env = ambientEnv(), home = (process.platform =
 	if (login.GEM_PATH) out.GEM_PATH = login.GEM_PATH;
 	return out;
 }
+/** What `rvm use <name>` sets: the gemset and its `@global` gemset on `GEM_PATH` and their `bin` directories on `PATH`. */
+function rvmRuby(rvm, name, exists) {
+	const gems = join(rvm, "gems", name);
+	const global = `${gems}@global`;
+	return {
+		bins: [
+			join(gems, "bin"),
+			join(global, "bin"),
+			join(rvm, "rubies", name, "bin")
+		].filter(exists),
+		gems: {
+			home: gems,
+			path: [gems, global].join(delimiter)
+		}
+	};
+}
 /**
 * The Ruby a new login shell makes the default, read from the version manager's files: rvm's `default` alias in
 * `~/.rvm/config/alias`, or rbenv's global `~/.rbenv/version`.
@@ -250,21 +271,7 @@ function podEnvForRuby(version, { env = ambientEnv(), home = (process.platform =
 function defaultRuby(home, exists, read) {
 	const rvm = join(home, ".rvm");
 	const alias = /^default=(\S+)$/m.exec(read(join(rvm, "config", "alias")) ?? "")?.[1];
-	if (alias && exists(join(rvm, "rubies", alias, "bin"))) {
-		const gems = join(rvm, "gems", alias);
-		const global = `${gems}@global`;
-		return {
-			bins: [
-				join(gems, "bin"),
-				join(global, "bin"),
-				join(rvm, "rubies", alias, "bin")
-			].filter(exists),
-			gems: {
-				home: gems,
-				path: [gems, global].join(delimiter)
-			}
-		};
-	}
+	if (alias && exists(join(rvm, "rubies", alias, "bin"))) return rvmRuby(rvm, alias, exists);
 	const rbenv = read(join(home, ".rbenv", "version"))?.trim();
 	if (rbenv && exists(join(home, ".rbenv", "versions", rbenv, "bin"))) return { bins: [join(home, ".rbenv", "versions", rbenv, "bin")] };
 	return null;
@@ -413,7 +420,7 @@ async function ensureBundledGems(root, pin, ctx) {
 			failed: true,
 			code: DEPS_ERROR,
 			reason: `\`bundle install\` failed (${how}).`,
-			remedy: frozenRemedy(root, pin, transcript) || gemInstallRemedy(root, pin),
+			remedy: frozenRemedy(pin, transcript) || gemInstallRemedy(root, pin),
 			diagnosticSource: extracted ? extracted.source : "tail",
 			diagnosticLines: extracted ? extracted.lines : [],
 			lastLines: install.transcript.slice(-20),
@@ -441,13 +448,13 @@ function bundlerSpawnFailure(command, run, pin) {
 function missingBundlerNote(pin) {
 	return `${pin.lockfile} pins this project's CocoaPods, but \`bundle\` is not on PATH, so pods run as plain \`pod install\` with whatever CocoaPods PATH resolves to (\`gem install bundler\` to use the pin).`;
 }
-function frozenRemedy(root, pin, transcript) {
+function frozenRemedy(pin, transcript) {
 	if (!BUNDLER_FROZEN.test(transcript)) return void 0;
-	return `Stim runs bundler with BUNDLE_FROZEN so it can never write into your checkout, and ${pin.gemfile} no longer matches ${pin.lockfile}. Run \`cd ${root} && bundle install\` yourself, keep the updated Gemfile.lock, then run again.`;
+	return `Stim runs bundler with BUNDLE_FROZEN so it can never write into your checkout, and ${pin.gemfile} no longer matches ${pin.lockfile}. Run \`cd ${dirname(pin.gemfile)} && bundle install\` yourself, keep the updated Gemfile.lock, then run again.`;
 }
 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.`;
+	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 ${dirname(pin.gemfile)} && 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), directory = join(root, "ios") } = {}) {
 	const iosDir = directory;
@@ -466,7 +473,7 @@ async function runPodInstall(root, logWriter, { spawnFn = null, now = Date.now,
 		onHeartbeat
 	};
 	const notes = [];
-	const pin = bundlerPin(root);
+	const pin = bundlerPin(root, iosDir);
 	let bundler = false;
 	if (pin) {
 		const gems = await ensureBundledGems(root, pin, ctx);
@@ -531,9 +538,9 @@ async function runPodInstall(root, logWriter, { spawnFn = null, now = Date.now,
 }
 function podFailureRemedy(root, pin, transcript) {
 	if (pin) {
-		const frozen = frozenRemedy(root, pin, transcript);
+		const frozen = frozenRemedy(pin, transcript);
 		if (frozen) return frozen;
-		if (BUNDLER_NO_COCOAPODS.test(transcript)) return `${pin.lockfile} resolves cocoapods, but bundler found no \`pod\` executable in the bundle it loaded: the installed gems belong to a different Gemfile than ${pin.gemfile}, or that Gemfile's bundle was never installed. Run \`cd ${root} && bundle install && bundle exec pod --version\` and make that work, then run again.`;
+		if (BUNDLER_NO_COCOAPODS.test(transcript)) return `${pin.lockfile} resolves cocoapods, but bundler found no \`pod\` executable in the bundle it loaded: the installed gems belong to a different Gemfile than ${pin.gemfile}, or that Gemfile's bundle was never installed. Run \`cd ${dirname(pin.gemfile)} && bundle install && bundle exec pod --version\` and make that work, then run again.`;
 	}
 	const pinned = /Could not find proper version of cocoapods/.test(transcript) ? readRubyVersion(root) : null;
 	if (!pinned) return void 0;
@@ -577,8 +584,8 @@ async function quietAsync(file, args) {
 		return null;
 	}
 }
-async function iosToolchainAsync(root, native) {
-	const rubyVersion = native ? null : readRubyVersion(root);
+/** This Mac's iOS toolchain, with the CocoaPods that `pod install` in `podDirectory` runs; null skips CocoaPods. */
+async function iosToolchainAsync(root, podDirectory) {
 	const [xcode, simulatorSdk, cocoapods] = await Promise.all([
 		quietAsync("xcodebuild", ["-version"]),
 		quietAsync("xcrun", [
@@ -586,7 +593,7 @@ async function iosToolchainAsync(root, native) {
 			"iphonesimulator",
 			"--show-sdk-version"
 		]),
-		native ? null : cocoapodsVersionAsync(rubyVersion)
+		podDirectory === null ? null : projectCocoapodsVersion(root, podDirectory)
 	]);
 	return assembleIosToolchain(xcode, simulatorSdk, cocoapods);
 }
@@ -618,11 +625,14 @@ function cocoapodsVersion(rubyVersion) {
 		env: podProbeEnv(podEnvForRuby(rubyVersion))
 	}));
 }
-async function cocoapodsVersionAsync(rubyVersion) {
+async function projectCocoapodsVersion(root, podDirectory) {
+	const pin = bundlerPin(root, podDirectory);
+	if (pin) return pin.cocoapods;
 	try {
 		return podVersionLine(await getExecutor().runFileAsync("pod", ["--version"], {
 			timeoutMs: 2e4,
-			env: podProbeEnv(await podEnvForRubyAsync(rubyVersion))
+			cwd: podDirectory,
+			env: podProbeEnv(await podEnvForRubyAsync(readRubyVersion(root)))
 		}));
 	} catch {
 		return null;
@@ -832,6 +842,17 @@ function toolchainMismatches(target, worker) {
 			reason: `${worker.os} there, and ${name} builds need a Mac`
 		}];
 	}
+	if (target.platform === "macos" && target.runsOnWorker) {
+		if (!worker.xcode) out.push({
+			code: "xcode",
+			reason: "no Xcode there"
+		});
+		if (!worker.macosSdk) out.push({
+			code: "macos-sdk",
+			reason: "no macOS SDK there"
+		});
+		return out;
+	}
 	if (worker.arch !== local.arch) out.push({
 		code: "arch",
 		reason: `CPU ${worker.arch} there, ${local.arch} here`

package/dist/trigger-BLsHgAGR.mjs

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

package/dist/{trigger-Cbyc41d_.mjs → trigger-CBMe2YLH.mjs}

@@ -1,7 +1,7 @@
-import { t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { t as getExecutor } from "./exec-VFRpu1iA.mjs";
 import { t as resolveMaintenanceSettings } from "./settings-Djl-mpjX.mjs";
 import { t as spawnEntry } from "./spawn-entry-jw19m8Nl.mjs";
-import { n as windowsLauncherArgs } from "./detached-entry-BwNEtIrP.mjs";
+import { n as windowsLauncherArgs } from "./detached-entry-KmieOKgN.mjs";
 import { n as stampAttempt, r as due, t as capChildLog } from "./attempt-DW-mQqM7.mjs";
 import { readClaimSet } from "@stim-cli/core/ownership-claim";
 import { closeSync, openSync } from "node:fs";

package/dist/{warm-progress-CA3TgT3-.mjs → warm-progress-ol0ZypEu.mjs}

@@ -1,10 +1,10 @@
-import { b as debugLog, n as isTimeoutError, r as WorkspaceProcessCleanupError, t as getExecutor, x as ownership_claim_exports } from "./exec-DEoAhcze.mjs";
+import { D as ownership_claim_exports, E as debugLog, l as WorkspaceProcessCleanupError, n as isTimeoutError, t as getExecutor } from "./exec-VFRpu1iA.mjs";
 import { d as workspaceDir, n as ensureWorkspaceStorage, v as withDirLock } from "./paths-DQtTgsBf.mjs";
-import { l as gitQuietAsync, o as git$1, s as gitAsync } from "./operation-exec-BW0em61G.mjs";
-import { f as agentKey, m as discoverAgentSessions, o as updateWorkspaceState, p as attributeAgentSessions } from "./workspace-state-U08dEzhG.mjs";
-import { wt as linkedWorktreesOnDisk, yt as gitCommonDirOnDisk } from "./settings-C7O8A6ZI.mjs";
-import { V as ownedAvdDirectory } from "./android-C7sVmyI9.mjs";
-import { s as pullRequestLookups } from "./pull-request-W1IuLXDt.mjs";
+import { l as gitQuietAsync, o as git$1, s as gitAsync } from "./operation-exec-CUZifp6Z.mjs";
+import { h as discoverAgentSessions, m as attributeAgentSessions, o as updateWorkspaceState, p as agentKey } from "./workspace-state-CeBpIZgr.mjs";
+import { wt as linkedWorktreesOnDisk, yt as gitCommonDirOnDisk } from "./settings-RKwY33wv.mjs";
+import { V as ownedAvdDirectory } from "./android-882m4hxX.mjs";
+import { s as pullRequestLookups } from "./pull-request-CbNlkFok.mjs";
 import { clearClaimChild, markClaimChildPending, releaseClaim, setClaimChild, tryAcquireClaim } from "@stim-cli/core/ownership-claim";
 import { randomUUID } from "node:crypto";
 import { existsSync, mkdirSync, readdirSync, realpathSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";

package/dist/{web-DRF_oFXk.mjs → web-BH7peScT.mjs}

@@ -1,20 +1,22 @@
 import { m as workspaceLogsDir } from "./paths-DQtTgsBf.mjs";
-import { E as upsertProject, p as getProject } from "./config-DlrsduwG.mjs";
-import { f as refuseNoProject, l as phaseLine } from "./command-output-YKGWivpG.mjs";
-import { i as recordWorkspaceUse } from "./workspace-state-U08dEzhG.mjs";
-import { J as resolveProjectSettingsAsync, a as SETTING_SHAPE_REMEDY, et as settingShapeErrors } from "./settings-C7O8A6ZI.mjs";
-import { f as projectRegistry, n as findCommandWorkspace } from "./project-DhCtQWWU.mjs";
-import { o as readWebRecord, r as cdpEndpoint } from "./state--smjFSTL.mjs";
-import { a as workspaceLinkLine, o as workspaceLinks } from "./stim-desktop-D5OGpYZM.mjs";
-import { t as liveWebRecord } from "./page-DBL2PiUU.mjs";
-import { n as ensureWorkspaceStorageSafely } from "./native-runtime-DBRfY_PN.mjs";
+import { E as upsertProject, O as withConfigLockAsync, p as getProject } from "./config-BZhXY15H.mjs";
+import { f as refuseNoProject, l as phaseLine } from "./command-output-DxC0k2rk.mjs";
+import { i as recordWorkspaceUse } from "./workspace-state-CeBpIZgr.mjs";
+import { J as resolveProjectSettingsAsync, a as SETTING_SHAPE_REMEDY, et as settingShapeErrors } from "./settings-RKwY33wv.mjs";
+import { f as projectRegistry, n as findCommandWorkspace } from "./project-Dz-hWkb-.mjs";
+import { a as workspaceLinkLine, o as workspaceLinks } from "./stim-desktop-DS0mzR8U.mjs";
+import { o as readWebRecord, r as cdpEndpoint } from "./state-B1ig0Kqy.mjs";
+import { t as liveWebRecord } from "./page-CzEA_-5_.mjs";
+import { n as ensureWorkspaceStorageSafely } from "./native-runtime-DgtJkzIa.mjs";
 import chalk from "chalk";
 //#region src/commands/web.ts
 const printNote = (line) => console.error(line);
 async function runWeb({ root, headed, note, context }) {
 	const startedAt = Date.now();
 	await ensureWorkspaceStorageSafely(root, { note });
-	if (!getProject(root)) upsertProject(root, {});
+	await withConfigLockAsync(() => {
+		if (!getProject(root)) upsertProject(root, {});
+	});
 	const { settings } = await resolveProjectSettingsAsync(root, context ? {
 		env: context.env,
 		signal: context.signal

package/dist/web-BdOFlTJr.mjs

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

package/dist/web-run.mjs

@@ -1,13 +1,12 @@
-import { g as process_identity_exports, t as getExecutor, x as ownership_claim_exports } from "./exec-DEoAhcze.mjs";
-import { u as cancellableSleep } from "./operation-exec-BW0em61G.mjs";
+import { D as ownership_claim_exports, S as process_identity_exports, o as cancellableSleep, t as getExecutor } from "./exec-VFRpu1iA.mjs";
+import { i as recordCreatedDevice } from "./created-devices-D2Aca-xu.mjs";
+import { f as signalProcessTree } from "./metro-Bu8LBfzS.mjs";
 import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
-import { f as signalProcessTree } from "./metro-DiXtA3Ty.mjs";
-import { c as webClaimRoot, f as webLogFile, g as chromeProcessState, h as writeWebRecord, i as clearWebRecord, l as webDir, n as browserLogFile, p as webProfileDir, s as updateWebRecord, v as liveProfileHolder, y as removeSingletonFiles } from "./state--smjFSTL.mjs";
-import { l as probeWebDrivers } from "./activity-BpWUPgUm.mjs";
-import { i as recordCreatedDevice } from "./created-devices-x9rN6bhs.mjs";
-import { t as connectOwnedBrowser } from "./cdp-3fwICjzi.mjs";
-import { t as relaunchWithLogFile } from "./detached-entry-BwNEtIrP.mjs";
-import { i as chromeArgs, n as DESKTOP_PAGE, r as PHONE_SCREEN } from "./chrome-Bbw689-6.mjs";
+import { c as webClaimRoot, f as webLogFile, g as chromeProcessState, h as writeWebRecord, i as clearWebRecord, l as webDir, n as browserLogFile, p as webProfileDir, s as updateWebRecord, v as liveProfileHolder, y as removeSingletonFiles } from "./state-B1ig0Kqy.mjs";
+import { l as probeWebDrivers } from "./activity-Dq3ZcdD8.mjs";
+import { t as connectOwnedBrowser } from "./cdp-BG3FJCCx.mjs";
+import { t as relaunchWithLogFile } from "./detached-entry-KmieOKgN.mjs";
+import { i as chromeArgs, n as DESKTOP_PAGE, r as PHONE_SCREEN } from "./chrome-BvV8ssI3.mjs";
 import { existsSync, mkdirSync, openSync, realpathSync } from "node:fs";
 import { isAbsolute, resolve } from "node:path";
 import { LOG_ROTATE_BYTES } from "@stim-cli/core";

package/dist/windows-report.mjs

@@ -1,17 +1,28 @@
-import { t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { t as getExecutor } from "./exec-VFRpu1iA.mjs";
+import { writeFileSync } from "node:fs";
 //#region bin/windows-report.ts
 const request = JSON.parse(process.env.STIM_REPORT_CHILD ?? "");
 const env = { ...process.env };
 delete env.STIM_REPORT_CHILD;
+const mark = (path) => {
+	if (!path) return;
+	try {
+		writeFileSync(path, "");
+	} catch {}
+};
 const child = getExecutor().spawn(request.file, request.args, {
 	stdio: "inherit",
 	env
 });
+child.once("spawn", () => {
+	mark(request.started);
+});
 child.once("error", (error) => {
 	console.error(error.message);
 	process.exitCode = 1;
 });
 child.once("close", (status) => {
+	mark(request.closed);
 	process.exitCode = status ?? 1;
 });
 //#endregion

package/dist/windows-report.ps1

@@ -40,4 +40,4 @@ $start.Arguments = '"' + $request.entry + '"'
 $start.UseShellExecute = $false
 $child = [System.Diagnostics.Process]::Start($start)
 $child.WaitForExit()
-[System.Environment]::Exit($child.ExitCode)
+exit $child.ExitCode

package/dist/{workspace-state-U08dEzhG.mjs → workspace-state-CeBpIZgr.mjs}

@@ -1,7 +1,7 @@
-import { g as process_identity_exports, t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { S as process_identity_exports, t as getExecutor } from "./exec-VFRpu1iA.mjs";
 import { _ as workspaceStateLock, g as workspaceStateFile$1, n as ensureWorkspaceStorage, r as ensureWorkspaceStorageAsync, v as withDirLock, y as withDirLockAsync } from "./paths-DQtTgsBf.mjs";
-import { A as writeConfigSettingAsync, k as writeConfigSetting, m as getProjectSettings } from "./config-DlrsduwG.mjs";
-import { ot as workspaceHiddenSetting } from "./settings-C7O8A6ZI.mjs";
+import { A as writeConfigSettingAsync, k as writeConfigSetting, m as getProjectSettings } from "./config-BZhXY15H.mjs";
+import { ot as workspaceHiddenSetting } from "./settings-RKwY33wv.mjs";
 import { existsSync, mkdirSync, readFileSync, realpathSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, isAbsolute, join, relative } from "node:path";
@@ -275,6 +275,13 @@ function writeWorkspaceState(root, patch) {
 		...patch
 	}));
 }
+/** Merges a patch into workspace state after asynchronously acquiring its lock. */
+function writeWorkspaceStateAsync(root, patch, signal) {
+	return updateWorkspaceStateAsync(root, (state) => ({
+		...state,
+		...patch
+	}), signal);
+}
 function updateWorkspaceState(root, update) {
 	return withWorkspaceStateLock(root, () => replaceWorkspaceState(root, update(readWorkspaceState(root) ?? {})));
 }
@@ -382,4 +389,4 @@ function workspaceUsePatch(now, env, commandCwd) {
 	};
 }
 //#endregion
-export { recordWorkspaceUseAsync as a, withWorkspaceStateLock as c, writeWorkspaceState as d, agentKey as f, recordWorkspaceUse as i, withWorkspaceStateLockAsync as l, discoverAgentSessions as m, clearWorkspaceStateKeys as n, updateWorkspaceState as o, attributeAgentSessions as p, readWorkspaceState$1 as r, updateWorkspaceStateAsync as s, clearWorkspaceStateKey as t, workspaceLastUsed as u };
+export { recordWorkspaceUseAsync as a, withWorkspaceStateLock as c, writeWorkspaceState as d, writeWorkspaceStateAsync as f, discoverAgentSessions as h, recordWorkspaceUse as i, withWorkspaceStateLockAsync as l, attributeAgentSessions as m, clearWorkspaceStateKeys as n, updateWorkspaceState as o, agentKey as p, readWorkspaceState$1 as r, updateWorkspaceStateAsync as s, clearWorkspaceStateKey as t, workspaceLastUsed as u };

package/dist/{workspaces-e41xsjKr.mjs → workspaces-CSV2Orf4.mjs}

@@ -1,20 +1,20 @@
-import { a as workspaceProcessLockError, c as declareSpawnsOn, f as stopDeclaringSpawnsOn, g as process_identity_exports, i as withWorkspaceProcessLock, o as workspaceProcessLockPath, r as WorkspaceProcessCleanupError, t as getExecutor, x as ownership_claim_exports } from "./exec-DEoAhcze.mjs";
+import { D as ownership_claim_exports, S as process_identity_exports, c as throwIfCancelled, d as workspaceProcessLockError, f as workspaceProcessLockPath, l as WorkspaceProcessCleanupError, m as declareSpawnsOn, o as cancellableSleep, t as getExecutor, u as withWorkspaceProcessLock, v as stopDeclaringSpawnsOn } from "./exec-VFRpu1iA.mjs";
 import { d as workspaceDir, h as workspaceName$1, l as workspaceAgentDeviceDir } from "./paths-DQtTgsBf.mjs";
-import { F as isOnMountedVolume, G as projectDeviceSlots, H as deviceSlotPlatforms, I as listMountedVolumes, L as measuredDirectorySizeAsync, O as withConfigLockAsync$1, P as formatBytes, _ as loadConfig$1, d as getConfigDir, g as isPathPrefix, j as acquireAvdClaim, p as getProject } from "./config-DlrsduwG.mjs";
+import { F as isOnMountedVolume, G as projectDeviceSlots, H as deviceSlotPlatforms, I as listMountedVolumes, L as measuredDirectorySizeAsync, O as withConfigLockAsync$1, P as formatBytes, _ as loadConfig$1, d as getConfigDir, g as isPathPrefix, j as acquireAvdClaim, p as getProject } from "./config-BZhXY15H.mjs";
 import { t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { a as formatElapsed, l as phaseLine } from "./command-output-YKGWivpG.mjs";
-import { f as throwIfCancelled, t as runOperationFile, u as cancellableSleep } from "./operation-exec-BW0em61G.mjs";
-import { l as withWorkspaceStateLockAsync, r as readWorkspaceState$1, u as workspaceLastUsed } from "./workspace-state-U08dEzhG.mjs";
-import { Nt as repoRootAsync, ut as resolveTailscaleBinary } from "./settings-C7O8A6ZI.mjs";
-import { a as macosRuntimeClaim, n as macosDir } from "./state-08I3hw3_.mjs";
-import { c as pidExists, f as signalProcessTree, p as signalProcessTreeAsync } from "./metro-DiXtA3Ty.mjs";
-import { _ as chromeProcessStateAsync, c as webClaimRoot, i as clearWebRecord, o as readWebRecord, p as webProfileDir, t as CDP_PORT_LABEL, u as webFacts, v as liveProfileHolder, y as removeSingletonFiles } from "./state--smjFSTL.mjs";
+import { a as formatElapsed, l as phaseLine } from "./command-output-DxC0k2rk.mjs";
+import { t as runOperationFile } from "./operation-exec-CUZifp6Z.mjs";
+import { l as withWorkspaceStateLockAsync, r as readWorkspaceState$1, u as workspaceLastUsed } from "./workspace-state-CeBpIZgr.mjs";
+import { Nt as repoRootAsync, ut as resolveTailscaleBinary } from "./settings-RKwY33wv.mjs";
+import { a as macosRuntimeClaim, n as macosDir } from "./state-BfAltYJP.mjs";
+import { H as ownedAvdMatchesConfiguration, K as ownedAvdSystemImage, L as listOrphanedAvdDirectories, S as deleteAvd, V as ownedAvdDirectory, _t as parkSim, bt as removeParkedAfter, g as avdPathExists, ht as eraseParkedAfter, it as shutdownAndroidEmulator, j as listAdbDevicesAsync, lt as wipeAvdUserData, nt as resolveOwnedAvdSerialAsync, p as assertOwnedAvdStoppedAsync, st as waitForAndroidEmulatorShutdown, ut as isStimOwnedAvd, v as avdStorageRoots, yt as readParked } from "./android-882m4hxX.mjs";
+import { i as recordCreatedDevice, n as forgetCreatedDeviceAsync, r as readCreatedDevices$1, t as forgetCreatedDevice } from "./created-devices-D2Aca-xu.mjs";
+import { c as pidExists, f as signalProcessTree, p as signalProcessTreeAsync } from "./metro-Bu8LBfzS.mjs";
+import { _ as chromeProcessStateAsync, c as webClaimRoot, i as clearWebRecord, o as readWebRecord, p as webProfileDir, t as CDP_PORT_LABEL, u as webFacts, v as liveProfileHolder, y as removeSingletonFiles } from "./state-B1ig0Kqy.mjs";
 import { t as canonicalPath } from "./paths-BsJMoPP2.mjs";
-import { N as listBuildLocks, d as readAgentDeviceRecords, t as agentDeviceDaemon } from "./activity-BpWUPgUm.mjs";
-import { i as recordCreatedDevice, r as readCreatedDevices$1, t as forgetCreatedDevice } from "./created-devices-x9rN6bhs.mjs";
-import { H as ownedAvdMatchesConfiguration, K as ownedAvdSystemImage, L as listOrphanedAvdDirectories, S as deleteAvd, V as ownedAvdDirectory, at as waitForAndroidEmulatorShutdown, et as resolveOwnedAvdSerialAsync, g as avdPathExists, gt as parkSim, j as listAdbDevicesAsync, lt as isStimOwnedAvd, mt as eraseParkedAfter, nt as shutdownAndroidEmulator, p as assertOwnedAvdStoppedAsync, st as wipeAvdUserData, v as avdStorageRoots, vt as readParked, yt as removeParkedAfter } from "./android-C7sVmyI9.mjs";
-import { E as resolveOwnedIosSim, O as shutdownIosSim, S as renameIosSim, c as eraseIosSim, f as listAllIosSimsAsync, o as deleteIosSim, p as listIosDeviceTypesAsync, s as deleteParkedIosSim, v as parkedSimName, y as parseRuntimeVersion } from "./ios-hcBpnEGk.mjs";
-import { r as releaseBrowserPort } from "./named-ports-DkEzOfzO.mjs";
+import { N as listBuildLocks, d as readAgentDeviceRecords, t as agentDeviceDaemon } from "./activity-Dq3ZcdD8.mjs";
+import { E as resolveOwnedIosSim, O as shutdownIosSim, S as renameIosSim, c as eraseIosSim, f as listAllIosSimsAsync, o as deleteIosSim, p as listIosDeviceTypesAsync, s as deleteParkedIosSim, v as parkedSimName, y as parseRuntimeVersion } from "./ios-CVUFFZ6C.mjs";
+import { r as releaseBrowserPort } from "./named-ports-BWDuU5oQ.mjs";
 import { createHash, randomUUID } from "node:crypto";
 import { closeSync, existsSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, rmdirSync, statSync, unlinkSync, watch, writeFileSync } from "node:fs";
 import { isDeepStrictEqual } from "node:util";
@@ -22,7 +22,7 @@ import { homedir } from "node:os";
 import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { ambientContext, ambientEnv, ambientWrite } from "@stim-cli/core";
 import { buildSlotsDir, hostedNativeRecords, isJsonObject, macosAppState, parseHostedNativePlacement, readJsonFile, readMacosRecord, requireAutomaticMachine, tryAcquireBuildSlotClaim, unreadableHostedNative } from "@stim-cli/core/state";
-import { basename as basename$1, isAbsolute as isAbsolute$1, join as join$1, relative as relative$1 } from "path";
+import { basename as basename$1, dirname as dirname$1, isAbsolute as isAbsolute$1, join as join$1, relative as relative$1 } from "path";
 import chalk from "chalk";
 import { existsSync as existsSync$1, lstatSync as lstatSync$1, readdirSync as readdirSync$1, statSync as statSync$1 } from "fs";
 import { lstat, readFile, readdir, rm, stat, unlink } from "node:fs/promises";
@@ -641,13 +641,13 @@ async function parkOwnedIosSim(settled, udid, park, operation) {
 	};
 	return {
 		record,
-		evicted: parkSim({
+		evicted: await withConfigLockAsync$1(() => parkSim({
 			platform: "ios",
 			projectPath: park.projectPath,
 			slot: park.slot,
 			record,
 			max: park.max
-		})
+		}))
 	};
 }
 async function teardownOwnedIosSim(udid, { del = false, label, park, workspace, shutdownClock = {}, operation } = {}) {
@@ -775,7 +775,7 @@ async function removeOrphanedAvdDirectory(candidate, owner, operation) {
 	} catch (error) {
 		throw new Error(`Could not remove AVD data at ${detached}; retry gc --delete: ${error.message}`, { cause: error });
 	}
-	forgetCreatedDevice("android", basename(detached, ".avd"));
+	await forgetCreatedDeviceAsync("android", basename(detached, ".avd"));
 }
 async function teardownUnregisteredAvd(avdName, del, owner, surveyed, operation) {
 	operation?.signal.throwIfAborted();
@@ -812,7 +812,7 @@ async function teardownOwnedAvd(avdName, options = {}) {
 		if (operation) declareSpawnsOn(operation, claim);
 		const result = await teardownClaimedAvd(avdName, claim, options);
 		operation?.signal.throwIfAborted();
-		if (result.status === "torn-down" || result.status === "missing") options.onRemoved?.();
+		if (result.status === "torn-down" || result.status === "missing") await options.onRemoved?.();
 		return result;
 	} catch (error) {
 		if (claim && (error instanceof WorkspaceProcessCleanupError || error instanceof Error && "reportCleanup" in error)) {
@@ -948,21 +948,22 @@ async function teardownClaimedAvd(avdName, claim, { operation, del = false, wipe
 			if (park && park.max > 0) try {
 				const systemImage = ownedAvdSystemImage(avdName);
 				if (!systemImage || !park.configuration || !ownedAvdMatchesConfiguration(avdName, park.configuration)) throw new Error("the AVD has no verified creation configuration");
-				const evicted = parkSim({
+				const record = {
+					udid: avdName,
+					name: avdName,
+					systemImage,
+					configuration: park.configuration,
+					parkedAt: (/* @__PURE__ */ new Date()).toISOString(),
+					...park.appId ? { packageName: park.appId } : {},
+					...park.cacheKey ? { cacheKey: park.cacheKey } : {}
+				};
+				const evicted = await withConfigLockAsync$1(() => parkSim({
 					platform: "android",
 					projectPath: park.projectPath,
 					slot: park.slot,
 					max: park.max,
-					record: {
-						udid: avdName,
-						name: avdName,
-						systemImage,
-						configuration: park.configuration,
-						parkedAt: (/* @__PURE__ */ new Date()).toISOString(),
-						...park.appId ? { packageName: park.appId } : {},
-						...park.cacheKey ? { cacheKey: park.cacheKey } : {}
-					}
-				});
+					record
+				}));
 				const removed = [];
 				const failures = [];
 				for (const entry of evicted) {
@@ -1132,7 +1133,7 @@ async function teardownBrowserHeld(root, { deleteProfile = false, operation } =
 				force: true
 			});
 			signal?.throwIfAborted();
-			forgetCreatedDevice("web", profile);
+			await forgetCreatedDeviceAsync("web", profile);
 		}
 		return record ? {
 			status: "torn-down",
@@ -2125,6 +2126,9 @@ function rootPresence(path) {
 		return code === "ENOENT" || code === "ENOTDIR" ? false : null;
 	}
 }
+function workspaceDirRemoved(dir) {
+	return existsSync$1(workspacesRoot()) && canonicalPath(dirname$1(dir)) === canonicalPath(workspacesRoot()) && rootPresence(dir) === false;
+}
 async function collectOrphanedWorkspaces(registryKeys, mountedVolumes, { measure = true, operation } = {}) {
 	const classified = {
 		orphaned: [],
@@ -2377,4 +2381,4 @@ function sizeText(bytes) {
 	return bytes === null ? "size unknown" : formatBytes(bytes);
 }
 //#endregion
-export { teardownParkedAvd as A, createGcResults as B, runningBundleInstancesAsync as C, teardownOwnedAvd as D, teardownBrowserHeld as E, writeUsageCache as F, acquireBuildSlot as I, listBuildSlots as L, probePublicHttp as M, canonical$1 as N, teardownOwnedBrowser as O, measureDu as P, releaseBuildSlot as R, withManagedTunnelRemovalLock as S, eraseParkedIosSim as T, takeGcResults as V, stopTunnel as _, collectWorkspaceOutputs as a, withManagedRemoteWorktreeRemovalLock as b, listWorkspaceDirs as c, emptyWorkspaceDir as d, withIdleWorkspace as f, startTunnelSequence as g, resolveSupervisorTarget as h, collectOrphanedWorkspaces as i, teardownParkedIosSim as j, teardownOwnedIosSim as k, rootPresence as l, workspaceInUseAsync as m, WORKSPACE_OUTPUT_DIRS as n, deleteOrphanedWorkspaces as o, workspaceInUse as p, clearWorkspaceOutputs as r, isInsideWorkspaces as s, REBUILD_COST as t, sizeText as u, terminateChild as v, eraseParkedAvd as w, withManagedTunnelLock as x, withManagedRemoteWorktreeLock as y, GC_OUTPUT as z };
+export { teardownOwnedIosSim as A, GC_OUTPUT as B, withManagedTunnelRemovalLock as C, teardownBrowserHeld as D, eraseParkedIosSim as E, measureDu as F, takeGcResults as H, writeUsageCache as I, acquireBuildSlot as L, teardownParkedIosSim as M, probePublicHttp as N, teardownOwnedAvd as O, canonical$1 as P, listBuildSlots as R, withManagedTunnelLock as S, eraseParkedAvd as T, createGcResults as V, startTunnelSequence as _, collectWorkspaceOutputs as a, withManagedRemoteWorktreeLock as b, listWorkspaceDirs as c, workspaceDirRemoved as d, emptyWorkspaceDir as f, resolveSupervisorTarget as g, workspaceInUseAsync as h, collectOrphanedWorkspaces as i, teardownParkedAvd as j, teardownOwnedBrowser as k, rootPresence as l, workspaceInUse as m, WORKSPACE_OUTPUT_DIRS as n, deleteOrphanedWorkspaces as o, withIdleWorkspace as p, clearWorkspaceOutputs as r, isInsideWorkspaces as s, REBUILD_COST as t, sizeText as u, stopTunnel as v, runningBundleInstancesAsync as w, withManagedRemoteWorktreeRemovalLock as x, terminateChild as y, releaseBuildSlot as z };

package/dist/{worktree-BEwxVwKF.mjs → worktree-DEDUzO_L.mjs}

@@ -1,2 +1,2 @@
-import { _ as worktreeCommand, a as matchWorktreeEntry, c as reclaimKeys, d as removalBlockers, f as removalPath, g as warmedWorkspace, h as warmWorktreeTarget, i as excludeWatchmanCookies, l as registerRemove, m as removeWorktreeTarget, n as dependencyInstallCommand, o as nestedWorktrees, p as removalRemedy, r as excludePodChurn, s as porcelainPath, t as customIosDirs, u as registerWarm } from "./worktree-B4Nj3EGS.mjs";
+import { _ as worktreeCommand, a as matchWorktreeEntry, c as reclaimKeys, d as removalBlockers, f as removalPath, g as warmedWorkspace, h as warmWorktreeTarget, i as excludeWatchmanCookies, l as registerRemove, m as removeWorktreeTarget, n as dependencyInstallCommand, o as nestedWorktrees, p as removalRemedy, r as excludePodChurn, s as porcelainPath, t as customIosDirs, u as registerWarm } from "./worktree-Dw8kfacb.mjs";
 export { customIosDirs, worktreeCommand as default, dependencyInstallCommand, excludePodChurn, excludeWatchmanCookies, matchWorktreeEntry, nestedWorktrees, porcelainPath, reclaimKeys, registerRemove, registerWarm, removalBlockers, removalPath, removalRemedy, removeWorktreeTarget, warmWorktreeTarget, warmedWorkspace };