stim 1.31.0 → 1.33.0

package/dist/{toolchain-CGdgD4x4.mjs → toolchain-s5ZmG42Z.mjs}

@@ -1,12 +1,12 @@
-import { D as ownership_claim_exports, _ as spawnDeclared, b as operationState, g as signalDeclaredSpawns, h as refuseDeclaredSpawns, m as declareSpawnsOn, p as allowDeclaredSpawns, t as getExecutor, u as withWorkspaceProcessLock, v as stopDeclaringSpawnsOn, y as isTermination } from "./exec-aULwtNly.mjs";
-import { E as workspaceDir, T as workspaceDerivedData, l as withWorkspaceStateLockAsync, o as updateWorkspaceState, r as readWorkspaceState$1, t as clearWorkspaceStateKey } from "./workspace-state-3bF4TB8P.mjs";
+import { C as operationState, D as ownership_claim_exports, S as isTermination, _ as declareSpawnsOn, b as spawnDeclared, g as allowDeclaredSpawns, p as withWorkspaceProcessLock, t as getExecutor, v as refuseDeclaredSpawns, x as stopDeclaringSpawnsOn, y as signalDeclaredSpawns } from "./exec-CGuDzt40.mjs";
+import { E as workspaceDir, T as workspaceDerivedData, l as withWorkspaceStateLockAsync, o as updateWorkspaceState, r as readWorkspaceState$1, t as clearWorkspaceStateKey } from "./workspace-state-BdZ-QgmB.mjs";
 import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { a as formatElapsed, l as phaseLine } from "./command-output-VrXd6qPX.mjs";
-import { a as killOnAbort } from "./operation-exec-Dp4FuIGR.mjs";
-import { o as androidHome } from "./android-DsEj2CCs.mjs";
+import { a as formatElapsed, l as phaseLine } from "./command-output-DWI9tGPU.mjs";
+import { a as killOnAbort } from "./operation-exec-DKlBcKAL.mjs";
+import { o as androidHome } from "./android-Iq0M2t2d.mjs";
 import { t as canonicalPath } from "./paths-BsJMoPP2.mjs";
 import { p as resolveOptimizations } from "./errors-DHm_U5gv.mjs";
-import { t as cleanLine } from "./server-expo-CP4dURQp.mjs";
+import { t as cleanLine } from "./server-expo-15RjL0ir.mjs";
 import { createRequire } from "node:module";
 import { createHash } from "node:crypto";
 import { existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, realpathSync, rmSync, statSync, writeFileSync } from "node:fs";
@@ -2195,10 +2195,16 @@ function jdkInstall(major, os) {
 }
 function androidMismatches(local, requires, worker) {
 	const out = [];
-	if ((!local.jdk || worker.jdk !== local.jdk) && !(local.jdk && worker.jdks?.includes(local.jdk))) out.push({
+	if (!local.jdk) {
+		if (!worker.jdk) out.push({
+			code: "jdk",
+			reason: "no JDK there",
+			...jdkInstall("17", worker.os)
+		});
+	} else if (worker.jdk !== local.jdk && !worker.jdks?.includes(local.jdk)) out.push({
 		code: "jdk",
-		reason: `JDK ${worker.jdk ?? "none"} there, ${local.jdk ?? "none"} here`,
-		...local.jdk && worker.jdks ? jdkInstall(local.jdk, worker.os) : {}
+		reason: `JDK ${worker.jdk ?? "none"} there, ${local.jdk} here`,
+		...worker.jdks ? jdkInstall(local.jdk, worker.os) : {}
 	});
 	const sdk = worker.androidSdk;
 	if (!sdk) return [...out, {
@@ -2249,8 +2255,8 @@ function cocoapodsDifference(target, worker) {
 }
 /**
 * What a build on the worker does beyond the match: the SDK packages it lacks and Gradle downloads on the first build,
-* because its SDK licenses are accepted and the project allows the download. None of them stops the build. For iOS, the
-* CocoaPods difference a named machine is sent the build despite.
+* because its SDK licenses are accepted and the project allows the download, and the JDK it builds on for a client with
+* none. None of them stops the build. For iOS, the CocoaPods difference a named machine is sent the build despite.
 */
 function toolchainNotes(target, worker) {
 	if (target.platform === "ios") {
@@ -2260,14 +2266,19 @@ function toolchainNotes(target, worker) {
 			reason: `${pods.reason}; its pod install runs anyway and a failure is reported`
 		}] : [];
 	}
-	if (target.platform !== "android" || !worker.androidSdk || !gradleDownloads(target.requires, worker)) return [];
+	if (target.platform !== "android") return [];
+	const jdk = !target.local.jdk && worker.jdk ? [{
+		code: "jdk",
+		reason: `this machine has no JDK, so the build runs on JDK ${worker.jdk} there`
+	}] : [];
+	if (!worker.androidSdk || !gradleDownloads(target.requires, worker)) return jdk;
 	const sdkManager = sdkManagerPath(worker);
-	return sdkGaps(target.requires, worker.androidSdk).map((gap) => ({
+	return [...jdk, ...sdkGaps(target.requires, worker.androidSdk).map((gap) => ({
 		code: gap.code,
 		reason: `${gap.label} is not installed there; Gradle downloads it on the first build${gap.size ? ` (${gap.size})` : ""}`,
 		commands: [`${sdkManager} "${gap.id}"`],
 		lead: "install the package now so the first build does not download it"
-	}));
+	}))];
 }
 function versionMismatch(tool, there, here) {
 	const side = (version) => version ? version.startsWith(tool) ? version : `${tool} ${version}` : `no ${tool}`;

package/dist/{trigger-CfnOfpDd.mjs → trigger-BtB4kbe0.mjs}

@@ -1,7 +1,7 @@
-import { t as getExecutor } from "./exec-aULwtNly.mjs";
+import { t as getExecutor } from "./exec-CGuDzt40.mjs";
 import { t as resolveMaintenanceSettings } from "./settings-D9LtQaUw.mjs";
 import { t as spawnEntry } from "./spawn-entry-jw19m8Nl.mjs";
-import { n as windowsLauncherArgs } from "./detached-entry-BPlSaCwC.mjs";
+import { n as windowsLauncherArgs } from "./detached-entry-tfrgGVWb.mjs";
 import { n as stampAttempt, r as due, t as capChildLog } from "./attempt-ClyJlZPT.mjs";
 import { readClaimSet } from "@stim-cli/core/ownership-claim";
 import { closeSync, openSync } from "node:fs";

package/dist/trigger-D8B7QR0q.mjs

@@ -0,0 +1,2 @@
+import { t as triggerMaintenance } from "./trigger-BtB4kbe0.mjs";
+export { triggerMaintenance };

package/dist/{warm-progress-_aTMvkIH.mjs → warm-progress-q11Vdvhh.mjs}

@@ -1,9 +1,9 @@
-import { D as ownership_claim_exports, E as debugLog, l as WorkspaceProcessCleanupError, n as isTimeoutError, t as getExecutor } from "./exec-aULwtNly.mjs";
-import { E as workspaceDir, M as withDirLock, _ as ensureWorkspaceStorage, h as discoverAgentSessions, m as attributeAgentSessions, o as updateWorkspaceState, p as agentKey } from "./workspace-state-3bF4TB8P.mjs";
-import { l as gitQuietAsync, o as git$1, s as gitAsync } from "./operation-exec-Dp4FuIGR.mjs";
-import { Ct as gitCommonDirOnDisk, Ot as linkedWorktreesOnDisk } from "./settings-C6UTYW2K.mjs";
-import { U as ownedAvdDirectory } from "./android-DsEj2CCs.mjs";
-import { s as pullRequestLookups } from "./pull-request-BzLmzAIQ.mjs";
+import { D as ownership_claim_exports, E as debugLog, f as WorkspaceProcessCleanupError, n as isTimeoutError, t as getExecutor } from "./exec-CGuDzt40.mjs";
+import { E as workspaceDir, M as withDirLock, _ as ensureWorkspaceStorage, h as discoverAgentSessions, m as attributeAgentSessions, o as updateWorkspaceState, p as agentKey } from "./workspace-state-BdZ-QgmB.mjs";
+import { l as gitQuietAsync, o as git$1, s as gitAsync } from "./operation-exec-DKlBcKAL.mjs";
+import { Ct as gitCommonDirOnDisk, Ot as linkedWorktreesOnDisk } from "./settings-B5IBDfTx.mjs";
+import { U as ownedAvdDirectory } from "./android-Iq0M2t2d.mjs";
+import { s as pullRequestLookups } from "./pull-request-BpMTNkMB.mjs";
 import { clearClaimChild, markClaimChildPending, releaseClaim, setClaimChild, tryAcquireClaim } from "@stim-cli/core/ownership-claim";
 import { randomUUID } from "node:crypto";
 import { existsSync, mkdirSync, readdirSync, realpathSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";

package/dist/{web-BE89ONcc.mjs → web-DwYCTFdh.mjs}

@@ -1,12 +1,12 @@
-import { i as recordWorkspaceUse, k as workspaceLogsDir } from "./workspace-state-3bF4TB8P.mjs";
-import { D as upsertProject, k as withConfigLockAsync, m as getProject } from "./config-D5qNWJEP.mjs";
-import { f as refuseNoProject, l as phaseLine } from "./command-output-VrXd6qPX.mjs";
-import { Z as resolveProjectSettingsAsync, a as SETTING_SHAPE_REMEDY, rt as settingShapeErrors } from "./settings-C6UTYW2K.mjs";
-import { f as projectRegistry, n as findCommandWorkspace } from "./project-DCLkDM8C.mjs";
-import { a as workspaceLinkLine, o as workspaceLinks } from "./stim-desktop-1XxET4S8.mjs";
-import { o as readWebRecord, r as cdpEndpoint } from "./state-CM_HvvkS.mjs";
-import { t as liveWebRecord } from "./page-CQJlcj3x.mjs";
-import { n as ensureWorkspaceStorageSafely } from "./native-runtime-D4qgnjK_.mjs";
+import { i as recordWorkspaceUse, k as workspaceLogsDir } from "./workspace-state-BdZ-QgmB.mjs";
+import { f as refuseNoProject, l as phaseLine } from "./command-output-DWI9tGPU.mjs";
+import { D as upsertProject, k as withConfigLockAsync, m as getProject } from "./config-BW0fAtoK.mjs";
+import { Z as resolveProjectSettingsAsync, a as SETTING_SHAPE_REMEDY, rt as settingShapeErrors } from "./settings-B5IBDfTx.mjs";
+import { f as projectRegistry, n as findCommandWorkspace } from "./project-DWEXiBA9.mjs";
+import { a as workspaceLinkLine, o as workspaceLinks } from "./stim-desktop-_WTria-r.mjs";
+import { o as readWebRecord, r as cdpEndpoint } from "./state-CtmYTRWm.mjs";
+import { t as liveWebRecord } from "./page-Dj8IqvGM.mjs";
+import { n as ensureWorkspaceStorageSafely } from "./native-runtime-e1OU8gEN.mjs";
 import chalk from "chalk";
 //#region src/commands/web.ts
 const printNote = (line) => console.error(line);

package/dist/web-cCfM8kwV.mjs

@@ -0,0 +1,2 @@
+import { n as webCommand, t as runWeb } from "./web-DwYCTFdh.mjs";
+export { webCommand as default, runWeb };

package/dist/web-run.mjs

@@ -1,12 +1,12 @@
-import { D as ownership_claim_exports, S as process_identity_exports, o as cancellableSleep, t as getExecutor } from "./exec-aULwtNly.mjs";
-import { Dt as recordCreatedDevice } from "./android-DsEj2CCs.mjs";
-import { f as signalProcessTree } from "./metro-mKHEMO-a.mjs";
+import { D as ownership_claim_exports, T as process_identity_exports, l as cancellableSleep, t as getExecutor } from "./exec-CGuDzt40.mjs";
+import { Dt as recordCreatedDevice } from "./android-Iq0M2t2d.mjs";
+import { f as signalProcessTree } from "./metro-B5PVz0Wv.mjs";
 import { i as createNdjsonWriter } from "./ndjson-CrjIsGzw.mjs";
-import { c as webClaimRoot, f as webLogFile, g as chromeProcessState, h as writeWebRecord, i as clearWebRecord, l as webDir, n as browserLogFile, p as webProfileDir, s as updateWebRecord, v as liveProfileHolder, y as removeSingletonFiles } from "./state-CM_HvvkS.mjs";
-import { l as probeWebDrivers } from "./activity-Dw4N_RFe.mjs";
-import { t as connectOwnedBrowser } from "./cdp-C3svvXiE.mjs";
-import { t as relaunchWithLogFile } from "./detached-entry-BPlSaCwC.mjs";
-import { i as chromeArgs, n as DESKTOP_PAGE, r as PHONE_SCREEN } from "./chrome-DyDWurWG.mjs";
+import { c as webClaimRoot, f as webLogFile, g as chromeProcessState, h as writeWebRecord, i as clearWebRecord, l as webDir, n as browserLogFile, p as webProfileDir, s as updateWebRecord, v as liveProfileHolder, y as removeSingletonFiles } from "./state-CtmYTRWm.mjs";
+import { l as probeWebDrivers } from "./activity-C8kBq9w0.mjs";
+import { t as connectOwnedBrowser } from "./cdp-C216kOAn.mjs";
+import { t as relaunchWithLogFile } from "./detached-entry-tfrgGVWb.mjs";
+import { i as chromeArgs, n as DESKTOP_PAGE, r as PHONE_SCREEN } from "./chrome-C8sC5tdl.mjs";
 import { existsSync, mkdirSync, openSync, realpathSync } from "node:fs";
 import { isAbsolute, resolve } from "node:path";
 import { LOG_ROTATE_BYTES } from "@stim-cli/core";

package/dist/windows-report.mjs

@@ -1,4 +1,4 @@
-import { t as getExecutor } from "./exec-aULwtNly.mjs";
+import { t as getExecutor } from "./exec-CGuDzt40.mjs";
 import { writeFileSync } from "node:fs";
 //#region bin/windows-report.ts
 const request = JSON.parse(process.env.STIM_REPORT_CHILD ?? "");

package/dist/{workspace-state-3bF4TB8P.mjs → workspace-state-BdZ-QgmB.mjs}

@@ -1,6 +1,6 @@
-import { S as process_identity_exports, t as getExecutor } from "./exec-aULwtNly.mjs";
-import { A as writeConfigSetting, h as getProjectSettings, j as writeConfigSettingAsync } from "./config-D5qNWJEP.mjs";
-import { lt as workspaceHiddenSetting } from "./settings-C6UTYW2K.mjs";
+import { T as process_identity_exports, t as getExecutor } from "./exec-CGuDzt40.mjs";
+import { A as writeConfigSetting, h as getProjectSettings, j as writeConfigSettingAsync } from "./config-BW0fAtoK.mjs";
+import { lt as workspaceHiddenSetting } from "./settings-B5IBDfTx.mjs";
 import { existsSync, mkdirSync, readFileSync, realpathSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, isAbsolute, join, relative } from "node:path";

package/dist/{workspaces-BNEyJ1B_.mjs → workspaces-B3ahAHZc.mjs}

@@ -1,18 +1,18 @@
-import { D as ownership_claim_exports, S as process_identity_exports, b as operationState, c as throwIfCancelled, d as workspaceProcessLockError, f as workspaceProcessLockPath, l as WorkspaceProcessCleanupError, m as declareSpawnsOn, o as cancellableSleep, t as getExecutor, u as withWorkspaceProcessLock, v as stopDeclaringSpawnsOn } from "./exec-aULwtNly.mjs";
-import { A as workspaceName$1, E as workspaceDir, l as withWorkspaceStateLockAsync, o as updateWorkspaceState, r as readWorkspaceState$1, t as clearWorkspaceStateKey, u as workspaceLastUsed, w as workspaceAgentDeviceDir } from "./workspace-state-3bF4TB8P.mjs";
-import { F as formatBytes, I as isOnMountedVolume, K as projectDeviceSlots, L as listMountedVolumes, M as acquireAvdClaim, O as withConfigLock$1, R as measuredDirectorySizeAsync, U as deviceSlotPlatforms, _ as isPathPrefix$1, d as getConfigDir, k as withConfigLockAsync$1, m as getProject, v as loadConfig$1 } from "./config-D5qNWJEP.mjs";
+import { C as operationState, D as ownership_claim_exports, T as process_identity_exports, _ as declareSpawnsOn, d as throwIfCancelled, f as WorkspaceProcessCleanupError, h as workspaceProcessLockPath, l as cancellableSleep, m as workspaceProcessLockError, p as withWorkspaceProcessLock, t as getExecutor, x as stopDeclaringSpawnsOn } from "./exec-CGuDzt40.mjs";
+import { A as workspaceName$1, E as workspaceDir, l as withWorkspaceStateLockAsync, o as updateWorkspaceState, r as readWorkspaceState$1, t as clearWorkspaceStateKey, u as workspaceLastUsed, w as workspaceAgentDeviceDir } from "./workspace-state-BdZ-QgmB.mjs";
 import { t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { a as formatElapsed, d as quotedPath$1, l as phaseLine, o as formatLongDuration, u as plural } from "./command-output-VrXd6qPX.mjs";
-import { c as gitQuiet, l as gitQuietAsync, t as runOperationFile } from "./operation-exec-Dp4FuIGR.mjs";
-import { Pt as lockReason, Vt as repoRootAsync, Xt as worktreeLockAsync, Yt as worktreeLock, pt as resolveTailscaleBinary } from "./settings-C6UTYW2K.mjs";
-import { a as macosRuntimeClaim, n as macosDir } from "./state-CiflgxTP.mjs";
-import { B as listOrphanedAvdDirectories, C as deleteAvd, Dt as recordCreatedDevice, Et as readCreatedDevices$1, J as ownedAvdSystemImage, K as ownedAvdSerialResolver, M as isEmulatorToolAbsent, P as listAdbDevicesAsync, St as removeParkedAfter, Tt as forgetCreatedDeviceAsync, U as ownedAvdDirectory, W as ownedAvdMatchesConfiguration, _t as eraseParkedAfter, dt as wipeAvdUserData, ft as isStimOwnedAvd, g as avdPathExists, it as resolveOwnedAvdSerialAsync, lt as waitForAndroidEmulatorShutdown, ot as shutdownAndroidEmulator, p as assertOwnedAvdStoppedAsync, q as ownedAvdSerialResolverAsync, v as avdStorageExists, wt as forgetCreatedDevice, xt as readParked, y as avdStorageRoots, yt as parkSim } from "./android-DsEj2CCs.mjs";
-import { c as pidExists, f as signalProcessTree, p as signalProcessTreeAsync } from "./metro-mKHEMO-a.mjs";
-import { _ as chromeProcessStateAsync, c as webClaimRoot, i as clearWebRecord, o as readWebRecord, p as webProfileDir, t as CDP_PORT_LABEL, u as webFacts, v as liveProfileHolder, y as removeSingletonFiles } from "./state-CM_HvvkS.mjs";
+import { a as formatElapsed, d as quotedPath$1, l as phaseLine, o as formatLongDuration, u as plural } from "./command-output-DWI9tGPU.mjs";
+import { M as acquireAvdClaim, O as withConfigLock$1, _ as isPathPrefix$1, at as isOnMountedVolume, d as getConfigDir, ft as deviceSlotPlatforms, ht as projectDeviceSlots, k as withConfigLockAsync$1, m as getProject, ot as listMountedVolumes, rt as formatBytes, st as measuredDirectorySizeAsync, v as loadConfig$1 } from "./config-BW0fAtoK.mjs";
+import { c as gitQuiet, l as gitQuietAsync, t as runOperationFile } from "./operation-exec-DKlBcKAL.mjs";
+import { Pt as lockReason, Vt as repoRootAsync, Xt as worktreeLockAsync, Yt as worktreeLock, pt as resolveTailscaleBinary } from "./settings-B5IBDfTx.mjs";
+import { a as macosRuntimeClaim, n as macosDir } from "./state-DSOUqO-o.mjs";
+import { B as listOrphanedAvdDirectories, C as deleteAvd, Dt as recordCreatedDevice, Et as readCreatedDevices$1, J as ownedAvdSystemImage, K as ownedAvdSerialResolver, M as isEmulatorToolAbsent, P as listAdbDevicesAsync, St as removeParkedAfter, Tt as forgetCreatedDeviceAsync, U as ownedAvdDirectory, W as ownedAvdMatchesConfiguration, _t as eraseParkedAfter, dt as wipeAvdUserData, ft as isStimOwnedAvd, g as avdPathExists, it as resolveOwnedAvdSerialAsync, lt as waitForAndroidEmulatorShutdown, ot as shutdownAndroidEmulator, p as assertOwnedAvdStoppedAsync, q as ownedAvdSerialResolverAsync, v as avdStorageExists, wt as forgetCreatedDevice, xt as readParked, y as avdStorageRoots, yt as parkSim } from "./android-Iq0M2t2d.mjs";
+import { c as pidExists, f as signalProcessTree, p as signalProcessTreeAsync } from "./metro-B5PVz0Wv.mjs";
+import { _ as chromeProcessStateAsync, c as webClaimRoot, i as clearWebRecord, o as readWebRecord, p as webProfileDir, t as CDP_PORT_LABEL, u as webFacts, v as liveProfileHolder, y as removeSingletonFiles } from "./state-CtmYTRWm.mjs";
 import { t as canonicalPath } from "./paths-BsJMoPP2.mjs";
-import { N as listBuildLocks, d as readAgentDeviceRecords, i as createActivityReaderAsync, r as createActivityReader, s as idleForMs, t as agentDeviceDaemon } from "./activity-Dw4N_RFe.mjs";
-import { C as renameIosSim, D as resolveOwnedIosSim, c as eraseIosSim, f as listAllIosSimsAsync, k as shutdownIosSim, o as deleteIosSim, p as listIosDeviceTypesAsync, s as deleteParkedIosSim, v as parkedSimName, y as parseRuntimeVersion } from "./ios-CdAV4-1E.mjs";
-import { r as releaseBrowserPort } from "./named-ports-B0hCk2v-.mjs";
+import { N as listBuildLocks, d as readAgentDeviceRecords, i as createActivityReaderAsync, r as createActivityReader, s as idleForMs, t as agentDeviceDaemon } from "./activity-C8kBq9w0.mjs";
+import { C as renameIosSim, D as resolveOwnedIosSim, c as eraseIosSim, f as listAllIosSimsAsync, k as shutdownIosSim, o as deleteIosSim, p as listIosDeviceTypesAsync, s as deleteParkedIosSim, v as parkedSimName, y as parseRuntimeVersion } from "./ios-BdZdNsAj.mjs";
+import { r as releaseBrowserPort } from "./named-ports-CA0nB9Yw.mjs";
 import { createHash, randomUUID } from "node:crypto";
 import { closeSync, existsSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, rmdirSync, statSync, unlinkSync, watch, writeFileSync } from "node:fs";
 import { isDeepStrictEqual } from "node:util";
@@ -21,9 +21,9 @@ import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "nod
 import { ambientContext, ambientEnv, ambientWrite, withDirLock, workspaceName } from "@stim-cli/core";
 import { BUILD_HISTORY_KEY, BUILD_HISTORY_LIMIT, BUILD_LEDGER_CAP, BUILD_PHASES, LAST_BUILD_KEYS, STATS_VERSION, buildLedgerFile, buildLedgerLock, buildSlotsDir, decodeStats, hostedAppAttempt, hostedNativeRecords, isJsonObject, lastNativeUseFrom, loadPerCore, macosAppState, parseHostedNativePlacement, parseMissReason, readJsonFile, readMacosRecord, readRunEstimates, readStats as readStats$1, requireAutomaticMachine, statsFile, statsProjectKey as statsProjectKey$1, trace, trimCapacityRefusals, trimCapacityWaits, trimSamples, tryAcquireBuildSlotClaim, unreadableHostedNative, wholePhases, workspaceBuildDetailFile } from "@stim-cli/core/state";
 import { basename as basename$1, dirname as dirname$1, isAbsolute as isAbsolute$1, join as join$1, relative as relative$1 } from "path";
-import { request } from "node:https";
 import chalk from "chalk";
 import { existsSync as existsSync$1, lstatSync as lstatSync$1, readdirSync as readdirSync$1, statSync as statSync$1 } from "fs";
+import { request } from "node:https";
 import { lstat, readFile, readdir, rm, stat, unlink } from "node:fs/promises";
 import { resolve4 } from "node:dns/promises";
 //#region src/commands/gc/limited.ts
@@ -3530,7 +3530,7 @@ function numberOrNull(v) {
 //#region src/workspace/in-use.ts
 const NATIVE_RUN = "native-run";
 const NATIVE_RUN_HELD = "a stim ios, android or stop run holds its native-run.lock";
-function workspaceInUse(root, { supervisor = true, devServer = true, managedLocks = true, hosted = true, nativeRun = true } = {}, bundleInstances = bundleInstancePids) {
+function workspaceInUse(root, { supervisor = true, devServer = true, managedLocks = true, hosted = true, hostedMacos = true, nativeRun = true } = {}, bundleInstances = bundleInstancePids) {
 	const reasons = [];
 	if (supervisor && devServer) {
 		const project = getProject(root);
@@ -3547,8 +3547,9 @@ function workspaceInUse(root, { supervisor = true, devServer = true, managedLock
 	}
 	if (supervisor) {
 		const macos = macosAppState(readMacosRecord(root));
-		if (macos?.host) reasons.push(`its macOS app runs on ${macos.host.machine}`);
-		else if (macos?.state === "running" || macos?.state === "orphaned" || macos?.build.state === "running") reasons.push("its macOS app or build is running");
+		if (macos?.host) {
+			if (hostedMacos) reasons.push(`its macOS app runs on ${macos.host.machine}`);
+		} else if (macos?.state === "running" || macos?.state === "orphaned" || macos?.build.state === "running") reasons.push("its macOS app or build is running");
 		else if (macos?.state === "unverified" || !macos && readWorkspaceState$1(root)?.macos !== void 0) reasons.push("its macOS process owner cannot be verified");
 		else try {
 			const pids = bundleInstances(root);

package/dist/{worktree-BTrii9e_.mjs → worktree-BhsML6GV.mjs}

@@ -1,43 +1,43 @@
-import { D as ownership_claim_exports, S as process_identity_exports, b as operationState, l as WorkspaceProcessCleanupError, m as declareSpawnsOn, n as isTimeoutError, t as getExecutor, v as stopDeclaringSpawnsOn } from "./exec-aULwtNly.mjs";
-import { E as workspaceDir, a as recordWorkspaceUseAsync, l as withWorkspaceStateLockAsync, r as readWorkspaceState$1, w as workspaceAgentDeviceDir } from "./workspace-state-3bF4TB8P.mjs";
-import { C as removeProject, D as upsertProject, K as projectDeviceSlots, M as acquireAvdClaim, R as measuredDirectorySizeAsync, _ as isPathPrefix$1, a as clearDevice, d as getConfigDir, k as withConfigLockAsync$1, m as getProject, v as loadConfig$1 } from "./config-D5qNWJEP.mjs";
-import { a as formatElapsed, h as shortUdid, i as formatDuration, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-VrXd6qPX.mjs";
-import { c as gitQuiet, l as gitQuietAsync, o as git, r as childEnvironment, s as gitAsync, t as runOperationFile } from "./operation-exec-Dp4FuIGR.mjs";
-import { Ct as gitCommonDirOnDisk, Dt as isPodInstallChurn, Et as hasUncommittedWorkAsync, Ft as matchWorktreeEntry, Gt as restoreFileAsync, Ht as resolveFullRef, It as nativeCanonicalPath, Jt as warmWorktreePaths, Kt as sourceCheckoutOf, Lt as podsOutOfSync, Mt as locallyKnownUpstream, Q as resolveSettings, Rt as readWorktreeExclude, St as gitCommonDirAsync, Tt as hasRemoteAsync, Ut as resolveFullRefAsync, V as readCommittedSettings, X as resolveProjectSettings, Y as resolveIosProjectDir, _ as inertSettingWarning, _t as deleteBranchAsync, a as SETTING_SHAPE_REMEDY, bt as dirtyPathsAsync, gt as cloneIgnoredEntries, ht as branchExistsAsync, jt as listWorktreesAsync, nn as moveIgnoredTreesToTrash, qt as unpushedCommitsAsync, rn as restoreTrashedTrees, rt as settingShapeErrors, st as unknownSettingKeys, tn as disposeTrash, vt as depsOutOfSync, wt as hasPopulatedSubmodulesAsync, zt as removeWorktreeAsync } from "./settings-C6UTYW2K.mjs";
-import { F as readRemoteSessionId, M as readMetroTunnel, O as clearManagedMetroTunnel, P as readRemoteSession, T as MODE_COMMAND, i as findProjectRoot$1, k as clearRemoteSession, o as isMobileProject } from "./project-DCLkDM8C.mjs";
-import { t as macosAppPresent } from "./state-CiflgxTP.mjs";
-import { a as workspaceLinkLine, o as workspaceLinks } from "./stim-desktop-1XxET4S8.mjs";
-import { bt as parkedMaxSetting, mt as POOL_SETTING_REMEDY } from "./android-DsEj2CCs.mjs";
-import { c as pidExists, d as resolveProjectMetro, p as signalProcessTreeAsync, r as killMetroTreeAsync } from "./metro-mKHEMO-a.mjs";
-import { A as diskPressureLevel, D as requestDevServerStop, En as runProcessOperation, G as planCacheEmptying, Ln as resolveEasCliBin, N as lowestFree, Ot as endRecordedSession, _ as resolveBudget, g as readVolumeSpaceAsync, h as readVolumeSpace, k as withdrawDevServerStopRequest, p as machineNumber, ur as discoverCaches } from "./ccache-DVDO2ocE.mjs";
-import { o as readWebRecord } from "./state-CM_HvvkS.mjs";
-import { C as stopTunnel, E as withManagedRemoteWorktreeRemovalLock, O as withManagedTunnelRemovalLock, _ as emptyWorkspaceDir, ht as teardownOwnedIosSim, mt as teardownOwnedBrowser, o as collectWorkspaceOutputs, pt as teardownOwnedAvd, v as withIdleWorkspace, x as resolveSupervisorTarget } from "./workspaces-BNEyJ1B_.mjs";
+import { C as operationState, D as ownership_claim_exports, T as process_identity_exports, _ as declareSpawnsOn, f as WorkspaceProcessCleanupError, n as isTimeoutError, t as getExecutor, x as stopDeclaringSpawnsOn } from "./exec-CGuDzt40.mjs";
+import { E as workspaceDir, a as recordWorkspaceUseAsync, l as withWorkspaceStateLockAsync, r as readWorkspaceState$1, w as workspaceAgentDeviceDir } from "./workspace-state-BdZ-QgmB.mjs";
+import { a as formatElapsed, h as shortUdid, i as formatDuration, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-DWI9tGPU.mjs";
+import { C as removeProject, D as upsertProject, M as acquireAvdClaim, _ as isPathPrefix$1, a as clearDevice, at as isOnMountedVolume, ct as volumeRootFor, d as getConfigDir, ht as projectDeviceSlots, it as isAbsentPath, k as withConfigLockAsync$1, m as getProject, ot as listMountedVolumes, st as measuredDirectorySizeAsync, v as loadConfig$1 } from "./config-BW0fAtoK.mjs";
+import { c as gitQuiet, l as gitQuietAsync, o as git, r as childEnvironment, s as gitAsync, t as runOperationFile } from "./operation-exec-DKlBcKAL.mjs";
+import { Ct as gitCommonDirOnDisk, Dt as isPodInstallChurn, Et as hasUncommittedWorkAsync, Ft as matchWorktreeEntry, Gt as restoreFileAsync, Ht as resolveFullRef, It as nativeCanonicalPath, Jt as warmWorktreePaths, Kt as sourceCheckoutOf, Lt as podsOutOfSync, Mt as locallyKnownUpstream, Q as resolveSettings, Rt as readWorktreeExclude, St as gitCommonDirAsync, Tt as hasRemoteAsync, Ut as resolveFullRefAsync, V as readCommittedSettings, X as resolveProjectSettings, Y as resolveIosProjectDir, _ as inertSettingWarning, _t as deleteBranchAsync, a as SETTING_SHAPE_REMEDY, bt as dirtyPathsAsync, gt as cloneIgnoredEntries, ht as branchExistsAsync, jt as listWorktreesAsync, nn as moveIgnoredTreesToTrash, qt as unpushedCommitsAsync, rn as restoreTrashedTrees, rt as settingShapeErrors, st as unknownSettingKeys, tn as disposeTrash, vt as depsOutOfSync, wt as hasPopulatedSubmodulesAsync, zt as removeWorktreeAsync } from "./settings-B5IBDfTx.mjs";
+import { F as readRemoteSessionId, M as readMetroTunnel, O as clearManagedMetroTunnel, P as readRemoteSession, T as MODE_COMMAND, i as findProjectRoot$1, k as clearRemoteSession, o as isMobileProject } from "./project-DWEXiBA9.mjs";
+import { t as macosAppPresent } from "./state-DSOUqO-o.mjs";
+import { a as workspaceLinkLine, o as workspaceLinks } from "./stim-desktop-_WTria-r.mjs";
+import { bt as parkedMaxSetting, mt as POOL_SETTING_REMEDY } from "./android-Iq0M2t2d.mjs";
+import { c as pidExists, d as resolveProjectMetro, p as signalProcessTreeAsync, r as killMetroTreeAsync } from "./metro-B5PVz0Wv.mjs";
+import { A as diskPressureLevel, D as requestDevServerStop, En as runProcessOperation, G as planCacheEmptying, Ln as resolveEasCliBin, N as lowestFree, Ot as endRecordedSession, _ as resolveBudget, g as readVolumeSpaceAsync, h as readVolumeSpace, k as withdrawDevServerStopRequest, p as machineNumber, ur as discoverCaches } from "./ccache-BXtzEL6M.mjs";
+import { o as readWebRecord } from "./state-CtmYTRWm.mjs";
+import { C as stopTunnel, E as withManagedRemoteWorktreeRemovalLock, O as withManagedTunnelRemovalLock, _ as emptyWorkspaceDir, ht as teardownOwnedIosSim, mt as teardownOwnedBrowser, o as collectWorkspaceOutputs, pt as teardownOwnedAvd, v as withIdleWorkspace, x as resolveSupervisorTarget } from "./workspaces-B3ahAHZc.mjs";
 import { t as canonicalPath } from "./paths-BsJMoPP2.mjs";
-import { C as DEPS_ERROR, E as readPodState, M as HEARTBEAT_INTERVAL_MS, O as runCaptured, T as podsAreStale, X as podInstallCommand, k as runPodInstall, lt as cacheUser } from "./toolchain-CGdgD4x4.mjs";
-import { D as releaseWorkspaceLeases, t as agentDeviceDaemon } from "./activity-Dw4N_RFe.mjs";
-import { R as readHostMemoryPressure, z as readHostMemoryPressureAsync } from "./ios-CdAV4-1E.mjs";
-import { t as clearNamedPorts } from "./named-ports-B0hCk2v-.mjs";
+import { C as DEPS_ERROR, E as readPodState, M as HEARTBEAT_INTERVAL_MS, O as runCaptured, T as podsAreStale, X as podInstallCommand, k as runPodInstall, lt as cacheUser } from "./toolchain-s5ZmG42Z.mjs";
+import { D as releaseWorkspaceLeases, t as agentDeviceDaemon } from "./activity-C8kBq9w0.mjs";
+import { R as readHostMemoryPressure, z as readHostMemoryPressureAsync } from "./ios-BdZdNsAj.mjs";
+import { t as clearNamedPorts } from "./named-ports-CA0nB9Yw.mjs";
 import { t as resolveMaintenanceSettings } from "./settings-D9LtQaUw.mjs";
-import { i as stopHostedAndroid } from "./hosted-android-CH1Sm4wo.mjs";
-import { a as stopHostedIos, n as removePhoneReverses } from "./phone-reverses-Drj5QQCh.mjs";
-import { r as stopMacosApp } from "./stop-BfNhzvXO.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-CCfiBfOP.mjs";
-import { o as pullRequestLookupAsync, r as endedPullRequest } from "./pull-request-BzLmzAIQ.mjs";
-import { c as mergeStateAsync, d as forgetStatusMeasures, t as startWarmProgress } from "./warm-progress-_aTMvkIH.mjs";
-import { r as workspaceRecordingEnabled } from "./recordings-BWnIlhZH.mjs";
-import { i as installedNpmTreeProblems, n as hasInstalledDependencies, t as dependencyState } from "./dependency-state-DZVln1P9.mjs";
-import { a as discoverXcodeProject } from "./react-native-build-vK2lFYfN.mjs";
+import { i as stopHostedAndroid } from "./hosted-android-ByG-ICuh.mjs";
+import { a as stopHostedIos, n as removePhoneReverses } from "./phone-reverses-rvyxW1Fl.mjs";
+import { r as stopMacosApp } from "./stop-CpTy6bod.mjs";
+import { n as verifyCollectorOwnership } from "./ownership-hC7xvvxF.mjs";
+import { o as pullRequestLookupAsync, r as endedPullRequest } from "./pull-request-BpMTNkMB.mjs";
+import { c as mergeStateAsync, d as forgetStatusMeasures, t as startWarmProgress } from "./warm-progress-q11Vdvhh.mjs";
+import { r as workspaceRecordingEnabled } from "./recordings-AKZfsW2W.mjs";
+import { i as installedNpmTreeProblems, n as hasInstalledDependencies, t as dependencyState } from "./dependency-state-mL5g4H6K.mjs";
+import { a as discoverXcodeProject } from "./react-native-build-DaPfzf_e.mjs";
 import { claimRemoveCommand, clearFreeClaimSet, readClaimSet, releaseClaim, tryAcquireClaim } from "@stim-cli/core/ownership-claim";
 import { createHash, randomUUID } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { cpus, freemem, homedir, loadavg, totalmem } from "node:os";
-import { basename, dirname, join, relative } from "node:path";
+import { basename, dirname, isAbsolute, join, relative } from "node:path";
 import { buildCacheRoot, configDir, metroCacheRoot, quotedPath, unitLines, unitWords, withDirLockTransaction, workspaceName } from "@stim-cli/core";
 import { LAST_BUILD_KEYS, archiveDir, archiveEnabled, archiveLock, archiveRoot, archivedUsage, buildWorkerRoot, countErrorEntries, endedAgentSessionOf, isJsonObject, isPathPrefix, listRecordedDevicesAsync, loadConfig, queryLogs, readArchivesAsync, readBuildHistory, readJsonObject, readLastBuilds, readMacosRecord, readPullRequestCache, readWorkspaceState, recordingEnabled, sharedCcache, sharedCompilationCache, sortByTs, trace, worktreeArchiveRoot } from "@stim-cli/core/state";
 import { basename as basename$1, dirname as dirname$1, isAbsolute as isAbsolute$1, join as join$1, relative as relative$1, resolve as resolve$1 } from "path";
-import { setTimeout as setTimeout$1 } from "node:timers/promises";
 import chalk from "chalk";
 import { existsSync as existsSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, readlinkSync as readlinkSync$1, realpathSync as realpathSync$1, renameSync as renameSync$1, rmSync as rmSync$1, symlinkSync as symlinkSync$1, unlinkSync as unlinkSync$1, writeFileSync as writeFileSync$1 } from "fs";
+import { setTimeout as setTimeout$1 } from "node:timers/promises";
 import { chmod, lstat, mkdir, readdir, rename, rm, rmdir, stat, utimes, writeFile } from "node:fs/promises";
 import { createHash as createHash$1 } from "crypto";
 //#region src/workspace/pods-relocate.ts
@@ -1379,6 +1379,37 @@ async function reclaimIdleProject(path, workspaceExisted, { archive, deleteOwned
 	};
 }
 //#endregion
+//#region src/commands/gc/projects.ts
+function classifyProjectEntries(projects, mountedVolumes) {
+	const deadProjects = [];
+	const invalidProjects = [];
+	const skipped = [];
+	for (const [path, project] of Object.entries(projects)) {
+		if (!isAbsolute(path)) {
+			const claimed = describeDereferenced(project);
+			if (claimed.length) skipped.push({
+				dir: path,
+				reason: `not an absolute path, so this record is invalid; kept because it still claims ${claimed.join(" and ")}; gc removes it once that claim is gone, or drop the entry from the config file by hand`
+			});
+			else invalidProjects.push(path);
+			continue;
+		}
+		if (!isAbsentPath(path)) continue;
+		if (!isOnMountedVolume(path, mountedVolumes)) {
+			const volume = volumeRootFor(path);
+			skipped.push({
+				dir: path,
+				reason: `volume ${volume} is not mounted`
+			});
+		} else deadProjects.push(path);
+	}
+	return {
+		deadProjects,
+		invalidProjects,
+		skipped
+	};
+}
+//#endregion
 //#region src/workspace/service-guard.ts
 const SERVICE_IN_USE = { code: "STIM_WORKTREE_SERVICE" };
 function inside(folder, canonical) {
@@ -3397,7 +3428,7 @@ async function reclaimEnvironment(root, why, output, operation, beforeRemove) {
 			return;
 		}
 		for (const s of result.skippedDevices) output.error(chalk.yellow(phaseLine("device", `kept ${describeKeptDevice(s)} (${s.reason})`)));
-		output.error(chalk.green(`Reclaimed the environment; the working tree stays (${why}).`));
+		output.error(chalk.green(existsSync$1(root) ? `Reclaimed the environment; the working tree stays (${why}).` : `Reclaimed the environment of the deleted folder (${why}).`));
 	}, operation, beforeRemove), {
 		signal: operation?.signal,
 		declareSpawnsFor: operation
@@ -3615,6 +3646,21 @@ async function removeOrRefuse(target, opts, onRemoved, output) {
 			}
 			return;
 		}
+		const registered = Object.fromEntries(Object.entries(loadConfig$1()?.projects ?? {}).filter(([key]) => isPathPrefix$1(path, key)));
+		const { deadProjects, skipped } = opts.linkedOnly ? {
+			deadProjects: [],
+			skipped: []
+		} : classifyProjectEntries(registered, listMountedVolumes());
+		if (skipped.length) {
+			for (const kept of skipped) output.error(chalk.red(`Refusing to remove ${kept.dir}: ${kept.reason}.`));
+			output.error(chalk.dim("Its absence cannot be confirmed, so its record is kept."));
+			output.fail();
+			return;
+		}
+		if (deadProjects.length) {
+			await reclaimEnvironment(path, "its folder is already gone", output, opts.operation, opts.beforeRemove);
+			return;
+		}
 		output.error(chalk.red(`No such worktree: ${path}`));
 		output.fail();
 		return;
@@ -3904,4 +3950,4 @@ function worktreeCommand(program) {
 	registerRemove(worktree);
 }
 //#endregion
-export { deleteSelectedArchives as A, sizeScanDeferred as C, stimCliUseOf as D, stimCliEntries as E, worktreeArchiveLimits as M, describeDereferenced as O, measureSizes as S, serviceRunningFrom as T, cacheBlocked as _, nestedWorktrees as a, measurePressure as b, registerRemove as c, removalPath as d, removalRemedy as f, worktreeCommand as g, warmedWorkspace as h, excludeWatchmanCookies as i, sweepArchiveStaging as j, reclaimProject as k, registerWarm as l, warmWorktreeTarget as m, dependencyInstallCommand as n, porcelainPath as o, removeWorktreeTarget as p, excludePodChurn as r, reclaimKeys as s, customIosDirs as t, removalBlockers as u, measureDisk as v, uncommittedActivityOf as w, measurePressureAsync as x, measureDiskAsync as y };
+export { deleteSelectedArchives as A, sizeScanDeferred as C, stimCliUseOf as D, stimCliEntries as E, worktreeArchiveLimits as M, classifyProjectEntries as O, measureSizes as S, serviceRunningFrom as T, cacheBlocked as _, nestedWorktrees as a, measurePressure as b, registerRemove as c, removalPath as d, removalRemedy as f, worktreeCommand as g, warmedWorkspace as h, excludeWatchmanCookies as i, sweepArchiveStaging as j, reclaimProject as k, registerWarm as l, warmWorktreeTarget as m, dependencyInstallCommand as n, porcelainPath as o, removeWorktreeTarget as p, excludePodChurn as r, reclaimKeys as s, customIosDirs as t, removalBlockers as u, measureDisk as v, uncommittedActivityOf as w, measurePressureAsync as x, measureDiskAsync as y };

package/dist/{worktree-DB3Ypdj6.mjs → worktree-CrjsPIs2.mjs}

@@ -1,2 +1,2 @@
-import { a as nestedWorktrees, c as registerRemove, d as removalPath, f as removalRemedy, g as worktreeCommand, h as warmedWorkspace, i as excludeWatchmanCookies, l as registerWarm, m as warmWorktreeTarget, n as dependencyInstallCommand, o as porcelainPath, p as removeWorktreeTarget, r as excludePodChurn, s as reclaimKeys, t as customIosDirs, u as removalBlockers } from "./worktree-BTrii9e_.mjs";
+import { a as nestedWorktrees, c as registerRemove, d as removalPath, f as removalRemedy, g as worktreeCommand, h as warmedWorkspace, i as excludeWatchmanCookies, l as registerWarm, m as warmWorktreeTarget, n as dependencyInstallCommand, o as porcelainPath, p as removeWorktreeTarget, r as excludePodChurn, s as reclaimKeys, t as customIosDirs, u as removalBlockers } from "./worktree-BhsML6GV.mjs";
 export { customIosDirs, worktreeCommand as default, dependencyInstallCommand, excludePodChurn, excludeWatchmanCookies, nestedWorktrees, porcelainPath, reclaimKeys, registerRemove, registerWarm, removalBlockers, removalPath, removalRemedy, removeWorktreeTarget, warmWorktreeTarget, warmedWorkspace };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stim",
-  "version": "1.31.0",
+  "version": "1.33.0",
   "description": "Stim: fast, isolated React Native environments for coding agents",
   "keywords": [
     "agent",
@@ -53,11 +53,11 @@
   },
   "dependencies": {
     "@expo/fingerprint": "^0.21.5",
-    "@stim-cli/agent-driver": "1.31.0",
-    "@stim-cli/agent-driver-agent-device": "1.31.0",
-    "@stim-cli/cache": "1.31.0",
-    "@stim-cli/core": "1.31.0",
-    "@stim-cli/metro": "1.31.0",
+    "@stim-cli/agent-driver": "1.33.0",
+    "@stim-cli/agent-driver-agent-device": "1.33.0",
+    "@stim-cli/cache": "1.33.0",
+    "@stim-cli/core": "1.33.0",
+    "@stim-cli/metro": "1.33.0",
     "@xmldom/xmldom": "0.9.12",
     "chalk": "^6.0.0",
     "commander": "^15.0.0",
@@ -66,7 +66,7 @@
     "ws": "^8.21.3"
   },
   "devDependencies": {
-    "@stim-cli/expo-build-cache": "1.31.0",
+    "@stim-cli/expo-build-cache": "1.33.0",
     "@types/cross-spawn": "^6.0.6",
     "@types/which": "^3.0.4",
     "@types/ws": "^8.18.1",

package/dist/server-expo-D3k9mvP8.mjs

@@ -1,2 +0,0 @@
-import { m as startExpoServer } from "./server-expo-CP4dURQp.mjs";
-export { startExpoServer };

package/dist/trigger-DBZ-GBrl.mjs

@@ -1,2 +0,0 @@
-import { t as triggerMaintenance } from "./trigger-CfnOfpDd.mjs";
-export { triggerMaintenance };

package/dist/web-DQPxvFVD.mjs

@@ -1,2 +0,0 @@
-import { n as webCommand, t as runWeb } from "./web-BE89ONcc.mjs";
-export { webCommand as default, runWeb };