reslop 0.2.4 → 0.2.5

package/lib/session/files-pane.js

@@ -3,7 +3,7 @@
 const ansi = require('../ansi.js');
 const files = require('../files.js');
 const { THEME_NAMES, setTheme, themeName } = ansi;
-const { isTodosEntry, TODO_FILE } = files;
+const { isTasksEntry, TASKS_FILE } = files;
 const npm = require('../render/npm.js');
 const { logViewRows } = npm;
 const unit = require('./unit.js');
@@ -13,7 +13,7 @@ const { setFileScope, openUnitFile, moveUnitBlock } = unit;
 
 const LAYOUTS = ['unified', 'mixed', 'side'];
 
-const current = (ui) => ui.nav.current(ui.items, ui.todoItem);
+const current = (ui) => ui.nav.current(ui.items, ui.tasksItem);
 
 const clampIndex = (ui) => ui.nav.clampIndex(ui.items.length);
 
@@ -32,14 +32,15 @@ const syncFileCursor = (ui) => {
 const showFiles = (ui) => {
   const nav = ui.nav;
   const held =
-    nav.todoOpen === true ||
+    nav.tasksOpen === true ||
     nav.pane === 'branches' ||
     nav.pane === 'commits' ||
     nav.pane === 'npm';
   nav.pane = 'files';
+  nav.resetListScroll('files');
   nav.clearSelection();
   followReviewPath(ui);
-  nav.todoOpen = false;
+  nav.tasksOpen = false;
   if (held) ui.lifecycle.catchUpWatch();
 };
 
@@ -54,12 +55,12 @@ const onFiles = (ui) => {
     if (ui.nav.fileScope === 'file') {
       const list = ui.fileList();
       const entry = list[ui.nav.fileCursor];
-      if (entry && !isTodosEntry(entry)) openUnitFile(ui, entry);
+      if (entry && !isTasksEntry(entry)) openUnitFile(ui, entry);
       return;
     }
     ui.nav.pane = 'diff';
     ui.nav.clearSelection();
-    if (ui.nav.reviewPath === TODO_FILE) ui.composer.openTodoPage();
+    if (ui.nav.reviewPath === TASKS_FILE) ui.composer.openTasksPage();
     return;
   }
   showFiles(ui);
@@ -72,18 +73,18 @@ const onOpenFile = (ui) => {
   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();
+    if (ui.nav.tasksOpen) ui.composer.editFocusedTask();
     return;
   }
   const list = ui.fileList();
   const entry = list[ui.nav.fileCursor];
   if (!entry) return;
-  if (isTodosEntry(entry)) {
-    ui.composer.openTodoPage();
+  if (isTasksEntry(entry)) {
+    ui.composer.openTasksPage();
     ui.status = '';
     return;
   }
-  ui.nav.todoOpen = false;
+  ui.nav.tasksOpen = false;
   ui.nav.index = entry.openIndex ?? entry.firstIndex;
   if (ui.nav.fileScope === 'file') {
     return void openUnitFile(ui, entry);
@@ -107,8 +108,8 @@ const onFileMove = (ui, delta) => {
   if (next === ui.nav.fileCursor) return;
   ui.nav.fileCursor = next;
   const entry = list[next];
-  if (isTodosEntry(entry)) {
-    ui.nav.reviewPath = TODO_FILE;
+  if (isTasksEntry(entry)) {
+    ui.nav.reviewPath = TASKS_FILE;
   } else {
     ui.nav.reviewPath = entry.path;
     ui.nav.index = entry.firstIndex;
@@ -133,8 +134,8 @@ const moveRemaining = (ui, step) => {
 
 const onNext = (ui) => {
   if (ui.nav.pane === 'unit') return void moveUnitBlock(ui, 1);
-  if (ui.nav.todoOpen) {
-    ui.composer.closeTodoPage();
+  if (ui.nav.tasksOpen) {
+    ui.composer.closeTasksPage();
     if (ui.items.length) ui.nav.index = 0;
     ui.nav.scroll = 0;
     syncReviewPath(ui);
@@ -146,8 +147,8 @@ const onNext = (ui) => {
 
 const onPrev = (ui) => {
   if (ui.nav.pane === 'unit') return void moveUnitBlock(ui, -1);
-  if (ui.nav.todoOpen) return;
-  if (ui.nav.index <= 0) return void ui.composer.openTodoPage();
+  if (ui.nav.tasksOpen) return;
+  if (ui.nav.index <= 0) return void ui.composer.openTasksPage();
   moveRemaining(ui, -1);
 };
 
@@ -175,8 +176,8 @@ const onScroll = (ui, delta) => {
     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);
+  if (ui.nav.tasksOpen && ui.composer.taskRowCount() > 1) {
+    return void ui.composer.moveTaskFocus(delta);
   }
   const frame = ui.lastFrame;
   const max = frame ? frame.scrollMax : null;
@@ -193,11 +194,11 @@ const onJump = (ui, toEnd) => {
     const delta = toEnd ? Number.MAX_SAFE_INTEGER : -Number.MAX_SAFE_INTEGER;
     return void onScroll(ui, delta);
   }
-  if (ui.nav.todoOpen && ui.composer.todoRowCount() > 0) {
-    const last = ui.composer.todoRowCount() - 1;
+  if (ui.nav.tasksOpen && ui.composer.taskRowCount() > 0) {
+    const last = ui.composer.taskRowCount() - 1;
     const target = toEnd ? last : 0;
-    const at = ui.composer.clampedTodoFocus();
-    return void ui.composer.moveTodoFocus(target - at);
+    const at = ui.composer.clampedTaskFocus();
+    return void ui.composer.moveTaskFocus(target - at);
   }
   const frame = ui.lastFrame;
   const max = frame ? frame.scrollMax : 0;
@@ -230,7 +231,6 @@ const createFilesPane = (ui) => ({
   onEscape: () => onEscape(ui),
   onFiles: () => onFiles(ui),
   onOpenFile: () => onOpenFile(ui),
-  onFileMove: (delta) => onFileMove(ui, delta),
   onNext: () => onNext(ui),
   onPrev: () => onPrev(ui),
   scrollStep: (fraction) => scrollStep(ui, fraction),
@@ -243,4 +243,4 @@ const createFilesPane = (ui) => ({
   onDiffScope: () => setFileScope(ui, 'diff'),
 });
 
-module.exports = { LAYOUTS, createFilesPane };
+module.exports = { createFilesPane };

package/lib/session/items.js

@@ -1,10 +1,7 @@
 'use strict';
 
-const accessors = require('./accessors.js');
-const { stateView } = accessors;
-
 const files = require('../files.js');
-const { itemPath, TODO_FILE, isTodoItem } = files;
+const { itemPath, TASKS_FILE, isTaskItem } = files;
 const review = require('../review.js');
 const { feedbackKey } = review;
 const diff = require('../diff/diff.js');
@@ -29,7 +26,7 @@ const npmBusyKind = (item) => {
 const blockKey = (item) => {
   if (!item || !item.file) return '';
   const rel = itemPath(item);
-  if (isTodoItem(item)) return `todo:${TODO_FILE}`;
+  if (isTaskItem(item)) return `todo:${TASKS_FILE}`;
   const depId = depChangeKey(item);
   if (depId) return `${rel}:dep:${depId}`;
   if (!item.hunk) {
@@ -44,13 +41,13 @@ const blockKey = (item) => {
 
 const itemKey = (item) => {
   const key = blockKey(item);
-  if (!key || isTodoItem(item)) return key;
+  if (!key || isTaskItem(item)) return key;
   const origin = item.origin ?? '';
   return `${origin}:${key}`;
 };
 
 const blockLinesKey = (item) => {
-  if (!item || !item.file || isTodoItem(item)) return '';
+  if (!item || !item.file || isTaskItem(item)) return '';
   if (!item.hunk) return '';
   const parts = [itemPath(item)];
   for (const line of item.hunk.lines) {
@@ -132,27 +129,25 @@ const alignLoadedItems = (prev, next) => {
   return ordered;
 };
 
-const restoredIndex = (items, item) => {
-  if (!item || !item.file) return -1;
-  const origin = item.origin ?? '';
+const originOf = (item) => item.origin ?? '';
+
+const hunkStart = (item) => (item.hunk ? item.hunk.newStart : 0);
+
+const sameLinesIndex = (items, item) => {
   const lines = blockLinesKey(item);
-  if (lines) {
-    let any = -1;
-    for (let i = 0; i < items.length; i++) {
-      if (blockLinesKey(items[i]) !== lines) continue;
-      if (any < 0) any = i;
-      if ((items[i].origin ?? '') === origin) return i;
-    }
-    if (any >= 0) return any;
-  }
-  const key = itemKey(item);
-  if (key) {
-    const exact = items.findIndex((entry) => itemKey(entry) === key);
-    if (exact >= 0) return exact;
+  if (!lines) return -1;
+  let fallback = -1;
+  for (let i = 0; i < items.length; i++) {
+    if (blockLinesKey(items[i]) !== lines) continue;
+    if (originOf(items[i]) === originOf(item)) return i;
+    if (fallback < 0) fallback = i;
   }
+  return fallback;
+};
+
+const nearestHunkIndex = (items, item) => {
   const rel = itemPath(item);
   if (!rel) return -1;
-  const start = item.hunk ? item.hunk.newStart : 0;
   let fileMatch = -1;
   let best = -1;
   let bestDist = Infinity;
@@ -160,19 +155,27 @@ const restoredIndex = (items, item) => {
     const entry = items[i];
     if (itemPath(entry) !== rel) continue;
     if (fileMatch < 0) fileMatch = i;
-    if ((entry.origin ?? '') !== origin) continue;
-    const at = entry.hunk ? entry.hunk.newStart : 0;
-    const dist = Math.abs(at - start);
+    if (originOf(entry) !== originOf(item)) continue;
+    const dist = Math.abs(hunkStart(entry) - hunkStart(item));
     if (dist >= bestDist) continue;
     bestDist = dist;
     best = i;
   }
-  if (best >= 0) return best;
-  return fileMatch;
+  return best >= 0 ? best : fileMatch;
+};
+
+const restoredIndex = (items, item) => {
+  if (!item || !item.file) return -1;
+  const byLines = sameLinesIndex(items, item);
+  if (byLines >= 0) return byLines;
+  const key = itemKey(item);
+  const exact = key ? items.findIndex((entry) => itemKey(entry) === key) : -1;
+  if (exact >= 0) return exact;
+  return nearestHunkIndex(items, item);
 };
 
 const itemFeedKey = (item) => {
-  if (!item || !item.file || isTodoItem(item)) return '';
+  if (!item || !item.file || isTaskItem(item)) return '';
   const hunk = item.hunk;
   const depId = depChangeKey(item);
   const file = depId ? `${itemPath(item)}#${depId}` : itemPath(item);
@@ -190,88 +193,65 @@ const sameBlock = (left, right) => {
 };
 
 const canEditCode = (item) => {
-  if (!item || isTodoItem(item)) return false;
+  if (!item || isTaskItem(item)) return false;
   if (!item.hunk || !item.file) return false;
   if (item.file.isBinary) return false;
   return true;
 };
 
-const createItemCollection = () => {
-  const state = {
-    items: [],
-    dismissed: new Set(),
-  };
+class ItemCollection {
+  constructor() {
+    this.items = [];
+    this.dismissed = new Set();
+  }
 
-  const reset = () => {
-    state.items = [];
-    state.dismissed = new Set();
-  };
+  reset() {
+    this.items = [];
+    this.dismissed = new Set();
+  }
 
-  const isDismissed = (item) => state.dismissed.has(itemKey(item));
+  isDismissed(item) {
+    return this.dismissed.has(itemKey(item));
+  }
 
-  const replace = (items) => {
-    const aligned = alignLoadedItems(state.items, items);
-    const next = [];
-    for (const item of aligned) {
-      if (isDismissed(item)) continue;
-      next.push(item);
-    }
-    state.items = next;
-    return next;
-  };
+  replace(items) {
+    const aligned = alignLoadedItems(this.items, items);
+    this.items = aligned.filter((item) => !this.isDismissed(item));
+    return this.items;
+  }
 
-  const dismiss = (item) => {
-    state.dismissed.add(itemKey(item));
-  };
+  dismiss(item) {
+    this.dismissed.add(itemKey(item));
+  }
 
-  const clearDismissed = () => {
-    state.dismissed.clear();
-  };
+  clearDismissed() {
+    this.dismissed.clear();
+  }
 
-  const findRestoredIndex = (item) => restoredIndex(state.items, item);
+  findRestoredIndex(item) {
+    return restoredIndex(this.items, item);
+  }
 
-  const keepOrigin = (item, origin) => {
+  keepOrigin(item, origin) {
     const next = { ...item, origin };
-    const { length } = state.items;
-    const replaced = new Array(length);
-    for (let i = 0; i < length; i++) {
-      const entry = state.items[i];
-      replaced[i] = sameBlock(entry, item) ? next : entry;
-    }
+    const replaced = this.items.map((entry) =>
+      sameBlock(entry, item) ? next : entry,
+    );
     if (next.dep) {
-      state.items = replaced;
+      this.items = replaced;
       return;
     }
-    state.items = refreshIndexPatches(replaced, next);
-  };
-
-  return stateView(
-    state,
-    {
-      reset,
-      replace,
-      dismiss,
-      clearDismissed,
-      isDismissed,
-      findRestoredIndex,
-      keepOrigin,
-    },
-    ['items'],
-    ['dismissed'],
-  );
-};
+    this.items = refreshIndexPatches(replaced, next);
+  }
+}
 
 module.exports = {
-  depChangeKey,
   needsReload,
   npmBusyKind,
-  blockKey,
-  itemKey,
   itemFeedKey,
-  blockLinesKey,
   alignLoadedItems,
   restoredIndex,
   sameBlock,
   canEditCode,
-  createItemCollection,
+  ItemCollection,
 };

package/lib/session/lifecycle.js

@@ -4,11 +4,11 @@ const fs = require('node:fs');
 const path = require('node:path');
 
 const sessionLoad = require('./load.js');
-const { isAbortError } = sessionLoad;
+const { isAbortError, tagLoaded, fetchSnapshot, fetchExtras } = sessionLoad;
 const watch = require('./watch.js');
-const { createDiskWatcher, POLL_MS, DEBOUNCE_MS } = watch;
+const { createDiskWatcher, DEBOUNCE_MS } = watch;
 const files = require('../files.js');
-const { itemPath, relativeAge, TODO_FILE } = files;
+const { itemPath, relativeAge } = files;
 const deps = require('../deps.js');
 const { MANIFEST, LOCKFILE, depFileMeta } = deps;
 const review = require('../review.js');
@@ -82,7 +82,7 @@ const failOpen = (api, error) => {
 
 const restoreAfterLoad = (api, here, wasTodo) => {
   const { collection, nav, ui } = api;
-  nav.todoOpen = wasTodo;
+  nav.tasksOpen = wasTodo;
   if (here && !wasTodo) {
     const idx = collection.findRestoredIndex(here);
     if (idx >= 0) nav.index = idx;
@@ -152,7 +152,7 @@ const applyLoaded = (api, loaded) => {
   if (loaded.generation !== undefined) {
     if (!loader.accept(loaded.generation, ui.done)) return false;
   }
-  const wasTodo = nav.todoOpen === true;
+  const wasTodo = nav.tasksOpen === true;
   const here = ui.current();
   ui.top = loaded.top ?? api.loadConfig.cwd;
   collection.replace(loaded.items);
@@ -243,6 +243,13 @@ const clearNpmExtras = (api) => {
   api.npmExtras = null;
 };
 
+const isWanted = (api, gen) => {
+  if (!api.loader.isCurrent(gen)) return false;
+  if (!api.ui.done) return true;
+  api.ops.clearBusy();
+  return false;
+};
+
 const followExtras = async (api, loaded, gen, kind) => {
   const extra = loadOptions(api, {
     paths: api.loadConfig.paths,
@@ -250,25 +257,18 @@ const followExtras = async (api, loaded, gen, kind) => {
   });
   let next;
   try {
-    next = await api.loader.fetchExtras(api.loadConfig.repo, loaded, extra);
+    next = await fetchExtras(api.loadConfig.repo, loaded, extra);
   } catch (error) {
-    if (!api.loader.isCurrent(gen)) return;
-    return void failOpen(api, error);
-  }
-  if (!api.loader.isCurrent(gen)) return;
-  if (api.ui.done) {
-    api.ops.clearBusy();
+    if (api.loader.isCurrent(gen)) failOpen(api, error);
     return;
   }
-  if (!next) {
-    api.ops.clearBusy();
+  if (!isWanted(api, gen)) return;
+  if (next) {
+    applyLoaded(api, tagLoaded(next, gen));
+    cacheNpmExtras(api, next);
+  } else {
     api.loader.pendingExtras = false;
-    api.ui.paint();
-    finishIfEmpty(api, kind);
-    return;
   }
-  applyLoaded(api, api.loader.tag(next, gen));
-  cacheNpmExtras(api, next);
   api.ops.clearBusy();
   api.ui.paint();
   finishIfEmpty(api, kind);
@@ -301,7 +301,13 @@ const resetNavAfterLoad = (api, extra = {}) => {
   if (extra.afterLoad) extra.afterLoad();
 };
 
+const refreshListsForPane = (api) => {
+  const pane = api.ui.nav.pane;
+  if (pane === 'commits' && api.ui.commits) api.ui.commits.refresh();
+};
+
 const afterSnapshot = (api, kind, extra = {}) => {
+  refreshListsForPane(api);
   if (kind !== 'open' && kind !== 'watch') {
     return void resetNavAfterLoad(api, extra);
   }
@@ -319,7 +325,7 @@ const runSnapshot = async (api, gen, kind, extra = {}) => {
   beginSnapshot(api, extra);
   let loaded;
   try {
-    loaded = await api.loader.fetchSnapshot(
+    loaded = await fetchSnapshot(
       api.loadConfig.repo,
       api.loadConfig.cwd,
       api.loadConfig.paths,
@@ -329,15 +335,11 @@ const runSnapshot = async (api, gen, kind, extra = {}) => {
       }),
     );
   } catch (error) {
-    if (!api.loader.isCurrent(gen)) return;
-    return void failOpen(api, error);
-  }
-  if (!api.loader.isCurrent(gen)) return;
-  if (api.ui.done) {
-    api.ops.clearBusy();
+    if (api.loader.isCurrent(gen)) failOpen(api, error);
     return;
   }
-  applyLoaded(api, api.loader.tag(loaded, gen));
+  if (!isWanted(api, gen)) return;
+  applyLoaded(api, tagLoaded(loaded, gen));
   afterSnapshot(api, kind, extra);
   if (loaded.pending === true || npmExtrasStale(api)) {
     api.ops.setBusy('checking npm');
@@ -383,7 +385,7 @@ const refreshFromRepo = (api, extra = {}) => {
     api.loadConfig.paths,
     snapshotOpts(api, extra),
   );
-  applyLoaded(api, api.loader.tag(loaded, gen));
+  applyLoaded(api, tagLoaded(loaded, gen));
   afterSnapshot(api, kind, extra);
   if (loaded.pending === true || npmExtrasStale(api)) {
     api.ops.setBusy('checking npm');
@@ -467,59 +469,6 @@ const catchUpWatch = (api) => {
   refreshFromRepo(api, { keepView: true, quiet: true });
 };
 
-const stampFile = (root, rel) => {
-  const full = path.join(root, rel);
-  let stat;
-  try {
-    stat = fs.statSync(full);
-  } catch {
-    return `${rel}:missing`;
-  }
-  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) {
-    api.watchStamp = '';
-    return;
-  }
-  if (!api.watchStamp) {
-    api.watchStamp = stamp;
-    return;
-  }
-  if (stamp === api.watchStamp) return;
-  api.watchStamp = stamp;
-  onDiskChange(api);
-};
-
 const reviewFileStamp = (api) => {
   const store = api.review && api.review.store;
   if (!store || !store.reviewPath) return '';
@@ -553,14 +502,12 @@ const applyReviewChange = (api) => {
   }
   mergeReview(store, disk);
   api.reviewStamp = stamp;
-  if (typeof api.ui.paint === 'function') api.ui.paint();
+  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();
   api.diskWatcher = null;
@@ -579,26 +526,15 @@ const startWatch = (api) => {
   });
   syncItemWatches(api);
   noteReviewStamp(api);
-  if (!api.ui.term) return;
-  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 {
-    applyLoaded: (loaded) => applyLoaded(api, loaded),
     load: () => load(api),
     openLoad: () => openLoad(api),
     loadReady: () => loadReady(api),
@@ -609,7 +545,6 @@ const createLifecycle = (api) => {
     applyReviewChange: () => applyReviewChange(api),
     noteReviewStamp: () => noteReviewStamp(api),
     catchUpWatch: () => catchUpWatch(api),
-    pollCurrentFile: () => pollCurrentFile(api),
     startWatch: () => startWatch(api),
     stopWatch: () => stopWatch(api),
     ignoreWatch: (ms) => ignoreWatch(api, ms),