chat-hook, store, and hark-chat-hook: fixed merge issues

pkg/arvo/app/chat-hook.hoon

@@ -713,12 +713,11 @@
   |=  arc=*
   ^-  (quip card _state)
   =/  sty=state-11
-    :*  %11
-      (remake-map ;;((tree [path ship]) +<.arc))
-      ;;(? +>-.arc)
+    :+  %11
+      :+  (remake-map ;;((tree [path ship]) +<.arc))
+        ;;(? +>-.arc)
       (remake-map ;;((tree [path ?]) +>+.arc))
-      ~
-    ==
+    ~
   :_  sty
   :_  ~
   =-  [%pass /self-poke %agent [our.bol %chat-hook] %poke -]

pkg/arvo/app/chat-store.hoon

@@ -54,7 +54,7 @@
       ::
         %3
       =.  cards  (weld cards (migrate-inbox:cc inbox.old))
-      [cards this(state old)]
+      $(old [%4 inbox])
       ::
       ::%_    $
         ::cards  (weld cards migrate-inbox)
@@ -370,7 +370,7 @@
 ++  mailbox-to-update
   |=  [=path =mailbox:store]
   ^-  update:graph-store
-  :+  %0  now.bowl
+  :+  %0  now.bol
   :+  %add-graph
     (path-to-resource:store path)
   :-  (mailbox-to-graph mailbox)
@@ -380,7 +380,7 @@
 ++  poke-graph-store
   |=  =update:graph-store
   ^-  card
-  [%pass / %agent [our.bowl %graph-store] %poke %graph-update !>(update)]
+  [%pass / %agent [our.bol %graph-store] %poke %graph-update !>(update)]
 ::
 ++  letter-to-contents
   |=  =letter:store

pkg/arvo/app/hark-chat-hook.hoon

@@ -11,7 +11,7 @@
 ++  on-load
   |=  =vase
   :_  this
-  ~[%pass /chat %agent [our.bowl %chat-store] %leave ~]
+  [%pass /chat %agent [our.bowl %chat-store] %leave ~]~
 ++  on-arvo   on-arvo:def
 ++  on-agent  on-agent:def
 ++  on-poke   on-poke:def