stim 1.25.0 → 1.27.0

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

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

package/dist/{ios-state-CT9nV5SP.mjs → ios-state-BZ03NFgF.mjs}

@@ -1,4 +1,4 @@
-import { l as withWorkspaceStateLockAsync, o as updateWorkspaceState, r as readWorkspaceState$1 } from "./workspace-state-CPSp3mav.mjs";
+import { l as withWorkspaceStateLockAsync, o as updateWorkspaceState, r as readWorkspaceState$1 } from "./workspace-state-BjqdjnJR.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) {

package/dist/{js-swap-Z9HbC4cj.mjs → js-swap-Dg2a945i.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-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 { a as killOnAbort, t as runOperationFile } from "./operation-exec-Dp4FuIGR.mjs";
+import { $t as makeTemporaryDirectory, en as removeTemporaryEntry } from "./settings-BDVI8Ivc.mjs";
+import { Bn as bundleInvocation } from "./ccache-BWTze1Ls.mjs";
+import { G as tailLines, U as startBuildHeartbeat, j as HEARTBEAT_INTERVAL_MS } from "./toolchain-CbCG6C5Z.mjs";
+import { s as expoTelemetryEnv, t as cleanLine } from "./server-expo-ABQs2XFA.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-D0lPvFFu.mjs → launch-CRyBeNsA.mjs}

@@ -1,22 +1,24 @@
-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-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 { x as withDrainingCancellation } from "./exec-aULwtNly.mjs";
+import { k as workspaceLogsDir } from "./workspace-state-BjqdjnJR.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-Dj-WT4BP.mjs";
+import { L as workspaceDevServerMode } from "./project-DYj-HVx6.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-DriNoAVy.mjs";
+import { c as pidExists, f as signalProcessTree } from "./metro-CvyD-xwe.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-BWTze1Ls.mjs";
+import { ut as teardownOwnedAvd } from "./workspaces-DFbj07jp.mjs";
+import { x as providerUploadOutcome } from "./build-cache-gBJ-WKzA.mjs";
+import { t as recordPhoneReverse } from "./phone-reverses-C9yAaKEv.mjs";
+import { n as verifyCollectorOwnership, r as readCollectors } from "./ownership-Bx-0cku-.mjs";
+import { n as nativeRunCommand, r as siblingPlatformSlots, t as launchSlotScope } from "./slot-launch-0l7RqSpr.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-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 { c as lostRefusal, s as lostLine, t as DEBUG_VERIFY_STEP_MS } from "./device-lease-run-DwsGfjUN.mjs";
+import { a as captureNativeCrashes, r as androidCrashClockOffset, s as printNativeCrashReport, t as errorDiagnostics } from "./error-diagnostics-snej9k4j.mjs";
+import { f as settleFingerprintCheck } from "./prebuild-BDpToDgR.mjs";
+import { i as launchOutcomeRecord } from "./native-runtime-DqaIBO5w.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-CNg_YsOk.mjs";
+import { a as persistLastBuild, n as finishAndroidUpload, s as reportAndroidResult } from "./result-CTqBw2Te.mjs";
 import { mkdirSync, openSync, statSync } from "node:fs";
 import { basename, join } from "node:path";
 import { ambientEnv } from "@stim-cli/core";
@@ -103,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 {
@@ -186,24 +182,33 @@ async function verifyAndroidProcessRun({ operation, root, slot, remoteDevice, ve
 	phase("", chalk.yellow(`${embeddedJavaScript ? "A release process" : "The app process"} exited before readiness. Run \`stim logs --errors\` for captured crash reports, or \`stim logs --source device\` for the full device output.`));
 	return { state: LAUNCH_FATAL };
 }
-async function verifyAndroidMetroRun({ operation, root, slot, remoteDevice, verifyLaunched, serial, androidPackage, metroCheck, logsDir, launchedAt, metroPort, isExpo, physical, device, scheme, component = null, phase, enterActivity }) {
-	const runCommand = nativeRunCommand("android", slot, {
+async function verifyAndroidMetroRun({ operation, root, slot, remoteDevice, verifyLaunched, serial, androidPackage, metroCheck, logsDir, launchedAt, metroPort, isExpo, physical, device, scheme, component = null, phase, enterActivity, hostedLogs, hostedRunCommand }) {
+	const runCommand = hostedRunCommand ?? nativeRunCommand("android", slot, {
 		physical,
 		deviceId: serial
 	});
-	const 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),
@@ -216,11 +221,13 @@ async function verifyAndroidMetroRun({ operation, root, slot, remoteDevice, veri
 		platform: "android",
 		mode: workspaceDevServerMode(root, isExpo),
 		readNativeCrashes,
-		processAlive: async () => {
+		readDeviceRecords: hostedLogs?.readDeviceRecords,
+		deviceLogsThrough: hostedLogs?.deviceLogsThrough,
+		processAlive: hostedLogs ? null : async () => {
 			const running = await androidAppProcess(serial, androidPackage);
 			return running.state === "unknown" ? null : running.state === "running";
 		}
-	}) : {
+	})) : {
 		verified: false,
 		skipped: true
 	};
@@ -240,7 +247,7 @@ async function verifyAndroidMetroRun({ operation, root, slot, remoteDevice, veri
 		phase("verify", chalk.red(`FATAL after ${formatDuration(verification.waitedMs ?? 0)}: ${reason}`));
 		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.`));
+		if (nativeFatal || verification.processAlive === false) phase("remedy", chalk.yellow(hostedRunCommand ? `Fix the crash, then run \`${runCommand}\` again. Metro reload cannot recover it.` : `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) 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 };
 	}
@@ -288,7 +295,8 @@ async function verifyAndroidMetroRun({ operation, root, slot, remoteDevice, veri
 		component,
 		devClientUrl: scheme ? androidDevClientUrl(scheme, metroPort ?? 8081, physical) : null,
 		devClient: Boolean(scheme),
-		mode: workspaceDevServerMode(root, isExpo)
+		mode: workspaceDevServerMode(root, isExpo),
+		remote: Boolean(hostedLogs)
 	})) phase("", chalk.yellow(line));
 	return { state: LAUNCH_UNVERIFIED };
 }
@@ -374,7 +382,7 @@ async function resolveInstallSerial({ root, slot, device, physical, remoteDevice
 	});
 	return resolved.serial;
 }
-async function finishAndroidRun({ operation, runtime, runtimePreparation, lease, releaseLease, root, slot, json, metroCheck, useBuildCache, variant, release, isExpo, metroPort, logsDir, emuLog, device, physical, remoteDevice, bootPromise, resolveAvdSerial, waitForDeviceBoot, bootDuration, bootPending, apkPath, androidPackage: initialPackage, androidPackageProblem, record, waitedForBuild, ccache, uploadPending, providerUpload, providerName, remote, abandonedRemote: remoteWasAbandoned, started, startedAt, writer, phase, fail, readApkPackage, readProjectPackage, packageRemedy, install, launch, launchRelease, resolveDevClientScheme, verifyLaunched, verifyReleaseLaunched, spawn, kill, pidAlive, verifyCollector, writeLaunch, recordBuild, now, out, emit, recordRun, reclaimed, devServer, enterPhase, enterActivity, rebootDevice, dataFreeBytes = androidDataFreeBytes, trimCaches = trimAndroidCaches, wipeDevice = teardownOwnedAvd }) {
+async function finishAndroidRun({ operation, runtime, runtimePreparation, lease, releaseLease, root, slot, json, metroCheck, useBuildCache, variant, release, isExpo, metroPort, logsDir, emuLog, device, physical, remoteDevice, bootPromise, resolveAvdSerial, waitForDeviceBoot, bootDuration, bootPending, apkPath, androidPackage: initialPackage, androidPackageProblem, record, waitedForBuild, ccache, uploadPending, fingerprintCheck, providerUpload, providerName, remote, abandonedRemote: remoteWasAbandoned, started, startedAt, writer, phase, fail, readApkPackage, readProjectPackage, packageRemedy, install, launch, launchRelease, resolveDevClientScheme, verifyLaunched, verifyReleaseLaunched, spawn, kill, pidAlive, verifyCollector, writeLaunch, recordBuild, now, out, emit, recordRun, reclaimed, devServer, enterPhase, enterActivity, rebootDevice, dataFreeBytes = androidDataFreeBytes, trimCaches = trimAndroidCaches, wipeDevice = teardownOwnedAvd }) {
 	const { env, signal } = operation ?? {};
 	let androidPackage = initialPackage;
 	let leaseWarned = false;
@@ -590,6 +598,7 @@ async function finishAndroidRun({ operation, runtime, runtimePreparation, lease,
 	const uploadWasAbandoned = await finishAndroidUpload(uploadPending, remote, phase);
 	const providerOutcome = providerUploadOutcome(providerUpload ? await providerUpload : null, providerName, env);
 	if (providerOutcome) phase("cache", providerOutcome.warn ? chalk.yellow(providerOutcome.line) : providerOutcome.line);
+	await settleFingerprintCheck(fingerprintCheck, "android", (line) => phase("fingerprint", chalk.yellow(line)), (entry) => writer.write(entry));
 	persistLastBuild({
 		recordBuild,
 		root,
@@ -762,4 +771,4 @@ function diagnoseBootFailure(booted, logFile, runCommand, physical) {
 	};
 }
 //#endregion
-export { killPreviousCollector as a, collectorLogFile as i, androidProcessRuntime as n, startCollector as o, finishAndroidRun as r, androidMetroRuntime as t };
+export { collectorLogFile as a, verifyAndroidMetroRun as i, androidProcessRuntime as n, killPreviousCollector as o, finishAndroidRun as r, startCollector as s, androidMetroRuntime as t };

package/dist/lightened-BCsdAGj_.mjs

@@ -0,0 +1,171 @@
+import { l as WorkspaceProcessCleanupError } from "./exec-aULwtNly.mjs";
+import { c as withWorkspaceStateLock } from "./workspace-state-BjqdjnJR.mjs";
+import { l as phaseLine } from "./command-output-Dj-WT4BP.mjs";
+import { Nt as podsOutOfSync, Ot as listCarryableIgnoredEntries, Pt as readWorktreeExclude, Q as resolveSettings, Wt as warmWorktreePaths, _t as depsOutOfSync } from "./settings-BDVI8Ivc.mjs";
+import { t as canonicalPath } from "./paths-BsJMoPP2.mjs";
+import { h as warmWorktreeTarget } from "./worktree-COAJ3-OD.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 };

package/dist/{logs-BsIRre8x.mjs → logs-CC_-ZzEE.mjs}

@@ -1,18 +1,13 @@
-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-BZhXY15H.mjs";
-import { n as pullHostedNativeLogs, t as pullHostedMacosLogs } from "./hosted-logs-CWKGYWNX.mjs";
-import { l as phaseLine } from "./command-output-BBvS1H6v.mjs";
-import { f as readAgentDeviceRecordsAsync, n as agentDeviceLiveness, o as envDir } from "./activity-BpjwrQXU.mjs";
-import { l as connectHost } from "./hosted-client-rsRqysJc.mjs";
-import { n as readHostedIos, t as readHostedAndroid } from "./ios-state-CT9nV5SP.mjs";
-import "./hosted-macos-d0pv9Tth.mjs";
-import { i as captureWorkspaceCrashes } from "./error-diagnostics-B1Mj_-7h.mjs";
+import { S as process_identity_exports } from "./exec-aULwtNly.mjs";
+import { k as workspaceLogsDir$1 } from "./workspace-state-BjqdjnJR.mjs";
+import { G as projectDeviceSlots, _ as loadConfig$1 } from "./config-Cn94Jc0g.mjs";
+import { f as readAgentDeviceRecordsAsync, n as agentDeviceLiveness, o as envDir } from "./activity-Cd-ysFes.mjs";
+import { o as captureWorkspaceCrashes } from "./error-diagnostics-snej9k4j.mjs";
+import { n as followHostedLogs, r as syncHostedLogs } from "./hosted-logs-sync-Dg3qrZmV.mjs";
 import { readdirSync, statSync, watch } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join, relative, resolve, sep } from "node:path";
-import { ambientWrite, configDir } from "@stim-cli/core";
-import { LEVELS, SOURCES, agentDeviceStateDirsAsync, buildCriteria, compileGrep, createAsyncAgentActionReader, followLogs, logFiles, openLogDir, parseSince, readMacosRecord, recordMatches, workspaceStateFile } from "@stim-cli/core/state";
+import { LEVELS, SOURCES, agentDeviceStateDirsAsync, buildCriteria, compileGrep, createAsyncAgentActionReader, followLogs, logFiles, openLogDir, parseSince, readMacosRecord, recordMatches } from "@stim-cli/core/state";
 import { setImmediate } from "node:timers/promises";
 import { realpath } from "node:fs/promises";
 //#region src/devices/agent-actions.ts
@@ -221,166 +216,6 @@ function followAgentActions(context, read, onRecord) {
 	return stop;
 }
 //#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);
-	else ambientWrite("stderr", text);
-}
-function warning(machine, error) {
-	const message = error.message.replace(/\.$/, "");
-	const hint = message.includes("refused device-host.logs.query") ? ` If ${machine} runs an older stim-server, update it.` : "";
-	return phaseLine("device", `Could not read the app's logs from ${machine}: ${message}. Showing the logs already copied here.${hint}`);
-}
-async function syncHostedMacosLogs(root, placement, slot, warnings, platform = "ios", context) {
-	let host;
-	const cancel = () => host?.connection.close();
-	context?.signal.addEventListener("abort", cancel, { once: true });
-	try {
-		host = await connectHost(placement.machine, void 0, false, context?.signal);
-		if (slot !== void 0) await pullHostedNativeLogs(root, slot, placement, host, false, platform, context?.signal);
-		else await pullHostedMacosLogs(root, placement, host, void 0, void 0, false, context?.signal);
-		return true;
-	} catch (error) {
-		context?.signal.throwIfAborted();
-		if (!warnings?.has(placement.machine)) {
-			warn(context, placement.machine, error);
-			warnings?.add(placement.machine);
-		}
-		return false;
-	} finally {
-		context?.signal.removeEventListener("abort", cancel);
-		host?.connection.close();
-	}
-}
-function followHostedMacosLogs(root, { failing = false, intervalMs = 500, retryMs = 5e3, slot, platform = "ios", context } = {}) {
-	let host;
-	const controller = new AbortController();
-	const signal = context ? AbortSignal.any([context.signal, controller.signal]) : controller.signal;
-	const cancel = () => host?.connection.close();
-	signal.addEventListener("abort", cancel, { once: true });
-	let retryAt = 0;
-	let stopped = false;
-	let running = false;
-	const tick = async () => {
-		if (running || stopped || signal.aborted || Date.now() < retryAt) return;
-		running = true;
-		try {
-			const placement = slot !== void 0 ? (platform === "ios" ? readHostedIos(root) : readHostedAndroid(root))[slot] : readMacosRecord(root)?.host;
-			if (!placement) {
-				host?.connection.close();
-				host = void 0;
-				return;
-			}
-			host ??= await connectHost(placement.machine, void 0, false, signal);
-			if (slot !== void 0) await pullHostedNativeLogs(root, slot, placement, host, false, platform, signal);
-			else await pullHostedMacosLogs(root, placement, host, void 0, void 0, false, signal);
-			failing = false;
-		} catch (error) {
-			host?.connection.close();
-			host = void 0;
-			if (signal.aborted) return;
-			if (!failing) warn(context, (slot !== void 0 ? (platform === "ios" ? readHostedIos(root) : readHostedAndroid(root))[slot] : readMacosRecord(root)?.host)?.machine ?? "the host", error);
-			failing = true;
-			retryAt = Date.now() + retryMs;
-		} finally {
-			running = false;
-		}
-	};
-	const timer = setInterval(() => void tick(), intervalMs);
-	return () => {
-		stopped = true;
-		controller.abort();
-		signal.removeEventListener("abort", cancel);
-		clearInterval(timer);
-		host?.connection.close();
-	};
-}
-async function syncHostedLogs(root, context) {
-	const macos = readMacosRecord(root)?.host;
-	const warnings = /* @__PURE__ */ new Set();
-	return (await Promise.all([
-		...macos ? [syncHostedMacosLogs(root, macos, void 0, warnings, "ios", context)] : [],
-		...Object.entries(readHostedIos(root)).map(([slot, placement]) => syncHostedMacosLogs(root, placement, slot, warnings, "ios", context)),
-		...Object.entries(readHostedAndroid(root)).map(([slot, placement]) => syncHostedMacosLogs(root, placement, slot, warnings, "android", context))
-	])).every(Boolean);
-}
-function followHostedLogs(root, failing, context) {
-	const stops = /* @__PURE__ */ new Map();
-	let closed = false;
-	const refresh = () => {
-		if (closed) return;
-		const active = /* @__PURE__ */ new Set();
-		if (readMacosRecord(root)?.host) {
-			active.add("macos");
-			if (!stops.has("macos")) stops.set("macos", followHostedMacosLogs(root, {
-				failing,
-				context
-			}));
-		}
-		for (const platform of ["ios", "android"]) for (const slot of Object.keys(platform === "ios" ? readHostedIos(root) : readHostedAndroid(root))) {
-			const key = `${platform}:${slot}`;
-			active.add(key);
-			if (!stops.has(key)) stops.set(key, followHostedMacosLogs(root, {
-				failing,
-				slot,
-				platform,
-				context
-			}));
-		}
-		for (const [key, stop] of stops) {
-			if (active.has(key)) continue;
-			stop();
-			stops.delete(key);
-		}
-	};
-	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];
-			const next = watch(directory, (_event, name) => {
-				if (name !== null && name.toString() !== entry) return;
-				if (directory !== dirname(stateFile)) observe();
-				refresh();
-			});
-			next.on("error", () => {
-				next.close();
-				if (watcher === next) watcher = null;
-			});
-			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;
-			directory = dirname(directory);
-		}
-	};
-	observe();
-	refresh();
-	const timer = setInterval(() => {
-		observe();
-		refresh();
-	}, 1e4);
-	return () => {
-		closed = true;
-		watcher?.close();
-		clearTimeout(recheck);
-		clearInterval(timer);
-		for (const stop of stops.values()) stop();
-	};
-}
-//#endregion
 //#region src/engine/logs.ts
 async function openWorkspaceLogs(context, options = {}, follow = false) {
 	context.signal.throwIfAborted();
@@ -429,8 +264,9 @@ async function readWorkspaceLogs(context, options = {}) {
 		await view.close();
 	}
 }
+const WORKSPACE_SOURCES = SOURCES.filter((source) => source !== "gc" && source !== "builds");
 function validateLogOptions(options) {
-	const invalid = (options.tail !== void 0 && (!Number.isSafeInteger(options.tail) || options.tail < 0) ? "tail must be a non-negative integer." : options.sources?.some((source) => !SOURCES.includes(source)) ? `sources must contain only ${SOURCES.join(", ")}.` : options.minLevel !== void 0 && !LEVELS.includes(options.minLevel) ? `minLevel must be one of ${LEVELS.join(", ")}.` : void 0) ?? (options.since !== void 0 ? parseSince(options.since).error : void 0) ?? (options.grep !== void 0 ? compileGrep(options.grep).error : void 0);
+	const invalid = (options.tail !== void 0 && (!Number.isSafeInteger(options.tail) || options.tail < 0) ? "tail must be a non-negative integer." : options.sources?.some((source) => !WORKSPACE_SOURCES.includes(source)) ? `sources must contain only ${WORKSPACE_SOURCES.join(", ")}.` : options.minLevel !== void 0 && !LEVELS.includes(options.minLevel) ? `minLevel must be one of ${LEVELS.join(", ")}.` : void 0) ?? (options.since !== void 0 ? parseSince(options.since).error : void 0) ?? (options.grep !== void 0 ? compileGrep(options.grep).error : void 0);
 	if (invalid) throw Object.assign(new Error(invalid), { code: "STIM_BAD_ARG" });
 }
 async function followWorkspaceLogs(context, options, onRecord, onBackfill) {
@@ -483,4 +319,4 @@ async function followWorkspaceLogs(context, options, onRecord, onBackfill) {
 	return stop;
 }
 //#endregion
-export { followAgentActions as a, followHostedLogs as i, openWorkspaceLogs as n, readWorkspaceLogs as r, followWorkspaceLogs as t };
+export { followAgentActions as i, openWorkspaceLogs as n, readWorkspaceLogs as r, followWorkspaceLogs as t };