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.

refactor(calendar): make the calendar OpenAPI paths root-relative (#6829)

gbirman4eb9c52c2329
diff --git a/apps/web/src/lib/service-clients/service-calendar/generated/client.ts b/apps/web/src/lib/service-clients/service-calendar/generated/client.ts
index af68ea4be7..795cafbed9 100644
--- a/apps/web/src/lib/service-clients/service-calendar/generated/client.ts
+++ b/apps/web/src/lib/service-clients/service-calendar/generated/client.ts
@@ -47,7 +47,7 @@ export type listCalendarsResponse =
| listCalendarsResponseError;
export const getListCalendarsUrl = () => {
- return `/calendar/calendars`;
+ return `/calendars`;
};
export const listCalendars = async (
@@ -120,7 +120,7 @@ export type createCalendarEventResponse =
| createCalendarEventResponseError;
export const getCreateCalendarEventUrl = () => {
- return `/calendar/events`;
+ return `/events`;
};
export const createCalendarEvent = async (
@@ -212,8 +212,8 @@ export const getDeleteCalendarEventUrl = (
const stringifiedParams = normalizedParams.toString();
return stringifiedParams.length > 0
- ? `/calendar/events/${eventId}?${stringifiedParams}`
- : `/calendar/events/${eventId}`;
+ ? `/events/${eventId}?${stringifiedParams}`
+ : `/events/${eventId}`;
};
export const deleteCalendarEvent = async (
@@ -296,7 +296,7 @@ export type updateCalendarEventResponse =
| updateCalendarEventResponseError;
export const getUpdateCalendarEventUrl = (eventId: string) => {
- return `/calendar/events/${eventId}`;
+ return `/events/${eventId}`;
};
export const updateCalendarEvent = async (
@@ -374,7 +374,7 @@ export type rsvpCalendarEventResponse =
| rsvpCalendarEventResponseError;
export const getRsvpCalendarEventUrl = (eventId: string) => {
- return `/calendar/events/${eventId}/rsvp`;
+ return `/events/${eventId}/rsvp`;
};
export const rsvpCalendarEvent = async (
diff --git a/apps/web/src/lib/service-clients/service-calendar/openapi.json b/apps/web/src/lib/service-clients/service-calendar/openapi.json
index 19af3579dc..1f60d9b3aa 100644
--- a/apps/web/src/lib/service-clients/service-calendar/openapi.json
+++ b/apps/web/src/lib/service-clients/service-calendar/openapi.json
@@ -9,7 +9,7 @@
"version": "0.1.0"
},
"paths": {
- "/calendar/calendars": {
+ "/calendars": {
"get": {
"tags": ["calendar_events"],
"summary": "List the requester's visible calendars for pickers and filters.",
@@ -41,7 +41,7 @@
}
}
},
- "/calendar/events": {
+ "/events": {
"post": {
"tags": ["calendar_events"],
"summary": "Create a calendar event and return its synced entity.",
@@ -113,7 +113,7 @@
}
}
},
- "/calendar/events/{event_id}": {
+ "/events/{event_id}": {
"delete": {
"tags": ["calendar_events"],
"summary": "Delete a calendar event at its provider.",
@@ -300,7 +300,7 @@
}
}
},
- "/calendar/events/{event_id}/rsvp": {
+ "/events/{event_id}/rsvp": {
"put": {
"tags": ["calendar_events"],
"summary": "Set the requester's RSVP on a calendar event and return its synced entity.",
diff --git a/crates/calendar_events/Cargo.toml b/crates/calendar_events/Cargo.toml
index 376cba30e9..df0c948468 100644
--- a/crates/calendar_events/Cargo.toml
+++ b/crates/calendar_events/Cargo.toml
@@ -14,7 +14,7 @@ dispatch = ["dep:tokio", "dep:tokio-util"]
# The worker plus the SQS adapter that backs it.
dispatch-sqs = ["dep:aws-sdk-sqs", "dispatch"]
google = ["dep:reqwest", "dep:urlencoding"]
-# The email-service HTTP adapter implementing the mutation port, for hosts
+# The calendar-service HTTP adapter implementing the mutation port, for hosts
# that are not the calendar write authority.
mutation-client = ["dep:reqwest"]
inbound = [
diff --git a/crates/calendar_events/src/inbound/mutation_router.rs b/crates/calendar_events/src/inbound/mutation_router.rs
index 4464748ea2..f35b8ad5b6 100644
--- a/crates/calendar_events/src/inbound/mutation_router.rs
+++ b/crates/calendar_events/src/inbound/mutation_router.rs
@@ -397,7 +397,7 @@ impl From<CalendarMutationError> for CalendarMutationApiError {
#[tracing::instrument(skip_all, err)]
#[utoipa::path(
post,
- path = "/calendar/events",
+ path = "/events",
tag = "calendar_events",
request_body = CreateCalendarEventRequest,
responses(
@@ -455,7 +455,7 @@ pub struct ListCalendarsResponse {
#[tracing::instrument(skip_all, err)]
#[utoipa::path(
get,
- path = "/calendar/calendars",
+ path = "/calendars",
tag = "calendar_events",
responses(
(status = 200, description = "Calendars visible to the requester", body = ListCalendarsResponse),
@@ -507,7 +507,7 @@ fn update_scope(
#[tracing::instrument(skip_all, fields(event_id = %event_id), err)]
#[utoipa::path(
patch,
- path = "/calendar/events/{event_id}",
+ path = "/events/{event_id}",
tag = "calendar_events",
params(("event_id" = Uuid, Path, description = "Calendar event entity id")),
request_body = UpdateCalendarEventRequest,
@@ -564,7 +564,7 @@ where
#[tracing::instrument(skip_all, fields(event_id = %event_id), err)]
#[utoipa::path(
delete,
- path = "/calendar/events/{event_id}",
+ path = "/events/{event_id}",
tag = "calendar_events",
params(
("event_id" = Uuid, Path, description = "Calendar event entity id"),
@@ -621,7 +621,7 @@ where
#[tracing::instrument(skip_all, fields(event_id = %event_id), err)]
#[utoipa::path(
put,
- path = "/calendar/events/{event_id}/rsvp",
+ path = "/events/{event_id}/rsvp",
tag = "calendar_events",
params(("event_id" = Uuid, Path, description = "Calendar event entity id")),
request_body = RsvpCalendarEventRequest,
diff --git a/crates/calendar_events/src/outbound/calendar_service_mutations.rs b/crates/calendar_events/src/outbound/calendar_service_mutations.rs
index ce186c53ed..a3f1f19032 100644
--- a/crates/calendar_events/src/outbound/calendar_service_mutations.rs
+++ b/crates/calendar_events/src/outbound/calendar_service_mutations.rs
@@ -74,7 +74,7 @@ impl CalendarServiceMutations {
) -> Result<reqwest::Response, CalendarMutationError> {
let response = request.send().await.map_err(|error| {
CalendarMutationError::Retryable(format!(
- "calendar mutation request failed to reach the email service: {error}"
+ "calendar mutation request failed to reach the calendar service: {error}"
))
})?;
let status = response.status();
diff --git a/packages/sdk/scripts/sync-specs.ts b/packages/sdk/scripts/sync-specs.ts
index 23bfe73c82..578bf74b30 100644
--- a/packages/sdk/scripts/sync-specs.ts
+++ b/packages/sdk/scripts/sync-specs.ts
@@ -1,15 +1,10 @@
import * as path from 'node:path';
-import { $ } from 'bun';
import { services } from '../services';
-// Services whose OpenAPI spec is copied from apps/web's service-clients package,
-// where `apps/web`'s `gen-api` writes each Rust service's spec. `calendar` is not
-// among them: its paths need the `/calendar` prefix stripped (see
-// `stripCalendarPrefix`), so its spec is generated here directly from the Rust
-// `calendar_service_openapi` binary. See `syncCalendarSpec`.
const serviceClientDirectories = {
'agent-harness': 'service-agent-harness',
auth: 'service-auth',
+ calendar: 'service-calendar',
cognition: 'service-cognition',
connection: 'service-connection',
contacts: 'service-contacts',
@@ -21,61 +16,16 @@ const serviceClientDirectories = {
'static-files': 'service-static-files',
storage: 'service-storage',
unfurl: 'service-unfurl',
-} satisfies Record<Exclude<(typeof services)[number], 'calendar'>, string>;
+} satisfies Record<(typeof services)[number], string>;
const serviceClientsDirectory = path.resolve(
import.meta.dirname,
'../../../apps/web/src/lib/service-clients',
);
const specsDirectory = path.resolve(import.meta.dirname, '../specs');
-const rustWorkspaceDirectory = path.resolve(import.meta.dirname, '../../..');
-
-/**
- * Rewrite calendar_service's OpenAPI so its paths are root-relative.
- *
- * The calendar mutation handlers are shared with email-service, whose spec must
- * keep serving them under `/calendar/*` (email base is `/email`). Their
- * `utoipa::path` annotations therefore carry a `/calendar` prefix. The SDK's
- * calendar client instead carries `/calendar` in its base URL (dev/prod
- * `<gateway>/calendar`), so the generated paths must drop it. Stripping here
- * keeps the annotations untouched — and so keeps email-service's spec, and the
- * apps/web spec generated from it, byte-for-byte unchanged.
- *
- * Temporary: once email-service stops serving `/calendar/*` (cutover cleanup),
- * the shared annotations can become router-relative and this transform goes away.
- */
-function stripCalendarPrefix(spec: string): string {
- const doc = JSON.parse(spec) as { paths?: Record<string, unknown> };
- if (doc.paths) {
- const rewritten: Record<string, unknown> = {};
- for (const [route, item] of Object.entries(doc.paths)) {
- const stripped = route.startsWith('/calendar/')
- ? route.slice('/calendar'.length)
- : route;
- rewritten[stripped] = item;
- }
- doc.paths = rewritten;
- }
- return `${JSON.stringify(doc, null, 2)}\n`;
-}
-
-async function syncCalendarSpec(destination: string): Promise<void> {
- const spec = await $`cargo run --quiet --bin calendar_service_openapi`
- .cwd(rustWorkspaceDirectory)
- .env({ ...process.env, SQLX_OFFLINE: 'true' })
- .text();
- await Bun.write(destination, stripCalendarPrefix(spec));
- console.log('Synced calendar (from calendar_service_openapi)');
-}
for (const service of services) {
const destination = path.join(specsDirectory, `${service}.json`);
-
- if (service === 'calendar') {
- await syncCalendarSpec(destination);
- continue;
- }
-
const source = path.join(
serviceClientsDirectory,
serviceClientDirectories[service],
diff --git a/packages/sdk/specs/calendar.json b/packages/sdk/specs/calendar.json
index 0733e16abc..1f60d9b3aa 100644
--- a/packages/sdk/specs/calendar.json
+++ b/packages/sdk/specs/calendar.json
@@ -11,9 +11,7 @@
"paths": {
"/calendars": {
"get": {
- "tags": [
- "calendar_events"
- ],
+ "tags": ["calendar_events"],
"summary": "List the requester's visible calendars for pickers and filters.",
"operationId": "list_calendars",
"responses": {
@@ -45,9 +43,7 @@
},
"/events": {
"post": {
- "tags": [
- "calendar_events"
- ],
+ "tags": ["calendar_events"],
"summary": "Create a calendar event and return its synced entity.",
"operationId": "create_calendar_event",
"requestBody": {
@@ -119,9 +115,7 @@
},
"/events/{event_id}": {
"delete": {
- "tags": [
- "calendar_events"
- ],
+ "tags": ["calendar_events"],
"summary": "Delete a calendar event at its provider.",
"operationId": "delete_calendar_event",
"parameters": [
@@ -214,9 +208,7 @@
}
},
"patch": {
- "tags": [
- "calendar_events"
- ],
+ "tags": ["calendar_events"],
"summary": "Update fields of a calendar event and return its synced entity.",
"operationId": "update_calendar_event",
"parameters": [
@@ -310,9 +302,7 @@
},
"/events/{event_id}/rsvp": {
"put": {
- "tags": [
- "calendar_events"
- ],
+ "tags": ["calendar_events"],
"summary": "Set the requester's RSVP on a calendar event and return its synced entity.",
"operationId": "rsvp_calendar_event",
"parameters": [
@@ -396,9 +386,7 @@
},
"/health": {
"get": {
- "tags": [
- "crate::health"
- ],
+ "tags": ["crate::health"],
"summary": "Health check",
"operationId": "health_handler",
"responses": {
@@ -421,12 +409,7 @@
"AttendeeResponseStatus": {
"type": "string",
"description": "RSVP state for an attendee.",
- "enum": [
- "needs_action",
- "accepted",
- "declined",
- "tentative"
- ]
+ "enum": ["needs_action", "accepted", "declined", "tentative"]
},
"CalendarAttendee": {
"type": "object",
@@ -440,17 +423,11 @@
],
"properties": {
"comment": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"description": "Optional attendee comment."
},
"displayName": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"description": "Provider display name."
},
"email": {
@@ -478,9 +455,7 @@
"CalendarAttendeeInputBody": {
"type": "object",
"description": "An attendee supplied to a calendar mutation.",
- "required": [
- "email"
- ],
+ "required": ["email"],
"properties": {
"email": {
"type": "string",
@@ -495,11 +470,7 @@
"CalendarDeletionScopeParam": {
"type": "string",
"description": "How much of a recurring series a deletion removes.",
- "enum": [
- "all",
- "this_event",
- "this_and_following"
- ]
+ "enum": ["all", "this_event", "this_and_following"]
},
"CalendarEvent": {
"type": "object",
@@ -529,10 +500,7 @@
"description": "Attendees, keyed by email during persistence."
},
"calendarId": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"format": "uuid",
"description": "Calendar the canonical source belongs to, when known. Absent only in\nprojections stored before calendars were attributed."
},
@@ -548,10 +516,7 @@
]
},
"conferenceUrl": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"description": "Direct join URL when known."
},
"createdAt": {
@@ -560,24 +525,15 @@
"description": "Entity creation time."
},
"creatorEmail": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"description": "Provider-reported creator email. Distinct from the organizer when\nsomeone writes onto a calendar they do not own. Omitted from stored\nprojections when unknown so events ingested before this field still\ncompare equal."
},
"creatorName": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"description": "Provider-reported creator display name."
},
"description": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"description": "Optional event body."
},
"eventType": {
@@ -598,24 +554,15 @@
"description": "Whether the canonical source's calendar prohibits editing it."
},
"location": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"description": "Optional physical or virtual location label."
},
"organizerEmail": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"description": "Organizer email."
},
"organizerName": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"description": "Organizer display name."
},
"ownerId": {
@@ -692,24 +639,15 @@
"description": "Calendar this copy lives on."
},
"creatorEmail": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"description": "Provider-reported creator email."
},
"creatorName": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"description": "Provider-reported creator display name."
},
"description": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"description": "Optional event body."
},
"eventType": {
@@ -721,10 +659,7 @@
"description": "Whether the calendar's access role prohibits editing this copy."
},
"location": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"description": "Optional physical or virtual location label."
},
"reminders": {
@@ -748,10 +683,7 @@
"CalendarMutationApiError": {
"type": "object",
"description": "HTTP error body returned by calendar mutation endpoints.",
- "required": [
- "code",
- "message"
- ],
+ "required": ["code", "message"],
"properties": {
"code": {
"$ref": "#/components/schemas/CalendarMutationErrorCode",
@@ -782,42 +714,27 @@
"CalendarRsvpScopeParam": {
"type": "string",
"description": "How much of a recurring series an RSVP applies to.\n\nUnlike deletion there is no this-and-following variant: the provider\ncannot express a forward-scoped response, so offering one would be a\npromise sync could not keep.",
- "enum": [
- "all",
- "this_event"
- ]
+ "enum": ["all", "this_event"]
},
"CalendarUpdateScopeParam": {
"type": "string",
"description": "How much of a recurring series an update applies to.\n\nLike RSVPs there is no this-and-following variant: the provider cannot\nexpress a forward-scoped edit as one write, and emulating it (truncate\nthe series, insert an edited clone) is non-atomic and re-invites the\nattendees of the clone. Compose it from a this-and-following deletion\nand a create when that shape is wanted.",
- "enum": [
- "all",
- "this_event"
- ]
+ "enum": ["all", "this_event"]
},
"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"
- ]
+ "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"
- ]
+ "enum": ["google_meet", "other"]
},
"CreateCalendarEventRequest": {
"type": "object",
"description": "Request body creating a calendar event on the requester's calendar.",
- "required": [
- "title",
- "time"
- ],
+ "required": ["title", "time"],
"properties": {
"attendees": {
"type": "array",
@@ -827,10 +744,7 @@
"description": "Invited attendees."
},
"calendarId": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"format": "uuid",
"description": "Exact calendar to create the event on; takes precedence over the\ninbox default."
},
@@ -846,25 +760,16 @@
]
},
"description": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"description": "Optional event body."
},
"emailLinkId": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"format": "uuid",
"description": "Connected inbox whose primary calendar receives the event; defaults\nto the requester's primary inbox."
},
"location": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"description": "Optional location label."
},
"outOfOffice": {
@@ -931,10 +836,7 @@
"EventReminderOverride": {
"type": "object",
"description": "One reminder: how it alerts and how many minutes before the event start\n(before midnight in the calendar's zone for all-day events) it fires.",
- "required": [
- "method",
- "minutes"
- ],
+ "required": ["method", "minutes"],
"properties": {
"method": {
"type": "string",
@@ -951,9 +853,7 @@
"EventReminders": {
"type": "object",
"description": "Per-user reminder configuration for an event, mirroring Google's model:\neither the calendar's default reminders apply, or the explicit overrides\nreplace them entirely.",
- "required": [
- "useDefault"
- ],
+ "required": ["useDefault"],
"properties": {
"overrides": {
"type": "array",
@@ -971,22 +871,14 @@
"EventStatus": {
"type": "string",
"description": "Canonical event status.",
- "enum": [
- "confirmed",
- "tentative",
- "cancelled"
- ]
+ "enum": ["confirmed", "tentative", "cancelled"]
},
"EventTime": {
"oneOf": [
{
"type": "object",
"description": "An event with absolute instants.",
- "required": [
- "startsAt",
- "endsAt",
- "kind"
- ],
+ "required": ["startsAt", "endsAt", "kind"],
"properties": {
"endsAt": {
"type": "string",
@@ -995,9 +887,7 @@
},
"kind": {
"type": "string",
- "enum": [
- "timed"
- ]
+ "enum": ["timed"]
},
"startsAt": {
"type": "string",
@@ -1005,10 +895,7 @@
"description": "Inclusive start instant."
},
"timeZone": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"description": "Original IANA time-zone identifier, when supplied."
}
}
@@ -1016,11 +903,7 @@
{
"type": "object",
"description": "An all-day event using RFC 5545's exclusive end date.",
- "required": [
- "startDate",
- "endDate",
- "kind"
- ],
+ "required": ["startDate", "endDate", "kind"],
"properties": {
"endDate": {
"type": "string",
@@ -1029,9 +912,7 @@
},
"kind": {
"type": "string",
- "enum": [
- "allDay"
- ]
+ "enum": ["allDay"]
},
"startDate": {
"type": "string",
@@ -1046,10 +927,7 @@
"EventTransparency": {
"type": "string",
"description": "Whether an event blocks availability.",
- "enum": [
- "opaque",
- "transparent"
- ]
+ "enum": ["opaque", "transparent"]
},
"EventType": {
"type": "string",
@@ -1066,19 +944,12 @@
"EventVisibility": {
"type": "string",
"description": "Visibility of event details.",
- "enum": [
- "default",
- "public",
- "private",
- "confidential"
- ]
+ "enum": ["default", "public", "private", "confidential"]
},
"ListCalendarsResponse": {
"type": "object",
"description": "Calendars visible to the requester across connected and delegated inboxes.",
- "required": [
- "calendars"
- ],
+ "required": ["calendars"],
"properties": {
"calendars": {
"type": "array",
@@ -1107,10 +978,7 @@
"description": "How conflicting invitations are handled while the user is out."
},
"declineMessage": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"description": "Message returned to organizers whose invitations are auto-declined."
}
}
@@ -1120,16 +988,11 @@
{
"type": "object",
"description": "A sync run committed changes for `link_id`; viewers should refetch.",
- "required": [
- "link_id",
- "event"
- ],
+ "required": ["link_id", "event"],
"properties": {
"event": {
"type": "string",
- "enum": [
- "synced"
- ]
+ "enum": ["synced"]
},
"link_id": {
"type": "string",
@@ -1144,23 +1007,15 @@
"RsvpCalendarEventRequest": {
"type": "object",
"description": "Request body setting the requester's RSVP on an event.",
- "required": [
- "response"
- ],
+ "required": ["response"],
"properties": {
"calendarId": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"format": "uuid",
"description": "Calendar whose copy of the event is answered, for an event synced\nfrom more than one calendar. Omit to answer on the canonical copy."
},
"recurrenceId": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"description": "Original-start key of the occurrence the response targets."
},
"response": {
@@ -1185,20 +1040,14 @@
"description": "Request body patching an event; omitted fields are left untouched.",
"properties": {
"attendees": {
- "type": [
- "array",
- "null"
- ],
+ "type": ["array", "null"],
"items": {
"$ref": "#/components/schemas/CalendarAttendeeInputBody"
},
"description": "Replacement attendee list."
},
"calendarId": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"format": "uuid",
"description": "Calendar whose copy of the event is patched, for an event synced from\nmore than one calendar. Omit to patch the canonical copy."
},
@@ -1214,17 +1063,11 @@
]
},
"description": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"description": "Replacement description; an empty string clears it."
},
"location": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"description": "Replacement location; an empty string clears it."
},
"outOfOffice": {
@@ -1239,17 +1082,11 @@
]
},
"recurrenceId": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"description": "Original-start key of the occurrence the update targets."
},
"recurrenceLines": {
- "type": [
- "array",
- "null"
- ],
+ "type": ["array", "null"],
"items": {
"type": "string"
},
@@ -1289,10 +1126,7 @@
]
},
"title": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"description": "Replacement title; an empty string clears it."
},
"transparency": {
@@ -1334,10 +1168,7 @@
],
"properties": {
"color": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"description": "Provider color."
},
"defaultReminders": {
@@ -1378,10 +1209,7 @@
"description": "Provider display name."
},
"syncError": {
- "type": [
- "string",
- "null"
- ],
+ "type": ["string", "null"],
"description": "A persistent sync failure isolated to this calendar, surfaced so the\nsettings row can badge it. `None` while the calendar is syncing\nnormally or a failure has not yet crossed the persistence threshold."
}
}
diff --git a/packages/sdk/src/config.ts b/packages/sdk/src/config.ts
index 26648cb629..295125bb7e 100644
--- a/packages/sdk/src/config.ts
+++ b/packages/sdk/src/config.ts
@@ -62,12 +62,10 @@ export const HOSTS: Record<Env, Record<ServiceName, string>> = {
storage: 'http://localhost:8086',
auth: 'http://localhost:8080',
email: 'http://localhost:8087',
- // No gateway locally, and calendar_service is not in the local stack yet.
- // email-service still serves /calendar/* on 8087, so the `/calendar` segment
- // is carried in the base here (the client's paths are root-relative). Point
- // this at calendar_service once it joins the local stack. Mirrors
- // apps/web servers.ts (PR #6752).
- calendar: 'http://localhost:8087/calendar',
+ // calendar_service serves its routes under `/calendar` as well as at the
+ // root; the `/calendar` segment keeps local paths identical to the
+ // gateway's. Mirrors apps/web servers.ts.
+ calendar: 'http://localhost:8088/calendar',
cognition: 'http://localhost:8085',
notification: 'http://localhost:8089',
properties: 'http://localhost:8086',
diff --git a/services/calendar_service/src/api.rs b/services/calendar_service/src/api.rs
index ca892c3e47..41e00f4ffe 100644
--- a/services/calendar_service/src/api.rs
+++ b/services/calendar_service/src/api.rs
@@ -15,7 +15,7 @@ mod calendar_watch;
pub mod swagger;
/// Path prefix the shared gateway ALB forwards unmodified. Dual-mounted
-/// alongside `/` so a dedicated ALB keeps working during cutover.
+/// alongside `/`, where the target group's `/health` check probes.
const GATEWAY_PATH_PREFIX: &str = "/calendar";
/// Build the application and serve it until a shutdown signal arrives.
diff --git a/services/calendar_service/src/api/swagger.rs b/services/calendar_service/src/api/swagger.rs
index bddff411d3..c9bc578b1b 100644
--- a/services/calendar_service/src/api/swagger.rs
+++ b/services/calendar_service/src/api/swagger.rs
@@ -2,11 +2,9 @@ use utoipa::OpenApi;
/// OpenAPI document for the calendar service.
///
-/// The calendar mutation operations live in the shared `calendar_events` crate
-/// and are served here (and, for cutover, also under `/calendar`). Their
-/// `utoipa::path` annotations carry the `/calendar` prefix because email-service
-/// serves the same handlers under `/email/calendar/*`; the SDK's spec sync
-/// strips that prefix so a calendar client can carry `/calendar` in its base.
+/// The calendar mutation operations live in the shared `calendar_events` crate.
+/// Their paths are root-relative; clients carry the `/calendar` gateway prefix
+/// in their base URL.
#[derive(OpenApi)]
#[openapi(
paths(