fix(google-calendar): honor cancellation on RSVP write and tighten outputs

Author: waleedlatif1

apps/docs/content/docs/integrations/google_calendar.mdx

@@ -320,7 +320,7 @@ RSVP to a Google Calendar event (accept, decline, or tentative) as the connected
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `calendarId` | string | No | Google Calendar ID the invitation appears on \(e.g., primary or calendar@group.calendar.google.com\) |
-| `eventId` | string | Yes | Google Calendar event ID to respond to. Use a recurring-event instance ID \(from Get Recurring Instances\) to respond to a single occurrence; the series ID responds to every occurrence. |
+| `eventId` | string | Yes | Google Calendar event ID to respond to. Use a recurring-event instance ID \(as returned by List Events or Get Recurring Instances\) to respond to a single occurrence; the series ID responds to every occurrence. |
 | `responseStatus` | string | Yes | Your response: accepted, declined, or tentative |
 | `comment` | string | No | Optional note to include with your response |
 | `sendUpdates` | string | No | Who to notify about your response: all, externalOnly, or none |

apps/sim/blocks/blocks/google_calendar.ts

@@ -1242,7 +1242,7 @@ export const GoogleCalendarBlockMeta = {
       name: 'rsvp-to-event',
       description: 'Accept, decline, or tentatively accept a Google Calendar invitation.',
       content:
-        '# RSVP to an Event\n\nChange your own response to an invitation without touching the guest list.\n\n## Steps\n1. Find the event with List Events over the right time window. List Events returns each occurrence of a recurring meeting with its own ID, so use that ID to respond to one occurrence only; the series ID (recurringEventId) changes your response for every occurrence.\n2. Run Respond to Invitation (RSVP) with Response set to `Yes (accept)`, `No (decline)`, or `Maybe (tentative)`, and an optional note.\n3. Do not use Update Event or Invite Attendees to RSVP; they edit the guest list, not your response.\n\n## Output\nConfirm the event title, the occurrence start time, and the confirmed response returned by the tool.',
+        '# RSVP to an Event\n\nChange your own response to an invitation without touching the guest list.\n\n## Steps\n1. Find the event with List Events over the right time window. List Events returns each occurrence of a recurring meeting with its own ID, so responding with that ID changes only that occurrence.\n2. Run Respond to Invitation (RSVP) with Response set to `Yes (accept)`, `No (decline)`, or `Maybe (tentative)`, and an optional note.\n3. Do not use Update Event or Invite Attendees to RSVP; they edit the guest list, not your response.\n\n## Output\nConfirm the event title, the occurrence start time, and the confirmed response returned by the tool.',
     },
   ],
 } as const satisfies BlockMeta

apps/sim/tools/generated/tool-metadata.ts

@@ -129,6 +129,31 @@ describe('google_calendar_respond', () => {
     ).rejects.toThrow('Forbidden')
   })
 
+  it('never writes the RSVP when the run was canceled', async () => {
+    const fetchMock = vi.fn()
+    vi.stubGlobal('fetch', fetchMock)
+    const controller = new AbortController()
+    controller.abort()
+
+    await expect(
+      respondTool.transformResponse!(jsonResponse(eventWith('needsAction')), baseParams, {
+        signal: controller.signal,
+      })
+    ).rejects.toThrow()
+    expect(fetchMock).not.toHaveBeenCalled()
+  })
+
+  it('forwards the execution signal to the RSVP write', async () => {
+    const fetchMock = vi.fn().mockResolvedValue(jsonResponse(eventWith('accepted')))
+    vi.stubGlobal('fetch', fetchMock)
+    const controller = new AbortController()
+
+    await respondTool.transformResponse!(jsonResponse(eventWith('needsAction')), baseParams, {
+      signal: controller.signal,
+    })
+    expect(fetchMock.mock.calls[0][1].signal).toBe(controller.signal)
+  })
+
   it('fails when Google does not reflect the new response', async () => {
     vi.stubGlobal('fetch', vi.fn().mockResolvedValue(jsonResponse(eventWith('needsAction'))))
 

apps/sim/tools/generated/tool-outputs.ts

@@ -5,7 +5,7 @@ import {
   type GoogleCalendarRespondParams,
   type GoogleCalendarRespondResponse,
 } from '@/tools/google_calendar/types'
-import type { ToolConfig } from '@/tools/types'
+import type { ToolConfig, ToolResponseContext } from '@/tools/types'
 
 const RESPONSE_STATUSES = ['accepted', 'declined', 'tentative'] as const
 
@@ -20,10 +20,12 @@ interface RespondResult {
  * entry flagged `self`, then patched with `attendeesOmitted: true` and only that entry, which
  * tells Google to update just this participant's response and leave every other guest intact.
  * Passing a recurring-event instance ID changes the response for that occurrence only.
+ * The execution signal is forwarded so a canceled run never writes the RSVP.
  */
 async function respondToEvent(
   response: Response,
-  params: GoogleCalendarRespondParams | undefined
+  params: GoogleCalendarRespondParams | undefined,
+  signal: AbortSignal | undefined
 ): Promise<RespondResult> {
   const existingEvent: GoogleCalendarApiEventResponse = await response.json()
 
@@ -61,8 +63,10 @@ async function respondToEvent(
   const queryString = queryParams.toString()
   const patchUrl = `${CALENDAR_API_BASE}/calendars/${encodeURIComponent(calendarId)}/events/${encodeURIComponent(params?.eventId?.trim() ?? '')}${queryString ? `?${queryString}` : ''}`
 
+  signal?.throwIfAborted()
   const patchResponse = await fetch(patchUrl, {
     method: 'PATCH',
+    signal,
     headers: {
       Authorization: `Bearer ${params?.accessToken}`,
       'Content-Type': 'application/json',
@@ -117,7 +121,7 @@ export const respondTool: ToolConfig<GoogleCalendarRespondParams, GoogleCalendar
       required: true,
       visibility: 'user-or-llm',
       description:
-        'Google Calendar event ID to respond to. Use a recurring-event instance ID (from Get Recurring Instances) to respond to a single occurrence; the series ID responds to every occurrence.',
+        'Google Calendar event ID to respond to. Use a recurring-event instance ID (as returned by List Events or Get Recurring Instances) to respond to a single occurrence; the series ID responds to every occurrence.',
     },
     responseStatus: {
       type: 'string',
@@ -151,8 +155,8 @@ export const respondTool: ToolConfig<GoogleCalendarRespondParams, GoogleCalendar
     }),
   },
 
-  transformResponse: async (response: Response, params) => {
-    const { data, responseStatus } = await respondToEvent(response, params)
+  transformResponse: async (response: Response, params, context?: ToolResponseContext) => {
+    const { data, responseStatus } = await respondToEvent(response, params, context?.signal)
 
     return {
       success: true,
@@ -212,8 +216,12 @@ export const respondV2Tool: ToolConfig<
   oauth: respondTool.oauth,
   params: respondTool.params,
   request: respondTool.request,
-  transformResponse: async (response: Response, params) => {
-    const { data, responseStatus, comment } = await respondToEvent(response, params)
+  transformResponse: async (response: Response, params, context?: ToolResponseContext) => {
+    const { data, responseStatus, comment } = await respondToEvent(
+      response,
+      params,
+      context?.signal
+    )
 
     return {
       success: true,
@@ -235,15 +243,15 @@ export const respondV2Tool: ToolConfig<
     id: { type: 'string', description: 'Event ID' },
     htmlLink: { type: 'string', description: 'Event link' },
     status: { type: 'string', description: 'Event status' },
-    summary: { type: 'string', description: 'Event title', optional: true },
+    summary: { type: 'string', description: 'Event title', nullable: true },
     start: { type: 'json', description: 'Event start' },
     end: { type: 'json', description: 'Event end' },
     responseStatus: {
       type: 'string',
       description: 'Your confirmed response (accepted, declined, or tentative)',
     },
-    comment: { type: 'string', description: 'Your response comment', optional: true },
-    attendees: { type: 'json', description: 'Event attendees', optional: true },
-    organizer: { type: 'json', description: 'Event organizer', optional: true },
+    comment: { type: 'string', description: 'Your response comment', nullable: true },
+    attendees: { type: 'json', description: 'Event attendees', nullable: true },
+    organizer: { type: 'json', description: 'Event organizer', nullable: true },
   },
 }