reslop 0.2.7 → 0.3.1

package/lib/render/{dash-blocks.js → dashboard/blocks.js}

@@ -1,28 +1,25 @@
 'use strict';
 
-const files = require('../files.js');
-const { shortAge } = files;
-const npmInfo = require('../dashboard/npm.js');
-const { TOP_PACKAGES } = npmInfo;
-const utilities = require('../utilities.js');
-const { parseVersion, cmpVersion } = utilities;
-const ansi = require('../ansi.js');
-const { THEME, visibleWidth } = ansi;
-const { minuteOf } = require('../dashboard/model.js');
-const tiles = require('./tiles.js');
-const { seg, barSegments, spinner } = tiles;
-const table = require('./dash-table.js');
-const { num, size, delta, waiting, cell, cellSegs, flexCell } = table;
-const { tableLines, pickGroups, labelOf, stat, pairRows } = table;
+const { shortAge, num, size } = require('../../common/format.js');
+const { TOP_PACKAGES } = require('../../dashboard/npm.js');
+const { clamp } = require('../../common/utilities.js');
+const { visibleWidth, truncateVisible } = require('../../term/ansi.js');
+const { minuteOf } = require('../../dashboard/model.js');
+const { seg, barSegments, spinner } = require('../tiles.js');
+const table = require('../table.js');
+const { delta, waiting, notice, cell } = table;
+const { cellSegs, flexCell, tableLines, pickGroups, labelOf } = table;
 const { titleAside, captionOver } = table;
+const { cmpText, hasRange, inRange } = require('../../deps/manifest.js');
 
 const BAR_W = 6;
 const FOLDER = '📁';
 const MARK_GAP = 1;
-const ACTIVITY_LABEL = 'activity ';
+const ACTIVITY_LABEL = 'activity';
 const PULSE = '∙';
+const TRACE = '─';
 const ACTIVITY_MARK = [
-  ['fail', 'x'],
+  ['fail', '⨯'],
   ['commit', '◉'],
   ['pass', '*'],
   ['abort', '!'],
@@ -30,6 +27,17 @@ const ACTIVITY_MARK = [
   ['rebase', '↻'],
   ['npm', '✦'],
 ];
+const MARK_TONE = {
+  '⨯': 'error',
+  '◉': 'key',
+  '*': 'add',
+  '!': 'error',
+  '⎇': 'sha',
+  '↻': 'sha',
+  '✦': 'key',
+  '+': 'add',
+  '-': 'del',
+};
 const UNKNOWN = '…';
 
 const share = (value, total) => (total > 0 ? value / total : 0);
@@ -84,14 +92,15 @@ const filesTotal = (data, ctx) => {
 const filesBlock = (model, width, height, ctx, tile) => {
   const data = model.files;
   if (!data.ready) return waiting('scanning…');
+  if (!data.total.files) return notice('no files');
   const picked = pickGroups(data.dirs, data.exts, height - 1);
   const labels = [
     cell(''),
     cell(''),
-    cell('files', 'muted', 'r'),
-    cell('size', 'muted', 'r'),
-    cell('lines', 'muted', 'r'),
-    cell(''),
+    cell('files', 'caption', 'r'),
+    cell('size', 'caption', 'r'),
+    cell('lines', 'caption', 'r'),
+    cell('share', 'caption', 'r'),
   ];
   const rows = [labels];
   for (const group of picked.dirs) rows.push(fileRow(group, true, data));
@@ -138,14 +147,6 @@ const heatIndex = (level) => {
   return 0;
 };
 
-const heatColor = (index) => {
-  if (index === 1) return THEME.heat1;
-  if (index === 2) return THEME.heat2;
-  if (index === 3) return THEME.heat3;
-  if (index === 4) return THEME.heat4;
-  return null;
-};
-
 const markGlyph = (marks) => {
   const list = marks ?? [];
   for (const [kind, glyph] of ACTIVITY_MARK) {
@@ -165,63 +166,56 @@ const diffGlyph = (bucket) => {
 
 const pulseGlyph = (level) => {
   const index = heatIndex(level);
-  if (index >= 4) return '◎';
+  if (index >= 4) return '●';
   if (index >= 3) return '•';
   return '◦';
 };
 
-const activityCell = (bucket, blink, track, pulse) => {
+const activityCell = (bucket, blink, pulse) => {
   const level = bucket ? bucket.level : 0;
   const glyph = markGlyph(bucket ? bucket.marks : null);
-  const index = heatIndex(level);
   const mark = glyph || diffGlyph(bucket);
   const phase = blink ? pulseGlyph(level) : PULSE;
-  const ch = pulse ? phase : mark || ' ';
-  const item = seg(ch, blink ? 'blink' : 'heat', Boolean(glyph) && !pulse);
-  let bg = track ? THEME.heatTrack : null;
-  const heat = heatColor(index);
-  if (heat) bg = heat;
-  if (blink) bg = THEME.heatBlink;
-  item.bg = bg;
-  return item;
+  const ch = pulse ? phase : mark || TRACE;
+  if (blink) return seg(ch, 'key', true);
+  if (!pulse && mark) {
+    return seg(ch, MARK_TONE[mark] || 'sha', Boolean(glyph));
+  }
+  return seg(ch, 'sha');
 };
 
 const activityCells = (activity, ctx, width) => {
   const minutes = activity && activity.minutes ? activity.minutes : [];
   const byAt = new Map();
-  let start = null;
   for (const row of minutes) {
     byAt.set(row.at, row);
-    if (start === null || row.at < start) start = row.at;
   }
   const current = minuteOf(ctx.now);
   const flash = Boolean(activity && activity.live);
   const on = Math.abs(ctx.frame ?? 0) % 2 === 1;
+  const body = Math.max(0, width - 2);
   const cells = [];
-  for (let i = 0; i < width; i++) {
-    const at = current - (width - 1 - i);
-    const last = i === width - 1;
+  for (let i = 0; i < body; i++) {
+    const at = current - (body - 1 - i);
+    const last = i === body - 1;
     const pulse = flash && last;
     const blink = pulse && on;
-    const track = start !== null && at >= start;
-    cells.push(activityCell(byAt.get(at), blink, track, pulse));
+    cells.push(activityCell(byAt.get(at), blink, pulse));
   }
-  return cells;
+  return [seg(' ', 'muted'), ...cells, seg(' ', 'muted')];
 };
 
 const activityFooter = (data, width, ctx) => {
-  const room = width - 1 - ACTIVITY_LABEL.length;
-  if (room < 2) return null;
+  const lineWidth = width + 1;
+  const room = lineWidth - ACTIVITY_LABEL.length;
+  if (room < 3) return null;
   const cells = activityCells(data.activity, ctx, room);
-  return [seg(ACTIVITY_LABEL, 'muted'), ...cells];
+  return [seg(ACTIVITY_LABEL, 'sha'), ...cells];
 };
 
 const diffsBlock = (model, width, height, ctx, tile) => {
   const data = model.diffs;
-  if (!data.files) {
-    const rows = pairRows([stat('changes', 'working tree clean', 'muted')], 1);
-    return { badge: [], lines: tableLines(rows, width) };
-  }
+  if (!data.files) return notice('working tree clean');
   const footer = activityFooter(data, width, ctx);
   const room = footer ? height - 1 : height;
   const picked = pickGroups(data.dirs, data.exts, room);
@@ -229,37 +223,28 @@ const diffsBlock = (model, width, height, ctx, tile) => {
   for (const group of picked.dirs) rows.push(diffRow(group, true));
   for (const group of picked.exts) rows.push(diffRow(group, false));
   const lines = tableLines(rows, width, 2, true);
-  return {
-    titleLine: captionOver(tile, lines[0]),
-    lines: lines.slice(1),
-    footer,
-    footerFlush: true,
-  };
+  const titleLine = captionOver(tile, lines[0]);
+  const body = lines.slice(1);
+  const footerFlush = true;
+  return { titleLine, lines: body, footer, footerFlush };
 };
 
-const countSegs = (label, value) => [
-  seg(`${label}: `, 'muted'),
-  seg(`${value}`, 'text'),
-];
+const compactSize = (bytes) => size(bytes).replaceAll(' ', '');
 
-const markSegs = (value, tone, mark) => {
+const alertSegs = (value, tone, mark) => {
   if (!value) return [];
-  return [seg('  '), seg(mark), seg(`${value}`, tone, true)];
+  return [seg(' '), seg(mark, tone), seg(` ${value}`, tone, true)];
 };
 
 const npmAside = (data) => {
   const modules = data.modules;
+  const bytes = compactSize(modules.bytes);
+  const counts = `deps:${data.deps} dev:${data.dev}`;
+  const text = `${counts} all:${modules.count}/${bytes}`;
   return [
-    ...countSegs('deps', data.deps),
-    seg('  '),
-    ...countSegs('dev', data.dev),
-    seg('  '),
-    ...countSegs('all', modules.count),
-    seg(' (', 'muted'),
-    seg(size(modules.bytes), 'text'),
-    seg(')', 'muted'),
-    ...markSegs(data.audit, 'error', '🚨 '),
-    ...markSegs(data.outdated, 'warn', '⚠️ '),
+    seg(text, 'caption'),
+    ...alertSegs(data.audit, 'error', '🚨'),
+    ...alertSegs(data.outdated, 'warn', '⚠️'),
   ];
 };
 
@@ -273,38 +258,6 @@ const npmStatus = (data) => {
   return text;
 };
 
-const cmpText = (left, right) => {
-  const a = parseVersion(left);
-  const b = parseVersion(right);
-  if (!a || !b) return null;
-  return cmpVersion(a, b);
-};
-
-const boundHolds = (cmp, op) => {
-  if (op === '<') return cmp < 0;
-  if (op === '<=') return cmp <= 0;
-  if (op === '>') return cmp > 0;
-  return cmp >= 0;
-};
-
-const inClause = (version, clause) => {
-  const ver = parseVersion(version);
-  if (!ver) return false;
-  const bounds = [...clause.matchAll(/(>=|<=|>|<)\s*(\d+\.\d+\.\d+)/g)];
-  if (!bounds.length) return false;
-  for (const match of bounds) {
-    const bound = parseVersion(match[2]);
-    if (!bound) return false;
-    if (!boundHolds(cmpVersion(ver, bound), match[1])) return false;
-  }
-  return true;
-};
-
-const inRange = (version, range) =>
-  `${range ?? ''}`.split('||').some((clause) => inClause(version, clause));
-
-const hasRange = (range) => /[<>]=?\s*\d+\.\d+\.\d+/.test(`${range ?? ''}`);
-
 const vulnTone = (text, pkg) => {
   if (!pkg.audit || !text || text === UNKNOWN) return '';
   const fix = pkg.fix || '';
@@ -369,19 +322,17 @@ const nameTone = (pkg) => {
 const packageName = (pkg) => {
   const segs = [seg(pkg.name, nameTone(pkg))];
   if (pkg.chain) segs.push(seg(` 🢒 ${pkg.chain}`, 'chain'));
-  return {
-    segs,
-    align: 'l',
-    flex: true,
-    keep: true,
-    measure: visibleWidth(pkg.name),
-  };
+  const align = 'l';
+  const flex = true;
+  const keep = true;
+  const measure = visibleWidth(pkg.name);
+  return { segs, align, flex, keep, measure };
 };
 
 const versionCell = (text, pkg) => cell(text, versionTone(text, pkg), 'r');
 
 const packageHead = () => {
-  const title = flexCell('');
+  const title = flexCell('name');
   title.keep = true;
   return [
     title,
@@ -410,7 +361,8 @@ const packageRow = (pkg, marks) => {
 const packageLines = (packages, width, limit) => {
   const all = limit === null;
   const headed = packages.length > 0 && (all || limit > 1);
-  const room = all ? packages.length : Math.max(0, limit - (headed ? 1 : 0));
+  const head = headed ? 1 : 0;
+  const room = all ? packages.length : Math.max(0, limit - head);
   const shown = packages.slice(0, room);
   const rows = shown.map((pkg) => packageRow(pkg, all));
   if (headed) rows.unshift(packageHead());
@@ -424,6 +376,7 @@ const npmContent = (data, width, limit, ctx, tile) => {
   const titleLine = titleAside(tile, npmAside(data), width, badge);
   const listed = data.modules && data.modules.packages;
   const packages = listed ? listed : [];
+  if (!packages.length) return notice('no packages', titleLine);
   const short = limit === null ? packages : packages.slice(0, TOP_PACKAGES);
   return { titleLine, lines: packageLines(short, width, limit) };
 };
@@ -431,23 +384,42 @@ const npmContent = (data, width, limit, ctx, tile) => {
 const npmBlock = (model, width, height, ctx, tile) =>
   npmContent(model.npm, width, height, ctx, tile);
 
-const TASK_GAP = 2;
+const NAME_GAP = 2;
+const RATIO_GAP = 1;
 
 const ratioLabel = (done, total) => `${done}/${total}`;
 
 const taskSpecs = (data) => {
-  const rows = [{ title: '', done: data.done, total: data.total, bold: true }];
+  const rows = [];
   for (const kind of data.kinds) {
-    rows.push({
-      title: kind.title,
-      done: kind.done,
-      total: kind.total,
-      bold: false,
-    });
+    const { title, done, total } = kind;
+    const bold = false;
+    const row = { title, done, total, bold };
+    rows.push(row);
   }
+  const title = 'Total';
+  const titleTone = 'add';
+  const { done, total } = data;
+  const bold = true;
+  const row = { title, titleTone, done, total, bold };
+  rows.push(row);
   return rows;
 };
 
+const taskRows = (specs, room) => {
+  if (room < 1) return [];
+  const total = specs.at(-1);
+  const kinds = specs.slice(0, -1).slice(0, room - 1);
+  return [...kinds, total];
+};
+
+const planAside = (tile, plan, width) => {
+  if (!plan) return [];
+  const room = Math.max(0, width - tile.title.length - 1);
+  const shown = truncateVisible(plan, room);
+  return shown ? [seg(shown, 'caption')] : [];
+};
+
 const widest = (rows, read) => {
   let width = 0;
   for (const row of rows) {
@@ -458,32 +430,54 @@ const widest = (rows, read) => {
 };
 
 const taskBarWidth = (width, nameW, ratioW) => {
-  const room = width - nameW - ratioW - TASK_GAP * 2;
+  const room = width - nameW - ratioW - NAME_GAP - RATIO_GAP;
   return room > 0 ? room : 0;
 };
 
+const taskBarSegments = (ratio, width) => {
+  if (width < 1) return [];
+  if (width < 3) return [seg(' '.repeat(width), 'muted')];
+  const inner = width - 2;
+  const clamped = clamp(Number.isFinite(ratio) ? ratio : 0, 0, 1);
+  const on = Math.round(clamped * inner);
+  const off = inner - on;
+  const parts = [seg(' ', 'muted')];
+  if (on) parts.push(seg(TRACE.repeat(on), 'add'));
+  if (off) parts.push(seg(' '.repeat(off), 'muted'));
+  parts.push(seg(' ', 'muted'));
+  return parts;
+};
+
 const taskLine = (row, barW) => {
   const tone = row.bold ? 'text' : 'muted';
-  const line = [cell(row.title, 'text', 'l', row.bold)];
+  const titleTone = row.titleTone ?? 'text';
+  const titleBold = row.titleTone ? false : row.bold;
+  const line = [cell(row.title, titleTone, 'l', titleBold)];
   if (barW > 0) {
-    line.push(cellSegs(barSegments(share(row.done, row.total), barW)));
+    const ratio = share(row.done, row.total);
+    line.push(cellSegs(taskBarSegments(ratio, barW)));
   }
-  line.push(cell(ratioLabel(row.done, row.total), tone, 'r', row.bold));
+  const count = cell(ratioLabel(row.done, row.total), tone, 'r', row.bold);
+  count.gap = RATIO_GAP;
+  line.push(count);
   return line;
 };
 
 const tasksBlock = (model, width, height, ctx, tile) => {
-  const specs = taskSpecs(model.tasks);
+  const data = model.tasks;
+  if (!data.total) {
+    const aside = planAside(tile, data.plan, width);
+    return notice('no tasks', titleAside(tile, aside, width));
+  }
+  const specs = taskSpecs(data);
   const nameW = widest(specs, (row) => row.title);
   const ratioW = widest(specs, (row) => ratioLabel(row.done, row.total));
   const barW = taskBarWidth(width, nameW, ratioW);
-  const rows = specs.map((row) => taskLine(row, barW));
-  const lines = tableLines(rows, width, TASK_GAP);
-  const shown = Math.max(0, height);
-  return {
-    titleLine: captionOver(tile, lines[0]),
-    lines: lines.slice(1, 1 + shown),
-  };
+  const visible = taskRows(specs, Math.max(0, height));
+  const rows = visible.map((row) => taskLine(row, barW));
+  const lines = tableLines(rows, width, NAME_GAP);
+  const aside = planAside(tile, data.plan, width);
+  return { titleLine: titleAside(tile, aside, width), lines };
 };
 
 module.exports = {

package/lib/render/{dashboard.js → dashboard/dashboard.js}

@@ -1,30 +1,33 @@
 'use strict';
 
-const primitives = require('./primitives.js');
-const { paintBodyFill, paneResult } = primitives;
-const tiles = require('./tiles.js');
+const { paintBodyFill, paneResult } = require('../primitives.js');
+const tiles = require('../tiles.js');
 const { layoutTiles, paintTile, composeBands, tileHits, pageFill } = tiles;
-const blocks = require('./dash-blocks.js');
+const blocks = require('./blocks.js');
 const { filesBlock, diffsBlock, npmBlock, tasksBlock } = blocks;
-const activity = require('./dash-activity.js');
+const activity = require('./activity.js');
 const { commitsBlock, branchesBlock, runsBlock } = activity;
+const { agentsBlock } = require('../agents.js');
+const { DASH_TILES } = require('../../input/actions.js');
 
-const TILES = [
-  { id: 'files', key: 'f', title: 'files', rank: 3, build: filesBlock },
-  { id: 'diffs', key: 'd', title: 'diffs', rank: 0, build: diffsBlock },
-  { id: 'tasks', key: 't', title: 'tasks', rank: 4, build: tasksBlock },
-  {
-    id: 'branches',
-    key: 'b',
-    title: 'branches',
-    rank: 5,
-    build: branchesBlock,
-  },
-  { id: 'commits', key: 'c', title: 'commits', rank: 2, build: commitsBlock },
-  { id: 'run', key: 'r', title: 'run', rank: 1, build: runsBlock },
-  { id: 'npm', key: 'n', title: 'npm', rank: 6, build: npmBlock },
-];
-const TILE_BY_ID = new Map(TILES.map((tile) => [tile.id, tile]));
+const TILE_VIEW = {
+  files: { rank: 3, size: 'normal', build: filesBlock },
+  diffs: { rank: 0, size: 'normal', build: diffsBlock },
+  tasks: { rank: 4, size: 'normal', build: tasksBlock },
+  branches: { rank: 5, size: 'wide', build: branchesBlock },
+  commits: { rank: 2, size: 'wide', build: commitsBlock },
+  run: { rank: 1, size: 'normal', build: runsBlock },
+  npm: { rank: 6, size: 'normal', build: npmBlock },
+  agents: { rank: 7, size: 'normal', build: agentsBlock },
+};
+
+const TILES = DASH_TILES.map(({ id, key }) => {
+  const title = id;
+  const view = TILE_VIEW[id];
+  return { id, key, title, ...view };
+});
+
+const TILE_BY_ID = Object.fromEntries(TILES.map((tile) => [tile.id, tile]));
 const MARGIN_MIN_H = 12;
 
 const paintTiles = (model, bands, color) => {
@@ -32,7 +35,7 @@ const paintTiles = (model, bands, color) => {
   const ctx = { now: model.now, frame: model.frame };
   for (const band of bands) {
     for (const place of band.tiles) {
-      const tile = TILE_BY_ID.get(place.id);
+      const tile = TILE_BY_ID[place.id];
       const inner = Math.max(0, place.w - 2);
       const room = Math.max(0, band.h - 1);
       const content = tile.build(model, inner, room, ctx, tile);