stim 1.3.1 → 1.4.0

package/dist/{android-hMj83VpN.mjs → android-BkM4qTaN.mjs}

@@ -1,18 +1,17 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { u as getConfigDir } from "./config-CcefMY2Q.mjs";
-import { r as register } from "./cache-manifest-CXR-Y8pH.mjs";
-import { b as sharedBuildCache } from "./state-B3XA2wp2.mjs";
-import { r as pidExists } from "./metro-CORqXyTL.mjs";
-import { a as formatElapsed } from "./command-output-8wHMEde0.mjs";
-import { d as releaseClaim, i as claimRemoveCommand, m as tryAcquireClaim, t as ClaimRefusedError, u as readClaimSet } from "./ownership-claim-BtPtJVmq.mjs";
-import { c as androidDataPartitionSizeBytes } from "./settings-DEJf6_kJ.mjs";
+import { E as ownership_claim_exports, u as getConfigDir } from "./config-6vdGngKa.mjs";
+import { r as register } from "./cache-manifest-D02TpYjA.mjs";
+import { l as sharedBuildCache } from "./workspace-state-Do1e2mOH.mjs";
+import { r as pidExists } from "./metro-DFLmaVz8.mjs";
+import { a as formatElapsed } from "./command-output-BuIb_ZOI.mjs";
+import { c as androidDataPartitionSizeBytes } from "./settings-DwfltIXQ.mjs";
 import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { createHash } from "node:crypto";
 import { join } from "node:path";
-import { existsSync as existsSync$1, lstatSync as lstatSync$1, mkdirSync as mkdirSync$1, openSync as openSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, realpathSync as realpathSync$1, renameSync as renameSync$1, rmSync as rmSync$1, statSync as statSync$1, utimesSync, writeFileSync as writeFileSync$1 } from "fs";
+import { existsSync as existsSync$1, lstatSync as lstatSync$1, mkdirSync as mkdirSync$1, openSync as openSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, realpathSync as realpathSync$1, renameSync as renameSync$1, rmSync as rmSync$1, statSync as statSync$1, writeFileSync as writeFileSync$1 } from "fs";
 import { homedir } from "os";
-import { basename as basename$1, dirname as dirname$1, isAbsolute as isAbsolute$1, join as join$1, resolve as resolve$1 } from "path";
-import { buildCacheKey } from "@stim-cli/core";
+import { dirname as dirname$1, isAbsolute as isAbsolute$1, join as join$1, resolve as resolve$1 } from "path";
+import { buildCacheKey, resolveArtifact, storeArtifact } from "@stim-cli/core";
 import * as expoFingerprint from "@expo/fingerprint";
 import { buildUploadTimeoutMs } from "@stim-cli/cache";
 const ASSET_MANIFEST_FILE = "assets-manifest.json";
@@ -163,16 +162,6 @@ function safeList$1(dir) {
 function entryDir(platform, key, root = sharedBuildCache()) {
 	return join$1(root, platform, key);
 }
-function artifactIn(dir) {
-	if (!existsSync$1(dir)) return null;
-	let found;
-	try {
-		found = readdirSync$1(dir).find((f) => f.endsWith(".app") || f.endsWith(".apk"));
-	} catch {
-		return null;
-	}
-	return found ? join$1(dir, found) : null;
-}
 const FINGERPRINT_PLATFORMS = /* @__PURE__ */ new Set(["ios", "android"]);
 /**
 * Paths that exist in a working checkout and not in a fresh one, which
@@ -211,55 +200,25 @@ function registerOnce(root) {
 	} catch {}
 }
 function resolveBuild(platform, key, root = sharedBuildCache()) {
-	const hit = artifactIn(entryDir(platform, key, root));
-	if (!hit) return null;
-	try {
-		utimesSync(dirname$1(hit), /* @__PURE__ */ new Date(), /* @__PURE__ */ new Date());
-	} catch {}
-	return hit;
+	return resolveArtifact(entryDir(platform, key, root));
 }
 function storeBuild(platform, key, buildPath, rootOrOptions = {}) {
 	const options = typeof rootOrOptions === "string" ? { root: rootOrOptions } : rootOrOptions || {};
 	const root = options.root || sharedBuildCache();
-	const overwrite = Boolean(options.overwrite);
 	if (!buildPath || !existsSync$1(buildPath)) throw new Error(`No build to store at ${buildPath}`);
 	registerOnce(root);
-	const dest = entryDir(platform, key, root);
-	const existing = artifactIn(dest);
-	if (existing && !overwrite) return existing;
-	const staging = `${dest}.staging-${process.pid}`;
-	rmSync$1(staging, {
-		recursive: true,
-		force: true
-	});
-	mkdirSync$1(staging, { recursive: true });
-	try {
-		getExecutor().runFile("cp", [
-			"-c",
-			"-R",
-			buildPath,
-			join$1(staging, basename$1(buildPath))
-		]);
-	} catch {
-		getExecutor().runFile("cp", [
-			"-R",
-			buildPath,
-			join$1(staging, basename$1(buildPath))
-		]);
-	}
-	if (Array.isArray(options.sources)) try {
-		writeFileSync$1(join$1(staging, SOURCES_FILE), JSON.stringify(options.sources));
-	} catch {}
-	if (options.assetManifest) try {
-		writeFileSync$1(join$1(staging, ASSET_MANIFEST_FILE), JSON.stringify(options.assetManifest));
-	} catch {}
-	mkdirSync$1(dirname$1(dest), { recursive: true });
-	rmSync$1(dest, {
-		recursive: true,
-		force: true
+	return storeArtifact(entryDir(platform, key, root), buildPath, {
+		runFile: getExecutor().runFile,
+		overwrite: Boolean(options.overwrite),
+		writeMetadata: (staging) => {
+			if (Array.isArray(options.sources)) try {
+				writeFileSync$1(join$1(staging, SOURCES_FILE), JSON.stringify(options.sources));
+			} catch {}
+			if (options.assetManifest) try {
+				writeFileSync$1(join$1(staging, ASSET_MANIFEST_FILE), JSON.stringify(options.assetManifest));
+			} catch {}
+		}
 	});
-	renameSync$1(staging, dest);
-	return artifactIn(dest);
 }
 const PROVIDER_DOWNLOAD_DIR = "cache-provider";
 function providerDownloadPath(workspacePath) {
@@ -498,13 +457,13 @@ function toRecord(holder) {
 }
 function readBuildLock(pathOrSpec) {
 	const path = typeof pathOrSpec === "string" ? pathOrSpec : buildLockPath(pathOrSpec.platform, pathOrSpec.key);
-	const survey = readClaimSet(path);
+	const survey = (0, ownership_claim_exports.readClaimSet)(path);
 	const holder = survey.live[0] ?? survey.dead[0];
 	return holder ? toRecord(holder) : null;
 }
 function acquireBuildLock({ platform, key, root = null, logFile = null }) {
 	const path = buildLockPath(platform, key);
-	const attempt = tryAcquireClaim({
+	const attempt = (0, ownership_claim_exports.tryAcquireClaim)({
 		root: path,
 		mode: "exclusive",
 		label: label(platform),
@@ -531,7 +490,7 @@ function acquireBuildLock({ platform, key, root = null, logFile = null }) {
 			tookOver: toRecord(reaped)
 		} : handle;
 	}
-	if (attempt.pending) releaseClaim(attempt.pending);
+	if (attempt.pending) (0, ownership_claim_exports.releaseClaim)(attempt.pending);
 	const holder = attempt.held ?? attempt.waitingFor?.[0];
 	return holder ? {
 		held: toRecord(holder),
@@ -539,7 +498,7 @@ function acquireBuildLock({ platform, key, root = null, logFile = null }) {
 	} : { path };
 }
 function releaseBuildLock(handle) {
-	return releaseClaim(handle?.claim);
+	return (0, ownership_claim_exports.releaseClaim)(handle?.claim);
 }
 function listBuildLocks() {
 	const dir = buildLocksDir();
@@ -560,7 +519,7 @@ function listBuildLocks() {
 		}
 		const stem = name.slice(0, -5);
 		const cut = stem.indexOf("-");
-		const survey = readClaimSet(path);
+		const survey = (0, ownership_claim_exports.readClaimSet)(path);
 		const holder = survey.live[0] ?? survey.dead[0];
 		const info = holder ? toRecord(holder) : null;
 		locks.push({
@@ -601,9 +560,9 @@ async function waitForBuild({ platform, key, resolve = resolveBuild, intervalMs
 			hit,
 			waitedMs: now() - started
 		};
-		const survey = readClaimSet(path);
+		const survey = (0, ownership_claim_exports.readClaimSet)(path);
 		const unresolved = survey.unresolved[0];
-		if (unresolved) throw new ClaimRefusedError({
+		if (unresolved) throw new ownership_claim_exports.ClaimRefusedError({
 			claimPath: unresolved.path,
 			root: path,
 			label: label(platform),
@@ -626,7 +585,7 @@ async function waitForBuild({ platform, key, resolve = resolveBuild, intervalMs
 		}
 		const elapsed = now() - started;
 		if (elapsed >= ceilingMs) {
-			const err = /* @__PURE__ */ new Error(`Waited ${formatElapsed(elapsed)} for ${holder?.projectRoot || "another workspace"}'s ${platform} build of ${key} without an artifact, and pid ${holder?.pid} is still the live holder. The lock is ${path}; remove it if that process is not really building:\n  ${claimRemoveCommand(path)}`);
+			const err = /* @__PURE__ */ new Error(`Waited ${formatElapsed(elapsed)} for ${holder?.projectRoot || "another workspace"}'s ${platform} build of ${key} without an artifact, and pid ${holder?.pid} is still the live holder. The lock is ${path}; remove it if that process is not really building:\n  ${(0, ownership_claim_exports.claimRemoveCommand)(path)}`);
 			err.code = "STIM_BUILD_WAIT_TIMEOUT";
 			err.lockPath = path;
 			err.holder = holder ?? void 0;
@@ -750,14 +709,48 @@ function pickDefaultSystemImage(images, { systemImage, hostArch } = {}) {
 	if (matching.length === 0) return null;
 	return matching.toSorted((a, b) => pageSizeRank(a) - pageSizeRank(b) || b.api - a.api || (b.tag === "google_apis" ? 1 : 0) - (a.tag === "google_apis" ? 1 : 0))[0] ?? null;
 }
-function createOwnedAvd(label, { systemImage } = {}) {
+async function createOwnedAvd(label, { systemImage, spawn = (...args) => getExecutor().spawn(...args) } = {}) {
 	const pick = pickDefaultSystemImage(listInstalledSystemImages(), { systemImage });
 	if (!pick) {
 		const arch = hostSystemImageArch();
 		throw new Error(`No ${arch} Android system image is installed. Install one, e.g.: sdkmanager "system-images;android-36;google_apis;${arch}"`);
 	}
 	const avdName = ownedAvdName(label);
-	getExecutor().run(`echo no | ${androidTool("avdmanager")} create avd -n "${avdName}" -k "${pick.pkg}" --device "${DEFAULT_AVD_DEVICE}"`);
+	const tool = androidToolPath("avdmanager");
+	const args = [
+		"create",
+		"avd",
+		"-n",
+		avdName,
+		"-k",
+		pick.pkg,
+		"--device",
+		DEFAULT_AVD_DEVICE
+	];
+	const child = spawn(tool, args, {
+		detached: true,
+		stdio: [
+			"pipe",
+			"pipe",
+			"pipe"
+		]
+	});
+	let stderr = "";
+	child.stdout?.on("data", () => {});
+	child.stderr?.on("data", (chunk) => {
+		stderr = (stderr + String(chunk)).slice(-67108864);
+	});
+	const completed = new Promise((finish, reject) => {
+		child.once("error", reject);
+		child.once("close", (code, signal) => finish({
+			code,
+			signal
+		}));
+	});
+	child.stdin?.on("error", () => {});
+	child.stdin?.end("no\n");
+	const result = await completed;
+	if (result.code !== 0) throw new Error(`Command failed: ${tool} ${args.join(" ")} (${result.signal ?? result.code})\n${stderr.trim()}`);
 	return {
 		avdName,
 		systemImage: pick.pkg

package/dist/{android-cas-DXorPCi_.mjs → android-cas-BjLRZyks.mjs}

@@ -1,11 +1,11 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { k as withDirLock, u as getConfigDir } from "./config-CcefMY2Q.mjs";
-import { r as register } from "./cache-manifest-CXR-Y8pH.mjs";
-import { D as workspaceLogsDir, x as sharedCcache, y as ensureWorkspaceStorage } from "./state-B3XA2wp2.mjs";
+import { D as withDirLock, u as getConfigDir } from "./config-6vdGngKa.mjs";
+import { r as register } from "./cache-manifest-D02TpYjA.mjs";
+import { _ as workspaceLogsDir, c as ensureWorkspaceStorage, u as sharedCcache } from "./workspace-state-Do1e2mOH.mjs";
 import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-C7IlIzd7.mjs";
-import { l as phaseLine } from "./command-output-8wHMEde0.mjs";
-import { n as androidHome } from "./android-hMj83VpN.mjs";
-import { f as startBuildHeartbeat, r as HEARTBEAT_INTERVAL_MS } from "./xcode-xnxyvJkD.mjs";
+import { l as phaseLine } from "./command-output-BuIb_ZOI.mjs";
+import { n as androidHome } from "./android-BkM4qTaN.mjs";
+import { d as startBuildHeartbeat, n as HEARTBEAT_INTERVAL_MS } from "./xcode-D9tVItl-.mjs";
 import { accessSync, constants, existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, symlinkSync, writeFileSync } from "node:fs";
 import { createHash, randomUUID } from "node:crypto";
 import { dirname, isAbsolute, join, relative } from "node:path";
@@ -717,7 +717,10 @@ function gradleArgs(task, { buildCache = true, abi = null } = {}) {
 async function buildAndroid({ root, logWriter, variant = null, abi = null }, { spawnFn = null, now = Date.now, env = process.env, buildCache = true, ccache = null, cas = null, pch = "auto", compilerCacheDisabled = false, heartbeatMs = HEARTBEAT_INTERVAL_MS, estimateMs = null, onHeartbeat = (line) => console.error(line), onNote = (line) => console.error(line) } = {}) {
 	const project = discoverAndroidProject(root);
 	if (project.failed) return {
-		...project,
+		ok: false,
+		code: project.code,
+		reason: project.reason,
+		remedy: project.remedy,
 		diagnostics: [],
 		truncated: 0,
 		lastLines: [],
@@ -730,7 +733,7 @@ async function buildAndroid({ root, logWriter, variant = null, abi = null }, { s
 		hasLocalProperties: existsSync(join(project.androidDir, "local.properties"))
 	});
 	if (refusal) return {
-		failed: true,
+		ok: false,
 		...refusal,
 		diagnostics: [],
 		truncated: 0,
@@ -841,7 +844,7 @@ async function buildAndroid({ root, logWriter, variant = null, abi = null }, { s
 		const how = result.signal ? `signal ${result.signal}` : `exit code ${result.code}`;
 		const { shown, truncated } = capDiagnostics(extractGradleDiagnostics(transcript));
 		return {
-			failed: true,
+			ok: false,
 			code: BUILD_ERROR,
 			reason: `\`./gradlew ${task}\` failed (${how}).`,
 			diagnostics: shown,
@@ -853,7 +856,7 @@ async function buildAndroid({ root, logWriter, variant = null, abi = null }, { s
 	}
 	const located = locateApk(root, transcript, variant);
 	if (!located.apkPath && located.candidates?.length) return {
-		failed: true,
+		ok: false,
 		code: BUILD_ERROR,
 		reason: `\`./gradlew ${task}\` left ${located.candidates.length} debug APKs under ${apkOutputsDir(root)}, and nothing says which flavor to install.`,
 		remedy: `Set the android.variant setting to the variant to install -- e.g. {"android": {"variant": "${variantNameOf(relative(apkOutputsDir(root), located.candidates[0]).split("/").slice(0, -1))}"}} in .stim.json.`,
@@ -864,7 +867,7 @@ async function buildAndroid({ root, logWriter, variant = null, abi = null }, { s
 		ccache: ccacheActivity
 	};
 	if (!located.apkPath) return {
-		failed: true,
+		ok: false,
 		code: BUILD_ERROR,
 		reason: variant ? `\`./gradlew ${task}\` succeeded but produced no APK under ${apkOutputsDir(root)} for variant "${variant}".` : `\`./gradlew ${task}\` succeeded but produced no APK in ${debugApkDir(root)}.`,
 		remedy: variant ? `Check that the android.variant setting ("${variant}") names a real variant (\`./gradlew :app:tasks\` lists the assemble tasks).` : `Check that ${task} builds the app module (\`./gradlew :app:${task}\` in android/) and that no flavour redirects the output.`,
@@ -894,7 +897,7 @@ function spawnFailure(err, project, durationMs) {
 	const message = String(nodeErr?.message || err || "");
 	const permissionDenied = nodeErr?.code === "EACCES" || /EACCES|permission denied/i.test(message);
 	return {
-		failed: true,
+		ok: false,
 		code: BUILD_ERROR,
 		reason: `Could not run ${project.gradlew}: ${message}`,
 		remedy: permissionDenied ? `Make the wrapper executable: \`chmod +x ${project.gradlew}\`.` : "Check that the gradle wrapper is intact (android/gradlew and android/gradle/wrapper/) and that JAVA_HOME points at a JDK 17 install.",

package/dist/{app-install-DIp9riNx.mjs → app-install--PAocWvq.mjs}

@@ -1,7 +1,7 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
 import { o as parseNdjsonText } from "./ndjson-BZwI1NBv.mjs";
 import { t as DEV_MENU_LAUNCH_ARGS } from "./ios-device-D3pzTKQE.mjs";
-import { s as isAppLaunchError } from "./command-output-8wHMEde0.mjs";
+import { s as isAppLaunchError } from "./command-output-BuIb_ZOI.mjs";
 import { l as iosSimulatorFailureAdvice, p as listUserApps, w as uninstallIosApp } from "./ios-Deh5js5V.mjs";
 import { closeSync, lstatSync, openSync, readFileSync, readSync, readdirSync } from "node:fs";
 import { createHash } from "node:crypto";
@@ -1136,7 +1136,7 @@ function unverifiedLaunchLines({ platform, metroPort, waitedMs = VERIFY_TIMEOUT_
 	if (platform === "ios") {
 		push(picker);
 		if (url && udid) push(`Retry the deep link: xcrun simctl openurl ${udid} '${url}'`);
-		else if (udid && bundleId) push(`Re-launch: xcrun simctl launch --console ${udid} ${bundleId}`);
+		else if (udid && bundleId) push(`Re-launch: xcrun simctl launch --terminate-running-process ${udid} ${bundleId}`);
 	} else {
 		if (url && serial) push(`Re-send the dev-client deep link -- this is the command that points the app at THIS workspace's Metro: adb -s ${serial} shell am start -a android.intent.action.VIEW -d ${deviceShellArg(deviceShellArg(url))} --ez ${ANDROID_DISABLE_AUTO_LAUNCH_EXTRA} true`);
 		push(picker);

package/dist/{build-slots-C4AouyNz.mjs → build-slots-D6sDzOe-.mjs}

@@ -1,6 +1,5 @@
-import { u as getConfigDir } from "./config-CcefMY2Q.mjs";
-import { a as formatElapsed } from "./command-output-8wHMEde0.mjs";
-import { d as releaseClaim, m as tryAcquireClaim, s as isClaimRefusal, u as readClaimSet } from "./ownership-claim-BtPtJVmq.mjs";
+import { E as ownership_claim_exports, u as getConfigDir } from "./config-6vdGngKa.mjs";
+import { a as formatElapsed } from "./command-output-BuIb_ZOI.mjs";
 import { readdirSync, statSync } from "node:fs";
 import { join } from "node:path";
 //#region src/engine/build-slots.ts
@@ -39,7 +38,7 @@ function tryAcquireBuildSlot({ max, root = null, logFile = null }) {
 		const path = buildSlotPath(index);
 		let attempt;
 		try {
-			attempt = tryAcquireClaim({
+			attempt = (0, ownership_claim_exports.tryAcquireClaim)({
 				root: path,
 				mode: "exclusive",
 				label: SLOT_LABEL,
@@ -50,11 +49,11 @@ function tryAcquireBuildSlot({ max, root = null, logFile = null }) {
 				}
 			});
 		} catch (err) {
-			if (!isClaimRefusal(err)) throw err;
+			if (!(0, ownership_claim_exports.isClaimRefusal)(err)) throw err;
 			refusal ??= err;
 			continue;
 		}
-		if (attempt.pending) releaseClaim(attempt.pending);
+		if (attempt.pending) (0, ownership_claim_exports.releaseClaim)(attempt.pending);
 		if (!attempt.acquired) {
 			busy = true;
 			continue;
@@ -111,7 +110,7 @@ async function acquireBuildSlot({ max, root = null, logFile = null, now = Date.n
 }
 function releaseBuildSlot(handle) {
 	if (!handle || handle.unlimited) return false;
-	return releaseClaim(handle.claim);
+	return (0, ownership_claim_exports.releaseClaim)(handle.claim);
 }
 function listBuildSlots() {
 	const dir = buildSlotsDir();
@@ -130,7 +129,7 @@ function listBuildSlots() {
 		} catch {
 			continue;
 		}
-		const survey = readClaimSet(path);
+		const survey = (0, ownership_claim_exports.readClaimSet)(path);
 		const holder = survey.live[0] ?? survey.dead[0];
 		const info = holder ? toRecord(holder) : null;
 		const index = Number(name.slice(5));

package/dist/{cache-manifest-CXR-Y8pH.mjs → cache-manifest-D02TpYjA.mjs}

@@ -1,4 +1,4 @@
-import { u as getConfigDir } from "./config-CcefMY2Q.mjs";
+import { u as getConfigDir } from "./config-6vdGngKa.mjs";
 import { existsSync } from "fs";
 import { homedir } from "os";
 import { join, resolve } from "path";

package/dist/cache-manifest.mjs

@@ -1,2 +1,2 @@
-import { a as unregister, i as registeredCaches, n as readManifest, r as register, t as manifestPath } from "./cache-manifest-CXR-Y8pH.mjs";
+import { a as unregister, i as registeredCaches, n as readManifest, r as register, t as manifestPath } from "./cache-manifest-D02TpYjA.mjs";
 export { manifestPath, readManifest, register, registeredCaches, unregister };

package/dist/cli.mjs

@@ -3,19 +3,20 @@ import { readFileSync } from "node:fs";
 import { Command } from "commander";
 //#region bin/cli.ts
 const commands = /* @__PURE__ */ new Map([
-	["doctor", () => import("./doctor-BueDfLYG.mjs")],
-	["worktree", () => import("./worktree-DtQGO9-s.mjs")],
-	["start", () => import("./start-B5G4NjiA.mjs")],
-	["stop", () => import("./stop-CQhffpmX.mjs")],
-	["ios", () => import("./ios-DAju3TVy.mjs")],
-	["android", () => import("./android-CT-PkXUh.mjs")],
-	["reload", () => import("./reload-CWpXoOgN.mjs")],
-	["device", () => import("./device-Bbv45Z9Z.mjs")],
-	["logs", () => import("./logs-CAdwW6c2.mjs")],
-	["status", () => import("./status-CI9clRSb.mjs")],
-	["stats", () => import("./stats-CaaQr4yN.mjs")],
-	["gc", () => import("./gc-BRu62v4o.mjs")],
-	["guide", () => import("./guide-D95E0u3i.mjs")]
+	["doctor", () => import("./doctor-B_mfURdt.mjs")],
+	["worktree", () => import("./worktree-BvcAIMdJ.mjs")],
+	["start", () => import("./start-BpKUHcU_.mjs")],
+	["ports", () => import("./ports-BiKqP92J.mjs")],
+	["stop", () => import("./stop-vKmmxhea.mjs")],
+	["ios", () => import("./ios-CtmGLx3X.mjs")],
+	["android", () => import("./android-BTR1KTMP.mjs")],
+	["reload", () => import("./reload-ByTqg6ZI.mjs")],
+	["device", () => import("./device-CKXLnRRb.mjs")],
+	["logs", () => import("./logs-BF3qPA7w.mjs")],
+	["status", () => import("./status-Y2ij3dm6.mjs")],
+	["stats", () => import("./stats-k5qMjyxo.mjs")],
+	["gc", () => import("./gc-0AyxmECv.mjs")],
+	["guide", () => import("./guide-CGxdmQ0K.mjs")]
 ]);
 const pkg = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf-8"));
 const program = new Command();

package/dist/collector-run.mjs

@@ -1,10 +1,10 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { I as deviceSlotKey, T as captureProcessToken, V as validateDeviceSlot } from "./config-CcefMY2Q.mjs";
+import { P as deviceSlotKey, w as process_identity_exports, z as validateDeviceSlot } from "./config-6vdGngKa.mjs";
 import { r as createNdjsonWriter } from "./ndjson-BZwI1NBv.mjs";
-import { D as workspaceLogsDir } from "./state-B3XA2wp2.mjs";
+import { _ as workspaceLogsDir } from "./workspace-state-Do1e2mOH.mjs";
 import { t as createLineReader } from "./process-output-C7IlIzd7.mjs";
 import { i as startIosDeviceConsole, r as parseDeviceConsoleLine } from "./ios-device-D3pzTKQE.mjs";
-import { a as unregisterCollector, i as registerCollector, r as readCollectors, t as collectorProcessTitle } from "./ownership-8O073GIC.mjs";
+import { a as unregisterCollector, i as registerCollector, r as readCollectors, t as collectorProcessTitle } from "./ownership-BvSpZVBk.mjs";
 import { a as watchAppPid, i as waitForAppPid, n as parseLogcatLine, r as startAndroidLogcat, t as androidClockOffset } from "./android-BW8i_YxU.mjs";
 import { existsSync } from "node:fs";
 import { isAbsolute, join, resolve } from "node:path";
@@ -301,7 +301,7 @@ async function runCollector({ slot = "default", platform, root, udid = null, app
 	};
 	const writer = createNdjsonWriter(join(workspaceLogsDir(root), "device.ndjson"));
 	const startedAt = new Date(now()).toISOString();
-	const processToken = captureProcessToken(process.pid);
+	const processToken = (0, process_identity_exports.captureProcessToken)(process.pid);
 	if (!processToken) {
 		stderr("Stim collector: could not capture process identity; refusing to start an unmanaged collector.");
 		writer.close();

package/dist/{command-output-8wHMEde0.mjs → command-output-BuIb_ZOI.mjs}

@@ -1,4 +1,5 @@
 import { n as stripAnsi } from "./process-output-C7IlIzd7.mjs";
+import { quotedPath } from "@stim-cli/core";
 //#region src/launch-error-preview.ts
 function framePriority(frame, root) {
 	const normalized = frame.replaceAll("\\", "/");
@@ -244,10 +245,6 @@ function releasedLeaseFact(lease) {
 function phaseLine(label, text) {
 	return `  ${String(label).padEnd(LABEL_WIDTH)} ${text}`;
 }
-/** Quote a path for a shell command Stim prints for a human to copy and run. */
-function quotedPath(path) {
-	return `'${path.replaceAll("'", "'\\''")}'`;
-}
 function shortUdid(udid) {
 	const text = String(udid ?? "");
 	return text.length > 4 ? `${text.slice(0, 4)}..` : text;

package/dist/{config-CcefMY2Q.mjs → config-6vdGngKa.mjs}

@@ -1,9 +1,10 @@
+import { n as __exportAll, r as __reExport } from "./rolldown-runtime-BsOwBuO_.mjs";
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
+import { join } from "node:path";
 import { existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, readlinkSync, renameSync, statSync, unlinkSync, writeFileSync } from "fs";
 import { homedir } from "os";
-import { dirname, isAbsolute, join, normalize } from "path";
-import { withDirLock } from "@stim-cli/core";
-import { capture, check, decode } from "unique-pid";
+import { dirname as dirname$1, isAbsolute as isAbsolute$1, join as join$1, normalize } from "path";
+import { configDir, withDirLock } from "@stim-cli/core";
 //#region src/device-slots.ts
 const DEFAULT_DEVICE_SLOT = "default";
 function validateDeviceSlot(slot = "default") {
@@ -114,7 +115,7 @@ function resolveWorkspaceRealish(workspacePath) {
 				} catch {
 					return null;
 				}
-				current = `${target.startsWith("/") ? target : normalize(join(dirname(prefix), target))}${normalized.slice(prefix.length)}`;
+				current = `${target.startsWith("/") ? target : normalize(join$1(dirname$1(prefix), target))}${normalized.slice(prefix.length)}`;
 				followedSymlink = true;
 				break;
 			}
@@ -136,7 +137,7 @@ function listMountedVolumes({ statFn = statSync } = {}) {
 	}
 	try {
 		for (const name of readdirSync("/Volumes")) {
-			const path = join("/Volumes", name);
+			const path = join$1("/Volumes", name);
 			let entryDev;
 			try {
 				entryDev = statFn(path).dev;
@@ -175,50 +176,41 @@ function formatBytes(bytes) {
 	return `${Math.round(bytes / 1024)}K`;
 }
 //#endregion
-//#region src/process-identity.ts
-function sameProcessRecord(a, b) {
-	if (!a || !b) return !a && !b;
-	return a.pid === b.pid && a.processToken === b.processToken;
-}
-function captureProcessIdentity(pid) {
-	const result = capture(pid);
-	if (result.ok) return {
-		ok: true,
-		token: result.value
-	};
-	return {
-		ok: false,
-		reason: `${result.error.code} (${result.error.message})`
-	};
-}
-function captureProcessToken(pid) {
-	const captured = captureProcessIdentity(pid);
-	return captured.ok ? captured.token : null;
-}
-function inspectProcessIdentity(record) {
-	if (!record || typeof record.processToken !== "string") return "unknown";
-	const decoded = decode(record.processToken);
-	if (!decoded.ok || decoded.value.pid !== record.pid) return "unknown";
-	const result = check(record.processToken);
-	return result.ok ? result.value : "unknown";
-}
-async function waitForProcessExit(record, timeoutMs) {
-	const deadline = Date.now() + timeoutMs;
-	while (Date.now() <= deadline) {
-		const identity = inspectProcessIdentity(record);
-		if (identity === "different" || identity === "gone") return true;
-		if (Date.now() >= deadline) return false;
-		await new Promise((resolve) => setTimeout(resolve, 100));
-	}
-	return false;
+//#region src/ownership-claim.ts
+var ownership_claim_exports = /* @__PURE__ */ __exportAll({});
+import * as import__stim_cli_core_ownership_claim from "@stim-cli/core/ownership-claim";
+__reExport(ownership_claim_exports, import__stim_cli_core_ownership_claim);
+//#endregion
+//#region src/avd-claim.ts
+function acquireAvdClaim(avdName) {
+	const root = join(configDir(), "avd-locks", `${encodeURIComponent(avdName.toLowerCase())}.lock`);
+	const label = `AVD ${avdName}`;
+	const attempt = (0, ownership_claim_exports.tryAcquireClaim)({
+		root,
+		mode: "exclusive",
+		label
+	});
+	if (attempt.pending) (0, ownership_claim_exports.releaseClaim)(attempt.pending);
+	if (attempt.acquired) return attempt.acquired;
+	throw new ownership_claim_exports.ClaimRefusedError({
+		root,
+		claimPath: attempt.held?.path ?? attempt.waitingFor?.[0]?.path ?? root,
+		label,
+		reason: "another operation is creating, recovering, or tearing down this AVD"
+	});
 }
 //#endregion
+//#region src/process-identity.ts
+var process_identity_exports = /* @__PURE__ */ __exportAll({});
+import * as import__stim_cli_core_process_identity from "@stim-cli/core/process-identity";
+__reExport(process_identity_exports, import__stim_cli_core_process_identity);
+//#endregion
 //#region src/config.ts
 function getConfigDir() {
-	return process.env.STIM_HOME || join(homedir(), ".stim");
+	return process.env.STIM_HOME || join$1(homedir(), ".stim");
 }
 function getConfigPath() {
-	return join(getConfigDir(), "config.json");
+	return join$1(getConfigDir(), "config.json");
 }
 function ensureDir() {
 	const dir = getConfigDir();
@@ -226,7 +218,7 @@ function ensureDir() {
 }
 const LOCK_DIR_NAME = "config.lock";
 function lockPath() {
-	return join(getConfigDir(), LOCK_DIR_NAME);
+	return join$1(getConfigDir(), LOCK_DIR_NAME);
 }
 function withConfigLock(fn) {
 	return withDirLock(lockPath(), fn, { ensureParent: ensureDir });
@@ -308,7 +300,7 @@ function getProject(projectPath) {
 	return loadConfig()?.projects?.[projectPath] || null;
 }
 function requireAbsoluteProjectPath(projectPath) {
-	if (isAbsolute(projectPath)) return;
+	if (isAbsolute$1(projectPath)) return;
 	throw new Error(`Project key "${projectPath}" is not an absolute path. The registry is keyed by the realpath of a workspace root, so a relative key can never resolve.`);
 }
 function upsertProject(projectPath, fields) {
@@ -331,6 +323,8 @@ function removeProject(projectPath) {
 	withConfigLock(() => {
 		const cfg = loadConfig();
 		if (!cfg?.projects?.[projectPath]) return;
+		if (Object.keys(cfg.projects[projectPath].ports ?? {}).length) throw new Error(`Named ports remain for ${projectPath}; stop or release them before removing its registry entry.`);
+		for (const { platforms } of projectDeviceSlots(cfg.projects[projectPath])) if (platforms.android?.owned && platforms.android.avdName) (0, ownership_claim_exports.releaseClaim)(acquireAvdClaim(platforms.android.avdName));
 		delete cfg.projects[projectPath];
 		saveConfig(cfg);
 	});
@@ -339,7 +333,10 @@ function claimMetroPort(projectPath, port) {
 	return withConfigLock(() => {
 		const cfg = ensureConfig();
 		if (!cfg.projects[projectPath]) throw new Error(`Project not registered: ${projectPath}`);
-		for (const [path, proj] of Object.entries(cfg.projects)) if (path !== projectPath && proj?.metroPort === port) return null;
+		for (const [path, proj] of Object.entries(cfg.projects)) {
+			if (path !== projectPath && proj?.metroPort === port) return null;
+			if (Object.values(proj?.ports ?? {}).includes(port)) return null;
+		}
 		cfg.projects[projectPath].metroPort = port;
 		saveConfig(cfg);
 		return port;
@@ -364,13 +361,16 @@ function releaseAndroidConsolePort(projectPath, consolePort, slot = "default") {
 		return true;
 	});
 }
-function clearDevice(projectPath, platform, slot = "default") {
-	withConfigLock(() => {
+function clearDevice(projectPath, platform, slot = "default", expectedId) {
+	return withConfigLock(() => {
 		const cfg = loadConfig();
 		const project = cfg?.projects?.[projectPath];
-		if (!cfg || !project) return;
+		if (!cfg || !project) return false;
+		const current = deviceSlotPlatforms(project, slot)?.[platform];
+		if (expectedId !== void 0 && (platform === "ios" ? current?.deviceUdid : current?.avdName) !== expectedId) return false;
 		removeSlotDevice(project, platform, slot);
 		saveConfig(cfg);
+		return true;
 	});
 }
 function setSupervisor(projectPath, { pid, port, startedAt, processToken }) {
@@ -396,7 +396,7 @@ function clearSupervisor(projectPath, expected) {
 		const cfg = loadConfig();
 		const current = cfg?.projects?.[projectPath]?.supervisor;
 		if (!current) return true;
-		if (expected !== void 0 && !sameProcessRecord(current, expected)) return false;
+		if (expected !== void 0 && !(0, process_identity_exports.sameProcessRecord)(current, expected)) return false;
 		delete cfg.projects[projectPath].supervisor;
 		saveConfig(cfg);
 		return true;
@@ -459,4 +459,4 @@ function allConsolePortsAndSerials({ isMounted = isOnMountedVolume } = {}) {
 	return result;
 }
 //#endregion
-export { directorySize as A, removeSlotDevice as B, withConfigLock as C, sameProcessRecord as D, inspectProcessIdentity as E, assignSlotDevice as F, deviceSlotKey as I, deviceSlotPlatforms as L, isOnMountedVolume as M, listMountedVolumes as N, waitForProcessExit as O, volumeRootFor as P, parseDeviceSlotKey as R, upsertProject as S, captureProcessToken as T, validateDeviceSlot as V, releaseAndroidConsolePort as _, clearSupervisor as a, setDevice as b, findEnclosingWorktreeRoot as c, getConfigPath as d, getProject as f, loadConfig as g, isPathPrefix as h, clearDevice as i, formatBytes as j, withDirLock as k, getConcurrencyLimits as l, getRepoSettings as m, allMetroPorts as n, configCorruptRepair as o, getProjectSettings as p, claimMetroPort as r, ensureConfig as s, allConsolePortsAndSerials as t, getConfigDir as u, removeProject as v, captureProcessIdentity as w, setSupervisor as x, saveConfig as y, projectDeviceSlots as z };
+export { isOnMountedVolume as A, withConfigLock as C, withDirLock as D, ownership_claim_exports as E, deviceSlotPlatforms as F, parseDeviceSlotKey as I, projectDeviceSlots as L, volumeRootFor as M, assignSlotDevice as N, directorySize as O, deviceSlotKey as P, removeSlotDevice as R, upsertProject as S, acquireAvdClaim as T, releaseAndroidConsolePort as _, clearSupervisor as a, setDevice as b, findEnclosingWorktreeRoot as c, getConfigPath as d, getProject as f, loadConfig as g, isPathPrefix as h, clearDevice as i, listMountedVolumes as j, formatBytes as k, getConcurrencyLimits as l, getRepoSettings as m, allMetroPorts as n, configCorruptRepair as o, getProjectSettings as p, claimMetroPort as r, ensureConfig as s, allConsolePortsAndSerials as t, getConfigDir as u, removeProject as v, process_identity_exports as w, setSupervisor as x, saveConfig as y, validateDeviceSlot as z };