bstack 1.5.0 → 1.5.1

package/dist/bstack.mjs

@@ -6,7 +6,7 @@ import * as v from "valibot";
 import { mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
 //#region package.json
-var version = "1.5.0";
+var version = "1.5.1";
 //#endregion
 //#region src/command.ts
 var CommandError = class extends Error {
@@ -666,10 +666,12 @@ var Stack = class Stack {
 		const currentIdSet = new Set(currentIds);
 		const removed = previous.changes.filter((change) => !currentIdSet.has(change.id));
 		const added = this.changes.filter((change) => !previousIdSet.has(change.id));
+		const baseChanged = previous.base !== options.base;
 		if (removed.length === 0) {
 			const previousIsPrefix = previousIds.every((id, index) => currentIds[index] === id);
-			if (previousIsPrefix && added.length === 0) return { kind: "skip" };
+			if (previousIsPrefix && added.length === 0) return baseChanged ? this.transitionForChangedBase(previous, options) : { kind: "skip" };
 			if (previousIsPrefix) {
+				if (baseChanged) return this.transitionForChangedBase(previous, options);
 				const stackNumber = previous.stackNumber ?? options.lookups.stackNumberForPullRequest(previous.changes[0].pullRequest);
 				if (stackNumber !== void 0) return {
 					kind: "append",
@@ -688,16 +690,21 @@ var Stack = class Stack {
 		const firstCurrentIndex = previousIds.indexOf(currentIds[0]);
 		const isPreviousSlice = firstCurrentIndex >= 0 && currentIds.every((id, index) => previousIds[firstCurrentIndex + index] === id);
 		if (options.preserveHigherChanges && added.length === 0 && isPreviousSlice && firstCurrentIndex + currentIds.length < previousIds.length) {
-			if (previous.changes.slice(0, firstCurrentIndex).every((change) => options.lookups.pullRequestState(change.pullRequest) === "MERGED")) return {
-				kind: "partial",
-				previousOffset: firstCurrentIndex
-			};
+			if (previous.changes.slice(0, firstCurrentIndex).every((change) => options.lookups.pullRequestState(change.pullRequest) === "MERGED")) {
+				if (baseChanged) throw new Error("Cannot change the stack base while preserving higher pull requests from a detached checkout");
+				return {
+					kind: "partial",
+					previousOffset: firstCurrentIndex
+				};
+			}
 		}
 		const removedPrefixWasMerged = removed.every((change, index) => previous.changes[index] === change) && removed.every((change) => options.lookups.pullRequestState(change.pullRequest) === "MERGED");
 		const survivingIds = previousIds.slice(removed.length);
-		const onlyAppendedAfterMergedPrefix = removedPrefixWasMerged && survivingIds.every((id, index) => currentIds[index] === id) && currentIds.slice(survivingIds.length).every((id) => !previousIdSet.has(id));
-		if (removedPrefixWasMerged && added.length === 0) return { kind: "skip" };
+		const survivingOrderIsUnchanged = survivingIds.every((id, index) => currentIds[index] === id);
+		const onlyAppendedAfterMergedPrefix = removedPrefixWasMerged && survivingOrderIsUnchanged && currentIds.slice(survivingIds.length).every((id) => !previousIdSet.has(id));
+		if (removedPrefixWasMerged && added.length === 0 && survivingOrderIsUnchanged) return baseChanged ? this.transitionForChangedBase(previous, options) : { kind: "skip" };
 		if (onlyAppendedAfterMergedPrefix) {
+			if (baseChanged) return this.transitionForChangedBase(previous, options);
 			if (previous.stackNumber === void 0) throw new Error("Cannot append after a merge because the native GitHub stack number is missing from local state");
 			return {
 				kind: "append",
@@ -714,23 +721,40 @@ var Stack = class Stack {
 		return {
 			kind: "rebuild",
 			stackNumber,
-			action: added.length === 0 ? "remove" : "update"
+			action: added.length === 0 && removedPrefixWasMerged ? "reorder" : added.length === 0 ? "remove" : "update"
+		};
+	}
+	transitionForChangedBase(previous, options) {
+		if (this.changes.length === 1) return { kind: "retarget" };
+		const stackNumber = previous.stackNumber ?? options.lookups.stackNumberForPullRequest(previous.changes[0].pullRequest);
+		return stackNumber === void 0 ? { kind: "full" } : {
+			kind: "rebuild",
+			stackNumber,
+			action: "change-base"
 		};
 	}
 };
 //#endregion
 //#region src/sync-transition.ts
-function prepareStackTransition(transition, github, previous, base, remote, reporter) {
+function prepareStackTransition(transition, github, previous, base, reporter) {
 	if (transition.kind !== "rebuild" || transition.action !== "reorder") return;
 	reporter.progress(`Preparing stack #${transition.stackNumber} for reordered branches`);
 	github.unstack(transition.stackNumber);
 	try {
-		for (const change of previous.changes) github.editPullRequestBase(github.pullRequest(change.pullRequest), base);
+		for (const change of previous.changes) {
+			const pullRequest = github.pullRequest(change.pullRequest);
+			if (pullRequest.state === "OPEN") github.editPullRequestBase(pullRequest, base);
+		}
 	} catch (error) {
-		restorePreviousStack(github, previous, base, remote, reporter, error);
+		restorePreviousStack(github, previous, reporter, error);
 	}
 }
 function applyStackTransition(transition, github, previous, changes, pullRequests, base, remote, draft, reporter) {
+	if (transition.kind === "retarget") {
+		reporter.progress(`Updating the pull request base to ${base}`);
+		github.editPullRequestBase(pullRequests[0], base);
+		return;
+	}
 	if (changes.length === 1) {
 		if (transition.kind === "partial") reporter.progress("Updating this down-stack prefix while preserving higher pull requests");
 		if (transition.kind === "collapse") {
@@ -739,7 +763,7 @@ function applyStackTransition(transition, github, previous, changes, pullRequest
 			try {
 				github.editPullRequestBase(pullRequests[0], base);
 			} catch (error) {
-				restorePreviousStack(github, previous, base, remote, reporter, error);
+				restorePreviousStack(github, previous, reporter, error);
 			}
 		}
 		return;
@@ -750,12 +774,13 @@ function applyStackTransition(transition, github, previous, changes, pullRequest
 		return;
 	}
 	if (transition.kind === "rebuild") {
-		reporter.progress(`Rebuilding stack #${transition.stackNumber} to ${transition.action} pull requests`);
+		const reason = transition.action === "change-base" ? `against ${base}` : `to ${transition.action} pull requests`;
+		reporter.progress(`Rebuilding stack #${transition.stackNumber} ${reason}`);
 		if (transition.action !== "reorder") github.unstack(transition.stackNumber);
 		try {
 			github.linkStack(pullRequests.map((pullRequest) => pullRequest.number), base, remote, draft);
 		} catch (error) {
-			restorePreviousStack(github, previous, base, remote, reporter, error);
+			restorePreviousStack(github, previous, reporter, error);
 		}
 		return;
 	}
@@ -774,11 +799,13 @@ function applyStackTransition(transition, github, previous, changes, pullRequest
 	}
 	reporter.progress("The native GitHub stack already has the correct members");
 }
-function restorePreviousStack(github, previous, base, remote, reporter, rebuildError) {
+function restorePreviousStack(github, previous, reporter, rebuildError) {
 	const rebuildMessage = rebuildError instanceof Error ? rebuildError.message : String(rebuildError);
 	reporter.progress("Rebuild failed; restoring the previous native GitHub stack");
 	try {
-		github.linkStack(previous.changes.map((change) => change.pullRequest), base, remote, true);
+		const pullRequests = previous.changes.map((change) => github.pullRequest(change.pullRequest)).filter((pullRequest) => pullRequest.state === "OPEN");
+		if (pullRequests.length === 1) github.editPullRequestBase(pullRequests[0], previous.base);
+		else if (pullRequests.length > 1) github.linkStack(pullRequests.map((pullRequest) => pullRequest.number), previous.base, previous.remote, true);
 	} catch (rollbackError) {
 		const rollbackMessage = rollbackError instanceof Error ? rollbackError.message : String(rollbackError);
 		throw new Error(`Stack rebuild failed: ${rebuildMessage}\nRestoring the previous stack also failed: ${rollbackMessage}`);
@@ -822,13 +849,14 @@ function syncStack(dependencies, options) {
 	const state = stateStore.read();
 	const previous = stack.findPrevious(state);
 	const transition = stack.transitionFrom(previous, {
+		base,
 		preserveHigherChanges: repository.currentBranch() === void 0,
 		lookups: {
 			pullRequestState: (pullRequest) => github.pullRequest(pullRequest).state,
 			stackNumberForPullRequest: (pullRequest) => github.stackNumberForPullRequest(pullRequest)
 		}
 	});
-	prepareStackTransition(transition, github, previous, base, remote, reporter);
+	prepareStackTransition(transition, github, previous, base, reporter);
 	const isReorder = transition.kind === "rebuild" && transition.action === "reorder";
 	let pushedBranches = /* @__PURE__ */ new Set();
 	try {
@@ -839,7 +867,7 @@ function syncStack(dependencies, options) {
 		reportPushResult(reporter, pushResult);
 		pushedBranches = new Set(pushResult.updated);
 	} catch (error) {
-		if (isReorder) restorePreviousStack(github, previous, base, remote, reporter, error);
+		if (isReorder) restorePreviousStack(github, previous, reporter, error);
 		throw error;
 	}
 	reporter.progress("Looking up existing pull requests");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bstack",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Create native GitHub stacked pull requests from a linear series of commits",
   "license": "MIT",
   "repository": {