@agent-native/core 0.98.8 → 0.98.9

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

@@ -13,6 +13,7 @@ import {
   attachmentsInput,
   attendeesInput,
   buildReminderOverrides,
+  buildStatusEventFields,
   cliBoolean,
   googleColorIdInput,
   normalizeAttendees,
@@ -23,7 +24,9 @@ import {
   remindersInput,
   requireActionUserEmail,
   resolveOwnedAccountEmail,
+  validateStatusEventTiming,
   visibilityInput,
+  workingLocationTypeInput,
 } from "./event-action-helpers.js";
 
 function mergeAttendees(
@@ -64,6 +67,16 @@ function mergeAttendees(
   return Array.from(merged.values());
 }
 
+function workingLocationTitle(
+  properties: NonNullable<CalendarEvent["workingLocationProperties"]>,
+): string {
+  if (properties.type === "homeOffice") return "Home";
+  if (properties.type === "officeLocation") {
+    return properties.officeLocation?.label || "Office";
+  }
+  return properties.customLocation?.label || "Working location";
+}
+
 export default defineAction({
   description:
     "Update a Google Calendar event. Supports title, description, location, time, event color, attachments, reminders, and recurrence rules such as RRULE:FREQ=DAILY;BYDAY=MO,TU,WE,TH,FR.",
@@ -80,6 +93,15 @@ export default defineAction({
     title: z.string().optional().describe("New event title"),
     description: z.string().optional().describe("New event description"),
     location: z.string().optional().describe("New event location"),
+    workingLocationType: workingLocationTypeInput.describe(
+      "For existing working-location events: homeOffice, officeLocation, or customLocation. Google Calendar event types cannot be changed after creation.",
+    ),
+    workingLocationLabel: z
+      .string()
+      .optional()
+      .describe(
+        "For existing working-location events: label shown in Google Calendar.",
+      ),
     start: z.string().optional().describe("New start time/date as ISO string"),
     end: z.string().optional().describe("New end time/date as ISO string"),
     startTimeZone: z
@@ -92,10 +114,10 @@ export default defineAction({
       .describe("IANA timezone for the event end, e.g. America/New_York"),
     allDay: cliBoolean.optional().describe("Whether the event is all-day"),
     transparency: availabilityInput.describe(
-      "Google Calendar availability: opaque blocks time (Busy), transparent does not block time (Free).",
+      "Google Calendar availability: opaque blocks time (Busy), transparent does not block time (Free). Existing working-location events are always sent to Google as transparent.",
     ),
     visibility: visibilityInput.describe(
-      "Google Calendar visibility: default, public, private, or confidential.",
+      "Google Calendar visibility: default, public, private, or confidential. Existing working-location events are always sent to Google as public.",
     ),
     status: z
       .enum(["confirmed", "tentative", "cancelled"])
@@ -193,6 +215,13 @@ export default defineAction({
       reminderMethod: args.reminderMethod,
       useDefaultReminders: args.remindersUseDefault,
     });
+    const hasWorkingLocationPatch =
+      args.workingLocationType !== undefined ||
+      args.workingLocationLabel !== undefined;
+    const hasTimePatch =
+      args.start !== undefined ||
+      args.end !== undefined ||
+      args.allDay !== undefined;
 
     const attendeesToAdd = normalizeAttendees(args.addAttendees);
     let attendees = normalizeAttendees(args.attendees);
@@ -216,7 +245,8 @@ export default defineAction({
       attendeesToAdd !== undefined ||
       Object.keys(reminderFields).length > 0 ||
       args.addGoogleMeet === true ||
-      args.addZoom === true;
+      args.addZoom === true ||
+      hasWorkingLocationPatch;
 
     if (!hasPatch) {
       throw new Error("No event updates provided.");
@@ -253,6 +283,91 @@ export default defineAction({
       return existingEvent;
     };
 
+    if (args.location !== undefined && !hasWorkingLocationPatch) {
+      const existingEvent = await loadExistingEvent();
+      if (existingEvent.eventType === "workingLocation") {
+        throw new Error(
+          "Working-location events do not support a generic location. Use workingLocationType and workingLocationLabel instead.",
+        );
+      }
+    }
+
+    if (hasTimePatch) {
+      const existingEvent = await loadExistingEvent();
+      const existingStatusEventType =
+        existingEvent.eventType === "outOfOffice" ||
+        existingEvent.eventType === "focusTime" ||
+        existingEvent.eventType === "workingLocation"
+          ? existingEvent.eventType
+          : "default";
+      validateStatusEventTiming({
+        eventType: existingStatusEventType,
+        allDay: args.allDay ?? existingEvent.allDay,
+        start: args.start ?? existingEvent.start,
+        end: args.end ?? existingEvent.end,
+      });
+      if (
+        existingEvent.eventType === "workingLocation" &&
+        existingEvent.workingLocationProperties
+      ) {
+        Object.assign(updates, {
+          eventType: "workingLocation" as const,
+          transparency: "transparent" as const,
+          visibility: "public" as const,
+          workingLocationProperties: existingEvent.workingLocationProperties,
+        });
+      }
+    }
+
+    if (hasWorkingLocationPatch) {
+      const existingEvent = await loadExistingEvent();
+      if (existingEvent.eventType !== "workingLocation") {
+        throw new Error(
+          "Working location details can only be updated on existing working-location events. Google Calendar event types cannot be changed after creation.",
+        );
+      }
+      const nextWorkingLocationType =
+        args.workingLocationType ??
+        existingEvent.workingLocationProperties?.type ??
+        "customLocation";
+      const existingWorkingLocationLabel =
+        existingEvent.workingLocationProperties?.type === "officeLocation"
+          ? existingEvent.workingLocationProperties.officeLocation?.label
+          : existingEvent.workingLocationProperties?.type === "customLocation"
+            ? existingEvent.workingLocationProperties.customLocation?.label
+            : undefined;
+      const nextWorkingLocationLabel =
+        args.workingLocationLabel ??
+        args.location ??
+        existingWorkingLocationLabel ??
+        existingEvent.title;
+      const workingLocationFields = buildStatusEventFields({
+        eventType: "workingLocation",
+        title: args.title ?? existingEvent.title,
+        workingLocationType: nextWorkingLocationType,
+        workingLocationLabel: nextWorkingLocationLabel,
+      });
+      const nextWorkingLocationProperties =
+        nextWorkingLocationType === "officeLocation"
+          ? {
+              type: "officeLocation" as const,
+              officeLocation: {
+                ...(existingEvent.workingLocationProperties?.type ===
+                "officeLocation"
+                  ? existingEvent.workingLocationProperties.officeLocation
+                  : {}),
+                label: nextWorkingLocationLabel,
+              },
+            }
+          : workingLocationFields.workingLocationProperties;
+      Object.assign(updates, {
+        transparency: "transparent",
+        visibility: "public",
+        workingLocationProperties: nextWorkingLocationProperties,
+      });
+      delete updates.location;
+    }
+
     if (attendeesToAdd !== undefined) {
       const existingEvent = await loadExistingEvent();
       attendees = mergeAttendees(existingEvent.attendees, attendeesToAdd);
@@ -296,16 +411,109 @@ export default defineAction({
       };
     }
 
-    const result = await googleCalendar.updateEvent(googleEventId, updates, {
-      account: { ownerEmail, accountEmail },
-      sendUpdates:
-        args.sendUpdates ??
-        (guestNotificationMessage || (attendeesToAdd?.length ?? 0) > 0
-          ? "all"
-          : undefined),
-      addGoogleMeet: args.addGoogleMeet,
-      scope: args.scope,
-    });
+    let result: Awaited<ReturnType<typeof googleCalendar.updateEvent>>;
+    let returnedGoogleEventId = googleEventId;
+    const replaceRecurringWorkingLocation =
+      hasWorkingLocationPatch &&
+      (args.scope ?? "single") === "single" &&
+      existingEvent?.recurringEventId &&
+      updates.workingLocationProperties;
+
+    if (replaceRecurringWorkingLocation) {
+      const hasUnsupportedReplacementPatch =
+        args.title !== undefined ||
+        args.description !== undefined ||
+        args.start !== undefined ||
+        args.end !== undefined ||
+        args.startTimeZone !== undefined ||
+        args.endTimeZone !== undefined ||
+        args.allDay !== undefined ||
+        args.status !== undefined ||
+        args.colorId !== undefined ||
+        args.attachments !== undefined ||
+        args.reminders !== undefined ||
+        args.reminderMinutes !== undefined ||
+        args.remindersUseDefault !== undefined ||
+        args.addGoogleMeet === true ||
+        args.addZoom === true ||
+        args.recurrence !== undefined ||
+        args.attendees !== undefined ||
+        args.addAttendees !== undefined ||
+        args.notificationMessage !== undefined;
+      if (hasUnsupportedReplacementPatch) {
+        throw new Error(
+          "Change the working location separately from other event fields for a single recurring occurrence.",
+        );
+      }
+      const now = new Date().toISOString();
+      const replacement = await googleCalendar.createEvent(
+        {
+          id: "",
+          title: workingLocationTitle(updates.workingLocationProperties!),
+          description: "",
+          start: existingEvent!.start,
+          end: existingEvent!.end,
+          startTimeZone: existingEvent!.startTimeZone,
+          endTimeZone: existingEvent!.endTimeZone,
+          location: "",
+          allDay: existingEvent!.allDay,
+          source: "google",
+          accountEmail,
+          colorId: existingEvent!.colorId,
+          transparency: "transparent",
+          visibility: "public",
+          status: "confirmed",
+          eventType: "workingLocation",
+          workingLocationProperties: updates.workingLocationProperties,
+          createdAt: now,
+          updatedAt: now,
+        },
+        { account: { ownerEmail, accountEmail } },
+      );
+      if (!replacement.id) {
+        throw new Error(
+          "Google did not return an id for the working location.",
+        );
+      }
+      try {
+        await googleCalendar.deleteEvent(
+          googleEventId,
+          { ownerEmail, accountEmail },
+          { scope: "single" },
+        );
+      } catch (error) {
+        try {
+          await googleCalendar.deleteEvent(
+            replacement.id,
+            { ownerEmail, accountEmail },
+            { scope: "single" },
+          );
+        } catch (cleanupError) {
+          console.error(
+            "Failed to clean up a working-location replacement after the original occurrence could not be cancelled.",
+            cleanupError,
+          );
+        }
+        throw error;
+      }
+      returnedGoogleEventId = replacement.id;
+      result = {
+        htmlLink: replacement.htmlLink,
+        meetLink: replacement.meetLink,
+        conferenceData: replacement.conferenceData,
+      };
+    } else {
+      result = await googleCalendar.updateEvent(googleEventId, updates, {
+        account: { ownerEmail, accountEmail },
+        sendUpdates:
+          args.sendUpdates ??
+          (guestNotificationMessage || (attendeesToAdd?.length ?? 0) > 0
+            ? "all"
+            : undefined),
+        addGoogleMeet: args.addGoogleMeet,
+        scope: args.scope,
+      });
+    }
 
     const returnedPatch: Partial<CalendarEvent> = {};
     if (result.htmlLink) returnedPatch.htmlLink = result.htmlLink;
@@ -340,7 +548,10 @@ export default defineAction({
 
     return {
       success: true,
-      id: `google-${googleEventId}`,
+      id: `google-${returnedGoogleEventId}`,
+      ...(returnedGoogleEventId !== googleEventId
+        ? { replacedId: `google-${googleEventId}` }
+        : {}),
       accountEmail,
       updated: updatedKeys,
       htmlLink: result.htmlLink,

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

@@ -1,6 +1,6 @@
 import { useT } from "@agent-native/core/client";
 import type { CalendarEvent } from "@shared/api";
-import { IconAlertTriangleFilled } from "@tabler/icons-react";
+import { IconAlertTriangleFilled, IconMapPin } from "@tabler/icons-react";
 import {
   eachHourOfInterval,
   format,
@@ -28,6 +28,7 @@ import {
   useViewPreferences,
   type ViewPreferences,
 } from "@/hooks/use-view-preferences";
+import { partitionAllDayEvents } from "@/lib/all-day-layout";
 import { getEventDisplayColor, allOtherDeclined } from "@/lib/event-colors";
 import {
   shouldSuppressAfterPopoverClose,
@@ -35,6 +36,12 @@ import {
 } from "@/lib/popover-click-guard";
 import { EventStatusIcon } from "@/lib/rsvp-status";
 import { cn } from "@/lib/utils";
+import {
+  createWorkingLocationDisplayLabels,
+  getWorkingLocationChipLabel,
+  getWorkingLocationTitle,
+  isWorkingLocationEvent,
+} from "@/lib/working-location";
 
 import { EventDetailPopover } from "./EventDetailPopover";
 
@@ -256,6 +263,8 @@ const DayEventCard = memo(function DayEventCard({
   onDraftCreate,
   onDraftDiscard,
 }: DayEventCardProps) {
+  const t = useT();
+  const workingLocationLabels = createWorkingLocationDisplayLabels(t);
   const li = layout.get(event.id) ?? {
     left: 0,
     width: 100,
@@ -323,10 +332,10 @@ const DayEventCard = memo(function DayEventCard({
       )}
       aria-label={
         event.ownerName || event.overlayEmail
-          ? `${event.title}, ${
+          ? `${getWorkingLocationTitle(event, workingLocationLabels)}, ${
               event.ownerName || event.overlayEmail
             }'s calendar`
-          : event.title
+          : getWorkingLocationTitle(event, workingLocationLabels)
       }
       style={{
         ...posStyle,
@@ -381,8 +390,13 @@ const DayEventCard = memo(function DayEventCard({
               !isPast && !isDeclined && "font-semibold",
             )}
           >
-            {event.title}
+            {getWorkingLocationChipLabel(event, workingLocationLabels)}
           </span>
+          {isWorkingLocationEvent(event) && (
+            <span className="shrink-0 text-[10px] font-normal text-foreground/55">
+              {t("eventForm.workingLocation")}
+            </span>
+          )}
         </div>
       ) : (
         <>
@@ -403,8 +417,15 @@ const DayEventCard = memo(function DayEventCard({
               />
             )}
             <EventStatusIcon event={event} className="shrink-0" />
-            <span className="truncate">{event.title}</span>
+            <span className="truncate">
+              {getWorkingLocationChipLabel(event, workingLocationLabels)}
+            </span>
           </div>
+          {isWorkingLocationEvent(event) && isStart && (
+            <div className="mt-0.5 truncate text-[10px] leading-tight text-foreground/60">
+              {t("eventForm.workingLocation")}
+            </div>
+          )}
           {isStart && (
             <div
               className={cn(
@@ -517,6 +538,7 @@ export const DayView = memo(function DayView({
   isLoading = false,
 }: DayViewProps) {
   const t = useT();
+  const workingLocationLabels = createWorkingLocationDisplayLabels(t);
   const { setFocusedEvent } = useCalendarSetters();
   const { prefs } = useViewPreferences();
   const [now, setNow] = useState(new Date());
@@ -568,6 +590,10 @@ export const DayView = memo(function DayView({
   );
 
   const allDayEvents = useMemo(() => events.filter((e) => e.allDay), [events]);
+  const { workingLocations, regularEvents: regularAllDayEvents } = useMemo(
+    () => partitionAllDayEvents(allDayEvents),
+    [allDayEvents],
+  );
   const timedEvents = useMemo(() => events.filter((e) => !e.allDay), [events]);
   const layout = useMemo(() => computeLayout(timedEvents), [timedEvents]);
 
@@ -726,72 +752,161 @@ export const DayView = memo(function DayView({
         </Tooltip>
       </div>
 
-      {/* All-day events */}
+      {/* Working locations and ordinary all-day events */}
       {allDayEvents.length > 0 && (
-        <div className="border-b border-border bg-card/50 px-4 py-2">
-          <p className="mb-1.5 text-[11px] font-medium uppercase tracking-wider text-muted-foreground">
-            {t("eventForm.allDay")}
-          </p>
-          <div className="space-y-1">
-            {allDayEvents.map((event) => {
-              const color = getEventDisplayColor(event, prefs);
-              return (
-                <EventDetailPopover
-                  key={event.id}
-                  event={event}
-                  onDelete={onDeleteEvent}
-                  isDraft={draftEventIds.includes(event.id)}
-                  defaultOpen={quickEditEventId === event.id}
-                  onTitleSave={onQuickEditSave}
-                  onDismissNew={onQuickEditCancel}
-                  onDraftUpdate={onDraftUpdate}
-                  onDraftCreate={onDraftCreate}
-                  onDraftDiscard={onDraftDiscard}
-                >
-                  <button
-                    className={cn(
-                      "relative flex w-full items-center gap-1.5 rounded-md px-3 py-1.5 text-left text-sm font-medium text-foreground transition-all hover:brightness-110",
-                      event.ownerColor && "pr-5",
-                    )}
-                    aria-label={
-                      event.ownerName || event.overlayEmail
-                        ? `${event.title}, ${
-                            event.ownerName || event.overlayEmail
-                          }'s calendar`
-                        : event.title
-                    }
-                    style={
-                      color
-                        ? {
-                            backgroundColor: `${color}30`,
-                            borderLeft: `3px solid ${color}`,
-                          }
-                        : {
-                            backgroundColor: "hsl(var(--primary) / 0.15)",
-                            borderLeft: "3px solid hsl(var(--primary))",
-                          }
-                    }
-                  >
-                    {allOtherDeclined(event) && (
-                      <IconAlertTriangleFilled
-                        size={14}
-                        className="shrink-0 text-current opacity-70"
-                      />
-                    )}
-                    <EventStatusIcon event={event} className="shrink-0" />
-                    <span className="truncate">{event.title}</span>
-                    {event.ownerColor && (
-                      <span
-                        aria-hidden="true"
-                        className="absolute right-2 top-1/2 size-1.5 -translate-y-1/2 rounded-full ring-1 ring-background/70"
-                        style={{ backgroundColor: event.ownerColor }}
-                      />
-                    )}
-                  </button>
-                </EventDetailPopover>
-              );
-            })}
-          </div>
+        <div className="border-b border-border bg-card/50">
+          {workingLocations.length > 0 && (
+            <div data-working-location-lane className="px-4 py-1.5">
+              <p className="mb-1 flex items-center gap-1 text-[10px] font-medium uppercase text-muted-foreground">
+                <IconMapPin aria-hidden="true" className="size-3" />
+                {t("eventForm.workingLocation")}
+              </p>
+              <div className="grid gap-1 sm:grid-cols-2">
+                {workingLocations.map((event) => {
+                  const color = getEventDisplayColor(event, prefs);
+                  return (
+                    <EventDetailPopover
+                      key={`${event.overlayEmail ?? event.accountEmail ?? "primary"}:${event.id}`}
+                      event={event}
+                      onDelete={onDeleteEvent}
+                      isDraft={draftEventIds.includes(event.id)}
+                      defaultOpen={quickEditEventId === event.id}
+                      onTitleSave={onQuickEditSave}
+                      onDismissNew={onQuickEditCancel}
+                      onDraftUpdate={onDraftUpdate}
+                      onDraftCreate={onDraftCreate}
+                      onDraftDiscard={onDraftDiscard}
+                    >
+                      <button
+                        className={cn(
+                          "relative flex h-6 w-full items-center gap-1.5 truncate rounded-sm px-2 text-left text-xs font-medium text-foreground transition-opacity hover:opacity-80",
+                          event.ownerColor && "pr-5",
+                        )}
+                        aria-label={
+                          event.ownerName || event.overlayEmail
+                            ? `${getWorkingLocationTitle(event, workingLocationLabels)}, ${
+                                event.ownerName || event.overlayEmail
+                              }'s calendar`
+                            : getWorkingLocationTitle(
+                                event,
+                                workingLocationLabels,
+                              )
+                        }
+                        style={{
+                          backgroundColor: color
+                            ? `${color}1f`
+                            : "hsl(var(--muted))",
+                          borderLeft: `2px solid ${
+                            color ?? "hsl(var(--muted-foreground))"
+                          }`,
+                        }}
+                      >
+                        <IconMapPin
+                          aria-hidden="true"
+                          className="size-3 shrink-0 opacity-70"
+                        />
+                        <span className="truncate">
+                          {getWorkingLocationChipLabel(
+                            event,
+                            workingLocationLabels,
+                          )}
+                        </span>
+                        {event.ownerColor && (
+                          <span
+                            aria-hidden="true"
+                            className="absolute right-2 top-1/2 size-1.5 -translate-y-1/2 rounded-full ring-1 ring-background/70"
+                            style={{ backgroundColor: event.ownerColor }}
+                          />
+                        )}
+                      </button>
+                    </EventDetailPopover>
+                  );
+                })}
+              </div>
+            </div>
+          )}
+
+          {regularAllDayEvents.length > 0 && (
+            <div
+              data-all-day-event-lane
+              className={cn(
+                "px-4 py-2",
+                workingLocations.length > 0 && "border-t border-border/60",
+              )}
+            >
+              <p className="mb-1.5 text-[11px] font-medium uppercase text-muted-foreground">
+                {t("eventForm.allDay")}
+              </p>
+              <div className="flex flex-col gap-1">
+                {regularAllDayEvents.map((event) => {
+                  const color = getEventDisplayColor(event, prefs);
+                  return (
+                    <EventDetailPopover
+                      key={`${event.overlayEmail ?? event.accountEmail ?? "primary"}:${event.id}`}
+                      event={event}
+                      onDelete={onDeleteEvent}
+                      isDraft={draftEventIds.includes(event.id)}
+                      defaultOpen={quickEditEventId === event.id}
+                      onTitleSave={onQuickEditSave}
+                      onDismissNew={onQuickEditCancel}
+                      onDraftUpdate={onDraftUpdate}
+                      onDraftCreate={onDraftCreate}
+                      onDraftDiscard={onDraftDiscard}
+                    >
+                      <button
+                        className={cn(
+                          "relative flex w-full items-center gap-1.5 rounded-md px-3 py-1.5 text-left text-sm font-medium text-foreground transition-all hover:brightness-110",
+                          event.ownerColor && "pr-5",
+                        )}
+                        aria-label={
+                          event.ownerName || event.overlayEmail
+                            ? `${getWorkingLocationTitle(event, workingLocationLabels)}, ${
+                                event.ownerName || event.overlayEmail
+                              }'s calendar`
+                            : getWorkingLocationTitle(
+                                event,
+                                workingLocationLabels,
+                              )
+                        }
+                        style={
+                          color
+                            ? {
+                                backgroundColor: `${color}30`,
+                                borderLeft: `3px solid ${color}`,
+                              }
+                            : {
+                                backgroundColor: "hsl(var(--primary) / 0.15)",
+                                borderLeft: "3px solid hsl(var(--primary))",
+                              }
+                        }
+                      >
+                        {allOtherDeclined(event) && (
+                          <IconAlertTriangleFilled
+                            size={14}
+                            className="shrink-0 text-current opacity-70"
+                          />
+                        )}
+                        <EventStatusIcon event={event} className="shrink-0" />
+                        <span className="truncate">
+                          {getWorkingLocationChipLabel(
+                            event,
+                            workingLocationLabels,
+                          )}
+                        </span>
+                        {event.ownerColor && (
+                          <span
+                            aria-hidden="true"
+                            className="absolute right-2 top-1/2 size-1.5 -translate-y-1/2 rounded-full ring-1 ring-background/70"
+                            style={{ backgroundColor: event.ownerColor }}
+                          />
+                        )}
+                      </button>
+                    </EventDetailPopover>
+                  );
+                })}
+              </div>
+            </div>
+          )}
         </div>
       )}