reslop 0.2.0 → 0.2.1

package/lib/review-merge.js

@@ -0,0 +1,270 @@
+'use strict';
+
+const { TODO_FILE } = require('./files.js');
+
+const flatText = (text) => `${text ?? ''}`.trim().replace(/\n/g, ' ');
+
+const snapTodo = (todo) => ({
+  file: todo.file ?? '',
+  text: flatText(todo.text),
+  done: todo.done === true,
+});
+
+const snapList = (todos) => {
+  const list = [];
+  for (const todo of todos ?? []) {
+    const snap = snapTodo(todo);
+    if (!snap.text) continue;
+    list.push(snap);
+  }
+  return list;
+};
+
+const copyMap = (map) => {
+  const next = new Map();
+  if (!map) return next;
+  for (const [key, note] of map) next.set(key, { ...note });
+  return next;
+};
+
+const snapshotSide = (store) => ({
+  status: store.status,
+  todos: snapList(store.todos),
+  feedback: copyMap(store.feedback),
+  code: copyMap(store.code),
+});
+
+const captureBaseline = (store) => {
+  store.baseline = snapshotSide(store);
+};
+
+const claim = (list, used, text, read) => {
+  for (let i = 0; i < list.length; i++) {
+    if (used[i]) continue;
+    if (read(list[i]) !== text) continue;
+    used[i] = true;
+    return i;
+  }
+  return -1;
+};
+
+const pickDone = (baseDone, ourDone, theirDone) => {
+  if (ourDone === theirDone) return ourDone;
+  if (theirDone === baseDone) return ourDone;
+  if (ourDone === baseDone) return theirDone;
+  return ourDone;
+};
+
+const withDone = (todo, done) => {
+  if (todo.done === done) return todo;
+  return { id: todo.id, file: todo.file, text: todo.text, done };
+};
+
+const liveText = (todo) => flatText(todo.text);
+
+const snapText = (snap) => snap.text;
+
+const flags = (n) => new Array(n).fill(false);
+
+const adoptTodo = (store, snap) => {
+  const id = store.nextTodoId;
+  store.nextTodoId += 1;
+  const file = snap.file || TODO_FILE;
+  return { id, file, text: snap.text, done: snap.done };
+};
+
+const findMerged = (merged, alias, text) => {
+  const linked = alias.get(text);
+  if (linked) {
+    const at = merged.indexOf(linked);
+    if (at >= 0) return at;
+  }
+  for (let i = 0; i < merged.length; i++) {
+    if (liveText(merged[i]) === text) return i;
+  }
+  return -1;
+};
+
+const insertTheir = (store, merged, theirs, theirKeep, alias) => {
+  for (let i = 0; i < theirs.length; i++) {
+    if (!theirKeep[i]) continue;
+    let at = merged.length;
+    let placed = false;
+    for (let j = i - 1; j >= 0 && !placed; j--) {
+      const prev = findMerged(merged, alias, theirs[j].text);
+      if (prev < 0) continue;
+      at = prev + 1;
+      placed = true;
+    }
+    for (let j = i + 1; j < theirs.length && !placed; j++) {
+      const next = findMerged(merged, alias, theirs[j].text);
+      if (next < 0) continue;
+      at = next;
+      placed = true;
+    }
+    const item = adoptTodo(store, theirs[i]);
+    merged.splice(at, 0, item);
+    alias.set(theirs[i].text, item);
+  }
+  return merged;
+};
+
+const keepOurs = (ours, kept, alias, index, text) => {
+  kept[index] = true;
+  alias.set(text, ours[index]);
+};
+
+const mergeBaseTodo = (
+  base,
+  ours,
+  theirs,
+  used,
+  kept,
+  dropped,
+  theirKeep,
+  alias,
+) => {
+  const text = base.text;
+  const oi = claim(ours, used.ours, text, liveText);
+  const ti = claim(theirs, used.theirs, text, snapText);
+  if (oi >= 0 && ti >= 0) {
+    const done = pickDone(base.done, ours[oi].done === true, theirs[ti].done);
+    ours[oi] = withDone(ours[oi], done);
+    keepOurs(ours, kept, alias, oi, text);
+    return;
+  }
+  if (oi >= 0) {
+    if (ours[oi].done === base.done) {
+      dropped[oi] = true;
+      return;
+    }
+    keepOurs(ours, kept, alias, oi, text);
+    return;
+  }
+  if (ti >= 0 && theirs[ti].done !== base.done) theirKeep[ti] = true;
+};
+
+const replaceTodo = (todo, snap) => ({
+  id: todo.id,
+  file: todo.file,
+  text: snap.text,
+  done: snap.done,
+});
+
+const fillGaps = (merged, gaps, theirs, theirKeep, alias) => {
+  let filled = 0;
+  for (let i = 0; i < theirs.length && filled < gaps.length; i++) {
+    if (!theirKeep[i]) continue;
+    const gap = gaps[filled];
+    const item = replaceTodo(gap.todo, theirs[i]);
+    merged.splice(gap.at, 0, item);
+    alias.set(theirs[i].text, item);
+    theirKeep[i] = false;
+    filled += 1;
+  }
+};
+
+const mergeFreshTodo = (ours, theirs, used, kept, alias, index) => {
+  const text = liveText(ours[index]);
+  const ti = claim(theirs, used.theirs, text, snapText);
+  if (ti < 0) {
+    kept[index] = true;
+    return;
+  }
+  const done = ours[index].done === true || theirs[ti].done === true;
+  ours[index] = withDone(ours[index], done);
+  keepOurs(ours, kept, alias, index, text);
+};
+
+const mergeTodos = (store, base, theirs) => {
+  const ours = [];
+  for (const todo of store.todos) {
+    if (!liveText(todo)) continue;
+    ours.push(todo);
+  }
+  const used = { ours: flags(ours.length), theirs: flags(theirs.length) };
+  const kept = flags(ours.length);
+  const dropped = flags(ours.length);
+  const theirKeep = flags(theirs.length);
+  const alias = new Map();
+  for (const item of base) {
+    mergeBaseTodo(item, ours, theirs, used, kept, dropped, theirKeep, alias);
+  }
+  for (let i = 0; i < ours.length; i++) {
+    if (used.ours[i]) continue;
+    mergeFreshTodo(ours, theirs, used, kept, alias, i);
+  }
+  for (let i = 0; i < theirs.length; i++) {
+    if (!used.theirs[i]) theirKeep[i] = true;
+  }
+  const merged = [];
+  const gaps = [];
+  let cursor = 0;
+  for (let i = 0; i < ours.length; i++) {
+    if (kept[i]) {
+      merged.push(ours[i]);
+      cursor += 1;
+      continue;
+    }
+    if (!dropped[i]) continue;
+    gaps.push({ at: cursor, todo: ours[i] });
+    cursor += 1;
+  }
+  fillGaps(merged, gaps, theirs, theirKeep, alias);
+  store.todos = insertTheir(store, merged, theirs, theirKeep, alias);
+};
+
+const sameNote = (left, right) =>
+  left.text === right.text && !!left.done === !!right.done;
+
+const cloneNote = (note, done) => {
+  if (!!note.done === done) return note;
+  return { ...note, done };
+};
+
+const pickNote = (ours, base, theirs) => {
+  if (ours && theirs && ours.text === theirs.text) {
+    const baseDone = base ? base.done === true : ours.done === true;
+    const done = pickDone(baseDone, ours.done === true, theirs.done === true);
+    return cloneNote(ours, done);
+  }
+  if (!base) return ours || theirs || null;
+  if (!ours) {
+    if (!theirs || sameNote(theirs, base)) return null;
+    return theirs;
+  }
+  if (!theirs) {
+    if (sameNote(ours, base)) return null;
+    return ours;
+  }
+  if (sameNote(theirs, base)) return ours;
+  if (sameNote(ours, base)) return theirs;
+  return ours;
+};
+
+const mergeMap = (ours, base, theirs) => {
+  const keys = new Set();
+  for (const key of ours.keys()) keys.add(key);
+  for (const key of base.keys()) keys.add(key);
+  for (const key of theirs.keys()) keys.add(key);
+  for (const key of keys) {
+    const next = pickNote(ours.get(key), base.get(key), theirs.get(key));
+    if (!next) ours.delete(key);
+    else ours.set(key, next);
+  }
+};
+
+const mergeReview = (store, disk) => {
+  const base = store.baseline;
+  const baseTodos = base ? base.todos : [];
+  const baseStatus = base ? base.status : store.status;
+  mergeTodos(store, baseTodos, snapList(disk.todos));
+  const feedback = base ? base.feedback : new Map();
+  const code = base ? base.code : new Map();
+  mergeMap(store.feedback, feedback, disk.feedback);
+  mergeMap(store.code, code, disk.code);
+  if (store.status === baseStatus && disk.status) store.status = disk.status;
+  store.baseline = snapshotSide(disk);
+};
+
+module.exports = { captureBaseline, mergeReview };

package/lib/review.js

@@ -4,6 +4,7 @@ const fs = require('node:fs');
 const path = require('node:path');
 
 const { TODO_FILE, REVIEW_DIR } = require('./files.js');
+const { captureBaseline, mergeReview } = require('./review-merge.js');
 
 const createStore = (reviewPath, templates = []) => ({
   reviewPath,
@@ -14,6 +15,7 @@ const createStore = (reviewPath, templates = []) => ({
   todos: [],
   templates: [...templates],
   status: 'editing',
+  baseline: null,
 });
 
 const noteCounts = (store) => {
@@ -119,6 +121,15 @@ const setTodoText = (store, id, text) => {
   store.dirty = true;
 };
 
+const setTodoDone = (store, id, done) => {
+  const i = store.todos.findIndex((todo) => todo.id === id);
+  if (i < 0) return;
+  const prev = store.todos[i];
+  if (prev.done === done) return;
+  store.todos[i] = { id: prev.id, file: prev.file, text: prev.text, done };
+  store.dirty = true;
+};
+
 const checkLabel = (text, done) => {
   const mark = done ? 'x' : ' ';
   return `[${mark}] ${text}`;
@@ -222,12 +233,13 @@ const SECTION_LINE = {
 };
 
 const AGENT_INSTRUCTIONS = [
-  'Execute reviews with `status: ready` or `status: partial`.',
-  'Do not start `editing` or `done` review files.',
-  'Work through unchecked items. After finishing one, mark it `[x]`.',
-  'For `code` items, replace added lines at that location with the fence.',
-  'Set `status` to `partial` if some remain, or `done` if all are `[x]`.',
-  'Do not redo items already marked `[x]`.',
+  '- Execute reviews with `status` `ready, partial, editing`',
+  '- Do not start or change `done` review files',
+  '- Work through unchecked items. After finishing one, mark it `[x]`',
+  '- For `code` items, replace added lines at that location',
+  '- If not `editing`, set `status` to `partial` if some remain, ' +
+    'or `done` if all are `[x]`',
+  '- Do not redo items already marked `[x]`',
 ].join('\n');
 
 const toInt = (text) => parseInt(text, 10);
@@ -622,6 +634,7 @@ const parseReview = (text, reviewPath, templates = []) => {
   flushPendingCode(builder, pendingCode);
   flushPendingFeedback(builder, pending);
   builder.dirty = false;
+  captureBaseline(builder);
   return builder;
 };
 
@@ -733,8 +746,25 @@ const loadTemplates = (dir) => {
   }
 };
 
+const readReviewText = (reviewPath) => {
+  try {
+    return fs.readFileSync(reviewPath, 'utf8');
+  } catch (error) {
+    if (error.code === 'ENOENT') return '';
+    throw error;
+  }
+};
+
+const mergeDiskReview = (notes) => {
+  const text = readReviewText(notes.reviewPath);
+  if (!text.startsWith('---')) return;
+  const disk = parseReview(text, notes.reviewPath, notes.templates);
+  mergeReview(notes, disk);
+};
+
 const flushReview = (notes, force = false) => {
   if (!notes || !notes.dirty) return false;
+  mergeDiskReview(notes);
   if (!hasNotes(notes) && !force) {
     notes.dirty = false;
     return false;
@@ -746,6 +776,7 @@ const flushReview = (notes, force = false) => {
   const templatesFile = path.join(top, REVIEW_DIR, TEMPLATES_FILE);
   const body = `${JSON.stringify(notes.templates, null, 2)}\n`;
   fs.writeFileSync(templatesFile, body, 'utf8');
+  captureBaseline(notes);
   notes.dirty = false;
   return true;
 };
@@ -770,6 +801,7 @@ module.exports = {
   addTodo,
   removeTodo,
   setTodoText,
+  setTodoDone,
   checkLabel,
   feedbackKey,
   applyImportedNotes,

package/lib/session/actions.js

@@ -7,6 +7,7 @@ const ACTIONS = {
   commit: ['c'],
   prev: ['left', 'p', 'k'],
   next: ['right', 'n', 'j'],
+  check: ['x', ' '],
   layout: ['m'],
   feedback: ['f'],
   todo: ['t'],
@@ -28,6 +29,8 @@ const BRANCH_ACTIONS = {
 
 const COMMIT_ACTIONS = {
   amend: ['a'],
+  apply: ['a'],
+  reword: ['r'],
   fixup: ['f'],
   drop: ['d'],
   pull: ['p'],
@@ -41,6 +44,7 @@ const ACTION_HOT = {
 
 const ACTION_LABEL = {
   revert: 'drop',
+  check: 'x',
   layout: 'mode',
   code: 'edit',
   newBranch: 'new',
@@ -49,11 +53,20 @@ const ACTION_LABEL = {
   next: '→',
 };
 
-const DIFF_DISABLED = ['commit', 'branch', 'pull', 'push', 'file', 'diff'];
+const DIFF_DISABLED = [
+  'check',
+  'commit',
+  'branch',
+  'pull',
+  'push',
+  'file',
+  'diff',
+];
 const UNIT_DISABLED = [...DIFF_DISABLED, 'layout'];
 const FILES_DISABLED = ['layout', 'feedback', 'code'];
 const FILES_HIDDEN = [
   ...FILES_DISABLED,
+  'check',
   'prev',
   'next',
   'commit',
@@ -86,6 +99,7 @@ const BRANCHES_DISABLED = [
   'feedback',
   'todo',
   'code',
+  'check',
   'branch',
   'file',
   'diff',
@@ -100,6 +114,7 @@ const COMMITS_DISABLED = [
   'feedback',
   'todo',
   'code',
+  'check',
   'branch',
   'file',
   'diff',
@@ -124,13 +139,17 @@ const branchGitDisabled = (item) => {
   return off;
 };
 
+const isFixupCommit = (item) =>
+  `${item && item.subject ? item.subject : ''}`.startsWith('fixup!');
+
 const commitWriteDisabled = (item) => {
-  if (!item || !item.sha) return ['amend', 'fixup', 'drop'];
+  if (!item || !item.sha) return ['amend', 'apply', 'reword', 'fixup', 'drop'];
   return [];
 };
 
 const commitGitDisabled = (item) => {
-  const off = commitWriteDisabled(item);
+  const off = [...commitWriteDisabled(item)];
+  if (!isFixupCommit(item)) off.push('apply');
   if (item && item.canCommit === true) return off;
   return [...off, 'commit', 'fixup'];
 };
@@ -149,6 +168,10 @@ const disabledActions = (pane, item) => {
   return [...DIFF_DISABLED, ...diffGitDisabled(item)];
 };
 
+const HIDDEN_KEYS = {
+  l: 'theme',
+};
+
 const SCROLL = {
   up: 'scrollUp',
   down: 'scrollDown',
@@ -194,6 +217,9 @@ for (const id of ACTION_IDS) {
 }
 
 for (const key of Object.keys(SCROLL)) KEY_TO_ACTION[key] = SCROLL[key];
+for (const key of Object.keys(HIDDEN_KEYS)) {
+  KEY_TO_ACTION[key] = HIDDEN_KEYS[key];
+}
 
 const actionFromKey = (key, pane, fileScope) => {
   const listPane =
@@ -318,6 +344,7 @@ module.exports = {
   diffGitDisabled,
   branchGitDisabled,
   commitGitDisabled,
+  isFixupCommit,
   actionFromKey,
   actionKeys,
   actionHot,

package/lib/session/commit.js

@@ -3,12 +3,22 @@
 const { stateView } = require('./accessors.js');
 
 const { isReadOnlyOrigin } = require('../files.js');
+const { isFixupCommit } = require('./actions.js');
 const { pickRepoWrite } = require('./ops.js');
 
 const COMMIT_STATUS = {
   commit: 'committed',
   amend: 'amended',
   fixup: 'fixup',
+  reword: 'reworded',
+};
+
+const isInPlaceCommit = (kind) => kind === 'amend' || kind === 'reword';
+
+const fixupMessage = (entry) => {
+  const subject = `${entry && entry.subject ? entry.subject : ''}`.trim();
+  if (!subject) return 'fixup!';
+  return `fixup! ${subject}`;
 };
 
 const canCommit = (ui) => {
@@ -100,21 +110,33 @@ const onCommitMove = (api, delta) => {
 
 const startGitCommit = (api, kind) => {
   const ui = api.ui;
-  if (kind !== 'amend' && !hasStagedChanges(ui)) {
+  if (!isInPlaceCommit(kind) && !hasStagedChanges(ui)) {
     ui.mode = 'review';
     ui.composer.state.commitKind = null;
     ui.status = 'nothing to commit';
     return;
   }
-  ui.composer.state.commitKind = kind;
   let text = '';
   if (kind === 'fixup') {
-    const entry = selectedCommit(api);
-    text = entry ? entry.shortSha || entry.sha : 'HEAD';
+    text = fixupMessage(selectedCommit(api));
+  }
+  if (kind === 'amend') {
+    const headAt = api.state.commits.findIndex((entry) => entry.head);
+    api.ui.nav.commitCursor = headAt < 0 ? 0 : headAt;
+    if (ui.repo.lastMessage) {
+      text = ui.repo.lastMessage(ui.top) ?? '';
+    }
   }
-  if (kind === 'amend' && ui.repo.lastMessage) {
-    text = ui.repo.lastMessage(ui.top) ?? '';
+  if (kind === 'reword') {
+    const entry = selectedCommit(api);
+    if (!entry || !entry.sha) return;
+    if (typeof ui.repo.commitMessage === 'function') {
+      text = ui.repo.commitMessage(ui.top, entry.sha) ?? '';
+    } else {
+      text = `${entry.subject ?? ''}`;
+    }
   }
+  ui.composer.state.commitKind = kind;
   ui.composer.openCompose('commit', text);
 };
 
@@ -130,6 +152,43 @@ const onAmend = (api) => {
   startGitCommit(api, 'amend');
 };
 
+const onReword = (api) => {
+  if (api.ui.nav.pane !== 'commits') return;
+  if (!canCommit(api.ui)) return;
+  startGitCommit(api, 'reword');
+};
+
+const applyFixupNow = (api) => {
+  const entry = selectedCommit(api);
+  if (!entry || !entry.sha) return;
+  const done = 'applied';
+  const repo = api.ui.repo;
+  if (!repo.applyFixup) {
+    api.ui.status = 'read only';
+    return;
+  }
+  const picked = pickRepoWrite(repo, 'applyFixup', api.ui.uiOpen);
+  if (picked.async) {
+    const run = (top) => picked.write(top, entry.sha);
+    const after = () => refreshAfterWrite(api, { doneStatus: done });
+    return void api.ui.ops.runBusy('applying', done, run, after);
+  }
+  const ok = api.ui.ops.runRepo(done, (top) => {
+    repo.applyFixup(top, entry.sha);
+  });
+  if (!ok) return;
+  refreshAfterWrite(api);
+  if (!api.ui.status) api.ui.status = done;
+};
+
+const onApply = (api) => {
+  if (api.ui.nav.pane !== 'commits') return;
+  if (!canCommit(api.ui)) return;
+  const entry = selectedCommit(api);
+  if (isFixupCommit(entry)) return void applyFixupNow(api);
+  startGitCommit(api, 'amend');
+};
+
 const onFixup = (api) => {
   if (api.ui.nav.pane !== 'commits') return;
   if (!canCommit(api.ui)) return;
@@ -166,20 +225,52 @@ const finishSyncCommit = (api, kind, message, done) => {
   }
 };
 
+const finishReword = (api, message) => {
+  const ui = api.ui;
+  const entry = selectedCommit(api);
+  if (!entry || !entry.sha) {
+    ui.status = 'read only';
+    return;
+  }
+  const done = COMMIT_STATUS.reword;
+  const repo = ui.repo;
+  if (!repo.reword) {
+    ui.status = 'read only';
+    return;
+  }
+  const picked = pickRepoWrite(repo, 'reword', ui.uiOpen);
+  if (picked.async) {
+    ui.composer.closeCompose();
+    const run = (top) => picked.write(top, entry.sha, message);
+    const after = () => refreshAfterWrite(api, { doneStatus: done });
+    return void ui.ops.runBusy('rewording', done, run, after);
+  }
+  try {
+    repo.reword(ui.top, entry.sha, message);
+  } catch (error) {
+    ui.status = error.message;
+    return;
+  }
+  ui.composer.closeCompose();
+  refreshAfterWrite(api);
+  if (!ui.status) ui.status = done;
+};
+
 const finishGitCommit = (api) => {
   const ui = api.ui;
   const kind = ui.composer.state.commitKind;
   const editor = ui.composer.state.editor;
   const message = editor ? editor.text : '';
-  if (kind !== 'fixup' && !message.trim()) {
+  if (!message.trim()) {
     ui.status = 'empty commit message';
     return;
   }
-  if (kind !== 'amend' && !hasStagedChanges(ui)) {
+  if (!isInPlaceCommit(kind) && !hasStagedChanges(ui)) {
     ui.composer.closeCompose();
     ui.status = 'nothing to commit';
     return;
   }
+  if (kind === 'reword') return void finishReword(api, message);
   const done = COMMIT_STATUS[kind] ?? 'committed';
   const uiOpen = ui.uiOpen;
   const picked = pickRepoWrite(ui.repo, 'commit', uiOpen);
@@ -259,6 +350,8 @@ const createCommitController = (ui) => {
       canCommit: () => canCommit(ui),
       onCommit: () => onCommit(api),
       onAmend: () => onAmend(api),
+      onReword: () => onReword(api),
+      onApply: () => onApply(api),
       onFixup: () => onFixup(api),
       onCommitMove: (delta) => onCommitMove(api, delta),
       cancelCommit: () => cancelCommit(api),