From 39a3e8314215e7fe7bfa50a9e076517771f5ff04 Mon Sep 17 00:00:00 2001
From: Dan Connolly <dckc@madmode.com>
Date: Tue, 18 Apr 2023 00:14:30 -0500
Subject: [PATCH 01/14] handle smallcaps

---
 src/app.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app.js b/src/app.js
index b7e076e..8ffe97e 100644
--- a/src/app.js
+++ b/src/app.js
@@ -95,8 +95,9 @@ const parseCranks = slogText => {
 
 const threshold = 8;
 const fmtMsg = ({ body, slots }) => {
-  const [method] = JSON.parse(body);
-  const args = body.slice(`["${method}"]`.length);
+  const bodyj = body.replace(/^#/, '');
+  const [method] = JSON.parse(bodyj);
+  const args = bodyj.slice(`["${method}"]`.length);
   return `.${method}(${args.slice(0, threshold)}${
     args.length > threshold ? `...${args.length}` : ''
   }, ${slots.slice(0, 3).join(',')})`;

From 8e3de697eb51aefa271aafd16ba13a61980dd621 Mon Sep 17 00:00:00 2001
From: Dan Connolly <dckc@madmode.com>
Date: Tue, 18 Apr 2023 00:14:42 -0500
Subject: [PATCH 02/14] take advantage of dynamic vat names

---
 src/app.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/app.js b/src/app.js
index 8ffe97e..558ae49 100644
--- a/src/app.js
+++ b/src/app.js
@@ -295,6 +295,11 @@ const slogToDot = (cranks, cranksToShow, notes) => {
     const current = event.crankNum === currentCrankNum;
 
     switch (type) {
+      case 'create-vat':
+        const { vatID, name } = event;
+        vats.push({ vatID, name });
+        summary = { type: 'create-vat', vatID, name };
+        break;
       case 'clist': {
         switch (event.mode) {
           case 'import':
@@ -322,8 +327,8 @@ const slogToDot = (cranks, cranksToShow, notes) => {
         switch (event.kd[0]) {
           case 'startVat': {
             const { vatID } = event;
-            const name = notes.vats[vatID];
-            vats.push({ vatID, name });
+            // const name = notes.vats[vatID];
+            // vats.push({ vatID, name });
             summary = { tag: 'startVat', vatID };
             break;
           }

From b8dbc9c015022614d3642f5e089b1ad9f963615f Mon Sep 17 00:00:00 2001
From: Dan Connolly <dckc@madmode.com>
Date: Tue, 18 Apr 2023 00:14:55 -0500
Subject: [PATCH 03/14] never mind vat name annotations

---
 www/index.html | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/www/index.html b/www/index.html
index acfed65..98d1b71 100644
--- a/www/index.html
+++ b/www/index.html
@@ -29,28 +29,6 @@ <h2>Annotations</h2>
     <textarea name="annotations">
 {
     "vats": {
-        "v1": "bootstrap",
-        "v2": "vatAdmin",
-        "v3": "comms",
-        "v4": "mailbox",
-        "v5": "timer",
-        "v6": "zoe",
-        "v7": "board",
-        "v8": "chainStorage",
-        "v9": "centralSupply",
-        "v10": "mintHolder: USDC_axl",
-        "v11": "mintHolder: AUSD",
-        "v12": "psmCharter",
-        "v13": "committee.econ",
-        "v14": "mintHolder: BLD",
-        "v15": "bank",
-        "v16": "walletFactory",
-        "v17": "governor: PSM(USDC_axl)",
-        "v18": "governor: PSM(AUSD)",
-        "v19": "governor: ?",
-        "v20": "PSM(USDC_axl)",
-        "v21": "PSM(AUSD)",
-        "v22": "provisionPool"
     },
     "exports": {
         "v1": {

From f86b45c119c831edb30e58f8e5167bd011ae43e7 Mon Sep 17 00:00:00 2001
From: Dan Connolly <dckc@madmode.com>
Date: Tue, 18 Apr 2023 00:15:43 -0500
Subject: [PATCH 04/14] start over on vat export annotations for vaults

---
 www/index.html | 144 ++++++-------------------------------------------
 1 file changed, 16 insertions(+), 128 deletions(-)

diff --git a/www/index.html b/www/index.html
index 98d1b71..79f9fe4 100644
--- a/www/index.html
+++ b/www/index.html
@@ -32,153 +32,41 @@ <h2>Annotations</h2>
     },
     "exports": {
         "v1": {
-            "ko21": "bootstrap*",
-            "ko124": "bridgeManager",
-            "ko135": "agoricNames",
-            "ko280": "namesByAddressAdmin"
+            "ko21": "bootstrap*"
         },
         "v2": {
-            "ko20": "vatAdmin*",
-            "ko27": "vatAdminSvc",
-            "ko34": "adminNode.34 v??",
-            "ko35": "adminNode.35 v??"
+            "ko20": "vatAdmin root",
+            "ko22": "vatAdmin*",
+            "ko25": "vatAdminSvc"
+        },
+        "v4": {
+            "ko24": "vattp*"
         },
         "v5": {
             "ko23": "timer*",
-            "ko29": "timerService"
+            "ko27": "timerService"
         },
         "v6": {
-            "ko30": "zoe*",
-            "ko36": "feeMintAccess",
-            "ko37": "zoeService",
-            "ko40": "IST Issuer",
-            "ko41": "Installation.41??",
-            "ko42": "Installation: mintHolder",
-            "ko43": "Installation.43??",
-            "ko44": "Installation.44??",
-            "ko45": "Installation.45??",
-            "ko46": "Installation.46??",
-            "ko47": "Installation.47??",
-            "ko48": "Installation.48??",
-            "ko49": "Installation.49??",
-            "ko57": "IST brand",
-            "ko58": "Invitation issuer",
-            "ko71": "Instance.71??",
-            "ko72": "zcfAdmin: mintHolder AUSD",
-            "ko73": "Instance: mintHolder AUSD",
-            "ko74": "zcfAdmin: psmCharter",
-            "ko75": "Instance.75??",
-            "ko85": "adminFacet.85??",
-            "ko87": "adminFacet.87??",
-            "ko88": "emptyPublicFacet.88",
-            "ko96": "Instance.96??",
-            "ko104": "Invitation.104??",
-            "ko106": "IST payment.106",
-            "ko110": "emptyPublicFacet.110",
-            "ko115": "zcfAdmin: mintHolder BLD",
-            "ko116": "Instance: mintHolder BLD",
-            "ko133": "Invitation.133??",
-            "ko134": "Invitation.134??",
-            "ko139": "Invitation brand",
-            "ko144": "zcfAdmin: walletFactory",
-            "ko145": "InstanceH.145",
-            "ko160": "zcfAdmin: v17",
-            "ko161": "Instance.161??",
-            "ko166": "Invitation.166??",
-            "ko175": "zcfAdmin.175",
-            "ko176": "Instance.176??",
-            "ko178": "InstanceH.178",
-            "ko181": "IST ZoeMint",
-            "ko273": "adminFacet.273??"
+            "ko29": "priceAuthority*"
         },
         "v7": {
-            "ko31": "board*",
-            "ko38": "board",
-            "ko51": "boardSerializer",
-            "ko151": "board readonly marshaller"
+            "ko30": "zoe*"
         },
         "v8": {
-            "ko32": "chainStorage*",
-            "ko39": "published??",
-            "ko50": "published.agoricNames",
-            "ko52": "published.committee",
-            "ko53": "node.53??",
-            "ko59": "node.59??",
-            "ko132": "node.132??",
-            "ko142": "published.psm",
-            "ko149": "node.149??"
+            "ko31": "board*",
+            "ko48": "board"
         },
         "v9": {
-            "ko60": "zcf.9"
+            "ko32": "bridge*"
         },
         "v10": {
-            "ko76": "USDC_axl mint",
-            "ko78": "USDC_axl issuer",
-            "ko90": "USDC_axl brand"
+            "ko33": "provisioning*"
         },
         "v11": {
-            "ko79": "AUSD mint",
-            "ko81": "AUSD issuer",
-            "ko91": "AUSD brand",
-            "ko128": "AUSD Purse.128",
-            "ko278": "AUSD Purse.278"
+            "ko34": "network*"
         },
         "v12": {
-            "ko82": "psmCharterCreatorFacet"
-        },
-        "v13": {
-            "ko100": "econ cttee creatorFacet",
-            "ko102": "econ cttee publicFacet",
-            "ko129": "InvitationH.129",
-            "ko130": "InvitationH.130",
-            "ko165": "InvitationH.165",
-            "ko249": "questionPoser.249",
-            "ko253": "econ cttee questionPoser.253"
-        },
-        "v14": {
-            "ko117": "BLD mint",
-            "ko119": "BLD issuer",
-            "ko121": "BLD brand"
-        },
-        "v15": {
-            "ko122": "bank*",
-            "ko125": "bankHandler",
-            "ko126": "bankManager",
-            "ko164": "bank",
-            "ko226": "Asset Subscription",
-            "ko230": "SubscriptionIterator.230",
-            "ko231": "Virtual Purse.231",
-            "ko260": "Virtual Purse.260",
-            "ko271": "notifier.271",
-            "ko279": "notifier.279",
-            "ko282": "Virtual Purse.282",
-            "ko284": "notifier.284"
-        },
-        "v16": {
-            "ko146": "walletActionHandler",
-            "ko152": "walletFactoryCreator"
-        },
-        "v17": {
-            "ko264": "psmGovernorFacet(USDC_axl)"
-        },
-        "v19": {
-            "ko261": "gov. creatorFacet.261"
-        },
-        "v21": {
-            "ko150": "published.psm.IST.AUSD",
-            "ko222": "PSM(AUSD) governorFacet",
-            "ko224": "PSM(AUSD) public or limited? .224",
-            "ko236": "PSM(AUSD) public or limited? .236",
-            "ko237": "PSM(AUSD) paramRetriever.237",
-            "ko241": "PSM(AUSD) param manager",
-            "ko258": "PSM(AUSD) paramRetriever.258",
-            "ko259": "PSM(AUSD) paramRetriever.259"
-        },
-        "v22": {
-            "ko216": "provisionPool governorFacet",
-            "ko217": "handleOffer.217",
-            "ko232": "ProvisionPool creator",
-            "ko281": "provisioningHandler"
+            "ko35": "ibc*"
         }
     }
 }

From ef377fc736644c39f8f4bb895ad9dffbcf011abd Mon Sep 17 00:00:00 2001
From: Dan Connolly <dckc@madmode.com>
Date: Tue, 3 Sep 2024 17:46:35 -0500
Subject: [PATCH 05/14] chore(deps): typescript

 - yarn added packageManager too
---
 package.json | 6 ++++--
 yarn.lock    | 5 +++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 37128db..3bab5db 100644
--- a/package.json
+++ b/package.json
@@ -8,10 +8,12 @@
     "singleQuote": true
   },
   "devDependencies": {
-    "esbuild": "^0.15.11"
+    "esbuild": "^0.15.11",
+    "typescript": "^5.5.4"
   },
   "dependencies": {
     "htm": "^3.1.1",
     "preact": "^10.11.2"
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha256.c17d3797fb9a9115bf375e31bfd30058cac6bc9c3b8807a3d8cb2094794b51ca"
 }
diff --git a/yarn.lock b/yarn.lock
index 395243d..a126647 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -149,3 +149,8 @@ preact@^10.11.2:
   version "10.11.2"
   resolved "https://registry.yarnpkg.com/preact/-/preact-10.11.2.tgz#e43f2a2f2985dedb426bb4c765b7bb037734f8a8"
   integrity sha512-skAwGDFmgxhq1DCBHke/9e12ewkhc7WYwjuhHB8HHS8zkdtITXLRmUMTeol2ldxvLwYtwbFeifZ9uDDWuyL4Iw==
+
+typescript@^5.5.4:
+  version "5.5.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba"
+  integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==

From ecce12585562ac7132ce56034264b5bc7335e1f8 Mon Sep 17 00:00:00 2001
From: Dan Connolly <dckc@madmode.com>
Date: Tue, 3 Sep 2024 17:47:21 -0500
Subject: [PATCH 06/14] chore: prune more vat export annotations

---
 www/index.html | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/www/index.html b/www/index.html
index 79f9fe4..8cef7a0 100644
--- a/www/index.html
+++ b/www/index.html
@@ -32,41 +32,27 @@ <h2>Annotations</h2>
     },
     "exports": {
         "v1": {
-            "ko21": "bootstrap*"
         },
         "v2": {
-            "ko20": "vatAdmin root",
-            "ko22": "vatAdmin*",
-            "ko25": "vatAdminSvc"
         },
         "v4": {
-            "ko24": "vattp*"
         },
         "v5": {
-            "ko23": "timer*",
-            "ko27": "timerService"
         },
         "v6": {
-            "ko29": "priceAuthority*"
+            "ko29": "agoricNamesAdmin"
         },
         "v7": {
-            "ko30": "zoe*"
         },
         "v8": {
-            "ko31": "board*",
-            "ko48": "board"
         },
         "v9": {
-            "ko32": "bridge*"
         },
         "v10": {
-            "ko33": "provisioning*"
         },
         "v11": {
-            "ko34": "network*"
         },
         "v12": {
-            "ko35": "ibc*"
         }
     }
 }

From e46e23d8eea423817cedede41771e6b051ded7cc Mon Sep 17 00:00:00 2001
From: Dan Connolly <dckc@madmode.com>
Date: Tue, 3 Sep 2024 17:47:38 -0500
Subject: [PATCH 07/14] fix: handle smallCaps in focus

---
 src/app.js | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/app.js b/src/app.js
index 558ae49..39f2261 100644
--- a/src/app.js
+++ b/src/app.js
@@ -176,13 +176,24 @@ const placesIn = (
   return walk(x);
 };
 
+const smallCaps = {
+  parseBody: body => JSON.parse(body.replace(/^#/, '')),
+  isSlotRef: x => typeof x === 'string' && /^\$/.test(x),
+  getIFace: x => {
+    const parts = x.match(/^\$\d+\.Alleged: (?<iface>.*)/);
+    return parts?.groups?.iface || x;
+  },
+};
+
 const theSlotRef = (target, { body, slots }) => {
-  const methargs = JSON.parse(body);
+  const methargs = smallCaps.parseBody(body);
   const ix = slots.findIndex(s => s === target);
   /** @returns {string | false} */
   const walk = tr => {
     if (tr === null) return false;
-    else if (typeof tr === 'object') {
+    else if (smallCaps.isSlotRef(tr)) {
+      return smallCaps.getIFace(tr);
+    } else if (typeof tr === 'object') {
       if ('@qclass' in tr) {
         if (tr['@qclass'] === 'slot' && tr.index === ix)
           return tr.iface || JSON.stringify(tr);
@@ -200,7 +211,7 @@ const theSlotRef = (target, { body, slots }) => {
     }
     return false;
   };
-  return walk(JSON.parse(body)) || die(target);
+  return walk(smallCaps.parseBody(body)) || die(target);
 };
 
 /**
@@ -590,8 +601,9 @@ const App =
     useEvent('hashchange', ev => {
       const hash = ev.target.location.hash;
       const kobjs = hash.slice(1).split(',');
-      setFocus(findUsages(kobjs, cranks, cranksToShow));
-      console.log('@@focus', focus);
+      const usages = findUsages(kobjs, cranks, cranksToShow);
+      setFocus(usages);
+      console.log('@@focus', usages);
     });
 
     return html`

From e1e481599ca0d0f96552a8bd82d9dd72cdeb8ea4 Mon Sep 17 00:00:00 2001
From: Dan Connolly <dckc@madmode.com>
Date: Tue, 3 Sep 2024 23:11:59 -0500
Subject: [PATCH 08/14] fix: match slot index

---
 src/app.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/app.js b/src/app.js
index 39f2261..23a3a72 100644
--- a/src/app.js
+++ b/src/app.js
@@ -178,7 +178,12 @@ const placesIn = (
 
 const smallCaps = {
   parseBody: body => JSON.parse(body.replace(/^#/, '')),
-  isSlotRef: x => typeof x === 'string' && /^\$/.test(x),
+  asSlotRef: x => {
+    if (typeof x !== 'string') return null;
+    const parts = x.match(/^\$(?<ref>\d+)/);
+    if (!parts) return null;
+    return Number(parts?.groups?.ref);
+  },
   getIFace: x => {
     const parts = x.match(/^\$\d+\.Alleged: (?<iface>.*)/);
     return parts?.groups?.iface || x;
@@ -191,7 +196,7 @@ const theSlotRef = (target, { body, slots }) => {
   /** @returns {string | false} */
   const walk = tr => {
     if (tr === null) return false;
-    else if (smallCaps.isSlotRef(tr)) {
+    else if (smallCaps.asSlotRef(tr) === ix) {
       return smallCaps.getIFace(tr);
     } else if (typeof tr === 'object') {
       if ('@qclass' in tr) {

From 32a473aaf2206c7cb8e00d950bf50991d029c070 Mon Sep 17 00:00:00 2001
From: Dan Connolly <dckc@madmode.com>
Date: Tue, 3 Sep 2024 23:12:11 -0500
Subject: [PATCH 09/14] chore: omit dups in focus

---
 src/app.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app.js b/src/app.js
index 23a3a72..1e7e1c7 100644
--- a/src/app.js
+++ b/src/app.js
@@ -219,6 +219,8 @@ const theSlotRef = (target, { body, slots }) => {
   return walk(smallCaps.parseBody(body)) || die(target);
 };
 
+const unique = xs => xs.filter((x, ix, array) => array.indexOf(x) === ix);
+
 /**
  * @param {string[]} kobjs
  * @param {Crank[]} cranks
@@ -262,7 +264,9 @@ const findUsages = (kobjs, cranks, cranksToShow) => {
     return [];
   };
 
-  return fromEntries(kobjs.map(k => [k, events.flatMap(e => usages(k, e))]));
+  return fromEntries(
+    kobjs.map(k => [k, unique(events.flatMap(e => usages(k, e)))]),
+  );
 };
 
 /**

From 9e027994112af71fb94635e35825ca1fb4fe3f98 Mon Sep 17 00:00:00 2001
From: Dan Connolly <dckc@madmode.com>
Date: Wed, 4 Sep 2024 01:32:58 -0500
Subject: [PATCH 10/14] docs: fix maybe type

---
 src/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app.js b/src/app.js
index 1e7e1c7..41b42c8 100644
--- a/src/app.js
+++ b/src/app.js
@@ -14,7 +14,7 @@ export const html = htm.bind(h);
 const die = why => {
   throw new Error(why);
 };
-/** @type {<T,U>(x:T, f:(xx:T) => U) => U[]} */
+/** @type {<T,U>(x:T | undefined, f:(xx:T) => U) => U[]} */
 const maybe = (x, f) => (x ? [f(x)] : []);
 
 /**

From cf031c8840a824502c0f30627c3b39b277946c1e Mon Sep 17 00:00:00 2001
From: Dan Connolly <dckc@madmode.com>
Date: Wed, 4 Sep 2024 01:33:41 -0500
Subject: [PATCH 11/14] refactor: hoist usages -> objInEvent

---
 src/app.js | 66 +++++++++++++++++++++++++++---------------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/app.js b/src/app.js
index 41b42c8..b8c1cdb 100644
--- a/src/app.js
+++ b/src/app.js
@@ -221,6 +221,38 @@ const theSlotRef = (target, { body, slots }) => {
 
 const unique = xs => xs.filter((x, ix, array) => array.indexOf(x) === ix);
 
+const objInEvent = (/** @type {KoID} */ k, /** @type {SlogEntry} */ e) => {
+  switch (e.type) {
+    case 'deliver':
+      switch (e.kd[0]) {
+        case 'message':
+          if (e.kd[1] === k) return [k + fmtMsg(e.kd[2].methargs)];
+          if (e.kd[2].methargs.slots.includes(k)) {
+            return [theSlotRef(k, e.kd[2].methargs)];
+          }
+          break;
+        case 'notify':
+          for (const [_kp, { data }] of e.kd[1]) {
+            if (data.slots.includes(k)) {
+              return [theSlotRef(k, data)];
+            }
+          }
+          break;
+      }
+      break;
+    case 'syscall': {
+      switch (e.ksc[0]) {
+        case 'send':
+          if (e.ksc[1] === k) return [k + fmtMsg(e.ksc[2].methargs)];
+          if (e.ksc[2].methargs.slots.includes(k)) {
+            return [theSlotRef(k, e.ksc[2].methargs)];
+          }
+      }
+    }
+  }
+  return [];
+};
+
 /**
  * @param {string[]} kobjs
  * @param {Crank[]} cranks
@@ -232,40 +264,8 @@ const findUsages = (kobjs, cranks, cranksToShow) => {
     .map(c => c.events)
     .flat();
 
-  const usages = (/** @type {string} */ k, /** @type {SlogEntry} */ e) => {
-    switch (e.type) {
-      case 'deliver':
-        switch (e.kd[0]) {
-          case 'message':
-            if (e.kd[1] === k) return [k + fmtMsg(e.kd[2].methargs)];
-            if (e.kd[2].methargs.slots.includes(k)) {
-              return [theSlotRef(k, e.kd[2].methargs)];
-            }
-            break;
-          case 'notify':
-            for (const [_kp, { data }] of e.kd[1]) {
-              if (data.slots.includes(k)) {
-                return [theSlotRef(k, data)];
-              }
-            }
-            break;
-        }
-        break;
-      case 'syscall': {
-        switch (e.ksc[0]) {
-          case 'send':
-            if (e.ksc[1] === k) return [k + fmtMsg(e.ksc[2].methargs)];
-            if (e.ksc[2].methargs.slots.includes(k)) {
-              return [theSlotRef(k, e.ksc[2].methargs)];
-            }
-        }
-      }
-    }
-    return [];
-  };
-
   return fromEntries(
-    kobjs.map(k => [k, unique(events.flatMap(e => usages(k, e)))]),
+    kobjs.map(k => [k, unique(events.flatMap(e => objInEvent(k, e)))]),
   );
 };
 

From e06e22f969ddc2652ca4be5cc5a9f3ff5ed27d63 Mon Sep 17 00:00:00 2001
From: Dan Connolly <dckc@madmode.com>
Date: Wed, 4 Sep 2024 01:37:27 -0500
Subject: [PATCH 12/14] fix: black vat color; refine string types

 - provide a color for create-vat tag
   - clarify static type for summary, which showed type: vs tag:
 - toward refactor for different presentation:
   use template literal types for VatID etc. to re-learn the code
---
 src/app.js   | 75 +++++++++++++++++++++++++++++++++++-----------------
 src/types.js | 29 +++++++++++---------
 2 files changed, 68 insertions(+), 36 deletions(-)

diff --git a/src/app.js b/src/app.js
index b8c1cdb..3c9be24 100644
--- a/src/app.js
+++ b/src/app.js
@@ -254,7 +254,7 @@ const objInEvent = (/** @type {KoID} */ k, /** @type {SlogEntry} */ e) => {
 };
 
 /**
- * @param {string[]} kobjs
+ * @param {KoID[]} kobjs
  * @param {Crank[]} cranks
  * @param {number} cranksToShow
  */
@@ -269,15 +269,38 @@ const findUsages = (kobjs, cranks, cranksToShow) => {
   );
 };
 
+const vatColors = {
+  message: 'DeepSkyBlue',
+  notify: 'DarkTurquoise',
+  startVat: 'Aquamarine',
+  'create-vat': 'Aquamarine',
+};
+/**
+ * @typedef {{
+ *   tag: 'create-vat' | 'startVat' | 'message' | 'notify';
+ *   vatID: VatID;
+ *   name?: string;
+ * }} Summary
+ */
+
+/** @param {Summary} summary */
+const crankColor = ({ tag, vatID }) => {
+  const color = vatColors[tag];
+  if (!color) {
+    console.warn('no color for', vatID, tag);
+  }
+  return color || 'orange';
+};
+
 /**
  *
  * @param {Crank[]} cranks
  * @param {number} cranksToShow
  * @param {SlogAnnotation} notes
  * @typedef {{
- *   vats: Record<string, string>,
- *   exports: Record<string, Record<string, string>>,
- *   objects: Record<string, string>,
+ *   vats: Record<VatID, string>,
+ *   exports: Record<VatID, Record<KoID, string>>,
+ *   objects: Record<KoID, string>,
  * }} SlogAnnotation
  */
 const slogToDot = (cranks, cranksToShow, notes) => {
@@ -293,11 +316,11 @@ const slogToDot = (cranks, cranksToShow, notes) => {
   };
   /** @type {Map<string, number>} */
   const typeCounts = new Map();
-  /** @type {Map<string, string>} */
+  /** @type {Map<KoID | KpID, VatID>} */
   const kopToVat = new Map();
-  /** @type {Map<string, string[]>} */
+  /** @type {Map<VatID, KpID[]>} */
   const pendingPromises = new Map();
-  /** @type {Map<string, SlogSyscallEntry>} */
+  /** @type {Map<KpID, SlogSyscallEntry & { ksc: ['send', KoID | KpID, Message] }>} */
   const pendingSends = new Map();
 
   const events = cranks
@@ -306,6 +329,7 @@ const slogToDot = (cranks, cranksToShow, notes) => {
     .flat();
   const currentCrankNum = crankStartNum(cranks[cranksToShow - 1].events[0]);
 
+  /** @type {Summary} */
   let summary;
 
   for (const event of events) {
@@ -318,7 +342,7 @@ const slogToDot = (cranks, cranksToShow, notes) => {
       case 'create-vat':
         const { vatID, name } = event;
         vats.push({ vatID, name });
-        summary = { type: 'create-vat', vatID, name };
+        summary = { tag: 'create-vat', vatID, name };
         break;
       case 'clist': {
         switch (event.mode) {
@@ -396,7 +420,7 @@ const slogToDot = (cranks, cranksToShow, notes) => {
           case 'send': {
             const [_s, _t, { result }] = ksc;
             kopToVat.set(result, event.vatID);
-            pendingSends.set(result, event);
+            pendingSends.set(result, { ...event, ksc });
 
             if (!current) break;
 
@@ -446,19 +470,24 @@ const slogToDot = (cranks, cranksToShow, notes) => {
     objToImpPort,
   });
 
-  const portOpt = o => objToImpPort.get(o) || o;
+  /** @param {KoID | KpID} id */
+  const portOpt = id => objToImpPort.get(/** @type {KoID} */ (id)) || id;
 
   const msgArcs = msgs.map(({ kd: [_m, target, { methargs, result }] }) =>
     d.arc(kopToVat.get(result) || result, portOpt(target), {
       label: fmtMsg(methargs),
     }),
   );
-  const pendingArc = kp => e =>
-    d.arc(kp, portOpt(e.ksc[1]), {
-      label: fmtMsg(e.ksc[2].methargs),
-      style: 'dashed',
-      fontsize: 8,
-    });
+  /** @param {KpID} kp */
+  const pendingArc =
+    kp =>
+    /** @param {SlogSyscallEntry & {ksc: ['send', KoID | KpID, Message]}} e */
+    e =>
+      d.arc(kp, portOpt(e.ksc[1]), {
+        label: fmtMsg(e.ksc[2].methargs),
+        style: 'dashed',
+        fontsize: 8,
+      });
   const pendingSendArcs = [...pendingPromises.values()].flatMap(kps =>
     kps.flatMap(kp => maybe(pendingSends.get(kp), pendingArc(kp))),
   );
@@ -519,16 +548,11 @@ const slogToDot = (cranks, cranksToShow, notes) => {
     );
 
     const active = summary.vatID === vatID;
-    const vatColors = {
-      message: 'DeepSkyBlue',
-      notify: 'DarkTurquoise',
-      startVat: 'Aquamarine',
-    };
     return d.nodeCluster(
       vatID,
       {
         label: name ? `${vatID}:${name}` : vatID,
-        ...(active ? { style: 'filled', color: vatColors[summary.tag] } : {}),
+        ...(active ? { style: 'filled', color: crankColor(summary) } : {}),
       },
       [
         d.node(`${vatID}_exports`, {
@@ -552,7 +576,7 @@ const slogToDot = (cranks, cranksToShow, notes) => {
     e.kd[1].map(r => d.node(r[0], { style: r[1] ? 'bold' : 'italic' })),
   );
 
-  return d.digraph({ rankdir: 'LR', fontsize: 10 }, [
+  const dot = d.digraph({ rankdir: 'LR', fontsize: 10 }, [
     // ...objLabels,
     ...pLabels,
     ...clusters,
@@ -560,6 +584,7 @@ const slogToDot = (cranks, cranksToShow, notes) => {
     ...msgArcs,
     ...importArcs,
   ]);
+  return { dot };
 };
 
 const App =
@@ -577,8 +602,10 @@ const App =
         JSON.parse(querySelector('textarea[name="annotations"]').value)
       ),
     );
+    /** @type {SlogAnnotation} */
     const notes = {
       ...rawNotes,
+      // @ts-expect-error grumble: entries() doesn't preserve the key type
       objects: fromEntries(values(rawNotes.exports).flatMap(m => entries(m))),
     };
 
@@ -602,7 +629,7 @@ const App =
 
     useEffect(() => {
       if (!cranks.length) return;
-      const dot = slogToDot(cranks, cranksToShow, notes);
+      const { dot } = slogToDot(cranks, cranksToShow, notes);
       console.log('renderDot:', dot);
       renderDot(dot);
     }, [cranks, cranksToShow]);
diff --git a/src/types.js b/src/types.js
index 193030b..08455ab 100644
--- a/src/types.js
+++ b/src/types.js
@@ -8,9 +8,14 @@
  * @typedef {{
  *   time: number
  * }} SlogTimedEntry
+ *
+ * @typedef {`v{number}`} VatID
+ * @typedef {`ko{number}`} KoID
+ * @typedef {`kp{number}`} KpID
+ *
  * @typedef { SlogTimedEntry & {
  *   crankNum: number,
- *   vatID: string,
+ *   vatID: VatID,
  *   deliveryNum: number,
  * }} SlogVatEntry
  *
@@ -19,9 +24,9 @@
  *   kd: KernelDelivery,
  * }} SlogDeliveryEntry
  * @typedef { |
- *   [tag: 'message', target: string, msg: Message] |
+ *   [tag: 'message', target: KoID, msg: Message] |
  *   [tag: 'notify', resolutions: Array<[
- *       kp: string,
+ *       kp: KpID,
  *       desc: { fulfilled: boolean, refCount: number, data: CapData },
  *     ]>] |
  *   [tag: 'retireImports' | 'retireExports' | 'dropExports']
@@ -29,7 +34,7 @@
  * } KernelDelivery
  * @typedef {{
  *   methargs: CapData,
- *   result: string,
+ *   result: KpID,
  * }} Message
  * @typedef {{
  *   body: string,
@@ -40,20 +45,20 @@
  *   ksc: [tag: 'invoke' | 'vatstoreGet'| 'vatstoreGetAfter'|
  *              'vatstoreSet' | 'vatstoreDelete' |
  *              'dropImports' | 'retireImports' | 'retireExports' ] |
- *        [tag: 'send', target: string, msg: Message] |
- *        [tag: 'subscribe', xx: unknown, p: string] |
- *        [tag: 'resolve', target: string,
- *         resolutions: Array<[kp: string, rejected: boolean, value: CapData]>],
+ *        [tag: 'send', target: KoID | KpID, msg: Message] |
+ *        [tag: 'subscribe', xx: unknown, p: KpID] |
+ *        [tag: 'resolve', target: KpID,
+ *         resolutions: Array<[kp: KpID, rejected: boolean, value: CapData]>],
  * }} SlogSyscallEntry
  *
  * @typedef { SlogTimedEntry & {
  *   type: 'create-vat',
- *   vatID: string,
+ *   vatID: VatID,
  *   dynamic?: boolean,
  *   description?: string,
  *   name?: string,
  *   managerType?: string,
- *   vatParameters?: Record<string, unknown>,
+ *   vatParameters?: Record<VatID, unknown>,
  *   vatSourceBundle?: unknown,
  * }} SlogCreateVatEntry
  * @typedef { SlogTimedEntry & {
@@ -63,14 +68,14 @@
  * }} SlogEndBlockStartEntry
  * @typedef { SlogTimedEntry & {
  *   type: 'deliver-result',
- *   vatID: string,
+ *   vatID: VatID,
  *   dr: [tag: unknown, x: unknown, meter: {}],
  * }} SlogDeliverResultEntry
  * @typedef { SlogTimedEntry & {
  *  type: 'crank-start', crankNum: number, crankType: string }} SlogCrankStartEntry
  * @typedef { SlogTimedEntry & {
  *  type: 'clist', mode: 'import' | 'export' | 'drop',
- *  vatID: string, vobj: string, kobj: string }} SlogCListEntry
+ *  vatID: VatID, vobj: string, kobj: KoID }} SlogCListEntry
  * @typedef { SlogTimedEntry & {
  *   type: 'import-kernel-start' | 'import-kernel-finish'
  *       | 'vat-startup-start' | 'vat-startup-finish'

From 276bf8a46b7df29ee686883f82fd8d528aae3bd7 Mon Sep 17 00:00:00 2001
From: Dan Connolly <dckc@madmode.com>
Date: Wed, 4 Sep 2024 05:24:30 -0500
Subject: [PATCH 13/14] chore: style for access matrix

---
 www/index.html | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/www/index.html b/www/index.html
index 8cef7a0..94ffb58 100644
--- a/www/index.html
+++ b/www/index.html
@@ -9,6 +9,19 @@
     .graph {
       width: 100%;
     }
+
+    th {
+      white-space: nowrap;
+    }
+    .vatName {
+      background-color: skyblue;
+    }
+    .iface {
+      background-color: wheat;
+    }
+    .import {
+      background-color: orchid;
+    }
   </style>
 </head>
 <body>

From 542e8f6d3bde1546cbd10627d9400f86853a6893 Mon Sep 17 00:00:00 2001
From: Dan Connolly <dckc@madmode.com>
Date: Wed, 4 Sep 2024 05:24:50 -0500
Subject: [PATCH 14/14] feat: access matrix (WIP)

---
 src/app.js | 60 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 52 insertions(+), 8 deletions(-)

diff --git a/src/app.js b/src/app.js
index 3c9be24..48ba9ab 100644
--- a/src/app.js
+++ b/src/app.js
@@ -304,6 +304,7 @@ const crankColor = ({ tag, vatID }) => {
  * }} SlogAnnotation
  */
 const slogToDot = (cranks, cranksToShow, notes) => {
+  /** @type {{ vatID: VatID, name?: string }[]} */
   const vats = [];
   const sends = [];
   const invokes = [];
@@ -445,11 +446,9 @@ const slogToDot = (cranks, cranksToShow, notes) => {
   }
   console.log({ typeCounts });
 
+  const pass1 = groupBy([...kopToVat.keys()], o => kopToVat.get(o) || die());
   const vatContents = new Map(
-    vats.map(({ vatID: v }) => [
-      v,
-      [...kopToVat.keys()].filter(o => kopToVat.get(o) === v),
-    ]),
+    vats.map(({ vatID: v }) => [v, pass1.get(v) || []]),
   );
 
   const d = fmtDot();
@@ -584,7 +583,46 @@ const slogToDot = (cranks, cranksToShow, notes) => {
     ...msgArcs,
     ...importArcs,
   ]);
-  return { dot };
+
+  const skipPromise = o => !o.startsWith('kp');
+  const exposedObjects = clist.importing.map(x => x.kobj).filter(skipPromise);
+  const nodeInfo = vats.flatMap(({ vatID, name }) => {
+    const myExported = (vatContents.get(vatID) || []).filter(o =>
+      exposedObjects.includes(o),
+    );
+    // TODO: filter by clist exporting?
+    return [{ vatID, name }, ...myExported.map(kobj => ({ kobj }))];
+  });
+  const renderAccessMatrix = () => {
+    const blankCell = html`<td></td>`;
+    const importCell = html`<td class="import">I</td>`;
+    const exportCell = html`<td>o</td>`; // TODO?
+
+    const rows = nodeInfo.map((rowHd, rowIx) => {
+      const cells = nodeInfo.flatMap((colHd, colIx) => {
+        if (colIx >= rowIx) return [];
+        if (!('vatID' in colHd)) return [blankCell];
+        if ('vatID' in rowHd) return [blankCell];
+        const { kobj } = rowHd;
+        const haystack = importsBySrc.get(colHd.vatID) || [];
+        if (haystack.find(e => e.kobj === kobj)) return [importCell];
+        // TODO: export cells?
+        return [blankCell];
+      });
+      return html`<tr>
+        ${cells}
+        ${'vatID' in rowHd
+          ? html`<th class="vatID">${rowHd.vatID}</th>
+              <th class="vatName" colspan="4">${rowHd.name}</th>`
+          : html`<th>${rowHd.kobj}</th>`}
+      </tr>`;
+    });
+    return html`<table border="1">
+      ${rows}
+    </table>`;
+  };
+
+  return { dot, accessMatrix: renderAccessMatrix() };
 };
 
 const App =
@@ -594,6 +632,7 @@ const App =
       /** @type {{ crankNum: number, events: readonly any[], lines: readonly string[] }[]} */ ([]),
     );
     const [cranksToShow, setCranksToShow] = useState(1);
+    const [matrix, setMatrix] = useState(html`<table border="1"></table>`);
     const [focus, setFocus] = useState(
       /** @type {Record<string, SlogEntry[]>} */ ({}),
     );
@@ -629,9 +668,12 @@ const App =
 
     useEffect(() => {
       if (!cranks.length) return;
-      const { dot } = slogToDot(cranks, cranksToShow, notes);
-      console.log('renderDot:', dot);
-      renderDot(dot);
+      const { dot, accessMatrix } = slogToDot(cranks, cranksToShow, notes);
+      setMatrix(accessMatrix);
+      if (false) {
+        console.log('renderDot:', dot);
+        renderDot(dot);
+      }
     }, [cranks, cranksToShow]);
 
     useEvent('hashchange', ev => {
@@ -676,6 +718,8 @@ const App =
           </div>
         `,
       )}
+      <hr />
+      ${matrix}
     `;
   };