reslop 0.2.4 → 0.2.5

package/lib/review.js

@@ -4,29 +4,31 @@ const fs = require('node:fs');
 const path = require('node:path');
 
 const files = require('./files.js');
-const { TODO_FILE, REVIEW_DIR } = files;
+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;
@@ -37,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,
@@ -64,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;
@@ -107,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;
 };
 
@@ -164,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;
   }
 };
@@ -233,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`',
@@ -273,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) => {
@@ -350,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;
@@ -358,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);
@@ -411,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) {
@@ -462,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;
 };
@@ -646,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;
@@ -802,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,
 };

package/lib/session/actions.js

@@ -6,13 +6,14 @@ const ACTIONS = {
   add: ['a'],
   unstage: ['u'],
   revert: ['d'],
+  ignore: ['i'],
   commit: ['c'],
   prev: ['left', 'p', 'k'],
   next: ['right', 'n', 'j'],
   check: ['x', ' '],
   layout: ['m'],
   feedback: ['f'],
-  todo: ['t'],
+  tasks: ['t'],
   code: ['e'],
   branch: ['b'],
   file: ['f'],
@@ -47,6 +48,7 @@ const NPM_ACTIONS = {
   npmDrop: ['d'],
   npmLogs: ['c'],
   npmStop: ['escape'],
+  npmVerbose: ['v'],
   npmRerun: ['r'],
 };
 
@@ -60,6 +62,7 @@ const ACTION_LABEL = {
   revert: 'drop',
   check: 'x',
   layout: 'mode',
+  tasks: 'tasks',
   view: 'view',
   code: 'edit',
   newBranch: 'new',
@@ -68,6 +71,7 @@ const ACTION_LABEL = {
   npmDrop: 'delete',
   npmLogs: 'cleanup',
   npmStop: 'esc',
+  npmVerbose: 'verbose',
   npmRerun: 're-run',
   quit: 'q',
   prev: '←',
@@ -82,6 +86,7 @@ const DIFF_DISABLED = [
   'push',
   'file',
   'diff',
+  'ignore',
 ];
 const UNIT_DISABLED = [...DIFF_DISABLED, 'layout'];
 const FILES_DISABLED = ['layout', 'feedback', 'code'];
@@ -94,16 +99,17 @@ const FILES_HIDDEN = [
   'file',
   'diff',
 ];
-const FILES_GIT_DISABLED = ['add', 'unstage', 'revert'];
-const FILES_TODO_DISABLED = [...FILES_GIT_DISABLED, ...FILES_DISABLED];
-const TODO_DISABLED = [
+const FILES_GIT_DISABLED = ['add', 'unstage', 'revert', 'ignore'];
+const FILES_TASKS_DISABLED = [...FILES_GIT_DISABLED, ...FILES_DISABLED];
+const TASKS_DISABLED = [
   'add',
   'unstage',
   'revert',
+  'ignore',
   'commit',
   'layout',
   'feedback',
-  'todo',
+  'tasks',
   'code',
   'branch',
   'file',
@@ -115,10 +121,11 @@ const BRANCHES_DISABLED = [
   'add',
   'unstage',
   'revert',
+  'ignore',
   'commit',
   'layout',
   'feedback',
-  'todo',
+  'tasks',
   'code',
   'check',
   'branch',
@@ -130,11 +137,11 @@ const BRANCHES_DISABLED = [
 const COMMITS_DISABLED = BRANCHES_DISABLED.filter((id) => id !== 'commit');
 const NPM_DISABLED = [...BRANCHES_DISABLED, 'pull', 'push'];
 
-const isTodosTarget = (item) =>
-  !!(item && (item.kind === 'todos' || item.origin === 'todo'));
+const isTasksTarget = (item) =>
+  !!(item && (item.kind === 'tasks' || item.origin === 'task'));
 
 const diffGitDisabled = (item) => {
-  if (!item || isTodosTarget(item)) return [];
+  if (!item || isTasksTarget(item)) return [];
   if (item.origin === 'staged') return ['add'];
   return ['unstage'];
 };
@@ -171,8 +178,8 @@ const commitGitDisabled = (item) => {
 };
 
 const disabledActions = (pane, item) => {
-  const onTodos = isTodosTarget(item);
-  if (pane === 'files') return onTodos ? FILES_TODO_DISABLED : FILES_DISABLED;
+  const onTodos = isTasksTarget(item);
+  if (pane === 'files') return onTodos ? FILES_TASKS_DISABLED : FILES_DISABLED;
   if (pane === 'unit') return [...UNIT_DISABLED, ...diffGitDisabled(item)];
   if (pane === 'branches') {
     return [...BRANCHES_DISABLED, ...branchGitDisabled(item)];
@@ -181,7 +188,7 @@ const disabledActions = (pane, item) => {
     return [...COMMITS_DISABLED, ...commitWriteDisabled(item)];
   }
   if (pane === 'npm') return NPM_DISABLED;
-  if (onTodos) return TODO_DISABLED;
+  if (onTodos) return TASKS_DISABLED;
   return [...DIFF_DISABLED, ...diffGitDisabled(item)];
 };
 
@@ -203,8 +210,8 @@ const SCROLL = {
   home: 'home',
   end: 'end',
   enter: 'open',
-  backspace: 'removeTodo',
-  delete: 'removeTodo',
+  backspace: 'removeTask',
+  delete: 'removeTask',
 };
 
 const keysForActions = (actions) => {
@@ -358,28 +365,22 @@ module.exports = {
   ACTION_IDS,
   BRANCH_ACTIONS,
   COMMIT_ACTIONS,
-  NPM_ACTIONS,
-  ACTION_HOT,
-  ACTION_LABEL,
   DIFF_DISABLED,
   UNIT_DISABLED,
   FILES_DISABLED,
   FILES_HIDDEN,
   FILES_GIT_DISABLED,
-  FILES_TODO_DISABLED,
-  TODO_DISABLED,
+  FILES_TASKS_DISABLED,
+  TASKS_DISABLED,
   BRANCHES_DISABLED,
   COMMITS_DISABLED,
   NPM_DISABLED,
-  SCROLL,
-  PANE_ONLY,
   disabledActions,
   diffGitDisabled,
   branchGitDisabled,
   commitGitDisabled,
   isFixupCommit,
   actionFromKey,
-  actionKeys,
   actionHot,
   actionLetter,
   buttonWord,

package/lib/session/branches.js

@@ -47,10 +47,12 @@ const onBranch = (api) => {
     return;
   }
   const current = api.state.branches.findIndex((entry) => entry.current);
-  api.ui.nav.branchCursor = current < 0 ? 0 : current;
-  api.ui.nav.pane = 'branches';
+  const nav = api.ui.nav;
+  nav.branchCursor = current < 0 ? 0 : current;
+  nav.pane = 'branches';
+  nav.resetListScroll('branches');
   api.ui.status = '';
-  api.ui.nav.clearSelection();
+  nav.clearSelection();
 };
 
 const onBranchMove = (api, delta) => {