fix(polling): address PR review feedback for Google polling triggers

- Fix Drive cursor stall: use nextPageToken as resume point when
  breaking early from pagination instead of re-using the original token
- Eliminate redundant Drive API call in Sheets poller by returning
  modifiedTime from the pre-check function
- Add 403/429 rate-limit handling to Sheets API calls matching the
  Calendar handler pattern
- Remove unused changeType field from DriveChangeEntry interface
- Rename triggers/google_drive to triggers/google-drive for consistency

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: waleedlatif1

apps/sim/lib/webhooks/polling/google-drive.ts

@@ -28,7 +28,6 @@ interface GoogleDriveWebhookConfig {
 interface DriveChangeEntry {
   kind: string
   type: string
-  changeType?: string
   time: string
   removed: boolean
   fileId: string
@@ -215,7 +214,8 @@ async function fetchChanges(
 ): Promise<{ changes: DriveChangeEntry[]; newStartPageToken: string }> {
   const allChanges: DriveChangeEntry[] = []
   let currentPageToken = config.pageToken!
-  let newStartPageToken = currentPageToken
+  let newStartPageToken: string | undefined
+  let lastNextPageToken: string | undefined
   const maxFiles = config.maxFilesPerPoll || MAX_FILES_PER_POLL
   let pages = 0
 
@@ -252,18 +252,23 @@ async function fetchChanges(
       newStartPageToken = data.newStartPageToken as string
     }
 
-    // Stop if no more pages or we have enough changes.
-    // Always use newStartPageToken (not nextPageToken) as the resume point —
-    // nextPageToken paginates the current query but newStartPageToken is the
-    // correct cursor for the next poll cycle.
+    if (data.nextPageToken) {
+      lastNextPageToken = data.nextPageToken as string
+    }
+
     if (!data.nextPageToken || allChanges.length >= maxFiles || pages >= MAX_PAGES) {
       break
     }
 
     currentPageToken = data.nextPageToken as string
   }
 
-  return { changes: allChanges.slice(0, maxFiles), newStartPageToken }
+  // If we exhausted all pages the API returns newStartPageToken on the final page.
+  // If we broke early, fall back to the last nextPageToken so we resume from where
+  // we stopped rather than re-fetching from the original cursor.
+  const resumeToken = newStartPageToken ?? lastNextPageToken ?? config.pageToken!
+
+  return { changes: allChanges.slice(0, maxFiles), newStartPageToken: resumeToken }
 }
 
 function filterChanges(

apps/sim/lib/webhooks/polling/google-sheets.ts

@@ -61,7 +61,7 @@ export const googleSheetsPollingHandler: PollingProviderHandler = {
       }
 
       // Pre-check: use Drive API to see if the file was modified since last poll
-      const skipPoll = await isDriveFileUnchanged(
+      const { unchanged: skipPoll, currentModifiedTime } = await isDriveFileUnchanged(
         accessToken,
         config.spreadsheetId,
         config.lastModifiedTime,
@@ -80,13 +80,6 @@ export const googleSheetsPollingHandler: PollingProviderHandler = {
         return 'success'
       }
 
-      // Get current Drive modifiedTime for state update
-      const currentModifiedTime = await getDriveFileModifiedTime(
-        accessToken,
-        config.spreadsheetId,
-        logger
-      )
-
       // Fetch current row count via column A
       const currentRowCount = await getDataRowCount(
         accessToken,
@@ -232,16 +225,16 @@ async function isDriveFileUnchanged(
   lastModifiedTime: string | undefined,
   requestId: string,
   logger: ReturnType<typeof import('@sim/logger').createLogger>
-): Promise<boolean> {
-  if (!lastModifiedTime) return false
+): Promise<{ unchanged: boolean; currentModifiedTime?: string }> {
+  if (!lastModifiedTime) return { unchanged: false }
 
   try {
     const currentModifiedTime = await getDriveFileModifiedTime(accessToken, spreadsheetId, logger)
-    return currentModifiedTime === lastModifiedTime
+    return { unchanged: currentModifiedTime === lastModifiedTime, currentModifiedTime }
   } catch (error) {
     // If Drive check fails, proceed with Sheets API (don't skip)
     logger.warn(`[${requestId}] Drive modifiedTime check failed, proceeding with Sheets API`)
-    return false
+    return { unchanged: false }
   }
 }
 
@@ -278,9 +271,17 @@ async function getDataRowCount(
   })
 
   if (!response.ok) {
+    const status = response.status
     const errorData = await response.json().catch(() => ({}))
+
+    if (status === 403 || status === 429) {
+      throw new Error(
+        `Sheets API rate limit (${status}) — skipping to retry next poll cycle: ${JSON.stringify(errorData)}`
+      )
+    }
+
     throw new Error(
-      `Failed to fetch row count: ${response.status} ${response.statusText} - ${JSON.stringify(errorData)}`
+      `Failed to fetch row count: ${status} ${response.statusText} - ${JSON.stringify(errorData)}`
     )
   }
 
@@ -312,7 +313,14 @@ async function fetchHeaderRow(
   })
 
   if (!response.ok) {
-    logger.warn(`[${requestId}] Failed to fetch header row, proceeding without headers`)
+    const status = response.status
+    if (status === 403 || status === 429) {
+      logger.warn(
+        `[${requestId}] Sheets API rate limit (${status}) fetching header row, proceeding without headers`
+      )
+    } else {
+      logger.warn(`[${requestId}] Failed to fetch header row, proceeding without headers`)
+    }
     return []
   }
 
@@ -344,9 +352,17 @@ async function fetchRowRange(
   })
 
   if (!response.ok) {
+    const status = response.status
     const errorData = await response.json().catch(() => ({}))
+
+    if (status === 403 || status === 429) {
+      throw new Error(
+        `Sheets API rate limit (${status}) — skipping to retry next poll cycle: ${JSON.stringify(errorData)}`
+      )
+    }
+
     throw new Error(
-      `Failed to fetch rows ${startRow}-${endRow}: ${response.status} ${response.statusText} - ${JSON.stringify(errorData)}`
+      `Failed to fetch rows ${startRow}-${endRow}: ${status} ${response.statusText} - ${JSON.stringify(errorData)}`
     )
   }
 

apps/sim/triggers/google_drive/index.ts apps/sim/triggers/google-drive/index.tsapps/sim/triggers/google_drive/index.ts renamed to apps/sim/triggers/google-drive/index.ts

@@ -90,7 +90,7 @@ import {
 } from '@/triggers/github'
 import { gmailPollingTrigger } from '@/triggers/gmail'
 import { gongCallCompletedTrigger, gongWebhookTrigger } from '@/triggers/gong'
-import { googleDrivePollingTrigger } from '@/triggers/google_drive'
+import { googleDrivePollingTrigger } from '@/triggers/google-drive'
 import { googleCalendarPollingTrigger } from '@/triggers/google-calendar'
 import { googleSheetsPollingTrigger } from '@/triggers/google-sheets'
 import { googleFormsWebhookTrigger } from '@/triggers/googleforms'