Skip to content

Fix TUI left/right arrow navigation direction #451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wesm merged 4 commits into from
Mar 6, 2026
Merged

Fix TUI left/right arrow navigation direction #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
164b4bb
Fix TUI left/right arrow navigation and rename Prev/Next functions
wesm Mar 6, 2026
e5dea43
Fix local variable names to match handler semantics
wesm Mar 6, 2026
94a1e5a
Rename findPrevVisibleJob/findNextVisibleJob to match chronological c…
wesm Mar 6, 2026
0024ce6
Add pgup/pgdown queue selection movement test
wesm Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cmd/roborev/tui/action_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,10 +393,10 @@ func TestTUIClosedToggleMovesSelectionWithHideActive(t *testing.T) {
}

// Simulate what happens in 'a' handler - selection should move
// Since job 2 is now hidden, find next visible
nextIdx := m.findNextVisibleJob(m.selectedIdx)
if nextIdx != 2 {
t.Errorf("Expected next visible job at index 2, got %d", nextIdx)
// Since job 2 is now hidden, find prev (older) visible job
prevIdx := m.findPrevVisibleJob(m.selectedIdx)
if prevIdx != 2 {
t.Errorf("Expected prev visible job at index 2, got %d", prevIdx)
}
}

Expand Down
100 changes: 50 additions & 50 deletions cmd/roborev/tui/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ func (m model) handleGlobalKey(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
return m.handleHomeKey()
case "up":
return m.handleUpKey()
case "k", "left":
case "j", "left":
return m.handlePrevKey()
case "down":
return m.handleDownKey()
case "j", "right":
case "k", "right":
return m.handleNextKey()
case "pgup":
return m.handlePageUpKey()
Expand Down Expand Up @@ -197,9 +197,9 @@ func (m model) handleHomeKey() (tea.Model, tea.Cmd) {
func (m model) handleUpKey() (tea.Model, tea.Cmd) {
switch m.currentView {
case viewQueue:
prevIdx := m.findPrevVisibleJob(m.selectedIdx)
if prevIdx >= 0 {
m.selectedIdx = prevIdx
nextIdx := m.findNextVisibleJob(m.selectedIdx)
if nextIdx >= 0 {
m.selectedIdx = nextIdx
m.updateSelectedJobID()
} else {
m.setFlash("No newer review", 2*time.Second, viewQueue)
Expand All @@ -224,22 +224,22 @@ func (m model) handleUpKey() (tea.Model, tea.Cmd) {
return m, nil
}

func (m model) handlePrevKey() (tea.Model, tea.Cmd) {
func (m model) handleNextKey() (tea.Model, tea.Cmd) {
switch m.currentView {
case viewQueue:
prevIdx := m.findPrevVisibleJob(m.selectedIdx)
if prevIdx >= 0 {
m.selectedIdx = prevIdx
nextIdx := m.findNextVisibleJob(m.selectedIdx)
if nextIdx >= 0 {
m.selectedIdx = nextIdx
m.updateSelectedJobID()
}
case viewReview:
prevIdx := m.findPrevViewableJob()
if prevIdx >= 0 {
nextIdx := m.findNextViewableJob()
if nextIdx >= 0 {
m.closeFixPanel()
m.selectedIdx = prevIdx
m.selectedIdx = nextIdx
m.updateSelectedJobID()
m.reviewScroll = 0
job := m.jobs[prevIdx]
job := m.jobs[nextIdx]
switch job.Status {
case storage.JobStatusDone:
return m, m.fetchReview(job.ID)
Expand All @@ -255,12 +255,12 @@ func (m model) handlePrevKey() (tea.Model, tea.Cmd) {
m.setFlash("No newer review", 2*time.Second, viewReview)
}
case viewKindPrompt:
prevIdx := m.findPrevPromptableJob()
if prevIdx >= 0 {
m.selectedIdx = prevIdx
nextIdx := m.findNextPromptableJob()
if nextIdx >= 0 {
m.selectedIdx = nextIdx
m.updateSelectedJobID()
m.promptScroll = 0
job := m.jobs[prevIdx]
job := m.jobs[nextIdx]
if job.Status == storage.JobStatusDone {
return m, m.fetchReviewForPrompt(job.ID)
} else if job.Status == storage.JobStatusRunning && job.Prompt != "" {
Expand All @@ -275,7 +275,7 @@ func (m model) handlePrevKey() (tea.Model, tea.Cmd) {
}
case viewLog:
if m.logFromView == viewTasks {
idx := m.findPrevLoggableFixJob()
idx := m.findNextLoggableFixJob()
if idx >= 0 {
m.fixSelectedIdx = idx
job := m.fixJobs[idx]
Expand All @@ -285,11 +285,11 @@ func (m model) handlePrevKey() (tea.Model, tea.Cmd) {
)
}
} else {
prevIdx := m.findPrevLoggableJob()
if prevIdx >= 0 {
m.selectedIdx = prevIdx
nextIdx := m.findNextLoggableJob()
if nextIdx >= 0 {
m.selectedIdx = nextIdx
m.updateSelectedJobID()
job := m.jobs[prevIdx]
job := m.jobs[nextIdx]
m.logStreaming = false
return m.openLogView(
job.ID, job.Status, m.logFromView,
Expand All @@ -304,11 +304,11 @@ func (m model) handlePrevKey() (tea.Model, tea.Cmd) {
func (m model) handleDownKey() (tea.Model, tea.Cmd) {
switch m.currentView {
case viewQueue:
nextIdx := m.findNextVisibleJob(m.selectedIdx)
if nextIdx >= 0 {
m.selectedIdx = nextIdx
prevIdx := m.findPrevVisibleJob(m.selectedIdx)
if prevIdx >= 0 {
m.selectedIdx = prevIdx
m.updateSelectedJobID()
if cmd := m.maybePrefetch(nextIdx); cmd != nil {
if cmd := m.maybePrefetch(prevIdx); cmd != nil {
return m, cmd
}
} else if m.canPaginate() {
Expand All @@ -335,28 +335,28 @@ func (m model) handleDownKey() (tea.Model, tea.Cmd) {
return m, nil
}

func (m model) handleNextKey() (tea.Model, tea.Cmd) {
func (m model) handlePrevKey() (tea.Model, tea.Cmd) {
switch m.currentView {
case viewQueue:
nextIdx := m.findNextVisibleJob(m.selectedIdx)
if nextIdx >= 0 {
m.selectedIdx = nextIdx
prevIdx := m.findPrevVisibleJob(m.selectedIdx)
if prevIdx >= 0 {
m.selectedIdx = prevIdx
m.updateSelectedJobID()
if cmd := m.maybePrefetch(nextIdx); cmd != nil {
if cmd := m.maybePrefetch(prevIdx); cmd != nil {
return m, cmd
}
} else if m.canPaginate() {
m.loadingMore = true
return m, m.fetchMoreJobs()
}
case viewReview:
nextIdx := m.findNextViewableJob()
if nextIdx >= 0 {
prevIdx := m.findPrevViewableJob()
if prevIdx >= 0 {
m.closeFixPanel()
m.selectedIdx = nextIdx
m.selectedIdx = prevIdx
m.updateSelectedJobID()
m.reviewScroll = 0
job := m.jobs[nextIdx]
job := m.jobs[prevIdx]
switch job.Status {
case storage.JobStatusDone:
return m, m.fetchReview(job.ID)
Expand All @@ -376,12 +376,12 @@ func (m model) handleNextKey() (tea.Model, tea.Cmd) {
m.setFlash("No older review", 2*time.Second, viewReview)
}
case viewKindPrompt:
nextIdx := m.findNextPromptableJob()
if nextIdx >= 0 {
m.selectedIdx = nextIdx
prevIdx := m.findPrevPromptableJob()
if prevIdx >= 0 {
m.selectedIdx = prevIdx
m.updateSelectedJobID()
m.promptScroll = 0
job := m.jobs[nextIdx]
job := m.jobs[prevIdx]
if job.Status == storage.JobStatusDone {
return m, m.fetchReviewForPrompt(job.ID)
} else if job.Status == storage.JobStatusRunning && job.Prompt != "" {
Expand All @@ -400,7 +400,7 @@ func (m model) handleNextKey() (tea.Model, tea.Cmd) {
}
case viewLog:
if m.logFromView == viewTasks {
idx := m.findNextLoggableFixJob()
idx := m.findPrevLoggableFixJob()
if idx >= 0 {
m.fixSelectedIdx = idx
job := m.fixJobs[idx]
Expand All @@ -410,11 +410,11 @@ func (m model) handleNextKey() (tea.Model, tea.Cmd) {
)
}
} else {
nextIdx := m.findNextLoggableJob()
if nextIdx >= 0 {
m.selectedIdx = nextIdx
prevIdx := m.findPrevLoggableJob()
if prevIdx >= 0 {
m.selectedIdx = prevIdx
m.updateSelectedJobID()
job := m.jobs[nextIdx]
job := m.jobs[prevIdx]
m.logStreaming = false
return m.openLogView(
job.ID, job.Status, m.logFromView,
Expand All @@ -435,11 +435,11 @@ func (m model) handlePageUpKey() (tea.Model, tea.Cmd) {
switch m.currentView {
case viewQueue:
for range pageSize {
prevIdx := m.findPrevVisibleJob(m.selectedIdx)
if prevIdx < 0 {
nextIdx := m.findNextVisibleJob(m.selectedIdx)
if nextIdx < 0 {
break
}
m.selectedIdx = prevIdx
m.selectedIdx = nextIdx
}
m.updateSelectedJobID()
case viewReview:
Expand All @@ -466,12 +466,12 @@ func (m model) handlePageDownKey() (tea.Model, tea.Cmd) {
case viewQueue:
reachedEnd := false
for range pageSize {
nextIdx := m.findNextVisibleJob(m.selectedIdx)
if nextIdx < 0 {
prevIdx := m.findPrevVisibleJob(m.selectedIdx)
if prevIdx < 0 {
reachedEnd = true
break
}
m.selectedIdx = nextIdx
m.selectedIdx = prevIdx
}
m.updateSelectedJobID()
if reachedEnd && m.canPaginate() {
Expand Down
6 changes: 3 additions & 3 deletions cmd/roborev/tui/handlers_msg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ func (m model) handleJobsMsg(msg jobsMsg) (tea.Model, tea.Cmd) {
m.paginateNav = 0
switch nav {
case viewReview:
nextIdx := m.findNextViewableJob()
nextIdx := m.findPrevViewableJob()
if nextIdx >= 0 {
m.selectedIdx = nextIdx
m.updateSelectedJobID()
Expand All @@ -182,7 +182,7 @@ func (m model) handleJobsMsg(msg jobsMsg) (tea.Model, tea.Cmd) {
}
}
case viewKindPrompt:
nextIdx := m.findNextPromptableJob()
nextIdx := m.findPrevPromptableJob()
if nextIdx >= 0 {
m.selectedIdx = nextIdx
m.updateSelectedJobID()
Expand All @@ -199,7 +199,7 @@ func (m model) handleJobsMsg(msg jobsMsg) (tea.Model, tea.Cmd) {
}
}
case viewLog:
nextIdx := m.findNextLoggableJob()
nextIdx := m.findPrevLoggableJob()
if nextIdx >= 0 {
m.selectedIdx = nextIdx
m.updateSelectedJobID()
Expand Down
28 changes: 14 additions & 14 deletions cmd/roborev/tui/handlers_review.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,15 @@ func (m model) handleCloseKey() (tea.Model, tea.Cmd) {
m.pendingClosed[job.ID] = pendingState{newState: newState, seq: seq}
m.applyStatsDelta(newState)
if m.hideClosed && newState {
nextIdx := m.findNextVisibleJob(m.selectedIdx)
if nextIdx < 0 {
nextIdx = m.findPrevVisibleJob(m.selectedIdx)
idx := m.findPrevVisibleJob(m.selectedIdx)
if idx < 0 {
idx = m.findNextVisibleJob(m.selectedIdx)
}
if nextIdx < 0 {
nextIdx = m.findFirstVisibleJob()
if idx < 0 {
idx = m.findFirstVisibleJob()
}
if nextIdx >= 0 {
m.selectedIdx = nextIdx
if idx >= 0 {
m.selectedIdx = idx
m.updateSelectedJobID()
}
}
Expand All @@ -103,15 +103,15 @@ func (m model) handleCancelKey() (tea.Model, tea.Cmd) {
job.FinishedAt = &now
// Canceled jobs are hidden when hideClosed is active
if m.hideClosed {
nextIdx := m.findNextVisibleJob(m.selectedIdx)
if nextIdx < 0 {
nextIdx = m.findPrevVisibleJob(m.selectedIdx)
idx := m.findPrevVisibleJob(m.selectedIdx)
if idx < 0 {
idx = m.findNextVisibleJob(m.selectedIdx)
}
if nextIdx < 0 {
nextIdx = m.findFirstVisibleJob()
if idx < 0 {
idx = m.findFirstVisibleJob()
}
if nextIdx >= 0 {
m.selectedIdx = nextIdx
if idx >= 0 {
m.selectedIdx = idx
m.updateSelectedJobID()
}
}
Expand Down
Loading
Loading