fix(google-drive): let an agent feed the page token back in

A page token is an opaque continuation value produced by a previous tool
response, not an account-specific id the user has to supply, so 'user-only'
hid it from agent blocks: they saw nextPageToken in the result and could not
send it back, silently reporting page one as the whole answer. Every other
pagination token in the tool set is 'user-or-llm'.

Also covers the case the mapper guard actually defends — a per-operation page
token surviving an operation switch, which reaches inputs because
shouldSerializeSubBlock skips condition evaluation for advanced fields.

Author: waleedlatif1

apps/sim/blocks/blocks/google_drive.test.ts

@@ -34,14 +34,20 @@ describe('GoogleDriveBlock pagination', () => {
       })
     })
 
-    it('forwards the page token to the tool', () => {
-      expect(
-        buildParams({ operation, [subBlockId]: 'token-abc' }, undefined as never)
-      ).toMatchObject({ pageToken: 'token-abc' })
+    /**
+     * `pageToken` is the canonical tool param, so the `list` case would forward
+     * through `...rest` even without the mapper. The per-operation ids are the
+     * ones the mapper has to translate, and none of them may survive as-is.
+     */
+    it('forwards the page token to the tool under its own id', () => {
+      const params = buildParams({ operation, [subBlockId]: 'token-abc' }, undefined as never)
+
+      expect(params).toMatchObject({ pageToken: 'token-abc' })
+      if (subBlockId !== 'pageToken') expect(params[subBlockId]).toBeUndefined()
     })
 
-    it('declares pageToken as a user-settable tool param', () => {
-      expect(tool.params.pageToken?.visibility).toBe('user-only')
+    it('lets an agent feed a nextPageToken back in', () => {
+      expect(tool.params.pageToken?.visibility).toBe('user-or-llm')
     })
   })
 
@@ -51,6 +57,40 @@ describe('GoogleDriveBlock pagination', () => {
     ).toBeUndefined()
   })
 
+  /**
+   * `shouldSerializeSubBlock` short-circuits for `advanced` fields in basic display
+   * mode without evaluating `condition`, so a page token typed under one operation
+   * genuinely reaches `inputs` after the user switches to another. The mapper must
+   * pick the token belonging to the operation being run and drop the rest.
+   */
+  describe.each(paginationCases.filter(({ subBlockId }) => subBlockId !== 'pageToken'))(
+    '$subBlockId left over from a previous operation',
+    ({ subBlockId }) => {
+      it.each(['upload', 'get_file', 'list'])('is dropped under %s', (operation) => {
+        const params = buildParams({ operation, [subBlockId]: 'stale' }, undefined as never)
+
+        expect(params.pageToken).toBeUndefined()
+        expect(params[subBlockId]).toBeUndefined()
+      })
+    }
+  )
+
+  it('prefers the operation-owned token when a stale sibling is also present', () => {
+    const params = buildParams(
+      {
+        operation: 'search',
+        searchPageToken: 'search-token',
+        commentsPageToken: 'stale',
+        pageToken: 'stale-canonical',
+      },
+      undefined as never
+    )
+
+    expect(params.pageToken).toBe('search-token')
+    expect(params.commentsPageToken).toBeUndefined()
+    expect(params.searchPageToken).toBeUndefined()
+  })
+
   it('declares pageToken as a block input', () => {
     expect(GoogleDriveBlock.inputs.pageToken).toBeDefined()
   })

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

@@ -48,7 +48,7 @@ export const listTool: ToolConfig<GoogleDriveToolParams, GoogleDriveListResponse
     pageToken: {
       type: 'string',
       required: false,
-      visibility: 'user-only',
+      visibility: 'user-or-llm',
       description: 'The page token to use for pagination',
     },
   },

apps/sim/tools/google_drive/list.ts

@@ -65,7 +65,7 @@ export const listCommentsTool: ToolConfig<
     pageToken: {
       type: 'string',
       required: false,
-      visibility: 'user-only',
+      visibility: 'user-or-llm',
       description: 'The page token to use for pagination',
     },
   },

apps/sim/tools/google_drive/list_comments.ts

@@ -43,7 +43,7 @@ export const listPermissionsTool: ToolConfig<
     pageToken: {
       type: 'string',
       required: false,
-      visibility: 'user-only',
+      visibility: 'user-or-llm',
       description: 'The page token to use for pagination',
     },
   },

apps/sim/tools/google_drive/list_permissions.ts

@@ -51,7 +51,7 @@ export const listRevisionsTool: ToolConfig<
     pageToken: {
       type: 'string',
       required: false,
-      visibility: 'user-only',
+      visibility: 'user-or-llm',
       description: 'The page token to use for pagination',
     },
   },

apps/sim/tools/google_drive/list_revisions.ts

@@ -50,7 +50,7 @@ export const searchTool: ToolConfig<GoogleDriveSearchParams, GoogleDriveSearchRe
     pageToken: {
       type: 'string',
       required: false,
-      visibility: 'user-only',
+      visibility: 'user-or-llm',
       description: 'Token for fetching the next page of results',
     },
   },