From 13f5969f043a79fab05217dee01a4b63ee81c8de Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Tue, 8 Sep 2015 16:37:20 -0400
Subject: [PATCH 01/38] add counter to work subscription

---
 ape/work.hoon | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/ape/work.hoon b/ape/work.hoon
index 7cf0b44952..4b3ccff88d 100644
--- a/ape/work.hoon
+++ b/ape/work.hoon
@@ -24,7 +24,8 @@
   ::
 |_  $:  bowl
         client
-        connected=_|
+        connected=_|                                    ::  subscribed to talk
+        count=@ud                                       ::  # messages from talk
         unordered=(map ,[@uvH @u] (pair ship flesh:work-stuff:talk))
     ==
 ++  at
@@ -114,6 +115,7 @@
       %-  unit
       $:  client
           _|
+          @ud
           (map ,[@uvH @u] (pair ship flesh:work-stuff:talk))
       ==
   ^-  [(list move) _+>.$]
@@ -124,7 +126,7 @@
   ?:  connected
     [~ .]
   :_  .(connected %&)  :_  ~
-  [ost %peer /peering [our %talk] /f/(main:talk our)/0]
+  [ost %peer /peering [our %talk] /f/(main:talk our)/(scot %ud count)]
 ::
 ++  process-duty
   |=  [when=@da her=ship from=(set station:talk) action=duty:work-stuff:talk]
@@ -309,28 +311,25 @@
       abut:send-create:(at | +.cod)
   ==
 ::
-::  XX  maybe need to check that we haven't received this message before
-::      by keeping a counter of last message received
-::  XX  definitely do this!
-::  XX  handle and test the disconnection case
-::
+::  XX  test the disconnection case
 ++  diff-talk-report
   |=  [way=wire rep=report:talk]
   ^-  [(list move) _+>.$]
   ?>  ?=(%grams -.rep)
   |-  ^-  [(list move) _+>.^$]
   ?~  q.rep  [~ +>.^$]
+  =.  count  +(count)
   =*  her   p.i.q.rep
   =*  when  p.r.q.i.q.rep
   =*  said  r.r.q.i.q.rep
+  ?.  ?=(%tax -.said)
+    $(p.rep +(p.rep), q.rep t.q.rep)
   =+  ^-  from=(set station:talk)
       %-  sa  ^-  (list station:talk)
       %+  murn  (~(tap by q.q.i.q.rep))
       =>  talk
       |=  [par=partner *]
       `(unit station)`?.(?=(%& -.par) ~ `p.par)
-  ?.  ?=(%tax -.said)
-    $(p.rep +(p.rep), q.rep t.q.rep)
   =^  mos  +>.^$  (process-duty when her from +.said)
   =^  mof  +>.^$  $(p.rep +(p.rep), q.rep t.q.rep)
   [(weld mos mof) +>.^$]

From 1b10c2e2046bea6d63432f231ff41eb78c1cea61 Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Tue, 8 Sep 2015 13:39:53 -0700
Subject: [PATCH 02/38] fixed dojo for updated ford interface

---
 ape/dojo.hoon | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ape/dojo.hoon b/ape/dojo.hoon
index a6dfb5a946..c3c2a7d6a1 100644
--- a/ape/dojo.hoon
+++ b/ape/dojo.hoon
@@ -543,8 +543,7 @@
       ^-  silk
       :+  %ride  gen
       :-  [%$ dy-twig-head]
-      =+  sur=(turn arc |=(hoof [& +<]))
-      [%plan [he-beak ~] / zuse sur lib ~ ~]            ::  XX spur
+      [%plan [he-beak ~] / zuse arc lib ~ ~]            ::  XX spur
     ::
     ++  dy-step                                         ::  advance project
       |=  nex=@ud

From 30e1b9e9a47fa7a3de1b9bc5ee326884b223c670 Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Tue, 8 Sep 2015 19:31:42 -0400
Subject: [PATCH 03/38] fix comment ownership

---
 ape/work.hoon | 4 ++--
 lib/talk.hoon | 3 ++-
 sur/talk.hoon | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ape/work.hoon b/ape/work.hoon
index 4b3ccff88d..b4cf031580 100644
--- a/ape/work.hoon
+++ b/ape/work.hoon
@@ -83,7 +83,7 @@
     |=  up=update
     ^+  +>
     ?-    -.up
-        %add  ?>(?=(%comment +<.up) (send-change %add-comment +>.up))
+        %add  ?>(?=(%comment +<.up) (send-change %add-comment our +>.up))
         %doer
       ?-  +<.up
         %release  (send-change %set-doer ~)
@@ -258,7 +258,7 @@
         %set-done         tax.u.tax(done ?.(don.meat.action ~ `when))
         %add-comment
           %=  tax.u.tax
-            discussion  [[when her com.meat.action] discussion.tax.u.tax]
+            discussion  [[when [who com]:meat.action] discussion.tax.u.tax]
           ==
       ==
     =+  ooo=(~(get by unordered) id.action +(version.action))
diff --git a/lib/talk.hoon b/lib/talk.hoon
index 5bca4c30f0..44bc270338 100644
--- a/lib/talk.hoon
+++ b/lib/talk.hoon
@@ -52,7 +52,8 @@
       %set-tags         =+(feh "{(tr-term -.feh)} {<tag>}")
       %set-title        =+(feh "{(tr-term -.feh)} {<(trip til)>}")
       %set-description  =+(feh "{(tr-term -.feh)} {<(trip des)>}")
-      %add-comment      =+(feh "{(tr-term -.feh)} {<(trip com)>}")
+      %add-comment      =+  feh
+                        "{(tr-term -.feh)} {(scow %p who)} {<(trip com)>}"
     ==
   --
 --
diff --git a/sur/talk.hoon b/sur/talk.hoon
index 8b01ee97ce..f9af2f3142 100644
--- a/sur/talk.hoon
+++ b/sur/talk.hoon
@@ -93,7 +93,7 @@
         [%set-title til=@t]                             ::  set title
         [%set-description des=@t] ::  XX (list ,@t)     ::  set description
         [%set-done don=?]                               ::  set done
-        [%add-comment com=@t]   ::  XX (list ,@t)       ::  add comment
+        [%add-comment who=@p com=@t]   ::  XX (list ,@t) ::  add comment
     ==                                                  ::
   ++  task                                              ::
     $:  id=@uvH                                         ::

From fd1719525efc289a5ea1ce1320e73e06a43ef9b5 Mon Sep 17 00:00:00 2001
From: Galen Wolfe-Pauly <mailroom@office-for.com>
Date: Thu, 10 Sep 2015 19:35:20 -0700
Subject: [PATCH 04/38] warning class

---
 pub/tree/src/css/main.css  | 33 ++++++++++++++++++++++++++++++---
 pub/tree/src/css/main.styl | 33 ++++++++++++++++++++++++++++++---
 2 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/pub/tree/src/css/main.css b/pub/tree/src/css/main.css
index 9576acc945..b86c52a96d 100644
--- a/pub/tree/src/css/main.css
+++ b/pub/tree/src/css/main.css
@@ -102,10 +102,13 @@ hr {
   border: 0;
   border-top: 2px solid #f4f4f4;
 }
+h1 {
+  margin-top: 4rem;
+}
 h2,
 h3 {
   margin: 0;
-  margin-top: 1rem;
+  margin-top: 2rem;
 }
 h1,
 h2,
@@ -433,8 +436,8 @@ div.post li p {
   display: inline;
 }
 div.toc {
-  margin-top: 6rem;
-  margin-bottom: 6rem;
+  margin-top: 3rem;
+  margin-bottom: 3rem;
 }
 div.toc h1,
 div.toc h2,
@@ -444,6 +447,8 @@ div.toc h4 {
   cursor: pointer;
   text-decoration: underline;
   font-size: 1.2rem;
+  margin-top: 0.3rem;
+  margin-bottom: 0.3rem;
 }
 div.toc h2 {
   margin-left: 1rem;
@@ -458,6 +463,7 @@ div.toc h1.t {
   font-weight: 500;
   font-size: 2rem;
   text-decoration: none;
+  margin-bottom: 2rem;
 }
 #body .CodeMirror {
   font-size: 0.8rem;
@@ -474,6 +480,27 @@ div.toc h1.t {
 .error {
   color: #f91733;
 }
+.warning {
+  background-color: #ff3537;
+  padding: 1rem;
+  width: 18rem;
+  margin: 2rem 0;
+  color: #fff;
+}
+.warning a {
+  color: inherit;
+  border-color: #fff;
+}
+.warning h1 {
+  font-size: 1rem;
+}
+.warning h1,
+.warning p {
+  margin: 0 0.3rem;
+}
+.warning.w {
+  width: auto;
+}
 @media only screen and (max-width: 1170px) {
   #nav,
   #nav > div,
diff --git a/pub/tree/src/css/main.styl b/pub/tree/src/css/main.styl
index 03cf8716e5..60f2f6d922 100644
--- a/pub/tree/src/css/main.styl
+++ b/pub/tree/src/css/main.styl
@@ -32,10 +32,13 @@ hr
   border 0
   border-top 2px solid #f4f4f4
 
+h1
+  margin-top 4rem
+
 h2
 h3
   margin 0
-  margin-top 1rem
+  margin-top 2rem
 
 h1
 h2
@@ -361,8 +364,8 @@ div.post
     display inline
 
 div.toc
-  margin-top 6rem
-  margin-bottom 6rem
+  margin-top 3rem
+  margin-bottom 3rem
 
   h1
   h2
@@ -372,6 +375,8 @@ div.toc
     cursor pointer
     text-decoration underline
     font-size 1.2rem
+    margin-top .3rem
+    margin-bottom .3rem
   
   h2
     margin-left 1rem
@@ -386,6 +391,7 @@ div.toc
     font-weight 500
     font-size 2rem
     text-decoration none
+    margin-bottom 2rem
 
 #body .CodeMirror
   font-size .8rem
@@ -402,4 +408,25 @@ div.toc
 .error
   color rgba(249,23,51,1)
 
+.warning
+  background-color rgb(255,53,55)
+  padding 1rem
+  width 18rem
+  margin 2rem 0
+  color #fff
+  
+  a
+    color inherit
+    border-color #fff
+  
+  h1
+    font-size 1rem
+  
+  h1
+  p
+    margin 0 .3rem
+
+.warning.w
+  width auto
+
 @import 'mobile'

From 387ed3212fb55b823598ce791be32892f7611da1 Mon Sep 17 00:00:00 2001
From: Galen Wolfe-Pauly <mailroom@office-for.com>
Date: Fri, 11 Sep 2015 07:38:37 -0700
Subject: [PATCH 05/38] no blog in test

---
 pub/blog.md             | 11 -----------
 pub/blog/~2015.7.16.md  | 10 ----------
 pub/blog/~2015.7.17.md  | 10 ----------
 pub/blog/~2015.7.18.mdy | 14 --------------
 4 files changed, 45 deletions(-)
 delete mode 100644 pub/blog.md
 delete mode 100644 pub/blog/~2015.7.16.md
 delete mode 100644 pub/blog/~2015.7.17.md
 delete mode 100644 pub/blog/~2015.7.18.mdy

diff --git a/pub/blog.md b/pub/blog.md
deleted file mode 100644
index 092989e6bd..0000000000
--- a/pub/blog.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="root">
-
-# Log —
-
-<search/>
-
-<list dataPreview="true" dataType="post"></list>
-
-Please direct all questions or inquiries to [urbit@urbit.org](mailto:urbit@urbit.org). You can also subscribe to the [urbit-dev]() mailing list or follow [@urbit_]() on twitter.
-
-</div>
diff --git a/pub/blog/~2015.7.16.md b/pub/blog/~2015.7.16.md
deleted file mode 100644
index e8893fe5c2..0000000000
--- a/pub/blog/~2015.7.16.md
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="post">
-
-# Technical demo — Part ii
-
-<h2 class="sub">2015 07 16</h2>
-<h2 class="sub">Curtis, Galen, Philip, Anton and Henry</h2>
-
-<iframe src="https://player.vimeo.com/video/133395510?color=fff&amp;title=0&amp;byline=0&amp;portrait=0" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
-
-</div>
diff --git a/pub/blog/~2015.7.17.md b/pub/blog/~2015.7.17.md
deleted file mode 100644
index c729fa0d33..0000000000
--- a/pub/blog/~2015.7.17.md
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="post">
-
-# Technical demo — Part i
-
-<h2 class="sub">2015-07-17</h2>
-<h2 class="sub">Curtis, Galen, Philip, Anton and Henry</h2>
-
-<iframe src="https://player.vimeo.com/video/133395510?color=fff&amp;title=0&amp;byline=0&amp;portrait=0" frameborder="0" webkitallowfullscreen="" mozallowfullscreen="" allowfullscreen=""></iframe>
-
-</div>
diff --git a/pub/blog/~2015.7.18.mdy b/pub/blog/~2015.7.18.mdy
deleted file mode 100644
index 85dd64b1c9..0000000000
--- a/pub/blog/~2015.7.18.mdy
+++ /dev/null
@@ -1,14 +0,0 @@
----
-title: Advantages
----
-<div class="post">
-
-# Concrete advantages of urbit
-
-<h2 class="sub">2015-7-18</h2>
-<h2 class="sub">Philip Monk</h2>
-
-# Item 1
-# Item 2
-
-</div>

From 77eb638240dcc75bbf0a367e2230e9e5256d4bc5 Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Fri, 11 Sep 2015 17:06:02 -0400
Subject: [PATCH 06/38] merge clay card-sending pathways

---
 arvo/clay.hoon | 445 +++++++++++++++++++++++--------------------------
 1 file changed, 208 insertions(+), 237 deletions(-)

diff --git a/arvo/clay.hoon b/arvo/clay.hoon
index f6c8f9bf37..ea54763739 100644
--- a/arvo/clay.hoon
+++ b/arvo/clay.hoon
@@ -162,11 +162,7 @@
           mer=mer.jod
       ==
   =*  red  ->
-  =|  yel=(list ,[p=duct q=gift])
-  =|  byn=(list ,[p=duct q=riot])
-  =|  reg=(list ,[p=duct q=gift])
-  =|  say=(list ,[p=duct q=path r=ship s=[p=@ud q=riff]])
-  =|  tag=(list move)
+  =|  mow=(list move)
   |%
   ++  abet
     ^-  [(list move) raft]
@@ -176,23 +172,7 @@
           ruf(hoy (~(put by hoy.ruf) her rug))
         =+  dos=(~(put by dos.u.rom) syd [qyx dom dok mer])
         ruf(fat (~(put by fat.ruf) her [(need hun) dos]))
-    ;:  weld
-      %+  turn  (flop yel)
-      |=([a=duct b=gift] [(need hun) %give b])
-    ::
-      %+  turn  (flop reg)
-      |=([a=duct b=gift] [a %give b])
-    ::
-      %+  turn  (flop byn)
-      |=([a=duct b=riot] [a %give [%writ b]])
-    ::
-      %+  turn  (flop say)
-      |=  [a=duct b=path c=ship d=[p=@ud q=riff]]
-      :-  a
-      [%pass b %a %wont [our c] [%c %question p.q.d (scot %ud p.d) ~] q.d]
-    ::
-      tag
-    ==
+    (flop mow)
   ::
   ++  aver                                              ::  read
     |=  mun=mood
@@ -260,6 +240,14 @@
       (mule |.(`~`~|([%expected-path got=p.pax] !!)))
     $(tay t.tay, can (~(put by can) ((hard path) q.q.pax) q.i.tay))
   ::
+  ++  emit
+    |=  mof=move
+    %_(+> mow [mof mow])
+  ::
+  ++  emil
+    |=  mof=(list move)
+    %_(+> mow (welp mof mow))
+  ::
   ++  balk                                              ::  read and send
     |=  [hen=duct cay=(unit (each cage lobe)) mun=mood]
     ^+  +>
@@ -268,18 +256,18 @@
   ::
   ++  bait
     |=  [hen=duct tym=@da]
-    %_(+> tag :_(tag [hen %pass /tyme %t %wait tym]))
+    (emit hen %pass /tyme %t %wait tym)
   ::
   ++  best
     |=  [hen=duct tym=@da]
-    %_(+> tag :_(tag [hen %pass /tyme %t %rest tym]))
+    (emit hen %pass /tyme %t %rest tym)
   ::
   ++  blab                                              ::  ship result
     |=  [hen=duct mun=mood dat=(each cage lobe)]
     ^+  +>
     ?:  ?=(%& -.dat)
-      +>.$(byn [[hen ~ [p.mun q.mun syd] r.mun p.dat] byn])
-    =-  +>.$(tag [- tag])
+      (emit hen %give %writ ~ [p.mun q.mun syd] r.mun p.dat)
+    %-  emit
     :*  hen  %pass  [%blab p.mun (scot q.mun) syd r.mun]
         %f  %exec  our  ~  [her syd q.mun]  (lobe-to-silk:ze r.mun p.dat)
     ==
@@ -295,7 +283,15 @@
   ::
   ++  blub                                              ::  ship stop
     |=  hen=duct
-    %_(+> byn [[hen ~] byn])
+    (emit hen %give %writ ~)
+  ::
+  ++  print-to-dill
+    |=  [car=@tD tan=tank]
+    (emit (need hun) %give %note car tan)
+  ::
+  ++  send-over-ames
+    |=  [a=duct b=path c=ship d=[p=@ud q=riff]]
+    (emit a %pass b %a %wont [our c] [%c %question p.q.d (scot %ud p.d) ~] q.d)
   ::
   ++  duce                                              ::  produce request
     |=  rov=rove
@@ -309,8 +305,10 @@
       ?.  ?=([%sing %v *] rav)  rav
       [%many %| [%ud let.dom] `case`q.p.rav r.p.rav]
     =+  inx=nix.u.ref
+    =.  +>+.$
+      =<  ?>(?=(^ ref) .)
+      (send-over-ames hen [(scot %ud inx) ~] her inx syd ~ vaw)
     %=  +>+.$
-      say        [[hen [(scot %ud inx) ~] her [inx syd ~ vaw]] say]
       nix.u.ref  +(nix.u.ref)
       bom.u.ref  (~(put by bom.u.ref) inx [hen vaw])
       fod.u.ref  (~(put by fod.u.ref) hen inx)
@@ -335,22 +333,19 @@
     =+  mus=(skim can |=(paf=path =(pax (scag (lent pax) paf))))
     ?~  mus
       +>.$
-    %_    +>.$
-        tag
-      :_  tag
-      :*  hen  %pass  [%ergoing (scot %p her) syd ~]  %f
-          %exec  our  ~  [her syd %da now]  %tabl
-          ^-  (list (pair silk silk))
-          %+  turn  `(list path)`mus
-          |=  a=path
-          ^-  (pair silk silk)
-          :-  [%$ %path !>(a)]
-          :+  %cast  %mime
-          =+  (need (need (read-x:ze let.dom a)))
-          ?:  ?=(%& -<)
-            [%$ p.-]
-          (lobe-to-silk:ze a p.-)
-      ==
+    %-  emit
+    :*  hen  %pass  [%ergoing (scot %p her) syd ~]  %f
+        %exec  our  ~  [her syd %da now]  %tabl
+        ^-  (list (pair silk silk))
+        %+  turn  `(list path)`mus
+        |=  a=path
+        ^-  (pair silk silk)
+        :-  [%$ %path !>(a)]
+        :+  %cast  %mime
+        =+  (need (need (read-x:ze let.dom a)))
+        ?:  ?=(%& -<)
+          [%$ p.-]
+        (lobe-to-silk:ze a p.-)
     ==
   ::
   ++  ease                                              ::  release request
@@ -364,8 +359,10 @@
     |-  ^+  +.$
     =+  nux=(~(get by fod.u.ref) hen)
     ?~  nux  +.$
+    =.  +.$
+      =<  ?>(?=(^ ref) .)
+      (send-over-ames hen [(scot %ud u.nux) ~] her u.nux syd ~)
     %=  +.$
-      say        [[hen [(scot %ud u.nux) ~] her [u.nux syd ~]] say]
       fod.u.ref  (~(del by fod.u.ref) hen)
       bom.u.ref  (~(del by bom.u.ref) u.nux)
     ==
@@ -422,31 +419,19 @@
       (duce `rove`[%many p.rav ptr q.q.rav r.q.rav ear])
     ==
   ::
-  ++  echa                                              ::  announce raw
-    |=  [wen=@da mer=mizu]
-    ^+  +>
-    %=    +>
-        reg  ~&  %merge-announce  reg
-        ::  yel  [[hen %note '=' %leaf ~] yel]     ::  XX do better
-    ==
-  ::
   ++  echo                                              ::  announce changes
     |=  [wen=@da lem=nuri]
     ^+  +>
-    %_    +>.$
-        yel
-      =+  pre=`path`~[(scot %p her) syd (scot %ud let.dom)]
-      ?-  -.lem
-        |  :_  yel
-           [hen %note '=' %leaf :(weld (trip p.lem) " " (spud pre))]
-        &  |-  ^+  yel
-           ?~  p.lem  yel
-           :_  $(p.lem t.p.lem)
-           :-  hen
-           :+  %note
-             ?-(-.q.i.p.lem %del '-', %ins '+', %dif ':')
-           [%leaf (spud (weld pre p.i.p.lem))]
-      ==
+    =+  pre=`path`~[(scot %p her) syd (scot %ud let.dom)]
+    ?-  -.lem
+      |   (print-to-dill '=' %leaf :(weld (trip p.lem) " " (spud pre)))
+      &   |-  ^+  +>.^$
+          ?~  p.lem  +>.^$
+          =.  +>.^$
+            %+  print-to-dill
+              ?-(-.q.i.p.lem %del '-', %ins '+', %dif ':')
+            [%leaf (spud (weld pre p.i.p.lem))]
+          $(p.lem t.p.lem)
     ==
   ::
   ++  edit                                              ::  apply changes
@@ -472,107 +457,97 @@
       ?&  ?=([?(%hoon %hook) *] (flop pax))
           ?=(%mime p.p.mis)
       ==
-    =-  %_    +>.$
-            tag  (welp - tag)
-            dok
-          :-  ~
-          :*  %+  turn  del
+    =.  +>.$
+      %-  emil
+      ^-  (list move)
+      :~  :*  hen  %pass
+              [%inserting (scot %p her) syd (scot %da wen) ~]
+              %f  %exec  our  ~  [her syd %da wen]  %tabl
+              ^-  (list (pair silk silk))
+              %+  turn  ins
               |=  [pax=path mis=miso]
-              ?>  ?=(%del -.mis)
-              pax
-          ::
-              %+  turn  ink
-              |=  [pax=path mis=miso]
-              ^-  (pair path cage)
               ?>  ?=(%ins -.mis)
+              :-  [%$ %path -:!>(*path) pax]
               =+  =>((flop pax) ?~(. %$ i))
-              [pax - [%atom %t] ((hard ,@t) +>.q.q.p.mis)]
-          ::
-              ~
-          ::
-              %-  mo
+              [%cast - [%$ p.mis]]
+          ==
+          :*  hen  %pass
+              [%diffing (scot %p her) syd (scot %da wen) ~]
+              %f  %exec  our  ~  [her syd %da wen]  %tabl
+              ^-  (list (pair silk silk))
               %+  turn  dif
               |=  [pax=path mis=miso]
               ?>  ?=(%dif -.mis)
-              [pax p.mis]
-          ::
-              ~
-          ::
-              %-  mo
+              =+  (need (need (read-x:ze let.dom pax)))
+              ?>  ?=(%& -<)
+              :-  [%$ %path -:!>(*path) pax]
+              [%pact [%$ p.-] [%$ p.mis]]
+          ==
+          :*  hen  %pass
+              [%castifying (scot %p her) syd (scot %da wen) ~]
+              %f  %exec  our  ~  [her syd %da wen]  %tabl
+              ^-  (list (pair silk silk))
               %+  turn  mut
               |=  [pax=path mis=miso]
               ?>  ?=(%mut -.mis)
-              [pax p.mis]
-          ::
-              ~
-          ::
-              ~
-          ::
-              %-  mo  ^-  (list (pair path mime))
-              ;:  welp
-                ^-  (list (pair path mime))
-                %+  murn  ins
-                |=  [pax=path mis=miso]
-                ^-  (unit (pair path mime))
-                ?>  ?=(%ins -.mis)
-                ?.  ?=(%mime p.p.mis)
-                  ~
-                `[pax ((hard mime) q.q.p.mis)]
-              ::
-                ^-  (list (pair path mime))
-                %+  murn  ink
-                |=  [pax=path mis=miso]
-                ^-  (unit (pair path mime))
-                ?>  ?=(%ins -.mis)
-                ?>  ?=(%mime p.p.mis)
-                `[pax ((hard mime) q.q.p.mis)]
-              ::
-                ^-  (list (pair path mime))
-                %+  murn  mut
-                |=  [pax=path mis=miso]
-                ^-  (unit (pair path mime))
-                ?>  ?=(%mut -.mis)
-                ?.  ?=(%mime p.p.mis)
-                  ~
-                `[pax ((hard mime) q.q.p.mis)]
-              ==
+              :-  [%$ %path -:!>(*path) pax]
+              =+  (lobe-to-mark:ze (~(got by q:(aeon-to-yaki:ze let.dom)) pax))
+              [%cast - [%$ p.mis]]
           ==
-        ==
-    ^-  (list move)
-    :~  :*  hen  %pass
-            [%inserting (scot %p her) syd (scot %da wen) ~]
-            %f  %exec  our  ~  [her syd %da wen]  %tabl
-            ^-  (list (pair silk silk))
-            %+  turn  ins
+      ==
+    %_    +>.$
+        dok
+      :-  ~
+      :*  (turn del |=([pax=path mis=miso] ?>(?=(%del -.mis) pax)))
+      ::
+          %+  turn  ink
+          |=  [pax=path mis=miso]
+          ^-  (pair path cage)
+          ?>  ?=(%ins -.mis)
+          =+  =>((flop pax) ?~(. %$ i))
+          [pax - [%atom %t] ((hard ,@t) +>.q.q.p.mis)]
+      ::
+          ~
+      ::
+          (mo (turn dif |=([pax=path mis=miso] ?>(?=(%dif -.mis) [pax p.mis]))))
+      ::
+          ~
+      ::
+          (mo (turn mut |=([pax=path mis=miso] ?>(?=(%mut -.mis) [pax p.mis]))))
+      ::
+          ~
+      ::
+          ~
+      ::
+          %-  mo  ^-  (list (pair path mime))
+          ;:  welp
+            ^-  (list (pair path mime))
+            %+  murn  ins
             |=  [pax=path mis=miso]
+            ^-  (unit (pair path mime))
             ?>  ?=(%ins -.mis)
-            :-  [%$ %path -:!>(*path) pax]
-            =+  =>((flop pax) ?~(. %$ i))
-            [%cast - [%$ p.mis]]
-        ==
-        :*  hen  %pass
-            [%diffing (scot %p her) syd (scot %da wen) ~]
-            %f  %exec  our  ~  [her syd %da wen]  %tabl
-            ^-  (list (pair silk silk))
-            %+  turn  dif
+            ?.  ?=(%mime p.p.mis)
+              ~
+            `[pax ((hard mime) q.q.p.mis)]
+          ::
+            ^-  (list (pair path mime))
+            %+  murn  ink
             |=  [pax=path mis=miso]
-            ?>  ?=(%dif -.mis)
-            =+  (need (need (read-x:ze let.dom pax)))
-            ?>  ?=(%& -<)
-            :-  [%$ %path -:!>(*path) pax]
-            [%pact [%$ p.-] [%$ p.mis]]
-        ==
-        :*  hen  %pass
-            [%castifying (scot %p her) syd (scot %da wen) ~]
-            %f  %exec  our  ~  [her syd %da wen]  %tabl
-            ^-  (list (pair silk silk))
-            %+  turn  mut
+            ^-  (unit (pair path mime))
+            ?>  ?=(%ins -.mis)
+            ?>  ?=(%mime p.p.mis)
+            `[pax ((hard mime) q.q.p.mis)]
+          ::
+            ^-  (list (pair path mime))
+            %+  murn  mut
             |=  [pax=path mis=miso]
+            ^-  (unit (pair path mime))
             ?>  ?=(%mut -.mis)
-            :-  [%$ %path -:!>(*path) pax]
-            =+  (lobe-to-mark:ze (~(got by q:(aeon-to-yaki:ze let.dom)) pax))
-            [%cast - [%$ p.mis]]
-        ==
+            ?.  ?=(%mime p.p.mis)
+              ~
+            `[pax ((hard mime) q.q.p.mis)]
+          ==
+      ==
     ==
   ::
   ++  silkify
@@ -691,8 +666,7 @@
           %+  turn  cat
           |=  [pax=path cay=cage]
           [pax (page-to-lobe:ze [p q.q]:cay)]
-    =-  %_(+>.$ tag [- tag])
-    ^-  move
+    %-  emit
     :*  hen  %pass
         [%mutating (scot %p her) syd (scot %da wen) ~]
         %f  %exec  our  ~  [her syd %da wen]  %tabl
@@ -733,11 +707,8 @@
     ^+  +>
     ::  ~&  %taking-patch
     ?:  ?=(%| -.res)
-      %_    +>.$
-          dok  ~
-          yel
-        [[hen %note '!' %rose [" " "" ""] leaf/"clay patch failed" p.res] yel]
-      ==
+      =.  dok  ~
+      (print-to-dill '!' %rose [" " "" ""] leaf/"clay patch failed" p.res)
     ::  ~&  %editing
     =+  ^-  sim=(list (pair path misu))
         ?~  dok
@@ -795,38 +766,31 @@
     =+  can=(mo sim)
     ::  ~&  %forming-ergo
     ::  =-  ~&  %formed-ergo  -
-    %_    +>.$
-        dok  ~
-        tag
-      :_  tag
-      :*  hen  %pass  [%ergoing (scot %p her) syd ~]  %f
-          %exec  our  ~  [her syd %da now]  %tabl
-          ^-  (list (pair silk silk))
-          %+  turn  (~(tap in sum))
-          |=  a=path
-          ^-  (pair silk silk)
-          :-  [%$ %path !>(a)]
-          =+  b=(~(got by can) a)
-          ?:  ?=(%del -.b)
-            [%$ %null !>(~)]
-          =+  (~(get by mim.u.dok) a)
-          ?^  -  [%$ %mime !>(u.-)]
-          :+  %cast  %mime
-          =+  (need (need (read-x:ze let.dom a)))
-          ?:  ?=(%& -<)
-            [%$ p.-]
-          (lobe-to-silk:ze a p.-)
-      ==
+    %-  emit(dok ~)
+    :*  hen  %pass  [%ergoing (scot %p her) syd ~]  %f
+        %exec  our  ~  [her syd %da now]  %tabl
+        ^-  (list (pair silk silk))
+        %+  turn  (~(tap in sum))
+        |=  a=path
+        ^-  (pair silk silk)
+        :-  [%$ %path !>(a)]
+        =+  b=(~(got by can) a)
+        ?:  ?=(%del -.b)
+          [%$ %null !>(~)]
+        =+  (~(get by mim.u.dok) a)
+        ?^  -  [%$ %mime !>(u.-)]
+        :+  %cast  %mime
+        =+  (need (need (read-x:ze let.dom a)))
+        ?:  ?=(%& -<)
+          [%$ p.-]
+        (lobe-to-silk:ze a p.-)
     ==
   ::
   ++  take-ergo
     |=  res=gage
     ^+  +>
     ?:  ?=(%| -.res)
-      %_    +>.$
-          yel
-        [[hen %note '!' %rose [" " "" ""] leaf/"clay ergo failed" p.res] yel]
-      ==
+      (print-to-dill '!' %rose [" " "" ""] leaf/"clay ergo failed" p.res)
     ?~  hez  ~|(%no-sync-duct !!)
     =+  ^-  can=(map path (unit mime))
         %-  mo  ^-  mode
@@ -839,33 +803,27 @@
           ~
         `((hard mime) q.q.mim)
     =+  mus=(must-ergo (turn (~(tap by can)) head))
-    %=    +>.$
-        reg
-      %-  welp  :_  reg
-      %+  turn  (~(tap by mus))
-      |=  [pot=term len=@ud pak=(set path)]
-      :*  u.hez  %ergo  pot
-          %+  turn  (~(tap in pak))
-          |=  pax=path
-          [(slag len pax) (~(got by can) pax)]
-      ==
+    %-  emil
+    %+  turn  (~(tap by mus))
+    |=  [pot=term len=@ud pak=(set path)]
+    :*  u.hez  %give  %ergo  pot
+        %+  turn  (~(tap in pak))
+        |=  pax=path
+        [(slag len pax) (~(got by can) pax)]
     ==
   ::
   ++  checkout-ankh
     |=  hat=(map path lobe)
     ^+  +>
-    %_    +>.$
-        tag
-      :_  tag
-      :*  hen  %pass  [%patching (scot %p her) syd ~]  %f
-          %exec  our  :^  ~  [her syd %da now]  %tabl
-          ^-  (list (pair silk silk))
-          %+  turn  (~(tap by hat))
-          |=  [a=path b=lobe]
-          ^-  (pair silk silk)
-          :-  [%$ %path-hash !>([a b])]
-          (lobe-to-silk:ze a b)
-      ==
+    %-  emit
+    :*  hen  %pass  [%patching (scot %p her) syd ~]  %f
+        %exec  our  :^  ~  [her syd %da now]  %tabl
+        ^-  (list (pair silk silk))
+        %+  turn  (~(tap by hat))
+        |=  [a=path b=lobe]
+        ^-  (pair silk silk)
+        :-  [%$ %path-hash !>([a b])]
+        (lobe-to-silk:ze a b)
     ==
   ::
   ++  apply-foreign-update                              ::  apply subscription
@@ -1020,7 +978,7 @@
     |=  rut=rand
     ^+  +>
     ~|  [%x-over-network-not-implemented [p q -.r]:rut hen]  !!
-    ::  =-  %_(+>.$ tag [- tag])
+    ::  %-  emit
     ::  :*  hen
     ::      [%foreign-plops (scot %p our) (scot %p her) syd ~]
     ::      %f  %exec  our  ~  %tabl
@@ -1043,7 +1001,7 @@
   ++  validate-x
     |=  [car=care cas=case pax=path peg=page]
     ^+  +>
-    =-  %_(+>.$ tag [- tag])
+    %-  emit
     :*  hen  %pass
         [%foreign-x (scot %p our) (scot %p her) syd car (scot cas) pax]
         %f  %exec  our  ~  [her syd cas]
@@ -1065,8 +1023,8 @@
   ++  validate-plops
     |=  [cas=case lem=(unit ,@da) pop=(set plop)]
     ^+  +>
-    =-  %_(+>.$ tag [- tag])
     =+  lum=(scot %da (fall lem *@da))
+    %-  emit
     :*  hen  %pass
         [%foreign-plops (scot %p our) (scot %p her) syd lum ~]
         %f  %exec  our  ~  [her syd cas]  %tabl
@@ -1074,14 +1032,8 @@
         %+  turn  (~(tap in pop))
         |=  a=plop
         ?-    -.a
-            %delta
-          :-  [%$ %blob !>([%delta p.a q.a *page])]
-          [%vale p.r.a q.r.a]
-        ::
-            %direct
-          :-  [%$ %blob !>([%direct p.a *page])]
-          [%vale p.q.a q.q.a]
-        ::
+            %delta   [[%$ %blob !>([%delta p.a q.a *page])] [%vale p.r.a q.r.a]]
+            %direct  [[%$ %blob !>([%direct p.a *page])] [%vale p.q.a q.q.a]]
             %indirect  ~|  %foreign-indirect-not-implemented  !!
         ==
     ==
@@ -1530,6 +1482,15 @@
         ~
       ```[%null [%atom %n] ~]
     ::
+    ++  read-v
+      |=  [yon=aeon pax=path]
+      ^-  (unit (unit ,[%dome (hypo dome)]))
+      ?:  (lth yon let.dom)
+        ~
+      ?:  (gth yon let.dom)
+        `~
+      ``[%dome -:!>(*dome) dom]
+    ::
     ++  read-x
       |=  [yon=aeon pax=path]
       ^-  (unit (unit (each cage lobe)))
@@ -1611,6 +1572,8 @@
         ?^(r.mun [~ ~] [~ ~ %& %aeon !>(yon)])
       ?:  ?=(%u p.mun)
         (read-u yon r.mun)
+      ?:  ?=(%v p.mun)
+        (bind (read-v yon r.mun) (curr bind (cury same %&)))
       ?:  ?=(%x p.mun)
         (read-x yon r.mun)
       ?:  ?=(%y p.mun)
@@ -1716,7 +1679,17 @@
         ^+  ..me
         ?:  don
           ..me(mer `dat)
-        ..me(mer ~, reg :_(reg [hen %mere gon.dat]))
+        =.  mer  ~
+        =>  (emit hen %give %mere gon.dat)
+        ..me
+      ::
+      ++  emit
+        |=  move
+        %_(+> ..ze (^emit +<))
+      ::
+      ++  emil
+        |=  (list move)
+        %_(+> ..ze (^emil +<))
       ::
       ++  route
         |=  [sat=term res=(each riot gage)]
@@ -1759,7 +1732,7 @@
       ::
       ++  fetch-ali
         ^+  .
-        =-  %_(+ tag [- tag], wat.dat %ali)
+        %-  emit(wat.dat %ali)
         :*  hen  %pass
             [%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %ali ~]
             %c  %warp  [p.bob p.ali]  q.ali
@@ -1937,7 +1910,7 @@
       ++  diff-bas
         |=  [nam=term yak=yaki oth=(trel ship desk case) yuk=yaki]
         ^+  +>
-        =-  %_(+>.$ tag [- tag])
+        %-  emit
         :*  hen  %pass
             =+  (cat 3 %diff- nam)
             [%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali - ~]
@@ -2046,7 +2019,7 @@
         |-  ^+  +.$
         ?+    gem.dat  ~|  [%merge-weird-gem gem.dat]  !!
             ?(%mate %meld)
-          =-  %_(+.$ tag [- tag], wat.dat %merge)
+          %-  emit(wat.dat %merge)
           :*  hen  %pass
               [%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %merge ~]
               %f  %exec  p.bob  ~  [p.bob q.bob da/now]  %tabl
@@ -2080,7 +2053,7 @@
       ::
       ++  build
         ^+  .
-        =-  %_(+ tag [- tag], wat.dat %build)
+        %-  emit(wat.dat %build)
         :*  hen  %pass
             [%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %build ~]
             %f  %exec  p.bob  ~  [p.bob q.bob da/now]  %tabl
@@ -2201,11 +2174,11 @@
       ::
       ++  checkout
         ^+  .
-        =-  %_(+ tag [- tag], wat.dat %checkout)
         =+  ^-  val=beak
             ?:  ?=(%init gem.dat)
               [p.ali q.ali cas.dat]
             [p.bob q.bob da/now]
+        %-  emit(wat.dat %checkout)
         :*  hen  %pass
             [%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %checkout ~]
             %f  %exec  p.bob  ~  val  %tabl
@@ -2244,7 +2217,6 @@
       ::
       ++  ergo
         ^+  .
-        =-  %_(+ tag [- tag], wat.dat %ergo)
         =+  ^-  sum=(set path)
             =+  (must-ergo (turn (~(tap by erg.dat)) head))
             =+  (turn (~(tap by -)) (corl tail tail))
@@ -2256,6 +2228,7 @@
             ?:  ?=(%init gem.dat)
               [p.ali q.ali cas.dat]
             [p.bob q.bob da/now]
+        %-  emit(wat.dat %ergo)
         :*  hen  %pass
             [%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %ergo ~]
             %f  %exec  p.bob  ~  val  %tabl
@@ -2292,17 +2265,15 @@
           (error:he %ergo-no-hez ~)
         ?:  ?=(%| -.gon.dat)
           +>.$
-        %*  done  he
-            reg
-          =+  mus=(must-ergo (turn (~(tap by erg.dat)) head))
-          %-  welp  :_  reg
-          %+  turn  (~(tap by mus))
-          |=  [pot=term len=@ud pak=(set path)]
-          :*  u.hez  %ergo  pot
-              %+  turn  (~(tap in pak))
-              |=  pax=path
-              [(slag len pax) (~(got by can) pax)]
-          ==
+        =+  mus=(must-ergo (turn (~(tap by erg.dat)) head))
+        =<  done:he
+        %-  emil
+        %+  turn  (~(tap by mus))
+        |=  [pot=term len=@ud pak=(set path)]
+        :*  u.hez  %give  %ergo  pot
+            %+  turn  (~(tap in pak))
+            |=  pax=path
+            [(slag len pax) (~(got by can) pax)]
         ==
       ::
       ++  he

From 76991344701fb15ffa46297b45ebef116721178f Mon Sep 17 00:00:00 2001
From: Joan Torres <joan@blueotter.net>
Date: Mon, 14 Sep 2015 11:31:02 -0700
Subject: [PATCH 07/38] Add ++murn jet

---
 arvo/hoon.hoon | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon
index 208bbb7ad4..2a92816dbd 100644
--- a/arvo/hoon.hoon
+++ b/arvo/hoon.hoon
@@ -696,6 +696,7 @@
   $(a t.a)
 ::
 ++  murn                                                ::  maybe transform
+  ~/  %murn
   |*  [a=(list) b=$+(* (unit))]
   |-
   ?~  a  ~

From 3bfe641b1c09149df516c835bcc1e8fcef4b85f3 Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Tue, 15 Sep 2015 20:24:44 -0400
Subject: [PATCH 08/38] added |cancel

---
 ape/hood.hoon  |  1 +
 arvo/clay.hoon | 33 ++++++++++++++++++++++++---------
 arvo/gall.hoon |  1 +
 arvo/zuse.hoon |  1 +
 lib/kiln.hoon  |  5 +++++
 5 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/ape/hood.hoon b/ape/hood.hoon
index 89e218f942..b9149f7d28 100644
--- a/ape/hood.hoon
+++ b/ape/hood.hoon
@@ -97,6 +97,7 @@
 ++  poke-kiln-cp            (wrap poke-cp):from-kiln
 ++  poke-kiln-label         (wrap poke-label):from-kiln
 ++  poke-kiln-merge         (wrap poke-merge):from-kiln
+++  poke-kiln-cancel        (wrap poke-cancel):from-kiln
 ++  poke-kiln-mount         (wrap poke-mount):from-kiln
 ++  poke-kiln-mv            (wrap poke-mv):from-kiln
 ++  poke-kiln-rm            (wrap poke-rm):from-kiln
diff --git a/arvo/clay.hoon b/arvo/clay.hoon
index ea54763739..fa844b5e2f 100644
--- a/arvo/clay.hoon
+++ b/arvo/clay.hoon
@@ -1171,6 +1171,15 @@
                 (bleb p.i.xiq +(u.nab) ?:(p.q.i.xiq ~ `[u.nab u.huy]))
       ==
     ==
+  ++  drop-me
+    ^+  .
+    ?~  mer
+      .
+    %-  emit(mer ~)  ^-  move  :*
+      hen.u.mer  %give  %mere  %|  %user-interrupt 
+      >sor.u.mer<  >our<  >cas.u.mer<  >gem.u.mer<  ~
+    ==
+  ::
   ++  ze
     |%
     ++  aeon-to-tako  ~(got by hit.dom)
@@ -1680,7 +1689,7 @@
         ?:  don
           ..me(mer `dat)
         =.  mer  ~
-        =>  (emit hen %give %mere gon.dat)
+        =>  (emit hen.dat %give %mere gon.dat)
         ..me
       ::
       ++  emit
@@ -2379,6 +2388,20 @@
       %boat
     :_  ..^$
     [hen %give %hill (turn (~(tap by mon.ruf)) head)]~
+  ::
+      %drop
+    =^  mos  ruf
+      =+  den=((de now hen ruf) [. .]:p.q.hic q.q.hic)
+      abet:drop-me:den
+    [mos ..^$]
+  ::
+      %info
+    ?:  =(%$ q.q.hic)
+      [~ ..^$]
+    =^  mos  ruf
+      =+  den=((de now hen ruf) [. .]:p.q.hic q.q.hic)
+      abet:(exec:den now r.q.hic)
+    [mos ..^$]
   ::
       %init
     :_  %_    ..^$
@@ -2393,14 +2416,6 @@
     ::
         ~
     ==
-  ::
-      %info
-    ?:  =(%$ q.q.hic)
-      [~ ..^$]
-    =^  mos  ruf
-      =+  den=((de now hen ruf) [. .]:p.q.hic q.q.hic)
-      abet:(exec:den now r.q.hic)
-    [mos ..^$]
   ::
       %into
     =.  hez.ruf  `hen
diff --git a/arvo/gall.hoon b/arvo/gall.hoon
index 05664dd45e..645ec68be1 100644
--- a/arvo/gall.hoon
+++ b/arvo/gall.hoon
@@ -1122,6 +1122,7 @@
         %deal  `%g
         %exec  `%f
         %flog  `%d
+        %drop  `%c
         %info  `%c
         %merg  `%c
         %mont  `%c
diff --git a/arvo/zuse.hoon b/arvo/zuse.hoon
index f6d71674f9..cdd591eff7 100644
--- a/arvo/zuse.hoon
+++ b/arvo/zuse.hoon
@@ -2360,6 +2360,7 @@
           ==                                            ::
 ++  kiss-clay                                           ::  in request ->$
           $%  [%boat ~]                                 ::  pier rebooted
+              [%drop p=@p q=@tas]                       ::  cancel pending merge
               [%info p=@p q=@tas r=nori]                ::  internal edit
               [%init p=@p]                              ::  report install
               [%into p=@tas q=? r=mode]                 ::  external edit
diff --git a/lib/kiln.hoon b/lib/kiln.hoon
index b291940e21..169569ec02 100644
--- a/lib/kiln.hoon
+++ b/lib/kiln.hoon
@@ -54,6 +54,7 @@
 =>  |%                                                ::  arvo structures
     ++  card                                          ::
       $%  [%exec wire @p ~ [beak silk]]               ::
+          [%drop wire @p @tas]                        ::
           [%info wire @p @tas nori]                   ::
           [%mont wire @tas @p @tas path]              ::
           [%ogre wire $|(@tas beam)]                  ::
@@ -118,6 +119,10 @@
   |=  kiln-merge
   abet:abet:(merge:(work syd) ali sud gim)
 ::
+++  poke-cancel
+  |=  syd=desk
+  abet:(emit %drop /cancel our syd)
+::
 ++  do-info
   |=  [mez=tape tor=toro]
   abet:(emit:(spam leaf/mez ~) %info /kiln our tor)

From 642b8da58e38a85bff6084f14722aa04832e5c17 Mon Sep 17 00:00:00 2001
From: Galen Wolfe-Pauly <mailroom@office-for.com>
Date: Wed, 16 Sep 2015 12:04:51 -0700
Subject: [PATCH 09/38] not sure how that got reverted

---
 lib/base.css | 619 +++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 529 insertions(+), 90 deletions(-)

diff --git a/lib/base.css b/lib/base.css
index bf2f4752e2..6a5cd5955b 100644
--- a/lib/base.css
+++ b/lib/base.css
@@ -70,113 +70,552 @@
   font-weight: 500;
   font-style: normal;
 }
-@font-face {
-  font-family: "scp";
-  src: url("//storage.googleapis.com/urbit-extra/scp-bold.woff");
-  font-weight: 600;
-  font-style: normal;
+body,
+html {
+  font-family: "bau", "Helvetica Neue", helvetica, arial, sans-serif;
 }
-@font-face {
-  font-family: "scp";
-  src: url("//storage.googleapis.com/urbit-extra/scp-black.woff");
-  font-weight: 700;
-  font-style: normal;
-}
-
-html,
-body {
-  margin: 0;
-  padding: 0;
-}
-
-html,
-input,
-button,
-body {
-  font-family: "bau";
-  font-size: 18px;
-}
-
-pre,
 code,
-.mono {
-  font-family:"scp";
+pre,
+li:before,
+.spin,
+#bred a,
+h3.time {
+  font-family: "scp", "Courier New", courier, monospace;
 }
-
-#c {
-  width: 32rem;
-  margin-left: -16rem;
-  position: absolute;
-  left: 50%;
+body,
+html {
+  font-size: 18px;
+  font-weight: 400;
+  line-height: 1.6rem;
+  -webkit-text-size-adjust: none;
+}
+a {
+  color: #000;
+  text-decoration: none;
+  border-bottom: 2px solid #000;
+  display: inline-block;
+  line-height: 0.8rem;
+}
+hr {
+  display: inline-block;
+  width: 6rem;
+  border: 0;
+  border-top: 2px solid #f4f4f4;
 }
-
 h1 {
-  font-size: 1.6rem;
-  font-weight: 500;
+  margin-top: 4rem;
 }
-
-h1:after {
-  content: "\2014";
-  margin-left: 1rem;
-}
-
-#c pre {
-  font-size: .6rem;
+h2,
+h3 {
+  margin: 0;
   margin-top: 2rem;
 }
-
-#pass {
-  width: 32rem;
-}
-
-button {
-  border: .3rem solid #000;
-  background-color: #fff;
-  font-size: 1rem;
-  padding: .3rem;
+h1,
+h2,
+h3,
+h4,
+strong {
   font-weight: 500;
 }
-
-.sig {
-  font-weight: 400;
-  font-size: 2rem;
-  display: inline;
-  vertical-align: middle;
+h4 {
+  margin-bottom: 0.3rem;
 }
-
-span#ship {
-  font-family: 'bau';
-  font-weight: 400;
-  font-size: 1.2rem;
-  text-transform: uppercase;
-  letter-spacing: .1rem;
+h5 {
+  font-style: italic;
+  font-weight: 200;
+  margin: 0;
+}
+h1 code,
+h2 code,
+h3 code {
+  font-size: inherit;
+  padding: 0.3rem;
+}
+pre,
+code {
+  font-size: 0.8rem;
+}
+pre {
+  background-color: #f5f5f5;
+  padding: 0.3rem;
+  margin-left: -0.3rem;
+}
+code {
+  line-height: 1.2rem;
+  background-color: #f4f4f4;
+  margin-top: -0.05rem;
+  padding: 0.2rem;
   display: inline-block;
-  min-width: 1rem;
 }
-
-input {
-  font-family: 'scp';
+ul {
+  list-style: none;
+  padding: 0;
+}
+li:before {
+  content: "+";
+  padding-right: 0.3rem;
+  font-size: 0.8rem;
+  font-weight: 600;
+}
+#nav,
+#cont {
+  left: 50%;
+}
+#cont {
+  width: 42rem;
+  margin-left: -21rem;
+  background-color: #fff;
+  z-index: 1;
+}
+#nav {
+  position: fixed;
+  top: 0rem;
+  width: 57rem;
+  padding-top: 1rem;
+  z-index: 0;
+  margin-left: -32rem;
+  overflow: hidden;
+  opacity: 0;
+  transition: opacity 1s ease-in-out;
+}
+#nav.moving {
+  opacity: 1;
+  transition: opacity 0.3s ease-in-out;
+}
+#nav:hover {
+  opacity: 1;
+  transition: opacity 0.3s ease-in-out;
+}
+#cont {
+  position: absolute;
+  top: 0;
+  margin-bottom: 9rem;
+}
+.loading {
+  display: inline-block;
+}
+.spin {
+  color: #fff;
+  padding: 0.6rem;
+  font-size: 0.7rem;
+  font-weight: 600;
+  letter-spacing: 0.1rem;
+  z-index: 3;
+}
+.loading > .spin {
+  background-color: #555;
+}
+#body .loading > .spin {
+  background-color: #000;
+}
+.spin.state-0:before {
+  content: "\2599";
+}
+.spin.state-1:before {
+  content: "\259B";
+}
+.spin.state-2:before {
+  content: "\259C";
+}
+.spin.state-3:before {
+  content: "\259F";
+}
+#load.load {
+  display: inline-block;
+  font-weight: 500;
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(10,10,10,0.4);
+  opacity: 1;
+  transition: opacity 1s ease-in-out;
+  z-index: 4;
+}
+img.logo {
+  height: 2rem;
+  width: 2rem;
+}
+h3.time {
+  margin-top: 0.3rem;
+  font-size: 0.7rem;
+  font-weight: 200;
+}
+#nav .links > div {
+  display: inline-block;
+  vertical-align: top;
+}
+#nav #sibs {
+  width: 8rem;
+  transition: margin-top 0.3s ease-in-out;
+  overflow: hidden;
+}
+#nav #sibs > div {
+  height: 20px;
+  margin-bottom: 4px;
+}
+.focus #sibs {
+  margin-top: 0 !important;
+  transition: margin-top 0.3s ease-in-out;
+}
+#nav a,
+.list > li > a {
+  text-transform: uppercase;
+  font-size: 0.7rem;
+  font-weight: 200;
+  letter-spacing: 1px;
+  white-space: nowrap;
+}
+.list > li > a {
+  border-bottom: none;
+  margin-bottom: 0.3rem;
+}
+#nav a,
+.list > li > a h1 {
+  border-bottom: 1px solid #000;
+  margin-right: 0.3rem;
+}
+#nav .active a {
+  font-weight: 500;
+  text-decoration: none;
+}
+#up {
+  padding-right: 1rem;
+  margin-top: -0.3rem;
+}
+#sides {
+  float: right;
+}
+#sides a {
+  margin-right: 0.6rem;
+}
+#nav .arow-up,
+#nav .arow-next,
+#nav .arow-prev {
+  width: 0;
+  height: 0;
+  border: 0.4rem solid transparent;
+}
+#nav .arow-up {
+  border-bottom: 0.6rem solid #000;
+}
+#nav .arow-next {
+  border-left: 0.6rem solid #000;
+}
+#nav .arow-prev {
+  border-right: 0.6rem solid #000;
+}
+#bred {
+  width: 5rem;
+  padding-right: 1rem;
+  text-align: right;
+  font-size: 0.6rem;
+  white-space: nowrap;
+  overflow: hidden;
+}
+#bred a {
+  text-transform: lowercase;
+  vertical-align: top;
+}
+#bred > div {
+  float: right;
+}
+#bred > div > div {
+  display: inline-block;
+  margin-top: -0.2rem;
+}
+#bred a,
+#kids a {
+  margin-right: 0.3rem;
+}
+#bred a {
+  margin-left: 0.3rem;
+}
+.short {
+  width: 32rem;
+}
+.list h1,
+.list li a > div p {
+  margin: 0;
+}
+.list li a > div,
+.list li a > div p {
   display: inline;
 }
-
-span#ship,
-input {
-  border: none;
-  padding: .3rem;
-  outline: none;
-  border-bottom: 3px solid #555;
+.list li a > div p {
+  margin-left: 0.3rem;
+}
+.list li a > div p:first-child {
+  margin-left: 0;
+}
+.list li a > div p code {
+  font-size: 0.7rem;
+  font-weight: 400;
+  text-transform: none;
+}
+.list li a h1 code {
+  text-transform: lowercase;
+  border-bottom: 1px solid #000;
+}
+.list li a code {
+  padding: 0.2rem;
+}
+.list h1,
+.list li a > div div {
+  display: inline;
+}
+.list li a > div div {
+  margin-left: 0.6rem;
+  overflow: hidden;
+}
+.list h1 {
+  font-size: 0.7rem;
+}
+.list.posts .post {
+  margin-bottom: 2rem;
+}
+.list.posts .post h1 {
+  text-transform: none;
+  font-size: 1.6rem;
+  line-height: 1.8rem;
+  margin-bottom: 1rem;
+  display: block;
+}
+.list.posts .post h2 {
+  font-size: 0.7rem;
+  font-weight: 400;
+  line-height: 1rem;
+  margin-top: 0;
+}
+.list.posts li.post:before {
+  content: "";
+}
+div.root h1 {
+  margin-bottom: 2rem;
+}
+div.root .list .sub {
+  margin-left: 0;
+  margin-right: 0.6rem;
+}
+div.root > p {
+  width: 27rem;
+  margin-top: 2rem;
+}
+h2.sub {
+  font-size: 0.7rem;
+  font-weight: 400;
+  line-height: 1rem;
+  letter-spacing: 1px;
+  margin-top: 0;
+  text-transform: uppercase;
+}
+div.post h1 {
+  font-size: 2.8rem;
+  line-height: 4rem;
+  display: block;
+  margin-top: 1rem;
+  margin-bottom: 1rem;
+}
+div.post h2 {
+  line-height: 1rem;
+  letter-spacing: 1px;
+}
+div.post h2 {
+  margin-top: 4rem;
+}
+div.post h2 {
+  font-size: 1.2rem;
+  font-weight: 500;
+}
+div.post p {
+  font-size: 1.2rem;
+  line-height: 2.2rem;
+}
+div.post li p {
+  display: inline;
+}
+div.toc {
+  margin-top: 3rem;
+  margin-bottom: 3rem;
+}
+div.toc h1,
+div.toc h2,
+div.toc h3,
+div.toc h4 {
+  font-weight: 400;
+  cursor: pointer;
+  text-decoration: underline;
+  font-size: 1.2rem;
+  margin-top: 0.3rem;
+  margin-bottom: 0.3rem;
+}
+div.toc h2 {
+  margin-left: 1rem;
+}
+div.toc h3 {
+  margin-left: 2rem;
+}
+div.toc h4 {
+  margin-left: 3rem;
+}
+div.toc h1.t {
+  font-weight: 500;
+  font-size: 2rem;
+  text-decoration: none;
+  margin-bottom: 2rem;
+}
+#body .CodeMirror {
+  font-size: 0.8rem;
+  line-height: 1rem;
+}
+#body .CodeMirror .cm-header {
+  font-weight: 200;
+}
+#body .CodeMirror-gutters {
+  background-color: #fff;
+  padding-right: 1rem;
+  margin-left: -1rem;
+}
+.error {
+  color: #f91733;
+}
+.warning {
+  background-color: #ff3537;
+  padding: 1rem;
+  width: 18rem;
+  margin: 2rem 0;
+  color: #fff;
+}
+.warning a {
+  color: inherit;
+  border-color: #fff;
+}
+.warning h1 {
+  font-size: 1rem;
+}
+.warning h1,
+.warning p {
+  margin: 0 0.3rem;
+}
+.warning.w {
+  width: auto;
+}
+@media only screen and (max-width: 1170px) {
+  #nav,
+  #nav > div,
+  #nav.up,
+  #nav.top,
+  #nav > .focus {
+    transform: translate3d(0, 0, 0);
+    -webkit-transform: translate3d(0, 0, 0);
+  }
+  #nav {
+    position: fixed;
+    top: 0;
+    opacity: 1;
+    width: 42rem;
+    margin-left: -21rem;
+    background-color: #fff;
+    z-index: 2;
+  }
+  #nav.m-down,
+  #nav.m-up {
+    position: absolute;
+  }
+  #nav.m-down.m-fixed {
+    position: fixed;
+    top: 0;
+  }
+  #nav > div {
+    max-height: 1rem;
+    overflow: hidden;
+    transition: max-height 0.3s ease-in-out;
+  }
+  #nav > .focus {
+    max-height: 40rem;
+    transition: max-height 0.3s ease-in-out;
+  }
+  #cont {
+    top: 3rem;
+  }
+}
+@media only screen and (min-width: 320px) and (max-width: 1024px) {
+  body,
+  html {
+    font-size: 21px;
+  }
+  #nav,
+  #cont {
+    width: 94%;
+    padding-left: 3%;
+    margin-left: 0;
+  }
+  #nav {
+    position: fixed;
+    padding-top: 0;
+    opacity: 1;
+    left: 0;
+    background-color: #fff;
+    z-index: 2;
+  }
+  #nav > div {
+    max-height: 1.4rem;
+  }
+  #nav > div {
+    padding-top: 0.6rem;
+  }
+  #nav #sibs {
+    width: 18rem;
+  }
+  #nav #sibs > div {
+    height: 20px;
+    line-height: 20px;
+  }
+  #nav a {
+    display: inline-block;
+    font-size: 0.7rem;
+  }
+  #nav #sides {
+    float: right;
+  }
+  #nav .arow-up,
+  #nav .arow-next,
+  #nav .arow-prev {
+    margin-right: 0;
+    border: 0.4rem solid transparent;
+  }
+  #nav .arow-up {
+    border-bottom: 0.6rem solid #000;
+  }
+  #nav .arow-next {
+    border-left: 0.6rem solid #000;
+  }
+  #nav .arow-prev {
+    margin-right: 1rem;
+    border-right: 0.6rem solid #000;
+  }
+  #cont {
+    top: 3rem;
+    left: 0;
+    padding-bottom: 9rem;
+  }
+  #cont h1:first-child {
+    margin-top: 0;
+  }
+  .short {
+    width: 100%;
+  }
 }
-
 @media only screen and (min-device-width: 320px) and (max-device-width: 480px) {
-  #c {
-    width: 16rem;
-    margin-left: -8rem;
+  #nav > div {
+    max-height: 1.6rem;
   }
-  #pass {
-    width: 16rem;
+  #nav a {
+    font-size: 0.7rem;
   }
-  input {
-    -webkit-appearance: none;
-    border-radius: 0;
+  #nav #sibs > div {
+    height: 20px;
+    line-height: 20px;
   }
-}
+}
\ No newline at end of file

From 58ddbe73fab7174e80adbe70cf2aa4c803ed48d7 Mon Sep 17 00:00:00 2001
From: Joan Torres <joan.torres@upr.edu>
Date: Wed, 16 Sep 2015 13:29:39 -0700
Subject: [PATCH 10/38] Add ++reap jet

---
 arvo/hoon.hoon | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon
index 2a92816dbd..00abc708d9 100644
--- a/arvo/hoon.hoon
+++ b/arvo/hoon.hoon
@@ -706,6 +706,7 @@
   [i=u.c t=$(a t.a)]
 ::
 ++  reap                                                ::  replicate
+  ~/  %reap
   |*  [a=@ b=*]
   |-  ^-  (list ,_b)
   ?~  a  ~

From aaa9022a4815fc70830130c9af189449a883a496 Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Wed, 16 Sep 2015 18:39:11 -0400
Subject: [PATCH 11/38] autoreload and autoreset

---
 ape/hood.hoon  |  9 ++++++++-
 arvo/dill.hoon | 14 +++++++++++++-
 lib/kiln.hoon  | 32 +++++++++++++++++++++++++++++++-
 3 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/ape/hood.hoon b/ape/hood.hoon
index b9149f7d28..6550386207 100644
--- a/ape/hood.hoon
+++ b/ape/hood.hoon
@@ -56,6 +56,11 @@
   ~?  ?=(^ saw)  [%kiln-spam-lame u.saw]
   [~ +>]
 ::
+++  coup-kiln-reload                                    ::
+  |=  [way=wire saw=(unit tang)]
+  ~?  ?=(^ saw)  [%kiln-reload-lame u.saw]
+  [~ +>]
+::
 ++  coup-drum-phat  (wrap take-coup-phat):from-drum
 ++  coup-helm-hi    (wrap coup-hi):from-helm
 ++  diff-sole-effect-drum-phat  (wrap diff-sole-effect-phat):from-drum
@@ -103,11 +108,13 @@
 ++  poke-kiln-rm            (wrap poke-rm):from-kiln
 ++  poke-kiln-schedule      (wrap poke-schedule):from-kiln
 ++  poke-kiln-sync          (wrap poke-sync):from-kiln
+++  poke-kiln-autoload      (wrap poke-autoload):from-kiln
 ++  poke-kiln-unmount       (wrap poke-unmount):from-kiln
 ++  poke-kiln-unsync        (wrap poke-unsync):from-kiln
 ++  poke-will               (wrap poke-will):from-helm
 ++  quit-drum-phat          (wrap quit-phat):from-drum
 ++  reap-drum-phat          (wrap reap-phat):from-drum
 ++  woot-helm               (wrap take-woot):from-helm
-++  writ-kiln-sync          (wrap take-writ):from-kiln
+++  writ-kiln-autoload      (wrap take-writ-autoload):from-kiln
+++  writ-kiln-sync          (wrap take-writ-sync):from-kiln
 --
diff --git a/arvo/dill.hoon b/arvo/dill.hoon
index 42c21e7644..8898280ed7 100644
--- a/arvo/dill.hoon
+++ b/arvo/dill.hoon
@@ -216,6 +216,7 @@
         =.  +>  (sync %home our %base)
         =.  +>  ?.  ?=(?(%king %czar) can)  +>
                 (sync %kids our %base)
+        =.  +>  autoload
         =.  +>  peer
         |-  ^+  +>+
         ?~  myt  +>+
@@ -255,7 +256,18 @@
         %_    +>.$
             moz
           :_  moz
-          [hen %pass ~ %g %deal [our our] ram %poke %hood-sync -:!>(syn) syn]
+          :*  hen  %pass  /sync  %g  %deal  [our our]
+              ram  %poke  %hood-sync  -:!>(syn)  syn
+          ==
+        ==
+      ::
+      ++  autoload
+        %_    .
+            moz
+          :_  moz
+          :*  hen  %pass  /autoload  %g  %deal  [our our]
+              ram  %poke  %kiln-autoload  [%cube ~ [%atom %n]]  ~
+          ==
         ==
       ::
       ++  pump                                          ::  send diff ack
diff --git a/lib/kiln.hoon b/lib/kiln.hoon
index 169569ec02..a625a73626 100644
--- a/lib/kiln.hoon
+++ b/lib/kiln.hoon
@@ -65,6 +65,8 @@
     ++  pear                                          ::  poke fruit
       $%  [%talk-command command:talk]                ::
           [%kiln-merge kiln-merge]                    ::
+          [%helm-reload (list term)]                  ::
+          [%helm-reset ~]                             ::
       ==                                              ::
     ++  move  (pair bone card)                        ::  user-level move
     --
@@ -153,6 +155,18 @@
   =+  old=;;((map ,@da cord) (fall (file where) ~))
   (foal where %sched !>((~(put by old) tym eve)))
 ::
+++  poke-autoload
+  |=  ~
+  =<  abet
+  %-  emil
+  %+  turn
+    `(list term)`~[%ames %behn %clay %dill %eyre %ford %gall %zuse %hoon]
+  |=  syd=term
+  ^-  card
+  :*  %warp  /kiln/autoload/[syd]  [our our]  %home  ~
+      %next  %y  da/now  /arvo/[syd]/hoon
+  ==
+::
 ++  take  |=(way=wire ?>(?=([@ ~] way) (work i.way))) ::  general handler
 ++  take-mere                                         ::
   |=  [way=wire are=(each (set path) (pair term tang))]
@@ -176,7 +190,7 @@
       ==
   abet:abet:(mere:(auto hos) mes)
 ::
-++  take-writ                                         ::
+++  take-writ-sync                                    ::
   |=  [way=wire rot=riot]
   ?>  ?=([@ @ @ ~] way)
   =+  ^-  hos=kiln-sync
@@ -186,6 +200,22 @@
       ==
   abet:abet:(writ:(auto hos) rot)
 ::
+++  take-writ-autoload
+  |=  [way=wire rot=riot]
+  ?>  ?=([@ ~] way)
+  ?>  ?=(^ rot)
+  =+  syd=(slav %tas i.way)
+  =.  +>.$
+    ?:  ?=(%hoon syd)
+      (emit %poke /kiln/reload/[syd] [our %hood] %helm-reset ~)
+    (emit %poke /kiln/reload/[syd] [our %hood] %helm-reload ~[syd])
+  =.  +>.$
+    %-  emit  :*
+      %warp  /kiln/autoload/[syd]  [our our]  %home  ~
+      %next  %y  da/now  /arvo/[syd]/hoon
+    ==
+  abet
+::
 ++  spam
   |=  mes=(list tank)
   ((slog mes) ..spam)

From a84fb403f6e7370104b2dce81a3a8a77506c5229 Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Wed, 16 Sep 2015 19:40:53 -0400
Subject: [PATCH 12/38] turn off autoload with |autoload

---
 ape/hood.hoon          | 81 +++++++++++++++++++++---------------------
 arvo/dill.hoon         |  2 +-
 gen/hood/autoload.hoon | 13 +++++++
 lib/kiln.hoon          | 10 ++++++
 4 files changed, 65 insertions(+), 41 deletions(-)
 create mode 100644 gen/hood/autoload.hoon

diff --git a/ape/hood.hoon b/ape/hood.hoon
index 6550386207..a14cf7d4ee 100644
--- a/ape/hood.hoon
+++ b/ape/hood.hoon
@@ -77,44 +77,45 @@
 ++  from-helm  (from-lib %helm [..$ ,_abet]:(helm))
 ++  from-kiln  (from-lib %kiln [..$ ,_abet]:(kiln))
 ::
-++  init-helm               |=([way=wire *] [~ +>])
-++  made-kiln               (wrap take-made):from-kiln
-++  mere-kiln               (wrap take-mere):from-kiln
-++  mere-kiln-sync          (wrap take-mere-sync):from-kiln
-++  note-helm               (wrap take-note):from-helm
-++  onto-drum               (wrap take-onto):from-drum
-++  peer-drum               (wrap peer):from-drum
-++  poke-dill-belt          (wrap poke-dill-belt):from-drum
-++  poke-drum-link          (wrap poke-link):from-drum
-::++  poke-drum-exit          (wrap poke-exit):from-drum
-++  poke-drum-start         (wrap poke-start):from-drum
-++  poke-helm-hi            (wrap poke-hi):from-helm
-++  poke-helm-init          (wrap poke-init):from-helm
-++  poke-helm-invite        (wrap poke-invite):from-helm
-++  poke-helm-mass          (wrap poke-mass):from-helm
-++  poke-helm-reload        (wrap poke-reload):from-helm
-++  poke-helm-reload-desk   (wrap poke-reload-desk):from-helm
-++  poke-helm-reset         (wrap poke-reset):from-helm
-++  poke-helm-send-hi       (wrap poke-send-hi):from-helm
-++  poke-helm-verb          (wrap poke-verb):from-helm
-++  poke-helm-begin         (wrap poke-begin):from-helm
-++  poke-hood-sync          (wrap poke-sync):from-kiln
-++  poke-kiln-cp            (wrap poke-cp):from-kiln
-++  poke-kiln-label         (wrap poke-label):from-kiln
-++  poke-kiln-merge         (wrap poke-merge):from-kiln
-++  poke-kiln-cancel        (wrap poke-cancel):from-kiln
-++  poke-kiln-mount         (wrap poke-mount):from-kiln
-++  poke-kiln-mv            (wrap poke-mv):from-kiln
-++  poke-kiln-rm            (wrap poke-rm):from-kiln
-++  poke-kiln-schedule      (wrap poke-schedule):from-kiln
-++  poke-kiln-sync          (wrap poke-sync):from-kiln
-++  poke-kiln-autoload      (wrap poke-autoload):from-kiln
-++  poke-kiln-unmount       (wrap poke-unmount):from-kiln
-++  poke-kiln-unsync        (wrap poke-unsync):from-kiln
-++  poke-will               (wrap poke-will):from-helm
-++  quit-drum-phat          (wrap quit-phat):from-drum
-++  reap-drum-phat          (wrap reap-phat):from-drum
-++  woot-helm               (wrap take-woot):from-helm
-++  writ-kiln-autoload      (wrap take-writ-autoload):from-kiln
-++  writ-kiln-sync          (wrap take-writ-sync):from-kiln
+++  init-helm                 |=([way=wire *] [~ +>])
+++  made-kiln                 (wrap take-made):from-kiln
+++  mere-kiln                 (wrap take-mere):from-kiln
+++  mere-kiln-sync            (wrap take-mere-sync):from-kiln
+++  note-helm                 (wrap take-note):from-helm
+++  onto-drum                 (wrap take-onto):from-drum
+++  peer-drum                 (wrap peer):from-drum
+++  poke-dill-belt            (wrap poke-dill-belt):from-drum
+++  poke-drum-link            (wrap poke-link):from-drum
+::++  poke-drum-exit            (wrap poke-exit):from-drum
+++  poke-drum-start           (wrap poke-start):from-drum
+++  poke-helm-hi              (wrap poke-hi):from-helm
+++  poke-helm-init            (wrap poke-init):from-helm
+++  poke-helm-invite          (wrap poke-invite):from-helm
+++  poke-helm-mass            (wrap poke-mass):from-helm
+++  poke-helm-reload          (wrap poke-reload):from-helm
+++  poke-helm-reload-desk     (wrap poke-reload-desk):from-helm
+++  poke-helm-reset           (wrap poke-reset):from-helm
+++  poke-helm-send-hi         (wrap poke-send-hi):from-helm
+++  poke-helm-verb            (wrap poke-verb):from-helm
+++  poke-helm-begin           (wrap poke-begin):from-helm
+++  poke-hood-sync            (wrap poke-sync):from-kiln
+++  poke-kiln-cp              (wrap poke-cp):from-kiln
+++  poke-kiln-label           (wrap poke-label):from-kiln
+++  poke-kiln-merge           (wrap poke-merge):from-kiln
+++  poke-kiln-cancel          (wrap poke-cancel):from-kiln
+++  poke-kiln-mount           (wrap poke-mount):from-kiln
+++  poke-kiln-mv              (wrap poke-mv):from-kiln
+++  poke-kiln-rm              (wrap poke-rm):from-kiln
+++  poke-kiln-schedule        (wrap poke-schedule):from-kiln
+++  poke-kiln-sync            (wrap poke-sync):from-kiln
+++  poke-kiln-start-autoload  (wrap poke-start-autoload):from-kiln
+++  poke-kiln-autoload        (wrap poke-autoload):from-kiln
+++  poke-kiln-unmount         (wrap poke-unmount):from-kiln
+++  poke-kiln-unsync          (wrap poke-unsync):from-kiln
+++  poke-will                 (wrap poke-will):from-helm
+++  quit-drum-phat            (wrap quit-phat):from-drum
+++  reap-drum-phat            (wrap reap-phat):from-drum
+++  woot-helm                 (wrap take-woot):from-helm
+++  writ-kiln-autoload        (wrap take-writ-autoload):from-kiln
+++  writ-kiln-sync            (wrap take-writ-sync):from-kiln
 --
diff --git a/arvo/dill.hoon b/arvo/dill.hoon
index 8898280ed7..e5ce331270 100644
--- a/arvo/dill.hoon
+++ b/arvo/dill.hoon
@@ -266,7 +266,7 @@
             moz
           :_  moz
           :*  hen  %pass  /autoload  %g  %deal  [our our]
-              ram  %poke  %kiln-autoload  [%cube ~ [%atom %n]]  ~
+              ram  %poke  %kiln-start-autoload  [%cube ~ [%atom %n]]  ~
           ==
         ==
       ::
diff --git a/gen/hood/autoload.hoon b/gen/hood/autoload.hoon
new file mode 100644
index 0000000000..5476276a15
--- /dev/null
+++ b/gen/hood/autoload.hoon
@@ -0,0 +1,13 @@
+::
+::::  /hoon/autoload/hood/gen
+  ::
+/?  314
+::
+::::
+  !:
+:-  %say
+|=  $:  [now=@da eny=@uvI bec=beak]
+        [arg=?(~ [? ~]) ~]
+    ==
+:-  %kiln-autoload
+`(unit ,?)`?~(arg ~ `-.arg)
diff --git a/lib/kiln.hoon b/lib/kiln.hoon
index a625a73626..f04328bf2e 100644
--- a/lib/kiln.hoon
+++ b/lib/kiln.hoon
@@ -10,6 +10,7 @@
 ++  kiln-pith                                           ::
     $:  rem=(map desk kiln-desk)                        ::
         syn=(map kiln-sync ,[let=@ud ust=bone])         ::
+        autoload=?                                      ::
     ==                                                  ::
 ++  kiln-desk                                           ::  per-desk state
     $:  auto=?                                          ::  escalate on failure
@@ -156,6 +157,13 @@
   (foal where %sched !>((~(put by old) tym eve)))
 ::
 ++  poke-autoload
+  |=  lod=(unit ,?)
+  ?^  lod
+    abet(autoload u.lod)
+  =<  abet(autoload !autoload)
+  (spam leaf/"turning autoload o{?:(autoload "ff" "n")}" ~)
+::
+++  poke-start-autoload
   |=  ~
   =<  abet
   %-  emil
@@ -206,6 +214,8 @@
   ?>  ?=(^ rot)
   =+  syd=(slav %tas i.way)
   =.  +>.$
+    ?.  autoload
+      +>.$
     ?:  ?=(%hoon syd)
       (emit %poke /kiln/reload/[syd] [our %hood] %helm-reset ~)
     (emit %poke /kiln/reload/[syd] [our %hood] %helm-reload ~[syd])

From 5de171f23d75f832d3e3ea808045c970ecf4ec49 Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Wed, 16 Sep 2015 19:45:54 -0400
Subject: [PATCH 13/38] RIP %indirect

---
 arvo/clay.hoon | 34 +---------------------------------
 arvo/zuse.hoon |  1 -
 2 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/arvo/clay.hoon b/arvo/clay.hoon
index fa844b5e2f..0d8178fc97 100644
--- a/arvo/clay.hoon
+++ b/arvo/clay.hoon
@@ -974,30 +974,6 @@
       !!
     ==
   ::
-  ++  rand-to-rant
-    |=  rut=rand
-    ^+  +>
-    ~|  [%x-over-network-not-implemented [p q -.r]:rut hen]  !!
-    ::  %-  emit
-    ::  :*  hen
-    ::      [%foreign-plops (scot %p our) (scot %p her) syd ~]
-    ::      %f  %exec  our  ~  %tabl
-    ::      ^-  (list (pair silk silk))
-    ::      %+  turn  (~(tap in pop))
-    ::      |=  a=plop
-    ::      ?-    -.a
-    ::          %delta
-    ::        :-  [%$ %blob !>([%delta p.a q.a *cage])]
-    ::        [%vale p.r.a q.r.a]
-    ::      ::
-    ::          %direct
-    ::        :-  [%$ %blob !>([%direct p.a *cage])]
-    ::        [%vale p.q.a q.q.a]
-    ::      ::
-    ::          %indirect  ~|  %foreign-indirect-not-implemented  !!
-    ::      ==
-    ::  ==
-  ::
   ++  validate-x
     |=  [car=care cas=case pax=path peg=page]
     ^+  +>
@@ -1034,7 +1010,6 @@
         ?-    -.a
             %delta   [[%$ %blob !>([%delta p.a q.a *page])] [%vale p.r.a q.r.a]]
             %direct  [[%$ %blob !>([%direct p.a *page])] [%vale p.q.a q.q.a]]
-            %indirect  ~|  %foreign-indirect-not-implemented  !!
         ==
     ==
   ::
@@ -1053,7 +1028,6 @@
         ?-  -.bol
           %delta      [-.bol p.bol q.bol p.cay q.q.cay]
           %direct     [-.bol p.bol p.cay q.q.cay]
-          %indirect   ~|  %plop-indirect-not-implemented  !!
         ==
     %^    apply-foreign-update
         lem
@@ -1192,7 +1166,6 @@
       ?-  -
         %delta      p.q
         %direct     p.q
-        %indirect   p.q
       ==
     ++  lobe-to-silk                  ::  XX  maybe move hoo{n,k} stuff here
       |=  [pax=path lob=lobe]
@@ -1210,7 +1183,6 @@
       =+  bol=(~(got by lat.ran) lob)
       ?-  -.bol
         %direct     [%volt q.bol]
-        %indirect   [%volt q.bol]
         %delta      ~|  delta/q.q.bol
                     [%pact $(lob q.q.bol) [%volt r.bol]]
       ==
@@ -1443,7 +1415,6 @@
       ?-  -.gar
         %direct    (~(put in far) lob)
         %delta     (~(put in $(lob q.q.gar)) lob)
-        %indirect  (~(put in $(lob r.gar)) lob)
       ==
     ::
     ++  data-twixt-takos
@@ -1526,8 +1497,6 @@
       =+  bol=(lobe-to-blob u.lob)
       ?:  ?=(%direct -.bol)
         ((hard ,@t) q.q.bol)
-      ?:  ?=(%indirect -.bol)
-        ((hard ,@t) q.q.bol)
       ?>  ?=(%delta -.bol)
       =+  txt=$(u.lob q.q.bol)
       ?>  ?=(%txt-diff p.r.bol)
@@ -1617,7 +1586,7 @@
       ::    %-  ~(run by hat)
       ::    |=  a=lobe
       ::    =+  (lobe-to-blob a)
-      ::    ?-(-.- %direct q.-, %indirect q.-, %delta !!)
+      ::    ?-(-.- %direct q.-, %delta !!)
       ::`+>.$(ank.dom (checkout-ankh -), let.dom yon)
     ::
     ++  update-lat                                      ::   update-lat:ze
@@ -2330,7 +2299,6 @@
           =+  bol=(~(got by lat.ran) lob)
           ?-  -.bol
             %direct     [%volt q.bol]
-            %indirect   [%volt q.bol]
             %delta      [%pact $(lob q.q.bol) [%volt r.bol]]
           ==
         ::
diff --git a/arvo/zuse.hoon b/arvo/zuse.hoon
index cdd591eff7..08b2e31ae9 100644
--- a/arvo/zuse.hoon
+++ b/arvo/zuse.hoon
@@ -1836,7 +1836,6 @@
 ++  blob                                                ::  fs blob
           $%  [%delta p=lobe q=[p=mark q=lobe] r=page]  ::  delta on q
               [%direct p=lobe q=page]                   ::  immediate
-              [%indirect p=lobe q=page r=lobe s=page]   ::  both
           ==                                            ::
 ++  boat  (map (pair bone wire) (trel bean ship path))  ::  outgoing subs
 ++  boon                                                ::  fort output

From 7c5860412ae2e9f14f5ea371b85810bc32d694b1 Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Thu, 17 Sep 2015 15:10:01 -0400
Subject: [PATCH 14/38] fix %talk-telegrams

---
 mar/talk/telegrams.hoon | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mar/talk/telegrams.hoon b/mar/talk/telegrams.hoon
index 94142098d8..eacff085a0 100644
--- a/mar/talk/telegrams.hoon
+++ b/mar/talk/telegrams.hoon
@@ -71,7 +71,7 @@
       set-title/so
       set-description/so
       set-done/bo
-      add-comment/so
+      add-comment/(ot ship/(su fed:ag) com/so ~)
     ==
   --
 ++  grow-work-duty
@@ -123,7 +123,7 @@
       %set-title        [%s til]
       %set-description  [%s des]
       %set-done         [%b don]
-      %add-comment      [%s com]
+      %add-comment      (jobe ship/(jope who) com/[%s com] ~)
     ==
   --
 ++  grab

From 646fa7cf1424688887f119e6710c62670efdef20 Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Thu, 17 Sep 2015 19:20:07 -0400
Subject: [PATCH 15/38] :+merge -> |merge

---
 lib/kiln.hoon | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/kiln.hoon b/lib/kiln.hoon
index f04328bf2e..b79972e0ff 100644
--- a/lib/kiln.hoon
+++ b/lib/kiln.hoon
@@ -289,7 +289,7 @@
       ?+  p.p.mes
         :*  (render "sync failed" sud her syd)
             leaf/"please manually merge the desks with"
-            leaf/":+merge %{(trip syd)} {(scow %p her)} %{(trip sud)}"
+            leaf/"|merge %{(trip syd)} {(scow %p her)} %{(trip sud)}"
             leaf/""
             leaf/"error code: {<p.p.mes>}"
             q.p.mes
@@ -502,7 +502,7 @@
             """
             done setting up scratch space in {<[-]>}
             please resolve the following conflicts and run
-            :+merge {<syd>} our {<[-]>}
+            |merge {<syd>} our {<[-]>}
             """
             %^  tanks-if-any
               "annotated conflicts in:"  annotated

From 0bfa034edb6e67f3d4a2264bbc01f88dfc691a77 Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Fri, 18 Sep 2015 16:45:09 -0400
Subject: [PATCH 16/38] added clay architecture doc

---
 pub/doc/arvo/clay/architecture.md | 415 ++++++++++++++++++++++++++++++
 1 file changed, 415 insertions(+)
 create mode 100644 pub/doc/arvo/clay/architecture.md

diff --git a/pub/doc/arvo/clay/architecture.md b/pub/doc/arvo/clay/architecture.md
new file mode 100644
index 0000000000..ed65ccd264
--- /dev/null
+++ b/pub/doc/arvo/clay/architecture.md
@@ -0,0 +1,415 @@
+# clay
+
+## high-level
+
+clay is the primary filesystem for the arvo operating system,
+which is the core of an urbit. The architecture of clay is
+intrinsically connected with arvo, but we assume no knowledge of
+either arvo or urbit. We will point out only those features of
+arvo that are necessary for an understanding of clay, and we will
+do so only when they arise.
+
+The first relevant feature of arvo is that it is a deterministic
+system where input and output are defined as a series of events
+and effects. The state of arvo is simply a function of its event
+log. None of the effects from an event are emitted until the
+event is entered in the log and persisted, either to disk or
+another trusted source of persistence, such as a Kafka cluster.
+Consequently, arvo is a single-level store: everything in its
+state is persistent. 
+
+In a more traditional OS, everything in RAM can be erased at any
+time by power failure, and is always erased on reboot. Thus, a
+primary purpose of a filesystem is to ensure files persist across
+power failures and reboots.  In arvo, both power failures and
+reboots are special cases of suspending computation, which is
+done safely since our event log is already persistent. Therefore,
+clay is not needed in arvo for persistence. Why, then, do we have a
+filesystem? There are two answers to this question.
+
+First, clay provides a filesystem tree, which is a convenient
+user interface for some applications. Unix has the useful concept
+of virtual filesystems, which are used for everything from direct
+access to devices, to random number generators, to the /proc
+tree. It is easy and intuitive to read from and write to a
+filesystem tree.
+
+Second, clay has a distributed revision control system baked into
+it.  Traditional filesystems are not revision controlled, so
+userspace software -- such as git -- is written on top of them to
+do so. clay natively provides the same functionality as modern
+DVCSes, and more.
+
+clay has two other unique properties that we'll cover later on:
+it supports typed data and is referentially transparent. 
+
+### Revision Control
+
+Every urbit has one or more "desks", which are independently
+revision-controlled branches. Each desk contains its own mark
+definitions, apps, doc, and so forth.
+
+Traditionally, an urbit has at least a base and a home desk. The
+base desk has all the system software from the distribution. the
+home desk is a fork of base with all the stuff specific to the
+user of the urbit.
+
+A desk is a series of numbered commits, the most recent of which
+represents the current state of the desk. A commit is composed of
+(1) an absolute time when it was created, (2) a list of zero or
+more parents, and (3) a map from paths to data.
+
+Most commits have exactly one parent, but the initial commit on a
+desk may have zero parents, and merge commits have more than one
+parent.
+
+The non-meta data is stored in the map of paths to data. It's
+worth noting that no constraints are put on this map, so, for
+example, both /a/b and /a/b/c could have data. This is impossible
+in a traditional Unix filesystem since it means that /a/b is both
+a file and a directory. Conventionally, the final element in the
+path is its mark -- much like a filename extension in Unix. Thus,
+/doc/readme.md in Unix is stored as /doc/readme/md in urbit.
+
+The data is not stored directly in the map; rather, a hash of the
+data is stored, and we maintain a master blob store. Thus, if the
+same data is referred to in multiple commits (as, for example,
+when a file doesn't change between commits), only the hash is
+duplicated.
+
+In the master blob store, we either store the data directly, or
+else we store a diff against another blob. The hash is dependent
+only on the data within and not on whether or not it's stored
+directly, so we may on occasion rearrange the contents of the
+blob store for performance reasons.
+
+Recall that a desk is a series of numbered commits. Not every
+commit in a desk must be numbered. For example, if the base desk
+has had 50 commits since home was forked from it, then a merge
+from base to home will only add a single revision number to home,
+although the full commit history will be accessible by traversing
+the parentage of the individual commits.
+
+We do guarantee that the first commit is numbered 1, commits are
+numbered consecutively after that (i.e. there are no "holes"),
+the topmost commit is always numbered, and every numbered commit
+is an ancestor of every later numbered commit.
+
+There are three ways to refer to particular commits in the
+revision history.  Firstly, one can use the revision number.
+Secondly, one can use any absolute time between the one numbered
+commit and the next (inclusive of the first, exclusive of the
+second). Thirdly, every desk has a map of labels to revision
+numbers. These labels may be used to refer to specific commits.
+
+Additionally, clay is a global filesystem, so data on other urbit
+is easily accessible the same way as data on our local urbit.  In
+general, the path to a particular revision of a desk is
+/~urbit-name/desk-name/revision.  Thus, to get /try/readme/md
+from revision 5 of the home desk on ~sampel-sipnym, we refer to
+/~sampel-sipnym/home/5/try/readme/md.  Clay's namespace is thus
+global and referentially transparent.
+
+XXX reactivity here?
+
+### A Typed Filesystem
+
+Since clay is a general filesystem for storing data of arbitrary
+types, in order to revision control correctly it needs to be
+aware of types all the way through.  Traditional revision control
+does an excellent job of handling source code, so for source code
+we act very similar to traditional revision control. The
+challenge is to handle other data similarly well.
+
+For example, modern VCSs generally support "binary files", which
+are files for which the standard textual diffing, patching, and
+merging algorithms are not helpful. A "diff" of two binary files
+is just a pair of the files, "patching" this diff is just
+replacing the old file with the new one, and "merging"
+non-identical diffs is always a conflict, which can't even be
+helpfully annotated. Without knowing anything about the structure
+of a blob of data, this is the best we can do.
+
+Often, though, "binary" files have some internal structure, and
+it is possible to create diff, patch, and merge algorithms that
+take advantage of this structure. An image may be the result of a
+base image with some set of operations applied. With algorithms
+aware of this set of operations, not only can revision control
+software save space by not having to save every revision of the
+image individually, these transformations can be made on parallel
+branches and merged at will.
+
+Suppose Alice is tasked with touching up a picture, improving the
+color balance, adjusting the contrast, and so forth, while Bob
+has the job of cropping the picture to fit where it's needed and
+adding textual overlay.  Without type-aware revision control,
+these changes must be made serially, requiring Alice and Bob to
+explicitly coordinate their efforts. With type-aware revision
+control, these operations may be performed in parallel, and then
+the two changesets can be merged programmatically.
+
+Of course, even some kinds of text files may be better served by
+diff, patch, and merge algorithms aware of the structure of the
+files. Consider a file containing a pretty-printed JSON object.
+Small changes in the JSON object may result in rather significant
+changes in how the object is pretty-printed (for example, by
+addding an indentation level, splitting a single line into
+multiple lines).
+
+A text file wrapped at 80 columns also reacts suboptimally with
+unadorned Hunt-McIlroy diffs. A single word inserted in a
+paragraph may push the final word or two of the line onto the
+next line, and the entire rest of the paragraph may be flagged as
+a change. Two diffs consisting of a single added word to
+different sentences may be flagged as a conflict. In general,
+prose should be diffed by sentence, not by line.
+
+As far as the author is aware, clay is the first generalized,
+type-aware revision control system.  We'll go into the workings
+of this system in some detail.
+
+### Marks
+
+Central to a typed filesystem is the idea of types. In clay, we
+call these "marks". A mark is a file that defines a type,
+conversion routines to and from the mark, and diff, patch, and
+merge routines.
+
+For example, a `%txt` mark may be a list of lines of text, and it
+may include conversions to `%mime` to allow it to be serialized
+and sent to a browswer or to the unix filesystem. It will also
+include Hunt-McIlroy diff, patch, and merge algorithms.
+
+A `%json` mark would be defined as a json object in the code, and
+it would have a parser to convert from `%txt` and a printer to
+convert back to `%txt`. The diff, patch, and merge algorithms are
+fairly straightforward for json, though they're very different
+from the text ones.
+
+More formally, a mark is a core with three arms, `++grab`,
+`++grow`, and `++grad`. In `++grab` is a series of functions to
+convert from other marks to the given mark.  In `++grow` is a
+series of functions to convert from the given mark to other
+marks. In `++grad` is `++diff`, `++pact`, `++join`, and `++mash`.
+
+The types are as follows, in an informal pseudocode:
+
+    ++  grab:
+      ++  mime: <mime> -> <mark-type>
+      ++  txt: <txt> -> <mark-type>
+      ...
+    ++  grow:
+      ++  mime: <mark-type> -> <mime>
+      ++  txt: <mark-type> -> <txt>
+      ...
+    ++  grad
+      ++  diff: (<mark-type>, <mark-type>) -> <diff-type>
+      ++  pact: (<mark-type>, <diff-type>) -> <mark-type>
+      ++  join: (<diff-type>, <diff-type>) -> <diff-type> or NULL
+      ++  mash: (<diff-type>, <diff-type>) -> <diff-type>
+
+These types are basically what you would expect. Not every mark
+has each of these functions defined -- all of them are optional
+in the general case.
+
+In general, for a particular mark, the `++grab` and `++grow` entries
+(if they exist) should be inverses of each other.
+
+In `++grad`, `++diff` takes two instances of a mark and produces
+a diff of them. `++pact` takes an instance of a mark and patches
+it with the given diff. `++join` takes two diffs and attempts to
+merge them into a single diff. If there are conflicts, it
+produces null. `++mash` takes two diffs and forces a merge,
+annotating any conflicts.
+
+In general, if `++diff` called with A and B produces diff D, then
+`++pact` called with A and D should produce B. Also, if `++join`
+of two diffs does not produce null, then `++mash` of the same
+diffs should produce the same result.
+
+Alternately, instead of `++diff`, `++pact`, `++join`, and
+`++mash`, a mark can provide the same functionality by defining
+`++sted` to be the name of another mark to which we wish to
+delegate the revision control responsibilities. Then, before
+running any of those functions, clay will convert to the other
+mark, and convert back afterward. For example, the `%hoon` mark
+is revision-controlled in the same way as `%txt`, so its `++grad`
+is simply `++sted %txt`. Of course, `++txt` must be defined in
+`++grow` and `++grab` as well.
+
+Every file in clay has a mark, and that mark must have a
+fully-functioning `++grad`. Marks are used for more than just
+clay, and other marks don't need a `++grad`, but if a piece of
+data is to be saved to clay, we must know how to revision-control
+it.
+
+Additionally, if a file is to be synced out to unix, then it must
+have conversion routines to and from the `%mime` mark.
+
+##Using clay
+
+### Reading and Subscribing
+
+When reading from Clay, there are three types of requests.  A
+`%sing` request asks for data at single revsion.  A `%next`
+request asks to be notified the next time there's a change to
+given file.  A `%many` request asks to be notified on every
+change in a desk for a range of changes.
+
+For `%sing` and `%next`, there are generally three things to be
+queried.  A `%u` request simply checks for the existence of a
+file at a path.  A `%x` request gets the data in the file at a
+path.  A `%y` request gets a hash of the data in the file at the
+path combined with all its children and their data.  Thus, `%y`
+of a node changes if it or any of its children change.
+
+A `%sing` request is fulfilled immediately if possible.  If the
+requested revision is in the future, or is on another ship for
+which we don't have the result cached, we don't respond
+immediately.  If the requested revision is in the future, we wait
+until the revision happens before we respond to the request.  If
+the request is for data on another ship, we pass on the request
+to the other ship.  In general, Clay subscriptions, like most
+things in Urbit, aren't guaranteed to return immediately.
+They'll return when they can, and they'll do so in a
+referentially transparent manner.
+
+A `%next` request checks query at the given revision, and it
+produces the result of the query the next time it changes, along
+with the revsion number when it changes.  Thus, a `%next` of a
+`%u` is triggered when a file is added or deleted, a `%next of a
+`%x` is triggered when a file is added, deleted, or changed, and
+a `%next` of a `%y` is triggered when a file or any of its
+children is added, deleted, or changed.
+
+A `%many` request is triggered every time the given desk has a
+new revision.  Unlike a `%next`, a `%many` has both a start and
+an end revsion, after which it stops returning.  For `%next`, a
+single change is reported, and if the caller wishes to hear of
+the next change, it must resubscribe.  For `%many`, every revsion
+from the start to the end triggers a response.  Since a `%many`
+request doesn't ask for any particular data, there aren't `%u`,
+`%x`, and `%y` versions for it.
+
+### Unix sync
+
+One of the primary functions of clay is as a convenient user
+interface. While tools exist to use clay from within urbit, it's
+often useful to be able to treat clay like any other filesystem
+from the Unix perspective -- to "mount" it, as it were.
+
+From urbit, you can run `|mount /path/to/directory %mount-point`,
+and this will mount the given clay directory to the mount-point
+directory in Unix. Every file is converted to `%mime` before it's
+written to Unix, and converted back when read from Unix. The
+entire directory is watched (a la Dropbox), and every change is
+auto-committed to clay.
+
+### Merging
+
+Merging is a fundamental operation for a distributed revision
+control system. At their root, clay's merges are similar to
+git's, but with some additions to accomodate typed data. There
+are seven different merge strategies.
+
+Throughout our discussion, we'll say that the merge is from
+Alice's desk to Bob's. Recall that a commit is a date (for all
+new commits this will be the current date), a list of parents,
+and the data itself.
+
+A `%init` merge should be used iff it's the first commit to a
+desk.  The head of Alice's desk is used as the number 1 commit to
+Bob's desk. Obviously, the ancestry remains intact through
+traversing the parentage of the commit even though previous
+commits are not numbered for Bob's desk.
+
+A `%this` merge means to keep what's in Bob's desk, but join the
+ancestry. Thus, the new commit has the head of each desk as
+parents, but the data is exactly what's in Bob's desk. For those
+following along in git, this is the 'ours' merge strategy, not
+the '--ours' option to the 'recursive' merge strategy. In other
+words, even if Alice makes a change that does not conflict with
+Bob, we throw it away. It's Bob's way or the highway.
+
+A `%that` merge means to take what's in Alice's desk, but join
+the ancestry. This is the reverse of `%this`.
+
+A `%fine` merge is a "fast-forward" merge. This succeeds iff one
+head is in the ancestry of the other. In this case, we use the
+descendant as our new head.
+
+For `%meet`, `%mate`, and `%meld` merges, we first find the most
+recent common ancestor to use as our merge base. If we have no
+common ancestors, then we fail. If we have more than one most
+recent common ancestor, then we have a criss-cross situation,
+which should be handled delicately. At present, we delicately
+throw up our hands and give up, but something akin to git's
+'recursive' strategy should be implemented in the future.
+
+There's a functional inclusion ordering on `%fine`, `%meet`,
+`%mate`, and `%meld` such that if an earlier strategy would have
+succeeded, then every later strategy will produce the same
+result. Put another way, every earlier strategy is the same as
+every later strategy except with a restricted domain.
+
+A `%meet` merge only succeeds if the changes from the merge base
+to Alice's head (hereafter, "Alice's changes") are in different
+files than Bob's changes. In this case, the parents are both
+Alice's and Bob's heads, and the data is the merge base plus
+Alice's changed files plus Bob's changed files.
+
+A `%mate` merge attempts to merge changes to the same file when
+both Alice and bob change it. If the merge is clean, we use it;
+otherwise, we fail. A merge between different types of changes --
+for example, deleting a file vs changing it -- is always a
+conflict. If we succeed, the parents are both Alice's and Bob's
+heads, and the data is the merge base plus Alice's changed files
+plus Bob's changed files plus the merged files.
+
+A `%meld` merge will succeed even if there are conflicts. If
+there are conflicts in a file, then we use the merge base's
+version of that file, and we produce a set of files with
+conflicts. The parents are both Alice's and Bob's heads, and the
+data is the merge base plus Alice's changed files plus Bob's
+changed files plus the successfully merged files plus the merge
+base's version of the conflicting files.
+
+That's the extent of the merge options in clay proper. In
+userspace there's a final option `%auto`, which is the most
+common.  `%auto` checks to see if Bob's desk exists, and if it
+doesn't we use a `%init` merge. Otherwise, we progressively try
+`%fine`, `%meet`, and `%mate` until one succeeds.
+
+If none succeed, we merge Bob's desk into a scratch desk.  Then,
+we merge Alice's desk into the scratch desk with the `%meld`
+option to force the merge. For each file in the produced set of
+conflicting files, we call the `++mash` function for the
+appropriate mark, which annotates the conflicts if we know how.
+
+Finally, we display a message to the user informing them of the
+scratch desk's existence, which files have annotated conflicts,
+and which files have unannotated conflicts. When the user has
+resolved the conflicts, they can merge the scratch desk back into
+Bob's desk. This will be a `%fine` merge since Bob's head is in
+the ancestry of the scratch desk.
+
+### Autosync
+
+Tracking and staying in sync with another desk is another
+fundamental operation. We call this "autosync". This doesn't mean
+simply mirroring a desk, since that wouldn't allow local changes.
+We simply want to apply changes as they are made upstream, as
+long as there are no conflicts with local changes.
+
+This is implemented by watching the other desk, and, when it has
+changes, merging these changes into our desk with the usual merge
+strategies.
+
+Note that it's quite reasonable for two desks to be autosynced to
+each other. This results in any change on one desk being mirrored
+to the other and vice versa.
+
+Additionally, it's fine to set up an autosync even if one desk,
+the other desk, or both desks do not exist. The sync will be
+activated when the upstream desk comes into existence and will
+create the downstream desk if needed.

From 06bda9cd8c17731f02246672441bf8acd45d22e9 Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Fri, 18 Sep 2015 20:15:36 -0400
Subject: [PATCH 17/38] fixed lose-changes-when-unrelated-conflict bug

---
 arvo/clay.hoon | 42 ++++++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/arvo/clay.hoon b/arvo/clay.hoon
index 0d8178fc97..e43c090fe7 100644
--- a/arvo/clay.hoon
+++ b/arvo/clay.hoon
@@ -1933,15 +1933,18 @@
           |=  [pax=path lob=lobe]
           (~(has by q.bas.dat) pax)
         =.  cal.dal.dat
-          %-  mo
-          %+  skim  (~(tap by q.bas.dat))
+          %-  mo  ^-  (list (pair path lobe))
+          %+  murn  (~(tap by q.bas.dat))
           |=  [pax=path lob=lobe]
+          ^-  (unit (pair path lobe))
           =+  a=(~(get by q.ali.dat) pax)
           =+  b=(~(get by q.bob.dat) pax)
-          ?&  ?=(^ a)
-              !=([~ lob] a)
-              =([~ lob] b)
-          ==
+          ?.  ?&  ?=(^ a)
+                  !=([~ lob] a)
+                  =([~ lob] b)
+              ==
+            ~
+          `[pax +.a]
         =.  can.dal.dat  p.can
         =.  old.dal.dat
           %-  mo  ^-  (list ,[path ~])
@@ -1973,15 +1976,18 @@
           |=  [pax=path lob=lobe]
           (~(has by q.bas.dat) pax)
         =.  cal.dob.dat
-          %-  mo
-          %+  skim  (~(tap by q.bas.dat))
+          %-  mo  ^-  (list (pair path lobe))
+          %+  murn  (~(tap by q.bas.dat))
           |=  [pax=path lob=lobe]
+          ^-  (unit (pair path lobe))
           =+  a=(~(get by q.ali.dat) pax)
           =+  b=(~(get by q.bob.dat) pax)
-          ?&  ?=(^ b)
-              !=([~ lob] b)
-              =([~ lob] a)
-          ==
+          ?.  ?&  ?=(^ b)
+                  !=([~ lob] b)
+                  =([~ lob] a)
+              ==
+            ~
+          `[pax +.b]
         =.  can.dob.dat  p.can
         =.  old.dob.dat
           %-  mo  ^-  (list ,[path ~])
@@ -2070,7 +2076,7 @@
             %-  ~(urn by con)
             |=  [pax=path *]
             (~(got by q.bas.dat) pax)
-        =.  con                                         ::  add/del conflict
+        =.  con                                         ::  change/del conflict
           %-  ~(uni by con)
           %-  mo  ^-  (list ,[path *])
           %+  skim  (~(tap by old.dal.dat))
@@ -2079,7 +2085,7 @@
             ~|  %strange-add-and-del
             !!
           (~(has by can.dob.dat) pax)
-        =.  con                                         ::  add/del conflict
+        =.  con                                         ::  change/del conflict
           %-  ~(uni by con)
           %-  mo  ^-  (list ,[path *])
           %+  skim  (~(tap by old.dob.dat))
@@ -2126,6 +2132,13 @@
                 [(lobe-to-mark u.-) u.-]
               [p q.q]:cay
           [(~(put by hat) pax p.bol) (~(put by lat) p.bol bol)]
+        ::  ~&  old=(~(run by old) mug)
+        ::  ~&  newdal=(~(run by new.dal.dat) mug)
+        ::  ~&  newdob=(~(run by new.dob.dat) mug)
+        ::  ~&  caldal=(~(run by cal.dal.dat) mug)
+        ::  ~&  caldob=(~(run by cal.dob.dat) mug)
+        ::  ~&  hot=(~(run by hot) mug)
+        ::  ~&  cas=(~(run by cas) mug)
         =+  ^-  hat=(map path lobe)                     ::  all the content
           %-  ~(uni by old)
           %-  ~(uni by new.dal.dat)
@@ -2134,6 +2147,7 @@
           %-  ~(uni by cal.dob.dat)
           %-  ~(uni by hot)
           cas
+        ::  ~&  >  hat=(~(run by hat) mug)
         =+  ^-  del=(map path ,?)
             (~(run by (~(uni by old.dal.dat) old.dob.dat)) |=(~ %|))
         =.  gon.dat  [%& (sa (turn (~(tap by con)) head))]

From cb8e5f41df98920d46c21e5ede924fcd0c572d0f Mon Sep 17 00:00:00 2001
From: Joan Torres <joan.torres@upr.edu>
Date: Sat, 19 Sep 2015 09:50:39 -0700
Subject: [PATCH 18/38] Add ++skid jet

---
 arvo/hoon.hoon | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon
index 554a305b1b..fbdaf7cda5 100644
--- a/arvo/hoon.hoon
+++ b/arvo/hoon.hoon
@@ -729,6 +729,7 @@
   $(a t.a, b b(+<+ (b i.a +<+.b)))
 ::
 ++  skid                                                ::  separate
+  ~/  %skid
   |*  [a=(list) b=$+(* ?)]
   |-  ^+  [p=a q=a]
   ?~  a  [~ ~]

From 09c6d28d6b9320451780e6344147eeb485af8b68 Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Mon, 21 Sep 2015 15:06:24 -0400
Subject: [PATCH 19/38] bump protocol to 5

---
 arvo/ames.hoon | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arvo/ames.hoon b/arvo/ames.hoon
index 908d592e56..20346d17d0 100644
--- a/arvo/ames.hoon
+++ b/arvo/ames.hoon
@@ -413,7 +413,7 @@
             vix=(bex +((cut 0 [25 2] mag)))             ::  width of sender
             tay=(cut 0 [27 5] mag)                      ::  message type
         ==
-    ?>  =(4 vez)
+    ?>  =(5 vez)
     ?>  =(chk (end 0 20 (mug bod)))
     :+  [(end 3 wix bod) (cut 3 [wix vix] bod)]
       (kins tay)
@@ -433,7 +433,7 @@
     =+  tay=(ksin q.kec)
     %+  mix
       %+  can  0
-      :~  [3 4]
+      :~  [3 5]
           [20 (mug bod)]
           [2 yax]
           [2 qax]
@@ -1018,7 +1018,7 @@
     ++  gnaw                                            ::    gnaw:am
       |=  [kay=cape ryn=lane pac=rock]                  ::  process packet
       ^-  [p=(list boon) q=fort]
-      ?.  =(4 (end 0 3 pac))  [~ fox]
+      ?.  =(5 (end 0 3 pac))  [~ fox]
       =+  kec=(bite pac)
       ?:  (goop p.p.kec)  [~ fox]
       ?.  (~(has by urb.ton.fox) q.p.kec)

From c61293fb443a72227635e63a94b397377f07c65e Mon Sep 17 00:00:00 2001
From: Galen Wolfe-Pauly <root@office-for.com>
Date: Mon, 21 Sep 2015 13:00:58 -0700
Subject: [PATCH 20/38] fixed anchor bug

---
 .../src/js/components/TocComponent.coffee     |  6 +-
 pub/tree/src/js/main.js                       | 86 ++++++++-----------
 2 files changed, 39 insertions(+), 53 deletions(-)

diff --git a/pub/tree/src/js/components/TocComponent.coffee b/pub/tree/src/js/components/TocComponent.coffee
index 7f41bf37d5..403d30ab80 100644
--- a/pub/tree/src/js/components/TocComponent.coffee
+++ b/pub/tree/src/js/components/TocComponent.coffee
@@ -52,13 +52,13 @@ module.exports = query {body:'r'}, recl
   componentWillUnmount: ->
     clearInterval @int
 
-
-
   collectHeaders: (e) ->
     hs = [{gn:"h1", ga:{className:"t"}, c:["Table of contents"]}]
     for k,v of e
       if not v.gn then continue
       if v.gn[0] is 'h' and parseInt(v.gn[1]) isnt NaN
+        _v = _.clone v
+        delete _v.ga.id
         hs.push v
     return hs
 
@@ -68,4 +68,4 @@ module.exports = query {body:'r'}, recl
         if v.gn is 'div' and v.ga?.id is "toc"
           return {gn:"div", ga:{className:"toc",onClick:@_click}, c:@collectHeaders(v.c)}
 
-  render: -> reactify @parseHeaders()
+  render: -> reactify @parseHeaders()
\ No newline at end of file
diff --git a/pub/tree/src/js/main.js b/pub/tree/src/js/main.js
index 3af4647c48..2fefc2a5ad 100644
--- a/pub/tree/src/js/main.js
+++ b/pub/tree/src/js/main.js
@@ -35,7 +35,6 @@ module.exports = {
 };
 
 
-
 },{"../dispatcher/Dispatcher.coffee":13,"../persistence/TreePersistence.coffee":19}],2:[function(require,module,exports){
 var BodyComponent, CLICK, Links, TreeActions, TreeStore, a, clas, div, query, reactify, recl, ref;
 
@@ -289,7 +288,6 @@ module.exports = query({
 }));
 
 
-
 },{"../actions/TreeActions.coffee":1,"../stores/TreeStore.coffee":20,"./Async.coffee":3,"./BodyComponent.coffee":4,"./Reactify.coffee":10,"classnames":15}],3:[function(require,module,exports){
 var TreeActions, TreeStore, _load, code, div, recl, ref, span;
 
@@ -391,7 +389,6 @@ module.exports = function(queries, Child, load) {
 };
 
 
-
 },{"../actions/TreeActions.coffee":1,"../stores/TreeStore.coffee":20,"./LoadComponent.coffee":9}],4:[function(require,module,exports){
 var div, query, reactify, recl;
 
@@ -417,7 +414,6 @@ module.exports = query({
 }));
 
 
-
 },{"./Async.coffee":3,"./Reactify.coffee":10}],5:[function(require,module,exports){
 var div, recl, ref, textarea;
 
@@ -441,7 +437,6 @@ module.exports = recl({
 });
 
 
-
 },{}],6:[function(require,module,exports){
 var div, recl;
 
@@ -463,7 +458,6 @@ module.exports = {
 };
 
 
-
 },{"./CodeMirror.coffee":5,"./KidsComponent.coffee":7,"./ListComponent.coffee":8,"./SearchComponent.coffee":11,"./TocComponent.coffee":12}],7:[function(require,module,exports){
 var a, div, hr, li, query, reactify, recl, ref, ul;
 
@@ -503,7 +497,6 @@ module.exports = query({
 }));
 
 
-
 },{"./Async.coffee":3,"./Reactify.coffee":10}],8:[function(require,module,exports){
 var a, clas, div, h1, li, query, reactify, recl, ref, ul;
 
@@ -599,7 +592,6 @@ module.exports = query({
 }));
 
 
-
 },{"./Async.coffee":3,"./Reactify.coffee":10,"classnames":15}],9:[function(require,module,exports){
 var div, input, recl, ref, textarea;
 
@@ -640,7 +632,6 @@ module.exports = recl({
 });
 
 
-
 },{}],10:[function(require,module,exports){
 var Virtual, div, load, reactify, recl, ref, rele, span, walk;
 
@@ -708,7 +699,6 @@ module.exports = _.extend(reactify, {
 });
 
 
-
 },{"./LoadComponent.coffee":9}],11:[function(require,module,exports){
 var a, div, input, query, reactify, recl, ref,
   slice = [].slice;
@@ -847,7 +837,6 @@ module.exports = query({
 }));
 
 
-
 },{"./Async.coffee":3,"./Reactify.coffee":10}],12:[function(require,module,exports){
 var div, query, reactify, recl;
 
@@ -932,7 +921,7 @@ module.exports = query({
     return clearInterval(this.int);
   },
   collectHeaders: function(e) {
-    var hs, k, v;
+    var _v, hs, k, v;
     hs = [
       {
         gn: "h1",
@@ -948,6 +937,8 @@ module.exports = query({
         continue;
       }
       if (v.gn[0] === 'h' && parseInt(v.gn[1]) !== NaN) {
+        _v = _.clone(v);
+        delete _v.ga.id;
         hs.push(v);
       }
     }
@@ -978,7 +969,6 @@ module.exports = query({
 }));
 
 
-
 },{"./Async.coffee":3,"./Reactify.coffee":10}],13:[function(require,module,exports){
 var Dispatcher;
 
@@ -1000,7 +990,6 @@ module.exports = _.extend(new Dispatcher(), {
 });
 
 
-
 },{"flux":16}],14:[function(require,module,exports){
 var rend;
 
@@ -1147,7 +1136,6 @@ $(function() {
 });
 
 
-
 },{"./actions/TreeActions.coffee":1,"./components/AnchorComponent.coffee":2,"./components/BodyComponent.coffee":4,"./components/Components.coffee":6,"./persistence/TreePersistence.coffee":19}],15:[function(require,module,exports){
 /*!
   Copyright (c) 2015 Jed Watson.
@@ -1156,46 +1144,46 @@ $(function() {
 */
 
 (function () {
-	'use strict';
+  'use strict';
 
-	function classNames () {
+  function classNames () {
 
-		var classes = '';
+    var classes = '';
 
-		for (var i = 0; i < arguments.length; i++) {
-			var arg = arguments[i];
-			if (!arg) continue;
+    for (var i = 0; i < arguments.length; i++) {
+      var arg = arguments[i];
+      if (!arg) continue;
 
-			var argType = typeof arg;
+      var argType = typeof arg;
 
-			if ('string' === argType || 'number' === argType) {
-				classes += ' ' + arg;
+      if ('string' === argType || 'number' === argType) {
+        classes += ' ' + arg;
 
-			} else if (Array.isArray(arg)) {
-				classes += ' ' + classNames.apply(null, arg);
+      } else if (Array.isArray(arg)) {
+        classes += ' ' + classNames.apply(null, arg);
 
-			} else if ('object' === argType) {
-				for (var key in arg) {
-					if (arg.hasOwnProperty(key) && arg[key]) {
-						classes += ' ' + key;
-					}
-				}
-			}
-		}
+      } else if ('object' === argType) {
+        for (var key in arg) {
+          if (arg.hasOwnProperty(key) && arg[key]) {
+            classes += ' ' + key;
+          }
+        }
+      }
+    }
 
-		return classes.substr(1);
-	}
+    return classes.substr(1);
+  }
 
-	if (typeof module !== 'undefined' && module.exports) {
-		module.exports = classNames;
-	} else if (typeof define === 'function' && typeof define.amd === 'object' && define.amd){
-		// AMD. Register as an anonymous module.
-		define(function () {
-			return classNames;
-		});
-	} else {
-		window.classNames = classNames;
-	}
+  if (typeof module !== 'undefined' && module.exports) {
+    module.exports = classNames;
+  } else if (typeof define === 'function' && typeof define.amd === 'object' && define.amd){
+    // AMD. Register as an anonymous module.
+    define(function () {
+      return classNames;
+    });
+  } else {
+    window.classNames = classNames;
+  }
 
 }());
 
@@ -1535,7 +1523,7 @@ module.exports = {
   encode: function(obj) {
     var _encode, delim;
     delim = function(n) {
-      return Array(n + 1).join('_') || '.';
+      return ('_'.repeat(n)) || '.';
     };
     _encode = function(obj) {
       var _dep, dep, k, res, sub, v;
@@ -1568,7 +1556,6 @@ module.exports = {
 };
 
 
-
 },{}],20:[function(require,module,exports){
 var EventEmitter, MessageDispatcher, QUERIES, TreeStore, _curr, _data, _tree, clog;
 
@@ -1804,7 +1791,6 @@ TreeStore.dispatchToken = MessageDispatcher.register(function(payload) {
 module.exports = TreeStore;
 
 
-
 },{"../dispatcher/Dispatcher.coffee":13,"events":21}],21:[function(require,module,exports){
 // Copyright Joyent, Inc. and other Node contributors.
 //
@@ -2108,4 +2094,4 @@ function isUndefined(arg) {
   return arg === void 0;
 }
 
-},{}]},{},[14]);
+},{}]},{},[14]);
\ No newline at end of file

From c44084be4090c9b1e39a9a4b67fb751d86fb98d9 Mon Sep 17 00:00:00 2001
From: Galen Wolfe-Pauly <root@office-for.com>
Date: Wed, 23 Sep 2015 09:56:58 -0700
Subject: [PATCH 21/38] email component

---
 pub/tree/src/js/components/Components.coffee  |   1 +
 .../src/js/components/EmailComponent.coffee   |  28 +++
 pub/tree/src/js/main.js                       | 167 ++++++++++++------
 3 files changed, 144 insertions(+), 52 deletions(-)
 create mode 100644 pub/tree/src/js/components/EmailComponent.coffee

diff --git a/pub/tree/src/js/components/Components.coffee b/pub/tree/src/js/components/Components.coffee
index 052f46c7bd..13671ac75c 100644
--- a/pub/tree/src/js/components/Components.coffee
+++ b/pub/tree/src/js/components/Components.coffee
@@ -7,4 +7,5 @@ module.exports =
   list:       require './ListComponent.coffee'
   kids:       require './KidsComponent.coffee'
   toc:        require './TocComponent.coffee'
+  email:      require './EmailComponent.coffee'
   lost:       recl render: -> (div {}, "<lost(", @props.children, ")>")
diff --git a/pub/tree/src/js/components/EmailComponent.coffee b/pub/tree/src/js/components/EmailComponent.coffee
new file mode 100644
index 0000000000..b5838f0bf8
--- /dev/null
+++ b/pub/tree/src/js/components/EmailComponent.coffee
@@ -0,0 +1,28 @@
+reactify    = require './Reactify.coffee'
+
+recl = React.createClass
+{div,p,button,input} = React.DOM
+
+module.exports = recl
+  displayName: "email"
+
+  getInitialState: -> {submit:false,email:""}
+
+  onClick: -> @submit()
+  onKeyUp: (e) -> 
+    $('div.email').text($('div.email').text())
+    if e.keyCode is 13 then @submit()
+
+  submit: ->
+    email = $('div.email').text()
+    @setState {submit:true}
+
+  render: ->
+    if @state.submit is false
+      cont = [
+        (input {key:"field",className:"email",placeholder:"your@email.com",@onKeyUp}, @state.email)
+        (button {key:"submit",className:"submit",@onClick}, "Submit")
+      ]
+    else
+      cont = [(div {className:"submitted"},"Got it. Thanks!")]
+    (p {className:"email"}, cont)
\ No newline at end of file
diff --git a/pub/tree/src/js/main.js b/pub/tree/src/js/main.js
index 2fefc2a5ad..6ebf299b60 100644
--- a/pub/tree/src/js/main.js
+++ b/pub/tree/src/js/main.js
@@ -35,7 +35,7 @@ module.exports = {
 };
 
 
-},{"../dispatcher/Dispatcher.coffee":13,"../persistence/TreePersistence.coffee":19}],2:[function(require,module,exports){
+},{"../dispatcher/Dispatcher.coffee":14,"../persistence/TreePersistence.coffee":20}],2:[function(require,module,exports){
 var BodyComponent, CLICK, Links, TreeActions, TreeStore, a, clas, div, query, reactify, recl, ref;
 
 clas = require('classnames');
@@ -288,7 +288,7 @@ module.exports = query({
 }));
 
 
-},{"../actions/TreeActions.coffee":1,"../stores/TreeStore.coffee":20,"./Async.coffee":3,"./BodyComponent.coffee":4,"./Reactify.coffee":10,"classnames":15}],3:[function(require,module,exports){
+},{"../actions/TreeActions.coffee":1,"../stores/TreeStore.coffee":21,"./Async.coffee":3,"./BodyComponent.coffee":4,"./Reactify.coffee":11,"classnames":16}],3:[function(require,module,exports){
 var TreeActions, TreeStore, _load, code, div, recl, ref, span;
 
 _load = require('./LoadComponent.coffee');
@@ -389,7 +389,7 @@ module.exports = function(queries, Child, load) {
 };
 
 
-},{"../actions/TreeActions.coffee":1,"../stores/TreeStore.coffee":20,"./LoadComponent.coffee":9}],4:[function(require,module,exports){
+},{"../actions/TreeActions.coffee":1,"../stores/TreeStore.coffee":21,"./LoadComponent.coffee":10}],4:[function(require,module,exports){
 var div, query, reactify, recl;
 
 query = require('./Async.coffee');
@@ -414,7 +414,7 @@ module.exports = query({
 }));
 
 
-},{"./Async.coffee":3,"./Reactify.coffee":10}],5:[function(require,module,exports){
+},{"./Async.coffee":3,"./Reactify.coffee":11}],5:[function(require,module,exports){
 var div, recl, ref, textarea;
 
 recl = React.createClass;
@@ -450,6 +450,7 @@ module.exports = {
   list: require('./ListComponent.coffee'),
   kids: require('./KidsComponent.coffee'),
   toc: require('./TocComponent.coffee'),
+  email: require('./EmailComponent.coffee'),
   lost: recl({
     render: function() {
       return div({}, "<lost(", this.props.children, ")>");
@@ -458,7 +459,69 @@ module.exports = {
 };
 
 
-},{"./CodeMirror.coffee":5,"./KidsComponent.coffee":7,"./ListComponent.coffee":8,"./SearchComponent.coffee":11,"./TocComponent.coffee":12}],7:[function(require,module,exports){
+},{"./CodeMirror.coffee":5,"./EmailComponent.coffee":7,"./KidsComponent.coffee":8,"./ListComponent.coffee":9,"./SearchComponent.coffee":12,"./TocComponent.coffee":13}],7:[function(require,module,exports){
+var button, div, input, p, reactify, recl, ref;
+
+reactify = require('./Reactify.coffee');
+
+recl = React.createClass;
+
+ref = React.DOM, div = ref.div, p = ref.p, button = ref.button, input = ref.input;
+
+module.exports = recl({
+  displayName: "email",
+  getInitialState: function() {
+    return {
+      submit: false,
+      email: ""
+    };
+  },
+  onClick: function() {
+    return this.submit();
+  },
+  onKeyUp: function(e) {
+    $('div.email').text($('div.email').text());
+    if (e.keyCode === 13) {
+      return this.submit();
+    }
+  },
+  submit: function() {
+    var email;
+    email = $('div.email').text();
+    return this.setState({
+      submit: true
+    });
+  },
+  render: function() {
+    var cont;
+    if (this.state.submit === false) {
+      cont = [
+        input({
+          key: "field",
+          className: "email",
+          placeholder: "your@email.com",
+          onKeyUp: this.onKeyUp
+        }, this.state.email), button({
+          key: "submit",
+          className: "submit",
+          onClick: this.onClick
+        }, "Submit")
+      ];
+    } else {
+      cont = [
+        div({
+          className: "submitted"
+        }, "Got it. Thanks!")
+      ];
+    }
+    return p({
+      className: "email"
+    }, cont);
+  }
+});
+
+
+},{"./Reactify.coffee":11}],8:[function(require,module,exports){
 var a, div, hr, li, query, reactify, recl, ref, ul;
 
 reactify = require('./Reactify.coffee');
@@ -497,7 +560,7 @@ module.exports = query({
 }));
 
 
-},{"./Async.coffee":3,"./Reactify.coffee":10}],8:[function(require,module,exports){
+},{"./Async.coffee":3,"./Reactify.coffee":11}],9:[function(require,module,exports){
 var a, clas, div, h1, li, query, reactify, recl, ref, ul;
 
 clas = require('classnames');
@@ -592,7 +655,7 @@ module.exports = query({
 }));
 
 
-},{"./Async.coffee":3,"./Reactify.coffee":10,"classnames":15}],9:[function(require,module,exports){
+},{"./Async.coffee":3,"./Reactify.coffee":11,"classnames":16}],10:[function(require,module,exports){
 var div, input, recl, ref, textarea;
 
 recl = React.createClass;
@@ -632,7 +695,7 @@ module.exports = recl({
 });
 
 
-},{}],10:[function(require,module,exports){
+},{}],11:[function(require,module,exports){
 var Virtual, div, load, reactify, recl, ref, rele, span, walk;
 
 recl = React.createClass;
@@ -699,7 +762,7 @@ module.exports = _.extend(reactify, {
 });
 
 
-},{"./LoadComponent.coffee":9}],11:[function(require,module,exports){
+},{"./LoadComponent.coffee":10}],12:[function(require,module,exports){
 var a, div, input, query, reactify, recl, ref,
   slice = [].slice;
 
@@ -837,7 +900,7 @@ module.exports = query({
 }));
 
 
-},{"./Async.coffee":3,"./Reactify.coffee":10}],12:[function(require,module,exports){
+},{"./Async.coffee":3,"./Reactify.coffee":11}],13:[function(require,module,exports){
 var div, query, reactify, recl;
 
 query = require('./Async.coffee');
@@ -969,7 +1032,7 @@ module.exports = query({
 }));
 
 
-},{"./Async.coffee":3,"./Reactify.coffee":10}],13:[function(require,module,exports){
+},{"./Async.coffee":3,"./Reactify.coffee":11}],14:[function(require,module,exports){
 var Dispatcher;
 
 Dispatcher = require('flux').Dispatcher;
@@ -990,7 +1053,7 @@ module.exports = _.extend(new Dispatcher(), {
 });
 
 
-},{"flux":16}],14:[function(require,module,exports){
+},{"flux":17}],15:[function(require,module,exports){
 var rend;
 
 rend = React.render;
@@ -1136,7 +1199,7 @@ $(function() {
 });
 
 
-},{"./actions/TreeActions.coffee":1,"./components/AnchorComponent.coffee":2,"./components/BodyComponent.coffee":4,"./components/Components.coffee":6,"./persistence/TreePersistence.coffee":19}],15:[function(require,module,exports){
+},{"./actions/TreeActions.coffee":1,"./components/AnchorComponent.coffee":2,"./components/BodyComponent.coffee":4,"./components/Components.coffee":6,"./persistence/TreePersistence.coffee":20}],16:[function(require,module,exports){
 /*!
   Copyright (c) 2015 Jed Watson.
   Licensed under the MIT License (MIT), see
@@ -1144,50 +1207,50 @@ $(function() {
 */
 
 (function () {
-  'use strict';
+	'use strict';
 
-  function classNames () {
+	function classNames () {
 
-    var classes = '';
+		var classes = '';
 
-    for (var i = 0; i < arguments.length; i++) {
-      var arg = arguments[i];
-      if (!arg) continue;
+		for (var i = 0; i < arguments.length; i++) {
+			var arg = arguments[i];
+			if (!arg) continue;
 
-      var argType = typeof arg;
+			var argType = typeof arg;
 
-      if ('string' === argType || 'number' === argType) {
-        classes += ' ' + arg;
+			if ('string' === argType || 'number' === argType) {
+				classes += ' ' + arg;
 
-      } else if (Array.isArray(arg)) {
-        classes += ' ' + classNames.apply(null, arg);
+			} else if (Array.isArray(arg)) {
+				classes += ' ' + classNames.apply(null, arg);
 
-      } else if ('object' === argType) {
-        for (var key in arg) {
-          if (arg.hasOwnProperty(key) && arg[key]) {
-            classes += ' ' + key;
-          }
-        }
-      }
-    }
+			} else if ('object' === argType) {
+				for (var key in arg) {
+					if (arg.hasOwnProperty(key) && arg[key]) {
+						classes += ' ' + key;
+					}
+				}
+			}
+		}
 
-    return classes.substr(1);
-  }
+		return classes.substr(1);
+	}
 
-  if (typeof module !== 'undefined' && module.exports) {
-    module.exports = classNames;
-  } else if (typeof define === 'function' && typeof define.amd === 'object' && define.amd){
-    // AMD. Register as an anonymous module.
-    define(function () {
-      return classNames;
-    });
-  } else {
-    window.classNames = classNames;
-  }
+	if (typeof module !== 'undefined' && module.exports) {
+		module.exports = classNames;
+	} else if (typeof define === 'function' && typeof define.amd === 'object' && define.amd){
+		// AMD. Register as an anonymous module.
+		define(function () {
+			return classNames;
+		});
+	} else {
+		window.classNames = classNames;
+	}
 
 }());
 
-},{}],16:[function(require,module,exports){
+},{}],17:[function(require,module,exports){
 /**
  * Copyright (c) 2014-2015, Facebook, Inc.
  * All rights reserved.
@@ -1199,7 +1262,7 @@ $(function() {
 
 module.exports.Dispatcher = require('./lib/Dispatcher')
 
-},{"./lib/Dispatcher":17}],17:[function(require,module,exports){
+},{"./lib/Dispatcher":18}],18:[function(require,module,exports){
 /*
  * Copyright (c) 2014, Facebook, Inc.
  * All rights reserved.
@@ -1451,7 +1514,7 @@ var _prefix = 'ID_';
 
 module.exports = Dispatcher;
 
-},{"./invariant":18}],18:[function(require,module,exports){
+},{"./invariant":19}],19:[function(require,module,exports){
 /**
  * Copyright (c) 2014, Facebook, Inc.
  * All rights reserved.
@@ -1506,7 +1569,7 @@ var invariant = function(condition, format, a, b, c, d, e, f) {
 
 module.exports = invariant;
 
-},{}],19:[function(require,module,exports){
+},{}],20:[function(require,module,exports){
 module.exports = {
   get: function(path, query, cb) {
     var url;
@@ -1523,7 +1586,7 @@ module.exports = {
   encode: function(obj) {
     var _encode, delim;
     delim = function(n) {
-      return ('_'.repeat(n)) || '.';
+      return Array(n + 1).join('_') || '.';
     };
     _encode = function(obj) {
       var _dep, dep, k, res, sub, v;
@@ -1556,7 +1619,7 @@ module.exports = {
 };
 
 
-},{}],20:[function(require,module,exports){
+},{}],21:[function(require,module,exports){
 var EventEmitter, MessageDispatcher, QUERIES, TreeStore, _curr, _data, _tree, clog;
 
 EventEmitter = require('events').EventEmitter;
@@ -1791,7 +1854,7 @@ TreeStore.dispatchToken = MessageDispatcher.register(function(payload) {
 module.exports = TreeStore;
 
 
-},{"../dispatcher/Dispatcher.coffee":13,"events":21}],21:[function(require,module,exports){
+},{"../dispatcher/Dispatcher.coffee":14,"events":22}],22:[function(require,module,exports){
 // Copyright Joyent, Inc. and other Node contributors.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
@@ -2094,4 +2157,4 @@ function isUndefined(arg) {
   return arg === void 0;
 }
 
-},{}]},{},[14]);
\ No newline at end of file
+},{}]},{},[15]);

From 13dc738ac1d49f2433a1382244d62c28de2d2298 Mon Sep 17 00:00:00 2001
From: Galen Wolfe-Pauly <root@office-for.com>
Date: Wed, 23 Sep 2015 10:27:02 -0700
Subject: [PATCH 22/38] email component with validation and submit

---
 .../src/js/components/EmailComponent.coffee   | 25 ++++++++++++++---
 pub/tree/src/js/main.js                       | 28 +++++++++++++++----
 2 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/pub/tree/src/js/components/EmailComponent.coffee b/pub/tree/src/js/components/EmailComponent.coffee
index b5838f0bf8..6b3842ec6b 100644
--- a/pub/tree/src/js/components/EmailComponent.coffee
+++ b/pub/tree/src/js/components/EmailComponent.coffee
@@ -10,12 +10,29 @@ module.exports = recl
 
   onClick: -> @submit()
   onKeyUp: (e) -> 
-    $('div.email').text($('div.email').text())
-    if e.keyCode is 13 then @submit()
+    email = @$email.val()
+    valid = (email.indexOf('@') != -1 && 
+      email.indexOf('.') != -1 && 
+      email.length > 7 && 
+      email.split(".")[1].length > 1 &&
+      email.split("@")[0].length > 0 &&
+      email.split("@")[1].length > 4)
+    @$email.toggleClass 'valid',valid
+    @$email.removeClass 'error'
+    if e.keyCode is 13 
+      if valid is true 
+        @submit()
+        e.stopPropagation()
+        e.preventDefault()
+        return false
+      else
+        @$email.addClass 'error'
 
   submit: ->
-    email = $('div.email').text()
-    @setState {submit:true}
+    $.post @props.dataPath,{email:@$email.text()},() ->
+      @setState {submit:true}
+
+  componentDidMount: -> @$email = $('input.email')
 
   render: ->
     if @state.submit is false
diff --git a/pub/tree/src/js/main.js b/pub/tree/src/js/main.js
index 6ebf299b60..d7ae996c2f 100644
--- a/pub/tree/src/js/main.js
+++ b/pub/tree/src/js/main.js
@@ -480,18 +480,34 @@ module.exports = recl({
     return this.submit();
   },
   onKeyUp: function(e) {
-    $('div.email').text($('div.email').text());
+    var email, valid;
+    email = this.$email.val();
+    valid = email.indexOf('@') !== -1 && email.indexOf('.') !== -1 && email.length > 7 && email.split(".")[1].length > 1 && email.split("@")[0].length > 0 && email.split("@")[1].length > 4;
+    this.$email.toggleClass('valid', valid);
+    this.$email.removeClass('error');
     if (e.keyCode === 13) {
-      return this.submit();
+      if (valid === true) {
+        this.submit();
+        e.stopPropagation();
+        e.preventDefault();
+        return false;
+      } else {
+        return this.$email.addClass('error');
+      }
     }
   },
   submit: function() {
-    var email;
-    email = $('div.email').text();
-    return this.setState({
-      submit: true
+    return $.post(this.props.dataPath, {
+      email: this.$email.text()
+    }, function() {
+      return this.setState({
+        submit: true
+      });
     });
   },
+  componentDidMount: function() {
+    return this.$email = $('input.email');
+  },
   render: function() {
     var cont;
     if (this.state.submit === false) {

From c76ee92346ab027cde1d91d5be0498ce2b747638 Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Wed, 23 Sep 2015 13:50:31 -0700
Subject: [PATCH 23/38] transitioned eyre to use weak etags

---
 arvo/eyre.hoon | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/arvo/eyre.hoon b/arvo/eyre.hoon
index 8d0b4f3c16..badb821226 100644
--- a/arvo/eyre.hoon
+++ b/arvo/eyre.hoon
@@ -431,13 +431,14 @@
     urb.waspFrom = function(sel,attr){
       Array.prototype.map.call(document.querySelectorAll(sel), 
         function(ele){
-          if(!ele[attr] || (new URL(ele[attr])).host != document.location.host) return;
+          if(!ele[attr] || (new URL(ele[attr])).host != document.location.host)
+            return;
           var xhr = new XMLHttpRequest()
           xhr.open("HEAD", ele[attr])
           xhr.send()
           xhr.onload = function(){
-            var tag = JSON.parse(this.getResponseHeader("etag"))
-            if(tag) urb.wasp(tag)
+            var dep = this.getResponseHeader("etag")
+            if(dep) urb.wasp(JSON.parse(dep.substr(2)))
     }})}
     if(urb.wasp){urb.waspFrom('script','src'); urb.waspFrom('link','href')}
     '''
@@ -771,7 +772,7 @@
           ==
         ~|  q.q.cay
         =+  ((hard ,[mit=mite rez=octs]) q.q.cay)
-        =+  dep=(crip (pojo %s (scot %uv p.sih)))
+        =+  dep=(crip "W/{(pojo %s (scot %uv p.sih))}")
         (give-thou 200 ~[etag/dep content-type/(moon mit)] ~ rez)
       ==
     ==

From 107ea396905fea54da72995165921a1a1f8e2630 Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Wed, 23 Sep 2015 16:10:30 -0700
Subject: [PATCH 24/38] fix invalid-path spin

---
 pub/tree/src/js/components/Async.coffee |  2 +-
 pub/tree/src/js/main.js                 | 26 ++++++++++++++++++++++---
 pub/tree/src/js/stores/TreeStore.coffee |  3 ++-
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/pub/tree/src/js/components/Async.coffee b/pub/tree/src/js/components/Async.coffee
index 8ac25c9a82..4eb41a21c5 100644
--- a/pub/tree/src/js/components/Async.coffee
+++ b/pub/tree/src/js/components/Async.coffee
@@ -34,7 +34,7 @@ module.exports = (queries, Child, load=_load)-> recl
   filterWith: (have,_queries)->
     return _queries unless have?
     request = {}
-    for k of _queries
+    for k of _queries when k isnt 'kids'
       request[k] = _queries[k] unless have[k] isnt undefined
     if _queries.kids? and have.kids?
       if _.isEmpty have.kids
diff --git a/pub/tree/src/js/main.js b/pub/tree/src/js/main.js
index d7ae996c2f..01394d57cb 100644
--- a/pub/tree/src/js/main.js
+++ b/pub/tree/src/js/main.js
@@ -35,6 +35,7 @@ module.exports = {
 };
 
 
+
 },{"../dispatcher/Dispatcher.coffee":14,"../persistence/TreePersistence.coffee":20}],2:[function(require,module,exports){
 var BodyComponent, CLICK, Links, TreeActions, TreeStore, a, clas, div, query, reactify, recl, ref;
 
@@ -288,6 +289,7 @@ module.exports = query({
 }));
 
 
+
 },{"../actions/TreeActions.coffee":1,"../stores/TreeStore.coffee":21,"./Async.coffee":3,"./BodyComponent.coffee":4,"./Reactify.coffee":11,"classnames":16}],3:[function(require,module,exports){
 var TreeActions, TreeStore, _load, code, div, recl, ref, span;
 
@@ -348,8 +350,10 @@ module.exports = function(queries, Child, load) {
       }
       request = {};
       for (k in _queries) {
-        if (have[k] === void 0) {
-          request[k] = _queries[k];
+        if (k !== 'kids') {
+          if (have[k] === void 0) {
+            request[k] = _queries[k];
+          }
         }
       }
       if ((_queries.kids != null) && (have.kids != null)) {
@@ -389,6 +393,7 @@ module.exports = function(queries, Child, load) {
 };
 
 
+
 },{"../actions/TreeActions.coffee":1,"../stores/TreeStore.coffee":21,"./LoadComponent.coffee":10}],4:[function(require,module,exports){
 var div, query, reactify, recl;
 
@@ -414,6 +419,7 @@ module.exports = query({
 }));
 
 
+
 },{"./Async.coffee":3,"./Reactify.coffee":11}],5:[function(require,module,exports){
 var div, recl, ref, textarea;
 
@@ -437,6 +443,7 @@ module.exports = recl({
 });
 
 
+
 },{}],6:[function(require,module,exports){
 var div, recl;
 
@@ -459,6 +466,7 @@ module.exports = {
 };
 
 
+
 },{"./CodeMirror.coffee":5,"./EmailComponent.coffee":7,"./KidsComponent.coffee":8,"./ListComponent.coffee":9,"./SearchComponent.coffee":12,"./TocComponent.coffee":13}],7:[function(require,module,exports){
 var button, div, input, p, reactify, recl, ref;
 
@@ -537,6 +545,7 @@ module.exports = recl({
 });
 
 
+
 },{"./Reactify.coffee":11}],8:[function(require,module,exports){
 var a, div, hr, li, query, reactify, recl, ref, ul;
 
@@ -576,6 +585,7 @@ module.exports = query({
 }));
 
 
+
 },{"./Async.coffee":3,"./Reactify.coffee":11}],9:[function(require,module,exports){
 var a, clas, div, h1, li, query, reactify, recl, ref, ul;
 
@@ -671,6 +681,7 @@ module.exports = query({
 }));
 
 
+
 },{"./Async.coffee":3,"./Reactify.coffee":11,"classnames":16}],10:[function(require,module,exports){
 var div, input, recl, ref, textarea;
 
@@ -711,6 +722,7 @@ module.exports = recl({
 });
 
 
+
 },{}],11:[function(require,module,exports){
 var Virtual, div, load, reactify, recl, ref, rele, span, walk;
 
@@ -778,6 +790,7 @@ module.exports = _.extend(reactify, {
 });
 
 
+
 },{"./LoadComponent.coffee":10}],12:[function(require,module,exports){
 var a, div, input, query, reactify, recl, ref,
   slice = [].slice;
@@ -916,6 +929,7 @@ module.exports = query({
 }));
 
 
+
 },{"./Async.coffee":3,"./Reactify.coffee":11}],13:[function(require,module,exports){
 var div, query, reactify, recl;
 
@@ -1048,6 +1062,7 @@ module.exports = query({
 }));
 
 
+
 },{"./Async.coffee":3,"./Reactify.coffee":11}],14:[function(require,module,exports){
 var Dispatcher;
 
@@ -1069,6 +1084,7 @@ module.exports = _.extend(new Dispatcher(), {
 });
 
 
+
 },{"flux":17}],15:[function(require,module,exports){
 var rend;
 
@@ -1215,6 +1231,7 @@ $(function() {
 });
 
 
+
 },{"./actions/TreeActions.coffee":1,"./components/AnchorComponent.coffee":2,"./components/BodyComponent.coffee":4,"./components/Components.coffee":6,"./persistence/TreePersistence.coffee":20}],16:[function(require,module,exports){
 /*!
   Copyright (c) 2015 Jed Watson.
@@ -1635,6 +1652,7 @@ module.exports = {
 };
 
 
+
 },{}],21:[function(require,module,exports){
 var EventEmitter, MessageDispatcher, QUERIES, TreeStore, _curr, _data, _tree, clog;
 
@@ -1687,7 +1705,7 @@ TreeStore = _.extend(EventEmitter.prototype, {
       }
       data[k] = (ref = _data[path]) != null ? ref[k] : void 0;
     }
-    if (query.kids) {
+    if (query.kids && !_data.EMPTY) {
       data.kids = {};
       for (k in tree) {
         sub = tree[k];
@@ -1744,6 +1762,7 @@ TreeStore = _.extend(EventEmitter.prototype, {
       this.loadValues(tree[k], path + "/" + k, v);
     }
     if (data.kids && _.isEmpty(data.kids)) {
+      _data.EMPTY = true;
       old.body = {
         gn: 'div',
         c: [
@@ -1870,6 +1889,7 @@ TreeStore.dispatchToken = MessageDispatcher.register(function(payload) {
 module.exports = TreeStore;
 
 
+
 },{"../dispatcher/Dispatcher.coffee":14,"events":22}],22:[function(require,module,exports){
 // Copyright Joyent, Inc. and other Node contributors.
 //
diff --git a/pub/tree/src/js/stores/TreeStore.coffee b/pub/tree/src/js/stores/TreeStore.coffee
index 36bdaeaebd..fab973dfee 100644
--- a/pub/tree/src/js/stores/TreeStore.coffee
+++ b/pub/tree/src/js/stores/TreeStore.coffee
@@ -24,7 +24,7 @@ TreeStore = _.extend EventEmitter.prototype, {
     for k,t of query when QUERIES[k]
       if t isnt QUERIES[k] then throw TypeError "Wrong query type: #{k}, '#{t}'"
       data[k] = _data[path]?[k]
-    if query.kids
+    if query.kids and not _data.EMPTY
       data.kids = {}
       for k,sub of tree
         data.kids[k] = @fulfillAt sub, path+"/"+k, query.kids
@@ -54,6 +54,7 @@ TreeStore = _.extend EventEmitter.prototype, {
       @loadValues tree[k], path+"/"+k, v
       
     if data.kids && _.isEmpty data.kids
+      _data.EMPTY = true
       old.body =
         gn: 'div'
         c: [ {gn:'h1',  ga:{className:'error'}, c:['Error: Empty path']}

From aaba53d2fad7e8cbcdd43574dd78f784aba6d3ef Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Wed, 23 Sep 2015 16:29:20 -0700
Subject: [PATCH 25/38] better emptiness handling take 2

---
 pub/tree/src/js/main.js                 | 4 ++--
 pub/tree/src/js/stores/TreeStore.coffee | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pub/tree/src/js/main.js b/pub/tree/src/js/main.js
index 01394d57cb..8777afb830 100644
--- a/pub/tree/src/js/main.js
+++ b/pub/tree/src/js/main.js
@@ -1705,7 +1705,7 @@ TreeStore = _.extend(EventEmitter.prototype, {
       }
       data[k] = (ref = _data[path]) != null ? ref[k] : void 0;
     }
-    if (query.kids && !_data.EMPTY) {
+    if (query.kids && !_data[path].EMPTY) {
       data.kids = {};
       for (k in tree) {
         sub = tree[k];
@@ -1762,7 +1762,7 @@ TreeStore = _.extend(EventEmitter.prototype, {
       this.loadValues(tree[k], path + "/" + k, v);
     }
     if (data.kids && _.isEmpty(data.kids)) {
-      _data.EMPTY = true;
+      old.EMPTY = true;
       old.body = {
         gn: 'div',
         c: [
diff --git a/pub/tree/src/js/stores/TreeStore.coffee b/pub/tree/src/js/stores/TreeStore.coffee
index fab973dfee..ee24ea092e 100644
--- a/pub/tree/src/js/stores/TreeStore.coffee
+++ b/pub/tree/src/js/stores/TreeStore.coffee
@@ -24,7 +24,7 @@ TreeStore = _.extend EventEmitter.prototype, {
     for k,t of query when QUERIES[k]
       if t isnt QUERIES[k] then throw TypeError "Wrong query type: #{k}, '#{t}'"
       data[k] = _data[path]?[k]
-    if query.kids and not _data.EMPTY
+    if query.kids and not _data[path].EMPTY
       data.kids = {}
       for k,sub of tree
         data.kids[k] = @fulfillAt sub, path+"/"+k, query.kids
@@ -54,7 +54,7 @@ TreeStore = _.extend EventEmitter.prototype, {
       @loadValues tree[k], path+"/"+k, v
       
     if data.kids && _.isEmpty data.kids
-      _data.EMPTY = true
+      old.EMPTY = true
       old.body =
         gn: 'div'
         c: [ {gn:'h1',  ga:{className:'error'}, c:['Error: Empty path']}

From b07f6fab024c5213a2b566ad8f0f73347324207c Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Wed, 23 Sep 2015 16:40:30 -0700
Subject: [PATCH 26/38] null check

---
 pub/tree/src/js/stores/TreeStore.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pub/tree/src/js/stores/TreeStore.coffee b/pub/tree/src/js/stores/TreeStore.coffee
index ee24ea092e..ae67258c7d 100644
--- a/pub/tree/src/js/stores/TreeStore.coffee
+++ b/pub/tree/src/js/stores/TreeStore.coffee
@@ -24,7 +24,7 @@ TreeStore = _.extend EventEmitter.prototype, {
     for k,t of query when QUERIES[k]
       if t isnt QUERIES[k] then throw TypeError "Wrong query type: #{k}, '#{t}'"
       data[k] = _data[path]?[k]
-    if query.kids and not _data[path].EMPTY
+    if query.kids and not _data[path]?.EMPTY
       data.kids = {}
       for k,sub of tree
         data.kids[k] = @fulfillAt sub, path+"/"+k, query.kids

From cdad444127314153898d7aa7414eeed4d69449b1 Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Wed, 23 Sep 2015 16:53:48 -0700
Subject: [PATCH 27/38] actually fix EMPTY usage

---
 pub/tree/src/js/main.js                 | 33 ++++++++++++++-----------
 pub/tree/src/js/stores/TreeStore.coffee | 16 ++++++------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/pub/tree/src/js/main.js b/pub/tree/src/js/main.js
index 8777afb830..44b20710b0 100644
--- a/pub/tree/src/js/main.js
+++ b/pub/tree/src/js/main.js
@@ -1693,23 +1693,26 @@ TreeStore = _.extend(EventEmitter.prototype, {
     return this.fulfillAt(this.getTree(path.split('/')), path, query);
   },
   fulfillAt: function(tree, path, query) {
-    var data, k, ref, sub, t;
+    var data, have, k, sub, t;
     data = this.fulfillLocal(path, query);
-    for (k in query) {
-      t = query[k];
-      if (!QUERIES[k]) {
-        continue;
+    have = _data[path];
+    if (have != null) {
+      for (k in query) {
+        t = query[k];
+        if (!QUERIES[k]) {
+          continue;
+        }
+        if (t !== QUERIES[k]) {
+          throw TypeError("Wrong query type: " + k + ", '" + t + "'");
+        }
+        data[k] = have[k];
       }
-      if (t !== QUERIES[k]) {
-        throw TypeError("Wrong query type: " + k + ", '" + t + "'");
-      }
-      data[k] = (ref = _data[path]) != null ? ref[k] : void 0;
-    }
-    if (query.kids && !_data[path].EMPTY) {
-      data.kids = {};
-      for (k in tree) {
-        sub = tree[k];
-        data.kids[k] = this.fulfillAt(sub, path + "/" + k, query.kids);
+      if (query.kids && !have.EMPTY) {
+        data.kids = {};
+        for (k in tree) {
+          sub = tree[k];
+          data.kids[k] = this.fulfillAt(sub, path + "/" + k, query.kids);
+        }
       }
     }
     if (!_.isEmpty(data)) {
diff --git a/pub/tree/src/js/stores/TreeStore.coffee b/pub/tree/src/js/stores/TreeStore.coffee
index ae67258c7d..105f0fa0a9 100644
--- a/pub/tree/src/js/stores/TreeStore.coffee
+++ b/pub/tree/src/js/stores/TreeStore.coffee
@@ -21,13 +21,15 @@ TreeStore = _.extend EventEmitter.prototype, {
   fulfill: (path,query) -> @fulfillAt (@getTree path.split '/'),path,query
   fulfillAt: (tree,path,query)->
     data = @fulfillLocal path, query
-    for k,t of query when QUERIES[k]
-      if t isnt QUERIES[k] then throw TypeError "Wrong query type: #{k}, '#{t}'"
-      data[k] = _data[path]?[k]
-    if query.kids and not _data[path]?.EMPTY
-      data.kids = {}
-      for k,sub of tree
-        data.kids[k] = @fulfillAt sub, path+"/"+k, query.kids
+    have = _data[path]
+    if have?
+      for k,t of query when QUERIES[k]
+        if t isnt QUERIES[k] then throw TypeError "Wrong query type: #{k}, '#{t}'"
+        data[k] = have[k]
+      if query.kids and not have.EMPTY
+        data.kids = {}
+        for k,sub of tree
+          data.kids[k] = @fulfillAt sub, path+"/"+k, query.kids
     data unless _.isEmpty data
       
   fulfillLocal: (path, query)->

From f77ffac57cbb99119385d030dc61b53c4c24ab00 Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Wed, 23 Sep 2015 17:17:09 -0700
Subject: [PATCH 28/38] actually fix async maybe?

---
 pub/tree/src/js/components/Async.coffee |  4 ++--
 pub/tree/src/js/main.js                 | 20 +++++++++++++-------
 pub/tree/src/js/stores/TreeStore.coffee |  8 +++++---
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/pub/tree/src/js/components/Async.coffee b/pub/tree/src/js/components/Async.coffee
index 4eb41a21c5..83593d7e1b 100644
--- a/pub/tree/src/js/components/Async.coffee
+++ b/pub/tree/src/js/components/Async.coffee
@@ -36,8 +36,8 @@ module.exports = (queries, Child, load=_load)-> recl
     request = {}
     for k of _queries when k isnt 'kids'
       request[k] = _queries[k] unless have[k] isnt undefined
-    if _queries.kids? and have.kids?
-      if _.isEmpty have.kids
+    if _queries.kids?
+      if not have.kids?
         request.kids = _queries.kids
       else
         request.kids = {}
diff --git a/pub/tree/src/js/main.js b/pub/tree/src/js/main.js
index 44b20710b0..ed112028a6 100644
--- a/pub/tree/src/js/main.js
+++ b/pub/tree/src/js/main.js
@@ -356,8 +356,8 @@ module.exports = function(queries, Child, load) {
           }
         }
       }
-      if ((_queries.kids != null) && (have.kids != null)) {
-        if (_.isEmpty(have.kids)) {
+      if (_queries.kids != null) {
+        if (have.kids == null) {
           request.kids = _queries.kids;
         } else {
           request.kids = {};
@@ -1707,11 +1707,17 @@ TreeStore = _.extend(EventEmitter.prototype, {
         }
         data[k] = have[k];
       }
-      if (query.kids && !have.EMPTY) {
-        data.kids = {};
-        for (k in tree) {
-          sub = tree[k];
-          data.kids[k] = this.fulfillAt(sub, path + "/" + k, query.kids);
+      if (query.kids) {
+        if (have.EMPTY) {
+          data.kids = {};
+        } else {
+          for (k in tree) {
+            sub = tree[k];
+            if (data.kids == null) {
+              data.kids = {};
+            }
+            data.kids[k] = this.fulfillAt(sub, path + "/" + k, query.kids);
+          }
         }
       }
     }
diff --git a/pub/tree/src/js/stores/TreeStore.coffee b/pub/tree/src/js/stores/TreeStore.coffee
index 105f0fa0a9..a3205e8281 100644
--- a/pub/tree/src/js/stores/TreeStore.coffee
+++ b/pub/tree/src/js/stores/TreeStore.coffee
@@ -26,9 +26,11 @@ TreeStore = _.extend EventEmitter.prototype, {
       for k,t of query when QUERIES[k]
         if t isnt QUERIES[k] then throw TypeError "Wrong query type: #{k}, '#{t}'"
         data[k] = have[k]
-      if query.kids and not have.EMPTY
-        data.kids = {}
-        for k,sub of tree
+      if query.kids
+        if have.EMPTY
+          data.kids = {}
+        else for k,sub of tree
+          data.kids ?= {}
           data.kids[k] = @fulfillAt sub, path+"/"+k, query.kids
     data unless _.isEmpty data
       

From 993bcd3ddb721ccdb0a4d3978d81d2b33377ac68 Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Wed, 23 Sep 2015 17:22:28 -0700
Subject: [PATCH 29/38] sigh

---
 pub/tree/src/js/main.js                            | 8 ++++++++
 pub/tree/src/js/persistence/TreePersistence.coffee | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/pub/tree/src/js/main.js b/pub/tree/src/js/main.js
index ed112028a6..b698b8cd69 100644
--- a/pub/tree/src/js/main.js
+++ b/pub/tree/src/js/main.js
@@ -1603,6 +1603,10 @@ var invariant = function(condition, format, a, b, c, d, e, f) {
 module.exports = invariant;
 
 },{}],20:[function(require,module,exports){
+var dedup;
+
+dedup = {};
+
 module.exports = {
   get: function(path, query, cb) {
     var url;
@@ -1610,6 +1614,10 @@ module.exports = {
       query = "no-query";
     }
     url = (window.tree.basepath(path)) + ".json?q=" + (this.encode(query));
+    if (dedup[url]) {
+      return;
+    }
+    dedup[url] = true;
     return $.get(url, {}, function(data) {
       if (cb) {
         return cb(null, data);
diff --git a/pub/tree/src/js/persistence/TreePersistence.coffee b/pub/tree/src/js/persistence/TreePersistence.coffee
index becce7bea5..bd0ad21221 100644
--- a/pub/tree/src/js/persistence/TreePersistence.coffee
+++ b/pub/tree/src/js/persistence/TreePersistence.coffee
@@ -1,6 +1,9 @@
+dedup = {}  # XX wrong layer
 module.exports =
   get: (path,query="no-query",cb) ->
     url = "#{window.tree.basepath(path)}.json?q=#{@encode query}"
+    return if dedup[url]
+    dedup[url] = true
     $.get url, {}, (data) -> if cb then cb null,data
   encode: (obj)->
     delim = (n)-> Array(n+1).join('_') || '.'

From a54d776d0ad67834a9fb6442df3d35111c2b5cfd Mon Sep 17 00:00:00 2001
From: bvschwartz <bruce@z2a.org>
Date: Wed, 23 Sep 2015 17:34:10 -0700
Subject: [PATCH 30/38] Update architecture.md

formatting fix
---
 pub/doc/arvo/clay/architecture.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pub/doc/arvo/clay/architecture.md b/pub/doc/arvo/clay/architecture.md
index ed65ccd264..d27ab0f34a 100644
--- a/pub/doc/arvo/clay/architecture.md
+++ b/pub/doc/arvo/clay/architecture.md
@@ -277,7 +277,7 @@ referentially transparent manner.
 A `%next` request checks query at the given revision, and it
 produces the result of the query the next time it changes, along
 with the revsion number when it changes.  Thus, a `%next` of a
-`%u` is triggered when a file is added or deleted, a `%next of a
+`%u` is triggered when a file is added or deleted, a `%next` of a
 `%x` is triggered when a file is added, deleted, or changed, and
 a `%next` of a `%y` is triggered when a file or any of its
 children is added, deleted, or changed.

From e21a202fbf22183e783b0384d650e3a18176848a Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Thu, 24 Sep 2015 11:07:34 -0700
Subject: [PATCH 31/38] fixed email component

---
 pub/tree/src/js/components/EmailComponent.coffee |  4 ++--
 pub/tree/src/js/main.js                          | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pub/tree/src/js/components/EmailComponent.coffee b/pub/tree/src/js/components/EmailComponent.coffee
index 6b3842ec6b..f212fb10bb 100644
--- a/pub/tree/src/js/components/EmailComponent.coffee
+++ b/pub/tree/src/js/components/EmailComponent.coffee
@@ -29,7 +29,7 @@ module.exports = recl
         @$email.addClass 'error'
 
   submit: ->
-    $.post @props.dataPath,{email:@$email.text()},() ->
+    $.post @props.dataPath,{email:@$email.val()},() =>
       @setState {submit:true}
 
   componentDidMount: -> @$email = $('input.email')
@@ -42,4 +42,4 @@ module.exports = recl
       ]
     else
       cont = [(div {className:"submitted"},"Got it. Thanks!")]
-    (p {className:"email"}, cont)
\ No newline at end of file
+    (p {className:"email"}, cont)
diff --git a/pub/tree/src/js/main.js b/pub/tree/src/js/main.js
index b698b8cd69..7524145d0a 100644
--- a/pub/tree/src/js/main.js
+++ b/pub/tree/src/js/main.js
@@ -506,12 +506,14 @@ module.exports = recl({
   },
   submit: function() {
     return $.post(this.props.dataPath, {
-      email: this.$email.text()
-    }, function() {
-      return this.setState({
-        submit: true
-      });
-    });
+      email: this.$email.val()
+    }, (function(_this) {
+      return function() {
+        return _this.setState({
+          submit: true
+        });
+      };
+    })(this));
   },
   componentDidMount: function() {
     return this.$email = $('input.email');

From 006b8050445a39854bc3acdd2b127488037c8d9d Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Thu, 24 Sep 2015 11:15:24 -0700
Subject: [PATCH 32/38] diabled header onclick handling

---
 pub/tree/src/js/components/AnchorComponent.coffee | 2 +-
 pub/tree/src/js/main.js                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pub/tree/src/js/components/AnchorComponent.coffee b/pub/tree/src/js/components/AnchorComponent.coffee
index ad152932e1..454066f530 100644
--- a/pub/tree/src/js/components/AnchorComponent.coffee
+++ b/pub/tree/src/js/components/AnchorComponent.coffee
@@ -47,7 +47,7 @@ Links = React.createFactory query {
     render: -> div {className:'links'}, @props.children, @_render()
     _render: -> div {id:"sibs"}, div {className:"active"}, a {}, @props.curr
 
-CLICK = 'a,h1,h2,h3,h4,h5,h6'
+CLICK = 'a' # 'a,h1,h2,h3,h4,h5,h6'
 module.exports = query {sein:'t',path:'t',name:'t',next:'t',prev:'t'},recl
   displayName: "Anchor"
   getInitialState: -> url: window.location.pathname
diff --git a/pub/tree/src/js/main.js b/pub/tree/src/js/main.js
index 7524145d0a..d4b83913e1 100644
--- a/pub/tree/src/js/main.js
+++ b/pub/tree/src/js/main.js
@@ -142,7 +142,7 @@ Links = React.createFactory(query({
   }
 })));
 
-CLICK = 'a,h1,h2,h3,h4,h5,h6';
+CLICK = 'a';
 
 module.exports = query({
   sein: 't',

From 14d7407e04f496969316cd709eede812acf91a30 Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Thu, 24 Sep 2015 12:05:19 -0700
Subject: [PATCH 33/38] fixed jquery object property iteration

---
 pub/tree/src/js/components/TocComponent.coffee |  6 +++---
 pub/tree/src/js/main.js                        | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pub/tree/src/js/components/TocComponent.coffee b/pub/tree/src/js/components/TocComponent.coffee
index 403d30ab80..d255fbe6a1 100644
--- a/pub/tree/src/js/components/TocComponent.coffee
+++ b/pub/tree/src/js/components/TocComponent.coffee
@@ -26,7 +26,7 @@ module.exports = query {body:'r'}, recl
     if Math.abs(@st-st) > 10
       hash = null
       @st = st
-      for k,v of @$headers
+      for v in @$headers 
         continue if v.tagName is undefined
         $h = $ v
         hst = $h.offset().top-$h.outerHeight(true)+10
@@ -40,7 +40,7 @@ module.exports = query {body:'r'}, recl
   checkHash: ->
     if document.location.hash?.length > 0 and document.location.hash isnt @hash
       hash = document.location.hash.slice(1)
-      for k,v of @$headers
+      for v in @$headers 
         $h = $ v
         if hash is @urlsafe $h.text()
           @hash = document.location.hash
@@ -68,4 +68,4 @@ module.exports = query {body:'r'}, recl
         if v.gn is 'div' and v.ga?.id is "toc"
           return {gn:"div", ga:{className:"toc",onClick:@_click}, c:@collectHeaders(v.c)}
 
-  render: -> reactify @parseHeaders()
\ No newline at end of file
+  render: -> reactify @parseHeaders()
diff --git a/pub/tree/src/js/main.js b/pub/tree/src/js/main.js
index d4b83913e1..7d2af5e6e3 100644
--- a/pub/tree/src/js/main.js
+++ b/pub/tree/src/js/main.js
@@ -961,15 +961,15 @@ module.exports = query({
     return this.$headers = $('#toc h1, #toc h2, #toc h3, #toc h4');
   },
   checkScroll: function() {
-    var $h, hash, hst, k, ref, results, st, v;
+    var $h, hash, hst, i, len, ref, results, st, v;
     st = $(window).scrollTop();
     if (Math.abs(this.st - st) > 10) {
       hash = null;
       this.st = st;
       ref = this.$headers;
       results = [];
-      for (k in ref) {
-        v = ref[k];
+      for (i = 0, len = ref.length; i < len; i++) {
+        v = ref[i];
         if (v.tagName === void 0) {
           continue;
         }
@@ -990,13 +990,13 @@ module.exports = query({
     }
   },
   checkHash: function() {
-    var $h, hash, k, offset, ref, ref1, results, v;
+    var $h, hash, i, len, offset, ref, ref1, results, v;
     if (((ref = document.location.hash) != null ? ref.length : void 0) > 0 && document.location.hash !== this.hash) {
       hash = document.location.hash.slice(1);
       ref1 = this.$headers;
       results = [];
-      for (k in ref1) {
-        v = ref1[k];
+      for (i = 0, len = ref1.length; i < len; i++) {
+        v = ref1[i];
         $h = $(v);
         if (hash === this.urlsafe($h.text())) {
           this.hash = document.location.hash;

From a2d9922d9c8b6f65a843bcf2fbaf3db495fa1f6d Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Thu, 24 Sep 2015 13:14:23 -0700
Subject: [PATCH 34/38] simplified Table of Contents js

---
 .../src/js/components/TocComponent.coffee     | 40 +++++------
 pub/tree/src/js/main.js                       | 72 +++++++++----------
 2 files changed, 54 insertions(+), 58 deletions(-)

diff --git a/pub/tree/src/js/components/TocComponent.coffee b/pub/tree/src/js/components/TocComponent.coffee
index d255fbe6a1..ee6b756162 100644
--- a/pub/tree/src/js/components/TocComponent.coffee
+++ b/pub/tree/src/js/components/TocComponent.coffee
@@ -9,17 +9,14 @@ module.exports = query {body:'r'}, recl
   hash:null
   displayName: "TableOfContents"
 
-  _click: (e) ->
-    document.location.hash = @urlsafe $(e.target).text()
-
-  urlsafe: (str) ->
-    str.toLowerCase().replace(/\ /g, "-").replace(/[^a-z0-9~_.-]/g,"")
+  _click: (id)->
+    -> if id then document.location.hash = id
     
   componentDidMount: ->
     @int = setInterval @checkHash,100
     @st = $(window).scrollTop()
-    $(window).on 'scroll',@checkScroll
-    @$headers = $('#toc h1, #toc h2, #toc h3, #toc h4')
+    # $(window).on 'scroll',@checkScroll
+    @$headers = $('#toc').children('h1,h2,h3,h4').filter('[id]')
 
   checkScroll: ->
     st = $(window).scrollTop()
@@ -31,7 +28,7 @@ module.exports = query {body:'r'}, recl
         $h = $ v
         hst = $h.offset().top-$h.outerHeight(true)+10
         if hst < st
-          hash = @urlsafe $h.text()
+          hash = $h.attr('id')
         if hst > st and hash isnt @hash and hash isnt null
           @hash = "#"+hash
           document.location.hash = hash
@@ -42,7 +39,7 @@ module.exports = query {body:'r'}, recl
       hash = document.location.hash.slice(1)
       for v in @$headers 
         $h = $ v
-        if hash is @urlsafe $h.text()
+        if hash is $h.attr('id')
           @hash = document.location.hash
           offset = $h.offset().top - $h.outerHeight(true)
           setTimeout -> $(window).scrollTop offset
@@ -52,20 +49,23 @@ module.exports = query {body:'r'}, recl
   componentWillUnmount: ->
     clearInterval @int
 
-  collectHeaders: (e) ->
-    hs = [{gn:"h1", ga:{className:"t"}, c:["Table of contents"]}]
-    for k,v of e
-      if not v.gn then continue
-      if v.gn[0] is 'h' and parseInt(v.gn[1]) isnt NaN
-        _v = _.clone v
-        delete _v.ga.id
-        hs.push v
-    return hs
+  collectHeader: ({gn,ga,c})->
+    if gn and gn[0] is 'h' and parseInt(gn[1]) isnt NaN
+      ga = _.clone ga
+      ga.onClick = @_click ga.id
+      delete ga.id
+      {gn,ga,c}
 
   parseHeaders: ->
     if @props.body.c
-      for k,v of @props.body.c
+      for v in @props.body.c
         if v.gn is 'div' and v.ga?.id is "toc"
-          return {gn:"div", ga:{className:"toc",onClick:@_click}, c:@collectHeaders(v.c)}
+          return {
+            gn:"div"
+            ga:{className:"toc"}
+            c:[
+              {gn:"h1", ga:{className:"t"}, c:["Table of contents"]}
+              (_.filter v.c.map @collectHeader)...
+          ]}
 
   render: -> reactify @parseHeaders()
diff --git a/pub/tree/src/js/main.js b/pub/tree/src/js/main.js
index 7d2af5e6e3..ad8c8aa38e 100644
--- a/pub/tree/src/js/main.js
+++ b/pub/tree/src/js/main.js
@@ -933,7 +933,8 @@ module.exports = query({
 
 
 },{"./Async.coffee":3,"./Reactify.coffee":11}],13:[function(require,module,exports){
-var div, query, reactify, recl;
+var div, query, reactify, recl,
+  slice = [].slice;
 
 query = require('./Async.coffee');
 
@@ -948,17 +949,17 @@ module.exports = query({
 }, recl({
   hash: null,
   displayName: "TableOfContents",
-  _click: function(e) {
-    return document.location.hash = this.urlsafe($(e.target).text());
-  },
-  urlsafe: function(str) {
-    return str.toLowerCase().replace(/\ /g, "-").replace(/[^a-z0-9~_.-]/g, "");
+  _click: function(id) {
+    return function() {
+      if (id) {
+        return document.location.hash = id;
+      }
+    };
   },
   componentDidMount: function() {
     this.int = setInterval(this.checkHash, 100);
     this.st = $(window).scrollTop();
-    $(window).on('scroll', this.checkScroll);
-    return this.$headers = $('#toc h1, #toc h2, #toc h3, #toc h4');
+    return this.$headers = $('#toc').children('h1,h2,h3,h4').filter('[id]');
   },
   checkScroll: function() {
     var $h, hash, hst, i, len, ref, results, st, v;
@@ -976,7 +977,7 @@ module.exports = query({
         $h = $(v);
         hst = $h.offset().top - $h.outerHeight(true) + 10;
         if (hst < st) {
-          hash = this.urlsafe($h.text());
+          hash = $h.attr('id');
         }
         if (hst > st && hash !== this.hash && hash !== null) {
           this.hash = "#" + hash;
@@ -998,7 +999,7 @@ module.exports = query({
       for (i = 0, len = ref1.length; i < len; i++) {
         v = ref1[i];
         $h = $(v);
-        if (hash === this.urlsafe($h.text())) {
+        if (hash === $h.attr('id')) {
           this.hash = document.location.hash;
           offset = $h.offset().top - $h.outerHeight(true);
           setTimeout(function() {
@@ -1015,44 +1016,39 @@ module.exports = query({
   componentWillUnmount: function() {
     return clearInterval(this.int);
   },
-  collectHeaders: function(e) {
-    var _v, hs, k, v;
-    hs = [
-      {
-        gn: "h1",
-        ga: {
-          className: "t"
-        },
-        c: ["Table of contents"]
-      }
-    ];
-    for (k in e) {
-      v = e[k];
-      if (!v.gn) {
-        continue;
-      }
-      if (v.gn[0] === 'h' && parseInt(v.gn[1]) !== NaN) {
-        _v = _.clone(v);
-        delete _v.ga.id;
-        hs.push(v);
-      }
+  collectHeader: function(arg) {
+    var c, ga, gn;
+    gn = arg.gn, ga = arg.ga, c = arg.c;
+    if (gn && gn[0] === 'h' && parseInt(gn[1]) !== NaN) {
+      ga = _.clone(ga);
+      ga.onClick = this._click(ga.id);
+      delete ga.id;
+      return {
+        gn: gn,
+        ga: ga,
+        c: c
+      };
     }
-    return hs;
   },
   parseHeaders: function() {
-    var k, ref, ref1, v;
+    var i, len, ref, ref1, v;
     if (this.props.body.c) {
       ref = this.props.body.c;
-      for (k in ref) {
-        v = ref[k];
+      for (i = 0, len = ref.length; i < len; i++) {
+        v = ref[i];
         if (v.gn === 'div' && ((ref1 = v.ga) != null ? ref1.id : void 0) === "toc") {
           return {
             gn: "div",
             ga: {
-              className: "toc",
-              onClick: this._click
+              className: "toc"
             },
-            c: this.collectHeaders(v.c)
+            c: [{
+                gn: "h1",
+                ga: {
+                  className: "t"
+                },
+                c: ["Table of contents"]
+              }].concat(slice.call(_.filter(v.c.map(this.collectHeader))))
           };
         }
       }

From f93a8c2401881d2bf4afbf1d0be18344c857d911 Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Thu, 24 Sep 2015 14:56:21 -0700
Subject: [PATCH 35/38] disable "empty path" handling out of confusion

---
 .../src/js/components/AnchorComponent.coffee  |  2 +-
 pub/tree/src/js/main.js                       | 25 +------------------
 pub/tree/src/js/stores/TreeStore.coffee       | 17 +++++++------
 3 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/pub/tree/src/js/components/AnchorComponent.coffee b/pub/tree/src/js/components/AnchorComponent.coffee
index 454066f530..ad152932e1 100644
--- a/pub/tree/src/js/components/AnchorComponent.coffee
+++ b/pub/tree/src/js/components/AnchorComponent.coffee
@@ -47,7 +47,7 @@ Links = React.createFactory query {
     render: -> div {className:'links'}, @props.children, @_render()
     _render: -> div {id:"sibs"}, div {className:"active"}, a {}, @props.curr
 
-CLICK = 'a' # 'a,h1,h2,h3,h4,h5,h6'
+CLICK = 'a,h1,h2,h3,h4,h5,h6'
 module.exports = query {sein:'t',path:'t',name:'t',next:'t',prev:'t'},recl
   displayName: "Anchor"
   getInitialState: -> url: window.location.pathname
diff --git a/pub/tree/src/js/main.js b/pub/tree/src/js/main.js
index ad8c8aa38e..2952c1e4dc 100644
--- a/pub/tree/src/js/main.js
+++ b/pub/tree/src/js/main.js
@@ -142,7 +142,7 @@ Links = React.createFactory(query({
   }
 })));
 
-CLICK = 'a';
+CLICK = 'a,h1,h2,h3,h4,h5,h6';
 
 module.exports = query({
   sein: 't',
@@ -1778,29 +1778,6 @@ TreeStore = _.extend(EventEmitter.prototype, {
     }
     if (data.kids && _.isEmpty(data.kids)) {
       old.EMPTY = true;
-      old.body = {
-        gn: 'div',
-        c: [
-          {
-            gn: 'h1',
-            ga: {
-              className: 'error'
-            },
-            c: ['Error: Empty path']
-          }, {
-            gn: 'div',
-            c: [
-              {
-                gn: 'pre',
-                c: [this.getCurr()]
-              }, {
-                gn: 'span',
-                c: ['is either empty or does not exist.']
-              }
-            ]
-          }
-        ]
-      };
     }
     return _data[path] = old;
   },
diff --git a/pub/tree/src/js/stores/TreeStore.coffee b/pub/tree/src/js/stores/TreeStore.coffee
index a3205e8281..d1e58c5e2b 100644
--- a/pub/tree/src/js/stores/TreeStore.coffee
+++ b/pub/tree/src/js/stores/TreeStore.coffee
@@ -59,14 +59,15 @@ TreeStore = _.extend EventEmitter.prototype, {
       
     if data.kids && _.isEmpty data.kids
       old.EMPTY = true
-      old.body =
-        gn: 'div'
-        c: [ {gn:'h1',  ga:{className:'error'}, c:['Error: Empty path']}
-             {gn:'div', c:[
-               {gn:'pre',  c:[@getCurr()]}
-               {gn:'span', c:['is either empty or does not exist.']}
-               # {gn:'list'}  XX handle empty snip
-           ] }]
+      #  XX why here?
+      # old.body =
+      #   gn: 'div'
+      #   c: [ {gn:'h1',  ga:{className:'error'}, c:['Error: Empty path']}
+      #        {gn:'div', c:[
+      #          {gn:'pre',  c:[@getCurr()]}
+      #          {gn:'span', c:['is either empty or does not exist.']}
+      #          # {gn:'list'}  XX handle empty snip
+      #      ] }]
         
     _data[path] = old
 

From a243f2a59a1f1f3fccd1c0957f66d62ab273e861 Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Fri, 25 Sep 2015 16:05:40 -0700
Subject: [PATCH 36/38] ford profiling

---
 arvo/eyre.hoon |  1 +
 arvo/ford.hoon | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/arvo/eyre.hoon b/arvo/eyre.hoon
index badb821226..24451eff54 100644
--- a/arvo/eyre.hoon
+++ b/arvo/eyre.hoon
@@ -148,6 +148,7 @@
 ::
 ++  fcgi                                                ::  credential caboose
   |=  [quy=quay ced=cred]  ^-  coin
+  ~&  fcgi/[`@uv`(mug ced) quy]
   :*  %many
       [%$ %ta ~]
       [%blob ced]
diff --git a/arvo/ford.hoon b/arvo/ford.hoon
index 75a622e5e1..d3734eddeb 100644
--- a/arvo/ford.hoon
+++ b/arvo/ford.hoon
@@ -499,6 +499,19 @@
     ++  dash                                            ::  process cache
       |=  cof=cafe
       ^+  +>
+      ~?    &
+          :+  %dash  (lent (skim (~(tap in p.cof)) |=(a=calx ?=(%bake -.a))))
+          =.  q.cof  (~(dif by q.cof) jav.bay)
+          =+  num=10
+          %.  |=  a=(list calx) 
+              =+  len=(lent a)
+              =-  [len (scag num (turn a f)) ?:((gth len num) %etc ~)]
+              =+  dewe=|=(beam +<(s ?+(s s [@ %web *] t.t.s)))
+              f=|=(b=calx [-.b ?+(-.b ~ %bake [p.q.b (tope (dewe q.q.b))])])
+          %~  run  by
+          =<  `(jar term calx)`(~(rep by q.cof) .)
+          |=  [[* a=calx] b=(jar term calx)]
+          (~(add ja b) -.a a)
       %_(+> jav.bay q.cof)
     ::
     ++  diff                                            ::  diff
@@ -1866,7 +1879,6 @@
 ::
 ++  load                                                ::  highly forgiving
   |=  old=axle
-  ::=.  pol.old  (~(run by pol.old) |=(baby +<(jav ~)))
   ..^$(+>- old)
   ::=.  old  
   ::    ?.  ?=([%0 *] old)  old                           ::  remove at 1

From 58e86fb223db0d6b0329000c92828c91a1d92124 Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Tue, 29 Sep 2015 12:15:01 -0700
Subject: [PATCH 37/38] No ford profiling

---
 arvo/ford.hoon | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arvo/ford.hoon b/arvo/ford.hoon
index d3734eddeb..0ee549c9da 100644
--- a/arvo/ford.hoon
+++ b/arvo/ford.hoon
@@ -499,7 +499,7 @@
     ++  dash                                            ::  process cache
       |=  cof=cafe
       ^+  +>
-      ~?    &
+      ~?    |
           :+  %dash  (lent (skim (~(tap in p.cof)) |=(a=calx ?=(%bake -.a))))
           =.  q.cof  (~(dif by q.cof) jav.bay)
           =+  num=10

From 1d4891e4ef0f835e5249cc11d40afc060fe8bfd1 Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Tue, 29 Sep 2015 12:15:33 -0700
Subject: [PATCH 38/38] add ? expr, ?? expr, ??? expr

---
 ape/dojo.hoon | 274 +++++++++++++++++++++++++++++++-------------------
 1 file changed, 170 insertions(+), 104 deletions(-)

diff --git a/ape/dojo.hoon b/ape/dojo.hoon
index 54acf9a8ee..ea7ff10b27 100644
--- a/ape/dojo.hoon
+++ b/ape/dojo.hoon
@@ -10,7 +10,7 @@
   !:                                                    ::    ::
 =>  |%                                                  ::  external structures
     ++  house                                           ::  all state
-      $:  %2
+      $:  %3
           hoc=(map bone session)                        ::  conversations
       ==                                                ::
     ++  session                                         ::  per conversation
@@ -23,14 +23,17 @@
           buf=tape                                      ::  multiline buffer
       ==                                                ::
     ++  dojo-command                                    ::
-      $%  [%flat p=path q=dojo-source]                  ::  noun to unix atom
-          [%pill p=path q=dojo-source]                  ::  noun to unix pill
-          ::  [%tree p=path q=dojo-source]              ::  noun to unix tree
-          [%file p=beam q=dojo-source]                  ::  save to clay
-          [%http p=?(%post %put) q=purl r=dojo-source]  ::  http outbound
-          [%poke p=goal q=dojo-source]                  ::  make and poke
-          [%show p=dojo-source]                         ::  print
-          [%verb p=term q=(unit dojo-source)]           ::  store variable
+      $&  (pair dojo-sink dojo-source)                  ::  route value
+      [%brev p=term]                                    ::  unbind variable
+    ++  dojo-sink                                       ::
+      $%  [%flat p=path]                                ::  atom to unix
+          [%pill p=path]                                ::  noun to unix pill
+          ::  [%tree p=path]                            ::  noun to unix tree
+          [%file p=beam]                                ::  save to clay
+          [%http p=?(%post %put) q=purl]                ::  http outbound
+          [%poke p=goal]                                ::  poke app
+          [%show p=?(0 1 2 3)]                          ::  print val/type/twig
+          [%verb p=term]                                ::  store variable
       ==                                                ::
     ++  dojo-source                                     ::  construction node
       $:  p=@ud                                         ::  assembly index
@@ -104,26 +107,30 @@
   ++  dp                                                ::  dojo parser
     |%  
     ++  dp-default-app  %hood
-    ++  dp-specify
-      |=  [gol=goal mod=dojo-model]
-      ^-  (pair goal dojo-source)
-      [gol [0 [%ge mod(q.p [q.gol q.p.mod])]]]
+    ++  dp-message                                      ::  %poke
+      |=  [gol=goal mod=dojo-model]  ^-  dojo-command
+      [[%poke gol] [0 [%ge mod(q.p [q.gol q.p.mod])]]]
     ::
     ++  dp-command-line  ;~(sfix dp-command (just '\0a'))
+    ++  dp-variable                                     ::  %verb or %brev
+      |*  [sym=_rule src=_rule]
+      %-  cook  :_  ;~(plug sym (punt src))
+      |=  [a=term b=(unit dojo-source)]  ^-  dojo-command
+      ?~(b [%brev a] [[%verb a] u.b])
+    ::
     ++  dp-command                                      ::  ++dojo-command
       %+  knee  *dojo-command  |.  ~+
-      ;~  pose
-        ;~  plug  (cold %poke bar)
-          %+  cook  dp-specify
+      ;~  pose  
+        ;~  pfix  bar
+          %+  cook  dp-message
           (stag [our.hid dp-default-app] dp-model)
         ==
       ::
-        ;~  plug  (cold %poke col)
+        ;~  pfix  col
           %+  cook
             |=  [a=goal b=$&(dojo-model dojo-source)]
-            ^-  (pair goal dojo-source)
-            ?@  -.b  [a b]
-            (dp-specify a b)
+            ?@  -.b  [[%poke a] b]
+            (dp-message a b)
           ;~  plug
             dp-goal
             ;~  pose
@@ -133,21 +140,26 @@
           ==
         ==
       ::
-        ;~(plug (cold %file tar) dp-beam ;~(pfix ace dp-source))
-        ;~(plug (cold %flat pat) (most fas sym) ;~(pfix ace dp-source))
-        ;~(plug (cold %pill dot) (most fas sym) ;~(pfix ace dp-source))
-        ;~(plug (cold %http lus) (easy %post) auri:epur ;~(pfix ace dp-source))
-        ;~(plug (cold %http hep) (easy %put) auri:epur ;~(pfix ace dp-source))
-        ;~(plug (cold %verb tis) sym (punt ;~(pfix ace dp-source)))
-        ;~  plug  (cold %verb fas) 
+        ;~(pfix tis (dp-variable sym ;~(pfix ace dp-source)))
+        ;~  pfix  fas 
           ;~  pose
-            ;~(plug (cold %arc hep) (punt ;~(pfix gap dp-hooves)))
-            ;~(plug (cold %lib lus) (punt ;~(pfix gap dp-hooves)))
-            (stag %dir :(stag ~ 0 %ex %clsg dp-poor))
+            (dp-variable (cold %arc hep) ;~(pfix gap dp-hooves))
+            (dp-variable (cold %lib lus) ;~(pfix gap dp-hooves))
+            :(stag [%verb %dir] 0 %ex %clsg dp-poor)
           ==
         ==
       ::
-        (stag %show dp-source)
+        ;~((glue ace) dp-sink dp-source)
+        (stag [%show %0] dp-source)
+      ==
+    ++  dp-sink
+      ;~  pose
+        ;~(plug (cold %file tar) dp-beam)
+        ;~(plug (cold %flat pat) (most fas sym))
+        ;~(plug (cold %pill dot) (most fas sym))
+        ;~(plug (cold %http lus) (easy %post) auri:epur)
+        ;~(plug (cold %http hep) (easy %put) auri:epur)
+        (stag %show (cook ?(1 2 3) (cook lent (stun [1 3] wut))))
       ==
     ++  dp-hooves                                       ::  hoof list
       :(stag 0 %ex %clsg (cook |=(a=tusk a) (most ;~(plug com gaw) dp-hoof)))
@@ -196,17 +208,17 @@
       ==
     ++  dp-beam                                         ::  ++beam
       %+  cook  |=(a=path =+((tome a) ?^(- u [he-beak (flop a)])))
-      =+  vez=(vang & dp-path)
+      =+  vez=(vang | dp-path)
       (sear plex:vez (stag %clsg poor:vez))
     ::
     ++  dp-model   ;~(plug dp-server dp-config)         ::  ++dojo-model
     ++  dp-path    (tope he-beam)                       ::  ++path
     ++  dp-server  (stag 0 (most fas sym))              ::  ++dojo-server
-    ++  dp-twig    tall:(vang & dp-path)                ::  ++twig
-    ++  dp-poor    poor:(vang & (tope dir))             ::  (list ++twig)
+    ++  dp-twig    tall:(vang | dp-path)                ::  ++twig
+    ++  dp-poor    poor:(vang | (tope dir))             ::  (list ++twig)
     ++  dp-value                                        ::  ++dojo-source
       ;~  pose
-        (stag %tu (ifix [kel ker] (most ace dp-source)))
+        (stag %tu (ifix [sel ser] (most ace dp-source)))
         (stag %ex dp-twig)
       ==
     ::
@@ -262,25 +274,11 @@
     ++  dy-init-command                                 ::  ++dojo-command
       |=  mad=dojo-command
       ^+  [mad +>]
-      ?-  -.mad
-        %file  =^(src +>.$ (dy-init-source q.mad) [mad(q src) +>.$])
-        %flat  =^(src +>.$ (dy-init-source q.mad) [mad(q src) +>.$])
-        %pill  =^(src +>.$ (dy-init-source q.mad) [mad(q src) +>.$])
-        %poke  =^(src +>.$ (dy-init-source q.mad) [mad(q src) +>.$])
-        %show  =^(src +>.$ (dy-init-source p.mad) [mad(p src) +>.$])
-        %verb  =^(src +>.$ (dy-init-source-unit q.mad) [mad(q src) +>.$])
-        %http
-          =.  r.mad  [0 %as %mime r.mad]
-          =^  src  +>.$  (dy-init-source r.mad)
-          [mad(r src) +>.$]
-      ==
-    ::
-    ++  dy-init-source-unit                             ::  (unit dojo-source)
-      |=  urc=(unit dojo-source)
-      ^+  [urc +>]
-      ?~  urc  [~ +>]
-      =^  src  +>  (dy-init-source u.urc)
-      [`src +>.$]
+      ?@  -.mad  [mad +>.$]
+      =.  q.mad
+        ?+(-.p.mad q.mad %http [0 %as %mime q.mad])
+      =^  src  +>.$  (dy-init-source q.mad)
+      [mad(q src) +>.$]
     ::
     ++  dy-init-source                                  ::  ++dojo-source
       |=  src=dojo-source
@@ -291,6 +289,13 @@
         ==
       [src +>.$(num +(num), job (~(put by job) src))]
     ::
+    ++  dy-init-source-unit                             ::  (unit dojo-source)
+      |=  urc=(unit dojo-source)
+      ^+  [urc +>]
+      ?~  urc  [~ +>]
+      =^  src  +>  (dy-init-source u.urc)
+      [`src +>.$]
+    ::
     ++  dy-init-build                                   ::  ++dojo-build
       |=  bul=dojo-build
       ^+  [bul +>]
@@ -390,49 +395,24 @@
     ::
     ++  dy-over                                         ::  finish construction
       ^+  +>
-      ?-    -.mad
-          %poke       
-        %-  he-card(poy ~)
-        :*  %deal
-            /poke
-            [our.hid p.p.mad]
-            q.p.mad
-            %poke
-            (~(got by rez) p.q.mad)
-        ==
-      ::
-          %file
-        %-  he-card(poy ~)  :*
-          %info
-          /file
-          our.hid
-          (foal (tope p.mad) (~(got by rez) p.q.mad))
-        ==
-      ::
-          %flat
-        =+  out=q.q:(~(got by rez) p.q.mad)
-        ?^  out 
-          (dy-rash %tan [%leaf "not an atom"]~)
-        (dy-rash %sav p.mad out)
-      ::
-          %pill
-        (dy-rash %sag p.mad q.q:(~(got by rez) p.q.mad))
-      ::
-          %verb
-        ?~  q.mad 
-          =.  var  (~(del by var) p.mad)
-          =<  dy-amok
-          ?+  p.mad  . 
-            ?(%eny %now %our)  !!
-            %lib  .(lib ~)
-            %arc  .(arc ~)
-            %dir  .(dir [[our.hid %home ud/0] /])
-          ==
-        =+  cay=(~(got by rez) p.u.q.mad)
-        =.  var  (~(put by var) p.mad cay)
-        ~|  bad-set/[p.mad p.q.cay]
+      ?:  ?=([%show 3] -.mad)
+        (dy-rash %tan (dy-show-source q.mad) ~)        ::  XX separate command
+      ?:  ?=(%brev -.mad)
+        =.  var  (~(del by var) p.mad)
         =<  dy-amok
-        ?+  p.mad  .
+        ?+  p.mad  . 
+          ?(%eny %now %our)  !!
+          %lib  .(lib ~)
+          %arc  .(arc ~)
+          %dir  .(dir [[our.hid %home ud/0] /])
+        ==
+      =+  cay=(~(got by rez) p.q.mad)
+      ?-    -.p.mad
+          %verb
+        =.  var  (~(put by var) p.p.mad cay)
+        ~|  bad-set/[p.p.mad p.q.cay]
+        =<  dy-amok
+        ?+  p.p.mad  .
           %eny  ~|(%entropy-is-eternal !!)
           %now  ~|(%time-is-immutable !!)
           %our  ~|(%self-is-immutable !!)
@@ -442,21 +422,53 @@
                 =-  +(..dy (he-diff %tan - ~))
                 rose/[" " `~]^~[leaf/"=%" (smyt (tope he-beak s.dir))]
         ==
+      ::
+          %poke       
+        %-  he-card(poy ~)
+        :*  %deal
+            /poke
+            [our.hid p.p.p.mad]
+            q.p.p.mad
+            %poke
+            cay
+        ==
+      ::
+          %file
+        %-  he-card(poy ~)  :*
+          %info
+          /file
+          our.hid
+          (foal (tope p.p.mad) cay)
+        ==
+      ::
+          %flat
+        ?^  q.q.cay 
+          (dy-rash %tan [%leaf "not an atom"]~)
+        (dy-rash %sav p.p.mad q.q.cay)
+      ::
+          %pill
+        (dy-rash %sag p.p.mad q.q.cay)
       ::
           %http
-        =+  cay=(~(got by rez) p.r.mad)
         ?>  ?=(%mime p.cay)
         =+  mim=;;(mime q.q.cay)
         =+  maf=(~(add ja *math) content-type/(moon p.mim))
-        (dy-eyre /show [q.mad p.mad maf ~ q.mim])
+        (dy-eyre /show [q.p.mad p.p.mad maf ~ q.mim])
       ::
           %show
-        (dy-show (~(got by rez) p.p.mad))
+        %+  dy-print  cay
+        ?-  p.p.mad
+          0  ~
+          1  ~[[%rose [~ "  " ~] (skol p.q.cay) ~] [%rose [~ "    " ~] >p.cay< ~]]
+          2  [%rose [~ "  " ~] (dy-show-type-noun p.q.cay) ~]~
+        ==
       ==
     ::
-    ++  dy-show
-      |=  cay=cage
+    ++  dy-show  |=(cay=cage (dy-print cay ~))
+    ++  dy-print
+      |=  [cay=cage tan=tang]
       %+  dy-rash  %tan
+      %-  welp  :_  tan
       ?+  p.cay  [(sell q.cay)]~
         %tang  ;;(tang q.q.cay)
         %httr
@@ -468,6 +480,53 @@
           (turn `wain`?~(r.hit ~ (lore q.u.r.hit)) trip)
       ==
     ::
+    ++  dy-show-type-noun
+      |=  a=type  ^-  tank
+      =-  >[-]<
+      |-  ^-  $?  $%  [%atom @tas]
+                      [%cell _$ _$]
+                      [%cube * _$]
+                      [%face @tas _$]
+                      [%fork _$ _$]
+                      [%hold (list ,[_$ twig])]
+                  ==
+                  wain                :: "<|core|>"
+                  ?(%noun %void)
+              ==
+      ?+  a  a
+        [?(%cube %face) ^]  a(q $(a q.a))
+        [?(%cell %fork) ^]  a(p $(a p.a), q $(a q.a))
+        [%bull ^]  $(a q.a)
+        [%core ^]  `wain`/core
+        [%hold *]  a(p (turn p.a |=([b=type c=twig] [^$(a b) c])))
+      ==
+    ::
+    ++  dy-show-source
+      |=  a=dojo-source  ^-  tank
+      =-  >[-]<
+      =+  `[@ bil=dojo-build]`a
+      |-  ^-  $&  [_$ _$]
+              $?  twig
+                  $%  [%ur purl]
+                      [%dv path]
+                      [%as mark _$]
+                      [%do twig _$]
+                      [%ge path (list ,_$) (map term (unit ,_$))]
+                  ==
+              ==
+      ?-  -.bil
+        ?(%ur %dv)  bil
+        %ex  p.bil
+        %tu  ?~  p.bil  !!
+             |-
+             ?~  t.p.bil  ^$(bil q.i.p.bil)
+             [^$(bil q.i.p.bil) $(p.bil t.p.bil)]
+        %as  bil(q $(bil q.q.bil))
+        %do  bil(q $(bil q.q.bil))
+        %ge  :+  %ge  q.p.p.bil
+             [(turn p.q.p.bil ..$) (~(run by q.q.p.bil) (lift ..$))]
+      ==
+    ::
     ++  dy-edit                                         ::  handle edit
       |=  cal=sole-change
       ^+  +>+>
@@ -643,6 +702,8 @@
       |=  nex=@ud
       ^+  +>+>
       ?>  ?=(~ cud)
+      ?:  ?=([%show 3] -.mad)
+        dy-over
       ?:  =(nex num)
         dy-over
       dy-make(cud `[nex (~(got by job) nex)])
@@ -836,12 +897,17 @@
   =+  session-1==+(*session ,_-(poy *(unit)))
   =+  session-0==+(*session-1 ,[_say syd=desk * _|2.-])
   :: ,_`..prep
-  =+  hoze=$%([%0 p=(map bone session-0)] [%1 p=(map bone session-1)])
+  =+  ^=  hoze
+      $%  [%0 p=(map bone session-0)]
+          [%1 p=(map bone session-1)]
+          [%2 p=(map bone session-1)]
+      ==
   |=  old=(unit ?(house hoze))  ^+  [~ ..prep]
   ?~  old  `..prep
   ?-  -.u.old
-    %2  `..prep(+<+ u.old)
-    %1  `..prep(+<+ [%2 (~(run by p.u.old) |=(session-1 +<(poy ~)))])
+    %3  `..prep(+<+ u.old)
+    %2  `..prep(+<+ [%3 (~(run by p.u.old) |=(session-1 +<(poy ~)))])
+    %1  `..prep(+<+ [%3 (~(run by p.u.old) |=(session-1 +<(poy ~)))])
     %0  =<  ^$(u.old [%1 (~(run by p.u.old) .)])
         |=  sos=session-0  ^-  session-1
         [-.sos [[our.hid syd.sos ud/0] /] |3.sos]