Merge branch 'master' into release/next-userspace

bin/solid.pill

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ecf3f8593815742e409008421f318b664124e672b1eecd131e4a1e49864a1c2a
-size 6175676
+oid sha256:b11d2aa426a4bb0647c9975812550786d5fec4fa99cdeb45500b55ddbee41beb
+size 6179535

pkg/arvo/app/chat-hook.hoon

@@ -19,8 +19,10 @@
       state-2
       state-3
       state-4
+      state-5
   ==
 ::
++$  state-5  [%5 state-base]
 +$  state-4  [%4 state-base]
 +$  state-3  [%3 state-base]
 +$  state-2  [%2 state-base]
@@ -48,7 +50,7 @@
   $%  [%chat-update update:store]
   ==
 --
-=|  state-4
+=|  state-5
 =*  state  -
 ::
 %-  agent:dbug
@@ -77,14 +79,14 @@
     =/  old  !<(versioned-state old-vase)
     =|  cards=(list card)
     |-
-    ?:  ?=(%4 -.old)
+    ?:  ?=(%5 -.old)
       [cards this(state old)]
-    ?:  ?=(%3 -.old)
+    ?:  ?=(?(%3 %4) -.old)
       =.  cards
         %+  weld  cards
         ^-  (list card)
         [%pass /pokeme %agent [our.bol %chat-hook] %poke %noun !>(%fix-dm)]~
-      $(-.old %4)
+      $(-.old %5)
     ?:  ?=(%2 -.old)
       =.  cards
         %+  weld  cards
@@ -406,7 +408,7 @@
     ::
     ~
   :-  =-  [%pass /fixdm %agent [our.bol %chat-view] %poke %chat-view-action -]
-      !>  ^-  action:store
+      !>  ^-  action:view
       [%delete path]
   =/  new-dm  /(scot %p our.bol)/(crip (weld "dm--" (trip (scot %p ship))))
   =/  mailbox=(unit mailbox:store)  (chat-scry path)
@@ -419,7 +421,7 @@
           (zing [(trip (scot %p our.bol)) " <-> " (trip (scot %p ship)) ~])
           ''
           new-dm
-          new-dm
+          ship+new-dm
           [%invite (silt ~[ship])]
           (silt ~[ship])
           %.y

pkg/arvo/app/glob.hoon

@@ -1,7 +1,7 @@
 /-  glob
 /+  default-agent, verb, dbug
 |%
-++  hash  0v5.knd3c.vvtvt.h0gg0.8qcau.8iii4
+++  hash  0v2.gm6p4.0gctq.j5uu6.pgkan.8jq93
 +$  state-0  [%0 hash=@uv glob=(unit (each glob:glob tid=@ta))]
 +$  all-states
   $%  state-0