fix(calendar): refine changed event listing (#875)

steipete · steipete · commit d7dc5bbf70c3 · 2026-06-26T06:01:05.000+01:00
diff --git a/.agents/skills/gog-calendar/SKILL.md b/.agents/skills/gog-calendar/SKILL.md
@@ -31,6 +31,7 @@ gog --readonly --account user@example.com calendar events --today --json --wrap-
 | `acl` | List calendar ACL |
 | `alias` | Manage calendar aliases |
 | `calendars` | List calendars |
+| `changed` | List most recently changed events (including deletions) |
 | `colors` | Show calendar colors |
 | `conflicts` | Find busy-time overlaps across calendars |
 | `create` | Create an event |
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ## 0.31.0 - 2026-06-24
 
+- Calendar: add `calendar changed` for listing recently modified events, including cancellations, across one or more calendars. (#875) — thanks @sorenisanerd.
 - Gmail: preserve HTML fragments from `--signature-file` instead of escaping their markup, without broadening HTML detection for message display or reply quoting. (#879) — thanks @kesslerio.
 - Docs: honor `--tab` when setting document layout so `page-layout --tab` (and `write --pageless --tab`) target the specified tab instead of always the default tab. Page layout is per-tab; previously these silently no-opped on secondary tabs of multi-tab documents. (#878) — thanks @atmasphere.
 - Auth: recover from corrupt stored OAuth token payloads by routing only classified decode corruption through the normal re-authentication flow while preserving operational keyring errors. (#872, #874) — thanks @KrasimirKralev.
diff --git a/docs/commands.generated.md b/docs/commands.generated.md
@@ -86,7 +86,7 @@ Generated from `gog schema --json`.
       - [`gog calendar (cal) alias set <alias> <calendarId>`](commands/gog-calendar-alias-set.md) - Set a calendar alias
       - [`gog calendar (cal) alias unset <alias>`](commands/gog-calendar-alias-unset.md) - Remove a calendar alias
     - [`gog calendar (cal) calendars [flags]`](commands/gog-calendar-calendars.md) - List calendars
-    - [`gog calendar (cal) changed (recent,modified) [<calendarId> ...] [flags]`](commands/gog-calendar-changed.md) - List most recently changed events
+    - [`gog calendar (cal) changed [<calendarId>] [flags]`](commands/gog-calendar-changed.md) - List most recently changed events (including deletions)
     - [`gog calendar (cal) colors`](commands/gog-calendar-colors.md) - Show calendar colors
     - [`gog calendar (cal) conflicts [flags]`](commands/gog-calendar-conflicts.md) - Find busy-time overlaps across calendars
     - [`gog calendar (cal) create (add,new) <calendarId> [flags]`](commands/gog-calendar-create.md) - Create an event
diff --git a/docs/commands/README.md b/docs/commands/README.md
@@ -138,7 +138,7 @@ Generated pages: 700.
       - [gog calendar alias set](gog-calendar-alias-set.md) - Set a calendar alias
       - [gog calendar alias unset](gog-calendar-alias-unset.md) - Remove a calendar alias
     - [gog calendar calendars](gog-calendar-calendars.md) - List calendars
-    - [gog calendar changed](gog-calendar-changed.md) - List most recently changed events
+    - [gog calendar changed](gog-calendar-changed.md) - List most recently changed events (including deletions)
     - [gog calendar colors](gog-calendar-colors.md) - Show calendar colors
     - [gog calendar conflicts](gog-calendar-conflicts.md) - Find busy-time overlaps across calendars
     - [gog calendar create](gog-calendar-create.md) - Create an event
diff --git a/docs/commands/gog-calendar-changed.md b/docs/commands/gog-calendar-changed.md
@@ -2,12 +2,12 @@
 
 > Generated from `gog schema --json`. Do not edit this page by hand; run `make docs-commands`.
 
-List most recently changed events
+List most recently changed events (including deletions)
 
 ## Usage
 
 ```bash
-gog calendar (cal) changed (recent,modified) [<calendarId> ...] [flags]
+gog calendar (cal) changed [<calendarId>] [flags]
 ```
 
 ## Parent
@@ -42,7 +42,6 @@ gog calendar (cal) changed (recent,modified) [<calendarId> ...] [flags]
 | `--readonly` | `bool` | false | Block mutating API requests at runtime; auth add also requests read-only OAuth scopes |
 | `--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. |
-| `--show-deleted` | `bool` |  | Include deleted events |
 | `--since` | `string` |  | Lower bound for last-modification time (RFC3339, date, or Go duration: 24h, 168h). Default: 720h (30 days). |
 | `-v`<br>`--verbose` | `bool` |  | Enable verbose logging |
 | `--version` | `kong.VersionFlag` |  | Print version and exit |
diff --git a/docs/commands/gog-calendar.md b/docs/commands/gog-calendar.md
@@ -19,7 +19,7 @@ gog calendar (cal) <command> [flags]
 - [gog calendar acl](gog-calendar-acl.md) - List calendar ACL
 - [gog calendar alias](gog-calendar-alias.md) - Manage calendar aliases
 - [gog calendar calendars](gog-calendar-calendars.md) - List calendars
-- [gog calendar changed](gog-calendar-changed.md) - List most recently changed events
+- [gog calendar changed](gog-calendar-changed.md) - List most recently changed events (including deletions)
 - [gog calendar colors](gog-calendar-colors.md) - Show calendar colors
 - [gog calendar conflicts](gog-calendar-conflicts.md) - Find busy-time overlaps across calendars
 - [gog calendar create](gog-calendar-create.md) - Create an event
diff --git a/internal/cmd/calendar.go b/internal/cmd/calendar.go
@@ -20,7 +20,7 @@ type CalendarCmd struct {
 	ProposeTime     CalendarProposeTimeCmd     `cmd:"" name:"propose-time" help:"Generate URL to propose a new meeting time (browser-only feature)"`
 	Colors          CalendarColorsCmd          `cmd:"" name:"colors" help:"Show calendar colors"`
 	Conflicts       CalendarConflictsCmd       `cmd:"" name:"conflicts" help:"Find busy-time overlaps across calendars"`
-	Changed         CalendarChangedCmd         `cmd:"" name:"changed" aliases:"recent,modified" help:"List most recently changed events"`
+	Changed         CalendarChangedCmd         `cmd:"" name:"changed" help:"List most recently changed events (including deletions)"`
 	Search          CalendarSearchCmd          `cmd:"" name:"search" aliases:"find,query" help:"Search events"`
 	Time            CalendarTimeCmd            `cmd:"" name:"time" help:"Show server time"`
 	Users           CalendarUsersCmd           `cmd:"" name:"users" help:"List workspace users (use their email as calendar ID)"`
diff --git a/internal/cmd/calendar_changed.go b/internal/cmd/calendar_changed.go
@@ -14,16 +14,15 @@ import (
 )
 
 type CalendarChangedCmd struct {
-	CalendarID  []string `arg:"" name:"calendarId" optional:"" help:"Calendar ID (default: primary)"`
-	Cal         []string `name:"cal" help:"Calendar ID or name (can be repeated)"`
-	Calendars   string   `name:"calendars" help:"Comma-separated calendar IDs, names, or indices from 'calendar calendars'"`
-	Since       string   `name:"since" help:"Lower bound for last-modification time (RFC3339, date, or Go duration: 24h, 168h). Default: 720h (30 days)."`
-	Max         int64    `name:"max" aliases:"limit" help:"Max results" default:"10"`
-	All         bool     `name:"all" help:"Fetch from all calendars"`
-	ShowDeleted bool     `name:"show-deleted" help:"Include deleted events"`
-	FailEmpty   bool     `name:"fail-empty" aliases:"non-empty,require-results" help:"Exit with code 3 if no results"`
-	Weekday     bool     `name:"weekday" help:"Include start/end day-of-week columns"`
-	Location    bool     `name:"location" help:"Include event LOCATION column in table output"`
+	CalendarID string   `arg:"" name:"calendarId" optional:"" help:"Calendar ID (default: primary)"`
+	Cal        []string `name:"cal" help:"Calendar ID or name (can be repeated)"`
+	Calendars  string   `name:"calendars" help:"Comma-separated calendar IDs, names, or indices from 'calendar calendars'"`
+	Since      string   `name:"since" help:"Lower bound for last-modification time (RFC3339, date, or Go duration: 24h, 168h). Default: 720h (30 days)."`
+	Max        int64    `name:"max" aliases:"limit" help:"Max results" default:"10"`
+	All        bool     `name:"all" help:"Fetch from all calendars"`
+	FailEmpty  bool     `name:"fail-empty" aliases:"non-empty,require-results" help:"Exit with code 3 if no results"`
+	Weekday    bool     `name:"weekday" help:"Include start/end day-of-week columns"`
+	Location   bool     `name:"location" help:"Include event LOCATION column in table output"`
 }
 
 func (c *CalendarChangedCmd) Run(ctx context.Context, flags *RootFlags) error {
@@ -45,10 +44,7 @@ func (c *CalendarChangedCmd) Run(ctx context.Context, flags *RootFlags) error {
 		return err
 	}
 
-	calendarID, err := normalizeCalendarEventsArgs(c.CalendarID)
-	if err != nil {
-		return err
-	}
+	calendarID := strings.TrimSpace(c.CalendarID)
 	calInputs := append([]string{}, c.Cal...)
 	if strings.TrimSpace(c.Calendars) != "" {
 		calInputs = append(calInputs, splitCSV(c.Calendars)...)
@@ -64,9 +60,9 @@ func (c *CalendarChangedCmd) Run(ctx context.Context, flags *RootFlags) error {
 
 	switch {
 	case c.All:
-		cals, err := listCalendarList(ctx, svc)
-		if err != nil {
-			return err
+		cals, listErr := listCalendarList(ctx, svc)
+		if listErr != nil {
+			return listErr
 		}
 		ids := make([]string, 0, len(cals))
 		for _, cal := range cals {
@@ -76,9 +72,9 @@ func (c *CalendarChangedCmd) Run(ctx context.Context, flags *RootFlags) error {
 		}
 		return c.listChangedMulti(ctx, svc, ids, sinceRFC3339, calendarTimezoneHints(cals))
 	case len(calInputs) > 0:
-		ids, err := resolveCalendarIDs(ctx, store, svc, calInputs)
-		if err != nil {
-			return err
+		ids, resolveErr := resolveCalendarIDs(ctx, store, svc, calInputs)
+		if resolveErr != nil {
+			return resolveErr
 		}
 		if len(ids) == 0 {
 			return usage("no calendars specified")
@@ -107,7 +103,7 @@ func (c *CalendarChangedCmd) resolveSince() (time.Time, error) {
 func (c *CalendarChangedCmd) listChangedSingle(ctx context.Context, svc *calendar.Service, calendarID, since string) error {
 	calendarTimezone, loc := calendarDisplayTimezone(ctx, svc, calendarID, nil)
 
-	items, err := fetchChangedEvents(ctx, svc, calendarID, since, c.ShowDeleted)
+	items, err := fetchChangedEvents(ctx, svc, calendarID, since)
 	if err != nil {
 		return err
 	}
@@ -135,7 +131,7 @@ func (c *CalendarChangedCmd) listChangedMulti(ctx context.Context, svc *calendar
 			continue
 		}
 		calendarTimezone, loc := calendarDisplayTimezone(ctx, svc, calID, hints)
-		items, err := fetchChangedEvents(ctx, svc, calID, since, c.ShowDeleted)
+		items, err := fetchChangedEvents(ctx, svc, calID, since)
 		if err != nil {
 			u.Err().Linef("calendar %s: %v", calID, err)
 			continue
@@ -154,11 +150,13 @@ func (c *CalendarChangedCmd) listChangedMulti(ctx context.Context, svc *calendar
 	return c.writeOutput(ctx, all, since, true)
 }
 
-func fetchChangedEvents(ctx context.Context, svc *calendar.Service, calendarID, since string, showDeleted bool) ([]*calendar.Event, error) {
+func fetchChangedEvents(ctx context.Context, svc *calendar.Service, calendarID, since string) ([]*calendar.Event, error) {
 	fetch := func(pageToken string) ([]*calendar.Event, string, error) {
+		// Calendar always returns entries deleted since updatedMin. Request them
+		// explicitly too: deletions are changes and belong in this command's output.
 		call := svc.Events.List(calendarID).
 			UpdatedMin(since).
-			ShowDeleted(showDeleted).
+			ShowDeleted(true).
 			OrderBy("updated").
 			MaxResults(250).
 			Context(ctx)
diff --git a/internal/cmd/calendar_changed_test.go b/internal/cmd/calendar_changed_test.go
@@ -12,8 +12,10 @@ import (
 )
 
 func TestCalendarChanged_JSON(t *testing.T) {
+	var showDeleted string
 	svc, closeServer := newCalendarServiceForTest(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if strings.Contains(r.URL.Path, "/calendars/primary/events") && r.Method == http.MethodGet {
+			showDeleted = r.URL.Query().Get("showDeleted")
 			w.Header().Set("Content-Type", "application/json")
 			_ = json.NewEncoder(w).Encode(map[string]any{
 				"items": []map[string]any{
@@ -31,6 +33,12 @@ func TestCalendarChanged_JSON(t *testing.T) {
 						"start":   map[string]any{"dateTime": "2026-06-20T10:00:00Z"},
 						"end":     map[string]any{"dateTime": "2026-06-20T11:00:00Z"},
 					},
+					{
+						"id":      "e3",
+						"summary": "Deleted event",
+						"status":  "cancelled",
+						"updated": "2026-06-13T09:00:00Z",
+					},
 				},
 			})
 			return
@@ -59,15 +67,18 @@ func TestCalendarChanged_JSON(t *testing.T) {
 	if err := json.Unmarshal(output.Bytes(), &parsed); err != nil {
 		t.Fatalf("json parse: %v", err)
 	}
-	if len(parsed.Events) != 2 {
-		t.Fatalf("expected 2 events, got %d", len(parsed.Events))
+	if showDeleted != "true" {
+		t.Fatalf("showDeleted = %q, want true", showDeleted)
+	}
+	if len(parsed.Events) != 3 {
+		t.Fatalf("expected 3 events, got %d", len(parsed.Events))
 	}
 	// Most recently updated event should come first (descending order).
-	if parsed.Events[0]["id"] != "e2" {
-		t.Errorf("expected e2 first (more recent updated), got %v", parsed.Events[0]["id"])
+	if parsed.Events[0]["id"] != "e3" {
+		t.Errorf("expected deleted e3 first (more recent updated), got %v", parsed.Events[0]["id"])
 	}
-	if parsed.Events[1]["id"] != "e1" {
-		t.Errorf("expected e1 second, got %v", parsed.Events[1]["id"])
+	if parsed.Events[1]["id"] != "e2" || parsed.Events[2]["id"] != "e1" {
+		t.Errorf("expected remaining events in descending order, got %v then %v", parsed.Events[1]["id"], parsed.Events[2]["id"])
 	}
 	if parsed.Since == "" {
 		t.Error("expected since field in JSON output")
