reslop 0.2.3 → 0.2.4

package/lib/session/lifecycle.js

@@ -3,14 +3,18 @@
 const fs = require('node:fs');
 const path = require('node:path');
 
-const { isAbortError } = require('./load.js');
-const { createDiskWatcher, POLL_MS, DEBOUNCE_MS } = require('./watch.js');
+const sessionLoad = require('./load.js');
+const { isAbortError } = sessionLoad;
+const watch = require('./watch.js');
+const { createDiskWatcher, POLL_MS, DEBOUNCE_MS } = watch;
 const files = require('../files.js');
 const { itemPath, relativeAge, TODO_FILE } = files;
-const { MANIFEST, LOCKFILE, depFileMeta } = require('../deps.js');
+const deps = require('../deps.js');
+const { MANIFEST, LOCKFILE, depFileMeta } = deps;
 const review = require('../review.js');
 const { hasNotes, loadReview } = review;
-const { mergeReview } = require('../review-merge.js');
+const reviewMerge = require('../review-merge.js');
+const { mergeReview } = reviewMerge;
 
 const loadOptions = (api, extra = {}) => {
   const { loadConfig, ui } = api;

package/lib/session/load.js

@@ -1,8 +1,10 @@
 'use strict';
 
-const { stateView } = require('./accessors.js');
+const accessors = require('./accessors.js');
+const { stateView } = accessors;
 
-const isAbortError = (error) => !!(error && error.code === 'ABORT');
+const utilities = require('../utilities.js');
+const { isAbort: isAbortError } = utilities;
 
 const createLoadCoordinator = () => {
   const state = {

package/lib/session/navigation.js

@@ -18,6 +18,7 @@ const initialState = (options = {}) => ({
   selection: null,
   mouseAnchor: null,
   pendingClick: null,
+  lastClick: null,
   todoOpen: false,
   todoFocus: 0,
 });

package/lib/session/npm.js

@@ -1,9 +1,11 @@
 'use strict';
 
 const commands = require('../npm-commands.js');
-const { logViewRows } = require('../render/npm.js');
+const npm = require('../render/npm.js');
+const { logViewRows } = npm;
 
 const { listCommands, reduceOutput, writeLog, parseScriptLine } = commands;
+const { staleLogFiles, removeStaleLogs, formatSize } = commands;
 const { scriptLine, saveScript, removeScript, reorderScript } = commands;
 const { startNpm } = commands;
 
@@ -30,9 +32,20 @@ const canEdit = (ui) => {
   return true;
 };
 
+const refreshLogs = (api) => {
+  try {
+    const found = staleLogFiles(api.ui.top);
+    api.state.logBytes = found.bytes;
+  } catch (error) {
+    api.state.logBytes = 0;
+    api.ui.status = error.message;
+  }
+};
+
 const open = (api) => {
   if (api.ui.mode === 'compose') return;
   refresh(api);
+  refreshLogs(api);
   api.state.viewing = false;
   api.state.output = '';
   api.ui.nav.pane = 'npm';
@@ -214,15 +227,45 @@ const askDrop = (api) => {
     api.ui.status = 'not a script';
     return;
   }
+  api.state.dropKind = 'script';
   api.state.dropName = entry.name;
   api.ui.mode = 'confirmDrop';
   api.ui.status = '';
 };
 
+const askLogs = (api) => {
+  if (api.state.viewing) return;
+  if (!canEdit(api.ui)) {
+    api.ui.status = 'read only';
+    return;
+  }
+  refreshLogs(api);
+  if (!api.state.logBytes) return;
+  api.state.dropKind = 'logs';
+  const size = formatSize(api.state.logBytes);
+  api.state.dropName = `logs older than 5 days (${size})`;
+  api.ui.mode = 'confirmDrop';
+  api.ui.status = '';
+};
+
 const confirmDrop = (api) => {
+  const kind = api.state.dropKind;
   const name = api.state.dropName;
   api.state.dropName = '';
+  api.state.dropKind = '';
   api.ui.mode = 'review';
+  if (kind === 'logs') {
+    try {
+      removeStaleLogs(api.ui.top);
+    } catch (error) {
+      api.ui.status = error.message;
+      refreshLogs(api);
+      return;
+    }
+    refreshLogs(api);
+    api.ui.status = 'dropped logs';
+    return;
+  }
   if (!name) return;
   try {
     api.ui.ignoreWatch();
@@ -237,6 +280,7 @@ const confirmDrop = (api) => {
 
 const cancelDrop = (api) => {
   api.state.dropName = '';
+  api.state.dropKind = '';
   api.ui.mode = 'review';
   api.ui.status = '';
 };
@@ -274,6 +318,8 @@ const createNpmController = (ui) => {
     logScroll: 0,
     editName: '',
     dropName: '',
+    dropKind: '',
+    logBytes: 0,
     running: false,
     stopping: false,
     child: null,
@@ -293,6 +339,10 @@ const createNpmController = (ui) => {
     get dropName() {
       return state.dropName;
     },
+    get logLabel() {
+      if (!state.logBytes) return '';
+      return `old logs ${formatSize(state.logBytes)}`;
+    },
     get followEnd() {
       return state.followEnd;
     },
@@ -315,6 +365,8 @@ const createNpmController = (ui) => {
       state.logScroll = 0;
       state.editName = '';
       state.dropName = '';
+      state.dropKind = '';
+      state.logBytes = 0;
       state.stopping = false;
     },
     open: () => open(api),
@@ -326,6 +378,7 @@ const createNpmController = (ui) => {
     create: () => newCommand(api),
     finishEdit: () => finishEdit(api),
     askDrop: () => askDrop(api),
+    askLogs: () => askLogs(api),
     confirmDrop: () => confirmDrop(api),
     cancelDrop: () => cancelDrop(api),
     reorder: (delta) => reorder(api, delta),

package/lib/session/ops.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { stateView } = require('./accessors.js');
+const accessors = require('./accessors.js');
+const { stateView } = accessors;
 
 const ASYNC_WITHOUT_UI = ['pull', 'push'];
 
@@ -81,6 +82,18 @@ const createOpsRunner = (ui) => {
     finishBusy(done, after);
   };
 
+  const runWrite = (name, args, kind, done, after) => {
+    const picked = pickRepoWrite(ui.repo, name, ui.uiOpen);
+    const write = (top) => picked.write(top, ...args);
+    if (picked.async) {
+      const refresh = () => after({ doneStatus: done });
+      return void runBusy(kind, done, write, refresh);
+    }
+    if (!runRepo(done, write)) return;
+    after({});
+    if (!ui.status) ui.status = done;
+  };
+
   return stateView(
     state,
     {
@@ -88,6 +101,7 @@ const createOpsRunner = (ui) => {
       setBusy,
       clearBusy,
       runRepo,
+      runWrite,
       runBusy,
     },
     ['gitBusy', 'busy'],

package/lib/session/pointer.js

@@ -1,8 +1,11 @@
 'use strict';
 
-const { extractText, isRange } = require('../select.js');
-const { hitAction } = require('../keys.js');
-const { copyText } = require('../clipboard.js');
+const select = require('../select.js');
+const { extractText, isRange } = select;
+const keys = require('../keys.js');
+const { hitAction } = keys;
+const clipboard = require('../clipboard.js');
+const { copyText } = clipboard;
 
 const mouseCell = (ui, event) => {
   const size = ui.lastSize ?? ui.getSize();
@@ -45,6 +48,20 @@ const clickButton = (ui, cell, clickId) => {
   return true;
 };
 
+const DOUBLE_CLICK_MS = 500;
+
+const armDoubleClick = (nav, pane, cursor) => {
+  const now = Date.now();
+  const prev = nav.lastClick;
+  const again =
+    prev !== null &&
+    prev.pane === pane &&
+    prev.cursor === cursor &&
+    now - prev.at <= DOUBLE_CLICK_MS;
+  nav.lastClick = { pane, cursor, at: now };
+  return again;
+};
+
 const clickHit = (ui, hits, cell, onHit) => {
   const nav = ui.nav;
   if (!hits || isRange(nav.selection)) return false;
@@ -107,7 +124,9 @@ const RELEASE_TARGETS = [
     match: (ui) => ui.pane === 'npm',
     hits: 'fileHits',
     onHit: (ui, hit) => {
+      const again = armDoubleClick(ui.nav, 'npm', hit.cursor);
       ui.nav.npmCursor = hit.cursor;
+      if (again && ui.mode === 'review') ui.npm.run();
     },
   },
   {

package/lib/session/review.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { stateView } = require('./accessors.js');
+const accessors = require('./accessors.js');
+const { stateView } = accessors;
 
 const review = require('../review.js');
 const { createStore, applyImportedNotes, setStatus } = review;

package/lib/session/terminal.js

@@ -1,7 +1,9 @@
 'use strict';
 
-const { presentRows, presentCursor } = require('../render/render.js');
-const { listen, watchResize } = require('../utilities.js');
+const render = require('../render/render.js');
+const { presentRows, presentCursor } = render;
+const utilities = require('../utilities.js');
+const { listen, watchResize } = utilities;
 
 const ENTER_TERM = '\x1b[?1049h\x1b[?25l\x1b[?7l\x1b[?1002h\x1b[?1006h';
 const LEAVE_TERM =

package/lib/session/update.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { stateView } = require('./accessors.js');
+const accessors = require('./accessors.js');
+const { stateView } = accessors;
 
 const update = require('../update.js');
 const { checkUpdate, installUpdate, markSkipped } = update;

package/lib/session/view.js

@@ -3,8 +3,9 @@
 const path = require('node:path');
 
 const files = require('../files.js');
-const { listedCommits } = require('./commit.js');
-const { fileEntries, REPO_TODOS_LABEL } = files;
+const commit = require('./commit.js');
+const { listedCommits } = commit;
+const { fileEntries, fileTotals, REPO_TODOS_LABEL } = files;
 const review = require('../review.js');
 const { noteCounts } = review;
 const diff = require('../diff/diff.js');
@@ -143,6 +144,30 @@ const unitBodyLines = (api) => {
   return unitLines(unitFileText(api), group);
 };
 
+const pendingLines = (items, rev, revShort) => {
+  if (rev || revShort) return null;
+  for (const item of items) {
+    if (item.origin === 'commit' || item.origin === 'pr') return null;
+  }
+  return fileTotals(fileEntries(items));
+};
+
+const commitRows = (api) => {
+  const rows = listedCommits(api.commits.commits);
+  const lines = pendingLines(api.collection.items, api.ui.rev, api.ui.revShort);
+  if (!lines || !rows[0]) return rows;
+  rows[0] = {
+    ...rows[0],
+    added: lines.added,
+    removed: lines.removed,
+    stagedAdded: lines.stagedAdded,
+    unstagedAdded: lines.unstagedAdded,
+    stagedRemoved: lines.stagedRemoved,
+    unstagedRemoved: lines.unstagedRemoved,
+  };
+  return rows;
+};
+
 const view = (api) => {
   const { composer, nav, ui, gitBranches, commits, npm, updater } = api;
   const templates = composer.shownTemplates();
@@ -170,7 +195,7 @@ const view = (api) => {
     branch: ui.branch,
     branches: gitBranches.branches,
     branchCursor: nav.branchCursor,
-    commits: listedCommits(commits.commits),
+    commits: commitRows(api),
     commitCursor: nav.commitCursor,
     commitView: commits.commitView,
     npmCommands: npm.commands,
@@ -181,6 +206,7 @@ const view = (api) => {
     npmScroll: npm.logScroll,
     npmEditName: npm.editName,
     npmRunning: npm.running,
+    npmLogs: nav.pane === 'npm' ? npm.logLabel : '',
     repoName: repoNameOf(api),
     rev: ui.rev || '',
     revShort: ui.revShort || '',

package/lib/session.js

@@ -9,28 +9,47 @@ const { renderFrame } = render;
 const { decodeChunk } = keys;
 const { AUTOSAVE_MS, hasNotes } = review;
 const capabilities = require('./capabilities.js');
+const actions = require('./session/actions.js');
+const { LIST_PANES } = actions;
 const { sessionCapabilities } = capabilities;
-const { createTerminal, LEAVE_TERM } = require('./session/terminal.js');
-const { createLoadCoordinator } = require('./session/load.js');
+const terminal = require('./session/terminal.js');
+const { createTerminal, LEAVE_TERM } = terminal;
+const load = require('./session/load.js');
+const { createLoadCoordinator } = load;
 const items = require('./session/items.js');
 const { createItemCollection } = items;
-const { createNavigation } = require('./session/navigation.js');
-const { createReviewController } = require('./session/review.js');
-const { createUpdateCoordinator } = require('./session/update.js');
-const { createProgress } = require('./session/progress.js');
-const { createComposer } = require('./session/compose.js');
-const { createOpsRunner } = require('./session/ops.js');
-const { createChangeActions } = require('./session/change-actions.js');
-const { createCommitController } = require('./session/commit.js');
-const { createBranchController } = require('./session/branches.js');
-const { createNpmController } = require('./session/npm.js');
+const navigation = require('./session/navigation.js');
+const { createNavigation } = navigation;
+const sessionReview = require('./session/review.js');
+const { createReviewController } = sessionReview;
+const update = require('./session/update.js');
+const { createUpdateCoordinator } = update;
+const progress = require('./session/progress.js');
+const { createProgress } = progress;
+const compose = require('./session/compose.js');
+const { createComposer } = compose;
+const ops = require('./session/ops.js');
+const { createOpsRunner } = ops;
+const changeActions = require('./session/change-actions.js');
+const { createChangeActions } = changeActions;
+const commit = require('./session/commit.js');
+const { createCommitController } = commit;
+const branches = require('./session/branches.js');
+const { createBranchController } = branches;
+const npm = require('./session/npm.js');
+const { createNpmController } = npm;
 const accessors = require('./session/accessors.js');
 const { bindAccessors, bindGetters, bindAlias } = accessors;
-const { createView } = require('./session/view.js');
-const { createFilesPane } = require('./session/files-pane.js');
-const { createLifecycle } = require('./session/lifecycle.js');
-const { createPointer } = require('./session/pointer.js');
-const { createDispatcher, createInput } = require('./session/dispatch.js');
+const view = require('./session/view.js');
+const { createView } = view;
+const filesPane = require('./session/files-pane.js');
+const { createFilesPane } = filesPane;
+const lifecycle = require('./session/lifecycle.js');
+const { createLifecycle } = lifecycle;
+const pointer = require('./session/pointer.js');
+const { createPointer } = pointer;
+const dispatch = require('./session/dispatch.js');
+const { createDispatcher, createInput } = dispatch;
 
 const CURSOR_BLINK_MS = 500;
 const PROGRESS_MS = 160;
@@ -314,12 +333,7 @@ class Session {
       height: size.height,
       color: this.color,
     });
-    if (
-      this.pane === 'files' ||
-      this.pane === 'branches' ||
-      this.pane === 'commits' ||
-      this.pane === 'npm'
-    ) {
+    if (LIST_PANES.includes(this.pane)) {
       this.nav.listScroll = frame.listScroll;
     }
     if (this.nav.todoOpen) this.nav.scroll = frame.scroll;

package/lib/source.js

@@ -1,8 +1,11 @@
 'use strict';
 
-const { parseGithubPrUrl } = require('./github.js');
-const { parseGitlabMrUrl } = require('./gitlab.js');
-const { capabilitiesFor, attachCapabilities } = require('./capabilities.js');
+const github = require('./github.js');
+const { parseGithubPrUrl } = github;
+const gitlab = require('./gitlab.js');
+const { parseGitlabMrUrl } = gitlab;
+const capabilities = require('./capabilities.js');
+const { capabilitiesFor, attachCapabilities } = capabilities;
 
 const selectChangeSource = (paths) => {
   if (!paths.length) return { kind: 'local', paths };

package/lib/update.js

@@ -4,15 +4,11 @@ const fs = require('node:fs');
 const os = require('node:os');
 const path = require('node:path');
 
-const { jsonParse, isHashObject } = require('metautil');
-const {
-  parseVersion,
-  cmpVersion,
-  npmBin,
-  npmOpts,
-  runProc,
-  oneLine,
-} = require('./utilities.js');
+const metautil = require('metautil');
+const { jsonParse, isHashObject } = metautil;
+const utilities = require('./utilities.js');
+const { parseVersion, cmpVersion, npmBin } = utilities;
+const { npmOpts, runProc, oneLine } = utilities;
 
 const PKG = require('../package.json');
 

package/lib/utilities.js

@@ -1,7 +1,9 @@
 'use strict';
 
-const { spawn, spawnSync } = require('node:child_process');
-const { split } = require('metautil');
+const childProcess = require('node:child_process');
+const { spawn, spawnSync } = childProcess;
+const metautil = require('metautil');
+const { split } = metautil;
 
 const IS_WIN = process.platform === 'win32';
 const DEFAULT_ENCODING = 'utf8';

package/lib/wrap.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { graphemes, graphemeWidth, visibleWidth } = require('./ansi.js');
+const ansi = require('./ansi.js');
+const { graphemes, graphemeWidth, visibleWidth } = ansi;
 
 const wrapPlain = (text, width) => {
   if (width <= 0) return [''];
@@ -28,6 +29,7 @@ const wrapPlain = (text, width) => {
     if (col + w > width && col > 0) {
       if (lastBreak >= start) {
         flush(lastBreak + 1);
+        i = start;
         continue;
       }
       flush(i);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reslop",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Interactive code review and repair planning for AI-assisted changes",
   "keywords": [
     "code-review",