fix: Attempt to handle blink messages

Author: lazysegtree

src/internal/function.go

@@ -16,7 +16,6 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 
 	"github.com/yorukot/superfile/src/internal/ui/processbar"
-	zoxideui "github.com/yorukot/superfile/src/internal/ui/zoxide"
 	"github.com/yorukot/superfile/src/internal/utils"
 
 	"github.com/yorukot/superfile/src/internal/common"
@@ -363,16 +362,6 @@ func processCmdToTeaCmd(cmd processbar.Cmd) tea.Cmd {
 	}
 }
 
-func zoxideCmdToTeaCmd(cmd zoxideui.Cmd) tea.Cmd {
-	if cmd == nil {
-		return nil
-	}
-	return func() tea.Msg {
-		updateMsg := cmd()
-		return NewZoxideUpdateMsg(updateMsg)
-	}
-}
-
 func getCopyOrCutOperationName(cut bool) string {
 	if cut {
 		return "cut"

src/internal/key_function.go

@@ -105,8 +105,7 @@ func (m *model) mainKey(msg string) tea.Cmd { //nolint: gocyclo,cyclop,funlen //
 	case slices.Contains(common.Hotkeys.OpenSPFPrompt, msg):
 		m.promptModal.Open(false)
 	case slices.Contains(common.Hotkeys.OpenZoxide, msg):
-		zCmd := m.zoxideModal.Open()
-		return zoxideCmdToTeaCmd(zCmd)
+		return m.zoxideModal.Open()
 
 	case slices.Contains(common.Hotkeys.OpenHelpMenu, msg):
 		m.openHelpMenu()

src/internal/model.go

@@ -14,7 +14,6 @@ import (
 	"github.com/yorukot/superfile/src/internal/common"
 	"github.com/yorukot/superfile/src/internal/ui/metadata"
 	"github.com/yorukot/superfile/src/internal/ui/notify"
-	zoxideui "github.com/yorukot/superfile/src/internal/ui/zoxide"
 	"github.com/yorukot/superfile/src/internal/utils"
 
 	"github.com/barasher/go-exiftool"
@@ -24,6 +23,7 @@ import (
 	"github.com/charmbracelet/x/ansi"
 
 	variable "github.com/yorukot/superfile/src/config"
+	zoxideui "github.com/yorukot/superfile/src/internal/ui/zoxide"
 	stringfunction "github.com/yorukot/superfile/src/pkg/string_function"
 )
 
@@ -86,6 +86,14 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		m.handleMouseMsg(msg)
 	case tea.KeyMsg:
 		inputCmd = m.handleKeyInput(msg)
+
+	// Has to handle zoxide messages separately as they could be generated via
+	// zoxide update commands, or batched commands from textinput
+	// Cannot do it like processbar messages
+	case zoxideui.UpdateMsg:
+		slog.Debug("Got ModelUpdate message", "id", msg.GetReqID())
+		gotModelUpdateMsg = true
+		updateCmd = msg.Apply(&m.zoxideModal)
 	case ModelUpdateMessage:
 		// TODO: Some of these updates messages should trigger filePanel state update
 		// For example a success message for delete operation
@@ -412,6 +420,7 @@ func (m *model) handleKeyInput(msg tea.KeyMsg) tea.Cmd {
 func (m *model) updateFilePanelsState(msg tea.Msg) tea.Cmd {
 	focusPanel := &m.fileModel.filePanels[m.filePanelFocusIndex]
 	var cmd tea.Cmd
+	var action common.ModelAction
 	switch {
 	case m.firstTextInput:
 		m.firstTextInput = false
@@ -422,20 +431,13 @@ func (m *model) updateFilePanelsState(msg tea.Msg) tea.Cmd {
 	case m.typingModal.open:
 		m.typingModal.textInput, cmd = m.typingModal.textInput.Update(msg)
 	case m.promptModal.IsOpen():
-		// *cmd is a non-name, and cannot be used on left of :=
-		var action common.ModelAction
-		// Taking returned cmd is necessary for blinking
 		// TODO : Separate this to a utility
 		cwdLocation := m.fileModel.filePanels[m.filePanelFocusIndex].location
 		action, cmd = m.promptModal.HandleUpdate(msg, cwdLocation)
 		m.applyPromptModalAction(action)
 	case m.zoxideModal.IsOpen():
-		var action common.ModelAction
-		var zCmd zoxideui.Cmd
-		action, zCmd = m.zoxideModal.HandleUpdate(msg)
+		action, cmd = m.zoxideModal.HandleUpdate(msg)
 		m.applyZoxideModalAction(action)
-		// Wrap zoxide cmd to convert to tea.Cmd
-		return zoxideCmdToTeaCmd(zCmd)
 	}
 
 	// TODO : This is like duct taping a bigger problem

src/internal/model_msg.go

@@ -8,7 +8,6 @@ import (
 	"github.com/yorukot/superfile/src/internal/ui/metadata"
 	"github.com/yorukot/superfile/src/internal/ui/notify"
 	"github.com/yorukot/superfile/src/internal/ui/processbar"
-	zoxideui "github.com/yorukot/superfile/src/internal/ui/zoxide"
 )
 
 type ModelUpdateMessage interface {
@@ -169,26 +168,6 @@ func (msg NotifyModalUpdateMsg) ApplyToModel(m *model) tea.Cmd {
 	return nil
 }
 
-type ZoxideUpdateMsg struct {
-	BaseMessage
-
-	zMsg zoxideui.UpdateMsg
-}
-
-func NewZoxideUpdateMsg(zMsg zoxideui.UpdateMsg) ZoxideUpdateMsg {
-	return ZoxideUpdateMsg{
-		zMsg: zMsg,
-		BaseMessage: BaseMessage{
-			reqID: zMsg.GetReqID(),
-		},
-	}
-}
-
-func (msg ZoxideUpdateMsg) ApplyToModel(m *model) tea.Cmd {
-	cmd := msg.zMsg.Apply(&m.zoxideModal)
-	return zoxideCmdToTeaCmd(cmd)
-}
-
 type FilePreviewUpdateMsg struct {
 	BaseMessage
 

src/internal/ui/zoxide/model.go

@@ -2,6 +2,7 @@ package zoxide
 
 import (
 	"log/slog"
+	"reflect"
 	"slices"
 	"strings"
 
@@ -30,13 +31,14 @@ func GenerateModel(zClient *zoxidelib.Client, maxHeight int, width int) Model {
 	return m
 }
 
-func (m *Model) HandleUpdate(msg tea.Msg) (common.ModelAction, Cmd) {
+func (m *Model) HandleUpdate(msg tea.Msg) (common.ModelAction, tea.Cmd) {
 	slog.Debug("zoxide.Model HandleUpdate()", "msg", msg,
+		"msgType", reflect.TypeOf(msg),
 		"textInput", m.textInput.Value(),
 		"cursorBlink", m.textInput.Cursor.Blink)
 	var action common.ModelAction
 	action = common.NoAction{}
-	var cmd Cmd
+	var cmd tea.Cmd
 	if !m.IsOpen() {
 		slog.Error("HandleUpdate called on closed zoxide")
 		return action, cmd
@@ -78,7 +80,7 @@ func (m *Model) HandleUpdate(msg tea.Msg) (common.ModelAction, Cmd) {
 		// Non keypress updates like Cursor Blink
 		// Only update text input if zoxide is available
 		if m.zClient != nil {
-			m.textInput, _ = m.textInput.Update(msg)
+			m.textInput, cmd = m.textInput.Update(msg)
 		}
 	}
 	return action, cmd
@@ -97,14 +99,14 @@ func (m *Model) handleConfirm() common.ModelAction {
 	return common.NoAction{}
 }
 
-func (m *Model) handleNormalKeyInput(msg tea.KeyMsg) Cmd {
+func (m *Model) handleNormalKeyInput(msg tea.KeyMsg) tea.Cmd {
 	m.textInput, _ = m.textInput.Update(msg)
 
 	// Return async query command
 	return m.GetQueryCmd(m.textInput.Value())
 }
 
-func (m *Model) GetQueryCmd(query string) Cmd {
+func (m *Model) GetQueryCmd(query string) tea.Cmd {
 	if m.zClient == nil || !common.Config.ZoxideSupport {
 		return nil
 	}
@@ -114,7 +116,7 @@ func (m *Model) GetQueryCmd(query string) Cmd {
 
 	slog.Debug("Submitting zoxide query request", "query", query, "id", reqID)
 
-	return func() UpdateMsg {
+	return func() tea.Msg {
 		queryFields := strings.Fields(query)
 		results, err := m.zClient.QueryAll(queryFields...)
 		if err != nil {
@@ -124,3 +126,22 @@ func (m *Model) GetQueryCmd(query string) Cmd {
 		return NewUpdateMsg(query, results, reqID)
 	}
 }
+
+// Apply updates the zoxide modal with query results
+func (msg UpdateMsg) Apply(m *Model) tea.Cmd {
+	// Ignore stale results - only apply if query matches current input
+	currentQuery := m.textInput.Value()
+	if msg.query != currentQuery {
+		slog.Debug("Ignoring stale zoxide query result",
+			"msgQuery", msg.query,
+			"currentQuery", currentQuery,
+			"id", msg.reqID)
+		return nil
+	}
+
+	m.results = msg.results
+	m.cursor = 0
+	m.renderIndex = 0
+
+	return nil
+}

src/internal/ui/zoxide/model_test.go

@@ -80,3 +80,48 @@ func TestJKKeyHandling(t *testing.T) {
 	assert.Equal(t, 1, m.cursor, "down arrow should navigate down")
 	assert.Empty(t, m.textInput.Value(), "down arrow should not add to textInput")
 }
+
+func TestApplyWithMatchingQuery(t *testing.T) {
+	m := setupTestModel()
+	m.textInput.SetValue("test")
+	m.cursor = 5
+	m.renderIndex = 2
+
+	results := []zoxidelib.Result{
+		{Path: "/test/path1", Score: 100},
+		{Path: "/test/path2", Score: 90},
+		{Path: "/test/path3", Score: 80},
+	}
+	msg := NewUpdateMsg("test", results, 1)
+
+	cmd := msg.Apply(&m)
+	assert.Nil(t, cmd)
+	assert.Len(t, m.results, 3, "results should be updated to 3 items")
+	assert.Equal(t, 0, m.cursor, "cursor should be reset to 0")
+	assert.Equal(t, 0, m.renderIndex, "renderIndex should be reset to 0")
+	assert.Equal(t, results, m.results, "results should match the update message")
+}
+
+func TestApplyWithStaleQuery(t *testing.T) {
+	m := setupTestModel()
+	m.textInput.SetValue("new")
+	m.cursor = 1
+	m.renderIndex = 1
+	originalResults := []zoxidelib.Result{
+		{Path: "/original/path", Score: 50},
+	}
+	m.results = originalResults
+
+	staleResults := []zoxidelib.Result{
+		{Path: "/test/path1", Score: 100},
+		{Path: "/test/path2", Score: 90},
+		{Path: "/test/path3", Score: 80},
+	}
+	msg := NewUpdateMsg("old", staleResults, 1)
+
+	cmd := msg.Apply(&m)
+	assert.Nil(t, cmd)
+	assert.Equal(t, originalResults, m.results, "results should remain unchanged")
+	assert.Equal(t, 1, m.cursor, "cursor should remain unchanged")
+	assert.Equal(t, 1, m.renderIndex, "renderIndex should remain unchanged")
+}

src/internal/ui/zoxide/type.go

@@ -29,9 +29,6 @@ type Model struct {
 	reqCnt int
 }
 
-// Cmd is a function that returns an UpdateMsg
-type Cmd func() UpdateMsg
-
 // UpdateMsg represents an async query result
 type UpdateMsg struct {
 	query   string

src/internal/ui/zoxide/update.go

@@ -8,7 +8,7 @@ import (
 	zoxidelib "github.com/lazysegtree/go-zoxide"
 )
 
-func (m *Model) Open() Cmd {
+func (m *Model) Open() tea.Cmd {
 	m.open = true
 	m.justOpened = true
 	m.textInput.SetValue("")