stim 1.10.1 → 1.12.0

package/dist/{build-progress-BXx-ZBe4.mjs → activity-CCZJs__P.mjs}

@@ -1,10 +1,8 @@
-import { D as process_identity_exports, k as ownership_claim_exports } from "./config-BEq0Qw_a.mjs";
+import { O as process_identity_exports } from "./config-0jCcMM0E.mjs";
 import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
-import { f as clearWorkspaceStateKey, g as updateWorkspaceState, j as workspaceLogsDir, m as readWorkspaceState$1 } from "./metro-BWLOJ_Wr.mjs";
-import { a as formatElapsed, u as plural } from "./command-output-D5z2_bcF.mjs";
-import { i as listLeaseFiles, r as leaseIsExpired } from "./device-lease-CbEaIk7b.mjs";
+import { j as workspaceLogsDir, m as readWorkspaceState } from "./metro-Dzo30hvJ.mjs";
+import { i as listLeaseFiles, r as leaseIsExpired } from "./device-lease-B9LAXIUH.mjs";
 import { closeSync, fstatSync, openSync, readFileSync, readSync, readdirSync } from "node:fs";
-import { BUILD_PHASES } from "@stim-cli/core/state";
 import { basename, join, resolve } from "node:path";
 import { homedir } from "node:os";
 //#region src/devices/activity.ts
@@ -68,6 +66,9 @@ function parseAgentDeviceRecord(kind, path, raw) {
 		path,
 		kind,
 		deviceId,
+		session: kind === "claim" && typeof entry?.session === "string" && entry.session ? entry.session : null,
+		workspace: kind === "claim" && typeof entry?.workspace === "string" && entry.workspace ? entry.workspace : null,
+		deviceName: kind === "claim" && typeof device?.name === "string" ? device.name : null,
 		readable: Boolean(entry && deviceId),
 		owner: entry ? field(entry, "ownerPid", "ownerStartTime") : null,
 		runner: entry && kind === "runner-lease" ? field(entry, "runnerPid", "runnerStartTime") : null,
@@ -298,7 +299,7 @@ function createActivityReader({ now = Date.now(), home = homedir(), startOf = pr
 				basis: "metro-bundle",
 				at: bundleAt
 			});
-			const usedAt = Date.parse(String(readWorkspaceState$1(target.workspace)?.lastUsedAt ?? ""));
+			const usedAt = Date.parse(String(readWorkspaceState(target.workspace)?.lastUsedAt ?? ""));
 			if (Number.isFinite(usedAt)) evidence.recency.push({
 				basis: "workspace-use",
 				at: usedAt
@@ -309,7 +310,7 @@ function createActivityReader({ now = Date.now(), home = homedir(), startOf = pr
 }
 function workspaceActivity(workspace, now = Date.now()) {
 	const dir = workspaceLogsDir(workspace);
-	const state = readWorkspaceState$1(workspace);
+	const state = readWorkspaceState(workspace);
 	const recency = [];
 	const deviceAt = latestRecordAt(tailLines(join(dir, "device.ndjson")) ?? [], (record) => record.src === "device" && isDeviceRecord(record));
 	if (deviceAt !== null) recency.push({
@@ -335,178 +336,4 @@ function workspaceActivity(workspace, now = Date.now()) {
 	}, now);
 }
 //#endregion
-//#region src/engine/build-progress.ts
-const ACTIVE_BUILD_KEY = "activeBuild";
-const NO_BUILD_PROGRESS = {
-	step: () => {},
-	durations: () => ({}),
-	clear: () => {}
-};
-const COLD_PHASES = [
-	"prebuild",
-	"pods",
-	"compile"
-];
-const DEVICE_PHASES = ["install", "launch"];
-function startBuildProgress({ root, platform, slot, claim, now = Date.now, note = () => {} }) {
-	const startedAt = new Date(now()).toISOString();
-	const record = {
-		platform,
-		slot,
-		startedAt,
-		phase: "prepare",
-		phaseStartedAt: startedAt,
-		phases: [{
-			phase: "prepare",
-			startedAt
-		}],
-		claim: {
-			root: claim.root,
-			path: claim.path,
-			claimId: claim.claimId,
-			pid: claim.owner.pid
-		}
-	};
-	let warned = false;
-	const guard = (fn) => {
-		try {
-			fn();
-		} catch (error) {
-			if (warned) return;
-			warned = true;
-			note(`Build progress could not be recorded in the workspace state: ${error?.message || error}`);
-		}
-	};
-	const write = () => guard(() => updateWorkspaceState(root, (state) => ({
-		...state,
-		[ACTIVE_BUILD_KEY]: record
-	})));
-	write();
-	return {
-		step(phase) {
-			if (phase === record.phase) return;
-			const at = new Date(now()).toISOString();
-			record.phase = phase;
-			record.phaseStartedAt = at;
-			record.phases.push({
-				phase,
-				startedAt: at
-			});
-			write();
-		},
-		durations() {
-			return phaseDurations(record.phases, now());
-		},
-		clear() {
-			guard(() => {
-				clearWorkspaceStateKey(root, ACTIVE_BUILD_KEY, (value) => parseActiveBuild(value)?.claim.claimId === record.claim.claimId);
-			});
-		}
-	};
-}
-function phaseDurations(phases, now) {
-	const out = {};
-	phases.forEach(({ phase, startedAt }, index) => {
-		const start = Date.parse(startedAt);
-		const next = phases[index + 1];
-		const end = next ? Date.parse(next.startedAt) : now;
-		if (!Number.isFinite(start) || !Number.isFinite(end)) return;
-		out[phase] = (out[phase] ?? 0) + Math.max(0, end - start);
-	});
-	return out;
-}
-function parseActiveBuild(value) {
-	if (!value || typeof value !== "object" || Array.isArray(value)) return null;
-	const record = value;
-	const claim = record.claim;
-	if (record.platform !== "ios" && record.platform !== "android") return null;
-	if (!isPhase(record.phase)) return null;
-	if (typeof record.startedAt !== "string" || typeof record.phaseStartedAt !== "string") return null;
-	if (!claim || typeof claim.root !== "string" || typeof claim.claimId !== "string") return null;
-	const phases = Array.isArray(record.phases) ? record.phases.filter((entry) => isPhase(entry?.phase) && typeof entry?.startedAt === "string") : [];
-	return {
-		platform: record.platform,
-		slot: typeof record.slot === "string" ? record.slot : "default",
-		startedAt: record.startedAt,
-		phase: record.phase,
-		phaseStartedAt: record.phaseStartedAt,
-		phases,
-		claim: {
-			root: claim.root,
-			path: typeof claim.path === "string" ? claim.path : "",
-			claimId: claim.claimId,
-			pid: typeof claim.pid === "number" ? claim.pid : 0
-		}
-	};
-}
-function isPhase(value) {
-	return BUILD_PHASES.includes(value);
-}
-function activeBuildState(claim, survey = (0, ownership_claim_exports.readClaimSet)(claim.root)) {
-	if (survey.live.some((holder) => holder.claimId === claim.claimId)) return "running";
-	if (survey.dead.some((holder) => holder.claimId === claim.claimId)) return "stale";
-	return survey.unresolved.length ? "unknown" : "stale";
-}
-function liveOutcome(record) {
-	const seen = new Set(record.phases.map((entry) => entry.phase));
-	if (COLD_PHASES.some((phase) => seen.has(phase))) return "cold";
-	if (DEVICE_PHASES.some((phase) => seen.has(phase))) return "hit";
-	return null;
-}
-function median(values) {
-	if (!values.length) return null;
-	const sorted = values.toSorted((a, b) => a - b);
-	const mid = Math.floor(sorted.length / 2);
-	return sorted.length % 2 ? sorted[mid] : Math.round((sorted[mid - 1] + sorted[mid]) / 2);
-}
-function estimateBuild(history, platform, known, phase) {
-	const lists = history?.[platform];
-	const outcome = known ?? latestOutcome(lists);
-	const samples = outcome && lists?.[outcome] || [];
-	const phaseSamples = samples.flatMap((sample) => phase in sample.phases ? [sample.phases[phase]] : []);
-	return {
-		outcome,
-		expectedMs: median(samples.map((sample) => sample.durationMs)),
-		expectedPhaseMs: median(phaseSamples),
-		basis: samples.length
-	};
-}
-function latestOutcome(lists) {
-	let latest = null;
-	for (const outcome of ["hit", "cold"]) {
-		const last = lists?.[outcome]?.at(-1);
-		const at = last ? Date.parse(last.at) : NaN;
-		if (Number.isFinite(at) && (!latest || at > latest.at)) latest = {
-			outcome,
-			at
-		};
-	}
-	return latest?.outcome ?? null;
-}
-function buildReport(record, { state, history }) {
-	return {
-		platform: record.platform,
-		slot: record.slot,
-		state,
-		phase: record.phase,
-		startedAt: record.startedAt,
-		phaseStartedAt: record.phaseStartedAt,
-		...estimateBuild(history, record.platform, liveOutcome(record), record.phase)
-	};
-}
-function remainingText(remainingMs) {
-	return remainingMs < 6e4 ? "under a minute left" : `about ${Math.ceil(remainingMs / 6e4)} min left`;
-}
-function buildStatusLine(report, now) {
-	const slot = report.slot === "default" ? "" : ` [${report.slot}]`;
-	if (report.state === "stale") return `build: stale ${report.platform}${slot} record from ${report.startedAt} (its run is gone; the next run replaces it)`;
-	const elapsedMs = Math.max(0, now - Date.parse(report.startedAt));
-	const head = `build: ${report.platform}${slot} ${report.phase}, ${formatElapsed(elapsedMs)} elapsed`;
-	if (report.state === "unknown") return `${head} (its native-run claim cannot be resolved, so it may not be running)`;
-	if (report.expectedMs === null) return head;
-	const basis = `median of ${plural(report.basis, `${report.outcome} run`)}`;
-	const remainingMs = report.expectedMs - elapsedMs;
-	return remainingMs > 0 ? `${head} -- ${remainingText(remainingMs)} (${basis})` : `${head} (usually ~${formatElapsed(report.expectedMs)}, ${basis})`;
-}
-//#endregion
-export { buildStatusLine as a, createActivityReader as c, buildReport as i, idleForMs as l, NO_BUILD_PROGRESS as n, parseActiveBuild as o, activeBuildState as r, startBuildProgress as s, ACTIVE_BUILD_KEY as t, workspaceActivity as u };
+export { workspaceActivity as a, readAgentDeviceRecords as i, createActivityReader as n, idleForMs as r, agentDeviceLiveness as t };

package/dist/{android-787HhP5w.mjs → android-75Sk2rIR.mjs}

@@ -1,12 +1,33 @@
-import { u as getConfigDir } from "./config-BEq0Qw_a.mjs";
+import { _ as loadConfig$1, d as getConfigDir } from "./config-0jCcMM0E.mjs";
 import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
-import { P as withDirLock, c as signalProcessTree, i as pidExists } from "./metro-BWLOJ_Wr.mjs";
-import { c as androidDataPartitionSizeBytes } from "./settings-DOugPlPz.mjs";
+import { P as withDirLock, c as signalProcessTree, i as pidExists } from "./metro-Dzo30hvJ.mjs";
+import { n as stimDesktopInstalled, t as settingDefault } from "./stim-desktop-D0xhpZt8.mjs";
+import { c as androidDataPartitionSizeBytes } from "./settings-BlyDn2Oz.mjs";
 import { mkdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { existsSync as existsSync$1, lstatSync as lstatSync$1, mkdirSync as mkdirSync$1, openSync as openSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, realpathSync as realpathSync$1, renameSync as renameSync$1, rmSync as rmSync$1, statSync as statSync$1, writeFileSync as writeFileSync$1 } from "fs";
 import { dirname, isAbsolute, join, resolve } from "path";
-import { createdDevicesFile, createdDevicesLock, readCreatedDevices, readCreatedDevices as readCreatedDevices$1 } from "@stim-cli/core/state";
+import { ANDROID_EMULATOR_APPS, createdDevicesFile, createdDevicesLock, readCreatedDevices, readCreatedDevices as readCreatedDevices$1, settingDefinition } from "@stim-cli/core/state";
 import { homedir, tmpdir } from "os";
+//#region src/devices/android-emulator-viewer.ts
+function configuredAndroidEmulatorApp(platform = process.platform) {
+	const value = loadConfig$1()?.androidEmulatorApp ?? settingDefault(settingDefinition("androidEmulatorApp"), () => stimDesktopInstalled(platform)).value;
+	if (ANDROID_EMULATOR_APPS.includes(value)) return value;
+	const error = /* @__PURE__ */ new Error("Invalid androidEmulatorApp in machine config. Use \"emulator\" or \"stim-desktop\".");
+	Object.assign(error, { code: "STIM_BAD_ARG" });
+	throw error;
+}
+function openEmulatorInStimDesktop(serial) {
+	getExecutor().runFileQuiet("open", [
+		"-g",
+		"-a",
+		"Stim",
+		`stim-desktop://open?serial=${serial}`
+	], {
+		timeoutMs: 5e3,
+		killSignal: "SIGKILL"
+	});
+}
+//#endregion
 //#region src/devices/created-devices.ts
 function update(platform, change) {
 	const dir = getConfigDir();
@@ -70,7 +91,7 @@ const ANDROID_ABIS = /* @__PURE__ */ new Set([
 	"x86",
 	"x86_64"
 ]);
-const DEFAULT_AVD_DEVICE = "pixel_6";
+const DEFAULT_AVD_DEVICE_PROFILE = String(settingDefinition("android.deviceProfile")?.default);
 function androidHome() {
 	const configured = process.env.ANDROID_HOME || process.env.ANDROID_SDK_ROOT;
 	if (configured) return configured;
@@ -184,7 +205,19 @@ function pickDefaultSystemImage(images, { systemImage, hostArch } = {}) {
 	if (matching.length === 0) return null;
 	return matching.toSorted((a, b) => pageSizeRank(a) - pageSizeRank(b) || b.api - a.api || (b.tag === "google_apis" ? 1 : 0) - (a.tag === "google_apis" ? 1 : 0))[0] ?? null;
 }
-async function createOwnedAvd(label, { systemImage, spawn = (...args) => getExecutor().spawn(...args) } = {}) {
+const FOLD_FEATURE_PROFILES = /* @__PURE__ */ new Set(["pixel_fold", "resizable"]);
+function profileNeedsFoldFeature(profile) {
+	return typeof profile === "string" && FOLD_FEATURE_PROFILES.has(profile);
+}
+function systemImageSupportsFold(pkg, home = androidHome()) {
+	try {
+		const ini = readFileSync$1(join(home, ...pkg.split(";"), "advancedFeatures.ini"), "utf8");
+		return /^\s*SupportPixelFold\s*=\s*on\s*$/im.test(ini);
+	} catch {
+		return false;
+	}
+}
+async function createOwnedAvd(label, { systemImage, deviceProfile = DEFAULT_AVD_DEVICE_PROFILE, spawn = (...args) => getExecutor().spawn(...args) } = {}) {
 	const pick = pickDefaultSystemImage(listInstalledSystemImages(), { systemImage });
 	if (!pick) {
 		const arch = hostSystemImageArch();
@@ -201,7 +234,7 @@ async function createOwnedAvd(label, { systemImage, spawn = (...args) => getExec
 		"-k",
 		pick.pkg,
 		"--device",
-		DEFAULT_AVD_DEVICE
+		deviceProfile
 	];
 	const child = spawn(tool, args, {
 		detached: true,
@@ -229,17 +262,24 @@ async function createOwnedAvd(label, { systemImage, spawn = (...args) => getExec
 	if (result.code !== 0) throw new Error(`Command failed: ${tool} ${args.join(" ")} (${result.signal ?? result.code})\n${stderr.trim()}`);
 	return {
 		avdName,
-		systemImage: pick.pkg
+		systemImage: pick.pkg,
+		deviceProfile
 	};
 }
 function parseAvdSystemImage(configIni) {
+	const dir = avdIniValue(configIni, "image.sysdir.1")?.replace(/[\\/]+$/, "");
+	if (!dir) return null;
+	return dir.split(/[\\/]/).join(";");
+}
+function parseAvdDeviceProfile(configIni) {
+	return avdIniValue(configIni, "hw.device.name") || null;
+}
+function avdIniValue(configIni, key) {
 	for (const line of String(configIni).split(/\r?\n/)) {
 		const separator = line.indexOf("=");
 		if (separator < 0) continue;
-		if (line.slice(0, separator).trim() !== "image.sysdir.1") continue;
-		const dir = line.slice(separator + 1).trim().replace(/[\\/]+$/, "");
-		if (!dir) return null;
-		return dir.split(/[\\/]/).join(";");
+		if (line.slice(0, separator).trim() !== key) continue;
+		return line.slice(separator + 1).trim();
 	}
 	return null;
 }
@@ -252,6 +292,18 @@ function ownedAvdSystemImage(avdName, { avdDirectory = ownedAvdDirectory, readFi
 		return null;
 	}
 }
+function ownedAvdDeviceProfile(avdName) {
+	const configIni = avdConfigIni(avdName);
+	return configIni === null ? null : parseAvdDeviceProfile(configIni);
+}
+const AVDMANAGER_LIST_TIMEOUT_MS = 6e4;
+function listAvdDeviceProfiles() {
+	return parseAvdList(getExecutor().runFile(androidToolPath("avdmanager"), [
+		"list",
+		"device",
+		"-c"
+	], { timeoutMs: AVDMANAGER_LIST_TIMEOUT_MS }));
+}
 function sanitizeAvdLabel(label) {
 	return String(label).replace(/[^A-Za-z0-9._-]+/g, "-").replace(/^-+|-+$/g, "");
 }
@@ -454,8 +506,9 @@ function nextConsolePort(claimedPorts) {
 	if (claimedPorts.length === 0) return 5554;
 	return Math.max(...claimedPorts) + 2;
 }
-function headlessEmulatorArgs(env = process.env, platform = process.platform) {
+function headlessEmulatorArgs(env = process.env, platform = process.platform, app = "emulator") {
 	const args = [];
+	if (platform === "darwin" && app === "stim-desktop") args.push("-no-window", "-gpu", "host");
 	if (platform === "linux" && !env.DISPLAY && !env.WAYLAND_DISPLAY) args.push("-no-window", "-noaudio", "-no-boot-anim", "-gpu", "swiftshader_indirect", "-no-snapshot-save", "-no-snapshot-load");
 	return args;
 }
@@ -631,10 +684,15 @@ function configureNewOwnedAvd(avdName, { dataPartitionSizeGb, avdConfig = {} },
 	for (const [key, value] of Object.entries(expected)) if (!verified.split(/\r?\n/).includes(`${key}=${value}`)) throw new Error(`Could not verify ${key} in ${configPath}.`);
 	return configPath;
 }
-function avdPoolConfiguration(dataPartitionSizeGb, avdConfig) {
+/**
+* Values every AVD Stim creates gets unless `android.avdConfig` or `android.avdConfigFile` sets the key. The
+* emulator drops gRPC `sendKey` events on an AVD without a hardware keyboard.
+*/
+const OWNED_AVD_CONFIG_DEFAULTS = Object.freeze({ "hw.keyboard": "yes" });
+function avdPoolConfiguration(dataPartitionSizeGb, avdConfig, deviceProfile = DEFAULT_AVD_DEVICE_PROFILE) {
 	return JSON.stringify(Object.entries({
 		...avdConfig,
-		"hw.device.name": DEFAULT_AVD_DEVICE,
+		"hw.device.name": deviceProfile,
 		"disk.dataPartition.size": String(androidDataPartitionSizeBytes(dataPartitionSizeGb))
 	}).toSorted(([a], [b]) => a.localeCompare(b)));
 }
@@ -751,7 +809,9 @@ function suppressEmulatorCrashConsent({ platform = process.platform, version = e
 	return [];
 }
 function bootAndroidEmulator(avdName, consolePort, { logFile, platform = process.platform } = {}) {
-	const child = getExecutor().spawn(androidToolPath("emulator"), [
+	const exec = getExecutor();
+	const app = configuredAndroidEmulatorApp(platform);
+	const child = exec.spawn(androidToolPath("emulator"), [
 		"-avd",
 		avdName,
 		"-port",
@@ -759,7 +819,7 @@ function bootAndroidEmulator(avdName, consolePort, { logFile, platform = process
 		"-grpc",
 		String(consolePort + 3e3),
 		"-grpc-use-token",
-		...headlessEmulatorArgs(),
+		...headlessEmulatorArgs(process.env, platform, app),
 		...suppressEmulatorCrashConsent({ platform })
 	], {
 		cwd: androidToolCwd(platform),
@@ -767,7 +827,9 @@ function bootAndroidEmulator(avdName, consolePort, { logFile, platform = process
 		stdio: emulatorStdio(logFile)
 	});
 	child?.unref?.();
-	return child?.pid ?? null;
+	const pid = child?.pid ?? null;
+	if (pid !== null && platform === "darwin" && app === "stim-desktop") openEmulatorInStimDesktop(`emulator-${consolePort}`);
+	return pid;
 }
 function emulatorStdio(logFile) {
 	if (!logFile) return "ignore";
@@ -997,4 +1059,4 @@ function ownedAvdSerialResolver({ timeoutMs } = {}) {
 	};
 }
 //#endregion
-export { ownedAvdDirectory as A, resolvePhysicalDevice as B, isStimOwnedAvdName as C, listOrphanedAvdDirectories as D, listInstalledSystemImages as E, physicalDeviceModel as F, wipeAvdUserData as G, sleepSync as H, pickDefaultSystemImage as I, recordCreatedDevice as J, isStimOwnedSim as K, probeEmulatorSerial as L, ownedAvdName as M, ownedAvdSerialResolver as N, memoizeEmulatorProbe as O, ownedAvdSystemImage as P, resetAdoptedAvd as R, hostSystemImageArch as S, listAvds as T, waitForAndroidEmulatorShutdown as U, shutdownAndroidEmulator as V, waitForBoot as W, emulatorDiskSpaceRemedy as _, androidPoolNoCandidatesRefusal as a, findBuildTool as b, androidToolPath as c, avdPoolConfiguration as d, avdStorageRoots as f, deleteAvd as g, createOwnedAvd as h, androidPoolCandidates as i, ownedAvdMatchesConfiguration as j, nextConsolePort as k, assertOwnedAvdStopped as l, configureNewOwnedAvd as m, androidDeviceAbi as n, androidSystemImageAbi as o, bootAndroidEmulator as p, forgetCreatedDevice as q, androidHome as r, androidToolCwd as s, androidBuildToolName as t, avdPathExists as u, emulatorFailureRemedy as v, listAdbDevices as w, getAvdNameForSerial as x, extractEmulatorFailure as y, resolveOwnedAvdSerial as z };
+export { forgetCreatedDevice as $, listOrphanedAvdDirectories as A, pickDefaultSystemImage as B, getAvdNameForSerial as C, listAvdDeviceProfiles as D, listAdbDevices as E, ownedAvdMatchesConfiguration as F, resolvePhysicalDevice as G, profileNeedsFoldFeature as H, ownedAvdName as I, systemImageSupportsFold as J, shutdownAndroidEmulator as K, ownedAvdSerialResolver as L, nextConsolePort as M, ownedAvdDeviceProfile as N, listAvds as O, ownedAvdDirectory as P, isStimOwnedSim as Q, ownedAvdSystemImage as R, findBuildTool as S, isStimOwnedAvdName as T, resetAdoptedAvd as U, probeEmulatorSerial as V, resolveOwnedAvdSerial as W, waitForBoot as X, waitForAndroidEmulatorShutdown as Y, wipeAvdUserData as Z, createOwnedAvd as _, androidHome as a, emulatorFailureRemedy as b, androidSystemImageAbi as c, assertOwnedAvdStopped as d, recordCreatedDevice as et, avdPathExists as f, configureNewOwnedAvd as g, bootAndroidEmulator as h, androidDeviceAbi as i, memoizeEmulatorProbe as j, listInstalledSystemImages as k, androidToolCwd as l, avdStorageRoots as m, OWNED_AVD_CONFIG_DEFAULTS as n, androidPoolCandidates as o, avdPoolConfiguration as p, sleepSync as q, androidBuildToolName as r, androidPoolNoCandidatesRefusal as s, DEFAULT_AVD_DEVICE_PROFILE as t, configuredAndroidEmulatorApp as tt, androidToolPath as u, deleteAvd as v, hostSystemImageArch as w, extractEmulatorFailure as x, emulatorDiskSpaceRemedy as y, physicalDeviceModel as z };