From 877a00baf89dab524a3237cb57e59b83fbac6ea9 Mon Sep 17 00:00:00 2001
From: silnem2 <126880409+silnem2@users.noreply.github.com>
Date: Wed, 15 Mar 2023 11:43:10 -0600
Subject: [PATCH 01/19] lib/gen: update pill lib/gens not to use whitelist

---
 pkg/arvo/gen/brass.hoon    |  3 ++-
 pkg/arvo/gen/solid.hoon    |  3 ++-
 pkg/base-dev/lib/pill.hoon | 54 +++++++++++++++++++++-----------------
 3 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/pkg/arvo/gen/brass.hoon b/pkg/arvo/gen/brass.hoon
index a80cd5e90..099c9d521 100644
--- a/pkg/arvo/gen/brass.hoon
+++ b/pkg/arvo/gen/brass.hoon
@@ -25,6 +25,7 @@
         ==
       ::
         prime=_|
+        exc=(list spur)
     ==
 :-  %pill
 ^-  pill:pill
@@ -45,4 +46,4 @@
   |=  =desk
   [desk /(scot %p p.bec)/[desk]/(scot %da now)]
 ::
-(brass:pill sys dez prime)
+(brass:pill sys dez prime exc)
diff --git a/pkg/arvo/gen/solid.hoon b/pkg/arvo/gen/solid.hoon
index f98d94948..1b3b6e0e2 100644
--- a/pkg/arvo/gen/solid.hoon
+++ b/pkg/arvo/gen/solid.hoon
@@ -29,6 +29,7 @@
       ::
         dub=_|
         prime=_|
+        exc=(list spur)
     ==
 :-  %pill
 ^-  pill:pill
@@ -46,4 +47,4 @@
   |=  =desk
   [desk /(scot %p p.bec)/[desk]/(scot %da now)]
 ::
-(solid:pill sys dez dub now prime)
+(solid:pill sys dez dub now prime exc)
diff --git a/pkg/base-dev/lib/pill.hoon b/pkg/base-dev/lib/pill.hoon
index 4b07f57c6..2e98b25fa 100644
--- a/pkg/base-dev/lib/pill.hoon
+++ b/pkg/base-dev/lib/pill.hoon
@@ -37,20 +37,14 @@
 ::    bas: full path to / directory
 ::
 ++  file-ovum
-  =/  directories=(list path)
-    :~  /app    ::  %gall applications
-        /gen    ::  :dojo generators
-        /lib    ::  libraries
-        /mar    ::  mark definitions
-        /sur    ::  structures
-        /sys    ::  system files
-        /ted    ::  :spider strands
-        /web    ::  %eyre web content
-        /desk   ::  desk manifest
-    ==
-  |=  [des=desk bas=path]
+  |=  [des=desk bas=path exc=(list spur)]
   ^-  unix-event
-  %.  directories
+  =/  dirs
+    ?~  exc  ~(tap in dir:.^(arch %cy bas))
+    %+  skim  
+      ~(tap in dir:.^(arch %cy bas))
+    |=(=spur =(~ (find ~[spur] exc)))
+  %.  dirs
   |=  ::  sal: all spurs to load from
       ::
       sal=(list spur)
@@ -99,7 +93,7 @@
 ::
 ::  +file-ovum2: electric boogaloo
 ::
-++  file-ovum2  |=(p=path `unix-event`[//arvo what/(user-files p)])
+++  file-ovum2  |=(z=[path (list spur)] `unix-event`[//arvo what/(user-files z)])
 ::
 ++  prep-ovum
   |=  dez=(list path)
@@ -114,8 +108,13 @@
 ::  +user-files: all userspace hoon files
 ::
 ++  user-files
-  |=  bas=path
-  %.  directories:file-ovum
+  |=  [bas=path exc=(list spur)]
+  =/  dirs
+    ?~  exc  ~(tap in dir:.^(arch %cy bas))
+    %+  skim
+      ~(tap in dir:.^(arch %cy bas))
+    |=(=spur =(~ (find ~[spur] exc)))
+  %.  dirs
   |=  sal=(list spur)
   ^-  (list (pair path (cask)))
   ::
@@ -154,8 +153,9 @@
 ++  solid
   ::  sys: root path to boot system, `/~me/[desk]/now/sys`
   ::  dez: secondary desks and their root paths
+  ::  exc: list of desk folders to exlclude
   ::
-  |=  [sys=path dez=(list [desk path]) dub=? now=@da prime=?]
+  |=  [sys=path dez=(list [desk path]) dub=? now=@da prime=? exc=(list spur)]
   ^-  pill
   =/  bas=path       (scag 3 sys)
   =/  compiler-path  (weld sys /hoon)
@@ -201,7 +201,8 @@
         :-  (boot-ovum:pill compiler-src arvo-src)
         %+  turn
           (snoc (turn dez tail) bas)
-        file-ovum2:pill
+        |=  =path  
+        (file-ovum2 [path exc])
       .*(0 arvo-formula)
     |=  [ovo=ovum ken=*]
     [~ (slum ken [now ovo])]
@@ -230,15 +231,18 @@
   :+  boot-ova  ~
   =.  dez  (snoc dez [%base bas])
   %+  weld
-    (turn dez file-ovum)
+    %+  turn  dez 
+    |=  [dek=desk bas=path] 
+    (file-ovum [dek bas exc])
   ?.  prime  ~
   [(prep-ovum (turn dez tail))]~
 ::
 ++  brass
   ::  sys: root path to boot system, `/~me/[desk]/now/sys`
   ::  dez: secondary desks and their root paths
+  ::  exc: list of desk folders to exclude
   ::
-  |=  [sys=path dez=(list [desk path]) prime=?]
+  |=  [sys=path dez=(list [desk path]) prime=? exc=(list spur)]
   ^-  pill
   =/  bas=path  (scag 3 sys)
   ::  compiler-source: hoon source file producing compiler, `sys/hoon`
@@ -274,12 +278,14 @@
   ::
   :+  %pill  %brass
   :+  boot-ova
-    :~  (boot-ovum:pill compiler-source arvo-source)
-        (file-ovum2:pill bas)
+    :~  (boot-ovum compiler-source arvo-source)
+        (file-ovum2 [bas exc])
     ==
   =.  dez  (snoc dez [%base bas])
   %+  weld
-    (turn dez file-ovum)
+    %+  turn  dez 
+    |=  [dek=desk bas=path] 
+    (file-ovum [dek bas exc])
   ?.  prime  ~
   [(prep-ovum (turn dez tail))]~
 ::
@@ -355,7 +361,7 @@
     ::TODO  will exclude non-:directories files, such as /changelog/txt
     =-  (murn - same)
     ^-  (list (unit ovum))
-    :~  `(file-ovum as (en-beam beak /))
+    :~  `(file-ovum as (en-beam beak /) ~)
       ::
         ?.  pri  ~
         `(prep-ovum (en-beam beak /) ~)

From 13ce5754fea443fd730dabf364824da5ee9a5a7c Mon Sep 17 00:00:00 2001
From: silnem2 <126880409+silnem2@users.noreply.github.com>
Date: Thu, 16 Mar 2023 11:49:29 -0600
Subject: [PATCH 02/19] Clean up lib/pill and fix %aqua

---
 pkg/arvo/app/aqua.hoon     |  5 ++---
 pkg/base-dev/lib/pill.hoon | 24 +++++++++++-------------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/pkg/arvo/app/aqua.hoon b/pkg/arvo/app/aqua.hoon
index a41f45ba3..10aad8262 100644
--- a/pkg/arvo/app/aqua.hoon
+++ b/pkg/arvo/app/aqua.hoon
@@ -485,11 +485,10 @@
     =/  =desk  +.val
     =.  userspace-ova.pil
       ::  take all files from a userspace desk
-      =/  all-dirs=(list path)  ~[/]
       :_  ~
       %-  unix-event:pill-lib
-      %+  %*(. file-ovum:pill-lib directories all-dirs)
-      desk  /(scot %p our.hid)/[desk]/(scot %da now.hid)
+      %-  file-ovum:pill-lib  :+  desk 
+      /(scot %p our.hid)/[desk]/(scot %da now.hid)  ~
     =^  ms  state  (poke-pill pil)
     (emit-cards ms)
   ::
diff --git a/pkg/base-dev/lib/pill.hoon b/pkg/base-dev/lib/pill.hoon
index 2e98b25fa..716676256 100644
--- a/pkg/base-dev/lib/pill.hoon
+++ b/pkg/base-dev/lib/pill.hoon
@@ -32,6 +32,14 @@
       [/sys/hoon hoon/hoon]
       [/sys/arvo hoon/arvo]
   ==
+::  +dirs: filter for userspace directories to include
+::     
+++  dirs
+  |=  [bas=path exc=(list spur)]
+  ?~  exc  ~(tap in dir:.^(arch %cy bas))
+  %+  skim
+    ~(tap in dir:.^(arch %cy bas))
+  |=(=spur =(~ (find ~[spur] exc)))  
 ::  +file-ovum: userspace filesystem load
 ::
 ::    bas: full path to / directory
@@ -39,12 +47,7 @@
 ++  file-ovum
   |=  [des=desk bas=path exc=(list spur)]
   ^-  unix-event
-  =/  dirs
-    ?~  exc  ~(tap in dir:.^(arch %cy bas))
-    %+  skim  
-      ~(tap in dir:.^(arch %cy bas))
-    |=(=spur =(~ (find ~[spur] exc)))
-  %.  dirs
+  %.  (dirs bas exc)
   |=  ::  sal: all spurs to load from
       ::
       sal=(list spur)
@@ -109,12 +112,7 @@
 ::
 ++  user-files
   |=  [bas=path exc=(list spur)]
-  =/  dirs
-    ?~  exc  ~(tap in dir:.^(arch %cy bas))
-    %+  skim
-      ~(tap in dir:.^(arch %cy bas))
-    |=(=spur =(~ (find ~[spur] exc)))
-  %.  dirs
+  %.  (dirs bas exc)
   |=  sal=(list spur)
   ^-  (list (pair path (cask)))
   ::
@@ -153,7 +151,7 @@
 ++  solid
   ::  sys: root path to boot system, `/~me/[desk]/now/sys`
   ::  dez: secondary desks and their root paths
-  ::  exc: list of desk folders to exlclude
+  ::  exc: list of desk folders to exclude
   ::
   |=  [sys=path dez=(list [desk path]) dub=? now=@da prime=? exc=(list spur)]
   ^-  pill

From 102bfb5571b5e53fd61afe692b2f82095917af4d Mon Sep 17 00:00:00 2001
From: silnem2 <126880409+silnem2@users.noreply.github.com>
Date: Thu, 16 Mar 2023 12:00:48 -0600
Subject: [PATCH 03/19] remove trailing whitespace

---
 pkg/arvo/app/aqua.hoon | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/arvo/app/aqua.hoon b/pkg/arvo/app/aqua.hoon
index 10aad8262..9c205a1b3 100644
--- a/pkg/arvo/app/aqua.hoon
+++ b/pkg/arvo/app/aqua.hoon
@@ -487,7 +487,7 @@
       ::  take all files from a userspace desk
       :_  ~
       %-  unix-event:pill-lib
-      %-  file-ovum:pill-lib  :+  desk 
+      %-  file-ovum:pill-lib  :+  desk
       /(scot %p our.hid)/[desk]/(scot %da now.hid)  ~
     =^  ms  state  (poke-pill pil)
     (emit-cards ms)

From a01aaa531d4475acc64877702790bd97e89120e9 Mon Sep 17 00:00:00 2001
From: silnem2 <126880409+silnem2@users.noreply.github.com>
Date: Thu, 16 Mar 2023 18:29:12 -0600
Subject: [PATCH 04/19] Update aqua fix to filter /sys

---
 pkg/arvo/app/aqua.hoon | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/arvo/app/aqua.hoon b/pkg/arvo/app/aqua.hoon
index 9c205a1b3..2ca3b0a54 100644
--- a/pkg/arvo/app/aqua.hoon
+++ b/pkg/arvo/app/aqua.hoon
@@ -488,7 +488,7 @@
       :_  ~
       %-  unix-event:pill-lib
       %-  file-ovum:pill-lib  :+  desk
-      /(scot %p our.hid)/[desk]/(scot %da now.hid)  ~
+      /(scot %p our.hid)/[desk]/(scot %da now.hid)  ~[/sys]
     =^  ms  state  (poke-pill pil)
     (emit-cards ms)
   ::

From 904c40719e81d822b16f7a80a8c855a9a78c44a1 Mon Sep 17 00:00:00 2001
From: silnem2 <126880409+silnem2@users.noreply.github.com>
Date: Fri, 17 Mar 2023 03:18:33 -0600
Subject: [PATCH 05/19] fix aqua style and add return type annotation to
 lib/pill

---
 pkg/arvo/app/aqua.hoon     | 4 ++--
 pkg/base-dev/lib/pill.hoon | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg/arvo/app/aqua.hoon b/pkg/arvo/app/aqua.hoon
index 2ca3b0a54..cfca37cc6 100644
--- a/pkg/arvo/app/aqua.hoon
+++ b/pkg/arvo/app/aqua.hoon
@@ -487,8 +487,8 @@
       ::  take all files from a userspace desk
       :_  ~
       %-  unix-event:pill-lib
-      %-  file-ovum:pill-lib  :+  desk
-      /(scot %p our.hid)/[desk]/(scot %da now.hid)  ~[/sys]
+      %-  file-ovum:pill-lib
+      [desk /(scot %p our.hid)/[desk]/(scot %da now.hid) ~[/sys]]
     =^  ms  state  (poke-pill pil)
     (emit-cards ms)
   ::
diff --git a/pkg/base-dev/lib/pill.hoon b/pkg/base-dev/lib/pill.hoon
index 716676256..0b4ae332f 100644
--- a/pkg/base-dev/lib/pill.hoon
+++ b/pkg/base-dev/lib/pill.hoon
@@ -36,6 +36,7 @@
 ::     
 ++  dirs
   |=  [bas=path exc=(list spur)]
+  ^-  (list spur)
   ?~  exc  ~(tap in dir:.^(arch %cy bas))
   %+  skim
     ~(tap in dir:.^(arch %cy bas))

From 978e0eb2bd1a2d49d5d7935123377a3ea0c25886 Mon Sep 17 00:00:00 2001
From: silnem2 <126880409+silnem2@users.noreply.github.com>
Date: Fri, 17 Mar 2023 12:00:13 -0600
Subject: [PATCH 06/19] revert /sys filter in aqua

---
 pkg/arvo/app/aqua.hoon | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/arvo/app/aqua.hoon b/pkg/arvo/app/aqua.hoon
index cfca37cc6..de53ae0dc 100644
--- a/pkg/arvo/app/aqua.hoon
+++ b/pkg/arvo/app/aqua.hoon
@@ -488,7 +488,7 @@
       :_  ~
       %-  unix-event:pill-lib
       %-  file-ovum:pill-lib
-      [desk /(scot %p our.hid)/[desk]/(scot %da now.hid) ~[/sys]]
+      [desk /(scot %p our.hid)/[desk]/(scot %da now.hid) ~]
     =^  ms  state  (poke-pill pil)
     (emit-cards ms)
   ::

From 2a9bf665f8af40b46b9aa31027ee37f0bf8b17cc Mon Sep 17 00:00:00 2001
From: Matthew LeVan <matthew@coeli.network>
Date: Mon, 20 Mar 2023 13:16:08 -0400
Subject: [PATCH 07/19] `vere.yml` -> `shared.yml`

---
 .github/workflows/develop.yml              | 4 ++--
 .github/workflows/feature.yml              | 4 ++--
 .github/workflows/master.yml               | 4 ++--
 .github/workflows/release.yml              | 4 ++--
 .github/workflows/{vere.yml => shared.yml} | 0
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename .github/workflows/{vere.yml => shared.yml} (100%)

diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
index 4832a4d7d..c40cfa27f 100644
--- a/.github/workflows/develop.yml
+++ b/.github/workflows/develop.yml
@@ -9,7 +9,7 @@ on:
       - '.github/workflows/develop.yml'
       - '.github/workflows/release.yml'
       - '.github/workflows/master.yml'
-      - '.github/workflows/vere.yml'
+      - '.github/workflows/shared.yml'
       - 'pkg/arvo/**'
       - 'pkg/docker-image/**'
       - 'pkg/ent/**'
@@ -24,7 +24,7 @@ on:
 
 jobs:
   call-vere:
-    uses: ./.github/workflows/vere.yml
+    uses: ./.github/workflows/shared.yml
     with:
       pace: 'edge'
       upload: >-
diff --git a/.github/workflows/feature.yml b/.github/workflows/feature.yml
index 01ca5af92..cdbc023df 100644
--- a/.github/workflows/feature.yml
+++ b/.github/workflows/feature.yml
@@ -7,7 +7,7 @@ on:
       - '.github/workflows/develop.yml'
       - '.github/workflows/release.yml'
       - '.github/workflows/master.yml'
-      - '.github/workflows/vere.yml'
+      - '.github/workflows/shared.yml'
       - 'pkg/arvo/**'
       - 'pkg/docker-image/**'
       - 'pkg/ent/**'
@@ -22,7 +22,7 @@ on:
 
 jobs:
   call-vere:
-    uses: ./.github/workflows/vere.yml
+    uses: ./.github/workflows/shared.yml
     with:
       pace: 'edge'
       upload: >-
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index b04cd042e..7b1022779 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -9,7 +9,7 @@ on:
       - '.github/workflows/develop.yml'
       - '.github/workflows/release.yml'
       - '.github/workflows/master.yml'
-      - '.github/workflows/vere.yml'
+      - '.github/workflows/shared.yml'
       - 'pkg/arvo/**'
       - 'pkg/docker-image/**'
       - 'pkg/ent/**'
@@ -24,7 +24,7 @@ on:
 
 jobs:
   call-vere:
-    uses: ./.github/workflows/vere.yml
+    uses: ./.github/workflows/shared.yml
     with:
       pace: 'live'
       upload: >-
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1d2258a1f..f863e7974 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ on:
       - '.github/workflows/develop.yml'
       - '.github/workflows/release.yml'
       - '.github/workflows/master.yml'
-      - '.github/workflows/vere.yml'
+      - '.github/workflows/shared.yml'
       - 'pkg/arvo/**'
       - 'pkg/docker-image/**'
       - 'pkg/ent/**'
@@ -24,7 +24,7 @@ on:
 
 jobs:
   call-vere:
-    uses: ./.github/workflows/vere.yml
+    uses: ./.github/workflows/shared.yml
     with:
       pace: 'soon'
       upload: >-
diff --git a/.github/workflows/vere.yml b/.github/workflows/shared.yml
similarity index 100%
rename from .github/workflows/vere.yml
rename to .github/workflows/shared.yml

From 1476d7872a95106e250a395c7a65ae0a9d5c6208 Mon Sep 17 00:00:00 2001
From: Matthew LeVan <matthew@coeli.network>
Date: Tue, 21 Mar 2023 12:17:31 -0400
Subject: [PATCH 08/19] ci: download binaries for `next/kelvin/*` branches

---
 .github/workflows/next.yml   | 31 +++++++++++++++++++++++++++++++
 .github/workflows/shared.yml |  9 +++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/next.yml

diff --git a/.github/workflows/next.yml b/.github/workflows/next.yml
new file mode 100644
index 000000000..82f0d98af
--- /dev/null
+++ b/.github/workflows/next.yml
@@ -0,0 +1,31 @@
+name: Push to next/kelvin/*
+
+on:
+  push:
+    branches:
+      - 'next/kelvin/*'
+    paths:
+      - '.github/workflows/feature.yml'
+      - '.github/workflows/develop.yml'
+      - '.github/workflows/release.yml'
+      - '.github/workflows/master.yml'
+      - '.github/workflows/shared.yml'
+      - 'pkg/arvo/**'
+      - 'pkg/docker-image/**'
+      - 'pkg/ent/**'
+      - 'pkg/ge-additions/**'
+      - 'pkg/libaes_siv/**'
+      - 'pkg/urbit/**'
+      - 'pkg/urcrypt/**'
+      - 'tests/**'
+      - 'bin/**'
+      - 'nix/**'
+      - 'default.nix'
+
+jobs:
+  call-vere:
+    uses: ./.github/workflows/shared.yml
+    with:
+      upload: true
+      next: ${{ github.ref | replace('refs/heads/next/kelvin/', '') }}
+    secrets: inherit
diff --git a/.github/workflows/shared.yml b/.github/workflows/shared.yml
index c24155c18..0927f2988 100644
--- a/.github/workflows/shared.yml
+++ b/.github/workflows/shared.yml
@@ -73,9 +73,14 @@ jobs:
         name: run urbit-tests
         run: |
           cp -RL tests pkg/arvo/tests
-          vere=$(curl https://bootstrap.urbit.org/vere/${{ inputs.pace }}/last)
+          if ${{ inputs.next != null }}; then
+            base="https://bootstrap.urbit.org/vere/next/kelvin/${{ inputs.next }}"
+          else
+            base="https://bootstrap.urbit.org/vere/${{ inputs.pace }}"
+          fi
+          vere=$(curl $base/last)
+          url="$(echo $base/v${vere}/vere-v${vere}-linux-x86_64)"
           echo $vere
-          url="$(echo https://bootstrap.urbit.org/vere/${{ inputs.pace }}/v${vere}/vere-v${vere}-linux-x86_64)"
           echo $url
           # put in .jam so it doesn't crash when it gets -A'd in
           curl -Lo pkg/arvo/vere.jam "$url"

From 8e5b9763b4b34a6add72b18d49c8868cb22d3bf9 Mon Sep 17 00:00:00 2001
From: Hunter Miller <hunter@hmiller.dev>
Date: Wed, 22 Mar 2023 10:39:15 -0500
Subject: [PATCH 09/19] meta: update for kelvin

---
 pkg/landscape/sys.kelvin | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/landscape/sys.kelvin b/pkg/landscape/sys.kelvin
index ea744fdf1..a36738916 100644
--- a/pkg/landscape/sys.kelvin
+++ b/pkg/landscape/sys.kelvin
@@ -1,2 +1,3 @@
 [%zuse 416]
 [%zuse 415]
+[%zuse 414]
\ No newline at end of file

From f7eb15e161f7193aa7b8de5ebde6aeb138b200b5 Mon Sep 17 00:00:00 2001
From: Matthew LeVan <matthew@coeli.network>
Date: Thu, 23 Mar 2023 10:16:29 -0400
Subject: [PATCH 10/19] ci: syntax clarity

---
 .github/workflows/shared.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/shared.yml b/.github/workflows/shared.yml
index 0927f2988..e809b7f5c 100644
--- a/.github/workflows/shared.yml
+++ b/.github/workflows/shared.yml
@@ -78,8 +78,8 @@ jobs:
           else
             base="https://bootstrap.urbit.org/vere/${{ inputs.pace }}"
           fi
-          vere=$(curl $base/last)
-          url="$(echo $base/v${vere}/vere-v${vere}-linux-x86_64)"
+          vere=$(curl ${base}/last)
+          url="$(echo ${base}/v${vere}/vere-v${vere}-linux-x86_64)"
           echo $vere
           echo $url
           # put in .jam so it doesn't crash when it gets -A'd in

From d8af103d2fdfcfcd9a018156b51cb2e2368f3fd0 Mon Sep 17 00:00:00 2001
From: Matthew LeVan <matthew@coeli.network>
Date: Thu, 23 Mar 2023 11:28:40 -0400
Subject: [PATCH 11/19] ci: add `next` parameter

---
 .github/workflows/shared.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/shared.yml b/.github/workflows/shared.yml
index e809b7f5c..4a253a02b 100644
--- a/.github/workflows/shared.yml
+++ b/.github/workflows/shared.yml
@@ -14,6 +14,11 @@ on:
         type: string
         default: 'edge'
         required: false
+      next:
+        description: 'next kelvin version'
+        type: string
+        default: null
+        required: false
     secrets:
       CACHIX_AUTH_TOKEN:
         required: false

From d2e6c7e8a17b0e35d6e84c0ddbbc77bbb3e42663 Mon Sep 17 00:00:00 2001
From: ~wicrum-wicrun <99811688+wicrum-wicrun@users.noreply.github.com>
Date: Mon, 27 Mar 2023 19:21:19 +0200
Subject: [PATCH 12/19] Unsubscribing and permissions

---
 pkg/base-dev/lib/sss.hoon | 301 +++++++++++++++++++++++++++-----------
 pkg/base-dev/sur/sss.hoon |  11 +-
 2 files changed, 224 insertions(+), 88 deletions(-)

diff --git a/pkg/base-dev/lib/sss.hoon b/pkg/base-dev/lib/sss.hoon
index 5f02e3db0..896401085 100644
--- a/pkg/base-dev/lib/sss.hoon
+++ b/pkg/base-dev/lib/sss.hoon
@@ -40,75 +40,119 @@
   |*  [=(lake) paths=mold]
   =>
     |%
-    +$  flow  [=aeon fail=_| =rock:lake]
+    +$  from    (on-rock:poke lake paths)
+    +$  into    (response:poke lake paths)
+    +$  result  (request:poke paths)
+    +$  fail    [paths ship dude]
+    +$  flow    [=aeon stale=_| fail=_| =rock:lake]
+    +$  subs    [%0 (map [ship dude paths] (unit flow))]
     --
-  |_  [sub=(map [ship dude paths] flow) =bowl:gall result-type=type on-rock-type=type]
-  ++  surf  pine                             ::  Subscribe to [ship dude path].
+  |=  $:  sub=subs
+          =bowl:gall
+          result-type=type
+          on-rock-type=type
+          fail-type=type
+      ==
+  =>  .(sub +.sub)
+  |%
+  ++  surf                                   ::  Subscribe to [ship dude path].
+    |=  which=[ship dude paths]
+    ^-  (quip card:agent:gall subs)
+    ?+  flow=(~(get by sub) which)  `0/sub
+      ~                 [~[(pine which)] 0/(~(put by sub) which ~)]
+      [~ ~]             [~[(pine which)] 0/sub]
+      [~ ~ [* %& * *]]  [~[(scry `+(aeon.u.u.flow) which)] 0/sub]
+    ==
+  ++  quit  (corl (lead %0) ~(del by sub))   ::  Unsub from [ship dude path].
   ++  read                                   ::  See current subscribed states.
-    ^-  (map [ship dude paths] [fail=? rock:lake])
-    %-  ~(run by sub)
-    |=  =flow
-    [fail rock]:flow
-  ::                                         ::  Check poke-acks for errors.
+    ^-  (map [ship dude paths] [stale=? fail=? =rock:lake])
+    %-  malt  %+  murn  ~(tap by sub)
+    |=  [key=[ship dude paths] val=(unit flow)]
+    ?~  val  ~
+    `[key +.u.val]
+  ::                                         ::  Check poke-ack for errors.
   ::                                         ::  If an %sss-on-rock poke nacks,
   ++  chit                                   ::  that state is flagged as failed.
     |=  [[aeon=term ship=term dude=term path=paths] =sign:agent:gall]
-    ^+  sub
+    ^-  subs
+    :-  %0
     ?>  ?=(%poke-ack -.sign)
     ?~  p.sign  sub
     %+  ~(jab by sub)  [(slav %p ship) dude path]
-    |=  =flow
+    |=  (unit flow)
+    =/  =flow  (need +<)
     ?>  =(aeon.flow (slav %ud aeon))
-    flow(fail &)
+    `flow(fail &)
+  ::                                         ::  Check poke-ack for errors.
+  ::                                         ::  If a scry request nacks,
+  ++  tell                                   ::  that state is flagged as stale.
+    |=  [[ship=term =dude aeon=term path=paths] =sign:agent:gall]
+    ^-  (quip card:agent:gall subs)
+    ?>  ?=(%poke-ack -.sign)
+    ?~  p.sign  `0/sub
+    =/  current  [ship=(slav %p ship) dude=dude path=path]
+    ?+    flow=(~(get by sub) current)  `0/sub
+        [~ ~ *]
+      =.  stale.u.u.flow  &
+      :_  0/(~(put by sub) current u.flow)
+      ~[(on-rock-poke current u.u.flow ~)]
+    ::
+        [~ ~]
+      :_  0/(~(del by sub) current)  :_  ~
+      :*  %pass   (zoom surf-fail/aeon/ship/dude/path)
+          %agent  [our dap]:bowl
+          %poke   %sss-surf-fail  fail-type  ^-  fail
+          [path ship dude]:current
+      ==
+    ==
   ::                                         ::  Check if we're still interested
   ::                                         ::  in a wave. If no, no-op.
   ::                                         ::  If yes, scry.
   ++  behn                                   ::  (See https://gist.github.com/belisarius222/7f8452bfea9b199c0ed717ab1778f35b)
     |=  [ship=term =dude aeon=term path=paths]
     ^-  (list card:agent:gall)
+    %-  fall  :_  ~  %-  mole  |.
     =/  ship  (slav %p ship)
     =/  aeon  (slav %ud aeon)
-    ?:  (lte aeon aeon:(~(got by sub) ship dude path))  ~
+    ?:  (lte aeon aeon:(fall (~(got by sub) ship dude path) *flow))  ~
     ~[(scry `aeon ship dude path)]
   ::
   ++  apply                                  ::  Handle response from publisher.
     |=  res=(response:poke lake paths)
-    ^-  (quip card:agent:gall _sub)
+    ^-  (quip card:agent:gall subs)
+    %-  fall  :_  `0/sub  %-  mole  |.
+    =*  current  [src.bowl dude.res path.res]
+    =/  old=flow  (fall (~(got by sub) current) *flow)
     ?-    type.res
+        %tomb
+      =/  =flow  old(stale &)
+      :_  0/(~(put by sub) current `flow)  :_  ~
+      (on-rock-poke current flow ~)
+    ::
         %yore
-      :_  sub  :_  ~
+      :_  0/sub  :_  ~
       (pine src.bowl dude.res path.res)
     ::
         %nigh
-      :_  sub  :_  ~
+      :_  0/sub  :_  ~
       (behn-s25 [dude aeon path]:res)
     ::
         %scry
-      =*  current  [src.bowl dude.res path.res]
       =/  [wave=(unit wave:lake) =flow]
-        =/  old=flow  (~(gut by sub) current *flow)
         ?-  what.res
           %rock  ?>  (gte aeon.res aeon.old)
-                 `[aeon.res | rock.res]
-          %wave  ~|  [%weird-wave res=res old=old]
-                 ?>  =(aeon.res +(aeon.old))
-                 [`wave.res [aeon.res | (wash:lake rock.old wave.res)]]
+                 [~ [aeon.res | | rock.res]]
+          %wave  ?>  =(aeon.res +(aeon.old))
+                 [`wave.res [aeon.res | | (wash:lake rock.old wave.res)]]
         ==
-      :_  (~(put by sub) current flow)
-      %-  flop
-      :~  (scry `+(aeon.res) src.bowl dude.res path.res)
-          :*  %pass   (zoom on-rock/(scot %ud aeon.flow)^(scot %p src.bowl)^dude.res^path.res)
-              %agent  [our dap]:bowl
-              %poke   %sss-on-rock  on-rock-type  ^-  from
-              [path.res src.bowl dude.res rock.flow wave]
-      ==  ==
+      :_  0/(~(put by sub) current `flow)
+      :~  (on-rock-poke current flow wave)
+          (scry `+(aeon.res) src.bowl dude.res path.res)
+      ==
     ==
   ::
   ::  Non-public facing arms below
   ::
-  +$  from    (on-rock:poke lake paths)
-  +$  into    (response:poke lake paths)
-  +$  result  (request:poke paths)
   ++  behn-s25
     |=  [=dude =aeon path=noun]
     ^-  card:agent:gall
@@ -119,71 +163,137 @@
   ++  scry
     |=  [when=(unit aeon) who=ship which=dude where=paths]
     ^-  card:agent:gall
-    =/  when  ?~  when  %~  (scot %ud u.when)
-    :*  %pass   (zoom request/scry/(scot %p who)^which^when^where)
+    =/  when  ?~  when  ~  (scot %ud u.when)
+    :*  %pass   (zoom scry-request/(scot %p who)^which^when^where)
         %agent  [who which]
         %poke   %sss-to-pub  :-  result-type  ^-  result
-        [where which ^when]
+        [where dap.bowl ^when]
+    ==
+  ++  on-rock-poke
+    |=  [[=ship =dude path=paths] flow wave=(unit wave:lake)]
+    ^-  card:agent:gall
+    :*  %pass   (zoom on-rock/(scot %ud aeon)^(scot %p ship)^dude^path)
+        %agent  [our dap]:bowl
+        %poke   %sss-on-rock  on-rock-type  ^-  from
+        [path ship dude stale fail rock wave]
     ==
   --
 ++  du                                       ::  Manage publications.
   |*  [=(lake) paths=mold]
   =>
     |%
-    +$  rule  [rocks=_1 waves=_5]            ::  Retention policy
+    +$  into    (request:poke paths)
+    +$  result  (response:poke lake paths)
+    +$  rule    [rocks=_1 waves=_5]          ::  Retention policy
     +$  tide
       $:  rok=((mop aeon rock:lake) gte)
           wav=((mop aeon wave:lake) lte)
           rul=rule
-          mem=(mip aeon [ship dude] @da)
+          mem=(mip ship dude @da)
       ==
+    +$  buoy
+      $:  tid=$~(*tide $@(aeon tide))
+          alo=(unit (set ship))
+      ==
+    +$  pubs  [%0 (map paths buoy)]
     --
-  |_  [pub=(map paths tide) =bowl:gall result-type=type]
-  +*  rok  ((on aeon rock:lake) gte)
-      wav  ((on aeon wave:lake) lte)
-  ::
+  |=  [pub=pubs =bowl:gall result-type=type]
+  =>  .(pub +.pub)
+  =*  rok  ((on aeon rock:lake) gte)
+  =*  wav  ((on aeon wave:lake) lte)
+  |%
   ++  rule                                   ::  Set new retention policy.
     |=  [path=paths =^rule]
-    ^+  pub
+    ^-  pubs
+    :-  %0
     %+  ~(jab by pub)  path
-    |=  =tide
-    (form tide(rul rule))
+    |=  =buoy
+    ?@  tid.buoy  buoy
+    buoy(tid (form tid.buoy(rul rule)))
   ::
   ++  wipe                                   ::  Create new rock and wipe rest.
     |=  path=paths
-    ^+  pub
+    ^-  pubs
+    :-  %0
     %+  ~(jab by pub)  path
-    |=  =tide
-    %*  .  (form tide(rul [0 1]))
-      rul  rul.tide
-      wav  ~
+    |=  =buoy
+    ?@  tid.buoy  buoy
+    %*  .  buoy(tid (form tid.buoy(rul [0 1])))
+      rul.tid  rul.tid.buoy
+      wav.tid  ~
     ==
   ++  give                                   ::  Give a wave on a path.
     |=  [path=paths =wave:lake]
-    ^-  (quip card:agent:gall _pub)
-    ?~  ;;((soft ^path) path)  ~|  %need-path  !!
-    =/  =tide  (~(gut by pub) path *tide)
-    =/  next=aeon
-      .+  %+  max
-        (fall (bind (pry:rok rok.tide) head) 0)
-      (fall (bind (ram:wav wav.tide) head) 0)
-    ::
-    :_  %+  ~(put by pub)  path
-        =/  last=[=aeon =rock:lake]  (fall (pry:rok rok.tide) *[key val]:rok)
-        =.  wav.tide  (put:wav wav.tide next wave)
-        =.  mem.tide  (~(del by mem.tide) next)
-        ?.  =(next (add aeon.last waves.rul.tide))  tide
-        (form tide)
-    ::
-    %+  murn  ~(tap by (~(gut by mem.tide) next ~))
-    |=  [[=ship =dude] =@da]
-    ?:  (lth da now.bowl)  ~
-    `(send scry/wave/wave ship dude next path)
+    ^-  (quip card:agent:gall pubs)
+    ?~  ((soft ^path) path)  ~|  %need-path  !!
+    =/  buoy  (~(gut by pub) path *buoy)
+    ?@  tide=tid.buoy  ~|  %dead-path  !!  ::TODO is this good behavior?
+    =/  next=aeon  +((latest tide))
+    :-  %+  murn  ~(tap bi mem.tide)
+        |=  [=ship =dude =@da]
+        ?:  (lth da now.bowl)  ~
+        `(send scry/wave/wave ship dude next path)
+    :-  %0
+    %+  ~(put by pub)  path
+    =/  last=[=aeon =rock:lake]  (fall (pry:rok rok.tide) *[key val]:rok)
+    =.  wav.tide  (put:wav wav.tide next wave)
+    =.  mem.tide  (~(del by mem.tide) next)
+    ?.  =(next (add aeon.last waves.rul.tide))  buoy
+    buoy(tid (form tide))
+  ::
+  ++  perm                                   ::  Change permissions with gate.
+    |=  [where=(list paths) diff=$-((unit (set ship)) (unit (set ship)))]
+    ^-  pubs
+    %+  edit  where
+    |=  =buoy
+    =/  new=_alo.buoy  (diff alo.buoy)
+    ?@  tid.buoy  buoy(alo new)
+    %=  buoy
+      alo      new
+      mem.tid  ?~  new  mem.tid.buoy
+               %.  mem.tid.buoy
+               ~(int by (malt (turn ~(tap in u.new) (late *(map @ @)))))
+    ==
+  ++  public  (curr perm _~)                 ::  Make list of paths public.
+  ++  secret  (curr perm _`~)                ::  Make list of paths secret.
+  ::                                         ::  Block ships from paths.
+  ++  block                                  ::  No-ops on public paths.
+    |=  [who=(list ship) whence=(list paths)]
+    ^-  pubs
+    %+  edit  whence
+    |=  =buoy
+    ?@  tid.buoy  buoy
+    ?~  alo.buoy  buoy
+    %=  buoy
+      alo      `(~(dif in u.alo.buoy) (sy who))
+      mem.tid  (~(dif by mem.tid.buoy) (malt (turn who (late ~))))
+    ==
+  ::                                         ::  Allow ships to paths.
+  ++  allow                                  ::  Any public paths will no-op.
+    |=  [who=(list ship) where=(list paths)]
+    ^-  pubs
+    %+  edit  where
+    |=  =buoy
+    ?@  tid.buoy  buoy
+    ?~  alo.buoy  buoy
+    buoy(alo `(~(gas in u.alo.buoy) who))
+  ::                                         ::  Kill a list of paths, i.e. tell
+  ++  kill                                   ::  subs to not expect updates.
+    (curr edit |=(=buoy buoy(tid (latest tid.buoy))))
+  ::                                         ::  Reopen list of killed paths.
+  ++  live                                   ::  No-ops on live paths.
+    %+  curr  edit
+    |=  =buoy
+    ?^  tid.buoy  buoy
+    %*(. buoy(tid *tide) rok.tid (put:rok ~ +(tid.buoy) *rock:lake))
+  ::
   ++  read                                   ::  See current published states.
-    ^-  (map paths rock:lake)
-    %-  ~(run by pub)
-    |=  =tide
-    =<  rock
+    ^-  (map paths [allowed=(unit (set ship)) =rock:lake])
+    %-  malt  %+  murn  ~(tap by pub)
+    |=  [path=paths =buoy]
+    ^-  (unit [paths (unit (set ship)) rock:lake])
+    ?@  tide=tid.buoy  ~
+    :^  ~  path  alo.buoy  =<  rock
     =/  snap=[=aeon =rock:lake]  (fall (pry:rok rok.tide) *[key val]:rok)
     %+  roll  (tap:wav (lot:wav wav.tide `aeon.snap ~))
     |=  [[=aeon =wave:lake] =_snap]
@@ -192,39 +302,58 @@
   ::
   ++  apply                                  ::  Handle request from subscriber.
     |=  req=(request:poke paths)
-    ^-  (quip card:agent:gall _pub)
-    =/  =tide  (~(gut by pub) path.req *tide)
+    ^-  (quip card:agent:gall pubs)
+    =/  =buoy  (~(gut by pub) path.req *buoy)
+    ?<  &(?=(^ alo.buoy) !(~(has in u.alo.buoy) src.bowl))
+    ?@  tid.buoy
+      :_  0/pub  :_  ~
+      (send tomb/~ src.bowl dude.req tid.buoy path.req)
     ?~  when.req
-      =/  last  (fall (pry:rok rok.tide) *[=key =val]:rok)
-      :_  pub  :_  ~
+      =/  last  (fall (pry:rok rok.tid.buoy) *[=key =val]:rok)
+      :_  0/pub  :_  ~
       (send scry/rock/val.last src.bowl dude.req key.last path.req)
-    ?^  dat=(get:wav wav.tide u.when.req)
-      :_  pub  :_  ~
+    ?^  dat=(get:wav wav.tid.buoy u.when.req)
+      :_  0/pub  :_  ~
       (send scry/wave/u.dat src.bowl [dude u.when path]:req)
     ?:  %+  lte  u.when.req
-        key::(fall (ram:wav wav.tide) (pry:rok rok.tide) [=key val]:wav)
-      :_  pub  :_  ~
+        key::(fall (ram:wav wav.tid.buoy) (pry:rok rok.tid.buoy) [=key val]:wav)
+      :_  0/pub  :_  ~
       (send yore/~ src.bowl [dude u.when path]:req)
+    ?>  =(u.when.req +((latest tid.buoy)))
     :-  ~[(send nigh/~ src.bowl [dude u.when path]:req)]
+    :-  %0
     %+  ~(put by pub)  path.req
-    %=  tide  mem
-      %^  ~(put bi mem.tide)  u.when.req  [src.bowl dude.req]
-      (add ~s25 now.bowl)
+    %=  buoy
+      mem.tid  (~(put bi mem.tid.buoy) src.bowl dude.req (add ~s25 now.bowl))
     ==
   ::
   ::  Non-public facing arms below
   ::
-  +$  into    (request:poke paths)
-  +$  result  (response:poke lake paths)
   ++  send
     |=  [payload=_|3:*(response:poke lake paths) =ship =dude =aeon path=paths]
     ^-  card:agent:gall
     =*  mark  (cat 3 %sss- name:lake)
-    :*  %pass   (zoom response/scry/(scot %p ship)^dude^(scot %ud aeon)^path)
+    :*  %pass   (zoom scry-response/(scot %p ship)^dude^(scot %ud aeon)^path)
         %agent  [ship dude]
         %poke   mark  result-type  ^-  (response:poke lake paths)
         [path dap.bowl aeon payload]
     ==
+  ++  latest
+    |=  =$@(aeon tide)
+    ^-  aeon
+    ?@  tide  tide
+    %+  max  (fall (bind (pry:rok rok.tide) head) 0)
+    (fall (bind (ram:wav wav.tide) head) 0)
+  ::
+  ++  edit
+    |=  [ps=(list paths) edit=$-(buoy buoy)]
+    ^-  pubs
+    :-  %0
+    %-  ~(rep in (sy ps))
+    |=  [path=paths =_pub]
+    %-  fall  :_  pub  %-  mole  |.
+    (~(jab by pub) path edit)
+  ::
   ++  form
     |=  =tide
     ^+  tide
diff --git a/pkg/base-dev/sur/sss.hoon b/pkg/base-dev/sur/sss.hoon
index 9533719d7..7f2ac2262 100644
--- a/pkg/base-dev/sur/sss.hoon
+++ b/pkg/base-dev/sur/sss.hoon
@@ -24,13 +24,20 @@
     $:  path=paths
         =dude
         =aeon
-        $%  [type=?(%nigh %yore) ~]
+        $%  [type=?(%nigh %yore %tomb) ~]
             $:  type=%scry
                 $%  [what=%rock =rock:lake]
                     [what=%wave =wave:lake]
     ==  ==  ==  ==
   ++  on-rock
     |*  [=(lake) paths=mold]
-    ,[path=paths src=ship from=dude =rock:lake wave=(unit wave:lake)]
+    $:  path=paths
+        src=ship
+        from=dude
+        stale=?
+        fail=?
+        =rock:lake
+        wave=(unit wave:lake)
+    ==
   --
 --

From 4516ecfaa36710aa3f7bdce5fbd6404a3e8bf385 Mon Sep 17 00:00:00 2001
From: ~wicrum-wicrun <99811688+wicrum-wicrun@users.noreply.github.com>
Date: Mon, 27 Mar 2023 22:03:24 +0200
Subject: [PATCH 13/19] sss: Simplify `+block:du` and `+allow:du`

---
 pkg/base-dev/lib/sss.hoon | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkg/base-dev/lib/sss.hoon b/pkg/base-dev/lib/sss.hoon
index 896401085..3a6d9114c 100644
--- a/pkg/base-dev/lib/sss.hoon
+++ b/pkg/base-dev/lib/sss.hoon
@@ -260,23 +260,16 @@
   ++  block                                  ::  No-ops on public paths.
     |=  [who=(list ship) whence=(list paths)]
     ^-  pubs
-    %+  edit  whence
-    |=  =buoy
-    ?@  tid.buoy  buoy
-    ?~  alo.buoy  buoy
-    %=  buoy
-      alo      `(~(dif in u.alo.buoy) (sy who))
-      mem.tid  (~(dif by mem.tid.buoy) (malt (turn who (late ~))))
-    ==
+    %+  perm  whence
+    |=  old=(unit (set ship))
+    ?~  old  ~  `(~(dif in u.old) (sy who))
   ::                                         ::  Allow ships to paths.
   ++  allow                                  ::  Any public paths will no-op.
     |=  [who=(list ship) where=(list paths)]
     ^-  pubs
-    %+  edit  where
-    |=  =buoy
-    ?@  tid.buoy  buoy
-    ?~  alo.buoy  buoy
-    buoy(alo `(~(gas in u.alo.buoy) who))
+    %+  perm  where
+    |=  old=(unit (set ship))
+    ?~  old  ~  `(~(gas in u.old) who)
   ::                                         ::  Kill a list of paths, i.e. tell
   ++  kill                                   ::  subs to not expect updates.
     (curr edit |=(=buoy buoy(tid (latest tid.buoy))))

From 00b7ace08d12d187d636f7f1795c2a65a0c90b97 Mon Sep 17 00:00:00 2001
From: Alessio <me@playfulpachyderm.com>
Date: Mon, 27 Mar 2023 23:58:19 -0300
Subject: [PATCH 14/19] arvo: add more files to |new-desk generator

---
 pkg/arvo/gen/hood/new-desk.hoon | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkg/arvo/gen/hood/new-desk.hoon b/pkg/arvo/gen/hood/new-desk.hoon
index 54995a597..f7d8dcd6c 100644
--- a/pkg/arvo/gen/hood/new-desk.hoon
+++ b/pkg/arvo/gen/hood/new-desk.hoon
@@ -5,7 +5,7 @@
 :-  %ask
 |=  $:  [now=@da eny=@uvJ bek=beak]
         [=desk ~]
-        [from=$~(%base desk) hard=_|]
+        [from=$~(%base desk) hard=_| minimal=_|]
     ==
 ::
 =;  make-new-desk
@@ -27,12 +27,23 @@
 %-  ~(gas by *(map path page:clay))
 |^  =-  (turn - mage)
     ^-  (list path)
-    :~  /mar/noun/hoon
+    =/  common-files=(list path)  :~
+        /mar/noun/hoon
         /mar/hoon/hoon
         /mar/txt/hoon
         /mar/kelvin/hoon
         /sys/kelvin
-    ==
+      ==
+    =/  extra-files=(list path)  ?:  minimal  [~]
+      :~
+        /mar/bill/hoon
+        /mar/mime/hoon
+        /mar/json/hoon
+        /lib/skeleton/hoon
+        /lib/default-agent/hoon
+        /lib/dbug/hoon
+      ==
+    (weld common-files extra-files)
 ::
 ++  mage
   |=  =path

From 821f99a351e011a70d14ad87ce70273931237957 Mon Sep 17 00:00:00 2001
From: "James D. Amberger" <jim@jimamberger.name>
Date: Mon, 20 Mar 2023 17:59:27 -0400
Subject: [PATCH 15/19] hood: options for +vats generator

This commit refactors `sur/hood.hoon` and changes the signature of the
`+vats` generator thus:

```hoon
|=  $:  [now=@da eny=@uvJ bec=beak]
        $@(~ [?(%suspended %running %blocking %nonexistent) ~])
        $:  verb=?
            show-suspended=?
            show-running=?
            show-blocking=?
            show-nonexistent=?
        ==
    ==
```

Called with a single positional argument, `+vats` will show only those
desks fitting the description given, while keyword parameters allow
finer-grained control over which desks are described. The `verb`
parameter determines whether the full load of desk information be shown,
or a subset thereof.

Resolves #6297.
---
 pkg/arvo/gen/vat.hoon      |   9 +-
 pkg/arvo/gen/vats.hoon     |  18 ++-
 pkg/base-dev/sur/hood.hoon | 236 +++++++++++++++++++++----------------
 3 files changed, 158 insertions(+), 105 deletions(-)

diff --git a/pkg/arvo/gen/vat.hoon b/pkg/arvo/gen/vat.hoon
index 6534d5e24..0a154b7fa 100644
--- a/pkg/arvo/gen/vat.hoon
+++ b/pkg/arvo/gen/vat.hoon
@@ -1,6 +1,11 @@
 /-  *hood
 :-  %say
 |=  $:  [now=@da eny=@uvJ bec=beak]
-        [[=desk ~] ~]
+        [syd=desk ~]
+        verb=?
     ==
-[%tang ~[(report-vat (report-prep p.bec now) p.bec now desk)]]
+=+  ~(abed report-vats p.bec now)
+=+  %+  report-vat
+      verb
+    %-  vat-info  syd
+[%tang -]
diff --git a/pkg/arvo/gen/vats.hoon b/pkg/arvo/gen/vats.hoon
index 67046c460..ebc152e1f 100644
--- a/pkg/arvo/gen/vats.hoon
+++ b/pkg/arvo/gen/vats.hoon
@@ -1,6 +1,20 @@
 /-  *hood
 :-  %say
 |=  $:  [now=@da eny=@uvJ bec=beak]
-        [arg=~ ~]
+        $@(~ [?(%suspended %running %blocking %nonexistent) ~])
+        $:  verb=?
+            show-suspended=?
+            show-running=?
+            show-blocking=?
+            show-nonexistent=?
+        ==
     ==
-[%tang (report-vats p.bec now)]
+=+  :-  verb
+    ?~  +<+<        +<+>+
+    ?-  -.+<+<
+      %suspended    [& | | |]
+      %running      [| & | |]
+      %blocking     [| | & |]
+      %nonexistent  [| | | &]
+    ==
+tang+((report-vats p.bec now) -)
diff --git a/pkg/base-dev/sur/hood.hoon b/pkg/base-dev/sur/hood.hoon
index 06ce86e5f..ece12a30e 100644
--- a/pkg/base-dev/sur/hood.hoon
+++ b/pkg/base-dev/sur/hood.hoon
@@ -16,110 +16,144 @@
 ::
 +$  sync-state  [nun=@ta kid=(unit desk) let=@ud]
 +$  sink        (unit [her=@p sud=desk kid=(unit desk) let=@ud])
-::  +report-prep: get data required for reports
-::
-++  report-prep
-  |=  [our=@p now=@da]
-  =/  ego  (scot %p our)
-  =/  wen  (scot %da now)
-  :*  .^(rock:tire %cx /(scot %p our)//(scot %da now)/tire)
-      .^(=cone %cx /(scot %p our)//(scot %da now)/domes)
-      .^((map desk [ship desk]) %gx /[ego]/hood/[wen]/kiln/sources/noun)
-      .^  (map [desk ship desk] sync-state)  %gx
-          /[ego]/hood/[wen]/kiln/syncs/noun
-      ==
-  ==
-::  +report-vats: report on all desk installations
-::
 ++  report-vats
-  |=  [our=@p now=@da]
-  ^-  tang
-  =/  desks  .^((set desk) %cd /(scot %p our)/base/(scot %da now))
-  =/  prep  (report-prep our now)
-  %+  turn  ~(tap in desks)
-  |=(syd=desk (report-vat prep our now syd))
-::  +report-vat: report on a single desk installation
-::
-++  report-vat
-  |=  $:  $:  tyr=rock:tire  =cone  sor=(map desk [ship desk])
-              zyn=(map [desk ship desk] sync-state)
-          ==
-          our=ship  now=@da  syd=desk
+  =|  $:  =cone
+          sor=(map desk [ship desk])
+          zyn=(map [desk ship desk] sync-state)
+          desks=(set desk)
+          =pikes
+          =rock:tire:clay
+          kel=weft
       ==
-  ^-  tank
-  =/  ego  (scot %p our)
-  =/  wen  (scot %da now)
-  =+  .^(=cass %cw /[ego]/[syd]/[wen])
-  ?:  =(ud.cass 0)
-    leaf+"desk does not yet exist: {<syd>}"
-  ?:  =(%kids syd)
-    =+  .^(hash=@uv %cz /[ego]/[syd]/[wen])
-    leaf+"%kids %cz hash:     {<hash>}"
-  =/  kel-path
-    /[ego]/[syd]/[wen]/sys/kelvin
-  ?.  .^(? %cu kel-path)
-    leaf+"bad desk: {<syd>}"
-  =+  .^(=waft %cx kel-path)
-  :+  %rose  ["" "{<syd>}" "::"]
-  ^-  tang
-  =/  hash  .^(@uv %cz /[ego]/[syd]/[wen])
-  =/  =sink
-    ?~  s=(~(get by sor) syd)
-      ~
-    ?~  z=(~(get by zyn) syd u.s)
-      ~
-    `[-.u.s +.u.s +.u.z]
-  =/  meb=(list @uv)
-    ?~  sink  [hash]~
-    (mergebase-hashes our syd now her.u.sink sud.u.sink)
-  =/  dek  (~(got by tyr) syd)
-  =/  =dome  (~(got by cone) our syd)
-  =/  [on=(list [@tas ?]) of=(list [@tas ?])]
-    (skid ~(tap by ren.dome) |=([* ?] +<+))
-  =/  sat
-    ?-  zest.dek
-      %live  "running"
-      %dead  "suspended"
-      %held  "suspended until next update"
+  |_  [our=@p now=@da]
+  +*  ego  (scot %p our)
+      wen  (scot %da now)
+  ++  $
+    |=  [? ? ? ? ?]
+     (report-vats:abed +<)
+  ++  abed 
+    %=    ..abed
+      cone  .^(^cone %cx /[ego]//[wen]/domes)
+      sor  .^((map desk [ship desk]) %gx /[ego]/hood/[wen]/kiln/sources/noun)
+      zyn  .^  (map [desk ship desk] sync-state)  %gx
+             /[ego]/hood/[wen]/kiln/syncs/noun
+           ==
+      desks  .^((set desk) %cd /[ego]/base/[wen])
+      pikes  .^(^pikes %gx /[ego]/hood/[wen]/kiln/pikes/kiln-pikes)
+      rock  .^(rock:tire:clay %cx /[ego]//[wen]/tire)
+      kel  (weft .^(* cx/(en-beam [our %base da+now] /sys/kelvin)))  
     ==
-  =/  kul=tape
-    %+  roll
-      %+  sort
-        ~(tap in (waft-to-wefts:clay waft))
-      |=  [a=weft b=weft]
-      ?:  =(lal.a lal.b)
-        (lte num.a num.b)
-      (lte lal.a lal.b)
-    |=  [=weft =tape]
-    (welp " {<[lal num]:weft>}" tape)
-  :~  leaf/"/sys/kelvin:     {kul}"
-      leaf/"base hash:        {?.(=(1 (lent meb)) <meb> <(head meb)>)}"
-      leaf/"%cz hash:         {<hash>}"
-      ::
-      leaf/"app status:       {sat}"
-      leaf/"force on:         {?:(=(~ on) "~" <on>)}"
-      leaf/"force off:        {?:(=(~ of) "~" <of>)}"
-      ::
-      leaf/"publishing ship:  {?~(sink <~> <(get-publisher our syd now)>)}"
-      leaf/"updates:          {?~(sink "local" "remote")}"
-      leaf/"source ship:      {?~(sink <~> <her.u.sink>)}"
-      leaf/"source desk:      {?~(sink <~> <sud.u.sink>)}"
-      leaf/"source aeon:      {?~(sink <~> <let.u.sink>)}"
-      leaf/"kids desk:        {?~(sink <~> ?~(kid.u.sink <~> <u.kid.u.sink>))}"
-      leaf/"pending updates:  {<`(list [@tas @ud])`~(tap in wic.dek)>}"
-  ==
-::  +report-kids: non-vat cz hash report for kids desk
-::
-++  report-kids
-  |=  [our=ship now=@da]
-  ^-  tank
-  =/  syd  %kids
-  =/  ego  (scot %p our)
-  =/  wen  (scot %da now)
-  ?.  (~(has in .^((set desk) %cd /[ego]//[wen])) syd)
-    leaf/"no %kids desk"
-  =+  .^(hash=@uv %cz /[ego]/[syd]/[wen])
-  leaf/"%kids %cz hash:     {<hash>}"
+  ++  vat-info
+    |=  desk=_`desk`%base
+    =/  pike  (~(got by pikes) desk)
+    =/  zest  -:(~(got by rock) desk)
+    =/  kel-path  /[ego]/[desk]/[wen]/sys/kelvin
+    =/  sink=sink
+      ?~  s=(~(get by sor) desk)
+        ~
+      ?~  z=(~(get by zyn) desk u.s)
+        ~
+      `[-.u.s +.u.s +.u.z]
+    =/  hash  .^(@uv %cz /[ego]/[desk]/[wen])
+    =/  dek  (~(got by rock) desk)
+    =/  =dome  (~(got by cone) our desk)
+    =+  .^(=waft %cx kel-path)
+    :*  &1  &2  &3  &4  &5  &6  &7  &8
+        desk=desk
+        ^=  running  =(%live zest)
+        ^=  suspended  =(%dead zest)
+        ^=  exists  !=(ud.cass 0):.^(=cass %cw /[ego]/[desk]/[wen])
+        ^=  bad-desk  ?!(.^(? %cu kel-path))
+        ^=  meb   ::  =(list @uv)
+          ?~  sink  [hash]~
+          (mergebase-hashes our desk now her.u.sink sud.u.sink)
+        ^-  [on=(list [@tas ?]) of=(list [@tas ?])]
+          (skid ~(tap by ren.dome) |=([* ?] +<+))
+        ^=  sat
+          ?-  zest.dek
+            %live  "running"
+            %dead  "suspended"
+            %held  "suspended until next update"
+          ==
+        ^-  kul=tape
+          %+  roll
+            %+  sort
+              ~(tap in (waft-to-wefts:clay waft))
+            |=  [a=weft b=weft]
+            ?:  =(lal.a lal.b)
+              (lte num.a num.b)
+            (lte lal.a lal.b)
+          |=  [=weft =tape]
+          (welp " {<[lal num]:weft>}" tape)
+        ^=  blocking
+            ?&  !=(%base desk)
+                !=(%live zest.pike)
+                !(~(has in wic.pike) kel) 
+    ==      ==
+  ++  report-vats
+    |=  $:  verb=?
+            show-suspended=?
+            show-running=?
+            show-blocking=?
+            show-nonexistent=?
+        ==
+    %+  turn
+      %+  skim
+        %+  turn  ~(tap in desks)
+        |=  =desk  (vat-info desk)
+      |=  vat-info
+      :: just unconditionally show "bad" desks, whatever that means
+      ?|  bad-desk
+          &(suspended show-suspended)
+          &(running show-running)
+          &(blocking show-blocking)
+          &(!exists show-nonexistent)
+      ==
+    |=  =vat-info
+    :+  %rose  [" " " " "::"]
+    :-  leaf+"{<desk.vat-info>}"
+    %-  flop
+    %-  report-vat
+    [verb vat-info]
+  ++  report-vat
+    |=  [verb=? vat-info]
+    ^-  tang
+    ?:  !exists
+      ~[leaf+"desk does not yet exist: {<desk>}"]
+    ?:  =(%kids desk)
+      ~[leaf+"%kids %cz hash:     {<hash>}"]
+    ?:  bad-desk
+      ~[leaf+"bad desk: {<desk>}"]
+    %-  flop
+    ?.  verb
+      :~  leaf/"/sys/kelvin:     {kul}"
+          leaf/"app status:       {sat}"
+          leaf/"publishing ship:  {?~(sink <~> <(get-publisher our desk now)>)}"
+          leaf/"pending updates:  {<`(list [@tas @ud])`~(tap in wic.dek)>}"
+      ==
+    :~  leaf/"/sys/kelvin:     {kul}"
+        leaf/"base hash:        {?.(=(1 (lent meb)) <meb> <(head meb)>)}"
+        leaf/"%cz hash:         {<hash>}"
+        ::
+        leaf/"app status:       {sat}"
+        leaf/"force on:         {?:(=(~ on) "~" <on>)}"
+        leaf/"force off:        {?:(=(~ of) "~" <of>)}"
+        ::
+        leaf/"publishing ship:  {?~(sink <~> <(get-publisher our desk now)>)}"
+        leaf/"updates:          {?~(sink "local" "remote")}"
+        leaf/"source ship:      {?~(sink <~> <her.u.sink>)}"
+        leaf/"source desk:      {?~(sink <~> <sud.u.sink>)}"
+        leaf/"source aeon:      {?~(sink <~> <let.u.sink>)}"
+        leaf/"kids desk:        {?~(sink <~> ?~(kid.u.sink <~> <u.kid.u.sink>))}"
+        leaf/"pending updates:  {<`(list [@tas @ud])`~(tap in wic.dek)>}"
+    ==
+  ++  report-kids
+    ^-  tank
+    ?.  (~(has in .^((set desk) %cd /[ego]//[wen])) %kids)
+      leaf/"no %kids desk"
+    =+  .^(hash=@uv %cz /[ego]/kids/[wen])
+    leaf/"%kids %cz hash:     {<hash>}"
+  --
 ::  +read-bill-foreign: read /desk/bill from a foreign desk
 ::
 ++  read-bill-foreign

From 38ace43ca00fafbf2f3101c42c58afe8ffa9849f Mon Sep 17 00:00:00 2001
From: Alessio <me@playfulpachyderm.com>
Date: Wed, 29 Mar 2023 14:20:23 -0300
Subject: [PATCH 16/19] arvo: change |new-desk to be minimal by default

---
 pkg/arvo/gen/hood/new-desk.hoon | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/arvo/gen/hood/new-desk.hoon b/pkg/arvo/gen/hood/new-desk.hoon
index f7d8dcd6c..1078db17d 100644
--- a/pkg/arvo/gen/hood/new-desk.hoon
+++ b/pkg/arvo/gen/hood/new-desk.hoon
@@ -5,7 +5,7 @@
 :-  %ask
 |=  $:  [now=@da eny=@uvJ bek=beak]
         [=desk ~]
-        [from=$~(%base desk) hard=_| minimal=_|]
+        [from=$~(%base desk) hard=_| gall=_|]
     ==
 ::
 =;  make-new-desk
@@ -34,7 +34,7 @@
         /mar/kelvin/hoon
         /sys/kelvin
       ==
-    =/  extra-files=(list path)  ?:  minimal  [~]
+    =/  extra-files=(list path)  ?.  gall  [~]
       :~
         /mar/bill/hoon
         /mar/mime/hoon

From bacbfd71ac0a1b277c250d620c68cb408d2d0cf8 Mon Sep 17 00:00:00 2001
From: midden-fabler <midden-fabler@protonmail.com>
Date: Tue, 4 Apr 2023 02:50:09 -0400
Subject: [PATCH 17/19] add last-contact scry endpoint

---
 pkg/arvo/sys/vane/ames.hoon | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkg/arvo/sys/vane/ames.hoon b/pkg/arvo/sys/vane/ames.hoon
index 5f09500fd..b00d2e845 100644
--- a/pkg/arvo/sys/vane/ames.hoon
+++ b/pkg/arvo/sys/vane/ames.hoon
@@ -3987,6 +3987,13 @@
       ?~  peer
         [~ ~]
       ``noun+!>(u.peer)
+    ::
+        [%last-contact ~]
+      :^  ~  ~  %noun
+      !>  ^-  (unit @da)
+      ?.  ?=([~ %known *] peer)
+        ~
+      `last-contact.qos.u.peer
     ::
         [%forward-lane ~]
       ::

From d8ad34f0fc0a1d33494f201f66aee9f822ecb511 Mon Sep 17 00:00:00 2001
From: midden-fabler <midden-fabler@protonmail.com>
Date: Tue, 4 Apr 2023 03:06:22 -0400
Subject: [PATCH 18/19] update scry path listing

---
 pkg/arvo/sys/vane/ames.hoon | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/arvo/sys/vane/ames.hoon b/pkg/arvo/sys/vane/ames.hoon
index b00d2e845..e6b1c7e08 100644
--- a/pkg/arvo/sys/vane/ames.hoon
+++ b/pkg/arvo/sys/vane/ames.hoon
@@ -3963,6 +3963,7 @@
   ::  /ax/protocol/version           @
   ::  /ax/peers                      (map ship ?(%alien %known))
   ::  /ax/peers/[ship]               ship-state
+  ::  /ax/peers/[ship]/last-contact  (unit @da)
   ::  /ax/peers/[ship]/forward-lane  (list lane)
   ::  /ax/bones/[ship]               [snd=(set bone) rcv=(set bone)]
   ::  /ax/snd-bones/[ship]/[bone]    vase

From db93df0c3356008b1d8a752f6b6a4baab04d2c99 Mon Sep 17 00:00:00 2001
From: Ted Blackman <ted@tlon.io>
Date: Fri, 7 Apr 2023 15:19:24 -0400
Subject: [PATCH 19/19] +vats: fix crash on nonexistent desks

---
 pkg/base-dev/sur/hood.hoon | 39 ++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/pkg/base-dev/sur/hood.hoon b/pkg/base-dev/sur/hood.hoon
index ece12a30e..f0ec60624 100644
--- a/pkg/base-dev/sur/hood.hoon
+++ b/pkg/base-dev/sur/hood.hoon
@@ -31,6 +31,18 @@
   ++  $
     |=  [? ? ? ? ?]
      (report-vats:abed +<)
+  ::
+  ++  kel-path
+    |=  =desk
+    ^-  path
+    /[ego]/[desk]/[wen]/sys/kelvin
+  ::
+  ++  desk-exists
+    |=  =desk
+    ?&  !=(ud.cass 0):.^(=cass %cw /[ego]/[desk]/[wen])
+        .^(? %cu (kel-path desk))
+    ==
+  ::
   ++  abed 
     %=    ..abed
       cone  .^(^cone %cx /[ego]//[wen]/domes)
@@ -47,7 +59,7 @@
     |=  desk=_`desk`%base
     =/  pike  (~(got by pikes) desk)
     =/  zest  -:(~(got by rock) desk)
-    =/  kel-path  /[ego]/[desk]/[wen]/sys/kelvin
+    =/  kel-path  (kel-path desk)
     =/  sink=sink
       ?~  s=(~(get by sor) desk)
         ~
@@ -62,8 +74,6 @@
         desk=desk
         ^=  running  =(%live zest)
         ^=  suspended  =(%dead zest)
-        ^=  exists  !=(ud.cass 0):.^(=cass %cw /[ego]/[desk]/[wen])
-        ^=  bad-desk  ?!(.^(? %cu kel-path))
         ^=  meb   ::  =(list @uv)
           ?~  sink  [hash]~
           (mergebase-hashes our desk now her.u.sink sud.u.sink)
@@ -90,6 +100,7 @@
                 !=(%live zest.pike)
                 !(~(has in wic.pike) kel) 
     ==      ==
+  ::
   ++  report-vats
     |=  $:  verb=?
             show-suspended=?
@@ -97,33 +108,33 @@
             show-blocking=?
             show-nonexistent=?
         ==
+    =/  [real=(list desk) fake=(list desk)]
+      (skid ~(tap in desks) desk-exists)
+    =;  reals=tang
+      ?.  show-nonexistent
+        reals
+      %+  weld  reals
+      `tang`(turn fake |=(=desk leaf+"nonexistent desk: {<desk>}"))
     %+  turn
-      %+  skim
-        %+  turn  ~(tap in desks)
-        |=  =desk  (vat-info desk)
+      %+  skim  (turn real vat-info)
       |=  vat-info
-      :: just unconditionally show "bad" desks, whatever that means
-      ?|  bad-desk
-          &(suspended show-suspended)
+      ?|  &(suspended show-suspended)
           &(running show-running)
           &(blocking show-blocking)
-          &(!exists show-nonexistent)
       ==
     |=  =vat-info
+    ^-  tank
     :+  %rose  [" " " " "::"]
     :-  leaf+"{<desk.vat-info>}"
     %-  flop
     %-  report-vat
     [verb vat-info]
+  ::
   ++  report-vat
     |=  [verb=? vat-info]
     ^-  tang
-    ?:  !exists
-      ~[leaf+"desk does not yet exist: {<desk>}"]
     ?:  =(%kids desk)
       ~[leaf+"%kids %cz hash:     {<hash>}"]
-    ?:  bad-desk
-      ~[leaf+"bad desk: {<desk>}"]
     %-  flop
     ?.  verb
       :~  leaf/"/sys/kelvin:     {kul}"