feat: add g/G and j/k vim navigation to project search (td-3b232874)

Add a ResultsFocused mode to project search that enables vim-style
navigation keys (j/k for up/down, g/G for top/bottom). Tab toggles
between input-focused mode (typing) and results-focused mode (navigation).
Arrow keys auto-focus results; typing auto-focuses input. Visual
feedback shows a block cursor when input-focused and thin cursor when
results-focused.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: marcus

internal/keymap/bindings.go

@@ -348,6 +348,10 @@ func DefaultBindings() []Binding {
 		{Key: "ctrl+e", Command: "open-in-editor", Context: "file-browser-project-search"},
 		{Key: "ctrl+d", Command: "page-down", Context: "file-browser-project-search"},
 		{Key: "ctrl+u", Command: "page-up", Context: "file-browser-project-search"},
+		{Key: "j", Command: "cursor-down", Context: "file-browser-project-search"},
+		{Key: "k", Command: "cursor-up", Context: "file-browser-project-search"},
+		{Key: "g", Command: "cursor-top", Context: "file-browser-project-search"},
+		{Key: "G", Command: "cursor-bottom", Context: "file-browser-project-search"},
 
 		// File browser file operation context
 		{Key: "esc", Command: "cancel", Context: "file-browser-file-op"},

internal/plugins/filebrowser/handlers.go

@@ -1073,6 +1073,48 @@ func (p *Plugin) handleProjectSearchKey(msg tea.KeyMsg) (plugin.Plugin, tea.Cmd)
 		}
 	}
 
+	// Tab toggles between input-focused and results-focused modes.
+	// When results-focused, j/k/g/G navigate results (vim parity).
+	if key == "tab" && state != nil && len(state.Results) > 0 {
+		state.ResultsFocused = !state.ResultsFocused
+		if state.ResultsFocused {
+			// Jump to first match if cursor isn't on one
+			_, _, isFile := state.FlatItem(state.Cursor)
+			if isFile || state.Cursor == 0 {
+				state.Cursor = state.FirstMatchIndex()
+			}
+		}
+		p.clearProjectSearchModal() // Rebuild modal to reflect focus state
+		return p, cmd
+	}
+
+	// When results-focused, handle vim navigation keys before they reach
+	// the default printable-character handler.
+	if state != nil && state.ResultsFocused {
+		switch key {
+		case "j":
+			state.Cursor = state.NextMatchIndex()
+			return p, cmd
+		case "k":
+			state.Cursor = state.PrevMatchIndex()
+			return p, cmd
+		case "g":
+			state.Cursor = state.FirstMatchIndex()
+			state.ScrollOffset = 0
+			return p, cmd
+		case "G":
+			state.Cursor = state.LastMatchIndex()
+			return p, cmd
+		}
+
+		// Any other printable character switches back to input mode
+		// and falls through to the default handler below.
+		if len(key) == 1 && key[0] >= 32 && key[0] <= 126 {
+			state.ResultsFocused = false
+			p.clearProjectSearchModal()
+		}
+	}
+
 	switch key {
 	case "esc":
 		// Close project search
@@ -1106,25 +1148,30 @@ func (p *Plugin) handleProjectSearchKey(msg tea.KeyMsg) (plugin.Plugin, tea.Cmd)
 
 	case "down", "ctrl+n":
 		if state != nil {
+			// Arrow navigation auto-focuses results
+			state.ResultsFocused = true
 			// Skip file headers, only navigate between matches
 			state.Cursor = state.NextMatchIndex()
 		}
 
 	case "up", "ctrl+p":
 		if state != nil {
+			// Arrow navigation auto-focuses results
+			state.ResultsFocused = true
 			// Skip file headers, only navigate between matches
 			state.Cursor = state.PrevMatchIndex()
 		}
 
 	case "ctrl+g":
-		// Go to first match (ctrl+g to avoid conflict with typing 'g')
+		// Go to first match
 		if state != nil {
+			state.ResultsFocused = true
 			state.Cursor = state.FirstMatchIndex()
 			state.ScrollOffset = 0
 		}
 
 	case "ctrl+e":
-		// Open in editor at line (ctrl+e to avoid conflict with typing 'e')
+		// Open in editor at line
 		if state != nil && len(state.Results) > 0 {
 			path, lineNo := state.GetSelectedFile()
 			if path != "" {
@@ -1139,6 +1186,7 @@ func (p *Plugin) handleProjectSearchKey(msg tea.KeyMsg) (plugin.Plugin, tea.Cmd)
 	case "ctrl+d":
 		// Page down, snap to nearest match
 		if state != nil {
+			state.ResultsFocused = true
 			state.Cursor += 10
 			maxIdx := state.FlatLen() - 1
 			if state.Cursor > maxIdx {
@@ -1154,6 +1202,7 @@ func (p *Plugin) handleProjectSearchKey(msg tea.KeyMsg) (plugin.Plugin, tea.Cmd)
 	case "ctrl+u":
 		// Page up, snap to nearest match
 		if state != nil {
+			state.ResultsFocused = true
 			state.Cursor -= 10
 			if state.Cursor < 0 {
 				state.Cursor = 0
@@ -1176,6 +1225,8 @@ func (p *Plugin) handleProjectSearchKey(msg tea.KeyMsg) (plugin.Plugin, tea.Cmd)
 
 	case "backspace":
 		if state != nil && len(state.Query) > 0 {
+			state.ResultsFocused = false
+			p.clearProjectSearchModal()
 			runes := []rune(state.Query)
 			state.Query = string(runes[:len(runes)-1])
 			if state.Query == "" {

internal/plugins/filebrowser/plugin.go

@@ -845,7 +845,7 @@ func (p *Plugin) Commands() []plugin.Command {
 		{ID: "cancel", Name: "Cancel", Description: "Cancel quick open", Category: plugin.CategoryActions, Context: "file-browser-quick-open", Priority: 1},
 		// Project search commands
 		{ID: "select", Name: "Open", Description: "Open selected result", Category: plugin.CategoryActions, Context: "file-browser-project-search", Priority: 1},
-		{ID: "toggle", Name: "Toggle", Description: "Expand/collapse file", Category: plugin.CategoryActions, Context: "file-browser-project-search", Priority: 2},
+		{ID: "toggle", Name: "Focus", Description: "Toggle input/results focus (j/k/g/G in results)", Category: plugin.CategoryNavigation, Context: "file-browser-project-search", Priority: 2},
 		{ID: "cancel", Name: "Close", Description: "Close search", Category: plugin.CategoryActions, Context: "file-browser-project-search", Priority: 3},
 		// File operation commands (move/rename/create/delete)
 		{ID: "confirm", Name: "Confirm", Description: "Confirm operation", Category: plugin.CategoryActions, Context: "file-browser-file-op", Priority: 1},

internal/plugins/filebrowser/project_search.go

@@ -28,10 +28,11 @@ type ProjectSearchState struct {
 	WholeWord     bool
 
 	// UI state
-	Cursor       int  // Index in flattened results (files + matches)
-	ScrollOffset int  // For scrolling
-	IsSearching  bool // True while ripgrep is running
-	Error        string
+	Cursor         int  // Index in flattened results (files + matches)
+	ScrollOffset   int  // For scrolling
+	IsSearching    bool // True while ripgrep is running
+	Error          string
+	ResultsFocused bool // When true, j/k/g/G navigate results instead of typing
 
 	// Debounce: only run search when version matches
 	DebounceVersion int
@@ -152,6 +153,28 @@ func (s *ProjectSearchState) FirstMatchIndex() int {
 	return 0 // Fallback to 0 if no matches visible
 }
 
+// LastMatchIndex returns the flat index of the last visible match.
+// Skips file headers. Returns 0 if no matches are visible.
+func (s *ProjectSearchState) LastMatchIndex() int {
+	last := 0
+	found := false
+	pos := 0
+	for _, f := range s.Results {
+		pos++ // Skip file header
+		if !f.Collapsed && len(f.Matches) > 0 {
+			found = true
+			last = pos + len(f.Matches) - 1
+		}
+		if !f.Collapsed {
+			pos += len(f.Matches)
+		}
+	}
+	if !found {
+		return 0
+	}
+	return last
+}
+
 // NextMatchIndex returns the flat index of the next match after current cursor.
 // Skips file headers. Returns current cursor if no next match exists.
 func (s *ProjectSearchState) NextMatchIndex() int {

internal/plugins/filebrowser/project_search_test.go

@@ -414,6 +414,89 @@ func TestProjectSearchState_PrevMatchIndex(t *testing.T) {
 	}
 }
 
+func TestProjectSearchState_LastMatchIndex(t *testing.T) {
+	tests := []struct {
+		name     string
+		results  []SearchFileResult
+		expected int
+	}{
+		{
+			name:     "empty results",
+			results:  nil,
+			expected: 0,
+		},
+		{
+			name: "single file with matches",
+			results: []SearchFileResult{
+				{Path: "a.go", Matches: []SearchMatch{{LineNo: 1}, {LineNo: 2}}},
+			},
+			expected: 2, // File header at 0, match1 at 1, match2 at 2
+		},
+		{
+			name: "multiple files",
+			results: []SearchFileResult{
+				{Path: "a.go", Matches: []SearchMatch{{LineNo: 1}}},
+				{Path: "b.go", Matches: []SearchMatch{{LineNo: 5}, {LineNo: 10}}},
+			},
+			expected: 4, // a.go(0), match(1), b.go(2), match(3), match(4)
+		},
+		{
+			name: "last file collapsed",
+			results: []SearchFileResult{
+				{Path: "a.go", Matches: []SearchMatch{{LineNo: 1}, {LineNo: 2}}},
+				{Path: "b.go", Collapsed: true, Matches: []SearchMatch{{LineNo: 5}}},
+			},
+			expected: 2, // Last visible match is a.go's second match at 2
+		},
+		{
+			name: "all files collapsed",
+			results: []SearchFileResult{
+				{Path: "a.go", Collapsed: true, Matches: []SearchMatch{{LineNo: 1}}},
+				{Path: "b.go", Collapsed: true, Matches: []SearchMatch{{LineNo: 5}}},
+			},
+			expected: 0, // No visible matches
+		},
+		{
+			name: "single match",
+			results: []SearchFileResult{
+				{Path: "a.go", Matches: []SearchMatch{{LineNo: 1}}},
+			},
+			expected: 1, // File header at 0, single match at 1
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			state := NewProjectSearchState()
+			state.Results = tc.results
+			if got := state.LastMatchIndex(); got != tc.expected {
+				t.Errorf("LastMatchIndex() = %d, want %d", got, tc.expected)
+			}
+		})
+	}
+}
+
+func TestProjectSearchState_ResultsFocused(t *testing.T) {
+	t.Run("default is input focused", func(t *testing.T) {
+		state := NewProjectSearchState()
+		if state.ResultsFocused {
+			t.Error("expected new state to have ResultsFocused=false")
+		}
+	})
+
+	t.Run("toggle results focused", func(t *testing.T) {
+		state := NewProjectSearchState()
+		state.ResultsFocused = true
+		if !state.ResultsFocused {
+			t.Error("expected ResultsFocused=true after setting")
+		}
+		state.ResultsFocused = false
+		if state.ResultsFocused {
+			t.Error("expected ResultsFocused=false after clearing")
+		}
+	})
+}
+
 func TestProjectSearchState_NearestMatchIndex(t *testing.T) {
 	state := NewProjectSearchState()
 	state.Results = []SearchFileResult{

internal/plugins/filebrowser/project_search_view.go

@@ -359,7 +359,11 @@ func (p *Plugin) projectSearchMaxVisible() int {
 // renderProjectSearchHeader renders the search input bar.
 func (p *Plugin) renderProjectSearchHeader(width int) string {
 	state := p.projectSearchState
+	// Show block cursor when input focused, thin cursor when results focused
 	cursor := "█"
+	if state.ResultsFocused {
+		cursor = "▏"
+	}
 
 	prefix := "Search: "
 	available := width - len(prefix) - 1