From c94fea25daae4581c3ffd7f1385fcc1f5894b888 Mon Sep 17 00:00:00 2001
From: Yaseen <9275716+ynx0@users.noreply.github.com>
Date: Sun, 29 May 2022 16:22:20 -0400
Subject: [PATCH 01/23] eyre: Modify landing title from "OS1" to "Urbit"

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

diff --git a/pkg/arvo/sys/vane/eyre.hoon b/pkg/arvo/sys/vane/eyre.hoon
index 562c33b46..333f8d73d 100644
--- a/pkg/arvo/sys/vane/eyre.hoon
+++ b/pkg/arvo/sys/vane/eyre.hoon
@@ -251,7 +251,7 @@
       ;meta(charset "utf-8");
       ;meta(name "viewport", content "width=device-width, initial-scale=1, shrink-to-fit=no");
       ;link(rel "icon", type "image/svg+xml", href (weld "data:image/svg+xml;utf8," favicon));
-      ;title:"OS1"
+      ;title:"Urbit"
       ;style:'''
              @import url("https://rsms.me/inter/inter.css");
              @font-face {

From 7a110db60dd63743ebe5f21271721ac6e5119e3c Mon Sep 17 00:00:00 2001
From: fang <git@fang.io>
Date: Mon, 30 May 2022 16:08:59 +0200
Subject: [PATCH 02/23] clay: render syntax errors at end of file

Previously, if the pointer for a syntax error pointed to the end of the file
(and the file ended in a newline) the code snippet rendering would try to
display a line _beyond_ the end of the file, causing a crash.

Here, we detect that case, and display `<<end of file>>` instead.
---
 pkg/arvo/sys/vane/clay.hoon | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkg/arvo/sys/vane/clay.hoon b/pkg/arvo/sys/vane/clay.hoon
index ab938a078..8c0a7f276 100644
--- a/pkg/arvo/sys/vane/clay.hoon
+++ b/pkg/arvo/sys/vane/clay.hoon
@@ -970,8 +970,14 @@
       %-  mean  %-  flop
       =/  lyn  p.hair
       =/  col  q.hair
+      ^-  (list tank)
       :~  leaf+"syntax error at [{<lyn>} {<col>}] in {<pax>}"
-          leaf+(trip (snag (dec lyn) (to-wain:format (crip tex))))
+        ::
+          =/  =wain  (to-wain:format (crip tex))
+          ?:  (gth lyn (lent wain))
+            '<<end of file>>'
+          (snag (dec lyn) wain)
+        ::
           leaf+(runt [(dec col) '-'] "^")
       ==
     ::

From 73c1c94ea8107e4673fd82430900aaf1ae2fa804 Mon Sep 17 00:00:00 2001
From: David Farrell <1469333+dnmfarrell@users.noreply.github.com>
Date: Fri, 10 Jun 2022 09:00:50 -0400
Subject: [PATCH 03/23] dojo: have dojo check =dir exists before switching

Scries clay for a list of files beneath the provided path - if the response
is nil then the dir must not exist (clay abhors a vacuum).

Fixes #1559
---
 pkg/arvo/app/dojo.hoon | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg/arvo/app/dojo.hoon b/pkg/arvo/app/dojo.hoon
index b127a3ce0..839c080dd 100644
--- a/pkg/arvo/app/dojo.hoon
+++ b/pkg/arvo/app/dojo.hoon
@@ -568,6 +568,9 @@
                       ?:  ?=([@ ~] pax)  ~[i.pax %base '0']
                       ?:  ?=([@ @ ~] pax)  ~[i.pax i.t.pax '0']
                       pax
+                  ?:  =(~ .^((list path) %ct pax))
+                    =-  +>(..dy (he-diff %tan - ~))
+                    rose+[" " `~]^~[leaf+"dir does not exist:" (smyt pax)]
                   =.  dir  (need (de-beam pax))
                   =-  +>(..dy (he-diff %tan - ~))
                   rose+[" " `~]^~[leaf+"=%" (smyt (en-beam he-beak s.dir))]

From 3a10b4d8f337b5a2910d6b9ae91af9e497433649 Mon Sep 17 00:00:00 2001
From: David Farrell <1469333+dnmfarrell@users.noreply.github.com>
Date: Mon, 13 Jun 2022 20:34:23 -0400
Subject: [PATCH 04/23] dojo: simplify dir not exist error message build

Incorporates @Fang- suggested changes (thanks!).

Drops the path serialization as it will print on two separate lines,
and it is already displayed in dojo immediately above the error message:

    > =dir /=base=/ge
    dojo: dir does not exist
---
 pkg/arvo/app/dojo.hoon | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkg/arvo/app/dojo.hoon b/pkg/arvo/app/dojo.hoon
index 839c080dd..bcb41ea7e 100644
--- a/pkg/arvo/app/dojo.hoon
+++ b/pkg/arvo/app/dojo.hoon
@@ -569,8 +569,7 @@
                       ?:  ?=([@ @ ~] pax)  ~[i.pax i.t.pax '0']
                       pax
                   ?:  =(~ .^((list path) %ct pax))
-                    =-  +>(..dy (he-diff %tan - ~))
-                    rose+[" " `~]^~[leaf+"dir does not exist:" (smyt pax)]
+                    +(..dy (he-diff %tan 'dojo: dir does not exist' ~))
                   =.  dir  (need (de-beam pax))
                   =-  +>(..dy (he-diff %tan - ~))
                   rose+[" " `~]^~[leaf+"=%" (smyt (en-beam he-beak s.dir))]

From 04672fbe1d3349508902787c2bfe0513d7d28559 Mon Sep 17 00:00:00 2001
From: David Farrell <1469333+dnmfarrell@users.noreply.github.com>
Date: Fri, 10 Jun 2022 11:16:22 -0400
Subject: [PATCH 05/23] dojo: setting eny/now/our shouldn't crash dojo

Changes dojo to emit a usage message and ignore the request.

Fixes #1519
---
 pkg/arvo/app/dojo.hoon | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/arvo/app/dojo.hoon b/pkg/arvo/app/dojo.hoon
index b127a3ce0..558f7da35 100644
--- a/pkg/arvo/app/dojo.hoon
+++ b/pkg/arvo/app/dojo.hoon
@@ -532,10 +532,11 @@
       ?:  ?=([%show %3] -.mad)
         (dy-rash %tan (dy-show-source q.mad) ~)
       ?:  ?=(%brev -.mad)
+        ?:  ?=(?(%eny %now %our) p.mad)
+          (dy-rash %tan (cat 3 p.mad ' is immutable') ~)
         =.  var  (~(del by var) p.mad)
         =<  dy-amok
         ?+  p.mad  .
-          $?(%eny %now %our)  !!
           %lib  .(lib ~)
           %sur  .(sur ~)
           %dir  .(dir [[our.hid %base ud+0] /])
@@ -543,13 +544,12 @@
       =+  cay=(~(got by rez) p.q.mad)
       ?-    -.p.mad
           %verb
+        ?:  ?=(?(%eny %now %our) p.p.mad)
+          (dy-rash %tan (cat 3 p.p.mad ' is immutable') ~)
         =.  var  (~(put by var) p.p.mad cay)
         ~|  bad-set+[p.p.mad p.q.cay]
         =<  dy-amok
         ?+  p.p.mad  .
-            %eny  ~|(%entropy-is-eternal !!)
-            %now  ~|(%time-is-immutable !!)
-            %our  ~|(%self-is-immutable !!)
             %lib
           %_    .
               lib

From d439b33cc948cb1a018dd43b57b551e260e7aa12 Mon Sep 17 00:00:00 2001
From: David Farrell <1469333+dnmfarrell@users.noreply.github.com>
Date: Thu, 9 Jun 2022 14:51:26 -0400
Subject: [PATCH 06/23] dojo: say how to beat the %dy-edit-busy escape room

It's too easy to get trapped in the dojo %dy-edit-busy escape room. Just
type something like:

  -build-file /=base/gen/ls/hoon

This modifies the dojo output to tell the user how to get out.

Fixes #1462.
---
 pkg/arvo/app/dojo.hoon | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/arvo/app/dojo.hoon b/pkg/arvo/app/dojo.hoon
index b127a3ce0..511e731e1 100644
--- a/pkg/arvo/app/dojo.hoon
+++ b/pkg/arvo/app/dojo.hoon
@@ -737,7 +737,8 @@
       ?:  |(?=(^ per) ?=(^ pux) ?=(~ pro))
         ~&  %dy-edit-busy
         =^  lic  say  (~(transmit sole say) dat)
-        (dy-diff %mor [%det lic] [%bel ~] ~)
+        =/  tip=@t  'dojo: busy (press backspace to abort)'
+        (dy-diff %mor [%det lic] [%bel ~] [%tan [tip ~]] ~)
       =>  .(per `dat)
       =/  res  (mule |.((slam u.pro !>((tufa buf.say)))))
       ?:  ?=(%| -.res)

From d8f34e89304ff42c5ed48179eb02ebc2b26e93ff Mon Sep 17 00:00:00 2001
From: David Farrell <1469333+dnmfarrell@users.noreply.github.com>
Date: Mon, 13 Jun 2022 21:00:46 -0400
Subject: [PATCH 07/23] dojo: remove unnecessary debug output

The tip already communicates to the user that dojo is busy, so the
sigpam output isn't needed anymore.
---
 pkg/arvo/app/dojo.hoon | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg/arvo/app/dojo.hoon b/pkg/arvo/app/dojo.hoon
index 511e731e1..84c827f0b 100644
--- a/pkg/arvo/app/dojo.hoon
+++ b/pkg/arvo/app/dojo.hoon
@@ -735,7 +735,6 @@
       ^+  +>+>
       =^  dat  say  (~(transceive sole say) cal)
       ?:  |(?=(^ per) ?=(^ pux) ?=(~ pro))
-        ~&  %dy-edit-busy
         =^  lic  say  (~(transmit sole say) dat)
         =/  tip=@t  'dojo: busy (press backspace to abort)'
         (dy-diff %mor [%det lic] [%bel ~] [%tan [tip ~]] ~)

From b1b422ce05c23a70485f6f8a8a9689d99744acc0 Mon Sep 17 00:00:00 2001
From: fang <github@fang.io>
Date: Fri, 17 Jun 2022 14:08:47 +0200
Subject: [PATCH 08/23] gall: exclude from traces

Removes the !: at the top of gall, so that it no longer gets included in traces about agent builds or crashes.

We also refine intentional crashes with ~_s, so that we still see a crash reason even if we don't get a full trace.

Lastly, flops the trace for +on-load crashes, which were getting printed bottom-first.
---
 pkg/arvo/sys/vane/gall.hoon | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkg/arvo/sys/vane/gall.hoon b/pkg/arvo/sys/vane/gall.hoon
index 3ea10d64a..e79dbe000 100644
--- a/pkg/arvo/sys/vane/gall.hoon
+++ b/pkg/arvo/sys/vane/gall.hoon
@@ -1,5 +1,4 @@
-!:
-::  ::  %gall, agent execution
+::  %gall, agent execution
 !?  163
 ::
 ::::
@@ -530,7 +529,7 @@
     |=  [=wire =sign-arvo]
     ^+  mo-core
     ::
-    ?+  -.wire  !!
+    ?+  -.wire  (mean 'gall: bad sys wire' >wire< ~)
       %lyv  (mo-handle-sys-lyv wire sign-arvo)
       %era  (mo-handle-sys-era wire sign-arvo)
       %cor  (mo-handle-sys-cor wire sign-arvo)
@@ -664,7 +663,7 @@
     =/  =ship           (slav %p i.t.wire)
     =/  foreign-agent   i.t.t.wire
     ::
-    ?+    sign-arvo  !!
+    ?+    sign-arvo  (mean 'gall: strange sign' >[- +<]:sign-arvo< ~)
         [%ames %done *]
       =^  remote-request  outstanding.state
         ?~  t.t.t.wire
@@ -703,7 +702,7 @@
       ?^  t.t.t.wire
         ::  kill subscriptions which use the old wire format
         ::
-        !!
+        ~_('gall: killing old style subscription' !!)
       =/  =ames-response  ;;(ames-response payload.sign-arvo)
       (mo-handle-ames-response ames-response)
     ::
@@ -1072,7 +1071,7 @@
       ^-  (list move)
       ::
       ?-    -.card
-          %slip  !!
+          %slip  ~_('gall: non-slip' !!)
       ::
           %give
         =/  =gift:agent  p.card
@@ -1238,8 +1237,8 @@
         %watch-as  (ap-subscribe-as +.deal)
         %poke      (ap-poke +.deal)
         %watch     (ap-subscribe +.deal)
-        %raw-poke  !!
-        %poke-as   !!
+        %raw-poke  ~_('gall: %raw-poke unapplicable' !!)
+        %poke-as   ~_('gall: %poke-as unapplicable' !!)
         %leave     ap-load-delete
       ==
     ::  +ap-peek: peek.
@@ -1338,7 +1337,7 @@
         (ap-install(agent.yoke &+agent) `old-state)
       ?~  error
         ap-core
-      (mean >%load-failed< u.error)
+      (mean 'gall: load failed' (flop u.error))
     ::  +ap-subscribe-as: apply %watch-as.
     ::
     ++  ap-subscribe-as
@@ -1731,7 +1730,7 @@
   ==
 ::  +load: recreate vane; note, only valid if called from pupa
 ::
-++  load  !!
+++  load  ~_('gall: adult load' !!)
 ::  +scry: standard scry
 ::
 ++  scry

From 5e867610ec62f85e509170db3029db52938dab6c Mon Sep 17 00:00:00 2001
From: Joe Bryan <joemfb@gmail.com>
Date: Fri, 17 Jun 2022 00:16:37 -0400
Subject: [PATCH 09/23] behn: adds (failing) tests

---
 pkg/arvo/tests/sys/vane/behn.hoon | 234 ++++++++++++++++++++++++++++++
 1 file changed, 234 insertions(+)
 create mode 100644 pkg/arvo/tests/sys/vane/behn.hoon

diff --git a/pkg/arvo/tests/sys/vane/behn.hoon b/pkg/arvo/tests/sys/vane/behn.hoon
new file mode 100644
index 000000000..2bd2f979d
--- /dev/null
+++ b/pkg/arvo/tests/sys/vane/behn.hoon
@@ -0,0 +1,234 @@
+/+  *test
+/=  behn-raw  /sys/vane/behn
+=/  behn-gate  (behn-raw ~bus)
+=/  scry  *roof
+=*  move  move:behn-gate
+::
+|%
+++  test-wake-no
+  ^-  tang
+  =/  wen  ~1111.1.1
+  =/  arg  [~[/vere] [%wake ~]]
+  -:(call ~ wen arg ~)
+::
+++  test-wake-no-wait
+  ^-  tang
+  =/  wen  ~1111.1.1
+  ::
+  =/  a-arg  [~[/vere] [%born ~]]
+  =/  a-out  ~
+  =^  a  behn-gate  (call `%a wen a-arg a-out)
+  ::
+  =/  b-arg  [~[/vere] [%wake ~]]
+  =/  b-out  ~
+  =^  b  behn-gate  (call `%b wen b-arg b-out)
+  ::
+  (weld a b)
+::
+++  test-wake-no-born
+  ^-  tang
+  =/  wen  ~1111.1.1
+  ::
+  =/  a-arg  [~[/foo] [%wait +(wen)]]
+  =/  a-out  ~
+  =^  a  behn-gate  (call `%a wen a-arg a-out)
+  ::
+  =/  b-arg  [~[/vere] [%wake ~]]
+  =/  b-out  ~
+  =^  b  behn-gate  (call `%b wen b-arg b-out)
+  ::
+  (weld a b)
+::
+++  test-wake
+  ^-  tang
+  =/  wen  ~1111.1.1
+  ::
+  =/  a-arg  [~[/vere] [%born ~]]
+  =/  a-out  ~
+  =^  a  behn-gate
+    (call ~ wen a-arg a-out)
+  ::
+  =/  b-arg  [~[/foo] [%wait +(wen)]]
+  =/  b-out=(list move)  [~[/vere] [%give [%doze `+(wen)]]]~
+  =^  b  behn-gate  (call `%b wen b-arg b-out)
+  ::
+  =/  c-arg  [~[/vere] [%wake ~]]
+  =/  c-out=(list move)  [~[/foo] [%give [%wake ~]]]~   :: XX spurious %doze
+  =^  c  behn-gate  (call `%c +(wen) c-arg c-out)
+  ::
+  :(weld a b c)
+::
+++  test-born
+  ^-  tang
+  =/  wen  ~1111.1.1
+  ::
+  =/  a-arg  [~[/foo] [%wait +(wen)]]
+  =/  a-out  ~
+  =^  a  behn-gate  (call `%a wen a-arg a-out)
+  ::
+  =/  b-arg  [~[/vere] [%born ~]]
+  =/  b-out=(list move)  [~[/vere] [%give [%doze `+(wen)]]]~
+  =^  b  behn-gate  (call `%b wen b-arg b-out)
+  ::
+  (weld a b)
+::
+++  test-many-ordered
+  ^-  tang
+  =/  wen  ~1111.1.1
+  ::
+  =/  a-arg  [~[/vere] [%born ~]]
+  =/  a-out  ~
+  =^  a  behn-gate  (call `%a wen a-arg a-out)
+  ::
+  =/  b-arg  [~[/foo] [%wait +(wen)]]
+  =/  b-out=(list move)  [~[/vere] [%give [%doze `+(wen)]]]~
+  =^  b  behn-gate  (call `%b wen b-arg b-out)
+  ::
+  =/  c-arg  [~[/foo] [%wait (add 2 wen)]]
+  =/  c-out  ~
+  =^  c  behn-gate  (call `%c wen c-arg c-out)
+  ::
+  =/  d-arg  [~[/foo] [%wait (add 3 wen)]]
+  =/  d-out  ~
+  =^  d  behn-gate  (call `%d wen d-arg d-out)
+  ::
+  =/  e-arg  [~[/vere] [%wake ~]]
+  =/  e-out=(list move)
+    :~  [~[/vere] [%give [%doze `(add 2 wen)]]]
+        [~[/foo] [%give [%wake ~]]]
+    ==
+  =^  e  behn-gate  (call `%e (add 4 wen) e-arg e-out)
+  ::
+  :(weld a b c d e)
+::
+++  test-many-ordered-lag
+  ^-  tang
+  =/  wen  ~1111.1.1
+  ::
+  =/  a-arg  [~[/vere] [%born ~]]
+  =/  a-out  ~
+  =^  a  behn-gate  (call `%a wen a-arg a-out)
+  ::
+  =/  b-arg  [~[/foo] [%wait +(wen)]]
+  =/  b-out=(list move)  [~[/vere] [%give [%doze `+(wen)]]]~
+  =^  b  behn-gate  (call `%b wen b-arg b-out)
+  ::
+  =/  c-arg  [~[/foo] [%wait (add 2 wen)]]
+  =/  c-out  ~
+  =^  c  behn-gate  (call `%c wen c-arg c-out)
+  ::
+  =/  d-arg  [~[/foo] [%wait (add 3 wen)]]
+  =/  d-out  ~
+  =^  d  behn-gate  (call `%d wen d-arg d-out)
+  ::
+  =/  e-arg  [~[/vere] [%wake ~]]
+  =/  e-out=(list move)
+    :~  [~[/vere] [%give [%doze `(add 2 wen)]]]         :: XX bug
+        [~[/foo] [%give [%wake ~]]]
+    ==
+  =^  e  behn-gate  (call `%e +(wen) e-arg e-out)
+  ::
+  :(weld a b c d e)
+::
+++  test-many-unordered
+  ^-  tang
+  =/  wen  ~1111.1.1
+  ::
+  =/  a-arg  [~[/vere] [%born ~]]
+  =/  a-out  ~
+  =^  a  behn-gate  (call `%a wen a-arg a-out)
+  ::
+  =/  b-arg  [~[/foo] [%wait (add 2 wen)]]
+  =/  b-out=(list move)  [~[/vere] [%give [%doze `(add 2 wen)]]]~
+  =^  b  behn-gate  (call `%b wen b-arg b-out)
+  ::
+  =/  c-arg  [~[/foo] [%wait (add 3 wen)]]
+  =/  c-out  ~
+  =^  c  behn-gate  (call `%c wen c-arg c-out)
+  ::
+  =/  d-arg  [~[/foo] [%wait +(wen)]]
+  =/  d-out=(list move)  [~[/vere] [%give [%doze `+(wen)]]]~
+  =^  d  behn-gate  (call `%d wen d-arg d-out)
+  ::
+  =/  e-arg  [~[/vere] [%wake ~]]
+  =/  e-out=(list move)
+    :~  [~[/vere] [%give [%doze `(add 2 wen)]]]
+        [~[/foo] [%give [%wake ~]]]
+    ==
+  =^  e  behn-gate  (call `%e (add 4 wen) e-arg e-out)
+  ::
+  :(weld a b c d e)
+::
+++  test-same-ordered-lag
+  ^-  tang
+  =/  wen  ~1111.1.1
+  ::
+  =/  a-arg  [~[/vere] [%born ~]]
+  =/  a-out  ~
+  =^  a  behn-gate  (call `%a wen a-arg a-out)
+  ::
+  =/  b-arg  [~[/foo] [%wait (add 2 wen)]]
+  =/  b-out=(list move)  [~[/vere] [%give [%doze `(add 2 wen)]]]~
+  =^  b  behn-gate  (call `%b wen b-arg b-out)
+  ::
+  =/  c-arg  [~[/foo] [%wait (add 2 wen)]]
+  =/  c-out  ~
+  =^  c  behn-gate  (call `%c wen c-arg c-out)
+  ::
+  =/  d-arg  [~[/foo] [%wait (add 2 wen)]]
+  =/  d-out  ~
+  =^  d  behn-gate  (call `%d wen d-arg d-out)
+  ::
+  =/  e-arg  [~[/vere] [%wake ~]]
+  =/  e-out=(list move)
+    :~  [~[/vere] [%give [%doze `(add 2 wen)]]]         :: XX spuriously skewed
+        [~[/foo] [%give [%wake ~]]]
+    ==
+  =^  e  behn-gate  (call `%e (add 3 wen) e-arg e-out)
+  ::
+  :(weld a b c d e)
+::
+++  test-rest
+  ^-  tang
+  =/  wen  ~1111.1.1
+  ::
+  =/  a-arg  [~[/vere] [%born ~]]
+  =/  a-out  ~
+  =^  a  behn-gate  (call `%a wen a-arg a-out)
+  ::
+  =/  b-arg  [~[/foo] [%wait (add 2 wen)]]
+  =/  b-out=(list move)  [~[/vere] [%give [%doze `(add 2 wen)]]]~
+  =^  b  behn-gate  (call `%b wen b-arg b-out)
+  ::
+  =/  c-arg  [~[/foo] [%wait (add 3 wen)]]
+  =/  c-out  ~
+  =^  c  behn-gate  (call `%c wen c-arg c-out)
+  ::
+  =/  d-arg  [~[/foo] [%rest (add 2 wen)]]
+  =/  d-out=(list move)  [~[/vere] [%give [%doze `(add 3 wen)]]]~
+  =^  d  behn-gate  (call `%d wen d-arg d-out)          ::  XX assumes .= in +set-unix-wake
+  ::
+  =/  e-arg  [~[/vere] [%wake ~]]
+  =/  e-out=(list move)  [~[/foo] [%give [%wake ~]]]~   :: XX spurious %doze
+  =^  e  behn-gate  (call `%e (add 4 wen) e-arg e-out)
+  ::
+  :(weld a b c d e)
+::
+++  call
+  =|  lac=?
+  |=  $:  label=(unit @tas)
+          now=@da
+          args=[=duct task=(hobo task:behn)]
+          expected-moves=(list move)
+      ==
+  =/  behn-core  (behn-gate now=now eny=`@`0xdead.beef scry=scry)
+  =^  moves  behn-gate
+    (call:behn-core duct.args dud=~ task.args)
+  ::
+  ~?  !lac  moves
+  =/  output=tang
+    %+  expect-eq
+      !>  expected-moves
+      !>  moves
+  [?~(label output ?~(output ~ [u.label output])) behn-gate]
+--

From 1843df6cde1850c3cee1c974a4855e5c0ba4fd85 Mon Sep 17 00:00:00 2001
From: Joe Bryan <joemfb@gmail.com>
Date: Thu, 16 Jun 2022 18:05:45 -0400
Subject: [PATCH 10/23] behn: unconditionally clear runtime timer state on
 %wake

---
 pkg/arvo/sys/vane/behn.hoon | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/arvo/sys/vane/behn.hoon b/pkg/arvo/sys/vane/behn.hoon
index afff958ea..3a895d9eb 100644
--- a/pkg/arvo/sys/vane/behn.hoon
+++ b/pkg/arvo/sys/vane/behn.hoon
@@ -120,6 +120,7 @@
   ++  wake
     |=  error=(unit tang)
     ^+  [moves state]
+    =.  next-wake.state  ~
     ::  no-op on spurious but innocuous unix wakeups
     ::
     ?:  =(~ timers.state)
@@ -135,7 +136,7 @@
     ::
     =/  [=timer later-timers=_timers.state]  pop-timer
     ?:  (gth date.timer now)
-      set-unix-wake(next-wake.state ~)
+      set-unix-wake
     ::  pop first timer, tell vane it has elapsed, and adjust next unix wakeup
     ::
     =<  set-unix-wake

From bf8114a29d29a33858e9fa1c6b4f39d85204f61b Mon Sep 17 00:00:00 2001
From: Joe Bryan <joemfb@gmail.com>
Date: Thu, 16 Jun 2022 18:08:30 -0400
Subject: [PATCH 11/23] behn: don't compare pending timers to now

---
 pkg/arvo/sys/vane/behn.hoon | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkg/arvo/sys/vane/behn.hoon b/pkg/arvo/sys/vane/behn.hoon
index 3a895d9eb..37d965dc0 100644
--- a/pkg/arvo/sys/vane/behn.hoon
+++ b/pkg/arvo/sys/vane/behn.hoon
@@ -168,9 +168,6 @@
     ::
     ?~  unix-duct.state
       event-core
-    ::  make sure we don't try to wake up in the past
-    ::
-    =?  date-unit  ?=(^ date-unit)  `(max now u.date-unit)
     ::
     %_  event-core
       next-wake.state  date-unit
@@ -192,10 +189,10 @@
       ?~  next-wake
         event-core
       (emit-doze ~)
-    ::  if :next-wake is in the past or not soon enough, reset it
+    ::  if :next-wake not soon enough, reset it
     ::
     ?^  next-wake
-      ?:  &((gte date.u.first u.next-wake) (lte now u.next-wake))
+      ?:  (gte date.u.first u.next-wake)
         event-core
       (emit-doze `date.u.first)
     ::  there was no unix wakeup timer; set one

From 1b6d4f0fc560e21c3eb7fc05eba9ef4ad11acc31 Mon Sep 17 00:00:00 2001
From: Joe Bryan <joemfb@gmail.com>
Date: Fri, 17 Jun 2022 02:11:49 -0400
Subject: [PATCH 12/23] behn: refactor to use +abet pattern

---
 pkg/arvo/sys/vane/behn.hoon | 223 +++++++++++++-----------------------
 1 file changed, 78 insertions(+), 145 deletions(-)

diff --git a/pkg/arvo/sys/vane/behn.hoon b/pkg/arvo/sys/vane/behn.hoon
index 6ae882285..315a84cb1 100644
--- a/pkg/arvo/sys/vane/behn.hoon
+++ b/pkg/arvo/sys/vane/behn.hoon
@@ -45,159 +45,109 @@
   |=  [[now=@da =duct] state=behn-state]
   ::
   |%
-  ::  %entry-points
   ::
-  ::  +born: urbit restarted; refresh :next-wake and store wakeup timer duct
+  +|  %helpers
   ::
-  ++  born  set-unix-wake(next-wake.state ~, unix-duct.state duct)
-  ::  +crud: handle failure of previous arvo event
-  ::
-  ++  crud
-    |=  [tag=@tas error=tang]
+  ++  this  .
+  ++  emit  |=(m=move this(moves [m moves]))
+  ++  abet
     ^+  [moves state]
-    ::  behn must get activated before other vanes in a %wake
+    ::  moves are statefully pre-flopped to ensure that
+    ::  any prepended %doze is emitted first
     ::
-    ?.  =(%wake tag)
-      ~&  %behn-crud-not-wake^tag
-      [[duct %slip %d %flog %crud tag error]~ state]
+    =.  moves  (flop moves)
+    =/  new=(unit @da)  (bind (pry:timer-map timers.state) head)
+    ::  emit %doze if needed
     ::
-    ?:  =(~ timers.state)
-      ~|(%behn-crud-no-timer^tag^error !!)
+    =?    ..this
+        ?~  unix-duct.state  |
+        =/  dif=[old=(unit @da) new=(unit @da)]  [next-wake.state new]
+        ?+  dif  ~|([%unpossible dif] !!)
+          [~ ~]  |                        :: no-op
+          [~ ^]  &                        :: set
+          [^ ~]  &                        :: clear
+          [^ ^]  !=(u.old.dif u.new.dif)  :: set if changed
+        ==
+      (emit(next-wake.state new) [unix-duct.state %give %doze new])
     ::
-    (wake `error)
-  ::  +rest: cancel the timer at :date, then adjust unix wakeup
-  ::  +wait: set a new timer at :date, then adjust unix wakeup
+    [moves state]
   ::
-  ++  rest  |=(date=@da set-unix-wake(timers.state (unset-timer [date duct])))
-  ++  wait  |=(date=@da set-unix-wake(timers.state (set-timer [date duct])))
-  ::  +huck: give back immediately
+  +|  %entry-points
   ::
-  ::    Useful if you want to continue working after other moves finish.
+  ++  call
+    |=  [=task error=(unit tang)]
+    ^+  this
+    ?:  ?&  ?=(^ error)
+            !?=(%wake -.task)
+        ==
+      ::  XX more and better error handling
+      ::
+      ~&  %behn-crud-not-wake^-.task
+      (emit [duct %slip %d %flog %crud -.task u.error])
+    ::
+    ?-  -.task
+      %born  this(next-wake.state ~, unix-duct.state duct)
+      %drip  (drip p.task)
+      %huck  (emit [duct %give %heck syn.task])
+      %rest  this(timers.state (unset-timer [p.task duct]))
+      %trim  this
+      %vega  this
+      %wait  this(timers.state (set-timer [p.task duct]))
+      %wake  (wake(next-wake.state ~) error)
+    ==
   ::
-  ++  huck
-    |=  syn=sign-arvo
-    =<  [moves state]
-    event-core(moves [duct %give %heck syn]~)
-  ::  +drip:  XX
-  ::
-  ++  drip
-    |=  mov=vase
-    =<  [moves state]
-    ^+  event-core
-    =.  moves
-      [duct %pass /drip/(scot %ud count.drips.state) %b %wait +(now)]~
-    =.  movs.drips.state
-      (~(put by movs.drips.state) count.drips.state mov)
-    =.  count.drips.state  +(count.drips.state)
-    event-core
   ::  +take-drip:  XX
   ::
   ++  take-drip
     |=  [num=@ud error=(unit tang)]
-    =<  [moves state]
-    ^+  event-core
+    ^+  this
     =/  drip  (~(got by movs.drips.state) num)
-    =.  movs.drips.state  (~(del by movs.drips.state) num)
-    =/  =move
-      =/  card  [%give %meta drip]
-      ?~  error
-        [duct card]
-      =/  =tang
-        (weld u.error `tang`[leaf/"drip failed" ~])
-      ::  XX should be
-      ::  [duct %hurl fail/tang card]
-      ::
-      [duct %pass /drip-slog %d %flog %crud %drip-fail tang]
-    event-core(moves [move moves])
-  ::  +trim: in response to memory pressue
+    %-  emit(movs.drips.state (~(del by movs.drips.state) num))
+    =/  card  [%give %meta drip]
+    ?~  error
+      [duct card]
+    =/  =tang
+      (weld u.error `tang`[leaf/"drip failed" ~])
+    ::  XX should be
+    ::  [duct %hurl fail/tang card]
+    ::
+    [duct %pass /drip-slog %d %flog %crud %drip-fail tang]
   ::
-  ++  trim  [moves state]
-  ::  +vega: learn of a kernel upgrade
+  +|  %tasks
+  ::
+  ::  +drip:  XX
+  ::
+  ++  drip
+    |=  vax=vase
+    ^+  this
+    %.  [duct %pass /drip/(scot %ud count.drips.state) %b %wait +(now)]
+    %=  emit
+      movs.drips.state   (~(put by movs.drips.state) count.drips.state vax)
+      count.drips.state  +(count.drips.state)
+    ==
   ::
-  ++  vega  [moves state]
   ::  +wake: unix says wake up; process the elapsed timer and set :next-wake
   ::
   ++  wake
     |=  error=(unit tang)
-    ^+  [moves state]
-    =.  next-wake.state  ~
-    ::  no-op on spurious but innocuous unix wakeups
-    ::
+    ^+  this
     ?:  =(~ timers.state)
+      ::  no-op on spurious but innocuous unix wakeups
+      ::
       ~?  ?=(^ error)  %behn-wake-no-timer^u.error
-      [moves state]
-    ::  if we errored, pop the timer and notify the client vane of the error
-    ::
-    ?^  error
-      =<  set-unix-wake
-      =^  =timer  timers.state  pop-timer
-      (emit-vane-wake duct.timer error)
-    ::  if unix woke us too early, retry by resetting the unix wakeup timer
-    ::
+      this
     =/  [=timer later-timers=_timers.state]  pop-timer
     ?:  (gth date.timer now)
-      set-unix-wake
-    ::  pop first timer, tell vane it has elapsed, and adjust next unix wakeup
+      ::  no-op if timer is early, (+abet will reset)
+      ::
+      this
+    ::  pop the first timer and notify client vane,
+    ::  forwarding error if present
     ::
-    =<  set-unix-wake
-    (emit-vane-wake(timers.state later-timers) duct.timer ~)
-  ::  %utilities
+    (emit(timers.state later-timers) [duct.timer %give %wake error])
   ::
-  ::+|
+  +|  %implementation
   ::
-  ++  event-core  .
-  ::  +emit-vane-wake: produce a move to wake a vane; assumes no prior moves
-  ::
-  ++  emit-vane-wake
-    |=  [=^duct error=(unit tang)]
-    event-core(moves [duct %give %wake error]~)
-  ::  +emit-doze: set new unix wakeup timer in state and emit move to unix
-  ::
-  ::    We prepend the unix %doze event so that it is handled first. Arvo must
-  ::    handle this first because the moves %behn emits will get handled in
-  ::    depth-first order. If we're handling a %wake which causes a move to a
-  ::    different vane and a %doze event to send to unix, Arvo needs to process
-  ::    the %doze first because otherwise if the move to the other vane calls
-  ::    back into %behn and emits a second %doze, the second %doze would be
-  ::    handled by unix first which is incorrect.
-  ::
-  ++  emit-doze
-    |=  =date=(unit @da)
-    ^+  event-core
-    ::  no-op if .unix-duct has not yet been set
-    ::
-    ?~  unix-duct.state
-      event-core
-    ::
-    %_  event-core
-      next-wake.state  date-unit
-      moves            [[unix-duct.state %give %doze date-unit] moves]
-    ==
-  ::  +set-unix-wake: set or unset next unix wakeup timer based on :i.timers
-  ::
-  ++  set-unix-wake
-    =<  [moves state]
-    ~%  %set-unix-wake  ..part  ~  |-
-    ^+  event-core
-    ::
-    =*  next-wake  next-wake.state
-    =*  timers     timers.state
-    ::  if no timers, cancel existing wakeup timer or no-op
-    ::
-    =/  first=(unit [date=@da *])  (pry:timer-map timers.state)
-    ?~  first
-      ?~  next-wake
-        event-core
-      (emit-doze ~)
-    ::  if :next-wake not soon enough, reset it
-    ::
-    ?^  next-wake
-      ?:  =(date.u.first u.next-wake)
-        event-core
-      (emit-doze `date.u.first)
-    ::  there was no unix wakeup timer; set one
-    ::
-    (emit-doze `date.u.first)
   ::  +pop-timer: dequeue and produce earliest timer
   ::
   ++  pop-timer
@@ -265,27 +215,10 @@
           wrapped-task=(hobo task)
       ==
   ^-  [(list move) _behn-gate]
-  ::
   =/  =task  ((harden task) wrapped-task)
   =/  event-core  (per-event [now hen] state)
-  ::
   =^  moves  state
-    ::
-    ::  handle error notifications
-    ::
-    ?^  dud
-      (crud:event-core -.task tang.u.dud)
-    ::
-    ?-  -.task
-      %born  born:event-core
-      %rest  (rest:event-core date=p.task)
-      %drip  (drip:event-core move=p.task)
-      %huck  (huck:event-core syn.task)
-      %trim  trim:event-core
-      %vega  vega:event-core
-      %wait  (wait:event-core date=p.task)
-      %wake  (wake:event-core error=~)
-    ==
+    abet:(call:event-core task ?~(dud ~ `tang.u.dud))
   [moves behn-gate]
 ::  +load: migrate an old state to a new behn version
 ::
@@ -376,6 +309,6 @@
   ?>  ?=([%drip @ ~] tea)
   =/  event-core  (per-event [now hen] state)
   =^  moves  state
-    (take-drip:event-core (slav %ud i.t.tea) error.hin)
+    abet:(take-drip:event-core (slav %ud i.t.tea) error.hin)
   [moves behn-gate]
 --

From 5482d3ff93506b6f6b1e1f85bcb50edfe195ad02 Mon Sep 17 00:00:00 2001
From: Joe Bryan <joemfb@gmail.com>
Date: Fri, 17 Jun 2022 00:16:51 -0400
Subject: [PATCH 13/23] behn: emit %doze on any rescheduling of the next timer

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

diff --git a/pkg/arvo/sys/vane/behn.hoon b/pkg/arvo/sys/vane/behn.hoon
index 37d965dc0..6ae882285 100644
--- a/pkg/arvo/sys/vane/behn.hoon
+++ b/pkg/arvo/sys/vane/behn.hoon
@@ -192,7 +192,7 @@
     ::  if :next-wake not soon enough, reset it
     ::
     ?^  next-wake
-      ?:  (gte date.u.first u.next-wake)
+      ?:  =(date.u.first u.next-wake)
         event-core
       (emit-doze `date.u.first)
     ::  there was no unix wakeup timer; set one

From 6b99b154d6efe68e42043bd383c4739582b96cf1 Mon Sep 17 00:00:00 2001
From: Joe Bryan <joemfb@gmail.com>
Date: Fri, 17 Jun 2022 22:20:16 -0400
Subject: [PATCH 14/23] behn: cleans up comments

---
 pkg/arvo/sys/vane/behn.hoon | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkg/arvo/sys/vane/behn.hoon b/pkg/arvo/sys/vane/behn.hoon
index 315a84cb1..78f13c81a 100644
--- a/pkg/arvo/sys/vane/behn.hoon
+++ b/pkg/arvo/sys/vane/behn.hoon
@@ -96,7 +96,7 @@
       %wake  (wake(next-wake.state ~) error)
     ==
   ::
-  ::  +take-drip:  XX
+  ::  +take-drip: the future is now, %give the deferred move
   ::
   ++  take-drip
     |=  [num=@ud error=(unit tang)]
@@ -115,7 +115,7 @@
   ::
   +|  %tasks
   ::
-  ::  +drip:  XX
+  ::  +drip: enqueue a future gift (as a vase), %pass ourselves a %wait
   ::
   ++  drip
     |=  vax=vase
@@ -126,7 +126,7 @@
       count.drips.state  +(count.drips.state)
     ==
   ::
-  ::  +wake: unix says wake up; process the elapsed timer and set :next-wake
+  ::  +wake: unix says wake up; process the elapsed timer (or forward error)
   ::
   ++  wake
     |=  error=(unit tang)
@@ -144,6 +144,9 @@
     ::  pop the first timer and notify client vane,
     ::  forwarding error if present
     ::
+    ::    XX %wake errors should be signaled out-of-band
+    ::    [duct.timer %hurl goof %give %wake ~]
+    ::
     (emit(timers.state later-timers) [duct.timer %give %wake error])
   ::
   +|  %implementation

From 244961ed397598ae42bc284575ea16e2e3033479 Mon Sep 17 00:00:00 2001
From: Joe Bryan <joemfb@gmail.com>
Date: Fri, 17 Jun 2022 22:24:24 -0400
Subject: [PATCH 15/23] test: removes debugging comments from %behn unit tests

---
 pkg/arvo/tests/sys/vane/behn.hoon | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/arvo/tests/sys/vane/behn.hoon b/pkg/arvo/tests/sys/vane/behn.hoon
index 2bd2f979d..c7db79ded 100644
--- a/pkg/arvo/tests/sys/vane/behn.hoon
+++ b/pkg/arvo/tests/sys/vane/behn.hoon
@@ -53,7 +53,7 @@
   =^  b  behn-gate  (call `%b wen b-arg b-out)
   ::
   =/  c-arg  [~[/vere] [%wake ~]]
-  =/  c-out=(list move)  [~[/foo] [%give [%wake ~]]]~   :: XX spurious %doze
+  =/  c-out=(list move)  [~[/foo] [%give [%wake ~]]]~
   =^  c  behn-gate  (call `%c +(wen) c-arg c-out)
   ::
   :(weld a b c)
@@ -123,7 +123,7 @@
   ::
   =/  e-arg  [~[/vere] [%wake ~]]
   =/  e-out=(list move)
-    :~  [~[/vere] [%give [%doze `(add 2 wen)]]]         :: XX bug
+    :~  [~[/vere] [%give [%doze `(add 2 wen)]]]
         [~[/foo] [%give [%wake ~]]]
     ==
   =^  e  behn-gate  (call `%e +(wen) e-arg e-out)
@@ -181,7 +181,7 @@
   ::
   =/  e-arg  [~[/vere] [%wake ~]]
   =/  e-out=(list move)
-    :~  [~[/vere] [%give [%doze `(add 2 wen)]]]         :: XX spuriously skewed
+    :~  [~[/vere] [%give [%doze `(add 2 wen)]]]
         [~[/foo] [%give [%wake ~]]]
     ==
   =^  e  behn-gate  (call `%e (add 3 wen) e-arg e-out)
@@ -206,10 +206,10 @@
   ::
   =/  d-arg  [~[/foo] [%rest (add 2 wen)]]
   =/  d-out=(list move)  [~[/vere] [%give [%doze `(add 3 wen)]]]~
-  =^  d  behn-gate  (call `%d wen d-arg d-out)          ::  XX assumes .= in +set-unix-wake
+  =^  d  behn-gate  (call `%d wen d-arg d-out)
   ::
   =/  e-arg  [~[/vere] [%wake ~]]
-  =/  e-out=(list move)  [~[/foo] [%give [%wake ~]]]~   :: XX spurious %doze
+  =/  e-out=(list move)  [~[/foo] [%give [%wake ~]]]~
   =^  e  behn-gate  (call `%e (add 4 wen) e-arg e-out)
   ::
   :(weld a b c d e)

From be1d70f4b6af326cecbb1f6c3add9273210cfa0a Mon Sep 17 00:00:00 2001
From: Sidnym Ladrut <sidnym@ladrut.xyz>
Date: Sat, 18 Jun 2022 23:29:54 +0000
Subject: [PATCH 16/23] hood: fix issue w/ rein diff application

---
 pkg/base-dev/sur/hood.hoon | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkg/base-dev/sur/hood.hoon b/pkg/base-dev/sur/hood.hoon
index d1087a05b..77721925b 100644
--- a/pkg/base-dev/sur/hood.hoon
+++ b/pkg/base-dev/sur/hood.hoon
@@ -180,9 +180,8 @@
           =rein
       ==
   ^-  [jolt=(list dude) idle=(list dude)]
-  =/  all=(list dude)  (read-bill local)
-  =/  want  (get-apps-want local all rein)
   =/  have  (get-apps-live local)
+  =/  want  (get-apps-want local have rein)
   [want (skip have ~(has in (sy want)))]
 ::
 ++  get-remote-diff

From 7e74d44054cbde9bcc0823e07810d87a1d77f838 Mon Sep 17 00:00:00 2001
From: pkova <pyry.kovanen@gmail.com>
Date: Sun, 26 Jun 2022 00:24:20 +0300
Subject: [PATCH 17/23] dns: transfer ship.arvo.network domains from ~zod to
 ~deg

---
 pkg/arvo/mar/dns/complete.hoon |  9 +++++++++
 pkg/arvo/mar/dns/request.hoon  | 16 ++++++++++++++++
 pkg/arvo/ted/dns/address.hoon  |  2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 pkg/arvo/mar/dns/request.hoon

diff --git a/pkg/arvo/mar/dns/complete.hoon b/pkg/arvo/mar/dns/complete.hoon
index cbe67c6f0..17276f99e 100644
--- a/pkg/arvo/mar/dns/complete.hoon
+++ b/pkg/arvo/mar/dns/complete.hoon
@@ -8,5 +8,14 @@
 ++  grab
   |%
   +$  noun  [ship binding]
+  ++  json
+    =,  dejs:format
+    |=  jon=json
+    %.  jon
+    %-  ot
+    :~  [%ship |=(j=json ?>(?=([%s *] j) (rash +.j fed:ag)))]
+        [%address |=(j=json ?>(?=([%s *] j) [%if (rash +.j ip4:eyre)]))]
+        [%turf (ar so)]
+    ==
   --
 --
diff --git a/pkg/arvo/mar/dns/request.hoon b/pkg/arvo/mar/dns/request.hoon
new file mode 100644
index 000000000..7b0e91a31
--- /dev/null
+++ b/pkg/arvo/mar/dns/request.hoon
@@ -0,0 +1,16 @@
+/-  *dns
+|_  r=request
+++  grad  %noun
+++  grow
+  |%
+  ++  json
+    %-  pairs:enjs:format
+    :~  ['ship' (ship:enjs:format ship.r)]
+        ['address' s+(rsh 3 (scot %if +.address.r))]
+    ==
+  --
+++  grab
+  |%
+  ++  noun  request
+  --
+--
diff --git a/pkg/arvo/ted/dns/address.hoon b/pkg/arvo/ted/dns/address.hoon
index faf5b902c..feb9662c5 100644
--- a/pkg/arvo/ted/dns/address.hoon
+++ b/pkg/arvo/ted/dns/address.hoon
@@ -25,7 +25,7 @@
   |=  if=@if
   =/  m  (strand ,~)
   ^-  form:m
-  =/  collector-app  `dock`[~zod %dns-collector]
+  =/  collector-app  `dock`[~deg %dns-collector]
   ;<  good=?  bind:m  (self-check-http:libdns |+if 2)
   ?.  good
     %+  strand-fail:strandio  %bail-early-self-check

From ddf35206485a1cf464d96adc94d973055fdb351b Mon Sep 17 00:00:00 2001
From: fang <git@fang.io>
Date: Tue, 5 Jul 2022 17:37:54 +0200
Subject: [PATCH 18/23] hood: re-patch |rein

Essentially reimplements #5863 in the generator, instead of the library.
---
 pkg/arvo/gen/hood/rein.hoon | 4 +++-
 pkg/base-dev/sur/hood.hoon  | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkg/arvo/gen/hood/rein.hoon b/pkg/arvo/gen/hood/rein.hoon
index 3f777a2d3..ab65645b5 100644
--- a/pkg/arvo/gen/hood/rein.hoon
+++ b/pkg/arvo/gen/hood/rein.hoon
@@ -9,7 +9,9 @@
 :-  %kiln-rein
 :-  desk
 %+  roll  arg
-=|  =rein:hood
+=/  =rein:hood
+  =<  rein.arak
+  .^(vat:hood %gx /(scot %p p.bec)/hood/(scot %da now)/kiln/vat/[desk]/noun)
 |:  [*[on=? =dude:gall] rein=rein(liv liv)]
 ?:  on
   rein(add (~(put in add.rein) dude))
diff --git a/pkg/base-dev/sur/hood.hoon b/pkg/base-dev/sur/hood.hoon
index 77721925b..d1087a05b 100644
--- a/pkg/base-dev/sur/hood.hoon
+++ b/pkg/base-dev/sur/hood.hoon
@@ -180,8 +180,9 @@
           =rein
       ==
   ^-  [jolt=(list dude) idle=(list dude)]
+  =/  all=(list dude)  (read-bill local)
+  =/  want  (get-apps-want local all rein)
   =/  have  (get-apps-live local)
-  =/  want  (get-apps-want local have rein)
   [want (skip have ~(has in (sy want)))]
 ::
 ++  get-remote-diff

From a1b3348cdf71ce4caed99534e41c5e7890bca0bd Mon Sep 17 00:00:00 2001
From: fang <git@fang.io>
Date: Thu, 7 Jul 2022 16:21:43 +0200
Subject: [PATCH 19/23] Revert "clay: render syntax errors at end of file"

This reverts commit 7a110db60dd63743ebe5f21271721ac6e5119e3c.
---
 pkg/arvo/sys/vane/clay.hoon | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkg/arvo/sys/vane/clay.hoon b/pkg/arvo/sys/vane/clay.hoon
index 8c0a7f276..ab938a078 100644
--- a/pkg/arvo/sys/vane/clay.hoon
+++ b/pkg/arvo/sys/vane/clay.hoon
@@ -970,14 +970,8 @@
       %-  mean  %-  flop
       =/  lyn  p.hair
       =/  col  q.hair
-      ^-  (list tank)
       :~  leaf+"syntax error at [{<lyn>} {<col>}] in {<pax>}"
-        ::
-          =/  =wain  (to-wain:format (crip tex))
-          ?:  (gth lyn (lent wain))
-            '<<end of file>>'
-          (snag (dec lyn) wain)
-        ::
+          leaf+(trip (snag (dec lyn) (to-wain:format (crip tex))))
           leaf+(runt [(dec col) '-'] "^")
       ==
     ::

From 283e5ad1dbb765ade35e4303e106a1af68b813d2 Mon Sep 17 00:00:00 2001
From: fang <git@fang.io>
Date: Thu, 7 Jul 2022 16:24:03 +0200
Subject: [PATCH 20/23] Revert "gall: exclude from traces"

This reverts commit b1b422ce05c23a70485f6f8a8a9689d99744acc0.
---
 pkg/arvo/sys/vane/gall.hoon | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkg/arvo/sys/vane/gall.hoon b/pkg/arvo/sys/vane/gall.hoon
index e79dbe000..3ea10d64a 100644
--- a/pkg/arvo/sys/vane/gall.hoon
+++ b/pkg/arvo/sys/vane/gall.hoon
@@ -1,4 +1,5 @@
-::  %gall, agent execution
+!:
+::  ::  %gall, agent execution
 !?  163
 ::
 ::::
@@ -529,7 +530,7 @@
     |=  [=wire =sign-arvo]
     ^+  mo-core
     ::
-    ?+  -.wire  (mean 'gall: bad sys wire' >wire< ~)
+    ?+  -.wire  !!
       %lyv  (mo-handle-sys-lyv wire sign-arvo)
       %era  (mo-handle-sys-era wire sign-arvo)
       %cor  (mo-handle-sys-cor wire sign-arvo)
@@ -663,7 +664,7 @@
     =/  =ship           (slav %p i.t.wire)
     =/  foreign-agent   i.t.t.wire
     ::
-    ?+    sign-arvo  (mean 'gall: strange sign' >[- +<]:sign-arvo< ~)
+    ?+    sign-arvo  !!
         [%ames %done *]
       =^  remote-request  outstanding.state
         ?~  t.t.t.wire
@@ -702,7 +703,7 @@
       ?^  t.t.t.wire
         ::  kill subscriptions which use the old wire format
         ::
-        ~_('gall: killing old style subscription' !!)
+        !!
       =/  =ames-response  ;;(ames-response payload.sign-arvo)
       (mo-handle-ames-response ames-response)
     ::
@@ -1071,7 +1072,7 @@
       ^-  (list move)
       ::
       ?-    -.card
-          %slip  ~_('gall: non-slip' !!)
+          %slip  !!
       ::
           %give
         =/  =gift:agent  p.card
@@ -1237,8 +1238,8 @@
         %watch-as  (ap-subscribe-as +.deal)
         %poke      (ap-poke +.deal)
         %watch     (ap-subscribe +.deal)
-        %raw-poke  ~_('gall: %raw-poke unapplicable' !!)
-        %poke-as   ~_('gall: %poke-as unapplicable' !!)
+        %raw-poke  !!
+        %poke-as   !!
         %leave     ap-load-delete
       ==
     ::  +ap-peek: peek.
@@ -1337,7 +1338,7 @@
         (ap-install(agent.yoke &+agent) `old-state)
       ?~  error
         ap-core
-      (mean 'gall: load failed' (flop u.error))
+      (mean >%load-failed< u.error)
     ::  +ap-subscribe-as: apply %watch-as.
     ::
     ++  ap-subscribe-as
@@ -1730,7 +1731,7 @@
   ==
 ::  +load: recreate vane; note, only valid if called from pupa
 ::
-++  load  ~_('gall: adult load' !!)
+++  load  !!
 ::  +scry: standard scry
 ::
 ++  scry

From e6996cb77c7f362d9ed9db8a978d73855a242bb0 Mon Sep 17 00:00:00 2001
From: janeway-bot <77382443+janeway-bot@users.noreply.github.com>
Date: Fri, 8 Jul 2022 10:20:31 -0700
Subject: [PATCH 21/23] groups: [skip actions] update glob
 (0v3.mtkm8.77bad.7j793.jtnl4.pi1mm)

---
 pkg/landscape/desk.docket-0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/landscape/desk.docket-0 b/pkg/landscape/desk.docket-0
index 7d3b4f032..16ae40b9f 100644
--- a/pkg/landscape/desk.docket-0
+++ b/pkg/landscape/desk.docket-0
@@ -1,7 +1,7 @@
 :~  title+'Groups'
     info+'A suite of applications to communicate on Urbit'
     color+0xee.5432
-    glob-http+['https://bootstrap.urbit.org/glob-0v4.2se6m.fvv67.nn5e8.vfrv9.mmi88.glob' 0v4.2se6m.fvv67.nn5e8.vfrv9.mmi88]
+    glob-http+['https://bootstrap.urbit.org/glob-0v3.mtkm8.77bad.7j793.jtnl4.pi1mm.glob' 0v3.mtkm8.77bad.7j793.jtnl4.pi1mm]
 
     base+'landscape'
     version+[1 0 11]

From 1ac97b2f69c3759db21cdd0d19d737e81287e91c Mon Sep 17 00:00:00 2001
From: Hunter Miller <hunter@tlon.io>
Date: Wed, 13 Jul 2022 12:21:20 -0500
Subject: [PATCH 22/23] meta: version bumps

---
 pkg/garden/desk.docket-0    | 2 +-
 pkg/landscape/desk.docket-0 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/garden/desk.docket-0 b/pkg/garden/desk.docket-0
index 4a8ae130c..619ef2b9a 100644
--- a/pkg/garden/desk.docket-0
+++ b/pkg/garden/desk.docket-0
@@ -4,7 +4,7 @@
     glob-http+['https://bootstrap.urbit.org/glob-0v5.kgrq2.gp725.bo5bk.dmr7d.h41qk.glob' 0v5.kgrq2.gp725.bo5bk.dmr7d.h41qk]
     ::glob-ames+~zod^0v0
     base+'grid'
-    version+[1 1 3]
+    version+[1 1 4]
     website+'https://tlon.io'
     license+'MIT'
 ==
diff --git a/pkg/landscape/desk.docket-0 b/pkg/landscape/desk.docket-0
index 16ae40b9f..aba83f78f 100644
--- a/pkg/landscape/desk.docket-0
+++ b/pkg/landscape/desk.docket-0
@@ -4,7 +4,7 @@
     glob-http+['https://bootstrap.urbit.org/glob-0v3.mtkm8.77bad.7j793.jtnl4.pi1mm.glob' 0v3.mtkm8.77bad.7j793.jtnl4.pi1mm]
 
     base+'landscape'
-    version+[1 0 11]
+    version+[1 1 0]
     website+'https://tlon.io'
     license+'MIT'
 ==

From e6ae2ba5dccc3d559a182877167cfd0fd2e7d06f Mon Sep 17 00:00:00 2001
From: Hunter Miller <hunter@tlon.io>
Date: Wed, 13 Jul 2022 12:23:29 -0500
Subject: [PATCH 23/23] meta: correcting version'

---
 pkg/garden/desk.docket-0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/garden/desk.docket-0 b/pkg/garden/desk.docket-0
index 619ef2b9a..6393b991c 100644
--- a/pkg/garden/desk.docket-0
+++ b/pkg/garden/desk.docket-0
@@ -4,7 +4,7 @@
     glob-http+['https://bootstrap.urbit.org/glob-0v5.kgrq2.gp725.bo5bk.dmr7d.h41qk.glob' 0v5.kgrq2.gp725.bo5bk.dmr7d.h41qk]
     ::glob-ames+~zod^0v0
     base+'grid'
-    version+[1 1 4]
+    version+[1 1 6]
     website+'https://tlon.io'
     license+'MIT'
 ==