Skip to content

Restore ctrl-r binding for searching prompt history #1759

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
rumpl merged 1 commit into from
Feb 17, 2026
+33 −9
Merged

Restore ctrl-r binding for searching prompt history #1759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion pkg/tui/page/chat/chat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,6 @@ type KeyMap struct {
Cancel key.Binding
ToggleSplitDiff key.Binding
ToggleSidebar key.Binding
HistorySearch key.Binding
}

// defaultKeyMap returns the default key bindings.
Expand Down
41 changes: 33 additions & 8 deletions pkg/tui/tui.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1417,10 +1417,16 @@ func (m *appModel) Bindings() []key.Binding {
bindings = append(bindings, m.chatPage.Bindings()...)
} else {
editorName := getEditorDisplayNameFromEnv(os.Getenv("VISUAL"), os.Getenv("EDITOR"))
bindings = append(bindings, key.NewBinding(
key.WithKeys("ctrl+g"),
key.WithHelp("Ctrl+g", fmt.Sprintf("edit in %s", editorName)),
))
bindings = append(bindings,
key.NewBinding(
key.WithKeys("ctrl+g"),
key.WithHelp("Ctrl+g", fmt.Sprintf("edit in %s", editorName)),
),
key.NewBinding(
key.WithKeys("ctrl+r"),
key.WithHelp("Ctrl+r", "history search"),
),
)
}
return bindings
}
Expand All @@ -1434,9 +1440,12 @@ func (m *appModel) handleKeyPress(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) {
return m, cmd
}

// Tab bar keys (Ctrl+t, Ctrl+p, Ctrl+n, Ctrl+w)
if cmd := m.tabBar.Update(msg); cmd != nil {
return m, cmd
// Tab bar keys (Ctrl+t, Ctrl+p, Ctrl+n, Ctrl+w) are suppressed during
// history search so that ctrl+n/ctrl+p cycle through matches instead.
if !m.editor.IsHistorySearchActive() {
if cmd := m.tabBar.Update(msg); cmd != nil {
return m, cmd
}
}

// Completion popup gets priority when open
Expand All @@ -1458,7 +1467,7 @@ func (m *appModel) handleKeyPress(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) {
return m, tea.Batch(cmds...)
}

// Global keyboard shortcuts
// Global keyboard shortcuts (active even during history search)
switch {
case key.Matches(msg, key.NewBinding(key.WithKeys("ctrl+c"))):
return m, core.CmdHandler(dialog.OpenDialogMsg{
Expand Down Expand Up @@ -1488,10 +1497,26 @@ func (m *appModel) handleKeyPress(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) {

case key.Matches(msg, key.NewBinding(key.WithKeys("ctrl+x"))):
return m, core.CmdHandler(messages.ClearQueueMsg{})
}

// History search is a modal state — capture all remaining keys before normal routing
if m.focusedPanel == PanelEditor && m.editor.IsHistorySearchActive() {
editorModel, cmd := m.editor.Update(msg)
m.editor = editorModel.(editor.Editor)
return m, cmd
}

switch {
case key.Matches(msg, key.NewBinding(key.WithKeys("ctrl+g"))):
return m.openExternalEditor()

case key.Matches(msg, key.NewBinding(key.WithKeys("ctrl+r"))):
if m.focusedPanel == PanelEditor && !m.editor.IsRecording() {
model, cmd := m.editor.EnterHistorySearch()
m.editor = model.(editor.Editor)
return m, cmd
}

// Toggle sidebar (propagates to content view regardless of focus)
case key.Matches(msg, key.NewBinding(key.WithKeys("ctrl+b"))):
updated, cmd := m.chatPage.Update(msg)
Expand Down