reslop 0.1.4 → 0.1.6

package/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 ## [Unreleased][unreleased]
 
+## [0.1.6][] - 2026-09-15
+
+- Auto updates for patch/minor, y/n per new major
+- Lists branches, new branch, git pull, git push
+- Show TUI progress for long background operations
+- Fix Windows spawn EINVAL when running `npm.cmd`
+- Highlight Dart diffs; refactor syntax highlighting
+- Multiple TUI/TUX improvements and fixes
+
+## [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
@@ -41,7 +58,8 @@
 - 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.4...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

package/README.md

@@ -18,7 +18,7 @@ Review → Plan → Repair → Verify
 
 - 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.
+- 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.
@@ -38,7 +38,7 @@ Works on Linux, macOS, and Windows. On Windows use Windows Terminal.
 - `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
+- `reslop -r` read-only mode
 
 Reviews go in `.review/YYYY-MM-DD-NN.md` with frontmatter `status`:
 
@@ -49,24 +49,23 @@ Reviews go in `.review/YYYY-MM-DD-NN.md` with frontmatter `status`:
 
 ## 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                                     |
+| Key                 | Action                                          |
+| ------------------- | ----------------------------------------------- |
+| `a` / `u` / `d`     | Stage / unstage / drop this diff                |
+| `c`                 | Commit: then `c` commit / `a` amend / `f` fixup |
+| `b`                 | List branches; `b, n` new branch                |
+| `p` / `s`           | git pull/push                                   |
+| `f` / `t` / `e`     | Add feedback / todo / edit diff text            |
+| `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/cli.js

@@ -143,29 +143,33 @@ const openLocalSession = (proc, deps, args, selected, env) => {
   return session;
 };
 
-const openRemoteSession = async (proc, deps, args, selected, env) => {
+const remoteRepo = (deps, selected, env, cwd) => {
+  if (deps.repo) return deps.repo;
   const remote = REMOTE_CHANGE[selected.kind];
-  const cwd = deps.cwd ?? proc.cwd();
   const loader = deps[remote.load] ?? remote.fallback;
   const token = remote.token(env);
-  const loaded = await loader(remote.target(selected), {
-    cwd,
-    paths: selected.paths,
-    token,
-    fetch: deps.fetch,
-  });
-  const change = loaded.change ?? null;
-  const repository = change ? change.repository : '';
-  const repo = deps.repo ?? createLoadedSource(loaded);
+  const loadRemote = async () => {
+    const loaded = await loader(remote.target(selected), {
+      cwd,
+      paths: selected.paths,
+      token,
+      fetch: deps.fetch,
+    });
+    const items = loaded.items ?? [];
+    return { ...loaded, items: [...items] };
+  };
+  const repo = createLoadedSource({ items: [] });
+  repo.loadAsync = loadRemote;
+  return repo;
+};
+
+const openRemoteSession = (proc, deps, args, selected, env) => {
+  const cwd = deps.cwd ?? proc.cwd();
   return startSession(
     sessionOptions(proc, deps, args, env, {
-      repo,
+      repo: remoteRepo(deps, selected, env, cwd),
       paths: selected.paths,
-      repoName: repository,
-      sourceLabel: loaded.sourceLabel,
-      change,
     }),
-    { load: true },
   );
 };
 

package/lib/detect.js

@@ -2,40 +2,7 @@
 
 const path = require('node:path');
 
-const LANG = {
-  md: 'md',
-  markdown: 'md',
-  js: 'js',
-  javascript: 'js',
-  mjs: 'mjs',
-  cjs: 'js',
-  ts: 'ts',
-  typescript: 'ts',
-  jsx: 'jsx',
-  tsx: 'tsx',
-  json: 'json',
-  csv: 'csv',
-  html: 'html',
-  htm: 'html',
-  css: 'css',
-  sh: 'bash',
-  bash: 'bash',
-  shell: 'bash',
-  zsh: 'bash',
-  txt: 'txt',
-  text: 'txt',
-  plain: 'txt',
-  log: 'log',
-  env: 'dot',
-  ini: 'dot',
-  conf: 'dot',
-  cfg: 'dot',
-  yaml: 'dot',
-  yml: 'dot',
-  toml: 'dot',
-  py: 'py',
-  python: 'py',
-};
+const { mapLang } = require('./highlight.js');
 
 const PROSE_BASENAMES = [
   'license',
@@ -53,11 +20,6 @@ const fileExt = (filePath) => {
   return base.slice(dot + 1).toLowerCase();
 };
 
-const mapLang = (name) => {
-  if (!name) return 'txt';
-  return LANG[name.toLowerCase()] || 'txt';
-};
-
 const isProseBasename = (base) => {
   const name = (base || '').toLowerCase();
   if (PROSE_BASENAMES.includes(name)) return true;
@@ -79,7 +41,7 @@ const detectLang = (filePath) => {
     if (rule.test(base)) return rule.lang;
   }
   const ext = fileExt(base);
-  if (ext) return LANG[ext] || 'txt';
+  if (ext) return mapLang(ext);
   return 'dot';
 };
 

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

@@ -57,6 +57,7 @@ const fileEntries = (items) => {
         path: rel,
         origins: [],
         firstIndex: i,
+        openIndex: i,
         remaining: 0,
         added: 0,
         removed: 0,
@@ -72,7 +73,10 @@ const fileEntries = (items) => {
     group.added += delta.added;
     group.removed += delta.removed;
     if (origin === 'staged') group.staged += 1;
-    if (origin === 'unstaged') group.unstaged += 1;
+    if (origin === 'unstaged') {
+      if (group.unstaged === 0) group.openIndex = i;
+      group.unstaged += 1;
+    }
   }
   const entries = [...groups.values()];
   for (const group of entries) {