reslop 0.1.9 → 0.2.0

package/lib/remote.js

@@ -0,0 +1,374 @@
+'use strict';
+
+const { delay, jsonParse, isHashObject } = require('metautil');
+const { oneLine } = require('./utilities.js');
+const { itemPath, isPathInScope } = require('./files.js');
+const { parseDiff, itemsFromFiles, isCtxType } = require('./diff/diff.js');
+const { foldDepItems } = require('./deps.js');
+
+const RETRY_ATTEMPTS = 3;
+const RETRY_DELAY_MS = 200;
+const TRANSIENT_STATUS = [429, 502, 503, 504];
+
+const isRecord = isHashObject;
+
+const abortError = (signal) => {
+  if (signal && signal.reason !== undefined) return signal.reason;
+  const error = new Error('This operation was aborted');
+  error.name = 'AbortError';
+  return error;
+};
+
+const isAbortError = (error, signal) => {
+  if (signal && signal.aborted) return true;
+  if (!error || typeof error !== 'object') return false;
+  if (error.name === 'AbortError') return true;
+  if (error.code === 'ABORT') return true;
+  return false;
+};
+
+const throwIfAborted = (signal) => {
+  if (signal && signal.aborted) throw abortError(signal);
+};
+
+const wait = async (ms, abortSignal) => {
+  try {
+    await delay(ms, abortSignal);
+  } catch (error) {
+    throwIfAborted(abortSignal);
+    throw error;
+  }
+};
+
+const createTransport = (deps = {}) => {
+  const fetchImpl = deps.fetch;
+  const signal = deps.signal;
+
+  const retry = async (run, options = {}) => {
+    const attempts = options.attempts ?? RETRY_ATTEMPTS;
+    const delayMs = options.delayMs ?? RETRY_DELAY_MS;
+    const isRetryable = options.isRetryable;
+    for (let i = 0; ; i++) {
+      try {
+        return await run();
+      } catch (error) {
+        if (isAbortError(error, signal)) throw error;
+        const isLast = i === attempts - 1;
+        if (isLast || !isRetryable(error)) throw error;
+        throwIfAborted(signal);
+        await wait(delayMs * (i + 1), signal);
+      }
+    }
+  };
+
+  const request = async (url, options = {}) => {
+    throwIfAborted(signal);
+    if (typeof fetchImpl !== 'function') {
+      throw options.missingFetch();
+    }
+    const headers = options.headers;
+    const method = options.method || 'GET';
+    const body = options.body;
+    const wrapNetwork = options.wrapNetwork;
+    const toHttpError = options.toHttpError;
+    const retryOpts = options.retry ?? {};
+    return retry(
+      async () => {
+        let response;
+        try {
+          const init = { method, headers };
+          if (body !== undefined) init.body = body;
+          if (signal) init.signal = signal;
+          response = await fetchImpl(url, init);
+        } catch (error) {
+          if (isAbortError(error, signal)) throw error;
+          throw wrapNetwork(error);
+        }
+        const text = await response.text();
+        if (!response.ok) throw toHttpError(response.status, text);
+        return { body: text, headers: response.headers };
+      },
+      { ...retryOpts, isRetryable: options.isRetryable },
+    );
+  };
+
+  const listPages = async (url, options = {}) => {
+    const items = [];
+    let next = url;
+    const parsePage = options.parsePage;
+    const nextPage = options.nextPage;
+    while (next) {
+      const page = await request(next, options);
+      const entries = parsePage(page.body);
+      for (const entry of entries) items.push(entry);
+      next = nextPage(page.headers, next);
+    }
+    return items;
+  };
+
+  return { retry, request, listPages };
+};
+
+const headerValue = (headers, name) => {
+  if (!headers) return '';
+  if (typeof headers.get === 'function') {
+    return headers.get(name) || '';
+  }
+  const wanted = name.toLowerCase();
+  for (const key of Object.keys(headers)) {
+    const value = headers[key];
+    if (key.toLowerCase() === wanted) return `${value}`;
+  }
+  return '';
+};
+
+const parseLinkNext = (headers) => {
+  const link = headerValue(headers, 'link');
+  if (!link) return '';
+  for (const part of link.split(',')) {
+    const match = /<([^>]+)>\s*;\s*rel="?next"?/i.exec(part.trim());
+    if (match) return match[1];
+  }
+  return '';
+};
+
+const parseNextPage = (headers, currentUrl) => {
+  const fromLink = parseLinkNext(headers);
+  if (fromLink) return fromLink;
+  const page = headerValue(headers, 'x-next-page');
+  if (!page) return '';
+  const url = new URL(currentUrl);
+  url.searchParams.set('page', page);
+  return url.toString();
+};
+
+const listUrl = (base) => {
+  const url = new URL(base);
+  url.searchParams.set('per_page', '100');
+  return url.toString();
+};
+
+const createClient = ({ name, subject, headers, nextPage }) => {
+  const prefix = name.toUpperCase();
+  const error = (code, message, extra = {}) =>
+    Object.assign(new Error(message), { code: `${prefix}_${code}`, ...extra });
+
+  const parseJson = (text, label, validate = isHashObject) => {
+    const data = jsonParse(text ?? '');
+    if (!validate(data)) throw error('PARSE', `${name} API: invalid ${label}`);
+    return data;
+  };
+
+  const httpError = (status, body, token) => {
+    const text = `${body ?? ''}`.trim();
+    const parsed = jsonParse(text);
+    const fields = name === 'GitLab' ? ['message', 'error'] : ['message'];
+    const field = fields.find((key) => typeof parsed?.[key] === 'string');
+    const message =
+      isHashObject(parsed) && field ? parsed[field] : oneLine(text);
+    if (status === 404) {
+      const hint = token
+        ? ''
+        : ` (set ${prefix}_TOKEN for private repositories)`;
+      return error('NOT_FOUND', `${name} ${subject} not found${hint}`, {
+        status,
+      });
+    }
+    if (status === 401) {
+      return error('AUTH', `${name} authentication failed`, { status });
+    }
+    const rateLimit = status === 403 && /rate limit/i.test(message);
+    if (rateLimit || (name === 'GitLab' && status === 429)) {
+      return error('RATE_LIMIT', `${name} API rate limit exceeded`, { status });
+    }
+    const detail = message ? `: ${oneLine(message)}` : ` HTTP ${status}`;
+    return error('HTTP', `${name} API${detail}`, { status });
+  };
+
+  const policy = (options) => ({
+    retry: options.retry ?? {},
+    isRetryable: (err) =>
+      err.code === `${prefix}_NETWORK` || TRANSIENT_STATUS.includes(err.status),
+    missingFetch: () => error('FETCH', 'fetch is not available'),
+    toHttpError: (status, body) => httpError(status, body, options.token),
+    wrapNetwork: (cause) => {
+      const detail = oneLine(cause && cause.message);
+      const suffix = detail ? `: ${detail}` : '';
+      return error('NETWORK', `${name} request failed${suffix}`, { cause });
+    },
+    method: options.method || 'GET',
+    headers: headers(options.token || '', options.accept),
+  });
+
+  const request = (url, options) => {
+    const init = policy(options);
+    if (options.contentType) init.headers['Content-Type'] = options.contentType;
+    return createTransport(options).request(url, {
+      ...init,
+      body: options.body,
+    });
+  };
+
+  const list = (url, options) =>
+    createTransport(options).listPages(url, {
+      ...policy(options),
+      method: 'GET',
+      parsePage: (text) => parseJson(text, 'list payload', Array.isArray),
+      nextPage,
+    });
+
+  return { parseJson, request, list, subject };
+};
+
+const sideLineNumber = (type, oldNo, newNo, side) => {
+  if (side === 'LEFT') {
+    if (type === 'add') return 0;
+    return oldNo;
+  }
+  if (type === 'del') return 0;
+  return newNo;
+};
+
+const locateLineInItem = (item, rel, line, side) => {
+  const path = itemPath(item);
+  if (path !== rel) return null;
+  const hunk = item.hunk;
+  if (!hunk || !line) return null;
+  let oldNo = hunk.oldStart;
+  let newNo = hunk.newStart;
+  for (const entry of hunk.lines) {
+    const at = sideLineNumber(entry.type, oldNo, newNo, side);
+    if (at === line) {
+      const inBlock = entry.blockId === item.blockId;
+      return { inBlock };
+    }
+    if (isCtxType(entry.type) || entry.type === 'del') {
+      oldNo += 1;
+    }
+    if (isCtxType(entry.type) || entry.type === 'add') {
+      newNo += 1;
+    }
+  }
+  return null;
+};
+
+const findItemForLine = (items, rel, line, side) => {
+  let fallback = null;
+  for (const item of items) {
+    const hit = locateLineInItem(item, rel, line, side);
+    if (!hit) continue;
+    if (hit.inBlock) return item;
+    if (!fallback) fallback = item;
+  }
+  return fallback;
+};
+
+const importedText = (entry, host) => {
+  const reviewer = entry.reviewer || 'unknown';
+  const body = `${entry.body ?? ''}`.trim();
+  return `@${reviewer} review at ${host}: ${body}`;
+};
+
+const importedTodo = (file, entry, host) => ({
+  kind: 'todo',
+  file,
+  text: importedText(entry, host),
+  done: entry.resolved === true,
+});
+
+const importedFeedback = (item, path, entry, host) => {
+  const hunk = item.hunk;
+  return {
+    kind: 'feedback',
+    file: itemPath(item) || path,
+    oldStart: hunk ? hunk.oldStart : 0,
+    newStart: hunk ? hunk.newStart : 0,
+    blockId: item.blockId ?? 0,
+    origin: item.origin ?? 'pr',
+    header: hunk ? hunk.header : '',
+    text: importedText(entry, host),
+    done: entry.resolved === true,
+  };
+};
+
+const noteFromLocation = (items, loc, entry, host, fallbackFile) => {
+  const path = loc.path || '';
+  const line = loc.line;
+  const side = loc.side;
+  if (line && path) {
+    const item = findItemForLine(items, path, line, side);
+    if (item) return importedFeedback(item, path, entry, host);
+  }
+  if (path) return importedTodo(path, entry, host);
+  return importedTodo(fallbackFile, entry, host);
+};
+
+const changePath = (file) => file.newPath || file.oldPath || '';
+
+const filterChangeFiles = (files, paths) => {
+  if (!paths.length) return files;
+  return files.filter((file) => isPathInScope(changePath(file), paths));
+};
+
+const changeFiles = (items) => {
+  const files = new Set();
+  for (const item of items) {
+    const paths = item.dep ? item.dep.files : [itemPath(item)];
+    for (const rel of paths ?? []) {
+      if (rel) files.add(rel);
+    }
+  }
+  return [...files];
+};
+
+const loadChange = async (ref, options, source) => {
+  const { client, url, diffUrl = url, diffAccept } = source;
+  const paths = options.paths ?? [];
+  const request = {
+    fetch: options.fetch ?? globalThis.fetch,
+    token: options.token ?? '',
+    retry: options.retry ?? {},
+    signal: options.signal,
+  };
+  const jsonPage = await client.request(url, request);
+  const data = client.parseJson(jsonPage.body, `${client.subject} payload`);
+  const diffPage = await client.request(diffUrl, {
+    ...request,
+    accept: diffAccept,
+  });
+  const files = filterChangeFiles(parseDiff(diffPage.body), paths);
+  const items = foldDepItems(itemsFromFiles(files, 'pr'));
+  const change = source.toChange(ref, data, items);
+  const sourceLabel = `${source.prefix}${change.number}`;
+  let imported = { feedback: [], todos: [] };
+  try {
+    const discussion = await source.loadDiscussion(ref, request);
+    imported = source.discussionToNotes(discussion, items, paths);
+  } catch (error) {
+    if (isAbortError(error, request.signal)) throw error;
+    // Discussion import is optional.
+  }
+  return { top: options.cwd, items, sourceLabel, change, imported };
+};
+
+module.exports = {
+  RETRY_ATTEMPTS,
+  RETRY_DELAY_MS,
+  TRANSIENT_STATUS,
+  isRecord,
+  isAbortError,
+  createTransport,
+  headerValue,
+  parseLinkNext,
+  parseNextPage,
+  createClient,
+  listUrl,
+  findItemForLine,
+  importedText,
+  importedTodo,
+  noteFromLocation,
+  changePath,
+  filterChangeFiles,
+  changeFiles,
+  loadChange,
+};

package/lib/render/branches.js

@@ -2,13 +2,12 @@
 
 const ansi = require('../ansi.js');
 const primitives = require('./primitives.js');
+const { measureColumns, padColumns, joinColumns, paintColumns } = primitives;
 
 const { THEME, paint, visibleWidth, truncateVisible, seq, EL } = ansi;
-const { fill, padVisible, FILE_MARK, paneResult } = primitives;
+const { fill, FILE_MARK, paneResult } = primitives;
 const { paintCursorList, branchLabel, paintBracketName } = primitives;
 
-const BRANCH_COL_KEYS = ['sha', 'ahead', 'behind', 'gone', 'date'];
-
 const BRANCH_COL_ALIGN = {
   sha: 'end',
   ahead: 'start',
@@ -33,11 +32,6 @@ const BRANCH_CURRENT_COL_FG = {
 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 {
@@ -77,68 +71,12 @@ const branchRowFields = (entry) => {
   return { sha, ahead, behind, gone, date };
 };
 
-const branchColumns = (branches) => {
-  const widths = { name: 0 };
-  for (const key of BRANCH_COL_KEYS) widths[key] = 0;
-  for (const entry of branches) {
-    const nameW = visibleWidth(branchLabel(entry.name));
-    if (nameW > widths.name) widths.name = nameW;
-    const fields = branchRowFields(entry);
-    for (const key of BRANCH_COL_KEYS) {
-      const w = visibleWidth(fields[key]);
-      if (w > widths[key]) widths[key] = w;
-    }
-  }
-  widths.name = Math.min(BRANCH_NAME_MAX, widths.name);
-  return widths;
-};
-
-const branchRowParts = (entry, cols) => {
-  const fields = branchRowFields(entry);
-  const parts = {};
-  for (const key of BRANCH_COL_KEYS) {
-    const width = cols?.[key] ?? visibleWidth(fields[key]);
-    const align = BRANCH_COL_ALIGN[key];
-    parts[key] = padVisible(fields[key], width, align);
-  }
-  return parts;
-};
-
-const joinBranchSuffix = (parts, cols) => {
-  const bits = [];
-  for (const key of BRANCH_COL_KEYS) {
-    if (!cols[key]) continue;
-    bits.push(colGap(key) + parts[key]);
-  }
-  if (!bits.length) return '';
-  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, current) => {
-  const bits = [];
-  for (const key of BRANCH_COL_KEYS) {
-    if (!cols[key]) continue;
-    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 bits.join('');
-};
-
 const paintBranchRow = (entry, width, color, selected, cols) => {
   const inner = Math.max(1, width - BRANCH_EDGE - BRANCH_TAIL);
   const mark = selected ? FILE_MARK : ' ';
   const prefix = ` ${mark} `;
-  const parts = branchRowParts(entry, cols);
-  const suffix = joinBranchSuffix(parts, cols);
+  const parts = padColumns(branchRowFields(entry), cols, BRANCH_COL_ALIGN);
+  const suffix = joinColumns(parts, cols);
   const rest = Math.max(1, inner - visibleWidth(prefix + suffix));
   const nameW = Math.min(cols.name, rest);
   const label = truncateVisible(branchLabel(entry.name), nameW);
@@ -170,7 +108,10 @@ const paintBranchRow = (entry, width, color, selected, cols) => {
     chip.nameBold,
   );
   out += paint(after, markFg, markBg, color);
-  out += paintBranchSuffix(parts, cols, markFg, markBg, color, entry.current);
+  const tones = entry.current
+    ? { ...BRANCH_COL_FG, ...BRANCH_CURRENT_COL_FG }
+    : BRANCH_COL_FG;
+  out += paintColumns(parts, cols, markFg, markBg, color, tones);
   out += paint(tail, markFg, markBg, color);
   return out + edge;
 };
@@ -209,7 +150,12 @@ const paintBranchEdit = (compose, width, color) => {
 
 const paintBodyBranches = (view, width, color, bodyH, headerLines) => {
   const branches = view.branches ?? [];
-  const cols = branchColumns(branches);
+  const cols = measureColumns(branches, branchRowFields, BRANCH_COL_ALIGN);
+  cols.name = 0;
+  for (const entry of branches) {
+    cols.name = Math.max(cols.name, visibleWidth(branchLabel(entry.name)));
+  }
+  cols.name = Math.min(BRANCH_NAME_MAX, cols.name);
   const cursor = view.branchCursor ?? 0;
   const compose = view.compose;
   const editing = compose && compose.kind === 'branch';

package/lib/render/chrome.js

@@ -9,7 +9,7 @@ const { itemPath, TODO_FILE, isTodosEntry, fileTotals } = files;
 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 { COMMITS_DISABLED, TODO_DISABLED, DIFF_DISABLED, UNIT_DISABLED } = keys;
 const { diffGitDisabled, branchGitDisabled, commitGitDisabled } = keys;
 const { CONFIRM, confirmPrefix, promptFromChoices } = keys;
 const { THEME, paint, visibleWidth } = ansi;
@@ -65,6 +65,8 @@ const INFO_STATUS = [
   'saved',
   'reloaded',
   'not a diff block',
+  'file scope',
+  'diff mode',
   'committed',
   'amended',
   'fixup',
@@ -113,8 +115,6 @@ const originLabel = (origin, view) => {
   return origin ?? 'unknown';
 };
 
-const headerRoleFg = (role) => HEADER_ROLE_FG[role] ?? THEME.headerChromeFg;
-
 const pathSegments = (rel) => {
   const segs = [];
   if (!rel) return segs;
@@ -171,6 +171,14 @@ const headerTarget = (view) => {
     const origin = entry.head ? 'HEAD' : 'commit';
     return { path: entry.subject ?? '', origin, n, total };
   }
+  if (pane === 'unit') {
+    const path = view.reviewPath ?? '';
+    const lines = view.unitLines ?? [];
+    const top = Math.max(0, (view.scroll ?? 0) - 1);
+    const n = lines.length ? Math.min(lines.length, top + 1) : 0;
+    const origin = view.item ? originLabel(view.item.origin, view) : 'unit';
+    return { path, origin, n, total: lines.length };
+  }
   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 };
@@ -243,7 +251,8 @@ const paintHeader = (view, width, color) => {
     if (!piece.text) {
       continue;
     }
-    out += `${fg(headerRoleFg(piece.role))}${piece.text}`;
+    const roleFg = HEADER_ROLE_FG[piece.role] ?? THEME.headerChromeFg;
+    out += `${fg(roleFg)}${piece.text}`;
   }
   return `${out}${RESET}`;
 };
@@ -428,12 +437,14 @@ const statusLayout = (view, status, width) => {
 };
 
 const choiceHits = (choices, prefix, y) => {
-  const hits = [];
+  const { length } = choices;
+  const hits = new Array(length);
   let x = visibleWidth(prefix);
-  for (const choice of choices) {
+  for (let i = 0; i < length; i++) {
+    const choice = choices[i];
     const piece = `${choice.lead}${choice.label}`;
     const w = visibleWidth(piece);
-    hits.push({ id: choice.letter, y, x0: x, x1: x + w });
+    hits[i] = { id: choice.letter, y, x0: x, x1: x + w };
     x += w;
   }
   return hits;
@@ -543,6 +554,7 @@ const selectedCommit = (view) => (view.commits ?? [])[view.commitCursor ?? 0];
 const hiddenActions = (view) => {
   const pane = view.pane ?? 'diff';
   if (pane === 'files') return FILES_HIDDEN;
+  if (pane === 'unit') return UNIT_DISABLED;
   if (pane === 'branches') return BRANCHES_DISABLED;
   if (pane === 'commits') return COMMITS_DISABLED;
   if (view.item && view.item.origin === 'todo') return TODO_DISABLED;
@@ -557,7 +569,7 @@ const dimFooterActions = (view) => {
     if (!entry || entry.kind !== 'todos') return [];
     return FILES_GIT_DISABLED;
   }
-  if (pane === 'diff') return diffGitDisabled(view.item);
+  if (pane === 'diff' || pane === 'unit') return diffGitDisabled(view.item);
   if (pane === 'branches') return branchGitDisabled(selectedBranch(view));
   if (pane === 'commits') {
     const entry = selectedCommit(view);
@@ -570,7 +582,10 @@ const dimFooterActions = (view) => {
 
 const extraFooterActions = (view) => {
   const pane = view.pane ?? 'diff';
-  if (pane === 'files') return ['commit', 'pull', 'push'];
+  if (pane === 'files') {
+    const scope = view.fileScope === 'file' ? 'diff' : 'file';
+    return [scope, 'commit', 'pull', 'push'];
+  }
   if (pane === 'branches') return Object.keys(BRANCH_ACTIONS);
   if (pane === 'commits') return Object.keys(COMMIT_ACTIONS);
   return [];

package/lib/render/commits.js

@@ -2,11 +2,10 @@
 
 const ansi = require('../ansi.js');
 const primitives = require('./primitives.js');
+const { measureColumns, padColumns, joinColumns, paintColumns } = primitives;
 
 const { THEME, paint, visibleWidth, truncateVisible, seq, EL } = ansi;
-const { fill, padVisible, FILE_MARK, paneResult, paintCursorList } = primitives;
-
-const COMMIT_COL_KEYS = ['sha', 'author', 'date'];
+const { fill, FILE_MARK, paneResult, paintCursorList } = primitives;
 
 const COMMIT_COL_ALIGN = {
   sha: 'end',
@@ -22,71 +21,19 @@ const COMMIT_COL_FG = {
 
 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 parts = padColumns(commitRowFields(entry), cols, COMMIT_COL_ALIGN);
+  const suffix = joinColumns(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));
@@ -103,14 +50,14 @@ const paintCommitRow = (entry, width, color, selected, cols) => {
   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 += paintColumns(parts, cols, fgRgb, bgRgb, color, COMMIT_COL_FG);
   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 cols = measureColumns(commits, commitRowFields, COMMIT_COL_ALIGN);
   const cursor = view.commitCursor ?? 0;
   const paintRow = (entry, rowWidth, rowColor, selected) =>
     paintCommitRow(entry, rowWidth, rowColor, selected, cols);