Adjust vanes for research changes.

app/hall.hoon

@@ -140,7 +140,7 @@
           peers     (~(run by peers.a) |=(a/(list query) (turn a query-0)))
         ==
       ++  query-0
-        $?  $:  $circle
+        $%  $:  $circle
                 nom/name
                 wer/(unit circle)
                 wat/(set circle-data)
@@ -2545,8 +2545,7 @@
             ~(so-in-range so:ta nom.qer ~ soy)
         ==
       ~
-    =+  out=?($gram $new $config $status $remove)
+    ?.  ?=(?($gram $new $config $status $remove) -.det.det)   ~
-    ?.  ?=(out -.det.det)   ~
     :+  ~  %circle
     ?+  det.det  det.det
         {$gram *}

sys/hoon.hoon

@@ -12776,7 +12776,7 @@
                   ['+' (rune lus %cnls expc)]
                   ['-' (rune hep %cnhp expb)]
                   [':' (rune col %cncl expi)]
-                  ['~' (rune sig %cnsg expu)]
+                  ['~' (rune sig %cnsg expn)]
                   ['*' (rune tar %cntr expm)]
                   ['=' (rune tis %cnts exph)]
               ==
@@ -13115,12 +13115,16 @@
     ++  expk  |.(;~(gunk loaf ;~(plug loaf (easy ~))))  ::  list of two hoons
     ++  expl  |.(;~(gunk (stag ~ sym) loaf loaf))       ::  term, two hoons
     ++  expm  |.((butt ;~(gunk rope loaf rick)))        ::  several [spec hoon]s
+    ++  expn  |.  ;~  gunk  rope  loaf                  ::  wing, hoon,
+                    ;~(plug loaf (easy ~))              ::  list of one hoon
+                  ==                                    ::
     ++  expo  |.(;~(gunk wise loaf loaf))               ::  =;
     ++  expp  |.(;~(gunk (butt rick) loaf))             ::  [wing hoon]s, hoon
     ++  expq  |.(;~(gunk rope loaf loaf))               ::  wing and two hoons
     ++  expr  |.(;~(gunk loaf wisp))                    ::  hoon and core tail
     ++  exps  |.((butt hank))                           ::  closed gapped hoons
     ++  expt  |.(;~(gunk wise rope loaf loaf))          ::  =^
+    ++  expu  |.(;~(gunk rope loaf (butt hank)))        ::  wing, hoon, hoons
     ++  expv  |.((butt rick))                           ::  just changes
     ++  expw  |.(;~(gunk rope loaf loaf loaf))          ::  wing and three hoons
     ++  expx  |.  ;~  gunk  loaf                        ::  hoon and core tail

sys/vane/clay.hoon

@@ -13,6 +13,7 @@
 =,  clay
 =>  |%
 ++  aeon  @ud                                           ::  version number
+++  axle  $%([%0 ruf=raft])
 ::
 ::  Recursive structure of a desk's data.
 ::
@@ -608,6 +609,13 @@
         %f  %exec  our  ~  [her syd q.mun]  (lobe-to-silk:ze r.mun p.dat)
     ==
   ::
+  ++  blas
+    |=  {hen/duct das/(set mood)}
+    ^+  +>
+    ?>  ?=(^ das)
+    =-  (emit hen %give %wris q.n.das -)
+    (~(run in `(set mood)`das) |=(m/mood [p.m r.m]))
+  ::
   ::  Give next step in a subscription.
   ::
   ++  bleb
@@ -642,6 +650,7 @@
   ::
   ++  blub-all  (duct-lift |=({a/duct ~} (blub a)))    ::  lifted ++blub
   ++  blab-all  (duct-lift blab)                        ::  lifted ++blab
+  ++  blas-all  (duct-lift blas)                        ::  lifted ++blas
   ++  balk-all  (duct-lift balk)                        ::  lifted ++balk
   ++  bleb-all  (duct-lift bleb)                        ::  lifted ++bleb
   ::
@@ -820,7 +829,7 @@
           $rw   (~(uni in who:(fall red.rit *rule)) who:(fall wit.rit *rule))
         ==
       |=  {w/whom s/(set @ta)}
-      ?:  |(?=($& -.w) (~(has by cez) p.w))  s
+      ?:  |(?=(%& -.w) (~(has by cez) p.w))  s
       (~(put in s) p.w)
     ?^  mis
       =-  (emit hen %give %mack `[%leaf "No such group(s): {-}"]~)
@@ -893,7 +902,6 @@
     |=  {for/(unit ship) rav/rave}
     ^+  +>
     ?-    -.rav
-        $mult  !!
         $sing
       =+  ver=(aver for p.rav)
       ?~  ver
@@ -1798,6 +1806,9 @@
           `p.q.p.rov
         ::
             $next  ~
+        ::
+            $mult  ~
+        ::
             $many
           %^  hunt  lth
             ?.  ?=($da -.p.q.rov)  ~
@@ -1814,6 +1825,7 @@
     ?-  -.rov
       $sing  rov
       $next  [- p]:rov
+      $mult  [- p]:rov
       $many  [- p q]:rov
     ==
   ::
@@ -1876,7 +1888,7 @@
       =*  new  s.rov
       ::  we will either respond, or store the maybe updated request.
       =;  res/(each (map mood (each cage lobe)) rove)
-          ?:  ?=($& -.res)
+          ?:  ?=(%& -.res)
             (respond p.res)
           (store p.res)
       |-  ::  so that we can retry for the next aeon if possible/needed.
@@ -2451,7 +2463,7 @@
       %-  ~(rep in who.rul)
       |=  {w/whom h/_|}
       ?:  h  &
-      ?:  ?=($& -.w)  =(p.w who)
+      ?:  ?=(%& -.w)  =(p.w who)
       (~(has in (fall (~(get by cez) p.w) ~)) who)
     ::
     ::  Checks for existence of a node at an aeon.
@@ -3864,7 +3876,7 @@
     %-  ~(rep in (fall fur ~))
     |=  {m/monk s/(unit ship)}
     ?^  s  s
-    ?:  ?=($| -.m)  ~
+    ?:  ?=(%| -.m)  ~
     ?:  =(p.m his)  ~
     `p.m
   =+  den=((de now [/scryduct ~] ruf) [. .]:his syd)
@@ -3914,9 +3926,6 @@
   ::
       $crud
     [[[hen %slip %d %flog +.q.hin] ~] ..^$]
-  ::
-      $news
-    [~ ..^$]
   ::
       $made
     ?~  tea  !!

sys/vane/dill.hoon

@@ -45,11 +45,8 @@
 ++  note-clay                                           ::
   $%  {$merg p/@p q/@tas r/@p s/@tas t/case u/germ:clay}::  merge desks
       {$warp p/sock q/riff:clay}                        ::  wait for clay hack
-<<<<<<< HEAD
       {$wegh $~}                                        ::
-=======
       {$perm p/ship q/desk r/path s/rite:clay}          ::  change permissions
->>>>>>> master
   ==                                                    ::
 ++  note-dill                                           ::  note to self, odd
   $%  {$crud p/@tas q/(list tank)}                      ::
@@ -94,11 +91,8 @@
   $%  {$mere p/(each (set path) (pair term tang))}      ::
       {$note p/@tD q/tank}                              ::
       {$writ p/riot:clay}                               ::
-<<<<<<< HEAD
       {$mass p/mass}                                    ::
-=======
       {$mack p/(unit tang)}                             ::
->>>>>>> master
   ==                                                    ::
 ++  sign-dill                                           ::
   $%  {$blit p/(list blit)}                             ::

sys/vane/ford.hoon

@@ -32,9 +32,9 @@
           ==  ==  ==                                    ::
 --                                                      ::
 |%                                                      ::  structures
-++  axle                                                ::  all %ford state
++=  axle                                                ::  all %ford state
-  $:  $0                                                ::  version for update
+  $:  %3                                                ::  version for update
-      pol/(map ship baby)                               ::
+      pol=(map ship baby)                               ::
   ==                                                    ::
 +=  baby                                                ::  state by ship
   $:  tad=[p=@ud q=(map @ud task)]                      ::  tasks by number
@@ -1948,9 +1948,9 @@
           |=  {cof/cafe dir/knot}
           =+  nod=(chap(s.how [dir s.how]) cof bax hon)
           ?:  ?=($2 -.q.nod)
-            (flue p.nod)
+            (new:bo cof ~)
-          (cope nod (flux some))
+          (tug:bo nod (with:bo some))
-        %-  flux
+        %-  with:bo
         |=  doy/(map @ cage)  ^-  vase
         ?~  doy  [[%atom %n `0] 0]
         %+  slop
@@ -2291,7 +2291,7 @@
       ?~(buy *baby u.buy)
   =^  mos  bay
     ?-    -.kis
-        $wipe  ~&(ford-cache-wiped/at=now [~ bay(jav ~)])
+        $wipe  ~&(%ford-cache-wiped [~ bay(jav ~)])
         $wasp
       (~(wasp za [our hen [now eny ski] ~] bay) q.kis)
         $exec