reslop 0.2.5 → 0.2.7

package/lib/render/chrome.js

@@ -4,39 +4,32 @@ const ansi = require('../ansi.js');
 const keys = require('../keys.js');
 const files = require('../files.js');
 const primitives = require('./primitives.js');
+const blocks = require('./dash-blocks.js');
+const { npmStatus } = blocks;
 
 const { itemPath, REPO_TASKS_LABEL, isTasksEntry, fileTotals } = files;
-const { ACTION_IDS, BRANCH_ACTIONS, COMMIT_ACTIONS, actionLetter } = keys;
-const { buttonWord } = keys;
+const { ACTION_IDS, actionLetter } = keys;
+const { DASH_IDS, DASH_HIDDEN, buttonWord } = keys;
 const { FILES_HIDDEN, FILES_GIT_DISABLED, BRANCHES_DISABLED } = keys;
 const { COMMITS_DISABLED, TASKS_DISABLED, DIFF_DISABLED, UNIT_DISABLED } = keys;
 const { NPM_DISABLED } = keys;
 const { diffGitDisabled, branchGitDisabled, commitGitDisabled } = keys;
+const { entryHasDiff, lineHasDiff, withoutMoves } = keys;
 const { CONFIRM, confirmPrefix, promptFromChoices } = keys;
 const { THEME, paint, visibleWidth } = ansi;
 const { truncateVisible, fg, RESET, EL, seq } = ansi;
-const { fill, branchLabel } = primitives;
-
-const HEADER_ROLE_FG = {
-  repo: THEME.headerRepoFg,
-  dir: THEME.headerDirFg,
-  slash: THEME.headerSlashFg,
-  file: THEME.headerFileFg,
-};
+const { fill, branchLabel, isTaskView } = primitives;
+const searchPaint = require('./search.js');
+const { paintPathText } = searchPaint;
+const locate = require('../find.js');
+const { activeHit, spansFor, fileMatches } = locate;
 
 const WAVE = '·•●•·';
+const BUSY_BAR = Array.from(WAVE, (_, frame) => {
+  const start = (WAVE.length - frame) % WAVE.length;
+  return WAVE.slice(start) + WAVE.slice(0, start);
+});
 
-const busyBars = (wave) => {
-  const n = wave.length;
-  const frames = new Array(n);
-  for (let frame = 0; frame < n; frame++) {
-    const start = (n - frame) % n;
-    frames[frame] = wave.slice(start) + wave.slice(0, start);
-  }
-  return frames;
-};
-
-const BUSY_BAR = busyBars(WAVE);
 const BUSY_PROGRESS = [
   'pulling',
   'pushing',
@@ -71,6 +64,7 @@ const INFO_STATUS = [
   'dropped',
   'already staged',
   'read only',
+  'transitive',
   'nothing to review',
   'nothing to commit',
   'unified',
@@ -112,178 +106,190 @@ const INFO_STATUS = [
 ];
 const INFO_PREFIX = ['checked out ', 'created ', 'rebased onto ', 'dropped '];
 
-const QUIT_PROMPT = promptFromChoices(CONFIRM.confirmQuit.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;
-const PUSH_PROMPT = `${PUSH_REJECT_PREFIX} force push`;
+const LOGO = '👁️';
+const HEADER_LEAD = ` ${LOGO}  reslop: `;
+const HEADER_ROLE_FG = {
+  chrome: THEME.headerChromeFg,
+  repo: THEME.headerRepoFg,
+  dir: THEME.headerDirFg,
+  slash: THEME.headerSlashFg,
+  file: THEME.headerFileFg,
+};
 
 const BUTTON_LEAD = ' ';
 const BUTTON_GAP = '  ';
 const BUTTON_EDGE = 1;
-const buttonGap = (index) => (index ? BUTTON_GAP : BUTTON_LEAD);
 const BACK_ARROW = '🢐';
-const STOP_MARK = '⊗';
 const BACK_KEY = 'esc';
-const LOGO = '👁️';
+
+const BUTTON_MARK = {
+  bgRgb: THEME.buttonBg,
+  fgRgb: THEME.buttonFg,
+  hotFg: THEME.buttonHotFg,
+  missFg: THEME.buttonHotFg,
+  missBold: true,
+};
+
+const QUIT_MARK = {
+  bgRgb: THEME.chromeBg,
+  fgRgb: THEME.mutedFg,
+  hotFg: THEME.warnFg,
+  missFg: THEME.mutedFg,
+  missBold: false,
+};
+
+const STATUS_MARK = /(\+[0-9]+(?:\/[0-9]+)?|-[0-9]+(?:\/[0-9]+)?)/g;
+const OLD_LOGS = /old logs \S+/;
+const SAVE_HINT = 'Press **Ctrl-S** or **Enter** at EOF to save';
+const HINT_HOT_FG = 0xff;
+
+const selectedFile = (view) => (view.files ?? [])[view.fileCursor ?? 0];
+
+const selectedBranch = (view) => (view.branches ?? [])[view.branchCursor ?? 0];
+
+const selectedCommit = (view) => (view.commits ?? [])[view.commitCursor ?? 0];
+
+const piecesText = (pieces) => pieces.map((piece) => piece.text).join('');
 
 const pathSegments = (rel) => {
   const segs = [];
   if (!rel) return segs;
   const bits = rel.split('/');
   for (let i = 0; i < bits.length; i++) {
-    if (i) {
-      segs.push({ text: '/', role: 'slash' });
-    }
-    if (!bits[i]) {
-      continue;
-    }
-    const last = i === bits.length - 1;
-    segs.push({ text: bits[i], role: last ? 'file' : 'dir' });
+    if (i) segs.push({ text: '/', role: 'slash' });
+    const role = i === bits.length - 1 ? 'file' : 'dir';
+    if (bits[i]) segs.push({ text: bits[i], role });
   }
   return segs;
 };
 
 const headerScreen = (view) => {
-  const pane = view.pane ?? 'diff';
-  if (pane === 'branches') return 'branches';
+  const { pane } = view;
+  if (
+    pane === 'dashboard' ||
+    pane === 'repos' ||
+    pane === 'branches' ||
+    pane === 'npm' ||
+    pane === 'packages' ||
+    pane === 'tasks'
+  ) {
+    return pane;
+  }
   if (pane === 'commits') {
-    const mode = view.commitView === 'full' ? 'full' : 'brief';
-    return `commits ${mode}`;
+    return view.commitView === 'full' ? 'commits full' : 'commits brief';
   }
-  if (pane === 'npm') return 'npm';
   if (pane === 'files') {
-    const files = view.files ?? [];
-    const entry = files[view.fileCursor ?? 0];
-    if (isTasksEntry(entry)) return REPO_TASKS_LABEL;
-    return '';
+    return isTasksEntry(selectedFile(view)) ? REPO_TASKS_LABEL : '';
   }
-  if (view.item && view.item.origin === 'task') return REPO_TASKS_LABEL;
-  return '';
+  return isTaskView(view) ? REPO_TASKS_LABEL : '';
 };
 
 const headerTarget = (view) => {
-  const pane = view.pane ?? 'diff';
-  if (pane === 'files') {
-    const entry = (view.files ?? [])[view.fileCursor ?? 0];
+  if (view.pane === 'files') {
+    const entry = selectedFile(view);
     if (!entry || isTasksEntry(entry)) return '';
     return entry.path;
   }
-  if (pane === 'unit') return view.reviewPath ?? '';
-  if (!view.item || view.item.origin === 'task') return '';
+  if (view.pane === 'unit') return view.reviewPath ?? '';
+  if (isTaskView(view)) return '';
   return itemPath(view.item);
 };
 
-const headerLabel = (view) => headerScreen(view) || headerTarget(view);
-
-const headerSep = (view) => (headerScreen(view) ? ': ' : '/');
-
-const headerPrefix = (view, label) => {
+const headerLead = (view) => {
+  const screen = headerScreen(view);
+  const label = screen || headerTarget(view);
   const repo = view.repoName || '';
-  if (repo && label) return ` ${LOGO}  reslop: ${repo}${headerSep(view)}`;
-  if (repo) return ` ${LOGO}  reslop: ${repo} `;
-  return ` ${LOGO}  reslop: `;
+  const pieces = [{ text: HEADER_LEAD, role: 'chrome' }];
+  if (repo) {
+    pieces.push({ text: repo, role: 'repo' });
+    if (!label) pieces.push({ text: ' ', role: 'chrome' });
+    else if (screen) pieces.push({ text: ': ', role: 'chrome' });
+    else pieces.push({ text: '/', role: 'slash' });
+  }
+  return { pieces, label };
 };
 
 const headerText = (view) => {
-  const label = headerLabel(view);
-  return `${headerPrefix(view, label)}${label}`;
+  const { pieces, label } = headerLead(view);
+  return `${piecesText(pieces)}${label}`;
 };
 
-const headerPieces = (view, width) => {
-  const repo = view.repoName || '';
-  const path = headerLabel(view);
-  const right = ' ';
-  const chrome = ` ${LOGO}  reslop: `;
-  const prefixW = visibleWidth(headerPrefix(view, path));
-  const used = prefixW + visibleWidth(right);
-  const room = Math.max(0, width - used);
-  const clipped = truncateVisible(path, room);
-  const pad = Math.max(0, room - visibleWidth(clipped));
-  const pieces = [{ text: chrome, role: 'chrome' }];
-  if (repo) {
-    pieces.push({ text: repo, role: 'repo' });
-    if (path) {
-      const sep = headerSep(view);
-      const role = sep === '/' ? 'slash' : 'chrome';
-      pieces.push({ text: sep, role });
-    } else {
-      pieces.push({ text: ' ', role: 'chrome' });
-    }
-  }
-  for (const seg of pathSegments(clipped)) {
-    pieces.push(seg);
-  }
-  if (pad) {
-    pieces.push({ text: ' '.repeat(pad), role: 'chrome' });
-  }
-  pieces.push({ text: right, role: 'chrome' });
-  return pieces;
+const headerFind = (view, label, clipped) => {
+  const query = view.find && view.find.query ? view.find.query : '';
+  const target = headerTarget(view);
+  if (!query || label !== target || !label) return [];
+  const hit = activeHit(view.files ?? [], view.find);
+  return spansFor(clipped, label, query, hit);
 };
 
-const paintHeader = (view, width, color) => {
-  const pieces = headerPieces(view, width);
-  if (!color) {
-    return pieces.map((piece) => piece.text).join('');
-  }
-  const bgRgb = THEME.headerBg;
-  let out = `${seq(THEME.headerChromeFg, bgRgb)}${EL}`;
+const paintHeaderRoles = (pieces) => {
+  let out = `${seq(THEME.headerChromeFg, THEME.headerBg)}${EL}`;
   for (const piece of pieces) {
-    if (!piece.text) {
-      continue;
-    }
-    const roleFg = HEADER_ROLE_FG[piece.role] ?? THEME.headerChromeFg;
-    out += `${fg(roleFg)}${piece.text}`;
+    out += `${fg(HEADER_ROLE_FG[piece.role])}${piece.text}`;
   }
-  return `${out}${RESET}`;
+  return out;
 };
 
-const BUTTON_MARK = {
-  bgRgb: THEME.buttonBg,
-  fgRgb: THEME.buttonFg,
-  hotFg: THEME.buttonHotFg,
-  missFg: THEME.buttonHotFg,
-  missBold: true,
+const paintHeaderHits = (clipped, spans, color) => {
+  let out = '';
+  let offset = 0;
+  for (const seg of pathSegments(clipped)) {
+    const local = [];
+    const end = offset + seg.text.length;
+    for (const span of spans) {
+      const start = Math.max(span.start, offset);
+      const stop = Math.min(span.end, end);
+      if (start >= stop) continue;
+      local.push({
+        start: start - offset,
+        end: stop - offset,
+        on: span.on === true,
+      });
+    }
+    const roleFg = HEADER_ROLE_FG[seg.role];
+    out += paintPathText(seg.text, roleFg, THEME.headerBg, color, false, local);
+    offset = end;
+  }
+  return out;
 };
 
-const QUIT_MARK = {
-  bgRgb: THEME.chromeBg,
-  fgRgb: THEME.mutedFg,
-  hotFg: THEME.warnFg,
-  missFg: THEME.mutedFg,
-  missBold: false,
+const paintHeader = (view, width, color) => {
+  const { pieces, label } = headerLead(view);
+  const right = ' ';
+  const used = visibleWidth(piecesText(pieces)) + visibleWidth(right);
+  const room = Math.max(0, width - used);
+  const clipped = truncateVisible(label, room);
+  const pad = ' '.repeat(Math.max(0, room - visibleWidth(clipped)));
+  const spans = headerFind(view, label, clipped);
+  if (!color || !spans.length) {
+    pieces.push(...pathSegments(clipped));
+    if (pad) pieces.push({ text: pad, role: 'chrome' });
+    pieces.push({ text: right, role: 'chrome' });
+    if (!color) return piecesText(pieces);
+    return `${paintHeaderRoles(pieces)}${RESET}`;
+  }
+  let out = paintHeaderRoles(pieces);
+  out += paintHeaderHits(clipped, spans, color);
+  out += `${fg(HEADER_ROLE_FG.chrome)}${pad}${right}`;
+  return `${out}${RESET}`;
 };
 
-const backFooterId = (view) => {
-  const pane = view.pane ?? 'diff';
-  if (pane === 'branches' || pane === 'commits') return 'back';
-  if (pane === 'npm') return view.npmView ? 'npmStop' : 'back';
-  if (view.item && view.item.origin === 'task') return 'back';
-  return '';
-};
+const backFooterId = (view) =>
+  view.pane === 'npm' && view.npmView ? 'npmStop' : 'back';
 
-const backHintMark = (view) => {
-  if (view.pane === 'npm' && view.npmView && view.npmRunning) return STOP_MARK;
-  return BACK_ARROW;
-};
+const backHintMark = () => BACK_ARROW;
 
-const hintBody = (mark) => {
-  const gap = mark === STOP_MARK ? ' ' : '';
-  return `${mark}${gap}${BACK_KEY}`;
-};
+const buttonGap = (index) => (index ? BUTTON_GAP : BUTTON_LEAD);
 
-const buttonLabel = (id, short, backId, mark) => {
-  if (id === backId) return hintBody(mark);
-  if (short) return actionLetter(id);
-  return buttonWord(id);
-};
+const hintBody = (mark) => `${mark}${BACK_KEY}`;
+
+const buttonLabel = (id, short) => (short ? actionLetter(id) : buttonWord(id));
 
 const paintBackHint = (color, mark) => {
   const bgRgb = THEME.buttonBg;
-  const body = hintBody(mark);
+  const rest = hintBody(mark).slice(mark.length);
   const arrow = paint(mark, THEME.buttonHotFg, bgRgb, color, true);
-  const rest = paint(body.slice(mark.length), THEME.buttonFg, bgRgb, color);
-  return arrow + rest;
+  return arrow + paint(rest, THEME.buttonFg, bgRgb, color);
 };
 
 const paintMarkedWord = (label, letter, color, mark) => {
@@ -294,59 +300,133 @@ const paintMarkedWord = (label, letter, color, mark) => {
   const before = label.slice(0, at);
   const hot = label.slice(at, at + letter.length);
   const after = label.slice(at + letter.length);
-  let out = '';
-  if (before) out += paint(before, mark.fgRgb, mark.bgRgb, color);
+  let out = paint(before, mark.fgRgb, mark.bgRgb, color);
   out += paint(hot, mark.hotFg, mark.bgRgb, color, true);
-  if (after) out += paint(after, mark.fgRgb, mark.bgRgb, color);
-  return out;
+  return out + paint(after, mark.fgRgb, mark.bgRgb, color);
 };
 
-const footerIds = (hidden, extra, backId) => {
+const footerIds = (hidden, extra, backId, globals, tail, after) => {
   const ids = backId ? [backId] : [];
-  for (const id of ACTION_IDS) {
-    if (id !== 'quit') {
-      if (!hidden.includes(id)) ids.push(id);
-      continue;
-    }
-    for (const add of extra) {
-      if (!ids.includes(add)) ids.push(add);
+  const push = (id) => {
+    if (!ids.includes(id)) ids.push(id);
+  };
+  for (const add of extra) push(add);
+  for (const id of globals) push(id);
+  if (tail) {
+    for (const id of ACTION_IDS) {
+      if (id === 'quit' || hidden.includes(id) || ids.includes(id)) continue;
+      ids.push(id);
     }
   }
+  for (const id of after) push(id);
   return ids;
 };
 
+const buttonPiece = (id, index, short, backId, mark) => {
+  const back = id === backId;
+  const letter = back ? BACK_KEY : actionLetter(id);
+  const label = back ? hintBody(mark) : buttonLabel(id, short);
+  const gap = buttonGap(index);
+  return {
+    id,
+    piece: `${gap}${label}`,
+    gap,
+    letter,
+    label,
+    back,
+    mark: back ? mark : '',
+  };
+};
+
+const packGroup = (ids, short, start, backId, mark) => {
+  const parts = [];
+  for (let i = 0; i < ids.length; i++) {
+    parts.push(buttonPiece(ids[i], start + i, short, backId, mark));
+  }
+  return parts;
+};
+
+const groupWidth = (parts) => {
+  let width = 0;
+  for (const part of parts) width += visibleWidth(part.piece);
+  return width;
+};
+
+const placeGroup = (parts, hits, disabled, x) => {
+  const placed = [];
+  let cursor = x;
+  for (const part of parts) {
+    const w = visibleWidth(part.piece);
+    const off = disabled.includes(part.id);
+    if (!off) hits.push({ id: part.id, x0: cursor, x1: cursor + w });
+    placed.push({ ...part, disabled: off });
+    cursor += w;
+  }
+  return { placed, cursor };
+};
+
+const splitFooter = (ids, options, limit) => {
+  const { disabled = [], backId = '', mark = BACK_ARROW } = options;
+  const { globals = [], after = [] } = options;
+  const rightIds = [];
+  for (const id of [...globals, ...after]) {
+    if (ids.includes(id) && !rightIds.includes(id)) rightIds.push(id);
+  }
+  const leftIds = ids.filter((id) => !rightIds.includes(id));
+  const pack = (leftShort, rightShort) => {
+    const left = packGroup(leftIds, leftShort, 0, backId, mark);
+    const start = left.length ? 1 : 0;
+    const right = packGroup(rightIds, rightShort, start, backId, mark);
+    return { left, right };
+  };
+  const wide = (packed) =>
+    groupWidth(packed.left) + groupWidth(packed.right) > limit;
+  let packed = pack(false, false);
+  if (wide(packed)) packed = pack(false, true);
+  if (wide(packed)) packed = pack(true, true);
+  const left = packed.left.slice();
+  const right = packed.right.slice();
+  while (groupWidth(left) + groupWidth(right) > limit && left.length) {
+    left.pop();
+  }
+  while (groupWidth(left) + groupWidth(right) > limit && right.length) {
+    right.pop();
+  }
+  const hits = [];
+  const leftPlace = placeGroup(left, hits, disabled, 0);
+  const parts = leftPlace.placed;
+  let x = leftPlace.cursor;
+  const gap = Math.max(0, limit - x - groupWidth(right));
+  if (gap && right.length) {
+    parts.push({ spacer: true, piece: ' '.repeat(gap) });
+    x += gap;
+  }
+  const rightPlace = placeGroup(right, hits, disabled, x);
+  parts.push(...rightPlace.placed);
+  return { hits, parts };
+};
+
 const layoutButtons = (width, options = {}) => {
-  const { compact = false, hidden = [], extra = [] } = options;
-  const { disabled: disabledIds = [], backId = '', mark = '' } = options;
-  const hint = mark || BACK_ARROW;
-  const ids = footerIds(hidden, extra, backId);
+  const { compact = false, hidden = [], extra = [], disabled = [] } = options;
+  const { backId = '', mark = BACK_ARROW, globals = [] } = options;
+  const { tail = true, after = [] } = options;
+  const ids = footerIds(hidden, extra, backId, globals, tail, after);
+  const limit = Math.max(0, width - BUTTON_EDGE);
+  if (globals.length) return splitFooter(ids, options, limit);
   const build = (short) => {
     const hits = [];
     const parts = [];
     let x = 0;
-    const limit = Math.max(0, width - BUTTON_EDGE);
     for (const id of ids) {
-      const back = id === backId;
-      const letter = back ? BACK_KEY : actionLetter(id);
-      const label = buttonLabel(id, short, backId, hint);
-      const gap = buttonGap(parts.length);
-      const piece = `${gap}${label}`;
-      const w = visibleWidth(piece);
+      const part = buttonPiece(id, parts.length, short, backId, mark);
+      const w = visibleWidth(part.piece);
       if (x + w > limit && parts.length) break;
-      const off = disabledIds.includes(id);
+      const off = disabled.includes(id);
       if (!off) hits.push({ id, x0: x, x1: x + w });
-      parts.push({
-        action: { id },
-        piece,
-        letter,
-        label,
-        disabled: off,
-        back,
-        mark: back ? hint : '',
-      });
+      parts.push({ ...part, disabled: off });
       x += w;
     }
-    return { hits, parts, width: x };
+    return { hits, parts };
   };
   if (compact) return build(true);
   const words = build(false);
@@ -355,72 +435,71 @@ const layoutButtons = (width, options = {}) => {
 };
 
 const paintButtons = (layout, width, color) => {
-  let out = '';
-  let used = 0;
   const fgRgb = THEME.buttonFg;
   const bgRgb = THEME.buttonBg;
+  let out = '';
+  let used = 0;
   for (let i = 0; i < layout.parts.length; i++) {
     const part = layout.parts[i];
-    const gap = buttonGap(i);
+    if (part.spacer) {
+      out += paint(part.piece, fgRgb, bgRgb, color);
+      used += visibleWidth(part.piece);
+      continue;
+    }
+    const gap = part.gap ?? buttonGap(i);
     out += paint(gap, fgRgb, bgRgb, color);
     if (part.back) out += paintBackHint(color, part.mark);
     else 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) {
-    out += fill(width - used, THEME.buttonFg, THEME.buttonBg, color);
-  }
-  return out;
+  return out + fill(width - used, fgRgb, bgRgb, color);
 };
 
-const isInfoStatus = (status) => {
-  if (INFO_STATUS.includes(status)) return true;
-  for (const prefix of INFO_PREFIX) {
-    if (status.startsWith(prefix)) return true;
-  }
-  return false;
-};
+const isInfoStatus = (status) =>
+  INFO_STATUS.includes(status) ||
+  INFO_PREFIX.some((prefix) => status.startsWith(prefix));
 
-const joinStatus = (parts) => {
-  const bits = [];
-  for (const part of parts) {
-    if (!part) continue;
-    bits.push(part);
-  }
-  return bits.join('  ');
-};
+const joinStatus = (parts) => parts.filter(Boolean).join('  ');
 
 const countsKind = (sourceKind, revShort) => {
   if (sourceKind === 'pr' || sourceKind === 'mr') return sourceKind;
-  if (revShort) return 'commit';
-  return 'worktree';
+  return revShort ? 'commit' : 'worktree';
 };
 
+const isWorktree = (view) =>
+  countsKind(view.sourceKind, view.revShort) === 'worktree';
+
 const notesLine = (counts) => {
-  const feedback = counts.feedback ?? 0;
-  const tasks = counts.tasks ?? 0;
-  const code = counts.code ?? 0;
-  return `feedback ${feedback}  tasks ${tasks}  code ${code}`;
+  const done = counts.tasksDone ?? 0;
+  const total = counts.tasks ?? 0;
+  return `tasks ${done}/${total}`;
 };
 
 const statusLead = (view) => {
+  if (view.pane === 'repos') {
+    const tiles = view.repos && view.repos.tiles ? view.repos.tiles : [];
+    const count = tiles.length;
+    if (!count) return 'repos';
+    const at = (view.repos.cursor ?? 0) + 1;
+    return `${at}/${count}`;
+  }
   const counts = view.counts ?? {};
   const kind = countsKind(view.sourceKind, view.revShort);
-  if (kind === 'worktree') return branchLabel(view.branch ?? '');
+  if (kind === 'worktree') return branchLabel(view.branch);
   if (kind === 'commit') {
-    const n = counts.commit ?? 0;
-    return `commit ${view.revShort}  ${n}`;
+    return `commit ${view.revShort}  ${counts.commit ?? 0}`;
   }
-  const n = counts.pr ?? 0;
   const label = view.sourceLabel || kind;
-  return `${kind} ${label}  ${n}`;
+  return `${kind} ${label}  ${counts.pr ?? 0}`;
 };
 
+const STATUS_QUIET = new Set(['npm', 'packages', 'branches']);
+
 const statusLeft = (view) => {
-  const body = joinStatus([statusLead(view), notesLine(view.counts ?? {})]);
-  if (!body) return '';
-  return ` ${body}`;
+  if (view.pane === 'repos') return ` ${statusLead(view)}`;
+  const notes = STATUS_QUIET.has(view.pane) ? '' : notesLine(view.counts ?? {});
+  return ` ${joinStatus([statusLead(view), notes])}`;
 };
 
 const statusDelta = (total) => {
@@ -433,28 +512,29 @@ const statusDelta = (total) => {
   if (!hasDelta && !total.removed) return '';
   const plus = `+${stagedAdd}/${stagedAdd + unstagedAdd}`;
   const minus = `-${stagedDel}/${stagedDel + unstagedDel}`;
-  return joinStatus([plus, minus]);
+  return `${plus}  ${minus}`;
 };
 
+const DIFF_QUIET = new Set(['npm', 'packages', 'tasks', 'branches']);
+
 const statusStats = (view) => {
   const counts = view.counts ?? {};
+  const staged = counts.staged ?? 0;
   const total = fileTotals(view.files ?? []);
-  const counted = (counts.staged ?? 0) + (counts.unstaged ?? 0);
   const hasGit =
     total.remaining || total.staged || total.added || total.removed;
-  const fallbackN = counts.staged ?? 0;
-  const n = hasGit ? total.staged : fallbackN;
-  const m = hasGit ? total.remaining : counted;
-  const git = joinStatus([statusDelta(total), `${n}/${m}`]);
-  if (!view.npmLogs) return git;
-  return joinStatus([view.npmLogs, git]);
+  const n = hasGit ? total.staged : staged;
+  const m = hasGit ? total.remaining : staged + (counts.unstaged ?? 0);
+  const delta = DIFF_QUIET.has(view.pane) ? '' : statusDelta(total);
+  const ratio = STATUS_QUIET.has(view.pane) ? '' : `${n}/${m}`;
+  const packages = view.pane === 'packages' ? npmStatus(view.packages) : '';
+  return joinStatus([view.npmLogs, delta, ratio, packages]);
 };
 
 const statusLayout = (view, status, width) => {
-  const shown = formatBusyStatus(status, view.progressFrame ?? 0);
-  const msg = shown;
-  let msgFg = THEME.chromeFg;
-  if (msg && !isInfoStatus(status)) msgFg = THEME.errorFg;
+  const msg = formatBusyStatus(status, view.progressFrame ?? 0);
+  const isError = msg && !isInfoStatus(status);
+  const msgFg = isError ? THEME.errorFg : THEME.chromeFg;
   const stats = statusStats(view);
   const right = stats ? `${stats} ` : '';
   const rightW = visibleWidth(right);
@@ -470,60 +550,36 @@ const statusLayout = (view, status, width) => {
 };
 
 const choiceHits = (choices, prefix, y) => {
-  const { length } = choices;
-  const hits = new Array(length);
   let x = visibleWidth(prefix);
-  for (let i = 0; i < length; i++) {
-    const choice = choices[i];
-    const piece = `${choice.lead}${choice.label}`;
-    const w = visibleWidth(piece);
-    hits[i] = { id: choice.letter, y, x0: x, x1: x + w };
+  return choices.map((choice) => {
+    const w = visibleWidth(`${choice.lead}${choice.label}`);
+    const hit = { id: choice.letter, y, x0: x, x1: x + w };
     x += w;
-  }
-  return hits;
+    return hit;
+  });
 };
 
-const paintChoicePrompt = (choices, width, color, prefix = '') => {
+const paintChoicePrompt = (choices, width, color, prefix) => {
   const bgRgb = THEME.chromeBg;
-  const labels = choices
-    .map((choice) => `${choice.lead}${choice.label}`)
-    .join('');
-  const body = `${prefix}${labels}`;
-  if (!color) {
-    const pad = Math.max(0, width - visibleWidth(body));
-    return body + ' '.repeat(pad);
-  }
-  let out = '';
-  if (prefix) out += paint(prefix, THEME.mutedFg, bgRgb, color);
+  const body = `${prefix}${promptFromChoices(choices)}`;
+  const pad = Math.max(0, width - visibleWidth(body));
+  if (!color) return body + ' '.repeat(pad);
+  let out = paint(prefix, THEME.mutedFg, bgRgb, color);
   for (const choice of choices) {
     const label = `${choice.lead}${choice.label}`;
     out += paintMarkedWord(label, choice.letter, color, QUIT_MARK);
   }
-  const pad = Math.max(0, width - visibleWidth(body));
   return out + fill(pad, THEME.mutedFg, bgRgb, color);
 };
 
-const STATUS_MARK = /(\+[0-9]+(?:\/[0-9]+)?|-[0-9]+(?:\/[0-9]+)?)/g;
-const OLD_LOGS = /old logs \S+/;
-
-const paintStatusMark = (token, color) => {
-  const bgRgb = THEME.chromeBg;
-  if (token.startsWith('+')) {
-    return paint(token, THEME.addLineFg, bgRgb, color);
-  }
-  return paint(token, THEME.delLineFg, bgRgb, color);
-};
-
 const paintStatusLeft = (text, color) => {
-  const bgRgb = THEME.chromeBg;
-  const muted = THEME.mutedFg;
   if (!color) return text;
+  const bgRgb = THEME.chromeBg;
   const found = text.match(OLD_LOGS);
   if (found) {
-    const at = found.index;
     const token = found[0];
-    const before = text.slice(0, at);
-    const after = text.slice(at + token.length);
+    const before = text.slice(0, found.index);
+    const after = text.slice(found.index + token.length);
     return (
       paintStatusLeft(before, color) +
       paint(token, THEME.shaFg, bgRgb, color) +
@@ -534,24 +590,18 @@ const paintStatusLeft = (text, color) => {
   let last = 0;
   for (const match of text.matchAll(STATUS_MARK)) {
     const token = match[0];
-    const start = match.index;
-    if (start > last) {
-      out += paint(text.slice(last, start), muted, bgRgb, color);
-    }
-    out += paintStatusMark(token, color);
-    last = start + token.length;
-  }
-  if (last < text.length) {
-    out += paint(text.slice(last), muted, bgRgb, color);
+    const tokenFg = token.startsWith('+') ? THEME.addLineFg : THEME.delLineFg;
+    out += paint(text.slice(last, match.index), THEME.mutedFg, bgRgb, color);
+    out += paint(token, tokenFg, bgRgb, color);
+    last = match.index + token.length;
   }
-  return out;
+  return out + paint(text.slice(last), THEME.mutedFg, bgRgb, color);
 };
 
 const paintBranchHead = (text, branch, color) => {
   const name = branchLabel(branch);
   if (!name || !text.startsWith(' ')) return null;
-  const head = ` ${name}`;
-  const shown = text.startsWith(head) ? name : text.slice(1);
+  const shown = text.startsWith(` ${name}`) ? name : text.slice(1);
   if (!shown || !name.startsWith(shown)) return null;
   const rest = text.slice(1 + shown.length);
   const bgRgb = THEME.chromeBg;
@@ -562,40 +612,23 @@ const paintBranchHead = (text, branch, color) => {
   );
 };
 
-const SAVE_HINT = 'Press **Ctrl-S** or **Enter** at EOF to save';
-const HINT_HOT_FG = 0xff;
-
-const hintParts = (source) => {
-  const bits = source.split('**');
-  const parts = [];
-  for (let i = 0; i < bits.length; i++) {
-    if (!bits[i]) continue;
-    parts.push({ text: bits[i], hot: i % 2 === 1 });
-  }
-  return parts;
-};
-
-const saveHintText = () => SAVE_HINT.replaceAll('**', '');
-
-const commitSaveHint = (view) => {
-  if (view.mode !== 'compose' || view.commitView !== 'full') return false;
-  const compose = view.compose;
-  return Boolean(compose && compose.kind === 'commit');
-};
+const commitSaveHint = (view) =>
+  view.mode === 'compose' &&
+  view.commitView === 'full' &&
+  view.compose?.kind === 'commit';
 
 const paintSaveHintBar = (width, color) => {
   const bgRgb = THEME.buttonBg;
-  const plain = `${BUTTON_LEAD}${saveHintText()}`;
-  if (!color) {
-    const pad = Math.max(0, width - visibleWidth(plain));
-    return plain + ' '.repeat(pad);
-  }
+  const plain = `${BUTTON_LEAD}${SAVE_HINT.replaceAll('**', '')}`;
+  const pad = Math.max(0, width - visibleWidth(plain));
+  if (!color) return plain + ' '.repeat(pad);
   let out = paint(BUTTON_LEAD, THEME.buttonFg, bgRgb, color);
-  for (const part of hintParts(SAVE_HINT)) {
-    const tone = part.hot ? HINT_HOT_FG : THEME.buttonFg;
-    out += paint(part.text, tone, bgRgb, color, part.hot);
+  const bits = SAVE_HINT.split('**');
+  for (let i = 0; i < bits.length; i++) {
+    const hot = i % 2 === 1;
+    const tone = hot ? HINT_HOT_FG : THEME.buttonFg;
+    out += paint(bits[i], tone, bgRgb, color, hot);
   }
-  const pad = Math.max(0, width - visibleWidth(plain));
   return out + fill(pad, THEME.buttonFg, bgRgb, color);
 };
 
@@ -604,12 +637,28 @@ const paintFooter = (view, layout, width, color) => {
   return paintButtons(layout, width, color);
 };
 
-const footerHits = (view, layout) => {
-  if (commitSaveHint(view)) return [];
-  return layout.hits;
+const footerHits = (view, layout) => (commitSaveHint(view) ? [] : layout.hits);
+
+const paintFindStatus = (view, width, color) => {
+  const query = view.find.query ?? '';
+  const hits = fileMatches(view.files ?? [], query);
+  const miss = query.length > 0 && hits.length === 0;
+  const lead = ' /';
+  const caret = 1;
+  const room = Math.max(0, width - lead.length - caret);
+  const shown = truncateVisible(query, room);
+  const pad = Math.max(0, width - lead.length - visibleWidth(shown) - caret);
+  if (!color) return `${lead}${shown}${' '.repeat(caret + pad)}`;
+  const bgRgb = THEME.chromeBg;
+  const tone = miss ? THEME.errorFg : THEME.chromeFg;
+  let out = paint(lead, THEME.warnFg, bgRgb, color, true);
+  out += paint(shown, tone, bgRgb, color);
+  out += paint(' ', THEME.searchOnFg, THEME.searchOnBg, color);
+  return out + fill(pad, THEME.mutedFg, bgRgb, color);
 };
 
 const paintStatusLine = (view, status, width, color) => {
+  if (view.find) return paintFindStatus(view, width, color);
   const confirm = CONFIRM[view.mode];
   if (confirm) {
     const prefix = confirmPrefix(confirm, view);
@@ -622,8 +671,7 @@ const paintStatusLine = (view, status, width, color) => {
     return layout.clipped + leftGap + layout.msg + rightGap + layout.right;
   }
   const bgRgb = THEME.chromeBg;
-  const worktree = countsKind(view.sourceKind, view.revShort) === 'worktree';
-  const head = worktree
+  const head = isWorktree(view)
     ? paintBranchHead(layout.clipped, view.branch, color)
     : null;
   const left = head ?? paintStatusLeft(layout.clipped, color);
@@ -639,79 +687,98 @@ const paintStatusLine = (view, status, width, color) => {
 const statusChoiceHits = (view, y) => {
   const spec = CONFIRM[view.mode];
   if (!spec) return [];
-  const prefix = confirmPrefix(spec, view);
-  return choiceHits(spec.choices, prefix, y);
+  return choiceHits(spec.choices, confirmPrefix(spec, view), y);
 };
 
 const statusBranchHit = (view, width, y) => {
-  const mode = view.mode;
-  if (CONFIRM[mode]) return null;
-  const branch = view.branch ?? '';
-  if (!branchLabel(branch)) return null;
-  if (countsKind(view.sourceKind, view.revShort) !== 'worktree') return null;
+  if (view.find || CONFIRM[view.mode]) return null;
+  const name = branchLabel(view.branch);
+  if (!name || !isWorktree(view)) return null;
   const layout = statusLayout(view, view.status ?? '', width);
-  const name = branchLabel(branch);
   const at = layout.clipped.indexOf(name);
   if (at < 0) return null;
   return { id: 'branch', y, x0: at, x1: at + visibleWidth(name) };
 };
 
-const selectedBranch = (view) => (view.branches ?? [])[view.branchCursor ?? 0];
-
-const selectedCommit = (view) => (view.commits ?? [])[view.commitCursor ?? 0];
+const withHidden = (ids, more) => [...ids, ...more];
 
 const hiddenActions = (view) => {
-  const pane = view.pane ?? 'diff';
+  const { pane } = view;
+  if (pane === 'dashboard' || pane === 'repos') return DASH_HIDDEN;
   if (pane === 'files') return FILES_HIDDEN;
-  if (pane === 'unit') return UNIT_DISABLED;
+  if (pane === 'unit') return withHidden(UNIT_DISABLED, ['feedback', 'tasks']);
   if (pane === 'branches') return BRANCHES_DISABLED;
   if (pane === 'commits') return COMMITS_DISABLED;
   if (pane === 'npm') return NPM_DISABLED;
-  if (view.item && view.item.origin === 'task') return TASKS_DISABLED;
-  return DIFF_DISABLED;
+  if (pane === 'tasks' || isTaskView(view)) {
+    return withHidden(TASKS_DISABLED, ['prev', 'next']);
+  }
+  return withHidden(DIFF_DISABLED, ['feedback', 'tasks']);
 };
 
 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 !== 'tasks') return [];
-    return FILES_GIT_DISABLED;
-  }
-  if (pane === 'diff' || pane === 'unit') return diffGitDisabled(view.item);
+    const entry = selectedFile(view);
+    if (isTasksEntry(entry)) return FILES_GIT_DISABLED;
+    return withoutMoves([], entryHasDiff(entry));
+  }
+  if (pane === 'unit') {
+    const off = [...diffGitDisabled(view.item)];
+    const lines = view.unitLines;
+    if (!lines || !lines.length) return off;
+    const line = lines[view.unitLine ?? 0];
+    return withoutMoves(off, lineHasDiff(line));
+  }
+  if (pane === 'diff') return diffGitDisabled(view.item);
   if (pane === 'branches') return branchGitDisabled(selectedBranch(view));
   if (pane === 'commits') {
-    const entry = selectedCommit(view);
-    const staged = (view.counts?.staged ?? 0) > 0;
-    const unstagedCurrent = !view.rev && !view.revShort;
     return commitGitDisabled({
-      ...entry,
-      canCommit: staged,
-      unstagedCurrent,
+      ...selectedCommit(view),
+      canCommit: (view.counts?.staged ?? 0) > 0,
+      unstagedCurrent: !view.rev && !view.revShort,
     });
   }
-  if (pane === 'npm' && view.npmView) {
-    if (view.npmRunning) return ['npmRerun'];
+  if (pane === 'packages') {
+    const listed = view.packages && view.packages.modules;
+    const rows = listed && listed.packages ? listed.packages : [];
+    const cursor = view.packagesCursor ?? 0;
+    const onRow = rows.length > 0 && cursor < rows.length;
+    if (!onRow) return ['packageDrop', 'packageWanted', 'packageLatest'];
+    if (rows[cursor] && rows[cursor].transitive) {
+      return ['packageNew', 'packageDrop'];
+    }
     return [];
   }
-  if (pane === 'npm' && !view.npmLogs) return ['npmLogs'];
-  return [];
+  if (pane !== 'npm') return [];
+  if (view.npmView) return view.npmRunning ? ['npmRerun'] : [];
+  return view.npmLogs ? [] : ['npmLogs'];
 };
 
+const GIT_FOOTER = ['add', 'unstage', 'revert', 'ignore'];
+
 const extraFooterActions = (view) => {
-  const pane = view.pane ?? 'diff';
-  if (pane === 'files') {
-    const scope = view.fileScope === 'file' ? 'diff' : 'file';
-    return ['npm', scope, 'commit', 'pull', 'push'];
+  const { pane } = view;
+  if (pane === 'repos') return ['theme'];
+  if (pane === 'dashboard') return ['theme', 'pull', 'push'];
+  if (pane === 'unit') return ['add', 'unstage', 'revert', 'feedback', 'code'];
+  if (pane === 'files') return [...GIT_FOOTER, 'code'];
+  if (pane === 'diff') return [...GIT_FOOTER, 'feedback', 'code', 'layout'];
+  if (pane === 'branches') {
+    return ['newBranch', 'rebase', 'drop', 'pull', 'push'];
+  }
+  if (pane === 'commits') {
+    return ['newCommit', 'apply', 'reword', 'drop', 'view', 'pull', 'push'];
   }
-  if (pane === 'branches') return Object.keys(BRANCH_ACTIONS);
-  if (pane === 'commits') return Object.keys(COMMIT_ACTIONS);
   if (pane === 'npm') {
     if (view.npmView) return ['npmVerbose', 'npmRerun'];
     return ['npmEdit', 'npmNew', 'npmDrop', 'npmLogs'];
   }
-  return [];
+  if (pane === 'packages') {
+    return ['packageNew', 'packageDrop', 'packageWanted', 'packageLatest'];
+  }
+  if (pane === 'tasks' || isTaskView(view)) return ['drop', 'check'];
+  return GIT_FOOTER;
 };
 
 const footerLayout = (view, width) =>
@@ -721,13 +788,11 @@ const footerLayout = (view, width) =>
     disabled: dimFooterActions(view),
     backId: backFooterId(view),
     mark: backHintMark(view),
+    globals: view.pane === 'repos' ? [] : DASH_IDS,
+    tail: false,
   });
 
 module.exports = {
-  QUIT_PROMPT,
-  PUSH_PROMPT,
-  updatePrompt,
-  dropPrompt,
   formatBusyStatus,
   headerText,
   paintHeader,