various: make all files build correctly

pkg/arvo/gen/hood/norm.hoon

@@ -8,5 +8,6 @@
     da+now
   =+  .^([=@ud @da] %cs /(scot %p ship)/[desk]/1/late)
   ud+ud
-=+  .^(=dome:clay %cv /(scot %p ship)/[desk]/(scot case))
-[%c %tomb %norm ship desk (~(put of nor.dome) path keep)]
+=+  .^(=cone:clay %cx /(scot %p p.bec)//(scot %da now)/domes)
+=/  =norm:clay  nor:(~(got by cone) [ship desk])
+[%c %tomb %norm ship desk (~(put of norm) path keep)]

pkg/arvo/gen/hood/tomb.hoon

@@ -3,55 +3,57 @@
 ::  TODO: recognize when it's going to fail because it's in the head of
 ::        a desk, and maybe offer to |rm
 ::
+=,  clay
 :-  %say
 |=  [[now=@da eny=@uvJ bec=beak] [target=path ~] dry=_|]
 :-  %helm-pans
 =+  .^(=arch %cy target)
 ?~  fil.arch
   [%d %flog %text "tomb: not a file"]~  ::  should recurse
-=/  =lobe:clay  u.fil.arch
-=+  .^(=rang:clay %cx /(scot %p p.bec)//(scot %da now)/rang)
-=+  .^(=cone:clay %cx /(scot %p p.bec)//(scot %da now)/domes)
-=/  domes=(list [[=ship =desk] =dome:clay])  ~(tap by cone)
+=/  =lobe  u.fil.arch
+=+  .^(=rang %cx /(scot %p p.bec)//(scot %da now)/rang)
+=+  .^(=cone %cx /(scot %p p.bec)//(scot %da now)/domes)
+=/  domes=(list [[=ship =desk] =dome tom=(map tako norm) nor=norm])
+  ~(tap by cone)
 =/  norms
   |^
-  |-  ^-  (set [ship desk tako:clay norm:clay path])
+  |-  ^-  (set [ship desk tako norm path])
   ?~  domes
     ~
   =/  n  1
-  =/  =aeon:clay  1
+  =/  =aeon  1
   %-  ~(uni in $(domes t.domes))
-  |-  ^-  (set [ship desk tako:clay norm:clay path])
+  |-  ^-  (set [ship desk tako norm path])
   ?:  (lth let.dome.i.domes aeon)
     ~
-  =/  =tako:clay  (~(got by hit.dome.i.domes) aeon)
-  =/  paths  (draw-tako ship.i.domes desk.i.domes dome.i.domes tako)
+  =/  =tako  (~(got by hit.dome.i.domes) aeon)
+  =/  paths  (draw-tako ship.i.domes desk.i.domes +.i.domes tako)
   (~(uni in paths) $(aeon +(aeon)))
   ::
   ++  draw-tako
-    |=  [=ship =desk =dome:clay =tako:clay]
-    ^-  (set [^ship ^desk tako:clay norm:clay path])
+    |=  [=ship =desk [dome tom=(map tako norm) nor=norm] =tako]
+    ^-  (set [^ship ^desk ^tako norm path])
     ~+
-    =/  =yaki:clay  (~(got by hut.rang) tako)
+    =/  =yaki  (~(got by hut.rang) tako)
     =/  takos
-      |-  ^-  (set [^ship ^desk tako:clay norm:clay path])
+      |-  ^-  (set [^ship ^desk ^tako norm path])
       ?~  p.yaki
         ~
       (~(uni in $(p.yaki t.p.yaki)) ^$(tako i.p.yaki))
-    |-  ^-  (set [^ship ^desk tako:clay norm:clay path])
+    |-  ^-  (set [^ship ^desk ^tako norm path])
     ?~  q.yaki
       takos
     %-  ~(uni in $(q.yaki l.q.yaki))
     %-  ~(uni in $(q.yaki r.q.yaki))
-    ^-  (set [^ship ^desk tako:clay norm:clay path])
+    ^-  (set [^ship ^desk ^tako norm path])
     ?.  =(lobe q.n.q.yaki)
       ~
-    [[ship desk tako (~(gut by tom.dome) tako nor.dome) p.n.q.yaki] ~ ~]
+    [[ship desk tako (~(gut by tom) tako nor) p.n.q.yaki] ~ ~]
   --
 ^-  (list note-arvo)
 %+  welp
   %+  murn  ~(tap in norms)
-  |=  [=ship =desk =tako:clay =norm:clay =path]
+  |=  [=ship =desk =tako =norm =path]
   ?:  ?=([~ %|] (~(fit of norm) path))
     ~
   %-  (slog leaf+"tomb: {<ship desk path `@uv`tako norm path>}" ~)

pkg/arvo/lib/desk-jam.hoon

@@ -3,11 +3,12 @@
 ++  jam-desk
   |=  [our=ship =desk now=@da]
   ~>  %slog.0^leaf/"jamming desk {<desk>}"
+  =+  .^(=rang:clay %cx /(scot %p our)//(scot %da now))
+  =+  .^(=tako:clay %cs /(scot %p our)/[desk]/(scot %da now))
   %-  jam
   %-  ?:(=(%base desk) remove-misc-dirs same)
-  %-  ankh-to-map
-  =<  ank
-  .^(dome:clay %cv /(scot %p our)/[desk]/(scot %da now))
+  %-  ~(run by q:(~(got by hut.rang) tako))
+  ~(got by lat.rang)
 ::
 ++  remove-misc-dirs
   |=  fiz=(map path page)
@@ -18,15 +19,4 @@
   ?|  ?=([%tmp *] p)
       ?=([%tests *] p)
   ==
-::
-++  ankh-to-map
-  =|  res=(map path page)
-  =|  pax=path
-  |=  a=ankh
-  ^-  (map path page)
-  =?  res  ?=(^ fil.a)  (~(put by res) pax [p q.q]:q.u.fil.a)
-  =/  dir=(list [seg=@ta =ankh])  ~(tap by dir.a)
-  |-  ^+  res
-  ?~  dir  res
-  $(dir t.dir, res ^$(pax (snoc pax seg.i.dir), a ankh.i.dir))
 --

pkg/arvo/sys/lull.hoon

@@ -813,7 +813,9 @@
         [%worn =ship =desk =tako =norm]                 ::  set commit norm
         [%seek =ship =desk =cash]                       ::  fetch source blobs
     ==                                                  ::
-  +$  cone  (map [ship desk] dome)                      ::  domes
+  +$  cone                                              ::  domes
+    %+  map  [ship desk]                                ::
+    [dome tom=(map tako norm) nor=norm]                 ::
   +$  crew  (set ship)                                  ::  permissions group
   +$  dict  [src=path rul=real]                         ::  effective permission
   +$  dome                                              ::  project state

pkg/arvo/sys/vane/clay.hoon

@@ -4935,19 +4935,19 @@
         %-  ~(gas by *cone)
         %+  turn  ~(tap by dos.rom.ruf)
         |=  [=desk =dojo]
-        [[our desk] [let hit lab]:dom.dojo]
+        [[our desk] [[let hit lab] tom nor]:dom.dojo]
       =.  domes
         %-  ~(uni by domes)
         %-  ~(gas by *cone)
-        ^-  (list [[ship desk] dome:clay])
+        ^-  (list [[ship desk] dome:clay (map tako norm) norm])
         %-  zing
-        ^-  (list (list [[ship desk] dome:clay]))
+        ^-  (list (list [[ship desk] dome:clay (map tako norm) norm]))
         %+  turn  ~(tap by hoy.ruf)
         |=  [=ship =rung]
-        ^-  (list [[^ship desk] dome:clay])
+        ^-  (list [[^ship desk] dome:clay (map tako norm) norm])
         %+  turn  ~(tap by rus.rung)
         |=  [=desk =rede]
-        [[ship desk] [let hit lab]:dom.rede]
+        [[ship desk] [[let hit lab] tom nor]:dom.rede]
       ``[%domes !>(`cone`domes)]
     ==
   ::

pkg/arvo/ted/aqua/ames.hoon

@@ -70,5 +70,5 @@
     ==
   [cards this]
 ::
-++  handle-arvo-response  _!!
+++  handle-arvo-response  |=(* !!)
 --

pkg/arvo/ted/aqua/dill.hoon

@@ -43,5 +43,5 @@
     ==
   [cards this]
 ::
-++  handle-arvo-response  _!!
+++  handle-arvo-response  |=(* !!)
 --