stim 1.17.2 → 1.19.0

package/dist/{status-BA2pehwf.mjs → status-BOyp0CUl.mjs}

@@ -1,43 +1,40 @@
-import { t as getExecutor } from "./exec-CaErVv7t.mjs";
-import { B as parseDeviceSlotKey, F as volumeRootFor, H as projectDeviceSlots, R as deviceSlotKey, _ as loadConfig$1, d as getConfigDir, j as formatBytes } from "./config-D0DbpZtM.mjs";
-import { t as process_identity_exports } from "./process-identity-BmRm1qV0.mjs";
-import { a as formatElapsed, i as formatDuration, r as clockTime, u as plural } from "./command-output-CDAIFD-8.mjs";
-import { P as resolveSettings, at as gitCommonDirOnDisk, gt as repoRoot, it as gitCommonDir, ut as linkedWorktreesOnDisk } from "./settings-Cfd-0r2d.mjs";
-import { a as detectTutorial, c as findServerWorkspace, d as projectShortcut, i as detectPlatforms, p as readAppJson, r as detectIsExpo } from "./project-D47Rh0ly.mjs";
-import { a as listeningPidsByPort, c as processCwds, d as isMetroRunning, i as listeningPids, l as resolveProjectMetro, o as pidExists, s as processCwd } from "./metro-g8NqiJp-.mjs";
-import { b as workspaceLogErrorIndex, r as readWorkspaceState$1, x as workspaceLogsDir$1 } from "./workspace-state-DqcCbpE7.mjs";
-import { a as readWebPage, o as readWebRecord, u as webFacts } from "./state-PeQiJuIu.mjs";
-import { _ as statusActivity, a as capacity, b as withWebFacts, c as diskLine, d as gitSummaryText, f as metroReverseTargets, g as remoteDeviceState, h as remoteDeviceLine, i as applyMachineMemory, l as environmentState, m as poolLine, n as activityLabel, o as deviceLeaseLines, p as parseDfFree, r as addReverseMissingIssue, s as deviceLeaseStates, v as tightVolumes, y as unprovisionedWorktrees } from "./status-CzS4bPO9.mjs";
-import { X as attributeMachineUsage, Z as readFootprints, a as machineNumber } from "./budget-DfcgFdQB.mjs";
-import { d as readWebActivity, f as tailLines, i as createDeviceProcessTables, r as createActivityReader } from "./activity-IRvJY_ru.mjs";
-import { i as listLeaseFiles, r as leaseIsExpired, s as parseWorkspaceLeases } from "./device-lease-DpoS36_u.mjs";
-import { c as readMetroTunnel, f as readWorkspaceLaunches, u as readRemoteSession } from "./state-BKa8wNN5.mjs";
-import { F as ownedAvdDeviceProfile, O as listAdbDevices, d as androidToolPath, ft as parkedMaxSetting, ot as POOL_SETTING_REMEDY, pt as readParked, z as ownedAvdSerialResolver } from "./android-B_YNZy61.mjs";
-import { d as listAllIosSimsAsync, v as parseSimctlList } from "./ios-DSfnPfse.mjs";
-import { t as resolveSupervisorTarget } from "./ownership-BMLqyBgJ.mjs";
-import { _ as statsProjectKey$1, a as buildStatusLine, i as buildReport, p as readStats$1, r as activeBuildState, s as parseActiveBuild, t as ACTIVE_BUILD_KEY } from "./build-progress-D0WkjCPd.mjs";
-import { a as parseNdjsonLine } from "./ndjson-PclOIwVY.mjs";
-import { n as describeMetroLastStop, o as metroLastStop } from "./stop-cause-rhmGfwvt.mjs";
-import { l as probeHostedSession } from "./hosted-client-Bp4knSwu.mjs";
-import { m as hasMetroReverse } from "./app-install-VPkI5WEg.mjs";
-import "./hosted-macos-DcxKjtfH.mjs";
-import { m as readEasSessionLedger$1, p as easMachineStateRoot$1 } from "./device-remote-hFSkpfQu.mjs";
-import { d as readIosDevices, s as isReachable } from "./ios-device-pAN4t54-.mjs";
-import { n as maintenanceLines, r as maintenanceStatus } from "./status-DlKvVJBE.mjs";
-import { i as createStatusMeasurer, n as workspacePhase, r as applyStatusMeasures, s as mergeState } from "./warm-progress-DF4JRvYI.mjs";
-import { r as workspaceRecordingEnabled } from "./recordings-BNgsD1Tr.mjs";
+import { t as process_identity_exports } from "./process-identity-Biv3arCO.mjs";
+import { t as getExecutor } from "./exec-i8GDPwq9.mjs";
+import { a as formatElapsed, i as formatDuration, r as clockTime, u as plural } from "./command-output-Bt8ygHE7.mjs";
+import { B as parseDeviceSlotKey, F as volumeRootFor, H as projectDeviceSlots, R as deviceSlotKey, _ as loadConfig$1, d as getConfigDir, j as formatBytes } from "./config-DC5jEtd1.mjs";
+import { b as workspaceLogErrorIndex, r as readWorkspaceState$1, x as workspaceLogsDir$1 } from "./workspace-state-CR9X86xJ.mjs";
+import { A as readWorkspaceLaunches, E as readMetroTunnel, O as readRemoteSession, _ as readAppJson, c as projectShortcut, i as findServerWorkspace, l as detectPlatforms, m as detectTutorial, p as detectIsExpo } from "./project-B5eQ1USs.mjs";
+import { I as resolveSettings, ct as linkedWorktreesOnDisk, mt as repoRoot, nt as gitCommonDir, rt as gitCommonDirOnDisk } from "./settings-CxgngUZk.mjs";
+import { a as listeningPidsByPort, c as processCwd, i as listeningPids, l as processCwds, p as isMetroRunning, s as pidExists, u as resolveProjectMetro } from "./metro-DI2AjPF_.mjs";
+import { a as readWebPage, o as readWebRecord, u as webFacts } from "./state-D2KtnALG.mjs";
+import { C as statusActivity, E as withWebFacts, S as remoteDeviceState, T as unprovisionedWorktrees, _ as gitSummaryText, b as poolLine, c as activityLabel, d as capacity, f as deviceLeaseLines, h as environmentState, l as addReverseMissingIssue, m as diskLine, p as deviceLeaseStates, u as applyMachineMemory, v as metroReverseTargets, w as tightVolumes, x as remoteDeviceLine, y as parseDfFree } from "./watchman-BL1IdOtq.mjs";
+import { A as buildReport, B as readStats$1, D as ACTIVE_BUILD_KEY, Mt as readFootprints, N as parseActiveBuild, W as statsProjectKey$1, _ as metroLastStop, j as buildStatusLine, jt as attributeMachineUsage, k as activeBuildState, o as machineNumber, p as describeMetroLastStop } from "./budget-Dz-kyXLv.mjs";
+import { m as resolveSupervisorTarget } from "./workspaces-Djb2gfi9.mjs";
+import { d as readWebActivity, f as tailLines, i as createDeviceProcessTables, r as createActivityReader } from "./activity-BSw0x84R.mjs";
+import { i as listLeaseFiles, r as leaseIsExpired, s as parseWorkspaceLeases } from "./device-lease-Cu7PtQpZ.mjs";
+import { F as ownedAvdDeviceProfile, O as listAdbDevices, d as androidToolPath, ft as parkedMaxSetting, ot as POOL_SETTING_REMEDY, pt as readParked, z as ownedAvdSerialResolver } from "./android-BdQC6zs1.mjs";
+import { f as listAllIosSimsAsync, y as parseSimctlList } from "./ios-BWbHFZVz.mjs";
+import { a as parseNdjsonLine } from "./ndjson-LGZAMsqa.mjs";
+import { l as probeHostedSession } from "./hosted-client-C5G4h_OJ.mjs";
+import { m as hasMetroReverse } from "./app-install-CFI4ptUL.mjs";
+import { m as readEasSessionLedger$1, p as easMachineStateRoot$1 } from "./device-remote-B5GiUifk.mjs";
+import { d as readIosDevices, s as isReachable } from "./ios-device-CJ_ZOGky.mjs";
+import "./hosted-macos-DABm3ScO.mjs";
+import { i as readSupervisorState } from "./stop-zDlknFoz.mjs";
+import { i as createStatusMeasurer, n as workspacePhase, r as applyStatusMeasures, s as mergeState } from "./warm-progress-pFLB2e6P.mjs";
+import { r as workspaceRecordingEnabled } from "./recordings-Bv8McZN4.mjs";
+import { n as maintenanceLines, r as maintenanceStatus } from "./status-BEeL6IKz.mjs";
 import { t as watchStdoutReader } from "./stdout-reader-C8yjre1x.mjs";
-import { t as triggerMaintenance } from "./trigger-Bemu8ytw.mjs";
-import { i as readSupervisorState } from "./stop-DQIasgKp.mjs";
-import { createHash, randomUUID } from "node:crypto";
+import { t as triggerMaintenance } from "./trigger-CAhmG-4s.mjs";
 import { mkdirSync, readFileSync, readdirSync, renameSync, rmSync, statSync, watch, writeFileSync } from "node:fs";
 import { join, posix, resolve } from "node:path";
-import { closeSync as closeSync$1, existsSync as existsSync$1, fstatSync as fstatSync$1, openSync as openSync$1, readFileSync as readFileSync$1, readSync as readSync$1, renameSync as renameSync$1, rmSync as rmSync$1, statSync as statSync$1, writeFileSync as writeFileSync$1 } from "fs";
-import { homedir, totalmem } from "os";
 import { basename as basename$1, dirname as dirname$1, join as join$1 } from "path";
-import { rotatedLogPath } from "@stim-cli/core";
 import { DEVICE_RECLAIM_REASON, ERROR_SOURCES, archiveRoot, archivedUsage, bundleMarkerPlatform, countErrorEntries, gitMergeCacheDir, hostedAndroidPlacements, hostedAndroidRecords, hostedAndroidStatus, hostedIosPlacements, hostedIosRecords, hostedIosStatus, linkReplacedArchives, logFiles, macosAppState, parseHostedAndroidPlacement, parseHostedIosPlacement, queryLogs, readArchives, readBuildDetail, readBuildHistory, readDeviceIdleShutdowns, readDevicePlacement, readIdleStop, readLastBuilds, readMacosRecord, recordMatches, sortByTs, unreadableHostedAndroid, unreadableHostedIos, withDerivedFacts, withGitChip, withStateReadCache } from "@stim-cli/core/state";
 import chalk from "chalk";
+import { closeSync as closeSync$1, existsSync as existsSync$1, fstatSync as fstatSync$1, openSync as openSync$1, readFileSync as readFileSync$1, readSync as readSync$1, renameSync as renameSync$1, rmSync as rmSync$1, statSync as statSync$1, writeFileSync as writeFileSync$1 } from "fs";
+import { rotatedLogPath } from "@stim-cli/core";
+import { createHash, randomUUID } from "node:crypto";
+import { homedir, totalmem } from "os";
 //#region src/device-host/hosted-native-status.ts
 function hostedNativeProbe(placement, probe, slot, platform) {
 	const label = platform === "ios" ? "iOS" : "Android";

package/dist/{stim-desktop-Cnz8CPnl.mjs → stim-desktop-C65jk_q2.mjs}

@@ -1,4 +1,4 @@
-import { t as getExecutor } from "./exec-CaErVv7t.mjs";
+import { t as getExecutor } from "./exec-i8GDPwq9.mjs";
 //#region src/devices/stim-desktop.ts
 const LAUNCH_SERVICES_LOOKUP = `ObjC.import('AppKit'); const url = $.NSWorkspace.sharedWorkspace.URLForApplicationWithBundleIdentifier('dev.stim.desktop'); url.isNil() ? '' : url.path.js`;
 const SCHEME_HANDLER_LOOKUP = `ObjC.import('AppKit'); const url = $.NSWorkspace.sharedWorkspace.URLForApplicationToOpenURL($.NSURL.URLWithString('stim-desktop://workspace')); url.isNil() ? '' : url.path.js`;

package/dist/{stim-installations-QMEI32v1.mjs → stim-installations-DbmUjsLv.mjs}

@@ -1,4 +1,4 @@
-import { t as getExecutor } from "./exec-CaErVv7t.mjs";
+import { t as getExecutor } from "./exec-i8GDPwq9.mjs";
 import { accessSync, constants, realpathSync, statSync } from "node:fs";
 import { delimiter, join, resolve } from "node:path";
 //#region src/diagnostics/stim-installations.ts

package/dist/stop-D0UIpZuh.mjs

@@ -0,0 +1,72 @@
+import { n as ownership_claim_exports, t as process_identity_exports } from "./process-identity-Biv3arCO.mjs";
+import { c as writeWorkspaceState, v as workspaceDir } from "./workspace-state-CR9X86xJ.mjs";
+import { C as runningBundleInstances } from "./workspaces-Djb2gfi9.mjs";
+import { a as withWorkspaceProcessLock } from "./named-ports-B4iWH4E-.mjs";
+import { a as macosRuntimeClaim, o as requiredMacosRecord } from "./state-Tp4uImDS.mjs";
+import { n as stopHostedMacos } from "./hosted-macos-DABm3ScO.mjs";
+import { readMacosRecord } from "@stim-cli/core/state";
+//#region src/macos/stop.ts
+const APP_EXIT_MS = 5e3;
+const SUPERVISOR_EXIT_MS = 12e3;
+function signal(pid, name) {
+	try {
+		process.kill(pid, name);
+	} catch (error) {
+		if (error.code !== "ESRCH") throw error;
+	}
+}
+async function stopProcesses(records, waitMs = APP_EXIT_MS) {
+	let live = [...new Map(records.map((record) => [record.pid, record])).values()];
+	for (const name of ["SIGTERM", "SIGKILL"]) {
+		live = live.filter((record) => {
+			const identity = (0, process_identity_exports.inspectProcessIdentity)(record);
+			if (identity === "gone" || identity === "different") return false;
+			if (identity !== "same") throw Object.assign(/* @__PURE__ */ new Error(`Cannot verify macOS owner pid ${record.pid}; no signal was sent.`), { code: "STIM_MACOS_OWNER_UNVERIFIED" });
+			return true;
+		});
+		for (const record of live) signal(record.pid, name);
+		const exited = await Promise.all(live.map((record) => (0, process_identity_exports.waitForProcessExit)(record, waitMs)));
+		live = live.filter((_, index) => !exited[index]);
+		if (!live.length) return;
+	}
+	throw new Error(`Owned macOS process ${live.map((record) => record.pid).join(", ")} did not exit.`);
+}
+/** Stops every running copy of the workspace's owned app bundle, including copies LaunchServices started. */
+async function stopBundleInstances(root) {
+	const instances = runningBundleInstances(root);
+	await stopProcesses(instances);
+	return instances.length > 0;
+}
+async function stopMacosAppHeld(root) {
+	const record = requiredMacosRecord(root);
+	if (record?.supervisor) await stopProcesses([record.supervisor], SUPERVISOR_EXIT_MS);
+	const app = readMacosRecord(root)?.app ?? record?.app;
+	if (app) await stopProcesses([app]);
+	const instances = runningBundleInstances(root);
+	await stopProcesses(instances);
+	if (!record) return instances.length > 0;
+	const claims = (0, ownership_claim_exports.readClaimSet)(macosRuntimeClaim(root));
+	if (claims.unresolved.length || claims.live.length) throw Object.assign(/* @__PURE__ */ new Error("The macOS runtime claim cannot be released; inspect its recorded owner before cleanup."), { code: "STIM_MACOS_OWNER_UNVERIFIED" });
+	return true;
+}
+/** Stops the workspace's app here, or its session on the hosting Mac, which must confirm the session stopped. */
+function stopMacosApp(root) {
+	const stop = async () => {
+		const record = requiredMacosRecord(root);
+		if (!record?.host) return stopMacosAppHeld(root);
+		await stopHostedMacos(root, record.host);
+		const { host: _host, hostLaunched: _launched, ...stopped } = record;
+		writeWorkspaceState(root, { macos: {
+			...stopped,
+			supervisor: void 0
+		} });
+		return true;
+	};
+	return withWorkspaceProcessLock(workspaceDir(root), "macos-launch", stop, {
+		external: true,
+		waitMs: 0,
+		ownerPurpose: "stop macOS app"
+	});
+}
+//#endregion
+export { stopMacosApp as n, stopMacosAppHeld as r, stopBundleInstances as t };

package/dist/{stop-zF1y04f2.mjs → stop-DRipAg-e.mjs}

@@ -1,3 +1,3 @@
-import { t as resolveSupervisorTarget } from "./ownership-BMLqyBgJ.mjs";
-import { a as resolveCollectorTargets, c as stopWorkspaceNow, i as readSupervisorState, n as clearSupervisorState, o as runStop, r as readCollectorState, s as stopCommand, t as clearCollectorState } from "./stop-DQIasgKp.mjs";
+import { m as resolveSupervisorTarget } from "./workspaces-Djb2gfi9.mjs";
+import { a as resolveCollectorTargets, c as stopWorkspaceNow, i as readSupervisorState, n as clearSupervisorState, o as runStop, r as readCollectorState, s as stopCommand, t as clearCollectorState } from "./stop-zDlknFoz.mjs";
 export { clearCollectorState, clearSupervisorState, stopCommand as default, readCollectorState, readSupervisorState, resolveCollectorTargets, resolveSupervisorTarget, runStop, stopWorkspaceNow };

package/dist/{stop-DQIasgKp.mjs → stop-zDlknFoz.mjs}

@@ -1,21 +1,22 @@
-import { B as parseDeviceSlotKey, D as withConfigLock$1, E as upsertProject, H as projectDeviceSlots, V as parseDeviceSlotOption, W as validateDeviceSlot, o as clearSupervisor, p as getProject, z as deviceSlotPlatforms } from "./config-D0DbpZtM.mjs";
-import { n as ownership_claim_exports, t as process_identity_exports } from "./process-identity-BmRm1qV0.mjs";
-import { f as refuseNoProject, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-CDAIFD-8.mjs";
-import { o as findCommandWorkspace } from "./project-D47Rh0ly.mjs";
-import { l as resolveProjectMetro, o as pidExists, r as killMetroTree, u as signalProcessTree } from "./metro-g8NqiJp-.mjs";
-import { a as updateWorkspaceState, c as writeWorkspaceState, n as clearWorkspaceStateKeys, o as withWorkspaceStateLock, r as readWorkspaceState$1, v as workspaceDir } from "./workspace-state-DqcCbpE7.mjs";
-import { n as fileLeaseIo, u as releaseWorkspaceLeases } from "./device-lease-DpoS36_u.mjs";
-import { a as clearRemoteSession, c as readMetroTunnel, i as clearManagedMetroTunnel, o as clearWorkspaceLaunches, s as clearWorkspaceSupervisor, u as readRemoteSession } from "./state-BKa8wNN5.mjs";
-import { g as teardownOwnedIosSim, h as teardownOwnedBrowser, i as stopTunnel, m as teardownOwnedAvd, t as resolveSupervisorTarget } from "./ownership-BMLqyBgJ.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-2mNzOlaB.mjs";
-import { a as logVanishedSupervisor, l as withdrawDevServerStopRequest, s as requestDevServerStop } from "./stop-cause-rhmGfwvt.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-DyRQru0q.mjs";
-import { t as stopMacosApp } from "./stop-BIiM49EY.mjs";
-import { i as stopHostedAndroid } from "./hosted-android-E1Heoqnv.mjs";
-import { f as resolveEasCliBin } from "./remote-cache-Ci4DQYYj.mjs";
-import { i as endRecordedSession } from "./device-remote-hFSkpfQu.mjs";
-import { a as decideStopAction, c as nativeRunWaitNotice, i as clearNativeRunCancel, l as requestNativeRunCancel, n as NATIVE_RUN_WAIT_MS, o as describeNativeRunHolder, s as nativeRunHolder, t as NATIVE_RUN_LOCK } from "./native-run-D1Q56rAD.mjs";
-import { r as stopHostedIos } from "./hosted-ios-BnbeYOUD.mjs";
+import { n as ownership_claim_exports, t as process_identity_exports } from "./process-identity-Biv3arCO.mjs";
+import { n as debugLog } from "./exec-i8GDPwq9.mjs";
+import { f as refuseNoProject, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-Bt8ygHE7.mjs";
+import { B as parseDeviceSlotKey, D as withConfigLock$1, E as upsertProject, H as projectDeviceSlots, V as parseDeviceSlotOption, W as validateDeviceSlot, o as clearSupervisor, p as getProject, z as deviceSlotPlatforms } from "./config-DC5jEtd1.mjs";
+import { a as updateWorkspaceState, c as writeWorkspaceState, n as clearWorkspaceStateKeys, o as withWorkspaceStateLock, r as readWorkspaceState$1, v as workspaceDir } from "./workspace-state-CR9X86xJ.mjs";
+import { C as clearRemoteSession, E as readMetroTunnel, O as readRemoteSession, S as clearManagedMetroTunnel, T as clearWorkspaceSupervisor, n as findCommandWorkspace, w as clearWorkspaceLaunches } from "./project-B5eQ1USs.mjs";
+import { d as signalProcessTree, r as killMetroTree, s as pidExists, u as resolveProjectMetro } from "./metro-DI2AjPF_.mjs";
+import { b as withdrawDevServerStopRequest, g as logVanishedSupervisor, v as requestDevServerStop } from "./budget-Dz-kyXLv.mjs";
+import { D as teardownOwnedAvd, O as teardownOwnedBrowser, g as stopTunnel, k as teardownOwnedIosSim, m as resolveSupervisorTarget } from "./workspaces-Djb2gfi9.mjs";
+import { n as fileLeaseIo, u as releaseWorkspaceLeases } from "./device-lease-Cu7PtQpZ.mjs";
+import { a as withWorkspaceProcessLock } from "./named-ports-B4iWH4E-.mjs";
+import { t as macosAppPresent } from "./state-Tp4uImDS.mjs";
+import { _ as nativeRunHolder, d as NATIVE_RUN_LOCK, f as NATIVE_RUN_WAIT_MS, g as describeNativeRunHolder, h as decideStopAction, m as clearNativeRunCancel, v as nativeRunWaitNotice, y as requestNativeRunCancel } from "./client-CuUo8Nvg.mjs";
+import { i as stopHostedAndroid } from "./hosted-android-Bs7fytj7.mjs";
+import { f as resolveEasCliBin } from "./remote-cache-N3hAEaAL.mjs";
+import { i as endRecordedSession } from "./device-remote-B5GiUifk.mjs";
+import { n as verifyCollectorOwnership } from "./ownership-EB0ySdGK.mjs";
+import { r as stopHostedIos } from "./hosted-ios-Bik035eL.mjs";
+import { n as stopMacosApp } from "./stop-D0UIpZuh.mjs";
 import { hostedAndroidDeviceName, hostedAndroidRecords, hostedIosRecords, hostedNativeRecords, isJsonObject, parseHostedNativePlacement } from "@stim-cli/core/state";
 import chalk from "chalk";
 //#region src/commands/stop.ts
@@ -250,10 +251,9 @@ async function stopWorkspaceHostedNative(root, slot, report, failed) {
 	};
 }
 async function stopWorkspaceMacos(root, failed, enabled) {
-	if (enabled === false || readWorkspaceState$1(root)?.macos === void 0) return void 0;
+	if (enabled === false || !macosAppPresent(root)) return void 0;
 	try {
-		await stopMacosApp(root);
-		return { status: "stopped" };
+		return await stopMacosApp(root) ? { status: "stopped" } : void 0;
 	} catch (error) {
 		const reason = error instanceof Error ? error.message : String(error);
 		failed(reason);
@@ -293,6 +293,7 @@ async function stopWorkspace({ root, project = void 0, state = void 0, collector
 	let ok = true;
 	let stillHolding = null;
 	let keepPort = null;
+	debugLog.log("stop.phase.start", { phase: "supervisor" });
 	const target = resolveSupervisorTarget({
 		state: sup,
 		record: proj?.supervisor ?? null,
@@ -330,6 +331,11 @@ async function stopWorkspace({ root, project = void 0, state = void 0, collector
 			stillHolding = outcomes.supervisor.reason;
 		}
 	}
+	debugLog.log("stop.phase.end", {
+		phase: "supervisor",
+		status: outcomes.supervisor.status
+	});
+	debugLog.log("stop.phase.start", { phase: "collectors" });
 	outcomes.collectors = await reapCollectors(root, collectorRecords, {
 		isAlive,
 		signal: signalCollector,
@@ -345,10 +351,22 @@ async function stopWorkspace({ root, project = void 0, state = void 0, collector
 	} else if (outcomes.collectors.entries.some((entry) => entry.status === "failed")) {
 		ok = false;
 		stillHolding ??= "a collector could not be stopped";
-	} else if (outcomes.collectors.entries.length && clearCollectors(root, collectorRecords) === false) {
-		ok = false;
-		stillHolding ??= "a replacement collector appeared during cleanup";
+	} else if (outcomes.collectors.entries.length) {
+		debugLog.log("stop.phase.start", { phase: "clear-collectors" });
+		const cleared = clearCollectors(root, collectorRecords);
+		debugLog.log("stop.phase.end", {
+			phase: "clear-collectors",
+			cleared
+		});
+		if (cleared === false) {
+			ok = false;
+			stillHolding ??= "a replacement collector appeared during cleanup";
+		}
 	}
+	debugLog.log("stop.phase.end", {
+		phase: "collectors",
+		status: outcomes.collectors.status
+	});
 	if (outcomes.supervisor.status === "stopped" || outcomes.supervisor.status === "timeout" || outcomes.supervisor.status === "unverified" || outcomes.supervisor.status === "failed") outcomes.metro = {
 		status: "skipped",
 		reason: "the supervisor owns the dev server on this port"
@@ -732,11 +750,25 @@ function shutDownDevices(project, workspace, { teardownIos, teardownAvd, report
 					reason: "Stim does not own this device"
 				};
 				report(chalk.dim(phaseLine("device", `${iosUdid} is not Stim-owned, leaving it running`)));
-			} else device[iosKey] = reportDevice(iosUdid, teardownIos(iosUdid, {
-				del: false,
-				label: iosName,
-				workspace
-			}), report, "ios");
+			} else {
+				debugLog.log("stop.device.start", {
+					platform: "ios",
+					slot,
+					deviceId: iosUdid
+				});
+				const result = teardownIos(iosUdid, {
+					del: false,
+					label: iosName,
+					workspace
+				});
+				debugLog.log("stop.device.end", {
+					platform: "ios",
+					slot,
+					deviceId: iosUdid,
+					status: result.status
+				});
+				device[iosKey] = reportDevice(iosUdid, result, report, "ios");
+			}
 		}
 		const android = platforms.android;
 		if (android?.avdName) {
@@ -748,10 +780,24 @@ function shutDownDevices(project, workspace, { teardownIos, teardownAvd, report
 					reason: "Stim does not own this device"
 				};
 				report(chalk.dim(phaseLine("device", `${android.avdName} is not Stim-owned, leaving it running`)));
-			} else device[androidKey] = reportDevice(android.avdName, teardownAvd(android.avdName, {
-				del: false,
-				workspace
-			}), report, "android");
+			} else {
+				debugLog.log("stop.device.start", {
+					platform: "android",
+					slot,
+					deviceId: android.avdName
+				});
+				const result = teardownAvd(android.avdName, {
+					del: false,
+					workspace
+				});
+				debugLog.log("stop.device.end", {
+					platform: "android",
+					slot,
+					deviceId: android.avdName,
+					status: result.status
+				});
+				device[androidKey] = reportDevice(android.avdName, result, report, "android");
+			}
 		}
 	}
 	return device;

package/dist/supervisor-run.d.mts

@@ -1,6 +1,28 @@
+import { a as readPidFile, i as clearWorkspaceSupervisor, n as MODE_EXPO, o as writePidFile, r as clearExpoMetroTunnel, t as MODE_BARE } from "./state-lKh8shBp.mjs";
 import { t as NdjsonWriter } from "./ndjson-Du3j0AQ9.mjs";
-import { a as readPidFile, i as clearWorkspaceSupervisor, n as MODE_EXPO, o as writePidFile, r as clearExpoMetroTunnel, t as MODE_BARE } from "./state-B4PQFXMW.mjs";
 import { DevServerStopRecord, DeviceActivity, DeviceIdleShutdownRecord, IOS_SIMULATOR_APPS } from "@stim-cli/core/state";
+//#region src/supervisor/types.d.ts
+interface ServerExitInfo {
+  code?: number | null;
+  signal?: NodeJS.Signals | null;
+  reason?: string;
+  error?: Error;
+}
+interface ServerHandle {
+  close(): Promise<void> | void;
+  onExit?(cb: (info?: ServerExitInfo | null) => void): void;
+  serverPid?: number | null;
+}
+type ServerStarter = (opts: {
+  root: string;
+  port: number;
+  logsDir: string;
+  writer?: NdjsonWriter | null;
+  tunnel?: boolean;
+  resetCache?: boolean;
+  onTunnelUrl?: ((url: string) => void) | null;
+}) => Promise<ServerHandle>;
+//#endregion
 //#region src/supervisor/idle-stop.d.ts
 interface IdleProbe {
   lastActivityAt(): number;
@@ -53,26 +75,6 @@ interface ParsedSupervisorArgs {
   error?: string;
 }
 declare function parseArgs(argv: string[]): ParsedSupervisorArgs;
-interface ServerExitInfo {
-  code?: number | null;
-  signal?: NodeJS.Signals | null;
-  reason?: string;
-  error?: Error;
-}
-interface ServerHandle {
-  close(): Promise<void> | void;
-  onExit?(cb: (info?: ServerExitInfo | null) => void): void;
-  serverPid?: number | null;
-}
-type ServerStarter = (opts: {
-  root: string;
-  port: number;
-  logsDir: string;
-  writer?: NdjsonWriter | null;
-  tunnel?: boolean;
-  resetCache?: boolean;
-  onTunnelUrl?: ((url: string) => void) | null;
-}) => Promise<ServerHandle>;
 interface DeviceIdleOps {
   due: typeof dueIdleDevices;
   shutDown: typeof shutDownIdleDevices;
@@ -103,4 +105,4 @@ declare function runSupervisor({ root, port, tunnel, resetCache, idleStopMinutes
 } | null>;
 declare function main(argv?: string[]): Promise<void>;
 //#endregion
-export { DeviceIdleOps, MODE_BARE, MODE_EXPO, RunSupervisorOptions, ServerExitInfo, ServerHandle, clearExpoMetroTunnel, clearWorkspaceSupervisor, main, parseArgs, readPidFile, runSupervisor, writePidFile };
+export { DeviceIdleOps, MODE_BARE, MODE_EXPO, RunSupervisorOptions, type ServerExitInfo, clearExpoMetroTunnel, clearWorkspaceSupervisor, main, parseArgs, readPidFile, runSupervisor, writePidFile };

package/dist/supervisor-run.mjs

@@ -1,27 +1,25 @@
-import { B as parseDeviceSlotKey, H as projectDeviceSlots, T as setSupervisor, o as clearSupervisor, p as getProject } from "./config-D0DbpZtM.mjs";
-import { t as process_identity_exports } from "./process-identity-BmRm1qV0.mjs";
-import { t as relaunchWithLogFile } from "./detached-entry-CiTEgMR1.mjs";
-import { r as detectIsExpo } from "./project-D47Rh0ly.mjs";
-import { C as workspaceStateFile, a as updateWorkspaceState, c as writeWorkspaceState, n as clearWorkspaceStateKeys, o as withWorkspaceStateLock, r as readWorkspaceState$1, x as workspaceLogsDir$1 } from "./workspace-state-DqcCbpE7.mjs";
-import { n as withIdleWorkspace } from "./in-use-CvGOUn-x.mjs";
-import { m as workspaceDeviceLastUseAt, r as createActivityReader } from "./activity-IRvJY_ru.mjs";
-import { a as parseLease, r as leaseIsExpired, s as parseWorkspaceLeases, t as deviceLeasePath } from "./device-lease-DpoS36_u.mjs";
-import { l as readPidFile, n as MODE_EXPO, p as writePidFile, r as clearExpoMetroTunnel, s as clearWorkspaceSupervisor, t as MODE_BARE } from "./state-BKa8wNN5.mjs";
-import { n as parseTriggerCount, o as runWatchman, r as parseWatchRoots, t as parseSubscriberNames } from "./watchman-APYjXSQa.mjs";
-import { z as ownedAvdSerialResolver } from "./android-B_YNZy61.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-2mNzOlaB.mjs";
-import { s as workspaceBuildInProgress } from "./idle-BXG__1BA.mjs";
-import { t as describeError } from "./errors-B6W7FkxQ.mjs";
-import { r as createNdjsonWriter } from "./ndjson-PclOIwVY.mjs";
-import { c as vanishedSupervisorMessage, i as devServerStopRecord, r as devServerStopLevel, t as describeDevServerStop } from "./stop-cause-rhmGfwvt.mjs";
-import { l as probeHostedSession } from "./hosted-client-Bp4knSwu.mjs";
-import { t as clearHostedMetro } from "./metro-gateway-C-ijGI2F.mjs";
-import { n as dueIdleDevices, r as shutDownIdleDevices } from "./idle-shutdown-IGyNV8Cr.mjs";
+import { t as process_identity_exports } from "./process-identity-Biv3arCO.mjs";
+import { B as parseDeviceSlotKey, H as projectDeviceSlots, T as setSupervisor, o as clearSupervisor, p as getProject } from "./config-DC5jEtd1.mjs";
+import { C as workspaceStateFile, a as updateWorkspaceState, c as writeWorkspaceState, n as clearWorkspaceStateKeys, o as withWorkspaceStateLock, r as readWorkspaceState$1, x as workspaceLogsDir$1 } from "./workspace-state-CR9X86xJ.mjs";
+import { D as readPidFile, T as clearWorkspaceSupervisor, b as MODE_EXPO, j as writePidFile, p as detectIsExpo, u as nativeProjectIntegration, x as clearExpoMetroTunnel, y as MODE_BARE } from "./project-B5eQ1USs.mjs";
+import { n as parseTriggerCount, o as runWatchman, r as parseWatchRoots, t as parseSubscriberNames } from "./watchman-BL1IdOtq.mjs";
+import { E as workspaceBuildInProgress, f as describeDevServerStop, h as devServerStopRecord, m as devServerStopLevel, y as vanishedSupervisorMessage } from "./budget-Dz-kyXLv.mjs";
+import { f as withIdleWorkspace } from "./workspaces-Djb2gfi9.mjs";
+import { m as workspaceDeviceLastUseAt, r as createActivityReader } from "./activity-BSw0x84R.mjs";
+import { a as parseLease, r as leaseIsExpired, s as parseWorkspaceLeases, t as deviceLeasePath } from "./device-lease-Cu7PtQpZ.mjs";
+import { z as ownedAvdSerialResolver } from "./android-BdQC6zs1.mjs";
+import { a as withWorkspaceProcessLock } from "./named-ports-B4iWH4E-.mjs";
+import { s as describeError } from "./metro-store-BAHFcJm6.mjs";
+import { r as createNdjsonWriter } from "./ndjson-LGZAMsqa.mjs";
+import { n as dueIdleDevices, r as shutDownIdleDevices } from "./idle-shutdown-DYiMBn34.mjs";
+import { l as probeHostedSession } from "./hosted-client-C5G4h_OJ.mjs";
+import { t as clearHostedMetro } from "./metro-gateway-BxpJLIwh.mjs";
+import { t as relaunchWithLogFile } from "./detached-entry-pB_IPfV4.mjs";
 import { existsSync, readFileSync, realpathSync, statSync } from "node:fs";
 import { dirname, isAbsolute, join, resolve, sep } from "node:path";
-import { LOG_ROTATE_BYTES, createMetroGateway } from "@stim-cli/core";
 import { DEV_SERVER_STOP_REQUEST_KEY, HOSTED_METRO_GATEWAYS_KEY, HOSTED_METRO_REQUESTS_KEY, IDLE_STOP_KEY, hostedAndroidPlacements, hostedIosPlacements, hostedMetroGateways, hostedMetroRequests, hostedNativeRecords, parseHostedNativePlacement, readDevServerStopRequest } from "@stim-cli/core/state";
 import { fileURLToPath } from "node:url";
+import { LOG_ROTATE_BYTES, createMetroGateway } from "@stim-cli/core";
 //#region src/supervisor/hosted-metro.ts
 function reconcileHostedMetro(requests, active) {
 	const same = (session) => JSON.stringify(requests[session]) === JSON.stringify(active[session]);
@@ -469,7 +467,8 @@ async function runSupervisor({ root, port, tunnel = false, resetCache = false, i
 	root = realpathSync(root);
 	const logsDir = workspaceLogsDir$1(root);
 	const writer = createNdjsonWriter(join(logsDir, "metro.ndjson"), { maxBytes: LOG_ROTATE_BYTES });
-	const mode = isExpo(root) ? MODE_EXPO : MODE_BARE;
+	const integration = nativeProjectIntegration(root, isExpo);
+	const mode = integration.mode;
 	const startedAt = new Date(now()).toISOString();
 	const processToken = (0, process_identity_exports.captureProcessToken)(process.pid);
 	if (!processToken) {
@@ -598,7 +597,7 @@ async function runSupervisor({ root, port, tunnel = false, resetCache = false, i
 		return writer.write(entry);
 	} });
 	try {
-		server = await (mode === "expo-child" ? startExpo || (await import("./server-expo-CeakhI8P.mjs")).startExpoServer : startBare || (await import("./server-bare-BkrSxSsZ.mjs")).startBareServer)({
+		server = await ((mode === "expo-child" ? startExpo : startBare) ?? await integration.loadDevServer())({
 			root,
 			port,
 			logsDir,

package/dist/{support-CsJNVfOc.mjs → support-CNqYkV0y.mjs}

@@ -1,10 +1,10 @@
-import { h as shortUdid, l as phaseLine } from "./command-output-CDAIFD-8.mjs";
-import { x as workspaceLogsDir } from "./workspace-state-DqcCbpE7.mjs";
-import { k as parseIosSimulatorApp } from "./ios-DSfnPfse.mjs";
-import { x as describeDiagnostic } from "./toolchain-DNyR3NPq.mjs";
-import { d as unknownIosDeviceTypeRefusal, f as unknownIosRuntimeRefusal, o as layerNote, t as DEFAULT_DEVICE_SLOT_WAIT_MS } from "./device-capacity-ZC4XSZ4R.mjs";
-import { l as parseDeviceWait } from "./device-lease-run-B8YltIH_.mjs";
-import { t as IosDeviceMismatchError } from "./device-ios-C2Um-XUR.mjs";
+import { h as shortUdid, l as phaseLine } from "./command-output-Bt8ygHE7.mjs";
+import { x as workspaceLogsDir } from "./workspace-state-CR9X86xJ.mjs";
+import { A as parseIosSimulatorApp } from "./ios-BWbHFZVz.mjs";
+import { d as unknownIosDeviceTypeRefusal, f as unknownIosRuntimeRefusal, o as layerNote, t as DEFAULT_DEVICE_SLOT_WAIT_MS } from "./device-capacity-BoN1jQkO.mjs";
+import { k as describeDiagnostic } from "./toolchain-C3xSoyUl.mjs";
+import { t as IosDeviceMismatchError } from "./device-ios-B2ruohE-.mjs";
+import { l as parseDeviceWait } from "./device-lease-run-D38SnZtt.mjs";
 import { basename, join } from "node:path";
 import chalk from "chalk";
 function buildLogFile(root) {

package/dist/{support-WvD__tSV.mjs → support-DsNaFg6D.mjs}

@@ -1,8 +1,8 @@
-import { t as getExecutor } from "./exec-CaErVv7t.mjs";
-import { C as emulatorFailureRemedy, D as hostSystemImageArch, K as profileNeedsFoldFeature, N as memoizeEmulatorProbe, S as emulatorDiskSpaceRemedy, T as findBuildTool, W as pickDefaultSystemImage, c as androidPoolNoCandidatesRefusal, l as androidSystemImageAbi, o as androidHome, s as androidPoolCandidates, w as extractEmulatorFailure } from "./android-B_YNZy61.mjs";
-import { l as unknownAndroidDeviceProfileRefusal, o as layerNote, u as unknownAndroidSystemImageRefusal } from "./device-capacity-ZC4XSZ4R.mjs";
-import { T as pickDevClientScheme } from "./app-install-VPkI5WEg.mjs";
-import { t as devClientScheme } from "./dev-client-B-XC4uRH.mjs";
+import { t as getExecutor } from "./exec-i8GDPwq9.mjs";
+import { C as emulatorFailureRemedy, D as hostSystemImageArch, K as profileNeedsFoldFeature, N as memoizeEmulatorProbe, S as emulatorDiskSpaceRemedy, T as findBuildTool, W as pickDefaultSystemImage, c as androidPoolNoCandidatesRefusal, l as androidSystemImageAbi, o as androidHome, s as androidPoolCandidates, w as extractEmulatorFailure } from "./android-BdQC6zs1.mjs";
+import { l as unknownAndroidDeviceProfileRefusal, o as layerNote, u as unknownAndroidSystemImageRefusal } from "./device-capacity-BoN1jQkO.mjs";
+import { T as pickDevClientScheme } from "./app-install-CFI4ptUL.mjs";
+import { t as devClientScheme } from "./dev-client-CDY_zAmD.mjs";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { relative } from "node:path";
 //#region src/commands/android/support.ts