reslop 0.2.0 → 0.2.1

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## [Unreleased][unreleased]
 
+## [0.2.1][] - 2026-09-23
+
+- Type a new commit message at the top of the list
+- Improve `fixup!` functions: create and apply
+- Reword the selected commit message with `r`
+- Add light theme: `-light` option and `l` hotkey to switch
+- Support checkbox state in TODOs, UI for state change
+- Reload the file list when leaving todos, branches, or commits
+- Let agents run `editing` reviews and leave `done` files unchanged
+- Skip npm audit and outdated unless package files changed
+- Sync and merge TODOs with file instead of overwriting it
+
 ## [0.2.0][] - 2026-09-22
 
 - Add a full-size file editor
@@ -105,7 +117,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.2.0...HEAD
+[unreleased]: https://github.com/tshemsedinov/reslop/compare/v0.2.1...HEAD
+[0.2.1]: https://github.com/tshemsedinov/reslop/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/tshemsedinov/reslop/compare/v0.1.9...v0.2.0
 [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

package/README.md

@@ -24,7 +24,7 @@ Review → Plan → Repair → Verify
 - 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, drop, pull, and push
+- Commits list: commit, amend, fixup, reword, drop, pull, and push
 - 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
@@ -48,6 +48,7 @@ Works on Linux, macOS, and Windows. On Windows use Windows Terminal.
 - `reslop https://github.com/metarhia/metacom/pull/555` GitHub/GitLab PR/MR
 - `reslop -n` start a new review even if the latest is still editing
 - `reslop -r` read-only mode
+- `reslop -light` light color theme (default dark)
 
 Reviews go in `.review/YYYY-MM-DD-NN.md` with frontmatter `status`:
 

package/lib/ansi.js

@@ -40,7 +40,7 @@ const WIDE_CP = [
   0x1fae9, 0x1faf0, 0x1faf8, 0x20000, 0x2fffd, 0x30000, 0x3fffd,
 ];
 
-const THEME = {
+const DARK_UI = {
   delLineFg: [0xcc, 0x7a, 0x7a],
   delLineBg: [0x3a, 0x1a, 0x1a],
   delCharFg: [0xff, 0xff, 0xff],
@@ -87,7 +87,7 @@ const THEME = {
   stagedAddCharBg: [0x4e, 0x4e, 0x58],
 };
 
-const CODE_FG = {
+const DARK_CODE = {
   keyword: [197, 134, 192],
   control: [197, 134, 192],
   storage: [86, 156, 214],
@@ -122,7 +122,7 @@ const CODE_FG = {
   logDebug: [140, 160, 180],
 };
 
-const LOG_COL_FG = [
+const DARK_LOG_COLS = [
   [210, 210, 220],
   [120, 180, 220],
   [180, 160, 220],
@@ -133,6 +133,143 @@ const LOG_COL_FG = [
   [200, 170, 140],
 ];
 
+const LIGHT_UI = {
+  delLineFg: [0xb3, 0x1d, 0x28],
+  delLineBg: [0xff, 0xeb, 0xe9],
+  delCharFg: [0x1f, 0x23, 0x28],
+  delCharBg: [0xff, 0xc1, 0xc0],
+  addLineFg: [0x1a, 0x7f, 0x37],
+  addLineBg: [0xe6, 0xff, 0xec],
+  addCharFg: [0x1f, 0x23, 0x28],
+  addCharBg: [0xab, 0xf2, 0xbc],
+  ctxFg: [0x57, 0x60, 0x6a],
+  ctxBg: [0xff, 0xff, 0xff],
+  splitGutterFg: [0xea, 0xee, 0xf2],
+  splitGutterBg: [0xea, 0xee, 0xf2],
+  headerFg: [0x24, 0x29, 0x2f],
+  headerBg: [0xd8, 0xde, 0xe4],
+  headerChromeFg: [0x42, 0x4a, 0x53],
+  headerRepoFg: [0x24, 0x29, 0x2f],
+  headerDirFg: [0x57, 0x60, 0x6a],
+  headerSlashFg: [0x8c, 0x95, 0x9f],
+  headerFileFg: [0x1f, 0x23, 0x28],
+  headerMetaFg: [0x42, 0x4a, 0x53],
+  chromeFg: [0x24, 0x29, 0x2f],
+  chromeBg: [0xf0, 0xf2, 0xf5],
+  noteBg: [0xe8, 0xf0, 0xfe],
+  buttonFg: [0x57, 0x60, 0x6a],
+  buttonBg: [0xe1, 0xe5, 0xea],
+  buttonHotFg: [0x0f, 0x14, 0x19],
+  currentBg: [0xac, 0xe1, 0xc2],
+  checkFg: [0x1f, 0x23, 0x28],
+  checkBg: [0xc8, 0xcf, 0xd8],
+  checkDoneFg: [0x0f, 0x3d, 0x1f],
+  checkDoneBg: [0xab, 0xf2, 0xbc],
+  errorFg: [0xcf, 0x22, 0x2e],
+  warnFg: [0x9a, 0x67, 0x00],
+  mutedFg: [0x6e, 0x77, 0x81],
+  shaFg: [0x05, 0x50, 0xae],
+  shaDarkFg: [0x0b, 0x3d, 0x70],
+  stagedDelLineFg: [0x57, 0x60, 0x6a],
+  stagedDelLineBg: [0xf3, 0xf4, 0xf6],
+  stagedDelCharFg: [0x1f, 0x23, 0x28],
+  stagedDelCharBg: [0xd8, 0xdc, 0xe1],
+  stagedAddLineFg: [0x42, 0x4a, 0x53],
+  stagedAddLineBg: [0xea, 0xec, 0xef],
+  stagedAddCharFg: [0x0f, 0x14, 0x19],
+  stagedAddCharBg: [0xcc, 0xd1, 0xd7],
+};
+
+const LIGHT_CODE = {
+  keyword: [175, 0, 219],
+  control: [175, 0, 219],
+  storage: [0, 0, 255],
+  literal: [0, 0, 255],
+  string: [163, 21, 21],
+  template: [163, 21, 21],
+  escape: [238, 0, 0],
+  interpolation: [0, 16, 128],
+  number: [9, 134, 88],
+  comment: [0, 128, 0],
+  function: [121, 94, 38],
+  method: [121, 94, 38],
+  className: [38, 127, 153],
+  type: [38, 127, 153],
+  interface: [38, 127, 153],
+  property: [0, 16, 128],
+  variable: [0, 16, 128],
+  parameter: [0, 16, 128],
+  constant: [0, 112, 193],
+  operator: [60, 60, 60],
+  punct: [60, 60, 60],
+  regex: [129, 31, 63],
+  decorator: [121, 94, 38],
+  tag: [128, 0, 0],
+  attr: [229, 0, 0],
+  plain: [31, 31, 31],
+  punctDim: [140, 140, 140],
+  logDate: [60, 60, 70],
+  logError: [205, 49, 49],
+  logWarn: [160, 110, 0],
+  logInfo: [0, 90, 180],
+  logDebug: [100, 110, 125],
+};
+
+const LIGHT_LOG_COLS = [
+  [60, 60, 70],
+  [0, 95, 150],
+  [110, 70, 170],
+  [30, 120, 60],
+  [150, 95, 20],
+  [170, 50, 90],
+  [20, 120, 120],
+  [130, 90, 50],
+];
+
+const PALETTES = {
+  dark: { ui: DARK_UI, code: DARK_CODE, logCols: DARK_LOG_COLS },
+  light: { ui: LIGHT_UI, code: LIGHT_CODE, logCols: LIGHT_LOG_COLS },
+};
+const THEME_NAMES = Object.keys(PALETTES);
+
+const applyColors = (into, from) => {
+  for (const key of Object.keys(from)) {
+    const src = from[key];
+    let dst = into[key];
+    if (!dst) {
+      dst = [0, 0, 0];
+      into[key] = dst;
+    }
+    dst[0] = src[0];
+    dst[1] = src[1];
+    dst[2] = src[2];
+  }
+  return into;
+};
+
+const cloneColors = (colors) => {
+  const into = Array.isArray(colors) ? [] : {};
+  return applyColors(into, colors);
+};
+
+const THEME = cloneColors(DARK_UI);
+const CODE_FG = cloneColors(DARK_CODE);
+const LOG_COL_FG = cloneColors(DARK_LOG_COLS);
+let currentTheme = 'dark';
+
+const setTheme = (name) => {
+  if (!Object.hasOwn(PALETTES, name)) {
+    throw new Error(`unknown theme ${name}`);
+  }
+  const palette = PALETTES[name];
+  applyColors(THEME, palette.ui);
+  applyColors(CODE_FG, palette.code);
+  applyColors(LOG_COL_FG, palette.logCols);
+  currentTheme = name;
+};
+
+const themeName = () => currentTheme;
+
 const codeFg = (style) => {
   if (typeof style !== 'string') return CODE_FG.plain;
   if (Object.hasOwn(CODE_FG, style)) return CODE_FG[style];
@@ -222,6 +359,10 @@ module.exports = {
   EL,
   THEME,
   CODE_FG,
+  PALETTES,
+  THEME_NAMES,
+  setTheme,
+  themeName,
   codeFg,
   fg,
   bg,

package/lib/api.js

@@ -16,6 +16,8 @@ const cli = require('./cli.js');
 module.exports = {
   THEME: ansi.THEME,
   CODE_FG: ansi.CODE_FG,
+  THEME_NAMES: ansi.THEME_NAMES,
+  setTheme: ansi.setTheme,
   ACTIONS: keys.ACTIONS,
   diffChars: diff.diffChars,
   parseDiff: diff.parseDiff,

package/lib/capabilities.js

@@ -18,6 +18,7 @@ const CHANGE_METHODS = [
   'revertFile',
   'edit',
   'writeFile',
+  'stagePath',
 ];
 
 const BRANCH_METHODS = [
@@ -25,6 +26,7 @@ const BRANCH_METHODS = [
   'commitAsync',
   'hasStaged',
   'lastMessage',
+  'commitMessage',
   'listBranches',
   'listCommits',
   'currentBranch',
@@ -38,6 +40,10 @@ const BRANCH_METHODS = [
   'dropAsync',
   'dropCommit',
   'dropCommitAsync',
+  'applyFixup',
+  'applyFixupAsync',
+  'reword',
+  'rewordAsync',
   'pull',
   'pullAsync',
   'push',

package/lib/cli.js

@@ -10,12 +10,14 @@ const { gitlabToken, loadMergeRequest } = require('./gitlab.js');
 const { selectChangeSource, createLoadedSource } = require('./source.js');
 const { Session } = require('./session.js');
 const { capabilitiesFor, attachCapabilities } = require('./capabilities.js');
+const { setTheme } = require('./ansi.js');
 
 const HEX_REV = /^[0-9a-f]{4,40}$/i;
 const HEAD_REV = /^HEAD([~^].*)?$/i;
 const RANGE_REV = /[~^]/;
 
-const USAGE = 'Usage: reslop [-n] [-r] [path | commit | pr-url | mr-url]';
+const USAGE =
+  'Usage: reslop [-n] [-r] [-light] [path | commit | pr-url | mr-url]';
 
 const REMOTE_CHANGE = {
   pr: {
@@ -48,6 +50,7 @@ const parseArgv = (argv) => {
   const paths = [];
   let newReview = false;
   let readOnly = false;
+  let theme = 'dark';
   for (const arg of argv) {
     if (arg === '-n') {
       newReview = true;
@@ -57,12 +60,16 @@ const parseArgv = (argv) => {
       readOnly = true;
       continue;
     }
+    if (arg === '-light') {
+      theme = 'light';
+      continue;
+    }
     if (arg.startsWith('-')) {
       throw new Error(`unknown option ${arg}`);
     }
     paths.push(arg);
   }
-  return { paths, newReview, readOnly };
+  return { paths, newReview, readOnly, theme };
 };
 
 const looksLikeRev = (spec) => {
@@ -183,6 +190,7 @@ const run = async (proc, deps = {}) => {
     stderr.write(`${USAGE}\n`);
     return 1;
   }
+  setTheme(args.theme);
   let session;
   try {
     session = await loadSession(proc, deps, args);

package/lib/git-branches.js

@@ -1,5 +1,9 @@
 'use strict';
 
+const fs = require('node:fs');
+const os = require('node:os');
+const path = require('node:path');
+
 const { oneLine, requireOk, runGit, runGitAsync } = require('./git.js');
 
 const BRANCH_FORMAT = [
@@ -20,12 +24,15 @@ const PUSH_REJECTED = [
   'updates were rejected',
 ];
 
-const lastMessage = (top) => {
-  const result = runGit(['log', '-1', '--format=%B'], top);
+const commitMessage = (top, sha) => {
+  const spec = `${sha ?? ''}`.trim() || 'HEAD';
+  const result = runGit(['log', '-1', '--format=%B', spec], top);
   if (result.status !== 0) return '';
   return (result.stdout ?? '').replace(/\s+$/, '');
 };
 
+const lastMessage = (top) => commitMessage(top, 'HEAD');
+
 const COMMIT_FORMAT = ['%H', '%h', '%an', '%ar', '%s'].join('%x1f');
 const COMMIT_LIMIT = 256;
 const UNIT = '\x1f';
@@ -120,6 +127,177 @@ const dropCommitAsync = async (top, sha) => {
   await dropOlderCommitAsync(top, target);
 };
 
+const FIXUP_MARK = 'fixup!';
+const AUTOSQUASH_ARGS = [
+  '-c',
+  'sequence.editor=:',
+  'rebase',
+  '--interactive',
+  '--autosquash',
+];
+
+const isFixupSubject = (subject) =>
+  `${subject ?? ''}`.trim().startsWith(FIXUP_MARK);
+
+const fixupRest = (subject) => {
+  let text = `${subject ?? ''}`.trim();
+  while (text.startsWith(FIXUP_MARK)) {
+    text = text.slice(FIXUP_MARK.length).trim();
+  }
+  return text;
+};
+
+const commitSubject = (top, sha) => {
+  const args = ['log', '-1', '--format=%s', sha];
+  const result = requireOk(runGit(args, top), 'log failed');
+  return (result.stdout ?? '').trim();
+};
+
+const ancestorWithSubject = (top, sha, want) => {
+  const args = ['log', `--format=${COMMIT_FORMAT}`, `${sha}^`];
+  const result = runGit(args, top);
+  if (result.status !== 0) return '';
+  for (const line of result.stdout.split('\n')) {
+    if (!line) continue;
+    const entry = parseCommitLine(line, 1);
+    if (entry && entry.subject === want) return entry.sha;
+  }
+  return '';
+};
+
+const applyAutosquash = (top, ontoArgs) => {
+  const result = runGit([...AUTOSQUASH_ARGS, ...ontoArgs], top);
+  const failed = rebaseFailed(result);
+  if (!failed) return;
+  runGit(['rebase', '--abort'], top);
+  throw new Error(oneLine(failed));
+};
+
+const applyAutosquashAsync = async (top, ontoArgs) => {
+  const result = await runGitAsync([...AUTOSQUASH_ARGS, ...ontoArgs], top);
+  const failed = rebaseFailed(result);
+  if (!failed) return;
+  await runGitAsync(['rebase', '--abort'], top);
+  throw new Error(oneLine(failed));
+};
+
+const applyFixupOnto = (top, original, applyRange) => {
+  const parent = runGit(['rev-parse', '--verify', `${original}^`], top);
+  if (parent.status !== 0) return applyRange(top, ['--root']);
+  return applyRange(top, [(parent.stdout ?? '').trim()]);
+};
+
+const applyFixup = (top, sha) => {
+  const spec = namedCommit(sha);
+  const commit = resolveCommit(top, spec);
+  const subject = commitSubject(top, commit);
+  if (!isFixupSubject(subject)) throw new Error('not a fixup commit');
+  const want = fixupRest(subject);
+  if (!want) throw new Error('no fixup target');
+  const original = ancestorWithSubject(top, commit, want);
+  if (!original) throw new Error('no fixup target');
+  applyFixupOnto(top, original, applyAutosquash);
+};
+
+const applyFixupAsync = async (top, sha) => {
+  const spec = namedCommit(sha);
+  const commit = resolveCommit(top, spec);
+  const subject = commitSubject(top, commit);
+  if (!isFixupSubject(subject)) throw new Error('not a fixup commit');
+  const want = fixupRest(subject);
+  if (!want) throw new Error('no fixup target');
+  const original = ancestorWithSubject(top, commit, want);
+  if (!original) throw new Error('no fixup target');
+  await applyFixupOnto(top, original, applyAutosquashAsync);
+};
+
+const messageBody = (message) => {
+  const text = `${message ?? ''}`;
+  return text.endsWith('\n') ? text : `${text}\n`;
+};
+
+const rewordHead = (top, message) => {
+  const args = ['commit', '--amend', '--only', '-F', '-'];
+  requireOk(runGit(args, top, messageBody(message)));
+};
+
+const REWORD_TODO = path.join(__dirname, 'git-reword-todo.js');
+
+const prepareRewordEditor = (message) => {
+  const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'reslop-reword-'));
+  const msgFile = path.join(dir, 'MSG');
+  fs.writeFileSync(msgFile, messageBody(message));
+  const node = JSON.stringify(process.execPath);
+  const script = JSON.stringify(REWORD_TODO);
+  return {
+    dir,
+    env: {
+      GIT_SEQUENCE_EDITOR: `${node} ${script}`,
+      RESLOP_REWORD_FILE: msgFile,
+    },
+  };
+};
+
+const rewordRange = (top, sha, env) => {
+  const parent = runGit(['rev-parse', '--verify', `${sha}^`], top);
+  const onto =
+    parent.status !== 0 ? ['--root'] : [(parent.stdout ?? '').trim()];
+  return runGit(['rebase', '--interactive', ...onto], top, undefined, { env });
+};
+
+const rewordRangeAsync = async (top, sha, env) => {
+  const parent = runGit(['rev-parse', '--verify', `${sha}^`], top);
+  const onto =
+    parent.status !== 0 ? ['--root'] : [(parent.stdout ?? '').trim()];
+  return runGitAsync(['rebase', '--interactive', ...onto], top, { env });
+};
+
+const finishRewordRebase = (top, result) => {
+  const failed = rebaseFailed(result);
+  if (!failed) return;
+  runGit(['rebase', '--abort'], top);
+  throw new Error(oneLine(failed));
+};
+
+const rewordOlder = (top, sha, message) => {
+  const prepared = prepareRewordEditor(message);
+  try {
+    const result = rewordRange(top, sha, prepared.env);
+    finishRewordRebase(top, result);
+  } finally {
+    fs.rmSync(prepared.dir, { recursive: true, force: true });
+  }
+};
+
+const rewordOlderAsync = async (top, sha, message) => {
+  const prepared = prepareRewordEditor(message);
+  try {
+    const result = await rewordRangeAsync(top, sha, prepared.env);
+    const failed = rebaseFailed(result);
+    if (!failed) return;
+    await runGitAsync(['rebase', '--abort'], top);
+    throw new Error(oneLine(failed));
+  } finally {
+    fs.rmSync(prepared.dir, { recursive: true, force: true });
+  }
+};
+
+const rewordCommit = (top, sha, message) => {
+  const spec = namedCommit(sha);
+  const commit = resolveCommit(top, spec);
+  const head = resolveCommit(top, 'HEAD');
+  if (commit === head) return void rewordHead(top, message);
+  rewordOlder(top, commit, message);
+};
+
+const rewordCommitAsync = async (top, sha, message) => {
+  const spec = namedCommit(sha);
+  const commit = resolveCommit(top, spec);
+  const head = resolveCommit(top, 'HEAD');
+  if (commit === head) return void rewordHead(top, message);
+  await rewordOlderAsync(top, commit, message);
+};
+
 const parseTrack = (text) => {
   const raw = `${text ?? ''}`.trim().replace(/^\[|\]$/g, '');
   if (!raw) return { ahead: 0, behind: 0, gone: false };
@@ -338,10 +516,6 @@ const hasStaged = (top) => {
 };
 
 const commitPlan = (kind, message) => {
-  if (kind === 'fixup') {
-    const target = (message ?? '').trim() || 'HEAD';
-    return { args: ['commit', `--fixup=${target}`], body: undefined };
-  }
   const args = ['commit'];
   if (kind === 'amend') args.push('--amend');
   args.push('-F', '-');
@@ -362,6 +536,7 @@ const commitChangesAsync = async (top, kind, message) => {
 
 module.exports = {
   lastMessage,
+  commitMessage,
   listCommits,
   listBranches,
   checkoutBranch,
@@ -372,6 +547,10 @@ module.exports = {
   rebaseBranchAsync,
   dropCommit,
   dropCommitAsync,
+  applyFixup,
+  applyFixupAsync,
+  rewordCommit,
+  rewordCommitAsync,
   dropBranch,
   dropBranchAsync,
   pullChanges,

package/lib/git-reword-todo.js

@@ -0,0 +1,20 @@
+'use strict';
+
+const fs = require('node:fs');
+
+const file = process.argv[process.argv.length - 1];
+const msg = process.env.RESLOP_REWORD_FILE;
+if (!file || !msg) process.exit(1);
+const text = fs.readFileSync(file, 'utf8');
+const rows = text.split('\n');
+const out = [];
+let seen = false;
+for (const row of rows) {
+  out.push(row);
+  if (seen) continue;
+  if (!/^(pick|p)\s+/.test(row)) continue;
+  const spec = JSON.stringify(msg);
+  out.push(`exec git commit --amend --only -F ${spec}`);
+  seen = true;
+}
+fs.writeFileSync(file, out.join('\n'));

package/lib/git.js

@@ -25,7 +25,7 @@ const GIT_MAX_BUFFER = proc.DEFAULT_MAX_BUFFER;
 
 const gitProcOptions = (cwd, extra = {}) => ({
   cwd,
-  env: { ...process.env, GIT_OPTIONAL_LOCKS: '0' },
+  env: { ...process.env, GIT_OPTIONAL_LOCKS: '0', ...extra.env },
   encoding: GIT_ENCODING,
   maxBuffer: GIT_MAX_BUFFER,
   input: extra.input,
@@ -45,8 +45,8 @@ const requireOk = (result, fallback = 'git failed') => {
   throw new Error(oneLine(msg, fallback));
 };
 
-const runGit = (args, cwd, input) => {
-  const options = gitProcOptions(cwd, { input });
+const runGit = (args, cwd, input, extra = {}) => {
+  const options = gitProcOptions(cwd, { input, env: extra.env });
   return gitResult(runProcSync('git', args, options));
 };
 
@@ -503,6 +503,11 @@ const writeFile = (top, rel, text) => {
   writeWorktree(abs, text);
 };
 
+const stagePath = (top, rel) => {
+  if (!rel) return;
+  requireOk(runGit(['add', '--', rel], top));
+};
+
 module.exports = {
   oneLine,
   requireOk,
@@ -521,6 +526,7 @@ module.exports = {
   readSnapshotAsync,
   editItem,
   writeFile,
+  stagePath,
 };
 
 const branches = require('./git-branches.js');
@@ -590,10 +596,12 @@ const createGitRepo = () =>
       revertFile: revertGitFile,
       edit: editItem,
       writeFile,
+      stagePath,
       commit: branches.commitChanges,
       commitAsync: branches.commitChangesAsync,
       hasStaged: branches.hasStaged,
       lastMessage: branches.lastMessage,
+      commitMessage: branches.commitMessage,
       listBranches: branches.listBranches,
       listCommits: branches.listCommits,
       currentBranch,
@@ -607,6 +615,10 @@ const createGitRepo = () =>
       dropAsync: branches.dropBranchAsync,
       dropCommit: branches.dropCommit,
       dropCommitAsync: branches.dropCommitAsync,
+      applyFixup: branches.applyFixup,
+      applyFixupAsync: branches.applyFixupAsync,
+      reword: branches.rewordCommit,
+      rewordAsync: branches.rewordCommitAsync,
       pull: branches.pullChanges,
       pullAsync: branches.pullChangesAsync,
       push: branches.pushChanges,
@@ -628,6 +640,7 @@ module.exports.commitChangesAsync = branches.commitChangesAsync;
 module.exports.hasStaged = branches.hasStaged;
 module.exports.currentBranch = currentBranch;
 module.exports.lastMessage = branches.lastMessage;
+module.exports.commitMessage = branches.commitMessage;
 module.exports.listBranches = branches.listBranches;
 module.exports.listCommits = branches.listCommits;
 module.exports.checkoutBranch = branches.checkoutBranch;
@@ -640,6 +653,10 @@ module.exports.dropBranch = branches.dropBranch;
 module.exports.dropBranchAsync = branches.dropBranchAsync;
 module.exports.dropCommit = branches.dropCommit;
 module.exports.dropCommitAsync = branches.dropCommitAsync;
+module.exports.applyFixup = branches.applyFixup;
+module.exports.applyFixupAsync = branches.applyFixupAsync;
+module.exports.rewordCommit = branches.rewordCommit;
+module.exports.rewordCommitAsync = branches.rewordCommitAsync;
 module.exports.pullChanges = branches.pullChanges;
 module.exports.pullChangesAsync = branches.pullChangesAsync;
 module.exports.pushChanges = branches.pushChanges;

package/lib/render/branches.js

@@ -6,7 +6,8 @@ const { measureColumns, padColumns, joinColumns, paintColumns } = primitives;
 
 const { THEME, paint, visibleWidth, truncateVisible, seq, EL } = ansi;
 const { fill, FILE_MARK, paneResult } = primitives;
-const { paintCursorList, branchLabel, paintBracketName } = primitives;
+const { paintCursorList, paintListEdit } = primitives;
+const { branchLabel, paintBracketName } = primitives;
 
 const BRANCH_COL_ALIGN = {
   sha: 'end',
@@ -116,37 +117,8 @@ const paintBranchRow = (entry, width, color, selected, cols) => {
   return out + edge;
 };
 
-const paintBranchEdit = (compose, width, color) => {
-  const inner = Math.max(1, width - BRANCH_EDGE);
-  const prefix = ` ${FILE_MARK} `;
-  const prefixW = visibleWidth(prefix);
-  const rest = Math.max(1, inner - prefixW);
-  const text = compose.text ?? '';
-  const label = `[${text}]`;
-  const clipped = truncateVisible(label, rest);
-  const pad = Math.max(0, rest - visibleWidth(clipped));
-  const left = `${prefix}${clipped}${' '.repeat(pad)}`;
-  const fgRgb = THEME.chromeFg;
-  const bgRgb = THEME.buttonBg;
-  const edge = fill(BRANCH_EDGE, fgRgb, THEME.ctxBg, color);
-  let row = `${left}${edge}`;
-  if (color) {
-    const gap = ' '.repeat(pad);
-    row = `${seq(fgRgb, bgRgb)}${EL}`;
-    row += paint(prefix, fgRgb, bgRgb, color);
-    row += paintBracketName(
-      clipped,
-      THEME.buttonHotFg,
-      THEME.mutedFg,
-      bgRgb,
-      color,
-    );
-    row += paint(gap, fgRgb, bgRgb, color);
-    row += edge;
-  }
-  const col = Math.min((compose.cursor ?? 0) + 1, visibleWidth(clipped));
-  return { row, cursor: { x: prefixW + col + 1 } };
-};
+const paintBranchEdit = (compose, width, color) =>
+  paintListEdit(compose, width, color, BRANCH_EDGE);
 
 const paintBodyBranches = (view, width, color, bodyH, headerLines) => {
   const branches = view.branches ?? [];