feat(calendar): improve selection and recurring scope handling (openclaw#319) (thanks @salmonumbrella)

Author: Peter Steinberger

CHANGELOG.md

@@ -20,6 +20,7 @@
 - Gmail: add `gmail messages modify` for single-message label changes, complementing thread- and batch-level modify flows. (#281) — thanks @zerone0x.
 - Calendar: add `calendar subscribe` (aliases `sub`, `add-calendar`) to add a shared calendar to the current account’s calendar list. (#327) — thanks @cdthompson.
 - Calendar: add `calendar alias list|set|unset`, and let calendar commands resolve configured aliases before API/name lookup. (#393) — thanks @salmonumbrella.
+- Calendar: let `calendar freebusy` / `calendar conflicts` accept `--cal`, names, indices, and `--all` like `calendar events`. (#319) — thanks @salmonumbrella.
 - Slides: add `create-from-template` with `--replace` / `--replacements`, dry-run support, and template placeholder replacement stats. (#273) — thanks @penguinco.
 - Forms: add form update/question-management commands plus response watch create/list/delete/renew, with delete-question validation and confirmation guardrails. (#274) — thanks @alexknowshtml.
 - Sheets: add `sheets update-note` / `set-note` to write or clear cell notes across a range. (#430) — thanks @andybergon.
@@ -56,6 +57,7 @@
 - Auth: preserve scope-shaping flags in the remote step-2 replay guidance for `auth add --remote`. (#427) — thanks @doodaaatimmy-creator.
 - Auth: add `--gmail-scope full|readonly`, and disable `include_granted_scopes` for readonly/limited auth requests to avoid Drive/Gmail scope accumulation. (#113) — thanks @salmonumbrella.
 - Calendar: force-send `minutes=0` for `--reminder popup:0m` so zero-minute popup reminders survive Google Calendar API JSON omission rules. (#316) — thanks @salmonumbrella.
+- Calendar: let recurring `calendar update --scope=future` and `calendar delete --scope=future` start from an instance event ID by resolving the parent series first. (#319) — thanks @salmonumbrella.
 - Calendar: hide cancelled/deleted events from `calendar events` list output by explicitly setting `showDeleted=false`. (#362) — thanks @sharukh010.
 - Sheets: harden `sheets format` against `boarders` typo (JSON and field mask), with clearer error messages. (#284) — thanks @nilzzzzzz.
 - Sheets: force-send empty note values so `sheets update-note --note ''` reliably clears notes via the API. (#341) — thanks @Shehryar.

README.md

@@ -851,9 +851,11 @@ gog calendar propose-time <calendarId> <eventId> --decline --comment "Can we do
 gog calendar freebusy --calendars "primary,work@example.com" \
   --from 2025-01-15T00:00:00Z \
   --to 2025-01-16T00:00:00Z
+gog calendar freebusy --cal Work --from 2025-01-15T00:00:00Z --to 2025-01-16T00:00:00Z
 
 gog calendar conflicts --calendars "primary,work@example.com" \
   --today                             # Today's conflicts
+gog calendar conflicts --all --today # Check conflicts across all calendars
 ```
 
 ### Time

docs/spec.md

@@ -201,7 +201,8 @@ Flag aliases:
 - `gog calendar create <calendarId> --summary S --from DT --to DT [--description D] [--location L] [--attendees a@b.com,c@d.com] [--all-day] [--event-type TYPE]`
 - `gog calendar update <calendarId> <eventId> [--summary S] [--from DT] [--to DT] [--description D] [--location L] [--attendees ...] [--add-attendee ...] [--all-day] [--event-type TYPE]`
 - `gog calendar delete <calendarId> <eventId>`
-- `gog calendar freebusy <calendarIds> --from RFC3339 --to RFC3339`
+- `gog calendar freebusy [calendarIds] [--cal ID_OR_NAME] [--calendars CSV] [--all] --from RFC3339 --to RFC3339`
+- `gog calendar conflicts [--cal ID_OR_NAME] [--calendars CSV] [--all] [--from RFC3339|date|relative] [--to RFC3339|date|relative] [--today|--week|--days N]`
 - `gog calendar respond <calendarId> <eventId> --status accepted|declined|tentative [--send-updates all|none|externalOnly]`
 - `gog time now [--timezone TZ]`
 - `gog classroom courses [--state ...] [--max N] [--page TOKEN]`

internal/cmd/calendar_conflicts.go

@@ -22,13 +22,15 @@ type conflict struct {
 }
 
 type CalendarConflictsCmd struct {
-	From      string `name:"from" help:"Start time (RFC3339, date, or relative: today, tomorrow, monday)"`
-	To        string `name:"to" help:"End time (RFC3339, date, or relative)"`
-	Today     bool   `name:"today" help:"Today only (timezone-aware)"`
-	Week      bool   `name:"week" help:"This week (uses --week-start, default Mon)"`
-	Days      int    `name:"days" help:"Next N days (timezone-aware)" default:"0"`
-	WeekStart string `name:"week-start" help:"Week start day for --week (sun, mon, ...)" default:""`
-	Calendars string `name:"calendars" help:"Comma-separated calendar IDs" default:"primary"`
+	From      string   `name:"from" help:"Start time (RFC3339, date, or relative: today, tomorrow, monday)"`
+	To        string   `name:"to" help:"End time (RFC3339, date, or relative)"`
+	Today     bool     `name:"today" help:"Today only (timezone-aware)"`
+	Week      bool     `name:"week" help:"This week (uses --week-start, default Mon)"`
+	Days      int      `name:"days" help:"Next N days (timezone-aware)" default:"0"`
+	WeekStart string   `name:"week-start" help:"Week start day for --week (sun, mon, ...)" default:""`
+	Cal       []string `name:"cal" help:"Calendar ID, name, or index (can be repeated)"`
+	Calendars string   `name:"calendars" help:"Comma-separated calendar IDs, names, or indices from 'calendar calendars'"`
+	All       bool     `name:"all" help:"Query all calendars"`
 }
 
 func (c *CalendarConflictsCmd) Run(ctx context.Context, flags *RootFlags) error {
@@ -38,21 +40,18 @@ func (c *CalendarConflictsCmd) Run(ctx context.Context, flags *RootFlags) error
 		return err
 	}
 
-	calendarIDs := splitCSV(c.Calendars)
-	if len(calendarIDs) == 0 {
-		return errors.New("no calendar IDs provided")
-	}
-
-	// Resolve aliases for all calendar IDs
-	resolvedIDs, err := prepareCalendarIDs(calendarIDs)
+	svc, err := newCalendarService(ctx, account)
 	if err != nil {
 		return err
 	}
 
-	svc, err := newCalendarService(ctx, account)
+	calendarIDs, err := resolveSelectedCalendarIDs(ctx, svc, c.Cal, c.Calendars, c.All, true)
 	if err != nil {
 		return err
 	}
+	if len(calendarIDs) == 0 {
+		return errors.New("no calendar IDs provided")
+	}
 
 	// Use timezone-aware time resolution
 	timeRange, err := ResolveTimeRange(ctx, svc, TimeRangeFlags{
@@ -69,8 +68,8 @@ func (c *CalendarConflictsCmd) Run(ctx context.Context, flags *RootFlags) error
 
 	from, to := timeRange.FormatRFC3339()
 
-	items := make([]*calendar.FreeBusyRequestItem, 0, len(resolvedIDs))
-	for _, id := range resolvedIDs {
+	items := make([]*calendar.FreeBusyRequestItem, 0, len(calendarIDs))
+	for _, id := range calendarIDs {
 		items = append(items, &calendar.FreeBusyRequestItem{Id: id})
 	}
 

internal/cmd/calendar_delete_test.go

@@ -18,6 +18,13 @@ func TestCalendarDeleteCmd_ScopeSingle(t *testing.T) {
 	svc, closeSvc := newCalendarServiceForTest(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		path := strings.TrimPrefix(r.URL.Path, "/calendar/v3")
 		switch {
+		case r.Method == http.MethodGet && path == "/calendars/cal@example.com/events/ev":
+			w.Header().Set("Content-Type", "application/json")
+			_ = json.NewEncoder(w).Encode(map[string]any{
+				"id":         "ev",
+				"recurrence": []string{"RRULE:FREQ=DAILY"},
+			})
+			return
 		case r.Method == http.MethodGet && strings.HasPrefix(path, "/calendars/cal@example.com/events/ev/instances"):
 			w.Header().Set("Content-Type", "application/json")
 			_ = json.NewEncoder(w).Encode(map[string]any{
@@ -227,3 +234,82 @@ func TestCalendarDeleteCmd_DryRunSkipsService(t *testing.T) {
 		t.Fatalf("unexpected dry-run output: %#v", payload)
 	}
 }
+
+func TestCalendarDeleteCmd_ScopeFuture_InstanceEventID(t *testing.T) {
+	origNew := newCalendarService
+	t.Cleanup(func() { newCalendarService = origNew })
+
+	var patchedRecurrence []string
+	svc, closeSvc := newCalendarServiceForTest(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		path := strings.TrimPrefix(r.URL.Path, "/calendar/v3")
+		switch {
+		case r.Method == http.MethodGet && path == "/calendars/cal@example.com/events/ev_instance":
+			w.Header().Set("Content-Type", "application/json")
+			_ = json.NewEncoder(w).Encode(map[string]any{
+				"id":               "ev_instance",
+				"recurringEventId": "ev_master",
+			})
+			return
+		case r.Method == http.MethodGet && path == "/calendars/cal@example.com/events/ev_master":
+			w.Header().Set("Content-Type", "application/json")
+			_ = json.NewEncoder(w).Encode(map[string]any{
+				"id":         "ev_master",
+				"recurrence": []string{"RRULE:FREQ=DAILY"},
+			})
+			return
+		case r.Method == http.MethodGet && strings.HasPrefix(path, "/calendars/cal@example.com/events/ev_master/instances"):
+			w.Header().Set("Content-Type", "application/json")
+			_ = json.NewEncoder(w).Encode(map[string]any{
+				"items": []map[string]any{
+					{
+						"id": "ev_2",
+						"originalStartTime": map[string]any{
+							"dateTime": "2025-01-02T10:00:00Z",
+						},
+					},
+				},
+			})
+			return
+		case r.Method == http.MethodDelete && path == "/calendars/cal@example.com/events/ev_2":
+			w.WriteHeader(http.StatusNoContent)
+			return
+		case r.Method == http.MethodPatch && path == "/calendars/cal@example.com/events/ev_master":
+			var body calendar.Event
+			_ = json.NewDecoder(r.Body).Decode(&body)
+			patchedRecurrence = append([]string{}, body.Recurrence...)
+			w.Header().Set("Content-Type", "application/json")
+			_ = json.NewEncoder(w).Encode(body)
+			return
+		default:
+			http.NotFound(w, r)
+			return
+		}
+	}))
+	defer closeSvc()
+	newCalendarService = func(context.Context, string) (*calendar.Service, error) { return svc, nil }
+
+	ctx := newCalendarJSONContext(t)
+
+	cmd := CalendarDeleteCmd{
+		CalendarID:        "cal@example.com",
+		EventID:           "ev_instance",
+		Scope:             scopeFuture,
+		OriginalStartTime: "2025-01-02T10:00:00Z",
+	}
+	flags := &RootFlags{Account: "a@b.com", Force: true}
+	out := captureStdout(t, func() {
+		if err := cmd.Run(ctx, flags); err != nil {
+			t.Fatalf("CalendarDeleteCmd: %v", err)
+		}
+	})
+	var payload struct {
+		Deleted bool   `json:"deleted"`
+		EventID string `json:"eventId"`
+	}
+	if err := json.Unmarshal([]byte(out), &payload); err != nil {
+		t.Fatalf("decode output: %v", err)
+	}
+	if !payload.Deleted || payload.EventID != "ev_2" || len(patchedRecurrence) == 0 {
+		t.Fatalf("unexpected output: %#v", payload)
+	}
+}

internal/cmd/calendar_edit.go

@@ -705,16 +705,15 @@ func (c *CalendarUpdateCmd) buildUpdateOutOfOfficeProperties(declineProvided boo
 func applyUpdateScope(ctx context.Context, svc *calendar.Service, calendarID, eventID, scope, originalStartTime string, patch *calendar.Event) (string, []string, error) {
 	targetEventID := eventID
 	var parentRecurrence []string
+	recurringEventID := eventID
 
 	if scope == scopeFuture {
-		parent, err := svc.Events.Get(calendarID, eventID).Context(ctx).Do()
+		parentID, recurrence, err := resolveRecurringParentEvent(ctx, svc, calendarID, eventID)
 		if err != nil {
 			return "", nil, err
 		}
-		if len(parent.Recurrence) == 0 {
-			return "", nil, fmt.Errorf("event %s is not a recurring event", eventID)
-		}
-		parentRecurrence = parent.Recurrence
+		recurringEventID = parentID
+		parentRecurrence = recurrence
 		recurrenceOverride := len(patch.Recurrence) > 0
 		if !recurrenceOverride {
 			for _, field := range patch.ForceSendFields {
@@ -730,7 +729,14 @@ func applyUpdateScope(ctx context.Context, svc *calendar.Service, calendarID, ev
 	}
 
 	if scope == scopeSingle || scope == scopeFuture {
-		instanceID, err := resolveRecurringInstanceID(ctx, svc, calendarID, eventID, originalStartTime)
+		if scope == scopeSingle {
+			var err error
+			recurringEventID, err = resolveRecurringSeriesID(ctx, svc, calendarID, eventID)
+			if err != nil {
+				return "", nil, err
+			}
+		}
+		instanceID, err := resolveRecurringInstanceID(ctx, svc, calendarID, recurringEventID, originalStartTime)
 		if err != nil {
 			return "", nil, err
 		}
@@ -823,18 +829,27 @@ func (c *CalendarDeleteCmd) Run(ctx context.Context, flags *RootFlags) error {
 
 	targetEventID := eventID
 	var parentRecurrence []string
+	parentEventID := eventID
 	if scope == scopeFuture {
-		parent, getErr := mutation.svc.Events.Get(mutation.calendarID, eventID).Context(ctx).Do()
-		if getErr != nil {
-			return getErr
-		}
-		if len(parent.Recurrence) == 0 {
-			return fmt.Errorf("event %s is not a recurring event", eventID)
+		parentID, recurrence, resolveErr := resolveRecurringParentEvent(ctx, mutation.svc, mutation.calendarID, eventID)
+		if resolveErr != nil {
+			return resolveErr
 		}
-		parentRecurrence = parent.Recurrence
+		parentEventID = parentID
+		parentRecurrence = recurrence
 	}
 	if scope == scopeSingle || scope == scopeFuture {
-		instanceID, resolveErr := resolveRecurringInstanceID(ctx, mutation.svc, mutation.calendarID, eventID, c.OriginalStartTime)
+		recurringEventID := eventID
+		if scope == scopeSingle {
+			recurringEventID, err = resolveRecurringSeriesID(ctx, mutation.svc, mutation.calendarID, eventID)
+			if err != nil {
+				return err
+			}
+		}
+		if scope == scopeFuture {
+			recurringEventID = parentEventID
+		}
+		instanceID, resolveErr := resolveRecurringInstanceID(ctx, mutation.svc, mutation.calendarID, recurringEventID, c.OriginalStartTime)
 		if resolveErr != nil {
 			return resolveErr
 		}
@@ -849,7 +864,7 @@ func (c *CalendarDeleteCmd) Run(ctx context.Context, flags *RootFlags) error {
 		if truncateErr != nil {
 			return truncateErr
 		}
-		_, patchErr := mutation.patchEvent(ctx, eventID, &calendar.Event{Recurrence: truncated}, sendUpdates)
+		_, patchErr := mutation.patchEvent(ctx, parentEventID, &calendar.Event{Recurrence: truncated}, sendUpdates)
 		if patchErr != nil {
 			return patchErr
 		}

internal/cmd/calendar_edit_scope_test.go

@@ -113,3 +113,64 @@ func TestApplyUpdateScopeFuture_NonRecurring(t *testing.T) {
 		t.Fatalf("expected error for non-recurring event")
 	}
 }
+
+func TestApplyUpdateScopeFuture_RecurringInstanceID(t *testing.T) {
+	originalStart := "2025-01-02T10:00:00Z"
+
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		path := strings.TrimPrefix(r.URL.Path, "/calendar/v3")
+		switch {
+		case r.Method == http.MethodGet && path == "/calendars/cal/events/ev_instance":
+			w.Header().Set("Content-Type", "application/json")
+			_ = json.NewEncoder(w).Encode(map[string]any{
+				"id":               "ev_instance",
+				"recurringEventId": "ev_master",
+			})
+		case r.Method == http.MethodGet && path == "/calendars/cal/events/ev_master":
+			w.Header().Set("Content-Type", "application/json")
+			_ = json.NewEncoder(w).Encode(map[string]any{
+				"id":         "ev_master",
+				"recurrence": []string{"RRULE:FREQ=DAILY"},
+			})
+		case r.Method == http.MethodGet && strings.HasPrefix(path, "/calendars/cal/events/ev_master/instances"):
+			w.Header().Set("Content-Type", "application/json")
+			_ = json.NewEncoder(w).Encode(map[string]any{
+				"items": []map[string]any{
+					{
+						"id": "ev_1",
+						"originalStartTime": map[string]any{
+							"dateTime": originalStart,
+						},
+					},
+				},
+			})
+		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)
+	}
+
+	patch := &calendar.Event{Summary: "updated"}
+	targetID, parentRecurrence, err := applyUpdateScope(context.Background(), svc, "cal", "ev_instance", scopeFuture, originalStart, patch)
+	if err != nil {
+		t.Fatalf("applyUpdateScope: %v", err)
+	}
+	if targetID != "ev_1" {
+		t.Fatalf("unexpected target id: %q", targetID)
+	}
+	if len(parentRecurrence) != 1 || parentRecurrence[0] != "RRULE:FREQ=DAILY" {
+		t.Fatalf("unexpected parent recurrence: %#v", parentRecurrence)
+	}
+	if len(patch.Recurrence) != 1 || patch.Recurrence[0] != "RRULE:FREQ=DAILY" {
+		t.Fatalf("patch did not inherit recurrence: %#v", patch.Recurrence)
+	}
+}

internal/cmd/calendar_freebusy.go

@@ -13,9 +13,11 @@ import (
 )
 
 type CalendarFreeBusyCmd struct {
-	CalendarIDs string `arg:"" name:"calendarIds" help:"Comma-separated calendar IDs"`
-	From        string `name:"from" help:"Start time (RFC3339, required)"`
-	To          string `name:"to" help:"End time (RFC3339, required)"`
+	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)"`
 }
 
 func (c *CalendarFreeBusyCmd) Run(ctx context.Context, flags *RootFlags) error {
@@ -25,32 +27,26 @@ func (c *CalendarFreeBusyCmd) Run(ctx context.Context, flags *RootFlags) error {
 		return err
 	}
 
-	calendarIDs := splitCSV(c.CalendarIDs)
-	if len(calendarIDs) == 0 {
-		return usage("no calendar IDs provided")
+	if strings.TrimSpace(c.From) == "" || strings.TrimSpace(c.To) == "" {
+		return usage("required: --from and --to")
 	}
 
-	// Resolve aliases for all calendar IDs
-	resolvedIDs, err := prepareCalendarIDs(calendarIDs)
+	svc, err := newCalendarService(ctx, account)
 	if err != nil {
 		return err
 	}
 
-	if strings.TrimSpace(c.From) == "" || strings.TrimSpace(c.To) == "" {
-		return usage("required: --from and --to")
-	}
-
-	svc, err := newCalendarService(ctx, account)
+	calendarIDs, err := resolveSelectedCalendarIDs(ctx, svc, c.Cal, c.CalendarIDs, c.All, true)
 	if err != nil {
 		return err
 	}
 
 	req := &calendar.FreeBusyRequest{
 		TimeMin: c.From,
 		TimeMax: c.To,
-		Items:   make([]*calendar.FreeBusyRequestItem, 0, len(resolvedIDs)),
+		Items:   make([]*calendar.FreeBusyRequestItem, 0, len(calendarIDs)),
 	}
-	for _, id := range resolvedIDs {
+	for _, id := range calendarIDs {
 		req.Items = append(req.Items, &calendar.FreeBusyRequestItem{Id: id})
 	}