@agent-native/core 0.93.0 → 0.94.0

package/corpus/templates/brain/changelog/2026-07-10-brain-settings-now-separate-assistant-behavior-publishing-re.md

@@ -0,0 +1,6 @@
+---
+type: improved
+date: 2026-07-10
+---
+
+Brain settings now separate assistant behavior, publishing review, and safety policies into focused sections.

package/corpus/templates/brain/changelog/2026-07-10-organization-settings-now-opens-directly-from-the-workspace-.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-10
+---
+
+Organization settings now opens directly from the workspace menu.

package/corpus/templates/calendar/.agents/skills/event-management/SKILL.md

@@ -85,7 +85,22 @@ pnpm action create-event \
 ```
 
 Required: `--title`, `--start`, `--end` (all ISO datetime format).
-Optional: `--description`, `--location`, `--attendees`, `--addGoogleMeet`, `--addZoom`, `--sendUpdates`.
+Optional: `--description`, `--location`, `--attendees`, `--addGoogleMeet`, `--addZoom`, `--sendUpdates`, `--accountEmail`.
+
+When multiple Google accounts are connected, choose the destination account's
+primary calendar with `--accountEmail`:
+
+```bash
+pnpm action create-event \
+  --title "Team standup" \
+  --start 2026-04-03T09:00:00 \
+  --end 2026-04-03T09:30:00 \
+  --accountEmail secondary@example.com
+```
+
+Creating without `accountEmail` is only unambiguous when one Google account is
+connected. The action does not support arbitrary non-primary Google calendar
+IDs.
 
 When attendees are invited and no video link/provider is supplied, Calendar
 automatically adds a Google Meet link by default. Pass `--addGoogleMeet=false`
@@ -179,10 +194,12 @@ location, attendees, reminders, attachments, color, and video provider.
 
 ### update-event
 
-Update an existing Google Calendar event. Use the event `id` from `list-events`, `search-events`, or `get-event`. If the event includes `accountEmail`, pass it through so multi-account calendars update the right connected account.
+Update an existing Google Calendar event. Use the event `id` from `list-events`,
+`search-events`, or `get-event`. Always preserve the event's `accountEmail` on
+the update so multi-account calendars use the right connected account.
 
 ```bash
-pnpm action update-event --id google-event-id --title "New title"
+pnpm action update-event --id google-event-id --accountEmail secondary@example.com --title "New title"
 pnpm action update-event --id google-event-id --start 2026-04-03T10:00:00 --end 2026-04-03T10:30:00
 
 # Replace attendee list (Google sends invites to anyone newly added)
@@ -232,12 +249,27 @@ pnpm action update-event \
 
 Delete an event if the user is the organizer, or remove it from their own calendar with `--removeOnly true` when they are not. For recurring events, use `--scope single`, `--scope all`, or `--scope thisAndFollowing`.
 
+Pass the event's `accountEmail` on deletes, including recurring-series choices
+and attendee removals, so the operation uses the account that owns the event.
+
 ```bash
-pnpm action delete-event --id google-event-id --scope single
+pnpm action delete-event --id google-event-id --accountEmail secondary@example.com --scope single
 pnpm action delete-event --id google-event-id --scope thisAndFollowing
 pnpm action delete-event --id google-event-id --removeOnly true
 ```
 
+### rsvp-event
+
+Accept, decline, or tentatively accept an invitation with the event's
+`accountEmail`. Preserve it for recurring RSVP scope as well:
+
+```bash
+pnpm action rsvp-event \
+  --id google-event-id \
+  --accountEmail secondary@example.com \
+  --status accepted
+```
+
 ## Date Patterns
 
 When the user says:

package/corpus/templates/calendar/AGENTS.md

@@ -75,6 +75,10 @@ Detailed event, availability, booking, storage, and UI rules live in
 - `navigate` moves the UI to calendar, event, availability, booking, and settings
   views.
 - Use actions for full event details and availability calculations.
+- Preserve `accountEmail` on every Google event write. When more than one
+  Google account is connected, pass the chosen account to `create-event`, and
+  pass the event's returned `accountEmail` to `update-event`, `delete-event`,
+  and `rsvp-event`. These actions target that account's primary calendar.
 
 ## Skills
 

package/corpus/templates/calendar/actions/create-event.ts

@@ -1,10 +1,6 @@
 import { defineAction } from "@agent-native/core";
 import { emit } from "@agent-native/core/event-bus";
-import {
-  buildDeepLink,
-  getRequestOrgId,
-  getRequestUserEmail,
-} from "@agent-native/core/server";
+import { buildDeepLink, getRequestUserEmail } from "@agent-native/core/server";
 import { z } from "zod";
 
 import {
@@ -24,6 +20,7 @@ import {
   googleColorIdInput,
   ensureOrganizerInAttendees,
   normalizeAttendees,
+  resolveOwnedAccountEmail,
   reminderMethodInput,
   reminderMinutesInput,
   remindersInput,
@@ -108,7 +105,9 @@ export default defineAction({
     accountEmail: z
       .string()
       .optional()
-      .describe("Account email to create the event on"),
+      .describe(
+        "Connected Google account email whose primary calendar receives the event. Required when multiple accounts are connected.",
+      ),
   }),
   run: async (args) => {
     const email = getRequestUserEmail();
@@ -130,19 +129,7 @@ export default defineAction({
       );
     }
 
-    // Resolve account email
-    let acctEmail = email;
-    if (args.accountEmail && args.accountEmail !== email) {
-      const status = await googleCalendar.getAuthStatus(
-        email,
-        getRequestOrgId(),
-      );
-      const isOwned = status.accounts.some(
-        (a) => a.email === args.accountEmail,
-      );
-      if (!isOwned) throw new Error("Account not owned by current user");
-      acctEmail = args.accountEmail;
-    }
+    const acctEmail = await resolveOwnedAccountEmail(args.accountEmail, email);
 
     const attendees = ensureOrganizerInAttendees(
       normalizeAttendees(args.attendees),
@@ -194,6 +181,7 @@ export default defineAction({
     }
 
     const result = await googleCalendar.createEvent(calEvent, {
+      account: { ownerEmail: email, accountEmail: acctEmail },
       addGoogleMeet: shouldAutoAddGoogleMeet(calEvent, {
         addGoogleMeet: args.addGoogleMeet,
         addZoom: args.addZoom,

package/corpus/templates/calendar/actions/delete-event.ts

@@ -72,17 +72,24 @@ export default defineAction({
         : (args.sendUpdates ?? (shouldNotifyGuests ? "all" : "none")),
     };
     const eventForNotification = shouldNotifyGuests
-      ? await googleCalendar.getEvent(googleEventId, accountEmail)
+      ? await googleCalendar.getEvent(googleEventId, {
+          ownerEmail,
+          accountEmail,
+        })
       : undefined;
 
     if (args.removeOnly) {
       await googleCalendar.removeEventFromCalendar(
         googleEventId,
-        accountEmail,
+        { ownerEmail, accountEmail },
         options,
       );
     } else {
-      await googleCalendar.deleteEvent(googleEventId, accountEmail, options);
+      await googleCalendar.deleteEvent(
+        googleEventId,
+        { ownerEmail, accountEmail },
+        options,
+      );
     }
 
     const guestNotification =

package/corpus/templates/calendar/actions/rsvp-event.ts

@@ -58,7 +58,7 @@ export default defineAction({
     await googleCalendar.rsvpEvent(
       googleEventId,
       args.status,
-      accountEmail,
+      { ownerEmail, accountEmail },
       args.scope,
       args.note?.trim() ?? args.note,
       args.sendUpdates,

package/corpus/templates/calendar/actions/update-event.ts

@@ -246,10 +246,10 @@ export default defineAction({
 
     let existingEvent: CalendarEvent | undefined;
     const loadExistingEvent = async () => {
-      existingEvent ??= await googleCalendar.getEvent(
-        googleEventId,
+      existingEvent ??= await googleCalendar.getEvent(googleEventId, {
+        ownerEmail,
         accountEmail,
-      );
+      });
       return existingEvent;
     };
 
@@ -297,6 +297,7 @@ export default defineAction({
     }
 
     const result = await googleCalendar.updateEvent(googleEventId, updates, {
+      account: { ownerEmail, accountEmail },
       sendUpdates:
         args.sendUpdates ??
         (guestNotificationMessage || (attendeesToAdd?.length ?? 0) > 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/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">