stim 1.23.0 → 1.24.0

package/dist/{ios-device-BXZ0c7Kb.mjs → ios-device-B6HK951C.mjs}

@@ -1,4 +1,4 @@
-import { t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { t as getExecutor } from "./exec-VFRpu1iA.mjs";
 //#region src/collector/ios-device.ts
 const CONSOLE_ENV = { OS_ACTIVITY_DT_MODE: "enable" };
 const DEV_MENU_LAUNCH_ARGS = [

package/dist/{ios-device-JC3uWM4K.mjs → ios-device-BI38NFFH.mjs}

@@ -1,6 +1,6 @@
-import { t as getExecutor } from "./exec-DEoAhcze.mjs";
-import { ln as INSTALL_ERROR, pn as appProcessFromPid } from "./budget-DnPX3DXj.mjs";
-import { n as TOOL_ERROR_PREFIX } from "./ios-device-BXZ0c7Kb.mjs";
+import { t as getExecutor } from "./exec-VFRpu1iA.mjs";
+import { dn as INSTALL_ERROR, hn as appProcessFromPid } from "./budget-dPGuhNai.mjs";
+import { n as TOOL_ERROR_PREFIX } from "./ios-device-B6HK951C.mjs";
 import { mkdtempSync, readFileSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";

package/dist/{ios-project-CVyNwjAF.mjs → ios-project-KYqeJURj.mjs}

@@ -1,9 +1,9 @@
 import { l as workspaceAgentDeviceDir } from "./paths-DQtTgsBf.mjs";
-import { i as formatDuration, l as phaseLine } from "./command-output-Db8BqzxH.mjs";
-import { B as recordFinishedBuild, Hn as isEasAuthFailureText, Rn as UPLOAD_TIMEOUT_MS, Vn as easAuthNote, zn as cacheLevel } from "./budget-DnPX3DXj.mjs";
-import { a as workspaceLinkLine } from "./stim-desktop-D5OGpYZM.mjs";
-import { o as compilationCacheActivityLine, t as COMPILATION_CACHE_NOT_RUN } from "./xcode-iQnROM5o.mjs";
-import { i as deviceLabel } from "./support-BTpZ6RAJ.mjs";
+import { i as formatDuration, l as phaseLine } from "./command-output-DxC0k2rk.mjs";
+import { a as workspaceLinkLine } from "./stim-desktop-DS0mzR8U.mjs";
+import { B as recordFinishedBuild, Bn as UPLOAD_TIMEOUT_MS, Un as easAuthNote, Vn as cacheLevel, Wn as isEasAuthFailureText } from "./budget-dPGuhNai.mjs";
+import { o as compilationCacheActivityLine, t as COMPILATION_CACHE_NOT_RUN } from "./xcode-DHu41qQ4.mjs";
+import { i as deviceLabel } from "./support-B1W-hmC2.mjs";
 import { buildDiagnostics } from "@stim-cli/core/state";
 import chalk from "chalk";
 //#region src/commands/ios/result.ts

package/dist/{ios-signing-BtAffm0A.mjs → ios-signing-4c_qXvQm.mjs}

@@ -1,5 +1,5 @@
-import { t as getExecutor } from "./exec-DEoAhcze.mjs";
-import { a as killOnAbort, f as throwIfCancelled, r as childEnvironment } from "./operation-exec-BW0em61G.mjs";
+import { c as throwIfCancelled, t as getExecutor } from "./exec-VFRpu1iA.mjs";
+import { a as killOnAbort, r as childEnvironment } from "./operation-exec-CUZifp6Z.mjs";
 import { X509Certificate } from "node:crypto";
 import { existsSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";

package/dist/{ios-state-Dtw5K2aI.mjs → ios-state-DlElquYD.mjs}

@@ -1,4 +1,4 @@
-import { o as updateWorkspaceState, r as readWorkspaceState$1 } from "./workspace-state-U08dEzhG.mjs";
+import { l as withWorkspaceStateLockAsync, o as updateWorkspaceState, r as readWorkspaceState$1 } from "./workspace-state-CeBpIZgr.mjs";
 import { HOSTED_METRO_REQUESTS_KEY, hostedMetroRequests, hostedNativeRecords, isJsonObject, parseHostedNativePlacement, unreadableHostedNative } from "@stim-cli/core/state";
 //#region src/device-host/ios-state.ts
 function readHostedNative(root, platform, slot) {
@@ -42,6 +42,10 @@ function writeDevicePlacement(root, slot, platform, placement) {
 		};
 	});
 }
+/** Records the device placement after asynchronously acquiring the workspace state lock; no placement takes no lock. */
+async function writeDevicePlacementAsync(root, slot, platform, placement) {
+	if (placement) await withWorkspaceStateLockAsync(root, () => writeDevicePlacement(root, slot, platform, placement));
+}
 function writeHostedNative(root, slot, host, platform) {
 	updateWorkspaceState(root, (state) => {
 		const slots = isJsonObject(state.deviceSlots) ? state.deviceSlots : {};
@@ -76,14 +80,18 @@ function writeHostedNative(root, slot, host, platform) {
 function readHostedIos(root, slot) {
 	return readHostedNative(root, "ios", slot);
 }
-function writeHostedIos(root, slot, host) {
-	writeHostedNative(root, slot, host, "ios");
+/** Records a hosted placement after asynchronously acquiring the workspace state lock. */
+function writeHostedNativeAsync(root, slot, host, platform) {
+	return withWorkspaceStateLockAsync(root, () => writeHostedNative(root, slot, host, platform));
+}
+function writeHostedIosAsync(root, slot, host) {
+	return writeHostedNativeAsync(root, slot, host, "ios");
+}
+function writeHostedAndroidAsync(root, slot, host) {
+	return writeHostedNativeAsync(root, slot, host, "android");
 }
 function readHostedAndroid(root, slot) {
 	return readHostedNative(root, "android", slot);
 }
-function writeHostedAndroid(root, slot, host) {
-	writeHostedNative(root, slot, host, "android");
-}
 //#endregion
-export { writeHostedAndroid as a, writeDevicePlacement as i, readHostedIos as n, writeHostedIos as o, readHostedNative as r, writeHostedNative as s, readHostedAndroid as t };
+export { writeHostedAndroidAsync as a, writeHostedNativeAsync as c, writeDevicePlacementAsync as i, readHostedIos as n, writeHostedIosAsync as o, readHostedNative as r, writeHostedNative as s, readHostedAndroid as t };

package/dist/{js-swap-C3QxUFJR.mjs → js-swap-BvrQvXHY.mjs}

@@ -1,10 +1,10 @@
-import { d as spawnDeclared, m as operationState, t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { _ as spawnDeclared, b as operationState, c as throwIfCancelled, t as getExecutor } from "./exec-VFRpu1iA.mjs";
 import { r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { a as killOnAbort, f as throwIfCancelled, t as runOperationFile } from "./operation-exec-BW0em61G.mjs";
-import { Ht as makeTemporaryDirectory, Ut as removeTemporaryEntry } from "./settings-C7O8A6ZI.mjs";
-import { Xn as bundleInvocation } from "./budget-DnPX3DXj.mjs";
-import { t as cleanLine } from "./server-expo-D9lEz4aq.mjs";
-import { _ as tailLines, h as startBuildHeartbeat, r as HEARTBEAT_INTERVAL_MS } from "./xcode-iQnROM5o.mjs";
+import { a as killOnAbort, t as runOperationFile } from "./operation-exec-CUZifp6Z.mjs";
+import { Ht as makeTemporaryDirectory, Ut as removeTemporaryEntry } from "./settings-RKwY33wv.mjs";
+import { Qn as bundleInvocation } from "./budget-dPGuhNai.mjs";
+import { s as expoTelemetryEnv, t as cleanLine } from "./server-expo-Tt_hLRpy.mjs";
+import { _ as tailLines, h as startBuildHeartbeat, r as HEARTBEAT_INTERVAL_MS } from "./xcode-DHu41qQ4.mjs";
 import { randomUUID } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from "node:fs";
 import { basename, join } from "node:path";
@@ -312,6 +312,7 @@ async function swapJsBundle({ context, root, iosDir, isExpo, cachedAppPath, logW
 			],
 			env: {
 				...context?.env ?? process.env,
+				...expoTelemetryEnv(context?.env ?? process.env),
 				FORCE_COLOR: "0"
 			}
 		}));

package/dist/{launch-CHY3p-yz.mjs → launch-BVlyQw3T.mjs}

@@ -1,44 +1,44 @@
-import { t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { o as cancellableSleep, t as getExecutor } from "./exec-VFRpu1iA.mjs";
 import { m as workspaceLogsDir } from "./paths-DQtTgsBf.mjs";
-import { B as deviceSlotFileKey, E as upsertProject, V as deviceSlotKey, p as getProject, u as getConcurrencyLimits, v as recordIosSchemeApprovals } from "./config-DlrsduwG.mjs";
-import { _ as stepTimer, c as launchErrorReport, i as formatDuration, l as phaseLine, n as appReadinessMessage, v as launchErrorPreview } from "./command-output-Db8BqzxH.mjs";
-import { u as cancellableSleep } from "./operation-exec-BW0em61G.mjs";
-import { d as writeWorkspaceState, r as readWorkspaceState } from "./workspace-state-U08dEzhG.mjs";
-import { $ as settingOriginScope, G as resolveCacheProviderConfig, Ht as makeTemporaryDirectory, Nt as repoRootAsync, Ut as removeTemporaryEntry, Y as resolveSettings, ct as detectProviders, nt as settingsLayers, vt as gitCommonDirAsync } from "./settings-C7O8A6ZI.mjs";
-import { L as workspaceDevServerMode, f as projectRegistry, i as findProjectRoot, v as detectIsExpo, z as writeWorkspaceLaunch } from "./project-CTLNHCfE.mjs";
+import { B as deviceSlotFileKey, E as upsertProject, O as withConfigLockAsync, V as deviceSlotKey, p as getProject, u as getConcurrencyLimits, v as recordIosSchemeApprovals } from "./config-BZhXY15H.mjs";
+import { _ as stepTimer, c as launchErrorReport, i as formatDuration, l as phaseLine, n as appReadinessMessage, v as launchErrorPreview } from "./command-output-DxC0k2rk.mjs";
+import { f as writeWorkspaceStateAsync, r as readWorkspaceState } from "./workspace-state-CeBpIZgr.mjs";
+import { $ as settingOriginScope, G as resolveCacheProviderConfig, Ht as makeTemporaryDirectory, Nt as repoRootAsync, Ut as removeTemporaryEntry, Y as resolveSettings, ct as detectProviders, nt as settingsLayers, vt as gitCommonDirAsync } from "./settings-RKwY33wv.mjs";
+import { L as workspaceDevServerMode, f as projectRegistry, i as findProjectRoot, v as detectIsExpo, z as writeWorkspaceLaunchAsync } from "./project-Dz-hWkb-.mjs";
+import { o as workspaceLinks } from "./stim-desktop-DS0mzR8U.mjs";
+import { c as pidExists, d as resolveProjectMetro, f as signalProcessTree } from "./metro-Bu8LBfzS.mjs";
 import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
-import { c as pidExists, d as resolveProjectMetro, f as signalProcessTree } from "./metro-DiXtA3Ty.mjs";
-import { $t as readCollectorRecords, Bn as checkEasAuth, Bt as ensureMetroReachable, En as restartedAppNote, Gt as resolveRemoteContext, J as recordRunStats, Jn as resolveRemote, Jt as LAUNCH_FATAL, K as recordCapacityRefusal, Mn as readRemoteSimulatorArch, Nn as gateMetroOrigin, Qt as isBundleProof, Rt as bundleEntryPoint, Sn as iosAppProcess, Tn as launchIosApp, Un as loadProjectProvider, Vt as ensureRemoteBootOwned, W as readRunEstimates, Wt as remoteIosDeps, Xt as RELEASE_VERIFY_WAIT_MS, Yn as uploadRemote, Yt as LAUNCH_UNVERIFIED, an as verifyReleaseLaunch, en as readMetroRecords, hn as devClientUrl, in as verifyLaunch, mn as clearOtherUserApps, nn as unverifiedLaunchLines, qn as resolveEasCliBin, qt as LAUNCH_BUNDLING, t as budgetGate, tn as unattributedLaunchLines, un as IOS_DEV_MENU_OFF_DEFAULTS_PLIST, xn as installIosApp } from "./budget-DnPX3DXj.mjs";
-import { I as acquireBuildSlot, R as releaseBuildSlot } from "./workspaces-BxzYlo3P.mjs";
-import { F as waitForBuild, M as acquireBuildLock, P as releaseBuildLock } from "./activity-B5RtpFda.mjs";
-import { b as untrackedNativeFiles, g as storeBuild, h as resolveBuild, l as fingerprintProject } from "./build-cache-Dv7RN200.mjs";
-import { d as listAllIosSims, h as listIosRuntimesAsync, r as clearIosAppData } from "./ios-hcBpnEGk.mjs";
-import { o as workspaceLinks } from "./stim-desktop-D5OGpYZM.mjs";
-import { f as readBundleExecutable, m as resolveScheme, p as readBundleId } from "./xcode-iQnROM5o.mjs";
-import { h as readPodState, m as podsAreStale, v as runPodInstall } from "./toolchain-CWeGJgCc.mjs";
-import { n as readHostedIos, o as writeHostedIos } from "./ios-state-Dtw5K2aI.mjs";
-import { n as prepareHostedIos, t as placeHostedIos } from "./hosted-ios-DtYHeuYR.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-C5fo5Edb.mjs";
-import { n as nativeRunCommand, r as siblingPlatformSlots, t as launchSlotScope } from "./slot-launch-D7M2nE4b.mjs";
-import { c as startDevServer, g as detectBundleId } from "./start-bjfiScgz.mjs";
+import { Bt as bundleEntryPoint, Cn as installIosApp, Dn as launchIosApp, Fn as gateMetroOrigin, Gn as loadProjectProvider, Hn as checkEasAuth, Ht as ensureMetroReachable, J as recordCapacityRefusal, K as readRunEstimates, Kt as remoteIosDeps, On as restartedAppNote, Pn as readRemoteSimulatorArch, Qt as RELEASE_VERIFY_WAIT_MS, Ut as ensureRemoteBootOwned, X as recordRunStats, Xn as resolveRemote, Xt as LAUNCH_FATAL, Yn as resolveEasCliBin, Yt as LAUNCH_BUNDLING, Zn as uploadRemote, Zt as LAUNCH_UNVERIFIED, _n as devClientUrl, en as isBundleProof, fn as IOS_DEV_MENU_OFF_DEFAULTS_PLIST, gn as clearOtherUserApps, in as unverifiedLaunchLines, nn as readMetroRecords, on as verifyLaunch, qt as resolveRemoteContext, rn as unattributedLaunchLines, sn as verifyReleaseLaunch, t as budgetGate, tn as readCollectorRecords, wn as iosAppProcess } from "./budget-dPGuhNai.mjs";
+import { L as acquireBuildSlot, z as releaseBuildSlot } from "./workspaces-CSV2Orf4.mjs";
+import { F as waitForBuild, M as acquireBuildLock, P as releaseBuildLock } from "./activity-Dq3ZcdD8.mjs";
+import { T as untrackedNativeFiles, b as storeBuild, d as fingerprintProject, y as resolveBuild } from "./build-cache-HFUQ9eLz.mjs";
+import { d as listAllIosSims, h as listIosRuntimesAsync, r as clearIosAppData } from "./ios-CVUFFZ6C.mjs";
+import { f as readBundleExecutable, m as resolveScheme, p as readBundleId } from "./xcode-DHu41qQ4.mjs";
+import { h as readPodState, m as podsAreStale, v as runPodInstall } from "./toolchain-D3bmRMia.mjs";
+import { n as readHostedIos, o as writeHostedIosAsync } from "./ios-state-DlElquYD.mjs";
+import { n as hostedMetroPortProbe } from "./hosted-native-Doxbfzem.mjs";
+import { n as prepareHostedIos, t as placeHostedIos } from "./hosted-ios-Sn0djzg8.mjs";
+import { n as verifyCollectorOwnership } from "./ownership-DxlZGDcV.mjs";
+import { n as nativeRunCommand, r as siblingPlatformSlots, t as launchSlotScope } from "./slot-launch-A1BgotaM.mjs";
+import { c as startDevServer, g as detectBundleId } from "./start-BKGrEhzG.mjs";
 import { t as spawnEntry } from "./spawn-entry-jw19m8Nl.mjs";
-import { a as discoverXcodeProject, r as buildIos } from "./react-native-build-CmJkTljQ.mjs";
-import { a as acquireRunLease, c as lostRefusal, d as runLease, s as lostLine, t as DEBUG_VERIFY_STEP_MS, u as releaseLeaseOnAbort } from "./device-lease-run-BgwPHc6u.mjs";
-import { r as checkDeviceCapacity } from "./device-capacity-CjaSdrhg.mjs";
-import { n as clearIosAdoptionPending } from "./device-ios-uOiEETX2.mjs";
-import { i as deviceLabel, o as deviceShortName, t as appNameFromPath } from "./support-BTpZ6RAJ.mjs";
-import { a as sealAppForDevice, r as gateProfileForDevice } from "./ios-signing-BtAffm0A.mjs";
-import { a as resolveEasDevelopmentBuild } from "./eas-build-CyjU5K7E.mjs";
-import { a as printNativeCrashReport, n as IOS_CRASH_REPORT_RETRY, o as simulatorConsolePaths, r as captureNativeCrashes, t as errorDiagnostics } from "./error-diagnostics-C6sVoeqO.mjs";
-import { i as launchOutcomeRecord, n as ensureWorkspaceStorageSafely } from "./native-runtime-CRSOZxKY.mjs";
-import { i as runPrebuild, n as planPrebuildAsync } from "./prebuild-BFm63bQ0.mjs";
-import { n as devClientTakesDevMenuParams, t as devClientScheme } from "./dev-client-BnYSDiKa.mjs";
-import { n as automaticDevicePlacement, t as checkEasFallback } from "./eas-fallback-DV3Wytf1.mjs";
-import { n as ensureBooted, o as warmMetro, r as ensureOwnedDevice } from "./device-CCkWmkAA.mjs";
-import { t as selectFromPool } from "./device-pool-C-ptmZTa.mjs";
-import { o as reportIosResult } from "./ios-project-CVyNwjAF.mjs";
-import { c as isWirelessIosDevice, i as iosDeviceProcess, l as listIosDevices, n as installIosDeviceApp, p as verifyIosDeviceReleaseLaunch, r as iosDeviceBounds, t as awaitIosDeviceLaunch, u as localNetworkPending } from "./ios-device-JC3uWM4K.mjs";
-import { i as swapJsBundle } from "./js-swap-C3QxUFJR.mjs";
+import { a as discoverXcodeProject, r as buildIos } from "./react-native-build-AuCu-aAP.mjs";
+import { a as acquireRunLease, c as lostRefusal, d as runLease, s as lostLine, t as DEBUG_VERIFY_STEP_MS, u as releaseLeaseOnAbort } from "./device-lease-run-DUtkbqBQ.mjs";
+import { r as checkDeviceCapacity } from "./device-capacity-Ic-kdmEV.mjs";
+import { n as clearIosAdoptionPending } from "./device-ios-DzpSlZyd.mjs";
+import { i as deviceLabel, o as deviceShortName, t as appNameFromPath } from "./support-B1W-hmC2.mjs";
+import { a as sealAppForDevice, r as gateProfileForDevice } from "./ios-signing-4c_qXvQm.mjs";
+import { a as resolveEasDevelopmentBuild } from "./eas-build-CxKUNHsb.mjs";
+import { a as printNativeCrashReport, n as IOS_CRASH_REPORT_RETRY, o as simulatorConsolePaths, r as captureNativeCrashes, t as errorDiagnostics } from "./error-diagnostics-BkKCZq4P.mjs";
+import { i as launchOutcomeRecord, n as ensureWorkspaceStorageSafely } from "./native-runtime-DgtJkzIa.mjs";
+import { a as runPrebuild, n as planPrebuildAsync } from "./prebuild-DmVCf5xb.mjs";
+import { n as devClientTakesDevMenuParams, r as hasDevClient, t as devClientScheme } from "./dev-client-w_fok0Ek.mjs";
+import { n as automaticDevicePlacement, t as checkEasFallback } from "./eas-fallback-LMxk9Kw0.mjs";
+import { n as ensureBooted, o as warmMetro, r as ensureOwnedDevice } from "./device-BktRGdjS.mjs";
+import { t as selectFromPool } from "./device-pool-CgBHk401.mjs";
+import { o as reportIosResult } from "./ios-project-KYqeJURj.mjs";
+import { c as isWirelessIosDevice, i as iosDeviceProcess, l as listIosDevices, n as installIosDeviceApp, p as verifyIosDeviceReleaseLaunch, r as iosDeviceBounds, t as awaitIosDeviceLaunch, u as localNetworkPending } from "./ios-device-BI38NFFH.mjs";
+import { i as swapJsBundle } from "./js-swap-BvrQvXHY.mjs";
 import { mkdirSync, openSync, writeFileSync } from "node:fs";
 import { networkInterfaces } from "node:os";
 import { basename, join } from "node:path";
@@ -257,8 +257,9 @@ const DEFAULT_DEPS = {
 	checkEasFallback,
 	prepareHostedIos,
 	placeHostedIos,
+	hostedMetroPortProbe,
 	readHostedIos,
-	writeHostedIos,
+	writeHostedIos: writeHostedIosAsync,
 	resolveEasDevelopmentBuild,
 	findProjectRoot,
 	resolveSettings,
@@ -269,9 +270,10 @@ const DEFAULT_DEPS = {
 	detectBundleId,
 	detectIsExpo,
 	devClientScheme,
+	hasDevClient,
 	devClientTakesDevMenuParams,
 	getProject,
-	upsertProject,
+	upsertProject: (...args) => withConfigLockAsync(() => upsertProject(...args)),
 	recordIosSchemeApprovals,
 	checkDeviceCapacity,
 	budgetGate,
@@ -342,8 +344,8 @@ const DEFAULT_DEPS = {
 	ensureWorkspaceStorage: ensureWorkspaceStorageSafely,
 	replaceCollector,
 	stopPreviousCollector,
-	writeWorkspaceLaunch,
-	writeWorkspaceState,
+	writeWorkspaceLaunch: writeWorkspaceLaunchAsync,
+	writeWorkspaceState: writeWorkspaceStateAsync,
 	createWriter: createNdjsonWriter,
 	recordStats: recordRunStats,
 	recordCapacityRefusal,
@@ -498,7 +500,7 @@ async function verifyIosMetroRun({ operation, root, slot, appPath, d, launched,
 		phase("verify", `bundle loaded` + (verification.processAlive === true ? ", process alive" : "") + (verification.readiness ? "" : ", stable for 3s -- the first screen may still be rendering") + ` (${formatDuration(verification.waitedMs ?? 0)} total)`);
 		const hasAppErrors = reportLaunchErrors(verification.errors ?? [], note, root);
 		if (hasAppErrors && verification.processAlive === true && metroPort !== null) {
-			const reloadRemedy = physical || remoteDevice ? `run \`agent-device metro reload --metro-port ${metroPort}\`.` : "run `stim reload ios`.";
+			const reloadRemedy = remoteDevice ? `run \`agent-device metro reload --metro-port ${metroPort}\`.` : "run `stim reload ios`.";
 			note(chalk.yellow(phaseLine("remedy", `The native app is still running. Fix the JavaScript or TypeScript error; Fast Refresh should apply the edit. If the error screen remains, ${reloadRemedy} Do not run \`${runCommand}\` unless native inputs changed or the app process exits.`)));
 		}
 		return {
@@ -619,10 +621,10 @@ async function readRunExecutable(d, appPath, note) {
 	if (appPath && !executable) note(chalk.dim(`Could not read CFBundleExecutable from ${appPath}; the device log predicate falls back to the .app basename.`));
 	return executable;
 }
-function recordIosReloadTarget({ d, root, physical, remoteDevice, bundleId, udid, metroPort, release, runtimeKind, launchedAt, note }) {
+async function recordIosReloadTarget({ d, root, physical, remoteDevice, bundleId, udid, metroPort, release, runtimeKind, launchedAt, note }) {
 	if (physical || remoteDevice) return;
 	try {
-		d.writeWorkspaceLaunch(root, "ios", {
+		await d.writeWorkspaceLaunch(root, "ios", {
 			appId: bundleId,
 			deviceId: udid,
 			metroPort,
@@ -680,7 +682,7 @@ async function finishIosRun({ operation, output, projectBundleId, runtime, runti
 			appPath
 		}
 	});
-	if (bundleId) d.upsertProject(root, { bundleId });
+	if (bundleId) await d.upsertProject(root, { bundleId });
 	enterPhase("device");
 	if (bootPending()) enterActivity("booting");
 	const booted = await bootPromise;
@@ -867,12 +869,12 @@ async function finishIosRun({ operation, output, projectBundleId, runtime, runti
 				bundleId
 			}
 		});
-		if (adopting) d.clearIosAdoptionPending(root, slot);
+		if (adopting) await d.clearIosAdoptionPending(root, slot);
 		installSkipped = Boolean(installed?.skipped);
 		const artifactDuration = installed?.artifactDurationMs === void 0 ? installTimer() : `(${formatDuration(installed.artifactDurationMs)})`;
 		phase("install", installSkipped ? `unchanged (${deviceShortName(device, udid)} already has this build) ${artifactDuration}` : `${basename(appPath)} -> ${deviceLabel(device, udid)} ${artifactDuration}`);
 		if (!remoteDevice && installed?.devClientPreparationDurationMs !== void 0) phase("install", `dev client prepared (${formatDuration(installed.devClientPreparationDurationMs)})`);
-		if (installed.schemeApprovals) d.recordIosSchemeApprovals(root, udid, installed.schemeApprovals, slot);
+		if (installed.schemeApprovals) await d.recordIosSchemeApprovals(root, udid, installed.schemeApprovals, slot);
 		dropSwapDir();
 		if (!remoteDevice) await d.replaceCollector({
 			root,
@@ -940,7 +942,7 @@ async function finishIosRun({ operation, output, projectBundleId, runtime, runti
 		}
 		phase("launch", `${bundleId}${restartedAppNote(launched.restartedPid)} ${launchTimer()}`);
 	}
-	recordIosReloadTarget({
+	await recordIosReloadTarget({
 		d,
 		root,
 		slot,

package/dist/{launch-Bz7JtaC4.mjs → launch-SfzGH_s9.mjs}

@@ -1,21 +1,22 @@
 import { m as workspaceLogsDir } from "./paths-DQtTgsBf.mjs";
-import { B as deviceSlotFileKey, C as saveConfig, E as upsertProject, H as deviceSlotPlatforms, O as withConfigLockAsync, P as formatBytes, V as deviceSlotKey, _ as loadConfig, w as setDevice } from "./config-DlrsduwG.mjs";
-import { _ as stepTimer, c as launchErrorReport, i as formatDuration, l as phaseLine, n as appReadinessMessage, v as launchErrorPreview } from "./command-output-Db8BqzxH.mjs";
-import { L as workspaceDevServerMode } from "./project-CTLNHCfE.mjs";
-import { c as pidExists, f as signalProcessTree } from "./metro-DiXtA3Ty.mjs";
-import { En as restartedAppNote, Jt as LAUNCH_FATAL, Xt as RELEASE_VERIFY_WAIT_MS, Yt as LAUNCH_UNVERIFIED, Zt as VERIFY_TIMEOUT_MS, bn as installConflictKind, dn as androidAppProcess, fn as androidDevClientUrl, nn as unverifiedLaunchLines, qt as LAUNCH_BUNDLING, sn as ADB_INSTALL_TIMEOUT_MS, tn as unattributedLaunchLines } from "./budget-DnPX3DXj.mjs";
-import { D as teardownOwnedAvd } from "./workspaces-BxzYlo3P.mjs";
-import { p as providerUploadOutcome } from "./build-cache-Dv7RN200.mjs";
-import { $ as resetAdoptedAvd, i as androidDataFreeBytes, it as trimAndroidCaches, u as androidToolCwd } from "./android-C7sVmyI9.mjs";
-import { o as workspaceLinks } from "./stim-desktop-D5OGpYZM.mjs";
-import { n as verifyCollectorOwnership, r as readCollectors } from "./ownership-C5fo5Edb.mjs";
-import { n as nativeRunCommand, r as siblingPlatformSlots, t as launchSlotScope } from "./slot-launch-D7M2nE4b.mjs";
+import { B as deviceSlotFileKey, C as saveConfig, E as upsertProject, H as deviceSlotPlatforms, O as withConfigLockAsync, P as formatBytes, V as deviceSlotKey, _ as loadConfig, w as setDevice } from "./config-BZhXY15H.mjs";
+import { _ as stepTimer, c as launchErrorReport, i as formatDuration, l as phaseLine, n as appReadinessMessage, v as launchErrorPreview } from "./command-output-DxC0k2rk.mjs";
+import { L as workspaceDevServerMode } from "./project-Dz-hWkb-.mjs";
+import { o as workspaceLinks } from "./stim-desktop-DS0mzR8U.mjs";
+import { i as androidDataFreeBytes, ot as trimAndroidCaches, tt as resetAdoptedAvd, u as androidToolCwd } from "./android-882m4hxX.mjs";
+import { c as pidExists, f as signalProcessTree } from "./metro-Bu8LBfzS.mjs";
+import { $t as VERIFY_TIMEOUT_MS, On as restartedAppNote, Qt as RELEASE_VERIFY_WAIT_MS, Sn as installConflictKind, Xt as LAUNCH_FATAL, Yt as LAUNCH_BUNDLING, Zt as LAUNCH_UNVERIFIED, in as unverifiedLaunchLines, ln as ADB_INSTALL_TIMEOUT_MS, mn as androidDevClientUrl, pn as androidAppProcess, rn as unattributedLaunchLines } from "./budget-dPGuhNai.mjs";
+import { O as teardownOwnedAvd } from "./workspaces-CSV2Orf4.mjs";
+import { _ as providerUploadOutcome } from "./build-cache-HFUQ9eLz.mjs";
+import { n as verifyCollectorOwnership, r as readCollectors } from "./ownership-DxlZGDcV.mjs";
+import { t as recordPhoneReverse } from "./phone-reverses-BdsdesVF.mjs";
+import { n as nativeRunCommand, r as siblingPlatformSlots, t as launchSlotScope } from "./slot-launch-A1BgotaM.mjs";
 import { t as spawnEntry } from "./spawn-entry-jw19m8Nl.mjs";
-import { c as lostRefusal, s as lostLine, t as DEBUG_VERIFY_STEP_MS } from "./device-lease-run-BgwPHc6u.mjs";
-import { a as printNativeCrashReport, r as captureNativeCrashes, t as errorDiagnostics } from "./error-diagnostics-C6sVoeqO.mjs";
-import { i as launchOutcomeRecord } from "./native-runtime-CRSOZxKY.mjs";
-import { a as PLATFORM, b as noDeviceDiagnostic, h as displayPath, n as LAUNCH_FAILED, r as NO_DEVICE, t as INSTALL_FAILED } from "./support-DTBV56gy.mjs";
-import { a as reportAndroidResult, i as persistLastBuild, n as finishAndroidUpload } from "./result-Cx5CRLvS.mjs";
+import { c as lostRefusal, s as lostLine, t as DEBUG_VERIFY_STEP_MS } from "./device-lease-run-DUtkbqBQ.mjs";
+import { a as printNativeCrashReport, r as captureNativeCrashes, t as errorDiagnostics } from "./error-diagnostics-BkKCZq4P.mjs";
+import { i as launchOutcomeRecord } from "./native-runtime-DgtJkzIa.mjs";
+import { a as PLATFORM, b as noDeviceDiagnostic, h as displayPath, n as LAUNCH_FAILED, r as NO_DEVICE, t as INSTALL_FAILED } from "./support-B3tzVhKn.mjs";
+import { a as persistLastBuild, n as finishAndroidUpload, s as reportAndroidResult } from "./result-DqBrb12U.mjs";
 import { mkdirSync, openSync, statSync } from "node:fs";
 import { basename, join } from "node:path";
 import { ambientEnv } from "@stim-cli/core";
@@ -240,10 +241,7 @@ async function verifyAndroidMetroRun({ operation, root, slot, remoteDevice, veri
 		for (const line of launchErrorPreview(verification.errors ?? [], root)) phase("", chalk.red(line));
 		if (verification.processAlive === false && !verification.errors?.some((record) => record.event === "native_crash")) phase("logs", "No attributable native crash report captured yet. Run `stim logs --errors` again for delayed reports, or `stim logs --source device` for available output.");
 		if (nativeFatal || verification.processAlive === false) phase("remedy", chalk.yellow(`Fix the crash, then run \`${runCommand}\` again; it force-stops a crashed process that remains alive behind the system crash dialog. Metro reload cannot recover it.`));
-		else if (verification.processAlive === true && metroPort !== null) {
-			const reloadRemedy = physical ? `run \`agent-device metro reload --metro-port ${metroPort}\`.` : "run `stim reload android`.";
-			phase("remedy", chalk.yellow(`The native app is still running. ${deliveryFailed ? "Check the Metro logs and device connection, then" : "Fix the JavaScript or TypeScript error, then"} ${reloadRemedy} Do not run \`${runCommand}\` unless native inputs changed or the app process exits.`));
-		}
+		else if (verification.processAlive === true && metroPort !== null) phase("remedy", chalk.yellow(`The native app is still running. ${deliveryFailed ? "Check the Metro logs and device connection, then" : "Fix the JavaScript or TypeScript error, then"} run \`stim reload android\`. Do not run \`${runCommand}\` unless native inputs changed or the app process exits.`));
 		return { state: LAUNCH_FATAL };
 	}
 	if (verification?.verified) {
@@ -251,10 +249,7 @@ async function verifyAndroidMetroRun({ operation, root, slot, remoteDevice, veri
 		const report = launchErrorReport(verification.errors ?? [], root);
 		if (report.summary) phase("launch", chalk.dim(report.summary));
 		for (const line of report.lines) phase("launch", chalk.yellow(line));
-		if (report.lines.length > 0 && verification.processAlive === true && metroPort !== null) {
-			const reloadRemedy = physical ? `run \`agent-device metro reload --metro-port ${metroPort}\`.` : "run `stim reload android`.";
-			phase("remedy", chalk.yellow(`The native app is still running. Fix the JavaScript or TypeScript error; Fast Refresh should apply the edit. If the error screen remains, ${reloadRemedy} Do not run \`${runCommand}\` unless native inputs changed or the app process exits.`));
-		}
+		if (report.lines.length > 0 && verification.processAlive === true && metroPort !== null) phase("remedy", chalk.yellow(`The native app is still running. Fix the JavaScript or TypeScript error; Fast Refresh should apply the edit. If the error screen remains, run \`stim reload android\`. Do not run \`${runCommand}\` unless native inputs changed or the app process exits.`));
 		return {
 			state: true,
 			warning: report.lines.length > 0 ? "app errors detected; inspect the error above" : verification.readiness === "timed-out" || verification.readiness === "error" ? "app readiness not confirmed; inspect the UI and logs" : void 0
@@ -315,7 +310,7 @@ async function wipeAdoptedAvd(room, free) {
 	if (wiped.status !== "torn-down") throw new Error(`could not wipe it: ${wiped.reason ?? wiped.status}`);
 	const rebooted = await room.rebootDevice();
 	if (!rebooted.ok || !rebooted.serial) throw new Error(`it did not boot after its user data was wiped: ${rebooted.reason ?? "no serial"}`);
-	if ((await room.resolveAvdSerial(room.avdName)).serial !== rebooted.serial) throw new Error(`${rebooted.serial} is not running ${room.avdName} after the wipe`);
+	if ((await room.resolveAvdSerial(room.avdName, { preferredSerial: rebooted.serial })).serial !== rebooted.serial) throw new Error(`${rebooted.serial} is not running ${room.avdName} after the wipe`);
 	room.phase("device", `${room.avdName} (${rebooted.serial}) booted with wiped user data`);
 	return rebooted.serial;
 }
@@ -353,13 +348,19 @@ async function installOnAdoptedAvd(room, serial, installApk) {
 }
 async function resolveInstallSerial({ root, slot, device, physical, remoteDevice, serial, resolveAvdSerial, waitForDeviceBoot, phase }) {
 	if (physical || remoteDevice || !device.owned || !device.avdName) return serial;
-	const resolved = await resolveAvdSerial(device.avdName, { timeoutMs: 5e3 });
+	const resolved = await resolveAvdSerial(device.avdName, {
+		timeoutMs: 5e3,
+		preferredSerial: serial
+	});
 	if (!resolved.serial) throw new Error(`Could not verify a running owned AVD ${device.avdName} before installation.`);
 	if (resolved.serial !== serial) {
 		phase("device", `${device.avdName} changed serial (${serial} -> ${resolved.serial}); checking readiness before installation`);
 		const ready = await waitForDeviceBoot(resolved.serial, 6e4, { commandTimeoutMs: 5e3 });
 		if (!ready.ok) throw new Error(`Emulator ${resolved.serial} never reported boot completion. Diagnostic: ${JSON.stringify(ready.diagnostic)}`);
-		if ((await resolveAvdSerial(device.avdName, { timeoutMs: 5e3 })).serial !== resolved.serial) throw new Error(`Could not verify AVD ${device.avdName} still runs on ${resolved.serial} after checking readiness.`);
+		if ((await resolveAvdSerial(device.avdName, {
+			timeoutMs: 5e3,
+			preferredSerial: resolved.serial
+		})).serial !== resolved.serial) throw new Error(`Could not verify AVD ${device.avdName} still runs on ${resolved.serial} after checking readiness.`);
 		phase("device", `reopen agent-device on ${resolved.serial}`);
 	}
 	const consolePort = Number(resolved.serial.replace(/^emulator-/, ""));
@@ -499,7 +500,7 @@ async function finishAndroidRun({ operation, runtime, runtimePreparation, lease,
 			msg: installed.note
 		});
 	}
-	if (androidPackage) upsertProject(root, { androidPackage });
+	if (androidPackage) await withConfigLockAsync(() => upsertProject(root, { androidPackage }));
 	record.bundleId = androidPackage;
 	if (!androidPackage) return fail(LAUNCH_FAILED, "Could not determine this app's Android package name, so there is nothing to launch.", packageRemedy, { lastBuildStatus: true });
 	if (physical) raiseLeaseFor(0, false);
@@ -520,6 +521,15 @@ async function finishAndroidRun({ operation, runtime, runtimePreparation, lease,
 		physical,
 		msg: `launching ${androidPackage} on ${serial}`
 	});
+	await notePhoneReverse({
+		root,
+		slot,
+		serial,
+		metroPort,
+		physical,
+		remoteDevice,
+		runtimeKind: runtime.kind
+	}, out);
 	const launched = await runtime.launch(runtimePreparation, {
 		serial,
 		androidPackage,
@@ -548,7 +558,7 @@ async function finishAndroidRun({ operation, runtime, runtimePreparation, lease,
 	});
 	phase("launch", `${androidPackage}${restartedAppNote(launched.restartedPid)} ${launchTimer()}`);
 	if (!physical && !remoteDevice) try {
-		writeLaunch(root, "android", {
+		await writeLaunch(root, "android", {
 			appId: androidPackage,
 			deviceId: serial,
 			metroPort,
@@ -705,6 +715,15 @@ function localInstallRemedy({ reason, packageName, serial, useBuildCache }) {
 function launchRemedy(remoteDevice, serial, packageName) {
 	return remoteDevice?.failureRemedy() ?? `Check the app installed correctly (\`adb -s ${serial} shell pm list packages ${packageName}\`).`;
 }
+async function notePhoneReverse(args, out) {
+	const { root, slot = "default", serial, metroPort } = args;
+	if (!args.physical || args.remoteDevice || args.runtimeKind !== "metro" || typeof metroPort !== "number") return;
+	try {
+		await recordPhoneReverse(root, slot, serial, metroPort);
+	} catch (error) {
+		out(phaseLine("state", chalk.yellow(`could not record the adb reverse on ${serial}: ${error instanceof Error ? error.message : error}`)));
+	}
+}
 function reportMetroRoute({ launched, remote, metroPort, androidPackage, serial, phase, writer }) {
 	if (remote) {
 		phase("metro", `public origin ${launched.jsLocation}`);

package/dist/{logs-mxqsWpJs.mjs → logs-DXE32kyb.mjs}

@@ -1,13 +1,13 @@
-import { g as process_identity_exports } from "./exec-DEoAhcze.mjs";
+import { S as process_identity_exports } from "./exec-VFRpu1iA.mjs";
 import { m as workspaceLogsDir$1 } from "./paths-DQtTgsBf.mjs";
-import { G as projectDeviceSlots, _ as loadConfig$1 } from "./config-DlrsduwG.mjs";
-import { n as pullHostedNativeLogs, t as pullHostedMacosLogs } from "./hosted-logs-Br84qWy1.mjs";
-import { l as phaseLine } from "./command-output-Db8BqzxH.mjs";
-import { f as readAgentDeviceRecordsAsync, n as agentDeviceLiveness, o as envDir } from "./activity-B5RtpFda.mjs";
-import { l as connectHost } from "./hosted-client-ByuMMO5s.mjs";
-import { n as readHostedIos, t as readHostedAndroid } from "./ios-state-Dtw5K2aI.mjs";
-import "./hosted-macos-DdtYajZt.mjs";
-import { i as captureWorkspaceCrashes } from "./error-diagnostics-C6sVoeqO.mjs";
+import { G as projectDeviceSlots, _ as loadConfig$1 } from "./config-BZhXY15H.mjs";
+import { n as pullHostedNativeLogs, t as pullHostedMacosLogs } from "./hosted-logs-CYIZ5ubJ.mjs";
+import { l as phaseLine } from "./command-output-DxC0k2rk.mjs";
+import { f as readAgentDeviceRecordsAsync, n as agentDeviceLiveness, o as envDir } from "./activity-Dq3ZcdD8.mjs";
+import { l as connectHost } from "./hosted-client-BBTVe3X6.mjs";
+import { n as readHostedIos, t as readHostedAndroid } from "./ios-state-DlElquYD.mjs";
+import "./hosted-macos-CXjsUNBR.mjs";
+import { i as captureWorkspaceCrashes } from "./error-diagnostics-BkKCZq4P.mjs";
 import { readdirSync, statSync, watch } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join, relative, resolve, sep } from "node:path";
@@ -222,6 +222,7 @@ function followAgentActions(context, read, onRecord) {
 }
 //#endregion
 //#region src/device-host/hosted-logs-sync.ts
+const WATCH_RECHECK_MS = 100;
 function warn(context, machine, error) {
 	const text = `${warning(machine, error)}\n`;
 	if (context) context.output("stderr", text);
@@ -337,10 +338,12 @@ function followHostedLogs(root, failing, context) {
 	const stateFile = workspaceStateFile(root);
 	const home = resolve(configDir());
 	let watcher = null;
+	let recheck;
 	const observe = () => {
 		if (closed) return;
 		watcher?.close();
 		watcher = null;
+		clearTimeout(recheck);
 		let directory = dirname(stateFile);
 		for (;;) try {
 			const entry = relative(directory, stateFile).split(sep)[0];
@@ -355,6 +358,8 @@ function followHostedLogs(root, failing, context) {
 			});
 			next.unref();
 			watcher = next;
+			recheck = setTimeout(refresh, WATCH_RECHECK_MS);
+			recheck.unref();
 			return;
 		} catch (error) {
 			if (directory === home || !(error instanceof Error && "code" in error && error.code === "ENOENT")) return;
@@ -370,6 +375,7 @@ function followHostedLogs(root, failing, context) {
 	return () => {
 		closed = true;
 		watcher?.close();
+		clearTimeout(recheck);
 		clearInterval(timer);
 		for (const stop of stops.values()) stop();
 	};
@@ -456,6 +462,7 @@ async function followWorkspaceLogs(context, options, onRecord, onBackfill) {
 	const stopLog = followLogs({
 		dir: workspaceLogsDir$1(context.projectRoot),
 		offsets: view.sizes,
+		identities: view.identities,
 		criteria,
 		onRecord,
 		errorContext: options.errorsOnly ? "field" : void 0

package/dist/{logs-CtNeNDuq.mjs → logs-ovlU7m7N.mjs}

@@ -1,11 +1,11 @@
 import { m as workspaceLogsDir$1 } from "./paths-DQtTgsBf.mjs";
-import { W as parseDeviceSlotOption, _ as loadConfig$1, g as isPathPrefix } from "./config-DlrsduwG.mjs";
-import { f as refuseNoProject, v as launchErrorPreview } from "./command-output-Db8BqzxH.mjs";
-import { r as readWorkspaceState$1 } from "./workspace-state-U08dEzhG.mjs";
-import { n as findCommandWorkspace } from "./project-CTLNHCfE.mjs";
+import { W as parseDeviceSlotOption, _ as loadConfig$1, g as isPathPrefix } from "./config-BZhXY15H.mjs";
+import { f as refuseNoProject, v as launchErrorPreview } from "./command-output-DxC0k2rk.mjs";
+import { r as readWorkspaceState$1 } from "./workspace-state-CeBpIZgr.mjs";
+import { n as findCommandWorkspace } from "./project-Dz-hWkb-.mjs";
 import { n as SOURCES$1, t as LEVELS$1 } from "./ndjson-CgE_o3Dl.mjs";
-import { a as followAgentActions, i as followHostedLogs, n as openWorkspaceLogs } from "./logs-mxqsWpJs.mjs";
-import { t as errorDiagnostics } from "./error-diagnostics-C6sVoeqO.mjs";
+import { a as followAgentActions, i as followHostedLogs, n as openWorkspaceLogs } from "./logs-DXE32kyb.mjs";
+import { t as errorDiagnostics } from "./error-diagnostics-BkKCZq4P.mjs";
 import { t as watchStdoutReader } from "./stdout-reader-C8yjre1x.mjs";
 import { realpathSync } from "node:fs";
 import { relative, sep } from "node:path";
@@ -166,6 +166,7 @@ function logsCommand(program) {
 		};
 		const { view, readAgent, hostedReachable } = await openWorkspaceLogs(context, query, Boolean(opts.follow));
 		const offsets = opts.follow ? view.sizes : null;
+		const identities = opts.follow ? view.identities : null;
 		let timeline = [];
 		let rawRecords;
 		try {
@@ -220,6 +221,7 @@ function logsCommand(program) {
 		const stop = followLogs({
 			dir,
 			offsets,
+			identities,
 			criteria,
 			onRecord: emit,
 			errorContext: opts.errors ? opts.json ? "field" : "msg" : void 0

package/dist/{macos-inNFbBWc.mjs → macos-B3BveDrU.mjs}

@@ -1,2 +1,2 @@
-import { n as runMacos, r as waitForLaunchServices, t as macosCommand } from "./macos-u0BoHKnO.mjs";
+import { n as runMacos, r as waitForLaunchServices, t as macosCommand } from "./macos-CCfhb-jT.mjs";
 export { macosCommand as default, runMacos, waitForLaunchServices };