diff --git a/ape/dojo.hoon b/ape/dojo.hoon index 6dff6f307..a460f0b61 100644 --- a/ape/dojo.hoon +++ b/ape/dojo.hoon @@ -238,7 +238,11 @@ ++ dy :: project work |_ dojo-project :: ++ dy-abet +>(poy `+<) :: resolve - ++ dy-amok +>(poy ~) :: terminate + ++ dy-amok :: terminate + ?~ pux +>(poy ~) + %. [%txt "! cancel {}"] + he-diff:(he-card(poy ~) %exec u.pux our.hid ~) + :: ++ dy-ford :: send work to ford |= [way=wire kas=silk] ^+ +>+> @@ -709,6 +713,11 @@ dy-make(cud `[nex (~(got by job) nex)]) -- :: + ++ he-baxp :: exit out of project + |= ~ ^+ +> + ?~ poy he-pine + he-pine:~(dy-amok dy u.poy) + :: ++ he-dope :: sole user of ++dp |= txt=tape :: ^- (each (unit (each dojo-command tape)) hair) :: prefix/result @@ -937,6 +946,7 @@ |= act=sole-action ~| poke/act %. act (wrap he-type):arm :: +++ poke-sole-back (wrap he-baxp):arm ++ made (wrap he-made):arm ++ sigh-httr (wrap he-sigh):arm ++ sigh-tang |=([a=wire b=tang] ~|(`term`(cat 3 'sigh-' -.a) (mean b))) diff --git a/ape/talk.hoon b/ape/talk.hoon index e8abdd66a..500d228b8 100644 --- a/ape/talk.hoon +++ b/ape/talk.hoon @@ -992,6 +992,7 @@ [%txt (weld "----------------| " (tufa buf))] == :: + ++ sh-baxp (sh-pact ~) :: clear target ++ sh-sole :: apply edit |= act=sole-action ^+ +> @@ -1057,7 +1058,15 @@ ?~ shu ~& [%ra-console-broken ost.hid] +>.$ - sh-abet:(~(sh-sole sh ~ (~(got by shells) ost.hid)) act) + sh-abet:(~(sh-sole sh ~ u.shu) act) + :: + ++ ra-baxp + ^+ ..ra-baxp + =+ shu=(~(get by shells) ost.hid) + ?~ shu + ~& [%ra-console-broken ost.hid] + ..ra-baxp + sh-abet:~(sh-baxp sh ~ u.shu) :: ++ ra-emil :: ra-emit move list |= mol=(list move) @@ -1804,6 +1813,7 @@ |= [act=sole-action] ra-abet:(ra-sole:ra act) :: +++ poke-sole-back |=(~ ra-abet:ra-baxp:ra) :: SOL backspace ++ diff-talk-report :: |= [way=wire rad=report] ^- (quip move +>) diff --git a/lib/drum.hoon b/lib/drum.hoon index e3121ac42..aae806731 100644 --- a/lib/drum.hoon +++ b/lib/drum.hoon @@ -134,6 +134,7 @@ => |% :: arvo structures ++ pear :: request $% [%sole-action p=sole-action] :: + [%sole-back ~] :: back out of dialog [%talk-command command:talk] :: == :: ++ lime :: update @@ -543,6 +544,7 @@ ..ta(liv.maz =(~ fug)) ..ta(fug (~(put by fug) gyl ``target`+<+)) :: + ++ ta-poke |=(a=pear +>(..ta (se-poke gyl a))) :: poke gyl ++ ta-ant :: toggle master ^+ . ?: mav @@ -563,7 +565,7 @@ ^+ +> ?: mav +>.$ - +>.$(+> (se-poke gyl %sole-action act)) + (ta-poke %sole-action act) :: ++ ta-aro :: hear arrow |= key=?(%d %l %r %u) @@ -613,7 +615,8 @@ ta-bel .(str.u.ris (scag (dec (lent str.u.ris)) str.u.ris)) ?: =(0 pos.inp) - .(+> (se-blit %bel ~)) + (ta-poke %sole-back ~) + :: .(+> (se-blit %bel ~)) =+ pre=(dec pos.inp) (ta-hom(pos.inp pre) %del pre) ::