yichus 0.3.2 → 0.3.3

package/dist/studio-page/what-happens.js

@@ -41,7 +41,7 @@
 // (poteto) TLA+ diagrams.
 
 import { mark, tg, MIN_LABEL, COLORS as C } from './system-map.js';
-import { walk, leavesOf, pathEffects, allEffects, stationLabel, outcomeLabel, isWriteOp } from './what-happens-record.js';
+import { walk, leavesOf, pathEffects, allEffects, stationLabel, stationDetail, fromWord, outcomeLabel, isWriteOp } from './what-happens-record.js';
 import { SANS, MONO, textWidth, clipText, boxAttr, fitAttr, labelAttr, labelled } from './label-fit.js';
 
 const RED = C.guard, GREEN = '#1f7a45', GREEN_SOFT = '#e4f4ea', RED_SOFT = '#fbe9e7';
@@ -223,9 +223,9 @@ export function renderWhatHappens(record, opts = {}) {
   y = frameTop + (phone ? 18 : 22);
   // the entry rack: the described entries, then one line for the others
   y = rack(record, entry, P, y, out, !!opts.ghosts || opts.open === 'ghosts');
-  // whether a base was compared, always in this place: a fix is then read
-  // off the frame, also when nothing is green
-  y = compared(record, P, y + (phone ? 13 : 15), out);
+  // what a compared base says, in this place: a fix is then read off the
+  // frame, also when nothing is green; with no base, nothing is drawn here
+  if (record.diff) y = compared(record, P, y + (phone ? 13 : 15), out);
   y += phone ? 10 : 14;
   // the entry's own line
   const o = parseOpen(opts.open);
@@ -243,6 +243,13 @@ export function renderWhatHappens(record, opts = {}) {
   }).map(effectKey));
   const x0 = P.pad + (phone ? 6 : 12);
   y = entryHead(entry, root || stepNode, record, P, x0, y, out, opts.open);
+  // entries that take the same steps, on other tables and checks
+  if (entry.sameShape && !root && !stepNode) {
+    const names = entry.sameShape.entries.map(id => id.replace(/^route:/, ''));
+    lines(`same steps as ${names.join(', ')} · on their own tables and checks`, P.fsS, P.W - P.pad - x0 - 12, false, 2)
+      .forEach(l => { out.push(tg([`sameShape:${entry.entry}`], T(x0 + 12, y + P.row * 0.2, l, { size: P.fsS, fill: C.muted, mono: false }))); y += P.row * 0.8; });
+    y += P.row * 0.3;
+  }
   const subject = root ? root.next : stepNode || entry.tree;
   // work beside the wrapper, folded; a wrapper's work after the handler is
   // folded on each path that runs it, just before its outcome
@@ -263,6 +270,35 @@ export function renderWhatHappens(record, opts = {}) {
     y = tree(subject, 0, x0, y, P, out, entry, true);
   }
   y = witnessList(record, entry, subject, P, x0, y + (phone ? 10 : 14), out);
+  // what each table it touches holds, by its checked row type, and then the tables only
+  // the entries with the same steps touch (which this tree stands for), each said to be theirs
+  const touched = new Map();
+  const touch = (es, by) => { for (const e of es || []) for (const tb of e.tables || []) if (!touched.has(tb)) touched.set(tb, by); };
+  for (const e of [entry, ...(entry.sameShape?.entries || []).map(id => record.entries.find(x => x.entry === id)).filter(Boolean)]) {
+    const by = e === entry ? null : e.entry.replace(/^route:/, '');
+    touch(e.effects, by);
+    walk(e === entry ? subject : e.tree, x => { if (!x.kind) touch(x.effects, by); });
+  }
+  for (const [tb, by] of [...touched].filter(([tb]) => record.rows && record.rows[tb])) {
+    for (const l of lines(`${by ? `in ${by}, ` : ''}${tb} holds ${record.rows[tb]}`, P.fsS, P.W - P.pad - x0 - 6, true, 3)) { y += P.row * 0.8; out.push(tg([`rows:${tb}`], T(x0, y, l, { size: P.fsS, fill: C.muted }))); }
+    y += P.row * 0.2;
+  }
+  // the checks it names are the author's labels: what each decides is in its code
+  const library = id => /^(Bosatsu|Yichus)\//.test(id);
+  const namedIds = [];
+  walk(subject, t => { if (t.kind === 'node' && t.from?.kind === 'call' && !library(t.from.callee) && !namedIds.includes(t.from.callee)) namedIds.push(t.from.callee); });
+  const named = [...new Set(namedIds.map(bare))];
+  if (named.length) {
+    const note = `${named.join(', ')}: names the author chose; this shows where each runs, what it is given and what happens when it fails, not what it decides`;
+    for (const l of lines(note, P.fsS, P.W - P.pad - x0 - 6, false, 3)) { y += P.row * 0.8; out.push(tg(['names'], T(x0, y, l, { size: P.fsS, fill: C.muted, mono: false }))); }
+    y += P.row * 0.3;
+  }
+  // what the author wrote above each named check: their words, in italic, not checked
+  for (const id of namedIds.filter(id => record.docs && record.docs[id])) {
+    const said = `${bare(id)}, in its author's comment (unchecked): ${record.docs[id].replace(/\s+/g, ' ')}`;
+    for (const l of lines(said, P.fsS, P.W - P.pad - x0 - 6, false, 3)) { y += P.row * 0.8; out.push(tg([`docs:${id}`], T(x0, y, l, { size: P.fsS, fill: C.muted, mono: false, italic: true }))); }
+    y += P.row * 0.2;
+  }
   const H = Math.ceil(y + (phone ? 10 : 16));
   const frame = labelled('frame', `<rect x="2.5" y="${frameTop}" width="${W - 5}" height="${H - frameTop - 3}" rx="10" fill="none" stroke="${C.frame}" stroke-width="1"/>` +
     `<text x="14" y="${frameTop + 4}" font-family="${SANS}" font-size="${phone ? 9 : 10}" font-weight="600" fill="${C.muted}" stroke="${C.page}" stroke-width="6" paint-order="stroke">Yichus output</text>`);
@@ -277,6 +313,12 @@ function rack(record, selected, P, y, out, expanded) {
   const x0 = pad + (phone ? 6 : 12);
   let x = x0, yy = y;
   const ghosts = record.entries.filter(e => !e.described);
+  // no entry described: one line that opens to list them all
+  if (ghosts.length === record.entries.length && !expanded) {
+    const n = ghosts.length, text = `${n} ${n === 1 ? 'entry' : 'entries'}`;
+    out.push(tg([`ghosts:${n}`], `<g data-ghosts="folded"${opener('ghosts', `Show the ${n} entries no scenario describes`)}>${title(`${n} entries no scenario describes`)}${ghostHead(x, yy)}${T(x + 11, yy, text, { size: fs, fill: C.muted, mono: false })}</g>`));
+    return yy + 4;
+  }
   out.push(T(x, yy, ghosts.length ? `entries · ${record.entries.length - ghosts.length} of ${record.entries.length} described by a scenario` : `entries · every one described`,
     { size: fs, fill: C.muted, mono: false }));
   yy += lh;
@@ -315,10 +357,6 @@ function rack(record, selected, P, y, out, expanded) {
 }
 function compared(record, P, y, out) {
   const x = P.pad + (P.phone ? 6 : 12), d = record.diff;
-  if (!d) {
-    out.push(tg(['compared:none'], `<g${labelAttr('compared')}>${title('no earlier version of the program was compared, so nothing here says what was fixed')}${T(x, y, 'no base compared', { size: P.fsS, fill: C.faint, mono: false })}</g>`));
-    return y + 4;
-  }
   const parts = [[`compared with ${d.base}`, C.muted, null], [`${d.fixed.length} fixed`, d.fixed.length ? GREEN : C.muted, 600], [`${d.stillRed.length} still failing`, d.stillRed.length ? RED : C.muted, 600]];
   if (d.unresolved.length) parts.push([`${d.unresolved.length} no longer checked`, C.muted, 600]);
   if (d.goneAtHead.length) parts.push([`${d.goneAtHead.length} gone with ${d.goneAtHead.length === 1 ? 'its entry' : 'their entries'}`, C.muted, null]);
@@ -370,13 +408,25 @@ function stations(effects, x, y, P, out, key) {
     const text = stationLabel(e) + (isCore(e) ? '' : ` · ${e.phase === 'after' ? `after the handler${whose}${after ? (after.everyPath ? ' · on every path that runs it' : ' · not on every path that runs it') : ''}` : e.layer === 'beside' ? 'beside the wrapper' : `before the handler${whose}`}`);
     const where = `${text} in ${String(e.site).split('::').pop()}${e.line ? `, line ${e.line}` : ''}`;
     const rows = lines(text, P.fsS, P.W - P.pad - x - r - 10, true, 2);
-    out.push(tg([`effect:${key}:${e.op}:${e.tables.join(',')}`], `<g data-layer="${e.layer || 'core'}">${title(where)}${ring}${rows.map((l, i) => T(x + r + 6 + (i ? 8 : 0), cy + 3.5 + i * P.row * 0.8, l, { size: P.fsS, fill: isCore(e) ? color : C.hullInk })).join('')}</g>`));
-    if (rows.length > 1) out.push(line(x, cy, x, cy + P.row * 1.2));
-    y = cy + P.row * 0.6 + (rows.length - 1) * P.row * 0.8;
+    // the row it touches and where what it writes comes from, under the label
+    // (measured at the size it is drawn at: never below the smallest label)
+    const dsz = Math.max(MIN_LABEL, P.fsS - 1);
+    const detail = stationDetail(e), more = detail ? lines(detail, dsz, P.W - P.pad - x - r - 18, true, 2) : [];
+    const all = [...rows.map(l => [l, P.fsS, isCore(e) ? color : C.hullInk]), ...more.map(l => [l, dsz, C.muted])];
+    out.push(tg([`effect:${key}:${e.op}:${e.tables.join(',')}`], `<g data-layer="${e.layer || 'core'}">${title(detail ? `${where}: ${detail}` : where)}${ring}${all.map(([l, size, fill], i) => T(x + r + 6 + (i ? 8 : 0), cy + 3.5 + i * P.row * 0.8, l, { size, fill })).join('')}</g>`));
+    if (all.length > 1) out.push(line(x, cy, x, cy + P.row * (0.6 + (all.length - 1) * 0.8)));
+    y = cy + P.row * 0.6 + (all.length - 1) * P.row * 0.8;
   }
   return y;
 }
 
+const forkSources = t => {
+  const f = t.from || {};
+  if (f.kind === 'call' || f.kind === 'derived') return (f.sources || []).map(fromWord).join(', ') || null;
+  if (f.kind === 'read') return f.op === 'mint id' ? 'new id' : `${f.table || bare(f.primitive)} as read`;
+  if (f.kind === 'request' || f.kind === 'caller') return [f.kind, ...(f.path || [])].join('.');
+  return null;
+};
 // One subtree from (x, y) down. Returns the y where it ends.
 // A folded step: one shaded box on the line (the map's hull), its role,
 // what it answers instead of running the handler, and its effects.
@@ -467,9 +517,18 @@ function tree(t, depth, x, y, P, out, entry, top) {
     out.push(tg([`words:${t.id}`], `<g>${title(`${t.test} (${t.key})`)}${T(lx, yy, clip(t.words, P.fs, room, false, 400, true), { size: P.fs, italic: true, mono: false, fill: crossNode ? C.hullInk : C.ink })}</g>`));
     if (!P.phone) out.push(T(lx + Math.min(room, width(clip(t.words, P.fs, room, false, 400, true), P.fs, false, 400, true)) + 8, yy, clip(t.test, P.fsS, Math.max(0, room - width(t.words, P.fs, false, 400, true) - 10)), { size: P.fsS, fill: C.faint }));
   } else {
-    for (const [i, l] of lines(t.test, P.fs, room, !guard, 2, guard ? 600 : 400).entries())
+    const rows = lines(t.test, P.fs, room, !guard, 2, guard ? 600 : 400);
+    for (const [i, l] of rows.entries())
       out.push(T(lx, yy + i * P.row * 0.85, l, { size: P.fs, mono: !guard, fill: guard ? RED : crossNode ? C.hullInk : C.ink2, weight: guard ? 600 : null }));
-    if (width(t.test, P.fs, !guard, guard ? 600 : 400) > room) yy += P.row * 0.85;
+    if (rows.length > 1) yy += P.row * 0.85;
+    // what the branch tests comes from: the request, the caller, a read
+    const src = forkSources(t);
+    if (src) {
+      const after = width(rows[rows.length - 1], P.fs, !guard, guard ? 600 : 400) + 8, left = room - after;
+      const text = `← ${src}`;
+      if (width(text, P.fsS, true) <= left) out.push(T(lx + after, yy, text, { size: P.fsS, fill: C.muted }));
+      else { yy += P.row * 0.8; out.push(T(lx, yy, clip(text, P.fsS, room), { size: P.fsS, fill: C.muted })); }
+    }
   }
   y = yy + P.row * 0.35;
   // the spine continues straight down: the arm that reaches the main

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yichus",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Local Bosatsu compilation, Yichus analysis, and generated apps using the WebMCP engine",
   "license": "MIT",
   "homepage": "https://yich.us",
@@ -20,7 +20,7 @@
   "dependencies": {
     "zod": "^4.3.6",
     "@modelcontextprotocol/sdk": "^1.26.0",
-    "@yichus/api-mcp": "0.1.4"
+    "@yichus/api-mcp": "0.1.5"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",