stim 1.26.0 → 1.28.0

package/dist/{ios-ftxdQbJS.mjs → ios-tg4tp3q1.mjs}

@@ -1,39 +1,40 @@
-import { a as recordWorkspaceUseAsync, k as workspaceLogsDir$1 } from "./workspace-state-pUg3_RRA.mjs";
-import { B as deviceSlotFileKey, W as parseDeviceSlotOption, q as validateDeviceSlot } from "./config-BktkY_zC.mjs";
-import { _ as stepTimer, g as stepClock, i as formatDuration, l as phaseLine } from "./command-output-BF5AR2dL.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-CosW5X-S.mjs";
-import { t as NO_PROJECT_REFUSAL } from "./project-BUu6Is4k.mjs";
-import { ft as POOL_SETTING_REMEDY, vt as parkedMaxSetting } from "./android-DTAcRwBC.mjs";
-import { G as runFailureRecord, I as NO_BUILD_PROGRESS, J as thrownRunFailureRecord, K as startBuildProgress, Un as runProcessOperation, Ut as binOnPath, Vn as exitAfterFlush, Y as createRunRecorder, hn as DEFAULT_METRO_PORT, q as tapBuildLog, tt as statsProjectKey$1, ur as ownedSessionName } from "./budget-k2mZGvvk.mjs";
-import { d as runCancellationSignal, f as withNativeBuildRun, r as cancelledFailure, u as runCancellation } from "./native-run-BfIDFKLH.mjs";
-import { i as createIosSimSnapshot } from "./ios-WxpDJ5T1.mjs";
+import { a as recordWorkspaceUseAsync, k as workspaceLogsDir$1 } from "./workspace-state-kIZrdlSg.mjs";
+import { B as deviceSlotFileKey, W as parseDeviceSlotOption, q as validateDeviceSlot } from "./config-Cn94Jc0g.mjs";
+import { _ as stepTimer, g as stepClock, i as formatDuration, l as phaseLine } from "./command-output-C8R1KIvi.mjs";
+import { B as publicUrlSetting, C as iosSigningIdentitySettingError, F as metroWarmupUrlSetting, N as metroPortSetting, S as iosSigningIdentitySetting, T as iosSigningIdentitySha1SettingError, a as SETTING_SHAPE_REMEDY, g as deviceReclaimIdleMinutesSetting, ot as tunnelModeSetting, v as iosLanHostSetting, w as iosSigningIdentitySha1Setting, y as iosLanHostSettingError, z as projectSettingsContextAsync } from "./settings-CY5JZlNN.mjs";
+import { t as NO_PROJECT_REFUSAL } from "./project-Sui52ywT.mjs";
+import { ft as POOL_SETTING_REMEDY, vt as parkedMaxSetting } from "./android-CsPs-7Mg.mjs";
+import { En as runProcessOperation, Et as binOnPath, Qt as DEFAULT_METRO_PORT, qn as ownedSessionName, wn as exitAfterFlush } from "./ccache-Bm_A1xX9.mjs";
+import { $ as tapBuildLog, H as NO_BUILD_PROGRESS, Q as startBuildProgress, Z as runFailureRecord, et as thrownRunFailureRecord, lt as statsProjectKey$1, rt as createRunRecorder } from "./workspaces-CmOcceDN.mjs";
+import { Q as cancelledFailure, at as runCancellation, k as COMPILATION_CACHE_NOT_RUN, ot as runCancellationSignal, st as withNativeBuildRun } from "./toolchain-mLA_km-b.mjs";
+import { i as createIosSimSnapshot } from "./ios-B1DYuOjh.mjs";
 import { d as optimizationBuildProfile, l as artifactCachePolicy } from "./errors-DHm_U5gv.mjs";
-import { k as COMPILATION_CACHE_NOT_RUN } from "./toolchain-J4J8MrAr.mjs";
-import { S as setRemoteLogSink, d as simulatorRuntime } from "./client-D9CaRks-.mjs";
-import { a as parseBuildMachineOption } from "./selection-BNPBZ6T5.mjs";
-import { r as hostedMetroSettings } from "./metro-gateway-B6_PgD0L.mjs";
-import { i as writeDevicePlacementAsync } from "./ios-state-Cw7-WQf2.mjs";
-import { t as devClientPortBusy } from "./hosted-native-CpDB3-PO.mjs";
-import { f as waitFlagConflict, o as leaseExpiryText } from "./device-lease-run-BmvIl7bI.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-CVOCp0Ft.mjs";
-import { r as isEasBuildFailure } from "./eas-build-Dsj93iM9.mjs";
-import { r as isPhysicalDeviceRequest, t as ensureDevServer } from "./native-runtime-Dq3RBcON.mjs";
-import "./dev-client-DXR_tPVY.mjs";
-import { t as didSetUpDevice } from "./device-BK-zwyd_.mjs";
+import { S as setRemoteLogSink, d as simulatorRuntime } from "./client-YxCer6ab.mjs";
+import { s as parseBuildMachineOption } from "./selection-CXgM_VK_.mjs";
+import { r as hostedMetroSettings } from "./metro-request-DXyKjVDF.mjs";
+import { i as writeDevicePlacementAsync } from "./ios-state-BPHqMDdZ.mjs";
+import { t as devClientPortBusy } from "./hosted-native-CDe33CSr.mjs";
+import { i as restoreLightenedDependencies, n as printLightenedFailure } from "./lightened-DFAJgfIk.mjs";
+import { f as waitFlagConflict, o as leaseExpiryText } from "./device-lease-run-Mtzp4THX.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-BtlJKjyQ.mjs";
+import { r as isEasBuildFailure } from "./eas-build-Dm6q68QY.mjs";
+import { i as launchOutcomeRecord, r as isPhysicalDeviceRequest, t as ensureDevServer } from "./native-runtime-DG4Rodzj.mjs";
+import "./dev-client-D-BW5uiq.mjs";
+import { t as didSetUpDevice } from "./device-CgXfbcz5.mjs";
 import { t as unsupportedPlan } from "./project-plan-BPwbLwQu.mjs";
-import { a as refusePlan, i as printPlan, n as planFlagRefusal } from "./build-plan-DrMMdayj.mjs";
-import { a as lastBuildRecord, o as reportIosResult, s as writeLastBuild } from "./ios-project-Ty5pHl9O.mjs";
-import { t as acquireIosArtifact } from "./artifact-CsAP6AGK.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-C8S7FlPF.mjs";
-import { a as iosPoolCandidates, c as isWirelessIosDevice, f as resolveIosPhysicalDevice, o as iosPoolNoCandidatesRefusal, r as iosDeviceBounds } from "./ios-device-CsyryvpT.mjs";
-import { i as lanOriginUrlFor, l as verifyIosMetroRun, n as chooseLanAddress, o as finishIosRun, t as DEFAULT_DEPS } from "./dependencies-Dw6wfQdv.mjs";
-import { basename, join } from "node:path";
+import { a as refusePlan, i as printPlan, n as planFlagRefusal } from "./build-plan-CxoYfxsc.mjs";
+import { a as iosLedgerDevice, c as writeLastBuild, o as lastBuildRecord, s as reportIosResult } from "./ios-project-CR4mZ7CH.mjs";
+import { t as acquireIosArtifact } from "./artifact-DYtHjxsn.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-DFlpAqdV.mjs";
+import { a as iosPoolCandidates, c as isWirelessIosDevice, f as resolveIosPhysicalDevice, o as iosPoolNoCandidatesRefusal, r as iosDeviceBounds } from "./ios-device-B4elVFKi.mjs";
+import { i as lanOriginUrlFor, l as verifyIosMetroRun, n as chooseLanAddress, o as finishIosRun, t as DEFAULT_DEPS } from "./dependencies-DKeMzwXY.mjs";
+import { join } from "node:path";
 import { workspaceId } from "@stim-cli/core";
 import { hostedIosStatus, parseMachine } from "@stim-cli/core/state";
 import chalk from "chalk";
 import { InvalidArgumentError } from "commander";
 //#region src/commands/ios/hosted.ts
-async function finishHostedIosRun({ target, d, artifact, root, slot, release, appMode, isExpo, metroCheck, metroPort, logsDir, fail, note, phase, enterPhase, enterActivity, selectors, projectBundleId, ...report }) {
+async function finishHostedIosRun({ target, operation, d, artifact, root, slot, release, appMode, isExpo, metroCheck, metroPort, logsDir, fail, note, phase, enterPhase, enterActivity, selectors, projectBundleId, logWriter, ...report }) {
 	const bundleId = artifact.bundleId ?? (await d.readBundleId(artifact.path) || await projectBundleId());
 	if (!bundleId) return fail({
 		code: "STIM_INSTALL_FAILED",
@@ -41,6 +42,7 @@ async function finishHostedIosRun({ target, d, artifact, root, slot, release, ap
 	});
 	const devClientScheme = appMode === "development" && isExpo ? d.devClientScheme(root, artifact.path) ?? void 0 : void 0;
 	const launchedAt = d.now();
+	let marked = false;
 	let run;
 	try {
 		run = await d.placeHostedIos(target, {
@@ -54,7 +56,25 @@ async function finishHostedIosRun({ target, d, artifact, root, slot, release, ap
 			mode: appMode,
 			...appMode === "development" && isExpo ? { devClientScheme } : {},
 			metroPort,
-			reserved: (placement) => d.writeHostedIos(root, slot, placement),
+			reserved: (placement) => {
+				if (placement.device && !marked) {
+					marked = true;
+					logWriter().write({
+						src: "build",
+						level: "info",
+						marker: true,
+						event: "launch_attempt",
+						ts: d.now(),
+						platform: "ios",
+						appId: bundleId,
+						deviceId: placement.session,
+						remote: true,
+						host: target.host.machine,
+						msg: `launching ${bundleId} on ${target.host.machine}`
+					});
+				}
+				return d.writeHostedIos(root, slot, placement);
+			},
 			note,
 			enterPhase
 		});
@@ -76,11 +96,13 @@ async function finishHostedIosRun({ target, d, artifact, root, slot, release, ap
 	}, slot);
 	let launched = run.launched;
 	let launchWarning;
+	let unattributed = false;
 	if (appMode === "development") {
 		const hostedLogs = d.followHostedLaunchLogs(root, slot, "ios", launchedAt);
 		let verification;
 		try {
 			verification = await verifyIosMetroRun({
+				operation,
 				root,
 				slot,
 				appPath: artifact.path,
@@ -117,7 +139,17 @@ async function finishHostedIosRun({ target, d, artifact, root, slot, release, ap
 		});
 		launched = verification.state === true ? true : verification.state === "bundling" ? "bundling" : "unverified";
 		launchWarning = verification.warning;
+		unattributed = verification.unattributed ?? false;
 	}
+	logWriter().write(launchOutcomeRecord({
+		launchState: launched,
+		release,
+		process: appMode === "process",
+		bundleId,
+		configuration: report.configuration,
+		metroPort,
+		unattributed
+	}));
 	if (launched === "unverified") note(`Launch on ${target.host.machine} is unverified; check the hosted app, then retry stim ios --remote ${target.host.machine}.`);
 	const cache = artifact.cache;
 	const device = run.placement.device;
@@ -207,9 +239,9 @@ function iosCommand(program) {
 	registerIos(program);
 }
 function registerIos(program, deps = {}) {
-	program.command("ios").description("Build (or restore from the fingerprint cache), install and launch this workspace's app on its owned simulator. React Native and Expo Debug runs start the dev server when it is not running.").option("--eas-profile <name>", "Download a matching EAS development build; on a miss, print the build command without running it").option("--slot <name>", "Reusable device slot within this workspace (default: default)", parseDeviceSlotOption).option("--remote-build <value>", "Build on auto, local, or one named machine; a name refuses without fallback", parseBuildMachineOption).option("--json", "Emit the facts as a single JSON line on stdout; every other line goes to stderr").option("--plan", "Predict the next build without building, booting or installing: resolve the fingerprint, check the local then remote cache, and print the expected cache result and duration. Writes no Stim state.").option("--scheme <name>", "Shared Xcode app scheme to build; overrides automatic scheme selection, not the app URL scheme").option("--no-metro-check", "Skip the \"is this workspace's dev server running?\" check: do not start it, and build anyway").option("--no-build-cache", "Build fresh, ignoring cached artifacts (local and the project's build-cache provider); the fresh build still replaces the cache entry").option("--configuration <name>", "Xcode configuration to build (e.g. Release). A non-Debug configuration embeds the JS bundle and skips Metro entirely. Overrides the ios.configuration setting. Default: Debug").option("--device-type <name>", "Simulator model to create this workspace's owned sim as, exactly as `xcrun simctl list devicetypes` names it (e.g. \"iPad Pro 13-inch (M5)\"). Overrides the ios.deviceType setting for this invocation. A model no installed runtime can create refuses with STIM_BAD_ARG and prints the models they do offer.").option("--runtime <version>", "Simulator runtime to create this workspace's owned sim on, as a version (\"18.5\") or a runtime's full name (\"iOS 18.5\"); nothing else matches. Overrides the ios.runtime setting for this invocation. An unknown version refuses with STIM_BAD_ARG and prints the installed runtimes.").option("--simulator-app <app>", "Open the owned simulator in xcode, siniulator, or stim-desktop for this run, overriding the machine iosSimulatorApp setting. Also opens an already running simulator; local simulators only.").option("--device [udid]", "Build the iphoneos slice for a connected iPhone, install it, and launch it, instead of using this workspace's owned simulator. The phone can be cabled or paired over Wi-Fi. With no UDID, the first cabled device this workspace can lease is used, waiting for one that is busy; a Wi-Fi device is used only when no cabled one is connected and ready. In Debug the app is wired to this workspace's Metro over the LAN. Stim never creates, boots, or deletes a physical device.").option("--remote <target>", "Run on eas, proxy, or an approved Mac in remote.machines; named Macs never fall back locally. auto places on an approved Mac when this machine is full or busy. local runs here, whatever ios.remote says.", (value) => {
+	program.command("ios").description("Build (or restore from the fingerprint cache), install and launch this workspace's app on its owned simulator. React Native and Expo Debug runs start the dev server when it is not running.").option("--eas-profile <name>", "Download a matching EAS development build; on a miss, print the build command without running it").option("--slot <name>", "Reusable device slot within this workspace (default: default)", parseDeviceSlotOption).option("--remote-build <value>", "Build on local, auto, remote (remote machines first), remote-only (never here), or one named machine; a name refuses without fallback", parseBuildMachineOption).option("--json", "Emit the facts as a single JSON line on stdout; every other line goes to stderr").option("--plan", "Predict the next build without building, booting or installing: resolve the fingerprint, check the local then remote cache, and print the expected cache result and duration. Writes no Stim state.").option("--scheme <name>", "Shared Xcode app scheme to build; overrides automatic scheme selection, not the app URL scheme").option("--no-metro-check", "Skip the \"is this workspace's dev server running?\" check: do not start it, and build anyway").option("--no-build-cache", "Build fresh, ignoring cached artifacts (local and the project's build-cache provider); the fresh build still replaces the cache entry").option("--configuration <name>", "Xcode configuration to build (e.g. Release). A non-Debug configuration embeds the JS bundle and skips Metro entirely. Overrides the ios.configuration setting. Default: Debug").option("--device-type <name>", "Simulator model to create this workspace's owned sim as, exactly as `xcrun simctl list devicetypes` names it (e.g. \"iPad Pro 13-inch (M5)\"). Overrides the ios.deviceType setting for this invocation. A model no installed runtime can create refuses with STIM_BAD_ARG and prints the models they do offer.").option("--runtime <version>", "Simulator runtime to create this workspace's owned sim on, as a version (\"18.5\") or a runtime's full name (\"iOS 18.5\"); nothing else matches. Overrides the ios.runtime setting for this invocation. An unknown version refuses with STIM_BAD_ARG and prints the installed runtimes.").option("--simulator-app <app>", "Open the owned simulator in xcode, siniulator, or stim-desktop for this run, overriding the machine iosSimulatorApp setting. Also opens an already running simulator; local simulators only.").option("--device [udid]", "Build the iphoneos slice for a connected iPhone, install it, and launch it, instead of using this workspace's owned simulator. The phone can be cabled or paired over Wi-Fi. With no UDID, the first cabled device this workspace can lease is used, waiting for one that is busy; a Wi-Fi device is used only when no cabled one is connected and ready. In Debug the app is wired to this workspace's Metro over the LAN. Stim never creates, boots, or deletes a physical device.").option("--remote <target>", "Run on eas, proxy, or an approved Mac in remote.machines; named Macs never fall back locally. auto places on an approved Mac when this machine is full or busy. remote tries remote.machines in order first and runs here only when none takes it. remote-only never runs here. local runs here, whatever ios.remote says.", (value) => {
 		if (parseMachine(value)) return value.trim();
-		throw new InvalidArgumentError("expected eas, proxy, auto, local, or a remote Mac name");
+		throw new InvalidArgumentError("expected eas, proxy, local, auto, remote, remote-only, or a remote Mac name");
 	}).option("--wait <seconds>", "How long to wait for another workspace to release the phone it leases, before refusing with STIM_DEVICE_BUSY (default 60, 0 refuses at once). Without --device, wait for an owned-device slot (default 600 seconds; --no-wait refuses immediately).").option("--no-wait", "Install on a phone another workspace leases instead of waiting: this run takes no lease and, when both workspaces build the same app id, the install terminates the holder's running app. Without --device, refuse a full device cap or existing slot queue immediately.").action(async (opts) => {
 		if (opts.plan) {
 			await planIos(opts, {
@@ -234,6 +266,12 @@ function runIosOperation(context, root, opts = {}, deps = {}, onFailure = () =>
 		platform: "ios",
 		slot: opts.slot ?? "default"
 	}, async (claim) => {
+		const lightened = await restoreLightenedDependencies(root, context);
+		if (lightened) {
+			printLightenedFailure(context, lightened, Boolean(opts.json));
+			onFailure(lightened);
+			return null;
+		}
 		await recordWorkspaceUseAsync(root, /* @__PURE__ */ new Date(), context.env, context.cwd, context.signal);
 		const progress = startBuildProgress({
 			root,
@@ -307,6 +345,10 @@ function iosSlotDeps(d, slot) {
 				...args,
 				slot
 			}),
+			ensureBooted: (args) => base.ensureBooted({
+				...args,
+				slot
+			}),
 			checkDeviceCapacity: (args) => base.checkDeviceCapacity({
 				...args,
 				slot
@@ -435,7 +477,15 @@ async function runIos(context, projectRoot, opts = {}, overrides = {}, progress
 	let devicePlacement;
 	let builtConfiguration = null;
 	let acquiredBuild = null;
-	const recordFailedBuild = (build, errorCode) => writeLastBuild(root, lastBuildRecord({
+	let builtScheme;
+	let builtDevice = null;
+	const recordFailedBuild = (build, errorCode, why = {}) => writeLastBuild(root, lastBuildRecord({
+		ledger: {
+			scheme: builtScheme,
+			device: builtDevice,
+			message: why.message,
+			remedy: why.remedy
+		},
 		devicePlacement,
 		buildMachine,
 		...build,
@@ -461,7 +511,10 @@ async function runIos(context, projectRoot, opts = {}, overrides = {}, progress
 		if (remedy) note(chalk.dim(phaseLine("remedy", remedy)));
 		if (logPath) note(chalk.dim(phaseLine("log", logPath)));
 		const failedBuild = build ?? acquiredBuild;
-		if (failedBuild) recordFailedBuild(failedBuild, code);
+		if (failedBuild) recordFailedBuild(failedBuild, code, {
+			message,
+			remedy
+		});
 		if (acquiredBuild) logWriter().write(runFailureRecord({
 			code,
 			message,
@@ -549,6 +602,7 @@ async function runIos(context, projectRoot, opts = {}, overrides = {}, progress
 	const configuration = opts.easProfile !== void 0 ? null : resolveConfiguration(opts.configuration, settings);
 	builtConfiguration = configuration ?? "Debug";
 	const buildScheme = resolveSchemeSelection(opts, settings);
+	builtScheme = buildScheme;
 	const release = isReleaseConfiguration(configuration);
 	const appMode = {
 		metro: "development",
@@ -573,7 +627,6 @@ async function runIos(context, projectRoot, opts = {}, overrides = {}, progress
 	const deviceSlotWait = {
 		automatic: false,
 		waitMs: deviceSlotWaitMs,
-		displayName: basename(root),
 		reclaimIdleMinutes: deviceReclaimIdleMinutesSetting(settings),
 		...deviceWaitRun.policy,
 		onWait: (ms) => {
@@ -621,6 +674,7 @@ async function runIos(context, projectRoot, opts = {}, overrides = {}, progress
 		}),
 		simSnapshot,
 		noWait: deviceSlotWaitMs === 0,
+		waitMs: deviceSlotWaitMs,
 		note,
 		phase,
 		log: (entry) => logWriter().write(entry)
@@ -818,6 +872,7 @@ async function runIos(context, projectRoot, opts = {}, overrides = {}, progress
 			const prepareMs = prepare();
 			if (device.created || prepareMs >= 2e3) phase("device", `${deviceLabel(device, device.deviceUdid)} ${device.created ? "created" : "prepared"} (${formatDuration(prepareMs)})`);
 		}
+		builtDevice = iosLedgerDevice(device);
 		let bootDuration = "";
 		let bootPending = false;
 		let bootPromise;
@@ -970,7 +1025,7 @@ async function runIos(context, projectRoot, opts = {}, overrides = {}, progress
 			if (cancelled) return fail(cancelled);
 			if (acquiredBuild) {
 				const { code } = error;
-				recordFailedBuild(acquiredBuild, typeof code === "string" ? code : void 0);
+				recordFailedBuild(acquiredBuild, typeof code === "string" ? code : void 0, { message: error instanceof Error ? error.message : String(error) });
 				logWriter().write(thrownRunFailureRecord(error, progress.phase()));
 			}
 			recordRun({
@@ -1093,6 +1148,7 @@ async function runIos(context, projectRoot, opts = {}, overrides = {}, progress
 			};
 			compilationCache = artifact.cache.compilation;
 			if (hostedTarget) return await finishHostedIosRun({
+				operation: context,
 				output: context.output,
 				target: hostedTarget,
 				projectBundleId: integration.bundleId,
@@ -1121,7 +1177,8 @@ async function runIos(context, projectRoot, opts = {}, overrides = {}, progress
 				phase,
 				enterPhase: progress.step,
 				enterActivity: progress.activity,
-				selectors
+				selectors,
+				logWriter
 			});
 			if (!localBoot) {
 				progress.step("device");

package/dist/{js-swap-BMhXYVDS.mjs → js-swap-CVpSW1fn.mjs}

@@ -1,10 +1,10 @@
-import { _ as spawnDeclared, b as operationState, c as throwIfCancelled, t as getExecutor } from "./exec-VFRpu1iA.mjs";
+import { _ as spawnDeclared, b as operationState, c as throwIfCancelled, t as getExecutor } from "./exec-aULwtNly.mjs";
 import { r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { a as killOnAbort, t as runOperationFile } from "./operation-exec-CUZifp6Z.mjs";
-import { Ut as makeTemporaryDirectory, Wt as removeTemporaryEntry } from "./settings-CosW5X-S.mjs";
-import { rr as bundleInvocation } from "./budget-k2mZGvvk.mjs";
-import { s as expoTelemetryEnv, t as cleanLine } from "./server-expo-eQfOdydb.mjs";
-import { G as tailLines, U as startBuildHeartbeat, j as HEARTBEAT_INTERVAL_MS } from "./toolchain-J4J8MrAr.mjs";
+import { a as killOnAbort, t as runOperationFile } from "./operation-exec-Dp4FuIGR.mjs";
+import { an as makeTemporaryDirectory, on as removeTemporaryEntry } from "./settings-CY5JZlNN.mjs";
+import { Bn as bundleInvocation } from "./ccache-Bm_A1xX9.mjs";
+import { G as tailLines, U as startBuildHeartbeat, j as HEARTBEAT_INTERVAL_MS } from "./toolchain-mLA_km-b.mjs";
+import { s as expoTelemetryEnv, t as cleanLine } from "./server-expo-Ccm9zB0o.mjs";
 import { randomUUID } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from "node:fs";
 import { basename, join } from "node:path";
@@ -120,7 +120,8 @@ async function readPlistKey(context, e, plist, key, format) {
 			plist
 		], { timeoutMs: 1e4 });
 	} catch (err) {
-		if (/No value at that key path/.test(describe(err))) return null;
+		const stdout = typeof err === "object" && err !== null && "stdout" in err ? String(err.stdout) : "";
+		if (/No value at that key path/.test(`${describe(err)}\n${stdout}`)) return null;
 		throw err;
 	}
 }

package/dist/{launch-DOp8RjDz.mjs → launch-DoySmhjz.mjs}

@@ -1,23 +1,24 @@
-import { k as workspaceLogsDir } from "./workspace-state-pUg3_RRA.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-BktkY_zC.mjs";
-import { _ as stepTimer, c as launchErrorReport, i as formatDuration, l as phaseLine, n as appReadinessMessage, v as launchErrorPreview } from "./command-output-BF5AR2dL.mjs";
-import { L as workspaceDevServerMode } from "./project-BUu6Is4k.mjs";
-import { o as workspaceLinks } from "./stim-desktop-6Dqp-gjX.mjs";
-import { i as androidDataFreeBytes, ot as trimAndroidCaches, tt as resetAdoptedAvd, u as androidToolCwd } from "./android-DTAcRwBC.mjs";
-import { c as pidExists, f as signalProcessTree } from "./metro-CjC10t6E.mjs";
-import { $t as LAUNCH_BUNDLING, Dn as installConflictKind, Nn as restartedAppNote, cn as unattributedLaunchLines, en as LAUNCH_FATAL, in as VERIFY_TIMEOUT_MS, ln as unverifiedLaunchLines, mn as ADB_INSTALL_TIMEOUT_MS, rn as RELEASE_VERIFY_WAIT_MS, tn as LAUNCH_UNVERIFIED, vn as androidAppProcess, yn as androidDevClientUrl } from "./budget-k2mZGvvk.mjs";
-import { O as teardownOwnedAvd } from "./workspaces-g2lhdBXF.mjs";
-import { b as providerUploadOutcome } from "./build-cache-DrXNCy3T.mjs";
-import { n as verifyCollectorOwnership, r as readCollectors } from "./ownership-BjYvMNX_.mjs";
-import { t as recordPhoneReverse } from "./phone-reverses-lmj6kcPm.mjs";
-import { n as nativeRunCommand, r as siblingPlatformSlots, t as launchSlotScope } from "./slot-launch-CYCEhfBY.mjs";
+import { x as withDrainingCancellation } from "./exec-aULwtNly.mjs";
+import { k as workspaceLogsDir } from "./workspace-state-kIZrdlSg.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-Cn94Jc0g.mjs";
+import { _ as stepTimer, c as launchErrorReport, i as formatDuration, l as phaseLine, n as appReadinessMessage, v as launchErrorPreview } from "./command-output-C8R1KIvi.mjs";
+import { L as workspaceDevServerMode } from "./project-Sui52ywT.mjs";
+import { o as workspaceLinks } from "./stim-desktop-CbWo21kb.mjs";
+import { i as androidDataFreeBytes, ot as trimAndroidCaches, tt as resetAdoptedAvd, u as androidToolCwd } from "./android-CsPs-7Mg.mjs";
+import { c as pidExists, f as signalProcessTree } from "./metro-BnhXV2Mj.mjs";
+import { Bt as RELEASE_VERIFY_WAIT_MS, Gt as unattributedLaunchLines, It as LAUNCH_BUNDLING, Kt as unverifiedLaunchLines, Lt as LAUNCH_FATAL, Rt as LAUNCH_UNVERIFIED, Vt as VERIFY_TIMEOUT_MS, Zt as ADB_INSTALL_TIMEOUT_MS, gn as restartedAppNote, nn as androidDevClientUrl, tn as androidAppProcess, un as installConflictKind } from "./ccache-Bm_A1xX9.mjs";
+import { pt as teardownOwnedAvd } from "./workspaces-CmOcceDN.mjs";
+import { x as providerUploadOutcome } from "./build-cache-CZULpXVl.mjs";
+import { t as recordPhoneReverse } from "./phone-reverses-BzTa8g1F.mjs";
+import { n as verifyCollectorOwnership, r as readCollectors } from "./ownership-DJCq48IJ.mjs";
+import { n as nativeRunCommand, r as siblingPlatformSlots, t as launchSlotScope } from "./slot-launch-BpmanOnk.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-BmvIl7bI.mjs";
-import { a as printNativeCrashReport, r as captureNativeCrashes, t as errorDiagnostics } from "./error-diagnostics-BOOm9Db7.mjs";
-import { f as settleFingerprintCheck } from "./prebuild-gmouvmJZ.mjs";
-import { i as launchOutcomeRecord } from "./native-runtime-Dq3RBcON.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-BGSCBoib.mjs";
-import { a as persistLastBuild, n as finishAndroidUpload, s as reportAndroidResult } from "./result-7F5hEwQJ.mjs";
+import { c as lostRefusal, s as lostLine, t as DEBUG_VERIFY_STEP_MS } from "./device-lease-run-Mtzp4THX.mjs";
+import { a as captureNativeCrashes, r as androidCrashClockOffset, s as printNativeCrashReport, t as errorDiagnostics } from "./error-diagnostics-D1QfyJzQ.mjs";
+import { f as settleFingerprintCheck } from "./prebuild-k8d_tqOq.mjs";
+import { i as launchOutcomeRecord } from "./native-runtime-DG4Rodzj.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-04IhBUTT.mjs";
+import { a as persistLastBuild, n as finishAndroidUpload, s as reportAndroidResult } from "./result-BIcXREyC.mjs";
 import { mkdirSync, openSync, statSync } from "node:fs";
 import { basename, join } from "node:path";
 import { ambientEnv } from "@stim-cli/core";
@@ -104,17 +105,11 @@ async function startCollector({ root, slot = "default", serial, packageName, spa
 //#endregion
 //#region src/commands/android/launch.ts
 function androidLaunchOutcomeRecord(kind, args) {
-	if (kind !== "process") return launchOutcomeRecord({
+	return launchOutcomeRecord({
 		...args,
-		release: kind === "embedded-js"
+		release: kind === "embedded-js",
+		process: kind === "process"
 	});
-	const unverified = args.launchState === LAUNCH_UNVERIFIED;
-	return {
-		src: "build",
-		level: unverified ? "warn" : "info",
-		event: unverified ? "launch_unverified" : "launch_verified",
-		msg: unverified ? `${args.bundleId} could not be verified as running` : `${args.bundleId} is running its native process`
-	};
 }
 function androidProcessRuntime(prepare, kind = "process") {
 	return {
@@ -192,19 +187,28 @@ async function verifyAndroidMetroRun({ operation, root, slot, remoteDevice, veri
 		physical,
 		deviceId: serial
 	});
-	const readNativeCrashes = () => hostedLogs ? hostedLogs.readNativeCrashes() : remoteDevice ? [] : captureNativeCrashes({
-		root,
-		slot,
-		platform: "android",
-		deviceId: serial,
-		appId: androidPackage,
-		since: launchedAt
-	}, logsDir, operation?.signal, operation?.env);
+	let clockOffsetMs;
+	const readNativeCrashes = async () => {
+		if (hostedLogs) return hostedLogs.readNativeCrashes();
+		if (remoteDevice) return [];
+		const measured = clockOffsetMs ?? await androidCrashClockOffset(serial, operation?.signal);
+		if (measured !== null) clockOffsetMs = measured;
+		return captureNativeCrashes({
+			root,
+			slot,
+			platform: "android",
+			deviceId: serial,
+			appId: androidPackage,
+			since: launchedAt,
+			clockOffsetMs: measured
+		}, logsDir, operation?.signal, operation?.env);
+	};
 	const freshEmulator = Boolean((device.created || device.adoptionPending) && device.owned && !remoteDevice);
 	const timeoutMs = freshEmulator ? 6e4 : VERIFY_TIMEOUT_MS;
 	if (metroCheck && freshEmulator) phase("verify", `waiting up to 60s for bundle load (${device.created ? "new" : "adopted"} emulator)`);
 	const siblings = metroCheck ? await siblingPlatformSlots(root, "android", slot) : [];
-	const verification = metroCheck ? await verifyLaunched({
+	const verification = metroCheck ? await withDrainingCancellation(operation, operation?.signal, () => verifyLaunched({
+		signal: operation?.signal,
 		timeoutMs,
 		requireBundleResponse: true,
 		slot: launchSlotScope(root, slot),
@@ -223,7 +227,7 @@ async function verifyAndroidMetroRun({ operation, root, slot, remoteDevice, veri
 			const running = await androidAppProcess(serial, androidPackage);
 			return running.state === "unknown" ? null : running.state === "running";
 		}
-	}) : {
+	})) : {
 		verified: false,
 		skipped: true
 	};

package/dist/lightened-DFAJgfIk.mjs

@@ -0,0 +1,171 @@
+import { l as WorkspaceProcessCleanupError } from "./exec-aULwtNly.mjs";
+import { c as withWorkspaceStateLock } from "./workspace-state-kIZrdlSg.mjs";
+import { l as phaseLine } from "./command-output-C8R1KIvi.mjs";
+import { Jt as warmWorktreePaths, Lt as podsOutOfSync, Q as resolveSettings, Rt as readWorktreeExclude, kt as listCarryableIgnoredEntries, vt as depsOutOfSync } from "./settings-CY5JZlNN.mjs";
+import { t as canonicalPath } from "./paths-BsJMoPP2.mjs";
+import { m as warmWorktreeTarget } from "./worktree-2dk5edza.mjs";
+import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
+import { basename, dirname, join, relative } from "node:path";
+import { isJsonObject, readJsonObject, workspaceLightenedFile, workspaceMetadataFile } from "@stim-cli/core/state";
+//#region src/workspace/lightened.ts
+function strings(value) {
+	return Array.isArray(value) ? value.filter((entry) => typeof entry === "string") : [];
+}
+function readRecord(root) {
+	const record = readJsonObject(workspaceLightenedFile(root));
+	return isJsonObject(record) ? {
+		dirs: strings(record.dirs),
+		pending: strings(record.pending)
+	} : {
+		dirs: [],
+		pending: []
+	};
+}
+/** The keys among `keys` that have a Stim workspace, which is what restores a lightened worktree. */
+function workspaceKeys(keys) {
+	return keys.filter((key) => existsSync(workspaceMetadataFile(key)));
+}
+const LOCKFILES = [
+	"pnpm-lock.yaml",
+	"package-lock.json",
+	"yarn.lock",
+	"bun.lock",
+	"bun.lockb"
+];
+function readOrNull(path) {
+	try {
+		return readFileSync(path);
+	} catch {
+		return null;
+	}
+}
+async function sourceFacts(worktree, operation) {
+	try {
+		const { root: source, common } = await warmWorktreePaths(worktree, operation);
+		const settings = resolveSettings({
+			gitCommonDir: common,
+			repoRoot: source
+		}).worktree;
+		const configured = isJsonObject(settings) && Array.isArray(settings.exclude) ? settings.exclude.filter((entry) => typeof entry === "string") : [];
+		const excluded = readWorktreeExclude(source);
+		const patterns = excluded?.length ? excluded : configured;
+		return {
+			source,
+			carryable: new Set(await listCarryableIgnoredEntries(source, patterns, {
+				env: operation?.env,
+				signal: operation?.signal,
+				declareFor: operation
+			}))
+		};
+	} catch (error) {
+		operation?.signal.throwIfAborted();
+		if (error instanceof WorkspaceProcessCleanupError) throw error;
+		return null;
+	}
+}
+/**
+* Why `worktree warm` could not put back what is deleted at `path`, or null when it copies the same versions back: it
+* carries that directory from the source checkout, and both hold the same lockfile.
+*/
+async function restoreProblem({ worktree, path }, cache = /* @__PURE__ */ new Map(), operation) {
+	let pending = cache.get(worktree);
+	if (!pending) cache.set(worktree, pending = sourceFacts(worktree, operation));
+	const facts = await pending;
+	if (!facts) return "its source checkout cannot be resolved, so worktree warm could not restore it";
+	const rel = relative(worktree, path);
+	if (!facts.carryable.has(rel)) return `worktree warm would not copy ${rel} back from the source checkout`;
+	const pods = basename(rel) === "Pods";
+	if ((pods ? podsOutOfSync(facts.source, [rel]) : depsOutOfSync(facts.source, facts.source, [rel])).length) return `the source checkout's ${rel} was not installed from its own lockfile, so worktree warm would restore other versions`;
+	const differs = (pods ? [join(dirname(rel), "Podfile.lock")] : [.../* @__PURE__ */ new Set([".", dirname(rel)])].flatMap((dir) => LOCKFILES.map((name) => join(dir, name)))).find((lock) => {
+		const mine = readOrNull(join(worktree, lock));
+		const theirs = readOrNull(join(facts.source, lock));
+		return mine === null ? theirs !== null : theirs === null || !mine.equals(theirs);
+	});
+	return differs ? `its ${differs} differs from the source checkout's, so worktree warm would restore other versions` : null;
+}
+function writeRecord(key, update) {
+	withWorkspaceStateLock(key, () => {
+		const file = workspaceLightenedFile(key);
+		mkdirSync(dirname(file), { recursive: true });
+		const tmp = `${file}.tmp-${process.pid}`;
+		writeFileSync(tmp, `${JSON.stringify({
+			at: (/* @__PURE__ */ new Date()).toISOString(),
+			...update(readRecord(key))
+		}, null, 2)}\n`, { mode: 384 });
+		renameSync(tmp, file);
+	});
+}
+/**
+* Records in each Stim workspace among `keys` that `dir` is being deleted to lighten its worktree, before the deletion;
+* it stays pending until `finishLightened`, so a deletion that stops part-way is still restored.
+*/
+function recordLightened(keys, dir) {
+	for (const key of workspaceKeys(keys)) writeRecord(key, ({ dirs, pending }) => ({
+		dirs: [.../* @__PURE__ */ new Set([...dirs, dir])],
+		pending: [.../* @__PURE__ */ new Set([...pending, dir])]
+	}));
+}
+function finishLightened(keys, dir) {
+	for (const key of workspaceKeys(keys)) writeRecord(key, ({ dirs, pending }) => ({
+		dirs,
+		pending: pending.filter((entry) => entry !== dir)
+	}));
+}
+function depsFailure(root, message, remedy = `Run \`stim worktree warm\` in ${root}, or install the project's dependencies, then retry.`) {
+	return {
+		code: "STIM_DEPS_FAILED",
+		message: `gc lightened this worktree, and ${message}`,
+		remedy: `${remedy} If you installed them yourself, delete ${workspaceLightenedFile(root)} so Stim stops restoring them.`
+	};
+}
+/**
+* Restores the dependencies gc deleted from this workspace's worktree through `stim worktree warm`, or returns the
+* failure to report. A workspace gc never lightened is left alone.
+*/
+async function restoreLightenedDependencies(root, operation) {
+	const { dirs, pending } = readRecord(root);
+	if (!dirs.length) return null;
+	const missing = () => dirs.filter((dir) => pending.includes(dir) || !existsSync(dir));
+	if (missing().length) {
+		const cache = /* @__PURE__ */ new Map();
+		const worktree = (await warmWorktreePaths(root, operation).catch(() => null))?.target;
+		for (const dir of missing()) {
+			const problem = worktree ? await restoreProblem({
+				worktree,
+				path: dir
+			}, cache, operation) : "its worktree cannot be resolved";
+			if (problem) return depsFailure(root, `${dir} cannot be restored by worktree warm: ${problem}.`, `Install the project's dependencies in ${root} (for example \`pnpm install\` or \`pod install\`), then retry.`);
+		}
+		operation.output("stderr", `${phaseLine("deps", `gc lightened this worktree; restoring ${missing().join(", ")} with worktree warm`)}\n`);
+		for (const dir of pending) {
+			if (!worktree || canonicalPath(dir) !== join(canonicalPath(worktree), relative(worktree, dir))) return depsFailure(root, `${dir} is reached through a link or lies outside its worktree, so it was not removed.`);
+			rmSync(dir, {
+				recursive: true,
+				force: true
+			});
+		}
+		let exitCode;
+		try {
+			({exitCode} = await warmWorktreeTarget({
+				cwd: root,
+				operation
+			}));
+		} catch (error) {
+			operation.signal.throwIfAborted();
+			if (error instanceof WorkspaceProcessCleanupError) throw error;
+			return depsFailure(root, `worktree warm failed: ${error instanceof Error ? error.message : String(error)}`);
+		}
+		const left = dirs.filter((dir) => !existsSync(dir));
+		if (exitCode !== 0 || left.length) return depsFailure(root, `worktree warm did not restore ${left.join(", ") || "its dependencies"}.`);
+	}
+	withWorkspaceStateLock(root, () => rmSync(workspaceLightenedFile(root), { force: true }));
+	return null;
+}
+/** Prints a restore failure the way a native run reports a refusal, with the JSON line on stdout when asked. */
+function printLightenedFailure(operation, failure, json) {
+	operation.output("stderr", `${phaseLine("error", `${failure.code}: ${failure.message}`)}\n`);
+	operation.output("stderr", `${phaseLine("remedy", failure.remedy)}\n`);
+	if (json) operation.output("stdout", `${JSON.stringify(failure)}\n`);
+}
+//#endregion
+export { restoreProblem as a, restoreLightenedDependencies as i, printLightenedFailure as n, workspaceKeys as o, recordLightened as r, finishLightened as t };