Merge pull request #654 from dgageot/simpler-history-2

Simpler code for history

Author: rumpl

pkg/history/history.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"os"
 	"path/filepath"
-	"slices"
 )
 
 type History struct {
@@ -33,13 +32,18 @@ func New() (*History, error) {
 }
 
 func (h *History) Add(message string) error {
-	// Avoid duplicate messages
-	if slices.Contains(h.Messages, message) {
-		return nil
+	// Add the message last but avoid duplicate messages
+	var messages []string
+	for _, msg := range h.Messages {
+		if msg != message {
+			messages = append(messages, msg)
+		}
 	}
+	messages = append(messages, message)
 
-	h.Messages = append(h.Messages, message)
+	h.Messages = messages
 	h.current = len(h.Messages)
+
 	return h.save()
 }
 

pkg/history/history_test.go

@@ -88,3 +88,47 @@ func TestHistory_EdgeCases(t *testing.T) {
 	assert.Equal(t, "only", h.Previous()) // Should stay at the beginning
 	assert.Empty(t, h.Next())             // Should return empty when going past the end
 }
+
+func TestHistory_StayAtTheBeginning(t *testing.T) {
+	t.Setenv("HOME", t.TempDir())
+
+	h, err := New()
+	require.NoError(t, err)
+
+	require.NoError(t, h.Add("first"))
+
+	assert.Equal(t, "first", h.Previous())
+	assert.Equal(t, "first", h.Previous())
+}
+
+func TestHistory_NoDuplicateMessages(t *testing.T) {
+	t.Setenv("HOME", t.TempDir())
+
+	h, err := New()
+	require.NoError(t, err)
+
+	require.NoError(t, h.Add("first"))
+	require.NoError(t, h.Add("second"))
+	require.NoError(t, h.Add("second"))
+
+	assert.Equal(t, "second", h.Previous())
+	assert.Equal(t, "first", h.Previous())
+	assert.Equal(t, "first", h.Previous())
+}
+
+func TestHistory_MoveDuplicateLast(t *testing.T) {
+	t.Setenv("HOME", t.TempDir())
+
+	h, err := New()
+	require.NoError(t, err)
+
+	require.NoError(t, h.Add("first"))
+	require.NoError(t, h.Add("second"))
+	require.NoError(t, h.Add("third"))
+	require.NoError(t, h.Add("first"))
+
+	assert.Equal(t, "first", h.Previous())
+	assert.Equal(t, "third", h.Previous())
+	assert.Equal(t, "second", h.Previous())
+	assert.Equal(t, "second", h.Previous())
+}

pkg/tui/components/editor/editor.go

@@ -22,46 +22,32 @@ type SendMsg struct {
 	Content string
 }
 
-// historyNavigation describes which direction we want to pull from history.
-type historyNavigation int
-
-const (
-	NAVIGATEPREVIOUS historyNavigation = iota
-	NAVIGATENEXT
-)
-
 // Editor represents an input editor component
 type Editor interface {
 	layout.Model
 	layout.Sizeable
 	layout.Focusable
 	layout.Help
-	SetHistory(hist *history.History)
 	SetWorking(working bool) tea.Cmd
 }
 
 // editor implements [Editor]
 type editor struct {
 	textarea *textarea.Model
+	hist     *history.History
 	width    int
 	height   int
 	working  bool
+	// completions are the available completions
+	completions []completions.Completion
 
-	// history is the shared command store backing up/down navigation.
-	hist *history.History
-	// draftInput holds the user's unsent text while they browse history.
-	draftInput string
-	// historyBrowsing marks that we're currently showing history entries.
-	historyBrowsing bool
 	// completionWord stores the word being completed
-	completionWord string
-	// completions are the available completions
-	completions       []completions.Completion
+	completionWord    string
 	currentCompletion completions.Completion
 }
 
 // New creates a new editor component
-func New(a *app.App) Editor {
+func New(a *app.App, hist *history.History) Editor {
 	ta := textarea.New()
 	ta.SetStyles(styles.InputStyle)
 	ta.Placeholder = "Type your message here..."
@@ -75,6 +61,7 @@ func New(a *app.App) Editor {
 
 	return &editor{
 		textarea:    ta,
+		hist:        hist,
 		completions: completions.Completions(a),
 	}
 }
@@ -123,24 +110,20 @@ func (e *editor) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			}
 			value := e.textarea.Value()
 			if value != "" && !e.working {
-				// Treat enter as send: clear input and exit history browse state.
 				e.textarea.Reset()
-				e.endHistoryBrowse()
 				return e, core.CmdHandler(SendMsg{Content: value})
 			}
 			return e, nil
 		case "ctrl+c":
 			return e, tea.Quit
 		case "up":
-			// Consume the key when we replace the buffer with an older command.
-			if e.navigateHistory(NAVIGATEPREVIOUS) {
-				return e, nil
-			}
+			e.textarea.SetValue(e.hist.Previous())
+			e.textarea.MoveToEnd()
+			return e, nil
 		case "down":
-			// Consume the key when we replace the buffer with a newer command.
-			if e.navigateHistory(NAVIGATENEXT) {
-				return e, nil
-			}
+			e.textarea.SetValue(e.hist.Next())
+			e.textarea.MoveToEnd()
+			return e, nil
 		default:
 			for _, completion := range e.completions {
 				if msg.String() == completion.Trigger() {
@@ -150,11 +133,6 @@ func (e *editor) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 					cmds = append(cmds, e.startCompletion(completion))
 				}
 			}
-
-			// Any other key exits history browsing so input becomes fresh text.
-			if e.historyBrowsing {
-				e.endHistoryBrowse()
-			}
 		}
 	}
 
@@ -244,88 +222,3 @@ func (e *editor) SetWorking(working bool) tea.Cmd {
 	e.working = working
 	return nil
 }
-
-func (e *editor) SetHistory(hist *history.History) {
-	e.hist = hist
-}
-
-func (e *editor) navigateHistory(direction historyNavigation) bool {
-	// Returning true tells Update to stop Bubble Tea's default cursor handling,
-	// because we've already replaced the textarea content for this key press.
-	if !e.canBrowseHistory() {
-		return false
-	}
-
-	if !e.historyBrowsing {
-		e.beginHistoryBrowse()
-	}
-
-	var entry string
-	switch direction {
-	case NAVIGATEPREVIOUS:
-		// Up arrow walks toward older commands.
-		entry = e.hist.Previous()
-	case NAVIGATENEXT:
-		// Down arrow walks toward newer commands.
-		entry = e.hist.Next()
-		if entry == "" {
-			// Restore the draft when we step past the newest entry.
-			e.restoreDraftFromHistory()
-			return true
-		}
-	default:
-		return false
-	}
-
-	if entry == "" {
-		return true
-	}
-
-	// Replace the input with the selected history entry.
-	e.textarea.SetValue(entry)
-	// Place the cursor at the end so the user can immediately append or send.
-	e.textarea.MoveToEnd()
-	return true
-}
-
-func (e *editor) canBrowseHistory() bool {
-	// We only take over arrow keys when there's at least one history entry and
-	// the textarea is a single line (multi-line inputs retain normal movement).
-	return e.hist != nil && e.textarea.Value() == ""
-}
-
-func (e *editor) beginHistoryBrowse() {
-	if e.hist == nil {
-		return
-	}
-	// Capture the in-progress text so we can restore it after browsing.
-	e.draftInput = e.textarea.Value()
-	e.historyBrowsing = true
-	// Start from the newest entry so the first "up" pulls the latest command.
-	e.moveHistoryCursorToLatest()
-}
-
-func (e *editor) restoreDraftFromHistory() {
-	e.textarea.SetValue(e.draftInput)
-	e.textarea.MoveToEnd()
-	e.endHistoryBrowse()
-}
-
-func (e *editor) endHistoryBrowse() {
-	e.historyBrowsing = false
-	e.draftInput = ""
-	if e.hist == nil {
-		return
-	}
-	e.moveHistoryCursorToLatest()
-}
-
-func (e *editor) moveHistoryCursorToLatest() {
-	if e.hist == nil {
-		return
-	}
-	// Advance until Next returns empty, which positions the cursor just after
-	// the most recent saved command.
-	for e.hist.Next() != "" {
-	}
-}

pkg/tui/page/chat/chat.go

@@ -95,19 +95,16 @@ func defaultKeyMap() KeyMap {
 
 // New creates a new chat page
 func New(a *app.App) Page {
-	ed := editor.New(a)
-
 	historyStore, err := history.New()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "failed to initialize command history: %v\n", err)
 	}
-	ed.SetHistory(historyStore)
 
 	return &chatPage{
 		title:        a.Title(),
 		sidebar:      sidebar.New(),
 		messages:     messages.New(a),
-		editor:       ed,
+		editor:       editor.New(a, historyStore),
 		focusedPanel: PanelEditor,
 		app:          a,
 		keyMap:       defaultKeyMap(),