stim 1.11.0 → 1.13.0

package/dist/{worktree-KOjMX3zA.mjs → worktree-D4Do_XiQ.mjs}

@@ -1,20 +1,23 @@
-import { D as process_identity_exports, H as projectDeviceSlots, O as acquireAvdClaim, b as removeProject, f as getProject, g as loadConfig, h as isPathPrefix, i as clearDevice, k as ownership_claim_exports, u as getConfigDir, w as upsertProject } from "./config-BEq0Qw_a.mjs";
+import { A as ownership_claim_exports, O as process_identity_exports, T as upsertProject, U as projectDeviceSlots, _ as loadConfig, a as clearDevice, d as getConfigDir, g as isPathPrefix, k as acquireAvdClaim, p as getProject, x as removeProject } from "./config-0jCcMM0E.mjs";
 import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
-import { O as workspaceDir, c as signalProcessTree, h as recordWorkspaceUse, i as pidExists, m as readWorkspaceState, s as resolveProjectMetro, t as killMetroTree } from "./metro-BWLOJ_Wr.mjs";
-import { C as sourceCheckoutOf, S as restoreFile, T as warmWorktreePaths, _ as readWorktreeExclude, b as resolveFullRef, 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-BlizKDpZ.mjs";
-import { o as findProjectRoot } from "./project-BXZzOABt.mjs";
-import { a as clearRemoteSession, i as clearManagedMetroTunnel, l as readRemoteSession, s as readMetroTunnel, u as readRemoteSessionId } from "./state-WGdIbi_d.mjs";
-import { a as formatElapsed, h as shortUdid, i as formatDuration, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-D5z2_bcF.mjs";
-import { u as releaseWorkspaceLeases } from "./device-lease-D83nqeMX.mjs";
-import { L as unknownSettingKeys, P as settingShapeErrors, a as SETTING_SHAPE_REMEDY, j as resolveSettings } from "./settings-B5oFZEri.mjs";
-import { d as teardownOwnedAvd, f as teardownOwnedIosSim, h as POOL_SETTING_REMEDY, i as stopTunnel, l as withManagedTunnelRemovalLock, s as withManagedRemoteWorktreeRemovalLock, t as resolveSupervisorTarget, y as parkedMaxSetting } from "./ownership-BiojdtAp.mjs";
-import { n as withIdleWorkspace, t as emptyWorkspaceDir } from "./in-use-DVhlSoyn.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-D2xbLVoz.mjs";
-import { i as endRecordedSession, z as resolveEasCliBin } from "./device-remote-BQZSnnmE.mjs";
-import { h as podInstallCommand, n as HEARTBEAT_INTERVAL_MS } from "./xcode-B5SPD--o.mjs";
-import { n as hasInstalledDependencies, r as installedNpmTreeIsValid, t as dependencyState } from "./dependency-state-r9UesA9a.mjs";
-import { t as clearNamedPorts } from "./named-ports-Dc7neAlc.mjs";
-import { a as runPodInstall, i as runCaptured, n as podsAreStale, r as readPodState, t as DEPS_ERROR } from "./deps-OF7CD5Dx.mjs";
+import { a as pidExists, c as resolveProjectMetro, g as recordWorkspaceUse, h as readWorkspaceState, k as workspaceDir, l as signalProcessTree, n as killMetroTree } from "./metro-BPeY1YMh.mjs";
+import { C as sourceCheckoutOf, S as restoreFile, T as warmWorktreePaths, _ as readWorktreeExclude, b as resolveFullRef, 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-DeBQSVtR.mjs";
+import { a as findProjectRoot } from "./project-DGeclhvO.mjs";
+import { a as clearRemoteSession, c as readMetroTunnel, d as readRemoteSessionId, i as clearManagedMetroTunnel, u as readRemoteSession } from "./state-DwAU2_-D.mjs";
+import { t as clearNamedPorts } from "./named-ports-n7tnJsI8.mjs";
+import { a as formatElapsed, h as shortUdid, i as formatDuration, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-BIL7rlX7.mjs";
+import { u as releaseWorkspaceLeases } from "./device-lease-CL9dZf73.mjs";
+import { ct as parkedMaxSetting, rt as POOL_SETTING_REMEDY } from "./android-qx_31wJo.mjs";
+import { L as unknownSettingKeys, P as settingShapeErrors, a as SETTING_SHAPE_REMEDY, j as resolveSettings } from "./settings-xB0Frkg6.mjs";
+import { f as teardownOwnedAvd, i as stopTunnel, l as withManagedTunnelRemovalLock, m as teardownOwnedIosSim, p as teardownOwnedBrowser, s as withManagedRemoteWorktreeRemovalLock, t as resolveSupervisorTarget } from "./ownership-PUP4Dwai.mjs";
+import { a as readWebRecord } from "./state-l1pYwOre.mjs";
+import { n as withIdleWorkspace, t as emptyWorkspaceDir } from "./in-use-wYEaKQM9.mjs";
+import { n as verifyCollectorOwnership } from "./ownership-Bz2kETAS.mjs";
+import { f as resolveEasCliBin } from "./remote-cache--aehr4Pr.mjs";
+import { i as endRecordedSession } from "./device-remote-DT9ngZiD.mjs";
+import { h as podInstallCommand, n as HEARTBEAT_INTERVAL_MS } from "./xcode-LM6A8cNZ.mjs";
+import { n as hasInstalledDependencies, r as installedNpmTreeIsValid, t as dependencyState } from "./dependency-state-DNN0yfx6.mjs";
+import { a as runPodInstall, i as runCaptured, n as podsAreStale, r as readPodState, t as DEPS_ERROR } from "./deps-2Wo81np9.mjs";
 import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { existsSync as existsSync$1, realpathSync as realpathSync$1 } from "fs";
 import { basename, dirname, isAbsolute, relative, resolve } from "path";
@@ -295,7 +298,7 @@ async function reclaimProject(path, options = {}) {
 		failedWorkspaceDirs: []
 	};
 }
-async function reclaimIdleProject(path, workspaceExisted, { deleteOwnedDevices = false, parkOwnedDevices = false, preserveProjectRecord = false, stopSession = defaultStopSession, stopMetroTunnel = defaultStopMetroTunnel, releaseLeases = releaseWorkspaceLeases, verifyCollector = verifyCollectorOwnership }) {
+async function reclaimIdleProject(path, workspaceExisted, { deleteOwnedDevices = false, parkOwnedDevices = false, preserveProjectRecord = false, stopSession = defaultStopSession, stopMetroTunnel = defaultStopMetroTunnel, releaseLeases = releaseWorkspaceLeases, verifyCollector = verifyCollectorOwnership, teardownBrowser = teardownOwnedBrowser }) {
 	await clearNamedPorts(path, { stop: true });
 	const project = getProject(path);
 	for (const { platforms } of projectDeviceSlots(project)) if (platforms.android?.owned && platforms.android.avdName) (0, ownership_claim_exports.releaseClaim)(acquireAvdClaim(platforms.android.avdName));
@@ -343,10 +346,19 @@ async function reclaimIdleProject(path, workspaceExisted, { deleteOwnedDevices =
 		verify: verifyCollector,
 		collectors: initialState?.collectors ?? {}
 	});
+	const browser = await teardownBrowser(path, { deleteProfile: true });
+	if (browser.status === "failed" || browser.status === "skipped") {
+		const entry = {
+			name: "owned Chrome",
+			reason: browser.reason ?? "it could not be closed"
+		};
+		skippedCollectors.push(entry);
+		failedCollectors.push(entry);
+	}
 	function retainReplacementProcesses() {
 		const currentState = readWorkspaceState(path);
 		const currentProject = getProject(path);
-		if (Boolean(currentState?.supervisor && !(0, process_identity_exports.sameProcessRecord)(currentState.supervisor, initialState?.supervisor) || currentProject?.supervisor && !(0, process_identity_exports.sameProcessRecord)(currentProject.supervisor, project?.supervisor) || Object.entries(currentState?.collectors ?? {}).some(([platform, record]) => !(0, process_identity_exports.sameProcessRecord)(record, initialState?.collectors?.[platform])))) {
+		if (Boolean(currentState?.supervisor && !(0, process_identity_exports.sameProcessRecord)(currentState.supervisor, initialState?.supervisor) || currentProject?.supervisor && !(0, process_identity_exports.sameProcessRecord)(currentProject.supervisor, project?.supervisor) || readWebRecord(path) !== null || Object.entries(currentState?.collectors ?? {}).some(([platform, record]) => !(0, process_identity_exports.sameProcessRecord)(record, initialState?.collectors?.[platform])))) {
 			supervisorHeld = true;
 			skippedMetro = "A replacement process appeared during cleanup; its ownership records are retained";
 		}
@@ -413,6 +425,192 @@ async function reclaimIdleProject(path, workspaceExisted, { deleteOwnedDevices =
 	};
 }
 //#endregion
+//#region src/workspace/pull-request.ts
+const GH_TIMEOUT_MS = 2e4;
+const GH_ENV = {
+	GH_PROMPT_DISABLED: "1",
+	GH_NO_UPDATE_NOTIFIER: "1",
+	NO_COLOR: "1"
+};
+const GH_FIELDS = "number,state,url,headRefOid,mergedAt,closedAt,isCrossRepository";
+const SIGNED_OUT_EXIT = 4;
+function stateOf(state) {
+	if (state === "OPEN") return "open";
+	if (state === "MERGED") return "merged";
+	if (state === "CLOSED") return "closed";
+	return null;
+}
+function epoch(text) {
+	const at = text ? Date.parse(text) : NaN;
+	return Number.isFinite(at) ? at : null;
+}
+/**
+* Picks the pull request that describes `head` among those `gh pr list --head <branch>` returned. One whose head is
+* `head` wins, then one whose head contains `head`, then one whose head `head` contains. An open one wins a tier,
+* then the newest. A pull request unrelated to `head` is from an earlier use of the branch name, and one from a fork
+* only shares the branch name; both are ignored.
+* `isAncestor(a, b)` answers whether commit `a` is an ancestor of commit `b`, and false when git cannot tell.
+*/
+function selectPullRequest(pulls, head, isAncestor) {
+	const known = pulls.flatMap((pull) => {
+		const state = stateOf(pull.state);
+		return state && pull.headRefOid && !pull.isCrossRepository ? [{
+			pull,
+			state
+		}] : [];
+	});
+	const tiers = [
+		known.filter(({ pull }) => pull.headRefOid === head),
+		known.filter(({ pull }) => pull.headRefOid !== head && isAncestor(head, pull.headRefOid)),
+		known.filter(({ pull }) => pull.headRefOid !== head && isAncestor(pull.headRefOid, head))
+	];
+	const tier = tiers.findIndex((entries) => entries.length > 0);
+	if (tier < 0) return null;
+	const { pull, state } = tiers[tier].toSorted((a, b) => Number(b.state === "open") - Number(a.state === "open") || b.pull.number - a.pull.number)[0];
+	return {
+		number: pull.number,
+		state,
+		url: pull.url,
+		head: pull.headRefOid,
+		containsHead: tier < 2,
+		endedAt: state === "merged" ? epoch(pull.mergedAt) : state === "closed" ? epoch(pull.closedAt) : null
+	};
+}
+function firstLine(error) {
+	const { stderr, message } = error;
+	const text = String(stderr ?? "").trim() || String(message ?? error);
+	return text.split("\n")[0] ?? text;
+}
+function ghFailure(error, command) {
+	if (error.status === SIGNED_OUT_EXIT) return {
+		unavailable: "gh is not signed in; run `gh auth login`",
+		sticky: true
+	};
+	if (error.code === "ETIMEDOUT") return {
+		unavailable: `${command} did not answer within ${GH_TIMEOUT_MS / 1e3}s`,
+		sticky: true
+	};
+	return {
+		unavailable: `${command} failed: ${firstLine(error)}`,
+		sticky: false
+	};
+}
+function ancestry(cwd) {
+	const exec = getExecutor();
+	return (ancestor, descendant) => exec.runFileQuiet("git", [
+		"-C",
+		cwd,
+		"merge-base",
+		"--is-ancestor",
+		ancestor,
+		descendant
+	]) !== null;
+}
+/**
+* Asks GitHub, through `gh`, which pull requests have `branch` as their head, run from `cwd` so `gh` picks the
+* repository from its remotes. Each call is one fixed `gh pr list` invocation. Once `gh` is missing, signed out or
+* times out, every later lookup through the same function answers `unavailable` without running it again.
+*/
+function pullRequestLookup() {
+	let unavailable;
+	return (cwd, branch, head) => {
+		const exec = getExecutor();
+		if (unavailable === void 0) unavailable = exec.findExecutable("gh") ? null : "gh is not installed";
+		if (unavailable) return { unavailable };
+		let out;
+		try {
+			out = exec.runFile("gh", [
+				"pr",
+				"list",
+				"--head",
+				branch,
+				"--state",
+				"all",
+				"--limit",
+				"20",
+				"--json",
+				GH_FIELDS
+			], {
+				cwd,
+				timeoutMs: GH_TIMEOUT_MS,
+				env: GH_ENV
+			});
+		} catch (error) {
+			const failure = ghFailure(error, "gh pr list");
+			if (failure.sticky) unavailable = failure.unavailable;
+			return { unavailable: failure.unavailable };
+		}
+		let pulls;
+		try {
+			pulls = JSON.parse(out);
+		} catch {
+			return { unavailable: "gh pr list printed no JSON" };
+		}
+		return { pullRequest: Array.isArray(pulls) ? selectPullRequest(pulls, head, ancestry(cwd)) : null };
+	};
+}
+function branchesQuery(count) {
+	return `query($owner: String!, $repo: String!${Array.from({ length: count }, (_, i) => `, $b${i}: String!`).join("")}) { repository(owner: $owner, name: $repo) {${Array.from({ length: count }, (_, i) => ` b${i}: pullRequests(headRefName: $b${i}, states: [OPEN, CLOSED, MERGED], first: 20, orderBy: {field: CREATED_AT, direction: DESC}) { nodes { ${GH_FIELDS.replaceAll(",", " ")} } }`).join("")} } }`;
+}
+/**
+* {@link pullRequestLookup} for every branch of one repository in one fixed `gh api graphql` call run from `repo`,
+* which asks for the same 20 newest pull requests of each head branch that `gh pr list --head` returns. `gh` fills
+* `{owner}` and `{repo}` from the remotes of `repo`; branch names travel as variables. Once `gh` is missing, signed
+* out or times out, every later call through the same function answers `unavailable` without running it again.
+*/
+function pullRequestLookups() {
+	let unavailable;
+	return async (repo, queries) => {
+		const exec = getExecutor();
+		if (unavailable === void 0) unavailable = exec.findExecutable("gh") ? null : "gh is not installed";
+		const all = (lookup) => queries.map(() => lookup);
+		if (unavailable) return all({ unavailable });
+		if (!queries.length) return [];
+		const args = [
+			"api",
+			"graphql",
+			"-F",
+			"owner={owner}",
+			"-F",
+			"repo={repo}"
+		];
+		queries.forEach(({ branch }, i) => args.push("-f", `b${i}=${branch}`));
+		args.push("-f", `query=${branchesQuery(queries.length)}`);
+		let out;
+		try {
+			out = await exec.runFileAsync("gh", args, {
+				cwd: repo,
+				timeoutMs: GH_TIMEOUT_MS,
+				env: GH_ENV
+			});
+		} catch (error) {
+			const failure = ghFailure(error, "gh api graphql");
+			if (failure.sticky) unavailable = failure.unavailable;
+			return all({ unavailable: failure.unavailable });
+		}
+		let found;
+		try {
+			found = JSON.parse(out).data?.repository;
+		} catch {
+			return all({ unavailable: "gh api graphql printed no JSON" });
+		}
+		if (!found) return all({ unavailable: "gh api graphql printed no repository" });
+		return queries.map(({ cwd, head }, i) => {
+			const pulls = found[`b${i}`]?.nodes;
+			return { pullRequest: Array.isArray(pulls) ? selectPullRequest(pulls, head, ancestry(cwd)) : null };
+		});
+	};
+}
+/** The merged or closed pull request whose commits include HEAD, which makes the worktree removable. */
+function endedPullRequest(lookup) {
+	const pr = lookup && "pullRequest" in lookup ? lookup.pullRequest : null;
+	return pr && pr.state !== "open" && pr.containsHead ? pr : null;
+}
+/** "PR #123 merged", for reports. */
+function describePullRequest(pr) {
+	return `PR #${pr.number} ${pr.state}`;
+}
+//#endregion
 //#region src/engine/warm-claim.ts
 const WARM_CLAIM_LABEL = "worktree warm";
 const WARM_CLAIM_POLL_MS = 250;
@@ -1707,7 +1905,17 @@ async function runRemove(target, opts, onRemoved) {
 	const branch = entry.branch;
 	const ownsBranch = Boolean(branch && project?.worktreeBranchOwned === true && project.worktreeBranch === branch);
 	const approvedBranchSha = ownsBranch ? resolveFullRef(path, "HEAD") : null;
-	const inspection = inspectRemoval(path, opts.mergedHead);
+	let mergedHead = opts.mergedHead;
+	let inspection = inspectRemoval(path, mergedHead);
+	if (inspection.blockers.length && !opts.force && !mergedHead && branch && inspection.unpushed?.length && !inspection.dirtyLines.length) {
+		const head = resolveFullRef(path, "HEAD");
+		const pr = head ? endedPullRequest(pullRequestLookup()(path, branch, head)) : null;
+		if (head && pr?.state === "merged") {
+			mergedHead = head;
+			inspection = inspectRemoval(path, mergedHead);
+			console.error(chalk.dim(`HEAD is in the merged PR #${pr.number} (${pr.url}); its local-only commits stay on GitHub.`));
+		}
+	}
 	if (inspection.blockers.length && !opts.force) {
 		printRemovalRefusal(path, inspection);
 		return;
@@ -1718,7 +1926,7 @@ async function runRemove(target, opts, onRemoved) {
 	await withManagedRemoteWorktreeRemovalLock(path, () => withReclaimLocks(path, async (lockedKeys) => {
 		if (opts.guard?.(lockedKeys).length) return;
 		const inspectedHead = resolveFullRef(path, "HEAD");
-		const current = inspectRemoval(path, opts.mergedHead);
+		const current = inspectRemoval(path, mergedHead);
 		if (current.blockers.length && !opts.force) {
 			printRemovalRefusal(path, current);
 			return;
@@ -1800,4 +2008,4 @@ function worktreeCommand(program) {
 	registerRemove(worktree);
 }
 //#endregion
-export { reclaimKeys as a, removalBlockers as c, removeWorktreeTarget as d, worktreeCommand as f, porcelainPath as i, removalPath as l, reclaimProject as m, excludePodChurn as n, registerRemove as o, describeDereferenced as p, matchWorktreeEntry as r, registerWarm as s, dependencyInstallCommand as t, removalRemedy as u };
+export { reclaimProject as _, reclaimKeys as a, removalBlockers as c, removeWorktreeTarget as d, worktreeCommand as f, describeDereferenced as g, pullRequestLookups as h, porcelainPath as i, removalPath as l, endedPullRequest as m, excludePodChurn as n, registerRemove as o, describePullRequest as p, matchWorktreeEntry as r, registerWarm as s, dependencyInstallCommand as t, removalRemedy as u };

package/dist/{worktree-BlizKDpZ.mjs → worktree-DeBQSVtR.mjs}

@@ -1,4 +1,4 @@
-import { g as loadConfig, u as getConfigDir } from "./config-BEq0Qw_a.mjs";
+import { _ as loadConfig, d as getConfigDir } from "./config-0jCcMM0E.mjs";
 import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
 import { accessSync, chmodSync, constants, lstatSync, mkdirSync, mkdtempSync, readdirSync, realpathSync, rmSync, statSync } from "node:fs";
 import { chmodSync as chmodSync$1, existsSync as existsSync$1, lstatSync as lstatSync$1, mkdirSync as mkdirSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, realpathSync as realpathSync$1, statSync as statSync$1, utimesSync } from "fs";
@@ -481,6 +481,7 @@ function dirtyFingerprintFiles(root) {
 }
 function hasUncommittedWork(dir) {
 	const out = getExecutor().runFileQuiet("git", [
+		"--no-optional-locks",
 		"-C",
 		dir,
 		"status",
@@ -491,6 +492,7 @@ function hasUncommittedWork(dir) {
 }
 function dirtyPaths(dir, { limit = 10 } = {}) {
 	const out = getExecutor().runFileQuiet("git", [
+		"--no-optional-locks",
 		"-C",
 		dir,
 		"status",

package/dist/{xcode-B5SPD--o.mjs → xcode-LM6A8cNZ.mjs}

@@ -1,12 +1,12 @@
 import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
-import { r as register } from "./cache-manifest-Pubfp8wV.mjs";
-import { D as workspaceDerivedData, w as sharedCompilationCache } from "./metro-BWLOJ_Wr.mjs";
-import { u as resolvePackageJson } from "./project-BXZzOABt.mjs";
-import { a as spawnDeclared } from "./spawn-claims-BJwXTMPt.mjs";
+import { r as register } from "./cache-manifest-DWPF4RKJ.mjs";
+import { O as workspaceDerivedData, T as sharedCompilationCache } from "./metro-BPeY1YMh.mjs";
+import { f as resolvePackageJson } from "./project-DGeclhvO.mjs";
+import { a as spawnDeclared } from "./spawn-claims-PT8aQpCa.mjs";
 import { t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { a as formatElapsed, l as phaseLine } from "./command-output-D5z2_bcF.mjs";
-import { W as resolveOptimizations } from "./settings-B5oFZEri.mjs";
-import { t as cleanLine } from "./server-expo-o6H5gcBc.mjs";
+import { a as formatElapsed, l as phaseLine } from "./command-output-BIL7rlX7.mjs";
+import { G as resolveOptimizations } from "./settings-xB0Frkg6.mjs";
+import { t as cleanLine } from "./server-expo-DUCg52-K.mjs";
 import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { basename, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { createHash } from "node:crypto";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stim",
-  "version": "1.11.0",
+  "version": "1.13.0",
   "description": "Stim: fast, isolated React Native environments for coding agents",
   "keywords": [
     "agent",
@@ -43,9 +43,9 @@
   },
   "dependencies": {
     "@expo/fingerprint": "^0.20.10",
-    "@stim-cli/cache": "^1.11.0",
-    "@stim-cli/core": "^1.11.0",
-    "@stim-cli/metro": "^1.11.0",
+    "@stim-cli/cache": "^1.13.0",
+    "@stim-cli/core": "^1.13.0",
+    "@stim-cli/metro": "^1.13.0",
     "chalk": "^6.0.0",
     "commander": "^15.0.0",
     "cross-spawn": "^7.0.6",
@@ -53,7 +53,7 @@
     "ws": "^8.21.3"
   },
   "devDependencies": {
-    "@stim-cli/expo-build-cache": "1.11.0",
+    "@stim-cli/expo-build-cache": "1.13.0",
     "@types/cross-spawn": "^6.0.6",
     "@types/which": "^3.0.4",
     "@types/ws": "^8.18.1",