reslop 0.2.0 → 0.2.1

package/lib/session/compose.js

@@ -9,7 +9,7 @@ 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');
@@ -81,6 +81,7 @@ const initialState = () => ({
   blinkOn: true,
   fileDirty: false,
   fileEditRows: null,
+  fileOpened: '',
 });
 
 const reset = (state) => {
@@ -124,6 +125,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;
@@ -140,6 +142,7 @@ const closeCompose = (api) => {
   state.commitKind = null;
   state.composeTodoId = null;
   state.composeBaseline = '';
+  state.fileOpened = '';
   state.templateIndex = -1;
   state.templateFocus = false;
   state.fileEditRows = null;
@@ -240,60 +243,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 +330,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 +347,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 +390,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) => {

package/lib/session/dispatch.js

@@ -32,6 +32,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,6 +40,8 @@ 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,
     branch: ui.gitBranches.onBranch,
     pull: ui.gitBranches.onPull,
@@ -54,6 +57,7 @@ const createDispatcher = (ui) => {
     open: ui.filesPane.onOpenFile,
     file: ui.filesPane.onFileScope,
     diff: ui.filesPane.onDiffScope,
+    check: () => ui.composer.toggleFocusedTodo(),
     removeTodo: ui.composer.removeFocusedTodo,
     quit: () => ui.onQuit(),
     scrollUp: () => ui.filesPane.onScroll(-1),
@@ -142,6 +146,8 @@ const createInput = (ui) => {
       return void ui.runComposeCommand(command);
     }
     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,6 +1,8 @@
 'use strict';
 
+const ansi = require('../ansi.js');
 const files = require('../files.js');
+const { THEME_NAMES, setTheme, themeName } = ansi;
 const { isTodosEntry, TODO_FILE } = files;
 const unit = require('./unit.js');
 const { setFileScope, openUnitFile, moveUnitBlock } = unit;
@@ -24,10 +26,14 @@ 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 = 'files';
+  nav.clearSelection();
   followReviewPath(ui);
-  ui.nav.todoOpen = false;
+  nav.todoOpen = false;
+  if (held) ui.lifecycle.catchUpWatch();
 };
 
 const onEscape = (ui) => {
@@ -214,6 +220,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 +243,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,30 @@ 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';
+
+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 +513,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 +568,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 +599,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/pointer.js

@@ -105,7 +105,10 @@ const RELEASE_TARGETS = [
   {
     match: (ui) => ui.pane === 'diff',
     hits: 'todoHits',
-    onHit: (ui, hit) => ui.composer.onTodoHit(hit.cursor),
+    onHit: (ui, hit) => {
+      if (hit.check) return void ui.composer.onTodoCheck(hit.cursor);
+      ui.composer.onTodoHit(hit.cursor);
+    },
   },
   {
     match: (ui) => ui.mode === 'compose',

package/lib/session/todos.js

@@ -3,7 +3,7 @@
 const files = require('../files.js');
 const { isTodosEntry, TODO_FILE } = files;
 const review = require('../review.js');
-const { addTodo, setTodoText, removeTodo, checkLabel } = review;
+const { addTodo, setTodoText, setTodoDone, removeTodo, checkLabel } = review;
 
 const TODO_TYPE_SKIP = [
   'enter',
@@ -101,6 +101,7 @@ const closeTodoPage = (api) => {
   api.nav.todoOpen = false;
   api.ui.syncReviewPath();
   api.ui.syncFileCursor();
+  api.ui.lifecycle.catchUpWatch();
 };
 
 const focusTodoPage = (api, todoId) => {
@@ -189,6 +190,17 @@ const removeFocusedTodo = (api) => {
   api.ui.flushReview(true);
 };
 
+const toggleFocusedTodo = (api) => {
+  const nav = api.nav;
+  if (!nav.todoOpen || nav.pane !== 'diff') return false;
+  if (api.ui.mode !== 'review') return false;
+  const todo = listTodos(api)[clampedTodoFocus(api)];
+  if (!todo) return false;
+  setTodoDone(api.review.store, todo.id, !todo.done);
+  api.ui.flushReview(true);
+  return true;
+};
+
 const onTodoHit = (api, cursor) => {
   if (!api.nav.todoOpen) return;
   const todos = listTodos(api);
@@ -206,6 +218,20 @@ const onTodoHit = (api, cursor) => {
   editFocusedTodo(api);
 };
 
+const onTodoCheck = (api, cursor) => {
+  if (!api.nav.todoOpen) return;
+  const todo = listTodos(api)[cursor];
+  if (!todo) return void onTodoHit(api, cursor);
+  const { state } = api;
+  if (state.composeKind === 'todo' && state.composeTodoId !== todo.id) {
+    api.commit();
+    api.close();
+  }
+  setTodoDone(api.review.store, todo.id, !todo.done);
+  api.nav.todoFocus = cursor;
+  api.ui.flushReview(true);
+};
+
 const createTodo = (api) => {
   startDraftCompose(api);
 };
@@ -253,6 +279,8 @@ const createTodoCompose = (api) => ({
   typeIntoTodo: (key) => typeIntoTodo(api, key),
   removeFocusedTodo: () => removeFocusedTodo(api),
   onTodoHit: (cursor) => onTodoHit(api, cursor),
+  onTodoCheck: (cursor) => onTodoCheck(api, cursor),
+  toggleFocusedTodo: () => toggleFocusedTodo(api),
   onTodo: () => onTodo(api),
   todoEditView: () => todoEditView(api),
   commitTodo: (text) => commitTodo(api, text),