Skip to content

Fix ctrl+p/ctrl+n navigation in multi-line TUI prompts #5473

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

Open
martinffx wants to merge 4 commits into
base: dev
Choose a base branch
from
+25 −5
Open

Fix ctrl+p/ctrl+n navigation in multi-line TUI prompts #5473

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a5b56e
tui: fix ctrl+p/ctrl+n to move cursor within multi-line input
martinffx Dec 8, 2025
f30c0cc
core: fix typecheck error in build script
martinffx Dec 8, 2025
764ec8c
remove random path update
martinffx Dec 13, 2025
b375c3b
remove random file ext
martinffx Dec 13, 2025
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
30 changes: 25 additions & 5 deletions packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,9 +635,18 @@ export function Prompt(props: PromptProps) {
}
if (store.mode === "normal") autocomplete.onKeyDown(e)
if (!autocomplete.visible) {
const isOnFirstRow = input.visualCursor.visualRow === 0
const isOnLastRow = input.visualCursor.visualRow === input.height - 1
const matchesPrevious = keybind.match("history_previous", e)
const matchesNext = keybind.match("history_next", e)

// History navigation only triggers on boundary rows:
// - previous: only on first visual row (allows cursor up movement on other rows)
// - next: only on last visual row (allows cursor down movement on other rows)
// This enables Emacs-style cursor navigation (ctrl+p/ctrl+n) within multi-line input
if (
(keybind.match("history_previous", e) && input.cursorOffset === 0) ||
(keybind.match("history_next", e) && input.cursorOffset === input.plainText.length)
(keybind.match("history_previous", e) && isOnFirstRow) ||
(keybind.match("history_next", e) && isOnLastRow)
) {
const direction = keybind.match("history_previous", e) ? -1 : 1
const item = history.move(direction, input.plainText)
Expand All @@ -653,9 +662,20 @@ export function Prompt(props: PromptProps) {
return
}

if (keybind.match("history_previous", e) && input.visualCursor.visualRow === 0) input.cursorOffset = 0
if (keybind.match("history_next", e) && input.visualCursor.visualRow === input.height - 1)
input.cursorOffset = input.plainText.length
// Handle Emacs-style cursor navigation (ctrl+p/ctrl+n) within multi-line input
// When NOT on boundary rows, move cursor up/down instead of triggering history
if (matchesPrevious && !isOnFirstRow) {
// Move cursor up one line
input.moveCursorUp()
e.preventDefault()
return
}
if (matchesNext && !isOnLastRow) {
// Move cursor down one line
input.moveCursorDown()
e.preventDefault()
return
}
}
}}
onSubmit={submit}
Expand Down