urbit · pkova · May 7, 2025 · Aug 28, 2024 · Sep 5, 2024 · Sep 5, 2024
diff --git a/bin/brass.pill b/bin/brass.pill
diff --git a/pkg/arvo/app/aqua.hoon b/pkg/arvo/app/aqua.hoon
@@ -2,10 +2,10 @@
 ::
 ::  usage:
 ::  |start %aqua
-::  /-  aquarium
-::  :aqua &pill .^(pill:aquarium %cx %/urbit/pill)
+::  /+  pill
+::  :aqua &pill .^(pill:pill %cx %/urbit/pill)
 ::    OR
-::  :aqua &pill +solid
+::  :aqua &pill +pill/solid
 ::
 ::  XX: update these examples
 ::  Then try stuff:
@@ -18,28 +18,34 @@
 ::  :aqua [%file ~[~bud ~dev] %/sys/vane]
 ::  :aqua [%pause-events ~[~bud ~dev]]
 ::
-::  We get ++unix-event and ++pill from /-aquarium
+::  We get ++unix-event from /-aquarium
 ::
 /-  aquarium
 /+  pill, azimuth, naive, default-agent, aqua-azimuth, dbug, verb
-=,  pill-lib=pill
 =,  aquarium
 =>  $~  |%
     +$  versioned-state
       $%  state-0
       ==
     +$  state-0
       $:  %0
-          pil=$>(%pill pill)
+          pil=$>(%pill pill-0)
           assembled=*
           tym=@da
           fresh-piers=(map [=ship fake=?] [=pier boths=(list unix-both)])
           fleet-snaps=(map term fleet)
           piers=fleet
       ==
-    ::  XX temporarily shadowed, fix and remove
     ::
-    +$  pill  pill:pill-lib
+    +$  pill-0
+      $%  [%ivory p=(list)]
+          $:  %pill
+              nam=term
+              boot-ova=(list)
+              kernel-ova=(list unix-event:pill)
+              userspace-ova=(list unix-event:pill)
+          ==
+      ==
     ::
     +$  fleet  [ships=(map ship pier) azi=az-state]
     +$  pier
@@ -85,7 +91,7 @@
     =^  cards  state
       ?+  mark  ~|([%aqua-bad-mark mark] !!)
           %aqua-events     (poke-aqua-events:ac !<((list aqua-event) vase))
-          %pill            (poke-pill:ac !<(pill vase))
+          %pill            (poke-pill:ac !<(pill:pill vase))
           %noun            (poke-noun:ac !<(* vase))
           %azimuth-action  (poke-azimuth-action:ac !<(azimuth-action vase))
       ==
@@ -408,16 +414,19 @@
 ::  events.
 ::
 ++  poke-pill
-  |=  p=pill
+  |=  p=pill:pill
   ^-  (quip card:agent:gall _state)
-  ?<  ?=(%ivory -.p)
+  =?  p  ?=(%cash -.p)
+    ^-  $>(%pill pill:pill)
+    [%pill +<.p]
+  ?>  ?=(%pill -.p)
   =.  userspace-ova.p
     ::  if there is an azimuth-snapshot in the pill, we stub it out,
     ::  since it would interfere with aqua's azimuth simulation.
     ::
     ^+  userspace-ova.p
     %+  turn  userspace-ova.p
-    |=  e=unix-event:pill-lib
+    |=  e=unix-event:pill
     ^+  e
     ?.  ?=(%park -.q.e)   e
     ?.  ?=(%& -.yok.q.e)  e
@@ -498,8 +507,8 @@
     =.  userspace-ova.pil
       ::  take all files from a userspace desk
       :_  ~
-      %-  unix-event:pill-lib
-      %-  file-ovum:pill-lib
+      %-  unix-event:pill
+      %-  file-ovum:pill
       [desk /(scot %p our.hid)/[desk]/(scot %da now.hid) ~]
     =^  ms  state  (poke-pill pil)
     (emit-cards ms)

diff --git a/pkg/arvo/gen/pill/brass.hoon b/pkg/arvo/gen/pill/brass.hoon
@@ -24,7 +24,9 @@
             rest=(list desk)
         ==
       ::
+        cache=_&
         prime=_|
+        wynn=_|
         exc=(list spur)
     ==
 :-  %pill
@@ -46,4 +48,4 @@
   |=  =desk
   [desk /(scot %p p.bec)/[desk]/(scot %da now)]
 ::
-(brass:pill sys dez prime exc)
+(brass:pill sys dez cache prime wynn exc)
diff --git a/pkg/arvo/sys.kelvin b/pkg/arvo/sys.kelvin
@@ -1 +1 @@
-[%zuse 410]
+[%zuse 409]
diff --git a/pkg/arvo/sys/arvo.hoon b/pkg/arvo/sys/arvo.hoon
@@ -3,7 +3,7 @@
 |%
 +|  %global
 ::
-++  arvo  %236
+++  arvo  %235
 ::
 ::  $arch: node identity
 ::  $axal: fundamental node, recursive (trie)
@@ -208,9 +208,9 @@
   ==
 +$  heir
   $%  $:  %grub
-          $%  [?(%240 %239 %238 %237 %236) =grub]
+          $%  [?(%240 %239 %238 %237 %236 %235) =grub]
       ==  ==
-      [?(%240 %239 %238 %237 %236) =debt =soul]
+      [?(%240 %239 %238 %237 %236 %235) =debt =soul]
   ==
 +$  plan  (pair germ (list move))
 +$  soul
@@ -779,6 +779,8 @@
       ~>  %slog.[0 leaf+"1-c (compiling compiler, wait a few minutes)"]
       =/  compiler-tool
         ~>  %bout
+        =>  [compiler-gate=compiler-gate log=hoon=hoon.log]
+        ~>  %memo./boot/brass
         .*([compiler-gate noun/hoon.log] [%9 2 %10 [6 %0 3] %0 2])
       ::
       ::  switch to the second-generation compiler.  we want to be
@@ -805,6 +807,8 @@
       ~>  %slog.[0 leaf+"1-f"]
       =/  kernel-tool
         ~>  %bout
+        =>  [compiler-gate=compiler-gate kernel-span=kernel-span log=arvo=arvo.log]
+        ~>  %memo./boot/brass
         .*([compiler-gate kernel-span arvo.log] [%9 2 %10 [6 %0 3] %0 2])
       ::
       ::  create the arvo kernel, whose subject is the kernel core.
@@ -1768,7 +1772,7 @@
   ::
   =.  sol
     ?-  -.hir
-      ?(%240 %239 %238 %237 %236)  soul.hir
+      ?(%240 %239 %238 %237 %236 %235)  soul.hir
     ==
   ::  clear compiler caches
   ::
@@ -1886,7 +1890,13 @@
             ~>  %slog.[0 leaf/"{cap}: {(scow uv+(mug txt))}"]
             %-  road  |.
             ~_  leaf/"{cap}: build failed"
-            (swat sub (rain pax txt))
+            =>  [tap=sub pax=pax txt=txt ..rain]
+            ~>  %memo./boot/brass
+            =/  gen  (rain pax txt)
+            ^-  (trap vase)
+            =/  gun  (~(mint ut p:$:tap) %noun gen)
+            |.  ~+
+            [p.gun .*(q:$:tap q.gun)]
           --
       ::
       |=  [grub fil=(list (pair path (cask)))]
@@ -1907,10 +1917,10 @@
       ::
       =^  job=oped:part  taf  (~(adorn adapt:part taf) del |)
       =?  lul  ?=(^ lul.job)
-       `(smit "lull" |.(pit) /sys/lull/hoon u.lul.job)
+        `(smit "lull" =>(pit=pit |.(pit)) /sys/lull/hoon u.lul.job)
       =?  zus  ?=(^ zus.job)
         ?.  ?=(^ lul)
-         ~|(%larval-need-lull !!)
+          ~|(%larval-need-lull !!)
         `(smit "zuse" u.lul /sys/zuse/hoon u.zus.job)
       =?  van  !=(~ van.job)    ::  XX TMI
         ?.  ?=(^ zus)

diff --git a/pkg/arvo/sys/hoon.hoon b/pkg/arvo/sys/hoon.hoon
@@ -2,11 +2,11 @@
 ::::    /sys/hoon                                       ::
   ::                                                    ::
 =<  ride
-=>  %137  =>
+=>  %136  =>
 ::                                                      ::
 ::::    0: version stub                                 ::
   ::                                                    ::
-~%  %k.137  ~  ~                                        ::
+~%  %k.136  ~  ~                                        ::
 |%
 ++  hoon-version  +
 --  =>
@@ -6013,14 +6013,14 @@
 ++  mack
   |=  [sub=* fol=*]
   ^-  (unit)
-  =/  ton  (mink [sub fol] |~(^ ~))
+  =/  ton  (mink [sub fol] ~)
   ?.(?=(%0 -.ton) ~ `product.ton)
 ::  +mink: raw virtual nock
 ::
 ++  mink  !.
   ~/  %mink
   |=  $:  [subject=* formula=*]
-          scry=$-(^ (unit (unit)))
+          scry=$@(~ $-(^ (unit (unit))))
       ==
   =|  trace=(list [@ta *])
   |^  ^-  tone
@@ -6139,7 +6139,9 @@
         ?.  ?=(%0 -.ref)  ref
         =/  path  $(formula path.formula)
         ?.  ?=(%0 -.path)  path
-        =/  result  (scry product.ref product.path)
+        =/  result
+          ?~  scry  ~
+          (scry product.ref product.path)
         ?~  result
           [%1 product.path]
         ?~  u.result
@@ -11452,6 +11454,14 @@
   =+  gun=(~(mint ut p.vax) %noun gen)
   [p.gun .*(q.vax q.gun)]
 ::
+++  slub
+  |=  [vax=vase gen=hoon]  ^-  vase                     ::  memoized slap
+  =/  gun
+    =>  [vax=p=p.vax gen=gen ut=ut]
+    ~>  %memo./hoon/mint
+    (~(mint ut p.vax) %noun gen)
+  [p.gun .*(q.vax q.gun)]
+::
 ++  slog                                                ::  deify printf
   =|  pri=@                                             ::  priority level
   |=  a=tang  ^+  same                                  ::  .=  ~&(%a 1)

diff --git a/pkg/arvo/sys/lull.hoon b/pkg/arvo/sys/lull.hoon
@@ -4,7 +4,7 @@
 =>  ..part
 ~%  %lull  ..part  ~
 |%
-++  lull  %322
+++  lull  %321
 ::                                                      ::  ::
 ::::                                                    ::  ::  (1) models
   ::                                                    ::  ::