reslop 0.2.5 → 0.2.7

package/CHANGELOG.md

@@ -2,6 +2,25 @@
 
 ## [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
+- Compact related failure contexts in test runnter logs
+- Save the raw command output beside the reduced log
+- Improve test results rendering
+- Update the dashboard from file system events, without timers
+- Record `reslop t` runs under `.log/.runs/` show progress on the dashboard
+- Implement tasks screen: backlog, issues, bugs, features
+
 ## [0.2.5][] - 2026-09-30
 
 - Remove UI and filesystem polling timers, refresh on events
@@ -153,7 +172,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.2.5...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
 [0.2.3]: https://github.com/tshemsedinov/reslop/compare/v0.2.1...v0.2.3

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2026 Timur Shemsedinov
+Copyright (c) 2026 Timur Shemsedinov and other contributors (see github)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -17,21 +17,19 @@ Open a change, leave findings and a backlog, and prepare a repair plan for the a
 Review → Plan → Repair → Verify
 ```
 
+- Live dashboard: files, diffs, tasks, branches, commits, run, and npm, updated in real time
 - Leave feedback, a project backlog, and in-place code proposals as a repair plan
 - Review uncommitted git diffs, a given commit, a GitHub PR, or a GitLab MR
 - File-scope review mode: not just diffs, with editor mode
 - Stage, unstage, or revert each contiguous block of diff lines
 - Auto-reload local diffs when files change, keeping the current screen
 - Import GitHub PR and GitLab MR review comments into the local plan for AI
-- Commits list: brief and full, view a commit's diff, commit, amend, fixup, reword, drop, pull, and push
-- Branches: checkout, create, rebase, drop, pull, and push
+- Commits list: brief and full, view a commit's diff, commit, amend, apply, edit, fixup, and delete
+- Branches: checkout, create, rebase, delete, pull, and push
 - npm scripts and bins: run, edit, and reorder; double-click to run; clean logs older than 5 days
-- Long lines wrap in the diff view; the editor scrolls horizontally
 - Reduced test and lint output for agents: failures and a short summary, not passing noise
-- Review each npm dependency once across `package.json` and the lockfile
-- Propose unused removals, npm audit fixes, and outdated updates as diffs
-- Code highlighting and intra-line diffs: unified, mixed, and side-by-side
-- Auto-update patch and minor releases; confirm a new major
+- Review, renew, audit and update npm dependencies in `package.json` and the lockfile
+- Auto-update reslop patch and minor releases; confirm a new major
 - Work with git, npm and fetch in background
 
 ## Install
@@ -45,8 +43,8 @@ Requires Node.js `>=18.15.0`.
 
 ## Usage
 
-- `reslop` uncommitted diffs in this repository
-- `reslop path/file` show only that path or file
+- `reslop` live dashboard of this repository; press a block key to open its screen
+- `reslop path/file` show only that path or file (starts on the file list)
 - `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
@@ -61,10 +59,12 @@ Prefix each program in an npm script with `reslop t --`. Keep `&&` between those
 "test": "reslop t -- npm run -s lint && reslop t -- node --test"
 ```
 
-The report is Markdown: failures, diagnostics, and a short summary. Passing results are omitted and similar problems are grouped. The same text is saved under `.log/`. Set `RESLOP_OUTPUT=raw` to pass the command through unchanged. The review screen runs scripts in raw mode and applies its own filter once.
+The report is Markdown: failures, diagnostics, and a short summary. Passing results are omitted and similar problems are grouped. The reduced report and the raw output are both saved under `.log/`. The report names the raw file for an agent to read when a detail is missing. Set `RESLOP_OUTPUT=raw` to pass the command through unchanged. The review screen runs scripts in raw mode and applies its own filter once.
 
 Run the full check with `npm t`. Run one or more test files with `reslop t -- node --test <files>`. New reviews include those two commands in the agent instructions.
 
+`reslop t` records each run in `.log/.runs/` so that the dashboard can show commands started by an agent in another terminal.
+
 Reviews go in `.review/YYYY-MM-DD-NN.md` with frontmatter `status`:
 
 - `editing`: still writing the review in reslop
@@ -87,5 +87,5 @@ Reviews go in `.review/YYYY-MM-DD-NN.md` with frontmatter `status`:
 
 ## License
 
-Copyright (c) 2026 Timur Shemsedinov.
+Copyright (c) 2026 Timur Shemsedinov and other contributors (see github).
 This is [MIT](./LICENSE) licensed software.

package/bin/reslop.js

@@ -16,12 +16,7 @@ const fail = (reason) => {
   process.exit(1);
 };
 
-process.on('uncaughtException', (error) => fail(error));
-process.on('unhandledRejection', (reason) => fail(reason));
+process.on('uncaughtException', fail);
+process.on('unhandledRejection', fail);
 
-run(process).then(
-  (code) => {
-    process.exit(code);
-  },
-  (error) => fail(error),
-);
+run(process).then((code) => process.exit(code), fail);

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],
@@ -84,6 +88,30 @@ const DARK_UI = {
   stagedAddLineBg: [0x26, 0x26, 0x2e],
   stagedAddCharFg: [0xff, 0xff, 0xff],
   stagedAddCharBg: [0x4e, 0x4e, 0x58],
+  dashBg: [0x00, 0x00, 0x00],
+  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],
+  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 = {
@@ -167,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],
@@ -176,6 +208,30 @@ const LIGHT_UI = {
   stagedAddLineBg: [0xea, 0xec, 0xef],
   stagedAddCharFg: [0x0f, 0x14, 0x19],
   stagedAddCharBg: [0xcc, 0xd1, 0xd7],
+  dashBg: [0xff, 0xff, 0xff],
+  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],
+  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 = {
@@ -233,26 +289,16 @@ const THEME_NAMES = Object.keys(PALETTES);
 const applyColors = (into, from) => {
   for (const key of Object.keys(from)) {
     const src = from[key];
-    let dst = into[key];
-    if (!dst) {
-      dst = [0, 0, 0];
-      into[key] = dst;
-    }
+    const dst = into[key];
     dst[0] = src[0];
     dst[1] = src[1];
     dst[2] = src[2];
   }
-  return into;
-};
-
-const cloneColors = (colors) => {
-  const into = Array.isArray(colors) ? [] : {};
-  return applyColors(into, colors);
 };
 
-const THEME = cloneColors(DARK_UI);
-const CODE_FG = cloneColors(DARK_CODE);
-const LOG_COL_FG = cloneColors(DARK_LOG_COLS);
+const THEME = structuredClone(DARK_UI);
+const CODE_FG = structuredClone(DARK_CODE);
+const LOG_COL_FG = structuredClone(DARK_LOG_COLS);
 let currentTheme = 'dark';
 
 const setTheme = (name) => {
@@ -339,22 +385,27 @@ const visibleWidth = (text) => {
   return width;
 };
 
-const truncateVisible = (text, width) => {
+const truncateVisible = (text, width, mark = '') => {
   if (width <= 0) return '';
-  if (visibleWidth(text) <= width) return text;
   const plain = stripAnsi(text);
+  if (visibleWidth(plain) <= width) return text;
+  const markW = mark ? visibleWidth(mark) : 0;
+  const fits = markW > 0 && markW <= width;
+  const limit = fits ? width - markW : width;
   const parts = graphemes(plain);
   let used = 0;
   let out = '';
   for (const ch of parts) {
     const w = graphemeWidth(ch, used);
-    if (used + w > width) break;
+    if (used + w > limit) break;
     out += ch;
     used += w;
   }
-  return out;
+  return fits ? `${out}${mark}` : out;
 };
 
+const trimVisible = (text, width) => truncateVisible(text, width, '…');
+
 const csiLength = (text, index) => {
   if (text[index] !== ESC || text[index + 1] !== '[') return 0;
   let at = index + 2;
@@ -459,7 +510,7 @@ const foregroundOn = (text, bgRgb) => {
     const kept = keepFgParams(sgrParams(seq));
     const reset = kept.includes(0);
     const rest = kept.filter((code) => code !== 0);
-    if (reset) out += `${ESC}[0m`;
+    if (reset) out += RESET;
     out += ground;
     if (rest.length) out += `${ESC}[${rest.join(';')}m`;
   }
@@ -487,6 +538,8 @@ module.exports = {
   graphemeWidth,
   visibleWidth,
   truncateVisible,
+  trimVisible,
+  firstGrapheme,
   clipAnsi,
   foregroundOn,
 };

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

@@ -50,12 +50,14 @@ const BRANCH_METHODS = [
   'pushAsync',
 ];
 
+const VIEW_CAPS = { read: true, changes: false, branches: false, review: true };
+
 const SOURCE_CAPS = {
   local: { read: true, changes: true, branches: true, review: true },
-  commit: { read: true, changes: false, branches: false, review: true },
-  pr: { read: true, changes: false, branches: false, review: true },
-  mr: { read: true, changes: false, branches: false, review: true },
-  readonly: { read: true, changes: false, branches: false, review: true },
+  commit: VIEW_CAPS,
+  pr: VIEW_CAPS,
+  mr: VIEW_CAPS,
+  readonly: VIEW_CAPS,
 };
 
 const withReadOnly = (caps, readOnly) => {
@@ -88,12 +90,10 @@ const sessionCapabilities = (options) => {
   if (options.capabilities) return withReadOnly(options.capabilities, readOnly);
   if (options.rev) return capabilitiesFor('commit', { readOnly });
   const source = options.change && options.change.source;
-  if (source && SOURCE_CAPS[source]) {
-    return capabilitiesFor(source, { readOnly });
-  }
+  if (SOURCE_CAPS[source]) return capabilitiesFor(source, { readOnly });
   const repoCaps = options.repo && options.repo.capabilities;
   if (repoCaps) return withReadOnly(repoCaps, readOnly);
-  return capabilitiesFor(readOnly ? 'readonly' : 'local');
+  return capabilitiesFor('local', { readOnly });
 };
 
 module.exports = {

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;
@@ -44,12 +46,8 @@ const REMOTE_CHANGE = {
   },
 };
 
-const errorMessage = (reason) => {
-  if (reason instanceof Error) return reason.message;
-  if (reason === null || reason === undefined) return '';
-  if (typeof reason === 'string') return reason;
-  return `${reason}`;
-};
+const errorMessage = (reason) =>
+  reason instanceof Error ? reason.message : `${reason ?? ''}`;
 
 const fail = (stderr, reason) => {
   stderr.write(`reslop: ${errorMessage(reason)}\n`);
@@ -62,81 +60,58 @@ const parseArgv = (argv) => {
   let readOnly = false;
   let theme = 'dark';
   for (const arg of argv) {
-    if (arg === '-n') {
-      newReview = true;
-      continue;
-    }
-    if (arg === '-r') {
-      readOnly = true;
-      continue;
-    }
-    if (arg === '-light') {
-      theme = 'light';
-      continue;
-    }
-    if (arg.startsWith('-')) {
-      throw new Error(`unknown option ${arg}`);
-    }
-    paths.push(arg);
+    if (arg === '-n') newReview = true;
+    else if (arg === '-r') readOnly = true;
+    else if (arg === '-light') theme = 'light';
+    else if (arg.startsWith('-')) throw new Error(`unknown option ${arg}`);
+    else paths.push(arg);
   }
   return { paths, newReview, readOnly, theme };
 };
 
-const looksLikeRev = (spec) => {
-  if (!spec) return false;
-  if (HEX_REV.test(spec)) return true;
-  if (HEAD_REV.test(spec)) return true;
-  return RANGE_REV.test(spec);
-};
+const looksLikeRev = (spec) =>
+  HEX_REV.test(spec) || HEAD_REV.test(spec) || RANGE_REV.test(spec);
 
 const resolveScope = async (cwd, paths, repo) => {
   if (!paths.length) return { rev: null, paths };
   const first = paths[0];
-  if (await exists(path.resolve(cwd, first))) {
-    return { rev: null, paths };
-  }
+  if (await exists(path.resolve(cwd, first))) return { rev: null, paths };
   const resolved = repo.resolveRev(cwd, first);
   if (resolved) {
-    if (paths.length > 1) {
-      throw new Error('use a commit or a path, not both');
-    }
+    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}`);
-  }
+  if (looksLikeRev(first)) throw new Error(`bad revision ${first}`);
   return { rev: null, paths };
 };
 
-const sessionOptions = (proc, deps, args, env, extra) => ({
-  cwd: deps.cwd ?? proc.cwd(),
-  stdin: proc.stdin,
-  stdout: proc.stdout,
-  color: proc.stdout.isTTY === true && !env.NO_COLOR,
-  startPane: 'files',
-  newReview: args.newReview,
-  readOnly: args.readOnly,
-  audit: true,
-  ...extra,
-});
-
-const openLocalSession = async (proc, deps, args, selected, env) => {
-  const cwd = deps.cwd ?? proc.cwd();
+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 });
-  const repo = attachCapabilities(rawRepo, capabilities);
-  const extra = {
-    repo,
+  const direct = scope.rev || scope.paths.length;
+  return {
+    repo: attachCapabilities(rawRepo, capabilities),
     paths: scope.paths,
     rev: scope.rev,
     capabilities,
+    startPane: direct ? 'files' : 'dashboard',
   };
-  const options = sessionOptions(proc, deps, args, env, extra);
-  const session = new Session(options);
-  session.ensureRepo();
-  return session;
 };
 
 const remoteRepo = (deps, selected, env, cwd) => {
@@ -160,26 +135,32 @@ const remoteRepo = (deps, selected, env, cwd) => {
   });
 };
 
-const openRemoteSession = (proc, deps, args, selected, env) => {
-  const cwd = deps.cwd ?? proc.cwd();
-  const capabilities = capabilitiesFor(selected.kind, {
-    readOnly: args.readOnly,
-  });
-  const repo = remoteRepo(deps, selected, env, cwd);
-  const extra = { repo, paths: selected.paths, capabilities };
-  const options = sessionOptions(proc, deps, args, env, extra);
-  const session = new Session(options);
-  session.ensureRepo();
-  return session;
-};
+const remoteOptions = (deps, args, selected, cwd, env) => ({
+  repo: remoteRepo(deps, selected, env, cwd),
+  paths: selected.paths,
+  capabilities: capabilitiesFor(selected.kind, { readOnly: args.readOnly }),
+});
 
 const loadSession = async (proc, deps, args) => {
   const env = proc.env ?? {};
+  const cwd = deps.cwd ?? proc.cwd();
   const selected = selectChangeSource(args.paths);
-  if (REMOTE_CHANGE[selected.kind]) {
-    return openRemoteSession(proc, deps, args, selected, env);
-  }
-  return openLocalSession(proc, deps, args, selected, env);
+  const extra = REMOTE_CHANGE[selected.kind]
+    ? remoteOptions(deps, args, selected, cwd, env)
+    : await localOptions(deps, args, selected, cwd);
+  const session = new Session({
+    cwd,
+    stdin: proc.stdin,
+    stdout: proc.stdout,
+    color: proc.stdout.isTTY === true && !env.NO_COLOR,
+    startPane: 'files',
+    newReview: args.newReview,
+    readOnly: args.readOnly,
+    audit: true,
+    ...extra,
+  });
+  if (session.pane !== 'repos') session.ensureRepo();
+  return session;
 };
 
 const runUi = async (session, proc) => {
@@ -196,7 +177,7 @@ const run = async (proc, deps = {}) => {
   const stderr = proc.stderr;
   let args;
   try {
-    args = parseArgv(proc.argv.slice(2));
+    args = parseArgv(argv);
   } catch (error) {
     fail(stderr, error);
     stderr.write(`${USAGE}\n`);
@@ -211,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) {
@@ -228,5 +213,6 @@ module.exports = {
   errorMessage,
   parseArgv,
   resolveScope,
+  loadSession,
   run,
 };

package/lib/clipboard.js

@@ -6,62 +6,46 @@ const { spawnSync } = childProcess;
 const ansi = require('./ansi.js');
 const { ESC } = ansi;
 const utilities = require('./utilities.js');
-const { clipTools, spawnBase } = utilities;
+const { spawnBase } = utilities;
 
 const CLIP_TIMEOUT_MS = 1000;
 
-const osc52 = (text) => {
-  const b64 = Buffer.from(text, 'utf8').toString('base64');
-  return `${ESC}]52;c;${b64}\x07`;
+const COPY_TOOLS = {
+  win32: [{ cmd: 'clip', args: [] }],
+  darwin: [{ cmd: 'pbcopy', args: [] }],
+  unix: [
+    { cmd: 'wl-copy', args: [] },
+    { cmd: 'xclip', args: ['-selection', 'clipboard'] },
+    { cmd: 'xsel', args: ['--clipboard', '--input'] },
+  ],
 };
 
-const runClip = (cmd, args, text) => {
-  const result = spawnSync(
-    cmd,
-    args,
-    spawnBase({
-      input: text,
-      encoding: 'utf8',
-      timeout: CLIP_TIMEOUT_MS,
-    }),
-  );
-  if (result.error) return false;
-  return result.status === 0;
+const PASTE_TOOLS = {
+  win32: [
+    { cmd: 'powershell', args: ['-NoProfile', '-Command', 'Get-Clipboard'] },
+  ],
+  darwin: [{ cmd: 'pbpaste', args: [] }],
+  unix: [
+    { cmd: 'wl-paste', args: ['--no-newline'] },
+    { cmd: 'xclip', args: ['-selection', 'clipboard', '-o'] },
+    { cmd: 'xsel', args: ['--clipboard', '--output'] },
+  ],
 };
 
-const UNIX_PASTE = [
-  { cmd: 'wl-paste', args: ['--no-newline'] },
-  { cmd: 'xclip', args: ['-selection', 'clipboard', '-o'] },
-  { cmd: 'xsel', args: ['--clipboard', '--output'] },
-];
-
 let copied = '';
 
-const pasteTools = (platform = process.platform) => {
-  if (platform === 'win32') {
-    const args = ['-NoProfile', '-Command', 'Get-Clipboard'];
-    return [{ cmd: 'powershell', args }];
-  }
-  if (platform === 'darwin') return [{ cmd: 'pbpaste', args: [] }];
-  return UNIX_PASTE;
-};
+const platformTools = (tools) => tools[process.platform] ?? tools.unix;
 
-const readPaste = (cmd, args) => {
-  const result = spawnSync(
-    cmd,
-    args,
-    spawnBase({ encoding: 'utf8', timeout: CLIP_TIMEOUT_MS }),
+const runTool = (tool, input) =>
+  spawnSync(
+    tool.cmd,
+    tool.args,
+    spawnBase({ input, encoding: 'utf8', timeout: CLIP_TIMEOUT_MS }),
   );
-  if (result.error || result.status !== 0) return '';
-  return result.stdout || '';
-};
 
-const systemPaste = () => {
-  for (const tool of pasteTools()) {
-    const text = readPaste(tool.cmd, tool.args);
-    if (text) return text;
-  }
-  return '';
+const osc52 = (text) => {
+  const b64 = Buffer.from(text, 'utf8').toString('base64');
+  return `${ESC}]52;c;${b64}\x07`;
 };
 
 const copyText = (text, stdout) => {
@@ -72,12 +56,20 @@ const copyText = (text, stdout) => {
     stdout.write(osc52(text));
     ok = true;
   }
-  for (const tool of clipTools()) {
-    if (runClip(tool.cmd, tool.args, text)) return true;
+  for (const tool of platformTools(COPY_TOOLS)) {
+    const result = runTool(tool, text);
+    if (!result.error && result.status === 0) return true;
   }
   return ok;
 };
 
-const pasteText = () => systemPaste() || copied;
+const pasteText = () => {
+  for (const tool of platformTools(PASTE_TOOLS)) {
+    const result = runTool(tool);
+    if (result.error || result.status !== 0) continue;
+    if (result.stdout) return result.stdout;
+  }
+  return copied;
+};
 
 module.exports = { osc52, copyText, pasteText };