reslop 0.1.9 → 0.2.1

package/lib/session/lifecycle.js

@@ -4,12 +4,13 @@ const fs = require('node:fs');
 const path = require('node:path');
 
 const { isAbortError } = require('./load.js');
-const { createDiskWatcher, POLL_MS } = require('./watch.js');
+const { createDiskWatcher, POLL_MS, DEBOUNCE_MS } = require('./watch.js');
 const files = require('../files.js');
-const { itemPath, relativeAge } = files;
-const { MANIFEST, LOCKFILE } = require('../deps/manifest.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;
@@ -30,8 +31,6 @@ const shouldDeferExtras = (api) => {
   return audit && (waitingOutdated || waitingAudit);
 };
 
-const watchOpts = (api) => api.watch ?? {};
-
 const endReadLoop = (api) => {
   const finish = api.ui.finishReadLoop;
   if (finish) finish();
@@ -50,8 +49,6 @@ const kindFromExtra = (extra = {}) => {
   return 'reload';
 };
 
-const shouldResetNav = (kind) => kind !== 'open' && kind !== 'watch';
-
 const finishIfEmpty = (api, kind) => {
   const { collection, review: notes, ui, nav } = api;
   if (collection.items.length) return;
@@ -125,9 +122,25 @@ const stampItemDates = (items, dates) => {
   }
 };
 
+const syncUnitEditor = (api) => {
+  const composer = api.ui.composer;
+  if (!composer || typeof composer.applyDiskText !== 'function') return;
+  if (api.nav.pane !== 'unit') return;
+  const rel = api.nav.reviewPath;
+  if (!rel) return;
+  const repo = api.ui.repo;
+  if (!repo || typeof repo.fileText !== 'function') return;
+  const text = repo.fileText(api.ui.top || api.loadConfig.cwd, rel, api.ui.rev);
+  composer.applyDiskText(text);
+};
+
 const syncItemWatches = (api) => {
   if (!api.diskWatcher) return;
-  api.diskWatcher.watchFiles(itemRels(api.collection));
+  const rels = itemRels(api.collection);
+  if (api.nav.pane === 'unit' && api.nav.reviewPath) {
+    if (!rels.includes(api.nav.reviewPath)) rels.push(api.nav.reviewPath);
+  }
+  api.diskWatcher.watchFiles(rels);
 };
 
 const applyLoaded = (api, loaded) => {
@@ -160,6 +173,7 @@ const applyLoaded = (api, loaded) => {
   markLoaded(api);
   loader.pendingExtras = loaded.pending === true;
   syncItemWatches(api);
+  syncUnitEditor(api);
   return true;
 };
 
@@ -173,23 +187,42 @@ const load = (api) => {
   applyLoaded(api, loaded);
 };
 
-const fileStamp = (top, rel, statSync) => {
+const fileStamp = (top, rel) => {
   const full = path.join(top, rel);
   try {
-    const stat = statSync(full);
+    const stat = fs.statSync(full);
     return `${stat.mtimeMs}:${stat.size}`;
   } catch {
     return 'missing';
   }
 };
 
+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 extra = watchOpts(api);
-  const statSync = extra.statSync ?? fs.statSync;
   const top = api.ui.top || api.loadConfig.cwd;
-  const pkg = fileStamp(top, MANIFEST, statSync);
-  const lock = fileStamp(top, LOCKFILE, statSync);
-  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) => {
@@ -216,8 +249,7 @@ const followExtras = async (api, loaded, gen, kind) => {
     next = await api.loader.fetchExtras(api.loadConfig.repo, loaded, extra);
   } catch (error) {
     if (!api.loader.isCurrent(gen)) return;
-    failOpen(api, error);
-    return;
+    return void failOpen(api, error);
   }
   if (!api.loader.isCurrent(gen)) return;
   if (api.ui.done) {
@@ -241,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;
@@ -267,9 +298,8 @@ const resetNavAfterLoad = (api, extra = {}) => {
 };
 
 const afterSnapshot = (api, kind, extra = {}) => {
-  if (shouldResetNav(kind)) {
-    resetNavAfterLoad(api, extra);
-    return;
+  if (kind !== 'open' && kind !== 'watch') {
+    return void resetNavAfterLoad(api, extra);
   }
   if (extra.afterLoad) extra.afterLoad();
 };
@@ -296,8 +326,7 @@ const runSnapshot = async (api, gen, kind, extra = {}) => {
     );
   } catch (error) {
     if (!api.loader.isCurrent(gen)) return;
-    failOpen(api, error);
-    return;
+    return void failOpen(api, error);
   }
   if (!api.loader.isCurrent(gen)) return;
   if (api.ui.done) {
@@ -306,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);
@@ -352,10 +381,9 @@ 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');
-    followExtras(api, loaded, gen, kind);
-    return;
+    return void followExtras(api, loaded, gen, kind);
   }
   if (kind === 'keep') return;
   finishIfEmpty(api, kind);
@@ -377,8 +405,7 @@ const reloadAfterChange = (api, afterLoad) => {
     if (afterLoad) afterLoad();
   };
   if (api.ui.uiOpen && api.loadConfig.repo.loadAsync) {
-    refreshFromRepo(api, { afterLoad: restore });
-    return;
+    return void refreshFromRepo(api, { afterLoad: restore });
   }
   refreshFromRepo(api);
   restore();
@@ -392,9 +419,7 @@ const onReload = (api) => {
 
 const clearWatchRetry = (api) => {
   if (api.watchRetry === null) return;
-  const extra = watchOpts(api);
-  const clearTimeoutFn = extra.clearTimeout ?? clearTimeout;
-  clearTimeoutFn(api.watchRetry);
+  clearTimeout(api.watchRetry);
   api.watchRetry = null;
 };
 
@@ -404,6 +429,10 @@ const shouldDeferWatch = (api) => {
   if (!ui.uiOpen) return true;
   if (!api.loader.didLoad) return true;
   if (ops.gitBusy) return true;
+  if (ui.mode === 'compose') {
+    const kind = ui.composer && ui.composer.state.composeKind;
+    if (kind === 'file') return false;
+  }
   if (ui.mode !== 'review') return true;
   return false;
 };
@@ -411,44 +440,64 @@ const shouldDeferWatch = (api) => {
 const WATCH_IGNORE_MS = 500;
 
 const ignoreWatch = (api, ms = WATCH_IGNORE_MS) => {
-  const extra = watchOpts(api);
-  const now = extra.now ?? Date.now;
-  api.ignoreWatchUntil = now() + ms;
+  api.ignoreWatchUntil = Date.now() + ms;
 };
 
 const onDiskChange = (api) => {
-  const extra = watchOpts(api);
-  const now = extra.now ?? Date.now;
-  if (now() < (api.ignoreWatchUntil ?? 0)) return;
+  if (Date.now() < (api.ignoreWatchUntil ?? 0)) return;
   if (shouldDeferWatch(api)) {
     if (api.watchRetry !== null) return;
-    const setTimeoutFn = extra.setTimeout ?? setTimeout;
-    const delay = extra.debounceMs ?? 200;
-    api.watchRetry = setTimeoutFn(() => {
+    api.watchRetry = setTimeout(() => {
       api.watchRetry = null;
       onDiskChange(api);
-    }, delay);
+    }, DEBOUNCE_MS);
+    if (typeof api.watchRetry.unref === 'function') api.watchRetry.unref();
     return;
   }
   refreshFromRepo(api, { keepView: true, quiet: true });
 };
 
-const currentFileStamp = (api) => {
-  if (api.nav.pane !== 'diff') return '';
-  const rel = itemPath(api.ui.current());
-  if (!rel) return '';
-  const extra = watchOpts(api);
-  const statSync = extra.statSync ?? fs.statSync;
-  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 = statSync(full);
+    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';
+
+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) {
@@ -464,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();
@@ -478,22 +564,30 @@ const startWatch = (api) => {
   if (!isWorktree(api.ui)) return;
   const root = api.ui.top || api.loadConfig.cwd;
   if (!root) return;
-  const extra = watchOpts(api);
   api.diskWatcher = createDiskWatcher({
     root,
     paths: api.loadConfig.paths,
     onChange: () => onDiskChange(api),
-    ...extra,
+    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/load.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const { stateView } = require('./accessors.js');
+
 const isAbortError = (error) => !!(error && error.code === 'ABORT');
 
 const createLoadCoordinator = () => {
@@ -46,40 +48,24 @@ const createLoadCoordinator = () => {
     return repo.loadExtras(loaded, extra);
   };
 
-  return {
-    get gen() {
-      return state.gen;
-    },
-    get promise() {
-      return state.promise;
-    },
-    set promise(value) {
-      state.promise = value;
-    },
-    get pendingExtras() {
-      return state.pendingExtras;
-    },
-    set pendingExtras(value) {
-      state.pendingExtras = value;
+  return stateView(
+    state,
+    {
+      get signal() {
+        return state.abort?.signal;
+      },
+      bump,
+      isCurrent,
+      accept,
+      abort,
+      reset,
+      tag,
+      fetchSnapshot,
+      fetchExtras,
     },
-    get didLoad() {
-      return state.didLoad;
-    },
-    set didLoad(value) {
-      state.didLoad = value;
-    },
-    get signal() {
-      return state.abort?.signal;
-    },
-    bump,
-    isCurrent,
-    accept,
-    abort,
-    reset,
-    tag,
-    fetchSnapshot,
-    fetchExtras,
-  };
+    ['promise', 'pendingExtras', 'didLoad'],
+    ['gen'],
+  );
 };
 
 module.exports = { isAbortError, createLoadCoordinator };

package/lib/session/navigation.js

@@ -12,6 +12,8 @@ const initialState = (options = {}) => ({
   scroll: 0,
   listScroll: 0,
   reviewPath: null,
+  fileScope: 'diff',
+  unitLine: 0,
   selection: null,
   mouseAnchor: null,
   pendingClick: null,
@@ -30,11 +32,20 @@ const clampIndex = (nav, length) => {
 
 const current = (nav, items, todoItem) => {
   if (nav.todoOpen) return todoItem;
+  if (nav.pane === 'unit' && nav.reviewPath) {
+    const item = items[nav.index];
+    if (item && listPath(item) === nav.reviewPath) return item;
+    for (const entry of items) {
+      if (listPath(entry) === nav.reviewPath) return entry;
+    }
+    return null;
+  }
   return items[nav.index] ?? null;
 };
 
 const syncReviewPath = (nav, item) => {
-  if (nav.pane !== 'diff') return;
+  if (nav.pane !== 'diff' && nav.pane !== 'unit') return;
+  if (nav.pane === 'unit' && nav.reviewPath) return;
   nav.reviewPath = item ? listPath(item) : null;
 };
 

package/lib/session/ops.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const { stateView } = require('./accessors.js');
+
 const ASYNC_WITHOUT_UI = ['pull', 'push'];
 
 const pickRepoWrite = (repo, name, uiOpen) => {
@@ -18,7 +20,7 @@ const pickRepoWrite = (repo, name, uiOpen) => {
   };
 };
 
-const createOpsRunner = (options) => {
+const createOpsRunner = (ui) => {
   const state = {
     gitBusy: false,
     busy: '',
@@ -31,53 +33,46 @@ const createOpsRunner = (options) => {
 
   const setBusy = (kind) => {
     state.busy = kind;
-    options.startProgress();
+    ui.startProgress();
   };
 
   const clearBusy = () => {
     state.busy = '';
-    options.stopProgress();
+    ui.stopProgress();
   };
 
   const runRepo = (label, write) => {
     try {
-      write(options.top());
-      options.setStatus(label);
+      write(ui.top);
+      ui.status = label;
       return true;
     } catch (error) {
-      options.setStatus(error.message);
+      ui.status = error.message;
       return false;
     }
   };
 
   const finishBusy = (done, after) => {
-    if (options.isDone()) {
-      options.paint();
-      return;
-    }
-    if (options.getMode() === 'confirmPush') {
-      options.paint();
-      return;
-    }
-    if (!options.getStatus() && after) after();
-    if (!options.getStatus() && !state.busy) options.setStatus(done);
-    options.paint();
+    if (ui.done || ui.mode === 'confirmPush') return void ui.paint();
+    if (!ui.status && after) after();
+    if (!ui.status && !state.busy) ui.status = done;
+    ui.paint();
   };
 
   const runBusy = async (kind, done, write, after) => {
     if (state.gitBusy) return;
     state.gitBusy = true;
-    options.setStatus('');
-    options.resetProgressFrame();
+    ui.status = '';
+    ui.progressFrame = 0;
     setBusy(kind);
-    options.paint();
+    ui.paint();
     try {
-      await write(options.top());
+      await write(ui.top);
     } catch (error) {
       if (error.rejected && kind !== 'force pushing') {
-        options.setMode('confirmPush');
+        ui.mode = 'confirmPush';
       } else {
-        options.setStatus(error.message);
+        ui.status = error.message;
       }
     } finally {
       clearBusy();
@@ -86,25 +81,17 @@ const createOpsRunner = (options) => {
     finishBusy(done, after);
   };
 
-  return {
-    get gitBusy() {
-      return state.gitBusy;
+  return stateView(
+    state,
+    {
+      reset,
+      setBusy,
+      clearBusy,
+      runRepo,
+      runBusy,
     },
-    set gitBusy(value) {
-      state.gitBusy = value;
-    },
-    get busy() {
-      return state.busy;
-    },
-    set busy(value) {
-      state.busy = value;
-    },
-    reset,
-    setBusy,
-    clearBusy,
-    runRepo,
-    runBusy,
-  };
+    ['gitBusy', 'busy'],
+  );
 };
 
 module.exports = { ASYNC_WITHOUT_UI, pickRepoWrite, createOpsRunner };