Fix reload error handling for task 1

4 files changed, 116 insertions, 20 deletions

diff --git a/internal/ui/handlers.go b/internal/ui/handlers.go
index 5428ebd..831687a 100644
--- a/internal/ui/handlers.go
+++ b/internal/ui/handlers.go
@@ -58,7 +58,9 @@ func (m *Model) handleAnnotationMode(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) {
 				return err
 			}
 		}
-		_ = m.reload()
+		if err := m.reload(); err != nil {
+			return fmt.Errorf("reloading tasks: %w", err)
+		}
 		return nil
 	}
 
@@ -84,7 +86,9 @@ func (m *Model) handleDescriptionMode(msg tea.KeyPressMsg) (tea.Model, tea.Cmd)
 		if err := task.SetDescription(m.descID, value); err != nil {
 			return err
 		}
-		_ = m.reload()
+		if err := m.reload(); err != nil {
+			return fmt.Errorf("reloading tasks: %w", err)
+		}
 		return nil
 	}
 
@@ -133,7 +137,9 @@ func (m *Model) handleTagsMode(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) {
 				return err
 			}
 		}
-		_ = m.reload()
+		if err := m.reload(); err != nil {
+			return fmt.Errorf("reloading tasks: %w", err)
+		}
 		return nil
 	}
 
@@ -164,7 +170,9 @@ func (m *Model) handleDueEditMode(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) {
 			return m, cmd
 		}
 		m.dueEditing = false
-		m.reload()
+		if !m.reloadAndReport() {
+			return m, nil
+		}
 		var cmd tea.Cmd
 		if m.showTaskDetail {
 			// In detail view, blink the due field
@@ -202,7 +210,9 @@ func (m *Model) handleRecurrenceMode(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) {
 		if err := task.SetRecurrence(m.recurID, value); err != nil {
 			return err
 		}
-		_ = m.reload()
+		if err := m.reload(); err != nil {
+			return fmt.Errorf("reloading tasks: %w", err)
+		}
 		return nil
 	}
 
@@ -233,7 +243,7 @@ func (m *Model) handleProjectMode(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) {
 
 	onExit := func() {
 		m.projEditing = false
-		m.reload()
+		m.reloadAndReport()
 	}
 
 	model, cmd := m.handleTextInput(msg, &m.projInput, onEnter, onExit)
@@ -267,7 +277,9 @@ func (m *Model) handlePriorityMode(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) {
 			return m, cmd
 		}
 		m.prioritySelecting = false
-		m.reload()
+		if !m.reloadAndReport() {
+			return m, nil
+		}
 		var cmd tea.Cmd
 		if m.showTaskDetail {
 			// In detail view, blink the priority field
@@ -343,7 +355,9 @@ func (m *Model) handleAddTaskMode(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) {
 
 		m.addingTask = false
 		m.addInput.Blur()
-		m.reload()
+		if !m.reloadAndReport() {
+			return m, nil
+		}
 
 		// Find the newly added task
 		var newID int
@@ -408,7 +422,9 @@ func (m *Model) handleSearchMode(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) {
 		}
 		m.searching = false
 		m.searchInput.Blur()
-		m.reload()
+		if !m.reloadAndReport() {
+			return m, nil
+		}
 		m.updateTableHeight()
 
 		if len(m.searchMatches) > 0 {
diff --git a/internal/ui/keyhandlers.go b/internal/ui/keyhandlers.go
index 33c7dc0..de16dd0 100644
--- a/internal/ui/keyhandlers.go
+++ b/internal/ui/keyhandlers.go
@@ -197,7 +197,7 @@ func (m *Model) handleQuitKey() (tea.Model, tea.Cmd) {
 		m.searchRegex = nil
 		m.searchMatches = nil
 		m.searchIndex = 0
-		m.reload()
+		m.reloadAndReport()
 		return m, nil
 	}
 	return m, tea.Quit
@@ -252,7 +252,7 @@ func (m *Model) handleEscapeKey() (tea.Model, tea.Cmd) {
 		m.searchRegex = nil
 		m.searchMatches = nil
 		m.searchIndex = 0
-		m.reload()
+		m.reloadAndReport()
 		return m, nil
 	}
 	return m, nil
@@ -294,7 +294,9 @@ func (m *Model) handleToggleStart() (tea.Model, tea.Cmd) {
 		}
 	}
 
-	m.reload()
+	if !m.reloadAndReport() {
+		return m, nil
+	}
 	return m, m.startBlink(id, false)
 }
 
@@ -420,7 +422,9 @@ func (m *Model) handleRemoveDueDate() (tea.Model, tea.Cmd) {
 		return m, nil
 	}
 
-	m.reload()
+	if !m.reloadAndReport() {
+		return m, nil
+	}
 	return m, m.startBlink(id, false)
 }
 
@@ -438,7 +442,9 @@ func (m *Model) handleRandomDueDate() (tea.Model, tea.Cmd) {
 		return m, nil
 	}
 
-	m.reload()
+	if !m.reloadAndReport() {
+		return m, nil
+	}
 	return m, m.startBlink(id, false)
 }
 
@@ -575,7 +581,9 @@ func (m *Model) handleTagToProject() (tea.Model, tea.Cmd) {
 		return m, nil
 	}
 
-	m.reload()
+	if !m.reloadAndReport() {
+		return m, nil
+	}
 	return m, m.startBlink(id, false)
 }
 
@@ -607,7 +615,7 @@ func (m *Model) handleToggleBlink() (tea.Model, tea.Cmd) {
 }
 
 func (m *Model) handleRefresh() (tea.Model, tea.Cmd) {
-	m.reload()
+	m.reloadAndReport()
 	return m, nil
 }
 
diff --git a/internal/ui/table.go b/internal/ui/table.go
index 0f569d2..20928fd 100644
--- a/internal/ui/table.go
+++ b/internal/ui/table.go
@@ -307,7 +307,7 @@ func (m *Model) startBlink(id int, markDone bool) tea.Cmd {
 		}
 		m.blinkID = 0
 		m.blinkMarkDone = false
-		m.reload()
+		m.reloadAndReport()
 		return nil
 	}
 
@@ -462,6 +462,14 @@ func (m *Model) reload() error {
 	return nil
 }
 
+func (m *Model) reloadAndReport() bool {
+	if err := m.reload(); err != nil {
+		m.showError(fmt.Errorf("reloading tasks: %w", err))
+		return false
+	}
+	return true
+}
+
 // Init implements tea.Model.
 func (m Model) Init() tea.Cmd { return nil }
 
@@ -572,7 +580,10 @@ func (m *Model) handleEditDone(msg editDoneMsg) (tea.Model, tea.Cmd) {
 	if m.showUltra {
 		m.ultraFocusedID = m.editID
 	}
-	m.reload()
+	if !m.reloadAndReport() {
+		m.editID = 0
+		return m, nil
+	}
 	cmd := m.startBlink(m.editID, false)
 	m.editID = 0
 	return m, cmd
@@ -616,7 +627,9 @@ func (m *Model) handleDescEditDone(msg descEditDoneMsg) (tea.Model, tea.Cmd) {
 		}
 
 		// Reload and start blinking
-		m.reload()
+		if !m.reloadAndReport() {
+			return m, nil
+		}
 		return m, m.startDetailBlink(m.detailDescriptionFieldIndex())
 	}
 
@@ -667,7 +680,7 @@ func (m *Model) handleBlinkMsg() (tea.Model, tea.Cmd) {
 				m.showError(err)
 			}
 		}
-		m.reload()
+		m.reloadAndReport()
 		return m, nil
 	}
 
diff --git a/internal/ui/table_test.go b/internal/ui/table_test.go
index 95f9b1b..7ad079b 100644
--- a/internal/ui/table_test.go
+++ b/internal/ui/table_test.go
@@ -228,6 +228,65 @@ func TestHandleDescEditDoneRemovesTempFileOnEditorError(t *testing.T) {
 	}
 }
 
+func TestHandleFilterModeReportsReloadError(t *testing.T) {
+	tmp := t.TempDir()
+	taskPath := filepath.Join(tmp, "task")
+	failFlag := filepath.Join(tmp, "fail-reload")
+
+	script := "#!/bin/sh\n" +
+		"if echo \"$@\" | grep -q export; then\n" +
+		"  if [ -f " + failFlag + " ]; then\n" +
+		"    echo 'reload failed' >&2\n" +
+		"    exit 42\n" +
+		"  fi\n" +
+		"  echo '{\"id\":1,\"uuid\":\"x\",\"description\":\"d\",\"status\":\"pending\",\"entry\":\"\",\"priority\":\"\",\"urgency\":0,\"annotations\":[]}'\n" +
+		"  exit 0\n" +
+		"fi\n"
+
+	if err := os.WriteFile(taskPath, []byte(script), 0o755); err != nil {
+		t.Fatal(err)
+	}
+
+	origPath := os.Getenv("PATH")
+	os.Setenv("PATH", tmp+":"+origPath)
+	t.Cleanup(func() { os.Setenv("PATH", origPath) })
+
+	os.Setenv("TASKDATA", tmp)
+	os.Setenv("TASKRC", "/dev/null")
+	t.Cleanup(func() {
+		os.Unsetenv("TASKDATA")
+		os.Unsetenv("TASKRC")
+	})
+
+	m, err := New(nil, "firefox")
+	if err != nil {
+		t.Fatalf("New: %v", err)
+	}
+
+	if err := os.WriteFile(failFlag, []byte("1"), 0o644); err != nil {
+		t.Fatal(err)
+	}
+
+	m.filterEditing = true
+	m.filterInput.SetValue("project:alpha")
+
+	mv, cmd := (&m).handleFilterMode(tea.KeyPressMsg{Code: tea.KeyEnter})
+	m = *mv.(*Model)
+
+	if !m.filterEditing {
+		t.Fatalf("filter editing was cleared after reload failure")
+	}
+	if cmd == nil {
+		t.Fatalf("reload failure did not return a clear-status command")
+	}
+	if !strings.Contains(m.statusMsg, "reloading tasks") {
+		t.Fatalf("unexpected status message: %q", m.statusMsg)
+	}
+	if got := strings.Join(m.filters, " "); got != "project:alpha" {
+		t.Fatalf("filters not applied before reload attempt: %q", got)
+	}
+}
+
 func TestDoneHotkey(t *testing.T) {
 	tmp := t.TempDir()
 	taskPath := filepath.Join(tmp, "task")