reslop 0.1.6 → 0.1.7

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## [Unreleased][unreleased]
 
+## [0.1.7][] - 2026-09-16
+
+- Make TODOs repo-wide, not per-file todos
+- Improve TODO screen and files screen TUI/TUX including hotkeys
+- Implement branch rebase and drop
+- Improve branch screen TUI/TUX
+- Fix TODOs autosave bug with todo duplication
+
 ## [0.1.6][] - 2026-09-15
 
 - Auto updates for patch/minor, y/n per new major
@@ -58,7 +66,9 @@
 - 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.5...HEAD
+[unreleased]: https://github.com/tshemsedinov/reslop/compare/v0.1.7...HEAD
+[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
 [0.1.5]: https://github.com/tshemsedinov/reslop/compare/v0.1.4...v0.1.5
 [0.1.4]: https://github.com/tshemsedinov/reslop/compare/v0.1.3...v0.1.4
 [0.1.3]: https://github.com/tshemsedinov/reslop/compare/v0.1.2...v0.1.3

package/README.md

@@ -1,4 +1,4 @@
-# 👁️ reslop — Review diff 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,12 +16,15 @@ 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.
-- Leave feedback, todos, and in-place code proposals that become a repair plan.
 - 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.
 
 ## Install
 
@@ -49,23 +52,34 @@ Reviews go in `.review/YYYY-MM-DD-NN.md` with frontmatter `status`:
 
 ## Hotkeys
 
-| Key                 | Action                                          |
-| ------------------- | ----------------------------------------------- |
-| `a` / `u` / `d`     | Stage / unstage / drop this diff                |
-| `c`                 | Commit: then `c` commit / `a` amend / `f` fixup |
-| `b`                 | List branches; `b, n` new branch                |
-| `p` / `s`           | git pull/push                                   |
-| `f` / `t` / `e`     | Add feedback / todo / edit diff text            |
-| `r`                 | Reload diffs from disk                          |
-| `m`                 | Mode: unified / mixed / side-by-side            |
-| `⏎`                 | Open the selected file                          |
-| `→` / `j`           | Next remaining diff / next file                 |
-| `←` / `k`           | Previous remaining diff / previous 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                                            |
+| 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       |
+| `r`                 | Reload diffs from disk                        |
+| `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.
 
 ## License
 

package/lib/ansi.js

@@ -74,6 +74,7 @@ const THEME = {
   errorFg: [0xff, 0x80, 0x80],
   warnFg: [0xe8, 0xc8, 0x4a],
   mutedFg: [0x7a, 0x7a, 0x8a],
+  shaFg: [0x56, 0x9c, 0xd6],
   stagedDelLineFg: [0xa0, 0xa0, 0xa8],
   stagedDelLineBg: [0x20, 0x20, 0x26],
   stagedDelCharFg: [0xf0, 0xf0, 0xf4],

package/lib/files.js

@@ -2,6 +2,8 @@
 
 const REVIEW_DIR = '.review';
 const ORIGIN_ORDER = ['staged', 'unstaged', 'untracked', 'commit', 'pr'];
+const TODO_FILE = 'TODOs';
+const REPO_TODOS_LABEL = 'Repository TODOs and Issues';
 
 const normalizePathSpec = (spec) =>
   `${spec ?? ''}`.replaceAll('\\', '/').replace(/\/+$/, '');
@@ -21,14 +23,34 @@ const itemPath = (item) => {
   return item.file.newPath || item.file.oldPath || '';
 };
 
+const isTodoItem = (item) => !!(item && item.origin === 'todo');
+
+const isTodosEntry = (entry) => !!(entry && entry.kind === 'todos');
+
+const repoTodosLabel = () => REPO_TODOS_LABEL;
+
+const makeTodoItem = () => ({
+  origin: 'todo',
+  file: {
+    oldPath: TODO_FILE,
+    newPath: TODO_FILE,
+    isNew: false,
+    isDeleted: false,
+    isBinary: false,
+    preamble: [],
+    hunks: [],
+  },
+  hunk: null,
+  blockId: 'todo',
+  patchAdd: '',
+  patchRevert: '',
+});
+
 const fileStatus = (origins) => {
   const present = new Set(origins);
   const seen = ORIGIN_ORDER.filter((origin) => present.has(origin));
   const key = seen.join('+');
-  if (!key) {
-    if (present.has('todo')) return 'todo';
-    return '';
-  }
+  if (!key) return '';
   if (key === 'staged+unstaged') return 'partial';
   return key;
 };
@@ -51,6 +73,7 @@ const fileEntries = (items) => {
   const groups = new Map();
   for (let i = 0; i < items.length; i++) {
     const item = items[i];
+    if (isTodoItem(item)) continue;
     const rel = itemPath(item);
     if (!groups.has(rel)) {
       groups.set(rel, {
@@ -87,8 +110,14 @@ const fileEntries = (items) => {
 
 module.exports = {
   REVIEW_DIR,
+  TODO_FILE,
+  REPO_TODOS_LABEL,
   isPathInScope,
   itemPath,
+  isTodoItem,
+  isTodosEntry,
+  repoTodosLabel,
+  makeTodoItem,
   fileStatus,
   fileEntries,
 };

package/lib/git.js

@@ -1032,6 +1032,39 @@ 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);
+  const failed = rebaseFailed(result);
+  if (!failed) return;
+  runGit(['rebase', '--abort'], top);
+  throw new Error(oneLine(failed));
+};
+
+const rebaseBranchAsync = async (top, onto) => {
+  const branch = namedBranch(onto);
+  const result = await runGitAsync(['rebase', branch], top);
+  const failed = rebaseFailed(result);
+  if (!failed) return;
+  await runGitAsync(['rebase', '--abort'], top);
+  throw new Error(oneLine(failed));
+};
+
+const dropBranch = (top, name) => {
+  const branch = namedBranch(name);
+  requireOk(runGit(['branch', '-D', branch], top), 'drop failed');
+};
+
+const dropBranchAsync = async (top, name) => {
+  const branch = namedBranch(name);
+  requireOk(await runGitAsync(['branch', '-D', branch], top), 'drop failed');
+};
+
 const pullChanges = (top) => {
   requireOk(runGit(['pull'], top), 'pull failed');
 };
@@ -1159,6 +1192,10 @@ const createGitRepo = () => ({
   checkoutAsync: checkoutBranchAsync,
   createBranch,
   createBranchAsync,
+  rebase: rebaseBranch,
+  rebaseAsync: rebaseBranchAsync,
+  drop: dropBranch,
+  dropAsync: dropBranchAsync,
   pull: pullChanges,
   pullAsync: pullChangesAsync,
   push: pushChanges,
@@ -1182,6 +1219,10 @@ module.exports = {
   checkoutBranchAsync,
   createBranch,
   createBranchAsync,
+  rebaseBranch,
+  rebaseBranchAsync,
+  dropBranch,
+  dropBranchAsync,
   pullChanges,
   pullChangesAsync,
   pushChanges,

package/lib/keys.js

@@ -21,6 +21,8 @@ const ACTION_IDS = Object.keys(ACTIONS);
 
 const BRANCH_ACTIONS = {
   newBranch: ['n'],
+  rebase: ['r'],
+  drop: ['d'],
 };
 
 const ACTION_HOT = {
@@ -34,16 +36,22 @@ const ACTION_LABEL = {
   code: 'edit',
   newBranch: 'new',
   quit: 'q',
+  prev: '←',
+  next: '→',
 };
 
-const DIFF_DISABLED = ['reload', 'branch', 'pull', 'push'];
+const DIFF_DISABLED = ['commit', 'reload', 'branch', 'pull', 'push'];
 const FILES_DISABLED = ['layout', 'feedback', 'code'];
+const FILES_GIT_DISABLED = ['add', 'unstage', 'revert'];
+const FILES_TODO_DISABLED = [...FILES_GIT_DISABLED, ...FILES_DISABLED];
 const TODO_DISABLED = [
   'add',
   'unstage',
   'revert',
+  'commit',
   'layout',
   'feedback',
+  'todo',
   'code',
   'reload',
   'branch',
@@ -65,11 +73,28 @@ const BRANCHES_DISABLED = [
   'push',
 ];
 
+const isTodosTarget = (item) =>
+  !!(item && (item.kind === 'todos' || item.origin === 'todo'));
+
+const diffGitDisabled = (item) => {
+  if (!item || isTodosTarget(item)) return [];
+  if (item.origin === 'staged') return ['add'];
+  return ['unstage'];
+};
+
+const branchGitDisabled = (item) => {
+  if (item && !item.current) return [];
+  return ['rebase', 'drop'];
+};
+
 const disabledActions = (pane, item) => {
-  if (pane === 'files') return FILES_DISABLED;
-  if (pane === 'branches') return BRANCHES_DISABLED;
-  if (item && item.origin === 'todo') return TODO_DISABLED;
-  return DIFF_DISABLED;
+  const onTodos = isTodosTarget(item);
+  if (pane === 'files') return onTodos ? FILES_TODO_DISABLED : FILES_DISABLED;
+  if (pane === 'branches') {
+    return [...BRANCHES_DISABLED, ...branchGitDisabled(item)];
+  }
+  if (onTodos) return TODO_DISABLED;
+  return [...DIFF_DISABLED, ...diffGitDisabled(item)];
 };
 
 const SCROLL = {
@@ -243,7 +268,7 @@ const actionKeys = (id) => ACTIONS[id] ?? BRANCH_ACTIONS[id] ?? [];
 
 const actionHot = (id) => ACTION_HOT[id] ?? actionKeys(id)[0];
 
-const actionLabel = (id) => ACTION_HOT[id] ?? ACTION_LABEL[id] ?? id;
+const actionLabel = (id) => ACTION_LABEL[id] ?? ACTION_HOT[id] ?? id;
 
 const actionLetter = actionHot;
 
@@ -267,9 +292,13 @@ module.exports = {
   BRANCH_ACTIONS,
   DIFF_DISABLED,
   FILES_DISABLED,
+  FILES_GIT_DISABLED,
+  FILES_TODO_DISABLED,
   TODO_DISABLED,
   BRANCHES_DISABLED,
   disabledActions,
+  diffGitDisabled,
+  branchGitDisabled,
   decodeChunk,
   actionFromKey,
   actionHot,

package/lib/render.js

@@ -6,15 +6,18 @@ const highlight = require('./highlight.js');
 const { detectLang } = require('./detect.js');
 const keys = require('./keys.js');
 const { overlayRows } = require('./select.js');
-const { itemPath } = require('./files.js');
+const files = require('./files.js');
+const { itemPath, TODO_FILE, isTodosEntry, REPO_TODOS_LABEL } = files;
 const wrap = require('./wrap.js');
 
 const { tokenize, overlayTokens } = highlight;
 const { ACTION_IDS, BRANCH_ACTIONS, actionLetter, buttonWord } = keys;
-const { disabledActions } = keys;
+const { FILES_DISABLED, FILES_GIT_DISABLED, BRANCHES_DISABLED } = keys;
+const { TODO_DISABLED, DIFF_DISABLED, diffGitDisabled } = keys;
+const { branchGitDisabled } = keys;
 const { wrapPlain, wrapMultiline, cursorInWrap } = wrap;
 const { THEME, CODE_FG, codeFg, paint, visibleWidth } = ansi;
-const { truncateVisible, fg, RESET, ESC, EL, seq } = ansi;
+const { truncateVisible, fg, RESET, ESC, EL, seq, BOLD } = ansi;
 
 const STYLES = {
   del: {
@@ -124,7 +127,7 @@ const BRANCH_COL_ALIGN = {
 };
 
 const BRANCH_COL_FG = {
-  sha: THEME.mutedFg,
+  sha: THEME.shaFg,
   ahead: THEME.addLineFg,
   behind: THEME.delLineFg,
   gone: THEME.delLineFg,
@@ -145,6 +148,8 @@ const BUSY_PROGRESS = [
   'npm audit fix',
   'checking out',
   'creating branch',
+  'rebasing',
+  'dropping',
   'committing',
   'force pushing',
 ];
@@ -190,17 +195,18 @@ const INFO_STATUS = [
   'force pushed',
   'checking out',
   'creating branch',
+  'rebasing',
+  'dropping',
   'committing',
   'checked out',
   'created',
   'empty branch name',
 ];
-const INFO_PREFIX = ['checked out ', 'created '];
+const INFO_PREFIX = ['checked out ', 'created ', 'rebased onto ', 'dropped '];
 
 const QUIT_CHOICES = [
   { letter: 'f', label: 'finish as ready', lead: ' ' },
   { letter: 'c', label: 'continue next time', lead: '  ' },
-  { letter: 'd', label: 'discard', lead: '  ' },
 ];
 const QUIT_PROMPT = QUIT_CHOICES.map(
   (choice) => `${choice.lead}${choice.label}`,
@@ -215,9 +221,10 @@ const COMMIT_PROMPT = COMMIT_CHOICES.map(
 ).join('');
 const UPDATE_CHOICES = [
   { letter: 'y', label: 'y', lead: ' ' },
-  { letter: 'n', label: 'n', lead: '  ' },
+  { letter: 'n', label: 'n', lead: '/' },
 ];
-const updatePrompt = (from, to) => ` update reslop ${from} → ${to}? y  n`;
+const updatePrompt = (from, to) => ` update reslop ${from} → ${to}? y/n`;
+const dropPrompt = (name) => ` drop ${name}? y/n`;
 const PUSH_CHOICES = [{ letter: 'f', label: 'force push', lead: ' ' }];
 const PUSH_REJECT_PREFIX = ' Need force-push?';
 const PUSH_PROMPT = `${PUSH_REJECT_PREFIX} force push`;
@@ -230,7 +237,6 @@ const LOGO = '👁️';
 const FILE_MARK = '▶';
 const FILE_LIST_PAD = 1;
 const CHECK_DONE = 'xX';
-const TODO_CAPTION = 'TODO:';
 const INPUT_MAX = 4;
 const NOTE_MAX = 4;
 const NOTE_PAD = 1;
@@ -423,6 +429,9 @@ const headerTarget = (view) => {
     const total = files.length;
     const n = total ? cursor + 1 : 0;
     if (!entry) return { path: '', origin: '', n, total };
+    if (isTodosEntry(entry)) {
+      return { path: TODO_FILE, origin: 'todo', n, total };
+    }
     return { path: entry.path, origin: entry.status, n, total };
   }
   if (pane === 'branches') {
@@ -441,6 +450,9 @@ const headerTarget = (view) => {
     return { path: entry.name, 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 };
+  }
   return {
     path: itemPath(view.item),
     origin: originLabel(view.item.origin, view),
@@ -574,7 +586,13 @@ const paintMarkedWord = (label, letter, color, mark) => {
   return out;
 };
 
-const layoutButtons = (width, compact = false, hidden = [], extra = []) => {
+const layoutButtons = (
+  width,
+  compact = false,
+  hidden = [],
+  extra = [],
+  disabled = [],
+) => {
   const ids = [];
   for (const id of ACTION_IDS) {
     if (id === 'quit') {
@@ -596,8 +614,9 @@ const layoutButtons = (width, compact = false, hidden = [], extra = []) => {
       const piece = `${BUTTON_GAP}${label}`;
       const w = visibleWidth(piece);
       if (x + w > width && parts.length) break;
-      hits.push({ id, x0: x, x1: x + w });
-      parts.push({ action: { id }, piece, letter, label });
+      const off = disabled.includes(id);
+      if (!off) hits.push({ id, x0: x, x1: x + w });
+      parts.push({ action: { id }, piece, letter, label, disabled: off });
       x += w;
     }
     return { hits, parts, width: x };
@@ -611,9 +630,12 @@ const layoutButtons = (width, compact = false, hidden = [], extra = []) => {
 const paintButtons = (layout, width, color) => {
   let out = '';
   let used = 0;
+  const fgRgb = THEME.buttonFg;
+  const bgRgb = THEME.buttonBg;
   for (const part of layout.parts) {
-    out += paint(BUTTON_GAP, THEME.buttonFg, THEME.buttonBg, color);
-    out += paintMarkedWord(part.label, part.letter, color, BUTTON_MARK);
+    out += paint(BUTTON_GAP, fgRgb, bgRgb, color);
+    if (part.disabled) out += paint(part.label, fgRgb, bgRgb, color);
+    else out += paintMarkedWord(part.label, part.letter, color, BUTTON_MARK);
     used += visibleWidth(part.piece);
   }
   if (used < width) {
@@ -628,6 +650,31 @@ const branchLabel = (name) => {
   return `[${branch}]`;
 };
 
+const branchNameChip = (entry, rowBg) => {
+  if (entry.current) {
+    return {
+      nameFg: THEME.headerFg,
+      wrapFg: THEME.mutedFg,
+      nameBg: THEME.buttonHotFg,
+      nameBold: false,
+    };
+  }
+  if (entry.isDefault) {
+    return {
+      nameFg: THEME.warnFg,
+      wrapFg: THEME.mutedFg,
+      nameBg: rowBg,
+      nameBold: true,
+    };
+  }
+  return {
+    nameFg: THEME.buttonHotFg,
+    wrapFg: THEME.mutedFg,
+    nameBg: rowBg,
+    nameBold: false,
+  };
+};
+
 const splitBracketName = (label) => {
   const text = `${label ?? ''}`;
   const open = text.startsWith('[') ? '[' : '';
@@ -637,11 +684,11 @@ const splitBracketName = (label) => {
   return { open, name, close };
 };
 
-const paintBracketName = (label, nameFg, wrapFg, bgRgb, color) => {
+const paintBracketName = (label, nameFg, wrapFg, bgRgb, color, nameBold) => {
   const { open, name, close } = splitBracketName(label);
   return (
     paint(open, wrapFg, bgRgb, color, true) +
-    paint(name, nameFg, bgRgb, color) +
+    paint(name, nameFg, bgRgb, color, nameBold) +
     paint(close, wrapFg, bgRgb, color, true)
   );
 };
@@ -746,6 +793,11 @@ const paintStatusLine = (view, status, width, color) => {
     const prefix = ` update reslop ${from} → ${to}?`;
     return paintChoicePrompt(UPDATE_CHOICES, width, color, prefix);
   }
+  if (mode === 'confirmDrop') {
+    const name = view.dropName ?? '';
+    const prefix = ` drop ${name}?`;
+    return paintChoicePrompt(UPDATE_CHOICES, width, color, prefix);
+  }
   if (mode === 'confirmPush') {
     return paintChoicePrompt(PUSH_CHOICES, width, color, PUSH_REJECT_PREFIX);
   }
@@ -782,6 +834,7 @@ const statusBranchHit = (view, width, y) => {
   if (mode === 'confirmQuit') return null;
   if (mode === 'confirmCommit') return null;
   if (mode === 'confirmUpdate') return null;
+  if (mode === 'confirmDrop') return null;
   if (mode === 'confirmPush') return null;
   const branch = view.branch ?? '';
   if (!branchLabel(branch)) return null;
@@ -807,6 +860,11 @@ const statusBranchHit = (view, width, y) => {
 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 };
+  }
   const { added, removed, staged, remaining } = entry;
   const add = signedCount('+', added);
   const del = signedCount('-', removed);
@@ -873,7 +931,30 @@ const paintFileSuffix = (parts, fgRgb, bgRgb, color) => {
   return gap + counts + gap + meta;
 };
 
+const paintTodosRow = (entry, width, color, selected, cols) => {
+  const inner = Math.max(1, width - 1);
+  const mark = selected ? FILE_MARK : ' ';
+  const prefix = ` ${mark} `;
+  const parts = fileRowParts(entry, cols);
+  const suffix = joinFileSuffix(parts);
+  const pathW = Math.max(1, inner - visibleWidth(prefix + suffix));
+  const clipped = truncateVisible(entry.path, pathW);
+  const pad = Math.max(0, pathW - visibleWidth(clipped));
+  const left = `${prefix}${clipped}${' '.repeat(pad)}`;
+  const fgRgb = THEME.buttonHotFg;
+  const bgRgb = selected ? THEME.buttonBg : THEME.ctxBg;
+  const edge = fill(1, fgRgb, bgRgb, color);
+  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);
+  return out + edge;
+};
+
 const paintFileRow = (entry, width, color, selected, cols) => {
+  if (isTodosEntry(entry)) {
+    return paintTodosRow(entry, width, color, selected, cols);
+  }
   const inner = Math.max(1, width - 1);
   const mark = selected ? FILE_MARK : ' ';
   const prefix = ` ${mark} `;
@@ -1164,13 +1245,19 @@ const paintBranchRow = (entry, width, color, selected, cols) => {
   const left = `${prefix}${label}${after}`;
   const fgRgb = branchRowFg(entry, selected);
   const bgRgb = selected ? THEME.buttonBg : THEME.ctxBg;
-  const nameFg = entry.isDefault ? THEME.headerFg : THEME.buttonHotFg;
-  const nameBg = entry.isDefault ? THEME.buttonHotFg : bgRgb;
+  const chip = branchNameChip(entry, bgRgb);
   const edge = fill(1, fgRgb, bgRgb, color);
   if (!color) return `${left}${suffix}${edge}`;
   let out = `${seq(fgRgb, bgRgb)}${EL}`;
   out += paint(prefix, fgRgb, bgRgb, color);
-  out += paintBracketName(label, nameFg, THEME.mutedFg, nameBg, color);
+  out += paintBracketName(
+    label,
+    chip.nameFg,
+    chip.wrapFg,
+    chip.nameBg,
+    color,
+    chip.nameBold,
+  );
   out += paint(after, fgRgb, bgRgb, color);
   out += paintBranchSuffix(parts, cols, fgRgb, bgRgb, color);
   return out + edge;
@@ -1229,8 +1316,16 @@ const paintBodyBranches = (view, width, color, bodyH, headerLines) => {
   );
 };
 
-const paintTodoCaption = (width, color) =>
-  paintBar(` ${TODO_CAPTION}`, width, THEME.chromeFg, THEME.ctxBg, color);
+const paintTodoCaption = (width, color) => {
+  const text = ` ${REPO_TODOS_LABEL}`;
+  const clipped = truncateVisible(text, width);
+  const pad = Math.max(0, width - visibleWidth(clipped));
+  const filled = clipped + ' '.repeat(pad);
+  if (!color) return filled;
+  const fgRgb = THEME.buttonHotFg;
+  const bgRgb = THEME.ctxBg;
+  return `${BOLD}${seq(fgRgb, bgRgb)}${EL}${filled}${RESET}`;
+};
 
 const paintBodyTodo = (view, width, color) => {
   const texts = view.todos ?? [];
@@ -1510,7 +1605,32 @@ const frameResult = (
 
 const hiddenActions = (view) => {
   const pane = view.pane ?? 'diff';
-  return disabledActions(pane, view.item);
+  if (pane === 'files') return FILES_DISABLED;
+  if (pane === 'branches') return BRANCHES_DISABLED;
+  if (view.item && view.item.origin === 'todo') return TODO_DISABLED;
+  return DIFF_DISABLED;
+};
+
+const dimFooterActions = (view) => {
+  const pane = view.pane ?? 'diff';
+  if (pane === 'files') {
+    const files = view.files ?? [];
+    const entry = files[view.fileCursor ?? 0];
+    if (!entry || entry.kind !== 'todos') return [];
+    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);
+  }
+  return [];
+};
+
+const extraFooterActions = (view) => {
+  if ((view.pane ?? 'diff') === 'branches') return Object.keys(BRANCH_ACTIONS);
+  return [];
 };
 
 const renderFrame = (view, options = {}) => {
@@ -1518,8 +1638,10 @@ const renderFrame = (view, options = {}) => {
   const height = Math.max(6, options.height ?? 24);
   const color = options.color ?? true;
   const rows = [paintHeader(view, width, color)];
-  const extra = view.pane === 'branches' ? Object.keys(BRANCH_ACTIONS) : [];
-  const layout = layoutButtons(width, false, hiddenActions(view), extra);
+  const extra = extraFooterActions(view);
+  const hidden = hiddenActions(view);
+  const dimmed = dimFooterActions(view);
+  const layout = layoutButtons(width, false, hidden, extra, dimmed);
   const notes = frameNotes(view, width, height, color);
   const headerLines = rows.length;
   const bodyH = notes.bodyH;
@@ -1571,6 +1693,7 @@ module.exports = {
   COMMIT_PROMPT,
   PUSH_PROMPT,
   updatePrompt,
+  dropPrompt,
   DEL_CHAR_BG,
   ADD_CHAR_BG,
   paintDiffLine,