feat(tui): vim motions in prompt input by leohenon · Pull Request #12679 · anomalyco/opencode

leohenon · 2026-02-08T09:43:47Z

What does this PR do?

Adds optional Vim motions to the prompt input. Enable with tui.vim: true or toggle from the menu. Disabled by default.

Supported:

Mode switching: i I a A o O S, cc, cw, Esc
Motions: h j k l, w b e, W B E, 0 ^ $
Deletes: x, dd, dw
Session navigation: gg/G
Scrolling: Ctrl+e/y/d/u/f/b
Enter in normal mode submits

Motivation: I use OpenCode daily and the external editor round-trip for small edits was slow. I originally built this for personal use and then cleaned it up for upstream.

Implementation: Vim state isolated in /vim module. Handler owns mode + pending operator state. Mode resets to insert after submit. No visual mode, intentionally excluded to avoid conflicts with the clipboard system.

I saw thdxr's concern in #1764 about partial Vim feeling incomplete. This PR covers only the core motions needed for prompt editing and is intentionally kept small to make review manageable. I have a fuller implementation locally (yank/put, word/line selections like daw/diw, yaw/yiw, history cycling with j/k, and menu navigation) that I can split into follow-up PRs if this direction looks good.

How did you verify your code works?

Used the fuller implementation locally for over a week of daily use. Reimplemented the core subset for this PR and verified manually (editing, scrolling, session switching, edge cases with pending operators, empty buffers, multiline). Added targeted tests for mode transitions, motions, deletes, pending state, and submit reset. All passing.

github-actions · 2026-02-08T09:43:57Z

Hey! Your PR title vim motions in prompt input box doesn't follow conventional commit format.

Please update it to start with one of:

feat: or feat(scope): new feature
fix: or fix(scope): bug fix
docs: or docs(scope): documentation changes
chore: or chore(scope): maintenance tasks
refactor: or refactor(scope): code refactoring
test: or test(scope): adding or updating tests

Where scope is the package name (e.g., app, desktop, opencode).

See CONTRIBUTING.md for details.

github-actions · 2026-02-08T09:44:22Z

The following comment was made by an LLM, it may be inaccurate:

No duplicate PRs found

Copilot

Pull request overview

Adds an optional Vim-style keybinding layer for the TUI prompt input (configurable via tui.vim or a settings toggle), including a mode indicator, motion/operator handling, and related documentation/tests.

Changes:

Introduces a /vim module (state, handler, motions, scroll/jump mapping, indicator) and wires it into the prompt input flow.
Adds a command-palette setting to toggle Vim input, plus config schema + docs updates.
Adds a targeted test suite covering mode transitions, motions, operators, scrolling, and jumps.

Reviewed changes

Copilot reviewed 13 out of 13 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
packages/web/src/content/docs/tui.mdx	Documents Vim mode and supported keys for the TUI prompt.
packages/web/src/content/docs/config.mdx	Documents `tui.vim` config flag.
packages/opencode/src/config/config.ts	Adds `tui.vim` boolean to config schema.
packages/opencode/src/cli/cmd/tui/component/vim/vim-state.ts	New Vim mode/pending state container.
packages/opencode/src/cli/cmd/tui/component/vim/vim-scroll.ts	Maps Ctrl+key combos to scroll actions.
packages/opencode/src/cli/cmd/tui/component/vim/vim-motions.ts	Implements cursor motions + delete/edit primitives on the textarea.
packages/opencode/src/cli/cmd/tui/component/vim/vim-motion-jump.ts	Implements `gg`/`G` jump behavior.
packages/opencode/src/cli/cmd/tui/component/vim/vim-indicator.ts	Computes INSERT/NORMAL indicator text.
packages/opencode/src/cli/cmd/tui/component/vim/vim-handler.ts	Key-event interpreter coordinating state + motions + submit/scroll/jump.
packages/opencode/src/cli/cmd/tui/component/vim/index.ts	Provides `useVimEnabled()` integration with KV + config.
packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx	Integrates Vim handler/state into prompt input, cursor styling, submit behavior, and indicator rendering.
packages/opencode/src/cli/cmd/tui/app.tsx	Adds command-palette toggle to enable/disable Vim input.
packages/opencode/test/cli/tui/vim-motions.test.ts	Adds tests for handler behavior, operators, and scroll mapping.

Comments suppressed due to low confidence (1)

packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx:918

The inline comment says "Don't preventDefault" but the code immediately calls e.preventDefault(). Either update the comment to match the behavior or adjust the behavior if the intent really is to let the textarea handle the event.

                    await exit()
                    // Don't preventDefault - let textarea potentially handle the event
                    e.preventDefault()
                    return

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-08T09:51:06Z

packages/opencode/src/cli/cmd/tui/component/vim/vim-motions.ts

+  let pos = offset
+  if (pos < text.length) pos++
+  while (pos < text.length && !match(text[pos])) pos++
+  while (pos < text.length && match(text[pos])) pos++
+  if (pos > offset + 1) pos--


wordEnd() currently increments pos before checking whether the cursor is already on a word character. This makes e/E behave incorrectly for 1-character words or when the cursor is on the last character of a word followed by whitespace (e.g., in "a b", e from a will jump to b, and in "a" it can return text.length, which then breaks normal-mode assumptions like l clamping). Consider rewriting wordEnd to first find the end of the current word when on a word char, and ensure it never returns an offset past the last character when used for normal-mode motions; add a regression test for the 1-character word case.

Suggested change

let pos = offset

if (pos < text.length) pos++

while (pos < text.length && !match(text[pos])) pos++

while (pos < text.length && match(text[pos])) pos++

if (pos > offset + 1) pos--

// If the buffer is empty, stay at 0.

if (text.length === 0) return 0

// Clamp starting position to the last valid character index.

let pos = offset

if (pos >= text.length) pos = text.length - 1

// If we're on a word character, move to the end of the *current* word.

if (match(text[pos])) {

while (pos + 1 < text.length && match(text[pos + 1])) pos++

return pos

}

// Otherwise, skip forward to the start of the next word (if any)...

while (pos < text.length && !match(text[pos])) pos++

if (pos >= text.length) return text.length - 1

// ...then move to the end of that word.

while (pos + 1 < text.length && match(text[pos + 1])) pos++

Copilot · 2026-02-08T09:51:06Z

packages/opencode/src/cli/cmd/tui/component/vim/vim-state.ts

+export function createVimState(input: {
+  enabled: Accessor<boolean>
+  active: Accessor<boolean>
+  initial?: Accessor<VimMode | undefined>
+}) {


createVimState requires an active accessor in its input but never reads it. Either remove active from the API (to avoid misleading callers) or use it to reset mode/pending when the prompt becomes inactive (e.g., hidden/disabled), since callers are already computing that signal.

leohenon added 3 commits February 8, 2026 16:56

feat(tui): add optional vim prompt mode foundation

7434687

feat(vim): add cursor motion helpers and h/j/k/l

31b437d

feat(vim): add word motions (w/b/e, W/B/E)

a199e1e

Copilot AI review requested due to automatic review settings February 8, 2026 09:43

github-actions bot added the needs:title label Feb 8, 2026

Copilot started reviewing on behalf of leohenon February 8, 2026 09:44 View session

leohenon changed the title ~~vim motions in prompt input box~~ feat(tui): vim motions in prompt input box Feb 8, 2026

github-actions bot removed the needs:title label Feb 8, 2026

Copilot AI reviewed Feb 8, 2026

View reviewed changes

leohenon changed the title ~~feat(tui): vim motions in prompt input box~~ feat(tui): vim motions in prompt input Feb 8, 2026

leohenon added 15 commits February 8, 2026 21:12

feat(vim): add insert transitions (a/A/i/I/o/O)

e040c9e

feat(vim): add x delete in normal mode

52496b7

feat(vim): add delete motions dd and dw

7ff3a1e

feat(vim): add ctrl scroll mappings for session panels

ab6f0bf

feat(vim): add g/G session jump motions

407a893

fix(vim): prioritize esc to exit insert mode over interrupt

7eafc8d

feat(vim): add mode indicator

3809e69

feat(vim): add S (substitute line) command

37c01ed

fix(vim): reset mode and pending after submit

fbd2267

fix(vim): remove unused active state and correct exit comment

6cfc9bd

fix(vim): correct wordEnd motion edge cases

be3aa6d

refactor(vim): extract vim scroll override check to avoid empty if block

3c2332e

feat(vim): add 0 ^ $ line motions

eb96c86

feat(vim): add cc and cw change commands

7edab55

docs(tui): document vim mode

87b4487

leohenon force-pushed the feat/vim-prompt-input-core branch from 2c180c9 to 87b4487 Compare February 8, 2026 13:28

leohenon added 2 commits February 8, 2026 21:32

Merge branch 'dev' into feat/vim-prompt-input-core

57f6973

Merge branch 'dev' into feat/vim-prompt-input-core

cd3562b

github-actions bot mentioned this pull request Feb 9, 2026

add Cmd+Up/Down keyboard shortcuts to jump to start/end of prompt text #12795

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(tui): vim motions in prompt input#12679

feat(tui): vim motions in prompt input#12679
leohenon wants to merge 20 commits intoanomalyco:devfrom
leohenon:feat/vim-prompt-input-core

leohenon commented Feb 8, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Feb 8, 2026

Uh oh!

github-actions bot commented Feb 8, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Feb 8, 2026

Uh oh!

leohenon Feb 8, 2026

Uh oh!

Copilot AI Feb 8, 2026

Uh oh!

leohenon Feb 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

-  let pos = offset
-  if (pos < text.length) pos++
-  while (pos < text.length && !match(text[pos])) pos++
-  while (pos < text.length && match(text[pos])) pos++
-  if (pos > offset + 1) pos--
+  // If the buffer is empty, stay at 0.
+  if (text.length === 0) return 0
+  // Clamp starting position to the last valid character index.
+  let pos = offset
+  if (pos >= text.length) pos = text.length - 1
+  // If we're on a word character, move to the end of the *current* word.
+  if (match(text[pos])) {
+    while (pos + 1 < text.length && match(text[pos + 1])) pos++
+    return pos
+  }
+  // Otherwise, skip forward to the start of the next word (if any)...
+  while (pos < text.length && !match(text[pos])) pos++
+  if (pos >= text.length) return text.length - 1
+  // ...then move to the end of that word.
+  while (pos + 1 < text.length && match(text[pos + 1])) pos++

Conversation

leohenon commented Feb 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

How did you verify your code works?

Uh oh!

github-actions bot commented Feb 8, 2026

Uh oh!

github-actions bot commented Feb 8, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Feb 8, 2026

Choose a reason for hiding this comment

Uh oh!

leohenon Feb 8, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 8, 2026

Choose a reason for hiding this comment

Uh oh!

leohenon Feb 8, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

leohenon commented Feb 8, 2026 •

edited

Loading