Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

feat(calendar): add and remove Google Meet on calendar events (#5584)

gbirman0bbef83d8fc4
diff --git a/.sqlx/query-0081a0ece2306a5f6bb5767d7a82020e97f997cf5e0aa5dc7f9f2f46fa87ea66.json b/.sqlx/query-0081a0ece2306a5f6bb5767d7a82020e97f997cf5e0aa5dc7f9f2f46fa87ea66.json
deleted file mode 100644
index 400aec0e21..0000000000
--- a/.sqlx/query-0081a0ece2306a5f6bb5767d7a82020e97f997cf5e0aa5dc7f9f2f46fa87ea66.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n INSERT INTO calendar_events (\n id, owner_id, source_link_id, ical_uid, title, description, location,\n status, visibility, transparency,\n starts_at, ends_at, start_date, end_date, time_zone,\n recurrence_lines, organizer_email, organizer_name,\n conference_url, sequence, is_read_only, canonical_source_kind,\n canonical_source_updated_at,\n reminders_use_default, reminder_overrides,\n created_at, updated_at\n )\n VALUES (\n $1, $2, $3, $4, $5, $6, $7,\n $8, $9, $10,\n $11, $12, $13, $14, $15,\n $16, $17, $18,\n $19, $20, $21, $22, $24,\n $25, $26,\n $23, $24\n )\n ON CONFLICT (owner_id, source_link_id, ical_uid) DO UPDATE SET\n title = EXCLUDED.title,\n description = EXCLUDED.description,\n location = EXCLUDED.location,\n status = EXCLUDED.status,\n visibility = EXCLUDED.visibility,\n transparency = EXCLUDED.transparency,\n starts_at = EXCLUDED.starts_at,\n ends_at = EXCLUDED.ends_at,\n start_date = EXCLUDED.start_date,\n end_date = EXCLUDED.end_date,\n time_zone = EXCLUDED.time_zone,\n recurrence_lines = EXCLUDED.recurrence_lines,\n organizer_email = EXCLUDED.organizer_email,\n organizer_name = EXCLUDED.organizer_name,\n conference_url = EXCLUDED.conference_url,\n sequence = EXCLUDED.sequence,\n is_read_only = EXCLUDED.is_read_only,\n canonical_source_kind = EXCLUDED.canonical_source_kind,\n canonical_source_updated_at = EXCLUDED.canonical_source_updated_at,\n reminders_use_default = EXCLUDED.reminders_use_default,\n reminder_overrides = EXCLUDED.reminder_overrides,\n updated_at = GREATEST(calendar_events.updated_at, EXCLUDED.updated_at)\n WHERE\n EXCLUDED.sequence > calendar_events.sequence\n OR (\n EXCLUDED.sequence = calendar_events.sequence\n AND EXCLUDED.canonical_source_updated_at\n >= calendar_events.canonical_source_updated_at\n )\n RETURNING id\n ",
- "describe": {
- "columns": [
- {
- "ordinal": 0,
- "name": "id",
- "type_info": "Uuid"
- }
- ],
- "parameters": {
- "Left": [
- "Uuid",
- "Text",
- "Uuid",
- "Text",
- "Text",
- "Text",
- "Text",
- "Text",
- "Text",
- "Text",
- "Timestamptz",
- "Timestamptz",
- "Date",
- "Date",
- "Text",
- "TextArray",
- "Text",
- "Text",
- "Text",
- "Int4",
- "Bool",
- "Text",
- "Timestamptz",
- "Timestamptz",
- "Bool",
- "Jsonb"
- ]
- },
- "nullable": [
- false
- ]
- },
- "hash": "0081a0ece2306a5f6bb5767d7a82020e97f997cf5e0aa5dc7f9f2f46fa87ea66"
-}
diff --git a/.sqlx/query-a14c8b03bf5ef50a0edf9ab22e2d244ac6aeb7e5b87551e340c820d1db70ea5c.json b/.sqlx/query-171fc2fe17cc55e036915fe8c0a2abe554f5e39f6eab2c75226ec9d6f96eec91.json
similarity index 63%
rename from .sqlx/query-a14c8b03bf5ef50a0edf9ab22e2d244ac6aeb7e5b87551e340c820d1db70ea5c.json
rename to .sqlx/query-171fc2fe17cc55e036915fe8c0a2abe554f5e39f6eab2c75226ec9d6f96eec91.json
index fc88742093..a4e17c1ef5 100644
--- a/.sqlx/query-a14c8b03bf5ef50a0edf9ab22e2d244ac6aeb7e5b87551e340c820d1db70ea5c.json
+++ b/.sqlx/query-171fc2fe17cc55e036915fe8c0a2abe554f5e39f6eab2c75226ec9d6f96eec91.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n SELECT\n occurrence.event_id,\n canonical_source.calendar_id AS \"canonical_calendar_id?\",\n occurrence.occurrence_key,\n occurrence.recurrence_id,\n occurrence.starts_at AS occurrence_starts_at,\n occurrence.ends_at AS occurrence_ends_at,\n occurrence.start_date AS occurrence_start_date,\n occurrence.end_date AS occurrence_end_date,\n occurrence.is_cancelled,\n event.owner_id,\n event.ical_uid,\n event.title,\n event.description,\n event.location,\n event.status,\n event.visibility,\n event.transparency,\n event.starts_at,\n event.ends_at,\n event.start_date,\n event.end_date,\n event.time_zone,\n event.recurrence_lines,\n event.organizer_email,\n event.organizer_name,\n event.conference_url,\n event.sequence,\n event.is_read_only,\n event.reminders_use_default,\n event.reminder_overrides,\n event.created_at,\n event.updated_at\n FROM calendar_event_occurrences occurrence\n JOIN calendar_events event ON event.id = occurrence.event_id\n LEFT JOIN LATERAL (\n SELECT source.calendar_id\n FROM calendar_event_sources source\n JOIN calendars calendar ON calendar.id = source.calendar_id\n JOIN calendar_accounts account ON account.id = source.account_id\n WHERE source.event_id = event.id\n AND NOT calendar.is_deleted\n AND account.sync_status <> 'disabled'\n ORDER BY\n source.source_sequence DESC,\n source.source_updated_at DESC,\n source.last_seen_at DESC,\n source.id DESC\n LIMIT 1\n ) canonical_source ON true\n WHERE occurrence.owner_id IN (\n SELECT $1::text\n UNION\n SELECT link.child_macro_id\n FROM macro_user_links link\n WHERE link.primary_macro_id = $1\n )\n AND event.status <> 'cancelled'\n AND NOT occurrence.is_cancelled\n AND (\n event.owner_id = $1\n OR EXISTS (\n SELECT 1\n FROM macro_user_links link\n WHERE link.link_id = event.source_link_id\n AND link.primary_macro_id = $1\n )\n )\n AND (\n occurrence.timed_span && tstzrange($2, $3, '[)')\n OR occurrence.day_span && daterange($4, $5, '[)')\n )\n AND (\n $6::timestamptz IS NULL\n OR (\n COALESCE(\n occurrence.starts_at,\n occurrence.start_date::timestamp AT TIME ZONE 'UTC'\n ),\n occurrence.event_id,\n occurrence.occurrence_key\n ) > ($6, $7, $8)\n )\n ORDER BY\n COALESCE(occurrence.starts_at, occurrence.start_date::timestamp AT TIME ZONE 'UTC'),\n occurrence.event_id,\n occurrence.occurrence_key\n LIMIT $9\n ",
+ "query": "\n SELECT\n occurrence.event_id,\n canonical_source.calendar_id AS \"canonical_calendar_id?\",\n occurrence.occurrence_key,\n occurrence.recurrence_id,\n occurrence.starts_at AS occurrence_starts_at,\n occurrence.ends_at AS occurrence_ends_at,\n occurrence.start_date AS occurrence_start_date,\n occurrence.end_date AS occurrence_end_date,\n occurrence.is_cancelled,\n event.owner_id,\n event.ical_uid,\n event.title,\n event.description,\n event.location,\n event.status,\n event.visibility,\n event.transparency,\n event.starts_at,\n event.ends_at,\n event.start_date,\n event.end_date,\n event.time_zone,\n event.recurrence_lines,\n event.organizer_email,\n event.organizer_name,\n event.conference_url,\n event.conference_provider,\n event.sequence,\n event.is_read_only,\n event.reminders_use_default,\n event.reminder_overrides,\n event.created_at,\n event.updated_at\n FROM calendar_event_occurrences occurrence\n JOIN calendar_events event ON event.id = occurrence.event_id\n LEFT JOIN LATERAL (\n SELECT source.calendar_id\n FROM calendar_event_sources source\n JOIN calendars calendar ON calendar.id = source.calendar_id\n JOIN calendar_accounts account ON account.id = source.account_id\n WHERE source.event_id = event.id\n AND NOT calendar.is_deleted\n AND account.sync_status <> 'disabled'\n ORDER BY\n source.source_sequence DESC,\n source.source_updated_at DESC,\n source.last_seen_at DESC,\n source.id DESC\n LIMIT 1\n ) canonical_source ON true\n WHERE occurrence.owner_id IN (\n SELECT $1::text\n UNION\n SELECT link.child_macro_id\n FROM macro_user_links link\n WHERE link.primary_macro_id = $1\n )\n AND event.status <> 'cancelled'\n AND NOT occurrence.is_cancelled\n AND (\n event.owner_id = $1\n OR EXISTS (\n SELECT 1\n FROM macro_user_links link\n WHERE link.link_id = event.source_link_id\n AND link.primary_macro_id = $1\n )\n )\n AND (\n occurrence.timed_span && tstzrange($2, $3, '[)')\n OR occurrence.day_span && daterange($4, $5, '[)')\n )\n AND (\n $6::timestamptz IS NULL\n OR (\n COALESCE(\n occurrence.starts_at,\n occurrence.start_date::timestamp AT TIME ZONE 'UTC'\n ),\n occurrence.event_id,\n occurrence.occurrence_key\n ) > ($6, $7, $8)\n )\n ORDER BY\n COALESCE(occurrence.starts_at, occurrence.start_date::timestamp AT TIME ZONE 'UTC'),\n occurrence.event_id,\n occurrence.occurrence_key\n LIMIT $9\n ",
"describe": {
"columns": [
{
@@ -135,31 +135,36 @@
},
{
"ordinal": 26,
+ "name": "conference_provider",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 27,
"name": "sequence",
"type_info": "Int4"
},
{
- "ordinal": 27,
+ "ordinal": 28,
"name": "is_read_only",
"type_info": "Bool"
},
{
- "ordinal": 28,
+ "ordinal": 29,
"name": "reminders_use_default",
"type_info": "Bool"
},
{
- "ordinal": 29,
+ "ordinal": 30,
"name": "reminder_overrides",
"type_info": "Jsonb"
},
{
- "ordinal": 30,
+ "ordinal": 31,
"name": "created_at",
"type_info": "Timestamptz"
},
{
- "ordinal": 31,
+ "ordinal": 32,
"name": "updated_at",
"type_info": "Timestamptz"
}
@@ -204,6 +209,7 @@
true,
true,
true,
+ true,
false,
false,
false,
@@ -212,5 +218,5 @@
false
]
},
- "hash": "a14c8b03bf5ef50a0edf9ab22e2d244ac6aeb7e5b87551e340c820d1db70ea5c"
+ "hash": "171fc2fe17cc55e036915fe8c0a2abe554f5e39f6eab2c75226ec9d6f96eec91"
}
diff --git a/.sqlx/query-7560f5929cf5e8b1cd8b7afd4cad52a6c1fd612db386416870c4b6bca7f97421.json b/.sqlx/query-7560f5929cf5e8b1cd8b7afd4cad52a6c1fd612db386416870c4b6bca7f97421.json
new file mode 100644
index 0000000000..242f4f5c93
--- /dev/null
+++ b/.sqlx/query-7560f5929cf5e8b1cd8b7afd4cad52a6c1fd612db386416870c4b6bca7f97421.json
@@ -0,0 +1,48 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n INSERT INTO calendar_events (\n id, owner_id, source_link_id, ical_uid, title, description, location,\n status, visibility, transparency,\n starts_at, ends_at, start_date, end_date, time_zone,\n recurrence_lines, organizer_email, organizer_name,\n conference_url, conference_provider, sequence, is_read_only,\n canonical_source_kind,\n canonical_source_updated_at,\n reminders_use_default, reminder_overrides,\n created_at, updated_at\n )\n VALUES (\n $1, $2, $3, $4, $5, $6, $7,\n $8, $9, $10,\n $11, $12, $13, $14, $15,\n $16, $17, $18,\n $19, $27, $20, $21, $22, $24,\n $25, $26,\n $23, $24\n )\n ON CONFLICT (owner_id, source_link_id, ical_uid) DO UPDATE SET\n title = EXCLUDED.title,\n description = EXCLUDED.description,\n location = EXCLUDED.location,\n status = EXCLUDED.status,\n visibility = EXCLUDED.visibility,\n transparency = EXCLUDED.transparency,\n starts_at = EXCLUDED.starts_at,\n ends_at = EXCLUDED.ends_at,\n start_date = EXCLUDED.start_date,\n end_date = EXCLUDED.end_date,\n time_zone = EXCLUDED.time_zone,\n recurrence_lines = EXCLUDED.recurrence_lines,\n organizer_email = EXCLUDED.organizer_email,\n organizer_name = EXCLUDED.organizer_name,\n conference_url = EXCLUDED.conference_url,\n conference_provider = EXCLUDED.conference_provider,\n sequence = EXCLUDED.sequence,\n is_read_only = EXCLUDED.is_read_only,\n canonical_source_kind = EXCLUDED.canonical_source_kind,\n canonical_source_updated_at = EXCLUDED.canonical_source_updated_at,\n reminders_use_default = EXCLUDED.reminders_use_default,\n reminder_overrides = EXCLUDED.reminder_overrides,\n updated_at = GREATEST(calendar_events.updated_at, EXCLUDED.updated_at)\n WHERE\n EXCLUDED.sequence > calendar_events.sequence\n OR (\n EXCLUDED.sequence = calendar_events.sequence\n AND EXCLUDED.canonical_source_updated_at\n >= calendar_events.canonical_source_updated_at\n )\n RETURNING id\n ",
+ "describe": {
+ "columns": [
+ {
+ "ordinal": 0,
+ "name": "id",
+ "type_info": "Uuid"
+ }
+ ],
+ "parameters": {
+ "Left": [
+ "Uuid",
+ "Text",
+ "Uuid",
+ "Text",
+ "Text",
+ "Text",
+ "Text",
+ "Text",
+ "Text",
+ "Text",
+ "Timestamptz",
+ "Timestamptz",
+ "Date",
+ "Date",
+ "Text",
+ "TextArray",
+ "Text",
+ "Text",
+ "Text",
+ "Int4",
+ "Bool",
+ "Text",
+ "Timestamptz",
+ "Timestamptz",
+ "Bool",
+ "Jsonb",
+ "Text"
+ ]
+ },
+ "nullable": [
+ false
+ ]
+ },
+ "hash": "7560f5929cf5e8b1cd8b7afd4cad52a6c1fd612db386416870c4b6bca7f97421"
+}
diff --git a/.sqlx/query-9f05f1c3121593e1756c28fb09d0f01832fe047fbf60cf119f74389f51417b3e.json b/.sqlx/query-d128007b3e2cc1c2b89192f2cae967d43a6eb09fb2869d72e6183c88ff9e6bb8.json
similarity index 67%
rename from .sqlx/query-9f05f1c3121593e1756c28fb09d0f01832fe047fbf60cf119f74389f51417b3e.json
rename to .sqlx/query-d128007b3e2cc1c2b89192f2cae967d43a6eb09fb2869d72e6183c88ff9e6bb8.json
index 6f47b45b9d..5b8c906af4 100644
--- a/.sqlx/query-9f05f1c3121593e1756c28fb09d0f01832fe047fbf60cf119f74389f51417b3e.json
+++ b/.sqlx/query-d128007b3e2cc1c2b89192f2cae967d43a6eb09fb2869d72e6183c88ff9e6bb8.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n UPDATE calendar_events\n SET title = $2,\n description = $3,\n location = $4,\n status = $5,\n visibility = $6,\n transparency = $7,\n starts_at = $8,\n ends_at = $9,\n start_date = $10,\n end_date = $11,\n time_zone = $12,\n recurrence_lines = $13,\n organizer_email = $14,\n organizer_name = $15,\n conference_url = $16,\n sequence = $17,\n is_read_only = $18,\n canonical_source_kind = $19,\n canonical_source_updated_at = $20,\n reminders_use_default = $23,\n reminder_overrides = $24,\n created_at = $21,\n updated_at = GREATEST(calendar_events.updated_at, $22)\n WHERE id = $1\n ",
+ "query": "\n UPDATE calendar_events\n SET title = $2,\n description = $3,\n location = $4,\n status = $5,\n visibility = $6,\n transparency = $7,\n starts_at = $8,\n ends_at = $9,\n start_date = $10,\n end_date = $11,\n time_zone = $12,\n recurrence_lines = $13,\n organizer_email = $14,\n organizer_name = $15,\n conference_url = $16,\n conference_provider = $25,\n sequence = $17,\n is_read_only = $18,\n canonical_source_kind = $19,\n canonical_source_updated_at = $20,\n reminders_use_default = $23,\n reminder_overrides = $24,\n created_at = $21,\n updated_at = GREATEST(calendar_events.updated_at, $22)\n WHERE id = $1\n ",
"describe": {
"columns": [],
"parameters": {
@@ -28,10 +28,11 @@
"Timestamptz",
"Timestamptz",
"Bool",
- "Jsonb"
+ "Jsonb",
+ "Text"
]
},
"nullable": []
},
- "hash": "9f05f1c3121593e1756c28fb09d0f01832fe047fbf60cf119f74389f51417b3e"
+ "hash": "d128007b3e2cc1c2b89192f2cae967d43a6eb09fb2869d72e6183c88ff9e6bb8"
}
diff --git a/apps/web/src/features/calendar/events/EventDetails.tsx b/apps/web/src/features/calendar/events/EventDetails.tsx
index cf86b24fdf..df8bca4bac 100644
--- a/apps/web/src/features/calendar/events/EventDetails.tsx
+++ b/apps/web/src/features/calendar/events/EventDetails.tsx
@@ -417,6 +417,10 @@ export function EventDetails(props: {
const conferenceUrl = createMemo(() =>
safeConferenceUrl(props.event.conferenceUrl)
);
+ const conferenceLabel = () =>
+ props.event.conferenceProvider === 'google_meet'
+ ? 'Join Google Meet'
+ : 'Join meeting';
const organizer = createMemo(() => findOrganizer(props.event));
const originalTimeZone = createMemo(() =>
formatOriginalTimeZone(props.event, props.timeFormat)
@@ -472,10 +476,10 @@ export function EventDetails(props: {
variant="cta"
size="sm"
class="h-8 rounded-lg"
- label="Join meeting"
+ label={conferenceLabel()}
onClick={() => openExternalUrl(url())}
>
- Join meeting
+ {conferenceLabel()}
<ArrowSquareOutIcon class="size-3.5" />
</Button>
</div>
diff --git a/apps/web/src/features/calendar/events/EventEditorDialog.tsx b/apps/web/src/features/calendar/events/EventEditorDialog.tsx
index 48c1a4cc0a..ca0e487c9d 100644
--- a/apps/web/src/features/calendar/events/EventEditorDialog.tsx
+++ b/apps/web/src/features/calendar/events/EventEditorDialog.tsx
@@ -1,6 +1,7 @@
import { toast } from '@core/component/Toast/Toast';
import BellSimpleIcon from '@phosphor/bell-simple.svg';
import SpinnerIcon from '@phosphor/spinner.svg';
+import VideoCameraIcon from '@phosphor/video-camera.svg';
import XIcon from '@phosphor/x.svg';
import { useVisibleCalendarsQuery } from '@queries/calendar/calendars';
import {
@@ -68,6 +69,33 @@ interface EditorState {
location: string;
description: string;
guests: string;
+ /** What conferencing the saved event should carry. */
+ conference: ConferenceChoice;
+}
+
+/**
+ * `existing` keeps a conference Macro did not create — a Zoom-style `addOn`
+ * conference or a legacy Hangout. Macro can detach or replace it on request,
+ * but cannot put one back, so leaving the editor without touching it must
+ * submit no conference change at all.
+ */
+type ConferenceChoice = 'none' | 'google_meet' | 'existing';
+
+function initialConference(event: CalendarEvent | undefined): ConferenceChoice {
+ if (!event?.conferenceUrl) return 'none';
+ return event.conferenceProvider === 'google_meet'
+ ? 'google_meet'
+ : 'existing';
+}
+
+/** Label for a conference Macro did not create, taken from its join URL. */
+function foreignConferenceLabel(url: string | undefined) {
+ if (!url) return 'Video conferencing';
+ try {
+ return new URL(url).hostname.replace(/^www\./, '');
+ } catch {
+ return 'Video conferencing';
+ }
}
function initialEditorState(event: CalendarEvent | undefined): EditorState {
@@ -81,6 +109,7 @@ function initialEditorState(event: CalendarEvent | undefined): EditorState {
location: '',
description: '',
guests: '',
+ conference: 'none',
};
}
if (event.allDay) {
@@ -98,6 +127,7 @@ function initialEditorState(event: CalendarEvent | undefined): EditorState {
location: event.location ?? '',
description: event.description ?? '',
guests: '',
+ conference: initialConference(event),
};
}
return {
@@ -108,6 +138,7 @@ function initialEditorState(event: CalendarEvent | undefined): EditorState {
location: event.location ?? '',
description: event.description ?? '',
guests: '',
+ conference: initialConference(event),
};
}
@@ -349,6 +380,12 @@ export function EventEditorDialog(props: {
if (event) {
const recurrenceChanged =
lines !== undefined && lines.join('\n') !== initialLines.join('\n');
+ // Omitting `conference` leaves the provider's conference untouched, so
+ // an unrelated edit never regenerates or drops a working join link.
+ // `existing` is therefore never submitted: it means "left alone".
+ const conferenceChanged =
+ current.conference !== 'existing' &&
+ current.conference !== initialConference(event);
update.mutate({
eventId: event.eventId,
patch: {
@@ -358,6 +395,12 @@ export function EventEditorDialog(props: {
description: current.description,
...(recurrenceChanged ? { recurrenceLines: lines } : {}),
...(reminders ? { reminders } : {}),
+ ...(conferenceChanged
+ ? {
+ conference:
+ current.conference === 'google_meet' ? 'google_meet' : 'none',
+ }
+ : {}),
},
});
return;
@@ -371,6 +414,9 @@ export function EventEditorDialog(props: {
description: current.description === '' ? undefined : current.description,
attendees: parseGuestEmails(current.guests).map((email) => ({ email })),
reminders,
+ ...(current.conference === 'google_meet'
+ ? { conference: 'google_meet' as const }
+ : {}),
});
};
@@ -649,6 +695,46 @@ export function EventEditorDialog(props: {
</Show>
</div>
</Show>
+ <div class="flex flex-col gap-2">
+ <Show when={state().conference !== 'none'}>
+ <div class="flex items-center gap-2 rounded-lg bg-surface px-2 py-1.5 text-xs text-ink">
+ <VideoCameraIcon class="size-4 shrink-0 text-ink-extra-muted" />
+ <span class="flex-1 truncate">
+ {state().conference === 'google_meet'
+ ? 'Google Meet'
+ : foreignConferenceLabel(props.event?.conferenceUrl)}
+ </span>
+ <Button
+ variant="ghost"
+ size="icon-sm"
+ label="Remove conferencing"
+ onClick={() => setState({ ...state(), conference: 'none' })}
+ >
+ <XIcon />
+ </Button>
+ </div>
+ </Show>
+ <Show when={state().conference !== 'google_meet'}>
+ <Button
+ variant="base"
+ size="sm"
+ class="w-full justify-center rounded-lg"
+ label="Add Google Meet video conferencing"
+ onClick={() =>
+ setState({ ...state(), conference: 'google_meet' })
+ }
+ >
+ <VideoCameraIcon class="size-4 shrink-0" />
+ <span>Add Google Meet</span>
+ </Button>
+ </Show>
+ <Show when={state().conference === 'existing'}>
+ <span class="text-xs text-ink-extra-muted">
+ Adding Google Meet replaces the current conferencing, which
+ Macro cannot put back.
+ </span>
+ </Show>
+ </div>
<input
type="text"
value={state().location}
diff --git a/apps/web/src/features/calendar/events/calendar-occurrence-mapper.test.ts b/apps/web/src/features/calendar/events/calendar-occurrence-mapper.test.ts
index dfec2e0ad6..23f3f3e1bb 100644
--- a/apps/web/src/features/calendar/events/calendar-occurrence-mapper.test.ts
+++ b/apps/web/src/features/calendar/events/calendar-occurrence-mapper.test.ts
@@ -13,6 +13,7 @@ const item = (time: CalendarOccurrenceItem['occurrence']['time']) =>
location: null,
description: 'Weekly planning',
conferenceUrl: 'https://meet.example.com/planning',
+ conferenceProvider: 'google_meet',
organizerName: 'Alex Rivera',
organizerEmail: '[email protected]',
attendees: [
@@ -57,6 +58,7 @@ describe('mapCalendarOccurrence', () => {
isCancelled: true,
isReadOnly: true,
conferenceUrl: 'https://meet.example.com/planning',
+ conferenceProvider: 'google_meet',
organizerName: 'Alex Rivera',
organizerEmail: '[email protected]',
recurrenceLines: ['RRULE:FREQ=WEEKLY'],
diff --git a/apps/web/src/features/calendar/events/calendar-occurrence-mapper.ts b/apps/web/src/features/calendar/events/calendar-occurrence-mapper.ts
index f0cc77a4fd..8c02139765 100644
--- a/apps/web/src/features/calendar/events/calendar-occurrence-mapper.ts
+++ b/apps/web/src/features/calendar/events/calendar-occurrence-mapper.ts
@@ -1,5 +1,9 @@
import type { CalendarOccurrenceItem } from '@service-storage/generated/schemas/calendarOccurrenceItem';
-import type { CalendarEvent, CalendarSource } from './types';
+import type {
+ CalendarEvent,
+ CalendarSource,
+ ConferenceProvider,
+} from './types';
/** Shared presentation source until calendar/account metadata is exposed. */
export const DEFAULT_CALENDAR_SOURCE: CalendarSource = {
@@ -30,6 +34,9 @@ export function mapCalendarOccurrence(
isCancelled: occurrence.isCancelled,
isReadOnly: event.isReadOnly,
conferenceUrl: event.conferenceUrl ?? undefined,
+ conferenceProvider:
+ (event.conferenceProvider as ConferenceProvider | null | undefined) ??
+ undefined,
organizerName: event.organizerName ?? undefined,
organizerEmail: event.organizerEmail ?? undefined,
attendees: event.attendees ?? [],
diff --git a/apps/web/src/features/calendar/events/types.ts b/apps/web/src/features/calendar/events/types.ts
index a04b5bba17..94b1c845f9 100644
--- a/apps/web/src/features/calendar/events/types.ts
+++ b/apps/web/src/features/calendar/events/types.ts
@@ -7,6 +7,9 @@ export type CalendarPeriodView =
| 'timeGridWeek'
| 'timeGridDay';
+/** The conferencing system backing an event's join URL. */
+export type ConferenceProvider = 'google_meet' | 'other';
+
/** Supported first day of the calendar week. */
export type CalendarWeekStart = 0 | 1;
@@ -39,6 +42,12 @@ export interface CalendarEvent {
isReadOnly: boolean;
/** Direct conference join URL, when available. */
conferenceUrl?: string;
+ /**
+ * Which conferencing system backs `conferenceUrl`. Only `google_meet` is
+ * one Macro can attach and detach; anything else is shown for joining but
+ * never rewritten.
+ */
+ conferenceProvider?: ConferenceProvider;
/** Event organizer display name. */
organizerName?: string;
/** Event organizer email address. */
diff --git a/apps/web/src/lib/service-clients/service-cognition/generated/tools/schemas.ts b/apps/web/src/lib/service-clients/service-cognition/generated/tools/schemas.ts
index 9bc6a670b4..84cdff09a5 100644
--- a/apps/web/src/lib/service-clients/service-cognition/generated/tools/schemas.ts
+++ b/apps/web/src/lib/service-clients/service-cognition/generated/tools/schemas.ts
@@ -1309,6 +1309,7 @@ export const ListEntitiesResponse = z.object({
z.any().superRefine((x, ctx) => {
const schemas = [
z.object({
+ conferenceProvider: z.union([z.string(), z.null()]).optional(),
conferenceUrl: z.union([z.string(), z.null()]).optional(),
id: z.string().uuid(),
location: z.union([z.string(), z.null()]).optional(),
diff --git a/apps/web/src/lib/service-clients/service-cognition/generated/tools/types.ts b/apps/web/src/lib/service-clients/service-cognition/generated/tools/types.ts
index f8961b88e3..be480b2523 100644
--- a/apps/web/src/lib/service-clients/service-cognition/generated/tools/types.ts
+++ b/apps/web/src/lib/service-clients/service-cognition/generated/tools/types.ts
@@ -185,6 +185,10 @@ export type EmailPreset = 'signal';
*/
export type EntityItem =
| {
+ /**
+ * Which conferencing system backs the join URL.
+ */
+ conferenceProvider?: string | null;
/**
* Optional conference join URL.
*/
diff --git a/apps/web/src/lib/service-clients/service-email/generated/schemas/calendarEvent.ts b/apps/web/src/lib/service-clients/service-email/generated/schemas/calendarEvent.ts
index 7953e16c69..1bd11a9634 100644
--- a/apps/web/src/lib/service-clients/service-email/generated/schemas/calendarEvent.ts
+++ b/apps/web/src/lib/service-clients/service-email/generated/schemas/calendarEvent.ts
@@ -6,6 +6,7 @@
*/
import type { CalendarAttendee } from './calendarAttendee';
import type { CalendarEventCalendarId } from './calendarEventCalendarId';
+import type { CalendarEventConferenceProvider } from './calendarEventConferenceProvider';
import type { CalendarEventConferenceUrl } from './calendarEventConferenceUrl';
import type { CalendarEventDescription } from './calendarEventDescription';
import type { CalendarEventLocation } from './calendarEventLocation';
@@ -26,6 +27,7 @@ export interface CalendarEvent {
/** Calendar the canonical source belongs to, when known. Absent only in
projections stored before calendars were attributed. */
calendarId?: CalendarEventCalendarId;
+ conferenceProvider?: CalendarEventConferenceProvider;
/** Direct join URL when known. */
conferenceUrl?: CalendarEventConferenceUrl;
/** Entity creation time. */
diff --git a/apps/web/src/lib/service-clients/service-email/generated/schemas/calendarEventConferenceProvider.ts b/apps/web/src/lib/service-clients/service-email/generated/schemas/calendarEventConferenceProvider.ts
new file mode 100644
index 0000000000..5219be68ee
--- /dev/null
+++ b/apps/web/src/lib/service-clients/service-email/generated/schemas/calendarEventConferenceProvider.ts
@@ -0,0 +1,9 @@
+/**
+ * Generated by orval v7.21.0 🍺
+ * Do not edit manually.
+ * email_service
+ * OpenAPI spec version: 0.1.0
+ */
+import type { ConferenceProvider } from './conferenceProvider';
+
+export type CalendarEventConferenceProvider = null | ConferenceProvider;
diff --git a/apps/web/src/lib/service-clients/service-email/generated/schemas/conferenceChange.ts b/apps/web/src/lib/service-clients/service-email/generated/schemas/conferenceChange.ts
new file mode 100644
index 0000000000..76b4911f14
--- /dev/null
+++ b/apps/web/src/lib/service-clients/service-email/generated/schemas/conferenceChange.ts
@@ -0,0 +1,19 @@
+/**
+ * Generated by orval v7.21.0 🍺
+ * Do not edit manually.
+ * email_service
+ * OpenAPI spec version: 0.1.0
+ */
+
+/**
+ * A requested change to an event's conferencing. Omitting the field leaves
+the existing conference untouched; only these values change it.
+ */
+export type ConferenceChange =
+ (typeof ConferenceChange)[keyof typeof ConferenceChange];
+
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export const ConferenceChange = {
+ google_meet: 'google_meet',
+ none: 'none',
+} as const;
diff --git a/apps/web/src/lib/service-clients/service-email/generated/schemas/conferenceProvider.ts b/apps/web/src/lib/service-clients/service-email/generated/schemas/conferenceProvider.ts
new file mode 100644
index 0000000000..57a9d3069b
--- /dev/null
+++ b/apps/web/src/lib/service-clients/service-email/generated/schemas/conferenceProvider.ts
@@ -0,0 +1,29 @@
+/**
+ * Generated by orval v7.21.0 🍺
+ * Do not edit manually.
+ * email_service
+ * OpenAPI spec version: 0.1.0
+ */
+
+/**
+ * The conferencing system backing an event's join URL.
+
+Macro generates only Google Meet conferences, so this distinguishes one it
+created from a third party's — Zoom and friends arriving as `addOn`
+conference data, or a legacy classic Hangout. Clients use it to label the
+conference and to tell whether the Meet toggle reflects a Macro-managed
+conference.
+
+It does not gate mutation. An explicit request replaces or detaches any
+conference, third-party included, exactly as deleting the event would;
+what protects a conference is that omitting the field leaves it untouched,
+so an unrelated edit never disturbs it.
+ */
+export type ConferenceProvider =
+ (typeof ConferenceProvider)[keyof typeof ConferenceProvider];
+
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export const ConferenceProvider = {
+ google_meet: 'google_meet',
+ other: 'other',
+} as const;
diff --git a/apps/web/src/lib/service-clients/service-email/generated/schemas/createCalendarEventRequest.ts b/apps/web/src/lib/service-clients/service-email/generated/schemas/createCalendarEventRequest.ts
index cde6051584..0ab2bf5ba6 100644
--- a/apps/web/src/lib/service-clients/service-email/generated/schemas/createCalendarEventRequest.ts
+++ b/apps/web/src/lib/service-clients/service-email/generated/schemas/createCalendarEventRequest.ts
@@ -6,6 +6,7 @@
*/
import type { CalendarAttendeeInputBody } from './calendarAttendeeInputBody';
import type { CreateCalendarEventRequestCalendarId } from './createCalendarEventRequestCalendarId';
+import type { CreateCalendarEventRequestConference } from './createCalendarEventRequestConference';
import type { CreateCalendarEventRequestDescription } from './createCalendarEventRequestDescription';
import type { CreateCalendarEventRequestEmailLinkId } from './createCalendarEventRequestEmailLinkId';
import type { CreateCalendarEventRequestLocation } from './createCalendarEventRequestLocation';
@@ -23,6 +24,7 @@ export interface CreateCalendarEventRequest {
/** Exact calendar to create the event on; takes precedence over the
inbox default. */
calendarId?: CreateCalendarEventRequestCalendarId;
+ conference?: CreateCalendarEventRequestConference;
/** Optional event body. */
description?: CreateCalendarEventRequestDescription;
/** Connected inbox whose primary calendar receives the event; defaults
diff --git a/apps/web/src/lib/service-clients/service-email/generated/schemas/createCalendarEventRequestConference.ts b/apps/web/src/lib/service-clients/service-email/generated/schemas/createCalendarEventRequestConference.ts
new file mode 100644
index 0000000000..6a10a13afc
--- /dev/null
+++ b/apps/web/src/lib/service-clients/service-email/generated/schemas/createCalendarEventRequestConference.ts
@@ -0,0 +1,9 @@
+/**
+ * Generated by orval v7.21.0 🍺
+ * Do not edit manually.
+ * email_service
+ * OpenAPI spec version: 0.1.0
+ */
+import type { ConferenceChange } from './conferenceChange';
+
+export type CreateCalendarEventRequestConference = null | ConferenceChange;
diff --git a/apps/web/src/lib/service-clients/service-email/generated/schemas/index.ts b/apps/web/src/lib/service-clients/service-email/generated/schemas/index.ts
index 369009c7f7..3961f847dd 100644
--- a/apps/web/src/lib/service-clients/service-email/generated/schemas/index.ts
+++ b/apps/web/src/lib/service-clients/service-email/generated/schemas/index.ts
@@ -150,6 +150,7 @@ export * from './calendarAttendeeInputBody';
export * from './calendarDeletionScopeParam';
export * from './calendarEvent';
export * from './calendarEventCalendarId';
+export * from './calendarEventConferenceProvider';
export * from './calendarEventConferenceUrl';
export * from './calendarEventDescription';
export * from './calendarEventLocation';
@@ -159,6 +160,8 @@ export * from './calendarMutationApiError';
export * from './calendarMutationErrorCode';
export * from './calendarRsvpScopeParam';
export * from './cancelBackfillParams';
+export * from './conferenceChange';
+export * from './conferenceProvider';
export * from './contact';
export * from './contactEmailAddress';
export * from './contactInfo';
@@ -174,6 +177,7 @@ export * from './contactOriginalPhotoUrl';
export * from './contactSfsPhotoUrl';
export * from './createCalendarEventRequest';
export * from './createCalendarEventRequestCalendarId';
+export * from './createCalendarEventRequestConference';
export * from './createCalendarEventRequestDescription';
export * from './createCalendarEventRequestEmailLinkId';
export * from './createCalendarEventRequestLocation';
@@ -311,6 +315,7 @@ export * from './unblockSenderRequest';
export * from './unresolvedSignatureImagesError';
export * from './updateCalendarEventRequest';
export * from './updateCalendarEventRequestAttendees';
+export * from './updateCalendarEventRequestConference';
export * from './updateCalendarEventRequestDescription';
export * from './updateCalendarEventRequestLocation';
export * from './updateCalendarEventRequestRecurrenceLines';
diff --git a/apps/web/src/lib/service-clients/service-email/generated/schemas/updateCalendarEventRequest.ts b/apps/web/src/lib/service-clients/service-email/generated/schemas/updateCalendarEventRequest.ts
index b1336a3549..630f9d862d 100644
--- a/apps/web/src/lib/service-clients/service-email/generated/schemas/updateCalendarEventRequest.ts
+++ b/apps/web/src/lib/service-clients/service-email/generated/schemas/updateCalendarEventRequest.ts
@@ -5,6 +5,7 @@
* OpenAPI spec version: 0.1.0
*/
import type { UpdateCalendarEventRequestAttendees } from './updateCalendarEventRequestAttendees';
+import type { UpdateCalendarEventRequestConference } from './updateCalendarEventRequestConference';
import type { UpdateCalendarEventRequestDescription } from './updateCalendarEventRequestDescription';
import type { UpdateCalendarEventRequestLocation } from './updateCalendarEventRequestLocation';
import type { UpdateCalendarEventRequestRecurrenceLines } from './updateCalendarEventRequestRecurrenceLines';
@@ -20,6 +21,7 @@ import type { UpdateCalendarEventRequestVisibility } from './updateCalendarEvent
export interface UpdateCalendarEventRequest {
/** Replacement attendee list. */
attendees?: UpdateCalendarEventRequestAttendees;
+ conference?: UpdateCalendarEventRequestConference;
/** Replacement description; an empty string clears it. */
description?: UpdateCalendarEventRequestDescription;
/** Replacement location; an empty string clears it. */
diff --git a/apps/web/src/lib/service-clients/service-email/generated/schemas/updateCalendarEventRequestConference.ts b/apps/web/src/lib/service-clients/service-email/generated/schemas/updateCalendarEventRequestConference.ts
new file mode 100644
index 0000000000..f513fe6725
--- /dev/null
+++ b/apps/web/src/lib/service-clients/service-email/generated/schemas/updateCalendarEventRequestConference.ts
@@ -0,0 +1,9 @@
+/**
+ * Generated by orval v7.21.0 🍺
+ * Do not edit manually.
+ * email_service
+ * OpenAPI spec version: 0.1.0
+ */
+import type { ConferenceChange } from './conferenceChange';
+
+export type UpdateCalendarEventRequestConference = null | ConferenceChange;
diff --git a/apps/web/src/lib/service-clients/service-email/openapi.json b/apps/web/src/lib/service-clients/service-email/openapi.json
index 5ddaf0c9a1..399c38e008 100644
--- a/apps/web/src/lib/service-clients/service-email/openapi.json
+++ b/apps/web/src/lib/service-clients/service-email/openapi.json
@@ -4463,6 +4463,17 @@
"format": "uuid",
"description": "Calendar the canonical source belongs to, when known. Absent only in\nprojections stored before calendars were attributed."
},
+ "conferenceProvider": {
+ "oneOf": [
+ {
+ "type": "null"
+ },
+ {
+ "$ref": "#/components/schemas/ConferenceProvider",
+ "description": "Which conferencing system backs `conference_url`. `None` whenever no\nconference is attached."
+ }
+ ]
+ },
"conferenceUrl": {
"type": ["string", "null"],
"description": "Direct join URL when known."
@@ -4594,6 +4605,16 @@
}
}
},
+ "ConferenceChange": {
+ "type": "string",
+ "description": "A requested change to an event's conferencing. Omitting the field leaves\nthe existing conference untouched; only these values change it.",
+ "enum": ["google_meet", "none"]
+ },
+ "ConferenceProvider": {
+ "type": "string",
+ "description": "The conferencing system backing an event's join URL.\n\nMacro generates only Google Meet conferences, so this distinguishes one it\ncreated from a third party's — Zoom and friends arriving as `addOn`\nconference data, or a legacy classic Hangout. Clients use it to label the\nconference and to tell whether the Meet toggle reflects a Macro-managed\nconference.\n\nIt does not gate mutation. An explicit request replaces or detaches any\nconference, third-party included, exactly as deleting the event would;\nwhat protects a conference is that omitting the field leaves it untouched,\nso an unrelated edit never disturbs it.",
+ "enum": ["google_meet", "other"]
+ },
"Contact": {
"type": "object",
"required": ["id", "link_id"],
@@ -4687,6 +4708,17 @@
"format": "uuid",
"description": "Exact calendar to create the event on; takes precedence over the\ninbox default."
},
+ "conference": {
+ "oneOf": [
+ {
+ "type": "null"
+ },
+ {
+ "$ref": "#/components/schemas/ConferenceChange",
+ "description": "Conference to attach to the new event; omit to create it without one."
+ }
+ ]
+ },
"description": {
"type": ["string", "null"],
"description": "Optional event body."
@@ -6027,6 +6059,17 @@
},
"description": "Replacement attendee list."
},
+ "conference": {
+ "oneOf": [
+ {
+ "type": "null"
+ },
+ {
+ "$ref": "#/components/schemas/ConferenceChange",
+ "description": "Conference change: `google_meet` attaches a freshly generated Meet,\n`none` detaches the current conference, and omitting it leaves the\nconference untouched.\n\nA third-party conference is replaced or detached like any other, since\nthe request is explicit. Omit the field to leave it alone."
+ }
+ ]
+ },
"description": {
"type": ["string", "null"],
"description": "Replacement description; an empty string clears it."
diff --git a/apps/web/src/lib/service-clients/service-storage/generated/schemas/calendarEvent.ts b/apps/web/src/lib/service-clients/service-storage/generated/schemas/calendarEvent.ts
index 6a7b184139..fd2b60a5bf 100644
--- a/apps/web/src/lib/service-clients/service-storage/generated/schemas/calendarEvent.ts
+++ b/apps/web/src/lib/service-clients/service-storage/generated/schemas/calendarEvent.ts
@@ -6,6 +6,7 @@
*/
import type { CalendarAttendee } from './calendarAttendee';
import type { CalendarEventCalendarId } from './calendarEventCalendarId';
+import type { CalendarEventConferenceProvider } from './calendarEventConferenceProvider';
import type { CalendarEventConferenceUrl } from './calendarEventConferenceUrl';
import type { CalendarEventDescription } from './calendarEventDescription';
import type { CalendarEventLocation } from './calendarEventLocation';
@@ -26,6 +27,7 @@ export interface CalendarEvent {
/** Calendar the canonical source belongs to, when known. Absent only in
projections stored before calendars were attributed. */
calendarId?: CalendarEventCalendarId;
+ conferenceProvider?: CalendarEventConferenceProvider;
/** Direct join URL when known. */
conferenceUrl?: CalendarEventConferenceUrl;
/** Entity creation time. */
diff --git a/apps/web/src/lib/service-clients/service-storage/generated/schemas/calendarEventConferenceProvider.ts b/apps/web/src/lib/service-clients/service-storage/generated/schemas/calendarEventConferenceProvider.ts
new file mode 100644
index 0000000000..e5767ba9c1
--- /dev/null
+++ b/apps/web/src/lib/service-clients/service-storage/generated/schemas/calendarEventConferenceProvider.ts
@@ -0,0 +1,9 @@
+/**
+ * Generated by orval v7.21.0 🍺
+ * Do not edit manually.
+ * document_storage_service
+ * OpenAPI spec version: 0.1.0
+ */
+import type { ConferenceProvider } from './conferenceProvider';
+
+export type CalendarEventConferenceProvider = null | ConferenceProvider;
diff --git a/apps/web/src/lib/service-clients/service-storage/generated/schemas/conferenceProvider.ts b/apps/web/src/lib/service-clients/service-storage/generated/schemas/conferenceProvider.ts
new file mode 100644
index 0000000000..8fa3099083
--- /dev/null
+++ b/apps/web/src/lib/service-clients/service-storage/generated/schemas/conferenceProvider.ts
@@ -0,0 +1,29 @@
+/**
+ * Generated by orval v7.21.0 🍺
+ * Do not edit manually.
+ * document_storage_service
+ * OpenAPI spec version: 0.1.0
+ */
+
+/**
+ * The conferencing system backing an event's join URL.
+
+Macro generates only Google Meet conferences, so this distinguishes one it
+created from a third party's — Zoom and friends arriving as `addOn`
+conference data, or a legacy classic Hangout. Clients use it to label the
+conference and to tell whether the Meet toggle reflects a Macro-managed
+conference.
+
+It does not gate mutation. An explicit request replaces or detaches any
+conference, third-party included, exactly as deleting the event would;
+what protects a conference is that omitting the field leaves it untouched,
+so an unrelated edit never disturbs it.
+ */
+export type ConferenceProvider =
+ (typeof ConferenceProvider)[keyof typeof ConferenceProvider];
+
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export const ConferenceProvider = {
+ google_meet: 'google_meet',
+ other: 'other',
+} as const;
diff --git a/apps/web/src/lib/service-clients/service-storage/generated/schemas/index.ts b/apps/web/src/lib/service-clients/service-storage/generated/schemas/index.ts
index 46320c5bfc..58d3b85ce7 100644
--- a/apps/web/src/lib/service-clients/service-storage/generated/schemas/index.ts
+++ b/apps/web/src/lib/service-clients/service-storage/generated/schemas/index.ts
@@ -169,6 +169,7 @@ export * from './calendarAttendeeComment';
export * from './calendarAttendeeDisplayName';
export * from './calendarEvent';
export * from './calendarEventCalendarId';
+export * from './calendarEventConferenceProvider';
export * from './calendarEventConferenceUrl';
export * from './calendarEventDescription';
export * from './calendarEventFilters';
@@ -273,6 +274,7 @@ export * from './commentOrder';
export * from './commentSender';
export * from './commentThread';
export * from './commentUpdatedAt';
+export * from './conferenceProvider';
export * from './copyDocumentParams';
export * from './copyDocumentQueryParams';
export * from './copyDocumentQueryParamsVersionId';
@@ -967,6 +969,7 @@ export * from './soupAttachmentMimeType';
export * from './soupAttachmentProviderAttachmentId';
export * from './soupAttachmentSizeBytes';
export * from './soupCalendarEventSoupPropertiesField';
+export * from './soupCalendarEventSoupPropertiesFieldConferenceProvider';
export * from './soupCalendarEventSoupPropertiesFieldConferenceUrl';
export * from './soupCalendarEventSoupPropertiesFieldDescription';
export * from './soupCalendarEventSoupPropertiesFieldExtra';
diff --git a/apps/web/src/lib/service-clients/service-storage/generated/schemas/soupCalendarEventSoupPropertiesField.ts b/apps/web/src/lib/service-clients/service-storage/generated/schemas/soupCalendarEventSoupPropertiesField.ts
index 837234554c..6376b72707 100644
--- a/apps/web/src/lib/service-clients/service-storage/generated/schemas/soupCalendarEventSoupPropertiesField.ts
+++ b/apps/web/src/lib/service-clients/service-storage/generated/schemas/soupCalendarEventSoupPropertiesField.ts
@@ -4,6 +4,7 @@
* document_storage_service
* OpenAPI spec version: 0.1.0
*/
+import type { SoupCalendarEventSoupPropertiesFieldConferenceProvider } from './soupCalendarEventSoupPropertiesFieldConferenceProvider';
import type { SoupCalendarEventSoupPropertiesFieldConferenceUrl } from './soupCalendarEventSoupPropertiesFieldConferenceUrl';
import type { SoupCalendarEventSoupPropertiesFieldDescription } from './soupCalendarEventSoupPropertiesFieldDescription';
import type { SoupCalendarEventSoupPropertiesFieldExtra } from './soupCalendarEventSoupPropertiesFieldExtra';
@@ -16,6 +17,8 @@ import type { SoupCalendarEventTime } from './soupCalendarEventTime';
* A canonical calendar event entity in Soup.
*/
export interface SoupCalendarEventSoupPropertiesField {
+ /** Which conferencing system backs `conference_url`. */
+ conferenceProvider?: SoupCalendarEventSoupPropertiesFieldConferenceProvider;
/** Direct conference join URL. */
conferenceUrl?: SoupCalendarEventSoupPropertiesFieldConferenceUrl;
/** Entity creation timestamp. */
diff --git a/apps/web/src/lib/service-clients/service-storage/generated/schemas/soupCalendarEventSoupPropertiesFieldConferenceProvider.ts b/apps/web/src/lib/service-clients/service-storage/generated/schemas/soupCalendarEventSoupPropertiesFieldConferenceProvider.ts
new file mode 100644
index 0000000000..b088a05278
--- /dev/null
+++ b/apps/web/src/lib/service-clients/service-storage/generated/schemas/soupCalendarEventSoupPropertiesFieldConferenceProvider.ts
@@ -0,0 +1,13 @@
+/**
+ * Generated by orval v7.21.0 🍺
+ * Do not edit manually.
+ * document_storage_service
+ * OpenAPI spec version: 0.1.0
+ */
+
+/**
+ * Which conferencing system backs `conference_url`.
+ */
+export type SoupCalendarEventSoupPropertiesFieldConferenceProvider =
+ | string
+ | null;
diff --git a/apps/web/src/lib/service-clients/service-storage/generated/zod.ts b/apps/web/src/lib/service-clients/service-storage/generated/zod.ts
index 7a3d3462fc..62e3967b34 100644
--- a/apps/web/src/lib/service-clients/service-storage/generated/zod.ts
+++ b/apps/web/src/lib/service-clients/service-storage/generated/zod.ts
@@ -982,6 +982,16 @@ export const listOccurrencesResponse = zod
.describe(
'Calendar the canonical source belongs to, when known. Absent only in\nprojections stored before calendars were attributed.'
),
+ conferenceProvider: zod
+ .union([
+ zod.null(),
+ zod
+ .enum(['google_meet', 'other'])
+ .describe(
+ "The conferencing system backing an event's join URL.\n\nMacro generates only Google Meet conferences, so this distinguishes one it\ncreated from a third party's — Zoom and friends arriving as `addOn`\nconference data, or a legacy classic Hangout. Clients use it to label the\nconference and to tell whether the Meet toggle reflects a Macro-managed\nconference.\n\nIt does not gate mutation. An explicit request replaces or detaches any\nconference, third-party included, exactly as deleting the event would;\nwhat protects a conference is that omitting the field leaves it untouched,\nso an unrelated edit never disturbs it."
+ ),
+ ])
+ .optional(),
conferenceUrl: zod
.string()
.nullish()
@@ -9842,6 +9852,12 @@ export const getItemsSoupResponse = zod
.object({
data: zod
.object({
+ conferenceProvider: zod
+ .string()
+ .nullish()
+ .describe(
+ 'Which conferencing system backs `conference_url`.'
+ ),
conferenceUrl: zod
.string()
.nullish()
@@ -13469,6 +13485,12 @@ export const postItemsSoupResponse = zod
.object({
data: zod
.object({
+ conferenceProvider: zod
+ .string()
+ .nullish()
+ .describe(
+ 'Which conferencing system backs `conference_url`.'
+ ),
conferenceUrl: zod
.string()
.nullish()
@@ -16562,6 +16584,12 @@ export const postItemsSoupAstResponse = zod
.object({
data: zod
.object({
+ conferenceProvider: zod
+ .string()
+ .nullish()
+ .describe(
+ 'Which conferencing system backs `conference_url`.'
+ ),
conferenceUrl: zod
.string()
.nullish()
@@ -19981,6 +20009,12 @@ export const postItemsSoupAstGroupedResponse = zod
.object({
data: zod
.object({
+ conferenceProvider: zod
+ .string()
+ .nullish()
+ .describe(
+ 'Which conferencing system backs `conference_url`.'
+ ),
conferenceUrl: zod
.string()
.nullish()
@@ -23078,6 +23112,12 @@ export const postItemsSoupAstGroupedResponse = zod
.object({
data: zod
.object({
+ conferenceProvider: zod
+ .string()
+ .nullish()
+ .describe(
+ 'Which conferencing system backs `conference_url`.'
+ ),
conferenceUrl: zod
.string()
.nullish()
diff --git a/apps/web/src/lib/service-clients/service-storage/openapi.json b/apps/web/src/lib/service-clients/service-storage/openapi.json
index 396ea9e6c5..3360637a0f 100644
--- a/apps/web/src/lib/service-clients/service-storage/openapi.json
+++ b/apps/web/src/lib/service-clients/service-storage/openapi.json
@@ -12892,6 +12892,17 @@
"format": "uuid",
"description": "Calendar the canonical source belongs to, when known. Absent only in\nprojections stored before calendars were attributed."
},
+ "conferenceProvider": {
+ "oneOf": [
+ {
+ "type": "null"
+ },
+ {
+ "$ref": "#/components/schemas/ConferenceProvider",
+ "description": "Which conferencing system backs `conference_url`. `None` whenever no\nconference is attached."
+ }
+ ]
+ },
"conferenceUrl": {
"type": ["string", "null"],
"description": "Direct join URL when known."
@@ -14627,6 +14638,11 @@
}
}
},
+ "ConferenceProvider": {
+ "type": "string",
+ "description": "The conferencing system backing an event's join URL.\n\nMacro generates only Google Meet conferences, so this distinguishes one it\ncreated from a third party's — Zoom and friends arriving as `addOn`\nconference data, or a legacy classic Hangout. Clients use it to label the\nconference and to tell whether the Meet toggle reflects a Macro-managed\nconference.\n\nIt does not gate mutation. An explicit request replaces or detaches any\nconference, third-party included, exactly as deleting the event would;\nwhat protects a conference is that omitting the field leaves it untouched,\nso an unrelated edit never disturbs it.",
+ "enum": ["google_meet", "other"]
+ },
"CopyDocumentQueryParams": {
"type": "object",
"description": "Query parameters for the copy document endpoint.",
@@ -21891,6 +21907,10 @@
"extra"
],
"properties": {
+ "conferenceProvider": {
+ "type": ["string", "null"],
+ "description": "Which conferencing system backs `conference_url`."
+ },
"conferenceUrl": {
"type": ["string", "null"],
"description": "Direct conference join URL."
diff --git a/crates/calendar_events/src/domain/models.rs b/crates/calendar_events/src/domain/models.rs
index d63dbe10f4..d72d836426 100644
--- a/crates/calendar_events/src/domain/models.rs
+++ b/crates/calendar_events/src/domain/models.rs
@@ -195,6 +195,51 @@ impl EventTransparency {
}
}
+/// The conferencing system backing an event's join URL.
+///
+/// Macro generates only Google Meet conferences, so this distinguishes one it
+/// created from a third party's — Zoom and friends arriving as `addOn`
+/// conference data, or a legacy classic Hangout. Clients use it to label the
+/// conference and to tell whether the Meet toggle reflects a Macro-managed
+/// conference.
+///
+/// It does not gate mutation. An explicit request replaces or detaches any
+/// conference, third-party included, exactly as deleting the event would;
+/// what protects a conference is that omitting the field leaves it untouched,
+/// so an unrelated edit never disturbs it.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[cfg_attr(feature = "schema", derive(utoipa::ToSchema))]
+#[serde(rename_all = "snake_case")]
+pub enum ConferenceProvider {
+ /// Google Meet.
+ GoogleMeet,
+ /// A third-party or legacy conference Macro leaves untouched.
+ Other,
+}
+
+impl ConferenceProvider {
+ /// Database representation.
+ pub fn as_str(self) -> &'static str {
+ match self {
+ Self::GoogleMeet => "google_meet",
+ Self::Other => "other",
+ }
+ }
+}
+
+/// A requested change to an event's conferencing. Omitting the field leaves
+/// the existing conference untouched; only these values change it.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[cfg_attr(feature = "schema", derive(utoipa::ToSchema))]
+#[serde(rename_all = "snake_case")]
+pub enum ConferenceChange {
+ /// Generate a new Google Meet conference and attach it.
+ GoogleMeet,
+ /// Detach whatever conference is currently attached.
+ #[serde(rename = "none")]
+ Removed,
+}
+
/// An attendee on a calendar event.
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
#[cfg_attr(feature = "schema", derive(utoipa::ToSchema))]
@@ -358,6 +403,10 @@ pub struct CalendarEvent {
pub organizer_name: Option<String>,
/// Direct join URL when known.
pub conference_url: Option<String>,
+ /// Which conferencing system backs `conference_url`. `None` whenever no
+ /// conference is attached.
+ #[serde(default)]
+ pub conference_provider: Option<ConferenceProvider>,
/// Provider/iCalendar sequence number.
pub sequence: u32,
/// Whether the current user can edit the canonical source.
@@ -659,6 +708,8 @@ pub struct CalendarEventDraft {
pub transparency: Option<EventTransparency>,
/// Reminder configuration; `None` keeps the provider default.
pub reminders: Option<EventReminders>,
+ /// Conference to attach on creation. `None` creates the event without one.
+ pub conference: Option<ConferenceChange>,
}
/// User-supplied changes to an existing provider event. `None` fields are
@@ -683,6 +734,8 @@ pub struct CalendarEventPatch {
pub transparency: Option<EventTransparency>,
/// Replacement reminder configuration.
pub reminders: Option<EventReminders>,
+ /// Conference change to apply; `None` leaves the conference untouched.
+ pub conference: Option<ConferenceChange>,
}
impl CalendarEventPatch {
diff --git a/crates/calendar_events/src/domain/models/test.rs b/crates/calendar_events/src/domain/models/test.rs
index 4776455af0..7f7126a442 100644
--- a/crates/calendar_events/src/domain/models/test.rs
+++ b/crates/calendar_events/src/domain/models/test.rs
@@ -163,6 +163,7 @@ fn default_reminders_stay_out_of_serialized_projections() {
organizer_email: None,
organizer_name: None,
conference_url: None,
+ conference_provider: None,
sequence: 0,
is_read_only: false,
attendees: Vec::new(),
diff --git a/crates/calendar_events/src/domain/mutations/test.rs b/crates/calendar_events/src/domain/mutations/test.rs
index 00ee1766ac..a82b3351b5 100644
--- a/crates/calendar_events/src/domain/mutations/test.rs
+++ b/crates/calendar_events/src/domain/mutations/test.rs
@@ -2,7 +2,7 @@ use super::*;
use crate::domain::models::{
AppliedGoogleGrant, CalendarAttendeeInput, CalendarBackfillJobKey, CalendarCreationTarget,
CalendarEventSource, CalendarLinkTokenIdentity, CalendarOccurrence, CalendarOccurrenceCursor,
- CalendarSyncStatus, EventStatus, EventTransparency, EventVisibility,
+ CalendarSyncStatus, ConferenceChange, EventStatus, EventTransparency, EventVisibility,
GoogleCalendarSyncSnapshot, GoogleCalendarTarget, GoogleEventSource, GoogleWatchChannel,
ProviderCalendar, StoredGoogleCalendar,
};
@@ -72,6 +72,7 @@ fn echo_upsert(target_owner: &str) -> CalendarEventUpsert {
organizer_email: None,
organizer_name: None,
conference_url: None,
+ conference_provider: None,
sequence: 0,
is_read_only: false,
attendees: Vec::new(),
@@ -107,6 +108,7 @@ fn draft() -> CalendarEventDraft {
visibility: None,
transparency: None,
reminders: None,
+ conference: None,
}
}
@@ -746,6 +748,21 @@ fn empty_patch_is_detected() {
);
}
+/// Attaching or detaching a conference is a complete edit on its own, so a
+/// patch carrying only a conference change must not be rejected as empty.
+#[test]
+fn a_conference_only_patch_is_not_empty() {
+ for change in [ConferenceChange::GoogleMeet, ConferenceChange::Removed] {
+ assert!(
+ !CalendarEventPatch {
+ conference: Some(change),
+ ..CalendarEventPatch::default()
+ }
+ .is_empty()
+ );
+ }
+}
+
#[tokio::test]
async fn scoped_deletions_reshape_or_retire_the_series() {
let repo = FakeRepo {
@@ -818,3 +835,32 @@ async fn truncation_that_empties_the_series_retires_the_local_source() {
assert!(upserts.lock().unwrap().is_empty());
assert_eq!(removed.lock().unwrap().len(), 1);
}
+
+/// A third-party conference is replaced or detached like any other once the
+/// request is explicit: the caller asked, and deleting the event outright —
+/// which Macro already allows — destroys strictly more. What protects such a
+/// conference is that omitting the field leaves it untouched, covered below.
+#[tokio::test]
+async fn conference_changes_reach_the_provider_for_any_conference() {
+ for change in [ConferenceChange::GoogleMeet, ConferenceChange::Removed] {
+ let repo = FakeRepo {
+ mutation_target: Some(mutation_target(false)),
+ ..FakeRepo::default()
+ };
+ let provider = FakeProvider::new(FakeProviderBehavior::Echo);
+ let calls = provider.calls.clone();
+ let result = service(repo, provider, FakeTokens::ok())
+ .update_event(
+ "macro|user",
+ Uuid::now_v7(),
+ CalendarEventPatch {
+ conference: Some(change),
+ ..CalendarEventPatch::default()
+ },
+ )
+ .await;
+
+ assert!(result.is_ok(), "{change:?} failed: {result:?}");
+ assert_eq!(calls.lock().unwrap().as_slice(), ["update:master-id"]);
+ }
+}
diff --git a/crates/calendar_events/src/domain/service/test.rs b/crates/calendar_events/src/domain/service/test.rs
index dd0f8ed459..84a2e96bbc 100644
--- a/crates/calendar_events/src/domain/service/test.rs
+++ b/crates/calendar_events/src/domain/service/test.rs
@@ -176,6 +176,7 @@ fn valid_upsert() -> CalendarEventUpsert {
organizer_email: None,
organizer_name: None,
conference_url: None,
+ conference_provider: None,
sequence: 0,
is_read_only: true,
attendees: vec![CalendarAttendee {
diff --git a/crates/calendar_events/src/inbound/mutation_router.rs b/crates/calendar_events/src/inbound/mutation_router.rs
index aef20082d9..bf92d79089 100644
--- a/crates/calendar_events/src/inbound/mutation_router.rs
+++ b/crates/calendar_events/src/inbound/mutation_router.rs
@@ -25,8 +25,8 @@ use uuid::Uuid;
use crate::domain::{
models::{
AttendeeResponseStatus, CalendarAttendeeInput, CalendarEvent, CalendarEventDraft,
- CalendarEventPatch, EventReminders, EventTime, EventTransparency, EventVisibility,
- VisibleCalendar,
+ CalendarEventPatch, ConferenceChange, EventReminders, EventTime, EventTransparency,
+ EventVisibility, VisibleCalendar,
},
ports::{
CalendarDeletionScope, CalendarMutationError, CalendarMutationService, CalendarRsvpScope,
@@ -138,6 +138,8 @@ pub struct CreateCalendarEventRequest {
pub transparency: Option<EventTransparency>,
/// Reminder configuration; omit to keep the calendar defaults.
pub reminders: Option<EventReminders>,
+ /// Conference to attach to the new event; omit to create it without one.
+ pub conference: Option<ConferenceChange>,
}
/// Request body patching an event; omitted fields are left untouched.
@@ -162,6 +164,13 @@ pub struct UpdateCalendarEventRequest {
pub transparency: Option<EventTransparency>,
/// Replacement reminder configuration.
pub reminders: Option<EventReminders>,
+ /// Conference change: `google_meet` attaches a freshly generated Meet,
+ /// `none` detaches the current conference, and omitting it leaves the
+ /// conference untouched.
+ ///
+ /// A third-party conference is replaced or detached like any other, since
+ /// the request is explicit. Omit the field to leave it alone.
+ pub conference: Option<ConferenceChange>,
}
/// How much of a recurring series a deletion removes.
@@ -365,6 +374,7 @@ where
visibility: request.visibility,
transparency: request.transparency,
reminders: request.reminders,
+ conference: request.conference,
};
let event = state
.service
@@ -453,6 +463,7 @@ where
visibility: request.visibility,
transparency: request.transparency,
reminders: request.reminders,
+ conference: request.conference,
};
let event = state
.service
diff --git a/crates/calendar_events/src/outbound/google.rs b/crates/calendar_events/src/outbound/google.rs
index c7ddfbc92f..8176ecf129 100644
--- a/crates/calendar_events/src/outbound/google.rs
+++ b/crates/calendar_events/src/outbound/google.rs
@@ -12,10 +12,11 @@ use crate::domain::{
models::{
AttendeeResponseStatus, CalendarAttendee, CalendarAttendeeInput, CalendarEvent,
CalendarEventDraft, CalendarEventOverride, CalendarEventPatch, CalendarEventSource,
- CalendarEventUpsert, CalendarOccurrence, EventReminderOverride, EventReminders, EventStart,
- EventStatus, EventTime, EventTransparency, EventVisibility, GoogleCalendarTarget,
- GoogleEventSource, GoogleEventSyncBatch, GoogleSyncPlan, GoogleWatchChannel,
- GoogleWatchConfig, OccurrenceRange, ProviderCalendar,
+ CalendarEventUpsert, CalendarOccurrence, ConferenceChange, ConferenceProvider,
+ EventReminderOverride, EventReminders, EventStart, EventStatus, EventTime,
+ EventTransparency, EventVisibility, GoogleCalendarTarget, GoogleEventSource,
+ GoogleEventSyncBatch, GoogleSyncPlan, GoogleWatchChannel, GoogleWatchConfig,
+ OccurrenceRange, ProviderCalendar,
},
ports::{
CalendarRsvpScope, GoogleCalendarMutationProvider, GoogleCalendarProvider,
@@ -735,7 +736,53 @@ impl<G: GoogleRequestGate> GoogleCalendarClient<G> {
/// UI's default behavior for invitations and cancellations.
const SEND_UPDATES: (&str, &str) = ("sendUpdates", "all");
+/// Google ignores `conferenceData` in a request body unless the client
+/// declares conference support. Declaring it per-request, keyed off the body
+/// actually carrying the field, keeps conference-free mutations on the
+/// version the rest of the adapter was written against.
+const CONFERENCE_DATA_VERSION: (&str, &str) = ("conferenceDataVersion", "1");
+
+/// The conference query parameter a body requires, if any.
+fn conference_query(body: &serde_json::Value) -> Option<(&'static str, &'static str)> {
+ body.get("conferenceData").map(|_| CONFERENCE_DATA_VERSION)
+}
+
+/// Apply the conference parameter a body requires, if any.
+fn with_conference_query(request: RequestBuilder, body: &serde_json::Value) -> RequestBuilder {
+ match conference_query(body) {
+ Some(parameter) => request.query(&[parameter]),
+ None => request,
+ }
+}
+
impl<G: GoogleRequestGate> GoogleCalendarClient<G> {
+ /// Resolve a conference Google is still generating.
+ ///
+ /// Meet creation is asynchronous, so a mutation echo can carry a
+ /// conference whose entry points have not materialized yet — persisting
+ /// that echo would store an event with a conference but no join URL. One
+ /// re-read settles the common case; a slower one converges on the next
+ /// sync, which Google's own push notification for this change triggers.
+ async fn resolve_pending_conference(
+ &self,
+ access_token: &str,
+ target: &GoogleCalendarTarget,
+ event: GoogleEvent,
+ ) -> Result<GoogleEvent, GoogleProviderError> {
+ if !conference_is_pending(event.conference_data.as_ref()) {
+ return Ok(event);
+ }
+ let refreshed = self
+ .event(
+ access_token,
+ target.email_link_id,
+ &target.provider_calendar_id,
+ &event.id,
+ )
+ .await?;
+ Ok(refreshed.unwrap_or(event))
+ }
+
/// Normalize the provider echo of a mutation into a persistable upsert.
///
/// Recurring series are re-read from the provider so Google stays the
@@ -747,6 +794,9 @@ impl<G: GoogleRequestGate> GoogleCalendarClient<G> {
target: &GoogleCalendarTarget,
event: GoogleEvent,
) -> Result<Option<CalendarEventUpsert>, GoogleProviderError> {
+ let event = self
+ .resolve_pending_conference(access_token, target, event)
+ .await?;
let outcome = if let Some(master_id) = event.recurring_event_id.clone() {
self.refresh_series(access_token, target, &master_id, None)
.await?
@@ -827,13 +877,14 @@ impl<G: GoogleRequestGate> GoogleCalendarClient<G> {
let calendar = urlencoding::encode(&target.provider_calendar_id);
let event = urlencoding::encode(provider_event_id);
self.gate.acquire(target.email_link_id).await?;
- let response = self
+ let request = self
.client
.patch(format!(
"{GOOGLE_CALENDAR_API}/calendars/{calendar}/events/{event}"
))
.bearer_auth(access_token)
- .query(&[SEND_UPDATES])
+ .query(&[SEND_UPDATES]);
+ let response = with_conference_query(request, &body)
.json(&body)
.send()
.await
@@ -867,15 +918,15 @@ impl<G: GoogleRequestGate> GoogleCalendarMutationProvider for GoogleCalendarClie
draft: &CalendarEventDraft,
) -> Result<CalendarEventUpsert, GoogleProviderError> {
let calendar = urlencoding::encode(&target.provider_calendar_id);
+ let body = draft_body(draft);
self.gate.acquire(target.email_link_id).await?;
- let created: GoogleEvent = send_google(
- self.client
- .post(format!("{GOOGLE_CALENDAR_API}/calendars/{calendar}/events"))
- .bearer_auth(access_token)
- .query(&[SEND_UPDATES])
- .json(&draft_body(draft)),
- )
- .await?;
+ let request = self
+ .client
+ .post(format!("{GOOGLE_CALENDAR_API}/calendars/{calendar}/events"))
+ .bearer_auth(access_token)
+ .query(&[SEND_UPDATES]);
+ let created: GoogleEvent =
+ send_google(with_conference_query(request, &body).json(&body)).await?;
// The insert already happened and carries no idempotency key, so a
// readback miss must not surface as retryable: a client retry would
// POST a duplicate event.
@@ -1376,6 +1427,9 @@ fn draft_body(draft: &CalendarEventDraft) -> serde_json::Value {
if let Some(reminders) = &draft.reminders {
body["reminders"] = google_reminders_body(reminders);
}
+ if let Some(conference) = draft.conference {
+ body["conferenceData"] = google_conference_body(conference);
+ }
body
}
@@ -1395,6 +1449,24 @@ fn google_reminders_body(reminders: &EventReminders) -> serde_json::Value {
})
}
+/// Build the `conferenceData` write for a requested conference change.
+///
+/// Google generates Meet conferences asynchronously from a `createRequest`,
+/// whose `requestId` is the idempotency key: reusing one makes Google ignore
+/// the request, so every attach mints a fresh identifier. An explicit JSON
+/// null is how the API expresses detachment.
+fn google_conference_body(change: ConferenceChange) -> serde_json::Value {
+ match change {
+ ConferenceChange::GoogleMeet => serde_json::json!({
+ "createRequest": {
+ "requestId": Uuid::new_v4().to_string(),
+ "conferenceSolutionKey": { "type": "hangoutsMeet" },
+ }
+ }),
+ ConferenceChange::Removed => serde_json::Value::Null,
+ }
+}
+
fn patch_body(patch: &CalendarEventPatch) -> serde_json::Value {
let mut body = serde_json::json!({});
if let Some(title) = &patch.title {
@@ -1426,6 +1498,9 @@ fn patch_body(patch: &CalendarEventPatch) -> serde_json::Value {
if let Some(reminders) = &patch.reminders {
body["reminders"] = google_reminders_body(reminders);
}
+ if let Some(conference) = patch.conference {
+ body["conferenceData"] = google_conference_body(conference);
+ }
body
}
@@ -1593,6 +1668,10 @@ fn map_upsert(
provider_etag: master.etag.clone(),
raw_payload: serde_json::to_value(&master).map_err(report)?,
});
+ let join_url = master
+ .hangout_link
+ .clone()
+ .or_else(|| conference_url(master.conference_data.as_ref()));
let event = CalendarEvent {
id: event_id,
owner_id: target.owner_id.clone(),
@@ -1614,10 +1693,11 @@ fn map_upsert(
.organizer
.as_ref()
.and_then(|value| value.display_name.clone()),
- conference_url: master
- .hangout_link
- .clone()
- .or_else(|| conference_url(master.conference_data.as_ref())),
+ conference_provider: conference_provider(
+ master.conference_data.as_ref(),
+ join_url.is_some(),
+ ),
+ conference_url: join_url,
sequence: master.sequence.unwrap_or_default(),
is_read_only: target.is_read_only,
attendees: master
@@ -1822,6 +1902,36 @@ fn conference_url(data: Option<&GoogleConferenceData>) -> Option<String> {
})
}
+/// Classify the conference behind a join URL. Only `hangoutsMeet` is one
+/// Macro may rewrite; a bare `hangoutLink` with no conference data is a
+/// legacy classic Hangout, which Macro also leaves alone.
+fn conference_provider(
+ data: Option<&GoogleConferenceData>,
+ has_url: bool,
+) -> Option<ConferenceProvider> {
+ if !has_url {
+ return None;
+ }
+ let solution_type = data
+ .and_then(|data| data.conference_solution.as_ref())
+ .and_then(|solution| solution.key.as_ref())
+ .and_then(|key| key.solution_type.as_deref());
+ Some(match solution_type {
+ Some("hangoutsMeet") => ConferenceProvider::GoogleMeet,
+ _ => ConferenceProvider::Other,
+ })
+}
+
+/// Whether Google is still generating a requested conference. Creation is
+/// asynchronous, so the mutation echo can carry a conference with no entry
+/// points yet; callers re-read the event instead of persisting that gap.
+fn conference_is_pending(data: Option<&GoogleConferenceData>) -> bool {
+ data.and_then(|data| data.create_request.as_ref())
+ .and_then(|request| request.status.as_ref())
+ .and_then(|status| status.status_code.as_deref())
+ == Some("pending")
+}
+
fn google_status(value: Option<&str>) -> EventStatus {
match value {
Some("tentative") => EventStatus::Tentative,
@@ -2017,6 +2127,38 @@ struct GoogleAttendee {
struct GoogleConferenceData {
#[serde(default)]
entry_points: Vec<GoogleEntryPoint>,
+ #[serde(skip_serializing_if = "Option::is_none")]
+ conference_solution: Option<GoogleConferenceSolution>,
+ #[serde(skip_serializing_if = "Option::is_none")]
+ create_request: Option<GoogleConferenceCreateRequest>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct GoogleConferenceSolution {
+ #[serde(skip_serializing_if = "Option::is_none")]
+ key: Option<GoogleConferenceSolutionKey>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct GoogleConferenceSolutionKey {
+ #[serde(rename = "type", skip_serializing_if = "Option::is_none")]
+ solution_type: Option<String>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct GoogleConferenceCreateRequest {
+ #[serde(skip_serializing_if = "Option::is_none")]
+ status: Option<GoogleConferenceCreateStatus>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct GoogleConferenceCreateStatus {
+ #[serde(skip_serializing_if = "Option::is_none")]
+ status_code: Option<String>,
}
#[derive(Clone, Debug, Deserialize, Serialize)]
diff --git a/crates/calendar_events/src/outbound/google/test.rs b/crates/calendar_events/src/outbound/google/test.rs
index ff906b64f1..150dddd9b9 100644
--- a/crates/calendar_events/src/outbound/google/test.rs
+++ b/crates/calendar_events/src/outbound/google/test.rs
@@ -659,6 +659,7 @@ fn mutation_bodies_serialize_reminders_in_google_shape() {
visibility: None,
transparency: None,
reminders: Some(reminders.clone()),
+ conference: None,
};
assert_eq!(draft_body(&draft)["reminders"], expected);
@@ -676,3 +677,193 @@ fn mutation_bodies_serialize_reminders_in_google_shape() {
"an untouched patch must not clobber provider reminders"
);
}
+
+#[test]
+fn attaching_a_meet_asks_google_to_generate_one() {
+ let body = patch_body(&CalendarEventPatch {
+ conference: Some(ConferenceChange::GoogleMeet),
+ ..CalendarEventPatch::default()
+ });
+
+ let create_request = &body["conferenceData"]["createRequest"];
+ assert_eq!(
+ create_request["conferenceSolutionKey"]["type"],
+ "hangoutsMeet"
+ );
+ // Google treats a repeated requestId as a duplicate and ignores the
+ // request, so each attach must mint a fresh one.
+ let other = patch_body(&CalendarEventPatch {
+ conference: Some(ConferenceChange::GoogleMeet),
+ ..CalendarEventPatch::default()
+ });
+ assert_ne!(
+ create_request["requestId"],
+ other["conferenceData"]["createRequest"]["requestId"]
+ );
+}
+
+#[test]
+fn detaching_a_conference_sends_an_explicit_null() {
+ let body = patch_body(&CalendarEventPatch {
+ conference: Some(ConferenceChange::Removed),
+ ..CalendarEventPatch::default()
+ });
+
+ // A missing key would leave the conference in place; only JSON null
+ // detaches it.
+ assert!(body.get("conferenceData").is_some());
+ assert!(body["conferenceData"].is_null());
+}
+
+#[test]
+fn a_patch_that_leaves_conferencing_alone_omits_the_field_and_the_parameter() {
+ let body = patch_body(&CalendarEventPatch {
+ title: Some("Renamed".to_string()),
+ ..CalendarEventPatch::default()
+ });
+
+ assert!(body.get("conferenceData").is_none());
+ assert_eq!(conference_query(&body), None);
+}
+
+#[test]
+fn conference_writes_declare_conference_support() {
+ for change in [ConferenceChange::GoogleMeet, ConferenceChange::Removed] {
+ let patch = patch_body(&CalendarEventPatch {
+ conference: Some(change),
+ ..CalendarEventPatch::default()
+ });
+ assert_eq!(conference_query(&patch), Some(CONFERENCE_DATA_VERSION));
+ }
+}
+
+#[test]
+fn drafts_carry_conference_requests_and_their_parameter() {
+ let draft = CalendarEventDraft {
+ title: "Kickoff".to_string(),
+ description: None,
+ location: None,
+ time: EventTime::Timed {
+ starts_at: DateTime::parse_from_rfc3339("2026-07-24T14:00:00Z")
+ .unwrap()
+ .with_timezone(&Utc),
+ ends_at: DateTime::parse_from_rfc3339("2026-07-24T15:00:00Z")
+ .unwrap()
+ .with_timezone(&Utc),
+ time_zone: None,
+ },
+ attendees: Vec::new(),
+ recurrence_lines: Vec::new(),
+ visibility: None,
+ transparency: None,
+ reminders: None,
+ conference: Some(ConferenceChange::GoogleMeet),
+ };
+
+ let body = draft_body(&draft);
+
+ assert_eq!(
+ body["conferenceData"]["createRequest"]["conferenceSolutionKey"]["type"],
+ "hangoutsMeet"
+ );
+ assert_eq!(conference_query(&body), Some(CONFERENCE_DATA_VERSION));
+}
+
+#[test]
+fn a_meet_conference_is_classified_as_google_meet() {
+ let data: GoogleConferenceData = serde_json::from_value(serde_json::json!({
+ "conferenceSolution": {"key": {"type": "hangoutsMeet"}},
+ "entryPoints": [{"entryPointType": "video", "uri": "https://meet.google.com/abc-defg-hij"}]
+ }))
+ .unwrap();
+
+ assert_eq!(
+ conference_url(Some(&data)).as_deref(),
+ Some("https://meet.google.com/abc-defg-hij")
+ );
+ assert_eq!(
+ conference_provider(Some(&data), true),
+ Some(ConferenceProvider::GoogleMeet)
+ );
+}
+
+/// A third-party conference stays joinable but must never be reported as a
+/// Meet: the product offers to detach only conferences Macro owns, so
+/// misclassifying a Zoom link here is what would let an edit destroy it.
+#[test]
+fn a_third_party_conference_is_not_classified_as_google_meet() {
+ let data: GoogleConferenceData = serde_json::from_value(serde_json::json!({
+ "conferenceSolution": {"key": {"type": "addOn"}},
+ "entryPoints": [{"entryPointType": "video", "uri": "https://example.zoom.us/j/123"}]
+ }))
+ .unwrap();
+
+ assert_eq!(
+ conference_provider(Some(&data), true),
+ Some(ConferenceProvider::Other)
+ );
+}
+
+#[test]
+fn an_event_without_a_conference_has_no_provider() {
+ assert_eq!(conference_provider(None, false), None);
+}
+
+/// A legacy classic Hangout arrives as a bare `hangoutLink` with no
+/// conference data, and Macro cannot regenerate it.
+#[test]
+fn a_bare_hangout_link_is_not_classified_as_google_meet() {
+ assert_eq!(
+ conference_provider(None, true),
+ Some(ConferenceProvider::Other)
+ );
+}
+
+#[test]
+fn a_conference_google_is_still_generating_is_pending() {
+ let pending: GoogleConferenceData = serde_json::from_value(serde_json::json!({
+ "createRequest": {"status": {"statusCode": "pending"}}
+ }))
+ .unwrap();
+ let settled: GoogleConferenceData = serde_json::from_value(serde_json::json!({
+ "conferenceSolution": {"key": {"type": "hangoutsMeet"}},
+ "createRequest": {"status": {"statusCode": "success"}},
+ "entryPoints": [{"entryPointType": "video", "uri": "https://meet.google.com/abc-defg-hij"}]
+ }))
+ .unwrap();
+
+ assert!(conference_is_pending(Some(&pending)));
+ assert!(!conference_is_pending(Some(&settled)));
+ assert!(!conference_is_pending(None));
+}
+
+/// Mutations serialize the provider echo into `raw_payload`, so conference
+/// fields must survive a deserialize/serialize round trip or a later sync
+/// would read the event back without its conference.
+#[test]
+fn conference_data_survives_the_raw_payload_round_trip() {
+ let event: GoogleEvent = serde_json::from_value(serde_json::json!({
+ "id": "provider-event",
+ "iCalUID": "[email protected]",
+ "hangoutLink": "https://meet.google.com/abc-defg-hij",
+ "conferenceData": {
+ "conferenceSolution": {"key": {"type": "hangoutsMeet"}},
+ "entryPoints": [
+ {"entryPointType": "video", "uri": "https://meet.google.com/abc-defg-hij"}
+ ]
+ }
+ }))
+ .unwrap();
+
+ let round_tripped: GoogleEvent =
+ serde_json::from_value(serde_json::to_value(&event).unwrap()).unwrap();
+
+ assert_eq!(
+ conference_provider(round_tripped.conference_data.as_ref(), true),
+ Some(ConferenceProvider::GoogleMeet)
+ );
+ assert_eq!(
+ conference_url(round_tripped.conference_data.as_ref()).as_deref(),
+ Some("https://meet.google.com/abc-defg-hij")
+ );
+}
diff --git a/crates/calendar_events/src/outbound/pg.rs b/crates/calendar_events/src/outbound/pg.rs
index 770384b93e..e281963613 100644
--- a/crates/calendar_events/src/outbound/pg.rs
+++ b/crates/calendar_events/src/outbound/pg.rs
@@ -16,11 +16,11 @@ use crate::domain::{
CalendarBackfillJobKey, CalendarBackfillKind, CalendarCreationTarget, CalendarEvent,
CalendarEventMutationTarget, CalendarEventOverride, CalendarEventSource,
CalendarEventUpsert, CalendarLinkTokenIdentity, CalendarOccurrence,
- CalendarOccurrenceCursor, CalendarReminderFiring, CalendarSyncStatus, DueCalendarReminder,
- EventReminderOverride, EventReminders, EventStart, EventStatus, EventTime,
- EventTransparency, EventVisibility, GOOGLE_CALENDAR_SCOPES, GoogleCalendarSyncSnapshot,
- GoogleScopeSet, GoogleWatchChannel, OccurrenceRange, ProviderCalendar,
- StoredGoogleCalendar, VisibleCalendar,
+ CalendarOccurrenceCursor, CalendarReminderFiring, CalendarSyncStatus, ConferenceProvider,
+ DueCalendarReminder, EventReminderOverride, EventReminders, EventStart, EventStatus,
+ EventTime, EventTransparency, EventVisibility, GOOGLE_CALENDAR_SCOPES,
+ GoogleCalendarSyncSnapshot, GoogleScopeSet, GoogleWatchChannel, OccurrenceRange,
+ ProviderCalendar, StoredGoogleCalendar, VisibleCalendar,
},
ports::{
CalendarBackfillRepository, CalendarEventWrite, CalendarReminderDispatchRepo,
@@ -294,6 +294,7 @@ struct OccurrenceJoinRow {
organizer_email: Option<String>,
organizer_name: Option<String>,
conference_url: Option<String>,
+ conference_provider: Option<String>,
sequence: i32,
is_read_only: bool,
reminders_use_default: bool,
@@ -549,7 +550,8 @@ impl CalendarRepository for PgCalendarRepository {
status, visibility, transparency,
starts_at, ends_at, start_date, end_date, time_zone,
recurrence_lines, organizer_email, organizer_name,
- conference_url, sequence, is_read_only, canonical_source_kind,
+ conference_url, conference_provider, sequence, is_read_only,
+ canonical_source_kind,
canonical_source_updated_at,
reminders_use_default, reminder_overrides,
created_at, updated_at
@@ -559,7 +561,7 @@ impl CalendarRepository for PgCalendarRepository {
$8, $9, $10,
$11, $12, $13, $14, $15,
$16, $17, $18,
- $19, $20, $21, $22, $24,
+ $19, $27, $20, $21, $22, $24,
$25, $26,
$23, $24
)
@@ -579,6 +581,7 @@ impl CalendarRepository for PgCalendarRepository {
organizer_email = EXCLUDED.organizer_email,
organizer_name = EXCLUDED.organizer_name,
conference_url = EXCLUDED.conference_url,
+ conference_provider = EXCLUDED.conference_provider,
sequence = EXCLUDED.sequence,
is_read_only = EXCLUDED.is_read_only,
canonical_source_kind = EXCLUDED.canonical_source_kind,
@@ -621,6 +624,10 @@ impl CalendarRepository for PgCalendarRepository {
upsert.event.updated_at,
upsert.event.reminders.use_default,
serde_json::to_value(&upsert.event.reminders.overrides).map_err(report)?,
+ upsert
+ .event
+ .conference_provider
+ .map(ConferenceProvider::as_str),
)
.fetch_optional(&mut *tx)
.await
@@ -710,6 +717,7 @@ impl CalendarRepository for PgCalendarRepository {
event.organizer_email,
event.organizer_name,
event.conference_url,
+ event.conference_provider,
event.sequence,
event.is_read_only,
event.reminders_use_default,
@@ -2213,6 +2221,7 @@ async fn restore_best_source_or_delete(
organizer_email = $14,
organizer_name = $15,
conference_url = $16,
+ conference_provider = $25,
sequence = $17,
is_read_only = $18,
canonical_source_kind = $19,
@@ -2247,6 +2256,10 @@ async fn restore_best_source_or_delete(
projection.event.updated_at,
projection.event.reminders.use_default,
serde_json::to_value(&projection.event.reminders.overrides).map_err(report)?,
+ projection
+ .event
+ .conference_provider
+ .map(ConferenceProvider::as_str),
)
.execute(&mut **tx)
.await
@@ -2836,6 +2849,7 @@ fn event_from_join(
organizer_email: row.organizer_email,
organizer_name: row.organizer_name,
conference_url: row.conference_url,
+ conference_provider: row.conference_provider.as_deref().map(conference_provider),
sequence: u32::try_from(row.sequence).unwrap_or_default(),
is_read_only: row.is_read_only,
reminders: EventReminders {
@@ -2885,6 +2899,17 @@ fn event_visibility(value: &str) -> EventVisibility {
}
}
+/// Parse the stored provider, treating an unknown value as a third-party
+/// conference so a row written by a newer deployment stays joinable and is
+/// never mistaken for one Macro may detach.
+fn conference_provider(value: &str) -> ConferenceProvider {
+ if value == "google_meet" {
+ ConferenceProvider::GoogleMeet
+ } else {
+ ConferenceProvider::Other
+ }
+}
+
fn event_transparency(value: &str) -> EventTransparency {
if value == "transparent" {
EventTransparency::Transparent
diff --git a/crates/calendar_events/src/outbound/pg/test.rs b/crates/calendar_events/src/outbound/pg/test.rs
index da282adb97..c1d711f986 100644
--- a/crates/calendar_events/src/outbound/pg/test.rs
+++ b/crates/calendar_events/src/outbound/pg/test.rs
@@ -140,6 +140,7 @@ fn timed_upsert(
organizer_email: Some("[email protected]".to_string()),
organizer_name: Some("Organizer".to_string()),
conference_url: None,
+ conference_provider: None,
sequence,
is_read_only: true,
attendees: vec![CalendarAttendee {
@@ -2469,6 +2470,7 @@ fn reminder_upsert(
organizer_email: None,
organizer_name: None,
conference_url: None,
+ conference_provider: None,
sequence: 0,
is_read_only: false,
attendees: Vec::new(),
@@ -2871,3 +2873,56 @@ async fn stale_and_declined_firings_resolve_safely(pool: PgPool) {
.unwrap();
assert_eq!(past, Vec::new());
}
+
+/// The provider classification has to survive the write and come back on the
+/// read path: it is what tells the product a conference is one Macro may
+/// detach, so losing it in persistence would put a third-party conference at
+/// risk of being destroyed by an edit.
+#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]
+async fn conference_provider_round_trips_through_persistence(pool: PgPool) {
+ let owner_id = "macro|[email protected]";
+ let link_id = insert_link(&pool, owner_id).await;
+ let repo = PgCalendarRepository::new(pool.clone());
+ let provider = grant_and_provider_ids(&repo, link_id).await;
+
+ let mut upsert = timed_upsert(
+ owner_id,
+ link_id,
+ provider,
+ "Meeting with a Meet",
+ 1,
+ );
+ upsert.event.conference_url = Some("https://meet.google.com/abc-defg-hij".to_string());
+ upsert.event.conference_provider = Some(ConferenceProvider::GoogleMeet);
+ repo.upsert_event(CalendarEventWrite::UserMutation(upsert))
+ .await
+ .unwrap();
+
+ let starts_at = Utc.with_ymd_and_hms(2026, 7, 24, 0, 0, 0).unwrap();
+ let ends_at = starts_at + Duration::days(2);
+ let occurrences = repo
+ .list_occurrences(
+ owner_id,
+ OccurrenceRange {
+ starts_at,
+ ends_at,
+ start_date: starts_at.date_naive(),
+ end_date: ends_at.date_naive(),
+ },
+ None,
+ 100,
+ )
+ .await
+ .unwrap();
+
+ let (event, _) = occurrences.first().expect("the event is in range");
+ assert_eq!(
+ event.conference_url.as_deref(),
+ Some("https://meet.google.com/abc-defg-hij")
+ );
+ assert_eq!(
+ event.conference_provider,
+ Some(ConferenceProvider::GoogleMeet)
+ );
+}
diff --git a/crates/graphql_soup/src/objects.rs b/crates/graphql_soup/src/objects.rs
index cdd6d0588c..04d87fa89e 100644
--- a/crates/graphql_soup/src/objects.rs
+++ b/crates/graphql_soup/src/objects.rs
@@ -463,6 +463,11 @@ where
self.0.conference_url.as_deref()
}
+ /// Which conferencing system backs the join URL.
+ async fn conference_provider(&self) -> Option<&str> {
+ self.0.conference_provider.as_deref()
+ }
+
/// Whether the canonical source is read-only.
async fn is_read_only(&self) -> bool {
self.0.is_read_only
diff --git a/crates/macro_db_client/migrations/20260811205801_calendar_event_conference_provider.sql b/crates/macro_db_client/migrations/20260811205801_calendar_event_conference_provider.sql
new file mode 100644
index 0000000000..24b688944f
--- /dev/null
+++ b/crates/macro_db_client/migrations/20260811205801_calendar_event_conference_provider.sql
@@ -0,0 +1,15 @@
+-- Records which conferencing system backs an event's conference_url so the
+-- product only offers to attach or detach conferences Macro owns. A
+-- third-party conference (Zoom and friends, arriving as addOn conference
+-- data) stays joinable but is never rewritten by a Macro edit.
+--
+-- Existing rows are backfilled to 'other': the ingestion that wrote them did
+-- not record a solution type, so nothing may claim they are Google Meet.
+-- The next sync of each event reclassifies it from the provider payload.
+ALTER TABLE calendar_events
+ ADD COLUMN conference_provider text
+ CHECK (conference_provider IN ('google_meet', 'other'));
+
+UPDATE calendar_events
+SET conference_provider = 'other'
+WHERE conference_url IS NOT NULL;
diff --git a/crates/models_soup/src/calendar_event.rs b/crates/models_soup/src/calendar_event.rs
index 670b075f53..14fbaaa843 100644
--- a/crates/models_soup/src/calendar_event.rs
+++ b/crates/models_soup/src/calendar_event.rs
@@ -64,6 +64,8 @@ pub struct SoupCalendarEvent<T = ()> {
pub organizer_name: Option<String>,
/// Direct conference join URL.
pub conference_url: Option<String>,
+ /// Which conferencing system backs `conference_url`.
+ pub conference_provider: Option<String>,
/// Whether the selected canonical source is read-only.
pub is_read_only: bool,
/// Entity creation timestamp.
diff --git a/crates/models_soup/src/item.rs b/crates/models_soup/src/item.rs
index ae6e1a8afe..f86346e6ef 100644
--- a/crates/models_soup/src/item.rs
+++ b/crates/models_soup/src/item.rs
@@ -373,6 +373,7 @@ impl<T> SoupItem<T> {
organizer_email,
organizer_name,
conference_url,
+ conference_provider,
is_read_only,
created_at,
updated_at,
@@ -391,6 +392,7 @@ impl<T> SoupItem<T> {
organizer_email,
organizer_name,
conference_url,
+ conference_provider,
is_read_only,
created_at,
updated_at,
diff --git a/crates/soup/src/inbound/toolset/list_entities.rs b/crates/soup/src/inbound/toolset/list_entities.rs
index aa7084f98c..0921d04344 100644
--- a/crates/soup/src/inbound/toolset/list_entities.rs
+++ b/crates/soup/src/inbound/toolset/list_entities.rs
@@ -126,6 +126,8 @@ pub enum EntityItem {
location: Option<String>,
/// Optional conference join URL.
conference_url: Option<String>,
+ /// Which conferencing system backs the join URL.
+ conference_provider: Option<String>,
/// Canonical timed or all-day span.
time: serde_json::Value,
/// Tags on the event visible to the user.
@@ -248,6 +250,7 @@ impl EntityItem {
status: event.status,
location: event.location,
conference_url: event.conference_url,
+ conference_provider: event.conference_provider,
time: serde_json::to_value(event.time).unwrap_or(serde_json::Value::Null),
tags: resolve_applied_tags(&event.extra.properties, tag_map),
},
diff --git a/crates/soup/src/outbound/pg_soup_repo/calendar_event.rs b/crates/soup/src/outbound/pg_soup_repo/calendar_event.rs
index 172cd60194..79c4f6fa7a 100644
--- a/crates/soup/src/outbound/pg_soup_repo/calendar_event.rs
+++ b/crates/soup/src/outbound/pg_soup_repo/calendar_event.rs
@@ -34,6 +34,7 @@ struct CalendarEventRow {
organizer_email: Option<String>,
organizer_name: Option<String>,
conference_url: Option<String>,
+ conference_provider: Option<String>,
is_read_only: bool,
created_at: DateTime<Utc>,
updated_at: DateTime<Utc>,
@@ -187,6 +188,7 @@ fn select_sql() -> &'static str {
event.organizer_email,
event.organizer_name,
event.conference_url,
+ event.conference_provider,
event.is_read_only,
event.created_at,
event.updated_at
@@ -316,6 +318,7 @@ fn row_to_item(row: CalendarEventRow) -> Result<SoupItem<()>, sqlx::Error> {
organizer_email: row.organizer_email,
organizer_name: row.organizer_name,
conference_url: row.conference_url,
+ conference_provider: row.conference_provider,
is_read_only: row.is_read_only,
created_at: row.created_at,
updated_at: row.updated_at,
diff --git a/crates/soup/src/outbound/pg_soup_repo/expanded/dynamic.rs b/crates/soup/src/outbound/pg_soup_repo/expanded/dynamic.rs
index 4bb691f5fc..3b6bcd5389 100644
--- a/crates/soup/src/outbound/pg_soup_repo/expanded/dynamic.rs
+++ b/crates/soup/src/outbound/pg_soup_repo/expanded/dynamic.rs
@@ -448,6 +448,7 @@ static GROUPED_CALENDAR_EVENT_DETAIL_CLAUSE: &str = r#"
'organizerEmail', event.organizer_email,
'organizerName', event.organizer_name,
'conferenceUrl', event.conference_url,
+ 'conferenceProvider', event.conference_provider,
'isReadOnly', event.is_read_only,
'createdAt', event.created_at,
'updatedAt', event.updated_at,
diff --git a/packages/sdk/generated/email/index.ts b/packages/sdk/generated/email/index.ts
index 3e17ad8dda..adf9aa054c 100644
--- a/packages/sdk/generated/email/index.ts
+++ b/packages/sdk/generated/email/index.ts
@@ -1,4 +1,4 @@
// This file is auto-generated by @hey-api/openapi-ts
export { type Options, Sdk } from './sdk.gen';
-export type { AccessLevel, AddDraftAttachmentData, AddDraftAttachmentError, AddDraftAttachmentErrors, AddDraftAttachmentRequest, AddDraftAttachmentResponse, AddDraftAttachmentResponse2, AddDraftAttachmentResponses, AddForwardedAttachmentData, AddForwardedAttachmentError, AddForwardedAttachmentErrors, AddForwardedAttachmentRequest, AddForwardedAttachmentResponse, AddForwardedAttachmentResponse2, AddForwardedAttachmentResponses, AddRemoveLabelData, AddRemoveLabelError, AddRemoveLabelErrors, AddRemoveLabelResponse, AddRemoveLabelResponses, AddRemoveThreadLabelData, AddRemoveThreadLabelError, AddRemoveThreadLabelErrors, AddRemoveThreadLabelResponse, AddRemoveThreadLabelResponses, ApiAttachment, ApiAttachmentDraft, ApiAttachmentForwarded, ApiContact, ApiContactInfo, ApiDraftContactInfo, ApiDraftInput, ApiDraftOutput, ApiEmailFilter, ApiLabel, ApiLabelListVisibility, ApiLabelType, ApiMessage, ApiMessageAttachment, ApiMessageLabel, ApiMessageListVisibility, ApiPaginatedThreadCursor, ApiSortMethod, ApiThread, ApiThreadPreviewCursor, ApiThreadPreviewCursorInner, ArchiveThreadData, ArchiveThreadError, ArchiveThreadErrors, ArchiveThreadRequest, ArchiveThreadResponse, ArchiveThreadResponses, Attachment, AttachmentDraft, AttachmentForwarded, AttendeeResponseStatus, BackfillJob, BackfillJobStatus, BackfillStatus, BlockSenderData, BlockSenderError, BlockSenderErrors, BlockSenderRequest, BlockSenderResponses, CalendarAttendee, CalendarAttendeeInputBody, CalendarDeletionScopeParam, CalendarEvent, CalendarMutationApiError, CalendarMutationErrorCode, CalendarRsvpScopeParam, CancelBackfillGmailData, CancelBackfillGmailError, CancelBackfillGmailErrors, CancelBackfillGmailResponse, CancelBackfillGmailResponses, CancelBackfillParams, ClientOptions, Contact, ContactInfo, ContactInfoLegacy, ContactInfoWithInteraction, CreateCalendarEventData, CreateCalendarEventError, CreateCalendarEventErrors, CreateCalendarEventRequest, CreateCalendarEventResponse, CreateCalendarEventResponses, CreateDraftData, CreateDraftError, CreateDraftErrors, CreateDraftRequest, CreateDraftResponse, CreateDraftResponse2, CreateDraftResponses, CreateLabelData, CreateLabelError, CreateLabelErrors, CreateLabelRequest, CreateLabelResponse, CreateLabelResponse2, CreateLabelResponses, DeleteCalendarEventData, DeleteCalendarEventError, DeleteCalendarEventErrors, DeleteCalendarEventResponse, DeleteCalendarEventResponses, DeleteDraftData, DeleteDraftError, DeleteDraftErrors, DeleteDraftResponse, DeleteDraftResponses, DeleteEmailFilterData, DeleteEmailFilterError, DeleteEmailFilterErrors, DeleteEmailFilterResponse, DeleteEmailFilterResponses, DeleteLabelData, DeleteLabelError, DeleteLabelErrors, DeleteLabelResponse, DeleteLabelResponses, DeleteLinkData, DeleteLinkError, DeleteLinkErrors, DeleteLinkResponse, DeleteLinkResponses, DeleteScheduledDraftData, DeleteScheduledDraftError, DeleteScheduledDraftErrors, DeleteScheduledDraftResponse, DeleteScheduledDraftResponses, DisableSyncData, DisableSyncError, DisableSyncErrors, DisableSyncResponse, DisableSyncResponses, EmptyResponse, ErrorResponse, EventReminderOverride, EventReminders, EventStatus, EventTime, EventTransparency, EventVisibility, GetActiveBackfillJobResponse, GetAttachmentData, GetAttachmentDocumentIdData, GetAttachmentDocumentIdError, GetAttachmentDocumentIdErrors, GetAttachmentDocumentIdResponse, GetAttachmentDocumentIdResponse2, GetAttachmentDocumentIdResponses, GetAttachmentError, GetAttachmentErrors, GetAttachmentResponse, GetAttachmentResponse2, GetAttachmentResponses, GetBackfillGmailActiveData, GetBackfillGmailActiveError, GetBackfillGmailActiveErrors, GetBackfillGmailActiveResponse, GetBackfillGmailActiveResponses, GetBackfillGmailData, GetBackfillGmailError, GetBackfillGmailErrors, GetBackfillGmailResponse, GetBackfillGmailResponses, GetBackfillJobResponse, GetMessageData, GetMessageError, GetMessageErrors, GetMessageResponse, GetMessageResponses, GetMessagesBatchData, GetMessagesBatchError, GetMessagesBatchErrors, GetMessagesBatchResponse, GetMessagesBatchResponses, GetPreviewsCursorParams, GetScheduledMessagesData, GetScheduledMessagesError, GetScheduledMessagesErrors, GetScheduledMessagesResponse, GetScheduledMessagesResponses, GetScheduledResponse, GetThreadData, GetThreadError, GetThreadErrors, GetThreadMessagesHandlerData, GetThreadMessagesHandlerError, GetThreadMessagesHandlerErrors, GetThreadMessagesHandlerResponse, GetThreadMessagesHandlerResponses, GetThreadResponse, GetThreadResponse2, GetThreadResponses, HealthCheckLinksData, HealthCheckLinksError, HealthCheckLinksErrors, HealthCheckLinksResponse, HealthCheckLinksResponses, HealthHandlerData, HealthHandlerResponse, HealthHandlerResponses, InitErrorCodeResponse, InitResponse, InitUserData, InitUserError, InitUserErrors, InitUserResponse, InitUserResponses, Label, LabelInfo, LabelListVisibility, LabelType, Link, ListBackfillGmailData, ListBackfillGmailError, ListBackfillGmailErrors, ListBackfillGmailResponse, ListBackfillGmailResponses, ListBackfillJobsResponse, ListBlockedResponse, ListBlockedSendersData, ListBlockedSendersError, ListBlockedSendersErrors, ListBlockedSendersResponse, ListBlockedSendersResponses, ListCalendarsData, ListCalendarsError, ListCalendarsErrors, ListCalendarsResponse, ListCalendarsResponse2, ListCalendarsResponses, ListContactsData, ListContactsError, ListContactsErrors, ListContactsResponse, ListContactsResponse2, ListContactsResponses, ListEmailFiltersData, ListEmailFiltersError, ListEmailFiltersErrors, ListEmailFiltersResponse, ListEmailFiltersResponse2, ListEmailFiltersResponses, ListLabelsData, ListLabelsError, ListLabelsErrors, ListLabelsResponse, ListLabelsResponse2, ListLabelsResponses, ListLinksData, ListLinksError, ListLinksErrors, ListLinksResponse, ListLinksResponse2, ListLinksResponses, Message, MessageListVisibility, ParsedMessage, PatchSettingsData, PatchSettingsError, PatchSettingsErrors, PatchSettingsRequest, PatchSettingsResponse, PatchSettingsResponse2, PatchSettingsResponses, PreviewsInboxCursorData, PreviewsInboxCursorError, PreviewsInboxCursorErrors, PreviewsInboxCursorResponse, PreviewsInboxCursorResponses, PreviewView, PreviewViewStandardLabel, RefreshCalendarEvent, RefreshEmailEvent, RemoveDraftAttachmentData, RemoveDraftAttachmentError, RemoveDraftAttachmentErrors, RemoveDraftAttachmentResponse, RemoveDraftAttachmentResponses, RemoveForwardedAttachmentData, RemoveForwardedAttachmentError, RemoveForwardedAttachmentErrors, RemoveForwardedAttachmentResponse, RemoveForwardedAttachmentResponses, ResyncLinkData, ResyncLinkError, ResyncLinkErrors, ResyncLinkResponse, ResyncLinkResponses, ResyncResponse, RsvpCalendarEventData, RsvpCalendarEventError, RsvpCalendarEventErrors, RsvpCalendarEventRequest, RsvpCalendarEventResponse, RsvpCalendarEventResponses, SendMessageData, SendMessageError, SendMessageErrors, SendMessageRequest, SendMessageResponse, SendMessageResponse2, SendMessageResponses, Settings, SharedInboxConflictResponse, SyncStatus, Thread, ThreadList, ThreadPreviewCursor, ThreadSeenData, ThreadSeenError, ThreadSeenErrors, ThreadSeenResponse, ThreadSeenResponses, ThreadSummary, UnblockSenderData, UnblockSenderError, UnblockSenderErrors, UnblockSenderRequest, UnblockSenderResponse, UnblockSenderResponses, UnresolvedSignatureImagesError, UpdateCalendarEventData, UpdateCalendarEventError, UpdateCalendarEventErrors, UpdateCalendarEventRequest, UpdateCalendarEventResponse, UpdateCalendarEventResponses, UpdateLabelBatchRequest, UpdateLabelBatchResponse, UpdateThreadLabelRequest, UpdateThreadLabelsResponse, UpdateThreadProjectData, UpdateThreadProjectError, UpdateThreadProjectErrors, UpdateThreadProjectRequest, UpdateThreadProjectResponse, UpdateThreadProjectResponse2, UpdateThreadProjectResponses, UpsertEmailFilterData, UpsertEmailFilterError, UpsertEmailFilterErrors, UpsertEmailFilterRequest, UpsertEmailFilterResponse, UpsertEmailFilterResponse2, UpsertEmailFilterResponses, UpsertScheduledMessageData, UpsertScheduledMessageError, UpsertScheduledMessageErrors, UpsertScheduledMessageResponse, UpsertScheduledMessageResponses, UpsertScheduledRequest, UpsertScheduledResponse, UserProvider, Value, VisibleCalendar } from './types.gen';
+export type { AccessLevel, AddDraftAttachmentData, AddDraftAttachmentError, AddDraftAttachmentErrors, AddDraftAttachmentRequest, AddDraftAttachmentResponse, AddDraftAttachmentResponse2, AddDraftAttachmentResponses, AddForwardedAttachmentData, AddForwardedAttachmentError, AddForwardedAttachmentErrors, AddForwardedAttachmentRequest, AddForwardedAttachmentResponse, AddForwardedAttachmentResponse2, AddForwardedAttachmentResponses, AddRemoveLabelData, AddRemoveLabelError, AddRemoveLabelErrors, AddRemoveLabelResponse, AddRemoveLabelResponses, AddRemoveThreadLabelData, AddRemoveThreadLabelError, AddRemoveThreadLabelErrors, AddRemoveThreadLabelResponse, AddRemoveThreadLabelResponses, ApiAttachment, ApiAttachmentDraft, ApiAttachmentForwarded, ApiContact, ApiContactInfo, ApiDraftContactInfo, ApiDraftInput, ApiDraftOutput, ApiEmailFilter, ApiLabel, ApiLabelListVisibility, ApiLabelType, ApiMessage, ApiMessageAttachment, ApiMessageLabel, ApiMessageListVisibility, ApiPaginatedThreadCursor, ApiSortMethod, ApiThread, ApiThreadPreviewCursor, ApiThreadPreviewCursorInner, ArchiveThreadData, ArchiveThreadError, ArchiveThreadErrors, ArchiveThreadRequest, ArchiveThreadResponse, ArchiveThreadResponses, Attachment, AttachmentDraft, AttachmentForwarded, AttendeeResponseStatus, BackfillJob, BackfillJobStatus, BackfillStatus, BlockSenderData, BlockSenderError, BlockSenderErrors, BlockSenderRequest, BlockSenderResponses, CalendarAttendee, CalendarAttendeeInputBody, CalendarDeletionScopeParam, CalendarEvent, CalendarMutationApiError, CalendarMutationErrorCode, CalendarRsvpScopeParam, CancelBackfillGmailData, CancelBackfillGmailError, CancelBackfillGmailErrors, CancelBackfillGmailResponse, CancelBackfillGmailResponses, CancelBackfillParams, ClientOptions, ConferenceChange, ConferenceProvider, Contact, ContactInfo, ContactInfoLegacy, ContactInfoWithInteraction, CreateCalendarEventData, CreateCalendarEventError, CreateCalendarEventErrors, CreateCalendarEventRequest, CreateCalendarEventResponse, CreateCalendarEventResponses, CreateDraftData, CreateDraftError, CreateDraftErrors, CreateDraftRequest, CreateDraftResponse, CreateDraftResponse2, CreateDraftResponses, CreateLabelData, CreateLabelError, CreateLabelErrors, CreateLabelRequest, CreateLabelResponse, CreateLabelResponse2, CreateLabelResponses, DeleteCalendarEventData, DeleteCalendarEventError, DeleteCalendarEventErrors, DeleteCalendarEventResponse, DeleteCalendarEventResponses, DeleteDraftData, DeleteDraftError, DeleteDraftErrors, DeleteDraftResponse, DeleteDraftResponses, DeleteEmailFilterData, DeleteEmailFilterError, DeleteEmailFilterErrors, DeleteEmailFilterResponse, DeleteEmailFilterResponses, DeleteLabelData, DeleteLabelError, DeleteLabelErrors, DeleteLabelResponse, DeleteLabelResponses, DeleteLinkData, DeleteLinkError, DeleteLinkErrors, DeleteLinkResponse, DeleteLinkResponses, DeleteScheduledDraftData, DeleteScheduledDraftError, DeleteScheduledDraftErrors, DeleteScheduledDraftResponse, DeleteScheduledDraftResponses, DisableSyncData, DisableSyncError, DisableSyncErrors, DisableSyncResponse, DisableSyncResponses, EmptyResponse, ErrorResponse, EventReminderOverride, EventReminders, EventStatus, EventTime, EventTransparency, EventVisibility, GetActiveBackfillJobResponse, GetAttachmentData, GetAttachmentDocumentIdData, GetAttachmentDocumentIdError, GetAttachmentDocumentIdErrors, GetAttachmentDocumentIdResponse, GetAttachmentDocumentIdResponse2, GetAttachmentDocumentIdResponses, GetAttachmentError, GetAttachmentErrors, GetAttachmentResponse, GetAttachmentResponse2, GetAttachmentResponses, GetBackfillGmailActiveData, GetBackfillGmailActiveError, GetBackfillGmailActiveErrors, GetBackfillGmailActiveResponse, GetBackfillGmailActiveResponses, GetBackfillGmailData, GetBackfillGmailError, GetBackfillGmailErrors, GetBackfillGmailResponse, GetBackfillGmailResponses, GetBackfillJobResponse, GetMessageData, GetMessageError, GetMessageErrors, GetMessageResponse, GetMessageResponses, GetMessagesBatchData, GetMessagesBatchError, GetMessagesBatchErrors, GetMessagesBatchResponse, GetMessagesBatchResponses, GetPreviewsCursorParams, GetScheduledMessagesData, GetScheduledMessagesError, GetScheduledMessagesErrors, GetScheduledMessagesResponse, GetScheduledMessagesResponses, GetScheduledResponse, GetThreadData, GetThreadError, GetThreadErrors, GetThreadMessagesHandlerData, GetThreadMessagesHandlerError, GetThreadMessagesHandlerErrors, GetThreadMessagesHandlerResponse, GetThreadMessagesHandlerResponses, GetThreadResponse, GetThreadResponse2, GetThreadResponses, HealthCheckLinksData, HealthCheckLinksError, HealthCheckLinksErrors, HealthCheckLinksResponse, HealthCheckLinksResponses, HealthHandlerData, HealthHandlerResponse, HealthHandlerResponses, InitErrorCodeResponse, InitResponse, InitUserData, InitUserError, InitUserErrors, InitUserResponse, InitUserResponses, Label, LabelInfo, LabelListVisibility, LabelType, Link, ListBackfillGmailData, ListBackfillGmailError, ListBackfillGmailErrors, ListBackfillGmailResponse, ListBackfillGmailResponses, ListBackfillJobsResponse, ListBlockedResponse, ListBlockedSendersData, ListBlockedSendersError, ListBlockedSendersErrors, ListBlockedSendersResponse, ListBlockedSendersResponses, ListCalendarsData, ListCalendarsError, ListCalendarsErrors, ListCalendarsResponse, ListCalendarsResponse2, ListCalendarsResponses, ListContactsData, ListContactsError, ListContactsErrors, ListContactsResponse, ListContactsResponse2, ListContactsResponses, ListEmailFiltersData, ListEmailFiltersError, ListEmailFiltersErrors, ListEmailFiltersResponse, ListEmailFiltersResponse2, ListEmailFiltersResponses, ListLabelsData, ListLabelsError, ListLabelsErrors, ListLabelsResponse, ListLabelsResponse2, ListLabelsResponses, ListLinksData, ListLinksError, ListLinksErrors, ListLinksResponse, ListLinksResponse2, ListLinksResponses, Message, MessageListVisibility, ParsedMessage, PatchSettingsData, PatchSettingsError, PatchSettingsErrors, PatchSettingsRequest, PatchSettingsResponse, PatchSettingsResponse2, PatchSettingsResponses, PreviewsInboxCursorData, PreviewsInboxCursorError, PreviewsInboxCursorErrors, PreviewsInboxCursorResponse, PreviewsInboxCursorResponses, PreviewView, PreviewViewStandardLabel, RefreshCalendarEvent, RefreshEmailEvent, RemoveDraftAttachmentData, RemoveDraftAttachmentError, RemoveDraftAttachmentErrors, RemoveDraftAttachmentResponse, RemoveDraftAttachmentResponses, RemoveForwardedAttachmentData, RemoveForwardedAttachmentError, RemoveForwardedAttachmentErrors, RemoveForwardedAttachmentResponse, RemoveForwardedAttachmentResponses, ResyncLinkData, ResyncLinkError, ResyncLinkErrors, ResyncLinkResponse, ResyncLinkResponses, ResyncResponse, RsvpCalendarEventData, RsvpCalendarEventError, RsvpCalendarEventErrors, RsvpCalendarEventRequest, RsvpCalendarEventResponse, RsvpCalendarEventResponses, SendMessageData, SendMessageError, SendMessageErrors, SendMessageRequest, SendMessageResponse, SendMessageResponse2, SendMessageResponses, Settings, SharedInboxConflictResponse, SyncStatus, Thread, ThreadList, ThreadPreviewCursor, ThreadSeenData, ThreadSeenError, ThreadSeenErrors, ThreadSeenResponse, ThreadSeenResponses, ThreadSummary, UnblockSenderData, UnblockSenderError, UnblockSenderErrors, UnblockSenderRequest, UnblockSenderResponse, UnblockSenderResponses, UnresolvedSignatureImagesError, UpdateCalendarEventData, UpdateCalendarEventError, UpdateCalendarEventErrors, UpdateCalendarEventRequest, UpdateCalendarEventResponse, UpdateCalendarEventResponses, UpdateLabelBatchRequest, UpdateLabelBatchResponse, UpdateThreadLabelRequest, UpdateThreadLabelsResponse, UpdateThreadProjectData, UpdateThreadProjectError, UpdateThreadProjectErrors, UpdateThreadProjectRequest, UpdateThreadProjectResponse, UpdateThreadProjectResponse2, UpdateThreadProjectResponses, UpsertEmailFilterData, UpsertEmailFilterError, UpsertEmailFilterErrors, UpsertEmailFilterRequest, UpsertEmailFilterResponse, UpsertEmailFilterResponse2, UpsertEmailFilterResponses, UpsertScheduledMessageData, UpsertScheduledMessageError, UpsertScheduledMessageErrors, UpsertScheduledMessageResponse, UpsertScheduledMessageResponses, UpsertScheduledRequest, UpsertScheduledResponse, UserProvider, Value, VisibleCalendar } from './types.gen';
diff --git a/packages/sdk/generated/email/types.gen.ts b/packages/sdk/generated/email/types.gen.ts
index e81b95fea0..4a8044c791 100644
--- a/packages/sdk/generated/email/types.gen.ts
+++ b/packages/sdk/generated/email/types.gen.ts
@@ -600,6 +600,7 @@ export type CalendarEvent = {
* projections stored before calendars were attributed.
*/
calendarId?: string | null;
+ conferenceProvider?: null | ConferenceProvider;
/**
* Direct join URL when known.
*/
@@ -712,6 +713,28 @@ export type CancelBackfillParams = {
job_id: string;
};
+/**
+ * A requested change to an event's conferencing. Omitting the field leaves
+ * the existing conference untouched; only these values change it.
+ */
+export type ConferenceChange = 'google_meet' | 'none';
+
+/**
+ * The conferencing system backing an event's join URL.
+ *
+ * Macro generates only Google Meet conferences, so this distinguishes one it
+ * created from a third party's — Zoom and friends arriving as `addOn`
+ * conference data, or a legacy classic Hangout. Clients use it to label the
+ * conference and to tell whether the Meet toggle reflects a Macro-managed
+ * conference.
+ *
+ * It does not gate mutation. An explicit request replaces or detaches any
+ * conference, third-party included, exactly as deleting the event would;
+ * what protects a conference is that omitting the field leaves it untouched,
+ * so an unrelated edit never disturbs it.
+ */
+export type ConferenceProvider = 'google_meet' | 'other';
+
export type Contact = {
email_address?: string | null;
id: string;
@@ -751,6 +774,7 @@ export type CreateCalendarEventRequest = {
* inbox default.
*/
calendarId?: string | null;
+ conference?: null | ConferenceChange;
/**
* Optional event body.
*/
@@ -1386,6 +1410,7 @@ export type UpdateCalendarEventRequest = {
* Replacement attendee list.
*/
attendees?: Array<CalendarAttendeeInputBody> | null;
+ conference?: null | ConferenceChange;
/**
* Replacement description; an empty string clears it.
*/
diff --git a/packages/sdk/generated/storage/index.ts b/packages/sdk/generated/storage/index.ts
index 7ee1803a56..4b880786c9 100644
--- a/packages/sdk/generated/storage/index.ts
+++ b/packages/sdk/generated/storage/index.ts
@@ -1,4 +1,4 @@
// This file is auto-generated by @hey-api/openapi-ts
export { type Options, Sdk } from './sdk.gen';
-export type { AccessLevel, Activity, ActivityType, AddFavoriteData, AddFavoriteError, AddFavoriteErrors, AddFavoriteRequest, AddFavoriteResponse, AddFavoriteResponses, AddParticipantsData, AddParticipantsError, AddParticipantsErrors, AddParticipantsRequest, AddParticipantsResponses, AddPinHandlerData, AddPinHandlerError, AddPinHandlerErrors, AddPinHandlerResponse, AddPinHandlerResponses, AddPinRequest, Anchor, AnchorId, AnchorRequest, AnchorResponse, AnnotationIncrementalUpdate, ApiActivity, ApiAttachmentChannelReference, ApiAttachmentEntityReference, ApiAttachmentGenericReference, ApiChannelAttachment, ApiChannelAttachmentsPage, ApiChannelContextMessage, ApiChannelDetail, ApiChannelListMessage, ApiChannelListPage, ApiChannelListParticipant, ApiChannelListType, ApiChannelMessage, ApiChannelMessageKind, ApiChannelMessagesPage, ApiChannelParticipant, ApiChannelWithLatest, ApiCountedReaction, ApiEntityFilterAst, ApiGroupByField, ApiGroupMeta, ApiMessageAttachment, ApiMessageSender, ApiMessageSenderType, ApiParticipantListRole, ApiParticipantRole, ApiPropertyEntityType, ApiResolvedChannelMessage, ApiThreadInfo, ApiThreadReply, AttendeeResponseStatus, BasicDocument, BasicDocumentSubType, BomPart, Bot, BotChannel, BotChannelType, BotId, BotKind, BotOwner, BotToken, BranchNameResponse, BTreeMap, BulkWakeupRequest, BulkWakeupResponse, BulkWakeupSyncServiceDocumentsData, BulkWakeupSyncServiceDocumentsErrors, BulkWakeupSyncServiceDocumentsResponse, BulkWakeupSyncServiceDocumentsResponses, CalendarAttendee, CalendarEvent, CalendarEventFilters, CalendarOccurrence, CalendarOccurrenceItem, CalendarOccurrenceResponse, CalendarSyncStatus, CallActiveResponse, CallFilters, CallRecord, CallRecordParticipant, CallRecordPreview, CallRecordPreviewData, CallRecordTranscriptSegment, CallStatus, CallTokenResponse, CallWebhookData, CallWebhookError, CallWebhookErrors, CallWebhookResponses, Channel, ChannelCreatedMetadata, ChannelDeletedMetadata, ChannelEventAttachment, ChannelFilters, ChannelJoinCodeResponse, ChannelMentionedMetadata, ChannelMessage, ChannelMessageAttachmentCreatedMetadata, ChannelMessageAttachmentRemovedMetadata, ChannelMessageDeletedMetadata, ChannelMessageFilters, ChannelMessagePatchedMetadata, ChannelMessagePostedMetadata, ChannelParticipant, ChannelParticipantAddedMetadata, ChannelParticipantRemovedMetadata, ChannelPreview, ChannelPreviewData, ChannelSender, ChannelSharePermission, ChannelThreadFilters, ChannelTopicEvent, ChannelType, ChannelUpdatedMetadata, ChannelWebhookRequest, ChannelWebhookResponse, ChannelWithParticipants, Chat, ChatFilters, CheckActiveCallData, CheckActiveCallError, CheckActiveCallErrors, CheckActiveCallResponse, CheckActiveCallResponses, ClientOptions, CloudStorageItemType, Comment, CommentThread, CopyDocumentData, CopyDocumentError, CopyDocumentErrors, CopyDocumentQueryParams, CopyDocumentRequest, CopyDocumentResponse, CopyDocumentResponse2, CopyDocumentResponses, CreateAnchorData, CreateAnchorError, CreateAnchorErrors, CreateAnchorResponse, CreateAnchorResponses, CreateBulkDocumentResponse, CreateBulkDocumentResponseData, CreateChannelData, CreateChannelError, CreateChannelErrors, CreateChannelRequest, CreateChannelResponse, CreateChannelResponse2, CreateChannelResponses, CreateChannelScopedBotData, CreateChannelScopedBotError, CreateChannelScopedBotErrors, CreateChannelScopedBotRequest, CreateChannelScopedBotResponse, CreateChannelScopedBotResponse2, CreateChannelScopedBotResponses, CreateCommentData, CreateCommentError, CreateCommentErrors, CreateCommentRequest, CreateCommentResponse, CreateCommentResponse2, CreateCommentResponses, CreateCrmCommentData, CreateCrmCommentError, CreateCrmCommentErrors, CreateCrmCommentRequest, CreateCrmCommentResponse, CreateCrmCommentResponses, CreateCrmCompanyData, CreateCrmCompanyError, CreateCrmCompanyErrors, CreateCrmCompanyRequest, CreateCrmCompanyResponse, CreateCrmCompanyResponses, CreateCrmContactData, CreateCrmContactError, CreateCrmContactErrors, CreateCrmContactRequest, CreateCrmContactResponse, CreateCrmContactResponses, CreateDocumentData, CreateDocumentError, CreateDocumentErrors, CreateDocumentRequest, CreateDocumentResponse, CreateDocumentResponseData, CreateDocumentResponses, CreateEntityMentionData, CreateEntityMentionError, CreateEntityMentionErrors, CreateEntityMentionRequest, CreateEntityMentionResponse, CreateEntityMentionResponse2, CreateEntityMentionResponses, CreateInstructionsDocumentResponse, CreateInstructionsHandlerData, CreateInstructionsHandlerError, CreateInstructionsHandlerErrors, CreateInstructionsHandlerResponse, CreateInstructionsHandlerResponses, CreateMarkdownDocumentRequest, CreateMarkdownDocumentResponse, CreateMarkdownHandlerData, CreateMarkdownHandlerError, CreateMarkdownHandlerErrors, CreateMarkdownHandlerResponse, CreateMarkdownHandlerResponses, CreateProjectHandlerData, CreateProjectHandlerError, CreateProjectHandlerErrors, CreateProjectHandlerResponse, CreateProjectHandlerResponses, CreateProjectRequest, CreateProjectResponse, CreateReminderData, CreateReminderError, CreateReminderErrors, CreateReminderRequest, CreateReminderResponse, CreateReminderResponses, CreateSkillHandlerData, CreateSkillHandlerError, CreateSkillHandlerErrors, CreateSkillHandlerResponse, CreateSkillHandlerResponses, CreateSkillRequest, CreateSkillResponse, CreateSnippetHandlerData, CreateSnippetHandlerError, CreateSnippetHandlerErrors, CreateSnippetHandlerResponse, CreateSnippetHandlerResponses, CreateSnippetRequest, CreateSnippetResponse, CreateTaskHandlerData, CreateTaskHandlerError, CreateTaskHandlerErrors, CreateTaskHandlerResponse, CreateTaskHandlerResponses, CreateTaskRequest, CreateTaskResponse, CreateUnthreadedAnchorRequest, CreateUnthreadedAnchorResponse, CreateUnthreadedPdfAnchorRequest, CreateViewHandlerData, CreateViewHandlerError, CreateViewHandlerErrors, CreateViewHandlerResponse, CreateViewHandlerResponses, CreateViewRequest, CreateWebhookData, CreateWebhookError, CreateWebhookErrors, CreateWebhookRequest, CreateWebhookResponse, CreateWebhookResponse2, CreateWebhookResponses, CrmComment, CrmCommentEntityType, CrmCommentThread, CrmCompanyFilters, CrmCompanyResponse, CrmContactResponse, CrmDomainResponse, CrmPermissionRole, CrmTeamSettingsResponse, CrmThread, CustomSpeakerAssignment, DataType, DeleteAnchorData, DeleteAnchorError, DeleteAnchorErrors, DeleteAnchorInfo, DeleteAnchorResponse, DeleteAnchorResponses, DeleteCallRecordData, DeleteCallRecordError, DeleteCallRecordErrors, DeleteCallRecordResponse, DeleteCallRecordResponses, DeleteChannelData, DeleteChannelError, DeleteChannelErrors, DeleteChannelResponse, DeleteChannelResponses, DeleteCommentData, DeleteCommentError, DeleteCommentErrors, DeleteCommentRequest, DeleteCommentResponse, DeleteCommentResponse2, DeleteCommentResponses, DeleteCrmCommentData, DeleteCrmCommentError, DeleteCrmCommentErrors, DeleteCrmCommentResponse, DeleteCrmCommentResponses, DeleteCrmCommentResult, DeleteDocumentData, DeleteDocumentError, DeleteDocumentErrors, DeleteDocumentResponse, DeleteDocumentResponses, DeleteEntityMentionData, DeleteEntityMentionError, DeleteEntityMentionErrors, DeleteEntityMentionResponse, DeleteEntityMentionResponse2, DeleteEntityMentionResponses, DeleteHistoryHandlerData, DeleteHistoryHandlerError, DeleteHistoryHandlerErrors, DeleteHistoryHandlerResponse, DeleteHistoryHandlerResponses, DeleteMessageData, DeleteMessageError, DeleteMessageErrors, DeleteMessageQuery, DeleteMessageResponse, DeleteMessageResponses, DeleteProjectHandlerData, DeleteProjectHandlerError, DeleteProjectHandlerErrors, DeleteProjectHandlerResponse, DeleteProjectHandlerResponses, DeleteReminderData, DeleteReminderError, DeleteReminderErrors, DeleteReminderResponse, DeleteReminderResponses, DeleteThreadInfo, DeleteUnthreadedAnchorRequest, DeleteUnthreadedAnchorResponse, DeleteUnthreadedPdfAnchorRequest, DeleteUserDocumentViewLocationData, DeleteUserDocumentViewLocationError, DeleteUserDocumentViewLocationErrors, DeleteUserDocumentViewLocationResponse, DeleteUserDocumentViewLocationResponses, DeleteViewHandlerData, DeleteViewHandlerError, DeleteViewHandlerErrors, DeleteViewHandlerResponses, DeleteWebhookData, DeleteWebhookError, DeleteWebhookErrors, DeleteWebhookResponse, DeleteWebhookResponses, DocumentBasic, DocumentContent, DocumentContentLocation, DocumentContentState, DocumentContentUploadedMetadata, DocumentCopiedMetadata, DocumentCreatedMetadata, DocumentDeletedMetadata, DocumentFilters, DocumentInteractionMetadata, DocumentMetadata, DocumentMetadataWithContent, DocumentPermissionsToken, DocumentPermissionsTokenRequest, DocumentPermissionsTokenResponse, DocumentPreview, DocumentPreviewData, DocumentPreviewDataSubType, DocumentPurgedMetadata, DocumentResponse, DocumentResponseMetadata, DocumentResponseMetadataWithContent, DocumentStorageServiceApiVersion, DocumentSubType, DocumentSyncContentUpdatedMetadata, DocumentTeamShareResponse, DocumentTopicEvent, DocumentUpdatedMetadata, EditAnchorData, EditAnchorError, EditAnchorErrors, EditAnchorRequest, EditAnchorResponse, EditAnchorResponse2, EditAnchorResponses, EditCallRecordData, EditCallRecordError, EditCallRecordErrors, EditCallRecordRequest, EditCallRecordResponse, EditCallRecordResponses, EditCallTranscriptData, EditCallTranscriptError, EditCallTranscriptErrors, EditCallTranscriptRequest, EditCallTranscriptResponse, EditCallTranscriptResponses, EditCommentData, EditCommentError, EditCommentErrors, EditCommentRequest, EditCommentResponse, EditCommentResponse2, EditCommentResponses, EditCrmCommentData, EditCrmCommentError, EditCrmCommentErrors, EditCrmCommentRequest, EditCrmCommentResponse, EditCrmCommentResponses, EditDocumentData, EditDocumentError, EditDocumentErrors, EditDocumentResponse, EditDocumentResponse2, EditDocumentResponses, EditDocumentServiceArgs, EditPdfAnchorRequest, EditPdfPlaceableCommentAnchorRequest, EditProjectV2Data, EditProjectV2Error, EditProjectV2Errors, EditProjectV2Response, EditProjectV2Responses, EditThreadV2Data, EditThreadV2Error, EditThreadV2Errors, EditThreadV2Response, EditThreadV2Responses, EmailFilters, EmptyResponse, EntityFilters, EntityPermission, EntityPermissionResponse, EntityReference, EntityType, ErrorResponse, EventReminderOverride, EventReminders, EventStatus, EventTime, EventTransparency, EventVisibility, ExcludedDefaultView, ExcludeDefaultViewHandlerData, ExcludeDefaultViewHandlerError, ExcludeDefaultViewHandlerErrors, ExcludeDefaultViewHandlerResponses, ExcludeDefaultViewRequest, ExportDocumentData, ExportDocumentError, ExportDocumentErrors, ExportDocumentResponse, ExportDocumentResponse2, ExportDocumentResponses, Favorite, FavoriteEntityRef, FavoritesList, FileSystemNodeWithIds, FileType, FileTypeUpdate, FolderItem, ForeignEntity, ForeignEntityFilters, GenericErrorResponse, GenericResponse, GenericSuccessResponse, GetActivitiesResponse, GetActivityData, GetActivityError, GetActivityErrors, GetActivityResponse, GetActivityResponses, GetAttachmentReferencesData, GetAttachmentReferencesError, GetAttachmentReferencesErrors, GetAttachmentReferencesResponse, GetAttachmentReferencesResponse2, GetAttachmentReferencesResponses, GetBatchCallRecordPreviewData, GetBatchCallRecordPreviewError, GetBatchCallRecordPreviewErrors, GetBatchCallRecordPreviewRequest, GetBatchCallRecordPreviewResponse, GetBatchCallRecordPreviewResponse2, GetBatchCallRecordPreviewResponses, GetBatchChannelPreviewData, GetBatchChannelPreviewError, GetBatchChannelPreviewErrors, GetBatchChannelPreviewRequest, GetBatchChannelPreviewResponse, GetBatchChannelPreviewResponse2, GetBatchChannelPreviewResponses, GetBatchPreviewHandlerData, GetBatchPreviewHandlerError, GetBatchPreviewHandlerErrors, GetBatchPreviewHandlerResponse, GetBatchPreviewHandlerResponses, GetBatchPreviewRequest, GetBatchPreviewResponse, GetBatchProjectPreviewData, GetBatchProjectPreviewError, GetBatchProjectPreviewErrors, GetBatchProjectPreviewRequest, GetBatchProjectPreviewResponse, GetBatchProjectPreviewResponse2, GetBatchProjectPreviewResponses, GetCallRecordData, GetCallRecordError, GetCallRecordErrors, GetCallRecordResponse, GetCallRecordResponses, GetChannelAttachmentsData, GetChannelAttachmentsError, GetChannelAttachmentsErrors, GetChannelAttachmentsResponse, GetChannelAttachmentsResponses, GetChannelData, GetChannelError, GetChannelErrors, GetChannelJoinLinkData, GetChannelJoinLinkError, GetChannelJoinLinkErrors, GetChannelJoinLinkResponse, GetChannelJoinLinkResponses, GetChannelMessagesData, GetChannelMessagesError, GetChannelMessagesErrors, GetChannelMessagesResponse, GetChannelMessagesResponses, GetChannelParticipantsData, GetChannelParticipantsError, GetChannelParticipantsErrors, GetChannelParticipantsResponse, GetChannelParticipantsResponses, GetChannelResponse, GetChannelResponses, GetChannelsData, GetChannelsError, GetChannelsErrors, GetChannelsResponse, GetChannelsResponses, GetCompanyData, GetCompanyError, GetCompanyErrors, GetCompanyResponse, GetCompanyResponses, GetContactData, GetContactError, GetContactErrors, GetContactResponse, GetContactResponses, GetCrmTeamSettingsData, GetCrmTeamSettingsError, GetCrmTeamSettingsErrors, GetCrmTeamSettingsResponse, GetCrmTeamSettingsResponses, GetDocumentAnchorsData, GetDocumentAnchorsError, GetDocumentAnchorsErrors, GetDocumentAnchorsResponse, GetDocumentAnchorsResponses, GetDocumentBranchNameData, GetDocumentBranchNameError, GetDocumentBranchNameErrors, GetDocumentBranchNameResponse, GetDocumentBranchNameResponses, GetDocumentByTeamSlugData, GetDocumentByTeamSlugError, GetDocumentByTeamSlugErrors, GetDocumentByTeamSlugResponse, GetDocumentByTeamSlugResponses, GetDocumentCommentsData, GetDocumentCommentsError, GetDocumentCommentsErrors, GetDocumentCommentsResponse, GetDocumentCommentsResponses, GetDocumentData, GetDocumentError, GetDocumentErrors, GetDocumentGithubPullRequestsData, GetDocumentGithubPullRequestsError, GetDocumentGithubPullRequestsErrors, GetDocumentGithubPullRequestsResponse, GetDocumentGithubPullRequestsResponses, GetDocumentKeyResponse, GetDocumentKeyResponseData, GetDocumentListHandlerData, GetDocumentListHandlerError, GetDocumentListHandlerErrors, GetDocumentListHandlerResponse, GetDocumentListHandlerResponses, GetDocumentListResult, GetDocumentLocationV3Data, GetDocumentLocationV3Error, GetDocumentLocationV3Errors, GetDocumentLocationV3Response, GetDocumentLocationV3Responses, GetDocumentPermissionsResponseDataV2, GetDocumentPermissionsTokenData, GetDocumentPermissionsTokenError, GetDocumentPermissionsTokenErrors, GetDocumentPermissionsTokenResponse, GetDocumentPermissionsTokenResponses, GetDocumentPermissionsV2Data, GetDocumentPermissionsV2Error, GetDocumentPermissionsV2Errors, GetDocumentPermissionsV2Response, GetDocumentPermissionsV2Responses, GetDocumentProcessingResult, GetDocumentProcessingResultData, GetDocumentProcessingResultError, GetDocumentProcessingResultErrors, GetDocumentProcessingResultResponse, GetDocumentProcessingResultResponse2, GetDocumentProcessingResultResponses, GetDocumentResponse, GetDocumentResponse2, GetDocumentResponseData, GetDocumentResponses, GetDocumentSearchResponse, GetDocumentShortIdData, GetDocumentShortIdError, GetDocumentShortIdErrors, GetDocumentShortIdResponse, GetDocumentShortIdResponses, GetDocumentsResponse, GetDocumentTeamShareData, GetDocumentTeamShareError, GetDocumentTeamShareErrors, GetDocumentTeamShareResponse, GetDocumentTeamShareResponses, GetDocumentUserAccessLevelResponse, GetDocumentVersionData, GetDocumentVersionError, GetDocumentVersionErrors, GetDocumentVersionResponse, GetDocumentVersionResponses, GetDocumentViewsHandlerData, GetDocumentViewsHandlerError, GetDocumentViewsHandlerErrors, GetDocumentViewsHandlerResponse, GetDocumentViewsHandlerResponses, GetEntityPermissionData, GetEntityPermissionErrors, GetEntityPermissionResponse, GetEntityPermissionResponses, GetForeignEntityData, GetForeignEntityError, GetForeignEntityErrors, GetForeignEntityResponse, GetForeignEntityResponses, GetHistoryHandlerData, GetHistoryHandlerError, GetHistoryHandlerErrors, GetHistoryHandlerResponse, GetHistoryHandlerResponses, GetInstructionsDocumentResponse, GetInstructionsHandlerData, GetInstructionsHandlerError, GetInstructionsHandlerErrors, GetInstructionsHandlerResponse, GetInstructionsHandlerResponses, GetItemsSoupData, GetItemsSoupError, GetItemsSoupErrors, GetItemsSoupResponse, GetItemsSoupResponses, GetLocationHandlerData, GetLocationHandlerError, GetLocationHandlerErrors, GetLocationHandlerResponse, GetLocationHandlerResponses, GetMessageWithContextData, GetMessageWithContextError, GetMessageWithContextErrors, GetMessageWithContextResponse, GetMessageWithContextResponse2, GetMessageWithContextResponses, GetOrCreateAction, GetOrCreateCallData, GetOrCreateCallError, GetOrCreateCallErrors, GetOrCreateCallResponse, GetOrCreateCallResponses, GetOrCreateChannelResponse, GetOrCreateDmData, GetOrCreateDmError, GetOrCreateDmErrors, GetOrCreateDmRequest, GetOrCreateDmResponse, GetOrCreateDmResponses, GetOrCreatePrivateData, GetOrCreatePrivateError, GetOrCreatePrivateErrors, GetOrCreatePrivateRequest, GetOrCreatePrivateResponse, GetOrCreatePrivateResponses, GetPendingProjectsHandlerData, GetPendingProjectsHandlerError, GetPendingProjectsHandlerErrors, GetPendingProjectsHandlerResponse, GetPendingProjectsHandlerResponses, GetPinsHandlerData, GetPinsHandlerError, GetPinsHandlerErrors, GetPinsHandlerResponse, GetPinsHandlerResponses, GetPinsResponse, GetProjectContentHandlerData, GetProjectContentHandlerError, GetProjectContentHandlerErrors, GetProjectContentHandlerResponse, GetProjectContentHandlerResponses, GetProjectContentResponse, GetProjectHandlerData, GetProjectHandlerError, GetProjectHandlerErrors, GetProjectHandlerResponse, GetProjectHandlerResponses, GetProjectPermissionsV2Data, GetProjectPermissionsV2Error, GetProjectPermissionsV2Errors, GetProjectPermissionsV2Response, GetProjectPermissionsV2Responses, GetProjectResponse, GetProjectResponseData, GetProjectsHandlerData, GetProjectsHandlerError, GetProjectsHandlerErrors, GetProjectsHandlerResponse, GetProjectsHandlerResponses, GetProjectsResponse, GetProjectUserAccessLevelData, GetProjectUserAccessLevelError, GetProjectUserAccessLevelErrors, GetProjectUserAccessLevelResponse, GetProjectUserAccessLevelResponses, GetRecentActivityHandlerData, GetRecentActivityHandlerError, GetRecentActivityHandlerErrors, GetRecentActivityHandlerResponse, GetRecentActivityHandlerResponses, GetReminderData, GetReminderError, GetReminderErrors, GetReminderResponse, GetReminderResponses, GetRingStatusData, GetRingStatusError, GetRingStatusErrors, GetRingStatusResponse, GetRingStatusResponses, GetSelfBotData, GetSelfBotError, GetSelfBotErrors, GetSelfBotResponse, GetSelfBotResponses, GetSystemSkillsHandlerData, GetSystemSkillsHandlerError, GetSystemSkillsHandlerErrors, GetSystemSkillsHandlerResponse, GetSystemSkillsHandlerResponses, GetThreadRepliesData, GetThreadRepliesError, GetThreadRepliesErrors, GetThreadRepliesResponse, GetThreadRepliesResponses, GetUserDocumentsHandlerData, GetUserDocumentsHandlerError, GetUserDocumentsHandlerErrors, GetUserDocumentsHandlerResponse, GetUserDocumentsHandlerResponses, GetUserDocumentViewLocationData, GetUserDocumentViewLocationError, GetUserDocumentViewLocationErrors, GetUserDocumentViewLocationResponse, GetUserDocumentViewLocationResponses, GetUserHistoryResponse, GetViewsHandlerData, GetViewsHandlerError, GetViewsHandlerErrors, GetViewsHandlerResponse, GetViewsHandlerResponses, GetWebhookData, GetWebhookError, GetWebhookErrors, GetWebhookResponse, GetWebhookResponses, GithubPullRequest, GithubPullRequestCheckRun, GithubPullRequestComment, GithubPullRequestsResponse, GroupedInitialParams, GroupedPageParams, GroupedSoupGroupPage, GroupedSoupInitialPage, GroupedSoupPage, GroupedSoupSort, HandlerData, HandlerError, HandlerErrors, HandlerResponse, HandlerResponses, HashMap, HealthHandlerData, HealthHandlerResponse, HealthHandlerResponses, HighlightType, IngestTranscriptData, IngestTranscriptError, IngestTranscriptErrors, IngestTranscriptResponses, InitializeUserDocumentsData, InitializeUserDocumentsError, InitializeUserDocumentsErrors, InitializeUserDocumentsResponse, InitializeUserDocumentsResponses, InstallSyncData, InstallSyncErrors, InteractionReason, Item, ItemWithUserAccessLevel, JobProcessingResultHandlerData, JobProcessingResultHandlerError, JobProcessingResultHandlerErrors, JobProcessingResultHandlerResponse, JobProcessingResultHandlerResponses, JoinChannelByCodeData, JoinChannelByCodeError, JoinChannelByCodeErrors, JoinChannelByCodeResponses, JoinChannelData, JoinChannelError, JoinChannelErrors, JoinChannelResponses, LatestMessage, LeaveCallResponse, LeaveChannelData, LeaveChannelError, LeaveChannelErrors, LeaveChannelResponses, LeaveOrEndCallData, LeaveOrEndCallError, LeaveOrEndCallErrors, LeaveOrEndCallResponse, LeaveOrEndCallResponses, ListBotChannelsData, ListBotChannelsError, ListBotChannelsErrors, ListBotChannelsResponse, ListBotChannelsResponses, ListCompanyContactsData, ListCompanyContactsError, ListCompanyContactsErrors, ListCompanyContactsResponse, ListCompanyContactsResponses, ListCrmCommentsData, ListCrmCommentsError, ListCrmCommentsErrors, ListCrmCommentsResponse, ListCrmCommentsResponses, ListFavoritesData, ListFavoritesError, ListFavoritesErrors, ListFavoritesResponse, ListFavoritesResponses, ListOccurrencesData, ListOccurrencesErrors, ListOccurrencesResponse, ListOccurrencesResponses, ListRemindersData, ListRemindersError, ListRemindersErrors, ListRemindersResponse, ListRemindersResponses, ListWebhooksData, ListWebhooksError, ListWebhooksErrors, ListWebhooksResponse, ListWebhooksResponse2, ListWebhooksResponses, LocationResponseData, LocationResponseV3, MacroUserIdStr, Mentions, NewChannelAttachment, NotificationFilters, Params, ParticipantRole, PatchChannelData, PatchChannelError, PatchChannelErrors, PatchChannelRequest, PatchChannelResponse, PatchChannelResponses, PatchMessageData, PatchMessageError, PatchMessageErrors, PatchMessageRequest, PatchMessageResponse, PatchMessageResponses, PatchProjectRequestV2, PatchThreadRequestV2, PatchViewHandlerData, PatchViewHandlerError, PatchViewHandlerErrors, PatchViewHandlerResponses, PatchWebhookData, PatchWebhookError, PatchWebhookErrors, PatchWebhookRequest, PatchWebhookResponse, PatchWebhookResponses, PdfAnchor, PdfAnchorId, PdfAnchorRequest, PdfHighlightAnchor, PdfHighlightAnchorRequest, PdfHighlightRect, PdfHighlightRectAnchorRequest, PdfPlaceableCommentAnchor, PdfPlaceableCommentAnchorRequest, PermanentlyDeleteDocumentData, PermanentlyDeleteDocumentError, PermanentlyDeleteDocumentErrors, PermanentlyDeleteDocumentResponse, PermanentlyDeleteDocumentResponses, PermanentlyDeleteProjectData, PermanentlyDeleteProjectError, PermanentlyDeleteProjectErrors, PermanentlyDeleteProjectResponse, PermanentlyDeleteProjectResponses, PinnedItem, PinRequest, PostActivityData, PostActivityError, PostActivityErrors, PostActivityRequest, PostActivityResponse, PostActivityResponses, PostChannelBotWebhookData, PostChannelBotWebhookError, PostChannelBotWebhookErrors, PostChannelBotWebhookResponse, PostChannelBotWebhookResponses, PostChannelMessagesData, PostChannelMessagesError, PostChannelMessagesErrors, PostChannelMessagesResponse, PostChannelMessagesResponses, PostGroupedSoupAstGroupPageRequest, PostGroupedSoupAstInitialRequest, PostGroupedSoupAstRequest, PostItemsSoupAstData, PostItemsSoupAstError, PostItemsSoupAstErrors, PostItemsSoupAstGroupedData, PostItemsSoupAstGroupedError, PostItemsSoupAstGroupedErrors, PostItemsSoupAstGroupedResponse, PostItemsSoupAstGroupedResponses, PostItemsSoupAstResponse, PostItemsSoupAstResponses, PostItemsSoupData, PostItemsSoupError, PostItemsSoupErrors, PostItemsSoupResponse, PostItemsSoupResponses, PostMessageData, PostMessageError, PostMessageErrors, PostMessageRequest, PostMessageResponse, PostMessageResponse2, PostMessageResponses, PostReactionData, PostReactionError, PostReactionErrors, PostReactionRequest, PostReactionResponse, PostReactionResponses, PostSoupAstRequest, PostSoupRequest, PostTypingData, PostTypingError, PostTypingErrors, PostTypingRequest, PostTypingResponse, PostTypingResponses, PresaveDocumentHandlerData, PresaveDocumentHandlerError, PresaveDocumentHandlerErrors, PresaveDocumentHandlerResponse, PresaveDocumentHandlerResponses, PreSaveDocumentRequest, PreSaveDocumentResponse, PreSaveDocumentResponseData, PresignedUrl, Project, ProjectDeleteResponseData, ProjectDocumentStatus, ProjectFilters, ProjectPreview, ProjectPreviewData, PropertyDefinition, PropertyFilter, PropertyInput, PropertyOwner, PropertyValue, PutCrmTeamSettingsData, PutCrmTeamSettingsError, PutCrmTeamSettingsErrors, PutCrmTeamSettingsResponse, PutCrmTeamSettingsResponses, ReactionAction, RecentlyDeletedData, RecentlyDeletedError, RecentlyDeletedErrors, RecentlyDeletedResponse, RecentlyDeletedResponseData, RecentlyDeletedResponses, Reminder, ReminderFilters, ReminderSchedule, RemindersList, RemoveBotFromChannelByBotData, RemoveBotFromChannelByBotError, RemoveBotFromChannelByBotErrors, RemoveBotFromChannelByBotResponse, RemoveBotFromChannelByBotResponses, RemoveFavoriteByEntityData, RemoveFavoriteByEntityError, RemoveFavoriteByEntityErrors, RemoveFavoriteByEntityResponses, RemoveParticipantsData, RemoveParticipantsError, RemoveParticipantsErrors, RemoveParticipantsRequest, RemoveParticipantsResponses, RemovePinHandlerData, RemovePinHandlerError, RemovePinHandlerErrors, RemovePinHandlerResponse, RemovePinHandlerResponses, ReorderFavoritesData, ReorderFavoritesError, ReorderFavoritesErrors, ReorderFavoritesRequest, ReorderFavoritesResponses, ReorderPinRequest, ReorderPinsHandlerData, ReorderPinsHandlerError, ReorderPinsHandlerErrors, ReorderPinsHandlerResponse, ReorderPinsHandlerResponses, ResolveChannelMessageData, ResolveChannelMessageError, ResolveChannelMessageErrors, ResolveChannelMessageResponse, ResolveChannelMessageResponses, RevertDeleteDocumentData, RevertDeleteDocumentError, RevertDeleteDocumentErrors, RevertDeleteDocumentResponse, RevertDeleteDocumentResponses, RevertDeleteProjectData, RevertDeleteProjectError, RevertDeleteProjectErrors, RevertDeleteProjectResponse, RevertDeleteProjectResponses, RingStatus, RingStatusResponse, S3ObjectInfo, SaveBomPart, SaveDocumentHandlerData, SaveDocumentHandlerError, SaveDocumentHandlerErrors, SaveDocumentHandlerResponse, SaveDocumentHandlerResponses, SaveDocumentRequest, SaveDocumentResponse, SaveDocumentResponseData, SetCompanyHiddenData, SetCompanyHiddenError, SetCompanyHiddenErrors, SetCompanyHiddenRequest, SetCompanyHiddenResponse, SetCompanyHiddenResponses, SetCompanyNameRequest, SetContactHiddenData, SetContactHiddenError, SetContactHiddenErrors, SetContactHiddenRequest, SetContactHiddenResponse, SetContactHiddenResponses, SetContactNameRequest, SetCrmCompanyNameData, SetCrmCompanyNameError, SetCrmCompanyNameErrors, SetCrmCompanyNameResponse, SetCrmCompanyNameResponses, SetCrmContactNameData, SetCrmContactNameError, SetCrmContactNameErrors, SetCrmContactNameResponse, SetCrmContactNameResponses, SetDocumentTeamShareData, SetDocumentTeamShareError, SetDocumentTeamShareErrors, SetDocumentTeamShareRequest, SetDocumentTeamShareResponse, SetDocumentTeamShareResponses, SetEmailSyncData, SetEmailSyncError, SetEmailSyncErrors, SetEmailSyncRequest, SetEmailSyncResponse, SetEmailSyncResponses, SetPropertyValue, SharedEmailFilter, SharePermissionV2, ShortIdResponse, SimpleMention, SimpleSaveData, SimpleSaveError, SimpleSaveErrors, SimpleSaveResponse, SimpleSaveResponses, SoupApiItem, SoupApiSort, SoupApiSortDirection, SoupAttachment, SoupCalendarEventSoupPropertiesField, SoupCalendarEventTime, SoupCallRecordParticipant, SoupCallRecordSoupPropertiesField, SoupChannel, SoupChannelThread, SoupChatSoupPropertiesField, SoupContact, SoupCountedReaction, SoupCrmCompanySoupPropertiesField, SoupCrmDomain, SoupDocumentSoupPropertiesField, SoupDocumentSubType, SoupEmailThreadPreview, SoupEnrichedEmailThreadPreviewSoupPropertiesField, SoupForeignEntity, SoupItem, SoupLabel, SoupLabelListVisibility, SoupLabelType, SoupMessageAttachment, SoupMessageListVisibility, SoupMessageSender, SoupMessageSenderType, SoupPage, SoupProjectSoupPropertiesField, SoupPropertiesField, SoupProperty, SoupReminderReference, SoupReminderSchedule, SoupReminderSoupPropertiesField, SoupThreadInfo, SoupThreadReply, StarterDocumentsResponse, String, SuccessResponse, SyncServiceVersionId, SystemSkillSummary, TagFilterMode, TaskFilters, TeamRole, Thread, ThreadResponse, ToggleShareWithTeamData, ToggleShareWithTeamError, ToggleShareWithTeamErrors, ToggleShareWithTeamResponse, ToggleShareWithTeamResponses, TranscriptSegmentRequest, TypedSuccessResponse, TypedSuccessResponseGetDocumentResponseData, TypingAction, UnthreadedPdfUuidRequest, UpdateChannelSharePermission, UpdateCrmTeamSettingsRequest, UpdateOperation, UpdateReminderData, UpdateReminderError, UpdateReminderErrors, UpdateReminderRequest, UpdateReminderResponse, UpdateReminderResponses, UpdateSharePermissionRequestV2, UploadDocumentStatus, UploadExtractFolderHandlerData, UploadExtractFolderHandlerError, UploadExtractFolderHandlerErrors, UploadExtractFolderHandlerResponse, UploadExtractFolderHandlerResponses, UploadExtractFolderRequest, UploadFolderHandlerData, UploadFolderHandlerError, UploadFolderHandlerErrors, UploadFolderHandlerResponse, UploadFolderHandlerResponses, UploadFolderRequest, UpsertHistoryHandlerData, UpsertHistoryHandlerError, UpsertHistoryHandlerErrors, UpsertHistoryHandlerResponse, UpsertHistoryHandlerResponses, UpsertUserDocumentViewLocationData, UpsertUserDocumentViewLocationError, UpsertUserDocumentViewLocationErrors, UpsertUserDocumentViewLocationRequest, UpsertUserDocumentViewLocationResponse, UpsertUserDocumentViewLocationResponses, UserActivitiesResponse, UserDocumentsResponse, UserDocumentViewLocation, UserDocumentViewLocationResponse, UserPinsResponse, UserViewsResponse, ValidateDocumentPermissionsTokenData, ValidateDocumentPermissionsTokenError, ValidateDocumentPermissionsTokenErrors, ValidateDocumentPermissionsTokenResponse, ValidateDocumentPermissionsTokenResponses, ValidateWebhookData, ValidateWebhookError, ValidateWebhookErrors, ValidateWebhookResponse, ValidateWebhookResponse2, ValidateWebhookResponses, Vec, View, ViewPatch, ViewsResponse, Webhook, WebhookEvent, WebhookFilter, WebhookScope, WebhookStatus, WebhookValidationTestEvent, WithCallId, WithChannelId, WithDocumentId, WithProjectId } from './types.gen';
+export type { AccessLevel, Activity, ActivityType, AddFavoriteData, AddFavoriteError, AddFavoriteErrors, AddFavoriteRequest, AddFavoriteResponse, AddFavoriteResponses, AddParticipantsData, AddParticipantsError, AddParticipantsErrors, AddParticipantsRequest, AddParticipantsResponses, AddPinHandlerData, AddPinHandlerError, AddPinHandlerErrors, AddPinHandlerResponse, AddPinHandlerResponses, AddPinRequest, Anchor, AnchorId, AnchorRequest, AnchorResponse, AnnotationIncrementalUpdate, ApiActivity, ApiAttachmentChannelReference, ApiAttachmentEntityReference, ApiAttachmentGenericReference, ApiChannelAttachment, ApiChannelAttachmentsPage, ApiChannelContextMessage, ApiChannelDetail, ApiChannelListMessage, ApiChannelListPage, ApiChannelListParticipant, ApiChannelListType, ApiChannelMessage, ApiChannelMessageKind, ApiChannelMessagesPage, ApiChannelParticipant, ApiChannelWithLatest, ApiCountedReaction, ApiEntityFilterAst, ApiGroupByField, ApiGroupMeta, ApiMessageAttachment, ApiMessageSender, ApiMessageSenderType, ApiParticipantListRole, ApiParticipantRole, ApiPropertyEntityType, ApiResolvedChannelMessage, ApiThreadInfo, ApiThreadReply, AttendeeResponseStatus, BasicDocument, BasicDocumentSubType, BomPart, Bot, BotChannel, BotChannelType, BotId, BotKind, BotOwner, BotToken, BranchNameResponse, BTreeMap, BulkWakeupRequest, BulkWakeupResponse, BulkWakeupSyncServiceDocumentsData, BulkWakeupSyncServiceDocumentsErrors, BulkWakeupSyncServiceDocumentsResponse, BulkWakeupSyncServiceDocumentsResponses, CalendarAttendee, CalendarEvent, CalendarEventFilters, CalendarOccurrence, CalendarOccurrenceItem, CalendarOccurrenceResponse, CalendarSyncStatus, CallActiveResponse, CallFilters, CallRecord, CallRecordParticipant, CallRecordPreview, CallRecordPreviewData, CallRecordTranscriptSegment, CallStatus, CallTokenResponse, CallWebhookData, CallWebhookError, CallWebhookErrors, CallWebhookResponses, Channel, ChannelCreatedMetadata, ChannelDeletedMetadata, ChannelEventAttachment, ChannelFilters, ChannelJoinCodeResponse, ChannelMentionedMetadata, ChannelMessage, ChannelMessageAttachmentCreatedMetadata, ChannelMessageAttachmentRemovedMetadata, ChannelMessageDeletedMetadata, ChannelMessageFilters, ChannelMessagePatchedMetadata, ChannelMessagePostedMetadata, ChannelParticipant, ChannelParticipantAddedMetadata, ChannelParticipantRemovedMetadata, ChannelPreview, ChannelPreviewData, ChannelSender, ChannelSharePermission, ChannelThreadFilters, ChannelTopicEvent, ChannelType, ChannelUpdatedMetadata, ChannelWebhookRequest, ChannelWebhookResponse, ChannelWithParticipants, Chat, ChatFilters, CheckActiveCallData, CheckActiveCallError, CheckActiveCallErrors, CheckActiveCallResponse, CheckActiveCallResponses, ClientOptions, CloudStorageItemType, Comment, CommentThread, ConferenceProvider, CopyDocumentData, CopyDocumentError, CopyDocumentErrors, CopyDocumentQueryParams, CopyDocumentRequest, CopyDocumentResponse, CopyDocumentResponse2, CopyDocumentResponses, CreateAnchorData, CreateAnchorError, CreateAnchorErrors, CreateAnchorResponse, CreateAnchorResponses, CreateBulkDocumentResponse, CreateBulkDocumentResponseData, CreateChannelData, CreateChannelError, CreateChannelErrors, CreateChannelRequest, CreateChannelResponse, CreateChannelResponse2, CreateChannelResponses, CreateChannelScopedBotData, CreateChannelScopedBotError, CreateChannelScopedBotErrors, CreateChannelScopedBotRequest, CreateChannelScopedBotResponse, CreateChannelScopedBotResponse2, CreateChannelScopedBotResponses, CreateCommentData, CreateCommentError, CreateCommentErrors, CreateCommentRequest, CreateCommentResponse, CreateCommentResponse2, CreateCommentResponses, CreateCrmCommentData, CreateCrmCommentError, CreateCrmCommentErrors, CreateCrmCommentRequest, CreateCrmCommentResponse, CreateCrmCommentResponses, CreateCrmCompanyData, CreateCrmCompanyError, CreateCrmCompanyErrors, CreateCrmCompanyRequest, CreateCrmCompanyResponse, CreateCrmCompanyResponses, CreateCrmContactData, CreateCrmContactError, CreateCrmContactErrors, CreateCrmContactRequest, CreateCrmContactResponse, CreateCrmContactResponses, CreateDocumentData, CreateDocumentError, CreateDocumentErrors, CreateDocumentRequest, CreateDocumentResponse, CreateDocumentResponseData, CreateDocumentResponses, CreateEntityMentionData, CreateEntityMentionError, CreateEntityMentionErrors, CreateEntityMentionRequest, CreateEntityMentionResponse, CreateEntityMentionResponse2, CreateEntityMentionResponses, CreateInstructionsDocumentResponse, CreateInstructionsHandlerData, CreateInstructionsHandlerError, CreateInstructionsHandlerErrors, CreateInstructionsHandlerResponse, CreateInstructionsHandlerResponses, CreateMarkdownDocumentRequest, CreateMarkdownDocumentResponse, CreateMarkdownHandlerData, CreateMarkdownHandlerError, CreateMarkdownHandlerErrors, CreateMarkdownHandlerResponse, CreateMarkdownHandlerResponses, CreateProjectHandlerData, CreateProjectHandlerError, CreateProjectHandlerErrors, CreateProjectHandlerResponse, CreateProjectHandlerResponses, CreateProjectRequest, CreateProjectResponse, CreateReminderData, CreateReminderError, CreateReminderErrors, CreateReminderRequest, CreateReminderResponse, CreateReminderResponses, CreateSkillHandlerData, CreateSkillHandlerError, CreateSkillHandlerErrors, CreateSkillHandlerResponse, CreateSkillHandlerResponses, CreateSkillRequest, CreateSkillResponse, CreateSnippetHandlerData, CreateSnippetHandlerError, CreateSnippetHandlerErrors, CreateSnippetHandlerResponse, CreateSnippetHandlerResponses, CreateSnippetRequest, CreateSnippetResponse, CreateTaskHandlerData, CreateTaskHandlerError, CreateTaskHandlerErrors, CreateTaskHandlerResponse, CreateTaskHandlerResponses, CreateTaskRequest, CreateTaskResponse, CreateUnthreadedAnchorRequest, CreateUnthreadedAnchorResponse, CreateUnthreadedPdfAnchorRequest, CreateViewHandlerData, CreateViewHandlerError, CreateViewHandlerErrors, CreateViewHandlerResponse, CreateViewHandlerResponses, CreateViewRequest, CreateWebhookData, CreateWebhookError, CreateWebhookErrors, CreateWebhookRequest, CreateWebhookResponse, CreateWebhookResponse2, CreateWebhookResponses, CrmComment, CrmCommentEntityType, CrmCommentThread, CrmCompanyFilters, CrmCompanyResponse, CrmContactResponse, CrmDomainResponse, CrmPermissionRole, CrmTeamSettingsResponse, CrmThread, CustomSpeakerAssignment, DataType, DeleteAnchorData, DeleteAnchorError, DeleteAnchorErrors, DeleteAnchorInfo, DeleteAnchorResponse, DeleteAnchorResponses, DeleteCallRecordData, DeleteCallRecordError, DeleteCallRecordErrors, DeleteCallRecordResponse, DeleteCallRecordResponses, DeleteChannelData, DeleteChannelError, DeleteChannelErrors, DeleteChannelResponse, DeleteChannelResponses, DeleteCommentData, DeleteCommentError, DeleteCommentErrors, DeleteCommentRequest, DeleteCommentResponse, DeleteCommentResponse2, DeleteCommentResponses, DeleteCrmCommentData, DeleteCrmCommentError, DeleteCrmCommentErrors, DeleteCrmCommentResponse, DeleteCrmCommentResponses, DeleteCrmCommentResult, DeleteDocumentData, DeleteDocumentError, DeleteDocumentErrors, DeleteDocumentResponse, DeleteDocumentResponses, DeleteEntityMentionData, DeleteEntityMentionError, DeleteEntityMentionErrors, DeleteEntityMentionResponse, DeleteEntityMentionResponse2, DeleteEntityMentionResponses, DeleteHistoryHandlerData, DeleteHistoryHandlerError, DeleteHistoryHandlerErrors, DeleteHistoryHandlerResponse, DeleteHistoryHandlerResponses, DeleteMessageData, DeleteMessageError, DeleteMessageErrors, DeleteMessageQuery, DeleteMessageResponse, DeleteMessageResponses, DeleteProjectHandlerData, DeleteProjectHandlerError, DeleteProjectHandlerErrors, DeleteProjectHandlerResponse, DeleteProjectHandlerResponses, DeleteReminderData, DeleteReminderError, DeleteReminderErrors, DeleteReminderResponse, DeleteReminderResponses, DeleteThreadInfo, DeleteUnthreadedAnchorRequest, DeleteUnthreadedAnchorResponse, DeleteUnthreadedPdfAnchorRequest, DeleteUserDocumentViewLocationData, DeleteUserDocumentViewLocationError, DeleteUserDocumentViewLocationErrors, DeleteUserDocumentViewLocationResponse, DeleteUserDocumentViewLocationResponses, DeleteViewHandlerData, DeleteViewHandlerError, DeleteViewHandlerErrors, DeleteViewHandlerResponses, DeleteWebhookData, DeleteWebhookError, DeleteWebhookErrors, DeleteWebhookResponse, DeleteWebhookResponses, DocumentBasic, DocumentContent, DocumentContentLocation, DocumentContentState, DocumentContentUploadedMetadata, DocumentCopiedMetadata, DocumentCreatedMetadata, DocumentDeletedMetadata, DocumentFilters, DocumentInteractionMetadata, DocumentMetadata, DocumentMetadataWithContent, DocumentPermissionsToken, DocumentPermissionsTokenRequest, DocumentPermissionsTokenResponse, DocumentPreview, DocumentPreviewData, DocumentPreviewDataSubType, DocumentPurgedMetadata, DocumentResponse, DocumentResponseMetadata, DocumentResponseMetadataWithContent, DocumentStorageServiceApiVersion, DocumentSubType, DocumentSyncContentUpdatedMetadata, DocumentTeamShareResponse, DocumentTopicEvent, DocumentUpdatedMetadata, EditAnchorData, EditAnchorError, EditAnchorErrors, EditAnchorRequest, EditAnchorResponse, EditAnchorResponse2, EditAnchorResponses, EditCallRecordData, EditCallRecordError, EditCallRecordErrors, EditCallRecordRequest, EditCallRecordResponse, EditCallRecordResponses, EditCallTranscriptData, EditCallTranscriptError, EditCallTranscriptErrors, EditCallTranscriptRequest, EditCallTranscriptResponse, EditCallTranscriptResponses, EditCommentData, EditCommentError, EditCommentErrors, EditCommentRequest, EditCommentResponse, EditCommentResponse2, EditCommentResponses, EditCrmCommentData, EditCrmCommentError, EditCrmCommentErrors, EditCrmCommentRequest, EditCrmCommentResponse, EditCrmCommentResponses, EditDocumentData, EditDocumentError, EditDocumentErrors, EditDocumentResponse, EditDocumentResponse2, EditDocumentResponses, EditDocumentServiceArgs, EditPdfAnchorRequest, EditPdfPlaceableCommentAnchorRequest, EditProjectV2Data, EditProjectV2Error, EditProjectV2Errors, EditProjectV2Response, EditProjectV2Responses, EditThreadV2Data, EditThreadV2Error, EditThreadV2Errors, EditThreadV2Response, EditThreadV2Responses, EmailFilters, EmptyResponse, EntityFilters, EntityPermission, EntityPermissionResponse, EntityReference, EntityType, ErrorResponse, EventReminderOverride, EventReminders, EventStatus, EventTime, EventTransparency, EventVisibility, ExcludedDefaultView, ExcludeDefaultViewHandlerData, ExcludeDefaultViewHandlerError, ExcludeDefaultViewHandlerErrors, ExcludeDefaultViewHandlerResponses, ExcludeDefaultViewRequest, ExportDocumentData, ExportDocumentError, ExportDocumentErrors, ExportDocumentResponse, ExportDocumentResponse2, ExportDocumentResponses, Favorite, FavoriteEntityRef, FavoritesList, FileSystemNodeWithIds, FileType, FileTypeUpdate, FolderItem, ForeignEntity, ForeignEntityFilters, GenericErrorResponse, GenericResponse, GenericSuccessResponse, GetActivitiesResponse, GetActivityData, GetActivityError, GetActivityErrors, GetActivityResponse, GetActivityResponses, GetAttachmentReferencesData, GetAttachmentReferencesError, GetAttachmentReferencesErrors, GetAttachmentReferencesResponse, GetAttachmentReferencesResponse2, GetAttachmentReferencesResponses, GetBatchCallRecordPreviewData, GetBatchCallRecordPreviewError, GetBatchCallRecordPreviewErrors, GetBatchCallRecordPreviewRequest, GetBatchCallRecordPreviewResponse, GetBatchCallRecordPreviewResponse2, GetBatchCallRecordPreviewResponses, GetBatchChannelPreviewData, GetBatchChannelPreviewError, GetBatchChannelPreviewErrors, GetBatchChannelPreviewRequest, GetBatchChannelPreviewResponse, GetBatchChannelPreviewResponse2, GetBatchChannelPreviewResponses, GetBatchPreviewHandlerData, GetBatchPreviewHandlerError, GetBatchPreviewHandlerErrors, GetBatchPreviewHandlerResponse, GetBatchPreviewHandlerResponses, GetBatchPreviewRequest, GetBatchPreviewResponse, GetBatchProjectPreviewData, GetBatchProjectPreviewError, GetBatchProjectPreviewErrors, GetBatchProjectPreviewRequest, GetBatchProjectPreviewResponse, GetBatchProjectPreviewResponse2, GetBatchProjectPreviewResponses, GetCallRecordData, GetCallRecordError, GetCallRecordErrors, GetCallRecordResponse, GetCallRecordResponses, GetChannelAttachmentsData, GetChannelAttachmentsError, GetChannelAttachmentsErrors, GetChannelAttachmentsResponse, GetChannelAttachmentsResponses, GetChannelData, GetChannelError, GetChannelErrors, GetChannelJoinLinkData, GetChannelJoinLinkError, GetChannelJoinLinkErrors, GetChannelJoinLinkResponse, GetChannelJoinLinkResponses, GetChannelMessagesData, GetChannelMessagesError, GetChannelMessagesErrors, GetChannelMessagesResponse, GetChannelMessagesResponses, GetChannelParticipantsData, GetChannelParticipantsError, GetChannelParticipantsErrors, GetChannelParticipantsResponse, GetChannelParticipantsResponses, GetChannelResponse, GetChannelResponses, GetChannelsData, GetChannelsError, GetChannelsErrors, GetChannelsResponse, GetChannelsResponses, GetCompanyData, GetCompanyError, GetCompanyErrors, GetCompanyResponse, GetCompanyResponses, GetContactData, GetContactError, GetContactErrors, GetContactResponse, GetContactResponses, GetCrmTeamSettingsData, GetCrmTeamSettingsError, GetCrmTeamSettingsErrors, GetCrmTeamSettingsResponse, GetCrmTeamSettingsResponses, GetDocumentAnchorsData, GetDocumentAnchorsError, GetDocumentAnchorsErrors, GetDocumentAnchorsResponse, GetDocumentAnchorsResponses, GetDocumentBranchNameData, GetDocumentBranchNameError, GetDocumentBranchNameErrors, GetDocumentBranchNameResponse, GetDocumentBranchNameResponses, GetDocumentByTeamSlugData, GetDocumentByTeamSlugError, GetDocumentByTeamSlugErrors, GetDocumentByTeamSlugResponse, GetDocumentByTeamSlugResponses, GetDocumentCommentsData, GetDocumentCommentsError, GetDocumentCommentsErrors, GetDocumentCommentsResponse, GetDocumentCommentsResponses, GetDocumentData, GetDocumentError, GetDocumentErrors, GetDocumentGithubPullRequestsData, GetDocumentGithubPullRequestsError, GetDocumentGithubPullRequestsErrors, GetDocumentGithubPullRequestsResponse, GetDocumentGithubPullRequestsResponses, GetDocumentKeyResponse, GetDocumentKeyResponseData, GetDocumentListHandlerData, GetDocumentListHandlerError, GetDocumentListHandlerErrors, GetDocumentListHandlerResponse, GetDocumentListHandlerResponses, GetDocumentListResult, GetDocumentLocationV3Data, GetDocumentLocationV3Error, GetDocumentLocationV3Errors, GetDocumentLocationV3Response, GetDocumentLocationV3Responses, GetDocumentPermissionsResponseDataV2, GetDocumentPermissionsTokenData, GetDocumentPermissionsTokenError, GetDocumentPermissionsTokenErrors, GetDocumentPermissionsTokenResponse, GetDocumentPermissionsTokenResponses, GetDocumentPermissionsV2Data, GetDocumentPermissionsV2Error, GetDocumentPermissionsV2Errors, GetDocumentPermissionsV2Response, GetDocumentPermissionsV2Responses, GetDocumentProcessingResult, GetDocumentProcessingResultData, GetDocumentProcessingResultError, GetDocumentProcessingResultErrors, GetDocumentProcessingResultResponse, GetDocumentProcessingResultResponse2, GetDocumentProcessingResultResponses, GetDocumentResponse, GetDocumentResponse2, GetDocumentResponseData, GetDocumentResponses, GetDocumentSearchResponse, GetDocumentShortIdData, GetDocumentShortIdError, GetDocumentShortIdErrors, GetDocumentShortIdResponse, GetDocumentShortIdResponses, GetDocumentsResponse, GetDocumentTeamShareData, GetDocumentTeamShareError, GetDocumentTeamShareErrors, GetDocumentTeamShareResponse, GetDocumentTeamShareResponses, GetDocumentUserAccessLevelResponse, GetDocumentVersionData, GetDocumentVersionError, GetDocumentVersionErrors, GetDocumentVersionResponse, GetDocumentVersionResponses, GetDocumentViewsHandlerData, GetDocumentViewsHandlerError, GetDocumentViewsHandlerErrors, GetDocumentViewsHandlerResponse, GetDocumentViewsHandlerResponses, GetEntityPermissionData, GetEntityPermissionErrors, GetEntityPermissionResponse, GetEntityPermissionResponses, GetForeignEntityData, GetForeignEntityError, GetForeignEntityErrors, GetForeignEntityResponse, GetForeignEntityResponses, GetHistoryHandlerData, GetHistoryHandlerError, GetHistoryHandlerErrors, GetHistoryHandlerResponse, GetHistoryHandlerResponses, GetInstructionsDocumentResponse, GetInstructionsHandlerData, GetInstructionsHandlerError, GetInstructionsHandlerErrors, GetInstructionsHandlerResponse, GetInstructionsHandlerResponses, GetItemsSoupData, GetItemsSoupError, GetItemsSoupErrors, GetItemsSoupResponse, GetItemsSoupResponses, GetLocationHandlerData, GetLocationHandlerError, GetLocationHandlerErrors, GetLocationHandlerResponse, GetLocationHandlerResponses, GetMessageWithContextData, GetMessageWithContextError, GetMessageWithContextErrors, GetMessageWithContextResponse, GetMessageWithContextResponse2, GetMessageWithContextResponses, GetOrCreateAction, GetOrCreateCallData, GetOrCreateCallError, GetOrCreateCallErrors, GetOrCreateCallResponse, GetOrCreateCallResponses, GetOrCreateChannelResponse, GetOrCreateDmData, GetOrCreateDmError, GetOrCreateDmErrors, GetOrCreateDmRequest, GetOrCreateDmResponse, GetOrCreateDmResponses, GetOrCreatePrivateData, GetOrCreatePrivateError, GetOrCreatePrivateErrors, GetOrCreatePrivateRequest, GetOrCreatePrivateResponse, GetOrCreatePrivateResponses, GetPendingProjectsHandlerData, GetPendingProjectsHandlerError, GetPendingProjectsHandlerErrors, GetPendingProjectsHandlerResponse, GetPendingProjectsHandlerResponses, GetPinsHandlerData, GetPinsHandlerError, GetPinsHandlerErrors, GetPinsHandlerResponse, GetPinsHandlerResponses, GetPinsResponse, GetProjectContentHandlerData, GetProjectContentHandlerError, GetProjectContentHandlerErrors, GetProjectContentHandlerResponse, GetProjectContentHandlerResponses, GetProjectContentResponse, GetProjectHandlerData, GetProjectHandlerError, GetProjectHandlerErrors, GetProjectHandlerResponse, GetProjectHandlerResponses, GetProjectPermissionsV2Data, GetProjectPermissionsV2Error, GetProjectPermissionsV2Errors, GetProjectPermissionsV2Response, GetProjectPermissionsV2Responses, GetProjectResponse, GetProjectResponseData, GetProjectsHandlerData, GetProjectsHandlerError, GetProjectsHandlerErrors, GetProjectsHandlerResponse, GetProjectsHandlerResponses, GetProjectsResponse, GetProjectUserAccessLevelData, GetProjectUserAccessLevelError, GetProjectUserAccessLevelErrors, GetProjectUserAccessLevelResponse, GetProjectUserAccessLevelResponses, GetRecentActivityHandlerData, GetRecentActivityHandlerError, GetRecentActivityHandlerErrors, GetRecentActivityHandlerResponse, GetRecentActivityHandlerResponses, GetReminderData, GetReminderError, GetReminderErrors, GetReminderResponse, GetReminderResponses, GetRingStatusData, GetRingStatusError, GetRingStatusErrors, GetRingStatusResponse, GetRingStatusResponses, GetSelfBotData, GetSelfBotError, GetSelfBotErrors, GetSelfBotResponse, GetSelfBotResponses, GetSystemSkillsHandlerData, GetSystemSkillsHandlerError, GetSystemSkillsHandlerErrors, GetSystemSkillsHandlerResponse, GetSystemSkillsHandlerResponses, GetThreadRepliesData, GetThreadRepliesError, GetThreadRepliesErrors, GetThreadRepliesResponse, GetThreadRepliesResponses, GetUserDocumentsHandlerData, GetUserDocumentsHandlerError, GetUserDocumentsHandlerErrors, GetUserDocumentsHandlerResponse, GetUserDocumentsHandlerResponses, GetUserDocumentViewLocationData, GetUserDocumentViewLocationError, GetUserDocumentViewLocationErrors, GetUserDocumentViewLocationResponse, GetUserDocumentViewLocationResponses, GetUserHistoryResponse, GetViewsHandlerData, GetViewsHandlerError, GetViewsHandlerErrors, GetViewsHandlerResponse, GetViewsHandlerResponses, GetWebhookData, GetWebhookError, GetWebhookErrors, GetWebhookResponse, GetWebhookResponses, GithubPullRequest, GithubPullRequestCheckRun, GithubPullRequestComment, GithubPullRequestsResponse, GroupedInitialParams, GroupedPageParams, GroupedSoupGroupPage, GroupedSoupInitialPage, GroupedSoupPage, GroupedSoupSort, HandlerData, HandlerError, HandlerErrors, HandlerResponse, HandlerResponses, HashMap, HealthHandlerData, HealthHandlerResponse, HealthHandlerResponses, HighlightType, IngestTranscriptData, IngestTranscriptError, IngestTranscriptErrors, IngestTranscriptResponses, InitializeUserDocumentsData, InitializeUserDocumentsError, InitializeUserDocumentsErrors, InitializeUserDocumentsResponse, InitializeUserDocumentsResponses, InstallSyncData, InstallSyncErrors, InteractionReason, Item, ItemWithUserAccessLevel, JobProcessingResultHandlerData, JobProcessingResultHandlerError, JobProcessingResultHandlerErrors, JobProcessingResultHandlerResponse, JobProcessingResultHandlerResponses, JoinChannelByCodeData, JoinChannelByCodeError, JoinChannelByCodeErrors, JoinChannelByCodeResponses, JoinChannelData, JoinChannelError, JoinChannelErrors, JoinChannelResponses, LatestMessage, LeaveCallResponse, LeaveChannelData, LeaveChannelError, LeaveChannelErrors, LeaveChannelResponses, LeaveOrEndCallData, LeaveOrEndCallError, LeaveOrEndCallErrors, LeaveOrEndCallResponse, LeaveOrEndCallResponses, ListBotChannelsData, ListBotChannelsError, ListBotChannelsErrors, ListBotChannelsResponse, ListBotChannelsResponses, ListCompanyContactsData, ListCompanyContactsError, ListCompanyContactsErrors, ListCompanyContactsResponse, ListCompanyContactsResponses, ListCrmCommentsData, ListCrmCommentsError, ListCrmCommentsErrors, ListCrmCommentsResponse, ListCrmCommentsResponses, ListFavoritesData, ListFavoritesError, ListFavoritesErrors, ListFavoritesResponse, ListFavoritesResponses, ListOccurrencesData, ListOccurrencesErrors, ListOccurrencesResponse, ListOccurrencesResponses, ListRemindersData, ListRemindersError, ListRemindersErrors, ListRemindersResponse, ListRemindersResponses, ListWebhooksData, ListWebhooksError, ListWebhooksErrors, ListWebhooksResponse, ListWebhooksResponse2, ListWebhooksResponses, LocationResponseData, LocationResponseV3, MacroUserIdStr, Mentions, NewChannelAttachment, NotificationFilters, Params, ParticipantRole, PatchChannelData, PatchChannelError, PatchChannelErrors, PatchChannelRequest, PatchChannelResponse, PatchChannelResponses, PatchMessageData, PatchMessageError, PatchMessageErrors, PatchMessageRequest, PatchMessageResponse, PatchMessageResponses, PatchProjectRequestV2, PatchThreadRequestV2, PatchViewHandlerData, PatchViewHandlerError, PatchViewHandlerErrors, PatchViewHandlerResponses, PatchWebhookData, PatchWebhookError, PatchWebhookErrors, PatchWebhookRequest, PatchWebhookResponse, PatchWebhookResponses, PdfAnchor, PdfAnchorId, PdfAnchorRequest, PdfHighlightAnchor, PdfHighlightAnchorRequest, PdfHighlightRect, PdfHighlightRectAnchorRequest, PdfPlaceableCommentAnchor, PdfPlaceableCommentAnchorRequest, PermanentlyDeleteDocumentData, PermanentlyDeleteDocumentError, PermanentlyDeleteDocumentErrors, PermanentlyDeleteDocumentResponse, PermanentlyDeleteDocumentResponses, PermanentlyDeleteProjectData, PermanentlyDeleteProjectError, PermanentlyDeleteProjectErrors, PermanentlyDeleteProjectResponse, PermanentlyDeleteProjectResponses, PinnedItem, PinRequest, PostActivityData, PostActivityError, PostActivityErrors, PostActivityRequest, PostActivityResponse, PostActivityResponses, PostChannelBotWebhookData, PostChannelBotWebhookError, PostChannelBotWebhookErrors, PostChannelBotWebhookResponse, PostChannelBotWebhookResponses, PostChannelMessagesData, PostChannelMessagesError, PostChannelMessagesErrors, PostChannelMessagesResponse, PostChannelMessagesResponses, PostGroupedSoupAstGroupPageRequest, PostGroupedSoupAstInitialRequest, PostGroupedSoupAstRequest, PostItemsSoupAstData, PostItemsSoupAstError, PostItemsSoupAstErrors, PostItemsSoupAstGroupedData, PostItemsSoupAstGroupedError, PostItemsSoupAstGroupedErrors, PostItemsSoupAstGroupedResponse, PostItemsSoupAstGroupedResponses, PostItemsSoupAstResponse, PostItemsSoupAstResponses, PostItemsSoupData, PostItemsSoupError, PostItemsSoupErrors, PostItemsSoupResponse, PostItemsSoupResponses, PostMessageData, PostMessageError, PostMessageErrors, PostMessageRequest, PostMessageResponse, PostMessageResponse2, PostMessageResponses, PostReactionData, PostReactionError, PostReactionErrors, PostReactionRequest, PostReactionResponse, PostReactionResponses, PostSoupAstRequest, PostSoupRequest, PostTypingData, PostTypingError, PostTypingErrors, PostTypingRequest, PostTypingResponse, PostTypingResponses, PresaveDocumentHandlerData, PresaveDocumentHandlerError, PresaveDocumentHandlerErrors, PresaveDocumentHandlerResponse, PresaveDocumentHandlerResponses, PreSaveDocumentRequest, PreSaveDocumentResponse, PreSaveDocumentResponseData, PresignedUrl, Project, ProjectDeleteResponseData, ProjectDocumentStatus, ProjectFilters, ProjectPreview, ProjectPreviewData, PropertyDefinition, PropertyFilter, PropertyInput, PropertyOwner, PropertyValue, PutCrmTeamSettingsData, PutCrmTeamSettingsError, PutCrmTeamSettingsErrors, PutCrmTeamSettingsResponse, PutCrmTeamSettingsResponses, ReactionAction, RecentlyDeletedData, RecentlyDeletedError, RecentlyDeletedErrors, RecentlyDeletedResponse, RecentlyDeletedResponseData, RecentlyDeletedResponses, Reminder, ReminderFilters, ReminderSchedule, RemindersList, RemoveBotFromChannelByBotData, RemoveBotFromChannelByBotError, RemoveBotFromChannelByBotErrors, RemoveBotFromChannelByBotResponse, RemoveBotFromChannelByBotResponses, RemoveFavoriteByEntityData, RemoveFavoriteByEntityError, RemoveFavoriteByEntityErrors, RemoveFavoriteByEntityResponses, RemoveParticipantsData, RemoveParticipantsError, RemoveParticipantsErrors, RemoveParticipantsRequest, RemoveParticipantsResponses, RemovePinHandlerData, RemovePinHandlerError, RemovePinHandlerErrors, RemovePinHandlerResponse, RemovePinHandlerResponses, ReorderFavoritesData, ReorderFavoritesError, ReorderFavoritesErrors, ReorderFavoritesRequest, ReorderFavoritesResponses, ReorderPinRequest, ReorderPinsHandlerData, ReorderPinsHandlerError, ReorderPinsHandlerErrors, ReorderPinsHandlerResponse, ReorderPinsHandlerResponses, ResolveChannelMessageData, ResolveChannelMessageError, ResolveChannelMessageErrors, ResolveChannelMessageResponse, ResolveChannelMessageResponses, RevertDeleteDocumentData, RevertDeleteDocumentError, RevertDeleteDocumentErrors, RevertDeleteDocumentResponse, RevertDeleteDocumentResponses, RevertDeleteProjectData, RevertDeleteProjectError, RevertDeleteProjectErrors, RevertDeleteProjectResponse, RevertDeleteProjectResponses, RingStatus, RingStatusResponse, S3ObjectInfo, SaveBomPart, SaveDocumentHandlerData, SaveDocumentHandlerError, SaveDocumentHandlerErrors, SaveDocumentHandlerResponse, SaveDocumentHandlerResponses, SaveDocumentRequest, SaveDocumentResponse, SaveDocumentResponseData, SetCompanyHiddenData, SetCompanyHiddenError, SetCompanyHiddenErrors, SetCompanyHiddenRequest, SetCompanyHiddenResponse, SetCompanyHiddenResponses, SetCompanyNameRequest, SetContactHiddenData, SetContactHiddenError, SetContactHiddenErrors, SetContactHiddenRequest, SetContactHiddenResponse, SetContactHiddenResponses, SetContactNameRequest, SetCrmCompanyNameData, SetCrmCompanyNameError, SetCrmCompanyNameErrors, SetCrmCompanyNameResponse, SetCrmCompanyNameResponses, SetCrmContactNameData, SetCrmContactNameError, SetCrmContactNameErrors, SetCrmContactNameResponse, SetCrmContactNameResponses, SetDocumentTeamShareData, SetDocumentTeamShareError, SetDocumentTeamShareErrors, SetDocumentTeamShareRequest, SetDocumentTeamShareResponse, SetDocumentTeamShareResponses, SetEmailSyncData, SetEmailSyncError, SetEmailSyncErrors, SetEmailSyncRequest, SetEmailSyncResponse, SetEmailSyncResponses, SetPropertyValue, SharedEmailFilter, SharePermissionV2, ShortIdResponse, SimpleMention, SimpleSaveData, SimpleSaveError, SimpleSaveErrors, SimpleSaveResponse, SimpleSaveResponses, SoupApiItem, SoupApiSort, SoupApiSortDirection, SoupAttachment, SoupCalendarEventSoupPropertiesField, SoupCalendarEventTime, SoupCallRecordParticipant, SoupCallRecordSoupPropertiesField, SoupChannel, SoupChannelThread, SoupChatSoupPropertiesField, SoupContact, SoupCountedReaction, SoupCrmCompanySoupPropertiesField, SoupCrmDomain, SoupDocumentSoupPropertiesField, SoupDocumentSubType, SoupEmailThreadPreview, SoupEnrichedEmailThreadPreviewSoupPropertiesField, SoupForeignEntity, SoupItem, SoupLabel, SoupLabelListVisibility, SoupLabelType, SoupMessageAttachment, SoupMessageListVisibility, SoupMessageSender, SoupMessageSenderType, SoupPage, SoupProjectSoupPropertiesField, SoupPropertiesField, SoupProperty, SoupReminderReference, SoupReminderSchedule, SoupReminderSoupPropertiesField, SoupThreadInfo, SoupThreadReply, StarterDocumentsResponse, String, SuccessResponse, SyncServiceVersionId, SystemSkillSummary, TagFilterMode, TaskFilters, TeamRole, Thread, ThreadResponse, ToggleShareWithTeamData, ToggleShareWithTeamError, ToggleShareWithTeamErrors, ToggleShareWithTeamResponse, ToggleShareWithTeamResponses, TranscriptSegmentRequest, TypedSuccessResponse, TypedSuccessResponseGetDocumentResponseData, TypingAction, UnthreadedPdfUuidRequest, UpdateChannelSharePermission, UpdateCrmTeamSettingsRequest, UpdateOperation, UpdateReminderData, UpdateReminderError, UpdateReminderErrors, UpdateReminderRequest, UpdateReminderResponse, UpdateReminderResponses, UpdateSharePermissionRequestV2, UploadDocumentStatus, UploadExtractFolderHandlerData, UploadExtractFolderHandlerError, UploadExtractFolderHandlerErrors, UploadExtractFolderHandlerResponse, UploadExtractFolderHandlerResponses, UploadExtractFolderRequest, UploadFolderHandlerData, UploadFolderHandlerError, UploadFolderHandlerErrors, UploadFolderHandlerResponse, UploadFolderHandlerResponses, UploadFolderRequest, UpsertHistoryHandlerData, UpsertHistoryHandlerError, UpsertHistoryHandlerErrors, UpsertHistoryHandlerResponse, UpsertHistoryHandlerResponses, UpsertUserDocumentViewLocationData, UpsertUserDocumentViewLocationError, UpsertUserDocumentViewLocationErrors, UpsertUserDocumentViewLocationRequest, UpsertUserDocumentViewLocationResponse, UpsertUserDocumentViewLocationResponses, UserActivitiesResponse, UserDocumentsResponse, UserDocumentViewLocation, UserDocumentViewLocationResponse, UserPinsResponse, UserViewsResponse, ValidateDocumentPermissionsTokenData, ValidateDocumentPermissionsTokenError, ValidateDocumentPermissionsTokenErrors, ValidateDocumentPermissionsTokenResponse, ValidateDocumentPermissionsTokenResponses, ValidateWebhookData, ValidateWebhookError, ValidateWebhookErrors, ValidateWebhookResponse, ValidateWebhookResponse2, ValidateWebhookResponses, Vec, View, ViewPatch, ViewsResponse, Webhook, WebhookEvent, WebhookFilter, WebhookScope, WebhookStatus, WebhookValidationTestEvent, WithCallId, WithChannelId, WithDocumentId, WithProjectId } from './types.gen';
diff --git a/packages/sdk/generated/storage/types.gen.ts b/packages/sdk/generated/storage/types.gen.ts
index 67b5f0becb..6851440417 100644
--- a/packages/sdk/generated/storage/types.gen.ts
+++ b/packages/sdk/generated/storage/types.gen.ts
@@ -1209,6 +1209,7 @@ export type CalendarEvent = {
* projections stored before calendars were attributed.
*/
calendarId?: string | null;
+ conferenceProvider?: null | ConferenceProvider;
/**
* Direct join URL when known.
*/
@@ -2431,6 +2432,22 @@ export type CommentThread = {
thread: Thread;
};
+/**
+ * The conferencing system backing an event's join URL.
+ *
+ * Macro generates only Google Meet conferences, so this distinguishes one it
+ * created from a third party's — Zoom and friends arriving as `addOn`
+ * conference data, or a legacy classic Hangout. Clients use it to label the
+ * conference and to tell whether the Meet toggle reflects a Macro-managed
+ * conference.
+ *
+ * It does not gate mutation. An explicit request replaces or detaches any
+ * conference, third-party included, exactly as deleting the event would;
+ * what protects a conference is that omitting the field leaves it untouched,
+ * so an unrelated edit never disturbs it.
+ */
+export type ConferenceProvider = 'google_meet' | 'other';
+
/**
* Query parameters for the copy document endpoint.
*/
@@ -6639,6 +6656,10 @@ export type SoupCalendarEventTime = {
* A canonical calendar event entity in Soup.
*/
export type SoupCalendarEventSoupPropertiesField = {
+ /**
+ * Which conferencing system backs `conference_url`.
+ */
+ conferenceProvider?: string | null;
/**
* Direct conference join URL.
*/
diff --git a/packages/sdk/specs/email.json b/packages/sdk/specs/email.json
index 5ddaf0c9a1..399c38e008 100644
--- a/packages/sdk/specs/email.json
+++ b/packages/sdk/specs/email.json
@@ -4463,6 +4463,17 @@
"format": "uuid",
"description": "Calendar the canonical source belongs to, when known. Absent only in\nprojections stored before calendars were attributed."
},
+ "conferenceProvider": {
+ "oneOf": [
+ {
+ "type": "null"
+ },
+ {
+ "$ref": "#/components/schemas/ConferenceProvider",
+ "description": "Which conferencing system backs `conference_url`. `None` whenever no\nconference is attached."
+ }
+ ]
+ },
"conferenceUrl": {
"type": ["string", "null"],
"description": "Direct join URL when known."
@@ -4594,6 +4605,16 @@
}
}
},
+ "ConferenceChange": {
+ "type": "string",
+ "description": "A requested change to an event's conferencing. Omitting the field leaves\nthe existing conference untouched; only these values change it.",
+ "enum": ["google_meet", "none"]
+ },
+ "ConferenceProvider": {
+ "type": "string",
+ "description": "The conferencing system backing an event's join URL.\n\nMacro generates only Google Meet conferences, so this distinguishes one it\ncreated from a third party's — Zoom and friends arriving as `addOn`\nconference data, or a legacy classic Hangout. Clients use it to label the\nconference and to tell whether the Meet toggle reflects a Macro-managed\nconference.\n\nIt does not gate mutation. An explicit request replaces or detaches any\nconference, third-party included, exactly as deleting the event would;\nwhat protects a conference is that omitting the field leaves it untouched,\nso an unrelated edit never disturbs it.",
+ "enum": ["google_meet", "other"]
+ },
"Contact": {
"type": "object",
"required": ["id", "link_id"],
@@ -4687,6 +4708,17 @@
"format": "uuid",
"description": "Exact calendar to create the event on; takes precedence over the\ninbox default."
},
+ "conference": {
+ "oneOf": [
+ {
+ "type": "null"
+ },
+ {
+ "$ref": "#/components/schemas/ConferenceChange",
+ "description": "Conference to attach to the new event; omit to create it without one."
+ }
+ ]
+ },
"description": {
"type": ["string", "null"],
"description": "Optional event body."
@@ -6027,6 +6059,17 @@
},
"description": "Replacement attendee list."
},
+ "conference": {
+ "oneOf": [
+ {
+ "type": "null"
+ },
+ {
+ "$ref": "#/components/schemas/ConferenceChange",
+ "description": "Conference change: `google_meet` attaches a freshly generated Meet,\n`none` detaches the current conference, and omitting it leaves the\nconference untouched.\n\nA third-party conference is replaced or detached like any other, since\nthe request is explicit. Omit the field to leave it alone."
+ }
+ ]
+ },
"description": {
"type": ["string", "null"],
"description": "Replacement description; an empty string clears it."
diff --git a/packages/sdk/specs/storage.json b/packages/sdk/specs/storage.json
index 396ea9e6c5..3360637a0f 100644
--- a/packages/sdk/specs/storage.json
+++ b/packages/sdk/specs/storage.json
@@ -12892,6 +12892,17 @@
"format": "uuid",
"description": "Calendar the canonical source belongs to, when known. Absent only in\nprojections stored before calendars were attributed."
},
+ "conferenceProvider": {
+ "oneOf": [
+ {
+ "type": "null"
+ },
+ {
+ "$ref": "#/components/schemas/ConferenceProvider",
+ "description": "Which conferencing system backs `conference_url`. `None` whenever no\nconference is attached."
+ }
+ ]
+ },
"conferenceUrl": {
"type": ["string", "null"],
"description": "Direct join URL when known."
@@ -14627,6 +14638,11 @@
}
}
},
+ "ConferenceProvider": {
+ "type": "string",
+ "description": "The conferencing system backing an event's join URL.\n\nMacro generates only Google Meet conferences, so this distinguishes one it\ncreated from a third party's — Zoom and friends arriving as `addOn`\nconference data, or a legacy classic Hangout. Clients use it to label the\nconference and to tell whether the Meet toggle reflects a Macro-managed\nconference.\n\nIt does not gate mutation. An explicit request replaces or detaches any\nconference, third-party included, exactly as deleting the event would;\nwhat protects a conference is that omitting the field leaves it untouched,\nso an unrelated edit never disturbs it.",
+ "enum": ["google_meet", "other"]
+ },
"CopyDocumentQueryParams": {
"type": "object",
"description": "Query parameters for the copy document endpoint.",
@@ -21891,6 +21907,10 @@
"extra"
],
"properties": {
+ "conferenceProvider": {
+ "type": ["string", "null"],
+ "description": "Which conferencing system backs `conference_url`."
+ },
"conferenceUrl": {
"type": ["string", "null"],
"description": "Direct conference join URL."
diff --git a/static_assets/schema.graphql b/static_assets/schema.graphql
index b9518490ad..2fde55adc3 100644
--- a/static_assets/schema.graphql
+++ b/static_assets/schema.graphql
@@ -2204,6 +2204,10 @@ type GraphqlSoupCalendarEvent implements GraphqlSoupEntity {
"""
conferenceUrl: String
"""
+ Which conferencing system backs the join URL.
+ """
+ conferenceProvider: String
+ """
Whether the canonical source is read-only.
"""
isReadOnly: Boolean!