reslop 0.1.6 → 0.1.7

package/lib/session.js

@@ -10,22 +10,24 @@ const wrap = require('./wrap.js');
 const { extractText, isRange } = require('./select.js');
 const { copyText } = require('./clipboard.js');
 const { watchResize } = require('./sys.js');
-const { fileEntries, itemPath } = require('./files.js');
+const files = require('./files.js');
+const { fileEntries, itemPath, TODO_FILE } = files;
+const { isTodoItem, isTodosEntry, REPO_TODOS_LABEL, makeTodoItem } = files;
 const { Editor } = require('./editor.js');
 const { refreshIndexPatches, blockAddText } = require('./diff.js');
 const update = require('./update.js');
 const { checkUpdate, installUpdate, markSkipped } = update;
 
 const { renderFrame, presentRows, presentCursor } = render;
-const { noteInnerWidth, todoInnerWidth, codeInnerWidth } = render;
+const { noteInnerWidth, codeInnerWidth } = render;
 const { actionFromKey, hitAction, decodeChunk } = keys;
 const { disabledActions } = keys;
-const { cursorInWrap, wrapDoc, wrapMove } = wrap;
+const { cursorInWrap, wrapDoc } = wrap;
 const { AUTOSAVE_MS, listReviewNames, loadTemplates } = review;
 const { resolveReviewPath, loadReview, createStore } = review;
 const { noteCounts, hasNotes, setFeedback, setCode, addTodo } = review;
 const { applyImportedNotes } = review;
-const { setTodoText, removeTodo, flushReview, mergeTodos } = review;
+const { setTodoText, removeTodo, flushReview } = review;
 const { feedbackKey, checkLabel, rankedTemplates } = review;
 const { prefixTemplates, TEMPLATE_SHOW, rememberTemplate } = review;
 
@@ -72,7 +74,7 @@ const npmBusyKind = (item) => {
 const itemKey = (item) => {
   if (!item || !item.file) return '';
   const rel = itemPath(item);
-  if (item.origin === 'todo') return `todo:${rel}`;
+  if (isTodoItem(item)) return `todo:${TODO_FILE}`;
   const origin = item.origin ?? '';
   const depId = depChangeKey(item);
   if (depId) return `${origin}:${rel}:dep:${depId}`;
@@ -87,7 +89,7 @@ const itemKey = (item) => {
 };
 
 const itemFeedKey = (item) => {
-  if (!item || !item.file || item.origin === 'todo') return '';
+  if (!item || !item.file || isTodoItem(item)) return '';
   const hunk = item.hunk;
   const depId = depChangeKey(item);
   const file = depId ? `${itemPath(item)}#${depId}` : itemPath(item);
@@ -98,7 +100,7 @@ const itemFeedKey = (item) => {
 };
 
 const canEditCode = (item) => {
-  if (!item || item.origin === 'todo') return false;
+  if (!item || isTodoItem(item)) return false;
   if (!item.hunk || !item.file) return false;
   if (item.file.isBinary) return false;
   return true;
@@ -115,7 +117,6 @@ const sameCursor = (a, b) => {
 const QUIT_CONFIRM = {
   f: (session) => session.finishQuit('ready'),
   c: (session) => session.finishQuit('editing'),
-  d: (session) => session.discardQuit(),
   'ctrl-c': (session) => session.finishQuit('ready'),
   escape: (session) => session.cancelQuit(),
 };
@@ -133,6 +134,12 @@ const UPDATE_CONFIRM = {
   escape: (session) => session.declineUpdate(),
 };
 
+const DROP_CONFIRM = {
+  y: (session) => session.confirmDropBranch(),
+  n: (session) => session.cancelDropBranch(),
+  escape: (session) => session.cancelDropBranch(),
+};
+
 const PUSH_CONFIRM = {
   f: (session) => session.onForcePush(),
   escape: (session) => session.cancelPush(),
@@ -142,6 +149,7 @@ const CONFIRM_MODE = [
   'confirmQuit',
   'confirmCommit',
   'confirmUpdate',
+  'confirmDrop',
   'confirmPush',
 ];
 
@@ -186,6 +194,8 @@ const HANDLERS = {
   pull: (session) => session.onPull(),
   push: (session) => session.onPush(),
   newBranch: (session) => session.onNewBranch(),
+  rebase: (session) => session.onRebaseBranch(),
+  drop: (session) => session.onDropBranch(),
   open: (session) => session.onOpenFile(),
   removeTodo: (session) => session.removeFocusedTodo(),
   quit: (session) => session.onQuit(),
@@ -201,11 +211,38 @@ const KEY_MODE = {
   confirmQuit: (session, key) => session.onConfirmQuit(key),
   confirmCommit: (session, key) => session.onConfirmCommit(key),
   confirmUpdate: (session, key) => session.onConfirmUpdate(key),
+  confirmDrop: (session, key) => session.onConfirmDrop(key),
   confirmPush: (session, key) => session.onConfirmPush(key),
   compose: (session, key) => session.handleComposeKey(key),
 };
 
 const COMPOSE_LEAVE = ['next', 'prev', 'todo'];
+const TODO_TYPE_SKIP = [
+  'enter',
+  'escape',
+  'tab',
+  'backspace',
+  'delete',
+  'left',
+  'right',
+  'up',
+  'down',
+  'home',
+  'end',
+  'j',
+  'k',
+  'n',
+  'p',
+  'q',
+];
+
+const isTodoTypeKey = (key) => {
+  if (!key) return false;
+  if (TODO_TYPE_SKIP.includes(key)) return false;
+  if (key.startsWith('ctrl-')) return false;
+  if (key.startsWith('alt-')) return false;
+  return key.charCodeAt(0) >= 32;
+};
 
 const MOUSE_KIND = {
   wheelUp: (session) => session.onScroll(-1),
@@ -274,7 +311,6 @@ 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;
@@ -296,6 +332,7 @@ class Session {
     this.branch = '';
     this.branches = [];
     this.branchCursor = 0;
+    this.dropName = '';
     this.scroll = 0;
     this.status = '';
     this.layout = 'unified';
@@ -319,7 +356,8 @@ class Session {
     this.composeTodoId = null;
     this.composeBaseline = '';
     this.todoFocus = 0;
-    this.todoDraftFile = null;
+    this.todoOpen = false;
+    this.todoItem = makeTodoItem();
     this.templateIndex = -1;
     this.templateFocus = false;
     this.saveTimer = null;
@@ -378,7 +416,8 @@ class Session {
   }
 
   applyLoaded(loaded) {
-    const here = itemKey(this.items[this.index]);
+    const wasTodo = this.todoOpen === true;
+    const here = itemKey(this.current());
     this.top = loaded.top ?? this.cwd;
     const items = loaded.items;
     this.items = items.filter((item) => !this.dismissed.has(itemKey(item)));
@@ -401,8 +440,8 @@ class Session {
       applyImportedNotes(this.notes, imported);
       this.importedRemoteNotes = true;
     }
-    this.injectTodos();
-    if (here) {
+    this.todoOpen = wasTodo;
+    if (here && !wasTodo) {
       const idx = this.items.findIndex((item) => itemKey(item) === here);
       if (idx >= 0) this.index = idx;
     }
@@ -430,6 +469,7 @@ class Session {
 
   finishIfEmpty(kind) {
     if (this.items.length) return;
+    if (this.notes && hasNotes(this.notes)) return;
     if (kind === 'keep') return;
     if (this.notes && hasNotes(this.notes)) this.flushReview();
     this.done = true;
@@ -625,10 +665,24 @@ class Session {
     this.notes = createStore(resolved.reviewPath, templates);
   }
 
-  injectTodos() {
-    const todos = this.notes ? this.notes.todos : [];
-    const extra = this.todoDraftFile ? [this.todoDraftFile] : [];
-    this.items = mergeTodos(this.items, todos, extra);
+  repoNameOf() {
+    return this.repoName || path.basename(this.top || this.cwd || '');
+  }
+
+  todosEntry() {
+    const notes = noteCounts(this.notes);
+    return {
+      path: REPO_TODOS_LABEL,
+      kind: 'todos',
+      status: 'todos',
+      remaining: notes.todo,
+      staged: notes.todoDone,
+      firstIndex: 0,
+      openIndex: 0,
+      added: 0,
+      removed: 0,
+      unstaged: 0,
+    };
   }
 
   clampIndex() {
@@ -644,10 +698,10 @@ class Session {
 
   fileList() {
     const entries = fileEntries(this.items);
-    if (this.sourceLabel) {
-      return relabelStatus(entries, 'pr', this.sourceLabel);
-    }
-    return relabelStatus(entries, 'commit', this.revShort);
+    const labeled = this.sourceLabel
+      ? relabelStatus(entries, 'pr', this.sourceLabel)
+      : relabelStatus(entries, 'commit', this.revShort);
+    return [this.todosEntry(), ...labeled];
   }
 
   syncReviewPath() {
@@ -673,8 +727,12 @@ class Session {
       this.fileCursor = 0;
       return;
     }
-    const here = this.reviewPath;
-    const idx = files.findIndex((entry) => entry.path === here);
+    const item = this.current();
+    const idx = isTodoItem(item)
+      ? files.findIndex((entry) => isTodosEntry(entry))
+      : files.findIndex(
+          (entry) => !isTodosEntry(entry) && entry.path === this.reviewPath,
+        );
     if (idx >= 0) {
       this.fileCursor = idx;
       return;
@@ -716,7 +774,7 @@ class Session {
     const templates = this.shownTemplates();
     const change = this.change;
     const sourceKind = (change && SOURCE_KIND[change.source]) || '';
-    const repoName = this.repoName || path.basename(this.top || this.cwd || '');
+    const repoName = this.repoNameOf();
     return {
       item: this.current(),
       index: this.index,
@@ -749,6 +807,7 @@ class Session {
       templateIndex: this.clampedTemplateIndex(templates),
       updateFrom: this.updateFrom,
       updateTo: this.updateTo,
+      dropName: this.dropName,
     };
   }
 
@@ -793,7 +852,10 @@ class Session {
       if (action === 'next') return void this.onBranchMove(1);
       if (action === 'prev') return void this.onBranchMove(-1);
     }
-    const hidden = disabledActions(this.pane, this.current());
+    let target = this.current();
+    if (this.pane === 'files') target = this.fileCursorEntry();
+    if (this.pane === 'branches') target = this.branches[this.branchCursor];
+    const hidden = disabledActions(this.pane, target);
     if (hidden.includes(action)) return;
     const handler = HANDLERS[action];
     if (!handler) return;
@@ -801,6 +863,7 @@ class Session {
   }
 
   current() {
+    if (this.todoOpen) return this.todoItem;
     return this.items[this.index] ?? null;
   }
 
@@ -920,7 +983,7 @@ class Session {
   activeDiffItem() {
     const item = this.current();
     if (!item) return null;
-    if (item.origin === 'todo') {
+    if (isTodoItem(item)) {
       this.status = 'not a diff block';
       return null;
     }
@@ -934,11 +997,11 @@ class Session {
 
   fileActionItems() {
     const entry = this.fileCursorEntry();
-    if (!entry) return [];
+    if (!entry || isTodosEntry(entry)) return [];
     const rel = entry.path;
     const items = [];
     for (const item of this.items) {
-      if (item.origin === 'todo') continue;
+      if (isTodoItem(item)) continue;
       if (itemPath(item) !== rel) continue;
       items.push(item);
     }
@@ -991,6 +1054,10 @@ class Session {
 
   onFileAdd() {
     const items = this.fileActionItems();
+    if (!items.length) {
+      this.status = 'not a diff block';
+      return;
+    }
     if (!this.guardFileGit(items)) return;
     const rel = itemPath(items[0]);
     const targets = items.filter((item) => item.origin !== 'staged');
@@ -1029,6 +1096,10 @@ class Session {
 
   onFileUnstage() {
     const items = this.fileActionItems();
+    if (!items.length) {
+      this.status = 'not a diff block';
+      return;
+    }
     if (!this.guardFileGit(items)) return;
     const rel = itemPath(items[0]);
     const targets = items.filter((item) => item.origin === 'staged');
@@ -1051,6 +1122,10 @@ class Session {
 
   onFileRevert() {
     const items = this.fileActionItems();
+    if (!items.length) {
+      this.status = 'not a diff block';
+      return;
+    }
     if (!this.guardFileGit(items)) return;
     const rel = itemPath(items[0]);
     for (const item of items) {
@@ -1145,10 +1220,23 @@ class Session {
   }
 
   onNext() {
+    if (this.todoOpen) {
+      this.closeTodoPage();
+      if (this.items.length) this.index = 0;
+      this.scroll = 0;
+      this.syncReviewPath();
+      this.syncFileCursor();
+      return;
+    }
     this.moveRemaining(1);
   }
 
   onPrev() {
+    if (this.todoOpen) return;
+    if (this.index <= 0) {
+      this.openTodoPage();
+      return;
+    }
     this.moveRemaining(-1);
   }
 
@@ -1176,23 +1264,6 @@ 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 = '';
@@ -1426,6 +1497,83 @@ class Session {
     if (!this.status) this.status = done;
   }
 
+  refreshBranchList() {
+    if (!this.repo.listBranches) return;
+    try {
+      this.branches = this.repo.listBranches(this.top);
+    } catch (error) {
+      this.status = error.message;
+      return;
+    }
+    const last = this.branches.length - 1;
+    if (this.branchCursor > last) this.branchCursor = Math.max(0, last);
+  }
+
+  onRebaseBranch() {
+    if (this.pane !== 'branches') return;
+    if (!this.canCommit()) return;
+    const entry = this.branches[this.branchCursor];
+    if (!entry || entry.current) return;
+    const onto = entry.name;
+    const done = `rebased onto ${onto}`;
+    if (this.uiOpen && this.repo.rebaseAsync) {
+      const write = (top) => this.repo.rebaseAsync(top, onto);
+      const after = () => {
+        this.refreshBranchList();
+        this.refreshFromRepo({ keepEmpty: true, doneStatus: done });
+      };
+      return void this.runGitBusy('rebasing', done, write, after);
+    }
+    const ok = this.runRepo(done, (top) => this.repo.rebase(top, onto));
+    if (!ok) return;
+    this.refreshBranchList();
+    this.refreshFromRepo({ keepEmpty: true });
+    if (!this.status) this.status = done;
+  }
+
+  onDropBranch() {
+    if (this.pane !== 'branches') return;
+    if (!this.canCommit()) return;
+    const entry = this.branches[this.branchCursor];
+    if (!entry || entry.current) return;
+    this.dropName = entry.name;
+    this.mode = 'confirmDrop';
+    this.status = '';
+  }
+
+  onConfirmDrop(key) {
+    const dropKey = key.length === 1 ? key.toLowerCase() : key;
+    const handler = DROP_CONFIRM[dropKey];
+    if (handler) handler(this);
+  }
+
+  cancelDropBranch() {
+    this.mode = 'review';
+    this.dropName = '';
+    this.status = '';
+  }
+
+  confirmDropBranch() {
+    const name = this.dropName;
+    this.mode = 'review';
+    this.dropName = '';
+    if (!name) return;
+    const done = `dropped ${name}`;
+    if (this.uiOpen && this.repo.dropAsync) {
+      const write = (top) => this.repo.dropAsync(top, name);
+      const after = () => {
+        this.refreshBranchList();
+        this.refreshFromRepo({ keepEmpty: true, doneStatus: done });
+      };
+      return void this.runGitBusy('dropping', done, write, after);
+    }
+    const ok = this.runRepo(done, (top) => this.repo.drop(top, name));
+    if (!ok) return;
+    this.refreshBranchList();
+    this.refreshFromRepo({ keepEmpty: true });
+    if (!this.status) this.status = done;
+  }
+
   onNewBranch() {
     if (this.pane !== 'branches') return;
     if (!this.canCommit()) return;
@@ -1518,7 +1666,7 @@ class Session {
       return;
     }
     const item = this.current();
-    if (!item || item.origin === 'todo') {
+    if (!item || isTodoItem(item)) {
       this.status = 'not a diff block';
       return;
     }
@@ -1527,19 +1675,14 @@ class Session {
     this.openCompose('feedback', text);
   }
 
-  todoFile() {
+  onTodo() {
     if (this.pane === 'files') {
       const entry = this.fileCursorEntry();
-      return entry ? entry.path : '';
+      if (entry && !isTodosEntry(entry)) {
+        this.index = entry.openIndex ?? entry.firstIndex;
+      }
     }
-    const item = this.current();
-    return item ? itemPath(item) : '';
-  }
-
-  onTodo() {
-    const file = this.todoFile();
-    if (!file) return;
-    this.createTodo(file);
+    this.createTodo();
   }
 
   onCode() {
@@ -1558,17 +1701,9 @@ class Session {
     this.openCompose('code', text);
   }
 
-  todoPageIndex(file) {
-    return this.items.findIndex(
-      (item) => item.origin === 'todo' && itemPath(item) === file,
-    );
-  }
-
-  focusTodoPage(file, todoId) {
-    const idx = this.todoPageIndex(file);
-    if (idx < 0) return false;
-    this.index = idx;
-    const todos = this.fileTodos(file);
+  focusTodoPage(todoId) {
+    this.openTodoPage();
+    const todos = this.listTodos();
     let focus = 0;
     if (todoId === null) {
       focus = todos.length;
@@ -1590,53 +1725,86 @@ class Session {
     );
   }
 
-  startDraftCompose(file) {
-    this.todoDraftFile = file;
-    this.injectTodos();
-    this.focusTodoPage(file, null);
+  openTodoPage() {
+    this.todoOpen = true;
+    this.pane = 'diff';
+    this.scroll = 0;
+    this.clearSelection();
+    this.syncReviewPath();
+  }
+
+  closeTodoPage() {
+    this.todoOpen = false;
     this.syncReviewPath();
+    this.syncFileCursor();
+  }
+
+  startDraftCompose() {
+    this.focusTodoPage(null);
     this.openCompose('todo', '', null);
   }
 
   editFocusedTodo() {
-    const item = this.current();
-    if (!item || item.origin !== 'todo') return;
-    const todos = this.fileTodos(itemPath(item));
+    if (!this.todoOpen) return;
+    const todos = this.listTodos();
     const focus = this.clampedTodoFocus();
     const todo = todos[focus];
     if (!todo) {
-      this.startDraftCompose(itemPath(item));
+      this.startDraftCompose();
       return;
     }
     this.openCompose('todo', todo.text, todo.id);
   }
 
+  editNextTodo() {
+    if (!this.todoOpen) return;
+    const last = this.todoRowCount() - 1;
+    const next = this.clampedTodoFocus() + 1;
+    if (next <= last) this.todoFocus = next;
+    this.editFocusedTodo();
+  }
+
+  moveTodoCompose(delta) {
+    if (!this.todoOpen) return;
+    const last = this.todoRowCount() - 1;
+    const next = this.clampedTodoFocus() + delta;
+    if (next < 0 || next > last) return;
+    this.commitCompose();
+    this.flushReview();
+    this.closeCompose();
+    const max = Math.max(0, this.todoRowCount() - 1);
+    this.todoFocus = Math.min(next, max);
+    this.editFocusedTodo();
+  }
+
+  typeIntoTodo(key) {
+    if (!this.todoOpen) return false;
+    if (this.pane !== 'diff') return false;
+    if (this.mode !== 'review') return false;
+    if (!isTodoTypeKey(key)) return false;
+    this.editFocusedTodo();
+    this.editor.insert(key);
+    this.resetBlink();
+    return true;
+  }
+
   removeFocusedTodo() {
-    if (this.pane !== 'diff') return;
-    const item = this.current();
-    if (!item || item.origin !== 'todo') return;
-    const file = itemPath(item);
-    const todos = this.fileTodos(file);
+    if (this.pane !== 'diff' || !this.todoOpen) return;
+    const todos = this.listTodos();
     const focus = this.clampedTodoFocus();
     const todo = todos[focus];
     if (!todo) return;
     removeTodo(this.notes, todo.id);
-    this.injectTodos();
-    const left = this.fileTodos(file);
-    if (!left.length) {
-      this.clampIndex();
-    } else if (this.todoFocus >= left.length) {
-      this.todoFocus = left.length - 1;
+    const left = this.listTodos();
+    if (this.todoFocus >= left.length) {
+      this.todoFocus = Math.max(0, left.length - 1);
     }
-    this.syncReviewPath();
-    this.syncFileCursor();
     this.flushReview(true);
   }
 
   onTodoHit(cursor) {
-    const item = this.current();
-    if (!item || item.origin !== 'todo') return;
-    const todos = this.fileTodos(itemPath(item));
+    if (!this.todoOpen) return;
+    const todos = this.listTodos();
     const draft = cursor === todos.length;
     const target = todos[cursor];
     if (!draft && !target) return;
@@ -1650,12 +1818,8 @@ class Session {
     this.editFocusedTodo();
   }
 
-  createTodo(file) {
-    if (!file) return;
-    this.pane = 'diff';
-    this.scroll = 0;
-    this.clearSelection();
-    this.startDraftCompose(file);
+  createTodo() {
+    this.startDraftCompose();
   }
 
   openCompose(kind, text, todoId) {
@@ -1676,7 +1840,7 @@ class Session {
     const text = this.editor.text;
     if (this.composeKind === 'feedback') {
       const item = this.current();
-      if (!item || item.origin === 'todo') return;
+      if (!item || isTodoItem(item)) return;
       const hunk = item.hunk;
       setFeedback(this.notes, itemFeedKey(item), {
         file: itemPath(item),
@@ -1719,24 +1883,13 @@ class Session {
     const id = this.composeTodoId;
     const todos = this.notes.todos;
     const prev = id === null ? null : todos.find((entry) => entry.id === id);
-    const current = this.current();
-    const file = prev ? prev.file : itemPath(current) || this.todoDraftFile;
     if (prev) {
       setTodoText(this.notes, id, text);
-    } else if (text.trim() && file) {
-      const todo = addTodo(this.notes, file, text);
-      this.composeTodoId = todo.id;
-    }
-    this.injectTodos();
-    if (this.focusTodoPage(file, this.composeTodoId)) return;
-    const hunkIdx = this.items.findIndex(
-      (item) => item.origin !== 'todo' && itemPath(item) === file,
-    );
-    if (hunkIdx >= 0) {
-      this.index = hunkIdx;
-    } else if (this.index >= this.items.length) {
-      this.index = Math.max(0, this.items.length - 1);
+      return;
     }
+    if (!text.trim()) return;
+    const todo = addTodo(this.notes, TODO_FILE, text);
+    this.composeTodoId = todo.id;
   }
 
   closeCompose() {
@@ -1748,8 +1901,6 @@ class Session {
     this.composeBaseline = '';
     this.templateIndex = -1;
     this.templateFocus = false;
-    this.todoDraftFile = null;
-    this.injectTodos();
     this.clampIndex();
     this.syncReviewPath();
     this.syncFileCursor();
@@ -1846,23 +1997,17 @@ class Session {
     this.applyTemplate();
   }
 
-  fileTodos(rel) {
-    if (!this.notes || !rel) return [];
-    const todos = [];
-    for (const todo of this.notes.todos) {
-      if (todo.file !== rel) continue;
-      todos.push(todo);
-    }
-    return todos;
+  listTodos() {
+    if (!this.notes) return [];
+    return this.notes.todos;
   }
 
   todoTexts() {
-    const item = this.current();
-    if (!item || item.origin !== 'todo') return [];
+    if (!this.todoOpen) return [];
     const texts = [];
     const editingTodo = this.mode === 'compose' && this.composeKind === 'todo';
     const editingId = editingTodo ? this.composeTodoId : null;
-    for (const todo of this.fileTodos(itemPath(item))) {
+    for (const todo of this.listTodos()) {
       const live = editingId === todo.id && this.editor;
       const text = live ? this.editor.text : todo.text;
       texts.push(checkLabel(text, todo.done));
@@ -1873,9 +2018,8 @@ class Session {
   }
 
   focusedTodo() {
-    const item = this.current();
-    if (!item || item.origin !== 'todo') return null;
-    const todos = this.fileTodos(itemPath(item));
+    if (!this.todoOpen) return null;
+    const todos = this.listTodos();
     return todos[this.clampedTodoFocus()] ?? null;
   }
 
@@ -1887,14 +2031,12 @@ class Session {
   }
 
   todoRowCount() {
-    const item = this.current();
-    if (!item || item.origin !== 'todo') return 0;
-    return this.fileTodos(itemPath(item)).length + 1;
+    if (!this.todoOpen) return 0;
+    return this.listTodos().length + 1;
   }
 
   moveTodoFocus(delta) {
-    const item = this.current();
-    if (!item || item.origin !== 'todo') return;
+    if (!this.todoOpen) return;
     const n = this.todoRowCount();
     if (!n) return;
     const next = this.clampedTodoFocus() + delta;
@@ -1907,7 +2049,7 @@ class Session {
     if (!this.notes) return '';
     if (this.mode === 'compose') return '';
     const item = this.current();
-    if (!item || item.origin === 'todo') return '';
+    if (!item || isTodoItem(item)) return '';
     const note = this.notes.feedback.get(itemFeedKey(item));
     if (!note || !note.text.trim()) return '';
     return checkLabel(note.text, note.done);
@@ -1926,7 +2068,8 @@ class Session {
     }
   }
 
-  saveCompose() {
+  saveCompose(options) {
+    const opts = options ?? {};
     if (this.composeKind === 'commit') {
       this.finishGitCommit();
       return;
@@ -1935,6 +2078,7 @@ class Session {
       this.finishCreateBranch();
       return;
     }
+    const editNext = opts.editNext === true;
     this.commitCompose();
     if (this.composeKind === 'feedback') {
       const next = this.editor ? this.editor.text : '';
@@ -1943,6 +2087,7 @@ class Session {
     this.flushReview();
     this.closeCompose();
     this.status = 'saved';
+    if (editNext) this.editNextTodo();
   }
 
   autosave() {
@@ -1954,26 +2099,10 @@ class Session {
     if (this.notes && this.notes.dirty) this.flushReview();
   }
 
-  moveTodoLine(delta, inner) {
-    const todo = this.focusedTodo();
-    const done = todo ? todo.done === true : false;
-    const label = checkLabel(this.editor.text, done);
-    const prefix = checkLabel('', done).length;
-    const col = this.editor.wantCol;
-    const at = prefix + this.editor.cursor;
-    const moved = wrapMove(label, at, inner, delta, col);
-    const next = moved.cursor - prefix;
-    const max = this.editor.text.length;
-    this.editor.wantCol = moved.col;
-    if (next < 0) this.editor.cursor = 0;
-    else if (next > max) this.editor.cursor = max;
-    else this.editor.cursor = next;
-  }
-
   moveComposeLine(delta) {
     const size = this.lastSize ?? this.getSize();
     if (this.composeKind === 'todo') {
-      this.moveTodoLine(delta, todoInnerWidth(size.width));
+      this.moveTodoCompose(delta);
       return;
     }
     if (this.composeKind === 'code') {
@@ -2035,6 +2164,10 @@ class Session {
         this.resetBlink();
         return;
       }
+      if (this.composeKind === 'todo') {
+        this.saveCompose({ editNext: true });
+        return;
+      }
       this.saveCompose();
       return;
     }
@@ -2067,6 +2200,7 @@ class Session {
     this.pane = 'files';
     this.clearSelection();
     this.followReviewPath();
+    this.todoOpen = false;
   }
 
   onEscape() {
@@ -2086,6 +2220,7 @@ class Session {
       if (!this.reviewPath) return;
       this.pane = 'diff';
       this.clearSelection();
+      if (this.reviewPath === TODO_FILE) this.openTodoPage();
       return;
     }
     this.showFiles();
@@ -2094,13 +2229,18 @@ class Session {
   onOpenFile() {
     if (this.pane === 'branches') return void this.onCheckoutBranch();
     if (this.pane !== 'files') {
-      const item = this.current();
-      if (item && item.origin === 'todo') this.editFocusedTodo();
+      if (this.todoOpen) this.editFocusedTodo();
       return;
     }
     const files = this.fileList();
     const entry = files[this.fileCursor];
     if (!entry) return;
+    if (isTodosEntry(entry)) {
+      this.openTodoPage();
+      this.status = '';
+      return;
+    }
+    this.todoOpen = false;
     this.index = entry.openIndex ?? entry.firstIndex;
     this.pane = 'diff';
     this.scroll = 0;
@@ -2122,8 +2262,12 @@ class Session {
     if (next === this.fileCursor) return;
     this.fileCursor = next;
     const entry = files[next];
-    this.reviewPath = entry.path;
-    this.index = entry.firstIndex;
+    if (isTodosEntry(entry)) {
+      this.reviewPath = TODO_FILE;
+    } else {
+      this.reviewPath = entry.path;
+      this.index = entry.firstIndex;
+    }
     this.status = '';
   }
 
@@ -2146,8 +2290,7 @@ class Session {
       this.onBranchMove(delta);
       return;
     }
-    const item = this.current();
-    if (item && item.origin === 'todo' && this.todoRowCount() > 1) {
+    if (this.todoOpen && this.todoRowCount() > 1) {
       this.moveTodoFocus(delta);
       return;
     }
@@ -2254,6 +2397,7 @@ class Session {
         this.onEscape();
         return;
       }
+      if (this.typeIntoTodo(event.key)) return;
       const action = actionFromKey(event.key, this.pane);
       if (action) this.dispatch(action);
       return;
@@ -2291,7 +2435,9 @@ class Session {
   }
 
   async startUi() {
-    if (this.didLoad && !this.items.length) {
+    const empty = !this.items.length;
+    const notes = this.notes && hasNotes(this.notes);
+    if (this.didLoad && empty && !notes) {
       this.emptyReview = true;
       return 0;
     }