stim 1.17.2 → 1.18.0

package/dist/{worktree-Be_7NLKy.mjs → worktree-BSYlofkq.mjs}

@@ -1,44 +1,222 @@
-import { t as getExecutor } from "./exec-CaErVv7t.mjs";
-import { E as upsertProject, H as projectDeviceSlots, S as removeProject, _ as loadConfig$1, a as clearDevice, d as getConfigDir, g as isPathPrefix, k as acquireAvdClaim, p as getProject } from "./config-D0DbpZtM.mjs";
-import { n as ownership_claim_exports, t as process_identity_exports } from "./process-identity-BmRm1qV0.mjs";
-import { a as pullRequestLookup, r as endedPullRequest } from "./pull-request-pxnDCQzn.mjs";
-import { a as formatElapsed, h as shortUdid, i as formatDuration, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-CDAIFD-8.mjs";
-import { $ as cloneIgnoredEntries, A as readCommittedSettings, H as unknownSettingKeys, P as resolveSettings, Q as branchExists, R as settingShapeErrors, St as warmWorktreePaths, _t as resolveFullRef, at as gitCommonDirOnDisk, bt as sourceCheckoutOf, ct as hasUncommittedWork, dt as listWorktrees, et as deleteBranch, ft as locallyKnownUpstream, ht as removeWorktree, i as SETTING_SHAPE_REMEDY, it as gitCommonDir, lt as isPodInstallChurn, mt as readWorktreeExclude, ot as hasPopulatedSubmodules, pt as podsOutOfSync, rt as dirtyPaths, st as hasRemote, tt as depsOutOfSync, xt as unpushedCommits, yt as restoreFile } from "./settings-Cfd-0r2d.mjs";
-import { n as appProjectProblem, s as findProjectRoot$1 } from "./project-D47Rh0ly.mjs";
-import { l as resolveProjectMetro, o as pidExists, r as killMetroTree, u as signalProcessTree } from "./metro-g8NqiJp-.mjs";
-import { g as workspaceAgentDeviceDir, i as recordWorkspaceUse, r as readWorkspaceState$1, v as workspaceDir } from "./workspace-state-DqcCbpE7.mjs";
-import { o as readWebRecord } from "./state-PeQiJuIu.mjs";
-import { a as machineNumber } from "./budget-DfcgFdQB.mjs";
-import { n as withIdleWorkspace, t as emptyWorkspaceDir } from "./in-use-CvGOUn-x.mjs";
-import { t as agentDeviceDaemon } from "./activity-IRvJY_ru.mjs";
-import { u as releaseWorkspaceLeases } from "./device-lease-DpoS36_u.mjs";
-import { a as clearRemoteSession, c as readMetroTunnel, d as readRemoteSessionId, i as clearManagedMetroTunnel, u as readRemoteSession } from "./state-BKa8wNN5.mjs";
-import { ft as parkedMaxSetting, ot as POOL_SETTING_REMEDY } from "./android-B_YNZy61.mjs";
-import { a as workspaceLinks, i as workspaceLinkLine } from "./stim-desktop-Cnz8CPnl.mjs";
-import { g as teardownOwnedIosSim, h as teardownOwnedBrowser, i as stopTunnel, l as withManagedTunnelRemovalLock, m as teardownOwnedAvd, s as withManagedRemoteWorktreeRemovalLock, t as resolveSupervisorTarget } from "./ownership-BMLqyBgJ.mjs";
-import { t as clearNamedPorts } from "./named-ports-C8m8EQs2.mjs";
-import { l as withdrawDevServerStopRequest, s as requestDevServerStop } from "./stop-cause-rhmGfwvt.mjs";
-import { C as podInstallCommand, u as HEARTBEAT_INTERVAL_MS } from "./toolchain-DNyR3NPq.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-DyRQru0q.mjs";
-import { t as stopMacosApp } from "./stop-BIiM49EY.mjs";
-import { a as runPodInstall, i as runCaptured, n as podsAreStale, r as readPodState, t as DEPS_ERROR } from "./deps-iKw0eD4P.mjs";
-import { i as stopHostedAndroid } from "./hosted-android-E1Heoqnv.mjs";
-import { f as resolveEasCliBin } from "./remote-cache-Ci4DQYYj.mjs";
-import { i as endRecordedSession } from "./device-remote-hFSkpfQu.mjs";
-import { n as hasInstalledDependencies, r as installedNpmTreeIsValid, t as dependencyState } from "./dependency-state-CLcBHH2M.mjs";
-import { a as forgetStatusMeasures, s as mergeState, t as startWarmProgress } from "./warm-progress-DF4JRvYI.mjs";
-import { r as workspaceRecordingEnabled } from "./recordings-BNgsD1Tr.mjs";
-import { r as stopHostedIos } from "./hosted-ios-BnbeYOUD.mjs";
-import { createHash, randomUUID } from "node:crypto";
+import { n as ownership_claim_exports, t as process_identity_exports } from "./process-identity-Biv3arCO.mjs";
+import { t as getExecutor } from "./exec-DWhCZDGm.mjs";
+import { a as formatElapsed, h as shortUdid, i as formatDuration, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-CBtzyIgF.mjs";
+import { E as upsertProject, H as projectDeviceSlots, S as removeProject, _ as loadConfig$1, a as clearDevice, d as getConfigDir, g as isPathPrefix, k as acquireAvdClaim, p as getProject } from "./config-CgYMahz7.mjs";
+import { C as sourceCheckoutOf, S as restoreFile, T as warmWorktreePaths, _ as readWorktreeExclude, b as resolveFullRef, c as gitCommonDirOnDisk, d as hasUncommittedWork, f as isPodInstallChurn, g as podsOutOfSync, h as locallyKnownUpstream, i as depsOutOfSync, l as hasPopulatedSubmodules, m as listWorktrees, n as cloneIgnoredEntries, o as dirtyPaths, r as deleteBranch, s as gitCommonDir, t as branchExists, u as hasRemote, v as removeWorktree, w as unpushedCommits } from "./worktree-CsKYexJM.mjs";
+import { n as appProjectProblem, s as findProjectRoot$1 } from "./project-C3ChRLZy.mjs";
+import { l as resolveProjectMetro, o as pidExists, r as killMetroTree, u as signalProcessTree } from "./metro-Dh8T4Ytd.mjs";
+import { g as workspaceAgentDeviceDir, i as recordWorkspaceUse, r as readWorkspaceState$1, v as workspaceDir } from "./workspace-state-C59dqG-Z.mjs";
+import { o as readWebRecord } from "./state-BG-aAk4k.mjs";
+import { Gt as readRemoteSessionId, Ht as readMetroTunnel, Rt as clearManagedMetroTunnel, Wt as readRemoteSession, b as withdrawDevServerStopRequest, o as machineNumber, v as requestDevServerStop, zt as clearRemoteSession } from "./budget-DIhL2BKx.mjs";
+import { D as teardownOwnedBrowser, E as teardownOwnedAvd, O as teardownOwnedIosSim, d as emptyWorkspaceDir, f as withIdleWorkspace, g as stopTunnel, m as resolveSupervisorTarget, x as withManagedTunnelRemovalLock, y as withManagedRemoteWorktreeRemovalLock } from "./workspaces-xXItD8Dj.mjs";
+import { t as agentDeviceDaemon } from "./activity-BxnkDZDi.mjs";
+import { u as releaseWorkspaceLeases } from "./device-lease-Co-EwifR.mjs";
+import { ft as parkedMaxSetting, ot as POOL_SETTING_REMEDY } from "./android-DC3ZLuw0.mjs";
+import { a as workspaceLinks, i as workspaceLinkLine } from "./stim-desktop-Behws_fi.mjs";
+import { F as resolveSettings, U as unknownSettingKeys, i as SETTING_SHAPE_REMEDY, j as readCommittedSettings, z as settingShapeErrors } from "./settings-CQyMElEP.mjs";
+import { t as clearNamedPorts } from "./named-ports-BFIz1Shz.mjs";
+import { c as DEPS_ERROR, f as runCaptured, g as HEARTBEAT_INTERVAL_MS, k as podInstallCommand, l as podsAreStale, p as runPodInstall, u as readPodState } from "./toolchain-Bnyd_K3A.mjs";
+import { i as stopHostedAndroid } from "./hosted-android-Bv285t_t.mjs";
+import { f as resolveEasCliBin } from "./remote-cache-BGg7aGIZ.mjs";
+import { i as endRecordedSession } from "./device-remote-tHbd1fKy.mjs";
+import { n as verifyCollectorOwnership } from "./ownership-D6Se7gg_.mjs";
+import { r as stopHostedIos } from "./hosted-ios-D5mNmtj4.mjs";
+import { t as stopMacosApp } from "./stop-BGhKMOuH.mjs";
+import { a as pullRequestLookup, r as endedPullRequest } from "./pull-request-u4vp7zmK.mjs";
+import { a as forgetStatusMeasures, s as mergeState, t as startWarmProgress } from "./warm-progress-CjB-MP6H.mjs";
+import { r as workspaceRecordingEnabled } from "./recordings-BAWltsVt.mjs";
+import { n as hasInstalledDependencies, r as installedNpmTreeIsValid, t as dependencyState } from "./dependency-state-xKoOypBm.mjs";
 import { chmodSync, existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, utimesSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, relative } from "node:path";
-import { existsSync as existsSync$1, realpathSync as realpathSync$1, rmSync as rmSync$1 } from "fs";
 import { basename as basename$1, dirname as dirname$1, isAbsolute as isAbsolute$1, join as join$1, relative as relative$1, resolve as resolve$1 } from "path";
-import { withDirLock, workspaceName } from "@stim-cli/core";
 import { LAST_BUILD_KEYS, archiveDir, archiveEnabled, archiveLock, archiveRoot, archivedUsage, countErrorEntries, endedAgentSessionOf, listRecordedDevices, loadConfig, queryLogs, readArchives, readBuildHistory, readJsonObject, readLastBuilds, readMacosRecord, readPullRequestCache, readWorkspaceState, recordingEnabled, sortByTs } from "@stim-cli/core/state";
-import { claimRemoveCommand, clearFreeClaimSet, readClaimSet, releaseClaim, tryAcquireClaim } from "@stim-cli/core/ownership-claim";
 import { homedir } from "node:os";
 import chalk from "chalk";
+import { existsSync as existsSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, readlinkSync as readlinkSync$1, realpathSync as realpathSync$1, renameSync as renameSync$1, rmSync as rmSync$1, symlinkSync as symlinkSync$1, unlinkSync as unlinkSync$1, writeFileSync as writeFileSync$1 } from "fs";
+import { withDirLock, workspaceName } from "@stim-cli/core";
+import { claimRemoveCommand, clearFreeClaimSet, readClaimSet, releaseClaim, tryAcquireClaim } from "@stim-cli/core/ownership-claim";
+import { createHash, randomUUID } from "node:crypto";
+import { createHash as createHash$1 } from "crypto";
+//#region src/workspace/pods-relocate.ts
+const CHECKSUMS_HEADER = "SPEC CHECKSUMS:\n";
+const GENERATED_DIRS = [
+	"Target Support Files",
+	"Pods.xcodeproj",
+	"Local Podspecs"
+];
+function normalize$1(text) {
+	return text.replace(/\r\n/g, "\n").trimEnd() + "\n";
+}
+function splitChecksums(text) {
+	const start = text.indexOf(`\n${CHECKSUMS_HEADER}`);
+	if (start === -1) return null;
+	const bodyStart = start + 1 + 16;
+	const lines = text.slice(bodyStart).split("\n");
+	const entries = /* @__PURE__ */ new Map();
+	let used = 0;
+	for (const line of lines) {
+		const match = /^ {2}"?([^":\s]+)"?: ([0-9a-f]{40})$/.exec(line);
+		if (!match) break;
+		entries.set(match[1], match[2]);
+		used += line.length + 1;
+	}
+	return {
+		before: text.slice(0, bodyStart),
+		entries,
+		after: text.slice(bodyStart + used)
+	};
+}
+function pathPattern(root, flags = "") {
+	const escaped = root.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+	return new RegExp(`(?:(?<![\\p{L}\\p{N}_.-])|(?<=-[IFL]))${escaped}(?![\\p{L}\\p{N}_.-])`, `u${flags}`);
+}
+function sha1(text) {
+	return createHash$1("sha1").update(text).digest("hex");
+}
+function relocatePath(text, from, to) {
+	return text.replace(pathPattern(from, "g"), () => to);
+}
+/**
+* Decides whether a carried Pods directory differs from the checkout's Podfile.lock only by
+* checksums of podspecs that embed the source checkout's absolute path. Any other difference,
+* a missing podspec, a podspec that does not embed the path, or a carried checksum that does
+* not match the carried podspec refuses.
+*/
+function planPodsRelocation({ podfileLock, manifest, sourceRoot, readPodspec }) {
+	const lock = splitChecksums(normalize$1(podfileLock));
+	const carried = splitChecksums(normalize$1(manifest));
+	if (!lock || !carried) return { ok: false };
+	if (lock.before !== carried.before || lock.after !== carried.after) return { ok: false };
+	if (lock.entries.size !== carried.entries.size) return { ok: false };
+	const pods = [];
+	for (const [pod, checksum] of lock.entries) {
+		const carriedChecksum = carried.entries.get(pod);
+		if (carriedChecksum === void 0) return { ok: false };
+		if (carriedChecksum === checksum) continue;
+		if (!/^[\w.+-]+$/.test(pod)) return { ok: false };
+		const podspec = readPodspec(pod);
+		if (podspec === null || sha1(podspec) !== carriedChecksum) return { ok: false };
+		if (!pathPattern(sourceRoot).test(podspec)) return { ok: false };
+		pods.push(pod);
+	}
+	return pods.length > 0 ? {
+		ok: true,
+		pods
+	} : { ok: false };
+}
+function walkTextFiles(dir, visit) {
+	for (const entry of readdirSync$1(dir, { withFileTypes: true })) {
+		const path = join$1(dir, entry.name);
+		if (entry.isDirectory()) walkTextFiles(path, visit);
+		else if (entry.isFile()) visit(path);
+	}
+}
+function sourceNamer(sourceRoot, targetRoot, encoding) {
+	const encode = (value) => Buffer.from(value, "utf-8").toString(encoding);
+	const pattern = pathPattern(encode(sourceRoot));
+	const nested = targetRoot.startsWith(`${sourceRoot}/`) ? pathPattern(encode(targetRoot), "g") : null;
+	return (text) => pattern.test(nested ? text.replace(nested, "") : text);
+}
+function findPath(dir, text, bytes) {
+	for (const entry of readdirSync$1(dir, { withFileTypes: true })) {
+		const path = join$1(dir, entry.name);
+		if (entry.isSymbolicLink() && text(readlinkSync$1(path))) return path;
+		if (entry.isDirectory()) {
+			const found = findPath(path, text, bytes);
+			if (found) return found;
+		} else if (entry.isFile() && bytes(readFileSync$1(path).toString("latin1"))) return path;
+	}
+	return null;
+}
+function walkSymlinks(dir, visit) {
+	for (const entry of readdirSync$1(dir, { withFileTypes: true })) {
+		const path = join$1(dir, entry.name);
+		if (entry.isSymbolicLink()) visit(path);
+		else if (entry.isDirectory()) walkSymlinks(path, visit);
+	}
+}
+/**
+* Makes a Pods directory cloned from `sourceRoot` read as one CocoaPods generated for
+* `targetRoot`: it rewrites the source path in the generated text files and absolute symlinks,
+* then points Pods/Manifest.lock at the checkout's Podfile.lock. When the locks already match,
+* `pod install` would be skipped over Pods that still name the source path, so the same rewrite
+* runs for them. Manifest.lock is removed before any rewrite and written back last, only after
+* no file or symlink in Pods names the source path, so a refused, failed or interrupted run
+* leaves it differing or absent and `pod install` still runs. `canRelocate: false` only
+* withholds a matching Manifest.lock from Pods that name the source path.
+*/
+function relocatePods({ podsDir, podfileLockPath, sourceRoot, targetRoot, canRelocate = true }) {
+	const manifestPath = join$1(podsDir, "Manifest.lock");
+	if (!existsSync$1(manifestPath) || !existsSync$1(podfileLockPath)) return { ok: false };
+	const podfileLock = readFileSync$1(podfileLockPath, "utf-8");
+	const manifest = readFileSync$1(manifestPath, "utf-8");
+	const pattern = pathPattern(sourceRoot);
+	const textNamesSource = sourceNamer(sourceRoot, targetRoot, "utf-8");
+	const bytesNameSource = sourceNamer(sourceRoot, targetRoot, "latin1");
+	let pods = [];
+	if (normalize$1(podfileLock) === normalize$1(manifest)) {
+		let names;
+		try {
+			names = findPath(podsDir, textNamesSource, bytesNameSource);
+		} catch (error) {
+			unlinkSync$1(manifestPath);
+			throw error;
+		}
+		if (!names) return { ok: false };
+		unlinkSync$1(manifestPath);
+		if (!canRelocate) return {
+			ok: false,
+			withheld: true
+		};
+	} else {
+		if (!canRelocate) return { ok: false };
+		const plan = planPodsRelocation({
+			podfileLock,
+			manifest,
+			sourceRoot,
+			readPodspec: (pod) => {
+				try {
+					return readFileSync$1(join$1(podsDir, "Local Podspecs", `${pod}.podspec.json`), "utf-8");
+				} catch {
+					return null;
+				}
+			}
+		});
+		if (!plan.ok) return plan;
+		pods = plan.pods;
+	}
+	for (const name of GENERATED_DIRS) {
+		const dir = join$1(podsDir, name);
+		if (!existsSync$1(dir)) continue;
+		walkTextFiles(dir, (file) => {
+			const buffer = readFileSync$1(file);
+			if (buffer.includes(0)) return;
+			const text = buffer.toString("utf-8");
+			if (!pattern.test(text)) return;
+			writeFileSync$1(file, relocatePath(text, sourceRoot, targetRoot));
+		});
+	}
+	walkSymlinks(podsDir, (link) => {
+		const target = readlinkSync$1(link);
+		if (!pattern.test(target)) return;
+		const next = `${link}.stim-relocate`;
+		symlinkSync$1(relocatePath(target, sourceRoot, targetRoot), next);
+		try {
+			renameSync$1(next, link);
+		} catch (error) {
+			unlinkSync$1(next);
+			throw error;
+		}
+	});
+	const leftover = findPath(podsDir, textNamesSource, bytesNameSource);
+	if (leftover) throw new Error(`${leftover} still names ${sourceRoot}`);
+	writeFileSync$1(manifestPath, podfileLock);
+	return {
+		ok: true,
+		pods
+	};
+}
+//#endregion
 //#region src/archive.ts
 const DAY = 864e5;
 const KINDS = [
@@ -1724,6 +1902,26 @@ function dependencyInstallCommand(target, dir = ".") {
 	else if (existsSync$1(resolve$1(installRoot, "package-lock.json"))) command = "npm ci";
 	return `cd '${installRoot.replaceAll("'", "'\\''")}' && ${command}`;
 }
+function relocateCarriedPods(root, target, copied) {
+	const canRelocate = depsOutOfSync(root, target, copied).length === 0;
+	for (const rel of copied) {
+		if (rel !== "Pods" && !rel.endsWith("/Pods")) continue;
+		const iosDir = rel === "Pods" ? "" : rel.slice(0, -5);
+		try {
+			const result = relocatePods({
+				podsDir: join$1(target, rel),
+				podfileLockPath: join$1(target, iosDir, "Podfile.lock"),
+				sourceRoot: root,
+				targetRoot: target,
+				canRelocate
+			});
+			if (result.ok) console.error(chalk.dim(phaseLine("carry", result.pods.length > 0 ? `moved ${rel} to this checkout's path; ${result.pods.join(", ")} checksum depends on the checkout path, so pod install is not needed` : `moved ${rel} to this checkout's path; the locks match, so pod install is not needed`)));
+			else if (result.withheld) console.error(chalk.yellow(phaseLine("carry", `${rel} names the source checkout's path; removed ${rel}/Manifest.lock so pod install runs`)));
+		} catch (error) {
+			console.error(chalk.yellow(phaseLine("carry", `could not move ${rel} to this checkout's path: ${error.message}. pod install will run`)));
+		}
+	}
+}
 function reportCarriedStateHealth(root, target, copied) {
 	const outOfSync = depsOutOfSync(root, target, copied);
 	for (const d of outOfSync.filter((dependency) => dependency.reason === "installed")) {
@@ -1834,6 +2032,7 @@ function registerWarm(worktree) {
 				for (const entry of result.failed) console.error(chalk.yellow(phaseLine("carry", `could not copy ${entry.file}: ${entry.error}`)));
 				if (result.copied.length) {
 					console.error(chalk.dim(phaseLine("carry", `copied ${carriedFileList(result.copied)} from ${root}`)));
+					relocateCarriedPods(root, target, result.copied);
 					reportCarriedStateHealth(root, target, result.copied);
 				}
 				console.error(phaseLine("carry", `${result.failed.length ? "incomplete" : "complete"}: ${result.copied.length} ignored entries copied, ${result.skipped.length} kept, ${result.failed.length} failed`));