git-reviewer 2.10.0 → 2.11.0

package/README.md

@@ -3,7 +3,7 @@
 [![CI](https://github.com/dheerajjha/reviewer/actions/workflows/ci.yml/badge.svg)](https://github.com/dheerajjha/reviewer/actions/workflows/ci.yml)
 [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
 [![Node](https://img.shields.io/badge/node-%3E%3D18-brightgreen.svg)](package.json)
-[![Tests](https://img.shields.io/badge/tests-310-brightgreen.svg)](test/)
+[![Tests](https://img.shields.io/badge/tests-314-brightgreen.svg)](test/)
 [![Dependencies](https://img.shields.io/badge/dependencies-3-brightgreen.svg)](package.json)
 
 When an agent writes the code, reading it becomes the bottleneck — and the tool
@@ -141,6 +141,35 @@ is nothing to configure:
 | Working directory clean | The last commit against its parent |
 | No commits yet | Every tracked and untracked file, as wholly new |
 
+### Reviewing further back than the last commit
+
+Those defaults cover the common case and nothing else needs setting up, but a
+branch you have been working on for a day is several commits deep, and the
+default scope only ever shows you the most recent one.
+
+**Changes since** in the header takes any earlier commit and reloads the review
+as a single combined diff up to `HEAD`. Pick one from the dropdown — recent
+commits by subject line and when they landed, so you do not have to go and find
+a SHA — or type a branch, a tag, or something like `HEAD~5` in the box beside
+it for anything the list does not reach.
+
+The commit the range starts from is not itself included: "changes since x1"
+means everything after x1, the same as `x1..HEAD`.
+
+The bar keeps saying how many commits the range covers, and it keeps saying it
+when there are no files:
+
+```
+Comparing 86b28f11 → 27668114 — 2 commits, shown as one combined diff
+2 commits, and no net change between the two ends — every change in them was
+undone again inside the range.
+```
+
+That is a real answer, not an empty screen. A file added in one commit and
+deleted in a later one is correctly absent from a diff of the two ends, and
+"no net change across 2 commits" is a different statement from "nothing to
+review".
+
 Modified, added, deleted, renamed, and binary files are all listed, each marked
 with its git status letter. Deleted lines are commentable too — the most useful
 review note is often about the code someone removed. A file deleted outright is
@@ -294,7 +323,7 @@ rather than a public issue.
 
 ```bash
 npm install           # 3 dependencies, no build step, ~6MB
-npm test              # 310 tests
+npm test              # 314 tests
 npm run test:watch
 npm run test:coverage
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-reviewer",
-  "version": "2.10.0",
+  "version": "2.11.0",
   "description": "Review your coding agent's changes like a pull request — locally, with inline comments and threaded follow-ups, then hand the marked-up review back to the agent",
   "author": "Dheeraj Jha",
   "license": "MIT",

package/public/app.js

@@ -156,19 +156,77 @@ function renderScope(data) {
   bar.classList.remove('hidden');
   reset.classList.toggle('hidden', data.mode !== 'range');
 
+  const select = document.getElementById('compareSelect');
+
   if (data.mode === 'range' && data.range) {
     const { base, head, commits } = data.range;
     label.textContent =
       `Comparing ${shortSha(base)} \u2192 ${shortSha(head)} \u2014 ` +
       `${commits} commit${commits === 1 ? '' : 's'}, shown as one combined diff`;
-    document.getElementById('compareBase').value = shortSha(base);
+    // Only if the base is one of the offered commits. A range opened by
+    // typing `HEAD~5` or a branch name has no matching option, and leaving
+    // the picker on its placeholder is honest -- the scope bar above already
+    // says exactly what is being compared.
+    select.value = [...select.options].some(option => option.value === base) ? base : '';
     return;
   }
 
   label.textContent = data.mode === 'lastCommit'
     ? 'Reviewing the last commit'
     : 'Reviewing uncommitted changes';
+  select.value = '';
+  document.getElementById('compareBase').value = '';
+}
+
+/**
+ * Fill the commit picker for the open repository.
+ *
+ * The newest commit is deliberately not offered. "Changes since HEAD" is
+ * either nothing or the working tree depending on how you squint, and both
+ * of those are already what "Back to latest" gives you -- so listing it
+ * would be offering a choice that cannot do anything useful.
+ *
+ * A failure here is silent on purpose: the text box next to it still works,
+ * and a repository whose history will not list is not a reason to refuse to
+ * review it.
+ */
+async function loadCommitOptions(repoId) {
+  const select = document.getElementById('compareSelect');
+
+  try {
+    const response = await fetch(`${API_BASE}/commits/${repoId}`);
+    if (!response.ok) return;
+
+    const { commits } = await response.json();
+    const options = commits.slice(1);
+
+    select.innerHTML = '';
+    if (options.length === 0) {
+      select.appendChild(new Option('No earlier commits', ''));
+      select.disabled = true;
+      return;
+    }
+
+    select.disabled = false;
+    select.appendChild(new Option('Pick a commit…', ''));
+    for (const commit of options) {
+      // The subject is what a person recognises; the sha is there to
+      // disambiguate two commits with the same message, which is common
+      // enough in a branch that has been rebased.
+      select.appendChild(new Option(`${commit.short} · ${commit.subject} · ${commit.when}`, commit.sha));
+    }
+  } catch {
+    /* the text box beside it is the fallback */
+  }
+}
+
+/** Compare from whatever was chosen in the picker. */
+function compareFromSelection() {
+  const base = document.getElementById('compareSelect').value;
+  if (!base) return;
+
   document.getElementById('compareBase').value = '';
+  loadRepo({ base });
 }
 
 /** Reload the repository as a range starting at whatever was typed. */
@@ -186,6 +244,7 @@ function compareFrom() {
 /** Back to the default scope: uncommitted changes, or the last commit. */
 function resetScope() {
   document.getElementById('compareBase').value = '';
+  document.getElementById('compareSelect').value = '';
   loadRepo();
 }
 
@@ -230,6 +289,9 @@ async function loadRepo(scope = {}) {
       setRepoButton(data.repoPath);
     }
 
+    // Before renderScope, which needs the options present to be able to
+    // select the current base among them.
+    await loadCommitOptions(data.repoId);
     renderScope(data);
 
     if (data.files.length === 0) {

package/public/index.html

@@ -58,11 +58,17 @@
     <div id="scopeBar" class="scope-bar hidden">
       <span id="scopeLabel" class="scope-label"></span>
       <div class="scope-compare">
-        <label for="compareBase">Compare from</label>
+        <!-- "since", not "from": `base..HEAD` does not include base's own
+             changes, and a picker that says "compare from x1" invites the
+             reading that x1 is in the diff. -->
+        <label for="compareSelect">Changes since</label>
+        <select id="compareSelect" onchange="compareFromSelection()" aria-label="Review everything after this commit">
+          <option value="">Pick a commit…</option>
+        </select>
         <input
           type="text"
           id="compareBase"
-          placeholder="commit, tag or branch"
+          placeholder="or a branch, tag or ref"
           spellcheck="false"
           autocomplete="off"
           value="">

package/public/style.css

@@ -1935,3 +1935,32 @@ button:disabled {
     width: 120px;
   }
 }
+
+/* The picker carries the common case; the text box beside it carries
+ * everything else — a branch, a tag, `HEAD~5`, a sha from somewhere else.
+ * Both stay visible rather than one hiding behind a mode, because a control
+ * you cannot see is a feature people believe is missing. */
+.scope-compare select {
+  max-width: 320px;
+  font-size: 12px;
+  padding: 4px 6px;
+  border: 1px solid #d1d5da;
+  border-radius: 6px;
+  background: #fff;
+  color: #24292e;
+}
+
+.scope-compare select:disabled {
+  color: #6a737d;
+  background: #f3f4f6;
+}
+
+@media (max-width: 720px) {
+  .scope-compare {
+    flex-wrap: wrap;
+  }
+
+  .scope-compare select {
+    max-width: 100%;
+  }
+}

package/server.js

@@ -62,6 +62,12 @@ class FileNotFoundError extends Error {
  *   leaves before deciding it is not coming back.
  * @returns {import('express').Express}
  */
+// How far back the range picker offers to go. Long enough to cover the work
+// someone is plausibly still reviewing, short enough that the list is a list
+// rather than the whole history -- anything older is still reachable by
+// typing a ref, which is what the text box is for.
+const COMMIT_LIST_LIMIT = 30;
+
 function createApp(options = {}) {
   const {
     reviewsDir = resolveReviewsDir(),
@@ -293,6 +299,58 @@ function createApp(options = {}) {
     return `${commits}, ${fileCount} changed file${fileCount === 1 ? '' : 's'} between the two ends`;
   }
 
+  /**
+   * Recent commits, so a range can be picked instead of typed.
+   *
+   * Nobody knows the SHA of the commit they want to review back to, and
+   * asking for one is asking the reviewer to go and run `git log` in another
+   * window to use a tool whose whole point is not having to.
+   *
+   * Each entry is what a person recognises a commit by -- the subject line
+   * and when it landed -- with the SHA carried alongside rather than being
+   * the thing they have to read.
+   *
+   * `%x00` separates the fields because a commit subject can contain
+   * anything a person can type, including whatever delimiter looked safe.
+   *
+   * @param {import('simple-git').SimpleGit} git
+   * @param {number} limit
+   */
+  async function recentCommits(git, limit) {
+    const raw = await git.raw([
+      'log', `--max-count=${limit}`, '--format=%H%x00%h%x00%s%x00%cr'
+    ]);
+
+    return raw
+      .split('\n')
+      .filter(line => line.trim() !== '')
+      .map(line => {
+        const [sha, short, subject, when] = line.split('\u0000');
+        return { sha, short, subject, when };
+      });
+  }
+
+  /**
+   * The commits of an open repository, newest first.
+   *
+   * Behind a session id like the file endpoints rather than taking a path:
+   * this reads history out of a repository, and the session is what says
+   * which repository the caller has already been granted.
+   */
+  app.get('/api/commits/:repoId', async (req, res) => {
+    try {
+      const session = requireSession(res, req.params.repoId);
+      if (!session) return;
+
+      const commits = await recentCommits(gitFactory(session.repoPath), COMMIT_LIST_LIMIT);
+      res.json({ commits });
+    } catch (error) {
+      // A repository with no commits is not an error, it is an empty list.
+      console.error('Commit list error:', error.message);
+      res.json({ commits: [] });
+    }
+  });
+
   /** Liveness probe, and a count of how many repositories are open. */
   app.get('/api/health', (req, res) => {
     res.json({ status: 'ok', sessions: sessions.size });