reslop 0.1.8 → 0.1.9

package/lib/session/items.js

@@ -21,25 +21,127 @@ const npmBusyKind = (item) => {
   return 'npm i';
 };
 
-const itemKey = (item) => {
+const blockKey = (item) => {
   if (!item || !item.file) return '';
   const rel = itemPath(item);
   if (isTodoItem(item)) return `todo:${TODO_FILE}`;
-  const origin = item.origin ?? '';
   const depId = depChangeKey(item);
-  if (depId) return `${origin}:${rel}:dep:${depId}`;
+  if (depId) return `${rel}:dep:${depId}`;
   if (!item.hunk) {
     const block = item.blockId ?? '-';
-    return `${origin}:${rel}:file:${block}`;
+    return `${rel}:file:${block}`;
   }
   const oldStart = item.hunk.oldStart;
   const newStart = item.hunk.newStart;
   const block = item.blockId ?? '-';
-  return `${origin}:${rel}:${oldStart}:${newStart}:${block}`;
+  return `${rel}:${oldStart}:${newStart}:${block}`;
+};
+
+const itemKey = (item) => {
+  const key = blockKey(item);
+  if (!key || isTodoItem(item)) return key;
+  const origin = item.origin ?? '';
+  return `${origin}:${key}`;
+};
+
+const blockLinesKey = (item) => {
+  if (!item || !item.file || isTodoItem(item)) return '';
+  if (!item.hunk) return '';
+  const parts = [itemPath(item)];
+  for (const line of item.hunk.lines) {
+    if (line.blockId !== item.blockId) continue;
+    if (line.type === 'ctx') continue;
+    parts.push(`${line.type}:${line.text}`);
+  }
+  return parts.join('\0');
+};
+
+const pushBucket = (map, key, item) => {
+  if (!key) return;
+  const list = map.get(key) ?? [];
+  list.push(item);
+  map.set(key, list);
+};
+
+const takeBucket = (map, key, used) => {
+  if (!key) return null;
+  const list = map.get(key);
+  if (!list || !list.length) return null;
+  while (list.length) {
+    const item = list.shift();
+    if (!used.has(item)) return item;
+  }
+  return null;
+};
+
+const pathOf = (item) => itemPath(item) || '';
+
+const groupByPath = (items) => {
+  const groups = new Map();
+  for (const item of items) {
+    const rel = pathOf(item);
+    const list = groups.get(rel) ?? [];
+    list.push(item);
+    groups.set(rel, list);
+  }
+  return groups;
+};
+
+const alignGroup = (prev, next) => {
+  if (!prev.length) return next;
+  if (!next.length) return [];
+  const byBlock = new Map();
+  const byLines = new Map();
+  for (const item of next) {
+    pushBucket(byBlock, blockKey(item), item);
+    pushBucket(byLines, blockLinesKey(item), item);
+  }
+  const used = new Set();
+  const ordered = [];
+  for (const item of prev) {
+    const byText = takeBucket(byLines, blockLinesKey(item), used);
+    const taken = byText ?? takeBucket(byBlock, blockKey(item), used);
+    if (!taken) continue;
+    used.add(taken);
+    ordered.push(taken);
+  }
+  for (const item of next) {
+    if (used.has(item)) continue;
+    ordered.push(item);
+  }
+  return ordered;
+};
+
+const alignLoadedItems = (prev, next) => {
+  if (!prev.length || !next.length) return next;
+  const nextGroups = groupByPath(next);
+  const seen = new Set();
+  const ordered = [];
+  for (const [rel, list] of groupByPath(prev)) {
+    seen.add(rel);
+    const aligned = alignGroup(list, nextGroups.get(rel) ?? []);
+    for (const item of aligned) ordered.push(item);
+  }
+  for (const [rel, list] of nextGroups) {
+    if (seen.has(rel)) continue;
+    for (const item of list) ordered.push(item);
+  }
+  return ordered;
 };
 
 const restoredIndex = (items, item) => {
   if (!item || !item.file) return -1;
+  const origin = item.origin ?? '';
+  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);
@@ -47,7 +149,6 @@ const restoredIndex = (items, item) => {
   }
   const rel = itemPath(item);
   if (!rel) return -1;
-  const origin = item.origin ?? '';
   const start = item.hunk ? item.hunk.newStart : 0;
   let fileMatch = -1;
   let best = -1;
@@ -106,8 +207,9 @@ const createItemCollection = () => {
   const isDismissed = (item) => state.dismissed.has(itemKey(item));
 
   const replace = (items) => {
+    const aligned = alignLoadedItems(state.items, items);
     const next = [];
-    for (const item of items) {
+    for (const item of aligned) {
       if (isDismissed(item)) continue;
       next.push(item);
     }
@@ -168,8 +270,11 @@ module.exports = {
   depChangeKey,
   needsReload,
   npmBusyKind,
+  blockKey,
   itemKey,
   itemFeedKey,
+  blockLinesKey,
+  alignLoadedItems,
   restoredIndex,
   sameBlock,
   canEditCode,

package/lib/session/lifecycle.js

@@ -6,7 +6,7 @@ const path = require('node:path');
 const { isAbortError } = require('./load.js');
 const { createDiskWatcher, POLL_MS } = require('./watch.js');
 const files = require('../files.js');
-const { itemPath } = files;
+const { itemPath, relativeAge } = files;
 const { MANIFEST, LOCKFILE } = require('../deps/manifest.js');
 const review = require('../review.js');
 const { hasNotes } = review;
@@ -103,6 +103,28 @@ const itemRels = (collection) => {
   return rels;
 };
 
+const fileDatesFromDisk = (top, rels) => {
+  const dates = new Map();
+  if (!top) return dates;
+  const now = Date.now();
+  for (const rel of rels) {
+    try {
+      const st = fs.statSync(path.join(top, rel));
+      dates.set(rel, relativeAge(st.mtimeMs, now));
+    } catch {
+      continue;
+    }
+  }
+  return dates;
+};
+
+const stampItemDates = (items, dates) => {
+  for (const item of items) {
+    const date = dates.get(itemPath(item));
+    if (date) item.date = date;
+  }
+};
+
 const syncItemWatches = (api) => {
   if (!api.diskWatcher) return;
   api.diskWatcher.watchFiles(itemRels(api.collection));
@@ -117,6 +139,10 @@ const applyLoaded = (api, loaded) => {
   const here = ui.current();
   ui.top = loaded.top ?? api.loadConfig.cwd;
   collection.replace(loaded.items);
+  stampItemDates(
+    collection.items,
+    fileDatesFromDisk(ui.top, itemRels(collection)),
+  );
   if (loaded.rev) ui.rev = loaded.rev;
   if (loaded.revShort) {
     ui.revShort = loaded.revShort;
@@ -340,9 +366,11 @@ const refreshFromRepo = (api, extra = {}) => {
 };
 
 const reloadAfterChange = (api, afterLoad) => {
-  const here = api.nav.index;
+  const hereItem = api.ui.current();
+  const hereIndex = api.nav.index;
   const restore = () => {
-    api.nav.index = here;
+    const idx = api.collection.findRestoredIndex(hereItem);
+    api.nav.index = idx >= 0 ? idx : hereIndex;
     api.ui.clampIndex();
     api.ui.syncReviewPath();
     api.ui.syncFileCursor();
@@ -380,10 +408,20 @@ const shouldDeferWatch = (api) => {
   return false;
 };
 
+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;
+};
+
 const onDiskChange = (api) => {
+  const extra = watchOpts(api);
+  const now = extra.now ?? Date.now;
+  if (now() < (api.ignoreWatchUntil ?? 0)) return;
   if (shouldDeferWatch(api)) {
     if (api.watchRetry !== null) return;
-    const extra = watchOpts(api);
     const setTimeoutFn = extra.setTimeout ?? setTimeout;
     const delay = extra.debounceMs ?? 200;
     api.watchRetry = setTimeoutFn(() => {
@@ -456,6 +494,7 @@ const createLifecycle = (api) => {
   api.diskWatcher = null;
   api.watchRetry = null;
   api.watchStamp = '';
+  api.ignoreWatchUntil = 0;
   api.npmExtras = null;
   return {
     applyLoaded: (loaded) => applyLoaded(api, loaded),
@@ -469,6 +508,7 @@ const createLifecycle = (api) => {
     pollCurrentFile: () => pollCurrentFile(api),
     startWatch: () => startWatch(api),
     stopWatch: () => stopWatch(api),
+    ignoreWatch: (ms) => ignoreWatch(api, ms),
     clearNpmExtras: () => clearNpmExtras(api),
   };
 };

package/lib/session/navigation.js

@@ -1,13 +1,14 @@
 'use strict';
 
 const files = require('../files.js');
-const { itemPath, isTodoItem, isTodosEntry, TODO_FILE } = files;
+const { listPath, isTodoItem, isTodosEntry, TODO_FILE } = files;
 
 const initialState = (options = {}) => ({
   pane: options.startPane ?? 'files',
   index: 0,
   fileCursor: 0,
   branchCursor: 0,
+  commitCursor: 0,
   scroll: 0,
   listScroll: 0,
   reviewPath: null,
@@ -34,7 +35,7 @@ const current = (nav, items, todoItem) => {
 
 const syncReviewPath = (nav, item) => {
   if (nav.pane !== 'diff') return;
-  nav.reviewPath = item ? itemPath(item) : null;
+  nav.reviewPath = item ? listPath(item) : null;
 };
 
 const clampFileCursor = (nav, length) => {

package/lib/session/pointer.js

@@ -97,6 +97,13 @@ const RELEASE_TARGETS = [
       options.onCheckoutBranch();
     },
   },
+  {
+    match: (options) => options.getPane() === 'commits',
+    hits: 'fileHits',
+    onHit: (options, hit) => {
+      options.nav.commitCursor = hit.cursor;
+    },
+  },
   {
     match: (options) => options.getPane() === 'diff',
     hits: 'todoHits',

package/lib/session/view.js

@@ -77,7 +77,7 @@ const counts = (api, notes = noteCounts(api.review.store)) => {
 const viewStatus = (api) => api.ui.status || api.ui.busy;
 
 const view = (api) => {
-  const { composer, nav, ui, gitBranches, updater } = api;
+  const { composer, nav, ui, gitBranches, commits, updater } = api;
   const templates = composer.shownTemplates();
   const change = ui.change;
   const sourceKind = (change && SOURCE_KIND[change.source]) || '';
@@ -100,6 +100,8 @@ const view = (api) => {
     branch: ui.branch,
     branches: gitBranches.branches,
     branchCursor: nav.branchCursor,
+    commits: commits.commits,
+    commitCursor: nav.commitCursor,
     repoName: repoNameOf(api),
     revShort: ui.revShort || '',
     sourceLabel: ui.sourceLabel || '',
@@ -115,7 +117,7 @@ const view = (api) => {
     templateIndex: composer.clampedTemplateIndex(templates),
     updateFrom: updater.from,
     updateTo: updater.to,
-    dropName: gitBranches.dropName,
+    dropName: gitBranches.dropName || commits.dropName,
   };
 };
 

package/lib/session.js

@@ -37,11 +37,17 @@ const PROGRESS_MS = 80;
 
 const systemNow = () => new Date();
 
+const targetHasStaged = (session) => {
+  if (session.repo.hasStaged) return session.repo.hasStaged(session.top);
+  return session.items.some((item) => item.origin === 'staged');
+};
+
 const NAV_FIELDS = [
   'pane',
   'index',
   'fileCursor',
   'branchCursor',
+  'commitCursor',
   'scroll',
   'listScroll',
   'reviewPath',
@@ -197,6 +203,7 @@ const assignControllers = (session) => {
     setStatus,
     syncReviewPath: () => session.syncReviewPath(),
     syncFileCursor: () => session.syncFileCursor(),
+    ignoreWatch: () => session.lifecycle.ignoreWatch(),
   });
   session.commits = createCommitController({
     repo: () => session.repo,
@@ -212,6 +219,9 @@ const assignControllers = (session) => {
     setStatus,
     isDone: () => session.done,
     pendingExtras: () => session.pendingExtras,
+    getMode: () => session.mode,
+    getStatus: () => session.status,
+    nav: session.nav,
   });
   session.gitBranches = createBranchController({
     repo: () => session.repo,
@@ -286,6 +296,7 @@ const bindViewer = (session) => {
     collection: session.collection,
     review: session.review,
     gitBranches: session.gitBranches,
+    commits: session.commits,
     updater: session.updater,
     ui: session,
   });
@@ -304,6 +315,7 @@ const bindFilesPane = (session) => {
     onQuit: () => session.onQuit(),
     onCheckoutBranch: session.gitBranches.onCheckoutBranch,
     onBranchMove: session.gitBranches.onBranchMove,
+    onCommitMove: session.commits.onCommitMove,
     layout: () => session.layout,
     setLayout: (value) => {
       session.layout = value;
@@ -344,6 +356,12 @@ const bindDispatch = (session) => {
       if (session.pane === 'branches') {
         return session.branches[session.branchCursor];
       }
+      if (session.pane === 'commits') {
+        const entry = session.commits.commits[session.commitCursor];
+        const staged = targetHasStaged(session);
+        if (!entry) return { canCommit: staged };
+        return { ...entry, canCommit: staged };
+      }
       return session.current();
     },
     composer: session.composer,
@@ -352,6 +370,7 @@ const bindDispatch = (session) => {
     gitBranches: session.gitBranches,
     onFileMove: filesPane.onFileMove,
     onBranchMove: session.gitBranches.onBranchMove,
+    onCommitMove: session.commits.onCommitMove,
     onNext: filesPane.onNext,
     onPrev: filesPane.onPrev,
     onOpenFile: filesPane.onOpenFile,
@@ -398,19 +417,23 @@ const bindDispatch = (session) => {
       editing: () => session.finishQuit('editing'),
       cancel: () => session.cancelQuit(),
     },
-    commit: {
-      commit: () => session.commits.startGitCommit('commit'),
-      amend: () => session.commits.startGitCommit('amend'),
-      fixup: () => session.commits.startGitCommit('fixup'),
-      cancel: session.commits.cancelCommit,
-    },
     update: {
       accept: session.updater.accept,
       decline: session.updater.decline,
     },
     drop: {
-      confirm: session.gitBranches.confirmDropBranch,
-      cancel: session.gitBranches.cancelDropBranch,
+      confirm: () => {
+        if (session.commits.dropName) {
+          return void session.commits.confirmDropCommit();
+        }
+        session.gitBranches.confirmDropBranch();
+      },
+      cancel: () => {
+        if (session.commits.dropName) {
+          return void session.commits.cancelDropCommit();
+        }
+        session.gitBranches.cancelDropBranch();
+      },
     },
     push: {
       force: session.gitBranches.onForcePush,
@@ -444,6 +467,7 @@ class Session {
     if (this.composer) this.composer.reset();
     if (this.ops) this.ops.reset();
     if (this.gitBranches) this.gitBranches.reset();
+    if (this.commits) this.commits.reset();
     this.top = this.cwd;
     this.branch = '';
     this.status = '';
@@ -507,7 +531,11 @@ class Session {
       height: size.height,
       color: this.color,
     });
-    if (this.pane === 'files' || this.pane === 'branches') {
+    if (
+      this.pane === 'files' ||
+      this.pane === 'branches' ||
+      this.pane === 'commits'
+    ) {
       this.nav.listScroll = frame.listScroll;
     }
     const composing = this.mode === 'compose';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reslop",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Interactive code review and repair planning for AI-assisted changes",
   "keywords": [
     "code-review",
@@ -59,7 +59,7 @@
     "eslint": "^9.39.4",
     "eslint-config-metarhia": "^9.1.9",
     "metaskills": "^1.0.5",
-    "prettier": "^3.9.7"
+    "prettier": "^3.9.8"
   },
   "dependencies": {
     "metautil": "^5.5.2"