reslop 0.1.2 → 0.1.4

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 ## [Unreleased][unreleased]
 
+## [0.1.4][] - 2026-09-13
+
+- Support a GitLab MR by URL and import review comments
+- Support Windows: npm.cmd, clip, terminal resize, installer
+- Added `-r` read-only mode that blocks stage, unstage, revert, npm
+- Fixed `npm test` so it finds tests on Windows, macOS, and Node 18
+- Added Testing CI on Linux, macOS, and Windows
+
+## [0.1.3][] - 2026-09-12
+
+- Showed added/removed and staged/total counts in the file list
+- Highlighted JSX and TSX syntax, including
+- Added vim-style j/k navigation and Ctrl scrolling
+- Improved TUI/UX with background git and npm checks to avoid a freeze
+
 ## [0.1.2][] - 2026-09-11
 
 - Review each dependency once across package.json and package-lock
@@ -26,7 +41,9 @@
 - Feedback and todos that produce a repair plan for an agent
 - Intra-line highlighting in unified, mixed, and side-by-side layouts
 
-[unreleased]: https://github.com/tshemsedinov/reslop/compare/v0.1.2...HEAD
+[unreleased]: https://github.com/tshemsedinov/reslop/compare/v0.1.4...HEAD
+[0.1.4]: https://github.com/tshemsedinov/reslop/compare/v0.1.3...v0.1.4
+[0.1.3]: https://github.com/tshemsedinov/reslop/compare/v0.1.2...v0.1.3
 [0.1.2]: https://github.com/tshemsedinov/reslop/compare/v0.1.1...v0.1.2
 [0.1.1]: https://github.com/tshemsedinov/reslop/compare/v0.1.0...v0.1.1
 [0.1.0]: https://github.com/tshemsedinov/reslop/releases/tag/v0.1.0

package/README.md

@@ -1,4 +1,11 @@
-# reslop — Review diff and plan changes
+# 👁️ reslop — Review diff and plan changes
+
+[![ci status](https://github.com/tshemsedinov/reslop/workflows/Testing%20CI/badge.svg)](https://github.com/tshemsedinov/reslop/actions?query=workflow%3A%22Testing+CI%22+branch%3Amain)
+[![snyk](https://snyk.io/test/github/tshemsedinov/reslop/badge.svg)](https://snyk.io/test/github/tshemsedinov/reslop)
+[![npm version](https://badge.fury.io/js/reslop.svg)](https://badge.fury.io/js/reslop)
+[![npm downloads/month](https://img.shields.io/npm/dm/reslop.svg)](https://www.npmjs.com/package/reslop)
+[![npm downloads](https://img.shields.io/npm/dt/reslop.svg)](https://www.npmjs.com/package/reslop)
+[![license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/tshemsedinov/reslop/blob/main/LICENSE)
 
 > Turn generated changes into owned changes
 
@@ -9,35 +16,29 @@ for the agent.
 Review → Plan → Repair → Verify
 ```
 
-- Review uncommitted git diffs, a given commit, or a GitHub pull request.
+- Review uncommitted git diffs, a given commit, a GitHub PR, or a GitLab MR.
 - Stage, unstage, or revert each contiguous block of diff lines.
 - Leave feedback and todos that become a repair plan for the agent.
-- Import GitHub pull request review comments into the local plan for AI.
+- Import GitHub PR and GitLab MR review comments into the local plan for AI.
 - Review each npm dependency once across `package.json` and the lockfile.
 - Propose unused removals, npm audit fixes, and outdated updates as diffs.
 
-Commit and pull request review is read-only. Applying a dependency
-proposal stages the files and runs `npm i` or `npm uninstall`.
-
-Intra-line highlighting paints the words that actually changed in a
-stronger red/green. A close edit inside one word still marks only
-those characters.
-
 ## Install
 
 ```bash
 npm i -g reslop
 ```
 
+Works on Linux, macOS, and Windows. On Windows use Windows Terminal.
+
 ## Usage
 
-```bash
-reslop
-reslop -n
-reslop path/file
-reslop 7ac260c
-reslop https://github.com/metarhia/metacom/pull/555
-```
+- `reslop` uncommitted diffs in this repository
+- `reslop path/file` show only that path or file
+- `reslop 7ac260c` show that commit (read-only)
+- `reslop https://github.com/metarhia/metacom/pull/555` GitHub/GitLab PR/MR
+- `reslop -n` start a new review even if the latest is still editing
+- `reslop -r` read-only: no stage, unstage, revert, or npm apply
 
 Reviews go in `.review/YYYY-MM-DD-NN.md` with frontmatter `status`:
 
@@ -46,25 +47,26 @@ Reviews go in `.review/YYYY-MM-DD-NN.md` with frontmatter `status`:
 - `partial`: AI started; some items remain
 - `done`: all items marked `[x]`
 
-## Keys and buttons
-
-| Key         | Action                                  |
-| ----------- | --------------------------------------- |
-| `a`         | Stage this block (`git add`)            |
-| `u`         | Unstage this block (keep worktree)      |
-| `r`         | Restore this block to the last commit   |
-| `s`         | Skip (leave unstaged, drop from review) |
-| `←`         | Previous remaining block                |
-| `→`         | Next remaining block                    |
-| `l`         | File list (git status of this scope)    |
-| `Esc`       | Quit file list or a tool                |
-| `m`         | Cycle unified / mixed / side-by-side    |
-| `f`         | Feedback on this diff block             |
-| `t`         | New todo for this file                  |
-| `⌫` / `Del` | Remove the selected todo                |
-| `⏎`         | Open the selected file                  |
-| `q`         | Quit                                    |
-| `?`         | Help                                    |
+## Hotkeys
+
+| Key                 | Action                                   |
+| ------------------- | ---------------------------------------- |
+| `a`                 | Stage this block (`git add`)             |
+| `u`                 | Unstage this block (keep worktree)       |
+| `r`                 | Restore this block to the last commit    |
+| `f`                 | Feedback on this diff block              |
+| `t`                 | New todo for this file                   |
+| `l`                 | File list (git status of this scope)     |
+| `m`                 | Cycle unified / mixed / side-by-side     |
+| `⏎`                 | Open the selected file                   |
+| `Esc`               | Quit file list or a tool                 |
+| `→` / `j`           | Next remaining block / next file         |
+| `←` / `k`           | Previous remaining block / previous file |
+| `Ctrl-e` / `Ctrl-y` | Scroll one line down / up                |
+| `Ctrl-f` / `Ctrl-b` | Scroll page down / up                    |
+| `Ctrl-d` / `Ctrl-u` | Scroll half-page down / up               |
+| `⌫` / `Del`         | Remove the selected todo                 |
+| `q`                 | Quit                                     |
 
 ## License
 

package/lib/api.js

@@ -8,6 +8,7 @@ const render = require('./render.js');
 const highlight = require('./highlight.js');
 const detect = require('./detect.js');
 const github = require('./github.js');
+const gitlab = require('./gitlab.js');
 const source = require('./source.js');
 const { Session } = require('./session.js');
 const cli = require('./cli.js');
@@ -25,6 +26,8 @@ module.exports = {
   createGitRepo: git.createGitRepo,
   parseGithubPrUrl: github.parseGithubPrUrl,
   loadPullRequest: github.loadPullRequest,
+  parseGitlabMrUrl: gitlab.parseGitlabMrUrl,
+  loadMergeRequest: gitlab.loadMergeRequest,
   selectChangeSource: source.selectChangeSource,
   decodeChunk: keys.decodeChunk,
   hitAction: keys.hitAction,

package/lib/cli.js

@@ -5,6 +5,7 @@ const path = require('node:path');
 
 const { createGitRepo } = require('./git.js');
 const { githubToken, loadPullRequest } = require('./github.js');
+const { gitlabToken, loadMergeRequest } = require('./gitlab.js');
 const { selectChangeSource, createLoadedSource } = require('./source.js');
 const { Session } = require('./session.js');
 
@@ -12,7 +13,22 @@ const HEX_REV = /^[0-9a-f]{4,40}$/i;
 const HEAD_REV = /^HEAD([~^].*)?$/i;
 const RANGE_REV = /[~^]/;
 
-const USAGE = 'Usage: reslop [-n] [path | commit | pr-url]';
+const USAGE = 'Usage: reslop [-n] [-r] [path | commit | pr-url | mr-url]';
+
+const REMOTE_CHANGE = {
+  'github-pr': {
+    load: 'loadPullRequest',
+    fallback: loadPullRequest,
+    token: githubToken,
+    target: (selected) => selected.pr,
+  },
+  'gitlab-mr': {
+    load: 'loadMergeRequest',
+    fallback: loadMergeRequest,
+    token: gitlabToken,
+    target: (selected) => selected.mr,
+  },
+};
 
 const errorMessage = (reason) => {
   if (reason instanceof Error) return reason.message;
@@ -37,17 +53,22 @@ const failUsage = (stderr, reason) => {
 const parseArgv = (argv) => {
   const paths = [];
   let newReview = false;
+  let readOnly = false;
   for (const arg of argv) {
     if (arg === '-n') {
       newReview = true;
       continue;
     }
+    if (arg === '-r') {
+      readOnly = true;
+      continue;
+    }
     if (arg.startsWith('-')) {
       throw new Error(`unknown option ${arg}`);
     }
     paths.push(arg);
   }
-  return { paths, newReview };
+  return { paths, newReview, readOnly };
 };
 
 const looksLikeRev = (spec) => {
@@ -95,13 +116,14 @@ const sessionOptions = (proc, deps, args, env, extra) => ({
   getSize: deps.getSize,
   startPane: 'files',
   newReview: args.newReview,
+  readOnly: args.readOnly,
   audit: true,
   ...extra,
 });
 
-const startSession = (options) => {
+const startSession = (options, extra = {}) => {
   const session = new Session(options);
-  session.load();
+  if (extra.load) session.load();
   return session;
 };
 
@@ -110,20 +132,23 @@ const openLocalSession = (proc, deps, args, selected, env) => {
   const repo = deps.repo ?? createGitRepo();
   const statSync = deps.statSync ?? fs.statSync;
   const scope = resolveScope(cwd, selected.paths, repo, statSync);
-  return startSession(
+  const session = startSession(
     sessionOptions(proc, deps, args, env, {
       repo,
       paths: scope.paths,
       rev: scope.rev,
     }),
   );
+  session.ensureRepo();
+  return session;
 };
 
-const openPullRequestSession = async (proc, deps, args, selected, env) => {
+const openRemoteSession = async (proc, deps, args, selected, env) => {
+  const remote = REMOTE_CHANGE[selected.kind];
   const cwd = deps.cwd ?? proc.cwd();
-  const loader = deps.loadPullRequest ?? loadPullRequest;
-  const token = githubToken(env);
-  const loaded = await loader(selected.pr, {
+  const loader = deps[remote.load] ?? remote.fallback;
+  const token = remote.token(env);
+  const loaded = await loader(remote.target(selected), {
     cwd,
     paths: selected.paths,
     token,
@@ -140,18 +165,26 @@ const openPullRequestSession = async (proc, deps, args, selected, env) => {
       sourceLabel: loaded.sourceLabel,
       change,
     }),
+    { load: true },
   );
 };
 
 const loadSession = async (proc, deps, args) => {
   const env = proc.env ?? {};
   const selected = selectChangeSource(args.paths);
-  if (selected.kind === 'github-pr') {
-    return openPullRequestSession(proc, deps, args, selected, env);
+  if (REMOTE_CHANGE[selected.kind]) {
+    return openRemoteSession(proc, deps, args, selected, env);
   }
   return openLocalSession(proc, deps, args, selected, env);
 };
 
+const runUi = async (session, proc) => {
+  const code = await session.startUi();
+  if (session.loadError) return fail(proc.stderr, session.loadError);
+  if (session.emptyReview) proc.stdout.write('nothing to review\n');
+  return code;
+};
+
 const run = async (proc, deps = {}) => {
   const stdout = proc.stdout;
   const stderr = proc.stderr;
@@ -167,15 +200,19 @@ const run = async (proc, deps = {}) => {
   } catch (error) {
     return fail(stderr, error);
   }
+  const tty = proc.stdin.isTTY === true && stdout.isTTY === true;
+  if (tty) return runUi(session, proc);
+  try {
+    await session.loadReady();
+  } catch (error) {
+    return fail(stderr, error);
+  }
   if (!session.items.length) {
     stdout.write('nothing to review\n');
     return 0;
   }
-  if (!proc.stdin.isTTY || !stdout.isTTY) {
-    stderr.write('reslop: interactive terminal required\n');
-    return 1;
-  }
-  return session.startUi();
+  stderr.write('reslop: interactive terminal required\n');
+  return 1;
 };
 
 module.exports = {

package/lib/clipboard.js

@@ -3,13 +3,9 @@
 const { spawnSync } = require('node:child_process');
 
 const { ESC } = require('./ansi.js');
+const { clipTools, spawnBase } = require('./sys.js');
 
 const CLIP_TIMEOUT_MS = 1000;
-const CLIP_TOOLS = [
-  { cmd: 'wl-copy', args: [] },
-  { cmd: 'xclip', args: ['-selection', 'clipboard'] },
-  { cmd: 'xsel', args: ['--clipboard', '--input'] },
-];
 
 const osc52 = (text) => {
   const b64 = Buffer.from(text, 'utf8').toString('base64');
@@ -17,11 +13,15 @@ const osc52 = (text) => {
 };
 
 const runClip = (cmd, args, text) => {
-  const result = spawnSync(cmd, args, {
-    input: text,
-    encoding: 'utf8',
-    timeout: CLIP_TIMEOUT_MS,
-  });
+  const result = spawnSync(
+    cmd,
+    args,
+    spawnBase({
+      input: text,
+      encoding: 'utf8',
+      timeout: CLIP_TIMEOUT_MS,
+    }),
+  );
   if (result.error) return false;
   return result.status === 0;
 };
@@ -33,7 +33,7 @@ const copyText = (text, stdout) => {
     stdout.write(osc52(text));
     ok = true;
   }
-  for (const tool of CLIP_TOOLS) {
+  for (const tool of clipTools()) {
     if (runClip(tool.cmd, tool.args, text)) return true;
   }
   return ok;

package/lib/detect.js

@@ -11,6 +11,8 @@ const LANG = {
   cjs: 'js',
   ts: 'ts',
   typescript: 'ts',
+  jsx: 'jsx',
+  tsx: 'tsx',
   json: 'json',
   csv: 'csv',
   html: 'html',

package/lib/files.js

@@ -33,26 +33,50 @@ const fileStatus = (origins) => {
   return key;
 };
 
+const lineDelta = ({ hunk, blockId }) => {
+  const delta = { added: 0, removed: 0 };
+  if (!hunk) return delta;
+  const { lines } = hunk;
+  if (!lines) return delta;
+  const scoped = typeof blockId === 'number';
+  for (const { type, blockId: lineBlock } of lines) {
+    if (scoped && lineBlock !== blockId) continue;
+    if (type === 'add') delta.added += 1;
+    else if (type === 'del') delta.removed += 1;
+  }
+  return delta;
+};
+
 const fileEntries = (items) => {
   const groups = new Map();
   for (let i = 0; i < items.length; i++) {
     const item = items[i];
     const rel = itemPath(item);
-    let group = groups.get(rel);
-    if (!group) {
-      group = { path: rel, origins: [], firstIndex: i, remaining: 0 };
-      groups.set(rel, group);
+    if (!groups.has(rel)) {
+      groups.set(rel, {
+        path: rel,
+        origins: [],
+        firstIndex: i,
+        remaining: 0,
+        added: 0,
+        removed: 0,
+        staged: 0,
+        unstaged: 0,
+      });
     }
-    group.origins.push(item.origin);
+    const group = groups.get(rel);
+    const { origin } = item;
+    group.origins.push(origin);
     group.remaining += 1;
+    const delta = lineDelta(item);
+    group.added += delta.added;
+    group.removed += delta.removed;
+    if (origin === 'staged') group.staged += 1;
+    if (origin === 'unstaged') group.unstaged += 1;
   }
-  const entries = [];
-  for (const group of groups.values()) {
-    const path = group.path;
-    const status = fileStatus(group.origins);
-    const firstIndex = group.firstIndex;
-    const remaining = group.remaining;
-    entries.push({ path, status, firstIndex, remaining });
+  const entries = [...groups.values()];
+  for (const group of entries) {
+    group.status = fileStatus(group.origins);
   }
   return entries;
 };