stim 1.23.1 → 1.25.0

package/README.md

@@ -188,8 +188,9 @@ refuses with `STIM_CLAIM_UNAVAILABLE` instead of a cancellation or timeout
 error. Child cleanup errors name the launcher PID; unverifiable processes and descendants
 are left untouched. On POSIX, a launcher that exited before identity capture can only
 finish successfully once its process group is proven gone.
-After a termination request, cleanup waits at most one second for a child to
-close. Overall cleanup has a 35 second budget, including temporary-worktree
+After a termination request, cleanup waits for a child to close, then for its
+process group to exit: each wait is 5 seconds times the host's load per CPU,
+from 5 to 15 seconds. Overall cleanup has a 35 second budget, including temporary-worktree
 removal; unfinished cleanup returns `STIM_CLAIM_UNAVAILABLE` and leaves
 unresolved resources in place. Credential refresh waits asynchronously and
 checks cancellation before writing.

package/dist/{acquire-artifact-BzYRDgaP.mjs → acquire-artifact-zA4S7RHE.mjs}

@@ -1,5 +1,5 @@
-import { r as WorkspaceProcessCleanupError } from "./exec-DEoAhcze.mjs";
-import { I as waitForSharedBuild } from "./activity-BpWUPgUm.mjs";
+import { l as WorkspaceProcessCleanupError } from "./exec-VFRpu1iA.mjs";
+import { I as waitForSharedBuild } from "./activity-BpjwrQXU.mjs";
 import { rmSync } from "node:fs";
 //#region src/engine/artifact-lifecycle.ts
 async function runArtifactLifecycle(phases) {

package/dist/{act-vxiMwdf5.mjs → act-BbHS3oV8.mjs}

@@ -1,23 +1,23 @@
-import { n as isTimeoutError, r as WorkspaceProcessCleanupError, t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { l as WorkspaceProcessCleanupError, n as isTimeoutError, t as getExecutor } from "./exec-VFRpu1iA.mjs";
 import { g as workspaceStateFile$1, m as workspaceLogsDir$1 } from "./paths-DQtTgsBf.mjs";
-import { F as isOnMountedVolume, G as projectDeviceSlots, I as listMountedVolumes, L as measuredDirectorySizeAsync, N as directorySizeAsync, P as formatBytes, _ as loadConfig$1, p as getProject } from "./config-DlrsduwG.mjs";
-import { o as formatLongDuration, u as plural } from "./command-output-YKGWivpG.mjs";
-import { c as gitQuiet, l as gitQuietAsync, n as runOperationFileQuiet, r as childEnvironment } from "./operation-exec-BW0em61G.mjs";
-import { r as readWorkspaceState$1, u as workspaceLastUsed } from "./workspace-state-U08dEzhG.mjs";
-import { E as maintenanceKeepSetting, Et as listWorktreesAsync, Ft as resolveFullRefAsync, It as resolveSourceCheckoutAsync, J as resolveProjectSettingsAsync, Rt as sourceCheckoutOf, St as hasUncommittedWorkAsync, Tt as listWorktrees, Wt as removeTemporaryEntryAsync, bt as hasPopulatedSubmodulesAsync, gt as dirtyPathsAsync, q as resolveProjectSettings, zt as unpushedCommitsAsync } from "./settings-C7O8A6ZI.mjs";
-import { i as findProjectRoot$1 } from "./project-DhCtQWWU.mjs";
-import { a as unregister, n as readManifest } from "./cache-manifest-DSeQjt-Q.mjs";
-import { A as workspaceBuildInProgress, E as collectOwnedDeviceActivityAsync, St as deleteProjectDevices, T as collectOwnedDeviceActivity, Tt as deviceSweepIsScoped, X as emptyCaches, _r as phase, br as discoverCaches, bt as deleteParkedAvds, ct as deleteGradleVersion, d as trimmableCaches, f as stopOwnedMetro, fr as memorySweepIsScoped, gr as stopIdleGradleDaemons, gt as DEVICE_LIST_TIMEOUT_MS, i as enforceBudget, kt as findStaleProjectDevices, nt as planCacheEmptying, o as machineNumber, pt as waitForGradleExit, r as cacheLabel, sr as collectMemoryReport, st as collectGradleVersions, u as resolveBudget, vt as collectParkedAvds, xr as pruneCache, xt as deleteParkedSims, yt as collectParkedSims } from "./budget-3ivAK99e.mjs";
+import { F as isOnMountedVolume, G as projectDeviceSlots, I as listMountedVolumes, L as measuredDirectorySizeAsync, N as directorySizeAsync, P as formatBytes, _ as loadConfig$1, p as getProject } from "./config-BZhXY15H.mjs";
+import { o as formatLongDuration, u as plural } from "./command-output-BBvS1H6v.mjs";
+import { c as gitQuiet, l as gitQuietAsync, n as runOperationFileQuiet, r as childEnvironment } from "./operation-exec-CUZifp6Z.mjs";
+import { r as readWorkspaceState$1, u as workspaceLastUsed } from "./workspace-state-CPSp3mav.mjs";
+import { Bt as unpushedCommitsAsync, Ct as hasUncommittedWorkAsync, D as maintenanceKeepSetting, Dt as listWorktreesAsync, Et as listWorktrees, Gt as removeTemporaryEntryAsync, It as resolveFullRefAsync, J as resolveProjectSettings, Lt as resolveSourceCheckoutAsync, Y as resolveProjectSettingsAsync, _t as dirtyPathsAsync, xt as hasPopulatedSubmodulesAsync, zt as sourceCheckoutOf } from "./settings-B5tCoq9N.mjs";
+import { i as findProjectRoot$1 } from "./project-BiC68mIp.mjs";
+import { F as listAvdsAsync, G as ownedAvdSerialResolverAsync, P as listAvds, V as ownedAvdDirectory, yt as readParked } from "./android-Cjcj8MCw.mjs";
+import { a as unregister, n as readManifest } from "./cache-manifest-BPXRONJz.mjs";
+import { A as workspaceBuildInProgress, Cr as discoverCaches, Ct as deleteParkedSims, Dt as deviceSweepIsScoped, E as collectOwnedDeviceActivityAsync, Q as emptyCaches, St as deleteParkedAvds, T as collectOwnedDeviceActivity, br as phase, bt as collectParkedAvds, d as trimmableCaches, f as stopOwnedMetro, hr as memorySweepIsScoped, ht as waitForGradleExit, i as enforceBudget, it as planCacheEmptying, jt as findStaleProjectDevices, lt as collectGradleVersions, o as machineNumber, r as cacheLabel, u as resolveBudget, ur as collectMemoryReport, ut as deleteGradleVersion, vt as DEVICE_LIST_TIMEOUT_MS, wr as pruneCache, wt as deleteProjectDevices, xt as collectParkedSims, yr as stopIdleGradleDaemons } from "./budget-HyShrIpL.mjs";
 import { t as canonicalPath } from "./paths-BsJMoPP2.mjs";
-import { V as takeGcResults, a as collectWorkspaceOutputs, c as listWorkspaceDirs, f as withIdleWorkspace, i as collectOrphanedWorkspaces, m as workspaceInUseAsync, o as deleteOrphanedWorkspaces, p as workspaceInUse, r as clearWorkspaceOutputs, s as isInsideWorkspaces, z as GC_OUTPUT } from "./workspaces-e41xsjKr.mjs";
-import { N as listBuildLocks, b as leaseIsExpired, g as workspaceActivity, x as listLeaseFiles } from "./activity-BpWUPgUm.mjs";
-import { F as listAvdsAsync, G as ownedAvdSerialResolverAsync, P as listAvds, V as ownedAvdDirectory, vt as readParked } from "./android-C7sVmyI9.mjs";
-import { d as listAllIosSims, f as listAllIosSimsAsync } from "./ios-hcBpnEGk.mjs";
-import { s as metroStoreRoot } from "./errors-ccaPc4ox.mjs";
+import { B as GC_OUTPUT, H as takeGcResults, a as collectWorkspaceOutputs, c as listWorkspaceDirs, d as workspaceDirRemoved, h as workspaceInUseAsync, i as collectOrphanedWorkspaces, m as workspaceInUse, o as deleteOrphanedWorkspaces, p as withIdleWorkspace, r as clearWorkspaceOutputs, s as isInsideWorkspaces } from "./workspaces-C9w4aeXF.mjs";
+import { N as listBuildLocks, b as leaseIsExpired, g as workspaceActivity, x as listLeaseFiles } from "./activity-BpjwrQXU.mjs";
+import { d as listAllIosSims, f as listAllIosSimsAsync } from "./ios-BQzvJlzw.mjs";
+import { s as metroStoreRoot } from "./errors-DHm_U5gv.mjs";
 import { t as resolveMaintenanceSettings } from "./settings-Djl-mpjX.mjs";
-import { A as levelFloors, C as measureDisk, E as measurePressureAsync, M as lowestFree, N as protectWindowMs, S as cacheBlocked, T as measurePressure, a as matchWorktreeEntry, c as reclaimKeys, i as excludeWatchmanCookies, k as diskPressureLevel, m as removeWorktreeTarget, o as nestedWorktrees, r as excludePodChurn, s as porcelainPath, w as measureDiskAsync } from "./worktree-B4Nj3EGS.mjs";
-import { c as FETCH_FRESH_MS, d as localDefaultBranchAsync, l as fetchDefaultBranchAsync, o as recordPullRequestLookup, p as mergeStateAsync, u as lastFetchedAtAsync } from "./warm-progress-CA3TgT3-.mjs";
-import { n as describePullRequest, r as endedPullRequest, s as pullRequestLookups } from "./pull-request-W1IuLXDt.mjs";
+import { A as measurePressureAsync, D as measureDisk, E as cacheBlocked, I as lowestFree, L as protectWindowMs, N as diskPressureLevel, O as measureDiskAsync, P as levelFloors, a as matchWorktreeEntry, c as reclaimKeys, i as excludeWatchmanCookies, k as measurePressure, m as removeWorktreeTarget, o as nestedWorktrees, r as excludePodChurn, s as porcelainPath } from "./worktree-CclFIe1Z.mjs";
+import { c as FETCH_FRESH_MS, d as localDefaultBranchAsync, l as fetchDefaultBranchAsync, o as recordPullRequestLookup, p as mergeStateAsync, u as lastFetchedAtAsync } from "./warm-progress-BV3ZPmcY.mjs";
+import { n as describePullRequest, r as endedPullRequest, s as pullRequestLookups } from "./pull-request-CbNlkFok.mjs";
 import { readClaimSet } from "@stim-cli/core/ownership-claim";
 import { existsSync, lstatSync, readdirSync, realpathSync, rmSync, statSync } from "node:fs";
 import { tmpdir } from "node:os";
@@ -1700,20 +1700,33 @@ const STIM_PREFIXES = [
 const STAGING_PREFIX = ".stim-delete-";
 const TRACE_PATTERN = /^instruments.*\.ktrace$/;
 const TRACE_PROCESSES = /* @__PURE__ */ new Set(["xctrace", "Instruments"]);
+const SWIFTPM_PATTERN = /^TemporaryDirectory\.[A-Za-z0-9]{6}$/;
+const SWIFTPM_PROCESSES = /* @__PURE__ */ new Set([
+	"swift",
+	"swift-build",
+	"swift-frontend",
+	"swift-package",
+	"swift-run",
+	"swift-test",
+	"xcodebuild"
+]);
 const REMEDIES = {
 	stim: "stim gc --delete removes them once they are idle for 24 hours",
 	xctrace: "stim gc --delete removes them once they are idle for 24 hours and no xctrace or Instruments process runs; export a recording you need first",
+	swiftpm: "stim gc --delete removes them once they are idle for 24 hours and no swift or xcodebuild process runs",
 	jest: "Jest owns this cache; clear it with `npx jest --clearCache`"
 };
 const LABELS = {
 	stim: "Stim temp directories",
 	xctrace: "xctrace recordings (instruments*.ktrace)",
+	swiftpm: "SwiftPM temp directories (TemporaryDirectory.*)",
 	jest: "Jest cache"
 };
 function kindOf(name, stat, jestName) {
 	const unstaged = name.startsWith(STAGING_PREFIX) ? name.slice(13) : name;
 	if (stat.isDirectory() && STIM_PREFIXES.some((prefix) => unstaged.startsWith(prefix))) return "stim";
 	if ((stat.isFile() || stat.isDirectory()) && TRACE_PATTERN.test(name)) return "xctrace";
+	if (stat.isDirectory() && SWIFTPM_PATTERN.test(name)) return "swiftpm";
 	if (stat.isDirectory() && name === jestName) return "jest";
 	return null;
 }
@@ -1812,8 +1825,8 @@ function temporaryRoot(env) {
 }
 /**
 * Recognized leftovers directly inside the user's TMPDIR, never following a symlink: Stim's own temp directories,
-* xctrace recordings and Jest's cache. Only the first two are ever deleted, and only once nothing in them changed for
-* 24 hours. Null with STIM_HOME set, because TMPDIR is shared by every Stim home, and for the real TMPDIR a test
+* xctrace recordings, SwiftPM's `TemporaryDirectory.*` and Jest's cache. All but Jest's are deleted, and only once
+* nothing in them changed for 24 hours. Null with STIM_HOME set, because TMPDIR is shared by every Stim home, and for the real TMPDIR a test
 * process recorded in STIM_TEST_GUARD_REAL_TMPDIR.
 */
 async function collectTempLeftovers({ now = Date.now(), env = process.env, signal, operation } = {}) {
@@ -1833,16 +1846,16 @@ async function collectTempLeftovers({ now = Date.now(), env = process.env, signa
 	const registeredProjects = () => Object.keys(loadConfig$1()?.projects ?? {}).flatMap((key) => [key, canonicalKey(key)]);
 	let projects = registeredProjects();
 	let executables;
-	const traceBusy = async () => {
+	const busy = async (processes) => {
 		if (executables === void 0) executables = await runningExecutables(operation, signal);
 		const listed = executables;
 		if (listed === null) return "the running processes could not be listed";
-		const running = [...TRACE_PROCESSES].filter((name) => listed.has(name));
+		const running = [...processes].filter((name) => listed.has(name));
 		return running.length ? `${running.join(" and ")} is running` : null;
 	};
 	const judge = async (path, stat, kind, identity = path) => {
 		const scan = await walk(path, stat, signal);
-		const kept = now - scan.newest < MIN_AGE_MS ? `modified within the last ${TEMP_LEFTOVER_MIN_AGE_HOURS}h` : kind === "stim" ? stimKept(identity, scan, projects) : scan.unreadable ?? await traceBusy();
+		const kept = now - scan.newest < MIN_AGE_MS ? `modified within the last ${TEMP_LEFTOVER_MIN_AGE_HOURS}h` : kind === "stim" ? stimKept(identity, scan, projects) : scan.unreadable ?? await busy(kind === "xctrace" ? TRACE_PROCESSES : SWIFTPM_PROCESSES);
 		return {
 			bytes: scan.bytes,
 			kept
@@ -1851,7 +1864,7 @@ async function collectTempLeftovers({ now = Date.now(), env = process.env, signa
 	const recheck = async (staged, original, kind) => {
 		const stat = await lstatOrError(staged);
 		if (!stat || "error" in stat || stat.isSymbolicLink()) return "it changed while it was being deleted";
-		if (kind === "xctrace") executables = void 0;
+		if (kind !== "stim") executables = void 0;
 		else projects = registeredProjects();
 		return (await judge(staged, stat, kind, original)).kept;
 	};
@@ -1896,6 +1909,7 @@ function summarize(report) {
 	return [
 		"stim",
 		"xctrace",
+		"swiftpm",
 		"jest"
 	].flatMap((kind) => {
 		const entries = report.entries.filter((entry) => entry.kind === kind);
@@ -1950,7 +1964,7 @@ async function deleteTempLeftovers(options = {}, output = GC_OUTPUT) {
 		try {
 			if (entry.kind === "jest") continue;
 			const name = basename(entry.path);
-			const staged = entry.kind === "xctrace" || name.startsWith(STAGING_PREFIX) ? entry.path : join(report.root, `${STAGING_PREFIX}${name}`);
+			const staged = entry.kind !== "stim" || name.startsWith(STAGING_PREFIX) ? entry.path : join(report.root, `${STAGING_PREFIX}${name}`);
 			const before = staged === entry.path ? null : await report.recheck?.(entry.path, entry.path, entry.kind) ?? null;
 			if (before) {
 				output.record("tempLeftover", "kept", entry.path, {
@@ -2062,7 +2076,7 @@ async function planLevel2({ settings, sizes, protectedRoot, pinned, now, operati
 		kind: "would-delete-temp-leftovers",
 		target: leftovers.root,
 		bytes: deletable.reduce((sum, entry) => sum + entry.bytes, 0),
-		reason: "disk pressure level 2, Stim temp directories and xctrace recordings unmodified for 24 hours",
+		reason: "disk pressure level 2, Stim temp directories, xctrace recordings and SwiftPM temp directories unmodified for 24 hours",
 		level: 2
 	});
 	const options = {
@@ -2242,7 +2256,7 @@ async function planPressureLevels(level, context) {
 function triggeringRoot(operation) {
 	return canonicalPath(findProjectRoot$1(operation?.cwd ?? process.cwd()) ?? join(configDir(), "maintenance", "no-project"));
 }
-async function plannedMaintenance(pressure, sizes, settings, { devices = true, sweep = false, worktrees = false, refresh = true, operation } = {}) {
+async function plannedMaintenance(pressure, recordedSizes, settings, { devices = true, sweep = false, worktrees = false, refresh = true, operation } = {}) {
 	const env = operation?.env ?? process.env;
 	const resolved = resolveBudget({ env });
 	if (resolved.error) throw new Error(resolved.error);
@@ -2272,6 +2286,7 @@ async function plannedMaintenance(pressure, sizes, settings, { devices = true, s
 		signal: operation?.signal,
 		operation
 	});
+	const sizes = recordedSizes.filter((size) => size.category !== "workspace-outputs" || !workspaceDirRemoved(size.dir));
 	const currentSizes = sizes.map((size) => {
 		if (size.category === "compilation-cache") return {
 			...size,

package/dist/{activity-BpWUPgUm.mjs → activity-BpjwrQXU.mjs}

@@ -1,10 +1,10 @@
-import { c as declareSpawnsOn, f as stopDeclaringSpawnsOn, g as process_identity_exports, t as getExecutor, x as ownership_claim_exports } from "./exec-DEoAhcze.mjs";
+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 workspaceLogsDir$1, v as withDirLock$1, y as withDirLockAsync$1 } from "./paths-DQtTgsBf.mjs";
-import { U as parseDeviceSlotKey, V as deviceSlotKey, d as getConfigDir, q as validateDeviceSlot } from "./config-DlrsduwG.mjs";
-import { a as formatElapsed, i as formatDuration, m as shortHash } from "./command-output-YKGWivpG.mjs";
-import { n as runOperationFileQuiet } from "./operation-exec-BW0em61G.mjs";
-import { c as withWorkspaceStateLock, d as writeWorkspaceState, l as withWorkspaceStateLockAsync, n as clearWorkspaceStateKeys, r as readWorkspaceState$1 } from "./workspace-state-U08dEzhG.mjs";
-import { h as resolveBuild } from "./build-cache-Dv7RN200.mjs";
+import { U as parseDeviceSlotKey, V as deviceSlotKey, d as getConfigDir, q as validateDeviceSlot } from "./config-BZhXY15H.mjs";
+import { a as formatElapsed, i as formatDuration, m as shortHash } from "./command-output-BBvS1H6v.mjs";
+import { n as runOperationFileQuiet } from "./operation-exec-CUZifp6Z.mjs";
+import { c as withWorkspaceStateLock, d as writeWorkspaceState, l as withWorkspaceStateLockAsync, n as clearWorkspaceStateKeys, r as readWorkspaceState$1 } from "./workspace-state-CPSp3mav.mjs";
+import { y as resolveBuild } from "./build-cache-CKCzxzxA.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-CUlLsbRt.mjs → agent-device-usage-output-Bnkerfod.mjs}

@@ -1,8 +1,8 @@
-import { g as process_identity_exports } from "./exec-DEoAhcze.mjs";
-import { P as formatBytes } from "./config-DlrsduwG.mjs";
-import { o as formatLongDuration } from "./command-output-YKGWivpG.mjs";
-import { F as writeUsageCache, N as canonical, P as measureDu, c as listWorkspaceDirs } from "./workspaces-e41xsjKr.mjs";
-import { c as parseAgentDeviceRecord, o as envDir, u as processMatches } from "./activity-BpWUPgUm.mjs";
+import { S as process_identity_exports } from "./exec-VFRpu1iA.mjs";
+import { P as formatBytes } from "./config-BZhXY15H.mjs";
+import { o as formatLongDuration } from "./command-output-BBvS1H6v.mjs";
+import { F as measureDu, I as writeUsageCache, P as canonical, c as listWorkspaceDirs } from "./workspaces-C9w4aeXF.mjs";
+import { c as parseAgentDeviceRecord, o as envDir, u as processMatches } from "./activity-BpjwrQXU.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-DtfRGLcc.mjs → android-BGwuK3Mc.mjs}

@@ -1,40 +1,41 @@
-import { t as getExecutor, x as ownership_claim_exports } from "./exec-DEoAhcze.mjs";
+import { D as ownership_claim_exports, t as getExecutor } from "./exec-VFRpu1iA.mjs";
 import { m as workspaceLogsDir$1, t as emulatorLogFile } from "./paths-DQtTgsBf.mjs";
-import { B as deviceSlotFileKey, E as upsertProject, H as deviceSlotPlatforms, W as parseDeviceSlotOption, p as getProject, q as validateDeviceSlot, u as getConcurrencyLimits } from "./config-DlrsduwG.mjs";
-import { _ as stepTimer, f as refuseNoProject, g as stepClock, i as formatDuration, l as phaseLine } from "./command-output-YKGWivpG.mjs";
-import { d as writeWorkspaceState, i as recordWorkspaceUse, r as readWorkspaceState$1 } from "./workspace-state-U08dEzhG.mjs";
-import { G as resolveCacheProviderConfig, H as remoteEasFallbackSetting, J as resolveProjectSettingsAsync, L as projectSettingsContextAsync, N as metroWarmupUrlSetting, R as publicUrlSetting, Y as resolveSettings, a as SETTING_SHAPE_REMEDY, ct as detectProviders, g as deviceReclaimIdleMinutesSetting, j as metroPortSetting, rt as tunnelModeSetting } from "./settings-C7O8A6ZI.mjs";
-import { L as workspaceDevServerMode, f as projectRegistry, i as findProjectRoot$1, l as projectShortcut, t as NO_PROJECT_REFUSAL, z as writeWorkspaceLaunch } from "./project-DhCtQWWU.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-BZhXY15H.mjs";
+import { _ as stepTimer, f as refuseNoProject, g as stepClock, i as formatDuration, l as phaseLine } from "./command-output-BBvS1H6v.mjs";
+import { a as recordWorkspaceUseAsync, f as writeWorkspaceStateAsync, r as readWorkspaceState$1 } from "./workspace-state-CPSp3mav.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-B5tCoq9N.mjs";
+import { L as workspaceDevServerMode, f as projectRegistry, i as findProjectRoot$1, l as projectShortcut, t as NO_PROJECT_REFUSAL, z as writeWorkspaceLaunchAsync } from "./project-BiC68mIp.mjs";
+import { A as listAdbDevices, I as listInstalledSystemImages, St as configuredAndroidEmulatorApp, Y as physicalDeviceModel, Z as probeEmulatorSerial, a as androidDeviceAbi, ct as waitForBoot, nt as resolveOwnedAvdSerialAsync, rt as resolvePhysicalDevice } from "./android-Cjcj8MCw.mjs";
+import { c as pidExists, d as resolveProjectMetro } from "./metro-1pJgCX4U.mjs";
 import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
-import { c as pidExists, d as resolveProjectMetro } from "./metro-DiXtA3Ty.mjs";
-import { Bn as checkEasAuth, Bt as ensureMetroReachable, Cn as launchAndroidApp, Gt as resolveRemoteContext, H as tapBuildLog, In as runProcessOperation, J as recordRunStats, Jn as resolveRemote, K as recordCapacityRefusal, Lt as binOnPath, M as NO_BUILD_PROGRESS, Pn as exitAfterFlush, U as createRunRecorder, Ut as remoteAndroidDeps, V as startBuildProgress, Vt as ensureRemoteBootOwned, W as readRunEstimates, Y as statsProjectKey$1, Yn as uploadRemote, cn as DEFAULT_METRO_PORT, in as verifyLaunch, qn as resolveEasCliBin, rn as verifyAndroidReleaseLaunch, rr as ownedSessionName, sn as ADB_INSTALL_TIMEOUT_MS, t as budgetGate, wn as launchAndroidReleaseApp, yn as installAndroidApp } from "./budget-3ivAK99e.mjs";
-import { d as runCancellationSignal, f as withNativeBuildRun, r as cancelledFailure, u as runCancellation } from "./native-run-Dv88i0aU.mjs";
-import { I as acquireBuildSlot, R as releaseBuildSlot } from "./workspaces-e41xsjKr.mjs";
-import { F as waitForBuild, M as acquireBuildLock, P as releaseBuildLock } from "./activity-BpWUPgUm.mjs";
-import { A as listAdbDevices, I as listInstalledSystemImages, Y as physicalDeviceModel, Z as probeEmulatorSerial, a as androidDeviceAbi, ct as configuredAndroidEmulatorApp, et as resolveOwnedAvdSerialAsync, ot as waitForBoot, tt as resolvePhysicalDevice } from "./android-C7sVmyI9.mjs";
-import { t as CCACHE_NOT_RUN } from "./ccache-CH2EWGPB.mjs";
-import { h as setRemoteLogSink } from "./client-B4MMzfo_.mjs";
-import { i as parseBuildMachineOption, s as resolveBuildPlacement } from "./selection-DSMbWEX2.mjs";
-import { r as hostedMetroSettings } from "./metro-gateway-CKZqKqx7.mjs";
-import { a as writeHostedAndroid, i as writeDevicePlacement, t as readHostedAndroid } from "./ios-state-Dtw5K2aI.mjs";
-import { n as prepareHostedAndroid, t as placeHostedAndroid } from "./hosted-android-xcfgCgSF.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-C5fo5Edb.mjs";
-import { r as siblingPlatformSlots, t as launchSlotScope } from "./slot-launch-B7AuoWJv.mjs";
-import { c as startDevServer } from "./start-CU8mCPC7.mjs";
-import { a as acquireRunLease, d as runLease, f as waitFlagConflict, o as leaseExpiryText, u as releaseLeaseOnAbort } from "./device-lease-run-DXPSwdbb.mjs";
-import { n as DeviceAdmissionRefusal, r as checkDeviceCapacity } from "./device-capacity-DH0QsZYZ.mjs";
-import { a as resolveEasDevelopmentBuild, r as isEasBuildFailure } from "./eas-build-DMWSSvxq.mjs";
-import { n as ensureWorkspaceStorageSafely, r as isPhysicalDeviceRequest, t as ensureDevServer } from "./native-runtime-DBRfY_PN.mjs";
-import { n as devicePlacementRecord } from "./placement-log-BnGgJRRZ.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-CbXPbUMJ.mjs";
-import { t as acquireAndroidArtifact } from "./artifact-Xvgibgzq.mjs";
-import { a as reportAndroidResult, c as resolveAndroidRunPlan, i as persistLastBuild, n as finishAndroidUpload, o as androidDeviceSelectorRefusal } from "./result-utnBea7x.mjs";
-import { n as automaticDevicePlacement, r as devicePlacementLine, t as checkEasFallback } from "./eas-fallback-vKlrqxgE.mjs";
-import { a as AvdRecoveryError, i as AvdBootError, n as ensureBooted, o as warmMetro, r as ensureOwnedDevice, t as didSetUpDevice } from "./device-CiNYxqp6.mjs";
-import { t as selectFromPool } from "./device-pool-B4iOXIrD.mjs";
-import { r as finishAndroidRun } from "./launch-D-zq8SHG.mjs";
+import { Dn as launchAndroidReleaseApp, En as launchAndroidApp, G as createRunRecorder, Gt as remoteAndroidDeps, H as startBuildProgress, Ht as ensureMetroReachable, J as recordCapacityRefusal, K as readRunEstimates, Ln as exitAfterFlush, M as NO_BUILD_PROGRESS, Qn as uploadRemote, Sn as installAndroidApp, U as tapBuildLog, Un as checkEasAuth, Ut as ensureRemoteBootOwned, V as runFailureRecord, W as thrownRunFailureRecord, X as recordRunStats, Xn as resolveEasCliBin, Z as statsProjectKey$1, Zn as resolveRemote, dn as DEFAULT_METRO_PORT, on as verifyAndroidReleaseLaunch, or as ownedSessionName, qt as resolveRemoteContext, sn as verifyLaunch, t as budgetGate, un as ADB_INSTALL_TIMEOUT_MS, zn as runProcessOperation, zt as binOnPath } from "./budget-HyShrIpL.mjs";
+import { d as runCancellationSignal, f as withNativeBuildRun, r as cancelledFailure, u as runCancellation } from "./native-run-D5OJsGwA.mjs";
+import { L as acquireBuildSlot, z as releaseBuildSlot } from "./workspaces-C9w4aeXF.mjs";
+import { F as waitForBuild, M as acquireBuildLock, P as releaseBuildLock } from "./activity-BpjwrQXU.mjs";
+import { x as storedAppId } from "./build-cache-CKCzxzxA.mjs";
+import { t as CCACHE_NOT_RUN } from "./ccache-h1FKhZeg.mjs";
+import { S as setRemoteLogSink } from "./client-BQsmyp_-.mjs";
+import { a as parseBuildMachineOption, c as resolveBuildPlacement } from "./selection-D5cxEl3t.mjs";
+import { r as hostedMetroSettings } from "./metro-gateway-Bp9gJQAN.mjs";
+import { a as writeHostedAndroidAsync, i as writeDevicePlacementAsync, t as readHostedAndroid } from "./ios-state-CT9nV5SP.mjs";
+import { n as prepareHostedAndroid, t as placeHostedAndroid } from "./hosted-android-Bvb2-ZxD.mjs";
+import { n as verifyCollectorOwnership } from "./ownership-jxxz-19m.mjs";
+import { r as siblingPlatformSlots, t as launchSlotScope } from "./slot-launch-QeuJMlnJ.mjs";
+import { c as startDevServer } from "./start-YMpNwLhh.mjs";
+import { a as acquireRunLease, d as runLease, f as waitFlagConflict, o as leaseExpiryText, u as releaseLeaseOnAbort } from "./device-lease-run-ogEeJ62K.mjs";
+import { n as DeviceAdmissionRefusal, r as checkDeviceCapacity } from "./device-capacity-ZYaRALv5.mjs";
+import { a as resolveEasDevelopmentBuild, r as isEasBuildFailure } from "./eas-build-CyDKNTBP.mjs";
+import { n as ensureWorkspaceStorageSafely, r as isPhysicalDeviceRequest, t as ensureDevServer } from "./native-runtime-B9w_Qyz3.mjs";
+import { n as devicePlacementRecord } from "./placement-log-DjOXJRIH.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-Cxj9CmII.mjs";
+import { t as acquireAndroidArtifact } from "./artifact-Co8zixVx.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-CR2vk2cj.mjs";
+import { n as automaticDevicePlacement, r as devicePlacementLine, t as checkEasFallback } from "./eas-fallback-gaZi-dJL.mjs";
+import { a as AvdRecoveryError, i as AvdBootError, n as ensureBooted, o as warmMetro, r as ensureOwnedDevice, t as didSetUpDevice } from "./device-B9FqTBYW.mjs";
+import { t as selectFromPool } from "./device-pool-BIg8MU8l.mjs";
+import { r as finishAndroidRun } from "./launch-D0lPvFFu.mjs";
 import { t as unsupportedPlan } from "./project-plan-BPwbLwQu.mjs";
-import { a as refusePlan, i as printPlan, n as planFlagRefusal } from "./build-plan-BmbdHQbr.mjs";
+import { a as refusePlan, i as printPlan, n as planFlagRefusal } from "./build-plan-zCuHGlA8.mjs";
 import { basename, join } from "node:path";
 import { workspaceId } from "@stim-cli/core";
 import { hostedAndroidStatus, parseMachine } from "@stim-cli/core/state";
@@ -201,8 +202,8 @@ async function finishHostedAndroidRun({ target, artifact, root, slot = "default"
 			note: out,
 			enterPhase
 		});
-		writePlacement(root, slot, run.placement);
-		writeLaunch(root, "android", {
+		await writePlacement(root, slot, run.placement);
+		await writeLaunch(root, "android", {
 			appId: packageName,
 			deviceId: run.placement.session,
 			metroPort,
@@ -235,7 +236,7 @@ async function finishHostedAndroidRun({ target, artifact, root, slot = "default"
 			record: report.record,
 			startedAt,
 			durationMs: now() - started,
-			status: "success",
+			status: "ok",
 			out
 		});
 		await finishAndroidUpload(artifact.uploadPending, artifact.remote, phase);
@@ -339,7 +340,7 @@ function runAndroidOperation(context, root, opts = {}) {
 		platform: PLATFORM,
 		slot: opts.slot ?? "default"
 	}, async (claim) => {
-		recordWorkspaceUse(root, /* @__PURE__ */ new Date(), context.env, context.cwd);
+		await recordWorkspaceUseAsync(root, /* @__PURE__ */ new Date(), context.env, context.cwd, context.signal);
 		const progress = startBuildProgress({
 			root,
 			platform: PLATFORM,
@@ -371,10 +372,10 @@ function runAndroidOperation(context, root, opts = {}) {
 		}
 	}, { write: (line) => context.output("stderr", `${chalk.dim(phaseLine("lock", line))}\n`) });
 }
-function resolveRunAndroidOptions({ context, root, json = false, remoteDevice: commandRemoteBackend = null, resolveSettingsFor = resolveSettings, resolveRemoteDeviceContext = resolveRemoteContext, remoteDeviceDeps: makeRemoteDeviceDeps = remoteAndroidDeps, resolveEasBin = resolveEasCliBin, ensureMetroReachable: ensureRemoteMetro = ensureMetroReachable, ensureRemoteBootOwned: ensureRemoteOwned = ensureRemoteBootOwned, detectRemoteProviders = detectProviders, metroCheck = true, useBuildCache = true, easProfile, resolveEasDevelopmentBuild: resolveEasBuild = resolveEasDevelopmentBuild, variant: variantFlag = null, systemImage: systemImageFlag = null, deviceProfile: deviceProfileFlag, device: deviceFlag = null, wait: waitFlag = void 0, waitConflict = false, acquireLease = acquireRunLease, makeRunLease = runLease, selectPool = selectFromPool, onLeaseSignal = releaseLeaseOnAbort, listDevices = listAdbDevices, deviceModel = physicalDeviceModel, deviceAbi = androidDeviceAbi, isEmulatorDevice = probeEmulatorSerial, readApkPackage = async (apkPath) => apkPackage(await dumpApkManifest(apkPath, { context })), getLimits = getConcurrencyLimits, checkCapacity = checkDeviceCapacity, acquireSlot = acquireBuildSlot, releaseSlot = releaseBuildSlot, ensureDevice = ensureOwnedDevice, listSystemImages = listInstalledSystemImages, listDeviceProfiles, ensureDeviceBooted = ensureBooted, resolveAvdSerial = resolveOwnedAvdSerialAsync, waitForDeviceBoot = waitForBoot, dataFreeBytes, trimCaches, wipeDevice, resolveMetro = resolveProjectMetro, warmMetro: prewarmMetro = warmMetro, startServer = startDevServer, readState = readWorkspaceState$1, pidAlive = pidExists, verifyCollector = verifyCollectorOwnership, verifyLaunched = verifyLaunch, ensureStorage = ensureWorkspaceStorageSafely, acquireLock = acquireBuildLock, releaseLock = releaseBuildLock, waitForBuild: waitForBuild$1 = waitForBuild, easAuth = checkEasAuth, resolveRemoteBuild = resolveRemote, uploadRemoteBuild = uploadRemote, resolveCacheProvider = resolveCacheProviderConfig, loadCacheProviderModule = loadCacheProvider, install = installAndroidApp, launch = launchAndroidApp, launchRelease = launchAndroidReleaseApp, verifyReleaseLaunched = verifyAndroidReleaseLaunch, resolveDevClientScheme = (projectRoot, apkPath, options) => androidDevClientScheme(projectRoot, apkPath, {
+function resolveRunAndroidOptions({ context, root, json = false, remoteDevice: commandRemoteBackend = null, resolveSettingsFor = resolveSettings, resolveRemoteDeviceContext = resolveRemoteContext, remoteDeviceDeps: makeRemoteDeviceDeps = remoteAndroidDeps, resolveEasBin = resolveEasCliBin, ensureMetroReachable: ensureRemoteMetro = ensureMetroReachable, ensureRemoteBootOwned: ensureRemoteOwned = ensureRemoteBootOwned, detectRemoteProviders = detectProviders, metroCheck = true, useBuildCache = true, easProfile, resolveEasDevelopmentBuild: resolveEasBuild = resolveEasDevelopmentBuild, variant: variantFlag = null, systemImage: systemImageFlag = null, deviceProfile: deviceProfileFlag, device: deviceFlag = null, wait: waitFlag = void 0, waitConflict = false, acquireLease = acquireRunLease, makeRunLease = runLease, selectPool = selectFromPool, onLeaseSignal = releaseLeaseOnAbort, listDevices = listAdbDevices, deviceModel = physicalDeviceModel, deviceAbi = androidDeviceAbi, isEmulatorDevice = probeEmulatorSerial, readApkPackage = async (apkPath) => apkPackage(await dumpApkManifest(apkPath, { context })), getLimits = getConcurrencyLimits, checkCapacity = checkDeviceCapacity, acquireSlot = acquireBuildSlot, releaseSlot = releaseBuildSlot, ensureDevice = ensureOwnedDevice, listSystemImages = listInstalledSystemImages, listDeviceProfiles, ensureDeviceBooted = ensureBooted, resolveAvdSerial = resolveOwnedAvdSerialAsync, waitForDeviceBoot = waitForBoot, dataFreeBytes, trimCaches, wipeDevice, resolveMetro = resolveProjectMetro, warmMetro: prewarmMetro = warmMetro, startServer = startDevServer, readState = readWorkspaceState$1, pidAlive = pidExists, verifyCollector = verifyCollectorOwnership, verifyLaunched = verifyLaunch, ensureStorage = ensureWorkspaceStorageSafely, acquireLock = acquireBuildLock, releaseLock = releaseBuildLock, waitForBuild: waitForBuild$1 = waitForBuild, easAuth = checkEasAuth, resolveRemoteBuild = resolveRemote, uploadRemoteBuild = uploadRemote, resolveCacheProvider = resolveCacheProviderConfig, loadCacheProviderModule = loadCacheProvider, storedAppId: storedAppId$1 = storedAppId, install = installAndroidApp, launch = launchAndroidApp, launchRelease = launchAndroidReleaseApp, verifyReleaseLaunched = verifyAndroidReleaseLaunch, resolveDevClientScheme = (projectRoot, apkPath, options) => androidDevClientScheme(projectRoot, apkPath, {
 	...options,
 	context
-}), spawn = (cmd, args, opts) => getExecutor().spawn(cmd, args, opts), kill = (pid, signal) => process.kill(pid, signal), createWriter = createNdjsonWriter, writeLaunch = writeWorkspaceLaunch, writeState = writeWorkspaceState, recordBuild, recordStats = recordRunStats, recordCapacityRefusal: recordRefusal, readEstimates = readRunEstimates, now = Date.now, out = (line) => context ? context.output("stderr", `${line}\n`) : console.error(line), emit = (line) => context ? context.output("stdout", `${line}\n`) : console.log(line) } = {}) {
+}), spawn = (cmd, args, opts) => getExecutor().spawn(cmd, args, opts), kill = (pid, signal) => process.kill(pid, signal), createWriter = createNdjsonWriter, writeLaunch = writeWorkspaceLaunchAsync, writeState = writeWorkspaceStateAsync, recordBuild, recordStats = recordRunStats, recordCapacityRefusal: recordRefusal, readEstimates = readRunEstimates, now = Date.now, out = (line) => context ? context.output("stderr", `${line}\n`) : console.error(line), emit = (line) => context ? context.output("stdout", `${line}\n`) : console.log(line) } = {}) {
 	return {
 		root,
 		json,
@@ -434,6 +435,7 @@ function resolveRunAndroidOptions({ context, root, json = false, remoteDevice: c
 		uploadRemoteBuild,
 		resolveCacheProvider,
 		loadCacheProviderModule,
+		storedAppId: storedAppId$1,
 		install,
 		launch,
 		launchRelease,
@@ -512,7 +514,7 @@ function avdSetupFailure(error, root, logFile) {
 }
 async function runAndroid(options = {}) {
 	const { context } = options;
-	let { root, json, commandRemoteBackend, resolveSettingsFor, resolveRemoteDeviceContext, makeRemoteDeviceDeps, resolveEasBin, ensureRemoteMetro, ensureRemoteOwned, detectRemoteProviders, metroCheck, useBuildCache: requestedBuildCache, easProfile, resolveEasBuild, variantFlag, systemImageFlag, deviceProfileFlag, deviceFlag, waitFlag, waitConflict, acquireLease, makeRunLease, selectPool, onLeaseSignal, listDevices, deviceModel, deviceAbi, isEmulatorDevice, readApkPackage, getLimits, checkCapacity, acquireSlot, releaseSlot, ensureDevice, listSystemImages, listDeviceProfiles, ensureDeviceBooted, resolveAvdSerial, waitForDeviceBoot, dataFreeBytes, trimCaches, wipeDevice, resolveMetro, prewarmMetro, startServer, readState, pidAlive, verifyCollector, verifyLaunched, ensureStorage, acquireLock, releaseLock, waitForBuild, easAuth, resolveRemoteBuild, uploadRemoteBuild, resolveCacheProvider, loadCacheProviderModule, install, launch, launchRelease, verifyReleaseLaunched, resolveDevClientScheme, spawn, kill, createWriter, writeLaunch, writeState, recordBuild, recordStats, recordCapacityRefusal: recordRefusal = recordCapacityRefusal, readEstimates, now, out, emit } = androidSlotOptions(options);
+	let { root, json, commandRemoteBackend, resolveSettingsFor, resolveRemoteDeviceContext, makeRemoteDeviceDeps, resolveEasBin, ensureRemoteMetro, ensureRemoteOwned, detectRemoteProviders, metroCheck, useBuildCache: requestedBuildCache, easProfile, resolveEasBuild, variantFlag, systemImageFlag, deviceProfileFlag, deviceFlag, waitFlag, waitConflict, acquireLease, makeRunLease, selectPool, onLeaseSignal, listDevices, deviceModel, deviceAbi, isEmulatorDevice, readApkPackage, getLimits, checkCapacity, acquireSlot, releaseSlot, ensureDevice, listSystemImages, listDeviceProfiles, ensureDeviceBooted, resolveAvdSerial, waitForDeviceBoot, dataFreeBytes, trimCaches, wipeDevice, resolveMetro, prewarmMetro, startServer, readState, pidAlive, verifyCollector, verifyLaunched, ensureStorage, acquireLock, releaseLock, waitForBuild, easAuth, resolveRemoteBuild, uploadRemoteBuild, resolveCacheProvider, loadCacheProviderModule, storedAppId, install, launch, launchRelease, verifyReleaseLaunched, resolveDevClientScheme, spawn, kill, createWriter, writeLaunch, writeState, recordBuild, recordStats, recordCapacityRefusal: recordRefusal = recordCapacityRefusal, readEstimates, now, out, emit } = androidSlotOptions(options);
 	const progress = options.progress ?? NO_BUILD_PROGRESS;
 	const slot = validateDeviceSlot(options.slot);
 	const started = now();
@@ -589,13 +591,14 @@ async function runAndroid(options = {}) {
 	const recordRun = stats.record;
 	let ccacheActivity = CCACHE_NOT_RUN;
 	let reclaimed = [];
+	let artifactAcquired = false;
 	const fail = (code, message, remedy, { lastBuildStatus = false, setup = false, diagnostics = [], buildDiagnostics: rawDiagnostics = [], retainedClaimRoots, lines = [], logPath = null, lease } = {}) => {
 		const cancellation = cancelledFailure(context, PLATFORM, {
 			code,
 			message
 		});
 		if (cancellation) ({code, message, remedy, lines} = cancellation);
-		if (lastBuildStatus) persistLastBuild({
+		if (lastBuildStatus || artifactAcquired) persistLastBuild({
 			recordBuild,
 			root,
 			record,
@@ -606,6 +609,11 @@ async function runAndroid(options = {}) {
 			diagnostics: rawDiagnostics,
 			out
 		});
+		logPostBuildFailure(artifactAcquired, writer, runFailureRecord({
+			code,
+			message,
+			phase: progress.phase()
+		}));
 		out(phaseLine("error", chalk.red(`${code}: ${message}`)));
 		for (const diagnostic of diagnostics) out(phaseLine("error", chalk.red(diagnostic)));
 		for (const line of lines) out(phaseLine("", chalk.dim(line)));
@@ -684,8 +692,10 @@ async function runAndroid(options = {}) {
 		wait: waitFlag,
 		waitConflict,
 		remote: commandRemoteBackend,
-		buildCache: requestedBuildCache
+		buildCache: requestedBuildCache,
+		buildMachine: placement.selected
 	}, {
+		preflight: integration.preflight,
 		resolveCacheProvider,
 		runtimeKind: integration.runtimeKind,
 		variantProblem: integration.variantProblem,
@@ -766,7 +776,7 @@ async function runAndroid(options = {}) {
 	if ("failure" in hosting) return fail(hosting.failure.code, hosting.failure.message, hosting.failure.remedy);
 	const { target, hostedTarget, budget, selectors } = hosting;
 	record.devicePlacement = hosting.devicePlacement;
-	writeDevicePlacement(root, slot, PLATFORM, record.devicePlacement);
+	await writeDevicePlacementAsync(root, slot, PLATFORM, record.devicePlacement);
 	const physical = target.kind === "physical";
 	const remoteBackend = target.kind === "remote" ? target.backend : null;
 	if (hostedTarget) {
@@ -811,12 +821,12 @@ async function runAndroid(options = {}) {
 	const appIds = await integration.appIds();
 	let androidPackage = appIds.androidPackage;
 	record.bundleId = androidPackage;
-	const registerProject = () => upsertProject(root, {
+	const registerProject = () => withConfigLockAsync$1(() => upsertProject(root, {
 		bundleId: appIds.bundleId ?? void 0,
 		androidPackage: androidPackage ?? void 0,
 		isExpo
-	});
-	if (remoteBackend !== "eas") registerProject();
+	}));
+	if (remoteBackend !== "eas") await registerProject();
 	const project = getProject(root);
 	const label = projectShortcut(root, project);
 	let remoteDevice = null;
@@ -1046,7 +1056,9 @@ async function runAndroid(options = {}) {
 			platform: "android",
 			isExpo,
 			appId: androidPackage,
-			bundleUrl: metroWarmupUrlSetting(settings, "android")
+			bundleUrl: metroWarmupUrlSetting(settings, "android"),
+			logsDir,
+			root
 		});
 		const acquiredArtifact = await acquireAndroidArtifact({
 			context,
@@ -1101,6 +1113,7 @@ async function runAndroid(options = {}) {
 			resolveRemoteBuild,
 			uploadRemoteBuild,
 			loadCacheProviderModule,
+			storedAppId,
 			acquireSlot,
 			releaseSlot,
 			now
@@ -1116,6 +1129,7 @@ async function runAndroid(options = {}) {
 		ccacheActivity = artifact.ccache;
 		androidPackage = artifact.androidPackage;
 		record.appPath = apkPath;
+		artifactAcquired = true;
 		if (runCancellation(context)) return fail("STIM_CANCELLED", "before install");
 		if (hostedTarget) return finishHostedAndroidRun({
 			target: hostedTarget,
@@ -1129,7 +1143,7 @@ async function runAndroid(options = {}) {
 			logsDir,
 			selectors,
 			place: options.placeHostedAndroid ?? placeHostedAndroid,
-			writePlacement: options.writeHostedAndroid ?? writeHostedAndroid,
+			writePlacement: options.writeHostedAndroid ?? writeHostedAndroidAsync,
 			verifyLaunch: verifyLaunched,
 			writeLaunch,
 			readApkPackage,
@@ -1258,7 +1272,7 @@ async function runAndroid(options = {}) {
 				writer,
 				phase,
 				fail,
-				readApkPackage,
+				readApkPackage: (path) => artifact.apkPackage ?? readApkPackage(path),
 				readProjectPackage: async () => (await integration.appIds()).androidPackage,
 				packageRemedy: integration.packageRemedy,
 				install,
@@ -1308,6 +1322,17 @@ async function runAndroid(options = {}) {
 			message: "while finishing the run"
 		});
 		if (cancelled) return fail(cancelled.code, cancelled.message, cancelled.remedy, { lastBuildStatus: true });
+		logPostBuildFailure(artifactAcquired, writer, thrownRunFailureRecord(error, progress.phase()));
+		persistThrownBuild({
+			acquired: artifactAcquired,
+			error,
+			recordBuild,
+			root,
+			record,
+			startedAt,
+			durationMs: now() - started,
+			out
+		});
 		recordRun({
 			failed: true,
 			durationMs: now() - started

package/dist/{android-CLi6DSiS.mjs → android-CNZgRC-4.mjs}

@@ -1,6 +1,6 @@
-import { i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-YKGWivpG.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-CbXPbUMJ.mjs";
-import { r as lastBuildRecord, t as androidFacts } from "./result-utnBea7x.mjs";
-import { i as runAndroidOperation, n as registerAndroid, r as runAndroid, t as androidCommand } from "./android-DtfRGLcc.mjs";
-import { a as killPreviousCollector, i as collectorLogFile, o as startCollector } from "./launch-D-zq8SHG.mjs";
+import { i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-BBvS1H6v.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-Cxj9CmII.mjs";
+import { r as lastBuildRecord, t as androidFacts } from "./result-CR2vk2cj.mjs";
+import { i as runAndroidOperation, n as registerAndroid, r as runAndroid, t as androidCommand } from "./android-BGwuK3Mc.mjs";
+import { a as killPreviousCollector, i as collectorLogFile, o as startCollector } from "./launch-D0lPvFFu.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 };