From 592dd3bdb10c1ced14d91b3ec6a7323210721d14 Mon Sep 17 00:00:00 2001 From: Bobby Bones <159389674+saariuslystoned@users.noreply.github.com> Date: Mon, 9 Nov 2026 01:35:15 -0500 Subject: [PATCH 1/3] fix(calendar): read further event pages up to --max in search and team events.list may return fewer events than maxResults together with a nextPageToken. calendar search and calendar team read one page and dropped the token, so later matches were silently missing. Read pages until --max events are collected or the listing ends, and note on stderr when calendar search stops with more matches remaining. Co-Authored-By: Claude Opus 5.5 --- CHANGELOG.md | 2 + internal/cmd/calendar_events_paging.go | 39 +++++++ internal/cmd/calendar_events_paging_test.go | 113 ++++++++++++++++++++ internal/cmd/calendar_search.go | 30 +++--- internal/cmd/calendar_team.go | 18 ++-- 5 files changed, 179 insertions(+), 23 deletions(-) create mode 100644 internal/cmd/calendar_events_paging.go create mode 100644 internal/cmd/calendar_events_paging_test.go diff --git a/CHANGELOG.md b/CHANGELOG.md index 861521fad..3d7c20fe8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## 0.48.1 - Unreleased +- Calendar: make `calendar search` and `calendar team` read further `events.list` pages until they have `--max` events, instead of returning only the first page. Google may return fewer events than `maxResults` per page together with a `nextPageToken`, so matches past the first page were silently missing. `calendar search` now notes on stderr when more matches remain beyond `--max`. — thanks @saariuslystoned. + ## 0.48.0 - 2026-11-05 **Highlights:** New backups stay local until you configure a remote; existing configurations keep working. Store service-account keys in the keyring, search Gmail IDs efficiently, and use environment-backed watch tokens, with Calendar fixes and security dependency updates. diff --git a/internal/cmd/calendar_events_paging.go b/internal/cmd/calendar_events_paging.go new file mode 100644 index 000000000..958c9b1f0 --- /dev/null +++ b/internal/cmd/calendar_events_paging.go @@ -0,0 +1,39 @@ +package cmd + +import ( + "context" + "strings" + + "google.golang.org/api/calendar/v3" +) + +// listCalendarEventsUpTo reads events.list pages until it has max events or +// the listing ends. events.list may return fewer events than maxResults and a +// nextPageToken even below its 2500-event page cap, so one call is not +// enough. more reports that the listing had events beyond max. +func listCalendarEventsUpTo(ctx context.Context, newCall func() *calendar.EventsListCall, max int64) (events []*calendar.Event, more bool, err error) { + var guard pageTokenGuard + pageToken := "" + for { + if err := guard.check(pageToken); err != nil { + return nil, false, err + } + call := newCall().MaxResults(max - int64(len(events))).Context(ctx) + if pageToken != "" { + call = call.PageToken(pageToken) + } + resp, err := call.Do() + if err != nil { + return nil, false, err + } + events = append(events, resp.Items...) + next := strings.TrimSpace(resp.NextPageToken) + if int64(len(events)) >= max { + return events[:max], next != "" || int64(len(events)) > max, nil + } + if next == "" { + return events, false, nil + } + pageToken = next + } +} diff --git a/internal/cmd/calendar_events_paging_test.go b/internal/cmd/calendar_events_paging_test.go new file mode 100644 index 000000000..7372de0ff --- /dev/null +++ b/internal/cmd/calendar_events_paging_test.go @@ -0,0 +1,113 @@ +package cmd + +import ( + "context" + "encoding/json" + "net/http" + "net/http/httptest" + "os" + "strings" + "sync/atomic" + "testing" + "time" + + "google.golang.org/api/calendar/v3" + "google.golang.org/api/option" + + "github.com/openclaw/gogcli/internal/outfmt" + "github.com/openclaw/gogcli/internal/ui" +) + +// twoPageEventsHandler serves events.list like the real API, which may return +// fewer events than maxResults and a nextPageToken: event1 on the first page, +// event2 on page "p2". +func twoPageEventsHandler(calls *atomic.Int32) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + if !strings.HasSuffix(r.URL.Path, "/events") { + http.NotFound(w, r) + return + } + calls.Add(1) + ev := func(id, start string) map[string]any { + return map[string]any{ + "id": id, "iCalUID": id + "@example.com", "summary": "standup " + id, "status": "confirmed", + "start": map[string]any{"dateTime": start}, + "end": map[string]any{"dateTime": strings.Replace(start, ":00:00Z", ":15:00Z", 1)}, + } + } + w.Header().Set("Content-Type", "application/json") + if r.URL.Query().Get("pageToken") == "" { + _ = json.NewEncoder(w).Encode(map[string]any{"items": []any{ev("event1", "2026-11-10T10:00:00Z")}, "nextPageToken": "p2"}) + return + } + _ = json.NewEncoder(w).Encode(map[string]any{"items": []any{ev("event2", "2026-11-11T10:00:00Z")}}) + } +} + +func TestCalendarSearch_ReadsLaterPagesUpToMax(t *testing.T) { + var calls atomic.Int32 + svc, closeServer := newGoogleTestService(t, withPrimaryCalendar(twoPageEventsHandler(&calls)), calendar.NewService) + t.Cleanup(closeServer) + for _, mode := range []string{"--json", "--plain"} { + calls.Store(0) + res := executeWithCalendarTestService(t, []string{mode, "--account", "a@b.com", "calendar", "search", "standup", "--max", "50"}, svc) + if res.err != nil { + t.Fatalf("%s: %v", mode, res.err) + } + if !strings.Contains(res.stdout, "event1") || !strings.Contains(res.stdout, "event2") { + t.Fatalf("%s: want event1 and event2, stdout=%q", mode, res.stdout) + } + if strings.Contains(res.stderr, "--max") { + t.Fatalf("%s: no more results remain, stderr=%q", mode, res.stderr) + } + } +} + +func TestCalendarSearch_StopsAtMaxAndSaysMoreRemain(t *testing.T) { + var calls atomic.Int32 + svc, closeServer := newGoogleTestService(t, withPrimaryCalendar(twoPageEventsHandler(&calls)), calendar.NewService) + t.Cleanup(closeServer) + res := executeWithCalendarTestService(t, []string{"--json", "--account", "a@b.com", "calendar", "search", "standup", "--max", "1"}, svc) + if res.err != nil { + t.Fatalf("search: %v", res.err) + } + if !strings.Contains(res.stdout, "event1") || strings.Contains(res.stdout, "event2") { + t.Fatalf("want only event1, stdout=%q", res.stdout) + } + if calls.Load() != 1 { + t.Fatalf("calls = %d, want 1 (stop once --max is reached)", calls.Load()) + } + if !strings.Contains(res.stderr, "--max") { + t.Fatalf("want a hint that more results remain, stderr=%q", res.stderr) + } +} + +func TestCalendarTeamEvents_ReadsLaterPagesPerCalendar(t *testing.T) { + var calls atomic.Int32 + srv := httptest.NewServer(twoPageEventsHandler(&calls)) + t.Cleanup(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) + } + tr := &TimeRange{ + From: time.Date(2026, 11, 9, 0, 0, 0, 0, time.UTC), + To: time.Date(2026, 11, 13, 0, 0, 0, 0, time.UTC), + Location: time.UTC, + } + cmd := &CalendarTeamCmd{GroupEmail: "group@example.com", Max: 100} + u, err := ui.New(ui.Options{Stdout: os.Stdout, Stderr: os.Stderr, Color: "never"}) + if err != nil { + t.Fatalf("ui.New: %v", err) + } + ctx := outfmt.WithMode(ui.WithUI(context.Background(), u), outfmt.Mode{JSON: true}) + out := captureStdout(t, func() { + if err := cmd.runEvents(ctx, svc, u, []string{"a@example.com"}, tr); err != nil { + t.Fatalf("runEvents: %v", err) + } + }) + if !strings.Contains(out, "standup event1") || !strings.Contains(out, "standup event2") { + t.Fatalf("want both pages' events, got %q", out) + } +} diff --git a/internal/cmd/calendar_search.go b/internal/cmd/calendar_search.go index 22d37d15f..baa6ed0f1 100644 --- a/internal/cmd/calendar_search.go +++ b/internal/cmd/calendar_search.go @@ -7,6 +7,8 @@ import ( "text/tabwriter" "time" + "google.golang.org/api/calendar/v3" + "github.com/openclaw/gogcli/internal/outfmt" "github.com/openclaw/gogcli/internal/ui" ) @@ -51,35 +53,37 @@ func (c *CalendarSearchCmd) Run(ctx context.Context, flags *RootFlags) error { } from, to := timeRange.FormatRFC3339() - call := svc.Events.List(calendarID). - Q(query). - TimeMin(from). - TimeMax(to). - MaxResults(c.Max). - SingleEvents(true). - OrderBy("startTime") - - resp, err := call.Do() + items, more, err := listCalendarEventsUpTo(ctx, func() *calendar.EventsListCall { + return svc.Events.List(calendarID). + Q(query). + TimeMin(from). + TimeMax(to). + SingleEvents(true). + OrderBy("startTime") + }, c.Max) if err != nil { return err } - redactCalendarEventsForOutput(ctx, resp.Items) + redactCalendarEventsForOutput(ctx, items) + if more { + u.Err().Linef("# More results: raise --max (currently %d) to see more matching events", c.Max) + } if outfmt.IsJSON(ctx) { return outfmt.WriteJSON(ctx, stdoutWriter(ctx), map[string]any{ - "events": wrapEventsWithDays(resp.Items), + "events": wrapEventsWithDays(items), "query": query, }) } - if len(resp.Items) == 0 { + if len(items) == 0 { u.Err().Println("No events found") return nil } tw := tabwriter.NewWriter(stdoutWriter(ctx), 0, 4, 2, ' ', 0) fmt.Fprintln(tw, "ID\tSTART\tEND\tSUMMARY") - for _, e := range resp.Items { + for _, e := range items { fmt.Fprintf(tw, "%s\t%s\t%s\t%s\n", e.Id, eventStart(e), eventEnd(e), e.Summary) } _ = tw.Flush() diff --git a/internal/cmd/calendar_team.go b/internal/cmd/calendar_team.go index f6a55661c..fd357fb8a 100644 --- a/internal/cmd/calendar_team.go +++ b/internal/cmd/calendar_team.go @@ -164,15 +164,13 @@ func (c *CalendarTeamCmd) runEvents(ctx context.Context, svc *calendar.Service, sem <- struct{}{} defer func() { <-sem }() - call := svc.Events.List(email). - SingleEvents(true). - TimeMin(from). - TimeMax(to). - MaxResults(c.Max). - OrderBy("startTime"). - Context(ctx) - - resp, err := call.Do() + items, _, err := listCalendarEventsUpTo(ctx, func() *calendar.EventsListCall { + return svc.Events.List(email). + SingleEvents(true). + TimeMin(from). + TimeMax(to). + OrderBy("startTime") + }, c.Max) if err != nil { mu.Lock() errors = append(errors, fmt.Sprintf("%s: %v", email, errfmt.FormatDiagnostic(err))) @@ -180,7 +178,7 @@ func (c *CalendarTeamCmd) runEvents(ctx context.Context, svc *calendar.Service, return } - for _, ev := range resp.Items { + for _, ev := range items { if ev == nil { continue } From 3cdb086c4c59424c8c54631b42496546f44632be Mon Sep 17 00:00:00 2001 From: Bobby Bones <159389674+saariuslystoned@users.noreply.github.com> Date: Mon, 9 Nov 2026 01:46:28 -0500 Subject: [PATCH 2/3] style(calendar): avoid shadowing the max builtin in the paging helper Co-Authored-By: Claude Opus 5.5 --- internal/cmd/calendar_events_paging.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/cmd/calendar_events_paging.go b/internal/cmd/calendar_events_paging.go index 958c9b1f0..e74ec46e0 100644 --- a/internal/cmd/calendar_events_paging.go +++ b/internal/cmd/calendar_events_paging.go @@ -7,18 +7,18 @@ import ( "google.golang.org/api/calendar/v3" ) -// listCalendarEventsUpTo reads events.list pages until it has max events or +// listCalendarEventsUpTo reads events.list pages until it has limit events or // the listing ends. events.list may return fewer events than maxResults and a // nextPageToken even below its 2500-event page cap, so one call is not -// enough. more reports that the listing had events beyond max. -func listCalendarEventsUpTo(ctx context.Context, newCall func() *calendar.EventsListCall, max int64) (events []*calendar.Event, more bool, err error) { +// enough. more reports that the listing had events beyond limit. +func listCalendarEventsUpTo(ctx context.Context, newCall func() *calendar.EventsListCall, limit int64) (events []*calendar.Event, more bool, err error) { var guard pageTokenGuard pageToken := "" for { if err := guard.check(pageToken); err != nil { return nil, false, err } - call := newCall().MaxResults(max - int64(len(events))).Context(ctx) + call := newCall().MaxResults(limit - int64(len(events))).Context(ctx) if pageToken != "" { call = call.PageToken(pageToken) } @@ -28,8 +28,8 @@ func listCalendarEventsUpTo(ctx context.Context, newCall func() *calendar.Events } events = append(events, resp.Items...) next := strings.TrimSpace(resp.NextPageToken) - if int64(len(events)) >= max { - return events[:max], next != "" || int64(len(events)) > max, nil + if int64(len(events)) >= limit { + return events[:limit], next != "" || int64(len(events)) > limit, nil } if next == "" { return events, false, nil From dbf8b18429567bdfaf98180923ea21eaf01779da Mon Sep 17 00:00:00 2001 From: Bobby Bones <159389674+saariuslystoned@users.noreply.github.com> Date: Mon, 9 Nov 2026 02:00:15 -0500 Subject: [PATCH 3/3] docs(changelog): reference #1322 Co-Authored-By: Claude Opus 5.5 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d7c20fe8..ce4ab6a25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## 0.48.1 - Unreleased -- Calendar: make `calendar search` and `calendar team` read further `events.list` pages until they have `--max` events, instead of returning only the first page. Google may return fewer events than `maxResults` per page together with a `nextPageToken`, so matches past the first page were silently missing. `calendar search` now notes on stderr when more matches remain beyond `--max`. — thanks @saariuslystoned. +- Calendar: make `calendar search` and `calendar team` read further `events.list` pages until they have `--max` events, instead of returning only the first page. Google may return fewer events than `maxResults` per page together with a `nextPageToken`, so matches past the first page were silently missing. `calendar search` now notes on stderr when more matches remain beyond `--max`. (#1322) — thanks @saariuslystoned. ## 0.48.0 - 2026-11-05