Merge branch 'test' into demo

Conflicts:
	urb/urbit.pill

base/ape/bit/core.hook

@@ -6,10 +6,16 @@
 /-  *talk, *bit-api
 /+  talk, sole, http, mean
 !:
+
+
 ::::  sivtyv-barnel
   ::  be sure to have oauth2-code markk
+
+
+
 |%
 ++  axle  
+
 $:  cred=(unit ,[app-secret=@t client-id=@t])
     oauth-code=(unit ,@t)
     auth=(unit ,[access=@t refresh=@t])

base/ape/hood/core.hook

@@ -97,9 +97,6 @@
 ++  poke-will  (wrap poke-will):from-helm
 ++  mere-kiln  (wrap take-mere):from-kiln
 ++  mere-kiln-sync  (wrap take-mere-sync):from-kiln
-::++  mere-kiln-sync
-::  |=  [then (each (set path) (pair term tang))]
-::  (ably (take-mere-sync:(kiln-work [hid ost src] (able %kiln)) way +<+))
 ++  made-kiln  (wrap take-made):from-kiln
 ++  init-helm  |=([way=wire *] [~ +>])
 ++  note-helm  (wrap take-note):from-helm
@@ -109,7 +106,4 @@
 ++  quit-drum  (wrap quit):from-drum
 ++  went-helm  (wrap take-went):from-helm
 ++  writ-kiln-sync  (wrap take-writ):from-kiln
-::++  writ-kiln-sync
-::  |=  [then riot]
-::  (ably (take-writ:(kiln-work [hid ost src] (able %kiln)) way +<+))
 --

base/arvo/clay.hoon

@@ -937,7 +937,7 @@
     ^+  +>
     ?>  ?=(^ ref)
     ?.  ?=(%& -.res)
-      ~|  "validate foreign plops failed"
+      ~|  "validate foreign x failed"
       =+  why=?-(-.res %| p.res, %tabl ~[>%bad-marc<])
       ~>  %mean.|.(%*(. >[%plop-fail %why]< |1.+> why))
       !!
@@ -972,17 +972,13 @@
     ^+  +>
     ?>  ?=(^ ref)
     ?>  ?=(^ nak.u.ref)
-    ?.  ?=(%| -.res)
-      ~|  "validate foreign plops failed"
-      ~>  %mean.|.(rose/[" " "[" "]"]^[>%plop-fail< p.res])
-      !!
     =+  ^-  lat=(list blob)
-        %+  turn  (gage-to-cages res)
+        %+  turn  ~|("validate foreign plops failed" (gage-to-cages res))
         |=  [bob=cage cay=cage]
         ?.  ?=(%blob p.bob)
           ~|  %plop-not-blob
           !!
-        =+  bol=((hard blob) q.bob)
+        =+  bol=((hard blob) q.q.bob)
         ?-  -.bol
           %delta      [-.bol p.bol q.bol p.cay q.q.cay]
           %direct     [-.bol p.bol p.cay q.q.cay]
@@ -1050,10 +1046,10 @@
       =+  vid=(read-at-aeon:ze u.nao p.q.i.xiq)
       ::  ~&  %red-at-aeon
       ?~  vid
-        ?:  =(0 u.nao)
-          ~&  [%oh-poor `path`[syd '0' r.p.q.i.xiq]]
-          $(xiq t.xiq)
-        ~&  [%oh-well desk=syd mood=p.q.i.xiq aeon=u.nao]
+        ::  ?:  =(0 u.nao)
+        ::    ~&  [%oh-poor `path`[syd '0' r.p.q.i.xiq]]
+        ::    $(xiq t.xiq)
+        ::  ~&  [%oh-well desk=syd mood=p.q.i.xiq aeon=u.nao]
         $(xiq t.xiq, xaq [i.xiq xaq])
       $(xiq t.xiq, ..wake (balk p.i.xiq u.vid p.q.i.xiq))
     ::
@@ -1438,6 +1434,8 @@
     ++  read-x
       |=  [yon=aeon pax=path]
       ^-  (unit (unit (each cage lobe)))
+      ?:  =(0 yon)
+        [~ ~]
       =+  tak=(~(get by hit.dom) yon)
       ?~  tak
         ~
@@ -1468,6 +1466,8 @@
     ++  read-y
       |=  [yon=aeon pax=path]
       ^-  (unit (unit ,[%arch (hypo arch)]))
+      ?:  =(0 yon)
+        ``[%arch -:!>(*arch) *arch]
       =+  tak=(~(get by hit.dom) yon)
       ?~  tak
         ~

base/lib/helm/core.hook

@@ -114,7 +114,7 @@
     ==
   ::
   ++  poke-invite                                       ::  send invite; fake
-    |=  [who=@p myl=@t]
+    |=  [who=@p myl=@t]  =<  abet
     %^  emit  %poke  /helm/invite
     :-  [our %talk]
     (said our %helm now eny [%leaf "sent invite: {<who>} at {(trip myl)}"]~)

base/lib/kiln/core.hook

@@ -36,8 +36,8 @@
         sud=desk                                        ::
         gim=?(%auto germ)                               ::
     ==                                                  ::
-++  hood-cp  [input=path output=path]          ::
-++  hood-mv  [input=path output=path]
+++  hood-cp  [input=path output=path]                   ::
+++  hood-mv  [input=path output=path]                   ::
 --                                                      ::
 ::                                                      ::  ::
 ::::                                                    ::  ::
@@ -189,12 +189,19 @@
         %-  spam
         ?:  ?=(%& -.mes)
           [leaf/"autosync succeeded from {<sud>} on {<her>} to {<syd>}" ~]
-        :*  leaf/"autosync failed from {<sud>} on {<her>} to {<syd>}"
-            leaf/"please manually merge the desks with"
-            leaf/":+merge %{(trip syd)} {(scow %p her)} %{(trip sud)}"
-            leaf/""
-            leaf/"error code: {<p.p.mes>}"
-            q.p.mes
+        ?+  p.p.mes
+          :*  leaf/"autosync failed from {<sud>} on {<her>} to {<syd>}"
+              leaf/"please manually merge the desks with"
+              leaf/":+merge %{(trip syd)} {(scow %p her)} %{(trip sud)}"
+              leaf/""
+              leaf/"error code: {<p.p.mes>}"
+              q.p.mes
+          ==
+        ::
+            %no-ali-desk
+          :~  leaf/"{<sud>} on {<her>} does not exist, so the sync"
+              leaf/"into {<syd>} will begin automatically when it does"
+          ==
         ==
       %-  blab  :_  ~
       :*  ost  %warp