Merge branch 'test'

Conflicts:
	urb/urbit.pill

arvo/eyre.hoon

@@ -1597,8 +1597,8 @@
       :+  ~
         %red
       ::  :+  [p.p.pul q.p.pul r.p.pul]
-      :+  [| q.p.pul r.p.pul]                           ::  XX  https
+      :+  [| q.p.pul r.p.pul]                           ::  XX https
-        [~ /gul]
+        [p.q.pul /gul]                                  ::  XX js discrimination
       :-  [%url (crip (earn pul(p.p |)))]
       ?~  whu  ~
       [%who (rsh 3 1 (scot %p u.whu))]~
@@ -1797,6 +1797,12 @@
     ++  lash                                            ::  user is authorized
       |=(a=ship (~(has ju aut.ced) %$ (scot %p a)))
     ::
+    ++  redi                                            ::  js login redirect
+      |=  pul=purl  ^-  tape
+      "window.location = '{(earn pul)}".
+        "{?~(r.pul "?" "&")}url=' +".
+        "encodeURIComponent(window.location)"
+    ::
     ++  step                                            ::  step in work
       |-  ^+  +
       =^  zib  +.$
@@ -1932,9 +1938,13 @@
           %=    pip
               pez
             :-  %fin
+            =+  pul=p.som.pip
+            ?:  ?=([~ %js] p.q.pul)               ::  XX js discrimination
+              [%mid /application/javascript (tact (redi pul(p.q ~)))]
+            =.  p.q.pul  ~
             :-  %raw
             :+  307
-              [%location (crip (earn p.som.pip))]~
+              [%location (crip (earn pul))]~
             ~
           ==
         ::

main/app/time/core.hook

@@ -0,0 +1,11 @@
+::  Time an operation, usage :time foo, |time :foo
+::
+::::  /hook/core/time/app
+  ::
+/+    sh-utils
+|_  [hide ~]
+++  peer  ,_`.
+++  poke--args  (add-resp [%pass /(scot %da lat) %t %wait lat] ,_`.)
+++  pour  |=([@ a=path *] %.(+< (args-into-gate +> ,_(resu a))))
+++  resu  |=(a=path tang/[>`@dr`(sub lat (slav %da -.a))<]~)
+--