reslop 0.2.3 → 0.2.5

package/lib/review-merge.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { TODO_FILE } = require('./files.js');
+const files = require('./files.js');
+const { TASKS_FILE } = files;
 
 const flatText = (text) => `${text ?? ''}`.trim().replace(/\n/g, ' ');
 
@@ -29,7 +30,7 @@ const copyMap = (map) => {
 
 const snapshotSide = (store) => ({
   status: store.status,
-  todos: snapList(store.todos),
+  tasks: snapList(store.tasks),
   feedback: copyMap(store.feedback),
   code: copyMap(store.code),
 });
@@ -67,83 +68,12 @@ 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;
+  const id = store.nextTaskId;
+  store.nextTaskId += 1;
+  const file = snap.file || TASKS_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,
@@ -151,68 +81,109 @@ const replaceTodo = (todo, snap) => ({
   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;
+class TodoMerge {
+  constructor(store, theirs) {
+    this.store = store;
+    this.ours = store.tasks.filter((todo) => liveText(todo));
+    this.theirs = theirs;
+    this.usedOurs = flags(this.ours.length);
+    this.usedTheirs = flags(theirs.length);
+    this.kept = flags(this.ours.length);
+    this.dropped = flags(this.ours.length);
+    this.theirKeep = flags(theirs.length);
+    this.alias = new Map();
+  }
+
+  keepOurs(index, text) {
+    this.kept[index] = true;
+    this.alias.set(text, this.ours[index]);
+  }
+
+  mergeBase(base) {
+    const { ours, theirs } = this;
+    const text = base.text;
+    const oi = claim(ours, this.usedOurs, text, liveText);
+    const ti = claim(theirs, this.usedTheirs, 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);
+      this.keepOurs(oi, text);
+    } else if (oi >= 0) {
+      if (ours[oi].done === base.done) this.dropped[oi] = true;
+      else this.keepOurs(oi, text);
+    } else if (ti >= 0 && theirs[ti].done !== base.done) {
+      this.theirKeep[ti] = true;
+    }
   }
-};
 
-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;
+  mergeFresh(index) {
+    const { ours, theirs } = this;
+    const text = liveText(ours[index]);
+    const ti = claim(theirs, this.usedTheirs, text, snapText);
+    if (ti < 0) {
+      this.kept[index] = true;
+      return;
+    }
+    const done = ours[index].done === true || theirs[ti].done === true;
+    ours[index] = withDone(ours[index], done);
+    this.keepOurs(index, text);
   }
-  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);
+  findMerged(merged, text) {
+    const linked = this.alias.get(text);
+    const at = linked ? merged.indexOf(linked) : -1;
+    if (at >= 0) return at;
+    return merged.findIndex((todo) => liveText(todo) === text);
   }
-  for (let i = 0; i < ours.length; i++) {
-    if (used.ours[i]) continue;
-    mergeFreshTodo(ours, theirs, used, kept, alias, i);
+
+  theirPlace(merged, index) {
+    const { theirs } = this;
+    for (let j = index - 1; j >= 0; j--) {
+      const prev = this.findMerged(merged, theirs[j].text);
+      if (prev >= 0) return prev + 1;
+    }
+    for (let j = index + 1; j < theirs.length; j++) {
+      const next = this.findMerged(merged, theirs[j].text);
+      if (next >= 0) return next;
+    }
+    return merged.length;
   }
-  for (let i = 0; i < theirs.length; i++) {
-    if (!used.theirs[i]) theirKeep[i] = true;
+
+  place(merged, at, index, item) {
+    merged.splice(at, 0, item);
+    this.alias.set(this.theirs[index].text, item);
+    this.theirKeep[index] = false;
   }
-  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;
+
+  merge(base) {
+    const { ours, theirs } = this;
+    for (const item of base) this.mergeBase(item);
+    for (let i = 0; i < ours.length; i++) {
+      if (!this.usedOurs[i]) this.mergeFresh(i);
+    }
+    for (let i = 0; i < theirs.length; i++) {
+      if (!this.usedTheirs[i]) this.theirKeep[i] = true;
     }
-    if (!dropped[i]) continue;
-    gaps.push({ at: cursor, todo: ours[i] });
-    cursor += 1;
+    const merged = [];
+    const gaps = [];
+    for (let i = 0; i < ours.length; i++) {
+      const at = merged.length + gaps.length;
+      if (this.kept[i]) merged.push(ours[i]);
+      else if (this.dropped[i]) gaps.push({ at, task: ours[i] });
+    }
+    for (let i = 0; i < theirs.length && gaps.length; i++) {
+      if (!this.theirKeep[i]) continue;
+      const gap = gaps.shift();
+      this.place(merged, gap.at, i, replaceTodo(gap.task, theirs[i]));
+    }
+    for (let i = 0; i < theirs.length; i++) {
+      if (!this.theirKeep[i]) continue;
+      const at = this.theirPlace(merged, i);
+      this.place(merged, at, i, adoptTodo(this.store, theirs[i]));
+    }
+    return merged;
   }
-  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;
@@ -256,9 +227,9 @@ const mergeMap = (ours, base, theirs) => {
 
 const mergeReview = (store, disk) => {
   const base = store.baseline;
-  const baseTodos = base ? base.todos : [];
+  const baseTodos = base?.tasks ?? base?.todos ?? [];
   const baseStatus = base ? base.status : store.status;
-  mergeTodos(store, baseTodos, snapList(disk.todos));
+  store.tasks = new TodoMerge(store, snapList(disk.tasks)).merge(baseTodos);
   const feedback = base ? base.feedback : new Map();
   const code = base ? base.code : new Map();
   mergeMap(store.feedback, feedback, disk.feedback);

package/lib/review.js

@@ -3,28 +3,32 @@
 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 files = require('./files.js');
+const { TASKS_FILE, REVIEW_DIR } = files;
+const reviewMerge = require('./review-merge.js');
+const { captureBaseline, mergeReview } = reviewMerge;
+const utilities = require('./utilities.js');
+const { pad2, dateStamp } = utilities;
 
 const createStore = (reviewPath, templates = []) => ({
   reviewPath,
   dirty: false,
-  nextTodoId: 1,
+  nextTaskId: 1,
   feedback: new Map(),
   code: new Map(),
-  todos: [],
+  tasks: [],
   templates: [...templates],
   status: 'editing',
   baseline: null,
 });
 
 const noteCounts = (store) => {
-  const counts = { feedback: 0, todo: 0, todoDone: 0, code: 0 };
+  const counts = { feedback: 0, tasks: 0, tasksDone: 0, code: 0 };
   if (!store) return counts;
-  for (const todo of store.todos) {
-    if (!todo.text.trim()) continue;
-    counts.todo += 1;
-    if (todo.done) counts.todoDone += 1;
+  for (const task of store.tasks) {
+    if (!task.text.trim()) continue;
+    counts.tasks += 1;
+    if (task.done) counts.tasksDone += 1;
   }
   for (const note of store.feedback.values()) {
     if (note.text.trim()) counts.feedback += 1;
@@ -35,21 +39,20 @@ const noteCounts = (store) => {
 
 const hasNotes = (store) => {
   const counts = noteCounts(store);
-  return counts.feedback > 0 || counts.todo > 0 || counts.code > 0;
+  return counts.feedback > 0 || counts.tasks > 0 || counts.code > 0;
 };
 
-const setFeedback = (store, key, note) => {
-  const text = note.text ?? '';
-  const trimmed = text.trim();
-  const prev = store.feedback.get(key);
-  if (!trimmed) {
+const putNote = (store, notes, key, note, clear) => {
+  const prev = notes.get(key);
+  if (clear) {
     if (!prev) return;
-    store.feedback.delete(key);
+    notes.delete(key);
     store.dirty = true;
     return;
   }
+  const text = note.text ?? '';
   if (prev && prev.text === text) return;
-  store.feedback.set(key, {
+  notes.set(key, {
     file: note.file,
     oldStart: note.oldStart ?? 0,
     newStart: note.newStart ?? 0,
@@ -62,42 +65,28 @@ const setFeedback = (store, key, note) => {
   store.dirty = true;
 };
 
+const setFeedback = (store, key, note) => {
+  const clear = !(note.text ?? '').trim();
+  putNote(store, store.feedback, key, note, clear);
+};
+
 const setCode = (store, key, note) => {
-  const prev = store.code.get(key);
-  if (note.clear) {
-    if (!prev) return;
-    store.code.delete(key);
-    store.dirty = true;
-    return;
-  }
-  const text = note.text ?? '';
-  if (prev && prev.text === text) return;
-  store.code.set(key, {
-    file: note.file,
-    oldStart: note.oldStart ?? 0,
-    newStart: note.newStart ?? 0,
-    blockId: note.blockId ?? 0,
-    origin: note.origin ?? '',
-    header: note.header ?? '',
-    text,
-    done: note.done ?? prev?.done ?? false,
-  });
-  store.dirty = true;
+  putNote(store, store.code, key, note, Boolean(note.clear));
 };
 
-const addTodo = (store, file, text = '') => {
-  const id = store.nextTodoId;
-  store.nextTodoId += 1;
+const addTask = (store, file, text = '') => {
+  const id = store.nextTaskId;
+  store.nextTaskId += 1;
   const todo = { id, file, text, done: false };
-  store.todos.push(todo);
+  store.tasks.push(todo);
   store.dirty = true;
   return todo;
 };
 
-const removeTodo = (store, id) => {
+const removeTask = (store, id) => {
   const next = [];
   let found = false;
-  for (const todo of store.todos) {
+  for (const todo of store.tasks) {
     if (todo.id === id) {
       found = true;
       continue;
@@ -105,28 +94,28 @@ const removeTodo = (store, id) => {
     next.push(todo);
   }
   if (!found) return false;
-  store.todos = next;
+  store.tasks = next;
   store.dirty = true;
   return true;
 };
 
-const setTodoText = (store, id, text) => {
-  const i = store.todos.findIndex((todo) => todo.id === id);
+const setTaskText = (store, id, text) => {
+  const i = store.tasks.findIndex((todo) => todo.id === id);
   if (i < 0) return;
-  const prev = store.todos[i];
+  const prev = store.tasks[i];
   const trimmed = text.trim();
-  if (!trimmed) return void removeTodo(store, id);
+  if (!trimmed) return void removeTask(store, id);
   if (prev.text === text) return;
-  store.todos[i] = { id: prev.id, file: prev.file, text, done: prev.done };
+  store.tasks[i] = { id: prev.id, file: prev.file, text, done: prev.done };
   store.dirty = true;
 };
 
-const setTodoDone = (store, id, done) => {
-  const i = store.todos.findIndex((todo) => todo.id === id);
+const setTaskDone = (store, id, done) => {
+  const i = store.tasks.findIndex((todo) => todo.id === id);
   if (i < 0) return;
-  const prev = store.todos[i];
+  const prev = store.tasks[i];
   if (prev.done === done) return;
-  store.todos[i] = { id: prev.id, file: prev.file, text: prev.text, done };
+  store.tasks[i] = { id: prev.id, file: prev.file, text: prev.text, done };
   store.dirty = true;
 };
 
@@ -162,9 +151,9 @@ const applyImportedNotes = (store, imported) => {
       done,
     });
   }
-  const todos = imported.todos ?? [];
+  const todos = imported.tasks ?? imported.todos ?? [];
   for (const todo of todos) {
-    const added = addTodo(store, todo.file || '', todo.text ?? '');
+    const added = addTask(store, todo.file || '', todo.text ?? '');
     if (todo.done) added.done = true;
   }
 };
@@ -231,6 +220,8 @@ const SECTION_LINE = {
   '### Todo': 'todo',
   '### Feedback': 'feedback',
 };
+const BACKLOG_HEAD = 'Backlog';
+const LEGACY_BACKLOG = 'TODOs';
 
 const AGENT_INSTRUCTIONS = [
   '- Execute reviews with `status` `ready, partial, editing`',
@@ -240,6 +231,8 @@ const AGENT_INSTRUCTIONS = [
   '- If not `editing`, set `status` to `partial` if some remain, ' +
     'or `done` if all are `[x]`',
   '- Do not redo items already marked `[x]`',
+  '- Run the full check with `npm t`',
+  '- Run specific test files with `reslop t -- node --test <files>`',
 ].join('\n');
 
 const toInt = (text) => parseInt(text, 10);
@@ -269,9 +262,9 @@ const parseFrontmatterStatus = (text) => {
 const isDoneMark = (mark) => mark === 'x' || mark === 'X';
 
 const pushTodo = (builder, file, text, done) => {
-  const id = builder.nextTodoId;
-  builder.nextTodoId += 1;
-  builder.todos.push({ id, file, text, done });
+  const id = builder.nextTaskId;
+  builder.nextTaskId += 1;
+  builder.tasks.push({ id, file, text, done });
 };
 
 const checkboxLine = (text, done) => {
@@ -346,7 +339,7 @@ const parseFeedSuffix = (textItem) => {
 const fileGroup = (groups, file) => {
   let group = groups.get(file);
   if (!group) {
-    group = { todos: [], feedback: [], code: [] };
+    group = { tasks: [], feedback: [], code: [] };
     groups.set(file, group);
   }
   return group;
@@ -354,9 +347,9 @@ const fileGroup = (groups, file) => {
 
 const groupReviewNotes = (notes) => {
   const groups = new Map();
-  for (const todo of notes.todos) {
+  for (const todo of notes.tasks) {
     if (!todo.text.trim()) continue;
-    fileGroup(groups, TODO_FILE).todos.push(todo);
+    fileGroup(groups, TASKS_FILE).tasks.push(todo);
   }
   for (const key of notes.feedback.keys()) {
     const note = notes.feedback.get(key);
@@ -407,12 +400,19 @@ const emitCodeItem = (lines, note) => {
   lines.push(fence);
 };
 
+const sectionTitle = (file) => (file === TASKS_FILE ? BACKLOG_HEAD : file);
+
+const backlogFile = (name) => {
+  if (name === BACKLOG_HEAD || name === LEGACY_BACKLOG) return TASKS_FILE;
+  return name;
+};
+
 const emitReviewGroups = (lines, groups) => {
   for (const file of groups.keys()) {
     const group = groups.get(file);
-    lines.push(`## ${file}`);
+    lines.push(`## ${sectionTitle(file)}`);
     lines.push('');
-    for (const todo of group.todos) {
+    for (const todo of group.tasks) {
       lines.push(checkboxLine(todo.text, todo.done));
     }
     for (const item of group.feedback) {
@@ -458,9 +458,9 @@ const flushPendingFeedback = (builder, pending) => {
 
 const headingFile = (line) => {
   const quoted = FILE_QUOTE.exec(line);
-  if (quoted) return quoted[1];
+  if (quoted) return backlogFile(quoted[1]);
   if (line.startsWith('## ') && line !== '## Agent instructions') {
-    return line.slice(3);
+    return backlogFile(line.slice(3));
   }
   return null;
 };
@@ -642,15 +642,6 @@ const TEMPLATES_FILE = 'templates.json';
 const AUTOSAVE_MS = 3000;
 const REVIEW_NAME = /^(\d{4}-\d{2}-\d{2})-(\d+)\.md$/;
 
-const pad2 = (n) => `${n}`.padStart(2, '0');
-
-const dateStamp = (date) => {
-  const y = date.getFullYear();
-  const month = pad2(date.getMonth() + 1);
-  const day = pad2(date.getDate());
-  return `${y}-${month}-${day}`;
-};
-
 const allocateReviewPath = (dir, date, existingNames) => {
   const stamp = dateStamp(date);
   let max = -1;
@@ -798,10 +789,10 @@ module.exports = {
   rememberTemplate,
   setFeedback,
   setCode,
-  addTodo,
-  removeTodo,
-  setTodoText,
-  setTodoDone,
+  addTask,
+  removeTask,
+  setTaskText,
+  setTaskDone,
   checkLabel,
   feedbackKey,
   applyImportedNotes,

package/lib/select.js

@@ -3,6 +3,7 @@
 const ansi = require('./ansi.js');
 
 const { ESC, RESET, THEME, seq, stripAnsi, graphemes, graphemeWidth } = ansi;
+const { visibleWidth } = ansi;
 
 const CSI_FINAL = /[@-~]/;
 
@@ -177,6 +178,56 @@ const overlayRange = (line, fromCol, toCol) => {
   return out;
 };
 
+const selectionOf = (source) => {
+  if (!source || typeof source.anchor !== 'number') return null;
+  const cursor = source.cursor ?? 0;
+  if (source.anchor === cursor) return null;
+  return { anchor: source.anchor, cursor };
+};
+
+const editorSelection = (view) => {
+  if (!view) return null;
+  if (view.compose) return selectionOf(view.compose);
+  return selectionOf(view.codeOverlay);
+};
+
+const spanCols = (hit, lo, hi) => {
+  const start = hit.start ?? 0;
+  const from = Math.max(lo, start);
+  const to = Math.min(hi, hit.limit ?? start);
+  if (to <= from) return null;
+  const text = hit.text ?? '';
+  const head = Math.max(0, from - start);
+  const tail = Math.max(0, to - start);
+  const c0 = visibleWidth(text.slice(0, head));
+  const c1 = visibleWidth(text.slice(0, tail));
+  const scroll = hit.scroll ?? 0;
+  const room = Math.max(0, (hit.x1 ?? hit.textX ?? 1) - (hit.textX ?? 1));
+  const vis0 = Math.max(c0, scroll);
+  const vis1 = Math.min(c1, scroll + room);
+  if (vis1 <= vis0) return null;
+  const origin = (hit.textX ?? 1) - 1;
+  return { from: origin + vis0 - scroll, to: origin + vis1 - scroll };
+};
+
+const markEditorSelection = (rows, view, hits, color) => {
+  if (!color || !hits) return rows;
+  const sel = editorSelection(view);
+  if (!sel) return rows;
+  const lo = Math.min(sel.anchor, sel.cursor);
+  const hi = Math.max(sel.anchor, sel.cursor);
+  const next = rows.slice();
+  for (const hit of hits) {
+    if (!hit.live || !hit.y) continue;
+    const range = spanCols(hit, lo, hi);
+    if (!range) continue;
+    const i = hit.y - 1;
+    if (i < 0 || i >= next.length) continue;
+    next[i] = overlayRange(next[i], range.from, range.to);
+  }
+  return next;
+};
+
 const overlayRows = (rows, sel) => {
   if (!isRange(sel)) return rows;
   const { length } = rows;
@@ -193,4 +244,5 @@ module.exports = {
   extractText,
   overlayRange,
   overlayRows,
+  markEditorSelection,
 };