🧹 improve shell history

Author: chris-rock

cli/shell/model.go

@@ -70,6 +70,12 @@ type shellModel struct {
 	historyDraft string
 	historyPath  string
 
+	// History search (ctrl+r)
+	searchMode    bool
+	searchQuery   string
+	searchMatches []int // indices into history that match
+	searchIdx     int   // current index into searchMatches
+
 	// Layout
 	width  int
 	height int
@@ -258,6 +264,11 @@ func (m *shellModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 // handleKeyMsg processes keyboard input
 func (m *shellModel) handleKeyMsg(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
+	// Handle history search mode (ctrl+r)
+	if m.searchMode {
+		return m.handleSearchKey(msg)
+	}
+
 	// Handle pasted content - let textarea handle it but adjust height after
 	if msg.Paste {
 		m.showPopup = false
@@ -327,6 +338,18 @@ func (m *shellModel) handleKeyMsg(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 		// Show asset information
 		return m, m.showAssetInfo()
 
+	case "ctrl+r":
+		// Enter history search mode
+		if len(m.history) > 0 {
+			m.searchMode = true
+			m.searchQuery = ""
+			m.searchMatches = nil
+			m.searchIdx = 0
+			// Save current input as draft
+			m.historyDraft = m.input.Value()
+		}
+		return m, nil
+
 	case "ctrl+j":
 		// Insert a newline for manual multiline input
 		m.showPopup = false
@@ -337,22 +360,6 @@ func (m *shellModel) handleKeyMsg(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 
 	case "enter":
 		return m.handleSubmit()
-
-	case "up":
-		// History navigation only when input is empty or single-line on first line
-		isMultiline := strings.Contains(m.input.Value(), "\n")
-		if m.input.Value() == "" || (!isMultiline && m.input.Line() == 0) {
-			return m.navigateHistory(-1)
-		}
-		// For multi-line, let textarea handle cursor movement
-
-	case "down":
-		// History navigation only when input is empty or single-line while browsing history
-		isMultiline := strings.Contains(m.input.Value(), "\n")
-		if m.input.Value() == "" || (!isMultiline && m.historyIdx < len(m.history)) {
-			return m.navigateHistory(1)
-		}
-		// For multi-line, let textarea handle cursor movement
 	}
 
 	// Let textarea handle all other keys
@@ -568,9 +575,107 @@ func (m *shellModel) navigateHistory(direction int) (tea.Model, tea.Cmd) {
 		m.input.SetValue(m.history[m.historyIdx])
 	}
 
+	// Update height for multi-line history entries
+	m.updateInputHeight()
+
+	// Move cursor to start so first line is visible
+	m.input.CursorStart()
+
 	return m, nil
 }
 
+// handleSearchKey processes key input during history search mode
+func (m *shellModel) handleSearchKey(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
+	switch msg.String() {
+	case "ctrl+r":
+		// Find next match (go backwards in history)
+		if len(m.searchMatches) > 0 {
+			m.searchIdx++
+			if m.searchIdx >= len(m.searchMatches) {
+				m.searchIdx = 0 // wrap around
+			}
+			m.applySearchMatch()
+		}
+		return m, nil
+
+	case "ctrl+c", "esc":
+		// Cancel search, restore original input
+		m.searchMode = false
+		m.input.SetValue(m.historyDraft)
+		m.updateInputHeight()
+		return m, nil
+
+	case "enter":
+		// Accept current match and exit search mode
+		m.searchMode = false
+		// Keep the current input value (already set by search)
+		return m, nil
+
+	case "backspace":
+		// Remove last character from search query
+		if len(m.searchQuery) > 0 {
+			m.searchQuery = m.searchQuery[:len(m.searchQuery)-1]
+			m.updateSearchMatches()
+		}
+		return m, nil
+
+	case "ctrl+g":
+		// Abort search (like in emacs)
+		m.searchMode = false
+		m.input.SetValue(m.historyDraft)
+		m.updateInputHeight()
+		return m, nil
+
+	default:
+		// Add typed characters to search query
+		if len(msg.Runes) > 0 {
+			for _, r := range msg.Runes {
+				m.searchQuery += string(r)
+			}
+			m.updateSearchMatches()
+		}
+		return m, nil
+	}
+}
+
+// updateSearchMatches finds all history entries matching the search query
+func (m *shellModel) updateSearchMatches() {
+	m.searchMatches = nil
+	m.searchIdx = 0
+
+	if m.searchQuery == "" {
+		m.input.SetValue("")
+		m.updateInputHeight()
+		return
+	}
+
+	query := strings.ToLower(m.searchQuery)
+
+	// Search backwards through history (most recent first)
+	for i := len(m.history) - 1; i >= 0; i-- {
+		if strings.Contains(strings.ToLower(m.history[i]), query) {
+			m.searchMatches = append(m.searchMatches, i)
+		}
+	}
+
+	m.applySearchMatch()
+}
+
+// applySearchMatch applies the current search match to the input
+func (m *shellModel) applySearchMatch() {
+	if len(m.searchMatches) == 0 {
+		m.input.SetValue("")
+		m.updateInputHeight()
+		return
+	}
+
+	idx := m.searchMatches[m.searchIdx]
+	m.input.SetValue(m.history[idx])
+	m.historyIdx = idx
+	m.updateInputHeight()
+	m.input.CursorStart()
+}
+
 // isBuiltinCommand checks if the input is a built-in shell command
 func isBuiltinCommand(input string) bool {
 	trimmed := strings.TrimSpace(input)
@@ -668,6 +773,9 @@ func (m *shellModel) View() string {
 	if m.executing {
 		b.WriteString(m.spinner.View())
 		b.WriteString(" Executing query...")
+	} else if m.searchMode {
+		// Show search interface
+		b.WriteString(m.renderSearchView())
 	} else {
 		// Render textarea input
 		b.WriteString(m.input.View())
@@ -731,11 +839,51 @@ func (m *shellModel) showAssetInfo() tea.Cmd {
 	}
 }
 
+// renderSearchView renders the history search interface
+func (m *shellModel) renderSearchView() string {
+	var b strings.Builder
+
+	// Show the search prompt
+	searchPrompt := m.theme.Secondary.Render("(reverse-i-search)`") +
+		m.theme.HelpKey.Render(m.searchQuery) +
+		m.theme.Secondary.Render("': ")
+
+	b.WriteString(searchPrompt)
+
+	// Show current match or empty
+	if len(m.searchMatches) > 0 {
+		// Show the matched command (first line only for preview)
+		match := m.history[m.searchMatches[m.searchIdx]]
+		lines := strings.Split(match, "\n")
+		preview := lines[0]
+		if len(lines) > 1 {
+			preview += m.theme.Disabled.Render(" ...")
+		}
+		b.WriteString(preview)
+	} else if m.searchQuery != "" {
+		b.WriteString(m.theme.Disabled.Render("(no match)"))
+	}
+
+	// Show match count
+	if len(m.searchMatches) > 0 {
+		b.WriteString("\n")
+		b.WriteString(m.theme.HelpText.Render(fmt.Sprintf("  [%d/%d matches]", m.searchIdx+1, len(m.searchMatches))))
+	}
+
+	return b.String()
+}
+
 // renderHelpBar renders the help bar with available key bindings
 func (m *shellModel) renderHelpBar() string {
 	var items []string
 
-	if m.showPopup {
+	if m.searchMode {
+		items = []string{
+			m.theme.HelpKey.Render("ctrl+r") + m.theme.HelpText.Render(" next"),
+			m.theme.HelpKey.Render("enter") + m.theme.HelpText.Render(" select"),
+			m.theme.HelpKey.Render("esc") + m.theme.HelpText.Render(" cancel"),
+		}
+	} else if m.showPopup {
 		items = []string{
 			m.theme.HelpKey.Render("↑↓") + m.theme.HelpText.Render(" navigate"),
 			m.theme.HelpKey.Render("tab") + m.theme.HelpText.Render(" select"),
@@ -748,8 +896,8 @@ func (m *shellModel) renderHelpBar() string {
 	} else {
 		items = []string{
 			m.theme.HelpKey.Render("enter") + m.theme.HelpText.Render(" run"),
+			m.theme.HelpKey.Render("ctrl+r") + m.theme.HelpText.Render(" search"),
 			m.theme.HelpKey.Render("ctrl+o") + m.theme.HelpText.Render(" info"),
-			m.theme.HelpKey.Render("ctrl+j") + m.theme.HelpText.Render(" newline"),
 			m.theme.HelpKey.Render("ctrl+d") + m.theme.HelpText.Render(" exit"),
 		}
 	}