2 files changed, 56 insertions, 2 deletions
diff --git a/internal/api/todoist.go b/internal/api/todoist.go
index d6058d3..2454233 100644
--- a/internal/api/todoist.go
+++ b/internal/api/todoist.go
@@ -3,6 +3,7 @@ package api
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	"task-dashboard/internal/config"
@@ -239,8 +240,14 @@ func parseDueDate(due *dueInfo) *time.Time {
 			dueDate = config.ToDisplayTZ(dueDate)
 		}
 	} else if due.Date != "" {
-		// Date-only, parse in display timezone
-		dueDate, err = config.ParseDateInDisplayTZ(due.Date)
+		// Todoist may put a local datetime (no tz offset) in the date field
+		// e.g. "2026-03-22T19:00:00" for recurring tasks with a set time.
+		// Fall back to date-only "2006-01-02" if no T is present.
+		if strings.Contains(due.Date, "T") {
+			dueDate, err = config.ParseDateTimeInDisplayTZ("2006-01-02T15:04:05", due.Date)
+		} else {
+			dueDate, err = config.ParseDateInDisplayTZ(due.Date)
+		}
 	}
 	if err != nil {
 		return nil
diff --git a/internal/api/todoist_test.go b/internal/api/todoist_test.go
index 99b9e80..d2c8da5 100644
--- a/internal/api/todoist_test.go
+++ b/internal/api/todoist_test.go
@@ -142,6 +142,53 @@ func TestTodoistClient_CreateTask_WithDueDate(t *testing.T) {
 	}
 }
 
+func TestParseDueDate_LocalDatetimeInDateField(t *testing.T) {
+	// Todoist REST API v1 puts local datetime (no tz offset) in the "date" field
+	// when datetime is not in UTC (e.g. recurring tasks with a set time)
+	// e.g. due={date="2026-03-22T19:00:00" datetime="" is_recurring=true}
+	due := &dueInfo{
+		Date:        "2026-03-22T19:00:00",
+		Datetime:    "",
+		IsRecurring: true,
+	}
+	result := parseDueDate(due)
+	if result == nil {
+		t.Fatal("parseDueDate returned nil for date field containing local datetime — must parse YYYY-MM-DDTHH:MM:SS format")
+	}
+	if result.Hour() != 19 || result.Minute() != 0 {
+		t.Errorf("Expected 19:00, got %02d:%02d", result.Hour(), result.Minute())
+	}
+}
+
+func TestParseDueDate_MicrosecondDatetime(t *testing.T) {
+	// Todoist REST API v1 returns datetime with microseconds: "2023-01-15T10:00:00.000000Z"
+	// time.RFC3339 cannot parse fractional seconds — parseDueDate must use RFC3339Nano
+	due := &dueInfo{
+		Date:        "2023-01-15",
+		Datetime:    "2023-01-15T10:00:00.000000Z",
+		IsRecurring: true,
+	}
+	result := parseDueDate(due)
+	if result == nil {
+		t.Fatal("parseDueDate returned nil for datetime with microseconds — RFC3339Nano required")
+	}
+	if result.Hour() != 10 || result.Minute() != 0 {
+		t.Errorf("Expected 10:00, got %02d:%02d", result.Hour(), result.Minute())
+	}
+}
+
+func TestParseDueDate_RFC3339Datetime(t *testing.T) {
+	// Standard RFC3339 without fractional seconds should also work
+	due := &dueInfo{
+		Date:     "2023-01-15",
+		Datetime: "2023-01-15T10:00:00Z",
+	}
+	result := parseDueDate(due)
+	if result == nil {
+		t.Fatal("parseDueDate returned nil for standard RFC3339 datetime")
+	}
+}
+
 func TestTodoistClient_UsesAPIv1BaseURL(t *testing.T) {
 	client := NewTodoistClient("test-key")
 	const want = "https://api.todoist.com/api/v1"