@agent-native/core 0.176.4 → 0.176.5-nightly-20260902202853

package/corpus/README.md

@@ -31,4 +31,4 @@ rg -n "defineAction|useActionQuery" node_modules/@agent-native/core/corpus
 
 ## Generated Counts
 
-- template files: 8851
+- template files: 8859

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

@@ -27,6 +27,12 @@ slot does not inject per-row UI.
 
 Query events from Google Calendar within a date range.
 
+Use `list-google-calendars` first when the user wants events from calendars
+shared with any connected account. Pass the returned opaque `sourceKey` values
+as `calendarSourceKeys`; never construct or decode them. Non-primary calendars
+are view-only in Calendar, even when Google reports an editable access role,
+and are excluded from booking availability.
+
 ```bash
 # Today's events (--to is exclusive, so use tomorrow)
 pnpm action list-events --from 2026-04-03 --to 2026-04-04

package/corpus/templates/calendar/AGENTS.md

@@ -55,6 +55,10 @@ Detailed event, availability, booking, storage, and UI rules live in
   `sourceCoverage`, and `coverageComplete` fields — a partial source failure is
   not an empty calendar. See `event-management` for the formats and the
   `accountEmails` rules.
+- Use `list-google-calendars` to discover primary and shared calendars available
+  through connected Google accounts, then pass its opaque `sourceKey` values to
+  `list-events`. Shared calendars are view-only in Calendar and do not affect
+  booking availability.
 - Treat Google Calendar working locations and full-day out-of-office events as
   native status events; see `event-management` for their action contracts.
 - Use framework sharing actions for calendar, event, and booking resources;

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

@@ -9,7 +9,7 @@ import { isGoogleNotFoundError } from "../server/lib/google-api.js";
 import * as googleCalendar from "../server/lib/google-calendar.js";
 import {
   cliBoolean,
-  normalizeGoogleEventId,
+  normalizeWritableGoogleEventId,
   requireActionUserEmail,
   resolveOwnedAccountEmail,
 } from "./event-action-helpers.js";
@@ -57,7 +57,7 @@ export default defineAction({
       );
     }
 
-    const googleEventId = normalizeGoogleEventId(args.id);
+    const googleEventId = normalizeWritableGoogleEventId(args.id);
     const accountEmail = await resolveOwnedAccountEmail(
       args.accountEmail,
       ownerEmail,

package/corpus/templates/calendar/actions/event-action-helpers.ts

@@ -176,6 +176,13 @@ export function normalizeGoogleEventId(id: string): string {
   return id.startsWith("google-") ? id.slice("google-".length) : id;
 }
 
+export function normalizeWritableGoogleEventId(id: string): string {
+  if (id.startsWith("google-google-calendar:")) {
+    throw new Error("Shared Google calendar events are read-only");
+  }
+  return normalizeGoogleEventId(id);
+}
+
 export async function resolveOwnedAccountEmail(
   requestedAccountEmail: string | undefined,
   ownerEmail: string,

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

@@ -1,10 +1,13 @@
 import { defineAction } from "@agent-native/core/action";
+import { isFeatureFlagEnabled } from "@agent-native/core/feature-flags";
 import { getRequestUserEmail, buildDeepLink } from "@agent-native/core/server";
 import { z } from "zod";
 
 import { calendarGetEvent } from "../server/lib/google-api.js";
 import * as googleCalendar from "../server/lib/google-calendar.js";
 import type { CalendarEvent } from "../shared/api.js";
+import { SHARED_GOOGLE_CALENDARS } from "../shared/feature-flags.js";
+import { parseGoogleCalendarSourceKey } from "../shared/google-calendar-sources.js";
 import { getGoogleEventColorHex } from "../shared/google-event-colors.js";
 
 export default defineAction({
@@ -20,13 +23,24 @@ export default defineAction({
       .optional()
       .default("primary")
       .describe('Calendar id — defaults to "primary"'),
+    calendarSourceKey: z
+      .string()
+      .optional()
+      .describe(
+        "Opaque source key from list-google-calendars for a shared event",
+      ),
   }),
   http: { method: "GET" },
   readOnly: true,
   publicAgent: { expose: true, readOnly: true, requiresAuth: true },
   link: ({ result }) => {
     if (!result || typeof result !== "object") return null;
-    const evt = result as { id?: string; start?: string; error?: string };
+    const evt = result as {
+      id?: string;
+      start?: string;
+      error?: string;
+      calendarSourceKey?: string;
+    };
     if (evt.error || !evt.id) return null;
     const date =
       typeof evt.start === "string" && evt.start
@@ -36,16 +50,39 @@ export default defineAction({
       url: buildDeepLink({
         app: "calendar",
         view: "calendar",
-        params: { eventId: evt.id, date },
+        params: {
+          eventId: evt.id,
+          date,
+          calendarSourceKey: evt.calendarSourceKey,
+        },
       }),
       label: "Open event in Calendar",
       view: "calendar",
     };
   },
-  run: async (args) => {
+  run: async (args, ctx) => {
     const email = getRequestUserEmail();
     if (!email) throw new Error("no authenticated user");
 
+    if (args.calendarSourceKey) {
+      if (!(await isFeatureFlagEnabled(SHARED_GOOGLE_CALENDARS, ctx))) {
+        throw new Error("Shared Google calendars is not enabled");
+      }
+      const source = parseGoogleCalendarSourceKey(args.calendarSourceKey);
+      if (!source) throw new Error("Invalid Google Calendar source key");
+      const namespacedPrefix = `google-${args.calendarSourceKey}-`;
+      const rawId = args.id.startsWith(namespacedPrefix)
+        ? args.id.slice(namespacedPrefix.length)
+        : args.id.startsWith("google-")
+          ? args.id.slice("google-".length)
+          : args.id;
+      return googleCalendar.getEvent(
+        rawId,
+        { ownerEmail: email, accountEmail: source.accountEmail },
+        { calendarSourceKey: args.calendarSourceKey },
+      );
+    }
+
     const rawId = args.id.startsWith("google-")
       ? args.id.slice("google-".length)
       : args.id;

package/corpus/templates/calendar/actions/list-events.ts

@@ -1,6 +1,7 @@
 import { createHash } from "node:crypto";
 
 import { defineAction } from "@agent-native/core/action";
+import { isFeatureFlagEnabled } from "@agent-native/core/feature-flags";
 import {
   getRequestTimezone,
   getRequestUserEmail,
@@ -17,6 +18,7 @@ import { getCalendarTimezone } from "../server/lib/calendar-settings.js";
 import * as googleCalendar from "../server/lib/google-calendar.js";
 import { fetchICalEvents } from "../server/lib/ical-fetcher.js";
 import type { CalendarEvent, ExternalCalendar } from "../shared/api.js";
+import { SHARED_GOOGLE_CALENDARS } from "../shared/feature-flags.js";
 import {
   addDaysToDateKey,
   dateKeyInTimezone,
@@ -74,6 +76,7 @@ interface ListCalendarEventsArgs {
   query?: string;
   overlayEmails?: string | string[];
   accountEmails?: string[];
+  calendarSourceKeys?: string[];
   sources?: CalendarInventorySource[];
   providerPageSize?: number;
 }
@@ -131,6 +134,12 @@ export interface CalendarInventoryItem {
   source: "google" | "booking" | "ics" | "overlay";
   sourceId?: string;
   accountEmail?: string;
+  calendarSourceKey?: string;
+  calendarId?: string;
+  calendarName?: string;
+  calendarAccessRole?: CalendarEvent["calendarAccessRole"];
+  calendarPrimary?: boolean;
+  calendarReadOnly?: boolean;
   overlayEmail?: string;
   organizer?: { email?: string; displayName?: string; self?: boolean };
   selfResponseStatus?: CalendarEvent["responseStatus"];
@@ -239,6 +248,7 @@ function inventoryQueryKey(args: {
   to: string;
   query?: string;
   accountEmails: string[];
+  calendarSourceKeys?: string[];
   overlayEmails?: string | string[];
   sources: CalendarInventorySource[];
 }): string {
@@ -248,6 +258,7 @@ function inventoryQueryKey(args: {
     to: args.to,
     query: args.query?.trim().toLowerCase() || "",
     accountEmails: normalizedEmails(args.accountEmails),
+    calendarSourceKeys: [...(args.calendarSourceKeys ?? [])].sort(),
     overlayEmails: normalizedOverlayEmails(args.overlayEmails),
     sources: [...args.sources].sort(),
   });
@@ -314,7 +325,10 @@ function compactInventoryEvent(event: CalendarEvent): CalendarInventoryItem {
   );
   const key = [
     event.source,
-    event.accountEmail ?? event.overlayEmail ?? "local",
+    event.calendarSourceKey ??
+      event.accountEmail ??
+      event.overlayEmail ??
+      "local",
     event.googleEventId ?? event.id,
     event.start,
   ].join(":");
@@ -338,6 +352,12 @@ function compactInventoryEvent(event: CalendarEvent): CalendarInventoryItem {
     source,
     sourceId: event.sourceId,
     accountEmail: event.accountEmail,
+    calendarSourceKey: event.calendarSourceKey,
+    calendarId: event.calendarId,
+    calendarName: cap(event.calendarName),
+    calendarAccessRole: event.calendarAccessRole,
+    calendarPrimary: event.calendarPrimary,
+    calendarReadOnly: event.calendarReadOnly,
     overlayEmail: event.overlayEmail,
     organizer: event.organizer
       ? {
@@ -638,6 +658,7 @@ export async function listCalendarEvents(
     connected && includeGoogle
       ? googleCalendar.listEvents(range.from, range.to, email, {
           accountEmails: args.accountEmails,
+          calendarSourceKeys: args.calendarSourceKeys,
           maxResults: args.providerPageSize,
         })
       : Promise.resolve({ events: [], errors: [] });
@@ -727,11 +748,21 @@ export async function listCalendarEvents(
 
   const googleEventIds = new Set(
     googleEvents
+      .filter(
+        (event) =>
+          event.calendarPrimary !== false &&
+          !event.overlayEmail &&
+          event.googleEventId,
+      )
       .map((event) => event.googleEventId)
       .filter((id): id is string => Boolean(id)),
   );
   const googleReadAuthoritative =
-    includeGoogle && connected && googleResult.errors.length === 0;
+    includeGoogle &&
+    connected &&
+    googleResult.errors.length === 0 &&
+    (!args.calendarSourceKeys?.length ||
+      googleEvents.some((event) => event.calendarPrimary === true));
   const bookingEvents = rawBookingEvents.filter((event) =>
     shouldShowLocalBookingEvent({
       event,
@@ -800,6 +831,14 @@ export default defineAction({
       .describe(
         "Connected Google accounts to read; omitted reads every connected account",
       ),
+    calendarSourceKeys: z
+      .array(z.string().min(1).max(4096))
+      .min(1)
+      .max(100)
+      .optional()
+      .describe(
+        "Opaque Google calendar source keys returned by list-google-calendars; each is revalidated before reading",
+      ),
     sources: z
       .array(z.enum(["google", "bookings", "ics", "overlays"]))
       .max(4)
@@ -825,6 +864,12 @@ export default defineAction({
   readOnly: true,
   publicAgent: { expose: true, readOnly: true, requiresAuth: true },
   run: async (args, ctx) => {
+    if (
+      args.calendarSourceKeys &&
+      !(await isFeatureFlagEnabled(SHARED_GOOGLE_CALENDARS, ctx))
+    ) {
+      throw new Error("Shared Google calendars is not enabled");
+    }
     const inventory =
       args.format === "inventory" || (ctx?.caller === "mcp" && !args.format);
     const owner = inventory ? getRequestUserEmail() : undefined;
@@ -855,6 +900,7 @@ export default defineAction({
         to: preparedRange.to,
         query: args.query,
         accountEmails: args.accountEmails ?? preparedOwnedAccounts ?? [],
+        calendarSourceKeys: args.calendarSourceKeys,
         overlayEmails: args.overlayEmails,
         sources: resolveInventorySources(args.sources),
       });
@@ -884,6 +930,7 @@ export default defineAction({
           to: result.range.to,
           query: args.query,
           accountEmails: result.requestedAccounts ?? result.resolvedAccounts,
+          calendarSourceKeys: args.calendarSourceKeys,
           overlayEmails: args.overlayEmails,
           sources: result.sources,
         });

package/corpus/templates/calendar/actions/list-google-calendars.ts

@@ -0,0 +1,24 @@
+import { defineAction } from "@agent-native/core/action";
+import { isFeatureFlagEnabled } from "@agent-native/core/feature-flags";
+import { getRequestUserEmail } from "@agent-native/core/server";
+import { z } from "zod";
+
+import { listGoogleCalendars } from "../server/lib/google-calendar.js";
+import { SHARED_GOOGLE_CALENDARS } from "../shared/feature-flags.js";
+
+export default defineAction({
+  description:
+    "Discover Google Calendar sources available through every connected account. Source keys are opaque and must be passed back to list-events; names and roles in client requests are never trusted.",
+  schema: z.object({}),
+  http: { method: "GET" },
+  readOnly: true,
+  publicAgent: { expose: true, readOnly: true, requiresAuth: true },
+  run: async (_args, ctx) => {
+    if (!(await isFeatureFlagEnabled(SHARED_GOOGLE_CALENDARS, ctx))) {
+      throw new Error("Shared Google calendars is not enabled");
+    }
+    const ownerEmail = getRequestUserEmail();
+    if (!ownerEmail) throw new Error("no authenticated user");
+    return listGoogleCalendars(ownerEmail);
+  },
+});

package/corpus/templates/calendar/actions/update-calendar-visual-preferences.ts

@@ -3,13 +3,17 @@ import {
   readAppState,
   writeAppState,
 } from "@agent-native/core/application-state";
+import { isFeatureFlagEnabled } from "@agent-native/core/feature-flags";
+import { getRequestUserEmail } from "@agent-native/core/server";
 import { z } from "zod";
 
+import { listGoogleCalendars } from "../server/lib/google-calendar.js";
 import {
   CALENDAR_VIEW_PREFERENCES_KEY,
   isValidCalendarColor,
   normalizeCalendarViewPreferences,
 } from "../shared/calendar-view-preferences.js";
+import { SHARED_GOOGLE_CALENDARS } from "../shared/feature-flags.js";
 
 const hexColor = z
   .string()
@@ -53,6 +57,19 @@ export default defineAction({
         .describe(
           "Map of connected Google Calendar account email to hex color, for setting multiple accounts at once",
         ),
+      googleCalendarSourceKey: z
+        .string()
+        .min(1)
+        .optional()
+        .describe(
+          "Opaque sourceKey returned by list-google-calendars whose Agent-Native visibility should change",
+        ),
+      googleCalendarVisible: z
+        .boolean()
+        .optional()
+        .describe(
+          "Whether the Google calendar source should appear in Agent-Native; does not change Google Calendar selection",
+        ),
       hideWeekends: z
         .boolean()
         .optional()
@@ -66,8 +83,33 @@ export default defineAction({
           "accountColor and accountColorMode require accountEmail to be set",
         path: ["accountEmail"],
       },
+    )
+    .refine(
+      (args) =>
+        args.googleCalendarVisible === undefined ||
+        !!args.googleCalendarSourceKey,
+      {
+        message:
+          "googleCalendarVisible requires googleCalendarSourceKey to be set",
+        path: ["googleCalendarSourceKey"],
+      },
     ),
-  run: async (args) => {
+  run: async (args, ctx) => {
+    if (args.googleCalendarSourceKey) {
+      if (!(await isFeatureFlagEnabled(SHARED_GOOGLE_CALENDARS, ctx))) {
+        throw new Error("Shared Google calendars is not enabled");
+      }
+      const ownerEmail = getRequestUserEmail();
+      if (!ownerEmail) throw new Error("no authenticated user");
+      const sourceResult = await listGoogleCalendars(ownerEmail);
+      if (
+        !sourceResult.calendars.some(
+          (source) => source.sourceKey === args.googleCalendarSourceKey,
+        )
+      ) {
+        throw new Error("Unknown Google calendar source");
+      }
+    }
     const runUpdate = async () => {
       const current = normalizeCalendarViewPreferences(
         (await readAppState(CALENDAR_VIEW_PREFERENCES_KEY)) as any,
@@ -105,6 +147,15 @@ export default defineAction({
           : {}),
         accountColors,
         accountColorModes,
+        googleCalendarVisibility: {
+          ...current.googleCalendarVisibility,
+          ...(args.googleCalendarSourceKey &&
+          args.googleCalendarVisible !== undefined
+            ? {
+                [args.googleCalendarSourceKey]: args.googleCalendarVisible,
+              }
+            : {}),
+        },
       });
 
       await writeAppState(

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

@@ -18,7 +18,7 @@ import {
   cliBoolean,
   googleColorIdInput,
   normalizeAttendees,
-  normalizeGoogleEventId,
+  normalizeWritableGoogleEventId,
   normalizeRecurrence,
   reminderMethodInput,
   reminderMinutesInput,
@@ -215,7 +215,7 @@ export default defineAction({
       );
     }
 
-    const googleEventId = normalizeGoogleEventId(args.id);
+    const googleEventId = normalizeWritableGoogleEventId(args.id);
     const accountEmail = await resolveOwnedAccountEmail(
       args.accountEmail,
       ownerEmail,

package/corpus/templates/calendar/actions/view-screen.ts

@@ -1,5 +1,6 @@
 import { defineAction } from "@agent-native/core/action";
 import { readAppState } from "@agent-native/core/application-state";
+import { isFeatureFlagEnabled } from "@agent-native/core/feature-flags";
 import { getRequestUserEmail } from "@agent-native/core/server";
 import { accessFilter } from "@agent-native/core/sharing";
 import { z } from "zod";
@@ -7,12 +8,14 @@ import { z } from "zod";
 import { getDb, schema } from "../server/db/index.js";
 import { rowToBookingLink } from "../server/lib/booking-link-utils.js";
 import { readCalendarSettings } from "../server/lib/calendar-settings.js";
+import { listGoogleCalendars } from "../server/lib/google-calendar.js";
 import type { CalendarEvent, CalendarEventDraft } from "../shared/api.js";
 import {
   CALENDAR_VIEW_PREFERENCES_KEY,
   normalizeCalendarViewPreferences,
 } from "../shared/calendar-view-preferences.js";
 import { getWeekStartsOn } from "../shared/calendar-week.js";
+import { SHARED_GOOGLE_CALENDARS } from "../shared/feature-flags.js";
 import {
   getCalendarViewDateRange,
   dateKeyInTimezone,
@@ -33,6 +36,7 @@ async function fetchEventsForRange(
   from: string,
   to: string,
   timezone: string,
+  calendarSourceKeys?: string[],
 ): Promise<{
   events: CalendarEvent[];
   errors: Array<{ email: string; error: string }>;
@@ -40,7 +44,10 @@ async function fetchEventsForRange(
   range: { from: string; to: string; timezone: string; defaulted: boolean };
 }> {
   try {
-    return await listCalendarEvents({ from, to }, { timezone });
+    return await listCalendarEvents(
+      { from, to, calendarSourceKeys },
+      { timezone },
+    );
   } catch (error: any) {
     return {
       events: [],
@@ -66,7 +73,7 @@ export default defineAction({
     "See what the user is currently looking at on screen. Returns the current view, date range, and visible events. Always call this first before taking any action.",
   schema: z.object({}),
   http: false,
-  run: async () => {
+  run: async (_args, ctx) => {
     const navigation = await readAppState("navigation");
     const visualPreferences = normalizeCalendarViewPreferences(
       (await readAppState(CALENDAR_VIEW_PREFERENCES_KEY)) as any,
@@ -97,10 +104,49 @@ export default defineAction({
         getWeekStartsOn(settings.weekStart),
       );
 
+      const sharedCalendarsEnabled = await isFeatureFlagEnabled(
+        SHARED_GOOGLE_CALENDARS,
+        ctx,
+      );
+      const calendarSourceResult = sharedCalendarsEnabled
+        ? await listGoogleCalendars(email)
+        : { calendars: [], errors: [] };
+      const calendarSources = calendarSourceResult.calendars;
+      const visibleCalendarSources = calendarSources.filter(
+        (source) =>
+          source.accessRole !== "freeBusyReader" &&
+          (source.primary ||
+            (visualPreferences.googleCalendarVisibility[source.sourceKey] ??
+              source.selected)),
+      );
+
+      if (sharedCalendarsEnabled) {
+        screen.googleCalendars = calendarSources.map((source) => ({
+          sourceKey: source.sourceKey,
+          accountEmail: source.accountEmail,
+          calendarId: source.calendarId,
+          name: source.name,
+          color: source.color,
+          visible:
+            source.primary ||
+            (visualPreferences.googleCalendarVisibility[source.sourceKey] ??
+              source.selected),
+          primary: source.primary,
+          accessRole: source.accessRole,
+          readOnly: source.readOnly || !source.primary,
+        }));
+        if (calendarSourceResult.errors.length > 0) {
+          screen.googleCalendarErrors = calendarSourceResult.errors;
+        }
+      }
+
       const eventResult = await fetchEventsForRange(
         range.from,
         range.to,
         timezone,
+        sharedCalendarsEnabled
+          ? visibleCalendarSources.map((source) => source.sourceKey)
+          : undefined,
       );
       const { events } = eventResult;
 
@@ -112,6 +158,12 @@ export default defineAction({
           end: e.end,
           source: e.source,
           accountEmail: e.accountEmail || undefined,
+          calendarSourceKey: e.calendarSourceKey || undefined,
+          calendarId: e.calendarId || undefined,
+          calendarName: e.calendarName || undefined,
+          calendarAccessRole: e.calendarAccessRole || undefined,
+          calendarPrimary: e.calendarPrimary,
+          calendarReadOnly: e.calendarReadOnly,
           location: e.location || undefined,
           allDay: e.allDay || undefined,
           recurrence: e.recurrence || undefined,

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

@@ -150,7 +150,10 @@ export function EventDetailPanel({
   );
   const { promptGuestNotification, guestNotificationDialog } =
     useGuestNotificationPrompt();
-  const isOverlay = !!event?.overlayEmail;
+  const isOverlay =
+    !!event?.overlayEmail ||
+    event?.calendarPrimary === false ||
+    event?.calendarReadOnly === true;
   const isWorkingLocation = event ? isWorkingLocationEvent(event) : false;
   const isOutOfOffice = event ? isOutOfOfficeEvent(event) : false;
   const isRecurringEvent = !!(
@@ -167,7 +170,13 @@ export function EventDetailPanel({
           entryPoint.entryPointType === "video" &&
           entryPoint.uri.includes("meet.google.com"),
       ));
-  const ownerLabel = event?.ownerName || event?.overlayEmail;
+  const ownerLabel =
+    event?.ownerName ||
+    event?.overlayEmail ||
+    ((event?.calendarPrimary === false || event?.calendarReadOnly) &&
+    event?.calendarName
+      ? `${event.calendarName} · ${event.accountEmail ?? "Google"}`
+      : undefined);
   const eventDetailSlotContext = useMemo(
     () => (event ? buildEventDetailSlotContext(event) : null),
     [event],
@@ -426,7 +435,7 @@ export function EventDetailPanel({
               {/* Content */}
               <div className="flex-1 overflow-y-auto px-4 py-4 space-y-4">
                 {/* Title — click to edit */}
-                {isEditingTitle && !isWorkingLocation ? (
+                {isEditingTitle && !isWorkingLocation && !isOverlay ? (
                   <input
                     ref={titleInputRef}
                     value={editingTitle}
@@ -462,10 +471,12 @@ export function EventDetailPanel({
                   <h2
                     className={cn(
                       "-mx-0.5 rounded px-0.5 text-lg font-semibold leading-tight text-foreground",
-                      !isWorkingLocation && "cursor-text hover:bg-muted/50",
+                      !isWorkingLocation &&
+                        !isOverlay &&
+                        "cursor-text hover:bg-muted/50",
                     )}
                     onClick={() => {
-                      if (isWorkingLocation) return;
+                      if (isWorkingLocation || isOverlay) return;
                       setEditingTitle(getEditableEventTitle(event));
                       setIsEditingTitle(true);
                     }}
@@ -548,20 +559,23 @@ export function EventDetailPanel({
                   </div>
                 ) : null}
 
-                {event.overlayEmail && ownerLabel && (
-                  <div className="flex items-center gap-2.5 text-sm text-muted-foreground">
-                    <span
-                      aria-hidden="true"
-                      className="ml-0.5 size-2 shrink-0 rounded-full ring-1 ring-border"
-                      style={{ backgroundColor: event.ownerColor }}
-                    />
-                    <span>
-                      {t("eventForm.viewingOwnerCalendar", {
-                        owner: ownerLabel,
-                      })}
-                    </span>
-                  </div>
-                )}
+                {(event.overlayEmail ||
+                  event.calendarPrimary === false ||
+                  event.calendarReadOnly) &&
+                  ownerLabel && (
+                    <div className="flex items-center gap-2.5 text-sm text-muted-foreground">
+                      <span
+                        aria-hidden="true"
+                        className="ml-0.5 size-2 shrink-0 rounded-full ring-1 ring-border"
+                        style={{ backgroundColor: event.ownerColor }}
+                      />
+                      <span>
+                        {t("eventForm.viewingOwnerCalendar", {
+                          owner: ownerLabel,
+                        })}
+                      </span>
+                    </div>
+                  )}
 
                 {!isWorkingLocation &&
                   (meetingLink ? (