fix(microsoft): address review round 2 — Dataverse nextLink table binding, offboarding roles, SharePoint hidden filters

Author: waleedlatif1

apps/docs/content/docs/integrations/azure_data_explorer.mdx

@@ -83,8 +83,11 @@ Run a Kusto Query Language (KQL) query against an Azure Data Explorer database a
 | `truncated` | boolean | Whether rows of the primary result table were dropped to stay within the row or size cap \(each additionalResults entry has its own truncated flag\) — narrow the query if true |
 | `additionalResults` | array | Further result tables, present only when a query batch \(statements separated by ;\) or fork returns more than one; the row and size caps are shared across all tables |
 |   ↳ `tableName` | string | Result table name |
-|   ↳ `columns` | array | Column metadata \(name, type, dataType\) |
-|   ↳ `rows` | array | Rows as positional arrays |
+|   ↳ `columns` | array | Column metadata |
+|     ↳ `name` | string | Column name |
+|     ↳ `type` | string | Kusto scalar type |
+|     ↳ `dataType` | string | Approximate .NET type |
+|   ↳ `rows` | array | Rows as positional arrays matching the columns order |
 |   ↳ `records` | array | Rows keyed by column name |
 |   ↳ `rowCount` | number | Rows carried after the caps |
 |   ↳ `totalRowCount` | number | Rows Kusto returned |

apps/docs/content/docs/integrations/microsoft_dataverse.mdx

@@ -345,7 +345,7 @@ Query and list records from a Microsoft Dataverse table. Supports OData query op
 | `top` | number | No | Maximum number of records to return \(OData $top\) |
 | `expand` | string | No | Navigation properties to expand \(OData $expand\) |
 | `count` | string | No | Set to "true" to include total record count in response \(OData $count\) |
-| `pageSize` | number | No | Records per page \(Prefer: odata.maxpagesize, 1-5000\). Defaults to 100 when Max Results is not set. Dataverse ignores $top when a page size is sent. |
+| `pageSize` | number | No | Records per page \(Prefer: odata.maxpagesize, 1-5000\). Defaults to 100 when Max Results is not set. Dataverse ignores $top when a page size is sent. When following nextLink, pass the same pageSize used for the first page, as Dataverse requires. |
 | `nextLink` | string | No | nextLink returned by a previous page. When set, the other query options are ignored and the same page size must be used. |
 
 #### Output

apps/sim/blocks/blocks/microsoft_ad.ts

@@ -1182,7 +1182,7 @@ export const MicrosoftAdBlockMeta = {
       description:
         'Disable an Azure AD account and strip its group memberships when someone leaves. Use for secure offboarding.',
       content:
-        '# Offboard User\n\nRevoke access for a departing user.\n\n## Steps\n1. Resolve the account with Get User by user principal name or id.\n2. Use Update User to set Account Enabled to No so the user can no longer sign in.\n3. Use List User Memberships with the user id to enumerate the groups the user belongs to directly.\n4. For each group, call Remove Group Member with the user id.\n\n## Output\nReturn the disabled user id and the list of groups the user was removed from. Note any group where removal failed so it can be handled manually, and recommend writing the action to an audit record.',
+        '# Offboard User\n\nRevoke access for a departing user.\n\n## Steps\n1. Resolve the account with Get User by user principal name or id.\n2. Use Update User to set Account Enabled to No so the user can no longer sign in.\n3. Use List User Memberships with the user id to enumerate everything the user belongs to directly.\n4. For each membership whose odataType is #microsoft.graph.group, call Remove Group Member with the user id. For each one whose odataType is #microsoft.graph.directoryRole, call Remove Directory Role Member with the role id and user id. List any other types (such as administrative units) for manual follow-up.\n\n## Output\nReturn the disabled user id and the groups and directory roles the user was removed from. Note any group where removal failed so it can be handled manually, and recommend writing the action to an audit record.',
     },
     {
       name: 'audit-group-membership',

apps/sim/blocks/blocks/sharepoint.ts

@@ -1472,6 +1472,12 @@ Return ONLY the JSON object - no explanations, no markdown, no extra text.`,
           top: cleanString(top) ? Number(cleanString(top)) : undefined,
         }
 
+        if (result.includeColumns === true && rest.operation === 'sharepoint_get_list') {
+          result.filter = undefined
+          result.top = undefined
+          result.selectFields = undefined
+        }
+
         if (columnDefinitions && rest.operation === 'sharepoint_create_list') {
           result.pageContent = columnDefinitions
         }

apps/sim/tools/azure_data_explorer/query.ts

@@ -155,9 +155,28 @@ export const azureDataExplorerQueryTool: InternalToolConfig<
         type: 'object',
         properties: {
           tableName: { type: 'string', description: 'Result table name', nullable: true },
-          columns: { type: 'array', description: 'Column metadata (name, type, dataType)' },
-          rows: { type: 'array', description: 'Rows as positional arrays' },
-          records: { type: 'array', description: 'Rows keyed by column name' },
+          columns: {
+            type: 'array',
+            description: 'Column metadata',
+            items: {
+              type: 'object',
+              properties: {
+                name: { type: 'string', description: 'Column name' },
+                type: { type: 'string', description: 'Kusto scalar type', nullable: true },
+                dataType: { type: 'string', description: 'Approximate .NET type', nullable: true },
+              },
+            },
+          },
+          rows: {
+            type: 'array',
+            description: 'Rows as positional arrays matching the columns order',
+            items: { type: 'array' },
+          },
+          records: {
+            type: 'array',
+            description: 'Rows keyed by column name',
+            items: { type: 'object' },
+          },
           rowCount: { type: 'number', description: 'Rows carried after the caps' },
           totalRowCount: { type: 'number', description: 'Rows Kusto returned' },
           truncated: { type: 'boolean', description: 'Whether rows were dropped by the caps' },

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

@@ -1,4 +1,5 @@
 import { createLogger } from '@sim/logger'
+import { escapeRegExp } from '@sim/utils/string'
 import type {
   DataverseListRecordsParams,
   DataverseListRecordsResponse,
@@ -34,7 +35,7 @@ function environmentHost(url: URL): string {
  * environment this request is bound to, so a supplied link can never carry the bearer token to
  * another host.
  */
-function assertNextLink(nextLink: string, baseUrl: string): string {
+function assertNextLink(nextLink: string, baseUrl: string, entitySetName: string): string {
   const value = nextLink.trim()
   if (!value || value.length > DATAVERSE_MAX_NEXT_LINK_LENGTH) {
     throw new Error(
@@ -52,9 +53,13 @@ function assertNextLink(nextLink: string, baseUrl: string): string {
     url.username !== '' ||
     url.password !== '' ||
     environmentHost(url) !== environmentHost(new URL(baseUrl)) ||
-    !url.pathname.startsWith('/api/data/')
+    !new RegExp(`^/api/data/v[0-9.]+/${escapeRegExp(entitySetName.trim())}$`, 'i').test(
+      url.pathname
+    )
   ) {
-    throw new Error('nextLink must be a Web API URL on the selected Dataverse environment')
+    throw new Error(
+      'nextLink must be a Web API URL for the selected table on the selected Dataverse environment'
+    )
   }
   return value
 }
@@ -132,7 +137,7 @@ export const dataverseListRecordsTool: ToolConfig<
       required: false,
       visibility: 'user-or-llm',
       description:
-        'Records per page (Prefer: odata.maxpagesize, 1-5000). Defaults to 100 when Max Results is not set. Dataverse ignores $top when a page size is sent.',
+        'Records per page (Prefer: odata.maxpagesize, 1-5000). Defaults to 100 when Max Results is not set. Dataverse ignores $top when a page size is sent. When following nextLink, pass the same pageSize used for the first page, as Dataverse requires.',
     },
     nextLink: {
       type: 'string',
@@ -147,7 +152,7 @@ export const dataverseListRecordsTool: ToolConfig<
     url: (params) => {
       const baseUrl = getDataverseRequestBaseUrl(params)
       getExplicitPageSize(params)
-      if (params.nextLink) return assertNextLink(params.nextLink, baseUrl)
+      if (params.nextLink) return assertNextLink(params.nextLink, baseUrl, params.entitySetName)
       const queryParts: string[] = []
       if (params.select) queryParts.push(`$select=${encodeURIComponent(params.select)}`)
       if (params.filter) queryParts.push(`$filter=${encodeURIComponent(params.filter)}`)