stim 1.20.2 → 1.22.0

package/dist/{workspaces-C36s2jb9.mjs → workspaces-CpANmBlq.mjs}

@@ -1,38 +1,69 @@
-import { A as acquireAvdClaim, D as withConfigLock$1, F as listMountedVolumes, I as measuredDirectorySize, N as formatBytes, P as isOnMountedVolume, V as deviceSlotPlatforms, W as projectDeviceSlots, _ as loadConfig$1, d as getConfigDir, g as isPathPrefix, j as ownership_claim_exports, k as process_identity_exports, p as getProject } from "./config-BYDxlMY3.mjs";
-import { t as getExecutor } from "./exec-DqKo9GKJ.mjs";
-import { Dt as repoRoot, ct as resolveTailscaleBinary } from "./settings-B717odTD.mjs";
-import { h as listBuildLocks } from "./device-lease-BX1sJQ2E.mjs";
-import { T as workspaceName, r as readWorkspaceState$1, s as workspaceLastUsed, x as workspaceDir, y as workspaceAgentDeviceDir } from "./workspace-state-DJt_MMvf.mjs";
+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 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 { t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { a as formatElapsed, l as phaseLine } from "./command-output-BTy8hZ0F.mjs";
-import { B as ownedAvdSystemImage, I as ownedAvdDirectory, J as resolveOwnedAvdSerial, L as ownedAvdMatchesConfiguration, M as listOrphanedAvdDirectories, O as listAdbDevices, X as shutdownAndroidEmulator, Z as sleepSync, _ as avdStorageRoots, ct as eraseParkedAfter, et as waitForAndroidEmulatorShutdown, f as assertOwnedAvdStopped, ft as readParked, h as avdPathExists, nt as wipeAvdUserData, pt as removeParkedAfter, rt as isStimOwnedAvd, ut as parkSim, x as deleteAvd } from "./android-Mz_Inn3w.mjs";
-import { n as readCreatedDevices$1, r as recordCreatedDevice, t as forgetCreatedDevice } from "./created-devices-Dzd5C2LF.mjs";
-import { d as signalProcessTree, s as pidExists } from "./metro-DnCEjCxs.mjs";
-import { n as declareSpawnsOn, o as stopDeclaringSpawnsOn } from "./spawn-claims-DVS5RkMS.mjs";
-import { a as withWorkspaceProcessLock, o as workspaceProcessLockError, r as releaseBrowserPort, s as workspaceProcessLockPath } from "./named-ports-4WopRPg-.mjs";
-import { _ as removeSingletonFiles, c as webClaimRoot, f as webProfileDir, g as liveProfileHolder, h as chromeProcessState, i as clearWebRecord, o as readWebRecord, t as CDP_PORT_LABEL, u as webFacts } from "./state-D1Icyjlu.mjs";
-import { t as agentDeviceDaemon, u as readAgentDeviceRecords } from "./activity-BSV745Kz.mjs";
-import { E as resolveOwnedIosSim, O as shutdownIosSim, S as renameIosSim, c as eraseIosSim, o as deleteIosSim, p as listIosDeviceTypes, s as deleteParkedIosSim, v as parkedSimName, y as parseRuntimeVersion } from "./ios-RkW4pnQf.mjs";
-import { a as macosRuntimeClaim, n as macosDir } from "./state-CG_OFoaA.mjs";
-import { closeSync, existsSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, rmdirSync, statSync, unlinkSync } from "node:fs";
-import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
-import { basename as basename$1, isAbsolute as isAbsolute$1, join as join$1, relative as relative$1, resolve as resolve$1 } from "path";
-import { buildSlotsDir, hostedNativeRecords, isJsonObject, macosAppState, parseHostedNativePlacement, readJsonFile, readMacosRecord, requireAutomaticMachine, tryAcquireBuildSlotClaim, unreadableHostedNative } from "@stim-cli/core/state";
-import { existsSync as existsSync$1, lstatSync as lstatSync$1, readdirSync as readdirSync$1, realpathSync as realpathSync$1, rmSync as rmSync$1, statSync as statSync$1 } from "fs";
+import { a as formatElapsed, l as phaseLine } from "./command-output-gwpm28fu.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 { t as canonicalPath } from "./paths-BsJMoPP2.mjs";
+import { N as listBuildLocks, d as readAgentDeviceRecords, t as agentDeviceDaemon } from "./activity-CMLmzp7o.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 { 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";
 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 chalk from "chalk";
-import { isDeepStrictEqual } from "node:util";
+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";
 import { resolve4 } from "node:dns/promises";
 import { request } from "node:https";
+//#region src/commands/gc/results.ts
+function createGcResults() {
+	const results = [];
+	return {
+		record(kind, status, label, { id = null, bytes = null, detail = null } = {}) {
+			results.push({
+				kind,
+				status,
+				label,
+				id,
+				bytes,
+				detail
+			});
+		},
+		take() {
+			return results.splice(0);
+		}
+	};
+}
+const detachedResults = createGcResults();
+const recordGcResult = detachedResults.record;
+const takeGcResults = detachedResults.take;
+const GC_OUTPUT = {
+	log: (line) => console.log(line),
+	error: (line) => console.error(line),
+	record: recordGcResult,
+	fail: () => {
+		process.exitCode = 1;
+	}
+};
+//#endregion
 //#region src/engine/build-slots.ts
 const SLOT_PREFIX = "slot-";
 const SLOT_POLL_MS = 1e3;
 const SLOT_PROGRESS_MS = 3e4;
 const SLOT_CEILING_MS = 54e5;
-function sleepAsync$1(ms) {
-	return new Promise((resolve) => setTimeout(resolve, ms));
-}
 function toRecord(holder) {
 	const details = holder.details;
 	return {
@@ -56,7 +87,7 @@ function tryAcquireBuildSlot({ max, root = null, logFile = null }) {
 		}
 	});
 	if (!got) return null;
-	declareSpawnsOn(got.claim);
+	declareSpawnsOn(ambientContext(), got.claim);
 	return {
 		acquired: true,
 		path: got.path,
@@ -74,7 +105,11 @@ function tryAcquireBuildSlot({ max, root = null, logFile = null }) {
 function slotWaitingLine({ max, elapsedMs }) {
 	return `${"build".padEnd(11)} waiting for a build slot (all ${max} in use, ${formatElapsed(elapsedMs)} elapsed) -- stim guide lifecycle concurrency`;
 }
-async function acquireBuildSlot({ max, root = null, logFile = null, now = Date.now, out = () => {}, waitingFor = () => {}, sleep = sleepAsync$1, intervalMs = SLOT_POLL_MS, progressMs = SLOT_PROGRESS_MS, ceilingMs = SLOT_CEILING_MS, automatic = false }) {
+async function acquireBuildSlot({ max, root = null, logFile = null, now = Date.now, out = () => {}, waitingFor = () => {}, signal, sleep = (ms) => cancellableSleep(ms, {
+	signal,
+	what: "build slot"
+}), intervalMs = SLOT_POLL_MS, progressMs = SLOT_PROGRESS_MS, ceilingMs = SLOT_CEILING_MS, automatic = false }) {
+	throwIfCancelled(signal, "build slot");
 	if (automatic) requireAutomaticMachine("build", "local");
 	if (!max || max <= 0) return {
 		acquired: true,
@@ -85,6 +120,7 @@ async function acquireBuildSlot({ max, root = null, logFile = null, now = Date.n
 	let waited = false;
 	try {
 		for (;;) {
+			throwIfCancelled(signal, "build slot");
 			if (automatic) requireAutomaticMachine("build", "local");
 			const got = tryAcquireBuildSlot({
 				max,
@@ -123,7 +159,7 @@ async function acquireBuildSlot({ max, root = null, logFile = null, now = Date.n
 }
 function releaseBuildSlot(handle) {
 	if (!handle || handle.unlimited) return false;
-	stopDeclaringSpawnsOn(handle.claim);
+	stopDeclaringSpawnsOn(ambientContext(), handle.claim);
 	return (0, ownership_claim_exports.releaseClaim)(handle.claim);
 }
 function listBuildSlots() {
@@ -162,59 +198,55 @@ function listBuildSlots() {
 	return slots;
 }
 //#endregion
-//#region src/supervisor/ownership.ts
-function resolveSupervisorTarget({ state, record, reservedPort, isAlive = pidExists, inspectIdentity = process_identity_exports.inspectProcessIdentity } = {}) {
-	const statePid = numberOrNull(state?.pid);
-	const recordPid = numberOrNull(record?.pid);
-	const pid = statePid ?? recordPid;
-	if (!pid) return { status: "none" };
-	if (statePid && recordPid && statePid !== recordPid) return {
-		status: "unverified",
-		pid,
-		reason: `workspace state.json records supervisor pid ${statePid} but the registry records pid ${recordPid}`
-	};
-	if (!isAlive(pid)) return {
-		status: "stale",
-		pid
-	};
-	const port = numberOrNull(state?.port) ?? numberOrNull(record?.port);
-	if (reservedPort !== null && reservedPort !== void 0 && port !== null && port !== reservedPort) return {
-		status: "unverified",
-		pid,
-		reason: `supervisor pid ${pid} records port ${port}, but this project reserved port ${reservedPort}`
-	};
-	if (reservedPort !== null && reservedPort !== void 0 && port === null) return {
-		status: "unverified",
-		pid,
-		reason: `supervisor pid ${pid} has no recorded port, so it cannot be matched against reserved port ${reservedPort}`
-	};
-	const identityRecord = statePid ? state : record;
-	if (statePid && recordPid && state?.processToken !== record?.processToken) return {
-		status: "unverified",
-		pid,
-		reason: "workspace state and registry process identities disagree"
-	};
-	const identity = inspectIdentity(identityRecord);
-	if (identity === "gone" || identity === "different") return {
-		status: "stale",
-		pid
-	};
-	if (identity !== "same") return {
-		status: "unverified",
-		pid,
-		reason: "the recorded process identity could not be verified"
-	};
+//#region src/devices/report-only-usage.ts
+function canonical$1(path) {
+	try {
+		return realpathSync.native(path);
+	} catch {
+		return resolve(path);
+	}
+}
+function parseDu(output) {
+	const sizes = /* @__PURE__ */ new Map();
+	for (const line of output.split("\n")) {
+		const match = /^(\d+)\t(.+?)\r?$/.exec(line);
+		if (match) sizes.set(resolve(match[2]), Number(match[1]) * 1024);
+	}
+	return sizes;
+}
+async function measureDu(args, operation) {
+	let output = "";
+	let complete = true;
+	try {
+		output = await runOperationFile(operation, getExecutor(), "du", args, {
+			timeoutMs: 2e4,
+			cwd: operation?.cwd,
+			signal: operation?.signal
+		});
+	} catch (error) {
+		if (error instanceof WorkspaceProcessCleanupError || error instanceof Error && "reportCleanup" in error) throw error;
+		operation?.signal.throwIfAborted();
+		complete = false;
+		const failure = error;
+		if (failure.status === 1 && !failure.code && typeof failure.stdout === "string") output = failure.stdout;
+	}
 	return {
-		status: "ours",
-		processToken: identityRecord.processToken,
-		pid,
-		port,
-		mode: state?.mode ?? record?.mode ?? null,
-		startedAt: state?.startedAt ?? record?.startedAt ?? null
+		sizes: parseDu(output),
+		complete
 	};
 }
-function numberOrNull(v) {
-	return typeof v === "number" && Number.isSafeInteger(v) && v > 0 ? v : null;
+function writeUsageCache(file, value, signal) {
+	signal?.throwIfAborted();
+	const temporary = `${file}.${randomUUID()}.tmp`;
+	try {
+		mkdirSync(dirname(file), { recursive: true });
+		writeFileSync(temporary, JSON.stringify(value));
+		renameSync(temporary, file);
+	} catch {
+		try {
+			rmSync(temporary, { force: true });
+		} catch {}
+	}
 }
 //#endregion
 //#region src/engine/public-http-probe.ts
@@ -275,1282 +307,1552 @@ async function probePublicHttp(url, signal) {
 	});
 }
 //#endregion
-//#region src/engine/tunnel.ts
-function tunnelArgv(provider, port, ngrokUrl, logFile, tailscaleBinary = "tailscale") {
-	if (provider === "tailscale") return {
-		bin: tailscaleBinary,
-		args: [
-			"serve",
-			`--https=${port}`,
-			`http://127.0.0.1:${port}`
-		]
-	};
-	if (provider === "cloudflared") return {
-		bin: "cloudflared",
-		args: [
-			"tunnel",
-			"--url",
-			`http://127.0.0.1:${port}`,
-			...logFile ? ["--logfile", logFile] : []
-		]
-	};
-	return {
-		bin: "ngrok",
-		args: [
-			"http",
-			String(port),
-			`--log=${logFile || "stdout"}`,
-			"--log-format=json",
-			...ngrokUrl ? ["--url", ngrokUrl] : []
-		]
-	};
+//#region src/devices/agent-device-cleanup.ts
+function parseAgentDeviceSessions(output) {
+	const result = JSON.parse(output);
+	if (result?.success !== true || !Array.isArray(result.data?.sessions)) throw new Error("agent-device did not return a successful session list");
+	return result.data.sessions.flatMap((entry) => {
+		if (!entry || typeof entry !== "object") return [];
+		const row = entry;
+		const id = row.platform === "ios" ? row.device_udid : row.id;
+		if (row.platform !== "ios" && row.platform !== "android" || typeof row.name !== "string" || !row.name.trim() || typeof id !== "string" || !id || typeof row.createdAt !== "number" || !Number.isFinite(row.createdAt) || row.platform === "ios" && row.id !== void 0 && row.id !== id) return [];
+		return [{
+			name: typeof row.address === "string" && row.address.trim() ? row.address : row.name,
+			platform: row.platform,
+			id,
+			device: typeof row.device === "string" ? row.device : null,
+			createdAt: row.createdAt
+		}];
+	});
 }
-const CLOUDFLARED_URL_RE = /https:\/\/[a-z0-9-]+\.trycloudflare\.com/i;
-function parseCloudflaredLine(line) {
-	const match = line.match(CLOUDFLARED_URL_RE);
-	return match ? match[0] : null;
+function isOwnDeviceSession(session, device, owner) {
+	if (session.platform !== device.platform || device.id !== null && session.id !== device.id) return false;
+	if (device.platform === "android" && session.device !== device.avdName.replaceAll("_", " ")) return false;
+	if (!owner) return true;
+	return owner.claims.some((claim) => claim.deviceId === session.id && claim.session === session.name && claim.workspace !== null && (within(owner.workspace, claim.workspace) || claim.workspace === owner.repoRoot));
 }
-function parseNgrokLine(line) {
-	let data;
+function within(root, path) {
+	const rest = relative(root, path);
+	return rest === "" || !isAbsolute(rest) && rest.split(sep)[0] !== "..";
+}
+function canonical(path) {
 	try {
-		data = JSON.parse(line);
+		return realpathSync(path);
 	} catch {
 		return null;
 	}
-	if (typeof data !== "object" || data === null) return null;
-	const url = data.url;
-	return typeof url === "string" && /^https?:\/\//i.test(url) ? url : null;
-}
-function parseTailscaleLine(line) {
-	return /^https:\/\/[^\s/]+\.ts\.net(:\d+)?\/?$/.test(line) ? line : null;
-}
-function parserFor(provider) {
-	if (provider === "tailscale") return parseTailscaleLine;
-	return provider === "cloudflared" ? parseCloudflaredLine : parseNgrokLine;
-}
-const URL_TIMEOUT_MS = 15e3;
-const REACHABLE_TIMEOUT_MS = 24e4;
-const REACHABLE_POLL_MS = 2e3;
-const defaultSleep = (ms) => new Promise((r) => setTimeout(r, ms));
-async function withManagedTunnelLock(root, fn, options = {}) {
-	return withWorkspaceProcessLock(managedTunnelLockRoot(root), "metro-tunnel", fn, {
-		...options,
-		rejectOwnerPurposes: ["workspace removal"]
-	});
-}
-async function withManagedTunnelRemovalLock(root, fn, options = {}) {
-	return withWorkspaceProcessLock(managedTunnelLockRoot(root), "metro-tunnel", fn, {
-		...options,
-		ownerPurpose: "workspace removal"
-	});
-}
-async function withManagedRemoteWorktreeLock(worktreeRoot, fn, options = {}) {
-	return withWorkspaceProcessLock(managedRemoteWorktreeLockRoot(worktreeRoot), "managed-remote", fn, {
-		...options,
-		external: true,
-		rejectOwnerPurposes: ["worktree removal"]
-	});
 }
-async function withManagedRemoteWorktreeRemovalLock(worktreeRoot, fn, options = {}) {
-	return withWorkspaceProcessLock(managedRemoteWorktreeLockRoot(worktreeRoot), "managed-remote", fn, {
-		...options,
-		external: true,
-		ownerPurpose: "worktree removal"
-	});
+function deviceClaims(device) {
+	return readAgentDeviceRecords(ambientEnv().HOME || ambientEnv().USERPROFILE || homedir(), ambientEnv()).filter((record) => record.kind === "claim" && (device.id === null || record.deviceId === device.id)).map((record) => ({
+		deviceId: record.deviceId,
+		session: record.session,
+		workspace: record.workspace && canonical(record.workspace)
+	}));
 }
-function managedLockHolders(root) {
-	const locks = [{
-		label: "managed tunnel",
-		path: workspaceProcessLockPath(managedTunnelLockRoot(root), "metro-tunnel", false)
-	}, {
-		label: "managed remote",
-		path: workspaceProcessLockPath(managedRemoteWorktreeLockRoot(root), "managed-remote", true)
-	}];
-	const reasons = [];
-	for (const { label, path } of locks) {
-		const claims = (0, ownership_claim_exports.readClaimSet)(path);
-		const holder = claims.live[0];
-		if (holder) {
-			const purpose = typeof holder.details.purpose === "string" ? ` for ${holder.details.purpose}` : "";
-			reasons.push(`the ${label} lock is held${purpose}`);
-		} else if (claims.unresolved[0]) reasons.push(`the ${label} lock cannot be resolved: ${claims.unresolved[0].reason}`);
+function explainFailure(error) {
+	const stdout = error?.stdout;
+	let failure;
+	try {
+		failure = typeof stdout === "string" ? JSON.parse(stdout)?.error : void 0;
+	} catch {
+		failure = void 0;
 	}
-	return reasons;
-}
-function managedTunnelLockRoot(root) {
-	const key = createHash("sha256").update(resolve(root)).digest("hex");
-	return join(getConfigDir(), "process-locks", key);
-}
-function managedRemoteWorktreeLockRoot(worktreeRoot) {
-	const key = createHash("sha256").update(resolve(worktreeRoot)).digest("hex");
-	return join(getConfigDir(), "process-locks", "worktrees", key);
+	if (typeof failure?.message !== "string" || !failure.message) return error;
+	const reason = typeof failure.details?.reason === "string" ? ` (${failure.details.reason})` : "";
+	return /* @__PURE__ */ new Error(`agent-device refused: ${failure.message}${reason}`);
 }
-async function defaultProbeReachable(url, signal) {
-	const status = await probePublicHttp(url, signal);
-	return status !== null && status > 0;
+function report(message) {
+	ambientWrite("stderr", `${phaseLine("device", message)}\n`);
 }
-function waitForUrl(child, parseLine, timeoutMs) {
-	return new Promise((resolve) => {
-		let settled = false;
-		let lastLine = null;
-		let timer;
-		let onOut;
-		let onErr;
-		let onError;
-		let onExit;
-		const finish = (url, exited = false) => {
-			if (settled) return;
-			settled = true;
-			clearTimeout(timer);
-			child.stdout?.removeListener("data", onOut);
-			child.stderr?.removeListener("data", onErr);
-			child.removeListener("error", onError);
-			child.removeListener("exit", onExit);
-			resolve({
-				url,
-				exited,
-				lastLine
-			});
+async function closeOwnedDeviceSessions(device, stillOwned, workspace, repoRoot, operation) {
+	const exec = getExecutor();
+	try {
+		operation?.signal.throwIfAborted();
+		if (!exec.findExecutable("agent-device")) return;
+		const root = workspace === void 0 ? void 0 : canonical(workspace);
+		if (root === null) return;
+		const owner = root === void 0 ? void 0 : {
+			workspace: root,
+			repoRoot: repoRoot && (canonical(repoRoot) ?? void 0),
+			claims: deviceClaims(device)
 		};
-		const onLine = (line) => {
-			if (settled) return;
-			if (line.trim()) lastLine = line.trim();
-			const url = parseLine(line);
-			if (url) finish(url);
-		};
-		const outReader = createLineReader(onLine);
-		const errReader = createLineReader(onLine);
-		onOut = (chunk) => outReader.push(chunk);
-		onErr = (chunk) => errReader.push(chunk);
-		onError = () => finish(null);
-		onExit = () => {
-			outReader.flush();
-			errReader.flush();
-			finish(null, true);
-		};
-		child.stdout?.setEncoding?.("utf-8");
-		child.stderr?.setEncoding?.("utf-8");
-		child.stdout?.on("data", onOut);
-		child.stderr?.on("data", onErr);
-		child.on("error", onError);
-		child.on("exit", onExit);
-		timer = setTimeout(() => finish(null), timeoutMs);
-	});
-}
-function waitForFileUrl(child, logFile, parseLine, timeoutMs) {
-	return new Promise((resolve) => {
-		let settled = false;
-		const finish = (url, exited = false) => {
-			if (settled) return;
-			settled = true;
-			clearInterval(interval);
-			clearTimeout(timer);
-			child.removeListener("error", onError);
-			child.removeListener("exit", onExit);
-			resolve({
-				url,
-				exited
-			});
-		};
-		const probe = () => {
+		const stateDir = root === void 0 ? void 0 : workspaceAgentDeviceDir(root);
+		const stateDirs = [void 0, ...stateDir && !["none", "dead"].includes(agentDeviceDaemon(stateDir)) ? [stateDir] : []];
+		for (const dir of stateDirs) {
+			const deadline = Date.now() + 15e3;
+			const run = async (args) => {
+				const remaining = deadline - Date.now();
+				if (remaining <= 0) throw new Error("agent-device cleanup timed out");
+				try {
+					return await runOperationFile(operation, exec, "agent-device", [
+						...args,
+						...dir ? ["--state-dir", dir] : [],
+						"--json",
+						"--daemon-transport",
+						"socket"
+					], {
+						timeoutMs: Math.min(5e3, remaining),
+						killSignal: "SIGKILL"
+					});
+				} catch (error) {
+					if (error instanceof WorkspaceProcessCleanupError || error instanceof Error && "reportCleanup" in error) throw error;
+					operation?.signal.throwIfAborted();
+					throw explainFailure(error);
+				}
+			};
+			const list = async () => parseAgentDeviceSessions(await run([
+				"session",
+				"list",
+				"--session",
+				"stim-teardown-inventory"
+			]));
 			try {
-				for (const line of readFileSync(logFile, "utf-8").split(/\r?\n/)) {
-					const url = parseLine(line);
-					if (url) return finish(url);
+				const sessions = (await list()).filter((session) => isOwnDeviceSession(session, device, owner));
+				for (const session of sessions) try {
+					if (!(await list()).some((current) => current.name === session.name && current.platform === session.platform && current.id === session.id && current.createdAt === session.createdAt)) continue;
+					if (!await stillOwned(session.id)) continue;
+					if (JSON.parse(await run([
+						"close",
+						"--session",
+						session.name,
+						"--session-lock",
+						"reject",
+						"--platform",
+						device.platform,
+						device.platform === "ios" ? "--udid" : "--serial",
+						session.id
+					]))?.success !== true) throw new Error("agent-device did not confirm session close");
+					report(`closed agent-device session ${session.name} on ${session.id}`);
+				} catch (error) {
+					if (error instanceof WorkspaceProcessCleanupError || error instanceof Error && "reportCleanup" in error) throw error;
+					operation?.signal.throwIfAborted();
+					report(`could not close agent-device session ${session.name} on ${session.id}: ${error.message}`);
 				}
-			} catch {}
-		};
-		const onError = () => finish(null);
-		const onExit = () => finish(null, true);
-		child.on("error", onError);
-		child.on("exit", onExit);
-		const interval = setInterval(probe, 25);
-		const timer = setTimeout(() => finish(null), timeoutMs);
-		probe();
-	});
-}
-function createTunnelLogFile(provider) {
-	const dir = join(getConfigDir(), "tunnel-logs");
-	mkdirSync(dir, { recursive: true });
-	const path = join(dir, `${provider}-${randomUUID()}.log`);
-	closeSync(openSync(path, "wx", 384));
-	return path;
+			} catch (error) {
+				if (error instanceof WorkspaceProcessCleanupError || error instanceof Error && "reportCleanup" in error) throw error;
+				operation?.signal.throwIfAborted();
+				report(`could not list agent-device sessions for ${device.platform === "ios" ? device.id : device.id ?? device.avdName}: ${error.message}`);
+			}
+		}
+	} catch (error) {
+		if (error instanceof WorkspaceProcessCleanupError || error instanceof Error && "reportCleanup" in error) throw error;
+		operation?.signal.throwIfAborted();
+		report(`could not list agent-device sessions for ${device.platform === "ios" ? device.id : device.id ?? device.avdName}: ${error.message}`);
+	}
 }
-function removeTunnelLogFile(path) {
-	if (!path) return;
+//#endregion
+//#region src/devices/teardown.ts
+async function teardownParkedAvd(avdName, { operation } = {}) {
 	try {
-		unlinkSync(path);
-	} catch {}
-}
-function removeRecordedTunnelLogFile(path) {
-	if (!path) return;
-	const dir = resolve(join(getConfigDir(), "tunnel-logs"));
-	const resolved = resolve(path);
-	if (!resolved.startsWith(`${dir}${sep}`) || resolve(join(dir, basename(resolved))) !== resolved) return;
-	removeTunnelLogFile(resolved);
-}
-async function waitUntilReachable({ url, now, sleep, probe, timeoutMs }) {
-	const deadline = now() + timeoutMs;
-	for (;;) {
-		if (await probe(url, new AbortController().signal).catch(() => false)) return true;
-		if (now() >= deadline) return false;
-		await sleep(REACHABLE_POLL_MS);
+		operation?.signal.throwIfAborted();
+		return await removeParkedAfter("android", avdName, async () => {
+			const result = await teardownOwnedAvd(avdName, {
+				del: true,
+				owner: { pool: true },
+				operation
+			});
+			if (result.status !== "torn-down" && result.status !== "missing") throw new Error(result.reason);
+		}, operation) ? {
+			status: "torn-down",
+			label: avdName
+		} : {
+			status: "skipped",
+			kind: "not-parked",
+			reason: "emulator is no longer parked"
+		};
+	} catch (error) {
+		if (error instanceof WorkspaceProcessCleanupError) throw error;
+		operation?.signal.throwIfAborted();
+		return {
+			status: "failed",
+			reason: String(error?.message || error)
+		};
 	}
 }
-const CLEANUP_TIMEOUT_MS = 1e3;
-const CLEANUP_POLL_MS = 25;
-async function startTunnel({ provider, port, spawnFn = null, urlTimeoutMs = URL_TIMEOUT_MS, reachableTimeoutMs = REACHABLE_TIMEOUT_MS, probeReachable = defaultProbeReachable, now = Date.now, sleep = defaultSleep, ngrokUrl = null, requireReachable = true, cleanupTimeoutMs = CLEANUP_TIMEOUT_MS, isChildAlive = pidExists, readProcessToken = process_identity_exports.captureProcessToken, logFile = null }) {
-	const spawn = spawnFn || ((cmd, args, opts) => getExecutor().spawn(cmd, args, opts));
-	const outputFile = provider === "tailscale" ? null : logFile || (spawnFn ? null : createTunnelLogFile(provider));
-	let child;
+async function teardownParkedIosSim(udid, { label, deleteSim = deleteParkedIosSim, operation } = {}) {
 	try {
-		const binary = provider === "tailscale" ? resolveTailscaleBinary((bin) => getExecutor().findExecutable(bin)) : provider;
-		if (!binary) throw new Error("Install Tailscale and sign in to your tailnet.");
-		const { bin, args } = tunnelArgv(provider, port, ngrokUrl, outputFile, binary);
-		child = spawn(bin, args, {
-			stdio: outputFile ? [
-				"ignore",
-				"ignore",
-				"ignore"
-			] : [
-				"ignore",
-				"pipe",
-				"pipe"
-			],
-			detached: true
-		});
-	} catch (err) {
-		removeTunnelLogFile(outputFile);
+		operation?.signal.throwIfAborted();
+		const removed = await removeParkedAfter("ios", udid, async () => {
+			await closeOwnedDeviceSessions({
+				platform: "ios",
+				id: udid
+			}, async () => Boolean((await resolveOwnedIosSimNow(udid, operation)).sim), void 0, void 0, operation);
+			await deleteSim(udid, operation);
+		}, operation);
+		if (!removed) return {
+			status: "skipped",
+			kind: "not-parked",
+			reason: "simulator is no longer parked"
+		};
 		return {
-			failed: true,
-			reason: `Could not start ${provider}: ${describe(err)}`
+			status: "torn-down",
+			label: label ?? removed.name
 		};
-	}
-	let childExited = false;
-	child.once("exit", () => {
-		childExited = true;
-	});
-	const cleanup = async (alreadyExited = childExited) => {
-		const stopped = await terminateChild(child, {
-			alreadyExited,
-			timeoutMs: cleanupTimeoutMs,
-			now,
-			sleep,
-			isAlive: isChildAlive
-		});
-		if (stopped) removeTunnelLogFile(outputFile);
-		return stopped ? { status: "stopped" } : {
+	} catch (error) {
+		if (error instanceof WorkspaceProcessCleanupError) throw error;
+		operation?.signal.throwIfAborted();
+		return {
 			status: "failed",
-			reason: `Sent SIGKILL but could not confirm that pid ${child.pid ?? "unknown"} exited.`
-		};
-	};
-	const failAfterCleanup = async (reason, alreadyExited = childExited) => {
-		const stopped = await cleanup(alreadyExited);
-		return stopped.status === "stopped" ? {
-			failed: true,
-			reason
-		} : {
-			failed: true,
-			reason: `${reason} ${stopped.reason}`,
-			cleanupFailed: true
+			reason: String(error?.message || error)
 		};
-	};
-	const pid = child.pid;
-	if (!pid) return failAfterCleanup(`${provider} started but reported no pid.`);
-	const captureChildIdentity = () => {
-		try {
-			return readProcessToken(pid);
-		} catch {
-			return null;
-		}
-	};
-	const initialProcessToken = captureChildIdentity();
-	if (!initialProcessToken) return failAfterCleanup(`${provider} started but its process identity token could not be read.`);
-	const { url, exited, lastLine } = outputFile ? await waitForFileUrl(child, outputFile, parserFor(provider), urlTimeoutMs) : await waitForUrl(child, parserFor(provider), urlTimeoutMs);
-	if (!url) return failAfterCleanup(exited ? provider === "tailscale" && lastLine ? `${provider} exited before printing a tunnel URL: ${lastLine}` : `${provider} exited before printing a tunnel URL.` : `${provider} did not print a tunnel URL within ${urlTimeoutMs}ms.`, exited || childExited);
-	if (!outputFile) resumeChildPipes(child);
-	if (requireReachable) {
-		if (!await waitUntilReachable({
-			url,
-			now,
-			sleep,
-			probe: probeReachable,
-			timeoutMs: reachableTimeoutMs
-		})) return failAfterCleanup(`${url} did not become reachable within ${reachableTimeoutMs}ms; ${provider} may still be registering, or the network path is blocked.`);
 	}
-	const finalProcessToken = captureChildIdentity();
-	if (!finalProcessToken || finalProcessToken !== initialProcessToken) return failAfterCleanup(`${provider} process identity changed before its tunnel could be recorded.`);
-	if (!outputFile) unrefChildPipes(child);
-	child.unref?.();
-	if (childExited) return failAfterCleanup(`${provider} exited before its tunnel could be recorded.`, true);
-	return {
-		url,
-		pid,
-		processToken: initialProcessToken,
-		logFile: outputFile,
-		cleanup: () => cleanup()
-	};
 }
-async function startTunnelSequence({ providers, port, ngrokUrl = null, requireReachable = true, start = startTunnel }) {
-	const failures = [];
-	for (const provider of providers) {
-		const result = await start({
-			provider,
-			port,
-			ngrokUrl: provider === "ngrok" ? ngrokUrl : null,
-			requireReachable
-		});
-		if (!("failed" in result)) return {
-			provider,
-			...result
+async function eraseParkedIosSim(udid, { label, operation } = {}) {
+	try {
+		operation?.signal.throwIfAborted();
+		const erased = await eraseParkedAfter("ios", udid, async (_record, eraseStarted) => {
+			await closeOwnedDeviceSessions({
+				platform: "ios",
+				id: udid
+			}, async () => Boolean((await resolveOwnedIosSimNow(udid, operation)).sim), void 0, void 0, operation);
+			const resolved = resolveOwnedIosSim(udid, await listAllIosSimsAsync({
+				signal: operation?.signal,
+				operation
+			}));
+			if (resolved.missing) throw new Error(`simulator ${udid} is not on this machine`);
+			if (resolved.notOwned) throw new Error(`simulator ${udid} is now named ${JSON.stringify(resolved.notOwned)}`);
+			const state = resolved.sim.state;
+			if (state !== "Shutdown") throw new Error(`simulator ${udid} is ${state}, not Shutdown; it was kept`);
+			operation?.signal.throwIfAborted();
+			eraseStarted();
+			await eraseIosSim(udid, operation);
+		}, operation);
+		if (!erased) return {
+			status: "skipped",
+			kind: "not-parked",
+			reason: "simulator is no longer parked"
 		};
-		failures.push(`${provider}: ${result.reason}`);
-		if (result.cleanupFailed) return {
-			failed: true,
-			reason: failures.join(" ")
+		return {
+			status: "torn-down",
+			label: label ?? erased.name
+		};
+	} catch (error) {
+		if (error instanceof WorkspaceProcessCleanupError) throw error;
+		operation?.signal.throwIfAborted();
+		return {
+			status: "failed",
+			reason: String(error?.message || error)
 		};
 	}
-	return {
-		failed: true,
-		reason: failures.join(" ") || "No managed tunnel provider was selected."
-	};
 }
-function closeChildPipes(child) {
-	child.stdout?.destroy?.();
-	child.stderr?.destroy?.();
-}
-function unrefChildPipes(child) {
-	resumeChildPipes(child);
-	for (const stream of [child.stdout, child.stderr]) stream?.unref?.();
-}
-function resumeChildPipes(child) {
-	child.stdout?.resume?.();
-	child.stderr?.resume?.();
-}
-async function signalAndWaitForExit(child, signal, { timeoutMs, now, sleep, isAlive, platform }) {
-	let exited = false;
-	const onExit = () => {
-		exited = true;
-	};
-	child.once("exit", onExit);
+async function eraseParkedAvd(avdName, { operation } = {}) {
 	try {
-		if (platform === "win32" && child.pid) signalProcessTree(child.pid, signal, { platform });
-		child.kill(signal);
-	} catch (err) {
-		child.removeListener("exit", onExit);
-		return isEsrch(err);
-	}
-	const hasExited = () => exited;
-	const deadline = now() + timeoutMs;
-	while (!hasExited() && now() < deadline) await sleep(CLEANUP_POLL_MS);
-	if (!hasExited() && child.pid && !isAlive(child.pid)) exited = true;
-	child.removeListener("exit", onExit);
-	return hasExited();
-}
-async function terminateChild(child, { alreadyExited, timeoutMs, now, sleep, isAlive, platform = process.platform }) {
-	if (alreadyExited) {
-		closeChildPipes(child);
-		return true;
+		operation?.signal.throwIfAborted();
+		return await eraseParkedAfter("android", avdName, async (_record, eraseStarted) => {
+			if ((await resolveOwnedAvdSerialAsync(avdName, {
+				timeoutMs: AVD_INVENTORY_TIMEOUT_MS,
+				operation,
+				signal: operation?.signal
+			})).serial) throw new Error(`AVD ${avdName} is running; it was kept`);
+			const result = await teardownOwnedAvd(avdName, {
+				wipe: true,
+				owner: { pool: true },
+				onWipeStart: eraseStarted,
+				operation
+			});
+			if (result.status !== "torn-down") throw new Error(result.reason ?? `AVD ${avdName} is ${result.status}`);
+		}, operation) ? {
+			status: "torn-down",
+			label: avdName
+		} : {
+			status: "skipped",
+			kind: "not-parked",
+			reason: "emulator is no longer parked"
+		};
+	} catch (error) {
+		if (error instanceof WorkspaceProcessCleanupError) throw error;
+		operation?.signal.throwIfAborted();
+		return {
+			status: "failed",
+			reason: String(error?.message || error)
+		};
 	}
-	if (await signalAndWaitForExit(child, "SIGTERM", {
-		timeoutMs,
-		now,
-		sleep,
-		isAlive,
-		platform
-	})) {
-		closeChildPipes(child);
-		return true;
+}
+const IOS_SHUTDOWN_SETTLE_MS = 15e3;
+const ADB_RELEASE_WAIT_MS = 3e3;
+const AVD_INVENTORY_TIMEOUT_MS = 15e3;
+async function repoRootAbove(workspace, operation) {
+	if (workspace === void 0 || !getExecutor().findExecutable("agent-device")) return void 0;
+	const root = await repoRootAsync(workspace, {
+		declareFor: operation,
+		env: operation?.env,
+		signal: operation?.signal
+	});
+	try {
+		return root && realpathSync(root) !== realpathSync(workspace) ? root : void 0;
+	} catch {
+		return;
 	}
-	const killed = await signalAndWaitForExit(child, "SIGKILL", {
-		timeoutMs,
-		now,
-		sleep,
-		isAlive,
-		platform
+}
+const IOS_SHUTDOWN_POLL_MS = 250;
+const IOS_SHUTDOWN_ATTEMPTS = 2;
+async function resolveOwnedIosSimNow(udid, operation) {
+	operation?.signal.throwIfAborted();
+	const sims = await listAllIosSimsAsync({
+		operation,
+		signal: operation?.signal
 	});
-	closeChildPipes(child);
-	return killed;
+	operation?.signal.throwIfAborted();
+	return resolveOwnedIosSim(udid, sims);
 }
-function describe(err) {
-	return err?.message || String(err);
+async function settleIosSimShutdown(udid, { now = Date.now, sleep }, operation) {
+	let resolved = await resolveOwnedIosSimNow(udid, operation);
+	for (let attempt = 1;; attempt++) {
+		const deadline = now() + IOS_SHUTDOWN_SETTLE_MS;
+		while (resolved.sim && resolved.sim.state !== "Shutdown" && now() < deadline) {
+			await (sleep ? sleep(IOS_SHUTDOWN_POLL_MS) : cancellableSleep(IOS_SHUTDOWN_POLL_MS, {
+				signal: operation?.signal,
+				what: "simulator shutdown"
+			}));
+			resolved = await resolveOwnedIosSimNow(udid, operation);
+		}
+		if (!resolved.sim || resolved.sim.state === "Shutdown" || attempt === IOS_SHUTDOWN_ATTEMPTS) return resolved;
+		await shutdownIosSim(udid, operation);
+		resolved = await resolveOwnedIosSimNow(udid, operation);
+	}
 }
-const STOP_TIMEOUT_MS = 5e3;
-const STOP_POLL_MS = 100;
-function isEsrch(err) {
-	return err?.code === "ESRCH";
+function iosShutdownFailureReason(udid, state) {
+	return `simulator ${udid} is still ${state} after ${IOS_SHUTDOWN_ATTEMPTS} shutdown attempts and ${IOS_SHUTDOWN_ATTEMPTS * IOS_SHUTDOWN_SETTLE_MS / 1e3}s of waiting`;
 }
-async function stopTunnel(record, { isAlive = pidExists, inspectIdentity = process_identity_exports.inspectProcessIdentity, platform = process.platform, kill = (pid) => signalProcessTree(pid, "SIGTERM", { platform }), now = Date.now, sleep = defaultSleep, timeoutMs = STOP_TIMEOUT_MS } = {}) {
-	const missing = () => {
-		removeRecordedTunnelLogFile(record?.logFile);
-		return { status: "missing" };
-	};
-	const pid = record?.pid;
-	if (!pid || !isAlive(pid)) return missing();
-	if (!record.processToken) return {
-		status: "failed",
-		reason: `tunnel pid ${pid} has no process identity token, so Stim cannot verify ownership. Keep the record. Inspect the process, stop it with the provider tooling, remove the stale metroTunnel state, and retry.`
+async function parkOwnedIosSim(settled, udid, park, operation) {
+	if (settled.missing) throw new Error(`simulator ${udid} disappeared after shutdown`);
+	if (settled.notOwned) throw new Error(`simulator ${udid} is now named ${JSON.stringify(settled.notOwned)}`);
+	const sim = settled.sim;
+	if (sim.state !== "Shutdown") throw new Error(iosShutdownFailureReason(udid, sim.state));
+	const model = (await listIosDeviceTypesAsync({
+		operation,
+		signal: operation?.signal
+	})).find((d) => d.identifier === sim.deviceTypeIdentifier)?.name ?? null;
+	const runtime = parseRuntimeVersion(sim.runtime);
+	const name = parkedSimName(sim.udid, {
+		model,
+		runtime
+	});
+	await renameIosSim(sim.udid, name, operation);
+	const record = {
+		udid: sim.udid,
+		name,
+		deviceTypeIdentifier: sim.deviceTypeIdentifier,
+		runtimeIdentifier: sim.runtime,
+		parkedAt: (/* @__PURE__ */ new Date()).toISOString(),
+		simslimManaged: Boolean(park.simslimManaged),
+		...park.appId ? { bundleId: park.appId } : {},
+		...park.cacheKey ? { cacheKey: park.cacheKey } : {}
 	};
-	const identity = inspectIdentity(record);
-	if (identity === "gone" || identity === "different") return missing();
-	if (identity !== "same") return {
-		status: "failed",
-		reason: `could not verify the process identity for tunnel pid ${pid}; refusing to signal it.`
+	return {
+		record,
+		evicted: parkSim({
+			platform: "ios",
+			projectPath: park.projectPath,
+			slot: park.slot,
+			record,
+			max: park.max
+		})
 	};
+}
+async function teardownOwnedIosSim(udid, { del = false, label, park, workspace, shutdownClock = {}, operation } = {}) {
+	let parkFallback;
 	try {
-		kill(pid);
-	} catch (err) {
-		return isEsrch(err) ? missing() : {
+		const resolved = await resolveOwnedIosSimNow(udid, operation);
+		if (resolved.notOwned) return {
+			status: "skipped",
+			kind: "not-owned",
+			reason: `sim "${resolved.notOwned}" is not Stim-owned: Stim has no record of creating it`
+		};
+		if (resolved.missing) return { status: "missing" };
+		await closeOwnedDeviceSessions({
+			platform: "ios",
+			id: udid
+		}, async () => Boolean((await resolveOwnedIosSimNow(udid, operation)).sim), workspace, void 0, operation);
+		const current = await resolveOwnedIosSimNow(udid, operation);
+		if (current.missing) return { status: "missing" };
+		if (current.notOwned) return {
+			status: "skipped",
+			kind: "not-owned",
+			reason: "simulator ownership changed before shutdown"
+		};
+		await shutdownIosSim(udid, operation);
+		const sim = resolved.sim;
+		if (del && park && park.max > 0) try {
+			const { record, evicted } = await parkOwnedIosSim(await settleIosSimShutdown(udid, shutdownClock, operation), udid, park, operation);
+			const removed = [];
+			const failures = [];
+			for (const entry of evicted) {
+				const result = await teardownParkedIosSim(entry.udid, {
+					label: entry.name,
+					operation
+				});
+				if (result.status === "torn-down") removed.push({
+					udid: entry.udid,
+					name: entry.name
+				});
+				else if (result.status === "failed") failures.push(`could not delete evicted ${entry.name} (${entry.udid}): ${result.reason}`);
+			}
+			return {
+				status: "torn-down",
+				label: label ?? sim.name ?? udid,
+				parked: {
+					udid: record.udid,
+					name: record.name
+				},
+				evicted: removed,
+				...failures.length ? { evictionFailures: failures } : {}
+			};
+		} catch (e) {
+			if (e instanceof WorkspaceProcessCleanupError) throw e;
+			operation?.signal.throwIfAborted();
+			parkFallback = String(e?.message || e);
+		}
+		if (del) {
+			await deleteIosSim(udid, operation);
+			return {
+				status: "torn-down",
+				label: label ?? sim.name ?? udid,
+				...parkFallback ? { parkFallback } : {}
+			};
+		}
+		const settled = await settleIosSimShutdown(udid, shutdownClock, operation);
+		if (settled.sim && settled.sim.state !== "Shutdown") return {
 			status: "failed",
-			reason: describe(err)
+			label: label ?? sim.name ?? udid,
+			reason: iosShutdownFailureReason(udid, settled.sim.state)
+		};
+		const root = sim.state === "Shutdown" ? void 0 : await repoRootAbove(workspace, operation);
+		if (root && settled.sim) await closeOwnedDeviceSessions({
+			platform: "ios",
+			id: udid
+		}, async () => (await resolveOwnedIosSimNow(udid, operation)).sim?.state === "Shutdown", workspace, root, operation);
+		return {
+			status: "torn-down",
+			label: label ?? sim.name ?? udid
+		};
+	} catch (e) {
+		if (e instanceof WorkspaceProcessCleanupError) throw e;
+		operation?.signal.throwIfAborted();
+		return {
+			status: "failed",
+			reason: String(e?.message || e),
+			...parkFallback ? { parkFallback } : {}
 		};
 	}
-	const deadline = now() + timeoutMs;
-	const exited = () => {
-		if (!isAlive(pid)) return true;
-		const current = inspectIdentity(record);
-		return current === "gone" || current === "different";
+}
+function assertAvdReferences(avdName, owner) {
+	const config = loadConfig$1();
+	if (!config) throw new Error("Cannot verify AVD references without a Stim config; the data was kept.");
+	if (owner && "projectPath" in owner && owner.expectedRecord && !isDeepStrictEqual(deviceSlotPlatforms(config.projects[owner.projectPath], owner.slot)?.android, owner.expectedRecord)) throw new Error(`AVD ${avdName} has a changed workspace record; its data was kept.`);
+	for (const [projectPath, project] of Object.entries(config.projects)) for (const { slot, platforms } of projectDeviceSlots(project)) {
+		if (platforms.android?.avdName?.toLowerCase() !== avdName.toLowerCase()) continue;
+		if (!owner || !("projectPath" in owner) || owner.projectPath !== projectPath || (owner.slot ?? "default") !== slot || !platforms.android.owned) throw new Error(`AVD ${avdName} is referenced by ${projectPath} (${slot}); its data was kept.`);
+	}
+	if (readParked("android", { config }).some((entry) => entry.name.toLowerCase() === avdName.toLowerCase()) && !(owner && "pool" in owner)) throw new Error(`AVD ${avdName} is in the emulator pool; its data was kept.`);
+}
+async function removeOrphanedAvdDirectory(candidate, owner, operation) {
+	operation?.signal.throwIfAborted();
+	const surveyed = listOrphanedAvdDirectories(candidate.name).find((entry) => entry.directory === candidate.directory);
+	if (!surveyed || surveyed.name !== candidate.name || surveyed.dev !== candidate.dev || surveyed.ino !== candidate.ino) throw new Error(`AVD data at ${candidate.directory} changed or is registered; it was kept.`);
+	await assertOwnedAvdStoppedAsync(candidate.name, operation, () => candidate.directory);
+	const detached = await withConfigLockAsync$1(() => {
+		const current = lstatSync(candidate.directory);
+		if (!current.isDirectory() || current.dev !== candidate.dev || current.ino !== candidate.ino) throw new Error(`AVD data at ${candidate.directory} changed or is registered; it was kept.`);
+		assertAvdReferences(candidate.name, owner);
+		const name = `stim-gc-${randomUUID()}`;
+		recordCreatedDevice("android", name);
+		const destination = join(dirname(candidate.directory), `${name}.avd`);
+		try {
+			renameSync(candidate.directory, destination);
+		} catch (error) {
+			forgetCreatedDevice("android", name);
+			throw error;
+		}
+		forgetCreatedDevice("android", candidate.name);
+		return destination;
+	}, operation?.signal);
+	const current = lstatSync(detached);
+	if (!current.isDirectory() || current.dev !== candidate.dev || current.ino !== candidate.ino) throw new Error(`Detached AVD data changed at ${detached}; it was kept.`);
+	operation?.signal.throwIfAborted();
+	try {
+		await rm(detached, { recursive: true });
+	} catch (error) {
+		throw new Error(`Could not remove AVD data at ${detached}; retry gc --delete: ${error.message}`, { cause: error });
+	}
+	forgetCreatedDevice("android", basename(detached, ".avd"));
+}
+async function teardownUnregisteredAvd(avdName, del, owner, surveyed, operation) {
+	operation?.signal.throwIfAborted();
+	const candidates = surveyed ? [surveyed] : listOrphanedAvdDirectories(avdName);
+	if (candidates.length === 0) {
+		if (avdStorageRoots().some((root) => avdPathExists(join(root, `${avdName}.ini`)) || avdPathExists(join(root, `${avdName}.avd`)))) throw new Error(`AVD ${avdName} is not listed but its storage remains; it was kept.`);
+		return { status: "missing" };
+	}
+	if (!del) return {
+		status: "skipped",
+		reason: "AVD registration is missing; its data was kept."
 	};
-	while (now() < deadline && !exited()) await sleep(STOP_POLL_MS);
-	if (!exited()) return {
-		status: "failed",
-		reason: `pid ${pid} did not exit within ${timeoutMs}ms.`
+	for (const candidate of candidates) {
+		if (candidate.name !== avdName) throw new Error(`AVD data does not match ${avdName}; it was kept.`);
+		await removeOrphanedAvdDirectory(candidate, owner, operation);
+	}
+	return {
+		status: "torn-down",
+		label: avdName
 	};
-	removeRecordedTunnelLogFile(record.logFile);
-	return { status: "stopped" };
 }
-//#endregion
-//#region src/commands/gc/paths.ts
-function canonicalPath(p) {
+async function teardownOwnedAvd(avdName, options = {}) {
+	let claim;
+	let retained = false;
+	const operation = options.operation;
 	try {
-		return realpathSync$1(p);
-	} catch {
-		return resolve$1(p);
+		operation?.signal.throwIfAborted();
+		if (!isStimOwnedAvd(avdName)) return {
+			status: "skipped",
+			kind: "not-owned",
+			reason: `AVD ${avdName} is not Stim-owned: Stim has no record of creating it`
+		};
+		claim = acquireAvdClaim(avdName);
+		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?.();
+		return result;
+	} catch (error) {
+		if (claim && (error instanceof WorkspaceProcessCleanupError || error instanceof Error && "reportCleanup" in error)) {
+			retained = true;
+			throw Object.assign(new WorkspaceProcessCleanupError([.../* @__PURE__ */ new Set([claim, ...error instanceof WorkspaceProcessCleanupError ? error.claims : []])], error.message, "Verify the AVD operation and its descendants have stopped."), { reportCleanup: true });
+		}
+		operation?.signal.throwIfAborted();
+		return {
+			status: "failed",
+			reason: String(error?.message || error)
+		};
+	} finally {
+		if (operation) stopDeclaringSpawnsOn(operation, claim);
+		if (!retained) (0, ownership_claim_exports.releaseClaim)(claim);
 	}
 }
-//#endregion
-//#region src/commands/gc/results.ts
-const results = [];
-function recordGcResult(kind, status, label, { id = null, bytes = null, detail = null } = {}) {
-	results.push({
-		kind,
-		status,
-		label,
-		id,
-		bytes,
-		detail
+async function serialFree(serial, timeoutMs = AVD_INVENTORY_TIMEOUT_MS, operation) {
+	operation?.signal.throwIfAborted();
+	const adb = await listAdbDevicesAsync({
+		timeoutMs,
+		operation,
+		signal: operation?.signal
 	});
+	operation?.signal.throwIfAborted();
+	return ![
+		...adb.emulators,
+		...adb.physical,
+		...adb.unhealthy
+	].some((entry) => entry.serial === serial);
 }
-function takeGcResults() {
-	return results.splice(0);
-}
-//#endregion
-//#region src/devices/agent-device-cleanup.ts
-function parseAgentDeviceSessions(output) {
-	const result = JSON.parse(output);
-	if (result?.success !== true || !Array.isArray(result.data?.sessions)) throw new Error("agent-device did not return a successful session list");
-	return result.data.sessions.flatMap((entry) => {
-		if (!entry || typeof entry !== "object") return [];
-		const row = entry;
-		const id = row.platform === "ios" ? row.device_udid : row.id;
-		if (row.platform !== "ios" && row.platform !== "android" || typeof row.name !== "string" || !row.name.trim() || typeof id !== "string" || !id || typeof row.createdAt !== "number" || !Number.isFinite(row.createdAt) || row.platform === "ios" && row.id !== void 0 && row.id !== id) return [];
-		return [{
-			name: typeof row.address === "string" && row.address.trim() ? row.address : row.name,
-			platform: row.platform,
-			id,
-			device: typeof row.device === "string" ? row.device : null,
-			createdAt: row.createdAt
-		}];
-	});
-}
-function isOwnDeviceSession(session, device, owner) {
-	if (session.platform !== device.platform || device.id !== null && session.id !== device.id) return false;
-	if (device.platform === "android" && session.device !== device.avdName.replaceAll("_", " ")) return false;
-	if (!owner) return true;
-	return owner.claims.some((claim) => claim.deviceId === session.id && claim.session === session.name && claim.workspace !== null && (within(owner.workspace, claim.workspace) || claim.workspace === owner.repoRoot));
-}
-function within(root, path) {
-	const rest = relative(root, path);
-	return rest === "" || !isAbsolute(rest) && rest.split(sep)[0] !== "..";
-}
-function canonical(path) {
-	try {
-		return realpathSync(path);
-	} catch {
-		return null;
-	}
-}
-function deviceClaims(device) {
-	return readAgentDeviceRecords(homedir()).filter((record) => record.kind === "claim" && (device.id === null || record.deviceId === device.id)).map((record) => ({
-		deviceId: record.deviceId,
-		session: record.session,
-		workspace: record.workspace && canonical(record.workspace)
-	}));
-}
-function explainFailure(error) {
-	const stdout = error?.stdout;
-	let failure;
-	try {
-		failure = typeof stdout === "string" ? JSON.parse(stdout)?.error : void 0;
-	} catch {
-		failure = void 0;
-	}
-	if (typeof failure?.message !== "string" || !failure.message) return error;
-	const reason = typeof failure.details?.reason === "string" ? ` (${failure.details.reason})` : "";
-	return /* @__PURE__ */ new Error(`agent-device refused: ${failure.message}${reason}`);
-}
-function report(message) {
-	process.stderr.write(`${phaseLine("device", message)}\n`);
-}
-function closeOwnedDeviceSessions(device, stillOwned, workspace, repoRoot) {
-	const exec = getExecutor();
+async function teardownClaimedAvd(avdName, claim, { operation, del = false, wipe = false, park, owner, workspace, orphanedDirectory, onlyIfMissing = false, onWipeStart, waitForShutdown = waitForAndroidEmulatorShutdown, assertStopped = (name) => assertOwnedAvdStoppedAsync(name, operation), resolveAvd: resolve = (name) => resolveOwnedAvdSerialAsync(name, {
+	timeoutMs: AVD_INVENTORY_TIMEOUT_MS,
+	operation,
+	signal: operation?.signal
+}) }) {
+	let parkFallback;
+	const resolveAvd = async (name) => {
+		operation?.signal.throwIfAborted();
+		const result = await resolve(name);
+		operation?.signal.throwIfAborted();
+		return result;
+	};
 	try {
-		if (!exec.findExecutable("agent-device")) return;
-		const root = workspace === void 0 ? void 0 : canonical(workspace);
-		if (root === null) return;
-		const owner = root === void 0 ? void 0 : {
-			workspace: root,
-			repoRoot: repoRoot && (canonical(repoRoot) ?? void 0),
-			claims: deviceClaims(device)
+		operation?.signal.throwIfAborted();
+		if (del || wipe) await withConfigLockAsync$1(() => assertAvdReferences(avdName, owner), operation?.signal);
+		const resolved = await resolveAvd(avdName);
+		if (resolved.notOwned) return {
+			status: "skipped",
+			kind: "not-owned",
+			reason: `AVD ${avdName} is not Stim-owned: Stim has no record of creating it`
 		};
-		const stateDir = root === void 0 ? void 0 : workspaceAgentDeviceDir(root);
-		const stateDirs = [void 0, ...stateDir && !["none", "dead"].includes(agentDeviceDaemon(stateDir)) ? [stateDir] : []];
-		for (const dir of stateDirs) {
-			const deadline = Date.now() + 15e3;
-			const run = (args) => {
-				const remaining = deadline - Date.now();
-				if (remaining <= 0) throw new Error("agent-device cleanup timed out");
+		if (resolved.missing) {
+			if (wipe) throw new Error(`AVD ${avdName} is not registered; its data was kept.`);
+			return await teardownUnregisteredAvd(avdName, del, owner, orphanedDirectory, operation);
+		}
+		if (onlyIfMissing) return {
+			status: "skipped",
+			reason: "AVD registration appeared; its record was kept."
+		};
+		if (orphanedDirectory) return {
+			status: "skipped",
+			reason: "AVD registration appeared; its data was kept."
+		};
+		const serial = resolved.serial;
+		const stillStopped = async (sessionSerial) => {
+			const current = await resolveAvd(avdName);
+			return !current.notOwned && !current.missing && !current.serial && await serialFree(sessionSerial, AVD_INVENTORY_TIMEOUT_MS, operation);
+		};
+		if (serial) {
+			const stillOwned = async () => {
+				const current = await resolveAvd(avdName);
+				return !current.notOwned && !current.missing && current.serial === serial;
+			};
+			await closeOwnedDeviceSessions({
+				platform: "android",
+				id: serial,
+				avdName
+			}, stillOwned, workspace, void 0, operation);
+			if (!await stillOwned()) throw new Error(`Owned AVD ${avdName} changed before shutdown; it was kept.`);
+			await waitForShutdown(avdName, async (timeoutMs) => {
+				if (!operation) (0, ownership_claim_exports.markClaimChildPending)(claim);
 				try {
-					return exec.runFile("agent-device", [
-						...args,
-						...dir ? ["--state-dir", dir] : [],
-						"--json",
-						"--daemon-transport",
-						"socket"
-					], {
-						timeoutMs: Math.min(5e3, remaining),
-						killSignal: "SIGKILL"
-					});
-				} catch (error) {
-					throw explainFailure(error);
+					await shutdownAndroidEmulator(serial, timeoutMs, operation);
+				} finally {
+					if (!operation) (0, ownership_claim_exports.clearClaimChild)(claim);
 				}
+			}, { operation });
+			const root = await repoRootAbove(workspace, operation);
+			if (root) {
+				const deadline = Date.now() + ADB_RELEASE_WAIT_MS;
+				while (!await serialFree(serial, Math.max(1, deadline - Date.now()), operation) && Date.now() < deadline) await cancellableSleep(250, {
+					signal: operation?.signal,
+					what: "emulator release"
+				});
+				await closeOwnedDeviceSessions({
+					platform: "android",
+					id: serial,
+					avdName
+				}, stillStopped, workspace, root, operation);
+			}
+		} else {
+			await closeOwnedDeviceSessions({
+				platform: "android",
+				id: null,
+				avdName
+			}, stillStopped, workspace, void 0, operation);
+			await waitForShutdown(avdName, null, { operation });
+		}
+		if (wipe && !del) {
+			const current = await resolveAvd(avdName);
+			if (current.notOwned || current.missing) throw new Error(`AVD ${avdName} changed before its data was wiped.`);
+			if (current.serial) throw new Error(`Owned AVD ${avdName} started again before its data was wiped.`);
+			await assertStopped(avdName);
+			await withConfigLockAsync$1(() => assertAvdReferences(avdName, owner), operation?.signal);
+			operation?.signal.throwIfAborted();
+			const directory = ownedAvdDirectory(avdName);
+			if (!directory) throw new Error(`The data directory of AVD ${avdName} could not be resolved.`);
+			onWipeStart?.();
+			await wipeAvdUserData(directory, operation?.signal);
+		}
+		if (del) {
+			const current = await resolveAvd(avdName);
+			if (current.notOwned) return {
+				status: "skipped",
+				kind: "not-owned",
+				reason: `AVD ${avdName} is not Stim-owned: Stim has no record of creating it`
 			};
-			const list = () => parseAgentDeviceSessions(run([
-				"session",
-				"list",
-				"--session",
-				"stim-teardown-inventory"
-			]));
-			try {
-				const sessions = list().filter((session) => isOwnDeviceSession(session, device, owner));
-				for (const session of sessions) try {
-					if (!list().some((current) => current.name === session.name && current.platform === session.platform && current.id === session.id && current.createdAt === session.createdAt)) continue;
-					if (!stillOwned(session.id)) continue;
-					if (JSON.parse(run([
-						"close",
-						"--session",
-						session.name,
-						"--session-lock",
-						"reject",
-						"--platform",
-						device.platform,
-						device.platform === "ios" ? "--udid" : "--serial",
-						session.id
-					]))?.success !== true) throw new Error("agent-device did not confirm session close");
-					report(`closed agent-device session ${session.name} on ${session.id}`);
-				} catch (error) {
-					report(`could not close agent-device session ${session.name} on ${session.id}: ${error.message}`);
+			if (current.missing) return await teardownUnregisteredAvd(avdName, del, owner, void 0, operation);
+			if (current.serial) throw new Error(`Owned AVD ${avdName} started again before deletion.`);
+			await assertStopped(avdName);
+			await withConfigLockAsync$1(() => assertAvdReferences(avdName, owner), operation?.signal);
+			operation?.signal.throwIfAborted();
+			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({
+					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 } : {}
+					}
+				});
+				const removed = [];
+				const failures = [];
+				for (const entry of evicted) {
+					const result = await teardownParkedAvd(entry.name, { operation });
+					if (result.status === "torn-down") removed.push({
+						udid: entry.name,
+						name: entry.name,
+						platform: "android"
+					});
+					else if (result.status === "failed") failures.push(`could not delete evicted ${entry.name}: ${result.reason}`);
 				}
+				return {
+					status: "torn-down",
+					label: avdName,
+					parked: {
+						udid: avdName,
+						name: avdName,
+						platform: "android"
+					},
+					evicted: removed,
+					...failures.length ? { evictionFailures: failures } : {}
+				};
 			} catch (error) {
-				report(`could not list agent-device sessions for ${device.platform === "ios" ? device.id : device.id ?? device.avdName}: ${error.message}`);
+				if (error instanceof WorkspaceProcessCleanupError) throw error;
+				operation?.signal.throwIfAborted();
+				parkFallback = String(error?.message || error);
+			}
+			const directory = ownedAvdDirectory(avdName);
+			const paths = avdStorageRoots().map((root) => join(root, `${avdName}.ini`));
+			if (directory) paths.push(directory);
+			if (!operation) (0, ownership_claim_exports.markClaimChildPending)(claim);
+			try {
+				await deleteAvd(avdName, operation);
+			} finally {
+				if (!operation) (0, ownership_claim_exports.clearClaimChild)(claim);
 			}
+			const remaining = paths.filter(avdPathExists);
+			if (remaining.length) throw new Error(`AVD ${avdName} was only partially deleted; data remains at ${remaining.join(", ")}.`);
 		}
-	} catch (error) {
-		report(`could not list agent-device sessions for ${device.platform === "ios" ? device.id : device.id ?? device.avdName}: ${error.message}`);
+		return {
+			status: "torn-down",
+			label: avdName,
+			serial: resolved.serial ?? null,
+			...parkFallback ? { parkFallback } : {}
+		};
+	} catch (e) {
+		if (e instanceof WorkspaceProcessCleanupError) throw e;
+		operation?.signal.throwIfAborted();
+		return {
+			status: "failed",
+			reason: String(e?.message || e)
+		};
 	}
 }
-//#endregion
-//#region src/devices/teardown.ts
-function teardownParkedAvd(avdName) {
-	try {
-		return removeParkedAfter("android", avdName, () => {
-			const result = teardownOwnedAvd(avdName, {
-				del: true,
-				owner: { pool: true }
+const BROWSER_EXIT_WAIT_MS = 15e3;
+const CHROME_KILL_WAIT_MS = 5e3;
+async function stopOwnedChrome(record, profile, operation) {
+	for (const signal of ["SIGTERM", "SIGKILL"]) {
+		operation?.signal.throwIfAborted();
+		const state = await chromeProcessStateAsync(record, profile, operation);
+		if (state === "gone") return true;
+		if (state === "unknown") return false;
+		try {
+			await signalProcessTreeAsync(record.pid, signal, {
+				group: true,
+				operation
 			});
-			if (result.status !== "torn-down" && result.status !== "missing") throw new Error(result.reason);
-		}) ? {
-			status: "torn-down",
-			label: avdName
-		} : {
-			status: "skipped",
-			kind: "not-parked",
-			reason: "emulator is no longer parked"
-		};
+		} catch (error) {
+			if (error instanceof WorkspaceProcessCleanupError) throw error;
+			operation?.signal.throwIfAborted();
+		}
+		const deadline = Date.now() + CHROME_KILL_WAIT_MS;
+		while (await chromeProcessStateAsync(record, profile, operation) !== "gone" && Date.now() < deadline) await cancellableSleep(50, {
+			signal: operation?.signal,
+			what: "Chrome shutdown"
+		});
+	}
+	return await chromeProcessStateAsync(record, profile, operation) === "gone";
+}
+/**
+* Closes the workspace's Stim-owned Chrome and its supervisor, after verifying both process identities. With
+* `deleteProfile`, it also deletes the profile directory, only when the created-devices ledger lists it.
+*/
+async function teardownOwnedBrowser(root, options = {}) {
+	try {
+		return await withWorkspaceProcessLock(workspaceDir(root), "web", () => teardownBrowserHeld(root, options), {
+			external: true,
+			ownerPurpose: "browser teardown",
+			signal: options.operation?.signal,
+			declareSpawnsFor: options.operation
+		});
 	} catch (error) {
+		if (error instanceof WorkspaceProcessCleanupError) throw error;
+		options.operation?.signal.throwIfAborted();
 		return {
 			status: "failed",
 			reason: String(error?.message || error)
 		};
 	}
 }
-function teardownParkedIosSim(udid, { label, deleteSim = deleteParkedIosSim } = {}) {
+/** {@link teardownOwnedBrowser} for a caller that already holds the {@link BROWSER_LOCK} lock. */
+async function teardownBrowserHeld(root, { deleteProfile = false, operation } = {}) {
+	const signal = operation?.signal;
 	try {
-		const removed = removeParkedAfter("ios", udid, () => {
-			closeOwnedDeviceSessions({
-				platform: "ios",
-				id: udid
-			}, () => Boolean(resolveOwnedIosSim(udid).sim));
-			deleteSim(udid);
-		});
-		if (!removed) return {
-			status: "skipped",
-			kind: "not-parked",
-			reason: "simulator is no longer parked"
-		};
-		return {
+		signal?.throwIfAborted();
+		const record = readWebRecord(root);
+		const profile = record?.profile ?? webProfileDir(root);
+		if (record) {
+			const supervisor = (0, process_identity_exports.inspectProcessIdentity)(record);
+			const chrome = record.chromeProcess ? (0, process_identity_exports.inspectProcessIdentity)(record.chromeProcess) : "gone";
+			if (supervisor === "unknown" || chrome === "unknown") return {
+				status: "skipped",
+				kind: "not-verified",
+				reason: `the browser supervisor (pid ${record.pid}) or its Chrome could not be verified; its record was kept`
+			};
+			if (supervisor === "same") {
+				try {
+					process.kill(record.pid, "SIGTERM");
+				} catch {}
+				if (!await (0, process_identity_exports.waitForProcessExit)(record, BROWSER_EXIT_WAIT_MS, signal)) return {
+					status: "failed",
+					reason: `browser supervisor pid ${record.pid} did not exit`
+				};
+			}
+			if (record.chromeProcess && !await stopOwnedChrome(record.chromeProcess, profile, operation)) return {
+				status: "failed",
+				reason: `Chrome pid ${record.chromeProcess.pid} did not exit`
+			};
+			const exited = record.chromeProcess;
+			const holder = liveProfileHolder(profile, { alive: (pid) => pidExists(pid) && !(pid === exited?.pid && (0, process_identity_exports.inspectProcessIdentity)(exited) === "gone") });
+			if (holder !== null) return {
+				status: "skipped",
+				kind: "not-verified",
+				reason: `pid ${holder} still holds ${profile}, and the browser record does not name it; it was left running`
+			};
+			const claims = (0, ownership_claim_exports.clearFreeClaimSet)({
+				root: webClaimRoot(root),
+				label: "browser supervisor"
+			});
+			if (claims.status !== "cleared") return {
+				status: "skipped",
+				kind: "not-verified",
+				reason: claims.status === "held" ? `the browser supervisor claim is still held${claims.holder ? ` by pid ${claims.holder.owner.pid}` : ""}` : `the browser supervisor claim could not be cleared (${claims.reason}); remove it with ${(0, ownership_claim_exports.claimRemoveCommand)(webClaimRoot(root))}`
+			};
+			await withWorkspaceStateLockAsync(root, () => clearWebRecord(root, record), signal);
+			await releaseBrowserPort(root, record.cdpPort, signal);
+		} else {
+			const holder = liveProfileHolder(profile);
+			if (holder !== null) return {
+				status: "skipped",
+				kind: "not-verified",
+				reason: `pid ${holder} holds ${profile} but no browser supervisor is recorded; it was left running`
+			};
+			const port = getProject(root)?.ports?.[CDP_PORT_LABEL];
+			if (typeof port === "number") await releaseBrowserPort(root, port, signal);
+		}
+		signal?.throwIfAborted();
+		if (existsSync(profile)) removeSingletonFiles(profile);
+		if (deleteProfile && existsSync(profile)) {
+			if (!readCreatedDevices$1().web.has(profile)) return {
+				status: "skipped",
+				kind: "not-owned",
+				reason: `${profile} is not in Stim's ledger; it was kept`
+			};
+			await rm(profile, {
+				recursive: true,
+				force: true
+			});
+			signal?.throwIfAborted();
+			forgetCreatedDevice("web", profile);
+		}
+		return record ? {
 			status: "torn-down",
-			label: label ?? removed.name
-		};
+			label: `Chrome (${profile})`
+		} : { status: "missing" };
 	} catch (error) {
+		if (error instanceof WorkspaceProcessCleanupError) throw error;
+		signal?.throwIfAborted();
 		return {
 			status: "failed",
 			reason: String(error?.message || error)
 		};
 	}
 }
-function eraseParkedIosSim(udid, { label } = {}) {
-	try {
-		const erased = eraseParkedAfter("ios", udid, (_record, eraseStarted) => {
-			closeOwnedDeviceSessions({
-				platform: "ios",
-				id: udid
-			}, () => Boolean(resolveOwnedIosSim(udid).sim));
-			const resolved = resolveOwnedIosSim(udid);
-			if (resolved.missing) throw new Error(`simulator ${udid} is not on this machine`);
-			if (resolved.notOwned) throw new Error(`simulator ${udid} is now named ${JSON.stringify(resolved.notOwned)}`);
-			const state = resolved.sim.state;
-			if (state !== "Shutdown") throw new Error(`simulator ${udid} is ${state}, not Shutdown; it was kept`);
-			eraseStarted();
-			eraseIosSim(udid);
-		});
-		if (!erased) return {
-			status: "skipped",
-			kind: "not-parked",
-			reason: "simulator is no longer parked"
-		};
-		return {
-			status: "torn-down",
-			label: label ?? erased.name
-		};
-	} catch (error) {
-		return {
-			status: "failed",
-			reason: String(error?.message || error)
-		};
-	}
+//#endregion
+//#region src/macos/instances.ts
+const BUNDLE_EXECUTABLE = /^[^/]+\.app\/Contents\/MacOS\/[^/]+$/;
+function bundleDirs(root) {
+	const dir = macosDir(root);
+	if (process.platform !== "darwin" || !existsSync(dir)) return [];
+	return [.../* @__PURE__ */ new Set([dir, realpathSync(dir)])];
 }
-function eraseParkedAvd(avdName) {
-	try {
-		return eraseParkedAfter("android", avdName, (_record, eraseStarted) => {
-			if (resolveOwnedAvdSerial(avdName, { timeoutMs: AVD_INVENTORY_TIMEOUT_MS }).serial) throw new Error(`AVD ${avdName} is running; it was kept`);
-			const result = teardownOwnedAvd(avdName, {
-				wipe: true,
-				owner: { pool: true },
-				onWipeStart: eraseStarted
-			});
-			if (result.status !== "torn-down") throw new Error(result.reason ?? `AVD ${avdName} is ${result.status}`);
-		}) ? {
-			status: "torn-down",
-			label: avdName
-		} : {
-			status: "skipped",
-			kind: "not-parked",
-			reason: "emulator is no longer parked"
-		};
-	} catch (error) {
-		return {
-			status: "failed",
-			reason: String(error?.message || error)
-		};
-	}
+function isBundleExecutable(path, dirs) {
+	return dirs.some((dir) => path.startsWith(`${dir}/`) && BUNDLE_EXECUTABLE.test(path.slice(dir.length + 1)));
 }
-const IOS_SHUTDOWN_SETTLE_MS = 15e3;
-const ADB_RELEASE_WAIT_MS = 3e3;
-const AVD_INVENTORY_TIMEOUT_MS = 15e3;
-function repoRootAbove(workspace) {
-	if (workspace === void 0 || !getExecutor().findExecutable("agent-device")) return void 0;
-	const root = repoRoot(workspace);
-	try {
-		return root && realpathSync(root) !== realpathSync(workspace) ? root : void 0;
-	} catch {
-		return;
+/** Pids from `ps -axww -o pid=,comm=` output whose command names a bundle executable inside `dirs`. */
+function bundleCandidates(psOutput, dirs) {
+	const pids = [];
+	for (const line of psOutput.split("\n")) {
+		const match = /^\s*(\d+)\s+(.+)$/.exec(line);
+		if (match && isBundleExecutable(match[2], dirs)) pids.push(Number(match[1]));
 	}
+	return pids;
 }
-const IOS_SHUTDOWN_POLL_MS = 250;
-const IOS_SHUTDOWN_ATTEMPTS = 2;
-function settleIosSimShutdown(udid, { now = Date.now, sleep = sleepSync }) {
-	let resolved = resolveOwnedIosSim(udid);
-	for (let attempt = 1;; attempt++) {
-		const deadline = now() + IOS_SHUTDOWN_SETTLE_MS;
-		while (resolved.sim && resolved.sim.state !== "Shutdown" && now() < deadline) {
-			sleep(IOS_SHUTDOWN_POLL_MS);
-			resolved = resolveOwnedIosSim(udid);
-		}
-		if (!resolved.sim || resolved.sim.state === "Shutdown" || attempt === IOS_SHUTDOWN_ATTEMPTS) return resolved;
-		shutdownIosSim(udid);
-		resolved = resolveOwnedIosSim(udid);
+/** Whether `lsof -Fn -d txt` output for one process names a bundle executable inside `dirs`. */
+function lsofNamesBundleExecutable(lsofOutput, dirs) {
+	return lsofOutput.split("\n").some((line) => line.startsWith("n") && isBundleExecutable(line.slice(1), dirs));
+}
+function candidatePids(dirs) {
+	if (!dirs.length) return [];
+	return bundleCandidates(getExecutor().runFile("ps", [
+		"-axww",
+		"-o",
+		"pid=,comm="
+	], { timeoutMs: 1e4 }), dirs).filter((pid) => pid !== process.pid);
+}
+/** Pids that claim to run an app bundle from the workspace's macOS directory. `ps` reports argv[0], so this is a lead. */
+function bundleInstancePids(root) {
+	return candidatePids(bundleDirs(root));
+}
+async function bundleInstancePidsAsync(root, signal, operation) {
+	signal?.throwIfAborted();
+	const dirs = bundleDirs(root);
+	if (!dirs.length) return [];
+	return bundleCandidates(await runOperationFile(operation, getExecutor(), "ps", [
+		"-axww",
+		"-o",
+		"pid=,comm="
+	], {
+		timeoutMs: 1e4,
+		killSignal: "SIGKILL",
+		signal,
+		cwd: operation?.cwd
+	}), dirs).filter((pid) => pid !== process.pid);
+}
+function unverified(pid, why) {
+	return Object.assign(/* @__PURE__ */ new Error(`Cannot verify macOS app pid ${pid}: ${why}; no signal was sent.`), { code: "STIM_MACOS_OWNER_UNVERIFIED" });
+}
+function bundleRecord(pid) {
+	const processToken = (0, process_identity_exports.captureProcessToken)(pid);
+	const start = (0, process_identity_exports.processStartMicros)(pid);
+	if (!processToken || start.status !== "running") {
+		if (start.status === "gone") return null;
+		throw unverified(pid, "its identity cannot be captured");
 	}
+	return {
+		pid,
+		processToken,
+		startedAtMicros: start.startedAtMicros
+	};
 }
-function iosShutdownFailureReason(udid, state) {
-	return `simulator ${udid} is still ${state} after ${IOS_SHUTDOWN_ATTEMPTS} shutdown attempts and ${IOS_SHUTDOWN_ATTEMPTS * IOS_SHUTDOWN_SETTLE_MS / 1e3}s of waiting`;
+function failedBundleListing(record, error) {
+	if (["gone", "different"].includes((0, process_identity_exports.inspectProcessIdentity)(record))) return null;
+	const open = String(error.stdout ?? "");
+	if (!open.trim()) throw unverified(record.pid, `lsof failed (${error.message.split("\n")[0]})`);
+	return open;
 }
-function parkOwnedIosSim(settled, udid, park) {
-	if (settled.missing) throw new Error(`simulator ${udid} disappeared after shutdown`);
-	if (settled.notOwned) throw new Error(`simulator ${udid} is now named ${JSON.stringify(settled.notOwned)}`);
-	const sim = settled.sim;
-	if (sim.state !== "Shutdown") throw new Error(iosShutdownFailureReason(udid, sim.state));
-	const model = listIosDeviceTypes().find((d) => d.identifier === sim.deviceTypeIdentifier)?.name ?? null;
-	const runtime = parseRuntimeVersion(sim.runtime);
-	const name = parkedSimName(sim.udid, {
-		model,
-		runtime
+/** Verifies owned bundle instances without blocking on process and executable probes. */
+async function runningBundleInstancesAsync(root, operation) {
+	operation?.signal.throwIfAborted();
+	const dirs = bundleDirs(root);
+	if (!dirs.length) return [];
+	const listing = await runOperationFile(operation, getExecutor(), "ps", [
+		"-axww",
+		"-o",
+		"pid=,comm="
+	], {
+		cwd: operation?.cwd,
+		timeoutMs: 1e4,
+		killSignal: "SIGKILL"
 	});
-	renameIosSim(sim.udid, name);
-	const record = {
-		udid: sim.udid,
-		name,
-		deviceTypeIdentifier: sim.deviceTypeIdentifier,
-		runtimeIdentifier: sim.runtime,
-		parkedAt: (/* @__PURE__ */ new Date()).toISOString(),
-		simslimManaged: Boolean(park.simslimManaged),
-		...park.appId ? { bundleId: park.appId } : {},
-		...park.cacheKey ? { cacheKey: park.cacheKey } : {}
+	const instances = [];
+	for (const pid of bundleCandidates(listing, dirs).filter((candidate) => candidate !== process.pid)) {
+		operation?.signal.throwIfAborted();
+		const record = bundleRecord(pid);
+		if (!record) continue;
+		let open;
+		try {
+			open = await runOperationFile(operation, getExecutor(), "lsof", [
+				"-a",
+				"-p",
+				String(pid),
+				"-d",
+				"txt",
+				"-Fn"
+			], {
+				cwd: operation?.cwd,
+				timeoutMs: 1e4,
+				killSignal: "SIGKILL"
+			});
+		} catch (error) {
+			if (error instanceof WorkspaceProcessCleanupError) throw error;
+			operation?.signal.throwIfAborted();
+			const partial = failedBundleListing(record, error);
+			if (partial === null) continue;
+			open = partial;
+		}
+		if (lsofNamesBundleExecutable(open, dirs)) instances.push(record);
+	}
+	return instances;
+}
+//#endregion
+//#region src/engine/tunnel.ts
+function tunnelArgv(provider, port, ngrokUrl, logFile, tailscaleBinary = "tailscale") {
+	if (provider === "tailscale") return {
+		bin: tailscaleBinary,
+		args: [
+			"serve",
+			`--https=${port}`,
+			`http://127.0.0.1:${port}`
+		]
+	};
+	if (provider === "cloudflared") return {
+		bin: "cloudflared",
+		args: [
+			"tunnel",
+			"--url",
+			`http://127.0.0.1:${port}`,
+			...logFile ? ["--logfile", logFile] : []
+		]
 	};
 	return {
-		record,
-		evicted: parkSim({
-			platform: "ios",
-			projectPath: park.projectPath,
-			slot: park.slot,
-			record,
-			max: park.max
-		})
+		bin: "ngrok",
+		args: [
+			"http",
+			String(port),
+			`--log=${logFile || "stdout"}`,
+			"--log-format=json",
+			...ngrokUrl ? ["--url", ngrokUrl] : []
+		]
 	};
 }
-function teardownOwnedIosSim(udid, { del = false, label, park, workspace, shutdownClock = {} } = {}) {
-	let parkFallback;
+const CLOUDFLARED_URL_RE = /https:\/\/[a-z0-9-]+\.trycloudflare\.com/i;
+function parseCloudflaredLine(line) {
+	const match = line.match(CLOUDFLARED_URL_RE);
+	return match ? match[0] : null;
+}
+function parseNgrokLine(line) {
+	let data;
 	try {
-		const resolved = resolveOwnedIosSim(udid);
-		if (resolved.notOwned) return {
-			status: "skipped",
-			kind: "not-owned",
-			reason: `sim "${resolved.notOwned}" is not Stim-owned: Stim has no record of creating it`
-		};
-		if (resolved.missing) return { status: "missing" };
-		closeOwnedDeviceSessions({
-			platform: "ios",
-			id: udid
-		}, () => Boolean(resolveOwnedIosSim(udid).sim), workspace);
-		const current = resolveOwnedIosSim(udid);
-		if (current.missing) return { status: "missing" };
-		if (current.notOwned) return {
-			status: "skipped",
-			kind: "not-owned",
-			reason: "simulator ownership changed before shutdown"
-		};
-		shutdownIosSim(udid);
-		const sim = resolved.sim;
-		if (del && park && park.max > 0) try {
-			const { record, evicted } = parkOwnedIosSim(settleIosSimShutdown(udid, shutdownClock), udid, park);
-			const removed = [];
-			const failures = [];
-			for (const entry of evicted) {
-				const result = teardownParkedIosSim(entry.udid, { label: entry.name });
-				if (result.status === "torn-down") removed.push({
-					udid: entry.udid,
-					name: entry.name
-				});
-				else if (result.status === "failed") failures.push(`could not delete evicted ${entry.name} (${entry.udid}): ${result.reason}`);
-			}
-			return {
-				status: "torn-down",
-				label: label ?? sim.name ?? udid,
-				parked: {
-					udid: record.udid,
-					name: record.name
-				},
-				evicted: removed,
-				...failures.length ? { evictionFailures: failures } : {}
-			};
-		} catch (e) {
-			parkFallback = String(e?.message || e);
-		}
-		if (del) {
-			deleteIosSim(udid);
-			return {
-				status: "torn-down",
-				label: label ?? sim.name ?? udid,
-				...parkFallback ? { parkFallback } : {}
-			};
-		}
-		const settled = settleIosSimShutdown(udid, shutdownClock);
-		if (settled.sim && settled.sim.state !== "Shutdown") return {
-			status: "failed",
-			label: label ?? sim.name ?? udid,
-			reason: iosShutdownFailureReason(udid, settled.sim.state)
-		};
-		const root = sim.state === "Shutdown" ? void 0 : repoRootAbove(workspace);
-		if (root && settled.sim) closeOwnedDeviceSessions({
-			platform: "ios",
-			id: udid
-		}, () => resolveOwnedIosSim(udid).sim?.state === "Shutdown", workspace, root);
-		return {
-			status: "torn-down",
-			label: label ?? sim.name ?? udid
-		};
-	} catch (e) {
-		return {
-			status: "failed",
-			reason: String(e?.message || e),
-			...parkFallback ? { parkFallback } : {}
-		};
+		data = JSON.parse(line);
+	} catch {
+		return null;
 	}
+	if (typeof data !== "object" || data === null) return null;
+	const url = data.url;
+	return typeof url === "string" && /^https?:\/\//i.test(url) ? url : null;
 }
-function assertAvdReferences(avdName, owner) {
-	const config = loadConfig$1();
-	if (!config) throw new Error("Cannot verify AVD references without a Stim config; the data was kept.");
-	if (owner && "projectPath" in owner && owner.expectedRecord && !isDeepStrictEqual(deviceSlotPlatforms(config.projects[owner.projectPath], owner.slot)?.android, owner.expectedRecord)) throw new Error(`AVD ${avdName} has a changed workspace record; its data was kept.`);
-	for (const [projectPath, project] of Object.entries(config.projects)) for (const { slot, platforms } of projectDeviceSlots(project)) {
-		if (platforms.android?.avdName?.toLowerCase() !== avdName.toLowerCase()) continue;
-		if (!owner || !("projectPath" in owner) || owner.projectPath !== projectPath || (owner.slot ?? "default") !== slot || !platforms.android.owned) throw new Error(`AVD ${avdName} is referenced by ${projectPath} (${slot}); its data was kept.`);
-	}
-	if (readParked("android", { config }).some((entry) => entry.name.toLowerCase() === avdName.toLowerCase()) && !(owner && "pool" in owner)) throw new Error(`AVD ${avdName} is in the emulator pool; its data was kept.`);
+function parseTailscaleLine(line) {
+	return /^https:\/\/[^\s/]+\.ts\.net(:\d+)?\/?$/.test(line) ? line : null;
 }
-function removeOrphanedAvdDirectory(candidate, owner) {
-	const surveyed = listOrphanedAvdDirectories(candidate.name).find((entry) => entry.directory === candidate.directory);
-	if (!surveyed || surveyed.name !== candidate.name || surveyed.dev !== candidate.dev || surveyed.ino !== candidate.ino) throw new Error(`AVD data at ${candidate.directory} changed or is registered; it was kept.`);
-	assertOwnedAvdStopped(candidate.name, { resolveDirectory: () => candidate.directory });
-	const detached = withConfigLock$1(() => {
-		const current = lstatSync(candidate.directory);
-		if (!current.isDirectory() || current.dev !== candidate.dev || current.ino !== candidate.ino) throw new Error(`AVD data at ${candidate.directory} changed or is registered; it was kept.`);
-		assertAvdReferences(candidate.name, owner);
-		const name = `stim-gc-${randomUUID()}`;
-		recordCreatedDevice("android", name);
-		const destination = join(dirname(candidate.directory), `${name}.avd`);
-		try {
-			renameSync(candidate.directory, destination);
-		} catch (error) {
-			forgetCreatedDevice("android", name);
-			throw error;
-		}
-		forgetCreatedDevice("android", candidate.name);
-		return destination;
+function parserFor(provider) {
+	if (provider === "tailscale") return parseTailscaleLine;
+	return provider === "cloudflared" ? parseCloudflaredLine : parseNgrokLine;
+}
+const URL_TIMEOUT_MS = 15e3;
+const REACHABLE_TIMEOUT_MS = 24e4;
+const REACHABLE_POLL_MS = 2e3;
+const defaultSleep = (ms) => new Promise((r) => setTimeout(r, ms));
+async function withManagedTunnelLock(root, fn, options = {}) {
+	return withWorkspaceProcessLock(managedTunnelLockRoot(root), "metro-tunnel", fn, {
+		...options,
+		rejectOwnerPurposes: ["workspace removal"]
 	});
-	const current = lstatSync(detached);
-	if (!current.isDirectory() || current.dev !== candidate.dev || current.ino !== candidate.ino) throw new Error(`Detached AVD data changed at ${detached}; it was kept.`);
-	try {
-		rmSync(detached, { recursive: true });
-	} catch (error) {
-		throw new Error(`Could not remove AVD data at ${detached}; retry gc --delete: ${error.message}`, { cause: error });
-	}
-	forgetCreatedDevice("android", basename(detached, ".avd"));
 }
-function teardownUnregisteredAvd(avdName, del, owner, surveyed) {
-	const candidates = surveyed ? [surveyed] : listOrphanedAvdDirectories(avdName);
-	if (candidates.length === 0) {
-		if (avdStorageRoots().some((root) => avdPathExists(join(root, `${avdName}.ini`)) || avdPathExists(join(root, `${avdName}.avd`)))) throw new Error(`AVD ${avdName} is not listed but its storage remains; it was kept.`);
-		return { status: "missing" };
-	}
-	if (!del) return {
-		status: "skipped",
-		reason: "AVD registration is missing; its data was kept."
-	};
-	for (const candidate of candidates) {
-		if (candidate.name !== avdName) throw new Error(`AVD data does not match ${avdName}; it was kept.`);
-		removeOrphanedAvdDirectory(candidate, owner);
-	}
-	return {
-		status: "torn-down",
-		label: avdName
-	};
+async function withManagedTunnelRemovalLock(root, fn, options = {}) {
+	return withWorkspaceProcessLock(managedTunnelLockRoot(root), "metro-tunnel", fn, {
+		...options,
+		ownerPurpose: "workspace removal"
+	});
 }
-function teardownOwnedAvd(avdName, options = {}) {
-	let claim;
-	try {
-		if (!isStimOwnedAvd(avdName)) return {
-			status: "skipped",
-			kind: "not-owned",
-			reason: `AVD ${avdName} is not Stim-owned: Stim has no record of creating it`
-		};
-		claim = acquireAvdClaim(avdName);
-		const result = teardownClaimedAvd(avdName, claim, options);
-		if (result.status === "torn-down" || result.status === "missing") options.onRemoved?.();
-		return result;
-	} catch (error) {
-		return {
-			status: "failed",
-			reason: String(error?.message || error)
-		};
-	} finally {
-		(0, ownership_claim_exports.releaseClaim)(claim);
+async function withManagedRemoteWorktreeLock(worktreeRoot, fn, options = {}) {
+	return withWorkspaceProcessLock(managedRemoteWorktreeLockRoot(worktreeRoot), "managed-remote", fn, {
+		...options,
+		external: true,
+		rejectOwnerPurposes: ["worktree removal"]
+	});
+}
+async function withManagedRemoteWorktreeRemovalLock(worktreeRoot, fn, options = {}) {
+	return withWorkspaceProcessLock(managedRemoteWorktreeLockRoot(worktreeRoot), "managed-remote", fn, {
+		...options,
+		external: true,
+		ownerPurpose: "worktree removal"
+	});
+}
+function managedLockHolders(root) {
+	const locks = [{
+		label: "managed tunnel",
+		path: workspaceProcessLockPath(managedTunnelLockRoot(root), "metro-tunnel", false)
+	}, {
+		label: "managed remote",
+		path: workspaceProcessLockPath(managedRemoteWorktreeLockRoot(root), "managed-remote", true)
+	}];
+	const reasons = [];
+	for (const { label, path } of locks) {
+		const claims = (0, ownership_claim_exports.readClaimSet)(path);
+		const holder = claims.live[0];
+		if (holder) {
+			const purpose = typeof holder.details.purpose === "string" ? ` for ${holder.details.purpose}` : "";
+			reasons.push(`the ${label} lock is held${purpose}`);
+		} else if (claims.unresolved[0]) reasons.push(`the ${label} lock cannot be resolved: ${claims.unresolved[0].reason}`);
 	}
+	return reasons;
 }
-function serialFree(serial, timeoutMs = AVD_INVENTORY_TIMEOUT_MS) {
-	const adb = listAdbDevices({ timeoutMs });
-	return ![
-		...adb.emulators,
-		...adb.physical,
-		...adb.unhealthy
-	].some((entry) => entry.serial === serial);
+function managedTunnelLockRoot(root) {
+	const key = createHash("sha256").update(resolve(root)).digest("hex");
+	return join(getConfigDir(), "process-locks", key);
 }
-function teardownClaimedAvd(avdName, claim, { del = false, wipe = false, park, owner, workspace, orphanedDirectory, onlyIfMissing = false, onWipeStart, waitForShutdown = waitForAndroidEmulatorShutdown, assertStopped = assertOwnedAvdStopped, resolveAvd = (name) => resolveOwnedAvdSerial(name, { timeoutMs: AVD_INVENTORY_TIMEOUT_MS }) }) {
-	let parkFallback;
-	try {
-		if (del || wipe) withConfigLock$1(() => assertAvdReferences(avdName, owner));
-		const resolved = resolveAvd(avdName);
-		if (resolved.notOwned) return {
-			status: "skipped",
-			kind: "not-owned",
-			reason: `AVD ${avdName} is not Stim-owned: Stim has no record of creating it`
-		};
-		if (resolved.missing) {
-			if (wipe) throw new Error(`AVD ${avdName} is not registered; its data was kept.`);
-			return teardownUnregisteredAvd(avdName, del, owner, orphanedDirectory);
-		}
-		if (onlyIfMissing) return {
-			status: "skipped",
-			reason: "AVD registration appeared; its record was kept."
-		};
-		if (orphanedDirectory) return {
-			status: "skipped",
-			reason: "AVD registration appeared; its data was kept."
-		};
-		const serial = resolved.serial;
-		const stillStopped = (sessionSerial) => {
-			const current = resolveAvd(avdName);
-			return !current.notOwned && !current.missing && !current.serial && serialFree(sessionSerial);
-		};
-		if (serial) {
-			const stillOwned = () => {
-				const current = resolveAvd(avdName);
-				return !current.notOwned && !current.missing && current.serial === serial;
-			};
-			closeOwnedDeviceSessions({
-				platform: "android",
-				id: serial,
-				avdName
-			}, stillOwned, workspace);
-			if (!stillOwned()) throw new Error(`Owned AVD ${avdName} changed before shutdown; it was kept.`);
-			waitForShutdown(avdName, (timeoutMs) => {
-				(0, ownership_claim_exports.markClaimChildPending)(claim);
-				try {
-					shutdownAndroidEmulator(serial, timeoutMs);
-				} finally {
-					(0, ownership_claim_exports.clearClaimChild)(claim);
-				}
-			});
-			const root = repoRootAbove(workspace);
-			if (root) {
-				const deadline = Date.now() + ADB_RELEASE_WAIT_MS;
-				while (!serialFree(serial, Math.max(1, deadline - Date.now())) && Date.now() < deadline) sleepSync(250);
-				closeOwnedDeviceSessions({
-					platform: "android",
-					id: serial,
-					avdName
-				}, stillStopped, workspace, root);
-			}
-		} else {
-			closeOwnedDeviceSessions({
-				platform: "android",
-				id: null,
-				avdName
-			}, stillStopped, workspace);
-			waitForShutdown(avdName, null);
-		}
-		if (wipe && !del) {
-			const current = resolveAvd(avdName);
-			if (current.notOwned || current.missing) throw new Error(`AVD ${avdName} changed before its data was wiped.`);
-			if (current.serial) throw new Error(`Owned AVD ${avdName} started again before its data was wiped.`);
-			assertStopped(avdName);
-			withConfigLock$1(() => assertAvdReferences(avdName, owner));
-			const directory = ownedAvdDirectory(avdName);
-			if (!directory) throw new Error(`The data directory of AVD ${avdName} could not be resolved.`);
-			onWipeStart?.();
-			wipeAvdUserData(directory);
-		}
-		if (del) {
-			const current = resolveAvd(avdName);
-			if (current.notOwned) return {
-				status: "skipped",
-				kind: "not-owned",
-				reason: `AVD ${avdName} is not Stim-owned: Stim has no record of creating it`
-			};
-			if (current.missing) return teardownUnregisteredAvd(avdName, del, owner);
-			if (current.serial) throw new Error(`Owned AVD ${avdName} started again before deletion.`);
-			assertStopped(avdName);
-			withConfigLock$1(() => assertAvdReferences(avdName, owner));
-			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({
-					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 } : {}
-					}
-				});
-				const removed = [];
-				const failures = [];
-				for (const entry of evicted) {
-					const result = teardownParkedAvd(entry.name);
-					if (result.status === "torn-down") removed.push({
-						udid: entry.name,
-						name: entry.name,
-						platform: "android"
-					});
-					else if (result.status === "failed") failures.push(`could not delete evicted ${entry.name}: ${result.reason}`);
-				}
-				return {
-					status: "torn-down",
-					label: avdName,
-					parked: {
-						udid: avdName,
-						name: avdName,
-						platform: "android"
-					},
-					evicted: removed,
-					...failures.length ? { evictionFailures: failures } : {}
-				};
-			} catch (error) {
-				parkFallback = String(error?.message || error);
-			}
-			const directory = ownedAvdDirectory(avdName);
-			const paths = avdStorageRoots().map((root) => join(root, `${avdName}.ini`));
-			if (directory) paths.push(directory);
-			(0, ownership_claim_exports.markClaimChildPending)(claim);
-			try {
-				deleteAvd(avdName);
-			} finally {
-				(0, ownership_claim_exports.clearClaimChild)(claim);
-			}
-			const remaining = paths.filter(avdPathExists);
-			if (remaining.length) throw new Error(`AVD ${avdName} was only partially deleted; data remains at ${remaining.join(", ")}.`);
-		}
-		return {
-			status: "torn-down",
-			label: avdName,
-			serial: resolved.serial ?? null,
-			...parkFallback ? { parkFallback } : {}
+function managedRemoteWorktreeLockRoot(worktreeRoot) {
+	const key = createHash("sha256").update(resolve(worktreeRoot)).digest("hex");
+	return join(getConfigDir(), "process-locks", "worktrees", key);
+}
+async function defaultProbeReachable(url, signal) {
+	const status = await probePublicHttp(url, signal);
+	return status !== null && status > 0;
+}
+function waitForUrl(child, parseLine, timeoutMs, signal) {
+	return new Promise((resolve) => {
+		let settled = false;
+		let lastLine = null;
+		let timer;
+		let onOut;
+		let onErr;
+		let onError;
+		let onExit;
+		const finish = (url, exited = false) => {
+			if (settled) return;
+			settled = true;
+			clearTimeout(timer);
+			child.stdout?.removeListener("data", onOut);
+			child.stderr?.removeListener("data", onErr);
+			child.removeListener("error", onError);
+			child.removeListener("exit", onExit);
+			signal?.removeEventListener("abort", onAbort);
+			resolve({
+				url,
+				exited,
+				lastLine
+			});
 		};
-	} catch (e) {
-		return {
-			status: "failed",
-			reason: String(e?.message || e)
+		const onAbort = () => finish(null);
+		const onLine = (line) => {
+			if (settled) return;
+			if (line.trim()) lastLine = line.trim();
+			const url = parseLine(line);
+			if (url) finish(url);
 		};
-	}
+		const outReader = createLineReader(onLine);
+		const errReader = createLineReader(onLine);
+		onOut = (chunk) => outReader.push(chunk);
+		onErr = (chunk) => errReader.push(chunk);
+		onError = () => finish(null);
+		onExit = () => {
+			outReader.flush();
+			errReader.flush();
+			finish(null, true);
+		};
+		child.stdout?.setEncoding?.("utf-8");
+		child.stderr?.setEncoding?.("utf-8");
+		child.stdout?.on("data", onOut);
+		child.stderr?.on("data", onErr);
+		child.on("error", onError);
+		child.on("exit", onExit);
+		timer = setTimeout(() => finish(null), timeoutMs);
+		signal?.addEventListener("abort", onAbort, { once: true });
+		if (signal?.aborted) onAbort();
+	});
 }
-const BROWSER_EXIT_WAIT_MS = 15e3;
-const CHROME_KILL_WAIT_MS = 5e3;
-async function stopOwnedChrome(record, profile) {
-	for (const signal of ["SIGTERM", "SIGKILL"]) {
-		const state = chromeProcessState(record, profile);
-		if (state === "gone") return true;
-		if (state === "unknown") return false;
+function waitForFileUrl(child, logFile, parseLine, timeoutMs, signal) {
+	return new Promise((resolve) => {
+		let settled = false;
+		let watcher = null;
+		const finish = (url, exited = false) => {
+			if (settled) return;
+			settled = true;
+			watcher?.close();
+			clearInterval(interval);
+			clearTimeout(timer);
+			child.removeListener("error", onError);
+			child.removeListener("exit", onExit);
+			signal?.removeEventListener("abort", onAbort);
+			resolve({
+				url,
+				exited
+			});
+		};
+		const onAbort = () => finish(null);
+		const probe = () => {
+			try {
+				for (const line of readFileSync(logFile, "utf-8").split(/\r?\n/)) {
+					const url = parseLine(line);
+					if (url) return finish(url);
+				}
+			} catch {}
+		};
+		const onError = () => finish(null);
+		const onExit = () => finish(null, true);
+		child.on("error", onError);
+		child.on("exit", onExit);
 		try {
-			signalProcessTree(record.pid, signal, { group: true });
+			watcher = watch(dirname(logFile), (_event, name) => {
+				if (name === null || name.toString() === basename(logFile)) probe();
+			});
+			watcher.on("error", () => {
+				watcher?.close();
+				watcher = null;
+			});
+			watcher.unref();
 		} catch {}
-		const deadline = Date.now() + CHROME_KILL_WAIT_MS;
-		while (chromeProcessState(record, profile) !== "gone" && Date.now() < deadline) await sleepAsync(50);
+		const interval = setInterval(probe, Math.min(1e3, timeoutMs));
+		const timer = setTimeout(() => finish(null), timeoutMs);
+		signal?.addEventListener("abort", onAbort, { once: true });
+		if (signal?.aborted) onAbort();
+		else probe();
+	});
+}
+function createTunnelLogFile(provider) {
+	const dir = join(getConfigDir(), "tunnel-logs");
+	mkdirSync(dir, { recursive: true });
+	const path = join(dir, `${provider}-${randomUUID()}.log`);
+	closeSync(openSync(path, "wx", 384));
+	return path;
+}
+function removeTunnelLogFile(path) {
+	if (!path) return;
+	try {
+		unlinkSync(path);
+	} catch {}
+}
+function removeRecordedTunnelLogFile(path) {
+	if (!path) return;
+	const dir = resolve(join(getConfigDir(), "tunnel-logs"));
+	const resolved = resolve(path);
+	if (!resolved.startsWith(`${dir}${sep}`) || resolve(join(dir, basename(resolved))) !== resolved) return;
+	removeTunnelLogFile(resolved);
+}
+async function waitUntilReachable({ url, now, sleep, probe, timeoutMs, signal }) {
+	const deadline = now() + timeoutMs;
+	for (;;) {
+		throwIfCancelled(signal, "Metro tunnel startup");
+		const controller = new AbortController();
+		const ok = await probe(url, signal ? AbortSignal.any([signal, controller.signal]) : controller.signal).catch(() => false);
+		throwIfCancelled(signal, "Metro tunnel startup");
+		if (ok) return true;
+		if (now() >= deadline) return false;
+		if (sleep === defaultSleep) await cancellableSleep(REACHABLE_POLL_MS, {
+			signal,
+			what: "Metro tunnel startup"
+		});
+		else await sleep(REACHABLE_POLL_MS);
 	}
-	return chromeProcessState(record, profile) === "gone";
 }
-const sleepAsync = (ms) => new Promise((done) => setTimeout(done, ms));
-/**
-* Closes the workspace's Stim-owned Chrome and its supervisor, after verifying both process identities. With
-* `deleteProfile`, it also deletes the profile directory, only when the created-devices ledger lists it.
-*/
-async function teardownOwnedBrowser(root, options = {}) {
+const CLEANUP_TIMEOUT_MS = 1e3;
+async function startTunnel({ claims = [], signal, provider, port, spawnFn = null, urlTimeoutMs = URL_TIMEOUT_MS, reachableTimeoutMs = REACHABLE_TIMEOUT_MS, probeReachable = defaultProbeReachable, now = Date.now, sleep = defaultSleep, ngrokUrl = null, requireReachable = true, cleanupTimeoutMs = CLEANUP_TIMEOUT_MS, isChildAlive = pidExists, readProcessToken = process_identity_exports.captureProcessToken, logFile = null }) {
+	throwIfCancelled(signal, "Metro tunnel startup");
+	const spawn = spawnFn || ((cmd, args, opts) => getExecutor().spawn(cmd, args, opts));
+	const outputFile = provider === "tailscale" ? null : logFile || (spawnFn ? null : createTunnelLogFile(provider));
+	let child;
 	try {
-		return await withWorkspaceProcessLock(workspaceDir(root), "web", () => teardownBrowserHeld(root, options), {
-			external: true,
-			ownerPurpose: "browser teardown"
+		const binary = provider === "tailscale" ? resolveTailscaleBinary((bin) => getExecutor().findExecutable(bin)) : provider;
+		if (!binary) throw new Error("Install Tailscale and sign in to your tailnet.");
+		const { bin, args } = tunnelArgv(provider, port, ngrokUrl, outputFile, binary);
+		for (const claim of claims) (0, ownership_claim_exports.markClaimChildPending)(claim);
+		child = spawn(bin, args, {
+			stdio: outputFile ? [
+				"ignore",
+				"ignore",
+				"ignore"
+			] : [
+				"ignore",
+				"pipe",
+				"pipe"
+			],
+			detached: true
 		});
-	} catch (error) {
+	} catch (err) {
+		for (const claim of claims) (0, ownership_claim_exports.clearClaimChild)(claim);
+		removeTunnelLogFile(outputFile);
 		return {
-			status: "failed",
-			reason: String(error?.message || error)
+			failed: true,
+			reason: `Could not start ${provider}: ${describe(err)}`
 		};
 	}
-}
-/** {@link teardownOwnedBrowser} for a caller that already holds the {@link BROWSER_LOCK} lock. */
-async function teardownBrowserHeld(root, { deleteProfile = false } = {}) {
-	try {
-		const record = readWebRecord(root);
-		const profile = record?.profile ?? webProfileDir(root);
-		if (record) {
-			const supervisor = (0, process_identity_exports.inspectProcessIdentity)(record);
-			const chrome = record.chromeProcess ? (0, process_identity_exports.inspectProcessIdentity)(record.chromeProcess) : "gone";
-			if (supervisor === "unknown" || chrome === "unknown") return {
-				status: "skipped",
-				kind: "not-verified",
-				reason: `the browser supervisor (pid ${record.pid}) or its Chrome could not be verified; its record was kept`
-			};
-			if (supervisor === "same") {
-				try {
-					process.kill(record.pid, "SIGTERM");
-				} catch {}
-				if (!await (0, process_identity_exports.waitForProcessExit)(record, BROWSER_EXIT_WAIT_MS)) return {
-					status: "failed",
-					reason: `browser supervisor pid ${record.pid} did not exit`
-				};
-			}
-			if (record.chromeProcess && !await stopOwnedChrome(record.chromeProcess, profile)) return {
-				status: "failed",
-				reason: `Chrome pid ${record.chromeProcess.pid} did not exit`
-			};
-			const exited = record.chromeProcess;
-			const holder = liveProfileHolder(profile, { alive: (pid) => pidExists(pid) && !(pid === exited?.pid && (0, process_identity_exports.inspectProcessIdentity)(exited) === "gone") });
-			if (holder !== null) return {
-				status: "skipped",
-				kind: "not-verified",
-				reason: `pid ${holder} still holds ${profile}, and the browser record does not name it; it was left running`
-			};
-			const claims = (0, ownership_claim_exports.clearFreeClaimSet)({
-				root: webClaimRoot(root),
-				label: "browser supervisor"
-			});
-			if (claims.status !== "cleared") return {
-				status: "skipped",
-				kind: "not-verified",
-				reason: claims.status === "held" ? `the browser supervisor claim is still held${claims.holder ? ` by pid ${claims.holder.owner.pid}` : ""}` : `the browser supervisor claim could not be cleared (${claims.reason}); remove it with ${(0, ownership_claim_exports.claimRemoveCommand)(webClaimRoot(root))}`
-			};
-			clearWebRecord(root, record);
-			await releaseBrowserPort(root, record.cdpPort);
-		} else {
-			const holder = liveProfileHolder(profile);
-			if (holder !== null) return {
-				status: "skipped",
-				kind: "not-verified",
-				reason: `pid ${holder} holds ${profile} but no browser supervisor is recorded; it was left running`
-			};
-			const port = getProject(root)?.ports?.[CDP_PORT_LABEL];
-			if (typeof port === "number") await releaseBrowserPort(root, port);
+	let childExited = false;
+	let childIdentity = null;
+	child.once("exit", () => {
+		childExited = true;
+	});
+	const cleanup = async (alreadyExited = childExited) => {
+		if (claims.length > 0 && childIdentity && process.platform !== "win32" && (0, process_identity_exports.inspectProcessIdentity)(childIdentity) === "same") try {
+			signalProcessTree(childIdentity.pid, "SIGTERM", { group: true });
+		} catch {}
+		const drained = await terminateChild(child, {
+			alreadyExited,
+			timeoutMs: cleanupTimeoutMs,
+			isAlive: isChildAlive,
+			waitForGroup: claims.length > 0 && process.platform !== "win32"
+		}) && (claims.length === 0 || process.platform === "win32" || !child.pid || !(0, ownership_claim_exports.processGroupAlive)(child.pid));
+		if (drained) {
+			for (const claim of claims) (0, ownership_claim_exports.clearClaimChild)(claim);
+			removeTunnelLogFile(outputFile);
 		}
-		if (existsSync(profile)) removeSingletonFiles(profile);
-		if (deleteProfile && existsSync(profile)) {
-			if (!readCreatedDevices$1().web.has(profile)) return {
-				status: "skipped",
-				kind: "not-owned",
-				reason: `${profile} is not in Stim's ledger; it was kept`
-			};
-			rmSync(profile, {
-				recursive: true,
-				force: true
-			});
-			forgetCreatedDevice("web", profile);
+		return drained ? { status: "stopped" } : {
+			status: "failed",
+			reason: `Sent SIGKILL but could not confirm that pid ${child.pid ?? "unknown"} exited.`
+		};
+	};
+	const failAfterCleanup = async (reason, alreadyExited = childExited) => {
+		const stopped = await cleanup(alreadyExited);
+		if (stopped.status === "failed") return {
+			failed: true,
+			reason: `${reason} ${stopped.reason}`,
+			cleanupFailed: true
+		};
+		return {
+			failed: true,
+			reason: signal?.aborted ? "Metro tunnel startup was cancelled." : reason
+		};
+	};
+	const pid = child.pid;
+	if (!pid) return failAfterCleanup(`${provider} started but reported no pid.`);
+	const captureChildIdentity = () => {
+		try {
+			return readProcessToken(pid);
+		} catch {
+			return null;
 		}
-		return record ? {
-			status: "torn-down",
-			label: `Chrome (${profile})`
-		} : { status: "missing" };
+	};
+	const initialProcessToken = captureChildIdentity();
+	if (!initialProcessToken) return failAfterCleanup(`${provider} started but its process identity token could not be read.`);
+	childIdentity = {
+		pid,
+		processToken: initialProcessToken
+	};
+	if (claims.length > 0) try {
+		for (const claim of claims) (0, ownership_claim_exports.setClaimChild)(claim, childIdentity);
 	} catch (error) {
-		return {
-			status: "failed",
-			reason: String(error?.message || error)
+		return failAfterCleanup(`Could not record ${provider} process ownership: ${describe(error)}`);
+	}
+	const { url, exited, lastLine } = outputFile ? await waitForFileUrl(child, outputFile, parserFor(provider), urlTimeoutMs, signal) : await waitForUrl(child, parserFor(provider), urlTimeoutMs, signal);
+	if (!url) return failAfterCleanup(exited ? provider === "tailscale" && lastLine ? `${provider} exited before printing a tunnel URL: ${lastLine}` : `${provider} exited before printing a tunnel URL.` : `${provider} did not print a tunnel URL within ${urlTimeoutMs}ms.`, exited || childExited);
+	if (!outputFile) resumeChildPipes(child);
+	if (requireReachable) {
+		let reachable;
+		try {
+			reachable = await waitUntilReachable({
+				url,
+				now,
+				sleep,
+				probe: probeReachable,
+				timeoutMs: reachableTimeoutMs,
+				signal
+			});
+		} catch (cause) {
+			return failAfterCleanup(`Could not establish ${provider} tunnel reachability: ${describe(cause)}`);
+		}
+		if (!reachable) return failAfterCleanup(`${url} did not become reachable within ${reachableTimeoutMs}ms; ${provider} may still be registering, or the network path is blocked.`);
+	}
+	if (signal?.aborted) return failAfterCleanup("Metro tunnel startup was cancelled.");
+	const finalProcessToken = captureChildIdentity();
+	if (!finalProcessToken || finalProcessToken !== initialProcessToken) return failAfterCleanup(`${provider} process identity changed before its tunnel could be recorded.`);
+	if (!outputFile) unrefChildPipes(child);
+	child.unref?.();
+	if (childExited) return failAfterCleanup(`${provider} exited before its tunnel could be recorded.`, true);
+	return {
+		url,
+		pid,
+		processToken: initialProcessToken,
+		logFile: outputFile,
+		cleanup: () => cleanup()
+	};
+}
+async function startTunnelSequence({ claims = [], signal, providers, port, ngrokUrl = null, requireReachable = true, start = startTunnel }) {
+	const failures = [];
+	for (const provider of providers) {
+		if (signal?.aborted) return {
+			failed: true,
+			reason: "Metro tunnel startup was cancelled."
+		};
+		const result = await start({
+			claims,
+			signal,
+			provider,
+			port,
+			ngrokUrl: provider === "ngrok" ? ngrokUrl : null,
+			requireReachable
+		});
+		if (!("failed" in result)) return {
+			provider,
+			...result
+		};
+		failures.push(`${provider}: ${result.reason}`);
+		if (result.cleanupFailed) return {
+			failed: true,
+			reason: failures.join(" "),
+			cleanupFailed: true
 		};
 	}
+	return {
+		failed: true,
+		reason: failures.join(" ") || "No managed tunnel provider was selected."
+	};
 }
-//#endregion
-//#region src/macos/instances.ts
-const BUNDLE_EXECUTABLE = /^[^/]+\.app\/Contents\/MacOS\/[^/]+$/;
-function bundleDirs(root) {
-	const dir = macosDir(root);
-	if (process.platform !== "darwin" || !existsSync(dir)) return [];
-	return [.../* @__PURE__ */ new Set([dir, realpathSync(dir)])];
+function closeChildPipes(child) {
+	child.stdout?.destroy?.();
+	child.stderr?.destroy?.();
 }
-function isBundleExecutable(path, dirs) {
-	return dirs.some((dir) => path.startsWith(`${dir}/`) && BUNDLE_EXECUTABLE.test(path.slice(dir.length + 1)));
+function unrefChildPipes(child) {
+	resumeChildPipes(child);
+	for (const stream of [child.stdout, child.stderr]) stream?.unref?.();
 }
-/** Pids from `ps -axww -o pid=,comm=` output whose command names a bundle executable inside `dirs`. */
-function bundleCandidates(psOutput, dirs) {
-	const pids = [];
-	for (const line of psOutput.split("\n")) {
-		const match = /^\s*(\d+)\s+(.+)$/.exec(line);
-		if (match && isBundleExecutable(match[2], dirs)) pids.push(Number(match[1]));
-	}
-	return pids;
+function resumeChildPipes(child) {
+	child.stdout?.resume?.();
+	child.stderr?.resume?.();
 }
-/** Whether `lsof -Fn -d txt` output for one process names a bundle executable inside `dirs`. */
-function lsofNamesBundleExecutable(lsofOutput, dirs) {
-	return lsofOutput.split("\n").some((line) => line.startsWith("n") && isBundleExecutable(line.slice(1), dirs));
+function signalAndWaitForExit(child, signal, { timeoutMs, isAlive, platform }) {
+	return new Promise((resolve) => {
+		let settled = false;
+		let timer;
+		const onExit = () => finish(true);
+		const onError = (error) => finish(isEsrch(error));
+		const finish = (exited) => {
+			if (settled) return;
+			settled = true;
+			clearTimeout(timer);
+			child.removeListener("exit", onExit);
+			child.removeListener("error", onError);
+			resolve(exited);
+		};
+		child.once("exit", onExit);
+		child.once("error", onError);
+		try {
+			if (platform === "win32" && child.pid) signalProcessTree(child.pid, signal, { platform });
+			child.kill(signal);
+		} catch (error) {
+			finish(isEsrch(error));
+		}
+		if (!settled) timer = setTimeout(() => finish(Boolean(child.pid && !isAlive(child.pid))), timeoutMs);
+	});
 }
-function candidatePids(dirs) {
-	if (!dirs.length) return [];
-	return bundleCandidates(getExecutor().runFile("ps", [
-		"-axww",
-		"-o",
-		"pid=,comm="
-	], { timeoutMs: 1e4 }), dirs).filter((pid) => pid !== process.pid);
+async function terminateChild(child, { alreadyExited, timeoutMs, isAlive, platform = process.platform, waitForGroup = false }) {
+	let stopped = alreadyExited;
+	let deadline = Date.now() + timeoutMs;
+	if (!stopped) stopped = await signalAndWaitForExit(child, "SIGTERM", {
+		timeoutMs,
+		isAlive,
+		platform
+	});
+	if (!stopped) {
+		deadline = Date.now() + timeoutMs;
+		stopped = await signalAndWaitForExit(child, "SIGKILL", {
+			timeoutMs,
+			isAlive,
+			platform
+		});
+	}
+	if (stopped && waitForGroup && child.pid) {
+		while ((0, ownership_claim_exports.processGroupAlive)(child.pid) && Date.now() < deadline) await cancellableSleep(25);
+		stopped = !(0, ownership_claim_exports.processGroupAlive)(child.pid);
+	}
+	closeChildPipes(child);
+	return stopped;
 }
-/** Pids that claim to run an app bundle from the workspace's macOS directory. `ps` reports argv[0], so this is a lead. */
-function bundleInstancePids(root) {
-	return candidatePids(bundleDirs(root));
+function describe(err) {
+	return err?.message || String(err);
 }
-function unverified(pid, why) {
-	return Object.assign(/* @__PURE__ */ new Error(`Cannot verify macOS app pid ${pid}: ${why}; no signal was sent.`), { code: "STIM_MACOS_OWNER_UNVERIFIED" });
+const STOP_TIMEOUT_MS = 5e3;
+const STOP_POLL_MS = 100;
+function isEsrch(err) {
+	return err?.code === "ESRCH";
 }
-/**
-* Every running process whose executable is an app bundle Stim built in the workspace's macOS directory, however it
-* was launched. Each identity is captured before its executable is confirmed with lsof.
-*/
-function runningBundleInstances(root) {
-	const dirs = bundleDirs(root);
-	const instances = [];
-	for (const pid of candidatePids(dirs)) {
-		const processToken = (0, process_identity_exports.captureProcessToken)(pid);
-		const start = (0, process_identity_exports.processStartMicros)(pid);
-		if (!processToken || start.status !== "running") {
-			if (start.status === "gone") continue;
-			throw unverified(pid, "its identity cannot be captured");
-		}
-		const record = {
+async function stopTunnel(record, { isAlive = pidExists, inspectIdentity = process_identity_exports.inspectProcessIdentity, platform = process.platform, operation, kill = (pid) => signalProcessTreeAsync(pid, "SIGTERM", {
+	platform,
+	operation
+}), now = Date.now, sleep = operation ? (ms) => cancellableSleep(ms, {
+	signal: operation.signal,
+	what: "tunnel stop"
+}) : defaultSleep, timeoutMs = STOP_TIMEOUT_MS } = {}) {
+	operation?.signal.throwIfAborted();
+	const missing = () => {
+		removeRecordedTunnelLogFile(record?.logFile);
+		return { status: "missing" };
+	};
+	const pid = record?.pid;
+	if (!pid || !isAlive(pid)) return missing();
+	if (!record.processToken) return {
+		status: "failed",
+		reason: `tunnel pid ${pid} has no process identity token, so Stim cannot verify ownership. Keep the record. Inspect the process, stop it with the provider tooling, remove the stale metroTunnel state, and retry.`
+	};
+	const identity = inspectIdentity(record);
+	if (identity === "gone" || identity === "different") return missing();
+	if (identity !== "same") return {
+		status: "failed",
+		reason: `could not verify the process identity for tunnel pid ${pid}; refusing to signal it.`
+	};
+	try {
+		await kill(pid);
+	} catch (err) {
+		if (err instanceof WorkspaceProcessCleanupError) throw err;
+		operation?.signal.throwIfAborted();
+		return isEsrch(err) ? missing() : {
+			status: "failed",
+			reason: describe(err)
+		};
+	}
+	const deadline = now() + timeoutMs;
+	const exited = () => {
+		if (!isAlive(pid)) return true;
+		const current = inspectIdentity(record);
+		return current === "gone" || current === "different";
+	};
+	while (now() < deadline && !exited()) {
+		operation?.signal.throwIfAborted();
+		await sleep(STOP_POLL_MS);
+	}
+	operation?.signal.throwIfAborted();
+	if (!exited()) return {
+		status: "failed",
+		reason: `pid ${pid} did not exit within ${timeoutMs}ms.`
+	};
+	removeRecordedTunnelLogFile(record.logFile);
+	return { status: "stopped" };
+}
+//#endregion
+//#region src/supervisor/ownership.ts
+function resolveSupervisorTarget({ state, record, reservedPort, isAlive = pidExists, inspectIdentity = process_identity_exports.inspectProcessIdentity } = {}) {
+	const statePid = numberOrNull(state?.pid);
+	const recordPid = numberOrNull(record?.pid);
+	const pid = statePid ?? recordPid;
+	if (!pid) return { status: "none" };
+	if (statePid && recordPid && statePid !== recordPid) {
+		const gone = (entry) => ["gone", "different"].includes(inspectIdentity(entry));
+		if (gone(state) && gone(record)) return {
+			status: "stale",
+			pid
+		};
+		return {
+			status: "unverified",
 			pid,
-			processToken,
-			startedAtMicros: start.startedAtMicros
+			reason: `workspace state.json records supervisor pid ${statePid} but the registry records pid ${recordPid}`
 		};
-		let open;
-		try {
-			open = getExecutor().runFile("lsof", [
-				"-a",
-				"-p",
-				String(pid),
-				"-d",
-				"txt",
-				"-Fn"
-			], { timeoutMs: 1e4 });
-		} catch (error) {
-			if (["gone", "different"].includes((0, process_identity_exports.inspectProcessIdentity)(record))) continue;
-			open = String(error.stdout ?? "");
-			if (!open.trim()) throw unverified(pid, `lsof failed (${error.message.split("\n")[0]})`);
-		}
-		if (lsofNamesBundleExecutable(open, dirs)) instances.push(record);
 	}
-	return instances;
+	if (!isAlive(pid)) return {
+		status: "stale",
+		pid
+	};
+	const port = numberOrNull(state?.port) ?? numberOrNull(record?.port);
+	if (reservedPort !== null && reservedPort !== void 0 && port !== null && port !== reservedPort) return {
+		status: "unverified",
+		pid,
+		reason: `supervisor pid ${pid} records port ${port}, but this project reserved port ${reservedPort}`
+	};
+	if (reservedPort !== null && reservedPort !== void 0 && port === null) return {
+		status: "unverified",
+		pid,
+		reason: `supervisor pid ${pid} has no recorded port, so it cannot be matched against reserved port ${reservedPort}`
+	};
+	const identityRecord = statePid ? state : record;
+	if (statePid && recordPid && state?.processToken !== record?.processToken) return {
+		status: "unverified",
+		pid,
+		reason: "workspace state and registry process identities disagree"
+	};
+	const identity = inspectIdentity(identityRecord);
+	if (identity === "gone" || identity === "different") return {
+		status: "stale",
+		pid
+	};
+	if (identity !== "same") return {
+		status: "unverified",
+		pid,
+		reason: "the recorded process identity could not be verified"
+	};
+	return {
+		status: "ours",
+		processToken: identityRecord.processToken,
+		pid,
+		port,
+		mode: state?.mode ?? record?.mode ?? null,
+		startedAt: state?.startedAt ?? record?.startedAt ?? null
+	};
+}
+function numberOrNull(v) {
+	return typeof v === "number" && Number.isSafeInteger(v) && v > 0 ? v : null;
 }
 //#endregion
 //#region src/workspace/in-use.ts
 const NATIVE_RUN = "native-run";
 const NATIVE_RUN_HELD = "a stim ios, android or stop run holds its native-run.lock";
-function workspaceInUse(root, { supervisor = true, managedLocks = true, hosted = true, nativeRun = true } = {}) {
+function workspaceInUse(root, { supervisor = true, managedLocks = true, hosted = true, nativeRun = true } = {}, bundleInstances = bundleInstancePids) {
 	const reasons = [];
 	if (supervisor) {
 		const project = getProject(root);
@@ -1566,7 +1868,7 @@ function workspaceInUse(root, { supervisor = true, managedLocks = true, hosted =
 		else if (macos?.state === "running" || macos?.state === "orphaned" || macos?.build.state === "running") reasons.push("its macOS app or build is running");
 		else if (macos?.state === "unverified" || !macos && readWorkspaceState$1(root)?.macos !== void 0) reasons.push("its macOS process owner cannot be verified");
 		else try {
-			const pids = bundleInstancePids(root);
+			const pids = bundleInstances(root);
 			if (pids.length) reasons.push(`its macOS app is running (pid ${pids.join(", ")})`);
 		} catch (error) {
 			reasons.push(`its running macOS apps cannot be listed: ${error.message}`);
@@ -1595,20 +1897,44 @@ function workspaceInUse(root, { supervisor = true, managedLocks = true, hosted =
 	if (managedLocks) reasons.push(...managedLockHolders(root));
 	return reasons;
 }
-function emptyWorkspaceDir(dir) {
-	if (lstatSync(dir).isSymbolicLink()) {
-		unlinkSync(dir);
-		return;
+async function workspaceInUseAsync(root, checks = {}, signal, operation) {
+	let instances;
+	try {
+		instances = checks.supervisor === false ? [] : await bundleInstancePidsAsync(root, signal, operation);
+	} catch (error) {
+		if (error instanceof WorkspaceProcessCleanupError) throw error;
+		signal?.throwIfAborted();
+		instances = error instanceof Error ? error : new Error(String(error));
 	}
-	for (const name of readdirSync(dir)) if (name !== `${NATIVE_RUN}.lock`) rmSync(join(dir, name), {
-		recursive: true,
-		force: true
+	signal?.throwIfAborted();
+	return workspaceInUse(root, checks, () => {
+		if (instances instanceof Error) throw instances;
+		return instances;
 	});
 }
-async function withIdleWorkspace(root, fn, { purpose, ...checks }) {
+async function emptyWorkspaceDir(dir, signal) {
+	signal?.throwIfAborted();
+	const stat = await lstat(dir);
+	signal?.throwIfAborted();
+	if (stat.isSymbolicLink()) {
+		await unlink(dir);
+		return;
+	}
+	for (const name of await readdir(dir)) {
+		signal?.throwIfAborted();
+		if (name !== `${NATIVE_RUN}.lock`) await rm(join(dir, name), {
+			recursive: true,
+			force: true
+		});
+	}
+}
+async function withIdleWorkspace(root, fn, { purpose, operation, signal = operation?.signal, ...checks }) {
 	try {
 		return await withWorkspaceProcessLock(workspaceDir(root), NATIVE_RUN, async () => {
-			const reasons = workspaceInUse(root, {
+			const reasons = signal ? await workspaceInUseAsync(root, {
+				...checks,
+				nativeRun: false
+			}, signal, operation) : workspaceInUse(root, {
 				...checks,
 				nativeRun: false
 			});
@@ -1623,9 +1949,13 @@ async function withIdleWorkspace(root, fn, { purpose, ...checks }) {
 		}, {
 			external: true,
 			waitMs: 0,
-			ownerPurpose: purpose
+			ownerPurpose: purpose,
+			signal,
+			declareSpawnsFor: operation
 		});
 	} catch (error) {
+		if (error instanceof WorkspaceProcessCleanupError) throw error;
+		signal?.throwIfAborted();
 		if (workspaceProcessLockError(error)) return {
 			ran: false,
 			reasons: [NATIVE_RUN_HELD]
@@ -1656,17 +1986,23 @@ function readRecordedRoot(dir, name) {
 	try {
 		parsed = readJsonFile(join$1(dir, "workspace.json"));
 	} catch (error) {
-		return {
-			projectRoot: null,
-			problem: error?.code === "ENOENT" ? "it has no workspace.json" : "its workspace.json does not parse"
-		};
+		return unreadableRecordedRoot(error);
 	}
+	return recordedRoot(parsed, name);
+}
+function unreadableRecordedRoot(error) {
+	return {
+		projectRoot: null,
+		problem: error?.code === "ENOENT" ? "it has no workspace.json" : "its workspace.json does not parse"
+	};
+}
+function recordedRoot(parsed, name) {
 	const projectRoot = isJsonObject(parsed) ? parsed.projectRoot : void 0;
 	if (typeof projectRoot !== "string" || !isAbsolute$1(projectRoot)) return {
 		projectRoot: null,
 		problem: "its workspace.json records no absolute project root"
 	};
-	if (workspaceName(projectRoot) !== name) return {
+	if (workspaceName$1(projectRoot) !== name) return {
 		projectRoot: null,
 		problem: `its workspace.json records ${projectRoot}, whose workspace directory has another name`
 	};
@@ -1698,6 +2034,42 @@ function listWorkspaceDirs() {
 	}
 	return entries;
 }
+async function listWorkspaceDirsAsync(signal) {
+	signal?.throwIfAborted();
+	const root = workspacesRoot();
+	let names;
+	try {
+		names = (await readdir(root)).toSorted();
+	} catch {
+		signal?.throwIfAborted();
+		return [];
+	}
+	const entries = [];
+	for (const name of names) {
+		signal?.throwIfAborted();
+		const dir = join$1(root, name);
+		try {
+			if (!(await stat(dir)).isDirectory()) continue;
+		} catch {
+			signal?.throwIfAborted();
+			continue;
+		}
+		signal?.throwIfAborted();
+		let recorded;
+		try {
+			recorded = recordedRoot(JSON.parse(await readFile(join$1(dir, "workspace.json"), "utf8")), name);
+		} catch (error) {
+			signal?.throwIfAborted();
+			recorded = unreadableRecordedRoot(error);
+		}
+		signal?.throwIfAborted();
+		entries.push({
+			dir,
+			...recorded
+		});
+	}
+	return entries;
+}
 function classifyWorkspaceDirs(entries, { registryKeys, exists, isMounted, inUse }) {
 	const orphaned = [];
 	const skipped = [];
@@ -1753,15 +2125,45 @@ function rootPresence(path) {
 		return code === "ENOENT" || code === "ENOTDIR" ? false : null;
 	}
 }
-function collectOrphanedWorkspaces(registryKeys, mountedVolumes, { measure = true } = {}) {
-	const classified = classifyWorkspaceDirs(listWorkspaceDirs(), {
-		registryKeys,
-		exists: rootPresence,
-		isMounted: (path) => isOnMountedVolume(path, mountedVolumes),
-		inUse: (root) => workspaceInUse(root)
-	});
+async function collectOrphanedWorkspaces(registryKeys, mountedVolumes, { measure = true, operation } = {}) {
+	const classified = {
+		orphaned: [],
+		skipped: []
+	};
+	for (const entry of await listWorkspaceDirsAsync(operation?.signal)) {
+		operation?.signal.throwIfAborted();
+		const current = classifyWorkspaceDirs([entry], {
+			registryKeys,
+			exists: rootPresence,
+			isMounted: (path) => isOnMountedVolume(path, mountedVolumes),
+			inUse: () => []
+		});
+		classified.skipped.push(...current.skipped);
+		for (const orphan of current.orphaned) {
+			const reasons = operation ? await workspaceInUseAsync(orphan.projectRoot, {}, operation.signal, operation) : workspaceInUse(orphan.projectRoot);
+			if (reasons.length) classified.skipped.push({
+				dir: orphan.dir,
+				reason: `its project root ${orphan.projectRoot} is gone, but ${reasons.join("; ")}`
+			});
+			else classified.orphaned.push(orphan);
+		}
+	}
+	if (!measure) return classified;
+	const orphaned = [];
+	for (const entry of classified.orphaned) {
+		operation?.signal.throwIfAborted();
+		const bytes = await measuredDirectorySizeAsync(entry.dir, {
+			timeoutMs: SIZE_TIMEOUT_MS,
+			operation,
+			signal: operation?.signal
+		});
+		orphaned.push({
+			...entry,
+			bytes
+		});
+	}
 	return {
-		orphaned: measure ? classified.orphaned.map((entry) => Object.assign({}, entry, { bytes: sizeOf(entry.dir) })) : classified.orphaned,
+		orphaned,
 		skipped: classified.skipped
 	};
 }
@@ -1789,9 +2191,6 @@ function planWorkspaceOutputs(entries, { olderThan, now }) {
 	});
 }
 const SIZE_TIMEOUT_MS = 6e4;
-function sizeOf(dir, timeoutMs = SIZE_TIMEOUT_MS) {
-	return measuredDirectorySize(dir, { timeoutMs });
-}
 function outputPaths(dir) {
 	const paths = WORKSPACE_OUTPUT_DIRS.map((name) => join$1(dir, name)).filter((path) => existsSync$1(path));
 	const macos = join$1(dir, "macos");
@@ -1801,39 +2200,58 @@ function outputPaths(dir) {
 	} catch {}
 	return paths;
 }
-function outputBytes(paths, timeoutMs) {
+async function outputBytes(paths, timeoutMs, signal, operation) {
 	let total = 0;
 	for (const path of paths) {
-		const size = sizeOf(path, timeoutMs);
+		const size = await measuredDirectorySizeAsync(path, {
+			timeoutMs,
+			signal,
+			operation
+		});
 		if (size === null) return null;
 		total += size;
 	}
 	return total;
 }
-function collectWorkspaceOutputs({ olderThan, now, exclude = [], measure = true, sizeTimeoutMs = SIZE_TIMEOUT_MS }) {
+function collectWorkspaceOutputs({ olderThan, now, exclude = [], measure = true, sizeTimeoutMs = SIZE_TIMEOUT_MS, signal, operation }) {
 	const mountedVolumes = listMountedVolumes();
-	const entries = listWorkspaceDirs().filter((entry) => !exclude.includes(entry.dir)).filter((entry) => entry.projectRoot === null || isOnMountedVolume(entry.projectRoot, mountedVolumes)).map((entry) => Object.assign({}, entry, { paths: outputPaths(entry.dir) })).filter((entry) => entry.paths.length > 0).map(({ paths, ...entry }) => Object.assign({}, entry, { bytes: measure ? outputBytes(paths, sizeTimeoutMs) : null })).map((entry) => Object.assign({}, entry, {
-		lastUsed: entry.projectRoot === null ? NaN : workspaceLastUsed(entry.projectRoot),
-		inUse: entry.projectRoot === null ? [] : workspaceInUse(entry.projectRoot)
-	}));
-	return {
+	const outputEntries = (entries) => entries.filter((entry) => !exclude.includes(entry.dir)).filter((entry) => entry.projectRoot === null || isOnMountedVolume(entry.projectRoot, mountedVolumes)).map((entry) => Object.assign({}, entry, { paths: outputPaths(entry.dir) })).filter((entry) => entry.paths.length > 0);
+	const report = (sizes) => ({
 		root: workspacesRoot(),
-		workspaces: planWorkspaceOutputs(entries, {
+		workspaces: planWorkspaceOutputs(sizes.map((entry) => Object.assign({}, entry, { lastUsed: entry.projectRoot === null ? NaN : workspaceLastUsed(entry.projectRoot) })), {
 			olderThan,
 			now
 		})
-	};
+	});
+	if (!measure && !signal) return report(outputEntries(listWorkspaceDirs()).map(({ paths: _paths, ...entry }) => Object.assign({}, entry, {
+		bytes: null,
+		inUse: entry.projectRoot === null ? [] : workspaceInUse(entry.projectRoot)
+	})));
+	return (async () => {
+		const sizes = [];
+		const entries = outputEntries(await listWorkspaceDirsAsync(signal));
+		for (const { paths, ...entry } of entries) {
+			signal?.throwIfAborted();
+			sizes.push({
+				...entry,
+				bytes: measure ? await outputBytes(paths, sizeTimeoutMs, signal, operation) : null,
+				inUse: entry.projectRoot === null ? [] : signal ? await workspaceInUseAsync(entry.projectRoot, {}, signal, operation) : workspaceInUse(entry.projectRoot)
+			});
+		}
+		return report(sizes);
+	})();
 }
-async function clearWorkspaceOutputs(report, { olderThan, now = Date.now() }) {
+async function clearWorkspaceOutputs(report, { olderThan, now = Date.now(), operation, signal = operation?.signal }, { log, record } = GC_OUTPUT) {
 	let failures = 0;
 	let cleared = 0;
 	const clearedRoots = [];
 	for (const entry of report.workspaces) {
+		signal?.throwIfAborted();
 		const root = entry.projectRoot;
 		if (!entry.willClear || root === null) {
 			if (entry.keptReason) {
-				console.log(chalk.dim(`Kept the build outputs of ${root ?? entry.dir}: ${entry.keptReason}`));
-				recordGcResult("workspaceOutputs", "kept", root ?? entry.dir, {
+				log(chalk.dim(`Kept the build outputs of ${root ?? entry.dir}: ${entry.keptReason}`));
+				record("workspaceOutputs", "kept", root ?? entry.dir, {
 					bytes: entry.bytes,
 					detail: entry.keptReason
 				});
@@ -1842,7 +2260,7 @@ async function clearWorkspaceOutputs(report, { olderThan, now = Date.now() }) {
 		}
 		let run;
 		try {
-			run = await withIdleWorkspace(root, () => {
+			run = await withIdleWorkspace(root, async () => {
 				const [again] = planWorkspaceOutputs([{
 					...entry,
 					problem: null,
@@ -1853,16 +2271,26 @@ async function clearWorkspaceOutputs(report, { olderThan, now = Date.now() }) {
 					now
 				});
 				if (again?.keptReason) return again.keptReason;
-				for (const path of outputPaths(entry.dir)) rmSync$1(path, {
-					recursive: true,
-					force: true
-				});
+				for (const path of outputPaths(entry.dir)) {
+					signal?.throwIfAborted();
+					await rm(path, {
+						recursive: true,
+						force: true
+					});
+				}
+				signal?.throwIfAborted();
 				return null;
-			}, { purpose: "gc" });
+			}, {
+				purpose: "gc",
+				signal,
+				operation
+			});
 		} catch (error) {
+			if (error instanceof WorkspaceProcessCleanupError) throw error;
+			signal?.throwIfAborted();
 			failures++;
-			console.log(chalk.red(`Could not clear the build outputs of ${root}: ${error?.message || String(error)}`));
-			recordGcResult("workspaceOutputs", "failed", root, {
+			log(chalk.red(`Could not clear the build outputs of ${root}: ${error?.message || String(error)}`));
+			record("workspaceOutputs", "failed", root, {
 				bytes: entry.bytes,
 				detail: error?.message || String(error)
 			});
@@ -1870,8 +2298,8 @@ async function clearWorkspaceOutputs(report, { olderThan, now = Date.now() }) {
 		}
 		const kept = run.ran ? run.value : `in use: ${run.reasons.join("; ")}`;
 		if (kept) {
-			console.log(chalk.yellow(`Kept the build outputs of ${root}: ${kept}`));
-			recordGcResult("workspaceOutputs", "kept", root, {
+			log(chalk.yellow(`Kept the build outputs of ${root}: ${kept}`));
+			record("workspaceOutputs", "kept", root, {
 				bytes: entry.bytes,
 				detail: kept
 			});
@@ -1879,10 +2307,10 @@ async function clearWorkspaceOutputs(report, { olderThan, now = Date.now() }) {
 		}
 		cleared += entry.bytes ?? 0;
 		clearedRoots.push(root);
-		console.log(chalk.green(`Cleared the build outputs of ${root} (${sizeText(entry.bytes)})`));
-		recordGcResult("workspaceOutputs", "done", root, { bytes: entry.bytes });
+		log(chalk.green(`Cleared the build outputs of ${root} (${sizeText(entry.bytes)})`));
+		record("workspaceOutputs", "done", root, { bytes: entry.bytes });
 	}
-	if (cleared) console.log(chalk.dim(`Cleared ${formatBytes(cleared)} of workspace build outputs. ${REBUILD_COST}`));
+	if (cleared) log(chalk.dim(`Cleared ${formatBytes(cleared)} of workspace build outputs. ${REBUILD_COST}`));
 	return {
 		failures,
 		cleared: clearedRoots
@@ -1892,47 +2320,56 @@ function stillOrphaned({ dir, projectRoot }) {
 	if (readRecordedRoot(dir, basename$1(dir)).projectRoot !== projectRoot || rootPresence(projectRoot) !== false || !isOnMountedVolume(projectRoot)) return false;
 	return !Object.keys(loadConfig$1()?.projects ?? {}).some((key) => isPathPrefix(projectRoot, key));
 }
-async function deleteOrphanedWorkspaces(orphaned) {
+async function deleteOrphanedWorkspaces(orphaned, output = GC_OUTPUT, operation) {
 	let failures = 0;
 	for (const entry of orphaned) {
+		operation?.signal.throwIfAborted();
 		if (!existsSync$1(entry.dir)) continue;
 		let run;
 		try {
 			run = await withIdleWorkspace(entry.projectRoot, async () => {
 				if (!stillOrphaned(entry)) return false;
-				const browser = await teardownOwnedBrowser(entry.projectRoot, { deleteProfile: true });
+				const browser = await teardownOwnedBrowser(entry.projectRoot, {
+					deleteProfile: true,
+					...operation ? { operation } : {}
+				});
 				if (browser.status === "failed" || browser.status === "skipped") throw new Error(`its owned Chrome profile was kept: ${browser.reason}`);
-				emptyWorkspaceDir(entry.dir);
+				await emptyWorkspaceDir(entry.dir, operation?.signal);
 				return true;
-			}, { purpose: "gc" });
+			}, {
+				purpose: "gc",
+				operation
+			});
 		} catch (error) {
+			if (error instanceof WorkspaceProcessCleanupError) throw error;
+			operation?.signal.throwIfAborted();
 			failures++;
-			console.log(chalk.red(`Could not remove ${entry.dir}: ${error?.message || error}`));
-			recordGcResult("workspaceDirectory", "failed", entry.dir, {
+			output.log(chalk.red(`Could not remove ${entry.dir}: ${error?.message || error}`));
+			output.record("workspaceDirectory", "failed", entry.dir, {
 				bytes: entry.bytes ?? null,
 				detail: error?.message || String(error)
 			});
 			continue;
 		}
 		if (!run.ran) {
-			console.log(chalk.yellow(`Kept ${entry.dir}: ${run.reasons.join("; ")}`));
-			recordGcResult("workspaceDirectory", "kept", entry.dir, {
+			output.log(chalk.yellow(`Kept ${entry.dir}: ${run.reasons.join("; ")}`));
+			output.record("workspaceDirectory", "kept", entry.dir, {
 				bytes: entry.bytes ?? null,
 				detail: run.reasons.join("; ")
 			});
 			continue;
 		}
 		if (!run.value) {
-			console.log(chalk.yellow(`Kept ${entry.dir}: it can no longer be confirmed orphaned.`));
-			recordGcResult("workspaceDirectory", "kept", entry.dir, {
+			output.log(chalk.yellow(`Kept ${entry.dir}: it can no longer be confirmed orphaned.`));
+			output.record("workspaceDirectory", "kept", entry.dir, {
 				bytes: entry.bytes ?? null,
 				detail: "it can no longer be confirmed orphaned"
 			});
 			continue;
 		}
 		const size = entry.bytes === void 0 ? "" : ` (${sizeText(entry.bytes)})`;
-		console.log(chalk.green(`Removed the orphaned workspace directory ${entry.dir}${size}`));
-		recordGcResult("workspaceDirectory", "done", entry.dir, { bytes: entry.bytes ?? null });
+		output.log(chalk.green(`Removed the orphaned workspace directory ${entry.dir}${size}`));
+		output.record("workspaceDirectory", "done", entry.dir, { bytes: entry.bytes ?? null });
 	}
 	return failures;
 }
@@ -1940,4 +2377,4 @@ function sizeText(bytes) {
 	return bytes === null ? "size unknown" : formatBytes(bytes);
 }
 //#endregion
-export { withManagedRemoteWorktreeRemovalLock as A, recordGcResult as C, stopTunnel as D, startTunnelSequence as E, acquireBuildSlot as F, listBuildSlots as I, releaseBuildSlot as L, withManagedTunnelRemovalLock as M, probePublicHttp as N, terminateChild as O, resolveSupervisorTarget as P, teardownParkedIosSim as S, canonicalPath as T, teardownBrowserHeld as _, collectWorkspaceOutputs as a, teardownOwnedIosSim as b, listWorkspaceDirs as c, emptyWorkspaceDir as d, withIdleWorkspace as f, eraseParkedIosSim as g, eraseParkedAvd as h, collectOrphanedWorkspaces as i, withManagedTunnelLock as j, withManagedRemoteWorktreeLock as k, rootPresence as l, runningBundleInstances 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, teardownOwnedAvd as v, takeGcResults as w, teardownParkedAvd as x, teardownOwnedBrowser as y };
+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 };