bstack 1.4.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.4.0";
+var version = "1.5.1";
 //#endregion
 //#region src/command.ts
 var CommandError = class extends Error {
@@ -265,9 +265,14 @@ var GitCliRepository = class {
 	}
 	pushBranches(remote, branches) {
 		const existing = this.remoteBranchOids(remote, branches.map((branch) => branch.name));
+		const updates = branches.filter((branch) => existing.get(branch.name) !== branch.oid);
+		if (updates.length === 0) return {
+			checked: branches.length,
+			updated: []
+		};
 		const leases = [];
 		const refspecs = [];
-		for (const branch of branches) {
+		for (const branch of updates) {
 			const expected = existing.get(branch.name) ?? "";
 			leases.push(`--force-with-lease=refs/heads/${branch.name}:${expected}`);
 			refspecs.push(`${branch.oid}:refs/heads/${branch.name}`);
@@ -279,7 +284,10 @@ var GitCliRepository = class {
 			remote,
 			...refspecs
 		]);
-		return branches.filter((branch) => existing.get(branch.name) !== branch.oid).map((branch) => branch.name);
+		return {
+			checked: branches.length,
+			updated: updates.map((branch) => branch.name)
+		};
 	}
 	statePath() {
 		return this.git([
@@ -513,7 +521,7 @@ var GitHubCliPlatform = class {
 //#region src/output.ts
 function formatSyncResult(result, dryRun) {
 	const changeCount = `${result.changes.length} change${result.changes.length === 1 ? "" : "s"}`;
-	const lines = [dryRun ? `Would sync ${changeCount} against ${result.base}:` : `Synced stack against ${result.base} (${changeCount}):`];
+	const lines = [dryRun ? `Would sync ${changeCount} against ${result.base}:` : `Synced ${result.changes.length}-commit stack against ${result.base}:`];
 	if (dryRun) {
 		for (const change of result.changes) lines.push(`  ${change.oid.slice(0, 8)}  ${change.subject}`);
 		return lines.join("\n");
@@ -603,6 +611,13 @@ var Stack = class Stack {
 		this.rewritten = rewritten;
 		this.rewrites = rewrites;
 		if (changes.length === 0) throw new Error("A stack must contain at least one change");
+		const seen = /* @__PURE__ */ new Set();
+		const duplicate = changes.find((change) => {
+			if (seen.has(change.id)) return true;
+			seen.add(change.id);
+			return false;
+		});
+		if (duplicate) throw new Error(`A stack cannot contain duplicate bstack-id ${duplicate.id}`);
 	}
 	static fromChanges(changes) {
 		return new Stack(changes);
@@ -651,8 +666,20 @@ 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) {
-			if (previousIds.every((id, index) => currentIds[index] === id)) return { kind: "full" };
+			const previousIsPrefix = previousIds.every((id, index) => currentIds[index] === id);
+			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",
+					stackNumber,
+					branches: added.map((change) => change.remoteBranch)
+				};
+				return { kind: "full" };
+			}
 			const stackNumber = previous.stackNumber ?? options.lookups.stackNumberForPullRequest(previous.changes[0].pullRequest);
 			return stackNumber === void 0 ? { kind: "full" } : {
 				kind: "rebuild",
@@ -663,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",
@@ -689,11 +721,98 @@ 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, 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) {
+			const pullRequest = github.pullRequest(change.pullRequest);
+			if (pullRequest.state === "OPEN") github.editPullRequestBase(pullRequest, base);
+		}
+	} catch (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") {
+			reporter.progress(`Removing omitted pull requests from stack #${transition.stackNumber}`);
+			github.unstack(transition.stackNumber);
+			try {
+				github.editPullRequestBase(pullRequests[0], base);
+			} catch (error) {
+				restorePreviousStack(github, previous, reporter, error);
+			}
+		}
+		return;
+	}
+	if (transition.kind === "full") {
+		reporter.progress(`Linking ${changes.length} pull requests as a native GitHub stack`);
+		github.linkStack(pullRequests.map((pullRequest) => pullRequest.number), base, remote, draft);
+		return;
+	}
+	if (transition.kind === "rebuild") {
+		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, reporter, error);
+		}
+		return;
+	}
+	if (transition.kind === "append") {
+		reporter.progress(`Appending ${transition.branches.length} pull request${transition.branches.length === 1 ? "" : "s"} to stack #${transition.stackNumber}`);
+		github.appendToStack(transition.stackNumber, transition.branches.map((branch) => {
+			const pullRequest = pullRequests[changes.findIndex((change) => change.remoteBranch === branch)];
+			if (!pullRequest) throw new Error(`Missing pull request for ${branch}`);
+			return pullRequest.number;
+		}), remote, draft);
+		return;
+	}
+	if (transition.kind === "partial") {
+		reporter.progress("Updating this down-stack prefix while preserving higher pull requests");
+		return;
+	}
+	reporter.progress("The native GitHub stack already has the correct members");
+}
+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 {
+		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}`);
+	}
+	throw rebuildError;
+}
+//#endregion
 //#region src/sync.ts
 function syncStack(dependencies, options) {
 	const { repository, github, stateStore, reporter } = dependencies;
@@ -730,32 +849,25 @@ 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, reporter);
 	const isReorder = transition.kind === "rebuild" && transition.action === "reorder";
-	if (isReorder) {
-		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);
-		} catch (error) {
-			restorePreviousStack(github, previous, base, remote, reporter, error);
-		}
-	}
-	reporter.progress(`Pushing ${changes.length} remote branch${changes.length === 1 ? "" : "es"}`);
 	let pushedBranches = /* @__PURE__ */ new Set();
 	try {
-		const updatedBranches = repository.pushBranches(remote, changes.map((change) => ({
+		const pushResult = repository.pushBranches(remote, changes.map((change) => ({
 			name: change.remoteBranch,
 			oid: change.oid
 		})));
-		pushedBranches = new Set(updatedBranches);
+		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");
@@ -768,39 +880,7 @@ function syncStack(dependencies, options) {
 		return github.createPullRequest(change, pullRequestBase, options.draft);
 	});
 	const createdBranches = new Set(changes.filter((_change, index) => existing[index] === void 0).map((change) => change.remoteBranch));
-	if (changes.length === 1) {
-		if (transition.kind === "partial") reporter.progress("Updating this down-stack prefix while preserving higher pull requests");
-		const pullRequest = pullRequests[0];
-		if (transition.kind === "collapse") {
-			reporter.progress(`Removing omitted pull requests from stack #${transition.stackNumber}`);
-			github.unstack(transition.stackNumber);
-			try {
-				github.editPullRequestBase(pullRequest, base);
-			} catch (error) {
-				restorePreviousStack(github, previous, base, remote, reporter, error);
-			}
-		}
-	} else if (transition.kind === "full") {
-		reporter.progress(`Linking ${changes.length} pull requests as a native GitHub stack`);
-		github.linkStack(pullRequests.map((pullRequest) => pullRequest.number), base, remote, options.draft);
-	} else if (transition.kind === "rebuild") {
-		reporter.progress(`Rebuilding stack #${transition.stackNumber} to ${transition.action} pull requests`);
-		if (!isReorder) github.unstack(transition.stackNumber);
-		try {
-			github.linkStack(pullRequests.map((pullRequest) => pullRequest.number), base, remote, options.draft);
-		} catch (error) {
-			restorePreviousStack(github, previous, base, remote, reporter, error);
-		}
-	} else if (transition.kind === "append") {
-		reporter.progress(`Appending ${transition.branches.length} pull request${transition.branches.length === 1 ? "" : "s"} to stack #${transition.stackNumber}`);
-		github.appendToStack(transition.stackNumber, transition.branches.map((branch) => {
-			const index = changes.findIndex((change) => change.remoteBranch === branch);
-			const pullRequest = pullRequests[index];
-			if (!pullRequest) throw new Error(`Missing pull request for ${branch}`);
-			return pullRequest.number;
-		}), remote, options.draft);
-	} else if (transition.kind === "partial") reporter.progress("Updating this down-stack prefix while preserving higher pull requests");
-	else reporter.progress("The native GitHub stack already has the correct members");
+	applyStackTransition(transition, github, previous, changes, pullRequests, base, remote, options.draft, reporter);
 	const currentIds = new Set(changes.map((change) => change.id));
 	const omittedPullRequests = transition.kind === "partial" ? [] : (previous?.changes ?? []).filter((change) => !currentIds.has(change.id)).map((change) => github.pullRequest(change.pullRequest)).filter((pullRequest) => pullRequest.state === "OPEN");
 	if (omittedPullRequests.length > 0) {
@@ -856,16 +936,12 @@ function changeOutcome(change, index, pullRequest, previous, changes, base, crea
 	const metadataChanged = pullRequest.title !== change.subject || pullRequest.body !== change.body;
 	return pushedBranches.has(change.remoteBranch) || previousBase !== currentBase || metadataChanged ? "updated" : "unchanged";
 }
-function restorePreviousStack(github, previous, base, remote, 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);
-	} 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}`);
+function reportPushResult(reporter, result) {
+	if (result.updated.length === 0) {
+		reporter.progress(`All ${result.checked} remote branch${result.checked === 1 ? "" : "es"} already match`);
+		return;
 	}
-	throw rebuildError;
+	reporter.progress(`Updating ${result.updated.length} of ${result.checked} remote branch${result.checked === 1 ? "" : "es"}`);
 }
 function writeUpdatedState(store, state, previous, updated) {
 	const stacks = previous ? state.stacks.map((stack) => stack === previous ? updated : stack) : [...state.stacks, updated];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bstack",
-  "version": "1.4.0",
+  "version": "1.5.1",
   "description": "Create native GitHub stacked pull requests from a linear series of commits",
   "license": "MIT",
   "repository": {
@@ -32,6 +32,7 @@
     "valibot": "^1.4.2"
   },
   "devDependencies": {
+    "@total-typescript/shoehorn": "^0.1.2",
     "@types/node": "^26.0.0",
     "oxfmt": "^0.64.0",
     "oxlint": "^1.79.0",