reslop 0.1.8 → 0.1.9

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## [Unreleased][unreleased]
 
+- Remove `r` reload hotkey and hint; auto-reload covers disk changes
+- Improve branch list TUI/TUX
+- Right-align the time column in the branch list
+- Refresh the branch list after push, pull, and rebase
+- Keep diff viewer order when staging or unstaging a block
+- Add a commits list screen with commit operation
+- Show staged/total rather than staged/unstaged in files list
+- Show file ages in the file list right-aligned
+- Sort the file list by path from the repo root
+- Update file-list hotkeys and hints
+- Fix dependency updates, locks and audit
+
 ## [0.1.8][] - 2026-09-17
 
 - Simplify session controllers, input dispatch, and loading orchestration
@@ -83,7 +95,8 @@
 - Feedback and todos that produce a repair plan for an agent
 - Intra-line highlighting in unified, mixed, and side-by-side layouts
 
-[unreleased]: https://github.com/tshemsedinov/reslop/compare/v0.1.8...HEAD
+[unreleased]: https://github.com/tshemsedinov/reslop/compare/v0.1.9...HEAD
+[0.1.9]: https://github.com/tshemsedinov/reslop/compare/v0.1.8...v0.1.9
 [0.1.8]: https://github.com/tshemsedinov/reslop/compare/v0.1.7...v0.1.8
 [0.1.7]: https://github.com/tshemsedinov/reslop/compare/v0.1.6...v0.1.7
 [0.1.6]: https://github.com/tshemsedinov/reslop/compare/v0.1.5...v0.1.6

package/README.md

@@ -1,4 +1,6 @@
-# 👁️ reslop — Review AI generated code and plan changes
+# 👁️ reslop
+
+## Review AI generated code and plan changes
 
 [![ci status](https://github.com/tshemsedinov/reslop/workflows/Testing%20CI/badge.svg)](https://github.com/tshemsedinov/reslop/actions?query=workflow%3A%22Testing+CI%22+branch%3Amain)
 [![snyk](https://snyk.io/test/github/tshemsedinov/reslop/badge.svg)](https://snyk.io/test/github/tshemsedinov/reslop)
@@ -16,16 +18,18 @@ for the agent.
 Review → Plan → Repair → Verify
 ```
 
-- Leave feedback, issues/todos, and in-place code proposals as a repair plan.
-- Review uncommitted git diffs, a given commit, a GitHub PR, or a GitLab MR.
-- Stage, unstage, or revert each contiguous block of diff lines.
-- Auto-reload local diffs when files change, keeping the current screen.
-- Import GitHub PR and GitLab MR review comments into the local plan for AI.
-- Commit, amend, or fixup staged changes from the file list.
-- Branches: checkout, create, rebase, drop, pull and push.
-- Review each npm dependency once across `package.json` and the lockfile.
-- Propose unused removals, npm audit fixes, and outdated updates as diffs.
-- Code highlighting, diff compare: unified, mixed, and side-by-side layouts.
+- Leave feedback, issues/todos, and in-place code proposals as a repair plan
+- Review uncommitted git diffs, a given commit, a GitHub PR, or a GitLab MR
+- Stage, unstage, or revert each contiguous block of diff lines
+- Auto-reload local diffs when files change, keeping the current screen
+- Import GitHub PR and GitLab MR review comments into the local plan for AI
+- Commits list: commit, amend, fixup, and drop
+- Branches: checkout, create, rebase, drop, pull, and push
+- Review each npm dependency once across `package.json` and the lockfile
+- Propose unused removals, npm audit fixes, and outdated updates as diffs
+- Code highlighting and intra-line diffs: unified, mixed, and side-by-side
+- Auto-update patch and minor releases; confirm a new major
+- Work with git, npm and fetch in background
 
 ## Install
 
@@ -51,35 +55,19 @@ Reviews go in `.review/YYYY-MM-DD-NN.md` with frontmatter `status`:
 - `partial`: AI started; some items remain
 - `done`: all items marked `[x]`
 
-## Hotkeys
-
-| Key                 | Action                                        |
-| ------------------- | --------------------------------------------- |
-| `a` / `u` / `d`     | Stage / unstage / drop this diff              |
-| `c`                 | File list: `c` commit / `a` amend / `f` fixup |
-| `b`                 | List branches; `n` new; `r` rebase; `d` drop  |
-| `p` / `s`           | git pull/push                                 |
-| `f` / `t` / `e`     | Feedback / repo todo / edit added lines       |
-| `m`                 | Mode: unified / mixed / side-by-side          |
-| `⏎`                 | Open the selected file                        |
-| `→` / `j`           | Next remaining diff / file                    |
-| `←` / `k`           | Previous remaining diff / file                |
-| `Ctrl-e` / `Ctrl-y` | Scroll one line down / up                     |
-| `Ctrl-f` / `Ctrl-b` | Scroll page down / up                         |
-| `Ctrl-d` / `Ctrl-u` | Scroll half-page down / up                    |
-| `⌫` / `Del`         | Remove the selected todo                      |
-| `Esc` / `q`         | Quit                                          |
-
 ## Future
 
-- Import issues from GitHub and GitLab.
-- Security and code-quality audit; propose a repair plan.
-- Send anonymized code blocks for expert review.
-- Send questions and the repair plan to experts for approval.
-- Ask experts.
-- Verify the codebase.
-- Apply refactoring skills.
-- Call agents, harnesses, and IDEs to execute prepared plans.
+- Import issues from GitHub and GitLab
+- Search, blame, and file history in the review
+- Security and code-quality audit; propose a repair plan
+- Send anonymized code blocks for expert review
+- Send questions and the repair plan to experts for approval
+- Ask experts
+- Verify the codebase
+- Apply refactoring skills
+- Call agents, harnesses, and IDEs to execute prepared plans
+- Squash, cherry-pick, and interactive rebase
+- Merge, rename, and conflict resolution
 
 ## License
 

package/lib/ansi.js

@@ -67,6 +67,7 @@ const THEME = {
   buttonFg: [0x6a, 0x6a, 0x7e],
   buttonBg: [0x2a, 0x2a, 0x40],
   buttonHotFg: [0xff, 0xff, 0xff],
+  currentBg: [0xa8, 0xcc, 0xb4],
   checkFg: [0xf4, 0xf4, 0xfc],
   checkBg: [0x52, 0x52, 0x74],
   checkDoneFg: [0xf0, 0xff, 0xf4],
@@ -75,6 +76,7 @@ const THEME = {
   warnFg: [0xe8, 0xc8, 0x4a],
   mutedFg: [0x7a, 0x7a, 0x8a],
   shaFg: [0x56, 0x9c, 0xd6],
+  shaDarkFg: [0x15, 0x4a, 0x8c],
   stagedDelLineFg: [0xa0, 0xa0, 0xa8],
   stagedDelLineBg: [0x20, 0x20, 0x26],
   stagedDelCharFg: [0xf0, 0xf0, 0xf4],

package/lib/capabilities.js

@@ -25,6 +25,7 @@ const BRANCH_METHODS = [
   'hasStaged',
   'lastMessage',
   'listBranches',
+  'listCommits',
   'currentBranch',
   'checkout',
   'checkoutAsync',
@@ -34,6 +35,8 @@ const BRANCH_METHODS = [
   'rebaseAsync',
   'drop',
   'dropAsync',
+  'dropCommit',
+  'dropCommitAsync',
   'pull',
   'pullAsync',
   'push',

package/lib/deps/changes.js

@@ -1,6 +1,11 @@
 'use strict';
 
 const { itemPath } = require('../files.js');
+const {
+  countSides,
+  formatHunkHeader,
+  formatPatch,
+} = require('../diff/patch.js');
 
 const manifest = require('./manifest.js');
 const { MANIFEST, LOCKFILE, SECTION_KEYS, depFileMeta, relOf } = manifest;
@@ -73,6 +78,87 @@ const diffOtherFields = (oldPkg, newPkg) => {
   return changes;
 };
 
+const foldedDepNames = (changes) => {
+  const names = new Set();
+  for (const change of changes) {
+    if (change.section === 'field') continue;
+    names.add(change.name);
+  }
+  return names;
+};
+
+const lineEntryName = (text) => {
+  const entry = DEP_ENTRY.exec(text);
+  return entry ? entry[1] : '';
+};
+
+const lineInBlock = (item, line) => {
+  const blockId = item.blockId;
+  if (typeof blockId !== 'number') return true;
+  return line.blockId === blockId;
+};
+
+const isSectionFence = (text) =>
+  SECTION_OPEN.test(text) || SECTION_END.test(text);
+
+const hunkOnlyFoldedDeps = (item, names) => {
+  if (!item.hunk || !names.size) return false;
+  let folded = 0;
+  for (const line of item.hunk.lines) {
+    if (line.type === 'ctx') continue;
+    if (!lineInBlock(item, line)) continue;
+    const name = lineEntryName(line.text);
+    if (name && names.has(name)) {
+      folded += 1;
+      continue;
+    }
+    if (isSectionFence(line.text)) continue;
+    return false;
+  }
+  return folded > 0;
+};
+
+const stripFoldedDepItem = (item, names) => {
+  if (!item.hunk || !names.size) return item;
+  const lines = [];
+  let removed = false;
+  for (const line of item.hunk.lines) {
+    if (line.type !== 'ctx') {
+      const name = lineEntryName(line.text);
+      if (name && names.has(name)) {
+        removed = true;
+        continue;
+      }
+    }
+    lines.push(line);
+  }
+  if (!removed) return item;
+  let hasEdit = false;
+  for (const line of lines) {
+    if (line.type === 'ctx') continue;
+    if (!lineInBlock(item, line)) continue;
+    hasEdit = true;
+    break;
+  }
+  if (!hasEdit) return null;
+  const counts = countSides(lines);
+  const hunk = {
+    ...item.hunk,
+    oldCount: counts.oldCount,
+    newCount: counts.newCount,
+    header: formatHunkHeader(
+      item.hunk.oldStart,
+      counts.oldCount,
+      item.hunk.newStart,
+      counts.newCount,
+    ),
+    lines,
+  };
+  const patchAdd = formatPatch(item.file, hunk, item.blockId, 'old');
+  const patchRevert = formatPatch(item.file, hunk, item.blockId, 'new');
+  return { ...item, hunk, patchAdd, patchRevert };
+};
+
 const onlyDepEdits = (items) => {
   if (!items.length) return false;
   for (const item of items) {
@@ -314,9 +400,12 @@ const collectGroups = (items) => {
 const takeManifestItems = (summary) => {
   if (!summary.foldManifest) return [];
   if (summary.takeAllManifest) return [...summary.manifestItems];
+  const names = foldedDepNames(summary.changes);
   const taken = [];
   for (const item of summary.manifestItems) {
-    if (onlyDepEdits([item])) taken.push(item);
+    if (onlyDepEdits([item]) || hunkOnlyFoldedDeps(item, names)) {
+      taken.push(item);
+    }
   }
   return taken;
 };
@@ -328,4 +417,6 @@ module.exports = {
   summarizeGroup,
   collectGroups,
   takeManifestItems,
+  foldedDepNames,
+  stripFoldedDepItem,
 };

package/lib/deps/items.js

@@ -2,7 +2,7 @@
 
 const { itemPath } = require('../files.js');
 
-const { depFileMeta } = require('./manifest.js');
+const { depFileMeta, listFilePath } = require('./manifest.js');
 const { orderedChanges } = require('./changes.js');
 const { buildRows, makeHunk } = require('./rows.js');
 
@@ -57,7 +57,7 @@ const makeDepItem = (origin, fileItems, hidden, change, extra, blockId) => {
   const allFiles = uniquePaths(fileItems);
   const files = change ? filesForChange(change, allFiles) : allFiles;
   const primary = pickPrimary(fileItems);
-  const oldPath = itemPath(primary);
+  const oldPath = listFilePath(itemPath(primary));
   const newPath = oldPath;
   const isNew = fileItems.some((item) => item.file && item.file.isNew);
   const isDeleted = fileItems.every((item) => item.file && item.file.isDeleted);
@@ -92,6 +92,9 @@ const makeDepItem = (origin, fileItems, hidden, change, extra, blockId) => {
 const makeDepItems = (origin, fileItems, hidden, summary) => {
   const ordered = orderedChanges(summary.changes);
   if (!ordered.length) {
+    const oldCount = summary.oldCount ?? 0;
+    const newCount = summary.newCount ?? 0;
+    if (oldCount === newCount) return [];
     return [makeDepItem(origin, fileItems, hidden, null, summary, 0)];
   }
   const items = [];

package/lib/deps/manifest.js

@@ -29,6 +29,12 @@ const depFileMeta = (rel) => {
 
 const relOf = (dir, name) => (dir === '.' ? name : `${dir}/${name}`);
 
+const listFilePath = (rel) => {
+  const meta = depFileMeta(rel);
+  if (meta && meta.kind === 'lockfile') return relOf(meta.dir, MANIFEST);
+  return posixRel(rel);
+};
+
 const parseJson = (text) => {
   if (!text || !`${text}`.trim()) return null;
   try {
@@ -134,6 +140,7 @@ module.exports = {
   posixRel,
   depFileMeta,
   relOf,
+  listFilePath,
   parseJson,
   emptySectionMaps,
   readSections,

package/lib/deps/rows.js

@@ -153,7 +153,6 @@ const buildRows = (change, oldCount, newCount) => {
     if (rows.at(-1).text !== '') rows.push(ctxLine(''));
     rows.push(ctxLine(countLine));
   }
-  if (!change && !countLine) rows.push(ctxLine('lockfile updated'));
   return rows;
 };
 

package/lib/deps.js

@@ -4,6 +4,7 @@ const { itemPath } = require('./files.js');
 
 const manifest = require('./deps/manifest.js');
 const { MANIFEST, LOCKFILE, depFileMeta, parseJson } = manifest;
+const { relOf, listFilePath } = manifest;
 const { readSections, lockEntries, lockPackageCount } = manifest;
 
 const { mergeDepFile } = require('./deps/merge.js');
@@ -11,6 +12,7 @@ const { mergeDepFile } = require('./deps/merge.js');
 const changes = require('./deps/changes.js');
 const { diffSections, mergeResolved, summarizeGroup } = changes;
 const { collectGroups, takeManifestItems } = changes;
+const { foldedDepNames, stripFoldedDepItem } = changes;
 
 const { makeDepItems, stubFileItem } = require('./deps/items.js');
 
@@ -46,6 +48,47 @@ const loadExportEntries = (names, extra = {}, pkgDir) => {
   return merged;
 };
 
+const groupDir = (key) => key.slice(key.indexOf('\0') + 1);
+
+const groupedSynthetics = (synthetic) => {
+  const byPath = new Map();
+  for (const key of synthetic.keys()) {
+    const rel = relOf(groupDir(key), MANIFEST);
+    const list = byPath.get(rel) ?? [];
+    for (const item of synthetic.get(key)) list.push(item);
+    byPath.set(rel, list);
+  }
+  return byPath;
+};
+
+const spliceAtSlots = (out, synthetic, slot) => {
+  const byPath = groupedSynthetics(synthetic);
+  const inserts = [];
+  for (const rel of byPath.keys()) {
+    const at = slot.has(rel) ? slot.get(rel) : out.length;
+    inserts.push({ at, items: byPath.get(rel) });
+  }
+  inserts.sort((left, right) => right.at - left.at);
+  for (const insert of inserts) {
+    out.splice(insert.at, 0, ...insert.items);
+  }
+  return out;
+};
+
+const lastPathIndex = (items, rel) => {
+  let at = -1;
+  for (let i = 0; i < items.length; i++) {
+    if (listFilePath(itemPath(items[i])) === rel) at = i;
+  }
+  return at;
+};
+
+const insertAfterPath = (items, added, rel) => {
+  const at = lastPathIndex(items, rel);
+  if (at < 0) return [...items, ...added];
+  return [...items.slice(0, at + 1), ...added, ...items.slice(at + 1)];
+};
+
 const foldDepItems = (
   items,
   readSides = noSides,
@@ -58,6 +101,7 @@ const foldDepItems = (
   if (!groups.size) return items;
   const folded = new Set();
   const synthetic = new Map();
+  const leftoverNames = new Map();
   for (const key of groups.keys()) {
     const group = groups.get(key);
     const summary = summarizeGroup(group, readSides);
@@ -72,32 +116,42 @@ const foldDepItems = (
     const audited = markAuditChanges(unused, audit);
     const changes = markOutdatedChanges(audited, outdated);
     const next = { ...summary, changes };
+    leftoverNames.set(key, foldedDepNames(next.changes));
     const taken = takeManifestItems(next);
     if (next.foldLock) {
       for (const item of next.lockItems) taken.push(item);
     }
     if (!taken.length && !next.changes.length) continue;
     const made = makeDepItems(group.origin, group.items, taken, next);
-    synthetic.set(key, made);
+    if (made.length) synthetic.set(key, made);
     for (const item of taken) folded.add(item);
   }
-  if (!synthetic.size) return items;
+  if (!synthetic.size && !folded.size) return items;
   const out = [];
-  const placed = new Set();
+  const slot = new Map();
   for (const item of items) {
     const rel = itemPath(item);
     const meta = depFileMeta(rel);
     if (meta) {
+      const pkgRel = relOf(meta.dir, MANIFEST);
       const key = `${item.origin}\0${meta.dir}`;
-      if (synthetic.has(key) && !placed.has(key)) {
-        placed.add(key);
-        const made = synthetic.get(key);
-        for (const depItem of made) out.push(depItem);
+      if (synthetic.has(key) && !slot.has(pkgRel)) {
+        slot.set(pkgRel, out.length);
+      }
+    }
+    if (folded.has(item)) continue;
+    if (meta && meta.kind === 'manifest') {
+      const names = leftoverNames.get(`${item.origin}\0${meta.dir}`);
+      const kept = names ? stripFoldedDepItem(item, names) : item;
+      if (kept) {
+        out.push(kept);
+        slot.set(relOf(meta.dir, MANIFEST), out.length);
       }
+      continue;
     }
-    if (!folded.has(item)) out.push(item);
+    out.push(item);
   }
-  return out;
+  return spliceAtSlots(out, synthetic, slot);
 };
 
 const proposeDepItems = (pkgText, outdated, audit, extra = {}) => {
@@ -133,7 +187,8 @@ const mergeProposedItems = (items, pkgText, outdated, audit, extra = {}) => {
     added.push(item);
   }
   if (!added.length) return items;
-  return [...items, ...added];
+  const rel = relOf(extra.dir ?? '.', MANIFEST);
+  return insertAfterPath(items, added, rel);
 };
 
 module.exports = {

package/lib/files.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const { listFilePath } = require('./deps/manifest.js');
+
 const REVIEW_DIR = '.review';
 const ORIGIN_ORDER = ['staged', 'unstaged', 'untracked', 'commit', 'pr'];
 const TODO_FILE = 'TODOs';
@@ -24,6 +26,8 @@ const itemPath = (item) => {
   return item.file.newPath || item.file.oldPath || '';
 };
 
+const listPath = (item) => listFilePath(itemPath(item));
+
 const isTodoItem = (item) => !!(item && item.origin === 'todo');
 
 const isTodosEntry = (entry) => !!(entry && entry.kind === 'todos');
@@ -72,6 +76,25 @@ const lineDelta = ({ hunk, blockId }) => {
   return delta;
 };
 
+const countAgo = (n, unit) => {
+  const label = n === 1 ? unit : `${unit}s`;
+  return `${n} ${label} ago`;
+};
+
+const relativeAge = (thenMs, nowMs = Date.now()) => {
+  const diff = Math.max(0, Math.round((nowMs - thenMs) / 1000));
+  if (diff < 90) return countAgo(diff, 'second');
+  const minutes = Math.round(diff / 60);
+  if (minutes < 90) return countAgo(minutes, 'minute');
+  const hours = Math.round(minutes / 60);
+  if (hours < 36) return countAgo(hours, 'hour');
+  const days = Math.round(hours / 24);
+  if (days < 14) return countAgo(days, 'day');
+  if (days < 70) return countAgo(Math.round(days / 7), 'week');
+  if (days < 365) return countAgo(Math.round(days / 30), 'month');
+  return countAgo(Math.round(days / 365), 'year');
+};
+
 const addLineDelta = (group, origin, delta) => {
   group.added += delta.added;
   group.removed += delta.removed;
@@ -116,7 +139,8 @@ const fileEntries = (items) => {
   for (let i = 0; i < items.length; i++) {
     const item = items[i];
     if (isTodoItem(item)) continue;
-    const rel = itemPath(item);
+    const rel = listPath(item);
+    if (!rel) continue;
     if (!groups.has(rel)) {
       groups.set(rel, {
         path: rel,
@@ -132,10 +156,12 @@ const fileEntries = (items) => {
         unstagedRemoved: 0,
         staged: 0,
         unstaged: 0,
+        date: '',
       });
     }
     const group = groups.get(rel);
     const { origin } = item;
+    if (item.date && !group.date) group.date = item.date;
     group.origins.push(origin);
     group.remaining += 1;
     addLineDelta(group, origin, lineDelta(item));
@@ -149,6 +175,7 @@ const fileEntries = (items) => {
   for (const group of entries) {
     group.status = fileStatus(group.origins);
   }
+  entries.sort((left, right) => left.path.localeCompare(right.path, 'en'));
   return entries;
 };
 
@@ -197,6 +224,7 @@ module.exports = {
   TOTAL_LABEL,
   isPathInScope,
   itemPath,
+  listPath,
   isTodoItem,
   isTodosEntry,
   isTotalEntry,
@@ -205,4 +233,5 @@ module.exports = {
   fileStatus,
   fileEntries,
   fileTotals,
+  relativeAge,
 };

package/lib/git/branches.js

@@ -26,6 +26,100 @@ const lastMessage = (top) => {
   return (result.stdout ?? '').replace(/\s+$/, '');
 };
 
+const COMMIT_FORMAT = ['%H', '%h', '%an', '%ar', '%s'].join('%x1f');
+const COMMIT_LIMIT = 256;
+const UNIT = '\x1f';
+
+const parseCommitLine = (line, index) => {
+  const parts = line.split(UNIT);
+  if (parts.length < 5) return null;
+  const sha = (parts[0] ?? '').trim();
+  if (!sha) return null;
+  return {
+    sha,
+    shortSha: (parts[1] ?? '').trim() || sha.slice(0, 7),
+    author: (parts[2] ?? '').trim(),
+    date: (parts[3] ?? '').trim(),
+    subject: parts.slice(4).join(UNIT).trim(),
+    head: index === 0,
+  };
+};
+
+const listCommits = (top) => {
+  const args = [
+    'log',
+    `--format=${COMMIT_FORMAT}`,
+    `--max-count=${COMMIT_LIMIT}`,
+  ];
+  const result = requireOk(runGit(args, top), 'log failed');
+  const commits = [];
+  for (const line of result.stdout.split('\n')) {
+    if (!line) continue;
+    const entry = parseCommitLine(line, commits.length);
+    if (entry) commits.push(entry);
+  }
+  return commits;
+};
+
+const namedCommit = (sha) => {
+  const commit = `${sha ?? ''}`.trim();
+  if (!commit) throw new Error('empty commit');
+  return commit;
+};
+
+const resolveCommit = (top, sha) => {
+  const result = requireOk(runGit(['rev-parse', sha], top), 'rev-parse failed');
+  return (result.stdout ?? '').trim();
+};
+
+const dropHeadCommit = (top) => {
+  requireOk(runGit(['reset', '--soft', 'HEAD~1'], top), 'drop failed');
+};
+
+const rebaseFailed = (result) => {
+  if (result.status === 0) return '';
+  return result.stderr || result.stdout || 'rebase failed';
+};
+
+const dropOlderCommit = (top, sha) => {
+  const onto = `${sha}^`;
+  const result = runGit(['rebase', '--onto', onto, sha], top);
+  const failed = rebaseFailed(result);
+  if (!failed) return;
+  runGit(['rebase', '--abort'], top);
+  throw new Error(oneLine(failed));
+};
+
+const dropOlderCommitAsync = async (top, sha) => {
+  const onto = `${sha}^`;
+  const result = await runGitAsync(['rebase', '--onto', onto, sha], top);
+  const failed = rebaseFailed(result);
+  if (!failed) return;
+  await runGitAsync(['rebase', '--abort'], top);
+  throw new Error(oneLine(failed));
+};
+
+const dropCommit = (top, sha) => {
+  const spec = namedCommit(sha);
+  const target = resolveCommit(top, spec);
+  const parent = runGit(['rev-parse', '--verify', `${target}^`], top);
+  if (parent.status !== 0) throw new Error('cannot drop root commit');
+  const head = resolveCommit(top, 'HEAD');
+  if (target === head) return void dropHeadCommit(top);
+  dropOlderCommit(top, target);
+};
+
+const dropCommitAsync = async (top, sha) => {
+  const spec = namedCommit(sha);
+  const target = resolveCommit(top, spec);
+  const parentArgs = ['rev-parse', '--verify', `${target}^`];
+  const parent = await runGitAsync(parentArgs, top);
+  if (parent.status !== 0) throw new Error('cannot drop root commit');
+  const head = resolveCommit(top, 'HEAD');
+  if (target === head) return void dropHeadCommit(top);
+  await dropOlderCommitAsync(top, target);
+};
+
 const parseTrack = (text) => {
   const raw = `${text ?? ''}`.trim().replace(/^\[|\]$/g, '');
   if (!raw) return { ahead: 0, behind: 0, gone: false };
@@ -125,11 +219,6 @@ const createBranchAsync = async (top, name) => {
   requireOk(await runGitAsync(args, top), 'checkout failed');
 };
 
-const rebaseFailed = (result) => {
-  if (result.status === 0) return '';
-  return result.stderr || result.stdout || 'rebase failed';
-};
-
 const rebaseBranch = (top, onto) => {
   const branch = namedBranch(onto);
   const result = runGit(['rebase', branch], top);
@@ -272,6 +361,7 @@ const commitChangesAsync = async (top, kind, message) => {
 
 module.exports = {
   lastMessage,
+  listCommits,
   listBranches,
   checkoutBranch,
   checkoutBranchAsync,
@@ -279,6 +369,8 @@ module.exports = {
   createBranchAsync,
   rebaseBranch,
   rebaseBranchAsync,
+  dropCommit,
+  dropCommitAsync,
   dropBranch,
   dropBranchAsync,
   pullChanges,