stim 1.10.0 → 1.11.0

package/dist/{gc-ChPFZMRC.mjs → gc-COZteyiq.mjs}

@@ -4,18 +4,18 @@ import { N as workspaceStateFile, O as workspaceDir, v as workspaceLastUsed } fr
 import { C as sourceCheckoutOf, b as resolveFullRef, d as hasUncommittedWork, l as hasPopulatedSubmodules, m as listWorktrees, o as dirtyPaths, w as unpushedCommits } from "./worktree-BlizKDpZ.mjs";
 import { a as detectIsExpo, o as findProjectRoot } from "./project-BXZzOABt.mjs";
 import { h as shortUdid, o as formatLongDuration, u as plural } from "./command-output-D5z2_bcF.mjs";
-import { d as removeExpiredLease, h as listBuildLocks } from "./device-lease-CbEaIk7b.mjs";
-import { A as ownedAvdDirectory, C as isStimOwnedAvdName, D as listOrphanedAvdDirectories, K as isStimOwnedSim, T as listAvds } from "./android-787HhP5w.mjs";
-import { h as POOL_SETTING_REMEDY, y as parkedMaxSetting } from "./ownership-DZjdx8Gq.mjs";
-import { l as listAllIosSims } from "./ios-B2Fpqvlb.mjs";
-import { a as parseIdleDuration, o as shutDownIdleDevices, r as idleDeviceLines, t as collectIdleDevices } from "./idle-DpRLp5lj.mjs";
-import { i as canonicalPath, o as listBuildSlots, r as workspaceInUse } from "./in-use-CjUluqIX.mjs";
-import { C as listOwnedSessionsArgs, D as verifyStoppedSession, E as stopSessionArgs, S as isDefinitiveMissingSessionError, T as parseSessionListPage, b as getSessionArgs, d as withRemoteSessionLock, f as withEasProjectLock, h as removeEasSessionClaim, m as readEasSessionLedger, p as easMachineStateRoot, x as inspectSessionForTeardown, y as findOrphanedOwnedSessions, z as resolveEasCliBin } from "./device-remote-Dy1jGj3U.mjs";
-import { A as discoverCaches, C as unverifiedDeviceCommand, D as planCacheEmptying, E as includesWorkspaceOutputs, O as selectCaches, S as findStaleProjectDevices, T as emptyCaches, _ as describeParkedSims, a as collectWorkspaceOutputs, b as findOrphanedDevices, c as listWorkspaceDirs, d as collectDeviceLeases, f as collectParkedAvds, g as deleteProjectDevices, h as deleteParkedSims, i as collectOrphanedWorkspaces, j as sizeCaches, k as trimCaches, l as sizeText, m as deleteParkedAvds, n as WORKSPACE_OUTPUT_DIRS, o as deleteOrphanedWorkspaces, p as collectParkedSims, r as clearWorkspaceOutputs, s as isInsideWorkspaces, t as REBUILD_COST, u as DEVICE_LIST_TIMEOUT_MS, v as describeUnverifiableDevices, w as withAndroidAvdSizes, x as findStaleDeviceRecords, y as deviceSweepIsScoped } from "./workspaces-BTUyFfkv.mjs";
-import { a as reclaimKeys, d as removeWorktreeTarget, m as reclaimProject, n as excludePodChurn, p as describeDereferenced, r as matchWorktreeEntry } from "./worktree-BMS7GeqB.mjs";
-import { statSync } from "node:fs";
+import { d as removeExpiredLease, h as listBuildLocks } from "./device-lease-D83nqeMX.mjs";
+import { D as listAvds, N as ownedAvdDirectory, Y as isStimOwnedSim, k as listOrphanedAvdDirectories, w as isStimOwnedAvdName } from "./android-C4zG2Tuc.mjs";
+import { h as POOL_SETTING_REMEDY, y as parkedMaxSetting } from "./ownership-BiojdtAp.mjs";
+import { l as listAllIosSims } from "./ios-DArbmwer.mjs";
+import { a as parseIdleDuration, o as shutDownIdleDevices, r as idleDeviceLines, t as collectIdleDevices } from "./idle-NETbeNiQ.mjs";
+import { i as canonicalPath, o as listBuildSlots, r as workspaceInUse } from "./in-use-DVhlSoyn.mjs";
+import { C as listOwnedSessionsArgs, D as verifyStoppedSession, E as stopSessionArgs, S as isDefinitiveMissingSessionError, T as parseSessionListPage, b as getSessionArgs, d as withRemoteSessionLock, f as withEasProjectLock, h as removeEasSessionClaim, m as readEasSessionLedger, p as easMachineStateRoot, x as inspectSessionForTeardown, y as findOrphanedOwnedSessions, z as resolveEasCliBin } from "./device-remote-BQZSnnmE.mjs";
+import { A as discoverCaches, C as unverifiedDeviceCommand, D as planCacheEmptying, E as includesWorkspaceOutputs, O as selectCaches, S as findStaleProjectDevices, T as emptyCaches, _ as describeParkedSims, a as collectWorkspaceOutputs, b as findOrphanedDevices, c as listWorkspaceDirs, d as collectDeviceLeases, f as collectParkedAvds, g as deleteProjectDevices, h as deleteParkedSims, i as collectOrphanedWorkspaces, j as sizeCaches, k as trimCaches, l as sizeText, m as deleteParkedAvds, n as WORKSPACE_OUTPUT_DIRS, o as deleteOrphanedWorkspaces, p as collectParkedSims, r as clearWorkspaceOutputs, s as isInsideWorkspaces, t as REBUILD_COST, u as DEVICE_LIST_TIMEOUT_MS, v as describeUnverifiableDevices, w as withAndroidAvdSizes, x as findStaleDeviceRecords, y as deviceSweepIsScoped } from "./workspaces-COD2xCz-.mjs";
+import { a as reclaimKeys, d as removeWorktreeTarget, m as reclaimProject, n as excludePodChurn, p as describeDereferenced, r as matchWorktreeEntry } from "./worktree-KOjMX3zA.mjs";
+import { n as mergeState, t as fetchDefaultBranch } from "./merge-state-DDxS-XIZ.mjs";
 import { InvalidArgumentError } from "commander";
-import { existsSync as existsSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, statSync as statSync$1 } from "fs";
+import { existsSync, readFileSync, readdirSync, statSync } from "fs";
 import { basename, dirname, isAbsolute, join } from "path";
 import chalk from "chalk";
 //#region src/commands/gc/eas-sessions.ts
@@ -37,18 +37,18 @@ function readRecordedRemoteSessionIds(roots) {
 	let safe = true;
 	for (const root of new Set(roots)) {
 		try {
-			if (!statSync$1(root).isDirectory()) throw new Error("path is not a directory");
-			readdirSync$1(root);
+			if (!statSync(root).isDirectory()) throw new Error("path is not a directory");
+			readdirSync(root);
 		} catch (error) {
 			safe = false;
 			notices.push(`${root} is not available as a readable workspace directory: ${describeError(error)}`);
 			continue;
 		}
 		const path = workspaceStateFile(root);
-		if (!existsSync$1(path)) continue;
+		if (!existsSync(path)) continue;
 		let state;
 		try {
-			state = JSON.parse(readFileSync$1(path, "utf-8"));
+			state = JSON.parse(readFileSync(path, "utf-8"));
 		} catch (error) {
 			safe = false;
 			notices.push(`${path} could not be read as valid JSON: ${describeError(error)}`);
@@ -84,8 +84,8 @@ function claimStateAbsence(claim) {
 	const stateDir = dirname(claim.stateFile);
 	let entries;
 	try {
-		if (!statSync$1(stateDir).isDirectory()) throw new Error("path is not a directory");
-		entries = readdirSync$1(stateDir);
+		if (!statSync(stateDir).isDirectory()) throw new Error("path is not a directory");
+		entries = readdirSync(stateDir);
 	} catch (error) {
 		return {
 			absent: false,
@@ -98,7 +98,7 @@ function claimStateAbsence(claim) {
 	};
 	let state;
 	try {
-		state = JSON.parse(readFileSync$1(claim.stateFile, "utf-8"));
+		state = JSON.parse(readFileSync(claim.stateFile, "utf-8"));
 	} catch (error) {
 		return {
 			absent: false,
@@ -215,8 +215,8 @@ function easLockRoots(projectRoot, config) {
 }
 function unavailableLockRootNotice(roots) {
 	for (const root of roots) try {
-		if (!statSync$1(root).isDirectory()) throw new Error("path is not a directory");
-		readdirSync$1(root);
+		if (!statSync(root).isDirectory()) throw new Error("path is not a directory");
+		readdirSync(root);
 	} catch (error) {
 		return `EAS session sweep skipped: ${root} is not available for remote-session lock inspection: ${describeError(error)}`;
 	}
@@ -225,7 +225,7 @@ function unavailableLockRootNotice(roots) {
 function malformedRemoteSessionLockNotice(roots) {
 	for (const root of roots) {
 		const lockPath = join(workspaceDir(root), "remote-session.lock");
-		if (!existsSync$1(lockPath)) continue;
+		if (!existsSync(lockPath)) continue;
 		if ((0, ownership_claim_exports.readClaimSet)(lockPath).unresolved.length === 0) continue;
 		return `EAS session sweep skipped: the remote-session lock at ${lockPath} has a malformed owner record.`;
 	}
@@ -399,233 +399,6 @@ async function deleteEasSessions(easSessionSweep, deps) {
 	return deleteFailures;
 }
 //#endregion
-//#region src/workspace/merge-state.ts
-const FETCH_TIMEOUT_MS = 3e4;
-const FETCH_FRESH_MS = 6e5;
-const GIT_TIMEOUT_MS = 6e4;
-const REMOTE_PREFIX = "refs/remotes/origin/";
-function failure(error) {
-	const { stderr, message } = error;
-	const text = String(stderr ?? "").trim() || String(message ?? error);
-	return text.split("\n")[0] ?? text;
-}
-function fetchedRecently(repo, now) {
-	const path = getExecutor().runFileQuiet("git", [
-		"-C",
-		repo,
-		"rev-parse",
-		"--path-format=absolute",
-		"--git-path",
-		"FETCH_HEAD"
-	])?.trim();
-	try {
-		return Boolean(path) && now - statSync(path).mtimeMs < FETCH_FRESH_MS;
-	} catch {
-		return false;
-	}
-}
-/**
-* Fetches the default branch that `origin/HEAD` names into its remote-tracking ref, bounded by a timeout and never
-* prompting for credentials. It skips the fetch when the checkout fetched anything in the last 10 minutes.
-*/
-function fetchDefaultBranch(repo, now = Date.now()) {
-	const exec = getExecutor();
-	const ref = exec.runFileQuiet("git", [
-		"-C",
-		repo,
-		"symbolic-ref",
-		"--quiet",
-		"refs/remotes/origin/HEAD"
-	])?.trim();
-	if (!ref?.startsWith(REMOTE_PREFIX)) return { error: `origin/HEAD is not set; run \`git -C ${repo} remote set-head origin --auto\`` };
-	const branch = ref.slice(20);
-	if (fetchedRecently(repo, now)) return {
-		ref,
-		name: `origin/${branch}`
-	};
-	try {
-		exec.runFile("git", [
-			"-C",
-			repo,
-			"fetch",
-			"--quiet",
-			"--no-tags",
-			"--no-recurse-submodules",
-			"origin",
-			`+refs/heads/${branch}:${ref}`
-		], {
-			timeoutMs: FETCH_TIMEOUT_MS,
-			env: { GIT_TERMINAL_PROMPT: "0" }
-		});
-	} catch (error) {
-		return { error: `git fetch origin ${branch} failed: ${failure(error)}` };
-	}
-	return {
-		ref,
-		name: `origin/${branch}`
-	};
-}
-function notMerged(detail) {
-	return {
-		merged: false,
-		unknown: false,
-		detail
-	};
-}
-function currentBranch(path) {
-	const ref = getExecutor().runFileQuiet("git", [
-		"-C",
-		path,
-		"symbolic-ref",
-		"--quiet",
-		"HEAD"
-	])?.trim();
-	return ref?.startsWith("refs/heads/") ? ref : null;
-}
-function upstreamGone(path, branch) {
-	if (!branch) return false;
-	const [upstream, state] = (getExecutor().runFileQuiet("git", [
-		"-C",
-		path,
-		"for-each-ref",
-		"--format=%(upstream)%00%(upstream:track)",
-		branch
-	]) ?? "").trim().split("\0");
-	return Boolean(upstream) && state === "[gone]";
-}
-function committedOn(path, branch, head) {
-	if (!branch) return false;
-	const exec = getExecutor();
-	return (exec.runFileQuiet("git", [
-		"-C",
-		path,
-		"reflog",
-		"show",
-		"--format=%H %gs",
-		branch
-	]) ?? "").split("\n").some((entry) => {
-		const [sha = "", ...subject] = entry.split(" ");
-		return /^(commit|cherry-pick|rebase|revert)\b/.test(subject.join(" ")) && exec.runFileQuiet("git", [
-			"-C",
-			path,
-			"merge-base",
-			"--is-ancestor",
-			sha,
-			head
-		]) !== null;
-	});
-}
-/**
-* Whether the worktree's HEAD is merged into `target`. The signals, all local git:
-* - HEAD is an ancestor of the default branch, off its first-parent line, and the branch's reflog shows a commit made
-*   on it that HEAD contains, so a merge commit brought the branch's own work in. A branch with no commit of its own
-*   is not merged.
-* - The branch changes the tree, has no merge commits, and every commit since the merge base has the same
-*   `git patch-id --verbatim` as a commit on the default branch (a rebase merge).
-* - The branch changes the tree and its whole diff since the merge base has the same verbatim patch id as a commit on
-*   the default branch, limited to the files the branch changes (a squash merge).
-* Anything git cannot answer is unknown, never merged. `coversUnpushed` is true for a patch-equivalent HEAD whose
-* upstream branch was deleted: its commits exist only locally, but their change is on the default branch.
-*/
-function mergeState(path, { ref, name }) {
-	const git = (args, input) => getExecutor().runFile("git", [
-		"--literal-pathspecs",
-		"-C",
-		path,
-		...args
-	], {
-		timeoutMs: GIT_TIMEOUT_MS,
-		input
-	});
-	const patch = (args) => getExecutor().runFile("git", [
-		"--literal-pathspecs",
-		"-C",
-		path,
-		...args
-	], {
-		timeoutMs: GIT_TIMEOUT_MS,
-		untrimmed: true
-	});
-	const patchIds = (text) => text ? git(["patch-id", "--verbatim"], text).split("\n").flatMap((line) => line.split(" ")[0] || []) : [];
-	const diffOptions = ["--no-color", "--no-ext-diff"];
-	const noOwnCommits = notMerged(`no commits of its own beyond ${name}`);
-	try {
-		const head = git([
-			"rev-parse",
-			"--verify",
-			"HEAD^{commit}"
-		]);
-		const base = git([
-			"merge-base",
-			head,
-			ref
-		]);
-		const branch = currentBranch(path);
-		if (base === head) {
-			if (git(["rev-parse", ref]) === head || git([
-				"rev-list",
-				"--first-parent",
-				"--parents",
-				`${head}..${ref}`
-			]).split("\n").some((line) => line.split(" ")[1] === head) || !committedOn(path, branch, head)) return noOwnCommits;
-			return {
-				merged: true,
-				into: name,
-				head,
-				coversUnpushed: false
-			};
-		}
-		const files = git([
-			"diff",
-			"--name-only",
-			"--no-renames",
-			"-z",
-			base,
-			head
-		]).split("\0").filter(Boolean);
-		if (!files.length) return notMerged(`no net change beyond ${name}`);
-		const log = (range, pathspec = []) => patch([
-			"log",
-			"-p",
-			"--no-merges",
-			...diffOptions,
-			"--format=commit %H",
-			range,
-			"--",
-			...pathspec
-		]);
-		const upstream = new Set(patchIds(log(`${base}..${ref}`, files)));
-		const patchEquivalent = () => ({
-			merged: true,
-			into: name,
-			head,
-			coversUnpushed: upstreamGone(path, branch)
-		});
-		const squash = patchIds(patch([
-			"diff",
-			...diffOptions,
-			base,
-			head
-		]));
-		if (squash.length === 1 && upstream.has(squash[0])) return patchEquivalent();
-		if (!git([
-			"rev-list",
-			"--merges",
-			`${base}..${head}`
-		])) {
-			const own = patchIds(log(`${base}..${head}`));
-			if (own.length && own.every((id) => upstream.has(id))) return patchEquivalent();
-		}
-		return notMerged(`not merged into ${name}`);
-	} catch (error) {
-		return {
-			merged: false,
-			unknown: true,
-			detail: `merge state unknown: ${failure(error)}`
-		};
-	}
-}
-//#endregion
 //#region src/commands/gc/worktrees.ts
 const DEFAULT_WORKTREE_IDLE_DAYS = 7;
 const DAY_MS = 864e5;
@@ -685,7 +458,7 @@ function porcelainOf(path, gitAnswered) {
 function candidateRoots() {
 	const registered = Object.keys(loadConfig()?.projects ?? {}).filter(isAbsolute);
 	const recorded = listWorkspaceDirs().flatMap((entry) => entry.projectRoot ? [entry.projectRoot] : []);
-	return [.../* @__PURE__ */ new Set([...registered, ...recorded])].filter((root) => existsSync$1(root)).toSorted();
+	return [.../* @__PURE__ */ new Set([...registered, ...recorded])].filter((root) => existsSync(root)).toSorted();
 }
 function checkMergeStates(pending, idle, now) {
 	const repos = /* @__PURE__ */ new Map();
@@ -851,7 +624,7 @@ function formatParkedAvdReport(parkedAvds, now) {
 	lines.push(`Parked emulators (${parkedAvds.length}):`);
 	for (const avd of parkedAvds) {
 		const listed = avd.listed === false ? " - not on this machine" : avd.listed === null ? " - listing unavailable; kept" : "";
-		lines.push(`  android ${avd.name} ${avd.systemImage} ${parkedAge(avd.parkedAt, now)}${avd.bytes === null ? "" : ` ${formatBytes(avd.bytes)}`}${listed}`);
+		lines.push(`  android ${avd.name} ${avd.systemImage}${avd.deviceProfile ? ` ${avd.deviceProfile}` : ""} ${parkedAge(avd.parkedAt, now)}${avd.bytes === null ? "" : ` ${formatBytes(avd.bytes)}`}${listed}`);
 	}
 	lines.push("              --delete attempts verified deletions and keeps failures.");
 	return lines;
@@ -1147,9 +920,10 @@ function gcReportSections({ skipped = [], deadProjects = [], orphanedPorts = [],
 			bytes,
 			listed
 		})),
-		parkedEmulators: parkedAvds.map(({ name, systemImage, parkedAt, bytes, listed }) => ({
+		parkedEmulators: parkedAvds.map(({ name, systemImage, deviceProfile, parkedAt, bytes, listed }) => ({
 			name,
 			systemImage,
+			deviceProfile,
 			parkedAt,
 			bytes,
 			listed
@@ -1344,7 +1118,7 @@ async function collectGcReport({ olderThan = null, cache = null, worktrees = fal
 			else invalidProjects.push(path);
 			continue;
 		}
-		if (existsSync$1(path)) continue;
+		if (existsSync(path)) continue;
 		if (!isOnMountedVolume(path, mountedVolumes)) {
 			const volume = volumeRootFor(path);
 			skipped.push({
@@ -1634,7 +1408,7 @@ async function runGcCore(opts, deps) {
 	deleteFailures += deleteParkedSims(report.parkedSims, deps) + deleteParkedAvds(report.parkedAvds);
 	removeInvalidProjectEntries(invalidProjects);
 	for (const path of deadProjects) {
-		if (existsSync$1(path) || !isOnMountedVolume(path)) {
+		if (existsSync(path) || !isOnMountedVolume(path)) {
 			console.log(chalk.yellow(`Kept ${path}: its absence can no longer be confirmed.`));
 			continue;
 		}