fix(calendar): parse freebusy date ranges like events (#811)

clawsweeper[bot] · steipete · web-flow · commit 23b847ca53cf · 2026-06-14T22:11:34.000-07:00
Co-authored-by: Peter Steinberger &lt;steipete@gmail.com&gt;
Co-authored-by: clawsweeper[bot] &lt;274271284+clawsweeper[bot]@users.noreply.github.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## 0.27.1 - Unreleased
 
+### Fixed
+
+- Calendar: accept relative and date-only `freebusy --from`/`--to` values using the same timezone-aware range parsing as events. (#806, #811) — thanks @privatenumber.
+
 ## 0.27.0 - 2026-06-14
 
 ### Added
diff --git a/docs/commands/gog-calendar-freebusy.md b/docs/commands/gog-calendar-freebusy.md
@@ -29,7 +29,7 @@ gog calendar (cal) freebusy [<calendarIds>] [flags]
 | `--enable-commands` | `string` |  | Comma-separated list of enabled command prefixes; dot paths allowed (restricts CLI) |
 | `--enable-commands-exact` | `string` |  | Comma-separated list of exact enabled commands; dot paths allowed and parent commands do not enable children |
 | `-y`<br>`--force`<br>`--assume-yes`<br>`--yes` | `bool` |  | Skip confirmations for destructive commands |
-| `--from` | `string` |  | Start time (RFC3339, required) |
+| `--from` | `string` |  | Start time (RFC3339 with timezone, date, or relative: now, today, tomorrow, monday) |
 | `--gmail-no-send` | `bool` | false | Block Gmail send operations (agent safety) |
 | `-h`<br>`--help` | `kong.helpFlag` |  | Show context-sensitive help. |
 | `--home` | `string` |  | Override gogcli config/data/state/cache root (equivalent to GOG_HOME) |
@@ -38,7 +38,7 @@ gog calendar (cal) freebusy [<calendarIds>] [flags]
 | `-p`<br>`--plain`<br>`--tsv` | `bool` | false | Output stable, parseable text to stdout (TSV; no colors) |
 | `--results-only` | `bool` |  | In JSON mode, emit only the primary result (drops envelope fields like nextPageToken) |
 | `--select`<br>`--pick`<br>`--project` | `string` |  | In JSON mode, select comma-separated fields (best-effort; supports dot paths). Desire path: use --fields for most commands. |
-| `--to` | `string` |  | End time (RFC3339, required) |
+| `--to` | `string` |  | End time (RFC3339 with timezone, date, or relative: now, today, tomorrow, monday) |
 | `-v`<br>`--verbose` | `bool` |  | Enable verbose logging |
 | `--version` | `kong.VersionFlag` |  | Print version and exit |
 | `--wrap-untrusted` | `bool` | false | In JSON/raw output, wrap fetched text fields in external untrusted-content markers |
diff --git a/internal/cmd/calendar_freebusy.go b/internal/cmd/calendar_freebusy.go
@@ -3,6 +3,7 @@ package cmd
 import (
 	"context"
 	"strings"
+	"time"
 
 	"google.golang.org/api/calendar/v3"
 
@@ -14,8 +15,8 @@ type CalendarFreeBusyCmd struct {
 	CalendarIDs string   `arg:"" optional:"" name:"calendarIds" help:"Comma-separated calendar IDs, names, or indices from 'calendar calendars'"`
 	Cal         []string `name:"cal" help:"Calendar ID, name, or index (can be repeated)"`
 	All         bool     `name:"all" help:"Query all calendars"`
-	From        string   `name:"from" help:"Start time (RFC3339, required)"`
-	To          string   `name:"to" help:"End time (RFC3339, required)"`
+	From        string   `name:"from" help:"Start time (RFC3339 with timezone, date, or relative: now, today, tomorrow, monday)"`
+	To          string   `name:"to" help:"End time (RFC3339 with timezone, date, or relative: now, today, tomorrow, monday)"`
 }
 
 func (c *CalendarFreeBusyCmd) Run(ctx context.Context, flags *RootFlags) error {
@@ -38,9 +39,14 @@ func (c *CalendarFreeBusyCmd) Run(ctx context.Context, flags *RootFlags) error {
 		return err
 	}
 
+	from, to, err := c.resolveFreeBusyRange(ctx, svc)
+	if err != nil {
+		return err
+	}
+
 	req := &calendar.FreeBusyRequest{
-		TimeMin: c.From,
-		TimeMax: c.To,
+		TimeMin: from,
+		TimeMax: to,
 		Items:   make([]*calendar.FreeBusyRequestItem, 0, len(calendarIDs)),
 	}
 	for _, id := range calendarIDs {
@@ -63,3 +69,24 @@ func (c *CalendarFreeBusyCmd) Run(ctx context.Context, flags *RootFlags) error {
 
 	return outfmt.WriteTable(ctx, stdoutWriter(ctx), calendarFreeBusyRows(resp.Calendars), calendarFreeBusyColumns())
 }
+
+func (c *CalendarFreeBusyCmd) resolveFreeBusyRange(ctx context.Context, svc *calendar.Service) (string, string, error) {
+	if isRFC3339Instant(c.From) && isRFC3339Instant(c.To) {
+		return c.From, c.To, nil
+	}
+
+	timeRange, err := ResolveTimeRange(ctx, svc, TimeRangeFlags{
+		From: c.From,
+		To:   c.To,
+	})
+	if err != nil {
+		return "", "", err
+	}
+	from, to := timeRange.FormatRFC3339()
+	return from, to, nil
+}
+
+func isRFC3339Instant(value string) bool {
+	_, err := time.Parse(time.RFC3339Nano, strings.TrimSpace(value))
+	return err == nil
+}
diff --git a/internal/cmd/calendar_freebusy_conflicts_selection_test.go b/internal/cmd/calendar_freebusy_conflicts_selection_test.go
@@ -8,6 +8,7 @@ import (
 	"sort"
 	"strings"
 	"testing"
+	"time"
 
 	"google.golang.org/api/calendar/v3"
 	"google.golang.org/api/option"
@@ -73,6 +74,127 @@ func TestCalendarFreeBusyCmd_ResolvesCalendarName(t *testing.T) {
 	}
 }
 
+func TestCalendarFreeBusyCmd_RFC3339RangeDoesNotFetchTimezone(t *testing.T) {
+	var got struct {
+		TimeMin string `json:"timeMin"`
+		TimeMax string `json:"timeMax"`
+	}
+	var unexpected []string
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		path := strings.TrimPrefix(r.URL.Path, "/calendar/v3")
+		if r.Method == http.MethodPost && strings.Contains(path, "/freeBusy") {
+			_ = json.NewDecoder(r.Body).Decode(&got)
+			w.Header().Set("Content-Type", "application/json")
+			_ = json.NewEncoder(w).Encode(map[string]any{
+				"calendars": map[string]any{
+					"work@example.com": map[string]any{"busy": []map[string]any{}},
+				},
+			})
+			return
+		}
+
+		unexpected = append(unexpected, r.Method+" "+path)
+		http.NotFound(w, r)
+	}))
+	defer srv.Close()
+
+	svc, err := calendar.NewService(context.Background(),
+		option.WithoutAuthentication(),
+		option.WithHTTPClient(srv.Client()),
+		option.WithEndpoint(srv.URL+"/"),
+	)
+	if err != nil {
+		t.Fatalf("NewService: %v", err)
+	}
+	result := executeWithCalendarTestService(t, []string{
+		"--json",
+		"--account", "a@b.com",
+		"calendar", "freebusy",
+		"work@example.com",
+		"--from", "2026-01-10T00:00:00-08:00",
+		"--to", "2026-01-11T00:00:00-08:00",
+	}, svc)
+	if result.err != nil {
+		t.Fatalf("Execute: %v", result.err)
+	}
+	if len(unexpected) != 0 {
+		t.Fatalf("unexpected pre-freebusy requests: %#v", unexpected)
+	}
+	if got.TimeMin != "2026-01-10T00:00:00-08:00" || got.TimeMax != "2026-01-11T00:00:00-08:00" {
+		t.Fatalf("expected original RFC3339 bounds, got %q -> %q", got.TimeMin, got.TimeMax)
+	}
+}
+
+func TestCalendarFreeBusyCmd_RelativeRangePayload(t *testing.T) {
+	var got struct {
+		TimeMin string `json:"timeMin"`
+		TimeMax string `json:"timeMax"`
+		Items   []struct {
+			ID string `json:"id"`
+		} `json:"items"`
+	}
+	srv := httptest.NewServer(withPrimaryCalendar(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		path := strings.TrimPrefix(r.URL.Path, "/calendar/v3")
+		switch {
+		case r.Method == http.MethodPost && strings.Contains(path, "/freeBusy"):
+			_ = json.NewDecoder(r.Body).Decode(&got)
+			w.Header().Set("Content-Type", "application/json")
+			_ = json.NewEncoder(w).Encode(map[string]any{
+				"calendars": map[string]any{
+					"work@example.com": map[string]any{"busy": []map[string]any{}},
+				},
+			})
+		default:
+			http.NotFound(w, r)
+		}
+	})))
+	defer srv.Close()
+
+	svc, err := calendar.NewService(context.Background(),
+		option.WithoutAuthentication(),
+		option.WithHTTPClient(srv.Client()),
+		option.WithEndpoint(srv.URL+"/"),
+	)
+	if err != nil {
+		t.Fatalf("NewService: %v", err)
+	}
+	result := executeWithCalendarTestService(t, []string{
+		"--json",
+		"--account", "a@b.com",
+		"calendar", "freebusy",
+		"work@example.com",
+		"--from", calendarExprToday,
+		"--to", calendarExprTomorrow,
+	}, svc)
+	if result.err != nil {
+		t.Fatalf("Execute: %v", result.err)
+	}
+
+	from, err := time.Parse(time.RFC3339, got.TimeMin)
+	if err != nil {
+		t.Fatalf("timeMin is not RFC3339: %q: %v", got.TimeMin, err)
+	}
+	to, err := time.Parse(time.RFC3339, got.TimeMax)
+	if err != nil {
+		t.Fatalf("timeMax is not RFC3339: %q: %v", got.TimeMax, err)
+	}
+	if got.TimeMin == calendarExprToday || got.TimeMax == calendarExprTomorrow {
+		t.Fatalf("expected parsed RFC3339 values, got timeMin=%q timeMax=%q", got.TimeMin, got.TimeMax)
+	}
+	if from.Location() != time.UTC || to.Location() != time.UTC {
+		t.Fatalf("expected UTC payload values, got %v -> %v", from.Location(), to.Location())
+	}
+	if from.Hour() != 0 || from.Minute() != 0 || from.Second() != 0 || to.Hour() != 0 || to.Minute() != 0 || to.Second() != 0 {
+		t.Fatalf("expected whole-day bounds, got %s -> %s", got.TimeMin, got.TimeMax)
+	}
+	if to.Sub(from) != 48*time.Hour {
+		t.Fatalf("expected today through tomorrow range, got %s -> %s", got.TimeMin, got.TimeMax)
+	}
+	if len(got.Items) != 1 || got.Items[0].ID != "work@example.com" {
+		t.Fatalf("expected work calendar item, got %#v", got.Items)
+	}
+}
+
 func TestCalendarConflictsCmd_AllCalendarsSelection(t *testing.T) {
 	var gotIDs []string
 	srv := httptest.NewServer(withPrimaryCalendar(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
diff --git a/internal/cmd/execute_more_text_coverage_test.go b/internal/cmd/execute_more_text_coverage_test.go
@@ -139,7 +139,7 @@ func TestExecute_ContactsGet_CustomFieldsSorted_Text(t *testing.T) {
 }
 
 func TestExecute_CalendarFreeBusy_Text(t *testing.T) {
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	srv := httptest.NewServer(withPrimaryCalendar(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if !(strings.Contains(r.URL.Path, "/freeBusy") && r.Method == http.MethodPost) {
 			http.NotFound(w, r)
 			return
@@ -152,7 +152,7 @@ func TestExecute_CalendarFreeBusy_Text(t *testing.T) {
 				},
 			},
 		})
-	}))
+	})))
 	defer srv.Close()
 
 	svc, err := calendar.NewService(context.Background(),
diff --git a/internal/cmd/help_printer_test.go b/internal/cmd/help_printer_test.go
@@ -128,10 +128,30 @@ func TestHelpProfileNoColorEnv(t *testing.T) {
 }
 
 func TestHelpProfileAlways(t *testing.T) {
-	orig := os.Getenv("NO_COLOR")
-	t.Cleanup(func() { _ = os.Setenv("NO_COLOR", orig) })
+	orig, hadOrig := os.LookupEnv("NO_COLOR")
+	origCLIColor, hadCLIColor := os.LookupEnv("CLICOLOR")
+	origCLIColorForce, hadCLIColorForce := os.LookupEnv("CLICOLOR_FORCE")
+	t.Cleanup(func() {
+		if hadOrig {
+			_ = os.Setenv("NO_COLOR", orig)
+		} else {
+			_ = os.Unsetenv("NO_COLOR")
+		}
+		if hadCLIColor {
+			_ = os.Setenv("CLICOLOR", origCLIColor)
+		} else {
+			_ = os.Unsetenv("CLICOLOR")
+		}
+		if hadCLIColorForce {
+			_ = os.Setenv("CLICOLOR_FORCE", origCLIColorForce)
+		} else {
+			_ = os.Unsetenv("CLICOLOR_FORCE")
+		}
+	})
 
-	_ = os.Setenv("NO_COLOR", "")
+	_ = os.Unsetenv("NO_COLOR")
+	_ = os.Unsetenv("CLICOLOR")
+	_ = os.Unsetenv("CLICOLOR_FORCE")
 	if got := helpProfile(io.Discard, "always"); got != termenv.TrueColor {
 		t.Fatalf("expected truecolor profile")
 	}
diff --git a/internal/cmd/time_helpers.go b/internal/cmd/time_helpers.go
@@ -33,6 +33,12 @@ type TimeRange struct {
 	Location *time.Location
 }
 
+const (
+	calendarExprToday     = "today"
+	calendarExprTomorrow  = "tomorrow"
+	calendarExprYesterday = "yesterday"
+)
+
 // getCalendarLocation fetches a calendar's timezone and returns it as a location.
 // Uses Calendars.Get (not CalendarList.Get) so it works for service accounts
 // whose "primary" calendar may not appear in their CalendarList.
@@ -234,7 +240,7 @@ func isDayExpr(expr string, now time.Time, loc *time.Location) bool {
 	}
 	exprLower := strings.ToLower(expr)
 	switch exprLower {
-	case "today", "tomorrow", "yesterday":
+	case calendarExprToday, calendarExprTomorrow, calendarExprYesterday:
 		return true
 	case "now":
 		return false
