Merge 3fc5db758b into release/next-userspace

pkg/arvo/app/dm-hook.hoon

@@ -13,16 +13,18 @@
 ::
 +$  state-0  [%0 base-state-0]
 +$  state-1  [%1 base-state-0]
++$  state-2  [%2 base-state-0]
 +$  versioned-state
   $%  state-0
       state-1
+      state-2
   ==
 +$  card  card:agent:gall
 +$  nodes  (map index:store node:store)
 ++  orm   orm:store
 --
 ::
-=|  state-1
+=|  state-2
 =*  state  -
 %-  agent:dbug
 ^-  agent:gall
@@ -90,12 +92,23 @@
 ::
 ++  on-save  !>(state)
 ++  on-load
-  |=  =vase
+  |=  =old=vase
   ^-  (quip card _this)
-  =+  !<(old=versioned-state vase)
-  ?:  ?=(%1 -.old)  `this(state old)
-  :_  this(state [%1 +.old])
-  (poke-self:pass noun+!>(%reinit))^~
+  =+  !<(old=versioned-state old-vase)
+  =|  cards=(list card)
+  |-
+  ?-    -.old
+      %0
+    %_($ -.old %1)
+      %1
+    %_    $
+      -.old  %2
+      cards  (weld cards (poke-our:pass %goad noun+!>(%force))^~)
+    ==
+      %2
+    :_  this(state old)
+    (weld cards (poke-self:pass noun+!>(%reinit))^~)
+  ==
 ::
 ++  on-poke
   |=  [=mark =vase]

pkg/arvo/lib/pull-hook.hoon

@@ -514,7 +514,11 @@
       ^+  tr-core
       ?-  -.action
         %add  (tr-add +.action)
-        %remove  tr-remove:(tr-abed resource.action)
+      ::
+          %remove
+        ?.  (~(has by tracking) resource.action)
+          tr-core
+        tr-remove:(tr-abed resource.action)
       ==
     ::
     ++  tr-cleanup

pkg/arvo/sys/vane/dill.hoon

@@ -275,13 +275,18 @@
         ::
             [%gall %unto *]
           ::  ~&  [%take-gall-unto +>.sih]
-          ?-  -.+>.sih
-            %poke-ack   ?~(p.p.+>.sih +>.$ (crud %coup u.p.p.+>.sih))
-            %kick       peer
-            %watch-ack  ?~  p.p.+>.sih
-                          +>.$
-                        (dump:(crud %reap u.p.p.+>.sih) %logo ~)
-            %fact       (from ;;(dill-blit q:`vase`+>+>.sih))
+          ?-    -.+>.sih
+              %poke-ack   ?~(p.p.+>.sih +>.$ (crud %coup u.p.p.+>.sih))
+              %kick       peer
+              %watch-ack
+            ?~  p.p.+>.sih
+              +>.$
+            (dump:(crud %reap u.p.p.+>.sih) %logo ~)
+          ::
+              %fact
+            ?.  ?=(%dill-blit p.cage.p.+>.sih)
+              +>.$
+            (from ;;(dill-blit q.q.cage.p.+>.sih))
           ==
         ::
             [%clay %note *]

pkg/arvo/ted/group/leave.hoon

@@ -7,9 +7,9 @@
 /+  strandio, resource, view=group-view
 =>
 |%
-++  strand    strand:spider
-++  poke      poke:strandio
-++  poke-our  poke-our:strandio
+++  strand        strand:spider
+++  poke          poke:strandio
+++  raw-poke-our  raw-poke-our:strandio
 --
 ^-  thread:spider
 |=  arg=vase
@@ -22,9 +22,9 @@
   :-  %pull-hook-action
   !>  ^-  action:pull-hook
   [%remove rid]
-;<  ~  bind:m  (poke-our %contact-pull-hook pull-hook-act)
-;<  ~  bind:m  (poke-our %metadata-pull-hook pull-hook-act)
-;<  ~  bind:m  (poke-our %group-pull-hook pull-hook-act)
-;<  ~  bind:m  (poke-our %group-store %group-update-0 !>([%remove-group rid ~]))
+;<  ~  bind:m  (raw-poke-our %contact-pull-hook pull-hook-act)
+;<  ~  bind:m  (raw-poke-our %metadata-pull-hook pull-hook-act)
+;<  ~  bind:m  (raw-poke-our %group-pull-hook pull-hook-act)
+;<  ~  bind:m  (raw-poke-our %group-store %group-update-0 !>([%remove-group rid ~]))
 ;<  ~  bind:m  (cleanup-md:view rid)
 (pure:m !>(~))