From b804ab3a23dc19778ba457da7492f044536bc7d7 Mon Sep 17 00:00:00 2001
From: ~wicrum-wicrun <99811688+wicrum-wicrun@users.noreply.github.com>
Date: Fri, 28 Apr 2023 19:19:42 +0200
Subject: [PATCH] gall: hold on to `.ken.yoke` through uninstalls

---
 pkg/arvo/sys/vane/gall.hoon | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkg/arvo/sys/vane/gall.hoon b/pkg/arvo/sys/vane/gall.hoon
index c23b27c710..0ab76c8908 100644
--- a/pkg/arvo/sys/vane/gall.hoon
+++ b/pkg/arvo/sys/vane/gall.hoon
@@ -968,9 +968,10 @@
       [%pass wire %arvo %a %yawn spar]
     ::
     ++  ap-idle
+      ^+  ap-core
       ?:  ?=(%| -.agent.yoke)  ap-core
-      =>  (ap-ingest ~ |.([ap-yawn-all p.agent.yoke]))
-      ap-core(agent.yoke |+on-save:ap-agent-core)
+      =>  [ken=ken.yoke (ap-ingest ~ |.([ap-yawn-all *agent]))]
+      ap-core(ken.yoke ken, agent.yoke |+on-save:ap-agent-core)
     ::
     ++  ap-nuke
       ^+  ap-core
@@ -1327,6 +1328,12 @@
         ?:  ?=(%& -.agent.yoke)
           on-save:ap-agent-core
         p.agent.yoke
+      =?  ap-core  &(?=(%| -.agent.yoke) ?=(^ ken.yoke))
+        =-  +:(ap-ingest ~ |.([+< agent]))
+        %-  zing
+        %+  turn  ~(tap by `(jug spar:ames wire)`ken.yoke)
+        |=  [=spar:ames wyz=(set wire)]
+        (turn ~(tap in wyz) |=(=wire [%pass wire %arvo %a %keen spar]))
       =^  error  ap-core
         (ap-install(agent.yoke &+agent) `old-state)
       ?~  error