diff --git a/base/ape/dojo/core.hook b/base/ape/dojo/core.hook index 0f5613dda..134731064 100644 --- a/base/ape/dojo/core.hook +++ b/base/ape/dojo/core.hook @@ -715,13 +715,13 @@ == -- :: -++ peer +++ peer-sole |= [from pax=path] ^- (quip move +>) ~? !=(src our.hid) [%dojo-peer-stranger ost src pax] :: ?> =(src our.hid) ?< (~(has by hoc) ost) - ?> =(/sole pax) + ?> =(~ pax) =< he-abet %~ he-peer he :- [ost ~] diff --git a/base/ape/hood/core.hook b/base/ape/hood/core.hook index f033b6faf..a037be6ae 100644 --- a/base/ape/hood/core.hook +++ b/base/ape/hood/core.hook @@ -76,11 +76,11 @@ |= [from hood-merge] (ably (poke-merge:(kiln-work [hid +<-] (able %kiln)) +<+)) :: -++ poke-hood-sync :: +++ poke-hood-sync :: |= [from hood-sync] (ably (poke-sync:(kiln-work [hid +<-] (able %kiln)) +<+)) :: -++ poke-hood-unix :: +++ poke-hood-unix :: |= [from hood-unix] (ably (poke-unix:(kiln-work [hid +<-] (able %kiln)) +<+)) :: @@ -100,8 +100,12 @@ |= [then saw=(unit tang)] (ably (take-coup-fancy:(kiln-work [hid ost src] (able %kiln)) way +<+)) :: -++ coup-kiln-spam +++ coup-kiln-spam :: |= [then saw=(unit tang)] ~? ?=(^ saw) [%kiln-spam-lame u.saw] [~ +>] +:: +++ went-helm :: + |= [then her=ship kay=cape] + (ably (take-went:(helm-work [hid ost src] (able %helm)) way +<+)) -- diff --git a/base/ape/talk/core.hook b/base/ape/talk/core.hook index 6d4523b40..51038f566 100644 --- a/base/ape/talk/core.hook +++ b/base/ape/talk/core.hook @@ -1714,7 +1714,7 @@ ra-abet:(~(ra-quit ra ost ~) man cuz) :: ++ pull :: - |= [from ~] + |= [from *] ^- [(list move) _+>] :: ~& [%talk-pull `*`ost] =^ moz +>.$ ra-abet:ra-ever:~(ra-cancel ra ost ~) diff --git a/base/arvo/ames.hoon b/base/arvo/ames.hoon index 9b71a3efe..5f6d77cff 100644 --- a/base/arvo/ames.hoon +++ b/base/arvo/ames.hoon @@ -454,7 +454,9 @@ ^- [(unit will) _+>] ?. =(our (sein her)) [~ +>.$] =+ nes=sen - ?. =(tic (end 6 1 (shaf %tick (mix her (shax sec:ex:q.nes))))) + =+ ryt=(end 6 1 (shaf %tick (mix her (shax sec:ex:q.nes)))) + ?. =(tic ryt) + ~& [%ames-wrong-ticket `@p`ryt] [~ +>.$] =+ rad=(~(get by hoc.saf) her) ?^ rad @@ -1671,7 +1673,7 @@ :+ (scot %p p.p.bon) (scot %p q.p.bon) q.q.bon - [hen %pass pax %g %rote p.bon /helm 0 %m %will wil]~ + [hen %pass pax %g %rote p.bon /hood 0 %m %will wil]~ ?> ?=([@ @ *] t.q.q.bon) :_ fox =+ [cak=i.t.q.q.bon ven=i.t.t.q.q.bon] @@ -1724,7 +1726,7 @@ == :: %ye :: %ye - :: ~& [%ye bon] + :: ~& [%ye bon] ?> =(p.p.bon (sein q.p.bon)) =+ ^= paz ^- (list ,@p) %+ skim pals:(~(um am [now fox]) p.p.bon) diff --git a/base/arvo/clay.hoon b/base/arvo/clay.hoon index cb47fc374..e6b5de048 100644 --- a/base/arvo/clay.hoon +++ b/base/arvo/clay.hoon @@ -727,8 +727,11 @@ [%done ~ %null !>(~)] =+ (~(get by mim.u.dok) a) ?^ - [%done ~ %mime !>(u.-)] - :^ %cast %mime %done :- ~ - (need (read:ze %x [%ud let.dom] a)) + :+ %cast %mime + =+ (need (need (read-x:ze let.dom a))) + ?: ?=(%& -<) + [%done ~ p.-] + (lobe-to-silk:ze a p.-) == == :: diff --git a/base/arvo/dill.hoon b/base/arvo/dill.hoon index a3b8c3061..98426399c 100644 --- a/base/arvo/dill.hoon +++ b/base/arvo/dill.hoon @@ -325,7 +325,7 @@ =+ ^= flo ^- (list (pair ship term)) =+ myr=(clan p.q.hic) ?: =(%pawn myr) - [[p.q.hic %dojo] ~] + [[p.q.hic %dojo] [p.q.hic %hood] ~] ?: =(%earl myr) =+ fap=(sein p.q.hic) [[fap %dojo] [fap %talk] [fap %hood] ~] diff --git a/base/arvo/gall.hoon b/base/arvo/gall.hoon index 643a8adb1..e2dcd692b 100644 --- a/base/arvo/gall.hoon +++ b/base/arvo/gall.hoon @@ -989,7 +989,7 @@ [~ ..^$(pol.all (~(put by pol.all) p.q.hic [hen ~ ~ ~]))] :: %rote - :: ~& [%gall-rote p.q.hic] + ~& [%gall-rote p.q.hic] ?. (~(has by pol.all) p.p.q.hic) ~& [%gall-not-ours p.q.hic] [~ ..^$] diff --git a/base/lib/helm/core.hook b/base/lib/helm/core.hook index 3bae59840..bab89d6d2 100644 --- a/base/lib/helm/core.hook +++ b/base/lib/helm/core.hook @@ -45,24 +45,15 @@ |% :: helm library ++ helm-work :: work in helm |= [[hide from] helm-part] - ?> =(src our) =+ sez=(fall (~(get by hoc) ost) *helm-session) => |% :: arvo structures ++ card :: $% [%cash wire p=@p q=buck] :: [%conf wire dock %load ship term] :: - [%flog wire dill] :: + [%flog wire flog] :: [%plug wire @p @tas @p @tas] :: [%want wire sock path *] :: send message == :: - ++ suss ,[term @tas @da] :: config report - ++ dill :: sent to %dill - $% [%crud p=term q=(list tank)] :: fat report - [%text p=tape] :: thin report - [%veer p=@ta q=path r=@t] :: install vane - [%vega p=path] :: reboot by path - [%verb ~] :: verbose mode - == :: ++ move (pair bone card) :: user-level move -- |_ moz=(list move) @@ -81,7 +72,7 @@ =+ buz=(shax :(mix (jam ges) eny)) =+ loy=(bruw 2.048 buz) %- emit(bur `[his [0 sec:ex:loy]~]) - [%want /ticketing [our (sein his)] /q/ta his tic ges pub:ex:loy] + [%want /helm/ticket [our (sein his)] /q/ta his tic ges pub:ex:loy] :: ++ poke-init :: initialize |= him=ship =< abet @@ -135,26 +126,31 @@ [%flog /reset %veer p way txt] :: ++ poke-will :: hear certificate - |= wil=(unit will) =< abet + |= wil=(unit will) ?> ?=(^ bur) - ?> ?=(^ wil) + ?> ?=(^ wil) + =< abet %- emil(bur ~) + ~& [%poke-will wil] :~ [%cash /helm p.u.bur q.u.bur u.wil] - [%plug /helm our %main (sein our) %main] - [%plug /helm our %arvo (sein our) %arvo] - [%plug /helm our %try (sein our) %try] + [%plug /helm our %home (sein our) %kids] == :: - ++ poke-verb + ++ poke-verb :: toggle verbose |= ~ =< abet (emit %flog /helm %verb ~) :: ++ take-onto :: result of %conf |= saw=(each suss tang) =< abet + ~& [%take-onto saw] %- emit ?- -.saw %| [%flog ~ %crud %onto `tang`p.saw] %& [%flog ~ %text "<{}>"] == + :: + ++ take-went :: result of %want + |= [way=path her=ship kay=cape] =< abet + (emit %flog ~ %text "went: {<[way kay]>}") -- -- diff --git a/base/lib/kiln/core.hook b/base/lib/kiln/core.hook index 8caa456d6..3212f7bf7 100644 --- a/base/lib/kiln/core.hook +++ b/base/lib/kiln/core.hook @@ -151,11 +151,11 @@ ^+ . (blab [ost %merg /kiln/[syd] our syd her sud gem] ~) :: - ++ fancy-merge :: send to self + ++ fancy-merge :: send to self |= [syd=desk her=@p sud=desk gem=?(%auto germ)] ^+ +> %- blab :_ ~ - [ost %poke /kiln/fancy/[^syd] [our %kiln] %hood-merge [syd her sud gem]] + [ost %poke /kiln/fancy/[^syd] [our %hood] %hood-merge [syd her sud gem]] :: ++ spam |= mes=(list tank)