reslop 0.3.1 → 0.3.2

package/lib/render/frame.js

@@ -18,11 +18,12 @@ const dashboard = require('./dashboard/dashboard.js');
 const packages = require('./packages.js');
 const agents = require('./agents.js');
 const repos = require('./repos.js');
+const { contextMenu } = require('./menu.js');
 
 const { isListPane, isTaskView, paintBodyFill, paneResult } = primitives;
 const { bodyRow } = primitives;
 const { paintStatusLine, statusBranchHit, statusChoiceHits } = status;
-const { statusPlanHit, planMenu } = status;
+const { statusPlanHit, statusEditHits, planMenu } = status;
 
 const PANE_BODY = {
   dashboard: dashboard.paintBodyDashboard,
@@ -250,8 +251,20 @@ const renderFrame = (view, options = {}) => {
     }
     statusHits.push(...menu.hits);
   }
-  const editHits = [...windowed.editHits, ...hits.editHits];
+  const editHits = [
+    ...windowed.editHits,
+    ...hits.editHits,
+    ...statusEditHits(view, width, statusY),
+  ];
   const shown = markEditorSelection(rows, view, editHits, color);
+  const popup = contextMenu(view.contextMenu, width, rows.length, color);
+  if (popup) {
+    for (const line of popup.lines) {
+      const index = line.y - 1;
+      if (index <= 0 || index >= rows.length - 1) continue;
+      shown[index] = stampVisible(shown[index], popup.x, line.text);
+    }
+  }
   const text = shown.map((row) => (color ? row + RESET : row)).join('\n');
   return {
     text,
@@ -262,6 +275,7 @@ const renderFrame = (view, options = {}) => {
     templateHits: hits.templateHits,
     editHits,
     statusHits,
+    contextHits: popup ? popup.hits : [],
     footerY: rows.length,
     height: rows.length,
     scroll: windowed.scroll,

package/lib/render/menu.js

@@ -4,6 +4,11 @@ const { clamp } = require('../common/utilities.js');
 const ansi = require('../term/ansi.js');
 const { listWindowStart, scrollMark } = require('./primitives.js');
 const { THEME, paint, visibleWidth, trimVisible } = ansi;
+const {
+  actionLetter,
+  actionCaption,
+  buttonWord,
+} = require('../input/actions.js');
 
 const menuBoxWidth = (options, columnW, room) => {
   let widest = Math.max(columnW, 4);
@@ -13,7 +18,24 @@ const menuBoxWidth = (options, columnW, room) => {
   return clamp(widest + 2, 4, room);
 };
 
-const menuItem = (label, boxW, color, selected, mark, disabled) => {
+const paintQuery = (text, query, fgRgb, bgRgb, color, bold) => {
+  const needle = `${query ?? ''}`.trim().toLowerCase();
+  if (!color || !needle) return paint(text, fgRgb, bgRgb, color, bold);
+  const hay = text.toLowerCase();
+  let out = '';
+  let from = 0;
+  let at = hay.indexOf(needle, from);
+  while (at >= 0) {
+    const end = at + needle.length;
+    out += paint(text.slice(from, at), fgRgb, bgRgb, color, bold);
+    out += paint(text.slice(at, end), THEME.warnFg, bgRgb, color, true);
+    from = end;
+    at = hay.indexOf(needle, from);
+  }
+  return out + paint(text.slice(from), fgRgb, bgRgb, color, bold);
+};
+
+const menuItem = (label, boxW, color, selected, mark, disabled, query) => {
   const barW = mark ? 1 : 0;
   const faceW = Math.max(1, boxW - barW);
   const room = Math.max(0, faceW - 1);
@@ -25,7 +47,7 @@ const menuItem = (label, boxW, color, selected, mark, disabled) => {
   const fgRgb = disabled ? THEME.mutedFg : THEME.chromeFg;
   const hotFg = hot ? THEME.buttonHotFg : fgRgb;
   const bgRgb = hot ? THEME.checkBg : THEME.noteBg;
-  let row = paint(face, hotFg, bgRgb, color, hot);
+  let row = paintQuery(face, query, hotFg, bgRgb, color, hot);
   if (!mark) return row;
   const barBg = mark === 'thumb' ? THEME.taskHeadBg : THEME.buttonBg;
   row += paint(' ', fgRgb, barBg, color);
@@ -40,7 +62,7 @@ const dropBox = (options, cursor, scroll, room) => {
   return { focus, inner, span: inner, start, count };
 };
 
-const menuFaces = (options, box, boxW, color, off = new Set()) => {
+const menuFaces = (options, box, boxW, color, query = '', off = new Set()) => {
   const faces = [];
   for (let i = 0; i < box.inner; i++) {
     const index = box.start + i;
@@ -50,11 +72,86 @@ const menuFaces = (options, box, boxW, color, off = new Set()) => {
     const focused = index === box.focus;
     const face =
       label === undefined
-        ? menuItem('none', boxW, color, false, mark, false)
-        : menuItem(label, boxW, color, focused, mark, disabled);
+        ? menuItem('none', boxW, color, false, mark, false, '')
+        : menuItem(label, boxW, color, focused, mark, disabled, query);
     faces.push({ index, face });
   }
   return faces;
 };
 
-module.exports = { menuBoxWidth, dropBox, menuFaces };
+const contextText = (id, keyWidth) => {
+  if (!keyWidth) return buttonWord(id);
+  const mark = actionLetter(id) ?? '';
+  const caption = actionCaption(id);
+  const key = mark.padEnd(keyWidth);
+  return `${key}  ${caption}`;
+};
+
+const contextLabel = (id, width, color, selected, disabled, keyWidth) => {
+  const label = contextText(id, keyWidth);
+  const mark = actionLetter(id) ?? '';
+  const shown = trimVisible(label, Math.max(1, width - 2));
+  const pad = ' '.repeat(Math.max(0, width - 2 - visibleWidth(shown)));
+  const face = ` ${shown}${pad} `;
+  if (!color || !mark) return face;
+  const bgRgb = selected && !disabled ? THEME.popupHotBg : THEME.popupBg;
+  const fgRgb = disabled ? THEME.popupDisabledFg : THEME.popupFg;
+  if (disabled) return paint(face, fgRgb, bgRgb, color);
+  const at = shown.indexOf(mark);
+  if (at < 0) return paint(face, fgRgb, bgRgb, color);
+  let out = paint(face.slice(0, at + 1), fgRgb, bgRgb, color);
+  out += paint(mark, THEME.buttonHotFg, bgRgb, color, true);
+  return out + paint(face.slice(at + mark.length + 1), fgRgb, bgRgb, color);
+};
+
+const contextMenu = (model, width, height, color) => {
+  if (!model || !model.actions || !model.actions.length) return null;
+  const keyWidth = model.editor
+    ? Math.max(
+        ...model.actions.map((id) => visibleWidth(actionLetter(id) ?? '')),
+      )
+    : 0;
+  const labels = model.actions.map((id) => contextText(id, keyWidth));
+  const widest = labels.reduce(
+    (size, label) => Math.max(size, visibleWidth(label)),
+    4,
+  );
+  const boxW = Math.min(width, widest + 2);
+  const count = model.actions.length;
+  const inner = Math.min(count, Math.max(1, height - 3));
+  const x = clamp(model.x ?? 0, 0, Math.max(0, width - boxW));
+  const anchorY = clamp(model.y ?? 2, 2, Math.max(2, height - 1));
+  const y = Math.min(anchorY, Math.max(2, height - inner - 1));
+  const cursor = clamp(model.cursor ?? 0, 0, count - 1);
+  const start = listWindowStart(cursor, 0, inner, count);
+  const lines = [];
+  const hits = [];
+  for (let row = 0; row < inner; row++) {
+    const index = start + row;
+    const id = model.actions[index];
+    const disabled = (model.disabled ?? []).includes(id);
+    const face = contextLabel(
+      id,
+      boxW,
+      color,
+      index === cursor,
+      disabled,
+      keyWidth,
+    );
+    lines.push({
+      y: y + row,
+      text: face,
+    });
+    hits.push({
+      id,
+      cursor: index,
+      disabled,
+      y: y + row,
+      x0: x,
+      x1: x + boxW,
+    });
+  }
+  return { x, lines, hits };
+};
+
+module.exports = { menuBoxWidth, dropBox, menuFaces, contextMenu };

package/lib/render/name-edit.js

@@ -0,0 +1,31 @@
+'use strict';
+
+const ansi = require('../term/ansi.js');
+const primitives = require('./primitives.js');
+
+const { THEME, paint, visibleWidth, seq, EL } = ansi;
+const { MARK_W, markPrefix, editSpan, fieldWindow } = primitives;
+
+// The row where a name is typed: of a new branch or of a new worktree
+const paintNameEdit = (compose, width, color) => {
+  const prefix = markPrefix(true);
+  const rest = Math.max(1, width - MARK_W);
+  const text = `${compose.text ?? ''}`.replaceAll('\n', ' ');
+  const win = fieldWindow(text, compose.cursor, compose.scrollCol, rest);
+  const gap = ' '.repeat(Math.max(0, rest - visibleWidth(win.text)));
+  const fgRgb = THEME.chromeFg;
+  const bgRgb = THEME.buttonBg;
+  let row = `${prefix}${win.text}${gap}`;
+  if (color) {
+    row = `${seq(fgRgb, bgRgb)}${EL}`;
+    row += paint(prefix, fgRgb, bgRgb, color);
+    row += paint(win.text, THEME.buttonHotFg, bgRgb, color);
+    row += paint(gap, fgRgb, bgRgb, color);
+  }
+  const textX = MARK_W + 1;
+  const edit = editSpan(1, textX, textX + rest, 0, text);
+  const cursor = { x: textX + win.col, scroll: win.scroll };
+  return { row, cursor, edits: [{ ...edit, scroll: win.scroll }] };
+};
+
+module.exports = { paintNameEdit };

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/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

@@ -7,8 +7,8 @@ Work through unchecked items.
 - 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/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;