From 839a822f71b53211d294fe021ddab5116a339352 Mon Sep 17 00:00:00 2001
From: Philip Monk <phil@pcmonk.me>
Date: Thu, 12 Sep 2019 12:57:37 -0700
Subject: [PATCH] mall: convert hood/dojo to refactored form

---
 bin/solid.pill                    |   4 +-
 pkg/arvo/age/dojo.hoon            | 123 +++++++++++-------------------
 pkg/arvo/age/hood.hoon            |  33 ++++----
 pkg/arvo/app/aqua.hoon            |   1 +
 pkg/arvo/lib/hood/drum-mall.hoon  |  17 ++---
 pkg/arvo/lib/hood/helm-mall.hoon  |  14 ++--
 pkg/arvo/lib/hood/kiln-mall.hoon  |  24 +++---
 pkg/arvo/lib/hood/write-mall.hoon |   2 +-
 pkg/arvo/sys/vane/ames.hoon       |  10 +--
 pkg/arvo/sys/vane/dill.hoon       |  16 ++--
 pkg/arvo/sys/vane/jael.hoon       |  35 ++++-----
 pkg/arvo/sys/vane/mall.hoon       |   6 +-
 pkg/arvo/sys/zuse.hoon            |   5 +-
 13 files changed, 124 insertions(+), 166 deletions(-)

diff --git a/bin/solid.pill b/bin/solid.pill
index d8c3a69e82..cfaa83ca89 100644
--- a/bin/solid.pill
+++ b/bin/solid.pill
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b8a1701002c00861ac55afcf4596f43d6daac82c0d5dca5e25274720a2cdd10
-size 17162691
+oid sha256:09d619d75bf296a740e90b7d54a766526f93ba0acc114216b064d4115b3f5d1b
+size 15445021
diff --git a/pkg/arvo/age/dojo.hoon b/pkg/arvo/age/dojo.hoon
index fbc40ab09a..e493183504 100644
--- a/pkg/arvo/age/dojo.hoon
+++ b/pkg/arvo/age/dojo.hoon
@@ -93,35 +93,6 @@
       ==                                                ::
     ++  bead  {p/(set beam) q/cage}                     ::  computed result
     ++  goal  {p/ship q/term}                           ::  flat application
-    ++  clap                                            ::  action, user
-      $%  {$peer p/path}                                ::  subscribe
-          {$poke p/(cask)}                              ::  apply
-          {$pull ~}                                     ::  unsubscribe
-      ==                                                ::
-    ++  club                                            ::  action, system
-      $%  {$peer p/path}                                ::  subscribe
-          {$poke p/cage}                                ::  apply
-          {$pull ~}                                     ::  unsubscribe
-      ==                                                ::
-    ++  sign                                            ::
-      $%  ::  %made: build result; response to %build +task
-          ::
-          $:  %made
-              ::  date: formal date of the build
-              ::
-              date=@da
-              ::  result: result of the build; either complete build, or error
-              ::
-              $=  result
-              $%  ::  %complete: contains the result of the completed build
-                  ::
-                  [%complete build-result=build-result:ford]
-                  ::  %incomplete: couldn't finish build; contains error message
-                  ::
-                  [%incomplete =tang]
-          ==  ==
-          {$unto p/internal-gift:gall}
-      ==
     --
 =>
 |%
@@ -324,7 +295,7 @@
 =*  state  -
 =>  |%
 ++  he                                                  ::  per session
-  |_  {hid/bowl:mall moz/(list move:agent:mall) session}
+  |_  {hid/bowl:mall ost=bone moz/(list card:agent:mall) session}
   ::
   ++  he-beam
     ^-  beam
@@ -348,21 +319,21 @@
       ::  pin all builds to :now.hid so they don't get cached forever
       ::
       %-  he-card(poy `+>+<(pux `way))
-      [%pass way %meta %f !>([%build live=%.n schematic])]
+      [%pass way %arvo %f %build live=%.n schematic]
     ::
     ++  dy-request
       |=  [way=wire =request:http]
       ^+  +>+>
       ?>  ?=(~ pux)
       %-  he-card(poy `+>+<(pux `way))
-      [%pass way %meta %l !>([%request request *outbound-config:iris])]
+      [%pass way %arvo %i %request request *outbound-config:iris]
     ::
     ++  dy-stop                                         ::  stop work
       ^+  +>
       =.  poy  ~
       ?~  pux  +>
       %.  [%txt "! cancel {<u.pux>}"]
-      he-diff:(he-card [%pass u.pux %meta %f !>([%kill ~])])
+      he-diff:(he-card [%pass u.pux %arvo %f %kill ~])
     ::
     ++  dy-slam                                         ::  call by ford
       |=  {way/wire gat/vase sam/vase}
@@ -559,7 +530,7 @@
         %-  he-card(poy ~)
         :*  %pass
             /poke 
-            %send
+            %agent
             p.p.p.mad
             q.p.p.mad
             %poke
@@ -568,8 +539,8 @@
       ::
           $file
         %-  he-card(poy ~)
-        :*  %pass  /file  %meta  %c  !>
-            [%info (foal:space:userlib (en-beam:format p.p.mad) cay)]
+        :*  %pass  /file  %arvo  %c
+            %info  (foal:space:userlib (en-beam:format p.p.mad) cay)
         ==
       ::
           $flat
@@ -836,21 +807,21 @@
     ==
   ::
   ++  he-abet                                           ::  resolve
-    [(flop moz) %_(state hoc (~(put by hoc) ost.hid +<+>))]
+    [(flop moz) %_(state hoc (~(put by hoc) ost +<+>+))]
   ::
   ++  he-abut                                           ::  discard
     =>  he-stop
-    [(flop moz) %_(state hoc (~(del by hoc) ost.hid))]
+    [(flop moz) %_(state hoc (~(del by hoc) ost))]
   ::
   ++  he-card                                           ::  emit gift
     |=  =card:agent:mall
     ^+  +>
-    %_(+> moz [[ost.hid card] moz])
+    %_(+> moz [card moz])
   ::
   ++  he-diff                                           ::  emit update
     |=  fec/sole-effect
     ^+  +>
-    (he-card %give %diff %sole-effect !>(fec))
+    (he-card %give %subscription-update `/sole %sole-effect !>(fec))
   ::
   ++  he-stop                                           ::  abort work
     ^+  .
@@ -928,9 +899,9 @@
     ==  ==
   ::
   ++  he-unto                                           ::  result from behn
-    |=  {way/wire cit/internal-gift:gall}
+    |=  {way/wire cit/gift:agent:mall}
     ^+  +>
-    ?.  ?=($coup -.cit)
+    ?.  ?=($poke-ack -.cit)
       ~&  [%strange-unto cit]
       +>
     ?~  p.cit
@@ -1115,12 +1086,16 @@
     he-pine                           ::  XX give mean to original keystroke
   --
 --
+=/  ost=bone  0
 ^-  agent:mall
 |_  hid=bowl:mall
 ++  handle-init
   `..handle-init
 ::
-++  handle-prep
+++  handle-extract-state
+  !>(state)
+::
+++  handle-upgrade-state
   |=  =old-state=vase
   =/  old-state  !<(house old-state-vase)
   ?~  old-state
@@ -1131,11 +1106,11 @@
 ::
 ++  handle-poke
   |=  [=mark =vase]
-  ^-  (quip move:agent:mall _..handle-init)
-  =/  a-session=session  (~(got by hoc) ost.hid)
-  =/  he-full  ~(. he hid ~ a-session)
+  ^-  (quip card:agent:mall _..handle-init)
+  =/  a-session=session  (~(got by hoc) ost)
+  =/  he-full  ~(. he hid ost ~ a-session)
   =^  moves  state
-    ^-  (quip move:agent:mall house)
+    ^-  (quip card:agent:mall house)
     ?+  mark  ~|([%dojo-poke-bad-mark mark] !!)
         %sole-action   he-abet:(he-type:he-full (need !<(sole-action vase)))
         %lens-command  he-abet:(he-lens:he-full (need !<(command:lens vase)))
@@ -1156,61 +1131,55 @@
   ::
   [moves ..handle-init]
 ::
-++  handle-peer
+++  handle-subscribe
   |=  =path
-  ^-  (quip move:agent:mall _..handle-init)
-  ~?  !=(our.hid src.hid)  [%dojo-peer-stranger ost.hid src.hid]
+  ^-  (quip card:agent:mall _..handle-init)
+  ~?  !=(our.hid src.hid)  [%dojo-peer-stranger src.hid]
   ?>  (team:title our.hid src.hid)
   =^  moves-1  state
-    ?.  (~(has by hoc) ost.hid)  [~ state]
-    ~&  [%dojo-peer-replaced ost.hid]
-    ~(he-abut he hid ~ (~(got by hoc) ost.hid))
+    ?.  (~(has by hoc) ost)  [~ state]
+    ~&  [%dojo-peer-replaced ost]
+    ~(he-abut he hid ost ~ (~(got by hoc) ost))
   =^  moves-2  state
     =/  =session  %*(. *session -.dir [our.hid %home ud+0])
     ?>  ?=([%sole *] path)
-    he-abet:(~(he-peer he hid moves-1 session) t.path)
+    he-abet:(~(he-peer he hid ost moves-1 session) t.path)
   [moves-2 ..handle-init]
 ::
-++  handle-pull
+++  handle-unsubscribe
   |=  path
   =^  moves  state
-    ~(he-abut he hid ~ (~(got by hoc) ost.hid))
-  =.  hoc  (~(del by hoc) ost.hid)
+    ~(he-abut he hid ost ~ (~(got by hoc) ost))
+  =.  hoc  (~(del by hoc) ost)
   [moves ..handle-init]
 ::
 ++  handle-peek
   |=  path
   *(unit (unit cage))
 ::
-++  handle-mall
-  |=  [=wire =internal-gift:mall]
-  =/  =session  (~(got by hoc) ost.hid)
+++  handle-agent-response
+  |=  [=wire =gift:agent:mall]
+  =/  =session  (~(got by hoc) ost)
   =^  moves  state
-    he-abet:(~(he-unto he hid ~ session) wire internal-gift)
+    he-abet:(~(he-unto he hid ost ~ session) wire gift)
   [moves ..handle-init]
 ::
-++  handle-take
-  |=  [=wire =vase]
-  =/  =session  (~(got by hoc) ost.hid)
-  =/  he-full  ~(. he hid ~ session)
+++  handle-arvo-response
+  |=  [=wire =sign-arvo]
+  =/  =session  (~(got by hoc) ost)
+  =/  he-full  ~(. he hid ost ~ session)
   =^  moves  state
     =<  he-abet
-    ?+    -.q.vase  ~|([%dojo-bad-take -.q.vase] !!)
-        %made
-      (he-made:he-full wire +:(need !<([%made @da made-result:ford] vase)))
-    ::
-        %http-response
-      (he-http-response:he-full wire +:(need !<([%made client-response:iris] vase)))
+    ?+    +<.sign-arvo  ~|([%dojo-bad-take +<.sign-arvo] !!)
+        %made           (he-made:he-full wire +>.sign-arvo)
+        %http-response  (he-http-response:he-full wire +>.sign-arvo)
     ==
   [moves ..handle-init]
 ::
-++  handle-lame
+++  handle-error
   |=  [=term =tang]
-  =/  =session  (~(got by hoc) ost.hid)
+  =/  =session  (~(got by hoc) ost)
   =^  moves  state
-    he-abet:(~(he-lame he hid ~ session) term tang)
+    he-abet:(~(he-lame he hid ost ~ session) term tang)
   [moves ..handle-init]
-::
-++  handle-stay
-  !>(state)
 --
diff --git a/pkg/arvo/age/hood.hoon b/pkg/arvo/age/hood.hoon
index b5d272ded1..fd005d220c 100644
--- a/pkg/arvo/age/hood.hoon
+++ b/pkg/arvo/age/hood.hoon
@@ -22,13 +22,9 @@
   =>  |%
       +$  part  [%module %0 pith]
       +$  pith  ~
-      ::
-      +$  move  [bone card]
-      +$  card  $%  [%fake ~]
-                ==
       --
-  |=  [bowl:gall own=part]
-  |_  moz=(list move)
+  |=  [bowl:mall own=part]
+  |_  moz=(list card:agent:mall)
   ++  abet  [(flop moz) own]
   --
 --
@@ -119,6 +115,7 @@
         |*  handle/_finish
         |=  a=_+<.handle
         =.  +>.handle  (start hid (able identity))
+        ^-  (quip card:agent:mall _lac)
         (ably (handle a))
       ::  per-module interface wrappers
       ++  from-drum  (from-module %drum [..$ _se-abet]:(hood-drum-mall))
@@ -250,7 +247,7 @@
       %write-wipe             %-  (wrap poke-wipe):from-write:h
                               (need !<(path vase))
     ==
-  [cards ..handle-init]
+  [`(list card:agent:mall)`cards `agent:mall`..handle-init]
 ::
 ++  handle-subscribe
   |=  =path
@@ -270,33 +267,33 @@
   *(unit (unit cage))
 ::
 ++  handle-agent-response
-  |=  [=wire =internal-gift:mall]
+  |=  [=wire =gift:agent:mall]
   =/  h  (help hid)
   =^  cards  lac
     ?+  wire  ~|([%hood-bad-wire wire] !!)
         [%helm %hi *]      %+  (wrap coup-hi):from-helm:h  t.t.wire
-                           ?>(?=(%poke-ack -.internal-gift) p.internal-gift)
+                           ?>(?=(%poke-ack -.gift) p.gift)
         [%kiln %fancy *]   %+  (wrap take-coup-fancy):from-kiln:h  t.t.wire
-                           ?>(?=(%poke-ack -.internal-gift) p.internal-gift)
+                           ?>(?=(%poke-ack -.gift) p.gift)
         [%kiln %reload *]  %+  (wrap take-coup-reload):from-kiln:h  t.t.wire
-                           ?>(?=(%poke-ack -.internal-gift) p.internal-gift)
+                           ?>(?=(%poke-ack -.gift) p.gift)
         [%kiln %spam *]    %+  (wrap take-coup-spam):from-kiln:h  t.t.wire
-                           ?>(?=(%poke-ack -.internal-gift) p.internal-gift)
+                           ?>(?=(%poke-ack -.gift) p.gift)
         [%drum %phat *]
-      ?-  -.internal-gift
+      ?-  -.gift
           %http-response  !!
-          %poke-ack            ((wrap take-coup-phat):from-drum:h t.t.wire p.internal-gift)
-          %subscription-ack    ((wrap reap-phat):from-drum:h t.t.wire p.internal-gift)
+          %poke-ack            ((wrap take-coup-phat):from-drum:h t.t.wire p.gift)
+          %subscription-ack    ((wrap reap-phat):from-drum:h t.t.wire p.gift)
           %subscription-close  ((wrap quit-phat):from-drum:h t.t.wire)
           %subscription-update
         %+  (wrap diff-sole-effect-phat):from-drum:h  t.t.wire
-        ?>  ?=(%sole-effect p.p.internal-gift)
-        (need !<(sole-effect q.p.internal-gift))
+        ?>  ?=(%sole-effect p.cage.gift)
+        (need !<(sole-effect q.cage.gift))
       ==
     ==
   [cards ..handle-init]
 ::
-++  handle-system-response
+++  handle-arvo-response
   |=  [=wire =sign-arvo]
   =/  h  (help hid)
   =^  cards  lac
diff --git a/pkg/arvo/app/aqua.hoon b/pkg/arvo/app/aqua.hoon
index fadd874b99..fab6634e5d 100644
--- a/pkg/arvo/app/aqua.hoon
+++ b/pkg/arvo/app/aqua.hoon
@@ -367,6 +367,7 @@
           %f  %ford
           %g  %gall
           %j  %jael
+          %m  %mall
         ==
       =/  pax
         /(scot %p our.hid)/home/(scot %da now.hid)/sys/vane/[vane]
diff --git a/pkg/arvo/lib/hood/drum-mall.hoon b/pkg/arvo/lib/hood/drum-mall.hoon
index 3815374a05..14df15430a 100644
--- a/pkg/arvo/lib/hood/drum-mall.hoon
+++ b/pkg/arvo/lib/hood/drum-mall.hoon
@@ -139,7 +139,7 @@
 ::
 ::::
   ::
-|=  {hid/bowl:gall part}                          ::  main drum work
+|=  {hid/bowl:mall part}                          ::  main drum work
 =/  ost  0
 =+  (~(gut by bin) ost *source)
 =*  dev  -
@@ -177,7 +177,7 @@
 ::
 ++  poke-set-boot-apps                                ::
   |=  lit/?
-  ^-  (quip move:agent:mall part)
+  ^-  (quip card:agent:mall part)
   ::  We do not run se-abet:se-view here because that starts the apps,
   ::  and some apps are not ready to start (eg Talk crashes because the
   ::  terminal has width 0).  It appears the first message to drum must
@@ -266,19 +266,14 @@
 ++  se-abet                                           ::  resolve
   ^-  (quip card:agent:mall part)
   =*  pith  +<+.$
-  ?.  se-ably
-    =.  .  se-adit
-    [(flop moz) pith]
   =.  .  se-subze:se-adze:se-adit
   :_  pith(bin (~(put by bin) ost dev))
   %-  flop
   ^-  (list card:agent:mall)
   ?~  biz  moz
   :_  moz
-  =/  =blit:dill  ?~(t.biz i.biz [%mor (flop biz)])
-  [%give %subscription-update `/drum %dill-blit !>(blit)]
-::
-++  se-ably  (~(has by sup.hid) ost)                  ::  caused by console
+  =/  =dill-blit:dill  ?~(t.biz i.biz [%mor (flop biz)])
+  [%give %subscription-update `/drum %dill-blit !>(dill-blit)]
 ::
 ++  se-adit                                           ::  update servers
   ^+  .
@@ -400,7 +395,6 @@
 ++  se-dump                                           ::  print tanks
   |=  tac/(list tank)
   ^+  +>
-  ?.  se-ably  (se-hall tac)
   =/  wol/wall
     (zing (turn (flop tac) |=(a/tank (~(win re a) [0 edg]))))
   |-  ^+  +>.^$
@@ -436,7 +430,7 @@
 ::
 ++  se-blit-sys                                       ::  output to system
   |=  bil/dill-blit:dill  ^+  +>
-  (se-emit %give %subscription-update %dill-blit `/drum !>(bil))
+  (se-emit %give %subscription-update `/drum %dill-blit !>(bil))
 ::
 ++  se-show                                           ::  show buffer, raw
   |=  lin/(pair @ud stub)
@@ -491,7 +485,6 @@
   ?.  ((sane %t) (crip txt))  :: XX upstream validation
     ~&  bad-text+<`*`txt>
     +>
-  ?.  se-ably  (se-hall [%leaf txt]~)
   (se-blit %out (tuba txt))
 ::
 ++  se-poke                                           ::  send a poke
diff --git a/pkg/arvo/lib/hood/helm-mall.hoon b/pkg/arvo/lib/hood/helm-mall.hoon
index 508a9747c1..f85cc6ea65 100644
--- a/pkg/arvo/lib/hood/helm-mall.hoon
+++ b/pkg/arvo/lib/hood/helm-mall.hoon
@@ -33,13 +33,13 @@
 ::                                                      ::  ::
 ::::                                                    ::  ::
   ::                                                    ::  ::
-|:  $:{bowl:gall part}                                  ::  main helm work
+|:  $:{bowl:mall part}                                  ::  main helm work
 =/  ost  0
-=+  sez=(~(gut by hoc) $:session)
+=+  sez=(~(gut by hoc) ost $:session)
 =|  moz=(list card:agent:mall)
 |%
 ++  abet
-  [(flop moz) %_(+<+.$ hoc (~(put by hoc) sez))]
+  [(flop moz) %_(+<+.$ hoc (~(put by hoc) ost sez))]
 ::
 ++  emit
   |=  card:agent:mall
@@ -50,7 +50,7 @@
   (emit %pass /di %arvo %d %flog flog)
 ::
 ++  emil                                              ::  return cards
-  |=  (list (wind internal-note:mall internal-gift:mall))
+  |=  (list card:agent:mall)
   ^+  +>
   ?~(+< +> $(+< t.+<, +> (emit i.+<)))
 ::
@@ -78,7 +78,7 @@
 ::
 ++  poke-nuke                                         ::  initialize
   |=  him/ship  =<  abet
-  (emit %pass /helm %arvo %j %nuke him)
+  (emit %pass /helm %arvo %a %nuke him)
 ::
 ++  poke-mass
   |=  ~  =<  abet
@@ -174,7 +174,7 @@
   |=  hood-reset
   =<  abet
   %-  emil  %-  flop
-  ^-  (list (wind internal-note:mall internal-gift:mall))
+  ^-  (list card:agent:mall)
   =/  top=path  /(scot %p our)/home/(scot %da now)/sys
   =/  hun  .^(@ %cx (welp top /hoon/hoon))
   =/  arv  .^(@ %cx (welp top /arvo/hoon))
@@ -197,7 +197,7 @@
 ::
 ++  take
   |=  [=wire =sign-arvo]
-  ?+  wire  ~|([%helm-bad-take-wire wire] !!)
+  ?+  wire  ~|([%helm-bad-take-wire wire +<.sign-arvo] !!)
     [%automass *]  %+  take-wake-automass  t.wire
                    ?>(?=(%wake +<.sign-arvo) +>.sign-arvo)
     [%serv *]      %+  take-bound  t.wire
diff --git a/pkg/arvo/lib/hood/kiln-mall.hoon b/pkg/arvo/lib/hood/kiln-mall.hoon
index 96440d7593..93716d9296 100644
--- a/pkg/arvo/lib/hood/kiln-mall.hoon
+++ b/pkg/arvo/lib/hood/kiln-mall.hoon
@@ -58,7 +58,7 @@
 ::                                                      ::  ::
 ::::                                                    ::  ::
   ::                                                    ::  ::
-|=  {bowl:gall part}                                    ::  main kiln work
+|=  {bowl:mall part}                                    ::  main kiln work
 ?>  =(src our)
 |_  moz/(list card:agent:mall)
 ++  abet                                                ::  resolve
@@ -69,7 +69,7 @@
   %_(+> moz [+< moz])
 ::
 ++  emil                                              ::  return cards
-  |=  (list (wind internal-note:mall internal-gift:mall))
+  |=  (list card:agent:mall)
   ^+  +>
   ?~(+< +> $(+< t.+<, +> (emit i.+<)))
 ::
@@ -186,7 +186,7 @@
 ++  autoload
   |%
   ++  emit
-    |=  a/(wind internal-note:mall internal-gift:mall)
+    |=  a/card:agent:mall
     +>(..autoload (^emit a))
   ::
   ++  tracked-vanes
@@ -263,17 +263,17 @@
   ::  +poke-overload: wipes ford cache at {start}, and then every {recur}.
   |=  [recur=@dr start=@da]
   ?>  (gte start now)
-  abet:(emit %pass /kiln/overload/(scot %dr recur) %arvo %c [%wait start])
+  abet:(emit %pass /kiln/overload/(scot %dr recur) %arvo %b [%wait start])
 ::
 ++  poke-wipe-ford
-  |=(percent=@ud abet:(emit %pass /kiln %arvo %c [%wipe percent]))
+  |=(percent=@ud abet:(emit %pass /kiln %arvo %f [%wipe percent]))
 ::
 ++  poke-keep-ford
   |=  [compiler-cache-size=@ud build-cache-size=@ud]
   =<  abet
-  (emit %pass /kiln %arvo %c [%keep compiler-cache-size build-cache-size])
+  (emit %pass /kiln %arvo %f [%keep compiler-cache-size build-cache-size])
 ::
-++  poke-wash-gall  |=(* abet:(emit %pass /kiln %arvo %c [%wash ~]))
+++  poke-wash-gall  |=(* abet:(emit %pass /kiln %arvo %m [%wash ~]))
 ::
 ++  mack
   |=  {way/wire saw/(unit tang)}
@@ -296,7 +296,7 @@
       [%autocommit *]   %+  take-wake-autocommit  t.wire
                         ?>(?=(%wake +<.sign-arvo) +>.sign-arvo)
       *
-    ?+  +<.sign-arvo  ~|([%kiln-bad-take-card -.q.vase] !!)
+    ?+  +<.sign-arvo  ~|([%kiln-bad-take-card +<.sign-arvo] !!)
       %mack  %+  mack  wire
              ?>(?=(%mack +<.sign-arvo) +>.sign-arvo)
       %made  %+  take-made  wire
@@ -407,7 +407,7 @@
   =+  (~(gut by syn) [syd her sud] let=*@ud)
   |%
   ++  abet
-    ..auto(syn (~(put by syn) [syd her sud] let ust))
+    ..auto(syn (~(put by syn) [syd her sud] let))
   ::
   ++  blab
     |=  new/(list card:agent:mall)
@@ -415,14 +415,14 @@
     +>.$(moz (welp new moz))
   ::
   ++  warp
-    |=  [=bone =wire =ship =riff]
-    (blab [bone %pass wire %arvo %c [%warp ship riff]] ~)
+    |=  [=wire =ship =riff]
+    (blab [%pass wire %arvo %c [%warp ship riff]] ~)
   ::
   ++  spam  |*(* %_(+> ..auto (^spam +<)))
   ++  stop
     =>  (spam (render "ended autosync" sud her syd) ~)
     =/  =wire  /kiln/sync/[syd]/(scot %p her)/[sud]
-    (warp ust wire her sud ~)
+    (warp wire her sud ~)
   ::  XX duplicate of start-sync? see |track
   ::
   ++  start-track
diff --git a/pkg/arvo/lib/hood/write-mall.hoon b/pkg/arvo/lib/hood/write-mall.hoon
index 5a4e82bb46..c61337a93a 100644
--- a/pkg/arvo/lib/hood/write-mall.hoon
+++ b/pkg/arvo/lib/hood/write-mall.hoon
@@ -19,7 +19,7 @@
 ::
 ::::
   ::
-|=  {bowl:gall part}
+|=  {bowl:mall part}
 =*  par  +<+
 |_  moz/(list card:agent:mall)
 ++  abet  [(flop moz) `part`par]
diff --git a/pkg/arvo/sys/vane/ames.hoon b/pkg/arvo/sys/vane/ames.hoon
index c382fb0518..293949a866 100644
--- a/pkg/arvo/sys/vane/ames.hoon
+++ b/pkg/arvo/sys/vane/ames.hoon
@@ -43,10 +43,10 @@
               ==                                        ::
           gift:able:jael                                ::
       ==                                                ::
-      $:  %g                                            ::    from %gall
+      $:  %m                                            ::    from %gall
           $%  [%mean p=ares]                            ::  XX obsolete
               [%nice ~]                                 ::  XX obsolete
-              $>(%unto gift:able:gall)                  ::  application ack
+              $>(%unto gift:able:mall)                  ::  application ack
       ==  ==                                            ::
       $:  @tas                                          ::    from any
           $%  $>(%crud vane-task)                       ::  XX strange
@@ -1369,7 +1369,7 @@
         %milk
       ::  ~&  [%milk p.bon q.bon]
       ?>  ?=([@ @ *] q.q.bon)
-      ?>  ?=(?(%a %c %e %g %j) i.q.q.bon)
+      ?>  ?=(?(%a %c %e %m %j) i.q.q.bon)
       =/  =wire  [(scot %p our) (scot %p p.bon) q.q.bon]
       :_  fox  [hen %pass wire i.q.q.bon %west p.bon t.q.q.bon r.bon]~
     ::
@@ -1436,8 +1436,8 @@
     ?-  +<.sih
         %crud  [[[hen [%slip %d %flog +.sih]] ~] +>]
     ::
-        %mack  ?~  +>.sih  $(sih [%g %nice ~])          ::  XX using old code
-               $(sih [%g %mean `[%mack +>+.sih]])
+        %mack  ?~  +>.sih  $(sih [%m %nice ~])          ::  XX using old code
+               $(sih [%m %mean `[%mack +>+.sih]])
     ::
         %public-keys
       ?.  ?=([%pubs @ ~] tea)
diff --git a/pkg/arvo/sys/vane/dill.hoon b/pkg/arvo/sys/vane/dill.hoon
index 772804eb83..50dcdda20b 100644
--- a/pkg/arvo/sys/vane/dill.hoon
+++ b/pkg/arvo/sys/vane/dill.hoon
@@ -357,7 +357,7 @@
       ++  peer
         %_    .
             moz
-          :_(moz [hen %pass ~ %m %deal [our our] ram %peer /drum])
+          :_(moz [hen %pass ~ %m %deal [our our] ram %subscribe /drum])
         ==
       ::
       ++  show                                          ::  permit reads on desk
@@ -422,13 +422,13 @@
             {$m $unto *}
           ::  ~&  [%take-gall-unto +>.sih]
           ?-  -.+>.sih
-            $coup  ?~(p.p.+>.sih +>.$ (crud %coup u.p.p.+>.sih))
-            $quit  peer
-            $reap  ?~  p.p.+>.sih
-                     +>.$
-                   (dump:(crud %reap u.p.p.+>.sih) %logo ~)
-            $diff  pump:(from ;;(dill-blit q:`vase`+>+>.sih))
-            $http-response  !!
+            $poke-ack             ?~(p.p.+>.sih +>.$ (crud %coup u.p.p.+>.sih))
+            $subscription-close   peer
+            $subscription-ack     ?~  p.p.+>.sih
+                                    +>.$
+                                  (dump:(crud %reap u.p.p.+>.sih) %logo ~)
+            $subscription-update  pump:(from ;;(dill-blit q:`vase`+>+>+.sih))
+            $http-response        !!
           ==
         ::
             {$c $note *}
diff --git a/pkg/arvo/sys/vane/jael.hoon b/pkg/arvo/sys/vane/jael.hoon
index ce14c5a178..eef76e3cea 100644
--- a/pkg/arvo/sys/vane/jael.hoon
+++ b/pkg/arvo/sys/vane/jael.hoon
@@ -75,8 +75,8 @@
   $%  $:  %a                                            ::    to %ames
           $>(%want task:able:ames)                      ::  send message
       ==                                                ::
-      $:  %g                                            ::    to self
-          $>(%deal task:able:gall)                              ::  set ethereum source
+      $:  %m                                            ::    to self
+          $>(%deal task:able:mall)                              ::  set ethereum source
       ==                                                ::
       $:  %j                                            ::    to self
           $>(%listen task)                              ::  set ethereum source
@@ -90,11 +90,11 @@
 +$  sign                                                ::  in result $<-
   $~  [%a %woot *ship ~]                                ::
   $%  [%a $>(%woot gift:able:ames)]                     ::  message result
-      $:  %g                                            ::
+      $:  %m                                            ::
           $>  $?  %onto                                 ::
                   %unto                                 ::
               ==                                        ::
-          gift:able:gall                                ::
+          gift:able:mall                                ::
       ==
   ==                                                    ::
 --  ::
@@ -186,7 +186,7 @@
     :*  hen
         %pass
         /[app]/poke
-        %g
+        %m
         %deal
         [our our]
         app
@@ -318,7 +318,7 @@
         %+  weld  moz
         ::  order is crucial!
         ::
-        ::    %dill must init after %gall
+        ::    %dill must init after %mall
         ::    the %give init (for unix) must be after %dill init
         ::    %jael init must be deferred (makes http requests)
         ::
@@ -522,30 +522,31 @@
       ::TODO  fail:et
       +>.$
     ::
-        [%g %onto *]
+        [%m %onto *]
       ~&  [%jael-onto tea hin]
       +>.$
     ::
-        [%g %unto *]
+        [%m %unto *]
       ?-  +>-.hin
-          $quit           ~|([%jael-unexpected-quit tea hin] !!)
-          $http-response  ~|([%jael-unexpected-http-response tea hin] !!)
-          $coup
+          $subscription-close  ~|([%jael-unexpected-quit tea hin] !!)
+          $http-response       ~|([%jael-unexpected-http-response tea hin] !!)
+          $poke-ack
         ?~  p.p.+>.hin
           +>.$
         %-  (slog leaf+"jael-bad-coup" u.p.p.+>.hin)
         +>.$
       ::
-          $reap
+          $subscription-ack
         ?~  p.p.+>.hin
           +>.$
         %-  (slog u.p.p.+>.hin)
         ~|([%jael-unexpected-reap tea hin] +>.$)
       ::
-          $diff
+          $subscription-update
         ?>  ?=([@ *] tea)
         =*  app  i.tea
-        =/  =peer-sign  ;;(peer-sign q.q.p.p.+>.hin)
+        ~!  +>.hin
+        =/  =peer-sign  ;;(peer-sign q.q.cage.p.+>.hin)
         %.  [hen tea app]
         =<  pump
         %-  curd  =<  abet
@@ -562,7 +563,7 @@
   ::                                                    ::  ++wind:of
   ++  pump
     |=  [hen=duct =wire app=term]
-    (emit [hen %pass wire %g %deal [our our] app %pump ~])
+    (emit [hen %pass wire %m %deal [our our] app %pump ~])
   --
 ::                                                      ::  ++su
 ::::                    ## relative^heavy               ::  subjective engine
@@ -610,11 +611,11 @@
     :*  hen
         %pass
         [app path]
-        %g
+        %m
         %deal
         [our our]
         app
-        %peer
+        %subscribe
         path
     ==
   ::
diff --git a/pkg/arvo/sys/vane/mall.hoon b/pkg/arvo/sys/vane/mall.hoon
index d6d3e019ac..54d4fff4d3 100644
--- a/pkg/arvo/sys/vane/mall.hoon
+++ b/pkg/arvo/sys/vane/mall.hoon
@@ -356,7 +356,7 @@
       /sys/way/[action]
     ::
     =/  =note-arvo
-      =/  =path  /g/ge/[term]
+      =/  =path  /m/ge/[term]
       =/  =noun  [bone forward-ames]
       [%a %want ship path noun]
     ::
@@ -982,7 +982,7 @@
         =/  =cage  cage.gift
         %+  turn  ducts
         |=  =duct
-        ~?  =(duct system-duct.agents.state)
+        ~?  &(=(duct system-duct.agents.state) !=(agent-name %hood))
           [%agent-giving-on-system-duct agent-name -.gift]
         ^-  move
         =/  =mark
@@ -1033,7 +1033,7 @@
       %+  murn  ~(tap by incoming.subscribers.current-agent)
       |=  [=duct =ship =path]
       ^-  (unit ^duct)
-      ?:  =(target-path path)
+      ?:  =(u.target-path path)
         `duct
       ~
     ::  +ap-apply: apply effect.
diff --git a/pkg/arvo/sys/zuse.hoon b/pkg/arvo/sys/zuse.hoon
index efbb39d9c7..5f1c1a9aa0 100644
--- a/pkg/arvo/sys/zuse.hoon
+++ b/pkg/arvo/sys/zuse.hoon
@@ -2437,7 +2437,6 @@
       gift:able:dill
       gift:able:eyre
       gift:able:ford
-      gift:able:gall
       gift:able:mall
       gift:able:iris
       gift:able:jael
@@ -2449,7 +2448,7 @@
       task:able:dill
       task:able:iris
       task:able:ford
-      task:able:gall
+      task:able:mall
       task:able:eyre
       task:able:jael
   ==
@@ -2461,7 +2460,6 @@
       {$d task:able:dill}
       [%e task:able:eyre]
       {$f task:able:ford}
-      {$g task:able:gall}
       {$m task:able:mall}
       [%i task:able:iris]
       {$j task:able:jael}
@@ -2479,7 +2477,6 @@
       {$d gift:able:dill}
       {$f gift:able:ford}
       [%e gift:able:eyre]
-      {$g gift:able:gall}
       {$m gift:able:mall}
       [%i gift:able:iris]
       {$j gift:able:jael}