@agent-native/core 0.92.12 → 0.94.0

package/corpus/templates/calendar/app/components/calendar/CreateEventDialog.tsx

@@ -15,7 +15,7 @@ import {
   IconUsers,
 } from "@tabler/icons-react";
 import { differenceInMinutes, format } from "date-fns";
-import { useState, useEffect, useRef } from "react";
+import { useState, useEffect, useMemo, useRef } from "react";
 import { toast } from "sonner";
 
 import {
@@ -46,6 +46,7 @@ import {
 import {
   Select,
   SelectContent,
+  SelectGroup,
   SelectItem,
   SelectTrigger,
   SelectValue,
@@ -58,10 +59,18 @@ import {
   TooltipTrigger,
 } from "@/components/ui/tooltip";
 import { useCreateEvent, useDeleteEvent } from "@/hooks/use-events";
+import { useGoogleAuthStatus } from "@/hooks/use-google-auth";
 import { useSettings } from "@/hooks/use-settings";
 import { setUndoAction } from "@/hooks/use-undo";
+import { useViewPreferences } from "@/hooks/use-view-preferences";
 import { useConnectZoom, useZoomStatus } from "@/hooks/use-zoom-auth";
+import { defaultColorForAccount } from "@/lib/calendar-view-preferences";
+import {
+  reconcileEventAccountEmail,
+  shouldShowEventAccountSelector,
+} from "@/lib/event-account-selection";
 import { getGoogleEventColorHex } from "@/lib/event-colors";
+import { buildEventFormInitializationKey } from "@/lib/event-form-initialization";
 import {
   attachmentsToDrafts,
   buildReminderPayload,
@@ -76,6 +85,7 @@ import {
   type ReminderMode,
   validateAttachmentDrafts,
 } from "@/lib/event-form-utils";
+import { buildDeleteEventMutationInput } from "@/lib/event-mutation-inputs";
 
 type VideoProvider = "none" | "google_meet" | "zoom";
 type EventType = "default" | "outOfOffice" | "focusTime" | "workingLocation";
@@ -83,6 +93,8 @@ type Availability = "opaque" | "transparent";
 type Visibility = "default" | "public" | "private" | "confidential";
 type WorkingLocationType = "homeOffice" | "officeLocation" | "customLocation";
 
+const EMPTY_CONNECTED_ACCOUNTS: Array<{ email: string }> = [];
+
 function addDaysToDateString(date: string, days: number) {
   const next = new Date(`${date}T00:00:00`);
   next.setDate(next.getDate() + days);
@@ -252,12 +264,21 @@ export function CreateEventPopover({
   const [videoProvider, setVideoProvider] = useState<VideoProvider>("none");
   const [videoProviderTouched, setVideoProviderTouched] = useState(false);
   const [attendees, setAttendees] = useState<AttendeeRecipient[]>([]);
+  const [accountEmail, setAccountEmail] = useState<string>();
   const [findTimeOpen, setFindTimeOpen] = useState(false);
   const timedOnlyStatus =
     eventType === "outOfOffice" || eventType === "focusTime";
 
   const createEvent = useCreateEvent();
   const delEvent = useDeleteEvent();
+  const googleStatus = useGoogleAuthStatus();
+  const connectedAccounts =
+    googleStatus.data?.accounts ?? EMPTY_CONNECTED_ACCOUNTS;
+  const connectedAccountEmails = useMemo(
+    () => connectedAccounts.map((account) => account.email),
+    [connectedAccounts],
+  );
+  const { prefs: viewPrefs } = useViewPreferences();
   const zoomStatus = useZoomStatus();
   const connectZoom = useConnectZoom();
   const formRef = useRef<HTMLFormElement>(null);
@@ -273,9 +294,14 @@ export function CreateEventPopover({
     const nextDate = format(defaultDate || new Date(), "yyyy-MM-dd");
     const draftTimezone =
       draft?.startTimeZone || draft?.endTimeZone || defaultTimezone;
-    const initKey = draft?.id
-      ? `draft:${draft.id}:${draftTimezone}`
-      : `new:${nextDate}:${defaultStart || fallbackStart}:${defaultEnd || fallbackEnd}:${defaultTimezone}`;
+    const initKey = buildEventFormInitializationKey({
+      draftId: draft?.id,
+      draftTimezone,
+      date: nextDate,
+      startTime: defaultStart || fallbackStart,
+      endTime: defaultEnd || fallbackEnd,
+      defaultTimezone,
+    });
     if (initializedKeyRef.current === initKey) return;
     initializedKeyRef.current = initKey;
 
@@ -362,6 +388,21 @@ export function CreateEventPopover({
     defaultTimezone,
   ]);
 
+  useEffect(() => {
+    if (!open) {
+      setAccountEmail(undefined);
+      return;
+    }
+
+    setAccountEmail((currentAccountEmail) =>
+      reconcileEventAccountEmail(
+        connectedAccounts,
+        currentAccountEmail,
+        draft?.accountEmail,
+      ),
+    );
+  }, [open, connectedAccounts, draft?.accountEmail]);
+
   useEffect(() => {
     if (!open) setFindTimeOpen(false);
   }, [open]);
@@ -419,7 +460,7 @@ export function CreateEventPopover({
             }))
           : undefined,
       ...buildVideoProviderPatch(videoProvider, videoProviderTouched),
-      accountEmail: draft?.accountEmail,
+      accountEmail,
       workingLocationType,
       workingLocationLabel:
         workingLocationType === "customLocation" ? location : undefined,
@@ -444,7 +485,7 @@ export function CreateEventPopover({
     open,
     draft?.id,
     draft?.createdAt,
-    draft?.accountEmail,
+    accountEmail,
     title,
     description,
     date,
@@ -651,7 +692,7 @@ export function CreateEventPopover({
       startTimeZone: effectiveAllDay ? undefined : timezone,
       endTimeZone: effectiveAllDay ? undefined : timezone,
       location,
-      accountEmail: draft?.accountEmail,
+      accountEmail,
       allDay: effectiveAllDay,
       transparency:
         eventType === "workingLocation"
@@ -689,11 +730,15 @@ export function CreateEventPopover({
         const eventId = result?.id;
         const undo = eventId
           ? () => {
-              delEvent.mutate({
-                id: eventId,
-                scope: "single",
-                sendUpdates: "none",
-              });
+              delEvent.mutate(
+                buildDeleteEventMutationInput(
+                  {
+                    id: eventId,
+                    accountEmail: result.accountEmail ?? accountEmail,
+                  },
+                  { scope: "single", sendUpdates: "none" },
+                ),
+              );
             }
           : undefined;
         if (undo) setUndoAction(undo);
@@ -753,6 +798,47 @@ export function CreateEventPopover({
               />
             </div>
 
+            {shouldShowEventAccountSelector(connectedAccounts) &&
+              accountEmail && (
+                <div className="space-y-1.5">
+                  <Label htmlFor="event-calendar" className="text-xs">
+                    {t("navigation.calendar")}
+                  </Label>
+                  <Select value={accountEmail} onValueChange={setAccountEmail}>
+                    <SelectTrigger
+                      id="event-calendar"
+                      aria-label={t("navigation.calendar")}
+                      className="h-8 text-sm"
+                    >
+                      <SelectValue />
+                    </SelectTrigger>
+                    <SelectContent>
+                      <SelectGroup>
+                        {connectedAccounts.map((account) => (
+                          <SelectItem key={account.email} value={account.email}>
+                            <span className="flex min-w-0 items-center gap-2">
+                              <span
+                                className="size-2.5 shrink-0 rounded-full"
+                                style={{
+                                  backgroundColor:
+                                    viewPrefs.accountColors[account.email] ??
+                                    viewPrefs.singleColor ??
+                                    defaultColorForAccount(
+                                      account.email,
+                                      connectedAccountEmails,
+                                    ),
+                                }}
+                              />
+                              <span className="truncate">{account.email}</span>
+                            </span>
+                          </SelectItem>
+                        ))}
+                      </SelectGroup>
+                    </SelectContent>
+                  </Select>
+                </div>
+              )}
+
             <div className="space-y-1.5">
               <Label htmlFor="event-type" className="text-xs">
                 {t("eventForm.type")}
@@ -1201,7 +1287,7 @@ export function CreateEventPopover({
             timezone={timezone}
             durationMinutes={findTimeDurationMinutes}
             attendees={attendees}
-            accountEmail={draft?.accountEmail}
+            accountEmail={accountEmail}
             selectedStart={currentStartISO}
             selectedEnd={currentEndISO}
             onSelectSlot={handleSelectFindTimeSlot}
@@ -1232,6 +1318,7 @@ export function CreateEventPopover({
                 className="h-7 text-xs"
                 disabled={
                   createEvent.isPending ||
+                  !accountEmail ||
                   (videoProvider === "zoom" && !zoomStatus.data?.connected)
                 }
               >

package/corpus/templates/calendar/app/components/calendar/DayView.tsx

@@ -50,8 +50,12 @@ interface DayViewProps {
     options?: { explicitDuration?: boolean },
   ) => void;
   quickEditEventId?: string | null;
-  onQuickEditSave?: (eventId: string, title: string) => void;
-  onQuickEditCancel?: (eventId: string) => void;
+  onQuickEditSave?: (
+    eventId: string,
+    title: string,
+    accountEmail?: string,
+  ) => void;
+  onQuickEditCancel?: (eventId: string, accountEmail?: string) => void;
   draftEventIds?: string[];
   onDraftUpdate?: (
     eventId: string,
@@ -210,8 +214,12 @@ interface DayEventCardProps {
   onDeleteEvent: (eventId: string) => void;
   isDraft: boolean;
   defaultOpen: boolean;
-  onQuickEditSave?: (eventId: string, title: string) => void;
-  onQuickEditCancel?: (eventId: string) => void;
+  onQuickEditSave?: (
+    eventId: string,
+    title: string,
+    accountEmail?: string,
+  ) => void;
+  onQuickEditCancel?: (eventId: string, accountEmail?: string) => void;
   onDraftUpdate?: DayViewProps["onDraftUpdate"];
   onDraftCreate?: DayViewProps["onDraftCreate"];
   onDraftDiscard?: DayViewProps["onDraftDiscard"];

package/corpus/templates/calendar/app/components/calendar/EventAttendeesSection.tsx

@@ -416,103 +416,110 @@ function AttendeeRow({
 
   return (
     <div className="group rounded-xl px-1 py-1 transition-colors hover:bg-muted/40">
-      <AttendeeApolloPopover attendee={attendee}>
-        <div className="flex items-center gap-2.5">
-          <div className="relative shrink-0">
-            <AttendeeAvatar attendee={attendee} resolvedPhotoUrl={photoUrl} />
-            <div className="absolute -bottom-0.5 -right-0.5">
-              <RsvpStatusIcon status={displayStatus ?? "needsAction"} />
-            </div>
-          </div>
-          <div className="min-w-0 flex-1">
-            <div className="flex items-center gap-1.5">
-              <span className="truncate text-sm text-foreground">
-                {attendee.displayName || attendee.email}
-              </span>
-              {attendee.organizer && (
-                <span className="shrink-0 rounded bg-muted px-1.5 py-0.5 text-[10px] font-medium text-muted-foreground">
-                  {t("eventForm.organizer")}
-                </span>
-              )}
-              {attendee.optional && !attendee.organizer && (
-                <span className="shrink-0 rounded bg-muted px-1.5 py-0.5 text-[10px] font-medium text-muted-foreground">
-                  {t("attendees.optionalBadge")}
-                </span>
-              )}
-            </div>
-            {attendee.displayName && (
-              <div className="truncate text-[11px] text-muted-foreground/60">
-                {attendee.email}
-                {localTimeLabel ? (
-                  <span className="ms-1.5 text-muted-foreground/50">
-                    · {localTimeLabel}
+      <div className="flex items-start">
+        <div className="min-w-0 flex-1">
+          <AttendeeApolloPopover attendee={attendee}>
+            <div className="flex items-center gap-2.5">
+              <div className="relative shrink-0">
+                <AttendeeAvatar
+                  attendee={attendee}
+                  resolvedPhotoUrl={photoUrl}
+                />
+                <div className="absolute -bottom-0.5 -right-0.5">
+                  <RsvpStatusIcon status={displayStatus ?? "needsAction"} />
+                </div>
+              </div>
+              <div className="min-w-0 flex-1">
+                <div className="flex items-center gap-1.5">
+                  <span className="truncate text-sm text-foreground">
+                    {attendee.displayName || attendee.email}
                   </span>
+                  {attendee.organizer && (
+                    <span className="shrink-0 rounded bg-muted px-1.5 py-0.5 text-[10px] font-medium text-muted-foreground">
+                      {t("eventForm.organizer")}
+                    </span>
+                  )}
+                  {attendee.optional && !attendee.organizer && (
+                    <span className="shrink-0 rounded bg-muted px-1.5 py-0.5 text-[10px] font-medium text-muted-foreground">
+                      {t("attendees.optionalBadge")}
+                    </span>
+                  )}
+                </div>
+                {attendee.displayName && (
+                  <div className="truncate text-[11px] text-muted-foreground/60">
+                    {attendee.email}
+                    {localTimeLabel ? (
+                      <span className="ms-1.5 text-muted-foreground/50">
+                        · {localTimeLabel}
+                      </span>
+                    ) : null}
+                  </div>
+                )}
+                {!attendee.displayName && localTimeLabel ? (
+                  <div className="truncate text-[11px] text-muted-foreground/50">
+                    {localTimeLabel}
+                  </div>
                 ) : null}
+                <div className="mt-0.5 text-[11px] text-muted-foreground/70">
+                  {inlineRsvp
+                    ? t("eventForm.yourResponse", { status: statusLabel })
+                    : statusLabel}
+                </div>
               </div>
-            )}
-            {!attendee.displayName && localTimeLabel ? (
-              <div className="truncate text-[11px] text-muted-foreground/50">
-                {localTimeLabel}
-              </div>
-            ) : null}
-            <div className="mt-0.5 text-[11px] text-muted-foreground/70">
-              {inlineRsvp
-                ? t("eventForm.yourResponse", { status: statusLabel })
-                : statusLabel}
             </div>
-          </div>
-          {showMenu && (
-            <DropdownMenu>
-              <DropdownMenuTrigger asChild>
-                <Button
-                  type="button"
-                  variant="ghost"
-                  size="icon"
-                  className="h-7 w-7 shrink-0 text-muted-foreground opacity-0 transition-opacity group-hover:opacity-100 focus-visible:opacity-100 data-[state=open]:opacity-100"
-                  aria-label={t("attendees.guestOptions", {
-                    email: attendee.email,
-                  })}
-                  onClick={(event) => event.stopPropagation()}
-                >
-                  <IconDots className="h-3.5 w-3.5" />
-                </Button>
-              </DropdownMenuTrigger>
-              <DropdownMenuContent
-                align="end"
+            {comment && (
+              <div className="ml-10 mt-1 flex items-start gap-1.5 rounded-md bg-muted/40 px-2 py-1 text-[11px] leading-relaxed text-muted-foreground">
+                <IconMessageCircle className="mt-0.5 h-3 w-3 shrink-0" />
+                <span className="min-w-0 break-words">{comment}</span>
+              </div>
+            )}
+          </AttendeeApolloPopover>
+        </div>
+        {showMenu && (
+          <DropdownMenu>
+            <DropdownMenuTrigger asChild>
+              <Button
+                type="button"
+                variant="ghost"
+                size="icon"
+                className="mt-0.5 h-7 w-7 shrink-0 text-muted-foreground opacity-0 transition-opacity group-hover:opacity-100 focus-visible:opacity-100 data-[state=open]:opacity-100"
+                aria-label={t("attendees.guestOptions", {
+                  email: attendee.email,
+                })}
                 onClick={(event) => event.stopPropagation()}
               >
-                {showOptionalMenu && (
-                  <DropdownMenuItem
-                    onSelect={() =>
-                      onToggleOptional(attendee.email, !attendee.optional)
-                    }
-                  >
-                    {attendee.optional
-                      ? t("attendees.markRequired")
-                      : t("attendees.markOptional")}
-                  </DropdownMenuItem>
-                )}
-                {onSetTimezone && (
-                  <DropdownMenuItem
-                    onSelect={(event) => {
-                      event.preventDefault();
-                      setTimezonePickerOpen(true);
-                    }}
-                  >
-                    {t("attendees.setTimezone")}
-                  </DropdownMenuItem>
-                )}
-              </DropdownMenuContent>
-            </DropdownMenu>
-          )}
-        </div>
-        {comment && (
-          <div className="ml-10 mt-1 flex items-start gap-1.5 rounded-md bg-muted/40 px-2 py-1 text-[11px] leading-relaxed text-muted-foreground">
-            <IconMessageCircle className="mt-0.5 h-3 w-3 shrink-0" />
-            <span className="min-w-0 break-words">{comment}</span>
-          </div>
+                <IconDots className="h-3.5 w-3.5" />
+              </Button>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent
+              align="end"
+              onClick={(event) => event.stopPropagation()}
+            >
+              {showOptionalMenu && (
+                <DropdownMenuItem
+                  onSelect={() =>
+                    onToggleOptional(attendee.email, !attendee.optional)
+                  }
+                >
+                  {attendee.optional
+                    ? t("attendees.markRequired")
+                    : t("attendees.markOptional")}
+                </DropdownMenuItem>
+              )}
+              {onSetTimezone && (
+                <DropdownMenuItem
+                  onSelect={(event) => {
+                    event.preventDefault();
+                    setTimezonePickerOpen(true);
+                  }}
+                >
+                  {t("attendees.setTimezone")}
+                </DropdownMenuItem>
+              )}
+            </DropdownMenuContent>
+          </DropdownMenu>
         )}
-      </AttendeeApolloPopover>
+      </div>
       {onSetTimezone && (
         <Popover open={timezonePickerOpen} onOpenChange={setTimezonePickerOpen}>
           <PopoverTrigger asChild>

package/corpus/templates/calendar/app/components/calendar/EventDetailPanel.tsx

@@ -61,7 +61,7 @@ interface EventDetailPanelProps {
   event: CalendarEvent | null;
   onClose: () => void;
   onDelete: (eventId: string) => void;
-  onTitleSave?: (eventId: string, title: string) => void;
+  onTitleSave?: (eventId: string, title: string, accountEmail?: string) => void;
 }
 
 function formatDuration(start: string, end: string): string {
@@ -310,7 +310,7 @@ export function EventDetailPanel({
                         e.preventDefault();
                         const trimmed = editingTitle.trim();
                         if (trimmed && trimmed !== event.title) {
-                          onTitleSave?.(event.id, trimmed);
+                          onTitleSave?.(event.id, trimmed, event.accountEmail);
                         }
                         setIsEditingTitle(false);
                       } else if (e.key === "Escape") {
@@ -322,7 +322,7 @@ export function EventDetailPanel({
                     onBlur={() => {
                       const trimmed = editingTitle.trim();
                       if (trimmed && trimmed !== event.title) {
-                        onTitleSave?.(event.id, trimmed);
+                        onTitleSave?.(event.id, trimmed, event.accountEmail);
                       }
                       setIsEditingTitle(false);
                     }}

package/corpus/templates/calendar/app/components/calendar/EventDetailPopover.tsx

@@ -58,6 +58,7 @@ import {
 import {
   Select,
   SelectContent,
+  SelectGroup,
   SelectItem,
   SelectTrigger,
   SelectValue,
@@ -70,8 +71,12 @@ import {
   TooltipProvider,
 } from "@/components/ui/tooltip";
 import { useEvent, useUpdateEvent } from "@/hooks/use-events";
+import { useGoogleAuthStatus } from "@/hooks/use-google-auth";
 import { useIsMobile } from "@/hooks/use-mobile";
+import { useViewPreferences } from "@/hooks/use-view-preferences";
 import { useConnectZoom, useZoomStatus } from "@/hooks/use-zoom-auth";
+import { defaultColorForAccount } from "@/lib/calendar-view-preferences";
+import { shouldShowEventAccountSelector } from "@/lib/event-account-selection";
 import { getGoogleEventColorHex } from "@/lib/event-colors";
 import {
   attachmentsToDrafts,
@@ -100,6 +105,7 @@ import { shortcutModifierLabel } from "@/lib/utils";
 
 const ZOOM_AFTER_CONNECT_EVENT_ID_KEY = "calendar.zoomAfterConnectEventId";
 const ZOOM_AFTER_CONNECT_MAX_AGE_MS = 10 * 60 * 1000;
+const EMPTY_CONNECTED_ACCOUNTS: Array<{ email: string }> = [];
 
 function buildEventDetailSlotContext(event: CalendarEvent) {
   return {
@@ -384,6 +390,68 @@ function formatEventDateRange(start: string, end: string, allDay?: boolean) {
   return startLabel === endLabel ? startLabel : `${startLabel} - ${endLabel}`;
 }
 
+function DraftEventAccountSelect({
+  event,
+  onAccountChange,
+}: {
+  event: CalendarEvent;
+  onAccountChange: (accountEmail: string) => void;
+}) {
+  const t = useT();
+  const googleStatus = useGoogleAuthStatus();
+  const connectedAccounts =
+    googleStatus.data?.accounts ?? EMPTY_CONNECTED_ACCOUNTS;
+  const connectedAccountEmails = useMemo(
+    () => connectedAccounts.map((account) => account.email),
+    [connectedAccounts],
+  );
+  const { prefs: viewPrefs } = useViewPreferences();
+
+  if (
+    !shouldShowEventAccountSelector(connectedAccounts) ||
+    !event.accountEmail
+  ) {
+    return null;
+  }
+
+  return (
+    <div className="flex items-center gap-3 py-1.5">
+      <IconCalendarTime className="h-4 w-4 shrink-0 text-muted-foreground" />
+      <Select value={event.accountEmail} onValueChange={onAccountChange}>
+        <SelectTrigger
+          aria-label={t("navigation.calendar")}
+          className="h-8 flex-1 text-sm"
+        >
+          <SelectValue />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectGroup>
+            {connectedAccounts.map((account) => (
+              <SelectItem key={account.email} value={account.email}>
+                <span className="flex min-w-0 items-center gap-2">
+                  <span
+                    className="size-2.5 shrink-0 rounded-full"
+                    style={{
+                      backgroundColor:
+                        viewPrefs.accountColors[account.email] ??
+                        viewPrefs.singleColor ??
+                        defaultColorForAccount(
+                          account.email,
+                          connectedAccountEmails,
+                        ),
+                    }}
+                  />
+                  <span className="truncate">{account.email}</span>
+                </span>
+              </SelectItem>
+            ))}
+          </SelectGroup>
+        </SelectContent>
+      </Select>
+    </div>
+  );
+}
+
 interface EventDetailPopoverProps {
   event: CalendarEvent;
   children: React.ReactNode;
@@ -392,9 +460,9 @@ interface EventDetailPopoverProps {
   /** When true, the popover opens immediately and title is focused for editing */
   defaultOpen?: boolean;
   /** Called when the title is changed and should be persisted */
-  onTitleSave?: (eventId: string, title: string) => void;
+  onTitleSave?: (eventId: string, title: string, accountEmail?: string) => void;
   /** Called when the popover is dismissed for a new event (to clean up if no title was set) */
-  onDismissNew?: (eventId: string) => void;
+  onDismissNew?: (eventId: string, accountEmail?: string) => void;
   onDraftUpdate?: (
     eventId: string,
     updates: Partial<CalendarEvent> & {
@@ -1122,12 +1190,12 @@ export function EventDetailPopover({
         ? { title: editingTitle.trim() }
         : undefined;
     if (updates) {
-      onTitleSave?.(event.id, updates.title);
+      onTitleSave?.(event.id, updates.title, event.accountEmail);
       setIsEditingTitle(false);
       isNewEventRef.current = false;
     }
     onDraftCreate(event.id, updates);
-  }, [editingTitle, event.id, isEditingTitle, onDraftCreate, onTitleSave]);
+  }, [editingTitle, event, isEditingTitle, onDraftCreate, onTitleSave]);
 
   // Keyboard shortcut: Cmd+J to join meeting when popover is open
   const handleKeyDown = useCallback(
@@ -1174,7 +1242,7 @@ export function EventDetailPopover({
         // Popover is closing — handle saves
         if (isEditingTitle) {
           if (trimmedTitle && trimmedTitle !== "(No title)") {
-            onTitleSave?.(event.id, trimmedTitle);
+            onTitleSave?.(event.id, trimmedTitle, event.accountEmail);
             isNewEventRef.current = false;
             savedPendingChange = true;
           }
@@ -1201,7 +1269,7 @@ export function EventDetailPopover({
           (!trimmedTitle || trimmedTitle === "(No title)") &&
           onDismissNew
         ) {
-          onDismissNew(event.id);
+          onDismissNew(event.id, event.accountEmail);
         }
 
         setEditingField(null);
@@ -1214,6 +1282,7 @@ export function EventDetailPopover({
       isEditingTitle,
       editingTitle,
       event.id,
+      event.accountEmail,
       onTitleSave,
       onDismissNew,
       editingField,
@@ -1323,7 +1392,7 @@ export function EventDetailPopover({
                       e.preventDefault();
                       const trimmed = editingTitle.trim();
                       if (trimmed && trimmed !== "(No title)") {
-                        onTitleSave?.(event.id, trimmed);
+                        onTitleSave?.(event.id, trimmed, event.accountEmail);
                         isNewEventRef.current = false;
                       }
                       setIsEditingTitle(false);
@@ -1353,7 +1422,7 @@ export function EventDetailPopover({
                       trimmed !== "(No title)" &&
                       trimmed !== event.title
                     ) {
-                      onTitleSave?.(event.id, trimmed);
+                      onTitleSave?.(event.id, trimmed, event.accountEmail);
                       isNewEventRef.current = false;
                     }
                     setIsEditingTitle(false);
@@ -1376,6 +1445,15 @@ export function EventDetailPopover({
             </div>
 
             <div className="px-4 space-y-1">
+              {isDraft && (
+                <DraftEventAccountSelect
+                  event={event}
+                  onAccountChange={(accountEmail) =>
+                    onDraftUpdate?.(event.id, { accountEmail })
+                  }
+                />
+              )}
+
               {/* Time — editable */}
               {editingField === "time" ? (
                 <div className="flex items-start gap-3 py-1.5">