reslop 0.1.8 → 0.1.9

package/lib/git.js

@@ -73,6 +73,7 @@ const createGitRepo = () =>
       hasStaged: branches.hasStaged,
       lastMessage: branches.lastMessage,
       listBranches: branches.listBranches,
+      listCommits: branches.listCommits,
       currentBranch: read.currentBranch,
       checkout: branches.checkoutBranch,
       checkoutAsync: branches.checkoutBranchAsync,
@@ -82,6 +83,8 @@ const createGitRepo = () =>
       rebaseAsync: branches.rebaseBranchAsync,
       drop: branches.dropBranch,
       dropAsync: branches.dropBranchAsync,
+      dropCommit: branches.dropCommit,
+      dropCommitAsync: branches.dropCommitAsync,
       pull: branches.pullChanges,
       pullAsync: branches.pullChangesAsync,
       push: branches.pushChanges,
@@ -104,6 +107,7 @@ module.exports = {
   currentBranch: read.currentBranch,
   lastMessage: branches.lastMessage,
   listBranches: branches.listBranches,
+  listCommits: branches.listCommits,
   checkoutBranch: branches.checkoutBranch,
   checkoutBranchAsync: branches.checkoutBranchAsync,
   createBranch: branches.createBranch,
@@ -112,6 +116,8 @@ module.exports = {
   rebaseBranchAsync: branches.rebaseBranchAsync,
   dropBranch: branches.dropBranch,
   dropBranchAsync: branches.dropBranchAsync,
+  dropCommit: branches.dropCommit,
+  dropCommitAsync: branches.dropCommitAsync,
   pullChanges: branches.pullChanges,
   pullChangesAsync: branches.pullChangesAsync,
   pushChanges: branches.pushChanges,

package/lib/keys.js

@@ -2,10 +2,13 @@
 
 const actions = require('./session/actions.js');
 
-const { ACTIONS, ACTION_IDS, BRANCH_ACTIONS } = actions;
+const { ACTIONS, ACTION_IDS, BRANCH_ACTIONS, COMMIT_ACTIONS } = actions;
 const { DIFF_DISABLED, FILES_DISABLED, FILES_GIT_DISABLED } = actions;
-const { FILES_TODO_DISABLED, TODO_DISABLED, BRANCHES_DISABLED } = actions;
+const { FILES_HIDDEN, FILES_TODO_DISABLED, TODO_DISABLED, BRANCHES_DISABLED } =
+  actions;
+const { COMMITS_DISABLED } = actions;
 const { disabledActions, diffGitDisabled, branchGitDisabled } = actions;
+const { commitGitDisabled } = actions;
 const { actionFromKey, actionHot, actionLetter, buttonWord } = actions;
 const { CONFIRM, CONFIRM_MODE, confirmKey, applyConfirm } = actions;
 const { confirmPrefix, promptFromChoices } = actions;
@@ -176,15 +179,19 @@ module.exports = {
   ACTIONS,
   ACTION_IDS,
   BRANCH_ACTIONS,
+  COMMIT_ACTIONS,
   DIFF_DISABLED,
   FILES_DISABLED,
+  FILES_HIDDEN,
   FILES_GIT_DISABLED,
   FILES_TODO_DISABLED,
   TODO_DISABLED,
   BRANCHES_DISABLED,
+  COMMITS_DISABLED,
   disabledActions,
   diffGitDisabled,
   branchGitDisabled,
+  commitGitDisabled,
   decodeChunk,
   actionFromKey,
   actionHot,

package/lib/render/branches.js

@@ -14,7 +14,7 @@ const BRANCH_COL_ALIGN = {
   ahead: 'start',
   behind: 'start',
   gone: 'end',
-  date: 'end',
+  date: 'start',
 };
 
 const BRANCH_COL_FG = {
@@ -25,14 +25,25 @@ const BRANCH_COL_FG = {
   date: THEME.mutedFg,
 };
 
+const BRANCH_CURRENT_COL_FG = {
+  sha: THEME.shaDarkFg,
+  date: THEME.headerFg,
+};
+
 const BRANCH_NAME_MAX = 24;
+const BRANCH_EDGE = 2;
+const BRANCH_TAIL = 1;
+const BRANCH_GAP = '  ';
+const BRANCH_DATE_GAP = '   ';
+
+const colGap = (key) => (key === 'date' ? BRANCH_DATE_GAP : BRANCH_GAP);
 
 const branchNameChip = (entry, rowBg) => {
   if (entry.current) {
     return {
-      nameFg: THEME.headerFg,
+      nameFg: THEME.mutedFg,
       wrapFg: THEME.mutedFg,
-      nameBg: THEME.buttonHotFg,
+      nameBg: THEME.currentBg,
       nameBold: false,
     };
   }
@@ -97,26 +108,33 @@ const joinBranchSuffix = (parts, cols) => {
   const bits = [];
   for (const key of BRANCH_COL_KEYS) {
     if (!cols[key]) continue;
-    bits.push(parts[key]);
+    bits.push(colGap(key) + parts[key]);
   }
   if (!bits.length) return '';
-  return `  ${bits.join('  ')}`;
+  return bits.join('');
+};
+
+const branchColFg = (key, current) => {
+  if (current && Object.hasOwn(BRANCH_CURRENT_COL_FG, key)) {
+    return BRANCH_CURRENT_COL_FG[key];
+  }
+  return BRANCH_COL_FG[key];
 };
 
-const paintBranchSuffix = (parts, cols, fgRgb, bgRgb, color) => {
-  const gap = paint('  ', fgRgb, bgRgb, color);
+const paintBranchSuffix = (parts, cols, fgRgb, bgRgb, color, current) => {
   const bits = [];
   for (const key of BRANCH_COL_KEYS) {
     if (!cols[key]) continue;
-    const tone = BRANCH_COL_FG[key] ?? fgRgb;
-    bits.push(paint(parts[key], tone, bgRgb, color));
+    const tone = branchColFg(key, current) ?? fgRgb;
+    const gap = paint(colGap(key), fgRgb, bgRgb, color);
+    bits.push(gap + paint(parts[key], tone, bgRgb, color));
   }
   if (!bits.length) return '';
-  return gap + bits.join(gap);
+  return bits.join('');
 };
 
 const paintBranchRow = (entry, width, color, selected, cols) => {
-  const inner = Math.max(1, width - 1);
+  const inner = Math.max(1, width - BRANCH_EDGE - BRANCH_TAIL);
   const mark = selected ? FILE_MARK : ' ';
   const prefix = ` ${mark} `;
   const parts = branchRowParts(entry, cols);
@@ -136,8 +154,11 @@ const paintBranchRow = (entry, width, color, selected, cols) => {
   const fgRgb = branchRowFg(entry, selected);
   const bgRgb = selected ? THEME.buttonBg : THEME.ctxBg;
   const chip = branchNameChip(entry, bgRgb);
-  const edge = fill(1, fgRgb, bgRgb, color);
-  if (!color) return `${left}${suffix}${edge}`;
+  const markFg = entry.current ? THEME.headerFg : fgRgb;
+  const markBg = entry.current ? THEME.currentBg : bgRgb;
+  const tail = ' '.repeat(BRANCH_TAIL);
+  const edge = fill(BRANCH_EDGE, fgRgb, THEME.ctxBg, color);
+  if (!color) return `${left}${suffix}${tail}${edge}`;
   let out = `${seq(fgRgb, bgRgb)}${EL}`;
   out += paint(prefix, fgRgb, bgRgb, color);
   out += paintBracketName(
@@ -148,13 +169,14 @@ const paintBranchRow = (entry, width, color, selected, cols) => {
     color,
     chip.nameBold,
   );
-  out += paint(after, fgRgb, bgRgb, color);
-  out += paintBranchSuffix(parts, cols, fgRgb, bgRgb, color);
+  out += paint(after, markFg, markBg, color);
+  out += paintBranchSuffix(parts, cols, markFg, markBg, color, entry.current);
+  out += paint(tail, markFg, markBg, color);
   return out + edge;
 };
 
 const paintBranchEdit = (compose, width, color) => {
-  const inner = Math.max(1, width - 1);
+  const inner = Math.max(1, width - BRANCH_EDGE);
   const prefix = ` ${FILE_MARK} `;
   const prefixW = visibleWidth(prefix);
   const rest = Math.max(1, inner - prefixW);
@@ -165,7 +187,7 @@ const paintBranchEdit = (compose, width, color) => {
   const left = `${prefix}${clipped}${' '.repeat(pad)}`;
   const fgRgb = THEME.chromeFg;
   const bgRgb = THEME.buttonBg;
-  const edge = fill(1, fgRgb, bgRgb, color);
+  const edge = fill(BRANCH_EDGE, fgRgb, THEME.ctxBg, color);
   let row = `${left}${edge}`;
   if (color) {
     const gap = ' '.repeat(pad);

package/lib/render/chrome.js

@@ -6,10 +6,12 @@ const files = require('../files.js');
 const primitives = require('./primitives.js');
 
 const { itemPath, TODO_FILE, isTodosEntry, fileTotals } = files;
-const { ACTION_IDS, BRANCH_ACTIONS, actionLetter, buttonWord } = keys;
-const { FILES_DISABLED, FILES_GIT_DISABLED, BRANCHES_DISABLED } = keys;
-const { TODO_DISABLED, DIFF_DISABLED, diffGitDisabled } = keys;
-const { branchGitDisabled, CONFIRM, confirmPrefix, promptFromChoices } = keys;
+const { ACTION_IDS, BRANCH_ACTIONS, COMMIT_ACTIONS, actionLetter } = keys;
+const { buttonWord } = keys;
+const { FILES_HIDDEN, FILES_GIT_DISABLED, BRANCHES_DISABLED } = keys;
+const { COMMITS_DISABLED, TODO_DISABLED, DIFF_DISABLED } = keys;
+const { diffGitDisabled, branchGitDisabled, commitGitDisabled } = keys;
+const { CONFIRM, confirmPrefix, promptFromChoices } = keys;
 const { THEME, paint, visibleWidth } = ansi;
 const { truncateVisible, fg, RESET, EL, seq } = ansi;
 const { fill, branchLabel, paintBracketName } = primitives;
@@ -91,7 +93,6 @@ const INFO_STATUS = [
 const INFO_PREFIX = ['checked out ', 'created ', 'rebased onto ', 'dropped '];
 
 const QUIT_PROMPT = promptFromChoices(CONFIRM.confirmQuit.choices);
-const COMMIT_PROMPT = promptFromChoices(CONFIRM.confirmCommit.choices);
 const updatePrompt = (from, to) => ` update reslop ${from} → ${to}? y/n`;
 const dropPrompt = (name) => ` drop ${name}? y/n`;
 const PUSH_REJECT_PREFIX = CONFIRM.confirmPush.prefix;
@@ -160,6 +161,16 @@ const headerTarget = (view) => {
     const origin = entry.current ? 'current' : 'branch';
     return { path: entry.name, origin, n, total };
   }
+  if (pane === 'commits') {
+    const commits = view.commits ?? [];
+    const cursor = view.commitCursor ?? 0;
+    const entry = commits[cursor];
+    const total = commits.length;
+    const n = total ? cursor + 1 : 0;
+    if (!entry) return { path: '', origin: 'commit', n, total };
+    const origin = entry.head ? 'HEAD' : 'commit';
+    return { path: entry.subject ?? '', origin, n, total };
+  }
   if (!view.item) return { path: '', origin: '', n: 0, total: view.total ?? 0 };
   if (view.item.origin === 'todo') {
     return { path: TODO_FILE, origin: 'todo', n: 1, total: 1 };
@@ -276,7 +287,7 @@ const layoutButtons = (width, compact, hidden, extra, disabled) => {
   for (const id of ACTION_IDS) {
     if (id === 'quit') {
       for (const add of extraIds) {
-        if (!hiddenIds.includes(add)) ids.push(add);
+        if (!ids.includes(add)) ids.push(add);
       }
     }
     if (hiddenIds.includes(id)) continue;
@@ -380,8 +391,8 @@ const statusDelta = (total) => {
   const hasDelta =
     stagedAdd || unstagedAdd || stagedDel || unstagedDel || total.added;
   if (!hasDelta && !total.removed) return '';
-  const plus = `+${stagedAdd}/${unstagedAdd}`;
-  const minus = `-${stagedDel}/${unstagedDel}`;
+  const plus = `+${stagedAdd}/${stagedAdd + unstagedAdd}`;
+  const minus = `-${stagedDel}/${stagedDel + unstagedDel}`;
   return joinStatus([plus, minus]);
 };
 
@@ -525,10 +536,15 @@ const statusBranchHit = (view, width, y) => {
   return { id: 'branch', y, x0: open, x1: close + 1 };
 };
 
+const selectedBranch = (view) => (view.branches ?? [])[view.branchCursor ?? 0];
+
+const selectedCommit = (view) => (view.commits ?? [])[view.commitCursor ?? 0];
+
 const hiddenActions = (view) => {
   const pane = view.pane ?? 'diff';
-  if (pane === 'files') return FILES_DISABLED;
+  if (pane === 'files') return FILES_HIDDEN;
   if (pane === 'branches') return BRANCHES_DISABLED;
+  if (pane === 'commits') return COMMITS_DISABLED;
   if (view.item && view.item.origin === 'todo') return TODO_DISABLED;
   return DIFF_DISABLED;
 };
@@ -542,22 +558,26 @@ const dimFooterActions = (view) => {
     return FILES_GIT_DISABLED;
   }
   if (pane === 'diff') return diffGitDisabled(view.item);
-  if (pane === 'branches') {
-    const branches = view.branches ?? [];
-    const entry = branches[view.branchCursor ?? 0];
-    return branchGitDisabled(entry);
+  if (pane === 'branches') return branchGitDisabled(selectedBranch(view));
+  if (pane === 'commits') {
+    const entry = selectedCommit(view);
+    const staged = (view.counts?.staged ?? 0) > 0;
+    if (!entry) return commitGitDisabled({ canCommit: staged });
+    return commitGitDisabled({ ...entry, canCommit: staged });
   }
   return [];
 };
 
 const extraFooterActions = (view) => {
-  if ((view.pane ?? 'diff') === 'branches') return Object.keys(BRANCH_ACTIONS);
+  const pane = view.pane ?? 'diff';
+  if (pane === 'files') return ['commit', 'pull', 'push'];
+  if (pane === 'branches') return Object.keys(BRANCH_ACTIONS);
+  if (pane === 'commits') return Object.keys(COMMIT_ACTIONS);
   return [];
 };
 
 module.exports = {
   QUIT_PROMPT,
-  COMMIT_PROMPT,
   PUSH_PROMPT,
   updatePrompt,
   dropPrompt,

package/lib/render/commits.js

@@ -0,0 +1,138 @@
+'use strict';
+
+const ansi = require('../ansi.js');
+const primitives = require('./primitives.js');
+
+const { THEME, paint, visibleWidth, truncateVisible, seq, EL } = ansi;
+const { fill, padVisible, FILE_MARK, paneResult, paintCursorList } = primitives;
+
+const COMMIT_COL_KEYS = ['sha', 'author', 'date'];
+
+const COMMIT_COL_ALIGN = {
+  sha: 'end',
+  author: 'start',
+  date: 'start',
+};
+
+const COMMIT_COL_FG = {
+  sha: THEME.shaFg,
+  author: THEME.mutedFg,
+  date: THEME.mutedFg,
+};
+
+const COMMIT_EDGE = 2;
+const COMMIT_TAIL = 1;
+const COMMIT_GAP = '  ';
+const COMMIT_DATE_GAP = '   ';
+
+const colGap = (key) => (key === 'date' ? COMMIT_DATE_GAP : COMMIT_GAP);
+
+const commitRowFields = (entry) => ({
+  sha: entry.shortSha ?? '',
+  author: entry.author ?? '',
+  date: entry.date ?? '',
+});
+
+const commitColumns = (commits) => {
+  const widths = {};
+  for (const key of COMMIT_COL_KEYS) widths[key] = 0;
+  for (const entry of commits) {
+    const fields = commitRowFields(entry);
+    for (const key of COMMIT_COL_KEYS) {
+      const w = visibleWidth(fields[key]);
+      if (w > widths[key]) widths[key] = w;
+    }
+  }
+  return widths;
+};
+
+const commitRowParts = (entry, cols) => {
+  const fields = commitRowFields(entry);
+  const parts = {};
+  for (const key of COMMIT_COL_KEYS) {
+    const width = cols?.[key] ?? visibleWidth(fields[key]);
+    parts[key] = padVisible(fields[key], width, COMMIT_COL_ALIGN[key]);
+  }
+  return parts;
+};
+
+const joinCommitSuffix = (parts, cols) => {
+  const bits = [];
+  for (const key of COMMIT_COL_KEYS) {
+    if (!cols[key]) continue;
+    bits.push(colGap(key) + parts[key]);
+  }
+  if (!bits.length) return '';
+  return bits.join('');
+};
+
+const commitColFg = (key) => COMMIT_COL_FG[key];
+
+const paintCommitSuffix = (parts, cols, fgRgb, bgRgb, color) => {
+  const bits = [];
+  for (const key of COMMIT_COL_KEYS) {
+    if (!cols[key]) continue;
+    const tone = commitColFg(key) ?? fgRgb;
+    const gap = paint(colGap(key), fgRgb, bgRgb, color);
+    bits.push(gap + paint(parts[key], tone, bgRgb, color));
+  }
+  if (!bits.length) return '';
+  return bits.join('');
+};
+
+const paintCommitRow = (entry, width, color, selected, cols) => {
+  const inner = Math.max(1, width - COMMIT_EDGE - COMMIT_TAIL);
+  const mark = selected ? FILE_MARK : ' ';
+  const prefix = ` ${mark} `;
+  const lead = ' ';
+  const parts = commitRowParts(entry, cols);
+  const suffix = joinCommitSuffix(parts, cols);
+  const rest = Math.max(1, inner - visibleWidth(prefix + lead + suffix));
+  const subject = truncateVisible(entry.subject ?? '', rest);
+  const pad = Math.max(0, rest - visibleWidth(subject));
+  const after = `${' '.repeat(pad)}`;
+  const left = `${prefix}${lead}${subject}${after}`;
+  const fgRgb = selected ? THEME.chromeFg : THEME.mutedFg;
+  const bgRgb = selected ? THEME.buttonBg : THEME.ctxBg;
+  const nameFg = selected ? THEME.buttonHotFg : THEME.chromeFg;
+  const tail = ' '.repeat(COMMIT_TAIL);
+  const edge = fill(COMMIT_EDGE, fgRgb, THEME.ctxBg, color);
+  if (!color) return `${left}${suffix}${tail}${edge}`;
+  let out = `${seq(fgRgb, bgRgb)}${EL}`;
+  out += paint(prefix, fgRgb, bgRgb, color);
+  out += paint(lead, nameFg, bgRgb, color);
+  out += paint(subject, nameFg, bgRgb, color);
+  out += paint(after, fgRgb, bgRgb, color);
+  out += paintCommitSuffix(parts, cols, fgRgb, bgRgb, color);
+  out += paint(tail, fgRgb, bgRgb, color);
+  return out + edge;
+};
+
+const paintBodyCommits = (view, width, color, bodyH, headerLines) => {
+  const commits = view.commits ?? [];
+  const cols = commitColumns(commits);
+  const cursor = view.commitCursor ?? 0;
+  const paintRow = (entry, rowWidth, rowColor, selected) =>
+    paintCommitRow(entry, rowWidth, rowColor, selected, cols);
+  const painted = paintCursorList(
+    commits,
+    cursor,
+    width,
+    color,
+    bodyH,
+    headerLines,
+    paintRow,
+    null,
+    view.listScroll,
+  );
+  return paneResult({
+    body: painted.body,
+    fileHits: painted.fileHits,
+    todoOwners: [],
+    cursor: painted.cursor,
+    splitBody: false,
+    listScroll: painted.offset,
+  });
+};
+
+module.exports = { paintBodyCommits };

package/lib/render/files.js

@@ -15,7 +15,7 @@ const FILE_STATUS_FG = {
   partial: THEME.warnFg,
 };
 
-const FILE_COL_KEYS = ['add', 'del', 'status', 'n', 'm'];
+const FILE_COL_KEYS = ['add', 'del', 'status', 'n', 'm', 'date'];
 
 const FILE_COL_ALIGN = {
   add: 'start',
@@ -23,15 +23,18 @@ const FILE_COL_ALIGN = {
   status: 'start',
   n: 'start',
   m: 'end',
+  date: 'start',
 };
 
+const FILE_DATE_GAP = '   ';
+
 const signedCount = (sign, n) => `${sign}${n ?? 0}`;
 
 const fileRowFields = (entry) => {
   if (isTodosEntry(entry)) {
     const n = `${entry.staged ?? 0}`;
     const m = `${entry.remaining ?? 0}`;
-    return { add: '', del: '', status: '', n, m };
+    return { add: '', del: '', status: '', n, m, date: '' };
   }
   const { added, removed, staged, remaining } = entry;
   const add = signedCount('+', added);
@@ -39,7 +42,8 @@ const fileRowFields = (entry) => {
   const status = entry.status ?? '';
   const n = `${staged ?? 0}`;
   const m = `${remaining ?? 0}`;
-  return { add, del, status, n, m };
+  const date = entry.date ?? '';
+  return { add, del, status, n, m, date };
 };
 
 const fileColumns = (files) => {
@@ -73,12 +77,20 @@ const fileRowParts = (entry, cols) => {
   return parts;
 };
 
-const joinFileSuffix = (parts) => {
+const joinFileDate = (parts, cols) => {
+  if (!cols?.date) return '';
+  return `${FILE_DATE_GAP}${parts.date}`;
+};
+
+const joinFileMeta = (parts) => {
   const { add, del, status, n, m } = parts;
   return `  ${add}  ${del}  ${status}  ${n}/${m}`;
 };
 
-const paintFileSuffix = (parts, fgRgb, bgRgb, color) => {
+const joinFileSuffix = (parts, cols) =>
+  `${joinFileMeta(parts)}${joinFileDate(parts, cols)}`;
+
+const paintFileSuffix = (parts, cols, fgRgb, bgRgb, color) => {
   const { add, del, status, n, m } = parts;
   const gap = paint('  ', fgRgb, bgRgb, color);
   const addText = paint(add, THEME.addLineFg, bgRgb, color);
@@ -89,7 +101,10 @@ const paintFileSuffix = (parts, fgRgb, bgRgb, color) => {
   const mText = paint(m, fgRgb, bgRgb, color);
   const counts = addText + gap + delText;
   const meta = statusText + gap + nText + slash + mText;
-  return gap + counts + gap + meta;
+  if (!cols?.date) return gap + counts + gap + meta;
+  const dateGap = paint(FILE_DATE_GAP, fgRgb, bgRgb, color);
+  const age = paint(parts.date, THEME.mutedFg, bgRgb, color);
+  return gap + counts + gap + meta + dateGap + age;
 };
 
 const paintTodosRow = (entry, width, color, selected, cols) => {
@@ -97,7 +112,9 @@ const paintTodosRow = (entry, width, color, selected, cols) => {
   const mark = selected ? FILE_MARK : ' ';
   const prefix = ` ${mark} `;
   const parts = fileRowParts(entry, cols);
-  const suffix = joinFileSuffix(parts);
+  const meta = joinFileMeta(parts);
+  const dated = joinFileDate(parts, cols);
+  const suffix = `${meta}${dated}`;
   const pathW = Math.max(1, inner - visibleWidth(prefix + suffix));
   const clipped = truncateVisible(entry.path, pathW);
   const pad = Math.max(0, pathW - visibleWidth(clipped));
@@ -108,7 +125,10 @@ const paintTodosRow = (entry, width, color, selected, cols) => {
   if (!color) return `${left}${suffix}${edge}`;
   let out = `${seq(fgRgb, bgRgb)}${EL}`;
   out += paint(left, fgRgb, bgRgb, color, true);
-  out += paint(suffix, fgRgb, bgRgb, color, true);
+  out += paint(meta, fgRgb, bgRgb, color, true);
+  if (!dated) return out + edge;
+  out += paint(FILE_DATE_GAP, fgRgb, bgRgb, color);
+  out += paint(parts.date, THEME.mutedFg, bgRgb, color);
   return out + edge;
 };
 
@@ -120,7 +140,7 @@ const paintFileRow = (entry, width, color, selected, cols) => {
   const mark = selected ? FILE_MARK : ' ';
   const prefix = ` ${mark} `;
   const parts = fileRowParts(entry, cols);
-  const suffix = joinFileSuffix(parts);
+  const suffix = joinFileSuffix(parts, cols);
   const pathW = Math.max(1, inner - visibleWidth(prefix + suffix));
   const { path, status } = entry;
   const clipped = truncateVisible(path, pathW);
@@ -132,7 +152,7 @@ const paintFileRow = (entry, width, color, selected, cols) => {
   if (!color) return `${left}${suffix}${edge}`;
   let out = `${seq(fgRgb, bgRgb)}${EL}`;
   out += paint(left, fgRgb, bgRgb, color);
-  out += paintFileSuffix(parts, fgRgb, bgRgb, color);
+  out += paintFileSuffix(parts, cols, fgRgb, bgRgb, color);
   return out + edge;
 };
 

package/lib/render/frame.js

@@ -6,6 +6,7 @@ const primitives = require('./primitives.js');
 const chrome = require('./chrome.js');
 const files = require('./files.js');
 const branches = require('./branches.js');
+const commits = require('./commits.js');
 const notes = require('./notes.js');
 const diff = require('./diff.js');
 
@@ -17,11 +18,14 @@ const { hiddenActions, dimFooterActions, extraFooterActions } = chrome;
 const { paintNotePanel, paintBodyTodo } = notes;
 const { paintBodyFiles } = files;
 const { paintBodyBranches } = branches;
+const { paintBodyCommits } = commits;
 const { paintBodyDiff } = diff;
 
 const bodyKind = (view) => {
   const pane = view.pane ?? 'diff';
-  if (pane === 'files' || pane === 'branches') return pane;
+  if (pane === 'files' || pane === 'branches' || pane === 'commits') {
+    return pane;
+  }
   if (!view.item) return 'empty';
   if (view.item.origin === 'todo') return 'todo';
   return 'diff';
@@ -39,6 +43,7 @@ const paintBodyEmpty = () =>
 const BODY_PAINT = {
   files: paintBodyFiles,
   branches: paintBodyBranches,
+  commits: paintBodyCommits,
   empty: paintBodyEmpty,
   todo: paintBodyTodo,
   diff: paintBodyDiff,

package/lib/render/primitives.js

@@ -8,7 +8,7 @@ const GUTTER_W = 2;
 const FILE_MARK = '▶';
 const FILE_LIST_PAD = 1;
 const CHECK_DONE = 'xX';
-const LIST_PANES = ['files', 'branches'];
+const LIST_PANES = ['files', 'branches', 'commits'];
 const CHECK_TOKEN = /\[([ xX])\]/;
 const CHECK_LEAD = /^\[[ xX]\] /;
 

package/lib/render.js

@@ -6,7 +6,7 @@ const diff = require('./render/diff.js');
 const present = require('./render/present.js');
 const { renderFrame } = require('./render/frame.js');
 
-const { QUIT_PROMPT, COMMIT_PROMPT, PUSH_PROMPT } = chrome;
+const { QUIT_PROMPT, PUSH_PROMPT } = chrome;
 const { updatePrompt, dropPrompt } = chrome;
 const { formatBusyStatus, headerText, layoutButtons } = chrome;
 const { DEL_CHAR_BG, ADD_CHAR_BG, paintDiffLine, codeInnerWidth } = diff;
@@ -15,7 +15,6 @@ const { presentCursor, presentRows } = present;
 
 module.exports = {
   QUIT_PROMPT,
-  COMMIT_PROMPT,
   PUSH_PROMPT,
   updatePrompt,
   dropPrompt,