Fixed: Remove cancelled occurrences

Author: KrisBraun

.changeset/strict-bats-cover.md

@@ -0,0 +1,5 @@
+---
+"@plotday/twister": patch
+---
+
+Added: addRecurrenceExdates and removeRecurrenceExdates

.changeset/young-files-ask.md

@@ -0,0 +1,6 @@
+---
+"@plotday/tool-outlook-calendar": minor
+"@plotday/tool-google-calendar": minor
+---
+
+Fixed: Remove cancelled occurrences

tools/google-calendar/src/google-calendar.ts

@@ -894,7 +894,7 @@ export class GoogleCalendar
     // Transform the instance data
     const instanceData = transformGoogleEvent(event, calendarId);
 
-    // Handle cancelled recurring instances by archiving the occurrence
+    // Handle cancelled recurring instances by adding to recurrence exdates
     if (event.status === "cancelled") {
       // Extract start/end from the event (they're present even for cancelled events)
       const start = event.start?.dateTime
@@ -909,20 +909,12 @@ export class GoogleCalendar
         ? event.end.date
         : null;
 
-      const occurrence: Omit<NewActivityOccurrence, "activity"> = {
-        occurrence: new Date(originalStartTime),
-        start: start instanceof Date ? start : new Date(originalStartTime),
-        archived: true,
-      };
-
-      // Include start/end at activity level to allow master activity creation
-      // during initial sync (upsert_activity needs these to infer scheduling)
       const occurrenceUpdate = {
         type: ActivityType.Event,
         source: masterCanonicalUrl,
         start: start,
         end: end,
-        occurrences: [occurrence],
+        addRecurrenceExdates: [new Date(originalStartTime)],
       };
 
       await this.tools.callbacks.run(callbackToken, occurrenceUpdate);

tools/outlook-calendar/src/outlook-calendar.ts

@@ -692,6 +692,23 @@ export class OutlookCalendar
       return; // Skip deleted events
     }
 
+    // Handle cancelled recurring instances by adding to recurrence exdates
+    if (event.isCancelled) {
+      const start = instanceData?.start ?? new Date(originalStart);
+      const end = instanceData?.end ?? null;
+
+      const occurrenceUpdate = {
+        type: ActivityType.Event,
+        source: masterCanonicalUrl,
+        start: start,
+        end: end,
+        addRecurrenceExdates: [new Date(originalStart)],
+      };
+
+      await this.tools.callbacks.run(callbackToken, occurrenceUpdate);
+      return;
+    }
+
     // Determine RSVP status for attendees
     const validAttendees =
       event.attendees?.filter(

twister/src/plot.ts

@@ -872,6 +872,19 @@ export type NewActivity = Pick<Activity, "type"> &
      * ```
      */
     occurrences?: NewActivityOccurrence[];
+
+    /**
+     * Dates to add to the recurrence exclusion list.
+     * These are merged with existing exdates. Use this for incremental updates
+     * (e.g., cancelling a single occurrence) instead of replacing the full list.
+     */
+    addRecurrenceExdates?: Date[];
+
+    /**
+     * Dates to remove from the recurrence exclusion list.
+     * Use this to "uncancel" a previously excluded occurrence.
+     */
+    removeRecurrenceExdates?: Date[];
   };
 
 export type ActivityUpdate = (
@@ -962,6 +975,19 @@ export type ActivityUpdate = (
      * ```
      */
     occurrences?: (NewActivityOccurrence | ActivityOccurrenceUpdate)[];
+
+    /**
+     * Dates to add to the recurrence exclusion list.
+     * These are merged with existing exdates. Use this for incremental updates
+     * (e.g., cancelling a single occurrence) instead of replacing the full list.
+     */
+    addRecurrenceExdates?: Date[];
+
+    /**
+     * Dates to remove from the recurrence exclusion list.
+     * Use this to "uncancel" a previously excluded occurrence.
+     */
+    removeRecurrenceExdates?: Date[];
   };
 
 /**