reslop 0.2.3 → 0.2.4

package/lib/session/actions.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const LIST_PANES = ['files', 'branches', 'commits', 'npm'];
+
 const ACTIONS = {
   add: ['a'],
   unstage: ['u'],
@@ -42,6 +44,8 @@ const NPM_ACTIONS = {
   npm: ['n'],
   npmEdit: ['e'],
   npmNew: ['n'],
+  npmDrop: ['d'],
+  npmLogs: ['c'],
   npmStop: ['escape'],
   npmRerun: ['r'],
 };
@@ -61,6 +65,8 @@ const ACTION_LABEL = {
   newBranch: 'new',
   npmEdit: 'edit',
   npmNew: 'new',
+  npmDrop: 'delete',
+  npmLogs: 'cleanup',
   npmStop: 'esc',
   npmRerun: 're-run',
   quit: 'q',
@@ -121,39 +127,8 @@ const BRANCHES_DISABLED = [
   'prev',
   'next',
 ];
-const COMMITS_DISABLED = [
-  'add',
-  'unstage',
-  'revert',
-  'layout',
-  'feedback',
-  'todo',
-  'code',
-  'check',
-  'branch',
-  'file',
-  'diff',
-  'prev',
-  'next',
-];
-const NPM_DISABLED = [
-  'add',
-  'unstage',
-  'revert',
-  'commit',
-  'layout',
-  'feedback',
-  'todo',
-  'code',
-  'check',
-  'branch',
-  'file',
-  'diff',
-  'prev',
-  'next',
-  'pull',
-  'push',
-];
+const COMMITS_DISABLED = BRANCHES_DISABLED.filter((id) => id !== 'commit');
+const NPM_DISABLED = [...BRANCHES_DISABLED, 'pull', 'push'];
 
 const isTodosTarget = (item) =>
   !!(item && (item.kind === 'todos' || item.origin === 'todo'));
@@ -176,8 +151,16 @@ const isFixupCommit = (item) =>
   `${item && item.subject ? item.subject : ''}`.startsWith('fixup!');
 
 const commitWriteDisabled = (item) => {
-  if (!item || !item.sha) return ['amend', 'apply', 'reword', 'fixup', 'drop'];
-  return [];
+  const pending = Boolean(item && item.pending);
+  const unstaged = Boolean(item && item.unstagedCurrent);
+  if (!item || !item.sha) {
+    const off = ['reword', 'fixup', 'drop'];
+    if (pending) return off;
+    return ['amend', 'apply', ...off];
+  }
+  if (unstaged) return [];
+  if (isFixupCommit(item)) return ['amend'];
+  return ['amend', 'apply'];
 };
 
 const commitGitDisabled = (item) => {
@@ -224,26 +207,29 @@ const SCROLL = {
   delete: 'removeTodo',
 };
 
-const KEY_TO_ACTION = {};
+const keysForActions = (actions) => {
+  const keys = {};
+  for (const [id, shortcuts] of Object.entries(actions)) {
+    for (const key of shortcuts) keys[key] = id;
+  }
+  return keys;
+};
+
 const PANE_ONLY = ['branch', 'file', 'diff'];
-const FILES_KEYS = {};
-for (const key of ACTIONS.branch) FILES_KEYS[key] = 'branch';
-for (const id of BRANCH_REMOTE) {
-  for (const key of BRANCH_ACTIONS[id]) FILES_KEYS[key] = id;
-}
-const BRANCH_KEYS = {};
-for (const id of Object.keys(BRANCH_ACTIONS)) {
-  for (const key of BRANCH_ACTIONS[id]) BRANCH_KEYS[key] = id;
-}
-const COMMIT_KEYS = {};
-for (const id of Object.keys(COMMIT_ACTIONS)) {
-  for (const key of COMMIT_ACTIONS[id]) COMMIT_KEYS[key] = id;
-}
+const FILES_KEYS = keysForActions({
+  branch: ACTIONS.branch,
+  pull: BRANCH_ACTIONS.pull,
+  push: BRANCH_ACTIONS.push,
+  npm: NPM_ACTIONS.npm,
+});
+const BRANCH_KEYS = keysForActions(BRANCH_ACTIONS);
+const COMMIT_KEYS = keysForActions(COMMIT_ACTIONS);
 const NPM_KEYS = {
   e: 'npmEdit',
   n: 'npmNew',
+  d: 'npmDrop',
+  c: 'npmLogs',
 };
-FILES_KEYS.n = 'npm';
 const PANE_KEYS = {
   files: FILES_KEYS,
   branches: BRANCH_KEYS,
@@ -251,23 +237,20 @@ const PANE_KEYS = {
   npm: NPM_KEYS,
 };
 
-for (const id of ACTION_IDS) {
-  if (PANE_ONLY.includes(id)) continue;
-  for (const key of ACTIONS[id]) KEY_TO_ACTION[key] = id;
-}
-
-for (const key of Object.keys(SCROLL)) KEY_TO_ACTION[key] = SCROLL[key];
-for (const key of Object.keys(HIDDEN_KEYS)) {
-  KEY_TO_ACTION[key] = HIDDEN_KEYS[key];
-}
+const KEY_TO_ACTION = {
+  ...keysForActions(
+    Object.fromEntries(
+      Object.entries(ACTIONS).filter(([id]) => !PANE_ONLY.includes(id)),
+    ),
+  ),
+  ...SCROLL,
+  ...HIDDEN_KEYS,
+};
 
 const actionFromKey = (key, pane, fileScope) => {
-  const listPane =
-    pane === 'files' ||
-    pane === 'branches' ||
-    pane === 'commits' ||
-    pane === 'npm';
-  if (listPane && (key === 'left' || key === 'right')) return null;
+  if (LIST_PANES.includes(pane) && (key === 'left' || key === 'right')) {
+    return null;
+  }
   const paneKeys = PANE_KEYS[pane];
   if (paneKeys && paneKeys[key]) return paneKeys[key];
   if (pane === 'files') {
@@ -370,6 +353,7 @@ const promptFromChoices = (choices) =>
   choices.map((choice) => `${choice.lead}${choice.label}`).join('');
 
 module.exports = {
+  LIST_PANES,
   ACTIONS,
   ACTION_IDS,
   BRANCH_ACTIONS,

package/lib/session/branches.js

@@ -1,8 +1,10 @@
 'use strict';
 
-const { stateView } = require('./accessors.js');
+const accessors = require('./accessors.js');
+const { stateView } = accessors;
 
-const { pickRepoWrite } = require('./ops.js');
+const ops = require('./ops.js');
+const { pickRepoWrite } = ops;
 
 const selectedBranch = (api) => {
   const cursor = api.ui.nav.branchCursor;
@@ -95,12 +97,6 @@ const onCheckoutBranch = (api) => {
   if (!api.ui.status) api.ui.status = done;
 };
 
-const rebaseAsync = (api, onto, done, write) => {
-  const run = (top) => write(top, onto);
-  const after = () => refreshAfterWrite(api, { doneStatus: done });
-  return void api.ui.ops.runBusy('rebasing', done, run, after);
-};
-
 const onRebaseBranch = (api) => {
   if (api.ui.nav.pane !== 'branches') return;
   if (!api.ui.commits.canCommit()) return;
@@ -108,17 +104,9 @@ const onRebaseBranch = (api) => {
   if (!entry || entry.current) return;
   const onto = entry.name;
   const done = `rebased onto ${onto}`;
-  const uiOpen = api.ui.uiOpen;
-  const picked = pickRepoWrite(api.ui.repo, 'rebase', uiOpen);
-  if (picked.async) {
-    return void rebaseAsync(api, onto, done, picked.write);
-  }
-  const ok = api.ui.ops.runRepo(done, (top) => {
-    api.ui.repo.rebase(top, onto);
-  });
-  if (!ok) return;
-  refreshAfterWrite(api);
-  if (!api.ui.status) api.ui.status = done;
+  api.ui.ops.runWrite('rebase', [onto], 'rebasing', done, (extra) =>
+    refreshAfterWrite(api, extra),
+  );
 };
 
 const onDropBranch = (api) => {
@@ -137,29 +125,15 @@ const cancelDropBranch = (api) => {
   api.ui.status = '';
 };
 
-const dropAsync = (api, name, done, write) => {
-  const run = (top) => write(top, name);
-  const after = () => refreshAfterWrite(api, { doneStatus: done });
-  return void api.ui.ops.runBusy('dropping', done, run, after);
-};
-
 const confirmDropBranch = (api) => {
   const name = api.state.dropName;
   api.ui.mode = 'review';
   api.state.dropName = '';
   if (!name) return;
   const done = `dropped ${name}`;
-  const uiOpen = api.ui.uiOpen;
-  const picked = pickRepoWrite(api.ui.repo, 'drop', uiOpen);
-  if (picked.async) {
-    return void dropAsync(api, name, done, picked.write);
-  }
-  const ok = api.ui.ops.runRepo(done, (top) => {
-    api.ui.repo.drop(top, name);
-  });
-  if (!ok) return;
-  refreshAfterWrite(api);
-  if (!api.ui.status) api.ui.status = done;
+  api.ui.ops.runWrite('drop', [name], 'dropping', done, (extra) =>
+    refreshAfterWrite(api, extra),
+  );
 };
 
 const onNewBranch = (api) => {
@@ -201,19 +175,9 @@ const finishCreateBranch = (api) => {
 
 const onPull = (api) => {
   if (!api.ui.commits.canCommit()) return;
-  const repo = api.ui.repo;
-  const picked = pickRepoWrite(repo, 'pull', api.ui.uiOpen);
-  if (picked.async) {
-    const after = () => refreshAfterWrite(api);
-    const write = (top) => picked.write(top);
-    return void api.ui.ops.runBusy('pulling', 'pulled', write, after);
-  }
-  const ok = api.ui.ops.runRepo('pulled', (top) => {
-    repo.pull(top);
-  });
-  if (!ok) return;
-  refreshAfterWrite(api);
-  if (!api.ui.status) api.ui.status = 'pulled';
+  api.ui.ops.runWrite('pull', [], 'pulling', 'pulled', (extra) =>
+    refreshAfterWrite(api, extra),
+  );
 };
 
 const startPush = (api, force) => {

package/lib/session/change-actions.js

@@ -4,7 +4,8 @@ const files = require('../files.js');
 const { listPath, isTodoItem, isTodosEntry, isReadOnlyOrigin } = files;
 const items = require('./items.js');
 const { needsReload, npmBusyKind, sameBlock } = items;
-const { hunkKey } = require('../diff/diff.js');
+const diff = require('../diff/diff.js');
+const { hunkKey } = diff;
 
 const nextUnstageOrigin = (item) => {
   if (item.file.isNew === true) return 'untracked';

package/lib/session/commit.js

@@ -1,15 +1,16 @@
 'use strict';
 
-const { stateView } = require('./accessors.js');
-
-const { isReadOnlyOrigin } = require('../files.js');
-const { isFixupCommit } = require('./actions.js');
-const { pickRepoWrite } = require('./ops.js');
-const {
-  commitLine,
-  commitText,
-  splitMessage,
-} = require('../render/commits.js');
+const accessors = require('./accessors.js');
+const { stateView } = accessors;
+
+const files = require('../files.js');
+const { isReadOnlyOrigin } = files;
+const actions = require('./actions.js');
+const { isFixupCommit } = actions;
+const ops = require('./ops.js');
+const { pickRepoWrite } = ops;
+const commits = require('../render/commits.js');
+const { commitLine, commitText, splitMessage } = commits;
 
 const COMMIT_STATUS = {
   commit: 'committed',
@@ -181,11 +182,23 @@ const onCommit = (api) => {
   startGitCommit(api, 'commit');
 };
 
+const openLoadedDiff = (ui) => {
+  ui.nav.todoOpen = false;
+  ui.nav.scroll = 0;
+  ui.nav.index = 0;
+  ui.nav.pane = ui.items.length ? 'diff' : 'files';
+  ui.syncReviewPath();
+  ui.syncFileCursor();
+  ui.status = '';
+};
+
 const showSelectedDiff = (api) => {
   if (api.ui.mode === 'compose') return;
   const entry = selectedCommit(api);
   if (!entry) return;
   const ui = api.ui;
+  const viewingCommit = Boolean(ui.rev || ui.revShort);
+  if (isPending(entry) && !viewingCommit) return void onCommit(api);
   if (isPending(entry) || !entry.sha) {
     ui.rev = '';
     ui.revShort = '';
@@ -193,16 +206,10 @@ const showSelectedDiff = (api) => {
     ui.rev = entry.sha;
     ui.revShort = entry.shortSha || '';
   }
-  const openDiff = () => {
-    ui.nav.todoOpen = false;
-    ui.nav.scroll = 0;
-    ui.nav.index = 0;
-    ui.nav.pane = ui.items.length ? 'diff' : 'files';
-    ui.syncReviewPath();
-    ui.syncFileCursor();
-    ui.status = '';
-  };
-  ui.refreshFromRepo({ keepEmpty: true, afterLoad: openDiff });
+  ui.refreshFromRepo({
+    keepEmpty: true,
+    afterLoad: () => openLoadedDiff(ui),
+  });
 };
 
 const onAmend = (api) => {
@@ -226,18 +233,9 @@ const applyFixupNow = (api) => {
     api.ui.status = 'read only';
     return;
   }
-  const picked = pickRepoWrite(repo, 'applyFixup', api.ui.uiOpen);
-  if (picked.async) {
-    const run = (top) => picked.write(top, entry.sha);
-    const after = () => refreshAfterWrite(api, { doneStatus: done });
-    return void api.ui.ops.runBusy('applying', done, run, after);
-  }
-  const ok = api.ui.ops.runRepo(done, (top) => {
-    repo.applyFixup(top, entry.sha);
-  });
-  if (!ok) return;
-  refreshAfterWrite(api);
-  if (!api.ui.status) api.ui.status = done;
+  api.ui.ops.runWrite('applyFixup', [entry.sha], 'applying', done, (extra) =>
+    refreshAfterWrite(api, extra),
+  );
 };
 
 const onApply = (api) => {
@@ -360,12 +358,6 @@ const cancelDropCommit = (api) => {
   api.ui.status = '';
 };
 
-const dropAsync = (api, sha, done, write) => {
-  const run = (top) => write(top, sha);
-  const after = () => refreshAfterWrite(api, { doneStatus: done });
-  return void api.ui.ops.runBusy('dropping', done, run, after);
-};
-
 const confirmDropCommit = (api) => {
   const sha = api.state.dropSha;
   const name = api.state.dropName;
@@ -379,17 +371,9 @@ const confirmDropCommit = (api) => {
     api.ui.status = 'read only';
     return;
   }
-  const uiOpen = api.ui.uiOpen;
-  const picked = pickRepoWrite(repo, 'dropCommit', uiOpen);
-  if (picked.async) {
-    return void dropAsync(api, sha, done, picked.write);
-  }
-  const ok = api.ui.ops.runRepo(done, (top) => {
-    repo.dropCommit(top, sha);
-  });
-  if (!ok) return;
-  refreshAfterWrite(api);
-  if (!api.ui.status) api.ui.status = done;
+  api.ui.ops.runWrite('dropCommit', [sha], 'dropping', done, (extra) =>
+    refreshAfterWrite(api, extra),
+  );
 };
 
 const onView = (api) => {
@@ -442,6 +426,7 @@ const createCommitController = (ui) => {
 
 module.exports = {
   COMMIT_STATUS,
+  hasStagedChanges,
   createCommitController,
   listedCommits,
 };

package/lib/session/compose.js

@@ -4,18 +4,24 @@ const wrap = require('../wrap.js');
 const { cursorInWrap, wrapDoc } = wrap;
 const render = require('../render/render.js');
 const { noteInnerWidth, codeInnerWidth, todoBodyWidth } = render;
-const { commitMessageWidth } = require('../render/commits.js');
-const { listedCommits } = require('./commit.js');
-const { Editor } = require('../editor.js');
+const commits = require('../render/commits.js');
+const { commitMessageWidth } = commits;
+const commit = require('./commit.js');
+const { listedCommits } = commit;
+const editor = require('../editor.js');
+const { Editor } = editor;
 const files = require('../files.js');
 const { itemPath, isTodoItem, listPath, isReadOnlyOrigin } = files;
-const { blockAddText } = require('../diff/diff.js');
+const diff = require('../diff/diff.js');
+const { blockAddText } = diff;
 const items = require('./items.js');
 const { itemFeedKey, canEditCode } = items;
 const review = require('../review.js');
 const { setFeedback, setCode, checkLabel, rememberTemplate } = review;
-const { createTemplatePick } = require('./templates.js');
-const { createTodoCompose } = require('./todos.js');
+const templates = require('./templates.js');
+const { createTemplatePick } = templates;
+const todos = require('./todos.js');
+const { createTodoCompose } = todos;
 const unit = require('./unit.js');
 
 const COMPOSE_EDITS = ['backspace', 'delete', 'ctrl-z', 'ctrl-y'];
@@ -112,6 +118,16 @@ const tickBlink = (api) => {
 
 const viewSize = (api) => api.ui.lastSize ?? api.ui.getSize();
 
+const syncCodeScroll = (api) => {
+  const kind = api.state.composeKind;
+  if (kind !== 'code' && kind !== 'file') return;
+  const ed = api.state.editor;
+  if (!ed) return;
+  const size = viewSize(api);
+  const inner = codeInnerWidth(size.width, api.ui.layout);
+  ed.reveal(inner);
+};
+
 const followFileEdit = (api) => {
   if (api.state.composeKind !== 'file') return;
   const text = api.state.editor ? api.state.editor.text : null;
@@ -426,7 +442,9 @@ const codeOverlayView = (api) => {
     api.state.composeKind === 'code' || api.state.composeKind === 'file';
   const editor = api.state.editor;
   const cursor = editing && editor ? editor.cursor : null;
-  return { text, keepEmpty: editing, cursor };
+  const picked = editing && editor ? editor.scrollCol : 0;
+  const scrollCol = picked ?? 0;
+  return { text, keepEmpty: editing, cursor, scrollCol };
 };
 
 const idleNoteText = (api) => {
@@ -511,9 +529,8 @@ const moveComposeLine = (api, delta) => {
     return void api.todos.moveTodoCompose(delta, inner);
   }
   if (move === 'code') {
-    const size = viewSize(api);
-    const inner = codeInnerWidth(size.width, api.ui.layout);
-    return void api.state.editor.moveLine(delta, inner);
+    api.state.editor.moveLine(delta);
+    return void syncCodeScroll(api);
   }
   if (fullCommitEdit(api)) return void moveCommitLine(api, delta);
   moveNoteLine(api, delta);
@@ -581,6 +598,7 @@ const onUnitEdit = (api) => {
   openCompose(api, 'file', at.text);
   api.state.fileEditRows = at.rows ?? null;
   api.state.editor.cursor = Math.min(at.cursor, at.text.length);
+  syncCodeScroll(api);
   followFileEdit(api);
 };
 
@@ -602,6 +620,7 @@ const onCode = (api) => {
     : notes.code.get(itemFeedKey(item));
   const text = prev ? prev.text : original;
   openCompose(api, 'code', text);
+  syncCodeScroll(api);
 };
 
 const insertNewline = (api) => {
@@ -667,7 +686,11 @@ const COMPOSE_SPECIAL = {
 };
 
 const handleKey = (api, key) => {
-  if (key === 'enter') return enterCompose(api);
+  if (key === 'enter') {
+    const result = enterCompose(api);
+    syncCodeScroll(api);
+    return result;
+  }
   if (key === 'escape' || key === 'ctrl-s') return leaveCompose(api, key);
   const special = COMPOSE_SPECIAL[key];
   if (special) {
@@ -675,6 +698,7 @@ const handleKey = (api, key) => {
     if (COMPOSE_EDITS.includes(key)) api.templates.clearTemplatePick();
     resetBlink(api);
     followFileEdit(api);
+    syncCodeScroll(api);
     return result ?? null;
   }
   if (!key.length) return null;
@@ -684,6 +708,7 @@ const handleKey = (api, key) => {
     api.state.editor.insert(key);
     resetBlink(api);
     followFileEdit(api);
+    syncCodeScroll(api);
   }
   return null;
 };
@@ -696,6 +721,7 @@ const applyDiskText = (api, text) => {
   api.state.editor.cursor = Math.min(cursor, text.length);
   api.state.composeBaseline = text;
   api.state.fileEditRows = unit.linesFor(api.ui, api.nav.reviewPath, null);
+  syncCodeScroll(api);
   followFileEdit(api);
 };
 

package/lib/session/dispatch.js

@@ -1,15 +1,17 @@
 'use strict';
 
 const compose = require('./compose.js');
-const { listedCommits } = require('./commit.js');
+const commit = require('./commit.js');
+const { hasStagedChanges, listedCommits } = commit;
 const { COMPOSE_LEAVE } = compose;
 const actions = require('./actions.js');
-const { CONFIRM_MODE, disabledActions, actionFromKey, applyConfirm } = actions;
-
-const targetHasStaged = (session) => {
-  if (session.repo.hasStaged) return session.repo.hasStaged(session.top);
-  return session.items.some((item) => item.origin === 'staged');
-};
+const {
+  LIST_PANES,
+  CONFIRM_MODE,
+  disabledActions,
+  actionFromKey,
+  applyConfirm,
+} = actions;
 
 const currentTarget = (ui) => {
   if (ui.pane === 'files') return ui.fileCursorEntry();
@@ -18,9 +20,9 @@ const currentTarget = (ui) => {
   }
   if (ui.pane === 'commits') {
     const entry = listedCommits(ui.commits.commits)[ui.commitCursor];
-    const staged = targetHasStaged(ui);
-    if (!entry) return { canCommit: staged };
-    return { ...entry, canCommit: staged };
+    const staged = hasStagedChanges(ui);
+    const unstagedCurrent = !ui.rev && !ui.revShort;
+    return { ...entry, canCommit: staged, unstagedCurrent };
   }
   return ui.current();
 };
@@ -62,6 +64,8 @@ const createDispatcher = (ui) => {
     npm: ui.npm.open,
     npmEdit: ui.npm.edit,
     npmNew: ui.npm.create,
+    npmDrop: () => ui.npm.askDrop(),
+    npmLogs: () => ui.npm.askLogs(),
     npmStop: () => ui.npm.closeView(),
     npmRerun: () => ui.npm.rerun(),
     check: () => ui.composer.toggleFocusedTodo(),
@@ -88,21 +92,9 @@ const createDispatcher = (ui) => {
       if (result && result.kind === 'error') return;
     }
     const pane = ui.pane;
-    if (pane === 'files') {
-      if (action === 'next') return void ui.filesPane.onFileMove(1);
-      if (action === 'prev') return void ui.filesPane.onFileMove(-1);
-    }
-    if (pane === 'branches') {
-      if (action === 'next') return void ui.gitBranches.onBranchMove(1);
-      if (action === 'prev') return void ui.gitBranches.onBranchMove(-1);
-    }
-    if (pane === 'commits') {
-      if (action === 'next') return void ui.commits.onCommitMove(1);
-      if (action === 'prev') return void ui.commits.onCommitMove(-1);
-    }
-    if (pane === 'npm') {
-      if (action === 'next') return void ui.npm.move(1);
-      if (action === 'prev') return void ui.npm.move(-1);
+    if (LIST_PANES.includes(pane) && (action === 'next' || action === 'prev')) {
+      ui.filesPane.onScroll(action === 'next' ? 1 : -1);
+      return;
     }
     const hidden = disabledActions(pane, currentTarget(ui));
     if (hidden.includes(action)) return;

package/lib/session/files-pane.js

@@ -4,8 +4,11 @@ const ansi = require('../ansi.js');
 const files = require('../files.js');
 const { THEME_NAMES, setTheme, themeName } = ansi;
 const { isTodosEntry, TODO_FILE } = files;
-const { logViewRows } = require('../render/npm.js');
+const npm = require('../render/npm.js');
+const { logViewRows } = npm;
 const unit = require('./unit.js');
+const actions = require('./actions.js');
+const { LIST_PANES } = actions;
 const { setFileScope, openUnitFile, moveUnitBlock } = unit;
 
 const LAYOUTS = ['unified', 'mixed', 'side'];
@@ -41,13 +44,6 @@ const showFiles = (ui) => {
 };
 
 const onEscape = (ui) => {
-  if (
-    ui.nav.pane === 'branches' ||
-    ui.nav.pane === 'commits' ||
-    ui.nav.pane === 'npm'
-  ) {
-    return void showFiles(ui);
-  }
   if (ui.nav.pane === 'files') return void ui.onQuit();
   showFiles(ui);
 };
@@ -193,26 +189,9 @@ const onScroll = (ui, delta) => {
 };
 
 const onJump = (ui, toEnd) => {
-  if (ui.nav.pane === 'files') {
-    const list = ui.fileList();
-    if (!list.length) {
-      ui.status = 'nothing to review';
-      return;
-    }
-    const target = toEnd ? list.length - 1 : 0;
-    return void onFileMove(ui, target - ui.nav.fileCursor);
-  }
-  if (ui.nav.pane === 'branches') {
-    const delta = toEnd ? Number.MAX_SAFE_INTEGER : -Number.MAX_SAFE_INTEGER;
-    return void ui.gitBranches.onBranchMove(delta);
-  }
-  if (ui.nav.pane === 'commits') {
-    const delta = toEnd ? Number.MAX_SAFE_INTEGER : -Number.MAX_SAFE_INTEGER;
-    return void ui.commits.onCommitMove(delta);
-  }
-  if (ui.nav.pane === 'npm') {
+  if (LIST_PANES.includes(ui.nav.pane)) {
     const delta = toEnd ? Number.MAX_SAFE_INTEGER : -Number.MAX_SAFE_INTEGER;
-    return void ui.npm.move(delta);
+    return void onScroll(ui, delta);
   }
   if (ui.nav.todoOpen && ui.composer.todoRowCount() > 0) {
     const last = ui.composer.todoRowCount() - 1;

package/lib/session/items.js

@@ -1,11 +1,14 @@
 'use strict';
 
-const { stateView } = require('./accessors.js');
+const accessors = require('./accessors.js');
+const { stateView } = accessors;
 
 const files = require('../files.js');
 const { itemPath, TODO_FILE, isTodoItem } = files;
-const { feedbackKey } = require('../review.js');
-const { refreshIndexPatches } = require('../diff/diff.js');
+const review = require('../review.js');
+const { feedbackKey } = review;
+const diff = require('../diff/diff.js');
+const { refreshIndexPatches } = diff;
 
 const depChangeKey = (item) => {
   const change = item.dep && item.dep.change;