visualproof 0.4.1 → 0.4.2

package/dist/shared/reviewqueue.js

@@ -39,6 +39,21 @@ export function nonStandardAxiom(g, i) {
 export function needsReview(g, d, i) {
     return nonStandardAxiom(g, i) || !trusted(d, g.nodes[i].name, g.nodes[i].module, g.isExt(i));
 }
+/** What set `s` holds besides `skip`, as a TCB's size counts it (TCBSpec decision 7): `counted`,
+ *  what needs review; `trusted`, the rest, told apart and never added in. The panel's counts and
+ *  the selection bar's (ViewSpec decision 14) count so. */
+export function trustSplit(g, d, s, skip = -1) {
+    let counted = 0, t = 0;
+    for (let j = 0; j < s.length; j++) {
+        if (!s[j] || j === skip)
+            continue;
+        if (needsReview(g, d, j))
+            counted++;
+        else
+            t++;
+    }
+    return { counted, trusted: t };
+}
 /** What `root`'s review holds, its review set (`reviewScope`), in the graph's numbering. */
 export function reviewSet(g, d, root) {
     return evaluate(reviewScope(g.nodes[root].name), { g, review: d });

package/dist/web/bundle/app.js

@@ -3040,6 +3040,18 @@ function inTargets(g2, targets) {
 function nonStandardAxiom(g2, i2) {
   return g2.nodes[i2].kind === "axiom" && !STANDARD_AXIOMS.includes(g2.nodes[i2].name);
 }
+function needsReview(g2, d2, i2) {
+  return nonStandardAxiom(g2, i2) || !trusted(d2, g2.nodes[i2].name, g2.nodes[i2].module, g2.isExt(i2));
+}
+function trustSplit(g2, d2, s2, skip = -1) {
+  let counted = 0, t2 = 0;
+  for (let j2 = 0; j2 < s2.length; j2++) {
+    if (!s2[j2] || j2 === skip) continue;
+    if (needsReview(g2, d2, j2)) counted++;
+    else t2++;
+  }
+  return { counted, trusted: t2 };
+}
 function reviewSet(g2, d2, root) {
   return evaluate(reviewScope(g2.nodes[root].name), { g: g2, review: d2 });
 }
@@ -12234,6 +12246,7 @@ function editorAnchor(href) {
 
 // src/web/src/panel.ts
 var PANEL_SECTIONS = { why: "p-why", stats: "p-stats", axioms: "p-axioms", tcb: "p-tcb" };
+var TRUSTED_TITLE = "Trusted without review, and not counted: what a trusted prefix covers (Mathlib, Lean's own by default), and the standard axioms";
 function banner(f2) {
   if (!f2) return "";
   const when = f2.builtAt ? new Date(f2.builtAt).toLocaleString() : "";
@@ -12352,18 +12365,16 @@ var Panel = class {
     const tcb = g2.reach([i2], SITE_STMT | SITE_BODY, "out");
     const deps = g2.reach([i2], ALL_SITES, "out");
     const apps = g2.reach([i2], ALL_SITES, "in");
-    const count2 = (s2) => {
-      let p2 = 0, x2 = 0;
-      for (let j2 = 0; j2 < s2.length; j2++) if (s2[j2] && j2 !== i2) g2.isExt(j2) ? x2++ : p2++;
-      return [p2, x2];
-    };
-    const [tcbP, tcbX] = count2(tcb);
-    const [depP, depX] = count2(deps);
-    const [appP] = count2(apps);
+    const d2 = this.hooks.reviewData();
+    const inTcb = trustSplit(g2, d2, tcb, i2);
+    const used = trustSplit(g2, d2, deps, i2);
+    const n3 = (x2) => x2.toLocaleString();
+    let appP = 0;
+    for (let j2 = 0; j2 < apps.length; j2++) if (apps[j2] && j2 !== i2 && !g2.isExt(j2)) appP++;
     const axioms = g2.axiomsOf(i2);
     const groups = /* @__PURE__ */ new Map();
     for (let j2 = 0; j2 < tcb.length; j2++) {
-      if (!tcb[j2] || j2 === i2 || g2.isExt(j2)) continue;
+      if (!tcb[j2] || j2 === i2 || !needsReview(g2, d2, j2)) continue;
       const k2 = g2.nodes[j2].kind;
       if (!groups.has(k2)) groups.set(k2, []);
       groups.get(k2).push(j2);
@@ -12371,7 +12382,7 @@ var Panel = class {
     const order = ["axiom", "opaque", "structure", "class", "inductive", "def", "abbrev", "instance", "notation", "theorem"];
     const tcbList = [...groups.entries()].sort((a3, b2) => order.indexOf(a3[0]) - order.indexOf(b2[0])).map(([k2, xs]) => {
       xs.sort((a3, b2) => g2.nodes[a3].name < g2.nodes[b2].name ? -1 : 1);
-      return `<div class="grp"><div class="grp-h"><span class="dot k-${k2}"></span>${k2} <span class="muted">${xs.length}</span></div>` + xs.map((j2) => `<button class="row rv-${markOf(this.hooks.reviewData(), g2.nodes[j2].name, g2.nodes[j2].module, false, g2.nodes[j2].hash)}" data-go="${j2}" title="Go to ${escapeHtml(g2.nodes[j2].name)}">${escapeHtml(g2.nodes[j2].name)}</button>`).join("") + `</div>`;
+      return `<div class="grp"><div class="grp-h"><span class="dot k-${k2}"></span>${k2} <span class="muted">${xs.length}</span></div>` + xs.map((j2) => `<button class="row rv-${markOf(d2, g2.nodes[j2].name, g2.nodes[j2].module, g2.isExt(j2), g2.nodes[j2].hash)}" data-go="${j2}" title="Go to ${escapeHtml(g2.nodes[j2].name)}">${escapeHtml(g2.nodes[j2].name)}</button>`).join("") + `</div>`;
     }).join("");
     const listOrder = this.hooks.listOrder();
     const keyOnly = listOrder === "key";
@@ -12413,11 +12424,11 @@ var Panel = class {
       ${this.hooks.links?.(i2) ?? ""}
       ${this.box.html(i2, true, tcb)}
       ${why ? part(PANEL_SECTIONS.why, "Why in the TCB", "", () => why) : ""}
-      ${part(PANEL_SECTIONS.stats, "Counts", `${tcbP} in TCB \xB7 ${depP} uses \xB7 ${appP} used by`, () => `
+      ${part(PANEL_SECTIONS.stats, "Counts", `${n3(inTcb.counted)} in TCB \xB7 ${n3(used.counted)} uses \xB7 ${n3(appP)} used by`, () => `
       <div class="stats">
-        <div class="stat"><div class="n grad-tcb">${tcbP}</div><div class="l">in TCB<br><span class="muted">+${tcbX} external</span></div></div>
-        <div class="stat"><div class="n grad-dep">${depP}</div><div class="l">uses<br><span class="muted">+${depX} external</span></div></div>
-        <div class="stat"><div class="n grad-app">${appP}</div><div class="l">used by</div></div>
+        <div class="stat"><div class="n grad-tcb">${n3(inTcb.counted)}</div><div class="l">in TCB<br><span class="muted" title="${TRUSTED_TITLE}">+${n3(inTcb.trusted)} trusted</span></div></div>
+        <div class="stat"><div class="n grad-dep">${n3(used.counted)}</div><div class="l">uses<br><span class="muted" title="${TRUSTED_TITLE}">+${n3(used.trusted)} trusted</span></div></div>
+        <div class="stat"><div class="n grad-app">${n3(appP)}</div><div class="l">used by</div></div>
       </div>`)}
       ${part(
       PANEL_SECTIONS.axioms,
@@ -12427,7 +12438,7 @@ var Panel = class {
       () => `<div class="axioms">${axioms.length ? axioms.map((a3) => `<span class="chip ${nonStd.includes(a3) ? "bad" : ""}">${escapeHtml(a3)}</span>`).join("") : `<span class="muted">none</span>`}</div>`
     )}
       ${notationHtml(g2, i2)}
-      ${tcbP ? part(PANEL_SECTIONS.tcb, "Its TCB", `${tcbP}${queue === null ? "" : keyOnly ? " \xB7 key declarations" : inOrder ? " \xB7 in review order" : " \xB7 by kind"}`, () => `<div class="sec-tcb p-order">${orderSwitch}</div><div class="tcb-list">${inOrder ? queue : tcbList}</div>`, { id: "checks", title: "What a TCB is: the film's chapter on the ways to check" }) : ""}
+      ${inTcb.counted ? part(PANEL_SECTIONS.tcb, "Its TCB", `${inTcb.counted}${queue === null ? "" : keyOnly ? " \xB7 key declarations" : inOrder ? " \xB7 in review order" : " \xB7 by kind"}`, () => `<div class="sec-tcb p-order">${orderSwitch}</div><div class="tcb-list">${inOrder ? queue : tcbList}</div>`, { id: "checks", title: "What a TCB is: the film's chapter on the ways to check" }) : ""}
     `;
     this.el.classList.add("open");
     if (!same2) this.el.scrollTop = 0;
@@ -19097,7 +19108,7 @@ var TOUR = [
   {
     id: "checks",
     title: "Three ways to check",
-    text: "<b>Selection</b>: the statement alone, least effort. <b>Keys</b>: the few that carry the meaning. <b>TCB</b>: all it rests on, most effort, most confidence. The counts say what each costs.",
+    text: "<b>Selection</b>: the statement alone, least effort. <b>Keys</b>: the few that carry the meaning. <b>TCB</b>: all it rests on, most effort, most confidence. The counts say what each costs, the trusted apart.",
     about: ["#lightup [data-mode=plain]", "#rests-steps [data-mode=keys]", "#rests-steps [data-mode=tcb]", "key:2"],
     showMe: "tcb-three",
     // tcb-first: the reader's own click selects, under Rests on · TCB, a theorem whose TCB lights
@@ -20122,6 +20133,40 @@ function besideSide(btn, el) {
 }
 
 // src/web/src/guide.ts
+function restsOnCounts(g2, d2, self2, lit) {
+  let read2 = 0, assumed = 0, proofs = 0, keys = 0;
+  for (let j2 = 0; j2 < g2.n; j2++) {
+    if (j2 === self2) continue;
+    if (!lit.tcb?.[j2]) {
+      if (lit.uses?.[j2]) proofs++;
+      continue;
+    }
+    if (!needsReview(g2, d2, j2)) assumed++;
+    else read2++;
+    if (lit.keys?.[j2]) keys++;
+  }
+  const at = self2 >= 0 && lit.tcb?.[self2] ? needsReview(g2, d2, self2) ? "read" : "trusted" : null;
+  return { self: at, read: read2, assumed, proofs, keys };
+}
+function tcbText(r2) {
+  const n3 = (x2) => x2.toLocaleString();
+  const proofs = r2.proofs ? ` What its proofs alone use, ${n3(r2.proofs)} more, is not lit: the proofs are Lean's to check.` : "";
+  if (!r2.read && !r2.assumed) return `Its <b>TCB</b> is itself alone: its statement rests on nothing but Lean.${proofs}`;
+  const decls = (x2) => `${n3(x2)} declaration${x2 === 1 ? "" : "s"}`;
+  const readThem = r2.read ? ` To trust it, read ${r2.read === 1 ? "that one" : `those ${n3(r2.read)}`}.` : "";
+  if (r2.self === "read") {
+    const one2 = r2.assumed === 1;
+    const trusted3 = r2.assumed ? ` The ${one2 ? "one" : n3(r2.assumed)} trusted, as Mathlib is, light${one2 ? "s" : ""} too, and ${one2 ? "is" : "are"} assumed.` : "";
+    if (!r2.read) return `Its <b>TCB</b> lights it alone to read: the ${one2 ? "one" : n3(r2.assumed)} it rests on ${one2 ? "is" : "are"} trusted, as Mathlib is, and assumed.${proofs}`;
+    return `Its <b>TCB</b> lights ${n3(r2.read + 1)}: it, and ${decls(r2.read)} to read \u2014 definitions, axioms, the project's notation.${trusted3}${readThem}${proofs}`;
+  }
+  const trusted2 = r2.assumed + (r2.self === "trusted" ? 1 : 0);
+  return `Its <b>TCB</b> lights ${r2.read ? `${decls(r2.read)} to read` : "nothing to read"}, and ${n3(trusted2)} trusted${r2.self === "trusted" ? ", it among them" : ""}, as Mathlib is, and assumed.${readThem}${proofs}`;
+}
+function keysText(r2) {
+  const of = `Of the ${r2.read.toLocaleString()} declaration${r2.read === 1 ? "" : "s"} to read, `;
+  return r2.keys === 1 ? `${of}the one the review marked <b>key</b>: what carries its meaning. Read it first.` : `${of}the ${r2.keys.toLocaleString()} the review marked <b>key</b>: the few that carry its meaning. Read them first.`;
+}
 var $2 = (sel) => document.querySelector(sel);
 function welcomeOf(o2) {
   if (o2.guided || o2.welcomed) return "none";
@@ -20613,7 +20658,7 @@ var Guide = class {
     const ring = (step2) => () => (phone ? around("#panel") : around(step2)) ?? board();
     const lit = (step2) => () => {
       const b2 = board();
-      const m3 = phone ? null : around(step2);
+      const m3 = phone ? null : around(step2, "#selbar .sb-n");
       if (!m3) return b2;
       const l2 = Math.min(b2.left, m3.left), t2 = Math.min(b2.top, m3.top);
       return new DOMRect(l2, t2, Math.max(b2.right, m3.right) - l2, Math.max(b2.bottom, m3.bottom) - t2);
@@ -20635,15 +20680,8 @@ var Guide = class {
           this.hooks.setTool("tcb");
           this.hooks.frameLit();
         },
-        // the numbers add up to the selection bar's: the theorem, what is to be read, what is assumed
-        text: () => {
-          const lit2 = r2.read + r2.assumed;
-          const assumed = r2.assumed ? `${r2.assumed} trusted, as Mathlib is, and assumed` : "";
-          const proofs = r2.proofs ? ` What its proofs alone use, ${r2.proofs} more, is not lit: the proofs are Lean's to check.` : "";
-          if (!lit2) return `Its <b>TCB</b> is itself alone: its statement rests on nothing but Lean.${proofs}`;
-          if (!r2.read) return `Its <b>TCB</b> lights ${lit2} besides it, all ${r2.assumed === 1 ? "of it " : ""}trusted, as Mathlib is, and assumed: nothing of the project's to read.${proofs}`;
-          return `Its <b>TCB</b> lights ${lit2} besides it: ${r2.read} to read \u2014 definitions, axioms, the project's notation \u2014${assumed ? ` and ${assumed}` : ""}. To trust it, read ${r2.read === 1 ? "that one" : `those ${r2.read}`}.${proofs}`;
-        },
+        // the numbers are the selection bar's: the theorem and what is to be read, what is trusted
+        text: () => tcbText(r2),
         at: lit("#rests-steps [data-mode=tcb]")
       },
       {
@@ -20653,7 +20691,7 @@ var Guide = class {
           this.hooks.setTool(r2.keys ? "keys" : "tcb");
           this.hooks.frameLit();
         },
-        text: () => r2.keys ? r2.keys === 1 ? `Of those ${r2.read + r2.assumed}, the one the review marked <b>key</b>: what carries its meaning. Read it first.` : `Of those ${r2.read + r2.assumed}, the ${r2.keys} the review marked <b>key</b>: the few that carry its meaning. Read them first.` : ro || this.hooks.snapshot() ? "None is marked <b>key</b> yet: the review marks the few of a target's TCB that carry its meaning." : phone ? "None is marked <b>key</b> yet. On a target's view, its panel's \u25C7 Mark as key marks the few that carry its meaning." : "None is marked <b>key</b> yet. On a view focused on a target, <kbd>k</kbd> marks the few of its TCB that carry its meaning.",
+        text: () => r2.keys ? keysText(r2) : ro || this.hooks.snapshot() ? "None is marked <b>key</b> yet: the review marks the few of a target's TCB that carry its meaning." : phone ? "None is marked <b>key</b> yet. On a target's view, its panel's \u25C7 Mark as key marks the few that carry its meaning." : "None is marked <b>key</b> yet. On a view focused on a target, <kbd>k</kbd> marks the few of its TCB that carry its meaning.",
         at: () => r2.keys ? lit("#rests-steps [data-mode=keys]")() : ring("#rests-steps [data-mode=keys]")()
       }
     ];
@@ -21580,7 +21618,7 @@ var SelectionBar = class {
     return !this.el.hidden;
   }
   /** The picks, the one the panel tells of (its index, or -1), how many declarations are lit on the
-   *  board, and whether Zoom in has a view to open that is not this one: one holding something,
+   *  board, the trusted apart, and whether Zoom in has a view to open that is not this one: one holding something,
    *  and not just what this board holds (shared/board.ts, zoomScope). */
   render(picks, panel, lit, zoom, key = null) {
     this.el.hidden = !picks.length;
@@ -21589,12 +21627,12 @@ var SelectionBar = class {
       return;
     }
     const esc2 = escapeHtml;
-    const why = lit ? "This board holds just what is lit already" : "Nothing selected is on this board";
+    const why = lit.counted + lit.trusted ? "This board holds just what is lit already" : "Nothing selected is on this board";
     const chips = picks.map((p2, k2) => {
       const words = pickWords(p2);
       return `<span class="sb-chip t-${p2.tool}${k2 === panel ? " on" : ""}" title="${esc2(printQuery(p2.q))}"><button class="sb-go" data-show="${k2}"${p2.root ? ` title="Show ${esc2(words)}"` : " disabled"}>${esc2(words)}</button><button class="sb-x" data-rm="${k2}" title="Take it out" aria-label="Take ${esc2(words)} out">\xD7</button></span>`;
     }).join("");
-    this.el.innerHTML = `<span class="sb-chips">${chips}</span><span class="sb-meta"><span class="sb-n" title="Declarations lit on this board">${lit.toLocaleString()} lit</span>` + (this.hooks.canOpenViews() ? `<button class="sb-btn" data-zoom${zoom ? ` title="Open a view of what is selected, laid out on its own, in a tab"` : ` disabled title="${why}"`}>Zoom in</button>` : "") + (key ? `<button class="sb-btn sb-key" data-mark-keys${key.fresh ? ` title="${esc2(`Mark the ${key.fresh} declaration${key.fresh === 1 ? "" : "s"} you clicked as key for ${key.target}`)}"` : ` disabled title="${esc2(key.already ? `What you clicked is key for ${key.target} already` : `Nothing you clicked is in ${key.target}'s review besides the target`)}"`}>\u25C6 Mark selected as key${key.fresh > 1 ? ` (${key.fresh})` : ""}</button>` : "") + `<button class="sb-btn" data-clear title="Select nothing (Esc)">Clear</button></span>`;
+    this.el.innerHTML = `<span class="sb-chips">${chips}</span><span class="sb-meta"><span class="sb-n"><span title="Declarations lit on this board that are not trusted">${lit.counted.toLocaleString()} lit</span>` + (lit.trusted ? `<span class="sb-trusted" title="Trusted declarations lit too: assumed without review, and not counted \u2014 what a trusted prefix covers, and the standard axioms"> \xB7 +${lit.trusted.toLocaleString()} trusted</span>` : "") + `</span>` + (this.hooks.canOpenViews() ? `<button class="sb-btn" data-zoom${zoom ? ` title="Open a view of what is selected, laid out on its own, in a tab"` : ` disabled title="${why}"`}>Zoom in</button>` : "") + (key ? `<button class="sb-btn sb-key" data-mark-keys${key.fresh ? ` title="${esc2(`Mark the ${key.fresh} declaration${key.fresh === 1 ? "" : "s"} you clicked as key for ${key.target}`)}"` : ` disabled title="${esc2(key.already ? `What you clicked is key for ${key.target} already` : `Nothing you clicked is in ${key.target}'s review besides the target`)}"`}>\u25C6 Mark selected as key${key.fresh > 1 ? ` (${key.fresh})` : ""}</button>` : "") + `<button class="sb-btn" data-clear title="Select nothing (Esc)">Clear</button></span>`;
   }
 };
 
@@ -23198,7 +23236,7 @@ function offsetIn(root, node, off) {
 }
 
 // src/web/src/reload.ts
-var PAGE_VERSION = true ? "0.4.1" : null;
+var PAGE_VERSION = true ? "0.4.2" : null;
 var KEY4 = "visualproof:reload";
 var FOR_KEY2 = "visualproof:reloaded-for";
 var FRESH_MS = 10 * 6e4;
@@ -53428,7 +53466,8 @@ async function boot() {
     review = { ...review, rev: c3.rev, problems: c3.problems, error: problemsText(c3.problems) };
     reviewChanged();
   };
-  const renderSelBar = (q2 = selectionQuery(picks), lit = q2 && litOn(q2)) => selBar.render(picks, picks.findIndex((p2) => !!shown && sameShown(shownOf(p2), shown)), lit?.count ?? 0, zoomOf(q2, lit) !== null, keyMarking());
+  const litCount = (lit) => lit ? trustSplit(vg(), boardReview(), lit.set) : { counted: 0, trusted: 0 };
+  const renderSelBar = (q2 = selectionQuery(picks), lit = q2 && litOn(q2)) => selBar.render(picks, picks.findIndex((p2) => !!shown && sameShown(shownOf(p2), shown)), litCount(lit), zoomOf(q2, lit) !== null, keyMarking());
   const apply = () => {
     const G2 = vg();
     syncFocus();
@@ -55070,20 +55109,8 @@ ${n3.note.text.slice(0, 200)}`)) return;
       const q2 = selectionQuery([declPick(tool, name, keysFor({ decl: name }))]);
       return q2 ? litOn(q2).set : null;
     };
-    const tcb = lit("tcb"), uses = lit("deps"), keys = lit("keys");
-    const self2 = toView(i2);
-    let read2 = 0, assumed = 0, proofs = 0, k2 = 0;
-    for (let j2 = 0; j2 < G2.n; j2++) {
-      if (j2 === self2) continue;
-      if (keys?.[j2]) k2++;
-      if (!tcb?.[j2]) {
-        if (uses?.[j2]) proofs++;
-        continue;
-      }
-      if (trusted(d2, G2.nodes[j2].name, G2.nodes[j2].module, G2.isExt(j2))) assumed++;
-      else read2++;
-    }
-    return { name: g2.nodes[i2].display ?? name.split(".").pop(), read: read2, assumed, proofs, keys: k2, target: isTarget(name) };
+    const counts2 = restsOnCounts(G2, d2, toView(i2), { tcb: lit("tcb"), uses: lit("deps"), keys: lit("keys") });
+    return { name: g2.nodes[i2].display ?? name.split(".").pop(), ...counts2, target: isTarget(name) };
   };
   const showMe = (action) => {
     const i2 = tourExample();

package/docs/agent-api/reading.md

@@ -39,9 +39,10 @@ Everything about one declaration; here `include=print` while Lean loads:
   a personal link, `by` their name now; `recordedBy`: typed for `by` by that person, at one screen
   (theirs all the same); `trustedBy`: covering prefixes, or `["standard axiom"]`.
 - `editedSinceCompiled`: file differs from what was compiled (null outside the project); `keyFor`,
-  `inTcbOf`: targets it is key for, whose TCB holds it; `usesDirect`, `usedBy.direct`: what it
-  refers to by name, what refers to it (`uses`, `users` list them); `usedBy.all`: all reaching it,
-  proofs included.
+  `inTcbOf`: targets it is key for, whose TCB holds it; `tcbSize`: its TCB besides it, by where,
+  trusted included (a TCB's size leaves them out: `tcb`'s `needReview`, `trustedNotCounted`);
+  `usesDirect`, `usedBy.direct`: what it refers to by name, what refers to it (`uses`, `users` list
+  them); `usedBy.all`: all reaching it, proofs included.
 
 **`include`**: comma-separated parts, each answered under its name as its endpoint would. `uses`,
 `users` take `offset`, `limit`, `where` from the query; `print` takes `proofs`; `describe` and

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "visualproof",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "type": "module",
   "description": "See a Lean codebase's declaration graph and the TCB of its theorems.",
   "license": "Apache-2.0",