reslop 0.3.0 → 0.3.2

package/lib/render/repos.js

@@ -9,6 +9,7 @@ const { paintTile, composeBands, tileHits, pageFill } = tiles;
 const { segmentsWidth, clipSegments, blinkTone } = tiles;
 const { size } = require('../common/format.js');
 const { isHot } = require('./table.js');
+const { paintNameEdit } = require('./name-edit.js');
 
 const REPO_MIN_H = 6;
 const MARGIN_MIN_H = 12;
@@ -40,11 +41,24 @@ const fitAside = (left, right, width) => {
   return [...clipped, seg(' '.repeat(gap)), ...right];
 };
 
+// A linked worktree hangs under its main one, the branch tells them apart
+const branchSegs = (row) => {
+  if (!row.branch && !row.head) return [];
+  const label = row.branch || `(${row.head})`;
+  const segs = [seg(`  ⎇ ${label}`, 'sha')];
+  if (row.dirty) segs.push(seg('*', 'warn', true));
+  if (row.locked) segs.push(seg(' locked', 'muted'));
+  return segs;
+};
+
 const titleLine = (row, ctx, selected, width) => {
   const hot = isHot(row.activityAt, ctx.now);
   const tone = hot ? blinkTone(ctx.frame) : 'text';
-  const left = [seg(row.name, tone, selected || hot)];
+  const left = [];
+  if (row.linked) left.push(seg('↳ ', 'muted'));
+  left.push(seg(row.name, tone, selected || hot));
   if (hot) left.push(seg(' ●', tone, true));
+  left.push(...branchSegs(row));
   const right = [];
   if (rowPending(row)) right.push(spin(ctx.frame), seg(' '));
   const label = row.filesReady ? size(row.bytes) : '…';
@@ -90,7 +104,7 @@ const resultNote = (run) => {
   return [];
 };
 
-const runLine = (row, ctx) => {
+const runState = (row, ctx) => {
   if (!row.runsReady) return [seg('run: ', 'muted'), spin(ctx.frame)];
   const run = row.run;
   if (!run) return [seg('run: ', 'muted'), seg('idle', 'muted')];
@@ -113,6 +127,17 @@ const runLine = (row, ctx) => {
   ];
 };
 
+// The agents working in the directory go on the line of the run
+const agentsNote = (row) => {
+  const count = row.agents ?? 0;
+  return [
+    seg('  agents active: ', 'muted'),
+    seg(`${count}`, count ? 'warn' : 'muted', count > 0),
+  ];
+};
+
+const runLine = (row, ctx) => [...runState(row, ctx), ...agentsNote(row)];
+
 const npmLine = (row, ctx) => {
   if (!row.npmReady) return [seg('deps: ', 'muted'), spin(ctx.frame)];
   const npm = row.npm;
@@ -191,14 +216,29 @@ const paintRepos = (model, bands, color) => {
   return painted;
 };
 
+// One row of tiles above another list, paged sideways
+const paintTreeBand = (model, width, height, color) => {
+  const grid = equalGrid(width, height, model.tiles.length, 34, height);
+  const page = pageWindow(model.tiles.length, model.cursor, grid.cap);
+  const shown = model.tiles.slice(page.start, page.end);
+  const bands = placeEqualTiles(shown, grid);
+  const painted = paintRepos(model, bands, color);
+  const rows = composeBands(bands, painted, width, height, color);
+  return { rows, bands, cols: grid.cols };
+};
+
+// The name of a new worktree is typed in a row above the tiles
 const paintBodyRepos = (view, width, color, bodyH, headerLines) => {
   const model = view.repos;
   if (!model || !model.tiles.length) {
     const blank = paintBodyFill(width, color, 'files');
     return paneResult({ body: new Array(bodyH).fill(blank) });
   }
-  const margin = bodyH >= MARGIN_MIN_H ? 1 : 0;
-  const height = Math.max(1, bodyH - margin * 2);
+  const naming = view.compose?.kind === 'worktree';
+  const edit = naming ? paintNameEdit(view.compose, width, color) : null;
+  const lead = edit ? 1 : 0;
+  const margin = bodyH - lead >= MARGIN_MIN_H ? 1 : 0;
+  const height = Math.max(1, bodyH - lead - margin * 2);
   const grid = equalGrid(width, height, model.tiles.length, 34, REPO_MIN_H);
   const page = pageWindow(model.tiles.length, model.cursor, grid.cap);
   const shown = model.tiles.slice(page.start, page.end);
@@ -206,9 +246,13 @@ const paintBodyRepos = (view, width, color, bodyH, headerLines) => {
   const painted = paintRepos(model, bands, color);
   const rows = composeBands(bands, painted, width, height, color);
   const pad = new Array(margin).fill(pageFill(width, color));
-  const body = [...pad, ...rows, ...pad];
-  const fileHits = tileHits(bands, headerLines + margin);
-  return { ...paneResult({ body, fileHits }), gridCols: grid.cols };
+  const head = edit ? [edit.row] : [];
+  const body = [...head, ...pad, ...rows, ...pad];
+  const fileHits = tileHits(bands, headerLines + lead + margin);
+  const typing = edit ? { cursor: { ...edit.cursor, row: 0 } } : {};
+  const editHits = edit ? edit.edits.map((span) => ({ ...span, row: 0 })) : [];
+  const result = paneResult({ body, fileHits, editHits, ...typing });
+  return { ...result, gridCols: grid.cols };
 };
 
-module.exports = { paintBodyRepos };
+module.exports = { paintBodyRepos, paintTreeBand };

package/lib/render/status.js

@@ -9,6 +9,7 @@ const { npmStatus } = require('./dashboard/blocks.js');
 const { menuBoxWidth, dropBox, menuFaces } = require('./menu.js');
 const field = require('./field.js');
 const { paintPlanFace, paintImportStatus, paintFindStatus } = field;
+const { fieldHit } = field;
 const { fileTotals } = files;
 const { CONFIRM, confirmPrefix, promptFromChoices } = actions;
 const { THEME, paint, visibleWidth } = ansi;
@@ -267,8 +268,8 @@ const paintTasksLeft = (view, text, color) => {
   const before = text.slice(0, place.at);
   const after = text.slice(place.at + place.face.length);
   const searching = Boolean(view.planOpen && view.planQuery);
-  const comboFg = searching ? THEME.searchFg : THEME.shaFg;
-  const comboBg = searching ? THEME.searchBg : THEME.chromeBg;
+  const comboFg = searching ? THEME.warnFg : THEME.shaFg;
+  const comboBg = THEME.chromeBg;
   const branch = paintBranchHead(before, view.branch, color);
   const head = branch ?? paintStatusLeft(before, color);
   const face = paintPlanFace(view, place.face, comboFg, comboBg, color);
@@ -293,7 +294,10 @@ const paintStatusLine = (view, status, width, color) => {
   const leftGap = ' '.repeat(layout.padLeft);
   const rightGap = ' '.repeat(layout.padRight);
   if (!color) {
-    return layout.clipped + leftGap + layout.msg + rightGap + layout.right;
+    const left = view.planOpen
+      ? paintTasksLeft(view, layout.clipped, false)
+      : layout.clipped;
+    return left + leftGap + layout.msg + rightGap + layout.right;
   }
   const bgRgb = THEME.chromeBg;
   const head = statusHead(view, layout.clipped, color);
@@ -323,6 +327,19 @@ const statusPlanHit = (view, width, y) => {
   return { id: 'plan', y, x0, x1: x0 + visibleWidth(place.face) };
 };
 
+const statusEditHits = (view, width, y) => {
+  const editor = view.import?.editor ?? view.find?.editor;
+  if (editor) {
+    const x = view.import ? 5 : 2;
+    return [fieldHit(editor, x, Math.max(0, width - x), y)];
+  }
+  if (!view.planOpen || !view.planEditor) return [];
+  const layout = statusLayout(view, view.status ?? '', width);
+  const place = planFace(view, layout.clipped);
+  if (!place) return [];
+  return [fieldHit(view.planEditor, place.x, visibleWidth(place.face), y)];
+};
+
 const planMenu = (view, width, color, statusY) => {
   if (view.pane !== 'tasks' || !view.planOpen || statusY < 3) return null;
   const names = view.planNames ?? [];
@@ -333,7 +350,7 @@ const planMenu = (view, width, color, statusY) => {
   const room = Math.max(1, statusY - 2);
   const box = dropBox(names, view.planCursor, view.planScroll, room);
   const boxW = menuBoxWidth(names, visibleWidth(place.face), width - x);
-  const faces = menuFaces(names, box, boxW, color);
+  const faces = menuFaces(names, box, boxW, color, view.planQuery);
   const lines = [];
   const hits = [];
   for (let i = 0; i < faces.length; i++) {
@@ -366,5 +383,6 @@ module.exports = {
   statusChoiceHits,
   statusBranchHit,
   statusPlanHit,
+  statusEditHits,
   planMenu,
 };

package/lib/report/render.js

@@ -3,15 +3,12 @@
 const { unquote } = require('../common/utilities.js');
 const { formatTable } = require('../runs/output.js');
 
-const NOTICE_HEAD =
-  'reslop: reduced output; passing results are omitted ' +
-  'and similar problems are grouped';
+const NOTICE_HEAD = 'Reduced output;';
 
 const notice = (rawFile) => {
-  let target = 'the matching raw log under `.log/`';
-  if (rawFile) target = `the raw log \`.log/${rawFile}\``;
-  const hint = `Agent: if this report hides a needed detail, read ${target}.`;
-  return `${NOTICE_HEAD}\n${hint}`;
+  let target = 'under `.log/`';
+  if (rawFile) target = `\`.log/${rawFile}\``;
+  return `${NOTICE_HEAD} the raw log if needed ${target}.`;
 };
 
 const addRow = (rows, key, value) => {

package/lib/report/run.js

@@ -1,9 +1,8 @@
 'use strict';
 
 const path = require('node:path');
-const { spawn } = require('node:child_process');
 
-const { spawnBase } = require('../common/process.js');
+const { spawnBase, spawnCmd, winCommand } = require('../common/process.js');
 const { withNewline } = require('../common/utilities.js');
 const { nextLogFile, saveLogs } = require('../runs/logs.js');
 const { toolHint, buildDocument } = require('./parse.js');
@@ -16,29 +15,12 @@ const {
 
 const OUTPUTS = ['md', 'raw'];
 const PIPE = ['ignore', 'pipe', 'pipe'];
-const CMD_SAFE = /^[\w./:=@+-]+$/;
-
-const quoteCmdArg = (arg) => {
-  const text = `${arg}`;
-  if (text && CMD_SAFE.test(text)) return text;
-  const escaped = text.replaceAll('"', '""').replaceAll('%', '"%"');
-  return `"${escaped}"`;
-};
-
-const winCommand = (program, args) => {
-  const parts = [program, ...args].map(quoteCmdArg);
-  return `"${parts.join(' ')}"`;
-};
+const EXIT_DRAIN_MS = 100;
 
 const spawnCommand = (command, options) => {
   const { program, args } = command;
-  if (process.platform !== 'win32') {
-    return spawn(program, args, spawnBase(options));
-  }
-  const shell = process.env.comspec || 'cmd.exe';
-  const line = winCommand(program, args);
-  const opts = spawnBase({ ...options, windowsVerbatimArguments: true });
-  return spawn(shell, ['/d', '/s', '/c', line], opts);
+  const shell = process.platform === 'win32';
+  return spawnCmd(program, args, spawnBase({ ...options, shell }));
 };
 
 const collect = (child, onOut, onErr) =>
@@ -46,9 +28,15 @@ const collect = (child, onOut, onErr) =>
     let out = '';
     let err = '';
     let settled = false;
-    const finish = (status) => {
+    let exitTimer = null;
+    const finish = (status, release = false) => {
       if (settled) return;
       settled = true;
+      clearTimeout(exitTimer);
+      if (release) {
+        if (child.stdout) child.stdout.destroy();
+        if (child.stderr) child.stderr.destroy();
+      }
       resolve({ status, stdout: out, stderr: err });
     };
     if (child.stdout) {
@@ -69,6 +57,10 @@ const collect = (child, onOut, onErr) =>
       err += `${error.message}\n`;
       finish(1);
     });
+    child.on('exit', (status) => {
+      if (settled) return;
+      exitTimer = setTimeout(() => finish(status ?? 1, true), EXIT_DRAIN_MS);
+    });
     child.on('close', (status) => finish(status ?? 1));
   });
 
@@ -182,6 +174,7 @@ const runCapture = async (proc, deps = {}) => {
 };
 
 module.exports = {
+  collect,
   winCommand,
   runCapture,
 };

package/lib/review/agent-instructions.md

@@ -1,9 +1,14 @@
-- Execute reviews with `status` `editing, partial`
-- Do not start or change `done` review files
-- Work through unchecked items. After finishing one, mark it `[x]`
-- Mark `[x]` only near the end, after code changes are done and tests pass
-- For `code` items, replace added lines at that location
-- Set `status` to `partial` if some items remain, or `done` if all are `[x]`
+Work through unchecked items.
+
+- Run reviews with status `editing` or `partial`
+- Do not start or change reviews with status `done`
+- After finishing an item, mark it `[x]`
+- Mark `[x]` only after the code changes are done and tests pass
+- For `code` items, replace the added lines at the given location
+- Set `status` to `partial` if any items remain, or `done` if all are `[x]`
 - Do not redo items already marked `[x]`
-- Run the full check with `npm t`
-- Run specific test files with `reslop t -- node --test <files>`
+- Run `npm t` for lint and tests that do not start processes
+- Run tests that start processes with `node --test <files>`
+- An item prefixed with `F<number>:` gets its own commit in this repo
+- Leave items without that prefix unstaged, do not commit or stage them
+- Do not add `Authored-by` or `Co-authored-by` unless the issue asks for it

package/lib/review/format.js

@@ -58,10 +58,6 @@ const TASK_TITLES = Object.fromEntries([
   ...TASK_KINDS.map((kind) => [kind.title, kind.id]),
 ]);
 
-const AGENT_BRIEF =
-  'Follow the agent instructions. Work through unchecked items. ' +
-  'Mark [x] only near exit after tests pass.';
-
 const AGENT_INSTRUCTIONS = resource(__dirname, 'agent-instructions.md').trim();
 
 const canonicalStatus = (raw) => {
@@ -179,8 +175,6 @@ const reviewHeader = (notes) => {
     '',
     '## Agent instructions',
     '',
-    AGENT_BRIEF,
-    '',
     AGENT_INSTRUCTIONS,
     '',
   ];

package/lib/runs/process.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const { spawn } = require('node:child_process');
-const { spawnBase } = require('../common/process.js');
+const { spawnBase, spawnCmd } = require('../common/process.js');
 
 const signalPid = (pid, signal) => {
   try {
@@ -80,7 +80,7 @@ class RunProcess {
 class PipeProcess extends RunProcess {
   start(cmd, args, options) {
     try {
-      this.child = spawn(cmd, args, options);
+      this.child = spawnCmd(cmd, args, options);
     } catch (error) {
       this.text = `${error.message}\n`;
       this.finish(1);
@@ -110,4 +110,4 @@ class PipeProcess extends RunProcess {
   }
 }
 
-module.exports = { commandEnv, RunProcess, PipeProcess };
+module.exports = { killTree, commandEnv, RunProcess, PipeProcess };

package/lib/runs/runs.js

@@ -13,6 +13,8 @@ const { nextLogFile } = require('./logs.js');
 const RUNS_REL = `${LOG_DIR}/.runs`;
 const RUNS_KEEP = 24;
 const WRITE_MS = 150;
+const HEARTBEAT_MS = 1000;
+const HEARTBEAT_STALE_MS = 5000;
 const FAILING_TEST = /^\s*(?:not ok \d+|[✖✗×]) /;
 const LIFECYCLE_EVENT = 'npm_lifecycle_event';
 
@@ -73,9 +75,19 @@ const listJson = (dir) => listDir(dir).filter((name) => name.endsWith('.json'));
 const isCommandRun = (record) =>
   Boolean(record && record.id && record.progress && !record.cliId);
 
-const settleRecord = (record, alive = pidAlive) => {
-  if (record.status !== 'running' || alive(record.pid)) return record;
-  return { ...record, status: 'aborted' };
+const settleRecord = (record, alive = pidAlive, now = Date.now) => {
+  if (record.status !== 'running') return record;
+  const activeAt = Number(record.activeAt);
+  const current = Number(now());
+  const fresh =
+    record.v >= 2 &&
+    Number.isFinite(activeAt) &&
+    Number.isFinite(current) &&
+    current - activeAt <= HEARTBEAT_STALE_MS;
+  if (fresh && alive(record.pid)) return record;
+  const endedAt =
+    Number(record.endedAt) || activeAt || Number(record.startedAt) || 0;
+  return { ...record, status: 'aborted', endedAt };
 };
 
 const pushRuns = (records, dir, names) => {
@@ -198,6 +210,7 @@ class RunRecorder {
     this.tracker = new Tracker();
     this.lastWrite = 0;
     this.closed = false;
+    this.heartbeat = null;
     this.slot = Object.hasOwn(options, 'slot') ? options.slot : null;
     if (!Object.hasOwn(options, 'slot')) {
       try {
@@ -209,7 +222,7 @@ class RunRecorder {
     const startedAt = this.clock();
     const env = options.env || process.env;
     this.record = {
-      v: 1,
+      v: 2,
       id: `${startedAt}-${process.pid}`,
       pid: process.pid,
       command,
@@ -217,6 +230,7 @@ class RunRecorder {
       cwd: root,
       startedAt,
       endedAt: 0,
+      activeAt: startedAt,
       status: 'running',
       exit: null,
       progress: { ...this.tracker.progress, expected: 0 },
@@ -231,10 +245,17 @@ class RunRecorder {
       pruneRuns(root);
       this.write();
     });
+    if (this.slot) {
+      this.heartbeat = setInterval(() => {
+        safely(() => this.write());
+      }, HEARTBEAT_MS);
+      this.heartbeat.unref();
+    }
   }
 
   write() {
     if (!this.slot) return;
+    if (!this.closed) this.record.activeAt = this.clock();
     Object.assign(this.record.progress, this.tracker.progress);
     writeRecord(this.slot.jsonFull, this.record);
   }
@@ -251,6 +272,8 @@ class RunRecorder {
   finish(status, result = null) {
     if (this.closed) return;
     this.closed = true;
+    clearInterval(this.heartbeat);
+    this.heartbeat = null;
     const record = this.record;
     record.endedAt = this.clock();
     record.exit = status;