reslop 0.1.0 → 0.1.1

package/CHANGELOG.md

@@ -2,15 +2,24 @@
 
 ## [Unreleased][unreleased]
 
-## [0.1.0][] - 2026-09-09
+## [0.1.1][] - 2026-09-10
+
+- Open a GitHub pull request by URL and review its diff
+- Import GitHub pull request review comments into the local review
+- Improve TUI navigation and hotkeys
+- CLI simplification and optimisation
+- Dix diff highlighting for snake_case identifier changes
+- Updated package metadata and README
+
+## [0.1.0][] - 2026-09-07
 
 ### Added
 
-- Interactive terminal git diff with intra-line highlighting
-- Stage, unstage, revert, and skip contiguous diff blocks
-- Feedback and todos in `.review/` markdown for an agent to execute
-- Unified, mixed, and side-by-side layouts
-- Review of a worktree, a path, or a given commit (read-only)
+- Interactive terminal review of uncommitted git diffs with stage, unstage,
+  revert, and skip
+- 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/metadiff/compare/v0.1.0...HEAD
-[0.1.0]: https://github.com/tshemsedinov/metadiff/releases/tag/v0.1.0
+[unreleased]: https://github.com/tshemsedinov/reslop/compare/v0.1.1...HEAD
+[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,12 +1,21 @@
-# reslop
+# reslop — Review diff and plan changes
 
-> Review diff and plan changes
+> Turn generated changes into owned changes
 
-- Prepare specs for the agent.
+```text
+Review → Plan → Repair → Verify
+```
+
+`0.1.x` implements Review: open a change, leave findings and todos, and
+prepare a repair plan for the agent. Plan, repair, and verify come later.
+
+- Prepare review findings and a repair plan for the agent.
 - Leave feedback, add todos.
 - Generate a plan the agent executes.
 
-Walk uncommitted git changes, or a given commit. Each contiguous block of diff lines can be staged, unstaged, reverted; add review and todos. Commit review is read-only.
+Walk uncommitted git changes, a given commit, or a GitHub pull request.
+Each contiguous block of diff lines can be staged, unstaged, reverted;
+add review and todos. Commit and pull request review is read-only.
 
 Intra-line highlighting paints the words that actually changed in a
 stronger red/green. A close edit inside one word still marks only
@@ -14,52 +23,26 @@ those characters.
 
 ## Install
 
-Global:
-
 ```bash
 npm i -g reslop
 ```
 
-Local:
-
-```bash
-npx reslop
-```
-
 ## Usage
 
 ```bash
 reslop
 reslop -n
-reslop path/to/folder
-reslop path/to/file
+reslop path/file
 reslop 7ac260c
-reslop HEAD~1 path/to/file
-reslop --help
+reslop https://github.com/metarhia/metacom/pull/555
 ```
 
-Starts on the diff. No arguments, or a folder, reviews that scope.
-A file argument opens that file's diff. A git revision that is not
-also an existing path opens that commit's patch. Esc opens the file
-list; Esc again quits.
-
-Specs go in `.review/YYYY-MM-DD-NN.md` with frontmatter `status`:
-
-| Status  | Meaning                                     |
-| ------- | ------------------------------------------- |
-| editing | Still writing the review in reslop          |
-| ready   | Ready for AI to work through the checkboxes |
-| partial | AI started; some items remain               |
-| done    | All items marked `[x]`                      |
-
-`reslop` resumes the latest file when its status is `editing`. Any other
-status starts a new file. `-n` / `--new` always starts a new file. Quit asks
-`f` (finish as `ready`, for the agent to execute) or `c` (keep `editing` and
-continue next time). The agent should execute `ready` and `partial` reviews.
-Files in `.review/` are omitted from the diff list.
+Reviews go in `.review/YYYY-MM-DD-NN.md` with frontmatter `status`:
 
-A `##` heading names the file. Todos are checkboxes under it. Feedback is a
-checkbox with ` - path:old:new:block` on the same line.
+- `editing`: still writing the review in reslop
+- `ready`: ready for AI to work through the checkboxes
+- `partial`: AI started; some items remain
+- `done`: all items marked `[x]`
 
 ## Keys and buttons
 
@@ -72,7 +55,7 @@ checkbox with ` - path:old:new:block` on the same line.
 | `←`         | Previous remaining block                |
 | `→`         | Next remaining block                    |
 | `l`         | File list (git status of this scope)    |
-| `Esc`       | File list, then quit                    |
+| `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                  |

package/lib/api.js

@@ -7,6 +7,8 @@ const keys = require('./keys.js');
 const render = require('./render.js');
 const highlight = require('./highlight.js');
 const detect = require('./detect.js');
+const github = require('./github.js');
+const source = require('./source.js');
 const { Session } = require('./session.js');
 const cli = require('./cli.js');
 
@@ -21,6 +23,9 @@ module.exports = {
   formatPatch: diff.formatPatch,
   itemsFromFiles: diff.itemsFromFiles,
   createGitRepo: git.createGitRepo,
+  parseGithubPrUrl: github.parseGithubPrUrl,
+  loadPullRequest: github.loadPullRequest,
+  selectChangeSource: source.selectChangeSource,
   decodeChunk: keys.decodeChunk,
   hitAction: keys.hitAction,
   renderFrame: render.renderFrame,

package/lib/cli.js

@@ -4,22 +4,16 @@ const fs = require('node:fs');
 const path = require('node:path');
 
 const { createGitRepo } = require('./git.js');
+const { githubToken, loadPullRequest } = require('./github.js');
+const { selectChangeSource, createLoadedSource } = require('./source.js');
 const { Session } = require('./session.js');
-const { ACTIONS, actionHot } = require('./keys.js');
-
-const FLAGS = Object.assign(Object.create(null), {
-  '-h': 'help',
-  '--help': 'help',
-  '-v': 'version',
-  '--version': 'version',
-  '-n': 'newReview',
-  '--new': 'newReview',
-});
 
 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 errorMessage = (reason) => {
   if (reason instanceof Error) return reason.message;
   if (reason === null || reason === undefined) return '';
@@ -32,32 +26,18 @@ const fail = (stderr, reason) => {
   return 1;
 };
 
-const helpText = () => {
-  const lines = [
-    'Usage: reslop [-n] [commit] [path...]',
-    '',
-    'Review uncommitted git changes, or a given commit (read only).',
-    'Resumes the latest .review file when its status is editing.',
-    'Finish marks the review ready for the agent to execute.',
-    'Use -n / --new to start a new review file.',
-    '',
-    'Keys:',
-  ];
-  for (const action of ACTIONS) {
-    lines.push(`  ${actionHot(action)}    ${action.label}`);
-  }
-  lines.push('  ?    Help');
-  lines.push('');
-  return `${lines.join('\n')}\n`;
+const failUsage = (stderr, reason) => {
+  fail(stderr, reason);
+  stderr.write(`${USAGE}\n`);
+  return 1;
 };
 
 const parseArgv = (argv) => {
   const paths = [];
-  const flags = { help: false, version: false, newReview: false };
+  let newReview = false;
   for (const arg of argv) {
-    const flag = FLAGS[arg];
-    if (flag) {
-      flags[flag] = true;
+    if (arg === '-n') {
+      newReview = true;
       continue;
     }
     if (arg.startsWith('-')) {
@@ -65,10 +45,7 @@ const parseArgv = (argv) => {
     }
     paths.push(arg);
   }
-  const help = flags.help;
-  const version = flags.version;
-  const newReview = flags.newReview;
-  return { paths, help, version, newReview };
+  return { paths, newReview };
 };
 
 const looksLikeRev = (spec) => {
@@ -94,55 +71,84 @@ const resolveScope = (cwd, paths, repo, statSync = fs.statSync) => {
     return { rev: null, paths };
   }
   const resolved = repo.resolveRev ? repo.resolveRev(cwd, first) : null;
-  if (resolved) return { rev: resolved, paths: paths.slice(1) };
+  if (resolved) {
+    if (paths.length > 1) {
+      throw new Error('use a commit or a path, not both');
+    }
+    return { rev: resolved, paths: [] };
+  }
   if (looksLikeRev(first)) {
     throw new Error(`bad revision ${first}`);
   }
   return { rev: null, paths };
 };
 
-const writeHelp = (stdout) => {
-  stdout.write(helpText());
-  return 0;
-};
-
-const writeVersion = (stdout, deps) => {
-  const pkgPath = path.join(__dirname, '..', 'package.json');
-  const pkg = deps.pkg ?? JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
-  stdout.write(`${pkg.version}\n`);
-  return 0;
-};
+const isColorEnabled = (stdout, env) => stdout.isTTY === true && !env.NO_COLOR;
 
-const loadSession = (proc, deps, args) => {
+const openLocalSession = (proc, deps, args, env) => {
   const stdout = proc.stdout;
-  const env = proc.env ?? {};
   const repo = deps.repo ?? createGitRepo();
   const cwd = deps.cwd ?? proc.cwd();
   const statSync = deps.statSync ?? fs.statSync;
   const scope = resolveScope(cwd, args.paths, repo, statSync);
-  const paths = scope.paths;
-  const rev = scope.rev;
-  const stdin = proc.stdin;
-  const color = stdout.isTTY === true && !env.NO_COLOR;
-  const getSize = deps.getSize;
-  const startPane = 'diff';
-  const newReview = args.newReview;
   const session = new Session({
     repo,
     cwd,
-    paths,
-    rev,
-    stdin,
+    paths: scope.paths,
+    rev: scope.rev,
+    stdin: proc.stdin,
+    stdout,
+    color: isColorEnabled(stdout, env),
+    getSize: deps.getSize,
+    startPane: 'files',
+    newReview: args.newReview,
+  });
+  session.load();
+  return session;
+};
+
+const openPullRequestSession = async (proc, deps, args, selected, env) => {
+  const stdout = proc.stdout;
+  const cwd = deps.cwd ?? proc.cwd();
+  const loader = deps.loadPullRequest ?? loadPullRequest;
+  const token = githubToken(env);
+  const loaded = await loader(selected.pr, {
+    cwd,
+    paths: selected.paths,
+    token,
+    fetch: deps.fetch,
+    env,
+  });
+  const change = loaded.change ?? null;
+  const repository = change ? change.repository : '';
+  const repo = deps.repo ?? createLoadedSource(loaded);
+  const session = new Session({
+    repo,
+    cwd,
+    paths: selected.paths,
+    stdin: proc.stdin,
     stdout,
-    color,
-    getSize,
-    startPane,
-    newReview,
+    color: isColorEnabled(stdout, env),
+    getSize: deps.getSize,
+    startPane: 'files',
+    newReview: args.newReview,
+    repoName: repository,
+    sourceLabel: loaded.sourceLabel,
+    change,
   });
   session.load();
   return session;
 };
 
+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);
+  }
+  return openLocalSession(proc, deps, args, env);
+};
+
 const run = async (proc, deps = {}) => {
   const stdout = proc.stdout;
   const stderr = proc.stderr;
@@ -150,13 +156,11 @@ const run = async (proc, deps = {}) => {
   try {
     args = parseArgv(proc.argv.slice(2));
   } catch (error) {
-    return fail(stderr, error);
+    return failUsage(stderr, error);
   }
-  if (args.help) return writeHelp(stdout);
-  if (args.version) return writeVersion(stdout, deps);
   let session;
   try {
-    session = loadSession(proc, deps, args);
+    session = await loadSession(proc, deps, args);
   } catch (error) {
     return fail(stderr, error);
   }
@@ -174,8 +178,8 @@ const run = async (proc, deps = {}) => {
 module.exports = {
   run,
   parseArgv,
-  helpText,
   resolveScope,
   looksLikeRev,
+  selectChangeSource,
   errorMessage,
 };

package/lib/diff.js

@@ -11,22 +11,23 @@ const PAIR_TOKEN_WEIGHT = 0.6;
 const WORD_REFINE_MIN = 0.6;
 const TOKEN_RE = /[A-Za-z_$][\w$]*|\d+|[^\s]/g;
 const PIECE_RE = /[A-Za-z_$][\w$]*|\d+|\s+|./g;
-const LINE_MARK = Object.assign(Object.create(null), {
+const LINE_MARK = {
   add: '+',
   del: '-',
   ctx: ' ',
-});
-const LINE_TYPE = Object.assign(Object.create(null), {
+};
+const LINE_TYPE = {
   '+': 'add',
   '-': 'del',
   ' ': 'ctx',
-});
-const INDEX_SIDE = Object.assign(Object.create(null), {
+};
+const INDEX_SIDE = {
   staged: 'new',
   unstaged: 'old',
   untracked: 'old',
   commit: 'old',
-});
+  pr: 'old',
+};
 
 const collapseSpans = (parts) => {
   const spans = [];
@@ -774,10 +775,10 @@ const formatPatch = (file, hunk, blockId, contextSide) => {
   return `${parts.join('\n')}\n`;
 };
 
-const LAYOUT_ALIGN = Object.assign(Object.create(null), {
+const LAYOUT_ALIGN = {
   mixed: alignPairs,
   side: alignSplit,
-});
+};
 
 const windowAroundBlock = (lines, blockId, radius) => {
   let start = -1;

package/lib/files.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const ORIGIN_ORDER = ['staged', 'unstaged', 'untracked', 'commit'];
+const ORIGIN_ORDER = ['staged', 'unstaged', 'untracked', 'commit', 'pr'];
 
 const itemPath = (item) => {
   if (!item || !item.file) return '';

package/lib/git.js

@@ -240,12 +240,36 @@ const revertItem = (top, item) => {
   }
 };
 
+const revertFile = (top, rel, items) => {
+  const origins = new Set();
+  let isNew = false;
+  for (const item of items) {
+    origins.add(item.origin);
+    if (item.file && item.file.isNew) isNew = true;
+  }
+  if (isNew) {
+    if (origins.has('staged')) {
+      requireOk(runGit(['rm', '-f', '--', rel], top));
+      return;
+    }
+    fs.unlinkSync(path.join(top, rel));
+    return;
+  }
+  if (origins.has('untracked') && origins.size === 1) {
+    fs.unlinkSync(path.join(top, rel));
+    return;
+  }
+  const args = ['restore', '-s', 'HEAD', '--worktree', '--staged', '--', rel];
+  requireOk(runGit(args, top));
+};
+
 const createGitRepo = () => ({
   load,
   resolveRev,
   add: addItem,
   unstage: unstageItem,
   revert: revertItem,
+  revertFile,
 });
 
 module.exports = {
@@ -256,6 +280,7 @@ module.exports = {
   addItem,
   unstageItem,
   revertItem,
+  revertFile,
   createGitRepo,
   oneLine,
 };