bstack 0.2.1 → 0.2.2

package/dist/bstack.js

@@ -5,7 +5,7 @@ import { randomUUID } from "node:crypto";
 import { mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
 //#region package.json
-var version = "0.2.1";
+var version = "0.2.2";
 //#endregion
 //#region src/command.ts
 var CommandError = class extends Error {
@@ -411,6 +411,13 @@ var GhPlatform = class {
 		args.push(String(stackNumber), ...branches);
 		this.gh(args);
 	}
+	unstack(stackNumber) {
+		this.gh([
+			"stack",
+			"unstack",
+			String(stackNumber)
+		]);
+	}
 	editPullRequest(pr, change) {
 		if (pr.title === change.subject && pr.body === change.body) return;
 		this.gh([
@@ -552,6 +559,20 @@ function syncStack(repository, github, options) {
 		if (evolution.kind === "full") {
 			reporter.progress(`Linking ${changes.length} pull requests as a native GitHub stack`);
 			github.linkStack(changes.map((change) => change.remoteBranch), base, remote, options.open);
+		} else if (evolution.kind === "rebuild") {
+			reporter.progress(`Rebuilding stack #${evolution.stackNumber} to insert pull requests`);
+			github.unstack(evolution.stackNumber);
+			try {
+				github.linkStack(changes.map((change) => change.remoteBranch), base, remote, options.open);
+			} catch (error) {
+				reporter.progress("Rebuild failed; restoring the previous native GitHub stack");
+				try {
+					github.linkStack(previous.changes.map((change) => change.remoteBranch), base, remote, false);
+				} catch (rollbackError) {
+					throw new Error(`Stack rebuild failed: ${errorMessage(error)}\nRestoring the previous stack also failed: ${errorMessage(rollbackError)}`);
+				}
+				throw error;
+			}
 		} else if (evolution.kind === "append") {
 			reporter.progress(`Appending ${evolution.branches.length} pull request${evolution.branches.length === 1 ? "" : "s"} to stack #${evolution.stackNumber}`);
 			github.appendToStack(evolution.stackNumber, evolution.branches, remote, options.open);
@@ -568,7 +589,7 @@ function syncStack(repository, github, options) {
 		github.editPullRequest(pr, changes[index]);
 		reporter.progress(`PR #${pr.number}: ${changes[index].subject}`);
 	}
-	const stackNumber = previous?.stackNumber ?? (pullRequests.length > 1 ? github.stackNumberForPullRequest(pullRequests[0].number) : void 0);
+	const stackNumber = evolution.kind === "rebuild" ? github.stackNumberForPullRequest(pullRequests[0].number) : previous?.stackNumber ?? (pullRequests.length > 1 ? github.stackNumberForPullRequest(pullRequests[0].number) : void 0);
 	const synchronizedChanges = changes.map((change, index) => ({
 		id: change.id,
 		remoteBranch: change.remoteBranch,
@@ -597,7 +618,14 @@ function analyzeEvolution(previous, changes, github) {
 	if (!previous) return { kind: "full" };
 	const previousIds = previous.changes.map((change) => change.id);
 	const currentIds = changes.map((change) => change.id);
-	if (isSubsequence(previousIds, currentIds)) return { kind: "full" };
+	if (isSubsequence(previousIds, currentIds)) {
+		if (previousIds.every((id, index) => currentIds[index] === id)) return { kind: "full" };
+		const stackNumber = previous.stackNumber ?? github.stackNumberForPullRequest(previous.changes[0].pullRequest);
+		return stackNumber === void 0 ? { kind: "full" } : {
+			kind: "rebuild",
+			stackNumber
+		};
+	}
 	const firstCurrentIndex = previousIds.indexOf(currentIds[0]);
 	if (firstCurrentIndex === -1) throw new Error("The current commits do not continue the previously submitted stack");
 	const removedPrefix = previous.changes.slice(0, firstCurrentIndex);
@@ -624,6 +652,9 @@ function isSubsequence(expected, actual) {
 	for (const value of actual) if (value === expected[expectedIndex]) expectedIndex++;
 	return expectedIndex === expected.length;
 }
+function errorMessage(error) {
+	return error instanceof Error ? error.message : String(error);
+}
 function writeUpdatedState(store, state, previous, updated) {
 	const stacks = previous ? state.stacks.map((stack) => stack === previous ? updated : stack) : [...state.stacks, updated];
 	store.write({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bstack",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "packageManager": "pnpm@11.5.1",
   "description": "Create native GitHub stacked pull requests from a linear series of commits",
   "repository": {