bstack 1.0.3 → 1.1.0

package/README.md

@@ -8,36 +8,87 @@ Convert a series of commits in a local branch into a native GitHub stack of pull
 npm install -g bstack
 ```
 
-Install and authenticate the GitHub CLI with the `github/gh-stack` extension:
+Install and authenticate the [GitHub CLI](https://cli.github.com/) with the [stack](https://github.com/github/gh-stack) extension:
 
 ```
 gh auth login
 gh extension install github/gh-stack
 ```
 
-## Use
+## How to use
 
-Create one commit per change, then sync the stack:
+Write and edit commits locally. `bstack` handles the GitHub ops for you:
+
+You
+
+- Do not push your local feature branch.
+- Do not open pull requests manually.
+- Run `bstack` when your commits are ready. It pushes dedicated remote branches
+  and creates one pull request for each commit.
+
+### Start a stack
+
+Create a local branch from `main`, then make one commit per reviewable change:
 
 ```bash
+git switch main
 git switch -c my-feature
 git commit -am "feat: add the model"
 git commit -am "feat: add the API"
 bstack
 ```
 
-Run `bstack` again after amending or rebasing commits.
+That is the whole publishing flow. Keep working on the same local branch and run `bstack` again whenever the stack changes.
 
-New PRs are ready for review by default. Pass `--draft` to create draft PRs.
+### Add another pull request
 
-Checkout a stack through one of its PRs:
+Add another commit on top of the stack, then run `bstack`:
+
+```bash
+git commit -am "feat: add validation"
+bstack
+```
+
+`bstack` keeps the existing pull requests and adds one for the new commit.
+
+### Modify a pull request
+
+Edit the corresponding commit, then run `bstack` again. For the latest commit:
+
+```bash
+git commit --amend
+bstack
+```
+
+For an older commit, use interactive rebase, mark that commit for editing, make
+your changes, and continue the rebase:
+
+```bash
+git rebase -i main
+git commit --amend
+git rebase --continue
+bstack
+```
+
+Stacks cannot contain merge commits.
+When `main` moves, rebase your branch onto it instead of merging `main` into your branch.
+
+### Checkout an existing stack
+
+Use any pull request in the stack:
 
 ```bash
 bstack checkout 123
 bstack checkout https://github.com/owner/repo/pull/123
 ```
 
-Use `--dry-run` to inspect without syncing and `--quiet` to hide progress logs.
+### Options
+
+New pull requests are ready for review by default. Pass `--draft` to create
+drafts instead.
+
+Use `--dry-run` to inspect without syncing. Pass `--verbose` to print every
+command before it runs.
 
 ## References
 

package/dist/bstack.js

@@ -2,11 +2,11 @@
 import { parseArgs } from "node:util";
 import { spawnSync } from "node:child_process";
 import { randomUUID } from "node:crypto";
-import { z } from "zod";
+import * as v from "valibot";
 import { mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
 //#region package.json
-var version = "1.0.3";
+var version = "1.1.0";
 //#endregion
 //#region src/command.ts
 var CommandError = class extends Error {
@@ -20,9 +20,14 @@ var CommandError = class extends Error {
 	}
 };
 var NodeCommandRunner = class {
+	logger;
+	constructor(logger) {
+		this.logger = logger;
+	}
 	run(command, options) {
 		const [executable, ...args] = command;
 		if (!executable) throw new Error("Cannot run an empty command");
+		this.logger?.(command);
 		const result = spawnSync(executable, args, {
 			cwd: options.cwd,
 			input: options.stdin,
@@ -41,10 +46,17 @@ var NodeCommandRunner = class {
 		return commandResult;
 	}
 };
+function formatCommand(command) {
+	return command.map(formatArgument).join(" ");
+}
+function formatArgument(argument) {
+	if (/^[A-Za-z0-9_./:@%+=,-]+$/.test(argument)) return argument;
+	return `'${argument.replaceAll("'", `'"'"'`)}'`;
+}
 //#endregion
 //#region src/checkout.ts
-function checkoutStack(repository, github, options) {
-	const { reporter } = options;
+function checkoutStack(dependencies, options) {
+	const { repository, github, reporter } = dependencies;
 	reporter.progress("Checking the repository and GitHub prerequisites");
 	repository.assertReady();
 	github.assertReady();
@@ -139,7 +151,7 @@ function splitCommitMessage(message) {
 }
 //#endregion
 //#region src/git.ts
-var GitRepository = class {
+var GitCliRepository = class {
 	cwd;
 	runner;
 	constructor(cwd, runner) {
@@ -164,17 +176,6 @@ var GitRepository = class {
 			"HEAD"
 		], { allowFailure: true }).stdout.trim();
 	}
-	remotes() {
-		return this.git(["remote"]).stdout.split("\n").filter(Boolean);
-	}
-	configuredPushRemote() {
-		const result = this.git([
-			"config",
-			"--get",
-			"remote.pushDefault"
-		], { allowFailure: true });
-		return result.exitCode === 0 ? result.stdout.trim() || void 0 : void 0;
-	}
 	resolveRemote(requested) {
 		if (requested) {
 			if (!this.remotes().includes(requested)) throw new Error(`Git remote ${requested} does not exist`);
@@ -233,69 +234,40 @@ var GitRepository = class {
 			oid
 		]).stdout));
 	}
-	ensureChangeIds(commits, dryRun, userLogin) {
-		const assigned = commits.map((commit) => commit.changeId ?? generateChangeId());
-		const needsRewrite = commits.some((commit) => commit.changeId === void 0);
-		let parent = commits[0]?.parent;
+	rewriteCommits(rewrites) {
+		if (rewrites.length === 0) return [];
+		let parent = rewrites[0].commit.parent;
 		const rewrittenOids = [];
-		if (needsRewrite && !dryRun) {
-			for (const [index, commit] of commits.entries()) {
-				const changeId = assigned[index];
-				const message = commit.changeId ? commit.message : addChangeId(commit.message, changeId);
-				const raw = rewriteCommit(commit, parent, message);
-				const oid = this.git([
-					"hash-object",
-					"-t",
-					"commit",
-					"-w",
-					"--stdin"
-				], { stdin: raw }).stdout.trim();
-				rewrittenOids.push(oid);
-				parent = oid;
-			}
-			const oldHead = commits.at(-1).oid;
-			const newHead = rewrittenOids.at(-1);
-			this.git([
-				"update-ref",
-				"HEAD",
-				newHead,
-				oldHead
-			]);
+		for (const rewrite of rewrites) {
+			const raw = rewriteCommit(rewrite.commit, parent, rewrite.message);
+			const oid = this.git([
+				"hash-object",
+				"-t",
+				"commit",
+				"-w",
+				"--stdin"
+			], { stdin: raw }).stdout.trim();
+			rewrittenOids.push(oid);
+			parent = oid;
 		}
-		return commits.map((commit, index) => {
-			const id = assigned[index];
-			const oid = needsRewrite && !dryRun ? rewrittenOids[index] : commit.oid;
-			const { subject, body } = splitCommitMessage(commit.message);
-			return {
-				id,
-				oid,
-				subject,
-				body,
-				remoteBranch: `bstack/${userLogin}/${id}`
-			};
-		});
-	}
-	remoteBranchOids(remote, branches) {
-		if (branches.length === 0) return /* @__PURE__ */ new Map();
-		const result = this.git([
-			"ls-remote",
-			"--heads",
-			remote,
-			...branches.map((branch) => `refs/heads/${branch}`)
+		const oldHead = rewrites.at(-1).commit.oid;
+		const newHead = rewrittenOids.at(-1);
+		this.git([
+			"update-ref",
+			"HEAD",
+			newHead,
+			oldHead
 		]);
-		return new Map(result.stdout.split("\n").filter(Boolean).map((line) => {
-			const [oid, ref] = line.split(/\s+/, 2);
-			return [ref.replace("refs/heads/", ""), oid];
-		}));
+		return rewrittenOids;
 	}
-	pushChanges(remote, changes) {
-		const existing = this.remoteBranchOids(remote, changes.map((change) => change.remoteBranch));
+	pushBranches(remote, branches) {
+		const existing = this.remoteBranchOids(remote, branches.map((branch) => branch.name));
 		const leases = [];
 		const refspecs = [];
-		for (const change of changes) {
-			const expected = existing.get(change.remoteBranch) ?? "";
-			leases.push(`--force-with-lease=refs/heads/${change.remoteBranch}:${expected}`);
-			refspecs.push(`${change.oid}:refs/heads/${change.remoteBranch}`);
+		for (const branch of branches) {
+			const expected = existing.get(branch.name) ?? "";
+			leases.push(`--force-with-lease=refs/heads/${branch.name}:${expected}`);
+			refspecs.push(`${branch.oid}:refs/heads/${branch.name}`);
 		}
 		this.git([
 			"push",
@@ -313,22 +285,46 @@ var GitRepository = class {
 			"bstack/state.json"
 		]).stdout.trim();
 	}
+	remotes() {
+		return this.git(["remote"]).stdout.split("\n").filter(Boolean);
+	}
+	configuredPushRemote() {
+		const result = this.git([
+			"config",
+			"--get",
+			"remote.pushDefault"
+		], { allowFailure: true });
+		return result.exitCode === 0 ? result.stdout.trim() || void 0 : void 0;
+	}
+	remoteBranchOids(remote, branches) {
+		if (branches.length === 0) return /* @__PURE__ */ new Map();
+		const result = this.git([
+			"ls-remote",
+			"--heads",
+			remote,
+			...branches.map((branch) => `refs/heads/${branch}`)
+		]);
+		return new Map(result.stdout.split("\n").filter(Boolean).map((line) => {
+			const [oid, ref] = line.split(/\s+/, 2);
+			return [ref.replace("refs/heads/", ""), oid];
+		}));
+	}
 };
 //#endregion
 //#region src/github.ts
-const pullRequestSchema = z.object({
-	number: z.number(),
-	url: z.string(),
-	state: z.enum([
+const pullRequestSchema = v.object({
+	number: v.number(),
+	url: v.string(),
+	state: v.picklist([
 		"OPEN",
 		"CLOSED",
 		"MERGED"
 	]),
-	title: z.string(),
-	body: z.string(),
-	isDraft: z.boolean()
+	title: v.string(),
+	body: v.string(),
+	isDraft: v.boolean()
 });
-const stackSchema = z.object({ number: z.number() });
+const stackSchema = v.object({ number: v.number() });
 var GitHubCliPlatform = class {
 	cwd;
 	runner;
@@ -348,12 +344,13 @@ var GitHubCliPlatform = class {
 		this.gh(["stack", "--version"]);
 	}
 	currentUserLogin() {
-		return z.string().min(1).parse(this.gh([
+		const login = this.gh([
 			"api",
 			"user",
 			"--jq",
 			".login"
-		]).stdout.trim());
+		]).stdout.trim();
+		return v.parse(v.pipe(v.string(), v.minLength(1)), login);
 	}
 	defaultBranch() {
 		return this.gh([
@@ -378,7 +375,7 @@ var GitHubCliPlatform = class {
 			"--json",
 			"number,url,state,title,body,isDraft"
 		]).stdout;
-		const candidates = pullRequestSchema.array().parse(JSON.parse(raw));
+		const candidates = v.parse(v.array(pullRequestSchema), JSON.parse(raw));
 		return candidates.find((pr) => pr.state === "OPEN") ?? candidates.find((pr) => pr.state === "MERGED");
 	}
 	pullRequest(number) {
@@ -389,7 +386,7 @@ var GitHubCliPlatform = class {
 			"--json",
 			"number,url,state,title,body,isDraft"
 		]).stdout;
-		return pullRequestSchema.parse(JSON.parse(raw));
+		return v.parse(pullRequestSchema, JSON.parse(raw));
 	}
 	createPullRequest(change, base, draft) {
 		const args = [
@@ -464,7 +461,7 @@ var GitHubCliPlatform = class {
 	}
 	stackNumberForPullRequest(prNumber) {
 		const raw = this.gh(["api", `repos/{owner}/{repo}/stacks?pull_request=${prNumber}`]).stdout;
-		return stackSchema.array().parse(JSON.parse(raw))[0]?.number;
+		return v.parse(v.array(stackSchema), JSON.parse(raw))[0]?.number;
 	}
 	pullRequestHead(reference) {
 		return this.gh([
@@ -488,12 +485,11 @@ var GitHubCliPlatform = class {
 //#endregion
 //#region src/reporter.ts
 var ConsoleReporter = class {
-	enabled;
-	constructor(enabled = true) {
-		this.enabled = enabled;
-	}
 	progress(message) {
-		if (this.enabled) process.stderr.write(`[bstack] ${message}\n`);
+		process.stderr.write(`[bstack] ${message}\n`);
+	}
+	command(command) {
+		this.progress(`$ ${formatCommand(command)}`);
 	}
 };
 //#endregion
@@ -502,23 +498,23 @@ const emptyState = () => ({
 	schemaVersion: 1,
 	stacks: []
 });
-const storedChangeSchema = z.object({
-	id: z.string(),
-	remoteBranch: z.string(),
-	pullRequest: z.number(),
-	url: z.string()
+const storedChangeSchema = v.object({
+	id: v.string(),
+	remoteBranch: v.string(),
+	pullRequest: v.number(),
+	url: v.string()
 });
-const storedStackSchema = z.object({
-	remote: z.string(),
-	base: z.string(),
-	stackNumber: z.number().optional(),
-	changes: storedChangeSchema.array()
+const storedStackSchema = v.object({
+	remote: v.string(),
+	base: v.string(),
+	stackNumber: v.optional(v.number()),
+	changes: v.array(storedChangeSchema)
 });
-const stateSchema = z.object({
-	schemaVersion: z.literal(1),
-	stacks: storedStackSchema.array()
+const stateSchema = v.object({
+	schemaVersion: v.literal(1),
+	stacks: v.array(storedStackSchema)
 });
-var StateStore = class {
+var FileStateStore = class {
 	path;
 	constructor(path) {
 		this.path = path;
@@ -527,7 +523,7 @@ var StateStore = class {
 		try {
 			return {
 				schemaVersion: 1,
-				stacks: stateSchema.parse(JSON.parse(readFileSync(this.path, "utf8"))).stacks.map((stack) => {
+				stacks: v.parse(stateSchema, JSON.parse(readFileSync(this.path, "utf8"))).stacks.map((stack) => {
 					const stored = {
 						remote: stack.remote,
 						base: stack.base,
@@ -539,7 +535,7 @@ var StateStore = class {
 			};
 		} catch (error) {
 			if (error instanceof Error && "code" in error && error.code === "ENOENT") return emptyState();
-			if (error instanceof z.ZodError) throw new Error(`Unsupported bstack state in ${this.path}`, { cause: error });
+			if (v.isValiError(error)) throw new Error(`Unsupported bstack state in ${this.path}`, { cause: error });
 			throw error;
 		}
 	}
@@ -549,16 +545,116 @@ var StateStore = class {
 		writeFileSync(temporary, `${JSON.stringify(state, null, 2)}\n`);
 		renameSync(temporary, this.path);
 	}
-	findByChangeIds(state, ids) {
+};
+//#endregion
+//#region src/stack.ts
+var Stack = class Stack {
+	changes;
+	rewritten;
+	rewrites;
+	constructor(changes, rewritten = false, rewrites = []) {
+		this.changes = changes;
+		this.rewritten = rewritten;
+		this.rewrites = rewrites;
+		if (changes.length === 0) throw new Error("A stack must contain at least one change");
+	}
+	static fromChanges(changes) {
+		return new Stack(changes);
+	}
+	static fromCommits(commits, userLogin) {
+		const ids = commits.map((commit) => commit.changeId ?? generateChangeId());
+		const rewritten = commits.some((commit) => commit.changeId === void 0);
+		const rewrites = rewritten ? commits.map((commit, index) => ({
+			commit,
+			message: commit.changeId ? commit.message : addChangeId(commit.message, ids[index])
+		})) : [];
+		const changes = commits.map((commit, index) => {
+			const id = ids[index];
+			const { subject, body } = splitCommitMessage(commit.message);
+			return {
+				id,
+				oid: commit.oid,
+				subject,
+				body,
+				remoteBranch: `bstack/${userLogin}/${id}`
+			};
+		});
+		return new Stack(changes, rewritten, rewrites);
+	}
+	writeChangeIds(repository) {
+		if (!this.rewritten) return this;
+		const rewrittenOids = repository.rewriteCommits(this.rewrites);
+		if (rewrittenOids.length !== this.changes.length) throw new Error(`Git rewrote ${rewrittenOids.length} commits for a stack with ${this.changes.length} changes`);
+		const changes = this.changes.map((change, index) => ({
+			...change,
+			oid: rewrittenOids[index]
+		}));
+		return new Stack(changes, true);
+	}
+	findPrevious(state) {
+		const ids = new Set(this.changes.map((change) => change.id));
 		const matches = state.stacks.filter((stack) => stack.changes.some((change) => ids.has(change.id)));
 		if (matches.length > 1) throw new Error("The current commits match more than one stored bstack stack");
 		return matches[0];
 	}
+	transitionFrom(previous, options) {
+		if (!previous) return { kind: "full" };
+		const previousIds = previous.changes.map((change) => change.id);
+		const currentIds = this.changes.map((change) => change.id);
+		const previousIdSet = new Set(previousIds);
+		const currentIdSet = new Set(currentIds);
+		if (!sameSequence(previousIds.filter((id) => currentIdSet.has(id)), currentIds.filter((id) => previousIdSet.has(id)))) throw new Error("Submitted commits cannot be reordered. Restore their original relative order before syncing");
+		const removed = previous.changes.filter((change) => !currentIdSet.has(change.id));
+		const added = this.changes.filter((change) => !previousIdSet.has(change.id));
+		if (removed.length === 0) {
+			if (previousIds.every((id, index) => currentIds[index] === id)) return { kind: "full" };
+			const stackNumber = previous.stackNumber ?? options.lookups.stackNumberForPullRequest(previous.changes[0].pullRequest);
+			return stackNumber === void 0 ? { kind: "full" } : {
+				kind: "rebuild",
+				stackNumber,
+				action: "insert"
+			};
+		}
+		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
+			};
+		}
+		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" };
+		if (onlyAppendedAfterMergedPrefix) {
+			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",
+				stackNumber: previous.stackNumber,
+				branches: added.map((change) => change.remoteBranch)
+			};
+		}
+		const stackNumber = previous.stackNumber ?? options.lookups.stackNumberForPullRequest(previous.changes[0].pullRequest);
+		if (stackNumber === void 0) throw new Error("Cannot remove submitted commits because the native GitHub stack number is missing from local state");
+		if (this.changes.length === 1) return {
+			kind: "collapse",
+			stackNumber
+		};
+		return {
+			kind: "rebuild",
+			stackNumber,
+			action: added.length === 0 ? "remove" : "update"
+		};
+	}
 };
+function sameSequence(left, right) {
+	return left.length === right.length && left.every((value, index) => value === right[index]);
+}
 //#endregion
 //#region src/sync.ts
-function syncStack(repository, github, options) {
-	const { reporter } = options;
+function syncStack(dependencies, options) {
+	const { repository, github, stateStore, reporter } = dependencies;
 	reporter.progress("Checking the repository and GitHub prerequisites");
 	repository.assertReady();
 	github.assertReady();
@@ -573,26 +669,35 @@ function syncStack(repository, github, options) {
 	const commits = repository.commitsSince(baseOid);
 	if (commits.length === 0) throw new Error(`No commits found between ${base} and HEAD`);
 	reporter.progress(`Found ${commits.length} local change${commits.length === 1 ? "" : "s"}`);
-	const rewritten = commits.some((commit) => commit.changeId === void 0);
-	if (rewritten) reporter.progress(options.dryRun ? "Stable change IDs would be added to the commits" : "Adding stable change IDs to the commits");
+	const pendingStack = Stack.fromCommits(commits, userLogin);
+	if (pendingStack.rewritten) reporter.progress(options.dryRun ? "Stable change IDs would be added to the commits" : "Adding stable change IDs to the commits");
 	else reporter.progress("All commits already have stable change IDs");
-	const changes = repository.ensureChangeIds(commits, options.dryRun, userLogin);
+	const stack = options.dryRun ? pendingStack : pendingStack.writeChangeIds(repository);
+	const { changes, rewritten } = stack;
 	if (options.dryRun) {
 		reporter.progress("Dry run complete; no commits or remote branches were changed");
 		return {
 			base,
 			remote,
 			rewritten,
-			changes
+			changes: [...changes]
 		};
 	}
 	reporter.progress("Reading the previous stack state");
-	const store = new StateStore(repository.statePath());
-	const state = store.read();
-	const previous = store.findByChangeIds(state, new Set(changes.map((change) => change.id)));
-	const transition = analyzeStackTransition(previous, changes, github, repository.currentBranch() === "");
+	const state = stateStore.read();
+	const previous = stack.findPrevious(state);
+	const transition = stack.transitionFrom(previous, {
+		preserveHigherChanges: repository.currentBranch() === "",
+		lookups: {
+			pullRequestState: (pullRequest) => github.pullRequest(pullRequest).state,
+			stackNumberForPullRequest: (pullRequest) => github.stackNumberForPullRequest(pullRequest)
+		}
+	});
 	reporter.progress(`Pushing ${changes.length} remote branch${changes.length === 1 ? "" : "es"}`);
-	repository.pushChanges(remote, changes);
+	repository.pushBranches(remote, changes.map((change) => ({
+		name: change.remoteBranch,
+		oid: change.oid
+	})));
 	reporter.progress("Looking up existing pull requests");
 	const existing = changes.map((change) => github.pullRequestForBranch(change.remoteBranch));
 	let pullRequests;
@@ -651,7 +756,7 @@ function syncStack(repository, github, options) {
 		changes: transition.kind === "partial" && previous ? [...synchronizedChanges, ...previous.changes.slice(transition.previousOffset + changes.length)] : synchronizedChanges
 	};
 	if (stackNumber !== void 0) updatedStack.stackNumber = stackNumber;
-	writeUpdatedState(store, state, previous, updatedStack);
+	writeUpdatedState(stateStore, state, previous, updatedStack);
 	reporter.progress("Saved the local stack state");
 	return {
 		base,
@@ -663,59 +768,6 @@ function syncStack(repository, github, options) {
 		}))
 	};
 }
-function analyzeStackTransition(previous, changes, github, preserveHigherChanges) {
-	if (!previous) return { kind: "full" };
-	const previousIds = previous.changes.map((change) => change.id);
-	const currentIds = changes.map((change) => change.id);
-	const previousIdSet = new Set(previousIds);
-	const currentIdSet = new Set(currentIds);
-	if (!sameSequence(previousIds.filter((id) => currentIdSet.has(id)), currentIds.filter((id) => previousIdSet.has(id)))) throw new Error("Submitted commits cannot be reordered. Restore their original relative order before syncing");
-	const removed = previous.changes.filter((change) => !currentIdSet.has(change.id));
-	const added = changes.filter((change) => !previousIdSet.has(change.id));
-	if (removed.length === 0) {
-		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,
-			action: "insert"
-		};
-	}
-	const firstCurrentIndex = previousIds.indexOf(currentIds[0]);
-	const isPreviousSlice = firstCurrentIndex >= 0 && currentIds.every((id, index) => previousIds[firstCurrentIndex + index] === id);
-	if (preserveHigherChanges && added.length === 0 && isPreviousSlice && firstCurrentIndex + currentIds.length < previousIds.length) {
-		if (previous.changes.slice(0, firstCurrentIndex).every((change) => github.pullRequest(change.pullRequest).state === "MERGED")) return {
-			kind: "partial",
-			previousOffset: firstCurrentIndex
-		};
-	}
-	const removedPrefixWasMerged = removed.every((change, index) => previous.changes[index] === change) && removed.every((change) => github.pullRequest(change.pullRequest).state === "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" };
-	if (onlyAppendedAfterMergedPrefix) {
-		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",
-			stackNumber: previous.stackNumber,
-			branches: added.map((change) => change.remoteBranch)
-		};
-	}
-	const stackNumber = previous.stackNumber ?? github.stackNumberForPullRequest(previous.changes[0].pullRequest);
-	if (stackNumber === void 0) throw new Error("Cannot remove submitted commits because the native GitHub stack number is missing from local state");
-	if (changes.length === 1) return {
-		kind: "collapse",
-		stackNumber
-	};
-	return {
-		kind: "rebuild",
-		stackNumber,
-		action: added.length === 0 ? "remove" : "update"
-	};
-}
-function sameSequence(left, right) {
-	return left.length === right.length && left.every((value, index) => value === right[index]);
-}
 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");
@@ -747,7 +799,7 @@ Options:
   --remote <name>    Git remote; defaults to remote.pushDefault or origin
   --draft            Create draft PRs instead of ready-for-review PRs
   --dry-run          Inspect the stack without rewriting commits or pushing
-  --quiet            Hide progress logs; the final summary is still printed
+  --verbose          Show each git and gh command before it runs
   --same-base        Refuse checkout if it would change the current merge base
   -v, --version      Show the installed version
   -h, --help         Show this help
@@ -767,7 +819,7 @@ function main() {
 				type: "boolean",
 				default: false
 			},
-			quiet: {
+			verbose: {
 				type: "boolean",
 				default: false
 			},
@@ -795,32 +847,39 @@ function main() {
 		console.log(version);
 		return;
 	}
-	const runner = new NodeCommandRunner();
+	const reporter = new ConsoleReporter();
+	const runner = new NodeCommandRunner(values.verbose ? (invocation) => reporter.command(invocation) : void 0);
 	const cwd = process.cwd();
-	const repository = new GitRepository(cwd, runner);
+	const repository = new GitCliRepository(cwd, runner);
 	const github = new GitHubCliPlatform(cwd, runner);
-	const reporter = new ConsoleReporter(!values.quiet);
 	const command = positionals[0] ?? "sync";
 	if (command === "checkout") {
 		const reference = positionals[1];
 		if (!reference || positionals.length > 2) throw new Error(`Usage: bstack checkout <PR-number-or-URL> [options]`);
-		const result = checkoutStack(repository, github, {
+		const result = checkoutStack({
+			repository,
+			github,
+			reporter
+		}, {
 			reference,
 			base: values.base,
 			remote: values.remote,
-			sameBase: values["same-base"],
-			reporter
+			sameBase: values["same-base"]
 		});
 		console.log(result.delegated ? `Checked out pull request ${reference}` : `Checked out ${result.headRef} from pull request ${reference}`);
 		return;
 	}
 	if (command !== "sync" || positionals.length > 1) throw new Error(`Unknown command: ${positionals.join(" ")}\n\n${help}`);
-	const result = syncStack(repository, github, {
+	const result = syncStack({
+		repository,
+		github,
+		stateStore: new FileStateStore(repository.statePath()),
+		reporter
+	}, {
 		base: values.base,
 		remote: values.remote,
 		draft: values.draft,
-		dryRun: values["dry-run"],
-		reporter
+		dryRun: values["dry-run"]
 	});
 	console.log(`${values["dry-run"] ? "Would sync" : "Synced"} ${result.changes.length} change${result.changes.length === 1 ? "" : "s"} against ${result.base}:`);
 	for (const change of result.changes) {

package/package.json

@@ -1,29 +1,25 @@
 {
   "name": "bstack",
-  "version": "1.0.3",
-  "packageManager": "pnpm@11.5.1",
+  "version": "1.1.0",
   "description": "Create native GitHub stacked pull requests from a linear series of commits",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/wsehl/bstack.git"
   },
-  "files": [
-    "dist/bstack.js"
-  ],
   "bin": {
     "bstack": "./dist/bstack.js"
   },
-  "engines": {
-    "node": ">=20"
-  },
+  "files": [
+    "dist/bstack.js"
+  ],
+  "type": "module",
   "publishConfig": {
     "access": "public"
   },
-  "type": "module",
   "scripts": {
     "build": "tsdown",
     "format": "oxfmt --write .",
-    "format:check": "oxfmt --check .",
+    "format-check": "oxfmt --check .",
     "lint": "oxlint .",
     "prepack": "pnpm run build",
     "prepublishOnly": "pnpm run type-check && pnpm test",
@@ -31,6 +27,9 @@
     "test": "vitest run",
     "type-check": "tsc --noEmit"
   },
+  "dependencies": {
+    "valibot": "^1.4.2"
+  },
   "devDependencies": {
     "@types/node": "^26.0.0",
     "oxfmt": "^0.64.0",
@@ -39,7 +38,8 @@
     "typescript": "^7.0.2",
     "vitest": "^4.0.0"
   },
-  "dependencies": {
-    "zod": "^4.4.3"
-  }
+  "engines": {
+    "node": ">=20"
+  },
+  "packageManager": "pnpm@11.5.1"
 }