reslop 0.1.3 → 0.1.5

package/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 ## [Unreleased][unreleased]
 
+## [0.1.5][] - 2026-09-14
+
+- Added `r` to reload diffs from disk
+- Added `e` to edit added lines in place
+- Added `d` on quit to discard a new review file
+- Added `c` to commit, amend, or fixup staged changes
+- Reassign hotkeys to free needed keys for new operations
+
+## [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
@@ -33,7 +49,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.3...HEAD
+[unreleased]: https://github.com/tshemsedinov/reslop/compare/v0.1.5...HEAD
+[0.1.5]: https://github.com/tshemsedinov/reslop/compare/v0.1.4...v0.1.5
+[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

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.
+- Leave feedback, todos, and in-place code proposals that become a repair plan.
+- 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 mode
 
 Reviews go in `.review/YYYY-MM-DD-NN.md` with frontmatter `status`:
 
@@ -46,26 +47,27 @@ 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    |
-| `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                                     |
+## Hotkeys
+
+| Key                 | Action                                          |
+| ------------------- | ----------------------------------------------- |
+| `a`                 | Stage this diff (git add)                       |
+| `u`                 | Unstage this diff                               |
+| `d`                 | Drop this diff to the last commit               |
+| `c`                 | Commit: then `c` commit / `a` amend / `f` fixup |
+| `f`                 | Feedback on this diff                           |
+| `t`                 | New todo                                        |
+| `e`                 | Edit added lines                                |
+| `r`                 | Reload diffs from disk                          |
+| `m`                 | Mode: unified / mixed / side-by-side            |
+| `⏎`                 | Open the selected file                          |
+| `→` / `j`           | Next remaining diff / next file                 |
+| `←` / `k`           | Previous remaining diff / 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                        |
+| `Esc` / `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,6 +116,7 @@ const sessionOptions = (proc, deps, args, env, extra) => ({
   getSize: deps.getSize,
   startPane: 'files',
   newReview: args.newReview,
+  readOnly: args.readOnly,
   audit: true,
   ...extra,
 });
@@ -121,11 +143,12 @@ const openLocalSession = (proc, deps, args, selected, env) => {
   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,
@@ -149,8 +172,8 @@ const openPullRequestSession = async (proc, deps, args, selected, env) => {
 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);
 };

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/diff.js

@@ -773,10 +773,78 @@ const windowAroundBlock = (lines, blockId, radius) => {
   return lines.slice(from, to);
 };
 
-const displayLines = (hunk, blockId, layout = 'unified', radius) => {
+const insertAddIndex = (lines) => {
+  for (let i = lines.length - 1; i >= 0; i--) {
+    if (isCtxType(lines[i].type)) continue;
+    return i + 1;
+  }
+  return lines.length;
+};
+
+const taggedAdd = (text, blockId, start, end) => ({
+  type: 'add',
+  text,
+  noNl: false,
+  blockId,
+  wrap: true,
+  editStart: start,
+  editEnd: end,
+  editLast: true,
+});
+
+const replaceAdds = (lines, overlay, blockId) => {
+  const text = overlay.text ?? '';
+  const keepEmpty = overlay.keepEmpty === true;
+  if (text === '' && !keepEmpty) {
+    return lines.filter((line) => line.type !== 'add');
+  }
+  const texts = text.split('\n');
+  const tagged = [];
+  let offset = 0;
+  for (let i = 0; i < texts.length; i++) {
+    const row = texts[i];
+    const start = offset;
+    const end = start + row.length;
+    const isLast = i === texts.length - 1;
+    tagged.push(taggedAdd(row, blockId, start, end));
+    offset = isLast ? end : end + 1;
+  }
+  const out = [];
+  let placed = 0;
+  let lastAdd = -1;
+  for (const line of lines) {
+    if (line.type !== 'add') {
+      out.push(line);
+      continue;
+    }
+    if (placed >= tagged.length) continue;
+    out.push(tagged[placed]);
+    lastAdd = out.length - 1;
+    placed += 1;
+  }
+  const extras = tagged.slice(placed);
+  if (!extras.length) return out;
+  const at = lastAdd >= 0 ? lastAdd + 1 : insertAddIndex(out);
+  out.splice(at, 0, ...extras);
+  return out;
+};
+
+const blockAddText = (hunk, blockId) => {
+  if (!hunk) return '';
+  const parts = [];
+  for (const line of hunk.lines) {
+    if (line.type !== 'add') continue;
+    if (line.blockId !== blockId) continue;
+    parts.push(line.text);
+  }
+  return parts.join('\n');
+};
+
+const displayLines = (hunk, blockId, layout = 'unified', radius, overlay) => {
   const flat = flattenBlock(hunk, blockId, 'new');
+  const source = overlay ? replaceAdds(flat, overlay, blockId) : flat;
   const around = radius ?? DISPLAY_CONTEXT;
-  const windowed = windowAroundBlock(flat, blockId, around);
+  const windowed = windowAroundBlock(source, blockId, around);
   const lines = windowed.map((line) => ({ ...line }));
   const painted = attachInline(lines);
   const align = LAYOUT_ALIGN[layout];
@@ -877,6 +945,7 @@ module.exports = {
   countSides,
   formatPatch,
   displayLines,
+  blockAddText,
   synthesizeNewFile,
   itemsFromFiles,
   refreshIndexPatches,

package/lib/git.js

@@ -7,12 +7,18 @@ const path = require('node:path');
 const diff = require('./diff.js');
 const { parseDiff, synthesizeNewFile, itemsFromFiles } = diff;
 const { itemPath, isPathInScope, REVIEW_DIR } = require('./files.js');
+const { npmBin, spawnBase } = require('./sys.js');
 const deps = require('./deps.js');
 const { foldDepItems, mergeDepFile, depFileMeta } = deps;
 const { collectUsedNames, parseAuditReport, parseOutdatedReport } = deps;
 const { mergeProposedItems, MANIFEST, LOCKFILE } = deps;
 
-const GIT_CONFIG = ['-c', 'core.quotepath=false'];
+const GIT_CONFIG = [
+  '-c',
+  'core.quotepath=false',
+  '-c',
+  'i18n.logOutputEncoding=utf-8',
+];
 const DIFF_OPTS = ['--no-color', '--no-ext-diff', '--no-renames', '-U3'];
 const GIT_ENCODING = 'utf8';
 const GIT_MAX_BUFFER = 32 * 1024 * 1024;
@@ -71,7 +77,7 @@ const runProc = (cmd, args, options = {}) =>
     let stderr = '';
     let settled = false;
     let timer = null;
-    const child = spawn(cmd, args, { cwd, env });
+    const child = spawn(cmd, args, spawnBase({ cwd, env }));
     const finish = (result) => {
       if (settled) return;
       settled = true;
@@ -135,7 +141,7 @@ const runGit = (args, cwd, input) => {
   const env = { ...process.env, GIT_OPTIONAL_LOCKS: '0' };
   const encoding = GIT_ENCODING;
   const maxBuffer = GIT_MAX_BUFFER;
-  const options = { cwd, encoding, input, maxBuffer, env };
+  const options = spawnBase({ cwd, encoding, input, maxBuffer, env });
   const result = spawnSync('git', args, options);
   return gitResult(result);
 };
@@ -275,18 +281,22 @@ const readDepSides = (top, rev, origin, rel) => {
 };
 
 const runNpmJson = (top, args, timeout) => {
-  const result = spawnSync('npm', args, {
-    cwd: top,
-    encoding: GIT_ENCODING,
-    maxBuffer: GIT_MAX_BUFFER,
-    timeout,
-  });
+  const result = spawnSync(
+    npmBin(),
+    args,
+    spawnBase({
+      cwd: top,
+      encoding: GIT_ENCODING,
+      maxBuffer: GIT_MAX_BUFFER,
+      timeout,
+    }),
+  );
   if (result.error) return '';
   return result.stdout || '';
 };
 
 const runNpmJsonAsync = async (top, args, timeout, signal) => {
-  const result = await runProc('npm', args, {
+  const result = await runProc(npmBin(), args, {
     cwd: top,
     encoding: GIT_ENCODING,
     maxBuffer: GIT_MAX_BUFFER,
@@ -443,12 +453,16 @@ const applyDepWorktree = (top, rel, change, origin) => {
 };
 
 const runNpm = (cwd, args) =>
-  spawnSync('npm', args, {
-    cwd,
-    encoding: GIT_ENCODING,
-    maxBuffer: GIT_MAX_BUFFER,
-    timeout: INSTALL_MS,
-  });
+  spawnSync(
+    npmBin(),
+    args,
+    spawnBase({
+      cwd,
+      encoding: GIT_ENCODING,
+      maxBuffer: GIT_MAX_BUFFER,
+      timeout: INSTALL_MS,
+    }),
+  );
 
 const firstDepRel = (files, kind) => {
   for (const rel of files) {
@@ -831,6 +845,28 @@ const revertItem = (top, item) => {
   }
 };
 
+const lastMessage = (top) => {
+  const result = runGit(['log', '-1', '--format=%B'], top);
+  if (result.status !== 0) return '';
+  return (result.stdout ?? '').replace(/\s+$/, '');
+};
+
+const commitChanges = (top, kind, message) => {
+  if (kind === 'fixup') {
+    const target = (message ?? '').trim() || 'HEAD';
+    const result = runGit(['commit', `--fixup=${target}`], top);
+    requireOk(result);
+    return;
+  }
+  const args = ['commit'];
+  if (kind === 'amend') args.push('--amend');
+  args.push('-F', '-');
+  const text = message ?? '';
+  const body = text.endsWith('\n') ? text : `${text}\n`;
+  const result = runGit(args, top, body);
+  requireOk(result);
+};
+
 const revertFile = (top, rel, items) => {
   const paths = new Set([rel]);
   for (const item of items) {
@@ -853,6 +889,8 @@ const createGitRepo = () => ({
   unstage: unstageItem,
   revert: revertItem,
   revertFile,
+  commit: commitChanges,
+  lastMessage,
 });
 
 module.exports = {
@@ -862,5 +900,7 @@ module.exports = {
   addItem,
   unstageItem,
   revertItem,
+  commitChanges,
+  lastMessage,
   createGitRepo,
 };