reslop 0.1.4 → 0.1.5

package/lib/session.js

@@ -12,17 +12,16 @@ const { copyText } = require('./clipboard.js');
 const { watchResize } = require('./sys.js');
 const { fileEntries, itemPath } = require('./files.js');
 const { Editor } = require('./editor.js');
-const { refreshIndexPatches } = require('./diff.js');
+const { refreshIndexPatches, blockAddText } = require('./diff.js');
 
 const { renderFrame, presentRows, presentCursor } = render;
-const { noteInnerWidth, todoInnerWidth } = render;
-const { QUIT_FINISH, QUIT_CONTINUE } = render;
+const { noteInnerWidth, todoInnerWidth, codeInnerWidth } = render;
 const { actionFromKey, hitAction, decodeChunk } = keys;
-const { FILES_DISABLED } = keys;
+const { disabledActions } = keys;
 const { cursorInWrap, wrapDoc, wrapMove } = wrap;
 const { AUTOSAVE_MS, listReviewNames, loadTemplates } = review;
 const { resolveReviewPath, loadReview, createStore } = review;
-const { noteCounts, hasNotes, setFeedback, addTodo } = review;
+const { noteCounts, hasNotes, setFeedback, setCode, addTodo } = review;
 const { applyImportedNotes } = review;
 const { setTodoText, removeTodo, flushReview, mergeTodos } = review;
 const { feedbackKey, checkLabel, rankedTemplates } = review;
@@ -87,6 +86,13 @@ const itemFeedKey = (item) => {
   return feedbackKey({ file, oldStart, newStart, blockId });
 };
 
+const canEditCode = (item) => {
+  if (!item || item.origin === 'todo') return false;
+  if (!item.hunk || !item.file) return false;
+  if (item.file.isBinary) return false;
+  return true;
+};
+
 const isAbortError = (error) => !!(error && error.code === 'ABORT');
 
 const sameCursor = (a, b) => {
@@ -96,12 +102,26 @@ const sameCursor = (a, b) => {
 };
 
 const QUIT_CONFIRM = {
-  [QUIT_FINISH]: (session) => session.finishQuit('ready'),
-  [QUIT_CONTINUE]: (session) => session.finishQuit('editing'),
+  f: (session) => session.finishQuit('ready'),
+  c: (session) => session.finishQuit('editing'),
+  d: (session) => session.discardQuit(),
   'ctrl-c': (session) => session.finishQuit('ready'),
   escape: (session) => session.cancelQuit(),
 };
 
+const COMMIT_CONFIRM = {
+  c: (session) => session.startGitCommit('commit'),
+  a: (session) => session.startGitCommit('amend'),
+  f: (session) => session.startGitCommit('fixup'),
+  escape: (session) => session.cancelCommit(),
+};
+
+const COMMIT_STATUS = {
+  commit: 'committed',
+  amend: 'amended',
+  fixup: 'fixup',
+};
+
 const COMPOSE_EDITS = ['backspace', 'delete', 'ctrl-z', 'ctrl-y'];
 
 const COMPOSE_SPECIAL = {
@@ -117,7 +137,7 @@ const COMPOSE_SPECIAL = {
   'ctrl-e': (session) => session.editor.end(),
   'ctrl-z': (session) => session.editor.undoEdit(),
   'ctrl-y': (session) => session.editor.redoEdit(),
-  tab: (session) => session.applyTemplate(),
+  tab: (session) => session.composeTab(),
 };
 
 const HANDLERS = {
@@ -130,6 +150,9 @@ const HANDLERS = {
   files: (session) => session.onFiles(),
   feedback: (session) => session.onFeedback(),
   todo: (session) => session.onTodo(),
+  code: (session) => session.onCode(),
+  reload: (session) => session.onReload(),
+  commit: (session) => session.onCommit(),
   open: (session) => session.onOpenFile(),
   removeTodo: (session) => session.removeFocusedTodo(),
   quit: (session) => session.onQuit(),
@@ -143,9 +166,12 @@ const HANDLERS = {
 
 const KEY_MODE = {
   confirmQuit: (session, key) => session.onConfirmQuit(key),
+  confirmCommit: (session, key) => session.onConfirmCommit(key),
   compose: (session, key) => session.handleComposeKey(key),
 };
 
+const COMPOSE_LEAVE = ['next', 'prev', 'todo'];
+
 const MOUSE_KIND = {
   wheelUp: (session) => session.onScroll(-1),
   wheelDown: (session) => session.onScroll(1),
@@ -200,6 +226,7 @@ class Session {
     this.readFileSync = options.readFileSync ?? fs.readFileSync;
     this.writeFileSync = options.writeFileSync ?? fs.writeFileSync;
     this.mkdirSync = options.mkdirSync ?? fs.mkdirSync;
+    this.unlinkSync = options.unlinkSync ?? fs.unlinkSync;
     this.now = options.now ?? systemNow;
     this.forceNewReview = options.newReview === true;
     this.readOnly = options.readOnly === true;
@@ -236,6 +263,7 @@ class Session {
     this.mode = 'review';
     this.editor = null;
     this.composeKind = null;
+    this.commitKind = null;
     this.composeTodoId = null;
     this.composeBaseline = '';
     this.todoFocus = 0;
@@ -530,6 +558,7 @@ class Session {
       pr: 0,
       todo: 0,
       feedback: 0,
+      code: 0,
     };
     for (const item of this.items) {
       if (!Object.hasOwn(counts, item.origin)) continue;
@@ -538,6 +567,7 @@ class Session {
     const notes = noteCounts(this.notes);
     counts.feedback = notes.feedback;
     counts.todo = notes.todo;
+    counts.code = notes.code;
     return counts;
   }
 
@@ -569,6 +599,7 @@ class Session {
       todos: this.todoTexts(),
       todoFocus: this.clampedTodoFocus(),
       todoEdit: this.todoEditView(),
+      codeOverlay: this.codeOverlayView(),
       templates,
       templateIndex: this.clampedTemplateIndex(templates),
     };
@@ -601,18 +632,18 @@ class Session {
 
   dispatch(action) {
     if (this.mode === 'confirmQuit') return;
+    if (this.mode === 'confirmCommit') return;
     if (this.mode === 'compose') {
-      if (action !== 'next' && action !== 'prev' && action !== 'todo') {
-        return;
-      }
+      if (!COMPOSE_LEAVE.includes(action)) return;
       this.commitCompose();
       this.closeCompose();
     }
     if (this.pane === 'files') {
       if (action === 'next') return void this.onFileMove(1);
       if (action === 'prev') return void this.onFileMove(-1);
-      if (FILES_DISABLED.includes(action)) return;
     }
+    const hidden = disabledActions(this.pane, this.current());
+    if (hidden.includes(action)) return;
     const handler = HANDLERS[action];
     if (!handler) return;
     handler(this);
@@ -622,8 +653,7 @@ class Session {
     return this.items[this.index] ?? null;
   }
 
-  reloadAfterChange() {
-    const here = this.index;
+  refreshFromRepo() {
     this.loadPromise = null;
     this.bumpLoad();
     const options = this.loadOptions({
@@ -631,10 +661,6 @@ class Session {
     });
     const loaded = this.repo.load(this.cwd, this.paths, options);
     this.applyLoaded(loaded);
-    this.index = here;
-    this.clampIndex();
-    this.syncReviewPath();
-    this.syncFileCursor();
     this.scroll = 0;
     this.clearSelection();
     if (loaded.pending) {
@@ -645,6 +671,22 @@ class Session {
     this.finishIfEmpty('reload');
   }
 
+  reloadAfterChange() {
+    const here = this.index;
+    this.refreshFromRepo();
+    this.index = here;
+    this.clampIndex();
+    this.syncReviewPath();
+    this.syncFileCursor();
+  }
+
+  onReload() {
+    this.dismissed.clear();
+    this.status = '';
+    this.refreshFromRepo();
+    if (!this.done && !this.pendingExtras) this.status = 'reloaded';
+  }
+
   clearSelection() {
     this.selection = null;
     this.mouseAnchor = null;
@@ -795,7 +837,7 @@ class Session {
     let ok = false;
     try {
       this.repo.revertFile(this.top, rel, items);
-      this.status = 'reverted';
+      this.status = 'dropped';
       ok = true;
     } catch (error) {
       this.status = error.message;
@@ -849,7 +891,7 @@ class Session {
     if (!this.guardWritable(item)) return;
     this.applyGit(
       item,
-      'reverted',
+      'dropped',
       (top, current) => this.repo.revert(top, current),
       () => {
         if (needsReload(item)) this.dismissed.add(itemKey(item));
@@ -911,6 +953,23 @@ class Session {
     this.exitCode = 0;
   }
 
+  removeReviewFile() {
+    const file = this.notes && this.notes.reviewPath;
+    if (!file) return;
+    try {
+      this.unlinkSync(file);
+    } catch {
+      // ignore missing review file
+    }
+  }
+
+  discardQuit() {
+    if (this.notes) this.notes.dirty = false;
+    if (!this.didResumeReview) this.removeReviewFile();
+    this.done = true;
+    this.exitCode = 0;
+  }
+
   cancelQuit() {
     this.mode = 'review';
     this.status = '';
@@ -922,6 +981,69 @@ class Session {
     if (handler) handler(this);
   }
 
+  canCommit() {
+    if (this.readOnly || this.rev || this.change) {
+      this.status = 'read only';
+      return false;
+    }
+    for (const item of this.items) {
+      if (isReadOnlyOrigin(item.origin)) {
+        this.status = 'read only';
+        return false;
+      }
+    }
+    return true;
+  }
+
+  onCommit() {
+    if (!this.canCommit()) return;
+    this.mode = 'confirmCommit';
+    this.status = '';
+  }
+
+  cancelCommit() {
+    this.mode = 'review';
+    this.commitKind = null;
+    this.status = '';
+  }
+
+  startGitCommit(kind) {
+    this.commitKind = kind;
+    let text = '';
+    if (kind === 'fixup') text = 'HEAD';
+    if (kind === 'amend' && this.repo.lastMessage) {
+      text = this.repo.lastMessage(this.top) ?? '';
+    }
+    this.openCompose('commit', text);
+  }
+
+  onConfirmCommit(key) {
+    const commitKey = key.length === 1 ? key.toLowerCase() : key;
+    const handler = COMMIT_CONFIRM[commitKey];
+    if (handler) handler(this);
+  }
+
+  finishGitCommit() {
+    const kind = this.commitKind;
+    const message = this.editor ? this.editor.text : '';
+    if (kind !== 'fixup' && !message.trim()) {
+      this.status = 'empty commit message';
+      return;
+    }
+    try {
+      this.repo.commit(this.top, kind, message);
+    } catch (error) {
+      this.status = error.message;
+      return;
+    }
+    this.closeCompose();
+    this.dismissed.clear();
+    this.refreshFromRepo();
+    if (!this.done && !this.pendingExtras) {
+      this.status = COMMIT_STATUS[kind] ?? 'committed';
+    }
+  }
+
   onFeedback() {
     if (this.pane === 'files') {
       this.status = 'not a diff block';
@@ -952,6 +1074,22 @@ class Session {
     this.createTodo(file);
   }
 
+  onCode() {
+    if (this.pane === 'files') {
+      this.status = 'not a diff block';
+      return;
+    }
+    const item = this.current();
+    if (!canEditCode(item)) {
+      this.status = 'not a diff block';
+      return;
+    }
+    const prev = this.notes.code.get(itemFeedKey(item));
+    const original = blockAddText(item.hunk, item.blockId);
+    const text = prev ? prev.text : original;
+    this.openCompose('code', text);
+  }
+
   todoPageIndex(file) {
     return this.items.findIndex(
       (item) => item.origin === 'todo' && itemPath(item) === file,
@@ -1084,6 +1222,29 @@ class Session {
       return;
     }
     if (this.composeKind === 'todo') this.commitTodo(text);
+    if (this.composeKind === 'code') this.commitCode(text);
+  }
+
+  commitCode(text) {
+    const item = this.current();
+    if (!canEditCode(item)) return;
+    const original = blockAddText(item.hunk, item.blockId);
+    const key = itemFeedKey(item);
+    const hunk = item.hunk;
+    const note = {
+      file: itemPath(item),
+      oldStart: hunk.oldStart ?? 0,
+      newStart: hunk.newStart ?? 0,
+      blockId: item.blockId ?? 0,
+      origin: item.origin,
+      header: hunk.header ?? '',
+      text,
+    };
+    if (text === original) {
+      setCode(this.notes, key, { ...note, clear: true });
+      return;
+    }
+    setCode(this.notes, key, note);
   }
 
   commitTodo(text) {
@@ -1114,6 +1275,7 @@ class Session {
     this.mode = 'review';
     this.editor = null;
     this.composeKind = null;
+    this.commitKind = null;
     this.composeTodoId = null;
     this.composeBaseline = '';
     this.templateIndex = -1;
@@ -1174,7 +1336,9 @@ class Session {
 
   composeView() {
     if (this.mode !== 'compose' || !this.editor) return null;
-    if (this.composeKind !== 'feedback') return null;
+    if (this.composeKind !== 'feedback' && this.composeKind !== 'commit') {
+      return null;
+    }
     const kind = this.composeKind;
     const text = this.editor.text;
     const cursor = this.editor.cursor;
@@ -1187,6 +1351,34 @@ class Session {
     return { cursor: this.editor.cursor };
   }
 
+  liveCodeText() {
+    const item = this.current();
+    if (!canEditCode(item)) return null;
+    if (this.mode === 'compose' && this.composeKind === 'code' && this.editor) {
+      return this.editor.text;
+    }
+    if (!this.notes) return null;
+    const note = this.notes.code.get(itemFeedKey(item));
+    if (!note) return null;
+    return note.text;
+  }
+
+  codeOverlayView() {
+    const text = this.liveCodeText();
+    if (text === null) return null;
+    const editing = this.mode === 'compose' && this.composeKind === 'code';
+    const cursor = editing && this.editor ? this.editor.cursor : null;
+    return { text, keepEmpty: editing, cursor };
+  }
+
+  composeTab() {
+    if (this.composeKind === 'code') {
+      this.editor.insert('\t');
+      return;
+    }
+    this.applyTemplate();
+  }
+
   fileTodos(rel) {
     if (!this.notes || !rel) return [];
     const todos = [];
@@ -1268,6 +1460,10 @@ class Session {
   }
 
   saveCompose() {
+    if (this.composeKind === 'commit') {
+      this.finishGitCommit();
+      return;
+    }
     this.commitCompose();
     if (this.composeKind === 'feedback') {
       const next = this.editor ? this.editor.text : '';
@@ -1280,7 +1476,10 @@ class Session {
 
   autosave() {
     const text = this.editor ? this.editor.text : '';
-    if (this.mode === 'compose' && text.trim()) this.commitCompose();
+    const editingCode = this.mode === 'compose' && this.composeKind === 'code';
+    if (this.mode === 'compose' && (editingCode || text.trim())) {
+      this.commitCompose();
+    }
     if (this.notes && this.notes.dirty) this.flushReview();
   }
 
@@ -1306,6 +1505,11 @@ class Session {
       this.moveTodoLine(delta, todoInnerWidth(size.width));
       return;
     }
+    if (this.composeKind === 'code') {
+      const inner = codeInnerWidth(size.width, this.layout);
+      this.editor.moveLine(delta, inner);
+      return;
+    }
     const width = noteInnerWidth(size.width);
     const shown = this.shownTemplates();
     if (shown.length && this.composeKind === 'feedback') {
@@ -1355,10 +1559,20 @@ class Session {
         this.selectTemplate(this.templateIndex);
         return;
       }
+      if (this.composeKind === 'code') {
+        this.editor.insert('\n');
+        this.resetBlink();
+        return;
+      }
       this.saveCompose();
       return;
     }
     if (key === 'escape' || key === 'ctrl-s') {
+      if (this.composeKind === 'commit' && key === 'escape') {
+        this.closeCompose();
+        this.status = '';
+        return;
+      }
       this.saveCompose();
       return;
     }

package/package.json

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