dubstack 0.1.3

package/dist/commands/restack.js

@@ -0,0 +1,190 @@
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { DubError } from "../lib/errors.js";
+import { branchExists, checkoutBranch, getBranchTip, getCurrentBranch, getMergeBase, rebaseContinue as gitRebaseContinue, isWorkingTreeClean, rebaseOnto, } from "../lib/git.js";
+import { getDubDir, readState } from "../lib/state.js";
+import { saveUndoEntry } from "../lib/undo-log.js";
+/**
+ * Rebases all branches in the current stack onto their updated parents.
+ *
+ * Uses a snapshot-before-rebase strategy: captures every branch's tip
+ * BEFORE starting any rebases, then uses `git rebase --onto <parent_new_tip>
+ * <parent_old_tip> <child>`. This prevents the duplication bug where a child
+ * replays its parent's already-rebased commits.
+ *
+ * On conflict, writes progress to `restack-progress.json` so
+ * `dub restack --continue` can resume.
+ *
+ * @param cwd - Working directory
+ * @returns Result with status, list of rebased branches, and optional conflict branch
+ * @throws {DubError} If not initialized, dirty tree, not in a stack, or branch missing
+ */
+export async function restack(cwd) {
+    const state = await readState(cwd);
+    if (!(await isWorkingTreeClean(cwd))) {
+        throw new DubError("Working tree has uncommitted changes. Commit or stash them before restacking.");
+    }
+    const originalBranch = await getCurrentBranch(cwd);
+    const targetStacks = getTargetStacks(state.stacks, originalBranch);
+    if (targetStacks.length === 0) {
+        throw new DubError(`Branch '${originalBranch}' is not part of any stack. Run 'dub create' first.`);
+    }
+    const allBranches = targetStacks.flatMap((s) => s.branches);
+    for (const branch of allBranches) {
+        if (!(await branchExists(branch.name, cwd))) {
+            throw new DubError(`Branch '${branch.name}' is tracked in state but no longer exists in git.\n` +
+                "  Remove it from the stack or recreate it before restacking.");
+        }
+    }
+    // Snapshot all branch tips BEFORE building steps or rebasing
+    const branchTips = {};
+    for (const branch of allBranches) {
+        branchTips[branch.name] = await getBranchTip(branch.name, cwd);
+    }
+    const steps = await buildRestackSteps(targetStacks, cwd);
+    if (steps.length === 0) {
+        return { status: "up-to-date", rebased: [] };
+    }
+    await saveUndoEntry({
+        operation: "restack",
+        timestamp: new Date().toISOString(),
+        previousBranch: originalBranch,
+        previousState: structuredClone(state),
+        branchTips,
+        createdBranches: [],
+    }, cwd);
+    const progress = { originalBranch, steps };
+    await writeProgress(progress, cwd);
+    return executeRestackSteps(progress, cwd);
+}
+/**
+ * Continues a restack after conflict resolution.
+ *
+ * Reads the saved progress file, finishes the in-progress rebase,
+ * then resumes with remaining branches.
+ *
+ * @param cwd - Working directory
+ * @throws {DubError} If no restack is in progress
+ */
+export async function restackContinue(cwd) {
+    const progress = await readProgress(cwd);
+    if (!progress) {
+        throw new DubError("No restack in progress. Run 'dub restack' to start.");
+    }
+    await gitRebaseContinue(cwd);
+    const conflictedStep = progress.steps.find((s) => s.status === "conflicted");
+    if (conflictedStep) {
+        conflictedStep.status = "done";
+    }
+    return executeRestackSteps(progress, cwd);
+}
+async function executeRestackSteps(progress, cwd) {
+    const rebased = [];
+    for (const step of progress.steps) {
+        if (step.status !== "pending") {
+            if (step.status === "done")
+                rebased.push(step.branch);
+            continue;
+        }
+        const parentNewTip = await getBranchTip(step.parent, cwd);
+        if (parentNewTip === step.parentOldTip) {
+            step.status = "skipped";
+            await writeProgress(progress, cwd);
+            continue;
+        }
+        try {
+            await rebaseOnto(parentNewTip, step.parentOldTip, step.branch, cwd);
+            step.status = "done";
+            rebased.push(step.branch);
+            await writeProgress(progress, cwd);
+        }
+        catch (error) {
+            if (error instanceof DubError && error.message.includes("Conflict")) {
+                step.status = "conflicted";
+                await writeProgress(progress, cwd);
+                return { status: "conflict", rebased, conflictBranch: step.branch };
+            }
+            throw error;
+        }
+    }
+    await clearProgress(cwd);
+    await checkoutBranch(progress.originalBranch, cwd);
+    const allSkipped = progress.steps.every((s) => s.status === "skipped" || s.status === "done");
+    return {
+        status: rebased.length === 0 && allSkipped ? "up-to-date" : "success",
+        rebased,
+    };
+}
+function getTargetStacks(stacks, currentBranch) {
+    // If current branch is a root of any stacks, restack all of them
+    const rootStacks = stacks.filter((s) => s.branches.some((b) => b.name === currentBranch && b.type === "root"));
+    if (rootStacks.length > 0)
+        return rootStacks;
+    // Otherwise, find the stack containing the current branch
+    const stack = stacks.find((s) => s.branches.some((b) => b.name === currentBranch));
+    return stack ? [stack] : [];
+}
+async function buildRestackSteps(stacks, cwd) {
+    const steps = [];
+    for (const stack of stacks) {
+        const ordered = topologicalOrder(stack);
+        for (const branch of ordered) {
+            if (branch.type === "root" || !branch.parent)
+                continue;
+            const mergeBase = await getMergeBase(branch.parent, branch.name, cwd);
+            steps.push({
+                branch: branch.name,
+                parent: branch.parent,
+                parentOldTip: mergeBase,
+                status: "pending",
+            });
+        }
+    }
+    return steps;
+}
+function topologicalOrder(stack) {
+    const result = [];
+    const root = stack.branches.find((b) => b.type === "root");
+    if (!root)
+        return result;
+    const childMap = new Map();
+    for (const branch of stack.branches) {
+        if (branch.parent) {
+            const children = childMap.get(branch.parent) ?? [];
+            children.push(branch);
+            childMap.set(branch.parent, children);
+        }
+    }
+    const queue = [root];
+    while (queue.length > 0) {
+        const current = queue.shift();
+        if (!current)
+            break;
+        result.push(current);
+        const children = childMap.get(current.name) ?? [];
+        queue.push(...children);
+    }
+    return result;
+}
+async function getProgressPath(cwd) {
+    const dubDir = await getDubDir(cwd);
+    return path.join(dubDir, "restack-progress.json");
+}
+async function writeProgress(progress, cwd) {
+    const progressPath = await getProgressPath(cwd);
+    fs.writeFileSync(progressPath, `${JSON.stringify(progress, null, 2)}\n`);
+}
+async function readProgress(cwd) {
+    const progressPath = await getProgressPath(cwd);
+    if (!fs.existsSync(progressPath))
+        return null;
+    const raw = fs.readFileSync(progressPath, "utf-8");
+    return JSON.parse(raw);
+}
+async function clearProgress(cwd) {
+    const progressPath = await getProgressPath(cwd);
+    if (fs.existsSync(progressPath)) {
+        fs.unlinkSync(progressPath);
+    }
+}
+//# sourceMappingURL=restack.js.map

package/dist/commands/restack.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"restack.js","sourceRoot":"","sources":["../../src/commands/restack.ts"],"names":[],"mappings":"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"}

package/dist/commands/undo.d.ts

@@ -0,0 +1,21 @@
+interface UndoResult {
+    undone: "create" | "restack";
+    details: string;
+}
+/**
+ * Undoes the last `dub create` or `dub restack` operation.
+ *
+ * Reversal strategy:
+ * - **create**: Deletes the created branch, restores state, checks out the previous branch.
+ * - **restack**: Resets every rebased branch to its pre-rebase tip via `git branch -f`,
+ *   restores state, checks out the previous branch.
+ *
+ * Only one level of undo is supported. After undo, the undo entry is cleared.
+ *
+ * @param cwd - Working directory
+ * @returns What was undone and a human-readable summary
+ * @throws {DubError} If nothing to undo or working tree is dirty
+ */
+export declare function undo(cwd: string): Promise<UndoResult>;
+export {};
+//# sourceMappingURL=undo.d.ts.map

package/dist/commands/undo.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"undo.d.ts","sourceRoot":"","sources":["../../src/commands/undo.ts"],"names":[],"mappings":"AAWA,UAAU,UAAU;IACnB,MAAM,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CA4D3D"}

package/dist/commands/undo.js

@@ -0,0 +1,63 @@
+import { DubError } from "../lib/errors.js";
+import { checkoutBranch, deleteBranch, forceBranchTo, getCurrentBranch, isWorkingTreeClean, } from "../lib/git.js";
+import { writeState } from "../lib/state.js";
+import { clearUndoEntry, readUndoEntry } from "../lib/undo-log.js";
+/**
+ * Undoes the last `dub create` or `dub restack` operation.
+ *
+ * Reversal strategy:
+ * - **create**: Deletes the created branch, restores state, checks out the previous branch.
+ * - **restack**: Resets every rebased branch to its pre-rebase tip via `git branch -f`,
+ *   restores state, checks out the previous branch.
+ *
+ * Only one level of undo is supported. After undo, the undo entry is cleared.
+ *
+ * @param cwd - Working directory
+ * @returns What was undone and a human-readable summary
+ * @throws {DubError} If nothing to undo or working tree is dirty
+ */
+export async function undo(cwd) {
+    const entry = await readUndoEntry(cwd);
+    if (!(await isWorkingTreeClean(cwd))) {
+        throw new DubError("Working tree has uncommitted changes. Commit or stash them before undoing.");
+    }
+    const currentBranch = await getCurrentBranch(cwd);
+    if (entry.operation === "create") {
+        // If we're on a branch that's about to be deleted, switch away first
+        const needsCheckout = entry.createdBranches.includes(currentBranch);
+        if (needsCheckout) {
+            await checkoutBranch(entry.previousBranch, cwd);
+        }
+        for (const branch of entry.createdBranches) {
+            await deleteBranch(branch, cwd);
+        }
+        if (!needsCheckout && currentBranch !== entry.previousBranch) {
+            await checkoutBranch(entry.previousBranch, cwd);
+        }
+        await writeState(entry.previousState, cwd);
+        await clearUndoEntry(cwd);
+        return {
+            undone: "create",
+            details: `Deleted branch${entry.createdBranches.length > 1 ? "es" : ""} '${entry.createdBranches.join("', '")}'`,
+        };
+    }
+    // restack undo: reset all branches to their pre-rebase tips
+    // First checkout a safe branch so we don't conflict with force-moves
+    await checkoutBranch(entry.previousBranch, cwd);
+    for (const [name, sha] of Object.entries(entry.branchTips)) {
+        if (name === entry.previousBranch)
+            continue; // skip the branch we're on
+        await forceBranchTo(name, sha, cwd);
+    }
+    // Now force the branch we're on (if it was tracked)
+    if (entry.branchTips[entry.previousBranch]) {
+        await forceBranchTo(entry.previousBranch, entry.branchTips[entry.previousBranch], cwd);
+    }
+    await writeState(entry.previousState, cwd);
+    await clearUndoEntry(cwd);
+    return {
+        undone: "restack",
+        details: `Reset ${Object.keys(entry.branchTips).length} branches to pre-restack state`,
+    };
+}
+//# sourceMappingURL=undo.js.map

package/dist/commands/undo.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"undo.js","sourceRoot":"","sources":["../../src/commands/undo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EACN,cAAc,EACd,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,kBAAkB,GAClB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAOnE;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,GAAW;IACrC,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,GAAG,CAAC,CAAC;IAEvC,IAAI,CAAC,CAAC,MAAM,kBAAkB,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QACtC,MAAM,IAAI,QAAQ,CACjB,4EAA4E,CAC5E,CAAC;IACH,CAAC;IAED,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAElD,IAAI,KAAK,CAAC,SAAS,KAAK,QAAQ,EAAE,CAAC;QAClC,qEAAqE;QACrE,MAAM,aAAa,GAAG,KAAK,CAAC,eAAe,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QACpE,IAAI,aAAa,EAAE,CAAC;YACnB,MAAM,cAAc,CAAC,KAAK,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;QACjD,CAAC;QAED,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;YAC5C,MAAM,YAAY,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,CAAC,aAAa,IAAI,aAAa,KAAK,KAAK,CAAC,cAAc,EAAE,CAAC;YAC9D,MAAM,cAAc,CAAC,KAAK,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;QACjD,CAAC;QAED,MAAM,UAAU,CAAC,KAAK,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;QAC3C,MAAM,cAAc,CAAC,GAAG,CAAC,CAAC;QAE1B,OAAO;YACN,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,iBAAiB,KAAK,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG;SAChH,CAAC;IACH,CAAC;IAED,4DAA4D;IAC5D,qEAAqE;IACrE,MAAM,cAAc,CAAC,KAAK,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;IAEhD,KAAK,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5D,IAAI,IAAI,KAAK,KAAK,CAAC,cAAc;YAAE,SAAS,CAAC,2BAA2B;QACxE,MAAM,aAAa,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACrC,CAAC;IAED,oDAAoD;IACpD,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;QAC5C,MAAM,aAAa,CAClB,KAAK,CAAC,cAAc,EACpB,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC,EACtC,GAAG,CACH,CAAC;IACH,CAAC;IAED,MAAM,UAAU,CAAC,KAAK,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;IAC3C,MAAM,cAAc,CAAC,GAAG,CAAC,CAAC;IAE1B,OAAO;QACN,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,SAAS,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,MAAM,gCAAgC;KACtF,CAAC;AACH,CAAC"}

package/dist/index.d.ts

@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+/**
+ * DubStack CLI — manage stacked diffs with ease.
+ *
+ * A local-first tool for managing chains of dependent git branches
+ * (stacked diffs) without manually dealing with complex rebase chains.
+ *
+ * @example
+ * ```bash
+ * dub init                    # Initialize in current repo
+ * dub create feat/my-branch   # Create stacked branch
+ * dub log                     # View stack tree
+ * dub restack                 # Rebase stack onto updated parent
+ * dub undo                    # Undo last dub operation
+ * ```
+ *
+ * @packageDocumentation
+ */
+export {};
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA;;;;;;;;;;;;;;;;GAgBG"}

package/dist/index.js

@@ -0,0 +1,125 @@
+#!/usr/bin/env node
+/**
+ * DubStack CLI — manage stacked diffs with ease.
+ *
+ * A local-first tool for managing chains of dependent git branches
+ * (stacked diffs) without manually dealing with complex rebase chains.
+ *
+ * @example
+ * ```bash
+ * dub init                    # Initialize in current repo
+ * dub create feat/my-branch   # Create stacked branch
+ * dub log                     # View stack tree
+ * dub restack                 # Rebase stack onto updated parent
+ * dub undo                    # Undo last dub operation
+ * ```
+ *
+ * @packageDocumentation
+ */
+import { createRequire } from "node:module";
+import chalk from "chalk";
+import { Command } from "commander";
+import { create } from "./commands/create.js";
+import { init } from "./commands/init.js";
+import { log } from "./commands/log.js";
+import { restack, restackContinue } from "./commands/restack.js";
+import { undo } from "./commands/undo.js";
+import { DubError } from "./lib/errors.js";
+const require = createRequire(import.meta.url);
+const { version } = require("../package.json");
+const program = new Command();
+program
+    .name("dub")
+    .description("Manage stacked diffs (dependent git branches) with ease")
+    .version(version);
+program
+    .command("init")
+    .description("Initialize DubStack in the current git repository")
+    .addHelpText("after", `
+Examples:
+  $ dub init    Initialize DubStack, creating .git/dubstack/ and updating .gitignore`)
+    .action(async () => {
+    const result = await init(process.cwd());
+    if (result.status === "created") {
+        console.log(chalk.green("✔ DubStack initialized"));
+    }
+    else {
+        console.log(chalk.yellow("⚠ DubStack already initialized"));
+    }
+});
+program
+    .command("create")
+    .argument("<branch-name>", "Name of the new branch to create")
+    .description("Create a new branch stacked on top of the current branch")
+    .addHelpText("after", `
+Examples:
+  $ dub create feat/api-endpoint      Create a branch on top of current branch
+  $ dub create feat/ui-component      Stack another branch on top`)
+    .action(async (branchName) => {
+    const result = await create(branchName, process.cwd());
+    console.log(chalk.green(`✔ Created branch '${result.branch}' on top of '${result.parent}'`));
+});
+program
+    .command("log")
+    .description("Display an ASCII tree of the current stack")
+    .addHelpText("after", `
+Examples:
+  $ dub log    Show the branch tree with current branch highlighted`)
+    .action(async () => {
+    const output = await log(process.cwd());
+    // Apply chalk styling to the output
+    const styled = output
+        .replace(/\*(.+?) \(Current\)\*/g, chalk.bold.cyan("$1 (Current)"))
+        .replace(/⚠ \(missing\)/g, chalk.yellow("⚠ (missing)"));
+    console.log(styled);
+});
+program
+    .command("restack")
+    .description("Rebase all branches in the stack onto their updated parents")
+    .option("--continue", "Continue restacking after resolving conflicts")
+    .addHelpText("after", `
+Examples:
+  $ dub restack              Rebase the current stack
+  $ dub restack --continue   Continue after resolving conflicts`)
+    .action(async (options) => {
+    const result = options.continue
+        ? await restackContinue(process.cwd())
+        : await restack(process.cwd());
+    if (result.status === "up-to-date") {
+        console.log(chalk.green("✔ Stack is already up to date"));
+    }
+    else if (result.status === "conflict") {
+        console.log(chalk.yellow(`⚠ Conflict while restacking '${result.conflictBranch}'`));
+        console.log(chalk.dim("  Resolve conflicts, stage changes, then run: dub restack --continue"));
+    }
+    else {
+        console.log(chalk.green(`✔ Restacked ${result.rebased.length} branch(es)`));
+        for (const branch of result.rebased) {
+            console.log(chalk.dim(`  ↳ ${branch}`));
+        }
+    }
+});
+program
+    .command("undo")
+    .description("Undo the last dub create or dub restack operation")
+    .addHelpText("after", `
+Examples:
+  $ dub undo    Roll back the last dub operation`)
+    .action(async () => {
+    const result = await undo(process.cwd());
+    console.log(chalk.green(`✔ Undid '${result.undone}': ${result.details}`));
+});
+async function main() {
+    try {
+        await program.parseAsync(process.argv);
+    }
+    catch (error) {
+        if (error instanceof DubError) {
+            console.error(chalk.red(`✖ ${error.message}`));
+            process.exit(1);
+        }
+        throw error;
+    }
+}
+main();
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/lib/errors.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Base error class for all user-facing DubStack errors.
+ *
+ * The CLI entry point catches instances of this class and prints
+ * a clean, colored error message. Unknown errors get a full stack trace.
+ *
+ * @example
+ * ```ts
+ * throw new DubError("Branch 'feat/x' already exists")
+ * ```
+ */
+export declare class DubError extends Error {
+    constructor(message: string);
+}
+//# sourceMappingURL=errors.d.ts.map

package/dist/lib/errors.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/lib/errors.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,qBAAa,QAAS,SAAQ,KAAK;gBACtB,OAAO,EAAE,MAAM;CAI3B"}

package/dist/lib/errors.js

@@ -0,0 +1,18 @@
+/**
+ * Base error class for all user-facing DubStack errors.
+ *
+ * The CLI entry point catches instances of this class and prints
+ * a clean, colored error message. Unknown errors get a full stack trace.
+ *
+ * @example
+ * ```ts
+ * throw new DubError("Branch 'feat/x' already exists")
+ * ```
+ */
+export class DubError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = "DubError";
+    }
+}
+//# sourceMappingURL=errors.js.map

package/dist/lib/errors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/lib/errors.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,MAAM,OAAO,QAAS,SAAQ,KAAK;IAClC,YAAY,OAAe;QAC1B,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;IACxB,CAAC;CACD"}

package/dist/lib/git.d.ts

@@ -0,0 +1,69 @@
+/**
+ * Checks whether the given directory is inside a git repository.
+ * @returns `true` if inside a git worktree, `false` otherwise. Never throws.
+ */
+export declare function isGitRepo(cwd: string): Promise<boolean>;
+/**
+ * Returns the absolute path to the repository root.
+ * @throws {DubError} If not inside a git repository.
+ */
+export declare function getRepoRoot(cwd: string): Promise<string>;
+/**
+ * Returns the name of the currently checked-out branch.
+ * @throws {DubError} If HEAD is detached or the repo has no commits.
+ */
+export declare function getCurrentBranch(cwd: string): Promise<string>;
+/**
+ * Checks whether a branch with the given name exists locally.
+ * @returns `true` if the branch exists, `false` otherwise. Never throws.
+ */
+export declare function branchExists(name: string, cwd: string): Promise<boolean>;
+/**
+ * Creates a new branch and switches to it.
+ * @throws {DubError} If a branch with that name already exists.
+ */
+export declare function createBranch(name: string, cwd: string): Promise<void>;
+/**
+ * Switches to an existing branch.
+ * @throws {DubError} If the branch does not exist.
+ */
+export declare function checkoutBranch(name: string, cwd: string): Promise<void>;
+/**
+ * Deletes a local branch forcefully. Used by undo to remove created branches.
+ * @throws {DubError} If the branch does not exist.
+ */
+export declare function deleteBranch(name: string, cwd: string): Promise<void>;
+/**
+ * Force-moves a branch pointer to a specific commit SHA.
+ * Used by undo to reset branches to their pre-operation tips.
+ */
+export declare function forceBranchTo(name: string, sha: string, cwd: string): Promise<void>;
+/**
+ * Checks whether the working tree is clean (no uncommitted changes).
+ * @returns `true` if clean (no output from `git status --porcelain`).
+ */
+export declare function isWorkingTreeClean(cwd: string): Promise<boolean>;
+/**
+ * Performs `git rebase --onto` to move a branch from one base to another.
+ *
+ * @param newBase - The commit/branch to rebase onto
+ * @param oldBase - The old base commit to replay from
+ * @param branch - The branch being rebased
+ * @throws {DubError} If a merge conflict occurs during rebase
+ */
+export declare function rebaseOnto(newBase: string, oldBase: string, branch: string, cwd: string): Promise<void>;
+/**
+ * Continues an in-progress rebase after conflicts have been resolved.
+ * @throws {DubError} If the rebase continue fails.
+ */
+export declare function rebaseContinue(cwd: string): Promise<void>;
+/**
+ * Returns the merge-base (common ancestor) commit SHA of two branches.
+ */
+export declare function getMergeBase(a: string, b: string, cwd: string): Promise<string>;
+/**
+ * Returns the commit SHA at the tip of a branch.
+ * @throws {DubError} If the branch does not exist.
+ */
+export declare function getBranchTip(name: string, cwd: string): Promise<string>;
+//# sourceMappingURL=git.d.ts.map

package/dist/lib/git.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/lib/git.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAW7D;AAED;;;GAGG;AACH,wBAAsB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAW9D;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAoBnE;AAED;;;GAGG;AACH,wBAAsB,YAAY,CACjC,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,GACT,OAAO,CAAC,OAAO,CAAC,CASlB;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAK3E;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAM7E;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAM3E;AAED;;;GAGG;AACH,wBAAsB,aAAa,CAClC,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,GACT,OAAO,CAAC,IAAI,CAAC,CAYf;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAGtE;AAED;;;;;;;GAOG;AACH,wBAAsB,UAAU,CAC/B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,GACT,OAAO,CAAC,IAAI,CAAC,CASf;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAW/D;AAED;;GAEG;AACH,wBAAsB,YAAY,CACjC,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,GAAG,EAAE,MAAM,GACT,OAAO,CAAC,MAAM,CAAC,CASjB;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAO7E"}