stim 1.26.0 → 1.27.0

package/dist/{activity-Lnb_EoRY.mjs → activity-Cd-ysFes.mjs}

@@ -1,9 +1,9 @@
-import { D as ownership_claim_exports, S as process_identity_exports, m as declareSpawnsOn, t as getExecutor, v as stopDeclaringSpawnsOn } from "./exec-VFRpu1iA.mjs";
-import { M as withDirLock$1, N as withDirLockAsync$1, c as withWorkspaceStateLock, d as writeWorkspaceState, k as workspaceLogsDir$1, l as withWorkspaceStateLockAsync, n as clearWorkspaceStateKeys, r as readWorkspaceState$1 } from "./workspace-state-pUg3_RRA.mjs";
-import { U as parseDeviceSlotKey, V as deviceSlotKey, d as getConfigDir, q as validateDeviceSlot } from "./config-BktkY_zC.mjs";
-import { a as formatElapsed, i as formatDuration, m as shortHash } from "./command-output-BF5AR2dL.mjs";
-import { n as runOperationFileQuiet } from "./operation-exec-CUZifp6Z.mjs";
-import { S as resolveBuild } from "./build-cache-DrXNCy3T.mjs";
+import { D as ownership_claim_exports, S as process_identity_exports, m as declareSpawnsOn, t as getExecutor, v as stopDeclaringSpawnsOn } from "./exec-aULwtNly.mjs";
+import { M as withDirLock$1, N as withDirLockAsync$1, c as withWorkspaceStateLock, d as writeWorkspaceState, k as workspaceLogsDir$1, l as withWorkspaceStateLockAsync, n as clearWorkspaceStateKeys, r as readWorkspaceState$1 } from "./workspace-state-BjqdjnJR.mjs";
+import { U as parseDeviceSlotKey, V as deviceSlotKey, d as getConfigDir, q as validateDeviceSlot } from "./config-Cn94Jc0g.mjs";
+import { a as formatElapsed, i as formatDuration, m as shortHash } from "./command-output-Dj-WT4BP.mjs";
+import { n as runOperationFileQuiet } from "./operation-exec-Dp4FuIGR.mjs";
+import { C as resolveBuild } from "./build-cache-gBJ-WKzA.mjs";
 import { randomBytes } from "node:crypto";
 import { closeSync, fstatSync, mkdirSync, openSync, readFileSync, readSync, readdirSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";

package/dist/{agent-device-usage-output-DbXy5tg8.mjs → agent-device-usage-output-C5nCKWp9.mjs}

@@ -1,8 +1,8 @@
-import { S as process_identity_exports } from "./exec-VFRpu1iA.mjs";
-import { P as formatBytes } from "./config-BktkY_zC.mjs";
-import { o as formatLongDuration } from "./command-output-BF5AR2dL.mjs";
-import { F as measureDu, I as writeUsageCache, P as canonical, c as listWorkspaceDirs } from "./workspaces-g2lhdBXF.mjs";
-import { c as parseAgentDeviceRecord, o as envDir, u as processMatches } from "./activity-Lnb_EoRY.mjs";
+import { S as process_identity_exports } from "./exec-aULwtNly.mjs";
+import { P as formatBytes } from "./config-Cn94Jc0g.mjs";
+import { o as formatLongDuration } from "./command-output-Dj-WT4BP.mjs";
+import { _t as measureDu, gt as canonical, l as listWorkspaceDirs, vt as writeUsageCache } from "./workspaces-DFbj07jp.mjs";
+import { c as parseAgentDeviceRecord, o as envDir, u as processMatches } from "./activity-Cd-ysFes.mjs";
 import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { homedir } from "node:os";
 import { isAbsolute, join, relative, sep } from "node:path";

package/dist/{android-CSbLRD53.mjs → android--HBgpvpW.mjs}

@@ -1,6 +1,6 @@
-import { i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-BF5AR2dL.mjs";
-import { E as resolveVariant, T as resolveSystemImage, _ as findAapt, b as noDeviceDiagnostic, d as androidVariantSetting, f as apkDevClientFacts, g as dumpApkManifest, h as displayPath, i as NO_FINGERPRINT, p as apkPackage, r as NO_DEVICE, s as androidDevClientScheme, u as androidSystemImageSetting, x as parseXmltree, y as isReleaseVariant } from "./support-BGSCBoib.mjs";
-import { r as lastBuildRecord, t as androidFacts } from "./result-7F5hEwQJ.mjs";
-import { i as runAndroidOperation, n as registerAndroid, r as runAndroid, t as androidCommand } from "./android-CiNQw3kq.mjs";
-import { a as collectorLogFile, o as killPreviousCollector, s as startCollector } from "./launch-DOp8RjDz.mjs";
+import { i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-Dj-WT4BP.mjs";
+import { E as resolveVariant, T as resolveSystemImage, _ as findAapt, b as noDeviceDiagnostic, d as androidVariantSetting, f as apkDevClientFacts, g as dumpApkManifest, h as displayPath, i as NO_FINGERPRINT, p as apkPackage, r as NO_DEVICE, s as androidDevClientScheme, u as androidSystemImageSetting, x as parseXmltree, y as isReleaseVariant } from "./support-CNg_YsOk.mjs";
+import { r as lastBuildRecord, t as androidFacts } from "./result-CTqBw2Te.mjs";
+import { i as runAndroidOperation, n as registerAndroid, r as runAndroid, t as androidCommand } from "./android-Cd6w7_qw.mjs";
+import { a as collectorLogFile, o as killPreviousCollector, s as startCollector } from "./launch-CRyBeNsA.mjs";
 export { NO_DEVICE, NO_FINGERPRINT, androidDevClientScheme, androidFacts, androidSystemImageSetting, androidVariantSetting, apkDevClientFacts, apkPackage, collectorLogFile, androidCommand as default, displayPath, dumpApkManifest, findAapt, formatDuration, isReleaseVariant, killPreviousCollector, lastBuildRecord, noDeviceDiagnostic, parseXmltree, phaseLine, registerAndroid, resolveSystemImage, resolveVariant, runAndroid, runAndroidOperation, shortHash, startCollector };

package/dist/{android-CiNQw3kq.mjs → android-Cd6w7_qw.mjs}

@@ -1,42 +1,43 @@
-import { D as ownership_claim_exports, t as getExecutor } from "./exec-VFRpu1iA.mjs";
-import { a as recordWorkspaceUseAsync, f as writeWorkspaceStateAsync, g as emulatorLogFile, k as workspaceLogsDir$1, r as readWorkspaceState$1 } from "./workspace-state-pUg3_RRA.mjs";
-import { B as deviceSlotFileKey, E as upsertProject, H as deviceSlotPlatforms, O as withConfigLockAsync$1, W as parseDeviceSlotOption, p as getProject, q as validateDeviceSlot, u as getConcurrencyLimits } from "./config-BktkY_zC.mjs";
-import { _ as stepTimer, f as refuseNoProject, g as stepClock, i as formatDuration, l as phaseLine } from "./command-output-BF5AR2dL.mjs";
-import { K as resolveCacheProviderConfig, M as metroPortSetting, P as metroWarmupUrlSetting, R as projectSettingsContextAsync, U as remoteEasFallbackSetting, X as resolveSettings, Y as resolveProjectSettingsAsync, a as SETTING_SHAPE_REMEDY, g as deviceReclaimIdleMinutesSetting, it as tunnelModeSetting, lt as detectProviders, z as publicUrlSetting } from "./settings-CosW5X-S.mjs";
-import { f as projectRegistry, i as findProjectRoot$1, l as projectShortcut, t as NO_PROJECT_REFUSAL, z as writeWorkspaceLaunchAsync } from "./project-BUu6Is4k.mjs";
-import { A as listAdbDevices, Dt as configuredAndroidEmulatorApp, I as listInstalledSystemImages, Y as physicalDeviceModel, Z as probeEmulatorSerial, a as androidDeviceAbi, ct as waitForBoot, nt as resolveOwnedAvdSerialAsync, rt as resolvePhysicalDevice } from "./android-DTAcRwBC.mjs";
-import { c as pidExists, d as resolveProjectMetro } from "./metro-CjC10t6E.mjs";
-import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
-import { An as launchAndroidApp, En as installAndroidApp, G as runFailureRecord, I as NO_BUILD_PROGRESS, J as thrownRunFailureRecord, K as startBuildProgress, Kt as ensureMetroReachable, Q as recordCapacityRefusal, Un as runProcessOperation, Ut as binOnPath, Vn as exitAfterFlush, X as readRunEstimates, Y as createRunRecorder, Yt as remoteAndroidDeps, Zt as resolveRemoteContext, dn as verifyLaunch, er as resolveEasCliBin, et as recordRunStats, hn as DEFAULT_METRO_PORT, jn as launchAndroidReleaseApp, mn as ADB_INSTALL_TIMEOUT_MS, nr as uploadRemote, q as tapBuildLog, qn as checkEasAuth, qt as ensureRemoteBootOwned, t as budgetGate, tr as resolveRemote, tt as statsProjectKey$1, un as verifyAndroidReleaseLaunch, ur as ownedSessionName } from "./budget-k2mZGvvk.mjs";
-import { d as runCancellationSignal, f as withNativeBuildRun, r as cancelledFailure, u as runCancellation } from "./native-run-BfIDFKLH.mjs";
-import { L as acquireBuildSlot, z as releaseBuildSlot } from "./workspaces-g2lhdBXF.mjs";
-import { F as waitForBuild, M as acquireBuildLock, P as releaseBuildLock } from "./activity-Lnb_EoRY.mjs";
-import { w as storedAppId } from "./build-cache-DrXNCy3T.mjs";
-import { t as CCACHE_NOT_RUN } from "./ccache-Bx5TbxwG.mjs";
-import { S as setRemoteLogSink } from "./client-D9CaRks-.mjs";
-import { a as parseBuildMachineOption, l as resolveBuildPlacement } from "./selection-BNPBZ6T5.mjs";
-import { r as hostedMetroSettings } from "./metro-gateway-B6_PgD0L.mjs";
-import { a as writeHostedAndroidAsync, i as writeDevicePlacementAsync, t as readHostedAndroid } from "./ios-state-Cw7-WQf2.mjs";
-import { n as prepareHostedAndroid, t as placeHostedAndroid } from "./hosted-android-Bk54ej6n.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-BjYvMNX_.mjs";
-import { c as startDevServer } from "./start-_BdJ32cZ.mjs";
-import { a as acquireRunLease, d as runLease, f as waitFlagConflict, o as leaseExpiryText, u as releaseLeaseOnAbort } from "./device-lease-run-BmvIl7bI.mjs";
-import { n as DeviceAdmissionRefusal, r as checkDeviceCapacity } from "./device-capacity-DCSvUF0l.mjs";
-import { a as resolveEasDevelopmentBuild, r as isEasBuildFailure } from "./eas-build-Dsj93iM9.mjs";
-import { t as followHostedLaunchLogs } from "./hosted-logs-sync-B0pvmOk-.mjs";
-import { f as settleFingerprintCheck } from "./prebuild-gmouvmJZ.mjs";
-import { n as ensureWorkspaceStorageSafely, r as isPhysicalDeviceRequest, t as ensureDevServer } from "./native-runtime-Dq3RBcON.mjs";
-import { n as devicePlacementRecord } from "./placement-log-DIFPQAXp.mjs";
-import { S as pooledAndroidDevice, a as PLATFORM, b as noDeviceDiagnostic, g as dumpApkManifest, h as displayPath, o as androidBuildOptions, p as apkPackage, r as NO_DEVICE, s as androidDevClientScheme } from "./support-BGSCBoib.mjs";
-import { t as acquireAndroidArtifact } from "./artifact-BxREhAaV.mjs";
-import { a as persistLastBuild, c as androidDeviceSelectorRefusal, i as logPostBuildFailure, n as finishAndroidUpload, o as persistThrownBuild, s as reportAndroidResult, u as resolveAndroidRunPlan } from "./result-7F5hEwQJ.mjs";
-import { n as automaticDevicePlacement, r as devicePlacementLine, t as checkEasFallback } from "./eas-fallback-FwkeqqGi.mjs";
-import { i as verifyAndroidMetroRun, r as finishAndroidRun } from "./launch-DOp8RjDz.mjs";
-import { a as AvdRecoveryError, i as AvdBootError, n as ensureBooted, o as warmMetro, r as ensureOwnedDevice, t as didSetUpDevice } from "./device-BK-zwyd_.mjs";
-import { t as selectFromPool } from "./device-pool-Dluix4H3.mjs";
+import { D as ownership_claim_exports, t as getExecutor } from "./exec-aULwtNly.mjs";
+import { a as recordWorkspaceUseAsync, f as writeWorkspaceStateAsync, g as emulatorLogFile, k as workspaceLogsDir$1, r as readWorkspaceState$1 } from "./workspace-state-BjqdjnJR.mjs";
+import { B as deviceSlotFileKey, E as upsertProject, H as deviceSlotPlatforms, O as withConfigLockAsync$1, W as parseDeviceSlotOption, p as getProject, q as validateDeviceSlot, u as getConcurrencyLimits } from "./config-Cn94Jc0g.mjs";
+import { _ as stepTimer, f as refuseNoProject, g as stepClock, i as formatDuration, l as phaseLine } from "./command-output-Dj-WT4BP.mjs";
+import { B as publicUrlSetting, F as metroWarmupUrlSetting, J as resolveCacheProviderConfig, N as metroPortSetting, Q as resolveSettings, W as remoteEasFallbackSetting, Z as resolveProjectSettingsAsync, a as SETTING_SHAPE_REMEDY, dt as detectProviders, g as deviceReclaimIdleMinutesSetting, ot as tunnelModeSetting, z as projectSettingsContextAsync } from "./settings-BDVI8Ivc.mjs";
+import { f as projectRegistry, i as findProjectRoot$1, l as projectShortcut, t as NO_PROJECT_REFUSAL, z as writeWorkspaceLaunchAsync } from "./project-DYj-HVx6.mjs";
+import { A as listAdbDevices, Dt as configuredAndroidEmulatorApp, I as listInstalledSystemImages, Y as physicalDeviceModel, Z as probeEmulatorSerial, a as androidDeviceAbi, ct as waitForBoot, nt as resolveOwnedAvdSerialAsync, rt as resolvePhysicalDevice } from "./android-DriNoAVy.mjs";
+import { c as pidExists, d as resolveProjectMetro } from "./metro-CvyD-xwe.mjs";
+import { i as createNdjsonWriter } from "./ndjson-Dy2W4vRa.mjs";
+import { An as checkEasAuth, At as ensureRemoteBootOwned, En as runProcessOperation, Et as binOnPath, Jt as verifyLaunch, Ln as resolveEasCliBin, Mt as remoteAndroidDeps, Pt as resolveRemoteContext, Qt as DEFAULT_METRO_PORT, Rn as resolveRemote, Zt as ADB_INSTALL_TIMEOUT_MS, c as budgetGate, kt as ensureMetroReachable, ln as installAndroidApp, mn as launchAndroidReleaseApp, pn as launchAndroidApp, qn as ownedSessionName, qt as verifyAndroidReleaseLaunch, t as CCACHE_NOT_RUN, wn as exitAfterFlush, zn as uploadRemote } from "./ccache-BWTze1Ls.mjs";
+import { J as runFailureRecord, X as tapBuildLog, Y as startBuildProgress, Z as thrownRunFailureRecord, at as recordRunStats, et as createRunRecorder, ot as statsProjectKey$1, rt as recordCapacityRefusal, tt as readRunEstimates, xt as releaseBuildSlot, yt as acquireBuildSlot, z as NO_BUILD_PROGRESS } from "./workspaces-DFbj07jp.mjs";
+import { Q as cancelledFailure, at as runCancellation, ot as runCancellationSignal, st as withNativeBuildRun } from "./toolchain-CbCG6C5Z.mjs";
+import { F as waitForBuild, M as acquireBuildLock, P as releaseBuildLock } from "./activity-Cd-ysFes.mjs";
+import { T as storedAppId } from "./build-cache-gBJ-WKzA.mjs";
+import { S as setRemoteLogSink } from "./client-xsdxrhWA.mjs";
+import { d as resolveBuildPlacement, s as parseBuildMachineOption } from "./selection-Bs8phwhN.mjs";
+import { r as hostedMetroSettings } from "./metro-gateway-BnHdqMO_.mjs";
+import { a as writeHostedAndroidAsync, i as writeDevicePlacementAsync, t as readHostedAndroid } from "./ios-state-BZ03NFgF.mjs";
+import { n as prepareHostedAndroid, t as placeHostedAndroid } from "./hosted-android-BMKzUNnY.mjs";
+import { n as verifyCollectorOwnership } from "./ownership-Bx-0cku-.mjs";
+import { i as restoreLightenedDependencies, n as printLightenedFailure } from "./lightened-BCsdAGj_.mjs";
+import { c as startDevServer } from "./start-DrPwER_2.mjs";
+import { a as acquireRunLease, d as runLease, f as waitFlagConflict, o as leaseExpiryText, u as releaseLeaseOnAbort } from "./device-lease-run-DwsGfjUN.mjs";
+import { n as DeviceAdmissionRefusal, r as checkDeviceCapacity } from "./device-capacity-6LP7QsaA.mjs";
+import { a as resolveEasDevelopmentBuild, r as isEasBuildFailure } from "./eas-build-CjNSWmjo.mjs";
+import { t as followHostedLaunchLogs } from "./hosted-logs-sync-Dg3qrZmV.mjs";
+import { f as settleFingerprintCheck } from "./prebuild-BDpToDgR.mjs";
+import { i as launchOutcomeRecord, n as ensureWorkspaceStorageSafely, r as isPhysicalDeviceRequest, t as ensureDevServer } from "./native-runtime-DqaIBO5w.mjs";
+import { n as devicePlacementRecord } from "./placement-log-BXUbiZM6.mjs";
+import { S as pooledAndroidDevice, a as PLATFORM, b as noDeviceDiagnostic, g as dumpApkManifest, h as displayPath, o as androidBuildOptions, p as apkPackage, r as NO_DEVICE, s as androidDevClientScheme } from "./support-CNg_YsOk.mjs";
+import { t as acquireAndroidArtifact } from "./artifact-0AGJYB9O.mjs";
+import { a as persistLastBuild, c as androidDeviceSelectorRefusal, i as logPostBuildFailure, n as finishAndroidUpload, o as persistThrownBuild, s as reportAndroidResult, u as resolveAndroidRunPlan } from "./result-CTqBw2Te.mjs";
+import { n as devicePlacementLine, t as automaticDevicePlacement } from "./auto-placement-z-H5pJza.mjs";
+import { i as verifyAndroidMetroRun, r as finishAndroidRun } from "./launch-CRyBeNsA.mjs";
+import { t as checkEasFallback } from "./eas-fallback-9fqb46kW.mjs";
+import { a as AvdRecoveryError, i as AvdBootError, n as ensureBooted, o as warmMetro, r as ensureOwnedDevice, t as didSetUpDevice } from "./device-tM41-TUq.mjs";
+import { t as selectFromPool } from "./device-pool-BnQqvs6o.mjs";
 import { t as unsupportedPlan } from "./project-plan-BPwbLwQu.mjs";
-import { a as refusePlan, i as printPlan, n as planFlagRefusal } from "./build-plan-DrMMdayj.mjs";
-import { basename, join } from "node:path";
+import { a as refusePlan, i as printPlan, n as planFlagRefusal } from "./build-plan-CBqYbzYM.mjs";
+import { join } from "node:path";
 import { workspaceId } from "@stim-cli/core";
 import { hostedAndroidStatus, parseMachine } from "@stim-cli/core/state";
 import chalk from "chalk";
@@ -86,7 +87,7 @@ async function connectAndroidHosting({ root, slot, machine, release, appMode = r
 		} };
 	}
 }
-async function selectAndroidPlacement({ target: selected, automatic = automaticDevicePlacement, checkBudget = budgetGate, note, phase, log, fromFlag, noWait, buildMachine, localSelectors, eas, ...args }) {
+async function selectAndroidPlacement({ target: selected, automatic = automaticDevicePlacement, checkBudget = budgetGate, note, phase, log, fromFlag, noWait, waitMs, signal, buildMachine, localSelectors, eas, ...args }) {
 	const appMode = args.appMode ?? (args.release ? "release" : "development");
 	const selectors = selected.kind === "hosted" ? {
 		...selected.systemImage ? { systemImage: selected.systemImage } : {},
@@ -119,15 +120,20 @@ async function selectAndroidPlacement({ target: selected, automatic = automaticD
 			root: args.root,
 			slot: args.slot,
 			platform: "android",
+			...selected.placement ? { placement: selected.placement } : {},
 			...appMode === "process" ? { appMode } : {},
 			selectors,
 			buildMachine,
 			noWait,
+			...waitMs === void 0 ? {} : { waitMs },
+			onWait: (line) => phase("placement:", line),
+			signal,
 			...eas ? { eas } : {}
 		});
 		phase("placement:", devicePlacementLine(placed.placement, placed.skipped));
 		log?.(devicePlacementRecord({
 			platform: "android",
+			selected: selected.placement,
 			fromFlag,
 			easFallback: Boolean(eas),
 			placed
@@ -173,6 +179,11 @@ async function selectAndroidPlacement({ target: selected, automatic = automaticD
 			devicePlacement: placed.placement
 		};
 	} catch (error) {
+		if (signal?.aborted) return { failure: {
+			code: "STIM_CANCELLED",
+			message: "The run was cancelled while it waited for a remote machine.",
+			remedy: "Run the command again when you want the app on a device."
+		} };
 		return { failure: {
 			code: error.code ?? "STIM_HOSTING_REFUSED",
 			message: error.message,
@@ -187,6 +198,7 @@ async function finishHostedAndroidRun({ target, artifact, root, slot = "default"
 	if (!artifact.apkPath || !packageName) return fail("STIM_INSTALL_FAILED", "The built APK has no package identity.");
 	const devClientScheme = appMode === "development" && isExpo ? await resolveDevClientScheme(root, artifact.apkPath) ?? void 0 : void 0;
 	const launchedAt = now();
+	let marked = false;
 	try {
 		const run = await place(target, {
 			root,
@@ -199,7 +211,25 @@ async function finishHostedAndroidRun({ target, artifact, root, slot = "default"
 			metroPort,
 			selectors,
 			...appMode === "development" && isExpo ? { devClientScheme } : {},
-			reserved: (placement) => writePlacement(root, slot, placement),
+			reserved: (placement) => {
+				if (placement.device && !marked) {
+					marked = true;
+					report.writer.write({
+						src: "build",
+						level: "info",
+						marker: true,
+						event: "launch_attempt",
+						ts: now(),
+						platform: "android",
+						appId: packageName,
+						deviceId: placement.session,
+						remote: true,
+						host: target.host.machine,
+						msg: `launching ${packageName} on ${target.host.machine}`
+					});
+				}
+				return writePlacement(root, slot, placement);
+			},
 			note: out,
 			enterPhase
 		});
@@ -214,6 +244,7 @@ async function finishHostedAndroidRun({ target, artifact, root, slot = "default"
 		}, slot);
 		let launched = run.launched;
 		let launchWarning;
+		let unattributed = false;
 		if (appMode === "development") {
 			const hostedLogs = followLogs(root, slot, "android", launchedAt);
 			let verification;
@@ -244,7 +275,17 @@ async function finishHostedAndroidRun({ target, artifact, root, slot = "default"
 			if (verification.state === "fatal") return fail("STIM_LAUNCH_FAILED", "The app failed its launch readiness check.", `Read the launch error above or run \`stim logs --errors\`. The full timeline is in ${logsDir}.`, { lastBuildStatus: true });
 			launched = verification.state === true ? true : verification.state === "bundling" ? "bundling" : "unverified";
 			launchWarning = verification.warning;
+			unattributed = verification.unattributed ?? false;
 		}
+		report.writer.write(launchOutcomeRecord({
+			launchState: launched,
+			release,
+			process: appMode === "process",
+			bundleId: packageName,
+			configuration: report.variant,
+			metroPort,
+			unattributed
+		}));
 		if (launched === "unverified") out(`Launch on ${target.host.machine} is unverified; check the hosted app, then retry stim android --remote ${target.host.machine}.`);
 		const host = hostedAndroidStatus(run.placement);
 		report.record.deviceName = host.device?.name ?? null;
@@ -337,8 +378,8 @@ function androidCommand(program) {
 	registerAndroid(program);
 }
 function registerAndroid(program) {
-	program.command("android").description("Build (or install from the shared cache), install and launch this workspace's Android app on its owned emulator. React Native and Expo Debug runs start the dev server when it is not running.").option("--eas-profile <name>", "Download a matching EAS development build; on a miss, print the build command without running it").option("--slot <name>", "Reusable device slot within this workspace (default: default)", parseDeviceSlotOption).option("--remote-build <value>", "Build on auto, local, or one named machine; a name refuses without fallback", parseBuildMachineOption).option("--json", "Emit the facts as a single JSON line on stdout; every other line goes to stderr").option("--plan", "Predict the next build without building, booting or installing: resolve the fingerprint, check the local then remote cache, and print the expected cache result and duration. Writes no Stim state.").option("--no-metro-check", "Skip the reserved-port Metro health check and do not start it (the app will load no bundle unless something else serves it)").option("--no-build-cache", "Build fresh, ignoring cached artifacts (local and the project's build-cache provider); the fresh build still replaces the cache entry").option("--variant <name>", "Gradle variant to assemble and install (e.g. productionDebug on a flavored project); overrides the android.variant setting. A variant ending in Release embeds the JS bundle and skips Metro entirely. Default: debug").option("--system-image <id>", "Android system image to create this workspace's owned AVD from, as the sdkmanager package id (e.g. \"system-images;android-36;google_apis;arm64-v8a\"). Overrides the android.systemImage setting for this invocation. An unknown id refuses with STIM_BAD_ARG and prints the installed images.").option("--device-profile <id>", "Hardware profile to create this workspace's owned AVD with, as an `avdmanager list device -c` id (e.g. \"pixel_fold\", \"pixel_tablet\"). Overrides the android.deviceProfile setting for this invocation. An unknown id refuses with STIM_BAD_ARG and prints the available ids.").option("--device [serial]", "Install and launch on a connected physical device instead of this workspace's owned emulator. With no serial, the first connected device this workspace can lease is used. Stim never creates, boots, or deletes a physical device.").option("--remote <target>", "Run on eas, proxy, or a named approved Mac from remote.machines; auto places on an approved Mac when this machine is full or busy; local runs here, whatever android.remote says", (value) => {
-		if (!parseMachine(value)) throw new InvalidArgumentError("expected eas, proxy, auto, local, or a tailnet machine name");
+	program.command("android").description("Build (or install from the shared cache), install and launch this workspace's Android app on its owned emulator. React Native and Expo Debug runs start the dev server when it is not running.").option("--eas-profile <name>", "Download a matching EAS development build; on a miss, print the build command without running it").option("--slot <name>", "Reusable device slot within this workspace (default: default)", parseDeviceSlotOption).option("--remote-build <value>", "Build on local, auto, remote (remote machines first), remote-only (never here), or one named machine; a name refuses without fallback", parseBuildMachineOption).option("--json", "Emit the facts as a single JSON line on stdout; every other line goes to stderr").option("--plan", "Predict the next build without building, booting or installing: resolve the fingerprint, check the local then remote cache, and print the expected cache result and duration. Writes no Stim state.").option("--no-metro-check", "Skip the reserved-port Metro health check and do not start it (the app will load no bundle unless something else serves it)").option("--no-build-cache", "Build fresh, ignoring cached artifacts (local and the project's build-cache provider); the fresh build still replaces the cache entry").option("--variant <name>", "Gradle variant to assemble and install (e.g. productionDebug on a flavored project); overrides the android.variant setting. A variant ending in Release embeds the JS bundle and skips Metro entirely. Default: debug").option("--system-image <id>", "Android system image to create this workspace's owned AVD from, as the sdkmanager package id (e.g. \"system-images;android-36;google_apis;arm64-v8a\"). Overrides the android.systemImage setting for this invocation. An unknown id refuses with STIM_BAD_ARG and prints the installed images.").option("--device-profile <id>", "Hardware profile to create this workspace's owned AVD with, as an `avdmanager list device -c` id (e.g. \"pixel_fold\", \"pixel_tablet\"). Overrides the android.deviceProfile setting for this invocation. An unknown id refuses with STIM_BAD_ARG and prints the available ids.").option("--device [serial]", "Install and launch on a connected physical device instead of this workspace's owned emulator. With no serial, the first connected device this workspace can lease is used. Stim never creates, boots, or deletes a physical device.").option("--remote <target>", "Run on eas, proxy, or a named approved Mac from remote.machines; auto places on an approved Mac when this machine is full or busy; remote tries remote.machines in order first and runs here only when none takes it; remote-only never runs here; local runs here, whatever android.remote says", (value) => {
+		if (!parseMachine(value)) throw new InvalidArgumentError("expected eas, proxy, local, auto, remote, remote-only, or a tailnet machine name");
 		return value;
 	}).option("--wait <seconds>", "How long to wait for another workspace to release the device it leases, before refusing with STIM_DEVICE_BUSY (default 60, 0 refuses at once). Without --device, wait for an owned-device slot (default 600 seconds; --no-wait refuses immediately).").option("--no-wait", "Install on a device another workspace leases instead of waiting: this run takes no lease and, when both workspaces build the same app id, the install terminates the holder's running app. Without --device, refuse a full device cap or existing slot queue immediately.").action(async (opts) => {
 		if (opts.plan) return planAndroid(opts);
@@ -361,6 +402,14 @@ function runAndroidOperation(context, root, opts = {}) {
 		platform: PLATFORM,
 		slot: opts.slot ?? "default"
 	}, async (claim) => {
+		const lightened = await restoreLightenedDependencies(root, context);
+		if (lightened) {
+			printLightenedFailure(context, lightened, Boolean(opts.json));
+			return {
+				ok: false,
+				error: lightened
+			};
+		}
 		await recordWorkspaceUseAsync(root, /* @__PURE__ */ new Date(), context.env, context.cwd, context.signal);
 		const progress = startBuildProgress({
 			root,
@@ -628,6 +677,8 @@ async function runAndroid(options = {}) {
 			status: "failed",
 			errorCode: code,
 			diagnostics: rawDiagnostics,
+			message,
+			remedy,
 			out
 		});
 		logPostBuildFailure(artifactAcquired, writer, runFailureRecord({
@@ -733,7 +784,6 @@ async function runAndroid(options = {}) {
 		automatic: plan.target.kind === "hosted" && plan.target.machine === "auto",
 		signal: runCancellationSignal(context),
 		waitMs: plan.deviceSlotWaitMs,
-		displayName: basename(root),
 		reclaimIdleMinutes: deviceReclaimIdleMinutesSetting(settings),
 		waitingFor: (info) => progress.waitingFor(info, "device-slot"),
 		onWait: (ms) => {
@@ -754,6 +804,8 @@ async function runAndroid(options = {}) {
 		appMode,
 		metroCheck,
 		noWait: plan.deviceSlotWaitMs === 0,
+		waitMs: plan.deviceSlotWaitMs,
+		signal: settingsSignal,
 		buildMachine: options.buildMachine,
 		read: options.readHostedAndroid,
 		resolveSerial: resolveAvdSerial,
@@ -1068,6 +1120,7 @@ async function runAndroid(options = {}) {
 	}
 	record.avdName = device.avdName ?? null;
 	record.deviceName = device.deviceName ?? device.avdName ?? null;
+	record.deviceSerial = device.serial;
 	record.systemImage = device.systemImage;
 	record.deviceProfile = device.deviceProfile;
 	let preparedArtifact;

package/dist/{android-B5P81yI-.mjs → android-Deb9X3_Y.mjs}

@@ -1,5 +1,5 @@
-import { t as getExecutor } from "./exec-VFRpu1iA.mjs";
-import { u as androidToolCwd } from "./android-DTAcRwBC.mjs";
+import { t as getExecutor } from "./exec-aULwtNly.mjs";
+import { u as androidToolCwd } from "./android-DriNoAVy.mjs";
 //#region src/collector/android.ts
 const LEVEL_BY_LETTER = {
 	V: "debug",
@@ -111,10 +111,19 @@ function logcatArgs(serial, pid) {
 		"time,epoch"
 	];
 }
-function androidClockOffset(serial, { exec = getExecutor(), now = Date.now } = {}) {
+function killOnAbort(signal) {
+	if (!signal) return {};
+	return { onSpawn(child) {
+		const kill = () => child.kill("SIGKILL");
+		signal.addEventListener("abort", kill, { once: true });
+		child.once("close", () => signal.removeEventListener("abort", kill));
+		if (signal.aborted) kill();
+	} };
+}
+async function androidClockOffset(serial, { exec = getExecutor(), now = Date.now, signal } = {}) {
 	const before = now();
 	try {
-		const output = exec.runFile("adb", [
+		const output = (await exec.runFileAsync("adb", [
 			"-s",
 			serial,
 			"shell",
@@ -122,8 +131,9 @@ function androidClockOffset(serial, { exec = getExecutor(), now = Date.now } = {
 			"+%s%3N"
 		], {
 			timeoutMs: 1e3,
-			cwd: androidToolCwd()
-		}).trim();
+			cwd: androidToolCwd(),
+			...killOnAbort(signal)
+		})).trim();
 		const after = now();
 		if (!/^\d{13}$/.test(output) || after < before || after - before > 1e3) return null;
 		return Math.round((before + after) / 2) - Number(output);
@@ -136,25 +146,31 @@ function parsePidof(text) {
 	const pid = Number(first);
 	return Number.isInteger(pid) && pid > 0 ? pid : null;
 }
-function resolveAppPid(serial, packageName, { exec = null } = {}) {
+async function resolveAppPid(serial, packageName, { exec = null, signal } = {}) {
 	const e = exec || getExecutor();
 	try {
-		return parsePidof(e.runFile("adb", [
+		return parsePidof(await e.runFileAsync("adb", [
 			"-s",
 			serial,
 			"shell",
 			"pidof",
 			"-s",
 			packageName
-		], { timeoutMs: 1e4 }));
+		], {
+			timeoutMs: 1e4,
+			...killOnAbort(signal)
+		}));
 	} catch {
 		return null;
 	}
 }
-async function waitForAppPid({ serial, packageName, timeoutMs = 3e4, pollMs = 500, exec = null, now = Date.now, sleep = defaultSleep }) {
+async function waitForAppPid({ serial, packageName, timeoutMs = 3e4, pollMs = 500, exec = null, signal, now = Date.now, sleep = defaultSleep }) {
 	const deadline = now() + timeoutMs;
 	for (;;) {
-		const pid = resolveAppPid(serial, packageName, { exec });
+		const pid = await resolveAppPid(serial, packageName, {
+			exec,
+			signal
+		});
 		if (pid) return {
 			ok: true,
 			pid
@@ -184,7 +200,7 @@ function pidWatchInterval() {
 	const override = Number(process.env.STIM_PID_WATCH_MS);
 	return Number.isFinite(override) && override > 0 ? override : PID_WATCH_MS;
 }
-function watchAppPid({ serial, packageName, pid, intervalMs = null, exec = null, onChange, resolve = resolveAppPid, setTimer = setTimeout, clearTimer = clearTimeout }) {
+function watchAppPid({ serial, packageName, pid, intervalMs = null, exec = null, signal, onChange, resolve = resolveAppPid, setTimer = setTimeout, clearTimer = clearTimeout }) {
 	const every = intervalMs ?? pidWatchInterval();
 	let current = pid;
 	let stopped = false;
@@ -194,7 +210,10 @@ function watchAppPid({ serial, packageName, pid, intervalMs = null, exec = null,
 		if (stopped) return;
 		let next = null;
 		try {
-			next = resolve(serial, packageName, { exec });
+			next = await resolve(serial, packageName, {
+				exec,
+				signal
+			});
 		} catch {}
 		if (next && next !== current) {
 			current = next;
@@ -211,9 +230,12 @@ function watchAppPid({ serial, packageName, pid, intervalMs = null, exec = null,
 			if (timer) clearTimer(timer);
 			timer = null;
 		},
-		probe() {
+		async probe() {
 			try {
-				return resolve(serial, packageName, { exec });
+				return await resolve(serial, packageName, {
+					exec,
+					signal
+				});
 			} catch {
 				return null;
 			}

package/dist/{android-DTAcRwBC.mjs → android-DriNoAVy.mjs}

@@ -1,10 +1,10 @@
-import { D as ownership_claim_exports, S as process_identity_exports, l as WorkspaceProcessCleanupError, m as declareSpawnsOn, o as cancellableSleep, t as getExecutor, v as stopDeclaringSpawnsOn } from "./exec-VFRpu1iA.mjs";
-import { M as withDirLock$1, N as withDirLockAsync$1 } from "./workspace-state-pUg3_RRA.mjs";
-import { C as saveConfig, D as withConfigLock$1, G as projectDeviceSlots, H as deviceSlotPlatforms, K as removeSlotDevice, O as withConfigLockAsync$1, _ as loadConfig$1, c as ensureConfig, d as getConfigDir, f as getConfigPath$1, z as assignSlotDevice } from "./config-BktkY_zC.mjs";
-import { n as runOperationFileQuiet, t as runOperationFile } from "./operation-exec-CUZifp6Z.mjs";
-import { c as androidDataPartitionSizeBytes } from "./settings-CosW5X-S.mjs";
-import { i as stimDesktopInstalledAsync, n as settingDefault, t as STIM_DESKTOP_OPEN_OPTIONS } from "./stim-desktop-6Dqp-gjX.mjs";
-import { c as pidExists, p as signalProcessTreeAsync } from "./metro-CjC10t6E.mjs";
+import { D as ownership_claim_exports, S as process_identity_exports, l as WorkspaceProcessCleanupError, m as declareSpawnsOn, o as cancellableSleep, t as getExecutor, v as stopDeclaringSpawnsOn } from "./exec-aULwtNly.mjs";
+import { M as withDirLock$1, N as withDirLockAsync$1 } from "./workspace-state-BjqdjnJR.mjs";
+import { C as saveConfig, D as withConfigLock$1, G as projectDeviceSlots, H as deviceSlotPlatforms, K as removeSlotDevice, O as withConfigLockAsync$1, _ as loadConfig$1, c as ensureConfig, d as getConfigDir, f as getConfigPath$1, z as assignSlotDevice } from "./config-Cn94Jc0g.mjs";
+import { n as runOperationFileQuiet, t as runOperationFile } from "./operation-exec-Dp4FuIGR.mjs";
+import { c as androidDataPartitionSizeBytes } from "./settings-BDVI8Ivc.mjs";
+import { i as stimDesktopInstalledAsync, n as settingDefault, t as STIM_DESKTOP_OPEN_OPTIONS } from "./stim-desktop-CbWo21kb.mjs";
+import { c as pidExists, p as signalProcessTreeAsync } from "./metro-CvyD-xwe.mjs";
 import { renameSync, rmSync, writeFileSync } from "node:fs";
 import { isDeepStrictEqual } from "node:util";
 import { join } from "node:path";
@@ -1421,16 +1421,25 @@ function listAvdEmulatorProcesses(avdName, platform) {
 	], { timeoutMs: 5e3 });
 	return out === null ? null : parseAvdEmulatorProcesses(out, avdName);
 }
+const PROCESS_TABLE_READ_TIMEOUTS_MS = [5e3, 15e3];
+async function readProcessTableAsync(operation, args, options = {}) {
+	for (const timeoutMs of PROCESS_TABLE_READ_TIMEOUTS_MS) {
+		const out = await runOperationFileQuiet(operation, getExecutor(), "ps", args, {
+			timeoutMs,
+			killSignal: "SIGKILL",
+			...options
+		});
+		if (out !== null) return out;
+	}
+	return null;
+}
 async function listAvdEmulatorProcessesAsync(avdName, platform, operation) {
 	if (platform === "win32") return [];
-	const out = await runOperationFileQuiet(operation, getExecutor(), "ps", [
+	const out = await readProcessTableAsync(operation, [
 		"-axww",
 		"-o",
 		"pid=,command="
-	], {
-		timeoutMs: 5e3,
-		killSignal: "SIGKILL"
-	});
+	]);
 	return out === null ? null : parseAvdEmulatorProcesses(out, avdName);
 }
 function scanAvdEmulatorProcesses(avdName, platform, listProcesses) {
@@ -1463,16 +1472,12 @@ async function assertOwnedAvdStoppedAsync(avdName, operation, resolveDirectory =
 	if (processes === null) throw new Error(`Could not read the process table to verify that owned AVD ${avdName} stopped.`);
 	const live = new Set(processes);
 	if (processId !== null && pidExists(processId)) {
-		const stat = process.platform === "win32" ? null : await runOperationFileQuiet(operation, getExecutor(), "ps", [
+		const stat = process.platform === "win32" ? null : await readProcessTableAsync(operation, [
 			"-o",
 			"stat=",
 			"-p",
 			String(processId)
-		], {
-			timeoutMs: 5e3,
-			killSignal: "SIGKILL",
-			cwd: operation?.cwd
-		});
+		], { cwd: operation?.cwd });
 		if (stat === null || !stat.trim().startsWith("Z")) live.add(processId);
 	}
 	if (live.size) throw new Error(`Owned AVD ${avdName} still has a live emulator process (${[...live].join(", ")}).`);

package/dist/{android-cas-BTVhZ0Qs.mjs → android-cas-D5e6ecUg.mjs}

@@ -1,7 +1,7 @@
-import { M as withDirLock$1, _ as ensureWorkspaceStorage } from "./workspace-state-pUg3_RRA.mjs";
-import { d as getConfigDir } from "./config-BktkY_zC.mjs";
-import { m as defaultAndroidLayout } from "./settings-CosW5X-S.mjs";
-import { r as register } from "./cache-manifest-BEZ9Bpl1.mjs";
+import { M as withDirLock$1, _ as ensureWorkspaceStorage } from "./workspace-state-BjqdjnJR.mjs";
+import { d as getConfigDir } from "./config-Cn94Jc0g.mjs";
+import { m as defaultAndroidLayout } from "./settings-BDVI8Ivc.mjs";
+import { r as register } from "./cache-manifest-DEjqGGat.mjs";
 import { createHash, randomUUID } from "node:crypto";
 import { accessSync, constants, existsSync, mkdirSync, readFileSync, realpathSync, renameSync, statSync, writeFileSync } from "node:fs";
 import { join } from "node:path";

package/dist/android-cas-compiler.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as getExecutor } from "./exec-VFRpu1iA.mjs";
+import { t as getExecutor } from "./exec-aULwtNly.mjs";
 import { createHash, randomUUID } from "node:crypto";
 import { appendFileSync, existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { join } from "node:path";

package/dist/api.d.mts

@@ -19,7 +19,7 @@ interface ReleasedLease {
 }
 //#endregion
 //#region src/commands/gc/results.d.ts
-type GcResultKind = "archive" | "device" | "parkedDevice" | "parkedHostedDevice" | "idleDevice" | "deviceRecord" | "workspaceOutputs" | "recording" | "workspaceDirectory" | "project" | "buildLock" | "buildSlot" | "deviceLease" | "easSession" | "worktree" | "cache" | "statusCache" | "tempLeftover" | "trash" | "watchmanRoot" | "watchman" | "gradleDaemon" | "gradleVersion" | "kotlinDaemon" | "devServer" | "workspaceLogs" | "ledgerEntry" | "easLedgerEntry";
+type GcResultKind = "archive" | "device" | "parkedDevice" | "parkedHostedDevice" | "idleDevice" | "deviceRecord" | "workspaceOutputs" | "worktreeDependencies" | "recording" | "workspaceDirectory" | "project" | "buildLock" | "buildSlot" | "deviceLease" | "easSession" | "worktree" | "cache" | "statusCache" | "tempLeftover" | "trash" | "watchmanRoot" | "watchman" | "gradleDaemon" | "gradleVersion" | "kotlinDaemon" | "devServer" | "workspaceLogs" | "ledgerEntry" | "easLedgerEntry";
 type GcResultStatus = "done" | "kept" | "failed";
 interface GcResult {
   kind: GcResultKind;
@@ -259,8 +259,12 @@ interface DoctorReport {
   maintenance: ReturnType<typeof maintenanceStatus> & {
     logPath: string;
   };
-  remoteMachines: BuildMachinesInspection["machines"];
-  deviceHosts: Awaited<ReturnType<typeof inspectDeviceHostMachines>>["machines"];
+  remoteMachines: Array<BuildMachinesInspection["machines"][number] & {
+    priority?: number;
+  }>;
+  deviceHosts: Array<Awaited<ReturnType<typeof inspectDeviceHostMachines>>["machines"][number] & {
+    priority?: number;
+  }>;
   toolchain: ToolchainReport | null;
   findings: Finding[];
 }
@@ -684,6 +688,11 @@ interface GcJsonSections {
     reason: WorkspaceLogsKeptCode | null;
     detail: string | null;
   }[];
+  worktreeDependencies: {
+    path: string;
+    willDelete: boolean;
+    detail: string | null;
+  }[];
   recordings: {
     dir: string;
     projectRoot: string | null;
@@ -697,6 +706,7 @@ interface GcJsonSections {
   workspaceBuildOutputs: {
     dir: string;
     projectRoot: string | null;
+    inTreeDirs: string[];
     bytes: number | null;
     idleDays: number | null;
     willClear: boolean;