reslop 0.2.0 → 0.2.3

package/lib/session/compose.js

@@ -4,12 +4,14 @@ 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 files = require('../files.js');
 const { itemPath, isTodoItem, listPath, isReadOnlyOrigin } = files;
 const { blockAddText } = require('../diff/diff.js');
 const items = require('./items.js');
-const { itemFeedKey, canEditCode, blockLinesKey } = items;
+const { itemFeedKey, canEditCode } = items;
 const review = require('../review.js');
 const { setFeedback, setCode, checkLabel, rememberTemplate } = review;
 const { createTemplatePick } = require('./templates.js');
@@ -68,12 +70,21 @@ const KIND = {
     command: 'branch',
     view: 'note',
   },
+  npm: {
+    enter: 'save',
+    tab: 'insert-tab',
+    escape: 'cancel',
+    move: 'note',
+    command: 'npm',
+    view: 'note',
+  },
 };
 
 const initialState = () => ({
   editor: null,
   composeKind: null,
   commitKind: null,
+  commitBody: '',
   composeTodoId: null,
   composeBaseline: '',
   templateIndex: -1,
@@ -81,6 +92,7 @@ const initialState = () => ({
   blinkOn: true,
   fileDirty: false,
   fileEditRows: null,
+  fileOpened: '',
 });
 
 const reset = (state) => {
@@ -124,6 +136,7 @@ const openCompose = (api, kind, text, todoId) => {
   state.composeKind = kind;
   state.composeTodoId = todoId ?? null;
   state.composeBaseline = text;
+  state.fileOpened = kind === 'file' ? text : '';
   state.editor = new Editor(text);
   state.templateIndex = -1;
   state.templateFocus = false;
@@ -138,8 +151,10 @@ const closeCompose = (api) => {
   state.editor = null;
   state.composeKind = null;
   state.commitKind = null;
+  state.commitBody = '';
   state.composeTodoId = null;
   state.composeBaseline = '';
+  state.fileOpened = '';
   state.templateIndex = -1;
   state.templateFocus = false;
   state.fileEditRows = null;
@@ -240,60 +255,66 @@ const saveUnitFile = (api, text) => {
   return true;
 };
 
-const snapshotPathKeys = (list, rel) => {
-  const keys = new Set();
-  for (const item of list) {
-    if (listPath(item) !== rel) continue;
-    keys.add(blockLinesKey(item));
-  }
-  return keys;
-};
-
-const stageNewFileHunks = (api, rel, beforeKeys) => {
+const stageEditedFile = (api, rel) => {
+  if (!rel) return false;
   const repo = api.ui.repo;
-  if (!rel || !repo || typeof repo.add !== 'function') return 0;
+  if (!repo) return false;
   const caps = api.ui.capabilities;
-  if (!caps || caps.changes !== true) return 0;
-  const list = api.ui.items ?? [];
+  if (!caps || caps.changes !== true) return false;
+  if (typeof repo.stagePath === 'function') {
+    try {
+      repo.stagePath(api.ui.top, rel);
+    } catch (error) {
+      api.ui.status = error.message;
+      return false;
+    }
+    if (typeof api.ui.ignoreWatch === 'function') api.ui.ignoreWatch();
+    return true;
+  }
+  if (typeof repo.add !== 'function') return false;
   let staged = 0;
-  for (const item of list) {
+  for (const item of api.ui.items ?? []) {
     if (listPath(item) !== rel) continue;
     if (isReadOnlyOrigin(item.origin)) continue;
     if (item.origin === 'staged') continue;
-    if (beforeKeys.has(blockLinesKey(item))) continue;
     try {
       repo.add(api.ui.top, item);
     } catch (error) {
       api.ui.status = error.message;
-      return staged;
+      return staged > 0;
     }
     if (api.ui.collection && api.ui.collection.keepOrigin) {
       api.ui.collection.keepOrigin(item, 'staged');
     }
-    if (typeof api.ui.ignoreWatch === 'function') api.ui.ignoreWatch();
     staged += 1;
   }
-  return staged;
+  if (staged && typeof api.ui.ignoreWatch === 'function') {
+    api.ui.ignoreWatch();
+  }
+  return staged > 0;
 };
 
 const saveFileCompose = (api) => {
   const rel = api.nav.reviewPath;
-  const beforeKeys = snapshotPathKeys(api.ui.items ?? [], rel);
+  const opened = api.state.fileOpened;
+  const text = api.state.editor ? api.state.editor.text : '';
   if (api.state.editor) {
     api.nav.unitLine = api.state.editor.linePos().line;
   }
-  const result = saveUnitFile(api, api.state.editor.text);
+  const result = saveUnitFile(api, text);
   if (result === false) return { kind: 'error' };
+  const changed = text !== opened;
   const reload = api.state.fileDirty === true;
+  if (changed) stageEditedFile(api, rel);
   api.ui.flushReview();
   closeCompose(api);
+  const doneStatus = changed ? 'staged' : 'saved';
   if (!reload || typeof api.ui.reloadAfterChange !== 'function') {
-    api.ui.status = 'saved';
+    if (!api.ui.status) api.ui.status = doneStatus;
     return { kind: 'saved' };
   }
   api.ui.reloadAfterChange(() => {
-    const n = stageNewFileHunks(api, rel, beforeKeys);
-    api.ui.status = n > 0 ? 'staged' : 'saved';
+    if (!api.ui.status) api.ui.status = doneStatus;
   });
   return { kind: 'saved' };
 };
@@ -321,6 +342,13 @@ const saveCompose = (api, extra) => {
   if (spec && spec.command) return { kind: spec.command };
   const kind = api.state.composeKind;
   if (kind === 'file') return saveFileCompose(api);
+  const item = api.ui.current ? api.ui.current() : null;
+  const shouldStage =
+    kind === 'code' &&
+    writesCodeFile(api, item) &&
+    item &&
+    item.origin !== 'staged';
+  const rel = itemPath(item);
   const baseline = api.state.composeBaseline;
   const result = commitCompose(api);
   if (result === false) return { kind: 'error' };
@@ -331,12 +359,17 @@ const saveCompose = (api, extra) => {
     const next = editor ? editor.text : '';
     if (notes) rememberTemplate(notes, baseline, next);
   }
+  if (shouldStage && reload) stageEditedFile(api, rel);
   api.ui.flushReview();
   closeCompose(api);
+  const doneStatus = shouldStage && reload ? 'staged' : 'saved';
   if (reload && typeof api.ui.reloadAfterChange === 'function') {
-    api.ui.reloadAfterChange();
+    api.ui.reloadAfterChange(() => {
+      if (!api.ui.status) api.ui.status = doneStatus;
+    });
+  } else {
+    api.ui.status = doneStatus;
   }
-  api.ui.status = 'saved';
   if (opts.editNext === true) api.todos.editNextTodo();
   return { kind: 'saved' };
 };
@@ -369,7 +402,7 @@ const composeView = (api) => {
   const kind = state.composeKind;
   const text = state.editor.text;
   const cursor = state.editor.cursor;
-  return { kind, text, cursor };
+  return { kind, text, cursor, commitKind: state.commitKind };
 };
 
 const liveCodeText = (api) => {
@@ -453,6 +486,22 @@ const moveNoteLine = (api, delta) => {
   api.state.editor.moveLine(delta, width);
 };
 
+const fullCommitEdit = (api) =>
+  api.state.composeKind === 'commit' && api.ui.commits.commitView === 'full';
+
+const editedCommitEntry = (api) => {
+  const kind = api.state.commitKind;
+  if (kind !== 'amend' && kind !== 'reword') return null;
+  const list = listedCommits(api.ui.commits.commits);
+  return list[api.nav.commitCursor] ?? null;
+};
+
+const moveCommitLine = (api, delta) => {
+  const size = viewSize(api);
+  const width = commitMessageWidth(editedCommitEntry(api), size.width);
+  api.state.editor.moveLine(delta, width);
+};
+
 const moveComposeLine = (api, delta) => {
   const spec = KIND[api.state.composeKind];
   const move = spec ? spec.move : 'note';
@@ -466,6 +515,7 @@ const moveComposeLine = (api, delta) => {
     const inner = codeInnerWidth(size.width, api.ui.layout);
     return void api.state.editor.moveLine(delta, inner);
   }
+  if (fullCommitEdit(api)) return void moveCommitLine(api, delta);
   moveNoteLine(api, delta);
 };
 
@@ -554,17 +604,31 @@ const onCode = (api) => {
   openCompose(api, 'code', text);
 };
 
+const insertNewline = (api) => {
+  api.state.editor.insert('\n');
+  resetBlink(api);
+  followFileEdit(api);
+  return null;
+};
+
+const onEmptyLastLine = (editor) => {
+  if (!editor) return false;
+  const text = editor.text;
+  const lastBreak = text.lastIndexOf('\n');
+  if (editor.cursor < lastBreak + 1) return false;
+  return text.slice(lastBreak + 1).trim() === '';
+};
+
 const enterCompose = (api) => {
   const { state } = api;
   if (state.templateFocus && state.composeKind === 'feedback') {
     return api.templates.selectTemplate(state.templateIndex);
   }
   const spec = KIND[state.composeKind];
-  if (spec && spec.enter === 'newline') {
-    state.editor.insert('\n');
-    resetBlink(api);
-    followFileEdit(api);
-    return null;
+  if (spec && spec.enter === 'newline') return insertNewline(api);
+  if (fullCommitEdit(api)) {
+    if (onEmptyLastLine(state.editor)) return saveCompose(api);
+    return insertNewline(api);
   }
   if (spec && spec.enter === 'edit-next') {
     return saveCompose(api, { editNext: true });

package/lib/session/dispatch.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const compose = require('./compose.js');
+const { listedCommits } = require('./commit.js');
 const { COMPOSE_LEAVE } = compose;
 const actions = require('./actions.js');
 const { CONFIRM_MODE, disabledActions, actionFromKey, applyConfirm } = actions;
@@ -16,7 +17,7 @@ const currentTarget = (ui) => {
     return ui.branches[ui.branchCursor];
   }
   if (ui.pane === 'commits') {
-    const entry = ui.commits.commits[ui.commitCursor];
+    const entry = listedCommits(ui.commits.commits)[ui.commitCursor];
     const staged = targetHasStaged(ui);
     if (!entry) return { canCommit: staged };
     return { ...entry, canCommit: staged };
@@ -32,6 +33,7 @@ const createDispatcher = (ui) => {
     next: ui.filesPane.onNext,
     prev: ui.filesPane.onPrev,
     layout: ui.filesPane.onLayout,
+    theme: ui.filesPane.onTheme,
     files: ui.filesPane.onFiles,
     feedback: ui.composer.onFeedback,
     todo: ui.composer.onTodo,
@@ -39,7 +41,10 @@ const createDispatcher = (ui) => {
     reload: ui.lifecycle.onReload,
     commit: ui.commits.onCommit,
     amend: ui.commits.onAmend,
+    reword: ui.commits.onReword,
+    apply: ui.commits.onApply,
     fixup: ui.commits.onFixup,
+    view: () => ui.commits.onView(),
     branch: ui.gitBranches.onBranch,
     pull: ui.gitBranches.onPull,
     push: ui.gitBranches.onPush,
@@ -54,7 +59,16 @@ const createDispatcher = (ui) => {
     open: ui.filesPane.onOpenFile,
     file: ui.filesPane.onFileScope,
     diff: ui.filesPane.onDiffScope,
-    removeTodo: ui.composer.removeFocusedTodo,
+    npm: ui.npm.open,
+    npmEdit: ui.npm.edit,
+    npmNew: ui.npm.create,
+    npmStop: () => ui.npm.closeView(),
+    npmRerun: () => ui.npm.rerun(),
+    check: () => ui.composer.toggleFocusedTodo(),
+    removeTodo: () => {
+      if (ui.pane === 'npm') return void ui.npm.askDrop();
+      ui.composer.removeFocusedTodo();
+    },
     quit: () => ui.onQuit(),
     scrollUp: () => ui.filesPane.onScroll(-1),
     scrollDown: () => ui.filesPane.onScroll(1),
@@ -86,6 +100,10 @@ const createDispatcher = (ui) => {
       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);
+    }
     const hidden = disabledActions(pane, currentTarget(ui));
     if (hidden.includes(action)) return;
     const handler = handlers[action];
@@ -109,12 +127,14 @@ const createInput = (ui) => {
     },
     confirmDrop: {
       confirm: () => {
+        if (ui.npm.dropName) return void ui.npm.confirmDrop();
         if (ui.commits.dropName) {
           return void ui.commits.confirmDropCommit();
         }
         ui.gitBranches.confirmDropBranch();
       },
       cancel: () => {
+        if (ui.npm.dropName) return void ui.npm.cancelDrop();
         if (ui.commits.dropName) {
           return void ui.commits.cancelDropCommit();
         }
@@ -141,7 +161,21 @@ const createInput = (ui) => {
       const command = ui.composer.handleKey(key);
       return void ui.runComposeCommand(command);
     }
+    if (ui.pane === 'npm' && ui.npm.viewing) {
+      if (key === 'escape') return void ui.npm.closeView();
+      if (key === 'r') return void ui.npm.rerun();
+      if (key === 'e' || key === 'n') return;
+    }
+    if (ui.pane === 'npm' && key === 'ctrl-up') return void ui.npm.reorder(-1);
+    if (ui.pane === 'npm' && key === 'ctrl-down') {
+      return void ui.npm.reorder(1);
+    }
+    if (ui.pane === 'npm' && (key === 'up' || key === 'down')) {
+      return void ui.npm.move(key === 'up' ? -1 : 1);
+    }
     if (key === 'escape') return void ui.filesPane.onEscape();
+    const toggle = key === 'x' || key === ' ';
+    if (toggle && ui.composer.toggleFocusedTodo()) return;
     if (ui.composer.typeIntoTodo(key)) return;
     const action = actionFromKey(key, ui.pane, ui.fileScope);
     if (action) ui.dispatch(action);

package/lib/session/files-pane.js

@@ -1,7 +1,10 @@
 'use strict';
 
+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 unit = require('./unit.js');
 const { setFileScope, openUnitFile, moveUnitBlock } = unit;
 
@@ -24,14 +27,25 @@ const syncFileCursor = (ui) => {
 };
 
 const showFiles = (ui) => {
-  ui.nav.pane = 'files';
-  ui.nav.clearSelection();
+  const nav = ui.nav;
+  const held =
+    nav.todoOpen === true ||
+    nav.pane === 'branches' ||
+    nav.pane === 'commits' ||
+    nav.pane === 'npm';
+  nav.pane = 'files';
+  nav.clearSelection();
   followReviewPath(ui);
-  ui.nav.todoOpen = false;
+  nav.todoOpen = false;
+  if (held) ui.lifecycle.catchUpWatch();
 };
 
 const onEscape = (ui) => {
-  if (ui.nav.pane === 'branches' || ui.nav.pane === 'commits') {
+  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();
@@ -59,7 +73,8 @@ const onOpenFile = (ui) => {
   if (ui.nav.pane === 'branches') {
     return void ui.gitBranches.onCheckoutBranch();
   }
-  if (ui.nav.pane === 'commits') return;
+  if (ui.nav.pane === 'commits') return void ui.commits.onShowDiff();
+  if (ui.nav.pane === 'npm') return void ui.npm.run();
   if (ui.nav.pane !== 'files') {
     if (ui.nav.todoOpen) ui.composer.editFocusedTodo();
     return;
@@ -146,7 +161,9 @@ const scrollStep = (ui, fraction) => {
   const rows = size.height ?? 24;
   const fallback = Math.max(1, rows - 4);
   const bodyH = frame?.bodyH ?? fallback;
-  const height = Math.max(1, bodyH);
+  const viewing = ui.nav.pane === 'npm' && ui.npm && ui.npm.viewing;
+  const viewRows = viewing ? logViewRows(bodyH) : bodyH;
+  const height = Math.max(1, viewRows);
   const span = Math.floor(height * Math.abs(fraction));
   const n = Math.max(1, span);
   if (fraction < 0) return -n;
@@ -161,6 +178,7 @@ const onScroll = (ui, delta) => {
   if (ui.nav.pane === 'commits') {
     return void ui.commits.onCommitMove(delta);
   }
+  if (ui.nav.pane === 'npm') return void ui.npm.move(delta);
   if (ui.nav.todoOpen && ui.composer.todoRowCount() > 1) {
     return void ui.composer.moveTodoFocus(delta);
   }
@@ -192,6 +210,10 @@ const onJump = (ui, toEnd) => {
     const delta = toEnd ? Number.MAX_SAFE_INTEGER : -Number.MAX_SAFE_INTEGER;
     return void ui.commits.onCommitMove(delta);
   }
+  if (ui.nav.pane === 'npm') {
+    const delta = toEnd ? Number.MAX_SAFE_INTEGER : -Number.MAX_SAFE_INTEGER;
+    return void ui.npm.move(delta);
+  }
   if (ui.nav.todoOpen && ui.composer.todoRowCount() > 0) {
     const last = ui.composer.todoRowCount() - 1;
     const target = toEnd ? last : 0;
@@ -214,6 +236,13 @@ const onLayout = (ui) => {
   ui.nav.clearSelection();
 };
 
+const onTheme = (ui) => {
+  const i = THEME_NAMES.indexOf(themeName());
+  const next = THEME_NAMES[(i + 1) % THEME_NAMES.length];
+  setTheme(next);
+  ui.status = next;
+};
+
 const createFilesPane = (ui) => ({
   clampIndex: () => clampIndex(ui),
   syncReviewPath: () => syncReviewPath(ui),
@@ -230,6 +259,7 @@ const createFilesPane = (ui) => ({
   onHome: () => onJump(ui, false),
   onEnd: () => onJump(ui, true),
   onLayout: () => onLayout(ui),
+  onTheme: () => onTheme(ui),
   onFileScope: () => setFileScope(ui, 'file'),
   onDiffScope: () => setFileScope(ui, 'diff'),
 });

package/lib/session/lifecycle.js

@@ -6,10 +6,11 @@ const path = require('node:path');
 const { isAbortError } = require('./load.js');
 const { createDiskWatcher, POLL_MS, DEBOUNCE_MS } = require('./watch.js');
 const files = require('../files.js');
-const { itemPath, relativeAge } = files;
-const { MANIFEST, LOCKFILE } = require('../deps.js');
+const { itemPath, relativeAge, TODO_FILE } = files;
+const { MANIFEST, LOCKFILE, depFileMeta } = require('../deps.js');
 const review = require('../review.js');
-const { hasNotes } = review;
+const { hasNotes, loadReview } = review;
+const { mergeReview } = require('../review-merge.js');
 
 const loadOptions = (api, extra = {}) => {
   const { loadConfig, ui } = api;
@@ -196,11 +197,32 @@ const fileStamp = (top, rel) => {
   }
 };
 
+const npmRels = (items) => {
+  const rels = [MANIFEST, LOCKFILE];
+  for (const item of items) {
+    const rel = itemPath(item);
+    if (!depFileMeta(rel)) continue;
+    if (rels.includes(rel)) continue;
+    rels.push(rel);
+  }
+  rels.sort();
+  return rels;
+};
+
 const npmStamp = (api) => {
   const top = api.ui.top || api.loadConfig.cwd;
-  const pkg = fileStamp(top, MANIFEST);
-  const lock = fileStamp(top, LOCKFILE);
-  return `${pkg}|${lock}`;
+  const rels = npmRels(api.collection.items);
+  const parts = new Array(rels.length);
+  for (let i = 0; i < rels.length; i++) {
+    parts[i] = `${rels[i]}:${fileStamp(top, rels[i])}`;
+  }
+  return parts.join('|');
+};
+
+const npmExtrasStale = (api) => {
+  const cached = api.npmExtras;
+  if (!cached || !api.loadConfig.audit) return false;
+  return cached.stamp !== npmStamp(api);
 };
 
 const cacheNpmExtras = (api, loaded) => {
@@ -251,7 +273,6 @@ const followExtras = async (api, loaded, gen, kind) => {
 const npmReuseOpts = (api, extra = {}) => {
   const opts = {};
   if (extra.signal) opts.signal = extra.signal;
-  if (extra.keepView !== true) return opts;
   const cached = api.npmExtras;
   if (!cached) return opts;
   if (cached.stamp !== npmStamp(api)) return opts;
@@ -314,7 +335,7 @@ const runSnapshot = async (api, gen, kind, extra = {}) => {
   }
   applyLoaded(api, api.loader.tag(loaded, gen));
   afterSnapshot(api, kind, extra);
-  if (loaded.pending) {
+  if (loaded.pending === true || npmExtrasStale(api)) {
     api.ops.setBusy('checking npm');
     if (kind === 'open' || extra.quiet === true) api.ui.paint();
     await followExtras(api, loaded, gen, kind);
@@ -360,7 +381,7 @@ const refreshFromRepo = (api, extra = {}) => {
   );
   applyLoaded(api, api.loader.tag(loaded, gen));
   afterSnapshot(api, kind, extra);
-  if (loaded.pending) {
+  if (loaded.pending === true || npmExtrasStale(api)) {
     api.ops.setBusy('checking npm');
     return void followExtras(api, loaded, gen, kind);
   }
@@ -436,12 +457,14 @@ const onDiskChange = (api) => {
   refreshFromRepo(api, { keepView: true, quiet: true });
 };
 
-const currentFileStamp = (api) => {
-  const pane = api.nav.pane;
-  if (pane !== 'diff' && pane !== 'unit') return '';
-  const rel = pane === 'unit' ? api.nav.reviewPath : itemPath(api.ui.current());
-  if (!rel) return '';
-  const full = path.join(api.ui.top || api.loadConfig.cwd, rel);
+const catchUpWatch = (api) => {
+  clearWatchRetry(api);
+  if (shouldDeferWatch(api)) return void onDiskChange(api);
+  refreshFromRepo(api, { keepView: true, quiet: true });
+};
+
+const stampFile = (root, rel) => {
+  const full = path.join(root, rel);
   let stat;
   try {
     stat = fs.statSync(full);
@@ -451,6 +474,33 @@ const currentFileStamp = (api) => {
   return `${rel}:${stat.mtimeMs}:${stat.size}`;
 };
 
+const worktreeStamp = (api) => {
+  const root = api.ui.top || api.loadConfig.cwd;
+  const parts = [];
+  for (const rel of itemRels(api.collection)) {
+    if (!rel || rel === TODO_FILE) continue;
+    parts.push(stampFile(root, rel));
+  }
+  return parts.join('\n');
+};
+
+const watchesWorktree = (nav) =>
+  nav.todoOpen === true ||
+  nav.pane === 'branches' ||
+  nav.pane === 'commits' ||
+  nav.pane === 'npm';
+
+const currentFileStamp = (api) => {
+  const { nav } = api;
+  const root = api.ui.top || api.loadConfig.cwd;
+  if (watchesWorktree(nav)) return worktreeStamp(api);
+  const pane = nav.pane;
+  if (pane !== 'diff' && pane !== 'unit') return '';
+  const rel = pane === 'unit' ? nav.reviewPath : itemPath(api.ui.current());
+  if (!rel) return '';
+  return stampFile(root, rel);
+};
+
 const pollCurrentFile = (api) => {
   const stamp = currentFileStamp(api);
   if (!stamp) {
@@ -466,9 +516,46 @@ const pollCurrentFile = (api) => {
   onDiskChange(api);
 };
 
+const reviewFileStamp = (api) => {
+  const store = api.review && api.review.store;
+  if (!store || !store.reviewPath) return '';
+  try {
+    const stat = fs.statSync(store.reviewPath);
+    return `${stat.mtimeMs}:${stat.size}`;
+  } catch {
+    return 'missing';
+  }
+};
+
+const noteReviewStamp = (api) => {
+  api.reviewStamp = reviewFileStamp(api);
+};
+
+const applyReviewChange = (api) => {
+  if (!api.ui || api.ui.done) return;
+  const stamp = reviewFileStamp(api);
+  if (!stamp || stamp === api.reviewStamp) return;
+  if (stamp === 'missing') {
+    api.reviewStamp = stamp;
+    return;
+  }
+  const store = api.review && api.review.store;
+  if (!store) return;
+  let disk;
+  try {
+    disk = loadReview(store.reviewPath, store.templates);
+  } catch {
+    return;
+  }
+  mergeReview(store, disk);
+  api.reviewStamp = stamp;
+  if (typeof api.ui.paint === 'function') api.ui.paint();
+};
+
 const stopWatch = (api) => {
   clearWatchRetry(api);
   api.watchStamp = '';
+  api.reviewStamp = '';
   if (api.ui.term) api.ui.term.stopTimer('watch');
   if (!api.diskWatcher) return;
   api.diskWatcher.close();
@@ -484,16 +571,26 @@ const startWatch = (api) => {
     root,
     paths: api.loadConfig.paths,
     onChange: () => onDiskChange(api),
+    onReview: () => applyReviewChange(api),
   });
   syncItemWatches(api);
+  noteReviewStamp(api);
   if (!api.ui.term) return;
-  api.ui.term.startTimer('watch', () => pollCurrentFile(api), POLL_MS);
+  api.ui.term.startTimer(
+    'watch',
+    () => {
+      pollCurrentFile(api);
+      applyReviewChange(api);
+    },
+    POLL_MS,
+  );
 };
 
 const createLifecycle = (api) => {
   api.diskWatcher = null;
   api.watchRetry = null;
   api.watchStamp = '';
+  api.reviewStamp = '';
   api.ignoreWatchUntil = 0;
   api.npmExtras = null;
   return {
@@ -505,6 +602,9 @@ const createLifecycle = (api) => {
     reloadAfterChange: (afterLoad) => reloadAfterChange(api, afterLoad),
     onReload: () => onReload(api),
     onDiskChange: () => onDiskChange(api),
+    applyReviewChange: () => applyReviewChange(api),
+    noteReviewStamp: () => noteReviewStamp(api),
+    catchUpWatch: () => catchUpWatch(api),
     pollCurrentFile: () => pollCurrentFile(api),
     startWatch: () => startWatch(api),
     stopWatch: () => stopWatch(api),

package/lib/session/navigation.js

@@ -9,6 +9,7 @@ const initialState = (options = {}) => ({
   fileCursor: 0,
   branchCursor: 0,
   commitCursor: 0,
+  npmCursor: 0,
   scroll: 0,
   listScroll: 0,
   reviewPath: null,