Skip to content

Commit ff08aec

Browse files
jlcjakclaude
andcommitted
Let the terminal scroll through its retained output
Long output had no usable scrollback, and Shift+PageUp reached the shell as an escape suffix. Wheel and Shift+PageUp/PageDown now move a bounded viewport over retained rows; typing returns to the live screen. Found by e2e s7-1. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent ed52c50 commit ff08aec

9 files changed

Lines changed: 83 additions & 13 deletions

File tree

‎LAWS.bend‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ import ./src/core/sidebar-read.bend as SIDEREAD
1212
import ./src/server/thin-signals.bend as SGV
1313
import ./src/core/signal.bend as SIGREV
1414
import Base
15+
import ./src/core/term-scroll.bend as TSC
16+
import ./src/web/workspace.bend as WSTERM
1517
import ./src/server/thin-sidebar.bend as CHATDERIVED
1618
import ./src/server/thin-sidebar-wire.bend as SWR
1719
import ./src/core/cbor.bend as CBR1 # fast hub R1
@@ -13602,3 +13604,11 @@ law search_unicode_spellings_agree:
1360213604
# Found by e2e o2-8.
1360313605
law stop_command_only_while_running:
1360413606
{WSK.WS.stop.command(False{}) == Nil{} : List<&2, U.PItem>}
13607+
13608+
# The terminal viewport reaches both bounds without wrapping.
13609+
law terminal_scroll_bounds:
13610+
{[TSC.TermScroll.move(0n, 2048n, True{}, 19n), TSC.TermScroll.move(2040n, 2048n, True{}, 19n), TSC.TermScroll.move(3n, 2048n, False{}, 19n)] == [19n, 2048n, 0n] : List<&2, Nat>}
13611+
13612+
law terminal_empty_input_keeps_view:
13613+
for +u: U.Ui
13614+
{WSTERM.WS.term.send(u, Nil{}) == U.Act{u, Nil{}} : U.Act}

‎PROOF.bend‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13981,3 +13981,9 @@ def Laws.search_unicode_spellings_agree():
1398113981

1398213982
def Laws.stop_command_only_while_running():
1398313983
{==}
13984+
13985+
def Laws.terminal_scroll_bounds():
13986+
{==}
13987+
13988+
def Laws.terminal_empty_input_keeps_view(u):
13989+
{==}

‎scripts/sidebar-draft-inputs.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
"src/core/wnote.bend": "019cf6a357f4428774176585931a2df17b83d2347b9e1078428f578968e445d5",
151151
"src/mobile/hubs.bend": "8b5c6d93f51edd32ba76209516ad417b40f175aa7cdf21035dd4beb93e6e8f54",
152152
"src/mobile/screen.bend": "ecb73a0b02dfadec4f7abe29243062902443307deb1960f23d06274e2021ac16",
153-
"src/server/thin-actor.bend": "3cee1ae196cd8b1765949bbb9738d18a298cd5365010aa9591b7eae09af7e73a",
153+
"src/server/thin-actor.bend": "0d4da209193fd84504ee8e6c2d1e6302ba8ecb634b042266e57da2717ff44460",
154154
"src/server/thin-body.bend": "cc0b822d95259c88ce0261bb6bdfbb6903fad200c3eb57229d9dcfd56e0b1f46",
155155
"src/server/thin-mirror.bend": "b488dc7c45fe49bb1aa17966f454f1ee0e9cfef7db4d619c265c298c9bc94e92",
156156
"src/server/thin-side-index.bend": "a90f7c343b70767d371cc2d44c989684489f70c03a7f96fa04911b8b4509e4b2",
@@ -172,7 +172,7 @@
172172
"src/web/space.bend": "b86a265e41a900498bc33c37c0404c4d6678554efe3d9054f329beb2cf35ee63",
173173
"src/web/usage-graph.bend": "fa06f7d2bf855a396a5f7a7b4725dfaa990145fbbcefe7ad21ae8f9a698a2679",
174174
"src/web/usage-page.bend": "706e3f17a4a3e5f159656d47aeb76a940d4825421f5c33228f9aef692ec926e3",
175-
"src/web/view.bend": "7d68ae00f066347efd02c9a569987f4ec2be2c35ff118a28677e0e16f60caacb"
175+
"src/web/view.bend": "e7f52e8cc9ceda7059b4161cdc1b3ecc8d720b133f2f65a7b4793711a2decd91"
176176
},
177177
"review": {
178178
"source": "5f19ea0b9dbcff736e51ced0cb79e19bfef5bba6",
@@ -377,5 +377,5 @@
377377
"limits": "Focused executed checks (9 files) only; global proof, package and device acceptance are the integrator/installer's."
378378
}
379379
},
380-
"reviewNote": "Rebased Stop a running turn from Commands or Ctrl+period; sidebar draft readers and rendering unchanged"
380+
"reviewNote": "Rebase Let the terminal scroll through its retained output; sidebar drafts unchanged and all 24 image checks pass"
381381
}

‎src/core/term-scroll.bend‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import Base
2+
3+
# A terminal's viewport stays between the live screen and its oldest kept
4+
# row. Moving back to the live screen never underflows.
5+
def TermScroll.move(+at: Nat, +history: Nat, back: Bool, +rows: Nat) -> Nat:
6+
match back:
7+
case True{}: Nat.min(history, Nat.add(at, rows))
8+
case False{}: Nat.min(history, Nat.sub(at, rows))

‎src/server/thin-actor.bend‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,8 @@ def Actor.mail_context(+u: U.Ui) -> J.Json:
651651
# by A.act with this connection's VT modes, never by JavaScript.
652652
def TerminalInput.request(+web: Bool, +p: J.Json) -> Bool:
653653
Bool.and(web, Bool.and(J.Json.get_bool(p, "terminalInput", False{}),
654-
Bool.or(String.eq(J.Json.get_str(p, "action", ""), "term-key"), String.eq(J.Json.get_str(p, "action", ""), "term-paste"))))
654+
Bool.and(Bool.not(Bool.or(String.eq(J.Json.get_str(p, "value", ""), "PageUp\t1"), String.eq(J.Json.get_str(p, "value", ""), "PageDown\t1"))),
655+
Bool.or(String.eq(J.Json.get_str(p, "action", ""), "term-key"), String.eq(J.Json.get_str(p, "action", ""), "term-paste")))))
655656

656657
def TerminalInput.owner(+u: U.Ui, +p: J.Json) -> Bool:
657658
+owner = U.Ui.scratch(u, "@terminal.owner")

‎src/web/app.bend‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ def terminal_node.attrs(+u: U.Ui, node: D.Node) -> D.Node:
180180
case _: node
181181

182182
def terminal_node(+u: U.Ui) -> D.Node:
183-
terminal_node.attrs(u, V.View.term.loc(U.Lang.loc(u), U.Ui.term(u, WS.WS.owner(u))))
183+
terminal_node.attrs(u, V.View.term.scroll.loc(U.Lang.loc(u), U.Ui.term(u, WS.WS.owner(u)), WS.WS.term.scroll.at(u)))
184184

185185
def view_sidebar(+u: U.Ui, reuse: Bool) -> D.Node:
186186
WS.WS.view(u, V.View.page.sidebar(stamp(u), reuse), terminal_node(u))

‎src/web/view.bend‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2638,21 +2638,24 @@ def View.paged(+lc: I.Loc, +drafts: Map<&2, String>, +es: List<&2, M.Entry>, +st
26382638

26392639
# the thread's shell: its screen, and over it a transparent field that
26402640
# takes keys (and a phone's keyboard)
2641-
def View.term.loc(+lc: I.Loc, +v: VT.Vt) -> D.Node:
2641+
def View.term.scroll.loc(+lc: I.Loc, +v: VT.Vt, +scroll: Nat) -> D.Node:
26422642
D.El{"section", "term-pane", [D.At{"class", "term-pane"}], [
26432643
D.El{"div", "", [D.At{"class", "term-head"}], [D.Dom.span("label", MSG.T.palette.terminal(lc) ++ Bool.pick(String, String.is_empty(VT.Vt.title(v)), "", " · " ++ VT.Vt.title(v))),
26442644
WI.WIcon.button("icon", "term-toggle", "", MSG.T.terminal.close(lc), "x", 16, "")]},
2645-
D.El{"div", "", [D.At{"class", "screen"}, D.At{"style", "background:" ++ View.hex(VT.Vt.bg()) ++ ";color:" ++ View.hex(VT.Vt.fg())}],
2646-
D.Dom.cat(View.tlines(VT.Vt.lines(v, 0n)), D.Dom.cat(View.cursor(VT.Vt.cursor(v)),
2645+
D.El{"div", "", [D.At{"class", "screen"}, D.At{"data-wheel", "ws-term-scroll"}, D.At{"style", "background:" ++ View.hex(VT.Vt.bg()) ++ ";color:" ++ View.hex(VT.Vt.fg())}],
2646+
D.Dom.cat(View.tlines(VT.Vt.lines(v, scroll)), D.Dom.cat(Bool.pick(List<&2, D.Node>, Nat.is_eq(scroll, 0n), View.cursor(VT.Vt.cursor(v)), Nil{}),
26472647
[D.El{"textarea", "term", [D.At{"id", "term"}, D.At{"class", "term-in"}, D.At{"data-keys", "term-key"}, D.At{"data-text", "term-paste"},
26482648
D.At{"autocapitalize", "off"}, D.At{"autocomplete", "off"}, D.At{"spellcheck", "false"}, D.At{"aria-label", MSG.T.terminal.input(lc)}], Nil{}}]))}]}
26492649

2650-
# Diff
2651-
# ----
2650+
def View.term.loc(lc: I.Loc, v: VT.Vt) -> D.Node:
2651+
View.term.scroll.loc(lc, v, 0n)
26522652

26532653
def View.term(+v: VT.Vt) -> D.Node:
26542654
View.term.loc(I.En{}, v)
26552655

2656+
# Diff
2657+
# ----
2658+
26562659
def View.dl.cls(+k: U32) -> String:
26572660
Bool.pick(String, U32.is_eq(k, 1), "dl add", Bool.pick(String, U32.is_eq(k, 2), "dl del", Bool.pick(String, U32.is_eq(k, 3), "dl meta", "dl")))
26582661

‎src/web/workspace.bend‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import ../core/json.bend as J
66
import ../core/vt.bend as VT
77
import ../core/far.bend as FR
88
import ../core/tools.bend as TO
9+
import ../core/term-scroll.bend as TS
910
import ./dom.bend as D
1011
import ./icon.bend as WI
1112

@@ -107,15 +108,30 @@ def WS.term.toggle(+u: U.Ui, +size: String) -> U.Act:
107108
Bool.pick(U.Act, Bool.and(U.Ui.flag(u, "term"), String.eq(WS.owner(u), U.Ui.sel(u))), WS.term.hide(u),
108109
WS.term.show(WS.term.local(u), u, size))
109110

110-
def WS.term.send(+u: U.Ui, bytes: List<&2, U32>) -> U.Act:
111-
Bool.pick(U.Act, String.is_empty(WS.owner(u)), WS.none(u), U.Ui.rpc(u, "term.input", [J.KV{"thread", J.Str{WS.owner(u)}}, J.KV{"b", J.Json.arr(U.Term.nums(bytes))}]))
111+
# The viewport is local to this shell, separate from its live grid.
112+
def WS.term.scroll.at(+u: U.Ui) -> Nat:
113+
M.Switch.num(U.Ui.scratch(u, "@terminal.scroll:" ++ WS.owner(u)), 0n)
114+
115+
def WS.term.scroll(+u: U.Ui, back: Bool, rows: Nat) -> U.Act:
116+
WS.none(U.Ui.scratch_set(u, "@terminal.scroll:" ++ WS.owner(u), Nat.show(TS.TermScroll.move(WS.term.scroll.at(u), U32.to_nat(VT.Vt.history(U.Ui.term(u, WS.owner(u)))), back, rows))))
117+
118+
def WS.term.wheel(+u: U.Ui, +value: String) -> U.Act:
119+
WS.term.scroll(u, String.starts_with(value, "-"), Nat.max(1n, Nat.div(M.Switch.num(Bool.pick(String, String.starts_with(value, "-"), String.drop(value, 1n), value), 0n), 17n)))
120+
121+
def WS.term.send(+u: U.Ui, +bytes: List<&2, U32>) -> U.Act:
122+
match bytes:
123+
case Nil{}: WS.none(u)
124+
case _ <> _:
125+
Bool.pick(U.Act, String.is_empty(WS.owner(u)), WS.none(u), U.Ui.rpc(U.Ui.scratch_set(u, "@terminal.scroll:" ++ WS.owner(u), "0"), "term.input", [J.KV{"thread", J.Str{WS.owner(u)}}, J.KV{"b", J.Json.arr(U.Term.nums(bytes))}]))
112126

113127
def WS.term.key.sym(ks: U32 & U32, +u: U.Ui, mods: U32) -> U.Act:
114128
(sym, cp) = ks
115129
WS.term.send(u, VT.Vt.key(U.Ui.term(u, WS.owner(u)), sym, cp, mods))
116130

117-
def WS.term.key.parts(ps: List<&2, String>, u: U.Ui) -> U.Act:
131+
def WS.term.key.parts(ps: List<&2, String>, +u: U.Ui) -> U.Act:
118132
match ps:
133+
case "PageUp" <> "1" <> _: WS.term.scroll(u, True{}, U32.to_nat(VT.Vt.rows(U.Ui.term(u, WS.owner(u)))))
134+
case "PageDown" <> "1" <> _: WS.term.scroll(u, False{}, U32.to_nat(VT.Vt.rows(U.Ui.term(u, WS.owner(u)))))
119135
case +key <> mods <> _: WS.term.key.sym(U.Keys.dom(key), u, U32.from_nat(Maybe.default(&2, Nat, Nat.read(mods), 0n)))
120136
case _: WS.none(u)
121137

@@ -284,6 +300,7 @@ def WS.act(action: String, +u: U.Ui, +value: String) -> U.Act:
284300
case "term-toggle": WS.term.toggle(u, value)
285301
case "ws-term-hide": WS.term.hide(u)
286302
case "ws-term-resize": WS.term.resize(u, value)
303+
case "ws-term-scroll": WS.term.wheel(u, value)
287304
case "term-key": WS.term.key(u, value)
288305
case "term-paste": WS.term.send(u, VT.Vt.paste(U.Ui.term(u, WS.owner(u)), value))
289306
case _: WS.none(u)

‎test/terminal_scroll_test.bend‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import Base
2+
import ./check.bend as C
3+
import ../src/core/term-scroll.bend as T
4+
import ../src/core/vt.bend as V
5+
import ../src/core/utf8.bend as U8
6+
import ../src/core/client.bend as U
7+
import ../src/web/workspace.bend as W
8+
import ../src/server/thin-actor.bend as A
9+
import ../src/core/json.bend as J
10+
11+
def ui() -> U.Ui:
12+
U.Ui.term_set(U.Ui.scratch_set(U.Ui.flag_on(U.Ui.init(0n), "term"), "@terminal.owner", "t"), "t", V.Vt.feed(V.Vt.new(20, 5), U8.Utf8.encode("1\r\n2\r\n3\r\n4\r\n5\r\n6\r\n7\r\n")))
13+
14+
def main() -> IO(Unit):
15+
do IO<Unit>:
16+
C.Check.str("up reaches oldest kept row", Nat.show(T.TermScroll.move(2040n, 2048n, True{}, 19n)), "2048")
17+
C.Check.str("down stops at live screen", Nat.show(T.TermScroll.move(3n, 2048n, False{}, 19n)), "0")
18+
+up : U.Act = W.WS.term.key(ui(), "PageUp\t1")
19+
C.Check.str("shift page up sends no shell input", Nat.show(List.length(&2, U.Cmd, U.Act.cmds(up))), "0")
20+
C.Check.str("shift page up reaches retained history", Nat.show(W.WS.term.scroll.at(U.Act.ui(up))), U32.show(V.Vt.history(U.Ui.term(ui(), "t"))))
21+
C.Check.str("modifier press keeps scrollback", Nat.show(W.WS.term.scroll.at(U.Act.ui(W.WS.term.key(U.Act.ui(up), "Shift\t1")))), Nat.show(W.WS.term.scroll.at(U.Act.ui(up))))
22+
C.Check.str("shift page down returns live", Nat.show(W.WS.term.scroll.at(U.Act.ui(W.WS.term.key(U.Act.ui(up), "PageDown\t1")))), "0")
23+
C.Check.str("wheel up moves viewport", Bool.show(Nat.is_gt(W.WS.term.scroll.at(U.Act.ui(W.WS.term.wheel(ui(), "-100"))), 0n)), "True")
24+
C.Check.str("typing returns to live screen", Nat.show(W.WS.term.scroll.at(U.Act.ui(W.WS.term.key(U.Act.ui(up), "a\t0")))), "0")
25+
C.Check.str("viewport key needs a picture", Bool.show(A.TerminalInput.request(True{}, J.Json.obj([J.KV{"terminalInput", J.Flag{True{}}}, J.KV{"action", J.Str{"term-key"}}, J.KV{"value", J.Str{"PageUp\t1"}}]))), "False")

0 commit comments

Comments
 (0)