stim 1.23.1 → 1.25.0

package/dist/{ios-CWjqfSm_.mjs → ios-BRVM8b0P.mjs}

@@ -1,33 +1,34 @@
 import { m as workspaceLogsDir$1 } from "./paths-DQtTgsBf.mjs";
-import { B as deviceSlotFileKey, W as parseDeviceSlotOption, q as validateDeviceSlot } from "./config-DlrsduwG.mjs";
-import { _ as stepTimer, g as stepClock, i as formatDuration, l as phaseLine } from "./command-output-YKGWivpG.mjs";
-import { i as recordWorkspaceUse } from "./workspace-state-U08dEzhG.mjs";
-import { C as iosSigningIdentitySha1Setting, L as projectSettingsContextAsync, N as metroWarmupUrlSetting, R as publicUrlSetting, S as iosSigningIdentitySettingError, _ as iosLanHostSetting, a as SETTING_SHAPE_REMEDY, g as deviceReclaimIdleMinutesSetting, j as metroPortSetting, rt as tunnelModeSetting, v as iosLanHostSettingError, w as iosSigningIdentitySha1SettingError, x as iosSigningIdentitySetting } from "./settings-C7O8A6ZI.mjs";
-import { L as workspaceDevServerMode, t as NO_PROJECT_REFUSAL } from "./project-DhCtQWWU.mjs";
-import { H as tapBuildLog, In as runProcessOperation, Lt as binOnPath, M as NO_BUILD_PROGRESS, Pn as exitAfterFlush, U as createRunRecorder, V as startBuildProgress, Y as statsProjectKey$1, cn as DEFAULT_METRO_PORT, rr as ownedSessionName } from "./budget-3ivAK99e.mjs";
-import { d as runCancellationSignal, f as withNativeBuildRun, r as cancelledFailure, u as runCancellation } from "./native-run-Dv88i0aU.mjs";
-import { _t as parkedMaxSetting, dt as POOL_SETTING_REMEDY } from "./android-C7sVmyI9.mjs";
-import { i as createIosSimSnapshot } from "./ios-hcBpnEGk.mjs";
-import { d as optimizationBuildProfile, l as artifactCachePolicy } from "./errors-ccaPc4ox.mjs";
-import { t as COMPILATION_CACHE_NOT_RUN } from "./xcode-Rq744mBF.mjs";
-import { d as simulatorRuntime, h as setRemoteLogSink } from "./client-B4MMzfo_.mjs";
-import { i as parseBuildMachineOption } from "./selection-DSMbWEX2.mjs";
-import { r as hostedMetroSettings } from "./metro-gateway-CKZqKqx7.mjs";
-import { i as writeDevicePlacement } from "./ios-state-Dtw5K2aI.mjs";
-import { r as siblingPlatformSlots, t as launchSlotScope } from "./slot-launch-B7AuoWJv.mjs";
-import { f as waitFlagConflict, o as leaseExpiryText } from "./device-lease-run-DXPSwdbb.mjs";
-import { _ as resolveIosWait, a as deviceModelRefusal, b as resolveSimulatorAppFlag, c as iosProjectPathError, d as ownedSimFailure, g as resolveIosBuildSetup, h as resolveDeviceType, i as deviceLabel, m as resolveConfiguration, n as buildLogFile, r as createIosDeviceWaitRun, u as isReleaseConfiguration, v as resolveRuntime, x as simulatorBuildArch, y as resolveSchemeSelection } from "./support-TWuQlHQo.mjs";
-import { r as isEasBuildFailure } from "./eas-build-DMWSSvxq.mjs";
-import { r as isPhysicalDeviceRequest, t as ensureDevServer } from "./native-runtime-DBRfY_PN.mjs";
-import "./dev-client-BFxiDpkf.mjs";
-import { t as didSetUpDevice } from "./device-CiNYxqp6.mjs";
+import { B as deviceSlotFileKey, W as parseDeviceSlotOption, q as validateDeviceSlot } from "./config-BZhXY15H.mjs";
+import { _ as stepTimer, g as stepClock, i as formatDuration, l as phaseLine } from "./command-output-BBvS1H6v.mjs";
+import { a as recordWorkspaceUseAsync } from "./workspace-state-CPSp3mav.mjs";
+import { C as iosSigningIdentitySha1Setting, M as metroPortSetting, P as metroWarmupUrlSetting, R as projectSettingsContextAsync, S as iosSigningIdentitySettingError, _ as iosLanHostSetting, a as SETTING_SHAPE_REMEDY, g as deviceReclaimIdleMinutesSetting, it as tunnelModeSetting, v as iosLanHostSettingError, w as iosSigningIdentitySha1SettingError, x as iosSigningIdentitySetting, z as publicUrlSetting } from "./settings-B5tCoq9N.mjs";
+import { L as workspaceDevServerMode, t as NO_PROJECT_REFUSAL } from "./project-BiC68mIp.mjs";
+import { ft as POOL_SETTING_REMEDY, vt as parkedMaxSetting } from "./android-Cjcj8MCw.mjs";
+import { G as createRunRecorder, H as startBuildProgress, Ln as exitAfterFlush, M as NO_BUILD_PROGRESS, U as tapBuildLog, V as runFailureRecord, W as thrownRunFailureRecord, Z as statsProjectKey$1, dn as DEFAULT_METRO_PORT, or as ownedSessionName, 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 { i as createIosSimSnapshot } from "./ios-BQzvJlzw.mjs";
+import { d as optimizationBuildProfile, l as artifactCachePolicy } from "./errors-DHm_U5gv.mjs";
+import { t as COMPILATION_CACHE_NOT_RUN } from "./xcode-CiIIDnuD.mjs";
+import { S as setRemoteLogSink, d as simulatorRuntime } from "./client-BQsmyp_-.mjs";
+import { a as parseBuildMachineOption } from "./selection-D5cxEl3t.mjs";
+import { r as hostedMetroSettings } from "./metro-gateway-Bp9gJQAN.mjs";
+import { i as writeDevicePlacementAsync } from "./ios-state-CT9nV5SP.mjs";
+import { t as devClientPortBusy } from "./hosted-native-BxTizGU2.mjs";
+import { r as siblingPlatformSlots, t as launchSlotScope } from "./slot-launch-QeuJMlnJ.mjs";
+import { f as waitFlagConflict, o as leaseExpiryText } from "./device-lease-run-ogEeJ62K.mjs";
+import { _ as resolveIosWait, a as deviceModelRefusal, b as resolveSimulatorAppFlag, c as iosProjectPathError, d as ownedSimFailure, g as resolveIosBuildSetup, h as resolveDeviceType, i as deviceLabel, m as resolveConfiguration, n as buildLogFile, r as createIosDeviceWaitRun, u as isReleaseConfiguration, v as resolveRuntime, x as simulatorBuildArch, y as resolveSchemeSelection } from "./support-qKcbgmI5.mjs";
+import { r as isEasBuildFailure } from "./eas-build-CyDKNTBP.mjs";
+import { r as isPhysicalDeviceRequest, t as ensureDevServer } from "./native-runtime-B9w_Qyz3.mjs";
+import "./dev-client-CHoXXZeg.mjs";
+import { t as didSetUpDevice } from "./device-B9FqTBYW.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 lastBuildRecord, o as reportIosResult, s as writeLastBuild } from "./ios-project-CSZYI1iu.mjs";
-import { t as acquireIosArtifact } from "./artifact-DBI3DALs.mjs";
-import { a as hostedIosSelectors, i as hostedIosMetroNote, n as connectIosTarget, o as iosPlacementBudget, r as deviceRemoteConflict, s as selectIosPlacement, t as connectIosBackend } from "./remote-DR8qUERM.mjs";
-import { a as iosPoolCandidates, c as isWirelessIosDevice, f as resolveIosPhysicalDevice, o as iosPoolNoCandidatesRefusal, r as iosDeviceBounds } from "./ios-device-DFGuwF4U.mjs";
-import { i as DEFAULT_DEPS, l as lanOriginUrlFor, s as chooseLanAddress, t as finishIosRun } from "./launch-CP2wDCVd.mjs";
+import { a as refusePlan, i as printPlan, n as planFlagRefusal } from "./build-plan-zCuHGlA8.mjs";
+import { a as lastBuildRecord, o as reportIosResult, s as writeLastBuild } from "./ios-project-DCUDo06I.mjs";
+import { t as acquireIosArtifact } from "./artifact-DN8JNwqS.mjs";
+import { a as hostedIosSelectors, i as hostedIosMetroNote, n as connectIosTarget, o as iosPlacementBudget, r as deviceRemoteConflict, s as selectIosPlacement, t as connectIosBackend } from "./remote-BuZj6AyU.mjs";
+import { a as iosPoolCandidates, c as isWirelessIosDevice, f as resolveIosPhysicalDevice, o as iosPoolNoCandidatesRefusal, r as iosDeviceBounds } from "./ios-device-CKSvk0bu.mjs";
+import { i as DEFAULT_DEPS, l as lanOriginUrlFor, s as chooseLanAddress, t as finishIosRun } from "./launch-DscF1QfM.mjs";
 import { basename, join } from "node:path";
 import { workspaceId } from "@stim-cli/core";
 import { hostedIosStatus, parseMachine } from "@stim-cli/core/state";
@@ -53,6 +54,7 @@ async function finishHostedIosRun({ target, d, artifact, root, slot, release, ap
 			release,
 			mode: appMode,
 			...appMode === "development" && isExpo ? { devClientScheme: d.devClientScheme(root, artifact.path) ?? void 0 } : {},
+			metroPort,
 			reserved: (placement) => d.writeHostedIos(root, slot, placement),
 			note,
 			enterPhase
@@ -64,8 +66,8 @@ async function finishHostedIosRun({ target, d, artifact, root, slot, release, ap
 			remedy: error instanceof Error && "remedy" in error && typeof error.remedy === "string" ? error.remedy : `Retry stim ios --remote ${target.host.machine}, or run stim stop to reconcile any recorded placement.`
 		});
 	}
-	d.writeHostedIos(root, slot, run.placement);
-	d.writeWorkspaceLaunch(root, "ios", {
+	await d.writeHostedIos(root, slot, run.placement);
+	await d.writeWorkspaceLaunch(root, "ios", {
 		appId: bundleId,
 		deviceId: run.placement.session,
 		metroPort,
@@ -207,7 +209,7 @@ function runIosOperation(context, root, opts = {}, deps = {}, onFailure = () =>
 		platform: "ios",
 		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: "ios",
@@ -407,6 +409,17 @@ async function runIos(context, projectRoot, opts = {}, overrides = {}, progress
 	let buildMachine = "auto";
 	let devicePlacement;
 	let builtConfiguration = null;
+	let acquiredBuild = null;
+	const recordFailedBuild = (build, errorCode) => writeLastBuild(root, lastBuildRecord({
+		devicePlacement,
+		buildMachine,
+		...build,
+		configuration: builtConfiguration,
+		startedAt,
+		status: "failed",
+		errorCode,
+		durationMs: elapsed()
+	}));
 	const fail = ({ retainedClaimRoots, code, message, remedy = null, lines = [], logPath = null, build = null, lease, setup = false }) => {
 		({code, message, remedy, lines} = cancelledFailure(context, "ios", {
 			code,
@@ -422,15 +435,12 @@ async function runIos(context, projectRoot, opts = {}, overrides = {}, progress
 		for (const line of lines) note(chalk.dim(phaseLine("", line)));
 		if (remedy) note(chalk.dim(phaseLine("remedy", remedy)));
 		if (logPath) note(chalk.dim(phaseLine("log", logPath)));
-		if (build) writeLastBuild(root, lastBuildRecord({
-			devicePlacement,
-			buildMachine,
-			...build,
-			configuration: builtConfiguration,
-			startedAt,
-			status: "failed",
-			errorCode: code,
-			durationMs: elapsed()
+		const failedBuild = build ?? acquiredBuild;
+		if (failedBuild) recordFailedBuild(failedBuild, code);
+		if (acquiredBuild) logWriter().write(runFailureRecord({
+			code,
+			message,
+			phase: progress.phase()
 		}));
 		note(chalk.red(phaseLine("failed", code)));
 		if (!setup) recordRun({
@@ -554,6 +564,7 @@ async function runIos(context, projectRoot, opts = {}, overrides = {}, progress
 		easProfile: opts.easProfile
 	});
 	if (capabilityRefusal) return fail(capabilityRefusal);
+	const simSnapshot = createIosSimSnapshot();
 	const remoteSelection = await selectIosPlacement({
 		root,
 		env: context.env,
@@ -580,8 +591,10 @@ async function runIos(context, projectRoot, opts = {}, overrides = {}, progress
 			deviceTypeOrigin: d.settingOriginScope(d.settingsLayers(settingsContext), "ios.deviceType"),
 			runtimeOrigin: d.settingOriginScope(d.settingsLayers(settingsContext), "ios.runtime"),
 			listRuntimes: d.listIosRuntimes,
-			signal: context.signal
+			signal: context.signal,
+			snapshot: simSnapshot
 		}),
+		simSnapshot,
 		noWait: deviceSlotWaitMs === 0,
 		note,
 		phase,
@@ -595,7 +608,7 @@ async function runIos(context, projectRoot, opts = {}, overrides = {}, progress
 	});
 	if (targetRefusal) return fail(targetRefusal);
 	devicePlacement = remoteSelection.devicePlacement;
-	writeDevicePlacement(root, slot, "ios", devicePlacement);
+	await writeDevicePlacementAsync(root, slot, "ios", devicePlacement);
 	const { machine: hostedMachine, backend: remoteBackend } = remoteSelection;
 	const viewer = resolveSimulatorAppFlag(opts.simulatorApp, physical, hostedMachine ?? remoteBackend, Boolean(remoteSelection.auto));
 	if ("refusal" in viewer) return fail(viewer.refusal);
@@ -613,7 +626,8 @@ async function runIos(context, projectRoot, opts = {}, overrides = {}, progress
 		remoteBackend,
 		hosted: Boolean(hostedMachine),
 		listRuntimes: d.listIosRuntimes,
-		signal: context.signal
+		signal: context.signal,
+		snapshot: simSnapshot
 	});
 	if (modelRefusal) return fail(modelRefusal);
 	const selectors = hostedIosSelectors(deviceType, runtime);
@@ -621,7 +635,6 @@ async function runIos(context, projectRoot, opts = {}, overrides = {}, progress
 	if ("failure" in connected) return fail(connected.failure);
 	const hostedTarget = connected.target;
 	try {
-		const simSnapshot = createIosSimSnapshot();
 		const budget = await iosPlacementBudget(d, root, note, Boolean(hostedTarget), remoteSelection.budget, simSnapshot, context.env);
 		reclaimed = budget.reclaimed;
 		if (budget.refusal) return fail(budget.refusal);
@@ -800,6 +813,11 @@ async function runIos(context, projectRoot, opts = {}, overrides = {}, progress
 		}
 		async function prepareMetro() {
 			if (metroCheck) {
+				const hostedPorts = hostedTarget && isExpo && d.hasDevClient(root) ? {
+					machine: hostedTarget.host.machine,
+					free: d.hostedMetroPortProbe(hostedTarget.host.machine, note),
+					busy: (port) => devClientPortBusy(hostedTarget.host.machine, port)
+				} : void 0;
 				const gate = await ensureDevServer({
 					env: context.env,
 					root,
@@ -807,6 +825,7 @@ async function runIos(context, projectRoot, opts = {}, overrides = {}, progress
 					settings: hostedMetroSettings(settings, Boolean(hostedTarget)),
 					settingsContext,
 					remote: Boolean(remoteDevice),
+					hostedPorts,
 					note,
 					resolve: d.resolveProjectMetro,
 					start: d.startDevServer,
@@ -825,6 +844,10 @@ async function runIos(context, projectRoot, opts = {}, overrides = {}, progress
 				};
 				metroPort = gate.port;
 				devServer = gate.devServer;
+				if (hostedPorts && !await hostedPorts.free(gate.port)) return {
+					ok: false,
+					error: devClientPortBusy(hostedPorts.machine, gate.port)
+				};
 			} else {
 				const pin = metroPortSetting(settings, context.env);
 				if (pin.error) return {
@@ -870,7 +893,9 @@ async function runIos(context, projectRoot, opts = {}, overrides = {}, progress
 				platform: "ios",
 				isExpo,
 				appId: proj?.bundleId,
-				bundleUrl: metroWarmupUrlSetting(settings, "ios")
+				bundleUrl: metroWarmupUrlSetting(settings, "ios"),
+				logsDir,
+				root
 			});
 			return {
 				ok: true,
@@ -917,10 +942,12 @@ async function runIos(context, projectRoot, opts = {}, overrides = {}, progress
 				code: "STIM_CANCELLED",
 				message: "while finishing the run"
 			});
-			if (cancelled) return fail({
-				...cancelled,
-				build: artifact?.failureFields
-			});
+			if (cancelled) return fail(cancelled);
+			if (acquiredBuild) {
+				const { code } = error;
+				recordFailedBuild(acquiredBuild, typeof code === "string" ? code : void 0);
+				logWriter().write(thrownRunFailureRecord(error, progress.phase()));
+			}
 			recordRun({
 				failed: true,
 				durationMs: elapsed()
@@ -1034,6 +1061,11 @@ async function runIos(context, projectRoot, opts = {}, overrides = {}, progress
 				return fail(acquiredArtifact.failure);
 			}
 			artifact = acquiredArtifact.artifact;
+			acquiredBuild = {
+				...artifact.failureFields,
+				appPath: artifact.path,
+				bundleId: artifact.bundleId
+			};
 			compilationCache = artifact.cache.compilation;
 			if (hostedTarget) return await finishHostedIosRun({
 				output: context.output,

package/dist/{ios-DTOYZGMJ.mjs → ios-Dvt97HgQ.mjs}

@@ -1,9 +1,9 @@
-import { h as shortUdid, i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-YKGWivpG.mjs";
-import { jn as schemesFromInfoPlist, kn as pickDevClientScheme } from "./budget-3ivAK99e.mjs";
-import { f as podAction, h as resolveDeviceType, i as deviceLabel, m as resolveConfiguration, n as buildLogFile, s as iosConfigurationSetting, t as appNameFromPath, u as isReleaseConfiguration, v as resolveRuntime } from "./support-TWuQlHQo.mjs";
-import { n as ensureWorkspaceStorageSafely } from "./native-runtime-DBRfY_PN.mjs";
-import { t as devClientScheme } from "./dev-client-BFxiDpkf.mjs";
-import { a as lastBuildRecord, i as iosFacts, n as cacheDescription, s as writeLastBuild } from "./ios-project-CSZYI1iu.mjs";
-import { n as registerIos, r as runIosOperation, t as iosCommand } from "./ios-CWjqfSm_.mjs";
-import { a as collectorEntry, o as replaceCollector } from "./launch-CP2wDCVd.mjs";
+import { h as shortUdid, i as formatDuration, l as phaseLine, m as shortHash } from "./command-output-BBvS1H6v.mjs";
+import { Mn as pickDevClientScheme, Pn as schemesFromInfoPlist } from "./budget-HyShrIpL.mjs";
+import { f as podAction, h as resolveDeviceType, i as deviceLabel, m as resolveConfiguration, n as buildLogFile, s as iosConfigurationSetting, t as appNameFromPath, u as isReleaseConfiguration, v as resolveRuntime } from "./support-qKcbgmI5.mjs";
+import { n as ensureWorkspaceStorageSafely } from "./native-runtime-B9w_Qyz3.mjs";
+import { t as devClientScheme } from "./dev-client-CHoXXZeg.mjs";
+import { a as lastBuildRecord, i as iosFacts, n as cacheDescription, s as writeLastBuild } from "./ios-project-DCUDo06I.mjs";
+import { n as registerIos, r as runIosOperation, t as iosCommand } from "./ios-BRVM8b0P.mjs";
+import { a as collectorEntry, o as replaceCollector } from "./launch-DscF1QfM.mjs";
 export { appNameFromPath, buildLogFile, cacheDescription, collectorEntry, iosCommand as default, devClientScheme, deviceLabel, ensureWorkspaceStorageSafely, formatDuration, iosConfigurationSetting, iosFacts, isReleaseConfiguration, lastBuildRecord, phaseLine, pickDevClientScheme, podAction, registerIos, replaceCollector, resolveConfiguration, resolveDeviceType, resolveRuntime, runIosOperation, schemesFromInfoPlist, shortHash, shortUdid, writeLastBuild };

package/dist/{ios-xtlRHaeB.mjs → ios-ENC4sRPA.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.ts
 const MESSAGE_TYPE_LEVEL = {
 	Debug: "debug",

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-DFGuwF4U.mjs → ios-device-CKSvk0bu.mjs}

@@ -1,6 +1,6 @@
-import { t as getExecutor } from "./exec-DEoAhcze.mjs";
-import { ln as INSTALL_ERROR, pn as appProcessFromPid } from "./budget-3ivAK99e.mjs";
-import { n as TOOL_ERROR_PREFIX } from "./ios-device-BXZ0c7Kb.mjs";
+import { t as getExecutor } from "./exec-VFRpu1iA.mjs";
+import { fn as INSTALL_ERROR, gn as appProcessFromPid } from "./budget-HyShrIpL.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-CSZYI1iu.mjs → ios-project-DCUDo06I.mjs}

@@ -1,9 +1,9 @@
 import { l as workspaceAgentDeviceDir } from "./paths-DQtTgsBf.mjs";
-import { i as formatDuration, l as phaseLine } from "./command-output-YKGWivpG.mjs";
-import { B as recordFinishedBuild, Hn as isEasAuthFailureText, Rn as UPLOAD_TIMEOUT_MS, Vn as easAuthNote, zn as cacheLevel } from "./budget-3ivAK99e.mjs";
-import { a as workspaceLinkLine } from "./stim-desktop-D5OGpYZM.mjs";
-import { o as compilationCacheActivityLine, t as COMPILATION_CACHE_NOT_RUN } from "./xcode-Rq744mBF.mjs";
-import { i as deviceLabel } from "./support-TWuQlHQo.mjs";
+import { i as formatDuration, l as phaseLine } from "./command-output-BBvS1H6v.mjs";
+import { a as workspaceLinkLine } from "./stim-desktop-DS0mzR8U.mjs";
+import { B as recordFinishedBuild, Gn as isEasAuthFailureText, Hn as cacheLevel, Vn as UPLOAD_TIMEOUT_MS, Wn as easAuthNote } from "./budget-HyShrIpL.mjs";
+import { o as compilationCacheActivityLine, t as COMPILATION_CACHE_NOT_RUN } from "./xcode-CiIIDnuD.mjs";
+import { i as deviceLabel } from "./support-qKcbgmI5.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-CT9nV5SP.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-CPSp3mav.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-BSBHldmm.mjs → js-swap-Z9HbC4cj.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-3ivAK99e.mjs";
-import { t as cleanLine } from "./server-expo-BXrWxNYh.mjs";
-import { _ as tailLines, h as startBuildHeartbeat, r as HEARTBEAT_INTERVAL_MS } from "./xcode-Rq744mBF.mjs";
+import { a as killOnAbort, t as runOperationFile } from "./operation-exec-CUZifp6Z.mjs";
+import { Ut as makeTemporaryDirectory, Wt as removeTemporaryEntry } from "./settings-B5tCoq9N.mjs";
+import { $n as bundleInvocation } from "./budget-HyShrIpL.mjs";
+import { s as expoTelemetryEnv, t as cleanLine } from "./server-expo-Ck8EIidM.mjs";
+import { _ as tailLines, h as startBuildHeartbeat, r as HEARTBEAT_INTERVAL_MS } from "./xcode-CiIIDnuD.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-D-zq8SHG.mjs → launch-D0lPvFFu.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-YKGWivpG.mjs";
-import { L as workspaceDevServerMode } from "./project-DhCtQWWU.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-3ivAK99e.mjs";
-import { D as teardownOwnedAvd } from "./workspaces-e41xsjKr.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-B7AuoWJv.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-BBvS1H6v.mjs";
+import { L as workspaceDevServerMode } from "./project-BiC68mIp.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-Cjcj8MCw.mjs";
+import { c as pidExists, f as signalProcessTree } from "./metro-1pJgCX4U.mjs";
+import { $t as RELEASE_VERIFY_WAIT_MS, Cn as installConflictKind, Xt as LAUNCH_FATAL, Yt as LAUNCH_BUNDLING, Zt as LAUNCH_UNVERIFIED, an as unverifiedLaunchLines, en as VERIFY_TIMEOUT_MS, hn as androidDevClientUrl, in as unattributedLaunchLines, kn as restartedAppNote, mn as androidAppProcess, un as ADB_INSTALL_TIMEOUT_MS } from "./budget-HyShrIpL.mjs";
+import { O as teardownOwnedAvd } from "./workspaces-C9w4aeXF.mjs";
+import { _ as providerUploadOutcome } from "./build-cache-CKCzxzxA.mjs";
+import { n as verifyCollectorOwnership, r as readCollectors } from "./ownership-jxxz-19m.mjs";
+import { t as recordPhoneReverse } from "./phone-reverses-CYb7RRAx.mjs";
+import { n as nativeRunCommand, r as siblingPlatformSlots, t as launchSlotScope } from "./slot-launch-QeuJMlnJ.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-DXPSwdbb.mjs";
-import { a as printNativeCrashReport, r as captureNativeCrashes, t as errorDiagnostics } from "./error-diagnostics-DYsjJIHz.mjs";
-import { i as launchOutcomeRecord } from "./native-runtime-DBRfY_PN.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-CbXPbUMJ.mjs";
-import { a as reportAndroidResult, i as persistLastBuild, n as finishAndroidUpload } from "./result-utnBea7x.mjs";
+import { c as lostRefusal, s as lostLine, t as DEBUG_VERIFY_STEP_MS } from "./device-lease-run-ogEeJ62K.mjs";
+import { a as printNativeCrashReport, r as captureNativeCrashes, t as errorDiagnostics } from "./error-diagnostics-B1Mj_-7h.mjs";
+import { i as launchOutcomeRecord } from "./native-runtime-B9w_Qyz3.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-Cxj9CmII.mjs";
+import { a as persistLastBuild, n as finishAndroidUpload, s as reportAndroidResult } from "./result-CR2vk2cj.mjs";
 import { mkdirSync, openSync, statSync } from "node:fs";
 import { basename, join } from "node:path";
 import { ambientEnv } from "@stim-cli/core";
@@ -240,21 +241,15 @@ 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) {
-		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)`);
+		phase("verify", `bundle loaded` + (verification.processAlive === true ? ", process alive" : "") + (verification.readiness ? "" : verification.jsRunning ? ", app JavaScript running -- the first screen may still be rendering" : ", stable for 3s -- the first screen may still be rendering") + ` (${formatDuration(verification.waitedMs ?? 0)} total)`);
 		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}`);