fix(google-calendar): address review — trust offset timezones, make list_acl showDeleted usable, harden unshare error parse, clarify update attendees

Author: waleedlatif1

apps/sim/blocks/blocks/google_calendar.ts

@@ -220,6 +220,14 @@ Return ONLY the RRULE string - no explanations, no extra text.`,
       ],
       value: () => 'false',
     },
+    {
+      id: 'timeZone',
+      title: 'Time Zone',
+      type: 'short-input',
+      placeholder: 'America/Los_Angeles',
+      condition: { field: 'operation', value: ['create', 'update'] },
+      mode: 'advanced',
+    },
 
     {
       id: 'timeMin',

apps/sim/tools/google_calendar/create.ts

@@ -75,8 +75,7 @@ export const createTool: ToolConfig<GoogleCalendarCreateParams, GoogleCalendarCr
       required: false,
       visibility: 'user-or-llm',
       description:
-        'Time zone (e.g., America/Los_Angeles). Required if datetime does not include offset. Defaults to America/Los_Angeles if not provided.',
-      default: 'America/Los_Angeles',
+        'IANA time zone (e.g., America/Los_Angeles). Used as-is when provided. For recurring events a time zone is required to expand the recurrence correctly; for one-off events it is only needed when the datetime omits a UTC offset (a naive datetime defaults to America/Los_Angeles).',
     },
     attendees: {
       type: 'array',
@@ -131,8 +130,8 @@ export const createTool: ToolConfig<GoogleCalendarCreateParams, GoogleCalendarCr
 
       const eventData: GoogleCalendarEventRequestBody = {
         summary: params.summary,
-        start: buildEventDateTime(params.startDateTime, params.timeZone, isRecurring),
-        end: buildEventDateTime(params.endDateTime, params.timeZone, isRecurring),
+        start: buildEventDateTime(params.startDateTime, params.timeZone),
+        end: buildEventDateTime(params.endDateTime, params.timeZone),
       }
 
       if (params.description) {

apps/sim/tools/google_calendar/list_acl.ts

@@ -45,7 +45,7 @@ export const listAclTool: ToolConfig<GoogleCalendarListAclParams, GoogleCalendar
     showDeleted: {
       type: 'boolean',
       required: false,
-      visibility: 'hidden',
+      visibility: 'user-only',
       description: 'Include deleted ACL rules (with role "none")',
     },
   },

apps/sim/tools/google_calendar/unshare_calendar.ts

@@ -68,8 +68,8 @@ export const unshareCalendarTool: ToolConfig<
       }
     }
 
-    const errorData = await response.json()
-    throw new Error(errorData.error?.message || 'Failed to remove sharing rule')
+    const errorData = await response.json().catch(() => null)
+    throw new Error(errorData?.error?.message || 'Failed to remove sharing rule')
   },
 
   outputs: {
@@ -112,8 +112,8 @@ export const unshareCalendarV2Tool: ToolConfig<
       }
     }
 
-    const errorData = await response.json()
-    throw new Error(errorData.error?.message || 'Failed to remove sharing rule')
+    const errorData = await response.json().catch(() => null)
+    throw new Error(errorData?.error?.message || 'Failed to remove sharing rule')
   },
   outputs: {
     ruleId: { type: 'string', description: 'Removed ACL rule ID' },

apps/sim/tools/google_calendar/update.ts

@@ -83,13 +83,14 @@ export const updateTool: ToolConfig<GoogleCalendarUpdateParams, GoogleCalendarUp
       required: false,
       visibility: 'user-or-llm',
       description:
-        'Time zone (e.g., America/Los_Angeles). Required if datetime does not include offset.',
+        'IANA time zone (e.g., America/Los_Angeles). Used as-is when provided. For recurring events a time zone is required to expand the recurrence correctly; for one-off events it is only needed when the datetime omits a UTC offset.',
     },
     attendees: {
       type: 'array',
       required: false,
       visibility: 'user-or-llm',
-      description: 'Array of attendee email addresses (replaces the existing attendee list)',
+      description:
+        'Array of attendee email addresses. When one or more emails are provided, they replace the existing attendee list. Leaving this empty keeps the current attendees unchanged (it does not clear them).',
     },
     recurrence: {
       type: 'string',
@@ -150,11 +151,11 @@ export const updateTool: ToolConfig<GoogleCalendarUpdateParams, GoogleCalendarUp
       }
 
       if (params.startDateTime !== undefined) {
-        updateData.start = buildEventDateTime(params.startDateTime, params.timeZone, isRecurring)
+        updateData.start = buildEventDateTime(params.startDateTime, params.timeZone)
       }
 
       if (params.endDateTime !== undefined) {
-        updateData.end = buildEventDateTime(params.endDateTime, params.timeZone, isRecurring)
+        updateData.end = buildEventDateTime(params.endDateTime, params.timeZone)
       }
 
       const attendees = normalizeAttendees(params.attendees)

apps/sim/tools/google_calendar/utils.ts

@@ -10,16 +10,16 @@ const TZ_OFFSET_PATTERN = /([+-]\d{2}:?\d{2}|Z)$/
  * Build a Google Calendar event date/time object from a user-supplied value.
  *
  * A date-only value (e.g. `2025-06-03`) produces an all-day `{ date }` object.
- * A datetime value produces `{ dateTime, timeZone? }`. A timezone is attached when
- * one is explicitly provided, when the datetime carries no UTC offset (so the time
- * is unambiguous), or when `requireTimeZone` is set — the Calendar API requires a
- * timezone on the start/end of recurring events.
+ * A datetime value produces `{ dateTime, timeZone? }`. An explicitly provided
+ * timezone always wins. Otherwise a default zone is attached only for "naive"
+ * datetimes that carry no UTC offset — when an offset is present it is authoritative
+ * and is never overridden with a guessed zone, which would misalign the time.
+ *
+ * For recurring events the Calendar API requires a named `timeZone` on start/end;
+ * callers should pass the user's timezone explicitly (an RFC3339 offset alone is
+ * insufficient to expand a recurrence across DST).
  */
-export function buildEventDateTime(
-  value: string,
-  timeZone: string | undefined,
-  requireTimeZone = false
-): EventDateTime {
+export function buildEventDateTime(value: string, timeZone: string | undefined): EventDateTime {
   const isDateOnly = !value.includes('T')
   if (isDateOnly) {
     return { date: value }
@@ -29,7 +29,7 @@ export function buildEventDateTime(
   const result: EventDateTime = { dateTime: value }
   if (timeZone) {
     result.timeZone = timeZone
-  } else if (!hasOffset || requireTimeZone) {
+  } else if (!hasOffset) {
     result.timeZone = DEFAULT_TIME_ZONE
   }
   return result