reslop 0.2.6 → 0.2.7

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## [Unreleased][unreleased]
 
+## [0.2.7][] - 2026-10-03
+
+- Add tiling view for multi-repository environment
+- Improve navigation and hotkeys
+- Add npm and dependencies screen
+- Rework tasks: regroup into feature, bug, debt, research, and security
+- Show tasks progress
+- Search file paths in the files and diff screens
+
 ## [0.2.6][] - 2026-10-02
 
 - Add a live dashboard as the start screen
@@ -163,7 +172,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.2.6...HEAD
+[unreleased]: https://github.com/tshemsedinov/reslop/compare/v0.2.7...HEAD
+[0.2.7]: https://github.com/tshemsedinov/reslop/compare/v0.2.6...v0.2.7
 [0.2.6]: https://github.com/tshemsedinov/reslop/compare/v0.2.5...v0.2.6
 [0.2.5]: https://github.com/tshemsedinov/reslop/compare/v0.2.4...v0.2.5
 [0.2.4]: https://github.com/tshemsedinov/reslop/compare/v0.2.3...v0.2.4

package/lib/ansi.js

@@ -75,6 +75,10 @@ const DARK_UI = {
   warnFg: [0xe8, 0xc8, 0x4a],
   mutedFg: [0x7a, 0x7a, 0x8a],
   shaFg: [0x56, 0x9c, 0xd6],
+  pkgDepFg: [0xaf, 0xe0, 0xb9],
+  pkgDevFg: [0x9a, 0xc4, 0xe6],
+  pkgFg: [0xc8, 0xc8, 0xd2],
+  pkgChainFg: [0x55, 0x55, 0x62],
   shaDarkFg: [0x15, 0x4a, 0x8c],
   stagedDelLineFg: [0xa0, 0xa0, 0xa8],
   stagedDelLineBg: [0x20, 0x20, 0x26],
@@ -88,10 +92,26 @@ const DARK_UI = {
   dashTileBg: [0x26, 0x26, 0x2a],
   dashRowBg: [0x1c, 0x1c, 0x1f],
   dashHeadBg: [0x70, 0x70, 0x7c],
+  dashDimHeadBg: [0x30, 0x30, 0x38],
+  dashDimTileBg: [0x12, 0x12, 0x14],
+  dashDimRowBg: [0x0c, 0x0c, 0x0e],
   dashHeadMuted: [0xf2, 0xf2, 0xfa],
   dashDelFg: [0xff, 0xd2, 0xd2],
-  dashTrendFg: [0x4a, 0x62, 0x70],
+  heatTrack: [0x3a, 0x3c, 0x48],
+  heat1: [0x1c, 0x3a, 0x32],
+  heat2: [0x2a, 0x5a, 0x38],
+  heat3: [0x8a, 0x6a, 0x18],
+  heat4: [0xa0, 0x3a, 0x28],
+  heatFg: [0xf4, 0xf4, 0xf8],
+  heatBlink: [0xf2, 0xe2, 0x8a],
+  heatBlinkFg: [0x1a, 0x16, 0x08],
   dashKeyFg: [0xff, 0xff, 0xff],
+  taskHeadFg: [0xff, 0xff, 0xff],
+  taskHeadBg: [0x3c, 0x3c, 0x48],
+  searchFg: [0x1a, 0x16, 0x08],
+  searchBg: [0x8a, 0x6a, 0x18],
+  searchOnFg: [0x1a, 0x16, 0x08],
+  searchOnBg: [0xf2, 0xe2, 0x8a],
 };
 
 const DARK_CODE = {
@@ -175,6 +195,10 @@ const LIGHT_UI = {
   warnFg: [0x9a, 0x67, 0x00],
   mutedFg: [0x6e, 0x77, 0x81],
   shaFg: [0x05, 0x50, 0xae],
+  pkgDepFg: [0x3c, 0xa8, 0x5a],
+  pkgDevFg: [0x3d, 0x7e, 0xc8],
+  pkgFg: [0x9a, 0xa2, 0xac],
+  pkgChainFg: [0x3a, 0x42, 0x4c],
   shaDarkFg: [0x0b, 0x3d, 0x70],
   stagedDelLineFg: [0x57, 0x60, 0x6a],
   stagedDelLineBg: [0xf3, 0xf4, 0xf6],
@@ -188,10 +212,26 @@ const LIGHT_UI = {
   dashTileBg: [0xe4, 0xe7, 0xeb],
   dashRowBg: [0xd9, 0xdc, 0xe1],
   dashHeadBg: [0xe8, 0xeb, 0xef],
+  dashDimHeadBg: [0xb0, 0xb6, 0xbe],
+  dashDimTileBg: [0xc4, 0xc8, 0xce],
+  dashDimRowBg: [0xb0, 0xb4, 0xba],
   dashHeadMuted: [0x3e, 0x46, 0x52],
   dashDelFg: [0xd0, 0x3a, 0x44],
-  dashTrendFg: [0x8a, 0x98, 0xa6],
+  heatTrack: [0xc5, 0xca, 0xd3],
+  heat1: [0xc8, 0xe6, 0xd4],
+  heat2: [0x7d, 0xc8, 0x96],
+  heat3: [0xe6, 0xb4, 0x3c],
+  heat4: [0xe0, 0x78, 0x68],
+  heatFg: [0x1f, 0x23, 0x28],
+  heatBlink: [0xff, 0xf3, 0xb0],
+  heatBlinkFg: [0x1a, 0x16, 0x08],
   dashKeyFg: [0x00, 0x00, 0x00],
+  taskHeadFg: [0xff, 0xff, 0xff],
+  taskHeadBg: [0x6e, 0x77, 0x81],
+  searchFg: [0x1a, 0x16, 0x08],
+  searchBg: [0xf0, 0xc8, 0x6a],
+  searchOnFg: [0x1a, 0x16, 0x08],
+  searchOnBg: [0xff, 0xe1, 0x4a],
 };
 
 const LIGHT_CODE = {

package/lib/api.js

@@ -1,5 +1,5 @@
 'use strict';
-
+// a
 const ansi = require('./ansi.js');
 const diff = require('./diff/diff.js');
 const git = require('./git.js');

package/lib/cli.js

@@ -21,6 +21,8 @@ const ansi = require('./ansi.js');
 const { setTheme } = ansi;
 const reportRun = require('./report-run.js');
 const { runCapture } = reportRun;
+const workspace = require('./workspace.js');
+const { workspaceFromArgs } = workspace;
 
 const HEX_REV = /^[0-9a-f]{4,40}$/i;
 const HEAD_REV = /^HEAD([~^].*)?$/i;
@@ -85,6 +87,20 @@ const resolveScope = async (cwd, paths, repo) => {
 
 const localOptions = async (deps, args, selected, cwd) => {
   const rawRepo = deps.repo ?? createGitRepo();
+  const found = workspaceFromArgs(cwd, selected.paths);
+  if (found) {
+    const capabilities = capabilitiesFor('local', { readOnly: args.readOnly });
+    return {
+      cwd: found.root,
+      repo: attachCapabilities(rawRepo, capabilities),
+      paths: [],
+      rev: null,
+      capabilities,
+      startPane: 'repos',
+      workspace: found,
+      repoName: path.basename(found.root),
+    };
+  }
   const scope = await resolveScope(cwd, selected.paths, rawRepo);
   const kind = scope.rev ? 'commit' : 'local';
   const capabilities = capabilitiesFor(kind, { readOnly: args.readOnly });
@@ -143,7 +159,7 @@ const loadSession = async (proc, deps, args) => {
     audit: true,
     ...extra,
   });
-  session.ensureRepo();
+  if (session.pane !== 'repos') session.ensureRepo();
   return session;
 };
 
@@ -176,6 +192,10 @@ const run = async (proc, deps = {}) => {
   }
   const tty = proc.stdin.isTTY === true && stdout.isTTY === true;
   if (tty) return runUi(session, proc);
+  if (session.pane === 'repos') {
+    stderr.write('reslop: interactive terminal required\n');
+    return 1;
+  }
   try {
     await session.loadReady();
   } catch (error) {

package/lib/dashboard/model.js

@@ -5,6 +5,7 @@ const { folderOf, extOf } = tree;
 const files = require('../files.js');
 const { TASK_KINDS, taskKind } = files;
 
+const MINUTE_MS = 60_000;
 const RUNS_SHOWN = 6;
 const CHAIN_GAP_MS = 2000;
 const NPM_NAMED = /^npm (?:run|exec)(?:\s+-s)?\s+(\S+)/;
@@ -237,12 +238,25 @@ const versionFields = (pkg, outdatedMap) => {
   return { current, wanted: hit.wanted, latest: hit.latest };
 };
 
+const auditFields = (pkg, auditMap) => {
+  const finding = auditMap ? auditMap.get(pkg.name) : null;
+  return {
+    audit: Boolean(finding),
+    fix: finding && finding.fix ? finding.fix : '',
+    range: finding && finding.range ? finding.range : '',
+    severity: finding && finding.severity ? finding.severity : '',
+    title: finding && finding.title ? finding.title : '',
+  };
+};
+
 const modulesModel = (modules, auditMap, outdatedMap) => {
   const packages = modules.packages.map((pkg) => ({
     name: pkg.name,
     bytes: pkg.bytes,
     dev: pkg.dev,
-    audit: Boolean(auditMap && auditMap.get(pkg.name)),
+    transitive: Boolean(pkg.transitive),
+    chain: pkg.chain || '',
+    ...auditFields(pkg, auditMap),
     ...versionFields(pkg, outdatedMap),
   }));
   return { ...modules, packages };
@@ -266,6 +280,8 @@ const npmModel = (input) => {
   };
 };
 
+const minuteOf = (at) => Math.floor((at || 0) / MINUTE_MS);
+
 const filesModel = (input) => {
   const index = input.index;
   const ready = Boolean(index && index.ready);
@@ -288,7 +304,7 @@ const diffsModel = (input) => {
     dirs: groups.dirs,
     exts: groups.exts,
     files: input.entries.length,
-    samples: input.samples,
+    activity: input.activity ?? { minutes: [], live: false },
     delta: input.diffDelta,
   };
 };
@@ -329,4 +345,13 @@ const buildModel = (input) => ({
   tasks: tasksModel(input),
 });
 
-module.exports = { groupChanges, mergeRuns, scriptName, runName, buildModel };
+module.exports = {
+  MINUTE_MS,
+  minuteOf,
+  groupChanges,
+  mergeRuns,
+  scriptName,
+  runName,
+  npmModel,
+  buildModel,
+};

package/lib/dashboard/npm.js

@@ -60,7 +60,28 @@ const rankedPackages = (totals) => {
   );
 };
 
-const devOnlyNames = (pkg, lock) => {
+const DIRECT_SECTIONS = [
+  'dependencies',
+  'devDependencies',
+  'optionalDependencies',
+  'peerDependencies',
+];
+const CHILD_SECTIONS = [
+  'dependencies',
+  'optionalDependencies',
+  'peerDependencies',
+];
+const CHAIN_MARK = ' 🢒 ';
+
+const directNames = (pkg) => {
+  const names = new Set();
+  for (const section of DIRECT_SECTIONS) {
+    for (const name of declaredNames(pkg, section)) names.add(name);
+  }
+  return names;
+};
+
+const devNames = (pkg) => {
   const keep = new Set([
     ...declaredNames(pkg, 'dependencies'),
     ...declaredNames(pkg, 'optionalDependencies'),
@@ -69,16 +90,84 @@ const devOnlyNames = (pkg, lock) => {
   for (const name of declaredNames(pkg, 'devDependencies')) {
     if (!keep.has(name)) names.add(name);
   }
+  return names;
+};
+
+const entryName = (key) => {
+  const at = key.lastIndexOf(MODULE_PREFIX);
+  if (at < 0) return '';
+  const rest = key.slice(at + MODULE_PREFIX.length);
+  if (rest.startsWith('@')) {
+    const parts = rest.split('/');
+    if (!parts[1]) return '';
+    return `${parts[0]}/${parts[1]}`;
+  }
+  return rest.split('/')[0] || '';
+};
+
+const childNames = (entry) => {
+  const names = [];
+  if (!entry || typeof entry !== 'object') return names;
+  for (const section of CHILD_SECTIONS) {
+    const map = entry[section];
+    if (!map || typeof map !== 'object') continue;
+    for (const name of Object.keys(map)) {
+      if (!names.includes(name)) names.push(name);
+    }
+  }
+  return names;
+};
+
+const dependencyChildren = (lock) => {
+  const children = new Map();
   const packages = lockPackages(lock);
-  if (!packages) return names;
+  if (!packages) return children;
   for (const key of Object.keys(packages)) {
-    const entry = packages[key];
-    if (!entry || !entry.dev || !key.startsWith(MODULE_PREFIX)) continue;
-    const name = key.slice(MODULE_PREFIX.length);
-    if (!name || name.includes('/node_modules/') || keep.has(name)) continue;
-    names.add(name);
+    if (!key) continue;
+    const name = entryName(key);
+    if (!name) continue;
+    const list = children.get(name) ?? [];
+    for (const child of childNames(packages[key])) {
+      if (!list.includes(child)) list.push(child);
+    }
+    if (list.length) children.set(name, list);
   }
-  return names;
+  return children;
+};
+
+const parentChain = (name, declared, children) => {
+  if (declared.has(name)) return '';
+  const prev = new Map();
+  const queue = [];
+  const roots = [...declared].sort();
+  for (const root of roots) {
+    if (prev.has(root)) continue;
+    prev.set(root, '');
+    queue.push(root);
+  }
+  let head = 0;
+  while (head < queue.length) {
+    const at = queue[head];
+    head += 1;
+    const kids = children.get(at);
+    if (!kids) continue;
+    for (const kid of kids) {
+      if (prev.has(kid)) continue;
+      prev.set(kid, at);
+      if (kid !== name) {
+        queue.push(kid);
+        continue;
+      }
+      const path = [];
+      let cursor = at;
+      while (cursor) {
+        path.push(cursor);
+        cursor = prev.get(cursor) || '';
+      }
+      return path.join(CHAIN_MARK);
+    }
+  }
+  return '';
 };
 
 const lockVersion = (lock, name) => {
@@ -89,16 +178,24 @@ const lockVersion = (lock, name) => {
 };
 
 const topPackages = (ranked, pkg, lock) => {
-  const devNames = devOnlyNames(pkg, lock);
-  const rows = ranked.map((item) => ({
-    name: item.name,
-    bytes: item.bytes,
-    dev: devNames.has(item.name),
-    version: lockVersion(lock, item.name),
-  }));
-  const runtime = rows.filter((row) => !row.dev);
-  const devs = rows.filter((row) => row.dev);
-  return [...runtime, ...devs].slice(0, TOP_PACKAGES);
+  const declared = directNames(pkg);
+  const devs = devNames(pkg);
+  const children = dependencyChildren(lock);
+  const rows = ranked.map((item) => {
+    const direct = declared.has(item.name);
+    return {
+      name: item.name,
+      bytes: item.bytes,
+      dev: direct && devs.has(item.name),
+      transitive: !direct,
+      chain: parentChain(item.name, declared, children),
+      version: lockVersion(lock, item.name),
+    };
+  });
+  const runtime = rows.filter((row) => !row.dev && !row.transitive);
+  const development = rows.filter((row) => row.dev);
+  const nested = rows.filter((row) => row.transitive);
+  return [...runtime, ...development, ...nested];
 };
 
 const measureModules = async (root) => {
@@ -190,4 +287,4 @@ const readNpmSummary = async (top, previous) => {
   };
 };
 
-module.exports = { readNpmSummary };
+module.exports = { TOP_PACKAGES, readNpmSummary };

package/lib/files.js

@@ -6,19 +6,24 @@ const { listFilePath } = manifest;
 const REVIEW_DIR = '.review';
 const ORIGIN_ORDER = ['staged', 'unstaged', 'untracked', 'commit', 'pr'];
 const TASKS_FILE = 'TODOs';
-const REPO_TASKS_LABEL =
-  'Project Tasks: Backlog, Issues, Bug Reports, Feature Requests';
+const REPO_TASKS_LABEL = [
+  'Project Tasks: Feature requests, Bug reports,',
+  'Technical debt, Research, Security',
+].join(' ');
 const TASK_KINDS = [
-  { id: 'backlog', title: 'Backlog' },
-  { id: 'issues', title: 'Issues' },
-  { id: 'bugs', title: 'Bug Reports' },
-  { id: 'features', title: 'Feature Requests' },
+  { id: 'features', title: 'Feature requests' },
+  { id: 'bugs', title: 'Bug reports' },
+  { id: 'debt', title: 'Technical debt' },
+  { id: 'research', title: 'Research' },
+  { id: 'security', title: 'Security' },
 ];
 const TASK_KIND_IDS = new Set(TASK_KINDS.map((kind) => kind.id));
+const TASK_KIND_ALIAS = { backlog: 'debt', issues: 'debt' };
 
 const taskKind = (todo) => {
   const kind = todo && todo.kind;
-  return TASK_KIND_IDS.has(kind) ? kind : 'backlog';
+  if (TASK_KIND_IDS.has(kind)) return kind;
+  return TASK_KIND_ALIAS[kind] ?? 'debt';
 };
 
 const taskTitle = (id) => {
@@ -236,6 +241,7 @@ module.exports = {
   isTotalEntry,
   makeTaskItem,
   fileStatus,
+  lineDelta,
   fileEntries,
   fileTotals,
   relativeAge,

package/lib/find.js

@@ -0,0 +1,61 @@
+'use strict';
+
+const matchesIn = (text, query) => {
+  const spans = [];
+  if (!query || !text) return spans;
+  const hay = text.toLowerCase();
+  const needle = query.toLowerCase();
+  const step = needle.length;
+  let from = 0;
+  while (from <= hay.length - step) {
+    const at = hay.indexOf(needle, from);
+    if (at < 0) break;
+    spans.push({ start: at, end: at + step });
+    from = at + step;
+  }
+  return spans;
+};
+
+const fileMatches = (entries, query) => {
+  const hits = [];
+  if (!query) return hits;
+  for (let index = 0; index < entries.length; index++) {
+    const entry = entries[index];
+    const path = entry && entry.path ? entry.path : '';
+    if (!path) continue;
+    for (const span of matchesIn(path, query)) {
+      hits.push({ index, path, start: span.start, end: span.end });
+    }
+  }
+  return hits;
+};
+
+const activeHit = (entries, find) => {
+  if (!find || !find.query) return null;
+  const hits = fileMatches(entries, find.query);
+  if (!hits.length) return null;
+  const count = hits.length;
+  let at = find.at % count;
+  if (at < 0) at += count;
+  return hits[at];
+};
+
+const keptPrefix = (shown, full) => {
+  const mark = shown.endsWith('…') && shown !== full ? 1 : 0;
+  const keep = shown.length - mark;
+  if (!full.startsWith(shown.slice(0, keep))) return -1;
+  return keep;
+};
+
+const spansFor = (shown, full, query, hit) => {
+  const spans = matchesIn(shown, query);
+  if (!hit || hit.path !== full) return spans;
+  const keep = keptPrefix(shown, full);
+  if (keep < 0 || hit.start >= keep) return spans;
+  return spans.map((span) => ({
+    ...span,
+    on: span.start === hit.start,
+  }));
+};
+
+module.exports = { matchesIn, fileMatches, activeHit, spansFor };

package/lib/git-deps.js

@@ -346,6 +346,7 @@ const revertFile = (top, rel, items) => {
 };
 
 module.exports = {
+  collectReportAsync,
   finishLoad,
   loadExtras,
   captureFile,

package/lib/git-worktree.js

@@ -8,7 +8,7 @@ const { runProc, runProcSync, isAbort, oneLine } = utilities;
 const diff = require('./diff/diff.js');
 const { parseDiff, synthesizeNewFile, itemsFromFiles } = diff;
 const files = require('./files.js');
-const { itemPath, isReadOnlyOrigin, REVIEW_DIR } = files;
+const { itemPath, isReadOnlyOrigin, lineDelta, REVIEW_DIR } = files;
 const edit = require('./diff/edit.js');
 const { replaceBlockAdds } = edit;
 
@@ -119,6 +119,8 @@ const untrackedArgs = (paths) => [
 
 const isReviewFile = (rel) => rel.split(/[/\\]/)[0] === REVIEW_DIR;
 
+const isDirEntry = (rel) => rel.endsWith('/');
+
 const dropReviewItems = (items) =>
   items.filter((item) => !isReviewFile(itemPath(item)));
 
@@ -132,7 +134,9 @@ const listScopeFiles = (top, paths = [], options = {}) => {
     ? ['ls-tree', '-r', '--name-only', '-z', rev, ...pathArgs(paths)]
     : ['ls-files', '-co', '--exclude-standard', '-z', ...pathArgs(paths)];
   const result = requireOk(runGit(args, top), 'ls-files failed');
-  const names = namesFromLs(result.stdout).filter((rel) => !isReviewFile(rel));
+  const names = namesFromLs(result.stdout).filter(
+    (rel) => !isReviewFile(rel) && !isDirEntry(rel),
+  );
   names.sort((left, right) => left.localeCompare(right, 'en'));
   return names;
 };
@@ -150,12 +154,12 @@ const binaryNewFile = (rel) => ({
 const untrackedItemsFrom = (top, names) => {
   const files = [];
   for (const rel of names) {
-    if (isReviewFile(rel)) continue;
+    if (isReviewFile(rel) || isDirEntry(rel)) continue;
     let buf;
     try {
       buf = fs.readFileSync(path.join(top, rel));
     } catch (error) {
-      if (error.code === 'ENOENT') continue;
+      if (error.code === 'ENOENT' || error.code === 'EISDIR') continue;
       throw error;
     }
     if (isBinaryBuffer(buf)) files.push(binaryNewFile(rel));
@@ -164,6 +168,19 @@ const untrackedItemsFrom = (top, names) => {
   return itemsFromFiles(files, 'untracked');
 };
 
+const countUntrackedAdded = async (top) => {
+  try {
+    const result = await runGitAsync(untrackedArgs([]), top);
+    if (result.status !== 0) return 0;
+    const items = untrackedItemsFrom(top, namesFromLs(result.stdout));
+    let added = 0;
+    for (const item of items) added += lineDelta(item).added;
+    return added;
+  } catch {
+    return 0;
+  }
+};
+
 const groupByPath = (items) => {
   const byPath = new Map();
   for (const item of items) {
@@ -424,6 +441,7 @@ module.exports = {
   resolveRev,
   currentBranch,
   fileText,
+  countUntrackedAdded,
   listScopeFiles,
   readSnapshot,
   readSnapshotAsync,

package/lib/keys.js

@@ -8,6 +8,7 @@ const { DIFF_DISABLED, FILES_GIT_DISABLED, FILES_HIDDEN } = actions;
 const { TASKS_DISABLED, BRANCHES_DISABLED } = actions;
 const { COMMITS_DISABLED, UNIT_DISABLED, NPM_DISABLED } = actions;
 const { diffGitDisabled, branchGitDisabled, commitGitDisabled } = actions;
+const { entryHasDiff, lineHasDiff, withoutMoves } = actions;
 const { actionLetter, buttonWord } = actions;
 const { CONFIRM, confirmPrefix, promptFromChoices } = actions;
 
@@ -20,14 +21,35 @@ const CSI_KEYS = {
   F: 'end',
 };
 
+const SS3_KEYS = {
+  ...CSI_KEYS,
+  P: 'f1',
+  Q: 'f2',
+  R: 'f3',
+  S: 'f4',
+};
+
 const CSI_TILDE = {
   1: 'home',
+  2: 'insert',
   3: 'delete',
   4: 'end',
   5: 'pageUp',
   6: 'pageDown',
   7: 'home',
   8: 'end',
+  11: 'f1',
+  12: 'f2',
+  13: 'f3',
+  14: 'f4',
+  15: 'f5',
+  17: 'f6',
+  18: 'f7',
+  19: 'f8',
+  20: 'f9',
+  21: 'f10',
+  23: 'f11',
+  24: 'f12',
 };
 
 const CSI_MAX = 16;
@@ -121,7 +143,7 @@ const parseEsc = (text, start) => {
   if (rest.startsWith('\x1b[')) return parseCsi(rest, start);
   if (rest.startsWith('\x1bO')) {
     if (rest.length < 3) return NEED_MORE;
-    const key = CSI_KEYS[rest[2]];
+    const key = SS3_KEYS[rest[2]];
     return key ? keyAt(key, start + 3) : keyAt('escape', start + 1);
   }
   return keyAt('escape', start + 1);
@@ -184,6 +206,9 @@ module.exports = {
   NPM_DISABLED,
   UNIT_DISABLED,
   diffGitDisabled,
+  entryHasDiff,
+  lineHasDiff,
+  withoutMoves,
   branchGitDisabled,
   commitGitDisabled,
   decodeChunk,