stim 1.11.0 → 1.12.0

package/dist/settings.schema.json

@@ -904,7 +904,7 @@
           "additionalProperties": false
         },
         "iosSimulatorApp": {
-          "description": "App that displays an owned iOS simulator",
+          "description": "App that displays an owned iOS simulator; stim-desktop by default when Stim Desktop is installed",
           "type": "string",
           "enum": [
             "xcode",
@@ -921,7 +921,7 @@
           }
         },
         "androidEmulatorApp": {
-          "description": "App that displays an owned Android emulator Stim boots on macOS",
+          "description": "App that displays an owned Android emulator Stim boots on macOS; stim-desktop by default when Stim Desktop is installed",
           "type": "string",
           "enum": [
             "emulator",
@@ -1030,6 +1030,26 @@
           },
           "additionalProperties": false
         },
+        "gc": {
+          "type": "object",
+          "properties": {
+            "worktreeGraceMinutes": {
+              "description": "Minutes after a linked worktree last changed, or its branch merged, before gc removes it; 0 removes it at once",
+              "type": "integer",
+              "minimum": 0,
+              "default": 120,
+              "x-stim": {
+                "key": "gc.worktreeGraceMinutes",
+                "kind": "number",
+                "scopes": [
+                  "machine"
+                ],
+                "env": "STIM_GC_WORKTREE_GRACE_MINUTES"
+              }
+            }
+          },
+          "additionalProperties": false
+        },
         "pool": {
           "type": "object",
           "properties": {

package/dist/{simslim-CIR3IYJO.mjs → simslim-COtEEP7x.mjs}

@@ -1,10 +1,11 @@
-import { D as process_identity_exports, H as projectDeviceSlots, g as loadConfig, k as ownership_claim_exports, u as getConfigDir, z as deviceSlotPlatforms } from "./config-BEq0Qw_a.mjs";
+import { A as ownership_claim_exports, B as deviceSlotPlatforms, O as process_identity_exports, U as projectDeviceSlots, _ as loadConfig, d as getConfigDir } from "./config-0jCcMM0E.mjs";
 import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
 import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { g as releaseBuildLock, m as acquireBuildLock } from "./device-lease-D83nqeMX.mjs";
-import { T as listAdbDevices } from "./android-C4zG2Tuc.mjs";
-import { l as listAllIosSims, s as iosRuntimeMatches } from "./ios-DArbmwer.mjs";
-import { _ as easCliSupport, s as readInstalledEasCliVersion, v as easCliUpgradeRemedy, z as resolveEasCliBin } from "./device-remote-BQZSnnmE.mjs";
+import { g as releaseBuildLock, m as acquireBuildLock } from "./device-lease-B9LAXIUH.mjs";
+import { E as listAdbDevices } from "./android-75Sk2rIR.mjs";
+import { l as listAllIosSims, s as iosRuntimeMatches } from "./ios-CZWOHTTc.mjs";
+import { f as resolveEasCliBin } from "./remote-cache-BRsRZru5.mjs";
+import { O as easCliSupport, k as easCliUpgradeRemedy, s as readInstalledEasCliVersion } from "./device-remote-C0_o-tJH.mjs";
 import { existsSync, realpathSync, statSync } from "node:fs";
 import { join } from "node:path";
 import { createHash } from "node:crypto";

package/dist/{slot-launch-rggO1Esw.mjs → slot-launch-DIACGEfH.mjs}

@@ -1,7 +1,7 @@
-import { f as getProject } from "./config-BEq0Qw_a.mjs";
-import { m as readWorkspaceState } from "./metro-BWLOJ_Wr.mjs";
-import { n as fileLeaseIo } from "./device-lease-D83nqeMX.mjs";
-import { d as deviceShellArg } from "./app-install-DHut6JnV.mjs";
+import { p as getProject } from "./config-0jCcMM0E.mjs";
+import { m as readWorkspaceState } from "./metro-Dzo30hvJ.mjs";
+import { n as fileLeaseIo } from "./device-lease-B9LAXIUH.mjs";
+import { d as deviceShellArg } from "./app-install-CsZi0SAT.mjs";
 //#region src/engine/slot-launch.ts
 function launchSlotScope(root, slot = "default") {
 	if (slot !== "default") return slot;

package/dist/{spawn-claims-BJwXTMPt.mjs → spawn-claims-PT8aQpCa.mjs}

@@ -1,4 +1,4 @@
-import { D as process_identity_exports, k as ownership_claim_exports } from "./config-BEq0Qw_a.mjs";
+import { A as ownership_claim_exports, O as process_identity_exports } from "./config-0jCcMM0E.mjs";
 //#region src/engine/spawn-claims.ts
 const declaring = /* @__PURE__ */ new Set();
 const running = /* @__PURE__ */ new Set();

package/dist/{start-i8zc9VmS.mjs → start-BFstVBlx.mjs}

@@ -1,2 +1,2 @@
-import { a as registerStart, c as startFacts, d as wantsExpoOwnTunnel, i as readLogTail, l as supervisorEntry, n as liveSupervisor, o as startCommand, r as parseWait, s as startDevServer, t as failureEvidence, u as tailLines } from "./start-BSsf2tUs.mjs";
+import { a as registerStart, c as startFacts, d as wantsExpoOwnTunnel, i as readLogTail, l as supervisorEntry, n as liveSupervisor, o as startCommand, r as parseWait, s as startDevServer, t as failureEvidence, u as tailLines } from "./start-BboE1HIS.mjs";
 export { startCommand as default, failureEvidence, liveSupervisor, parseWait, readLogTail, registerStart, startDevServer, startFacts, supervisorEntry, tailLines, wantsExpoOwnTunnel };

package/dist/{start-BSsf2tUs.mjs → start-BboE1HIS.mjs}

@@ -1,23 +1,113 @@
-import { D as process_identity_exports, f as getProject, w as upsertProject } from "./config-BEq0Qw_a.mjs";
+import { O as process_identity_exports, T as upsertProject, p as getProject } from "./config-0jCcMM0E.mjs";
 import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
 import { i as levelRank } from "./ndjson-CDY9IkVC.mjs";
-import { T as supervisorLogFile, c as signalProcessTree, d as reserveMetroPort, h as recordWorkspaceUse, i as pidExists, j as workspaceLogsDir, m as readWorkspaceState$1, p as clearWorkspaceStateKeys, s as resolveProjectMetro, x as ensureWorkspaceStorage, y as writeWorkspaceState } from "./metro-BWLOJ_Wr.mjs";
-import { s as gitCommonDir, y as repoRoot } from "./worktree-BlizKDpZ.mjs";
-import { a as detectIsExpo, i as detectBundleId, n as appProjectProblem, o as findProjectRoot, r as detectAndroidPackage, t as NO_PROJECT_REFUSAL } from "./project-BXZzOABt.mjs";
+import { T as supervisorLogFile, c as signalProcessTree, d as reserveMetroPort, h as recordWorkspaceUse, i as pidExists, j as workspaceLogsDir, m as readWorkspaceState$1, p as clearWorkspaceStateKeys, s as resolveProjectMetro, x as ensureWorkspaceStorage, y as writeWorkspaceState } from "./metro-Dzo30hvJ.mjs";
+import { s as gitCommonDir, y as repoRoot } from "./worktree-DeBQSVtR.mjs";
+import { c as readAppConfigText, i as findProjectRoot, l as readAppJson, n as appProjectProblem, r as detectIsExpo, t as NO_PROJECT_REFUSAL } from "./project-B8rbutVC.mjs";
 import { n as windowsLauncherArgs } from "./detached-entry-DJHoca49.mjs";
-import { i as clearManagedMetroTunnel, s as readMetroTunnel } from "./state-WGdIbi_d.mjs";
-import { n as workspaceProcessLockError, t as withWorkspaceProcessLock } from "./workspace-process-lock-Cx74RSDZ.mjs";
-import { _ as stepTimer, l as phaseLine } from "./command-output-D5z2_bcF.mjs";
-import { A as resolveCacheProviderConfig, B as planMetroReach, C as ngrokUrlSetting, E as publicUrlSetting, I as tunnelModeSetting, L as unknownSettingKeys, O as remoteAndroidSetting, P as settingShapeErrors, R as PUBLIC_METRO_ENV, a as SETTING_SHAPE_REMEDY, b as metroIdleStopMinutesSetting, d as cacheProviderSettingError, j as resolveSettings, k as remoteIosSetting, x as metroTunnelSettingError, z as detectProviders } from "./settings-B5oFZEri.mjs";
-import { a as terminateChild, c as withManagedTunnelLock, i as stopTunnel, o as withManagedRemoteWorktreeLock, r as startTunnelSequence, t as resolveSupervisorTarget } from "./ownership-BiojdtAp.mjs";
-import { i as stopOwnedMetroForReset, t as budgetGate } from "./budget-De3P2rq_.mjs";
+import { c as readMetroTunnel, i as clearManagedMetroTunnel } from "./state-DcDgzfu3.mjs";
+import { n as workspaceProcessLockError, t as withWorkspaceProcessLock } from "./workspace-process-lock-BvvJTfo_.mjs";
+import { _ as stepTimer, l as phaseLine } from "./command-output-BWCj5Vh-.mjs";
+import { A as resolveCacheProviderConfig, B as planMetroReach, C as ngrokUrlSetting, E as publicUrlSetting, I as tunnelModeSetting, L as unknownSettingKeys, O as remoteAndroidSetting, P as settingShapeErrors, R as PUBLIC_METRO_ENV, a as SETTING_SHAPE_REMEDY, b as metroIdleStopMinutesSetting, d as cacheProviderSettingError, j as resolveSettings, k as remoteIosSetting, x as metroTunnelSettingError, z as detectProviders } from "./settings-BlyDn2Oz.mjs";
+import { a as terminateChild, c as withManagedTunnelLock, i as stopTunnel, o as withManagedRemoteWorktreeLock, r as startTunnelSequence, t as resolveSupervisorTarget } from "./ownership-B8d4kXBx.mjs";
+import { d as readProjectConfig } from "./remote-cache-BRsRZru5.mjs";
+import { I as stopOwnedMetroForReset, t as budgetGate } from "./budget-DbzW5VTD.mjs";
 import { appendFileSync, mkdirSync, openSync, readFileSync } from "node:fs";
+import { existsSync as existsSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1 } from "fs";
+import { join } from "path";
 import { IDLE_STOP_KEY, queryLogs } from "@stim-cli/core/state";
-import { basename, dirname, join } from "node:path";
+import { basename as basename$1, dirname as dirname$1, join as join$1 } from "node:path";
 import { EventEmitter } from "node:events";
 import { fileURLToPath } from "node:url";
 import chalk from "chalk";
 import { CACHE_PROVIDER_ENV, cacheProviderEnv } from "@stim-cli/cache";
+//#region src/workspace/app-id.ts
+function configString(config, platform, key) {
+	if (!config || typeof config !== "object") return null;
+	const expoField = config.expo;
+	const section = (expoField && typeof expoField === "object" ? expoField : config)[platform];
+	if (!section || typeof section !== "object") return null;
+	const value = section[key];
+	return typeof value === "string" && value ? value : null;
+}
+function literalString(text, key) {
+	return text?.match(new RegExp(`${key}\\s*:\\s*["']([^"']+)["']`))?.[1] ?? null;
+}
+function idsFromConfig(projectRoot) {
+	const read = readProjectConfig(projectRoot);
+	if (!read.unavailable) return {
+		bundleId: configString(read.config, "ios", "bundleIdentifier"),
+		androidPackage: configString(read.config, "android", "package")
+	};
+	const appJson = readAppJson(projectRoot);
+	const text = readAppConfigText(projectRoot);
+	return {
+		bundleId: configString(appJson, "ios", "bundleIdentifier") ?? literalString(text, "bundleIdentifier"),
+		androidPackage: configString(appJson, "android", "package") ?? literalString(text, "package")
+	};
+}
+function detectAppIds(projectRoot) {
+	const ids = idsFromConfig(projectRoot);
+	return {
+		bundleId: ids.bundleId ?? detectBundleIdFromPbxproj(projectRoot),
+		androidPackage: ids.androidPackage ?? detectAndroidPackageFromGradle(projectRoot)
+	};
+}
+function detectBundleId(projectRoot) {
+	return detectAppIds(projectRoot).bundleId;
+}
+function detectAndroidPackage(projectRoot) {
+	return detectAppIds(projectRoot).androidPackage;
+}
+function detectBundleIdFromPbxproj(projectRoot) {
+	const iosDir = join(projectRoot, "ios");
+	if (!existsSync$1(iosDir)) return null;
+	let entries;
+	try {
+		entries = readdirSync$1(iosDir, { withFileTypes: true });
+	} catch {
+		return null;
+	}
+	for (const entry of entries) {
+		if (!entry.isDirectory() || !entry.name.endsWith(".xcodeproj")) continue;
+		const pbx = join(iosDir, entry.name, "project.pbxproj");
+		if (!existsSync$1(pbx)) continue;
+		let text;
+		try {
+			text = readFileSync$1(pbx, "utf-8");
+		} catch {
+			continue;
+		}
+		const concrete = [...text.matchAll(/PRODUCT_BUNDLE_IDENTIFIER\s*=\s*([^;\s"]+)\s*;/g)].map((m) => m[1]).filter((id) => !!id && !id.startsWith("$") && !id.includes("("));
+		if (concrete.length === 0) continue;
+		const counts = {};
+		for (const id of concrete) counts[id] = (counts[id] || 0) + 1;
+		let best = null, bestCount = 0, bestLen = Infinity;
+		for (const [id, count] of Object.entries(counts)) if (count > bestCount || count === bestCount && id.length < bestLen) {
+			best = id;
+			bestCount = count;
+			bestLen = id.length;
+		}
+		return best;
+	}
+	return null;
+}
+function detectAndroidPackageFromGradle(projectRoot) {
+	const gradle = join(projectRoot, "android", "app", "build.gradle");
+	if (!existsSync$1(gradle)) return null;
+	let text;
+	try {
+		text = readFileSync$1(gradle, "utf-8");
+	} catch {
+		return null;
+	}
+	const nsId = text.match(/namespace\s+["']([^"']+)["']/)?.[1];
+	if (nsId) return nsId;
+	const appId = text.match(/applicationId\s+["']([^"']+)["']/)?.[1];
+	if (appId) return appId;
+	return null;
+}
+//#endregion
 //#region src/spawn-entry.ts
 const DEV_ENTRIES = {
 	"supervisor-run": "./supervisor/run.ts",
@@ -25,8 +115,8 @@ const DEV_ENTRIES = {
 };
 function spawnEntry(name) {
 	const here = fileURLToPath(import.meta.url);
-	if (basename(dirname(here)) === "src") return fileURLToPath(new URL(DEV_ENTRIES[name], import.meta.url));
-	return join(dirname(here), `${name}.mjs`);
+	if (basename$1(dirname$1(here)) === "src") return fileURLToPath(new URL(DEV_ENTRIES[name], import.meta.url));
+	return join$1(dirname$1(here), `${name}.mjs`);
 }
 //#endregion
 //#region src/commands/start.ts
@@ -269,9 +359,10 @@ async function startDevServer({ root, settings, waitSeconds = DEFAULT_WAIT_SECON
 		if (tunnel) note(chalk.dim("note   requesting an Expo tunnel for this workspace's dev server"));
 		const managedRemote = remote && !tunnel && !publicUrl && tunnelMode !== "off";
 		const runStart = async () => {
+			const appIds = detectAppIds(root);
 			upsertProject(root, {
-				bundleId: detectBundleId(root) ?? void 0,
-				androidPackage: detectAndroidPackage(root) ?? void 0,
+				bundleId: appIds.bundleId ?? void 0,
+				androidPackage: appIds.androidPackage ?? void 0,
 				isExpo
 			});
 			const gateBudget = async () => {
@@ -819,7 +910,7 @@ async function startDevServer({ root, settings, waitSeconds = DEFAULT_WAIT_SECON
 		};
 		const startLocked = async () => {
 			try {
-				return await withWorkspaceProcessLock(dirname(workspaceLogsDir(root)), "metro-start", runStart, { external: true });
+				return await withWorkspaceProcessLock(dirname$1(workspaceLogsDir(root)), "metro-start", runStart, { external: true });
 			} catch (error) {
 				if (workspaceProcessLockError(error) !== "timeout") throw error;
 				return fail({
@@ -935,4 +1026,4 @@ function report({ json, out, facts, waited, reclaimed }) {
 	out(chalk.dim(phaseLine("logs", facts.logsDir)));
 }
 //#endregion
-export { registerStart as a, startFacts as c, wantsExpoOwnTunnel as d, spawnEntry as f, readLogTail as i, supervisorEntry as l, liveSupervisor as n, startCommand as o, parseWait as r, startDevServer as s, failureEvidence as t, tailLines as u };
+export { registerStart as a, startFacts as c, wantsExpoOwnTunnel as d, spawnEntry as f, detectBundleId as h, readLogTail as i, supervisorEntry as l, detectAppIds as m, liveSupervisor as n, startCommand as o, detectAndroidPackage as p, parseWait as r, startDevServer as s, failureEvidence as t, tailLines as u };

package/dist/{state-WGdIbi_d.mjs → state-DcDgzfu3.mjs}

@@ -1,5 +1,5 @@
-import { B as parseDeviceSlotKey, D as process_identity_exports, R as deviceSlotKey } from "./config-BEq0Qw_a.mjs";
-import { E as supervisorPidFile, N as workspaceStateFile, _ as withWorkspaceStateLock, f as clearWorkspaceStateKey, g as updateWorkspaceState, m as readWorkspaceState } from "./metro-BWLOJ_Wr.mjs";
+import { O as process_identity_exports, V as parseDeviceSlotKey, z as deviceSlotKey } from "./config-0jCcMM0E.mjs";
+import { E as supervisorPidFile, N as workspaceStateFile, _ as withWorkspaceStateLock, f as clearWorkspaceStateKey, g as updateWorkspaceState, m as readWorkspaceState } from "./metro-Dzo30hvJ.mjs";
 import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
 //#region src/supervisor/state.ts
@@ -68,6 +68,18 @@ function writeWorkspaceLaunch(root, platform, record, slot = "default") {
 		};
 	});
 }
+function clearWorkspaceLaunches(root, slot) {
+	updateWorkspaceState(root, (state) => {
+		if (!state.launches || typeof state.launches !== "object") return state;
+		const launches = { ...state.launches };
+		delete launches[deviceSlotKey("ios", slot)];
+		delete launches[deviceSlotKey("android", slot)];
+		return {
+			...state,
+			launches
+		};
+	});
+}
 function readRemoteSession(root) {
 	const record = readWorkspaceState(root)?.remoteDevice;
 	if (!record || typeof record !== "object") return null;
@@ -130,4 +142,4 @@ function readPidFile(root) {
 	}
 }
 //#endregion
-export { clearRemoteSession as a, readPidFile as c, readWorkspaceLaunches as d, writePidFile as f, clearManagedMetroTunnel as i, readRemoteSession as l, MODE_EXPO as n, clearWorkspaceSupervisor as o, writeWorkspaceLaunch as p, clearExpoMetroTunnel as r, readMetroTunnel as s, MODE_BARE as t, readRemoteSessionId as u };
+export { clearRemoteSession as a, readMetroTunnel as c, readRemoteSessionId as d, readWorkspaceLaunches as f, clearManagedMetroTunnel as i, readPidFile as l, writeWorkspaceLaunch as m, MODE_EXPO as n, clearWorkspaceLaunches as o, writePidFile as p, clearExpoMetroTunnel as r, clearWorkspaceSupervisor as s, MODE_BARE as t, readRemoteSession as u };

package/dist/{stats-BAgJaLA4.mjs → stats-D8rUTPHd.mjs}

@@ -1,4 +1,4 @@
-import { T as withConfigLock, u as getConfigDir } from "./config-BEq0Qw_a.mjs";
+import { E as withConfigLock, d as getConfigDir } from "./config-0jCcMM0E.mjs";
 import { readFileSync, realpathSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, relative, resolve } from "node:path";
 const PLATFORMS = ["ios", "android"];

package/dist/{stats-DBYJ5bxL.mjs → stats-DiCtmluY.mjs}

@@ -1,7 +1,7 @@
-import { s as gitCommonDir, y as repoRoot } from "./worktree-BlizKDpZ.mjs";
-import { o as findProjectRoot } from "./project-BXZzOABt.mjs";
-import { o as formatLongDuration } from "./command-output-D5z2_bcF.mjs";
-import { a as statsProjectKey, r as readStats } from "./stats-BAgJaLA4.mjs";
+import { s as gitCommonDir, y as repoRoot } from "./worktree-DeBQSVtR.mjs";
+import { i as findProjectRoot } from "./project-B8rbutVC.mjs";
+import { o as formatLongDuration } from "./command-output-BWCj5Vh-.mjs";
+import { a as statsProjectKey, r as readStats } from "./stats-D8rUTPHd.mjs";
 import chalk from "chalk";
 //#region src/commands/stats.ts
 const PLATFORMS = ["ios", "android"];

package/dist/{status-Q-WDEGCB.mjs → status-BUASYyy_.mjs}

@@ -1,5 +1,5 @@
-import { H as projectDeviceSlots } from "./config-BEq0Qw_a.mjs";
-import { a as formatElapsed, o as formatLongDuration, r as clockTime, u as plural } from "./command-output-D5z2_bcF.mjs";
+import { U as projectDeviceSlots, z as deviceSlotKey } from "./config-0jCcMM0E.mjs";
+import { a as formatElapsed, o as formatLongDuration, r as clockTime, u as plural } from "./command-output-BWCj5Vh-.mjs";
 import { sep } from "path";
 //#region src/status.ts
 const IOS_SIM_MB = 1500;
@@ -22,7 +22,27 @@ function poolLine({ platform, parked, max }) {
 	const what = plural(parked, `parked ${platform === "ios" ? "iOS simulator" : "Android emulator"}`);
 	return max > 0 ? `pool: ${what} (max ${max})` : `pool: ${what} (parking off; gc --delete removes them)`;
 }
-function environmentState(project, { simsByUdid = {}, metro = null, worktrees = [], simsAvailable = true, androidRuntime = null, androidRuntimes = {}, supervisor = null, logs = null, remote = null, idleStop = null } = {}) {
+const RECENT_LAUNCH_MS = 18e5;
+function avdExpected({ slot, serial, launches, leasedIds, running, now }) {
+	if (serial && leasedIds.has(serial)) return true;
+	const launch = launches[deviceSlotKey("android", slot)];
+	if (!launch) return false;
+	return running || now - Date.parse(launch.launchedAt) < 18e5;
+}
+function androidStatus(android, androidRuntime, androidDeviceProfile) {
+	if (!android) return null;
+	return {
+		name: android.avdName ?? android.serial,
+		owned: Boolean(android.owned),
+		physical: Boolean(android.serial && !android.avdName),
+		...androidRuntime ? {
+			serial: androidRuntime.serial,
+			state: androidRuntime.state
+		} : {},
+		...androidDeviceProfile ? { deviceProfile: androidDeviceProfile } : {}
+	};
+}
+function environmentState(project, { simsByUdid = {}, metro = null, worktrees = [], simsAvailable = true, androidRuntime = null, androidRuntimes = {}, androidDeviceProfile = null, androidDeviceProfiles = {}, supervisor = null, logs = null, remote = null, idleStop = null, launches = {}, leasedIds = /* @__PURE__ */ new Set(), now = Date.now(), slot = "default", workspaceRunning = false } = {}) {
 	const ios = project.platforms?.ios;
 	const android = project.platforms?.android;
 	const sim = ios ? simsByUdid[ios.deviceUdid] : null;
@@ -34,20 +54,35 @@ function environmentState(project, { simsByUdid = {}, metro = null, worktrees =
 	if (simBooted) memoryMb += IOS_SIM_MB;
 	if (androidDetected) memoryMb += ANDROID_EMULATOR_MB;
 	if (metroRunning) memoryMb += METRO_MB;
-	const warnings = [];
-	if (metro?.notOurs) warnings.push(`port ${project.metroPort}: ${metro.notOurs}`);
-	if (ios && !sim && simsAvailable) warnings.push(`recorded sim ${ios.deviceUdid} no longer exists`);
-	if (simBooted && project.metroPort && !metroRunning) warnings.push("simulator is booted with no Metro serving it");
+	const running = workspaceRunning || metroRunning || supervisor?.status === "ours";
+	const issues = [];
+	const add = (code, message, remedy, severity = "warning") => issues.push({
+		code,
+		severity,
+		message,
+		remedy,
+		workspace: project.__path,
+		...slot === "default" ? {} : { slot }
+	});
+	const slotFlag = slot === "default" ? "" : ` --slot ${slot}`;
+	if (metro?.notOurs && slot === "default") add("port-not-ours", `port ${project.metroPort}: ${metro.notOurs}`, "stim guide errors teardown", "error");
+	if (ios && !sim && simsAvailable) add("sim-missing", `recorded sim ${ios.deviceUdid} no longer exists`, `stim ios${slotFlag}`);
+	if (simBooted && project.metroPort && !metroRunning) add("sim-without-metro", "simulator is booted with no Metro serving it", "stim start");
 	if (androidRuntime && android?.avdName) {
 		const recordedSerial = android.consolePort ? `emulator-${android.consolePort}` : android.serial;
-		if (androidRuntime.serial && recordedSerial && androidRuntime.serial !== recordedSerial) warnings.push(`owned AVD ${android.avdName} changed serial (${recordedSerial} -> ${androidRuntime.serial}); rerun your \`stim android\` command in this workspace to restore Metro forwarding, then reopen agent-device on ${androidRuntime.serial}`);
-		if (androidRuntime.state === "missing") warnings.push(`recorded AVD ${android.avdName} no longer exists`);
-		if (androidRuntime.state === "not-detected") warnings.push(`owned AVD ${android.avdName} is not detected by adb; rerun your \`stim android\` command in this workspace to reconnect`);
-		if (androidRuntime.error) warnings.push(`could not check owned AVD ${android.avdName}: ${androidRuntime.error}`);
+		const expected = avdExpected({
+			slot,
+			serial: recordedSerial,
+			launches,
+			leasedIds,
+			running,
+			now
+		});
+		for (const [code, message] of androidIssues(android, recordedSerial, androidRuntime, expected)) add(code, message, code === "avd-unchecked" ? "stim doctor" : `stim android${slotFlag}`);
 	}
-	if (supervisor && supervisor.alive === false) warnings.push(`stale supervisor record for ${project.__path}`);
+	if (supervisor?.status === "unverified") add("supervisor-unverified", `supervisor pid ${supervisor.pid} could not be verified${supervisor.reason ? `: ${supervisor.reason}` : ""}`, "stim guide errors teardown", "error");
 	const slots = [];
-	for (const { slot, platforms } of projectDeviceSlots(project).slice(1)) {
+	for (const { slot: name, platforms } of projectDeviceSlots(project).slice(1)) {
 		const deviceState = environmentState({
 			...project,
 			platforms,
@@ -56,45 +91,44 @@ function environmentState(project, { simsByUdid = {}, metro = null, worktrees =
 			simsByUdid,
 			simsAvailable,
 			metro,
-			androidRuntime: androidRuntimes[slot]
+			androidRuntime: androidRuntimes[name],
+			androidDeviceProfile: androidDeviceProfiles[name],
+			launches,
+			leasedIds,
+			now,
+			slot: name,
+			workspaceRunning: running
 		});
 		slots.push({
-			slot,
+			slot: name,
 			ios: deviceState.ios,
 			android: deviceState.android
 		});
 		memoryMb += deviceState.memoryMb - (metroRunning ? METRO_MB : 0);
 		live ||= deviceState.live;
-		warnings.push(...deviceState.warnings.map((warning) => `${slot}: ${warning}`));
+		issues.push(...deviceState.issues);
 	}
 	return {
 		path: project.__path,
 		...slots.length ? { slots } : {},
 		live,
 		memoryMb,
-		warnings,
+		warnings: issues.map(issueText),
+		issues,
 		ios: ios ? {
 			name: sim?.name ?? null,
 			udid: ios.deviceUdid,
 			owned: Boolean(ios.owned),
 			state: sim?.state ?? (simsAvailable ? "missing" : "unknown")
 		} : null,
-		android: android ? {
-			name: android.avdName ?? android.serial,
-			owned: Boolean(android.owned),
-			physical: Boolean(android.serial && !android.avdName),
-			...androidRuntime ? {
-				serial: androidRuntime.serial,
-				state: androidRuntime.state
-			} : {}
-		} : null,
+		android: androidStatus(android, androidRuntime, androidDeviceProfile),
 		metro: project.metroPort ? {
 			port: project.metroPort,
 			running: metroRunning,
 			pid: metro?.metro?.pid ?? null,
 			...idleStop && !metroRunning ? { idleStop } : {}
 		} : null,
-		supervisor: supervisor ? {
+		supervisor: supervisor && supervisor.status !== "stale" ? {
 			pid: supervisor.pid ?? null,
 			mode: supervisor.mode ?? null,
 			startedAt: supervisor.startedAt ?? null,
@@ -108,6 +142,17 @@ function environmentState(project, { simsByUdid = {}, metro = null, worktrees =
 		remoteDevices: remote ? [remote] : []
 	};
 }
+function androidIssues(android, recordedSerial, runtime, expected) {
+	const issues = [];
+	if (runtime.serial && recordedSerial && runtime.serial !== recordedSerial) issues.push(["avd-serial-changed", `owned AVD ${android.avdName} changed serial (${recordedSerial} -> ${runtime.serial}), so Metro forwarding is lost; rerun with the same build options, then reopen agent-device on ${runtime.serial}`]);
+	if (runtime.state === "missing") issues.push(["avd-missing", `recorded AVD ${android.avdName} no longer exists`]);
+	if (runtime.state === "not-detected" && expected) issues.push(["avd-not-detected", `owned AVD ${android.avdName} is not detected by adb`]);
+	if (runtime.error) issues.push(["avd-unchecked", `could not check owned AVD ${android.avdName}: ${runtime.error}`]);
+	return issues;
+}
+function issueText(issue) {
+	return `${issue.slot ? `${issue.slot}: ` : ""}${issue.message}; run \`${issue.remedy}\``;
+}
 function activityLabel(activity, now) {
 	if (!activity) return null;
 	if (activity.state === "driven") {
@@ -227,4 +272,4 @@ function deviceLeaseLines(states, now) {
 	return lines;
 }
 //#endregion
-export { diskLine as a, gitSummaryText as c, remoteDeviceLine as d, remoteDeviceState as f, deviceLeaseStates as i, parseDfFree as l, unprovisionedWorktrees as m, capacity as n, environmentState as o, tightVolumes as p, deviceLeaseLines as r, formatSpace as s, activityLabel as t, poolLine as u };
+export { deviceLeaseStates as a, formatSpace as c, poolLine as d, remoteDeviceLine as f, unprovisionedWorktrees as h, deviceLeaseLines as i, gitSummaryText as l, tightVolumes as m, activityLabel as n, diskLine as o, remoteDeviceState as p, capacity as r, environmentState as s, RECENT_LAUNCH_MS as t, parseDfFree as u };

package/dist/{status-CitcBRsC.mjs → status-DI9Tjo7T.mjs}

@@ -1,22 +1,22 @@
-import { F as volumeRootFor, H as projectDeviceSlots, g as loadConfig$1, u as getConfigDir } from "./config-BEq0Qw_a.mjs";
+import { I as volumeRootFor, U as projectDeviceSlots, _ as loadConfig$1, d as getConfigDir } from "./config-0jCcMM0E.mjs";
 import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
 import { a as parseNdjsonLine } from "./ndjson-CDY9IkVC.mjs";
-import { A as workspaceLogErrorIndex, a as processCwd, j as workspaceLogsDir, l as isMetroRunning, m as readWorkspaceState$1, n as listeningPids, o as processCwds, r as listeningPidsByPort, s as resolveProjectMetro } from "./metro-BWLOJ_Wr.mjs";
-import { c as gitCommonDirOnDisk, p as linkedWorktreesOnDisk, s as gitCommonDir, y as repoRoot } from "./worktree-BlizKDpZ.mjs";
-import { l as projectShortcut, o as findProjectRoot } from "./project-BXZzOABt.mjs";
-import { l as readRemoteSession } from "./state-WGdIbi_d.mjs";
-import { i as formatDuration } from "./command-output-D5z2_bcF.mjs";
-import { i as listLeaseFiles } from "./device-lease-D83nqeMX.mjs";
-import { n as createActivityReader } from "./activity-BtG4Va9l.mjs";
-import { I as ownedAvdSerialResolver, l as androidToolPath } from "./android-C4zG2Tuc.mjs";
-import { b as readParked, h as POOL_SETTING_REMEDY, t as resolveSupervisorTarget, y as parkedMaxSetting } from "./ownership-BiojdtAp.mjs";
-import { _ as parseSimctlList, u as listAllIosSimsAsync } from "./ios-DArbmwer.mjs";
-import { a as buildStatusLine, i as buildReport, r as activeBuildState, s as parseActiveBuild, t as ACTIVE_BUILD_KEY } from "./build-progress-CDwogz6R.mjs";
-import { m as readEasSessionLedger$1, p as easMachineStateRoot$1 } from "./device-remote-BQZSnnmE.mjs";
-import { a as diskLine, c as gitSummaryText, d as remoteDeviceLine, f as remoteDeviceState, i as deviceLeaseStates, l as parseDfFree, m as unprovisionedWorktrees, n as capacity, o as environmentState, p as tightVolumes, r as deviceLeaseLines, t as activityLabel, u as poolLine } from "./status-Q-WDEGCB.mjs";
-import { a as statsProjectKey, r as readStats } from "./stats-BAgJaLA4.mjs";
-import { n as mergeState } from "./merge-state-DDxS-XIZ.mjs";
-import { i as readSupervisorState } from "./stop-DIhrvu0B.mjs";
+import { A as workspaceLogErrorIndex, a as processCwd, j as workspaceLogsDir, l as isMetroRunning, m as readWorkspaceState$1, n as listeningPids, o as processCwds, r as listeningPidsByPort, s as resolveProjectMetro } from "./metro-Dzo30hvJ.mjs";
+import { c as gitCommonDirOnDisk, p as linkedWorktreesOnDisk, s as gitCommonDir, y as repoRoot } from "./worktree-DeBQSVtR.mjs";
+import { i as findProjectRoot, s as projectShortcut } from "./project-B8rbutVC.mjs";
+import { f as readWorkspaceLaunches, u as readRemoteSession } from "./state-DcDgzfu3.mjs";
+import { i as formatDuration } from "./command-output-BWCj5Vh-.mjs";
+import { i as listLeaseFiles } from "./device-lease-B9LAXIUH.mjs";
+import { n as createActivityReader } from "./activity-CCZJs__P.mjs";
+import { L as ownedAvdSerialResolver, N as ownedAvdDeviceProfile, u as androidToolPath } from "./android-75Sk2rIR.mjs";
+import { b as readParked, h as POOL_SETTING_REMEDY, t as resolveSupervisorTarget, y as parkedMaxSetting } from "./ownership-B8d4kXBx.mjs";
+import { _ as parseSimctlList, u as listAllIosSimsAsync } from "./ios-CZWOHTTc.mjs";
+import { a as buildStatusLine, i as buildReport, r as activeBuildState, s as parseActiveBuild, t as ACTIVE_BUILD_KEY } from "./build-progress-h60GPV27.mjs";
+import { T as readEasSessionLedger$1, w as easMachineStateRoot$1 } from "./device-remote-C0_o-tJH.mjs";
+import { a as deviceLeaseStates, d as poolLine, f as remoteDeviceLine, h as unprovisionedWorktrees, i as deviceLeaseLines, l as gitSummaryText, m as tightVolumes, n as activityLabel, o as diskLine, p as remoteDeviceState, r as capacity, s as environmentState, u as parseDfFree } from "./status-BUASYyy_.mjs";
+import { a as statsProjectKey, r as readStats } from "./stats-D8rUTPHd.mjs";
+import { n as mergeState } from "./merge-state-ytFQCeh4.mjs";
+import { i as readSupervisorState } from "./stop-Bn6v-GvS.mjs";
 import { mkdirSync, readFileSync, readdirSync, renameSync, rmSync, watch, writeFileSync } from "node:fs";
 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, writeFileSync as writeFileSync$1 } from "fs";
 import { basename, dirname, join } from "path";
@@ -611,7 +611,9 @@ async function statusLines(json, gitMaxAgeMs) {
 	const androidRuntimeOf = androidRuntimeReader();
 	const devices = projects.map(([, proj]) => ({
 		androidRuntimes: Object.fromEntries(projectDeviceSlots(proj).slice(1).map(({ slot, platforms }) => [slot, platforms.android?.owned && platforms.android.avdName ? androidRuntimeOf(platforms.android.avdName) : null])),
-		androidRuntime: proj.platforms?.android?.owned && proj.platforms.android.avdName ? androidRuntimeOf(proj.platforms.android.avdName) : null
+		androidRuntime: proj.platforms?.android?.owned && proj.platforms.android.avdName ? androidRuntimeOf(proj.platforms.android.avdName) : null,
+		androidDeviceProfiles: Object.fromEntries(projectDeviceSlots(proj).slice(1).map(({ slot, platforms }) => [slot, platforms.android?.owned && platforms.android.avdName ? ownedAvdDeviceProfile(platforms.android.avdName) : null])),
+		androidDeviceProfile: proj.platforms?.android?.owned && proj.platforms.android.avdName ? ownedAvdDeviceProfile(proj.platforms.android.avdName) : null
 	}));
 	const logs = projects.map(([path]) => logFacts(path));
 	const simsByUdid = {};
@@ -629,9 +631,16 @@ async function statusLines(json, gitMaxAgeMs) {
 	const states = [];
 	const labelOnlyRoots = [];
 	const easLedger = readEasSessionLedger$1();
+	const leaseNow = Date.now();
+	const leaseFiles = listLeaseFiles();
+	const leases = deviceLeaseStates(leaseFiles, {
+		root: cwdRoot,
+		now: leaseNow
+	});
 	for (const [i, [path, proj]] of projects.entries()) {
 		const { metro, supervisor } = running[i];
 		const saved = readWorkspaceState$1(path);
+		const builds = workspaceBuilds(path, saved, history);
 		states.push(environmentState({
 			...proj,
 			__path: path
@@ -644,10 +653,16 @@ async function statusLines(json, gitMaxAgeMs) {
 			supervisor,
 			logs: logs[i],
 			remote: remoteDeviceState(readRemoteSession(path), easLedger, path),
-			idleStop: readIdleStop(saved)
+			idleStop: readIdleStop(saved),
+			launches: readWorkspaceLaunches(path),
+			leasedIds: new Set(deviceLeaseStates(leaseFiles, {
+				root: path,
+				now: leaseNow
+			}).flatMap((lease) => lease.mine && !lease.expired && lease.id ? [lease.id] : [])),
+			now: leaseNow
 		}));
 		const state = states[states.length - 1];
-		if (state) Object.assign(state, workspaceBuilds(path, saved, history));
+		if (state) Object.assign(state, builds);
 		labelOnlyRoots.push(Boolean(proj.worktreeRoot && !proj.bundleId && !state?.metro && !state?.ios && !state?.android));
 	}
 	const readActivity = createActivityReader();
@@ -671,11 +686,6 @@ async function statusLines(json, gitMaxAgeMs) {
 			id: device.android.serial
 		});
 	}
-	const leaseNow = Date.now();
-	const leases = deviceLeaseStates(listLeaseFiles(), {
-		root: cwdRoot,
-		now: leaseNow
-	});
 	const totalMemoryMb = Math.round(totalmem() / 1048576);
 	const cap = capacity(states, totalMemoryMb);
 	const pools = ["ios", "android"].map((platform) => {
@@ -932,13 +942,14 @@ async function supervisorFacts(path, proj, metroResolution, lookup) {
 	const pid = state?.pid ?? record?.pid ?? null;
 	if (!pid) return null;
 	const port = state?.port ?? record?.port ?? null;
-	const alive = resolveSupervisorTarget({
+	const target = resolveSupervisorTarget({
 		state,
 		record,
 		reservedPort: proj?.metroPort
-	}).status === "ours";
+	});
+	const status = target.status === "ours" ? "ours" : target.status === "unverified" ? "unverified" : "stale";
 	let healthy = false;
-	if (alive && port) {
+	if (status === "ours" && port) {
 		const resolution = port === proj?.metroPort && metroResolution ? metroResolution : await resolveOnPort(port, path, lookup);
 		healthy = Boolean(resolution?.metro);
 	}
@@ -946,7 +957,8 @@ async function supervisorFacts(path, proj, metroResolution, lookup) {
 		pid,
 		mode: state?.mode ?? record?.mode ?? null,
 		startedAt: state?.startedAt ?? record?.startedAt ?? null,
-		alive,
+		status,
+		...target.reason ? { reason: target.reason } : {},
 		healthy
 	};
 }

package/dist/stim-desktop-D0xhpZt8.mjs

@@ -0,0 +1,29 @@
+import { t as getExecutor } from "./exec-DK8KaVHK.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 STIM_DESKTOP_INSTALLED = "Stim Desktop installed";
+function stimDesktopInstalled(platform = process.platform) {
+	if (platform !== "darwin") return false;
+	const found = getExecutor().runFileQuiet("osascript", [
+		"-l",
+		"JavaScript",
+		"-e",
+		LAUNCH_SERVICES_LOOKUP
+	], {
+		timeoutMs: 5e3,
+		killSignal: "SIGKILL"
+	});
+	return Boolean(found);
+}
+function settingDefault(setting, desktopInstalled = stimDesktopInstalled) {
+	if (setting.desktopDefault !== void 0 && desktopInstalled()) return {
+		value: setting.desktopDefault,
+		reason: STIM_DESKTOP_INSTALLED
+	};
+	return {
+		value: setting.default,
+		reason: null
+	};
+}
+//#endregion
+export { stimDesktopInstalled as n, settingDefault as t };