detached 154420e

tui: align /help descriptions across slash commands and keys

each section had its own label column width (10 vs 14) so the
descriptions formed two staircases at different x-positions.
compute one shared width from the longest label across BOTH
lists (with a 14-cell minimum so future entries don't compress
the column visually) and pad every label to it. now every
description starts at the same column.
commit
154420e9383f4fb42075e71dae1128c16e72860e
author
patriceckhart · · 2026-04-19 11:14 UTC
parent
c4251d8
signature
unsigned
refs
tag: v0.0.19
1 file · +28 -10
M internal/agent/modes/help.go +28 -10
@@ -29,34 +29,52 @@ var helpKeyRows = [][2]string{
2929 // frameHeader/frameRule helpers so the rules match every other block
3030 // in the tui (tool results, code fences, dialogs) — full terminal width
3131 // in the muted colour.
32+//
33+// Slash commands and keybindings share the same label column width so
34+// every description starts at the same x-position, regardless of which
35+// section it lives in. The width is computed from the longest label
36+// across BOTH lists, with a minimum of 14 cells so changes to either
37+// list don't compress the column visually.
3238 func renderHelpBlock(th tui.Theme, width int) []string {
3339 if width < 20 {
3440 width = 20
3541 }
42+
43+ labelWidth := 14
44+ for _, c := range slashCatalog {
45+ if n := len(c.Name); n > labelWidth {
46+ labelWidth = n
47+ }
48+ }
49+ for _, k := range helpKeyRows {
50+ if n := len(k[0]); n > labelWidth {
51+ labelWidth = n
52+ }
53+ }
54+
55+ pad := func(s string) string {
56+ if len(s) >= labelWidth {
57+ return s
58+ }
59+ return s + strings.Repeat(" ", labelWidth-len(s))
60+ }
61+
3662 var out []string
3763 out = append(out, frameHeader(th, "zot help", width))
3864
3965 // commands section
4066 out = append(out, tui.Bold("slash commands:"))
4167 for _, c := range slashCatalog {
42- name := c.Name
43- if len(name) < 10 {
44- name = name + strings.Repeat(" ", 10-len(name))
45- }
4668 out = append(out, fmt.Sprintf(" %s %s",
47- th.FG256(th.Accent, name),
69+ th.FG256(th.Accent, pad(c.Name)),
4870 th.FG256(th.Muted, c.Desc)))
4971 }
5072
5173 // keys section
5274 out = append(out, "", tui.Bold("keys:"))
5375 for _, k := range helpKeyRows {
54- name := k[0]
55- if len(name) < 14 {
56- name = name + strings.Repeat(" ", 14-len(name))
57- }
5876 out = append(out, fmt.Sprintf(" %s %s",
59- th.FG256(th.Accent, name),
77+ th.FG256(th.Accent, pad(k[0])),
6078 th.FG256(th.Muted, k[1])))
6179 }
6280
@@ -29,34 +29,52 @@ var helpKeyRows = [][2]string{
29 // frameHeader/frameRule helpers so the rules match every other block29 // frameHeader/frameRule helpers so the rules match every other block
30 // in the tui (tool results, code fences, dialogs) — full terminal width30 // in the tui (tool results, code fences, dialogs) — full terminal width
31 // in the muted colour.31 // in the muted colour.
32+//
33+// Slash commands and keybindings share the same label column width so
34+// every description starts at the same x-position, regardless of which
35+// section it lives in. The width is computed from the longest label
36+// across BOTH lists, with a minimum of 14 cells so changes to either
37+// list don't compress the column visually.
32 func renderHelpBlock(th tui.Theme, width int) []string {38 func renderHelpBlock(th tui.Theme, width int) []string {
33 if width < 20 {39 if width < 20 {
34 width = 2040 width = 20
35 }41 }
42+
43+ labelWidth := 14
44+ for _, c := range slashCatalog {
45+ if n := len(c.Name); n > labelWidth {
46+ labelWidth = n
47+ }
48+ }
49+ for _, k := range helpKeyRows {
50+ if n := len(k[0]); n > labelWidth {
51+ labelWidth = n
52+ }
53+ }
54+
55+ pad := func(s string) string {
56+ if len(s) >= labelWidth {
57+ return s
58+ }
59+ return s + strings.Repeat(" ", labelWidth-len(s))
60+ }
61+
36 var out []string62 var out []string
37 out = append(out, frameHeader(th, "zot help", width))63 out = append(out, frameHeader(th, "zot help", width))
38 64
39 // commands section65 // commands section
40 out = append(out, tui.Bold("slash commands:"))66 out = append(out, tui.Bold("slash commands:"))
41 for _, c := range slashCatalog {67 for _, c := range slashCatalog {
42- name := c.Name
43- if len(name) < 10 {
44- name = name + strings.Repeat(" ", 10-len(name))
45- }
46 out = append(out, fmt.Sprintf(" %s %s",68 out = append(out, fmt.Sprintf(" %s %s",
47- th.FG256(th.Accent, name),69+ th.FG256(th.Accent, pad(c.Name)),
48 th.FG256(th.Muted, c.Desc)))70 th.FG256(th.Muted, c.Desc)))
49 }71 }
50 72
51 // keys section73 // keys section
52 out = append(out, "", tui.Bold("keys:"))74 out = append(out, "", tui.Bold("keys:"))
53 for _, k := range helpKeyRows {75 for _, k := range helpKeyRows {
54- name := k[0]
55- if len(name) < 14 {
56- name = name + strings.Repeat(" ", 14-len(name))
57- }
58 out = append(out, fmt.Sprintf(" %s %s",76 out = append(out, fmt.Sprintf(" %s %s",
59- th.FG256(th.Accent, name),77+ th.FG256(th.Accent, pad(k[0])),
60 th.FG256(th.Muted, k[1])))78 th.FG256(th.Muted, k[1])))
61 }79 }
62 80

Keyboard shortcuts

Single-key shortcuts are on. ctrl k and esc work whatever this says.

ctrl k :
go to a section, branch, tag, file or repository
?
this list
j k
move the row cursor down / up
enter
open the row under the cursor; on Files, a directory opens or closes in place
↑ ↓ ← → home end
in the file tree (focus on a row): previous / next row, close / open a directory or go to its parent / first entry, first / last row. They never open a file
l h
on Files: open a directory or a file / close a directory or go up to its parent, then to the parent page. Elsewhere: into the side panel (on a merge request, its files) / back to the content; there j k move between its controls
g g G
first / last row
/
filter the list; on Files, find a file anywhere in the repository (esc clears, enter opens the best match)
b
switch branch or tag
g s g f g c g b g m g i g r g a
tabs: summary, files, commits, branches & tags, merge requests, issues, releases, actions (when available)
g h
home
w
wide mode: use the whole width of the screen, or not (remembered)
y
copy a permalink pinned to the commit
d u x
diff: split / unified / collapse or expand all
e E
diff: the whole file in view / every file, with the lines the hunks hide
n
merge request: next note in the diff
esc
close a dialog, leave a field

Branches 1

Tags 476

↑↓ moveenter openesc close