fix(03): CR-01 preserve RRULE on edit-as-move (forward source rule to create row)

apps/api/src/broker/outboxWorker.ts

@@ -282,6 +282,23 @@ async function dispatchRow(row: OutboxRow): Promise<DispatchResult> {
     } catch {
       return { success: false, conflict: false, hardFail: true, transient: false, error: 'payload parse failed' }
     }
+    // CR-01: edit-as-move RRULE preservation. The same-calendar `update` branch
+    // preserves a recurring series' RRULE by reading rawVevent; the `create` branch
+    // (used for the create half of an edit-as-move, D-04) has no source for the
+    // original RRULE because it writes under a brand-new uid. The edit route extracts
+    // the source event's RRULE and stashes it on the payload as `_preservedRrule` so
+    // the worker can re-apply it here. An explicit `recurrence` on the payload still
+    // wins (deliberate user change); the preserved RRULE only fills the gap when the
+    // edit omitted recurrence — matching the update-branch semantics and the WR-01 fix.
+    const hasExplicitRecurrence = Object.prototype.hasOwnProperty.call(fields, 'recurrence')
+    const rruleFromPayload =
+      fields.recurrence && fields.recurrence !== 'none'
+        ? RRULE_PRESETS[fields.recurrence as string]
+        : undefined
+    const preservedRrule =
+      typeof fields._preservedRrule === 'string' && fields._preservedRrule.length > 0
+        ? fields._preservedRrule
+        : undefined
     const { icsString } = buildVeventString({
       uid: row.uid,
       summary: fields.title as string,
@@ -290,7 +307,7 @@ async function dispatchRow(row: OutboxRow): Promise<DispatchResult> {
       dtend: fields.allDay ? (fields.end as string) : new Date(fields.end as string),
       location: fields.location as string | undefined,
       description: fields.description as string | undefined,
-      rruleString: fields.recurrence && fields.recurrence !== 'none' ? RRULE_PRESETS[fields.recurrence as string] : undefined,
+      rruleString: hasExplicitRecurrence ? rruleFromPayload : (preservedRrule ?? rruleFromPayload),
     })
     // Build a minimal DAVCalendar for the write wrapper (only url is needed)
     const davCalendar = { url: row.calendarUrl } as Parameters<typeof createCalendarEvent>[1]

apps/api/src/routes/events.ts

@@ -31,6 +31,7 @@ import { sql } from 'drizzle-orm'
 import { db } from '../db/client.js'
 import { calendarEvents, calendars, users, calendarOutbox } from '../db/schema.js'
 import { expandOccurrences } from '../broker/expand.js'
+import { extractRruleString } from '../broker/vevent.js'
 import { getAuth } from '../auth/middleware.js'
 import { upsertUser, deriveDisplayName } from '../auth/user.js'
 // Side-effect import: brings in the ContextVariableMap augmentation for c.get('user')
@@ -334,6 +335,7 @@ eventsRouter.patch('/:uid/edit', zValidator('json', eventFieldsSchema), async (c
         calendarId: calendarEvents.calendarId,
         calendarUrl: calendars.url,
         userId: calendars.userId,
+        rawVevent: calendarEvents.rawVevent,
       })
       .from(calendarEvents)
       .innerJoin(calendars, eq(calendarEvents.calendarId, calendars.id))
@@ -373,6 +375,25 @@ eventsRouter.patch('/:uid/edit', zValidator('json', eventFieldsSchema), async (c
       const newUid = `${randomUUID()}@familysync`
       const groupId = randomUUID()
 
+      // CR-01: carry the existing RRULE through the move. The edit payload omits
+      // `recurrence` (the occurrence contract does not expose it, D-03), and the
+      // create lands under a brand-new uid that the worker can never look up the
+      // original RRULE from. Unlike the same-calendar `update` branch — which reads
+      // rawVevent and re-applies the stored RRULE — the create branch has no source
+      // for it. Extract the RRULE from the source event here and stash it on the
+      // create payload so the worker re-applies it, preventing a recurring series
+      // from silently collapsing into a single occurrence on a calendar move.
+      // Only stash when the edit did NOT carry an explicit recurrence: an explicit
+      // value (including 'none') is a deliberate user change and must win.
+      const preservedRrule =
+        payload.recurrence === undefined
+          ? extractRruleString(eventRow.rawVevent ?? '')
+          : undefined
+      const createPayload =
+        preservedRrule !== undefined
+          ? { ...payload, _preservedRrule: preservedRrule }
+          : payload
+
       await db.transaction(async (tx) => {
         // Delete from old calendar
         await tx.insert(calendarOutbox).values({
@@ -392,7 +413,7 @@ eventsRouter.patch('/:uid/edit', zValidator('json', eventFieldsSchema), async (c
           status: 'pending',
           uid: newUid,
           calendarUrl: newCalendarUrl,
-          payload: JSON.stringify(payload),
+          payload: JSON.stringify(createPayload),
           groupId,
         })
       })