stim 1.36.0 → 1.38.0

package/dist/{eas-build-Xf5Jd6LR.mjs → eas-build-4rg9WpEg.mjs}

@@ -1,7 +1,7 @@
-import { D as ownership_claim_exports, d as throwIfCancelled, t as getExecutor } from "./exec-CGuDzt40.mjs";
-import { a as killOnAbort, r as childEnvironment } from "./operation-exec-DKlBcKAL.mjs";
-import { ar as remoteCliInvocation, lr as easCliSupport, tr as resolveEasCliBin, ur as easCliUpgradeRemedy } from "./device-capacity-CpAVcKgq.mjs";
-import { M as acquireBuildLock, P as releaseBuildLock } from "./activity-BpdDvA8Q.mjs";
+import { D as ownership_claim_exports, d as throwIfCancelled, t as getExecutor } from "./exec-L37dbiIb.mjs";
+import { a as killOnAbort, r as childEnvironment } from "./operation-exec-DNynwpqO.mjs";
+import { cr as remoteCliInvocation, fr as easCliSupport, ir as resolveEasCliBin, pr as easCliUpgradeRemedy } from "./device-capacity-D_IlxZRL.mjs";
+import { M as acquireBuildLock, P as releaseBuildLock } from "./activity-CANftndU.mjs";
 import { createHash } from "node:crypto";
 import { existsSync, realpathSync, statSync } from "node:fs";
 //#region src/engine/eas-build.ts

package/dist/{eas-fallback-DNYPNinw.mjs → eas-fallback-UGo0SG7T.mjs}

@@ -1,9 +1,9 @@
-import { d as throwIfCancelled, t as getExecutor } from "./exec-CGuDzt40.mjs";
-import { m as getProject } from "./config-BA3TgoIP.mjs";
-import { r as childEnvironment } from "./operation-exec-DKlBcKAL.mjs";
-import { dt as detectProviders, ft as planMetroReach } from "./settings-Bap-qjnp.mjs";
-import { M as readMetroTunnel, P as readRemoteSession } from "./project-Clk1JAWL.mjs";
-import { Qt as readInstalledEasCliVersionAsync, Xn as isEasAuthFailureText, cr as MIN_EAS_CLI_SIMULATOR_VERSION, lr as easCliSupport, or as remoteCommand, sr as MIN_EAS_CLI_DEVICE_VERSION, tr as resolveEasCliBin } from "./device-capacity-CpAVcKgq.mjs";
+import { d as throwIfCancelled, t as getExecutor } from "./exec-L37dbiIb.mjs";
+import { m as getProject } from "./config-CNmN-ndb.mjs";
+import { r as childEnvironment } from "./operation-exec-DNynwpqO.mjs";
+import { dt as detectProviders, ft as planMetroReach } from "./settings-Cz8kQJzr.mjs";
+import { M as readMetroTunnel, P as readRemoteSession } from "./project-DIo71tGq.mjs";
+import { $n as isEasAuthFailureText, dr as MIN_EAS_CLI_SIMULATOR_VERSION, fr as easCliSupport, ir as resolveEasCliBin, lr as remoteCommand, tn as readInstalledEasCliVersionAsync, ur as MIN_EAS_CLI_DEVICE_VERSION } from "./device-capacity-D_IlxZRL.mjs";
 //#region src/engine/eas-fallback.ts
 const AVAILABILITY_TIMEOUT_MS = 3e4;
 function unusable(code, reason) {

package/dist/{eas-session-ledger-CXZ4aix0.mjs → eas-session-ledger-BDpSdFDM.mjs}

@@ -1,9 +1,9 @@
-import { r as reportSignal, t as getExecutor } from "./exec-CGuDzt40.mjs";
-import { M as withDirLock$1, N as withDirLockAsync$1, w as workspaceAgentDeviceDir } from "./workspace-state-BhwAJBgA.mjs";
-import { a as formatElapsed, o as formatLongDuration, r as clockTime, u as plural } from "./command-output-T3cDctRE.mjs";
-import { ft as deviceSlotKey, gt as projectDeviceSlots } from "./config-BA3TgoIP.mjs";
-import { n as isInsideProject } from "./metro-DM3yJL1M.mjs";
-import { r as cdpEndpoint } from "./state-B9VFI6r0.mjs";
+import { r as reportSignal, t as getExecutor } from "./exec-L37dbiIb.mjs";
+import { M as withDirLock$1, N as withDirLockAsync$1, w as workspaceAgentDeviceDir } from "./workspace-state-CHEN_xzy.mjs";
+import { a as formatElapsed, o as formatLongDuration, r as clockTime, u as plural } from "./command-output-DsjhOzJ3.mjs";
+import { ft as deviceSlotKey, gt as projectDeviceSlots } from "./config-CNmN-ndb.mjs";
+import { n as isInsideProject } from "./metro-Cj6W4qOO.mjs";
+import { r as cdpEndpoint } from "./state-C2vELPyr.mjs";
 import { accessSync, constants, existsSync, mkdirSync, realpathSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { delimiter, dirname, join, resolve } from "node:path";
 import { workspaceId } from "@stim-cli/core";

package/dist/{error-diagnostics-CvB5bpPU.mjs → error-diagnostics-CW9xl6ot.mjs}

@@ -1,13 +1,13 @@
-import { t as getExecutor } from "./exec-CGuDzt40.mjs";
-import { r as readWorkspaceState$1 } from "./workspace-state-BhwAJBgA.mjs";
-import { v as launchErrorPreview } from "./command-output-T3cDctRE.mjs";
-import { ft as deviceSlotKey, m as getProject, pt as deviceSlotPlatforms } from "./config-BA3TgoIP.mjs";
-import { I as readWorkspaceLaunches } from "./project-Clk1JAWL.mjs";
-import { o as androidHome, u as androidToolCwd } from "./android-SJx1V3R3.mjs";
-import { d as resolveProjectMetro } from "./metro-DM3yJL1M.mjs";
-import { i as parseLogcatLine, n as androidLogGroups, r as isAndroidCrashText } from "./android-5wkcMFDG.mjs";
-import { S as parseLease, v as deviceLeasePath, y as fileLeaseIo } from "./activity-BpdDvA8Q.mjs";
-import { r as deviceConsoleLevel } from "./ios-device-DLdEDWJj.mjs";
+import { t as getExecutor } from "./exec-L37dbiIb.mjs";
+import { r as readWorkspaceState$1 } from "./workspace-state-CHEN_xzy.mjs";
+import { v as launchErrorPreview } from "./command-output-DsjhOzJ3.mjs";
+import { ft as deviceSlotKey, m as getProject, pt as deviceSlotPlatforms } from "./config-CNmN-ndb.mjs";
+import { I as readWorkspaceLaunches } from "./project-DIo71tGq.mjs";
+import { o as androidHome, u as androidToolCwd } from "./android-27_JgJ1T.mjs";
+import { d as resolveProjectMetro } from "./metro-Cj6W4qOO.mjs";
+import { i as parseLogcatLine, n as androidLogGroups, r as isAndroidCrashText } from "./android-DGLG_VQ3.mjs";
+import { S as parseLease, v as deviceLeasePath, y as fileLeaseIo } from "./activity-CANftndU.mjs";
+import { r as deviceConsoleLevel } from "./ios-device-ygijU78G.mjs";
 import { createHash, randomUUID } from "node:crypto";
 import { existsSync, readFileSync, renameSync } from "node:fs";
 import { homedir } from "node:os";

package/dist/{exec-CGuDzt40.mjs → exec-L37dbiIb.mjs}

@@ -4,7 +4,7 @@ import { existsSync, rmSync } from "node:fs";
 import { availableParallelism, loadavg, tmpdir } from "node:os";
 import { join } from "node:path";
 import { ambientContext, ambientEnv } from "@stim-cli/core";
-import { createDebugLog, redactArgv, redactCommandLine, runId, trace } from "@stim-cli/core/state";
+import { createDebugLog, redactArgv, redactCommandLine, runId, tailscaleEnv, trace } from "@stim-cli/core/state";
 import { basename as basename$1, delimiter as delimiter$1, join as join$1, resolve as resolve$1 } from "path";
 import { execSync } from "child_process";
 import spawn from "cross-spawn";
@@ -597,6 +597,9 @@ function redactError(error, values) {
 	}
 	return error;
 }
+function tailscaleEnvironment(file, env) {
+	return basename$1(file).toLowerCase() === "tailscale" ? tailscaleEnv(env ?? ambientEnv()) : env;
+}
 const defaultExecutor = {
 	reportSignal: () => reportSignal(ambientContext()),
 	run(cmd, { timeoutMs, killSignal, cwd, env }) {
@@ -649,6 +652,7 @@ const defaultExecutor = {
 			for (const key of omitEnv ?? []) delete childEnv[key];
 			opts.env = childEnv;
 		}
+		opts.env = tailscaleEnvironment(file, opts.env);
 		refuseUnsafeBatchArguments(file, args, opts.env, opts.cwd);
 		const result = spawn.sync(file, args, opts);
 		if (result.error) throw redactError(nameTimeout(Object.assign(result.error, result), [file, ...args].join(" "), timeoutMs), redact);
@@ -685,6 +689,7 @@ const defaultExecutor = {
 				for (const key of omitEnv ?? []) delete childEnv[key];
 				opts.env = childEnv;
 			}
+			opts.env = tailscaleEnvironment(file, opts.env);
 			refuseUnsafeBatchArguments(file, args, opts.env, opts.cwd);
 			const claims = declareFor ? [...operationState(declareFor).declaring] : [];
 			let clearDeclaration;
@@ -853,6 +858,7 @@ const defaultExecutor = {
 			cwd: opts.cwd ?? context.cwd,
 			env: opts.env ?? context.env
 		} : opts;
+		childOpts.env = tailscaleEnvironment(cmd, childOpts.env);
 		if (report && process.platform !== "win32") childOpts.detached = true;
 		refuseUnsafeBatchArguments(cmd, args, childOpts.env ?? ambientEnv(), childOpts.cwd);
 		const claims = report ? [...operationState(context).declaring] : [];

package/dist/{gc-DiUhrVFo.mjs → gc-3DHVCn-k.mjs}

@@ -1,24 +1,24 @@
-import { D as ownership_claim_exports, T as process_identity_exports, _ as declareSpawnsOn, d as throwIfCancelled, f as WorkspaceProcessCleanupError, t as getExecutor, w as withDrainingCancellation, x as stopDeclaringSpawnsOn } from "./exec-CGuDzt40.mjs";
-import { E as workspaceDir, u as workspaceLastUsed } from "./workspace-state-BhwAJBgA.mjs";
-import { d as quotedPath$1, h as shortUdid, o as formatLongDuration, u as plural } from "./command-output-T3cDctRE.mjs";
-import { A as withConfigLockAsync$1, C as removeProject, N as acquireAvdClaim, at as isAbsentPath, ct as measuredDirectorySizeAsync, d as getConfigDir, gt as projectDeviceSlots, it as formatBytes, ot as isOnMountedVolume, rt as directorySizeAsync, st as listMountedVolumes, v as loadConfig$1 } from "./config-BA3TgoIP.mjs";
-import { t as runOperationFile } from "./operation-exec-DKlBcKAL.mjs";
-import { $t as TRASH_MANIFEST, Ft as matchWorktreeEntry, Wt as resolveSourceCheckoutAsync, Zt as TRASH_CLAIMS, en as deleteTrashEntry, jt as listWorktreesAsync } from "./settings-Bap-qjnp.mjs";
-import { i as findProjectRoot$1, v as detectIsExpo } from "./project-Clk1JAWL.mjs";
-import { B as listOrphanedAvdDirectories, Et as readCreatedDevices$1, R as listAvdsAsync, Tt as forgetCreatedDeviceAsync, U as ownedAvdDirectory, bt as parkedMaxSetting, h as avdNameAbsent, mt as POOL_SETTING_REMEDY } from "./android-SJx1V3R3.mjs";
-import { Ar as sizeCaches, At as deleteParkedAvds, Bt as unverifiedDeviceCommand, Cr as scopedMemoryReport, Dt as collectDeviceLeases, Et as DEVICE_LIST_TIMEOUT_MS, Ft as deviceSweepIsScoped, Gt as withRemoteSessionGcLocks, Ht as collectEasSessionSweep, It as eraseParkedDevices, Lt as findOrphanedDevices, Mt as deleteProjectDevices, Or as discoverCaches, Ot as collectParkedAvds, Pt as describeUnverifiableDevices, Rt as findStaleDeviceRecords, Sr as reclaimMemory, St as includesGradleVersions, Tr as phase, Tt as collectInventory, Ut as deleteEasSessions, Vt as withAndroidAvdSizes, Wn as runProcessOperation, Wt as describeError, _r as memoryCacheKind, _t as collectGradleVersions, br as memorySweepIsScoped, bt as gradleVersionLines, ct as includesParkedDevices, dt as isWorkspacesScope, fr as parseArchiveSelector, ft as planCacheEmptying, gt as trimCaches, hr as collectMemoryReport, ht as selectsBeyondCaches, it as openGcLog, jt as deleteParkedSims, kt as collectParkedSims, lt as includesRecordings, mt as selectCaches, nn as withEasProjectLock, nt as gcOptionsOf, ot as emptyCaches, pt as previewScopedEmptying, st as includesArchives, ut as includesWorkspaceOutputs, vr as memoryLines, wt as getMachineCacheReport, xr as memoryWorkPending, xt as gradleVersionsPending, yr as memoryScope, yt as deleteGradleVersions, zt as findStaleProjectDevices } from "./device-capacity-CpAVcKgq.mjs";
-import { n as easMachineStateRoot$1, o as removeEasSessionClaimAsync, r as readEasSessionLedger$1 } from "./eas-session-ledger-CXZ4aix0.mjs";
-import { At as mapLimited, Dt as createGcResults, Et as GC_OUTPUT, I as idleDeviceLines, M as collectIdleDevices, Mt as sizeConcurrency, N as collectIdleDevicesAsync, R as parseIdleDuration, a as collectOrphanedWorkspaces, b as workspaceInUseAsync, c as isInsideWorkspaces, f as rootPresence, g as ARTIFACT_DIRS, i as clearWorkspaceOutputs, jt as readConcurrency, kt as eachLimited, n as REBUILD_COST, o as collectWorkspaceOutputs, p as sizeText, r as WORKSPACE_OUTPUT_DIRS, s as deleteOrphanedWorkspaces, t as LIGHTEN_AFTER_MS, u as listWorkspaceDirs, v as withIdleWorkspace, wt as listBuildSlots, z as shutDownIdleDevices } from "./workspaces-Dh5N70qW.mjs";
-import { t as canonicalPath } from "./paths-BsJMoPP2.mjs";
-import { N as listBuildLocks, k as removeExpiredLease } from "./activity-BpdDvA8Q.mjs";
-import { d as listAllIosSims, f as listAllIosSimsAsync } from "./ios-BhfpRfNf.mjs";
+import { D as ownership_claim_exports, T as process_identity_exports, _ as declareSpawnsOn, d as throwIfCancelled, f as WorkspaceProcessCleanupError, t as getExecutor, w as withDrainingCancellation, x as stopDeclaringSpawnsOn } from "./exec-L37dbiIb.mjs";
+import { E as workspaceDir, u as workspaceLastUsed } from "./workspace-state-CHEN_xzy.mjs";
+import { d as quotedPath$1, h as shortUdid, o as formatLongDuration, u as plural } from "./command-output-DsjhOzJ3.mjs";
+import { A as withConfigLockAsync$1, C as removeProject, N as acquireAvdClaim, at as isAbsentPath, ct as measuredDirectorySizeAsync, d as getConfigDir, gt as projectDeviceSlots, it as formatBytes, ot as isOnMountedVolume, rt as directorySizeAsync, st as listMountedVolumes, v as loadConfig$1 } from "./config-CNmN-ndb.mjs";
+import { t as runOperationFile } from "./operation-exec-DNynwpqO.mjs";
+import { $t as TRASH_MANIFEST, Ft as matchWorktreeEntry, Wt as resolveSourceCheckoutAsync, Zt as TRASH_CLAIMS, en as deleteTrashEntry, jt as listWorktreesAsync } from "./settings-Cz8kQJzr.mjs";
+import { i as findProjectRoot$1, v as detectIsExpo } from "./project-DIo71tGq.mjs";
+import { B as listOrphanedAvdDirectories, Et as readCreatedDevices$1, R as listAvdsAsync, Tt as forgetCreatedDeviceAsync, U as ownedAvdDirectory, bt as parkedMaxSetting, h as avdNameAbsent, mt as POOL_SETTING_REMEDY } from "./android-27_JgJ1T.mjs";
+import { At as collectParkedSims, Bt as findOrphanedDevices, Cr as memorySweepIsScoped, Ct as includesGradleVersions, Dt as DEVICE_LIST_TIMEOUT_MS, Er as scopedMemoryReport, Et as collectInventory, Gt as collectEasSessionSweep, Ht as findStaleProjectDevices, It as describeUnverifiableDevices, Jt as withRemoteSessionGcLocks, Kt as deleteEasSessions, Lt as deviceSweepIsScoped, Mt as deleteParkedSims, Nr as sizeCaches, Nt as deleteProjectDevices, Or as phase, Ot as collectDeviceLeases, Pt as describeDeadProjectDevices, Rt as eraseParkedDevices, Sr as memoryScope, St as gradleVersionsPending, Tr as reclaimMemory, Tt as getMachineCacheReport, Ut as unverifiedDeviceCommand, Vt as findStaleDeviceRecords, Wt as withAndroidAvdSizes, _t as trimCaches, an as withEasProjectLock, br as memoryCacheKind, bt as deleteGradleVersions, ct as includesParkedDevices, dt as isWorkspacesScope, ft as markOverCapCompilationCache, gt as selectsBeyondCaches, hr as parseArchiveSelector, ht as selectCaches, it as openGcLog, jr as discoverCaches, jt as deleteParkedAvds, kt as collectParkedAvds, lt as includesRecordings, mt as previewScopedEmptying, nt as gcOptionsOf, ot as emptyCaches, pt as planCacheEmptying, qn as runProcessOperation, qt as describeError, st as includesArchives, ut as includesWorkspaceOutputs, vr as collectMemoryReport, vt as collectGradleVersions, wr as memoryWorkPending, xr as memoryLines, xt as gradleVersionLines, zt as findDeadProjectOwnedDevices } from "./device-capacity-D_IlxZRL.mjs";
+import { n as easMachineStateRoot$1, o as removeEasSessionClaimAsync, r as readEasSessionLedger$1 } from "./eas-session-ledger-BDpSdFDM.mjs";
+import { At as eachLimited, B as shutDownIdleDevices, Dt as GC_OUTPUT, L as idleDeviceLines, Mt as readConcurrency, N as collectIdleDevices, Nt as sizeConcurrency, Ot as createGcResults, P as collectIdleDevicesAsync, S as pruneEmptyProcessLockDirs, Tt as listBuildSlots, a as collectOrphanedWorkspaces, b as workspaceInUseAsync, c as isInsideWorkspaces, f as rootPresence, g as ARTIFACT_DIRS, i as clearWorkspaceOutputs, jt as mapLimited, n as REBUILD_COST, o as collectWorkspaceOutputs, p as sizeText, r as WORKSPACE_OUTPUT_DIRS, s as deleteOrphanedWorkspaces, t as LIGHTEN_AFTER_MS, u as listWorkspaceDirs, v as withIdleWorkspace, z as parseIdleDuration } from "./workspaces-BgAYIccE.mjs";
 import { t as resolveMaintenanceSettings } from "./settings-D9LtQaUw.mjs";
-import { r as readCollectors } from "./ownership-C3y8wLSl.mjs";
-import { A as deleteSelectedArchives, O as classifyProjectEntries, j as sweepArchiveStaging, k as reclaimProject } from "./worktree-Yw3EW77B.mjs";
-import { p as writeCacheFile } from "./warm-progress-DwsGBpph.mjs";
-import { a as restoreProblem, o as workspaceKeys } from "./lightened-B6TnpHMX.mjs";
-import { C as candidateRootsAsync, D as worktreeRemovalReason, E as worktreePullRequestNote, S as maintenancePinned, T as removeWorktrees, _ as finishedWorkspaces, a as previewMaintenance, b as cachedDeviceActivity, c as deleteTempLeftovers, d as appRoots, f as artifactWorktrees, g as stopIdleWorkspace, h as planIdleStop, l as tempLeftoverLines, m as collectArtifactsAsync, o as triggeringRoot, p as clearArtifact, s as collectTempLeftovers, t as deleteIdleWorkspaceDevices, u as tempLeftoverSection, w as collectWorktreeSweep, x as cachedDeviceActivityAsync, y as ownedDeviceUsage } from "./act-CvN9xyV6.mjs";
-import { i as getSwiftpmCacheUsage, n as swiftpmCacheLines, r as getAgentDeviceUsage, t as agentDeviceLines } from "./agent-device-usage-output-pbhaW7_k.mjs";
+import { t as canonicalPath } from "./paths-BsJMoPP2.mjs";
+import { N as listBuildLocks, k as removeExpiredLease } from "./activity-CANftndU.mjs";
+import { d as listAllIosSims, f as listAllIosSimsAsync } from "./ios-DQEzde6f.mjs";
+import { r as readCollectors } from "./ownership-BLgOimfp.mjs";
+import { A as deleteSelectedArchives, O as classifyProjectEntries, j as sweepArchiveStaging, k as reclaimProject } from "./worktree-kGPE9Pcw.mjs";
+import { p as writeCacheFile } from "./warm-progress-D3a0KviW.mjs";
+import { a as restoreProblem, o as workspaceKeys } from "./lightened-KHWHmzGs.mjs";
+import { C as candidateRootsAsync, D as worktreeRemovalReason, E as worktreePullRequestNote, S as maintenancePinned, T as removeWorktrees, _ as finishedWorkspaces, a as previewMaintenance, b as cachedDeviceActivity, c as deleteTempLeftovers, d as appRoots, f as artifactWorktrees, g as stopIdleWorkspace, h as planIdleStop, l as tempLeftoverLines, m as collectArtifactsAsync, o as triggeringRoot, p as clearArtifact, s as collectTempLeftovers, t as deleteIdleWorkspaceDevices, u as tempLeftoverSection, w as collectWorktreeSweep, x as cachedDeviceActivityAsync, y as ownedDeviceUsage } from "./act-Bh3t-NuH.mjs";
+import { i as getSwiftpmCacheUsage, n as swiftpmCacheLines, r as getAgentDeviceUsage, t as agentDeviceLines } from "./agent-device-usage-output-CuROXefb.mjs";
 import { claimRemoveCommand, isClaimRefusal, isClaimUnavailable, readClaimSet, releaseClaim, tryAcquireClaim } from "@stim-cli/core/ownership-claim";
 import { existsSync, lstatSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
@@ -121,10 +121,6 @@ function archiveWorkPending(selection, otherWork) {
 //#endregion
 //#region src/commands/gc/eas-ledger.ts
 const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-/**
-* An entry is dropped only when its id cannot be an EAS session id and its workspace root is provably gone:
-* absolute, missing, and on a mounted volume, the same proof gc uses for dead project entries.
-*/
 function isStaleEasLedgerEntry(claim, mountedVolumes, exists = existsSync) {
 	if (UUID.test(claim.sessionId)) return false;
 	const root = claim.workspaceRoot;
@@ -238,7 +234,11 @@ function machineCacheLines(report, now = Date.now()) {
 }
 //#endregion
 //#region src/commands/gc/status-caches.ts
-const KINDS = ["disk-usage", "pull-request"];
+const KINDS = [
+	"disk-usage",
+	"pull-request",
+	"git-merge"
+];
 const KEPT_REASON = {
 	unreadable: "the file records no readable path of its own",
 	unknown: "Stim cannot tell whether the folder it measures still exists",
@@ -1000,7 +1000,7 @@ function orphanedWorkspaceLines(orphaned) {
 	const lines = [`Orphaned workspace directories (${orphaned.length}):`];
 	for (const entry of orphaned) {
 		lines.push(`  ${entry.dir}${entry.bytes === void 0 ? "" : ` - ${sizeText(entry.bytes)}`}`);
-		lines.push(`              recorded project root ${entry.projectRoot} is gone and no registry entry names it`);
+		lines.push(entry.projectRoot === null ? "              it is empty and has no workspace.json" : `              ${entry.residue ? "the project root its logs name" : "recorded project root"} ${entry.projectRoot} is gone and no registry entry names it`);
 	}
 	lines.push("              --delete re-checks each directory, then removes it whole.");
 	return lines;
@@ -2296,7 +2296,7 @@ async function collectGcReport({ olderThan = null, cache = null, worktrees = fal
 	const selected = selectCaches(discoverCaches(env, operation?.cwd), scope).filter((c) => !withWorkspaces || !isInsideWorkspaces(c.dir));
 	if (selected.length) phase("caches", `measuring ${plural(selected.length, "shared cache")}`, operation);
 	const sized = await sizeCaches(selected, operation);
-	const caches = scope === null ? previewScopedEmptying(sized, env) : planCacheEmptying(sized, all, env);
+	const caches = scope === null ? markOverCapCompilationCache(previewScopedEmptying(sized, env), env) : planCacheEmptying(sized, all, env);
 	if (scope) return {
 		archives: includesArchives(scope) ? await collectArchives(scope, olderThan, now, operation?.signal) : void 0,
 		skipped: [],
@@ -2446,14 +2446,14 @@ async function collectGcReport({ olderThan = null, cache = null, worktrees = fal
 	const unsweepableReason = cfg === null ? "no Stim config found" : deviceSweepIsScoped(env) ? "STIM_HOME scopes this config, but simulators and AVDs are machine-global" : null;
 	phase("devices", "listing simulators and emulators", operation);
 	if (unsweepableReason) {
-		let simNames = [];
+		let allSims = [];
 		let avdNames = [];
 		try {
-			simNames = (await listAllIosSimsAsync({
+			allSims = await listAllIosSimsAsync({
 				timeoutMs: DEVICE_LIST_TIMEOUT_MS,
 				operation,
 				signal: operation?.signal
-			})).map((s) => s.name);
+			});
 		} catch (error) {
 			if (error instanceof WorkspaceProcessCleanupError) throw error;
 			operation?.signal.throwIfAborted();
@@ -2468,7 +2468,14 @@ async function collectGcReport({ olderThan = null, cache = null, worktrees = fal
 			if (error instanceof WorkspaceProcessCleanupError) throw error;
 			operation?.signal.throwIfAborted();
 		}
-		deviceSweepNotices.push(...describeUnverifiableDevices(simNames, avdNames, { reason: unsweepableReason }));
+		const deadOwned = cfg === null ? [] : findDeadProjectOwnedDevices({
+			config: cfg,
+			deadProjects,
+			sims: allSims,
+			avds: avdNames
+		});
+		const deadOwnedIds = new Set(deadOwned.map((device) => device.id));
+		deviceSweepNotices.push(...describeDeadProjectDevices(deadOwned), ...describeUnverifiableDevices(allSims.filter((sim) => !deadOwnedIds.has(sim.udid)).map((sim) => sim.name), avdNames.filter((name) => !deadOwnedIds.has(name)), { reason: unsweepableReason }));
 	} else {
 		let sims = [];
 		let simsChecked = true;
@@ -2891,6 +2898,7 @@ async function pruneDeadProjects(deadProjects, output, operation) {
 		}
 		const result = await reclaimProject(path, {
 			archive: { removedBy: "gc" },
+			deleteOwnedDevices: deviceSweepIsScoped(operation?.env ?? process.env),
 			stopRequester: { by: "stim gc --delete" },
 			operation
 		}).catch((error) => {
@@ -2921,7 +2929,10 @@ async function pruneDeadProjects(deadProjects, output, operation) {
 		if (result.killedPid) output.log(chalk.dim(`  killed orphaned Metro pid ${result.killedPid}`));
 		if (result.stoppedSession) output.log(chalk.dim(`  stopped remote session ${result.stoppedSession}`));
 		if (result.stoppedTunnel) output.log(chalk.dim(`  stopped ${result.stoppedTunnel} tunnel`));
-		for (const name of result.deletedDevices) output.record("device", "done", name);
+		for (const name of result.deletedDevices) {
+			output.log(chalk.dim(`  deleted owned device ${name}`));
+			output.record("device", "done", name);
+		}
 		for (const s of result.skippedDevices) {
 			output.log(chalk.yellow(`  ${s.name}: ${s.reason}`));
 			output.record("device", result.failedDevices.includes(s) ? "failed" : "kept", s.name, {
@@ -2965,7 +2976,7 @@ async function reclaimParkedDevices(report, deps, output) {
 }
 function reportActionable(report) {
 	const { deadProjects, invalidProjects, orphanedDevices, staleDevices, staleDeviceRecords, buildLocks, buildSlots, deviceLeases, easSessionSweep, caches, olderThan, all, cacheScope: cache } = report;
-	return archiveWorkPending(report.archives, deadProjects.length + invalidProjects.length > 0 || report.orphanedWorkspaces.length > 0 || Boolean(report.workspaceOutputs?.workspaces.some((entry) => entry.willClear)) || Boolean(report.worktreeDependencies?.candidates.length) || report.workspaceLogs.some((entry) => entry.willTrim) || report.recordings.some((entry) => entry.willDelete && !entry.withWorkspace) || Boolean(report.tempLeftovers?.entries.some((entry) => entry.willDelete)) || Boolean(report.trash?.entries.some((entry) => entry.willDelete)) || Boolean(report.worktreeSweep?.worktrees.some((entry) => !entry.skipped)) || report.parkedSims.length > 0 || report.parkedAvds.length + report.parkedHostedDevices.filter((device) => device.listed !== false).length > 0 || orphanedDevices.length > 0 || staleDevices.length + report.finishedDevices.length > 0 || staleDeviceRecords.length > 0 || report.staleLedgerEntries.length + report.staleEasLedgerEntries.length > 0 || report.staleStatusCaches.length > 0 || buildLocks.stale.length > 0 || buildSlots.stale.length > 0 || deviceLeases.expired.length > 0 || easSessionSweep.orphaned.length > 0 || (olderThan !== null || all) && caches.length > 0 || scopedWorkPending(cache, report));
+	return archiveWorkPending(report.archives, deadProjects.length + invalidProjects.length > 0 || report.orphanedWorkspaces.length > 0 || Boolean(report.workspaceOutputs?.workspaces.some((entry) => entry.willClear)) || Boolean(report.worktreeDependencies?.candidates.length) || report.workspaceLogs.some((entry) => entry.willTrim) || report.recordings.some((entry) => entry.willDelete && !entry.withWorkspace) || Boolean(report.tempLeftovers?.entries.some((entry) => entry.willDelete)) || Boolean(report.trash?.entries.some((entry) => entry.willDelete)) || Boolean(report.worktreeSweep?.worktrees.some((entry) => !entry.skipped)) || report.parkedSims.length > 0 || report.parkedAvds.length + report.parkedHostedDevices.filter((device) => device.listed !== false).length > 0 || orphanedDevices.length > 0 || staleDevices.length + report.finishedDevices.length > 0 || staleDeviceRecords.length > 0 || report.staleLedgerEntries.length + report.staleEasLedgerEntries.length > 0 || report.staleStatusCaches.length > 0 || buildLocks.stale.length > 0 || buildSlots.stale.length > 0 || deviceLeases.expired.length > 0 || easSessionSweep.orphaned.length > 0 || (olderThan !== null || all) && caches.length > 0 || caches.some((entry) => entry.willEmpty) || scopedWorkPending(cache, report));
 }
 async function runGcCore(opts, deps, execution, reportOnly = false) {
 	const { output, takeResults } = execution;
@@ -3117,6 +3128,10 @@ async function runGcCore(opts, deps, execution, reportOnly = false) {
 		output.record("buildLock", "done", `${lock.platform} build lock`, { id: lock.path });
 		output.log(chalk.green(`Cleared the ${lock.platform} build lock left by pid ${lock.pid ?? "?"} (${lock.projectRoot || "unrecorded workspace"})`));
 	}
+	if (report.cacheScope === null) {
+		const emptyLockDirs = pruneEmptyProcessLockDirs();
+		if (emptyLockDirs > 0) output.log(chalk.dim(`Removed ${emptyLockDirs} empty process lock entries`));
+	}
 	for (const slot of buildSlots.stale) {
 		throwIfCancelled(signal, "GC");
 		const cleared = (0, ownership_claim_exports.clearFreeClaimSet)({
@@ -3171,12 +3186,13 @@ async function runGcCore(opts, deps, execution, reportOnly = false) {
 	throwIfCancelled(signal, "GC");
 	if (all) deleteFailures += await emptyCaches(caches, output, signal, deps.operation);
 	else if (olderThan === null) {
-		if (caches.length) output.log(chalk.dim("Shared caches left alone: pass --cache all to empty them, or --older-than <days> to trim them."));
-	} else deleteFailures += (await trimCaches(caches, olderThan, output, signal, deps.operation)).failures;
+		if (caches.some((entry) => !entry.willEmpty)) output.log(chalk.dim("Shared caches left alone: pass --cache all to empty them, or --older-than <days> to trim them."));
+	} else deleteFailures += (await trimCaches(caches.filter((entry) => !entry.willEmpty), olderThan, output, signal, deps.operation)).failures;
+	if (!all) deleteFailures += await emptyCaches(caches.filter((entry) => entry.willEmpty), output, signal, deps.operation);
 	return payload(deleteFailures);
 }
 function gcCommand(program) {
-	program.command("gc").description("Report what Stim has left behind: dead project entries, orphaned workspace directories, clean Stim-managed linked worktrees whose branch is merged or whose pull request was merged or closed, orphaned owned devices and EAS sessions, records of devices that no longer exist, build locks whose builder is gone, expired physical-device leases, the shared build caches, the build outputs and logs of each workspace, the memory of watchman and of the Gradle and Kotlin daemons, and recognized leftovers in TMPDIR. Reports by default; pass --delete to act.").option("--worktrees", "also remove clean, idle Stim-managed linked worktrees, not only merged ones: with --delete run `stim worktree remove` (never --force) on each; idle means unused for --older-than days, 7 without it").option("--delete", "actually prune the reported entries, reap the reported devices, lighten every workspace that is not building and ran no ios, android or macos command in the last 15 minutes by clearing its build outputs, a running dev server or booted device included, trim its Metro, client and device logs to their newest 8 MiB, and, unless maintenance.mode is off, stop each workspace idle past maintenance.idleStopHours as stim stop does").option("--older-than <days>", "also reap owned devices whose workspace has not been used this long, trim shared cache entries nothing has used in that time and device recordings made before it, and clear workspace build outputs only for workspaces idle this long and parked devices only once parked this long", (v) => {
+	program.command("gc").description("Report what Stim has left behind: dead project entries, orphaned workspace directories, clean Stim-managed linked worktrees whose branch is merged or whose pull request was merged or closed, orphaned owned devices and EAS sessions, records of devices that no longer exist, build locks whose builder is gone, expired physical-device leases, the shared build caches, the build outputs and logs of each workspace, the memory of watchman and of the Gradle and Kotlin daemons, and recognized leftovers in TMPDIR. Reports by default; pass --delete to act.").option("--worktrees", "also remove clean, idle Stim-managed linked worktrees, not only merged ones: with --delete run `stim worktree remove` (never --force) on each; idle means unused for --older-than days, 7 without it").option("--delete", "actually prune the reported entries, reap the reported devices, lighten every workspace that is not building and ran no ios, android or macos command in the last 15 minutes by clearing its build outputs, a running dev server or booted device included, trim its Metro, client and device logs to their newest 8 MiB, and, unless maintenance.mode is off, stop each workspace idle past maintenance.idleStopHours as stim stop does, and shut down the shared watchman daemon (after removing its stale roots) when no client, subscription or trigger uses it").option("--older-than <days>", "also reap owned devices whose workspace has not been used this long, trim shared cache entries nothing has used in that time and device recordings made before it, and clear workspace build outputs only for workspaces idle this long and parked devices only once parked this long", (v) => {
 		const n = parseInt(v, 10);
 		if (!Number.isFinite(n) || String(n) !== String(v).trim()) throw new InvalidArgumentError("must be a whole number of days, e.g. --older-than 30");
 		return n;

package/dist/{gc-8Qm_K1iy.mjs → gc-BQ5dXnC7.mjs}

@@ -1,3 +1,3 @@
-import { Lt as findOrphanedDevices, Nt as describeParkedSims, Pt as describeUnverifiableDevices, Rt as findStaleDeviceRecords, jt as deleteParkedSims, mt as selectCaches, zt as findStaleProjectDevices } from "./device-capacity-CpAVcKgq.mjs";
-import { a as runGc, i as readGcReport, n as executeGc, o as withGcMaintenanceClaim, r as gcCommand, s as formatGcReport, t as collectGcReport } from "./gc-DiUhrVFo.mjs";
+import { Bt as findOrphanedDevices, Ft as describeParkedSims, Ht as findStaleProjectDevices, It as describeUnverifiableDevices, Mt as deleteParkedSims, Vt as findStaleDeviceRecords, ht as selectCaches } from "./device-capacity-D_IlxZRL.mjs";
+import { a as runGc, i as readGcReport, n as executeGc, o as withGcMaintenanceClaim, r as gcCommand, s as formatGcReport, t as collectGcReport } from "./gc-3DHVCn-k.mjs";
 export { collectGcReport, gcCommand as default, deleteParkedSims, describeParkedSims, describeUnverifiableDevices, executeGc, findOrphanedDevices, findStaleDeviceRecords, findStaleProjectDevices, formatGcReport, readGcReport, runGc, selectCaches, withGcMaintenanceClaim };