dubstack 0.1.3

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 wiseiodev
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -0,0 +1,276 @@
+# DubStack
+
+A local-first CLI for managing **stacked diffs** — chains of dependent git branches that build on each other. Stop juggling complex rebase chains by hand.
+
+## Why Stacked Diffs?
+
+Stacked diffs let you break large features into small, reviewable PRs that depend on each other. Instead of one 2,000-line monster PR, you get a clean chain:
+
+```
+(main)
+  └─ feat/api-models
+       └─ feat/api-endpoint
+            └─ feat/ui-component
+```
+
+When `main` updates or you amend an earlier branch, `dub restack` cascades rebases through the entire chain for you.
+
+## Install
+
+> Requires **Node ≥ 22** and **pnpm**.
+
+```bash
+# Clone and install
+git clone <repo-url> && cd dubstack
+pnpm install
+
+# Link globally so `dub` is available everywhere
+pnpm build
+pnpm link --global
+```
+
+## Quick Start
+
+```bash
+# 1. Initialize in any git repo
+cd my-project
+dub init
+
+# 2. Start stacking branches
+git checkout main
+dub create feat/api-models
+# hack hack hack, commit...
+
+dub create feat/api-endpoint
+# hack hack hack, commit...
+
+dub create feat/ui-component
+# hack hack hack, commit...
+
+# 3. See your stack
+dub log
+
+# 4. Rebase the whole chain after main updates
+git checkout main && git pull
+dub restack
+
+# 5. Made a mistake? Undo it
+dub undo
+```
+
+## Commands
+
+### `dub init`
+
+Initializes DubStack in the current git repository.
+
+```bash
+dub init
+```
+
+- Creates `.git/dubstack/state.json` with an empty state
+- Adds `.git/dubstack` to `.gitignore`
+- **Idempotent** — safe to run multiple times
+
+```
+✔ DubStack initialized            # first run
+⚠ DubStack already initialized    # subsequent runs
+```
+
+---
+
+### `dub create <branch-name>`
+
+Creates a new branch stacked on top of the current branch.
+
+```bash
+# On main
+dub create feat/api-models
+
+# On feat/api-models
+dub create feat/api-endpoint
+```
+
+- Checks out the new branch at the current HEAD
+- Records the parent → child relationship in state
+- Auto-creates a new stack if the parent isn't already tracked
+- Saves an undo snapshot before any mutation
+
+**Errors:**
+| Condition | Message |
+|---|---|
+| Not initialized | `DubStack is not initialized. Run 'dub init' first.` |
+| Branch already exists | `Branch '<name>' already exists.` |
+| Detached HEAD | `HEAD is detached. Check out a branch first.` |
+
+---
+
+### `dub log`
+
+Displays an ASCII tree of all tracked stacks.
+
+```bash
+dub log
+```
+
+Example output:
+
+```
+(main)
+  ├─ feat/api-models
+  │    └─ feat/api-endpoint (Current)
+  └─ feat/auth
+       └─ feat/auth-ui ⚠ (missing)
+```
+
+- **Current branch** is highlighted and marked `(Current)`
+- **Root branches** are shown in parentheses, e.g. `(main)`
+- **Deleted branches** still tracked in state show `⚠ (missing)`
+- Multiple stacks are separated by blank lines
+
+---
+
+### `dub restack`
+
+Rebases all branches in the current stack onto their updated parents.
+
+```bash
+dub restack
+```
+
+**How it works:**
+
+1. Snapshots every branch tip _before_ starting
+2. Walks the tree in topological order (parents first)
+3. For each child branch, runs `git rebase --onto <parent_new_tip> <parent_old_tip> <child>`
+4. Skips branches whose parent hasn't moved
+5. Returns you to the branch you started on
+
+**Conflict handling:**
+
+If a rebase hits a conflict, DubStack pauses and tells you:
+
+```
+⚠ Conflict while restacking 'feat/api-endpoint'
+  Resolve conflicts, stage changes, then run: dub restack --continue
+```
+
+After resolving:
+
+```bash
+# Fix the conflicting files
+git add .
+dub restack --continue
+```
+
+Progress is saved to `.git/dubstack/restack-progress.json`, so the resume picks up exactly where it left off.
+
+**Output examples:**
+
+```
+✔ Stack is already up to date
+
+✔ Restacked 2 branch(es)
+  ↳ feat/api-models
+  ↳ feat/api-endpoint
+```
+
+**Errors:**
+| Condition | Message |
+|---|---|
+| Uncommitted changes | `Working tree has uncommitted changes. Commit or stash them before restacking.` |
+| Branch not in a stack | `Branch '<name>' is not part of any stack.` |
+| Tracked branch deleted | `Branch '<name>' is tracked in state but no longer exists in git.` |
+
+---
+
+### `dub undo`
+
+Rolls back the last `dub create` or `dub restack` operation.
+
+```bash
+dub undo
+```
+
+**Undo strategies:**
+
+- **After `create`:** Deletes the created branch, restores state, checks out the previous branch
+- **After `restack`:** Force-resets every rebased branch to its pre-rebase commit, restores state
+
+Only **one level** of undo is supported. After undo, the undo entry is cleared.
+
+```
+✔ Undid 'create': Deleted branch 'feat/api-endpoint'
+✔ Undid 'restack': Reset 3 branches to pre-restack state
+```
+
+**Errors:**
+| Condition | Message |
+|---|---|
+| Nothing to undo | `Nothing to undo.` |
+| Uncommitted changes | `Working tree has uncommitted changes. Commit or stash them before undoing.` |
+
+---
+
+## Typical Workflow
+
+```bash
+# Start a feature stack off main
+git checkout main
+dub create feat/data-layer
+# write code, commit
+
+dub create feat/api-routes
+# write code, commit
+
+dub create feat/frontend
+# write code, commit
+
+# View the stack
+dub log
+# (main)
+#   └─ feat/data-layer
+#        └─ feat/api-routes
+#             └─ feat/frontend (Current)
+
+# Later: main gets updated, or you amend feat/data-layer
+git checkout feat/data-layer
+# amend your commits...
+dub restack
+# ✔ Restacked 2 branch(es)
+#   ↳ feat/api-routes
+#   ↳ feat/frontend
+
+# Oops, that restack went wrong
+dub undo
+# ✔ Undid 'restack': Reset 3 branches to pre-restack state
+```
+
+## How State Works
+
+DubStack stores all state locally inside your git repo:
+
+```
+.git/dubstack/
+├── state.json               # branch relationships and stack metadata
+├── undo.json                 # snapshot for single-level undo
+└── restack-progress.json     # in-flight restack state (temporary)
+```
+
+Nothing is pushed to your remote. State is per-repo and git-ignored.
+
+## Development
+
+```bash
+pnpm install          # install deps
+pnpm dev              # run via tsx (no build step)
+pnpm build            # compile TypeScript to dist/
+pnpm test             # run tests (vitest)
+pnpm typecheck        # type-check without emitting
+pnpm checks           # lint + format check (biome)
+pnpm checks:fix       # auto-fix lint + format issues
+```
+
+## License
+
+MIT

package/dist/commands/create.d.ts

@@ -0,0 +1,18 @@
+interface CreateResult {
+    branch: string;
+    parent: string;
+}
+/**
+ * Creates a new branch stacked on top of the current branch.
+ *
+ * Records the parent-child relationship in dubstack state so the stack
+ * can be restacked later. Saves an undo entry before mutating.
+ *
+ * @param name - Name of the new branch to create
+ * @param cwd - Working directory (must be inside an initialized dubstack repo)
+ * @returns The created branch name and its parent
+ * @throws {DubError} If not initialized, branch exists, HEAD is detached, or repo is empty
+ */
+export declare function create(name: string, cwd: string): Promise<CreateResult>;
+export {};
+//# sourceMappingURL=create.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":"AAKA,UAAU,YAAY;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAyB7E"}

package/dist/commands/create.js

@@ -0,0 +1,35 @@
+import { DubError } from "../lib/errors.js";
+import { branchExists, createBranch, getCurrentBranch } from "../lib/git.js";
+import { addBranchToStack, readState, writeState } from "../lib/state.js";
+import { saveUndoEntry } from "../lib/undo-log.js";
+/**
+ * Creates a new branch stacked on top of the current branch.
+ *
+ * Records the parent-child relationship in dubstack state so the stack
+ * can be restacked later. Saves an undo entry before mutating.
+ *
+ * @param name - Name of the new branch to create
+ * @param cwd - Working directory (must be inside an initialized dubstack repo)
+ * @returns The created branch name and its parent
+ * @throws {DubError} If not initialized, branch exists, HEAD is detached, or repo is empty
+ */
+export async function create(name, cwd) {
+    const state = await readState(cwd);
+    const parent = await getCurrentBranch(cwd);
+    if (await branchExists(name, cwd)) {
+        throw new DubError(`Branch '${name}' already exists.`);
+    }
+    await saveUndoEntry({
+        operation: "create",
+        timestamp: new Date().toISOString(),
+        previousBranch: parent,
+        previousState: structuredClone(state),
+        branchTips: {},
+        createdBranches: [name],
+    }, cwd);
+    await createBranch(name, cwd);
+    addBranchToStack(state, name, parent);
+    await writeState(state, cwd);
+    return { branch: name, parent };
+}
+//# sourceMappingURL=create.js.map

package/dist/commands/create.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAOnD;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,IAAY,EAAE,GAAW;IACrD,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,CAAC;IACnC,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAE3C,IAAI,MAAM,YAAY,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,QAAQ,CAAC,WAAW,IAAI,mBAAmB,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,aAAa,CAClB;QACC,SAAS,EAAE,QAAQ;QACnB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACnC,cAAc,EAAE,MAAM;QACtB,aAAa,EAAE,eAAe,CAAC,KAAK,CAAC;QACrC,UAAU,EAAE,EAAE;QACd,eAAe,EAAE,CAAC,IAAI,CAAC;KACvB,EACD,GAAG,CACH,CAAC;IAEF,MAAM,YAAY,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC9B,gBAAgB,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACtC,MAAM,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAE7B,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;AACjC,CAAC"}

package/dist/commands/init.d.ts

@@ -0,0 +1,18 @@
+interface InitResult {
+    status: "created" | "already_exists";
+    gitignoreUpdated: boolean;
+}
+/**
+ * Initializes DubStack in the current git repository.
+ *
+ * Creates `.git/dubstack/state.json` with an empty state and ensures
+ * `.git/dubstack` is listed in `.gitignore`. Idempotent — safe to run
+ * multiple times.
+ *
+ * @param cwd - Working directory (must be inside a git repo)
+ * @returns Status indicating whether state was created or already existed
+ * @throws {DubError} If not inside a git repository
+ */
+export declare function init(cwd: string): Promise<InitResult>;
+export {};
+//# sourceMappingURL=init.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAMA,UAAU,UAAU;IACnB,MAAM,EAAE,SAAS,GAAG,gBAAgB,CAAC;IACrC,gBAAgB,EAAE,OAAO,CAAC;CAC1B;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CA2B3D"}

package/dist/commands/init.js

@@ -0,0 +1,41 @@
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { DubError } from "../lib/errors.js";
+import { getRepoRoot, isGitRepo } from "../lib/git.js";
+import { initState } from "../lib/state.js";
+/**
+ * Initializes DubStack in the current git repository.
+ *
+ * Creates `.git/dubstack/state.json` with an empty state and ensures
+ * `.git/dubstack` is listed in `.gitignore`. Idempotent — safe to run
+ * multiple times.
+ *
+ * @param cwd - Working directory (must be inside a git repo)
+ * @returns Status indicating whether state was created or already existed
+ * @throws {DubError} If not inside a git repository
+ */
+export async function init(cwd) {
+    if (!(await isGitRepo(cwd))) {
+        throw new DubError("Not a git repository. Run this command inside a git repo.");
+    }
+    const status = await initState(cwd);
+    const repoRoot = await getRepoRoot(cwd);
+    const gitignorePath = path.join(repoRoot, ".gitignore");
+    const entry = ".git/dubstack";
+    let gitignoreUpdated = false;
+    if (fs.existsSync(gitignorePath)) {
+        const content = fs.readFileSync(gitignorePath, "utf-8");
+        const lines = content.split("\n");
+        if (!lines.some((line) => line.trim() === entry)) {
+            const separator = content.endsWith("\n") ? "" : "\n";
+            fs.writeFileSync(gitignorePath, `${content}${separator}${entry}\n`);
+            gitignoreUpdated = true;
+        }
+    }
+    else {
+        fs.writeFileSync(gitignorePath, `${entry}\n`);
+        gitignoreUpdated = true;
+    }
+    return { status, gitignoreUpdated };
+}
+//# sourceMappingURL=init.js.map

package/dist/commands/init.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.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,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAO5C;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,GAAW;IACrC,IAAI,CAAC,CAAC,MAAM,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,QAAQ,CACjB,2DAA2D,CAC3D,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,CAAC;IACpC,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,CAAC;IACxC,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IACxD,MAAM,KAAK,GAAG,eAAe,CAAC;IAC9B,IAAI,gBAAgB,GAAG,KAAK,CAAC;IAE7B,IAAI,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QAClC,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QACxD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,KAAK,CAAC,EAAE,CAAC;YAClD,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YACrD,EAAE,CAAC,aAAa,CAAC,aAAa,EAAE,GAAG,OAAO,GAAG,SAAS,GAAG,KAAK,IAAI,CAAC,CAAC;YACpE,gBAAgB,GAAG,IAAI,CAAC;QACzB,CAAC;IACF,CAAC;SAAM,CAAC;QACP,EAAE,CAAC,aAAa,CAAC,aAAa,EAAE,GAAG,KAAK,IAAI,CAAC,CAAC;QAC9C,gBAAgB,GAAG,IAAI,CAAC;IACzB,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC;AACrC,CAAC"}

package/dist/commands/log.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Renders an ASCII tree view of all tracked stacks.
+ *
+ * Highlights the current branch, marks branches missing from git,
+ * and handles multiple stacks separated by blank lines.
+ *
+ * @param cwd - Working directory (must be inside an initialized dubstack repo)
+ * @returns Formatted ASCII tree string (no ANSI colors — caller adds chalk)
+ * @throws {DubError} If not initialized
+ */
+export declare function log(cwd: string): Promise<string>;
+//# sourceMappingURL=log.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../src/commands/log.ts"],"names":[],"mappings":"AAIA;;;;;;;;;GASG;AACH,wBAAsB,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAsBtD"}

package/dist/commands/log.js

@@ -0,0 +1,77 @@
+import { branchExists, getCurrentBranch } from "../lib/git.js";
+import { readState } from "../lib/state.js";
+/**
+ * Renders an ASCII tree view of all tracked stacks.
+ *
+ * Highlights the current branch, marks branches missing from git,
+ * and handles multiple stacks separated by blank lines.
+ *
+ * @param cwd - Working directory (must be inside an initialized dubstack repo)
+ * @returns Formatted ASCII tree string (no ANSI colors — caller adds chalk)
+ * @throws {DubError} If not initialized
+ */
+export async function log(cwd) {
+    const state = await readState(cwd);
+    if (state.stacks.length === 0) {
+        return "No stacks. Run 'dub create' to start.";
+    }
+    let currentBranch = null;
+    try {
+        currentBranch = await getCurrentBranch(cwd);
+    }
+    catch {
+        // Detached HEAD or empty repo — no branch highlighted
+    }
+    const sections = [];
+    for (const stack of state.stacks) {
+        const tree = await renderStack(stack, currentBranch, cwd);
+        sections.push(tree);
+    }
+    return sections.join("\n\n");
+}
+async function renderStack(stack, currentBranch, cwd) {
+    const root = stack.branches.find((b) => b.type === "root");
+    if (!root)
+        return "";
+    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 lines = [];
+    await renderNode(root, currentBranch, childMap, "", true, true, lines, cwd);
+    return lines.join("\n");
+}
+async function renderNode(branch, currentBranch, childMap, prefix, isRoot, isLast, lines, cwd) {
+    let label;
+    const exists = await branchExists(branch.name, cwd);
+    if (isRoot) {
+        label = `(${branch.name})`;
+    }
+    else if (branch.name === currentBranch) {
+        label = `*${branch.name} (Current)*`;
+    }
+    else if (!exists) {
+        label = `${branch.name} ⚠ (missing)`;
+    }
+    else {
+        label = branch.name;
+    }
+    if (isRoot) {
+        lines.push(label);
+    }
+    else {
+        const connector = isLast ? "└─ " : "├─ ";
+        lines.push(`${prefix}${connector}${label}`);
+    }
+    const children = childMap.get(branch.name) ?? [];
+    const childPrefix = isRoot ? "  " : `${prefix}${isLast ? "     " : "│    "}`;
+    for (let i = 0; i < children.length; i++) {
+        const isChildLast = i === children.length - 1;
+        await renderNode(children[i], currentBranch, childMap, childPrefix, false, isChildLast, lines, cwd);
+    }
+}
+//# sourceMappingURL=log.js.map

package/dist/commands/log.js.map

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

package/dist/commands/restack.d.ts

@@ -0,0 +1,33 @@
+interface RestackResult {
+    status: "success" | "conflict" | "up-to-date";
+    rebased: string[];
+    conflictBranch?: string;
+}
+/**
+ * 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 declare function restack(cwd: string): Promise<RestackResult>;
+/**
+ * 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 declare function restackContinue(cwd: string): Promise<RestackResult>;
+export {};
+//# sourceMappingURL=restack.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"restack.d.ts","sourceRoot":"","sources":["../../src/commands/restack.ts"],"names":[],"mappings":"AA6BA,UAAU,aAAa;IACtB,MAAM,EAAE,SAAS,GAAG,UAAU,GAAG,YAAY,CAAC;IAC9C,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAwDjE;AAED;;;;;;;;GAQG;AACH,wBAAsB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAezE"}