dubstack 0.1.3 → 0.3.0

package/dist/commands/restack.js

@@ -1,190 +0,0 @@
-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

@@ -1 +0,0 @@
-{"version":3,"file":"restack.js","sourceRoot":"","sources":["../../src/commands/restack.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EACN,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,gBAAgB,EAChB,YAAY,EACZ,cAAc,IAAI,iBAAiB,EACnC,kBAAkB,EAClB,UAAU,GACV,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAoBnD;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,GAAW;IACxC,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,CAAC;IAEnC,IAAI,CAAC,CAAC,MAAM,kBAAkB,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QACtC,MAAM,IAAI,QAAQ,CACjB,+EAA+E,CAC/E,CAAC;IACH,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACnD,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAEnE,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,QAAQ,CACjB,WAAW,cAAc,qDAAqD,CAC9E,CAAC;IACH,CAAC;IAED,MAAM,WAAW,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC5D,KAAK,MAAM,MAAM,IAAI,WAAW,EAAE,CAAC;QAClC,IAAI,CAAC,CAAC,MAAM,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;YAC7C,MAAM,IAAI,QAAQ,CACjB,WAAW,MAAM,CAAC,IAAI,sDAAsD;gBAC3E,8DAA8D,CAC/D,CAAC;QACH,CAAC;IACF,CAAC;IAED,6DAA6D;IAC7D,MAAM,UAAU,GAA2B,EAAE,CAAC;IAC9C,KAAK,MAAM,MAAM,IAAI,WAAW,EAAE,CAAC;QAClC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAChE,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,iBAAiB,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;IAEzD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IAC9C,CAAC;IAED,MAAM,aAAa,CAClB;QACC,SAAS,EAAE,SAAS;QACpB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACnC,cAAc,EAAE,cAAc;QAC9B,aAAa,EAAE,eAAe,CAAC,KAAK,CAAC;QACrC,UAAU;QACV,eAAe,EAAE,EAAE;KACnB,EACD,GAAG,CACH,CAAC;IAEF,MAAM,QAAQ,GAAoB,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC;IAC5D,MAAM,aAAa,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAEnC,OAAO,mBAAmB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;AAC3C,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,GAAW;IAChD,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,GAAG,CAAC,CAAC;IAEzC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACf,MAAM,IAAI,QAAQ,CAAC,qDAAqD,CAAC,CAAC;IAC3E,CAAC;IAED,MAAM,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAE7B,MAAM,cAAc,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,YAAY,CAAC,CAAC;IAC7E,IAAI,cAAc,EAAE,CAAC;QACpB,cAAc,CAAC,MAAM,GAAG,MAAM,CAAC;IAChC,CAAC;IAED,OAAO,mBAAmB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;AAC3C,CAAC;AAED,KAAK,UAAU,mBAAmB,CACjC,QAAyB,EACzB,GAAW;IAEX,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;QACnC,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC/B,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM;gBAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACtD,SAAS;QACV,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC1D,IAAI,YAAY,KAAK,IAAI,CAAC,YAAY,EAAE,CAAC;YACxC,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;YACxB,MAAM,aAAa,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;YACnC,SAAS;QACV,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,UAAU,CAAC,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YACpE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC1B,MAAM,aAAa,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QACpC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,KAAK,YAAY,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;gBACrE,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC;gBAC3B,MAAM,aAAa,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;gBACnC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,cAAc,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC;YACrE,CAAC;YACD,MAAM,KAAK,CAAC;QACb,CAAC;IACF,CAAC;IAED,MAAM,aAAa,CAAC,GAAG,CAAC,CAAC;IACzB,MAAM,cAAc,CAAC,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;IAEnD,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,CACtC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,KAAK,MAAM,CACpD,CAAC;IACF,OAAO;QACN,MAAM,EAAE,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS;QACrE,OAAO;KACP,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,MAAe,EAAE,aAAqB;IAC9D,iEAAiE;IACjE,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CACtC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,aAAa,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CACrE,CAAC;IACF,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,UAAU,CAAC;IAE7C,0DAA0D;IAC1D,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC/B,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,aAAa,CAAC,CAChD,CAAC;IACF,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC7B,CAAC;AAED,KAAK,UAAU,iBAAiB,CAC/B,MAAe,EACf,GAAW;IAEX,MAAM,KAAK,GAAkB,EAAE,CAAC;IAEhC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC5B,MAAM,OAAO,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACxC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC9B,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM;gBAAE,SAAS;YACvD,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YACtE,KAAK,CAAC,IAAI,CAAC;gBACV,MAAM,EAAE,MAAM,CAAC,IAAI;gBACnB,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,YAAY,EAAE,SAAS;gBACvB,MAAM,EAAE,SAAS;aACjB,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAED,OAAO,KAAK,CAAC;AACd,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAY;IACrC,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;IAC3D,IAAI,CAAC,IAAI;QAAE,OAAO,MAAM,CAAC;IAEzB,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAoB,CAAC;IAC7C,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QACrC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACnD,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACtB,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACvC,CAAC;IACF,CAAC;IAED,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC;IACrB,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;QAC9B,IAAI,CAAC,OAAO;YAAE,MAAM;QACpB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrB,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAClD,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;IACzB,CAAC;IAED,OAAO,MAAM,CAAC;AACf,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,GAAW;IACzC,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,CAAC;IACpC,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;AACnD,CAAC;AAED,KAAK,UAAU,aAAa,CAC3B,QAAyB,EACzB,GAAW;IAEX,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,GAAG,CAAC,CAAC;IAChD,EAAE,CAAC,aAAa,CAAC,YAAY,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;AAC1E,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,GAAW;IACtC,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,GAAG,CAAC,CAAC;IAChD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC;QAAE,OAAO,IAAI,CAAC;IAC9C,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IACnD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAoB,CAAC;AAC3C,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,GAAW;IACvC,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,GAAG,CAAC,CAAC;IAChD,IAAI,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACjC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IAC7B,CAAC;AACF,CAAC"}

package/dist/commands/undo.d.ts

@@ -1,21 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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

@@ -1,63 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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

@@ -1,20 +0,0 @@
-#!/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

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

package/dist/lib/errors.d.ts

@@ -1,15 +0,0 @@
-/**
- * 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

@@ -1 +0,0 @@
-{"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

@@ -1,18 +0,0 @@
-/**
- * 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

@@ -1 +0,0 @@
-{"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

@@ -1,69 +0,0 @@
-/**
- * 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

@@ -1 +0,0 @@
-{"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"}

package/dist/lib/git.js

@@ -1,184 +0,0 @@
-import { execa } from "execa";
-import { DubError } from "./errors.js";
-/**
- * Checks whether the given directory is inside a git repository.
- * @returns `true` if inside a git worktree, `false` otherwise. Never throws.
- */
-export async function isGitRepo(cwd) {
-    try {
-        const { stdout } = await execa("git", ["rev-parse", "--is-inside-work-tree"], { cwd });
-        return stdout.trim() === "true";
-    }
-    catch {
-        return false;
-    }
-}
-/**
- * Returns the absolute path to the repository root.
- * @throws {DubError} If not inside a git repository.
- */
-export async function getRepoRoot(cwd) {
-    try {
-        const { stdout } = await execa("git", ["rev-parse", "--show-toplevel"], {
-            cwd,
-        });
-        return stdout.trim();
-    }
-    catch {
-        throw new DubError("Not a git repository. Run this command inside a git repo.");
-    }
-}
-/**
- * Returns the name of the currently checked-out branch.
- * @throws {DubError} If HEAD is detached or the repo has no commits.
- */
-export async function getCurrentBranch(cwd) {
-    try {
-        const { stdout } = await execa("git", ["rev-parse", "--abbrev-ref", "HEAD"], { cwd });
-        const branch = stdout.trim();
-        if (branch === "HEAD") {
-            throw new DubError("HEAD is detached. Checkout a branch before running this command.");
-        }
-        return branch;
-    }
-    catch (error) {
-        if (error instanceof DubError)
-            throw error;
-        throw new DubError("Repository has no commits. Make at least one commit first.");
-    }
-}
-/**
- * Checks whether a branch with the given name exists locally.
- * @returns `true` if the branch exists, `false` otherwise. Never throws.
- */
-export async function branchExists(name, cwd) {
-    try {
-        await execa("git", ["rev-parse", "--verify", `refs/heads/${name}`], {
-            cwd,
-        });
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-/**
- * Creates a new branch and switches to it.
- * @throws {DubError} If a branch with that name already exists.
- */
-export async function createBranch(name, cwd) {
-    if (await branchExists(name, cwd)) {
-        throw new DubError(`Branch '${name}' already exists.`);
-    }
-    await execa("git", ["checkout", "-b", name], { cwd });
-}
-/**
- * Switches to an existing branch.
- * @throws {DubError} If the branch does not exist.
- */
-export async function checkoutBranch(name, cwd) {
-    try {
-        await execa("git", ["checkout", name], { cwd });
-    }
-    catch {
-        throw new DubError(`Branch '${name}' not found.`);
-    }
-}
-/**
- * Deletes a local branch forcefully. Used by undo to remove created branches.
- * @throws {DubError} If the branch does not exist.
- */
-export async function deleteBranch(name, cwd) {
-    try {
-        await execa("git", ["branch", "-D", name], { cwd });
-    }
-    catch {
-        throw new DubError(`Failed to delete branch '${name}'. It may not exist.`);
-    }
-}
-/**
- * Force-moves a branch pointer to a specific commit SHA.
- * Used by undo to reset branches to their pre-operation tips.
- */
-export async function forceBranchTo(name, sha, cwd) {
-    try {
-        const current = await getCurrentBranch(cwd).catch(() => null);
-        if (current === name) {
-            await execa("git", ["reset", "--hard", sha], { cwd });
-        }
-        else {
-            await execa("git", ["branch", "-f", name, sha], { cwd });
-        }
-    }
-    catch (error) {
-        if (error instanceof DubError)
-            throw error;
-        throw new DubError(`Failed to reset branch '${name}' to ${sha}.`);
-    }
-}
-/**
- * Checks whether the working tree is clean (no uncommitted changes).
- * @returns `true` if clean (no output from `git status --porcelain`).
- */
-export async function isWorkingTreeClean(cwd) {
-    const { stdout } = await execa("git", ["status", "--porcelain"], { cwd });
-    return stdout.trim() === "";
-}
-/**
- * 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 async function rebaseOnto(newBase, oldBase, branch, cwd) {
-    try {
-        await execa("git", ["rebase", "--onto", newBase, oldBase, branch], { cwd });
-    }
-    catch {
-        throw new DubError(`Conflict while restacking '${branch}'.\n` +
-            "  Resolve conflicts, stage changes, then run: dub restack --continue");
-    }
-}
-/**
- * Continues an in-progress rebase after conflicts have been resolved.
- * @throws {DubError} If the rebase continue fails.
- */
-export async function rebaseContinue(cwd) {
-    try {
-        await execa("git", ["rebase", "--continue"], {
-            cwd,
-            env: { GIT_EDITOR: "true" },
-        });
-    }
-    catch {
-        throw new DubError("Failed to continue rebase. Ensure all conflicts are resolved and staged.");
-    }
-}
-/**
- * Returns the merge-base (common ancestor) commit SHA of two branches.
- */
-export async function getMergeBase(a, b, cwd) {
-    try {
-        const { stdout } = await execa("git", ["merge-base", a, b], { cwd });
-        return stdout.trim();
-    }
-    catch {
-        throw new DubError(`Could not find common ancestor between '${a}' and '${b}'.`);
-    }
-}
-/**
- * Returns the commit SHA at the tip of a branch.
- * @throws {DubError} If the branch does not exist.
- */
-export async function getBranchTip(name, cwd) {
-    try {
-        const { stdout } = await execa("git", ["rev-parse", name], { cwd });
-        return stdout.trim();
-    }
-    catch {
-        throw new DubError(`Branch '${name}' not found.`);
-    }
-}
-//# sourceMappingURL=git.js.map

package/dist/lib/git.js.map

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