@basou/cli 0.71.2 → 0.72.0

package/dist/index.js

@@ -842,11 +842,13 @@ import {
   assertBasouRootSafe as assertBasouRootSafe3,
   BOARD_INIT_SAVE,
   basouPaths as basouPaths4,
+  boardDeclarationSnapshot,
   boardGuide,
   boardInitText,
   buildRecord,
   byCodePoint,
   diffCells,
+  diffDeclarations,
   diffObserved,
   displayPath as displayPath3,
   effortStartOf,
@@ -2345,9 +2347,10 @@ async function doRunBoardMeasure(options, ctx) {
     throw new Error("--model must name a model.");
   }
   const loaded = await loadBoard(options, ctx, "board measure");
-  const measurement = await measureLoaded(loaded, ctx, options.model, await previousOf(loaded));
+  const previous = await previousOf(loaded);
+  const measurement = await measureLoaded(loaded, ctx, options.model, previous);
   if (options.json === true) console.log(JSON.stringify(measurement, null, 2));
-  else printMeasurementText(measurement, hasRecords(loaded));
+  else printMeasurementText(measurement, hasRecords(loaded), declarationChanges(loaded, previous));
   if (!measurement.complete) process.exitCode = 1;
   return measurement;
 }
@@ -2362,16 +2365,17 @@ async function runBoardRecord(options, ctx = {}) {
 var RecordRefusal = class extends Error {
 };
 async function doRunBoardRecord(options, ctx) {
-  let result;
+  let checked;
   try {
-    result = await checkAndRecord(options, ctx);
+    checked = await checkAndRecord(options, ctx);
   } catch (error) {
     if (error instanceof RecordRefusal || !(error instanceof Error)) throw error;
     throw new RecordRefusal(`${error.message}
 Nothing was written.`, { cause: error.cause });
   }
+  const { result, declared } = checked;
   if (options.json === true) console.log(JSON.stringify(result, null, 2));
-  else printRecordText(result);
+  else printRecordText(result, declared ?? null);
   return result;
 }
 async function checkAndRecord(options, ctx) {
@@ -2412,6 +2416,7 @@ ${parsed.errors.map((e) => `  - ${displayPath3(e)}`).join("\n")}`
     recordedAt,
     recordedWith: { basou: BASOU_CLI_VERSION, build: BASOU_BUILD?.commit ?? null }
   });
+  const declared = options.json === true ? void 0 : declarationChanges(loaded, previous);
   let written = null;
   if (options.dryRun !== true) {
     let name;
@@ -2438,14 +2443,22 @@ ${parsed.errors.map((e) => `  - ${displayPath3(e)}`).join("\n")}`
     };
   }
   return {
-    record: written,
-    dry_run: options.dryRun === true,
-    complete: measurement.complete,
-    not_found: measurement.not_found,
-    order_anomalies: record.order_anomalies,
-    diff
+    result: {
+      record: written,
+      dry_run: options.dryRun === true,
+      complete: measurement.complete,
+      not_found: measurement.not_found,
+      order_anomalies: record.order_anomalies,
+      diff
+    },
+    ...declared === void 0 ? {} : { declared }
   };
 }
+function declarationChanges(loaded, previous) {
+  const { last } = previous;
+  if (last.status !== "found") return null;
+  return diffDeclarations(last.record.declaration, boardDeclarationSnapshot(loaded.declaration));
+}
 var INPUT_KEYS = /* @__PURE__ */ new Set([
   "measure_digest",
   "observed",
@@ -2595,7 +2608,7 @@ async function checkRecordsPlace(loaded, recordsDir, shown, notPrivate) {
     }
   }
 }
-function printRecordText(result) {
+function printRecordText(result, declared) {
   const lines = [
     result.record === null ? "Dry run: the record checked out (nothing was written)." : `Recorded ${displayPath3(result.record)}`
   ];
@@ -2616,7 +2629,11 @@ function printRecordText(result) {
         `  observed ${displayPath3(o.name)}: ${observation(o.before)} -> ${observation(o.after)}`
       );
     }
-    lines.push(...diffLines(result.diff.measure, cells.length + observed.length > 0));
+    const declaration = declarationLines(declared);
+    lines.push(
+      ...diffLines(result.diff.measure, cells.length + observed.length + declaration.length > 0),
+      ...declaration
+    );
   }
   if (!result.complete) {
     lines.push(`The measurement recorded is not complete (${result.not_found.length}):`);
@@ -2802,6 +2819,16 @@ function diffLines(diff, more) {
   if (lines.length === 0 && !more) lines.push("  nothing moved");
   return lines;
 }
+function declarationLines(changes) {
+  if (changes === null) {
+    return [
+      "  declaration: not compared (the previous record holds no declaration basou can compare with)"
+    ];
+  }
+  return changes.map(
+    (c) => `  declaration ${displayPath3(c.at)}: ${c.change === "reordered" ? "the order changed" : c.change}`
+  );
+}
 function shownValue(value) {
   if (value === null) return "not measured";
   if (typeof value === "number") return String(Math.round(value * 1e4) / 1e4);
@@ -2933,12 +2960,18 @@ function axisLines(m) {
   for (const u of a.unjudged) lines.push(`    (${u.trigger}) not judged: ${u.why}`);
   return lines;
 }
-function printMeasurementText(m, hasRecords2) {
+function printMeasurementText(m, hasRecords2, declared) {
   const lines = [displayPath3(m.title)];
   const build = m.measured_with.build === null ? "" : ` (build ${m.measured_with.build})`;
   lines.push(`Measured ${m.measured_at} with basou ${m.measured_with.basou}${build}`);
   if (m.diff !== null) {
-    lines.push("", `Since the previous record ${m.diff.against}:`, ...diffLines(m.diff, false));
+    const declaration = declarationLines(declared);
+    lines.push(
+      "",
+      `Since the previous record ${m.diff.against}:`,
+      ...diffLines(m.diff, declaration.length > 0),
+      ...declaration
+    );
   } else if (m.not_found.some((n) => n.at === "diff")) {
     lines.push("", "The previous record could not be read (see Not measured).");
   } else {
@@ -13958,6 +13991,11 @@ var BOARD_HTML = `<!doctype html>
   .chip.blocked { background: var(--chip-blocked); }
   .chip.unverified { background: var(--chip-unverified); }
   .muted { color: var(--fg-2); }
+  .sub { font-size: 12px; color: var(--fg-2); overflow-wrap: anywhere; }
+  ul.sub { margin: 0; padding-left: 18px; }
+  td.wrap { overflow-wrap: anywhere; min-width: 10em; }
+  tr.notes td { padding-top: 0; }
+  .chip.changed { margin-left: 0; margin-right: 6px; background: var(--chip-unverified); }
   .bar { height: 10px; background: var(--fill); border-radius: 5px; min-width: 120px; position: relative; overflow: hidden; }
   .bar span { position: absolute; left: 0; top: 0; bottom: 0; background: var(--s1); }
   figure { margin: 16px 0; }
@@ -14087,6 +14125,60 @@ var BOARD_HTML = `<!doctype html>
       return JSON.stringify(k) + ':' + v;
     }).join(',') + '}';
   }
+  // The parts of a value drawn on one line, and what an http value says of each word.
+  var DOT = ' ' + String.fromCharCode(183) + ' ';
+  var FOUND = String.fromCharCode(10003);
+  var NOT_FOUND = String.fromCharCode(10007);
+  // An http value read as its parts: the status, the redirects, where it
+  // landed, and what it read off the body (when the status is 2xx) or that it
+  // did not. Numbers and strings are drawn as they are.
+  function httpText(h) {
+    var parts = [String(h.status), fill(S.observed.redirects, { n: h.redirects }), h.final_url];
+    if (h.body === null) parts.push(S.observed.bodyNotRead);
+    else if (h.body) {
+      if (h.body.words) {
+        parts.push(h.body.words.map(function (w) { return w.word + ' ' + (w.found ? FOUND : NOT_FOUND); }).join('  '));
+      }
+      if (h.body.count !== undefined) parts.push(fill(S.observed.count, { n: h.body.count }));
+      if (h.body.capture !== undefined) {
+        parts.push(h.body.capture === null ? S.observed.captureNone : fill(S.observed.capture, { value: JSON.stringify(h.body.capture) }));
+      }
+    }
+    return parts.join(DOT);
+  }
+  // A value of an observation as the page draws it: an http value in its
+  // shape read as its parts, one with words beside what it says of each, and
+  // any other as it is (a string) or as JSON. A test lifts this function.
+  function observedText(value, words, http) {
+    if (http) return httpText(http);
+    if (words) return withWords(value, words);
+    return shown(value);
+  }
+  // The value of an observation that moved, and what the previous record
+  // held: a value whose type alone moved ("12" and 12) is drawn as JSON, so
+  // that the two do not read the same. A test lifts this function.
+  function movedText(o) {
+    var m = o.moved;
+    var now = observedText(o.value, o.words, o.http);
+    if (m.status === 'none') return { now: now, then: S.observed.beforeNone };
+    if (m.value === null) {
+      return { now: now, then: S.observed.beforeNotObserved + (m.error ? '  (' + m.error + ')' : '') };
+    }
+    var then = observedText(m.value, m.words, m.http);
+    if ((typeof m.value === 'string') !== (typeof o.value === 'string')) {
+      then = JSON.stringify(m.value);
+      if (then === now) now = JSON.stringify(o.value);
+    }
+    return { now: now, then: fill(S.observed.before, { value: then }) + (m.error ? '  (' + m.error + ')' : '') };
+  }
+  // A measure's value: the paths of a file_paths by how many, a number with
+  // its unit, and a string (a file's name, a capture), which is no amount,
+  // without it.
+  function measureText(m) {
+    if (Array.isArray(m.value)) return num(m.value.length) + ' ' + m.unit;
+    return num(m.value) + (typeof m.value === 'number' ? ' ' + m.unit : '');
+  }
+  function signed(n) { return (n > 0 ? '+' : '') + num(n); }
   function stateName(state) { return S.states[state] || state; }
   function setStatus(message, isErr) {
     var s = $('status');
@@ -14171,17 +14263,36 @@ var BOARD_HTML = `<!doctype html>
     if (s.observed.length === 0) {
       observed = el('p', { class: 'muted', text: S.observed.none });
     } else {
-      var rows = s.observed.map(function (o) {
+      var rows = [];
+      s.observed.forEach(function (o) {
+        var cell = el('td', { class: 'wrap' });
         var value;
-        if (o.value !== null) value = o.words ? withWords(o.value, o.words) : shown(o.value);
-        else if (o.previous && o.previous.status === 'value') value = fill(S.observed.missing, { value: shown(o.previous.value) });
-        else if (o.previous && o.previous.status === 'unreadable') value = S.observed.missingPreviousUnreadable;
-        else value = S.observed.missingNoPrevious;
-        if (o.error) value += '  (' + o.error + ')';
-        return el('tr', null, [
-          el('td', { text: o.name }), el('td', { text: value }),
-          el('td', { text: o.observed_at }), el('td', { text: o.source })
-        ]);
+        if (o.value !== null && o.moved) {
+          var pair = movedText(o);
+          cell.appendChild(el('span', { class: 'chip changed', text: S.observed.changed }));
+          value = pair.now;
+          cell.appendChild(el('span', { text: value + (o.error ? '  (' + o.error + ')' : '') }));
+          cell.appendChild(el('div', { class: 'sub', text: pair.then }));
+        } else {
+          if (o.value !== null) value = observedText(o.value, o.words, o.http);
+          else if (o.previous && o.previous.status === 'value') value = fill(S.observed.missing, { value: shown(o.previous.value) });
+          else if (o.previous && o.previous.status === 'unreadable') value = S.observed.missingPreviousUnreadable;
+          else value = S.observed.missingNoPrevious;
+          if (o.error) value += '  (' + o.error + ')';
+          cell.appendChild(el('span', { text: value }));
+        }
+        // What the record's declaration says it is and looks at, under its name.
+        var what = o.kind ? [o.kind].concat(o.looks_at || []).join(DOT) : null;
+        rows.push(el('tr', null, [
+          el('td', null, [el('div', { text: o.name }), what === null ? null : el('div', { class: 'sub', text: what })]),
+          cell,
+          el('td', { text: o.observed_at }), el('td', { class: 'wrap', text: o.source })
+        ]));
+        if (o.notes && o.notes.length > 0) {
+          rows.push(el('tr', { class: 'notes' }, [el('td', { colspan: '4' }, [
+            el('ul', { class: 'sub' }, o.notes.map(function (n) { return el('li', null, [prose(n, 'span')]); }))
+          ])]));
+        }
       });
       observed = el('div', { class: 'scroll' }, [el('table', { class: 'grid' }, [
         el('tr', null, [
@@ -14191,12 +14302,16 @@ var BOARD_HTML = `<!doctype html>
       ].concat(rows))]);
     }
     var observedHeading = el('h3', { text: S.observed.heading }, [reported()]);
-    return section(S.sections.summary, false, [
+    var children = [
       el('div', null, [prose(s.text), reported()]),
       tiles,
       observedHeading,
       observed
-    ]);
+    ];
+    if (s.previous_record === 'unreadable' && s.observed.length > 0) {
+      children.push(el('p', { class: 'muted', text: S.observed.previousUnreadable }));
+    }
+    return section(S.sections.summary, false, children);
   }
 
   var SVGNS = 'http://www.w3.org/2000/svg';
@@ -14535,6 +14650,27 @@ var BOARD_HTML = `<!doctype html>
     }));
   }
 
+  // Every measure of the record, with the lanes it is drawn in and how much a
+  // number moved since the previous record.
+  function measures(b) {
+    if (b.measures.length === 0) {
+      return section(S.sections.measures, false, [el('p', { class: 'muted', text: S.measures.none })]);
+    }
+    var head = el('tr', null, [
+      el('th', { text: S.measures.id }), el('th', { text: S.measures.value }),
+      el('th', { text: S.measures.lanes }), el('th', { class: 'n', text: S.measures.delta })
+    ]);
+    var rows = b.measures.map(function (m) {
+      return el('tr', { 'data-measure': m.id }, [
+        el('td', null, [el('code', { text: m.id })]),
+        el('td', { class: 'wrap', text: measureText(m) }),
+        el('td', { text: m.lanes.length === 0 ? '-' : m.lanes.join(', ') }),
+        el('td', { class: 'n', text: m.delta === null || m.delta === undefined ? '' : signed(m.delta) })
+      ]);
+    });
+    return section(S.sections.measures, false, [el('div', { class: 'scroll' }, [el('table', { class: 'grid' }, [head].concat(rows))])]);
+  }
+
   function composition(b) {
     if (b.composition.length === 0) {
       return section(S.sections.composition, false, [el('p', { class: 'muted', text: S.composition.none })]);
@@ -14622,7 +14758,8 @@ var BOARD_HTML = `<!doctype html>
     var b = page.board;
     // The board's own title, so that boards open in other tabs can be told apart.
     document.title = b.heading.title;
-    [heading(b), summary(b), effort(b, false), matrix(b), lanes(b), composition(b), turns(b), footnotes(b)]
+    [heading(b), summary(b), effort(b, false), matrix(b), lanes(b), measures(b), composition(b), turns(b),
+      recordRepos(b), recordComponents(b), footnotes(b)]
       .forEach(function (node) { root.appendChild(node); });
   }
 
@@ -14648,12 +14785,14 @@ var BOARD_HTML = `<!doctype html>
   function missingIn(l) {
     return function (at) { return l.footnotes.not_found.some(function (n) { return n.at === at; }); };
   }
-  function liveRepos(l) {
-    var missing = missingIn(l);
+  // The repositories as a table. older: a record of version 1 or 2, which
+  // measured no base, ahead or fetch time (drawn as '-') and held the
+  // commits behind as behind_main.
+  function reposTable(list, missing, older) {
     var labels = [S.live.repo, S.live.branch, S.live.head, S.live.lastCommit, S.live.commits, S.live.uncommitted, S.live.base, S.live.behind, S.live.ahead, S.live.fetchedAt];
     var numeric = [4, 5, 7, 8];
     var head = el('tr', null, labels.map(function (label, i) { return el('th', { class: numeric.indexOf(i) !== -1 ? 'n' : '', text: label }); }));
-    var rows = l.repos.map(function (r) {
+    var rows = list.map(function (r) {
       var at = 'repos[' + r.path + ']';
       // A null the measurement says it could not measure, or one that means
       // so (a detached HEAD, no commit yet, no base, no fetch of it on
@@ -14662,6 +14801,7 @@ var BOARD_HTML = `<!doctype html>
         if (v !== null) return show(v);
         return missing(at) || missing(at + '.' + field) ? S.tiles.notMeasured : '-';
       };
+      var unmeasured = function (field, v, show) { return older ? '-' : value(field, v, show); };
       return el('tr', null, [
         el('td', { text: r.name === null ? r.path : r.name }),
         el('td', { text: value('branch', r.branch, String) }),
@@ -14669,13 +14809,59 @@ var BOARD_HTML = `<!doctype html>
         el('td', { text: value('last_commit', r.last_commit, when) }),
         el('td', { class: 'n', text: num(r.commits) }),
         el('td', { class: 'n', text: num(r.uncommitted) }),
-        el('td', { text: value('base', r.base, String) }),
-        el('td', { class: 'n', text: value('behind', r.behind, num) }),
-        el('td', { class: 'n', text: value('ahead', r.ahead, num) }),
-        el('td', { text: value('fetched_at', r.fetched_at, when) })
+        el('td', { text: unmeasured('base', r.base, String) }),
+        el('td', { class: 'n', text: value(older ? 'behind_main' : 'behind', r.behind, num) }),
+        el('td', { class: 'n', text: unmeasured('ahead', r.ahead, num) }),
+        el('td', { text: unmeasured('fetched_at', r.fetched_at, when) })
+      ]);
+    });
+    return el('div', { class: 'scroll' }, [el('table', { class: 'grid' }, [head].concat(rows))]);
+  }
+  function liveRepos(l) {
+    return section(S.live.repos, false, [reposTable(l.repos, missingIn(l), false)]);
+  }
+  // The repositories as the record measured them, by its version.
+  function recordRepos(b) {
+    var r = b.repos;
+    if (!r) return section(S.live.repos, false, [el('p', { class: 'muted', text: S.record.reposUnread })]);
+    var children = [reposTable(r.list, missingIn(b), !r.base_measured)];
+    if (!r.base_measured) children.push(el('p', { class: 'muted', text: fill(S.record.notMeasuredByVersion, { version: r.record_version }) }));
+    return section(S.live.repos, false, children);
+  }
+  // The components the record found, by the lanes its registry counts them
+  // in, then those in no lane, those not registered, and those gone.
+  function recordComponents(b) {
+    var c = b.components;
+    if (!c) return section(S.live.components, false, [el('p', { class: 'muted', text: S.record.componentsUnread })]);
+    if (!c.measured) {
+      return section(S.live.components, false, [
+        el('p', { class: 'muted', text: S.record.componentsNotMeasured }),
+        el('ul', null, c.reasons.map(function (reason) { return el('li', { text: reason }); }))
       ]);
+    }
+    var item = function (x) {
+      var kinds = x.kinds === null ? S.record.notFound : x.kinds.join(', ');
+      var parts = [el('code', { text: x.key }), el('span', { class: 'muted', text: '  ' + kinds })];
+      if (x.kind_changed) {
+        parts.push(el('span', { class: 'chip changed', text: fill(S.record.kindChanged, { before: x.kind_changed.before.join(', ') }) }));
+      }
+      if (x.note) parts.push(el('div', { class: 'sub', text: x.note }));
+      return el('li', { 'data-component': x.key }, parts);
+    };
+    var group = function (title, list, empty) {
+      return [el('h3', { text: title }), list.length === 0 ? el('p', { class: 'muted', text: empty }) : el('ul', null, list.map(item))];
+    };
+    var children = [];
+    c.lanes.forEach(function (lane) {
+      children = children.concat(group(lane.name, lane.components, S.record.noComponentInLane));
     });
-    return section(S.live.repos, false, [el('div', { class: 'scroll' }, [el('table', { class: 'grid' }, [head].concat(rows))])]);
+    children = children.concat(group(S.record.uncounted, c.uncounted, S.record.none));
+    children = children.concat(group(S.record.unacknowledged, c.unacknowledged, S.record.none));
+    children.push(el('h3', { text: S.record.gone }));
+    children.push(c.gone === null ? el('p', { class: 'muted', text: S.record.goneUnknown })
+      : c.gone.length === 0 ? el('p', { class: 'muted', text: S.record.none })
+      : el('ul', null, c.gone.map(function (key) { return el('li', null, [el('code', { text: key })]); })));
+    return section(S.live.components, false, children);
   }
   function liveTrail(l) {
     var t = l.trail;
@@ -16336,7 +16522,7 @@ function installExperimentalNotice(program2, names = EXPERIMENTAL_COMMANDS, writ
 function readBuildStamp() {
   if (false) return void 0;
   try {
-    return JSON.parse('{"version":"0.71.2","commit":"c7fc0ed","committedAt":"2026-10-19T20:00:28+09:00"}');
+    return JSON.parse('{"version":"0.72.0","commit":"f92df50","committedAt":"2026-10-20T12:15:21+09:00"}');
   } catch {
     return void 0;
   }