fix(gitlab): validation pass — SAML provider param, member/invitation query filter, moderation user guard, registry order

Author: waleedlatif1

apps/docs/content/docs/en/integrations/gitlab.mdx

@@ -27,7 +27,7 @@ Using Sim’s GitLab integration, your agents can programmatically interact with
 
 ## Usage Instructions
 
-Integrate GitLab into the workflow. Can manage projects, issues, merge requests, pipelines, and add comments. Supports all core GitLab DevOps operations.
+Integrate GitLab into the workflow. Can manage projects, issues, merge requests, pipelines, and add comments, plus project/group membership, invitations, access requests, SAML group links, and instance user administration. Supports all core GitLab DevOps operations.
 
 
 
@@ -1680,6 +1680,7 @@ Add a SAML group link that maps an identity-provider group to a GitLab group at
 | `samlGroupName` | string | Yes | The name of the SAML group as sent by the identity provider |
 | `accessLevel` | number | Yes | Access level granted to members of the SAML group: 10 \(Guest\), 20 \(Reporter\), 30 \(Developer\), 40 \(Maintainer\), 50 \(Owner\) |
 | `memberRoleId` | number | No | Custom member role ID \(GitLab Ultimate only\) |
+| `provider` | string | No | Unique provider name that must match for this group link to be applied |
 
 #### Output
 
@@ -1698,6 +1699,7 @@ Delete a SAML group link from a GitLab group
 | `host` | string | No | Self-managed GitLab host \(e.g. gitlab.example.com\). Defaults to gitlab.com. |
 | `groupId` | string | Yes | Group ID or URL-encoded path |
 | `samlGroupName` | string | Yes | The name of the SAML group link to delete |
+| `provider` | string | No | Provider name of the link to delete. Required when multiple links share the same SAML group name. |
 
 #### Output
 

apps/sim/blocks/blocks/gitlab.ts

@@ -95,7 +95,7 @@ export const GitLabBlock: BlockConfig<GitLabResponse> = {
   authMode: AuthMode.ApiKey,
   triggerAllowed: true,
   longDescription:
-    'Integrate GitLab into the workflow. Can manage projects, issues, merge requests, pipelines, and add comments. Supports all core GitLab DevOps operations.',
+    'Integrate GitLab into the workflow. Can manage projects, issues, merge requests, pipelines, and add comments, plus project/group membership, invitations, access requests, SAML group links, and instance user administration. Supports all core GitLab DevOps operations.',
   docsLink: 'https://docs.sim.ai/integrations/gitlab',
   category: 'tools',
   integrationType: IntegrationType.DevOps,
@@ -991,6 +991,18 @@ Return ONLY the commit message - no explanations, no extra text.`,
         value: EMAIL_OPS,
       },
     },
+    // Filter for member / invitation listings
+    {
+      id: 'query',
+      title: 'Filter',
+      type: 'short-input',
+      placeholder: 'Filter members by name/username, or invitations by email',
+      mode: 'advanced',
+      condition: {
+        field: 'operation',
+        value: ['gitlab_list_members', 'gitlab_list_invitations'],
+      },
+    },
     // Direct members only toggle (list members)
     {
       id: 'directMembersOnly',
@@ -1027,6 +1039,18 @@ Return ONLY the commit message - no explanations, no extra text.`,
         value: SAML_NAME_OPS,
       },
     },
+    // SAML provider name (add/delete SAML group link)
+    {
+      id: 'samlProvider',
+      title: 'SAML Provider',
+      type: 'short-input',
+      placeholder: 'Provider name (required when multiple links share a group name)',
+      mode: 'advanced',
+      condition: {
+        field: 'operation',
+        value: SAML_NAME_OPS,
+      },
+    },
     // Provider (delete user identity)
     {
       id: 'provider',
@@ -1644,6 +1668,7 @@ Return ONLY the commit message - no explanations, no extra text.`,
               resourceType: params.resourceType || 'project',
               resourceId: params.resourceId.trim(),
               directOnly: params.directMembersOnly || undefined,
+              query: params.query?.trim() || undefined,
               perPage: params.perPage ? Number(params.perPage) : undefined,
               page: params.page ? Number(params.page) : undefined,
             }
@@ -1709,6 +1734,7 @@ Return ONLY the commit message - no explanations, no extra text.`,
               ...baseParams,
               resourceType: params.resourceType || 'project',
               resourceId: params.resourceId.trim(),
+              query: params.query?.trim() || undefined,
               perPage: params.perPage ? Number(params.perPage) : undefined,
               page: params.page ? Number(params.page) : undefined,
             }
@@ -1795,6 +1821,7 @@ Return ONLY the commit message - no explanations, no extra text.`,
               samlGroupName: params.samlGroupName.trim(),
               accessLevel: Number(params.accessLevel),
               memberRoleId: params.memberRoleId ? Number(params.memberRoleId) : undefined,
+              provider: params.samlProvider?.trim() || undefined,
             }
 
           case 'gitlab_delete_saml_group_link':
@@ -1805,6 +1832,7 @@ Return ONLY the commit message - no explanations, no extra text.`,
               ...baseParams,
               groupId: params.groupId.trim(),
               samlGroupName: params.samlGroupName.trim(),
+              provider: params.samlProvider?.trim() || undefined,
             }
 
           case 'gitlab_search_users':
@@ -1954,8 +1982,16 @@ Return ONLY the commit message - no explanations, no extra text.`,
     memberRoleId: { type: 'number', description: 'Custom member role ID (Ultimate)' },
     email: { type: 'string', description: 'Email address for invitations' },
     directMembersOnly: { type: 'boolean', description: 'Exclude inherited members' },
+    query: {
+      type: 'string',
+      description: 'Filter members by name/username, or invitations by email',
+    },
     userSearch: { type: 'string', description: 'User search query' },
     samlGroupName: { type: 'string', description: 'SAML group name' },
+    samlProvider: {
+      type: 'string',
+      description: 'SAML provider name for a group link (disambiguates duplicate link names)',
+    },
     provider: { type: 'string', description: 'External identity provider name' },
     hardDelete: { type: 'boolean', description: 'Hard-delete a user' },
     userAdminEmail: { type: 'string', description: "User's email (create/update user)" },

apps/sim/tools/gitlab/add_saml_group_link.ts

@@ -53,6 +53,12 @@ export const gitlabAddSamlGroupLinkTool: ToolConfig<
       visibility: 'user-or-llm',
       description: 'Custom member role ID (GitLab Ultimate only)',
     },
+    provider: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Unique provider name that must match for this group link to be applied',
+    },
   },
 
   request: {
@@ -72,6 +78,7 @@ export const gitlabAddSamlGroupLinkTool: ToolConfig<
       }
 
       if (params.memberRoleId !== undefined) body.member_role_id = params.memberRoleId
+      if (params.provider) body.provider = params.provider.trim()
 
       return body
     },

apps/sim/tools/gitlab/delete_saml_group_link.ts

@@ -39,13 +39,23 @@ export const gitlabDeleteSamlGroupLinkTool: ToolConfig<
       visibility: 'user-or-llm',
       description: 'The name of the SAML group link to delete',
     },
+    provider: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'Provider name of the link to delete. Required when multiple links share the same SAML group name.',
+    },
   },
 
   request: {
     url: (params) => {
       const encodedId = encodeURIComponent(String(params.groupId).trim())
       const encodedName = encodeURIComponent(String(params.samlGroupName).trim())
-      return `${getGitLabApiBase(params.host)}/groups/${encodedId}/saml_group_links/${encodedName}`
+      const queryParams = new URLSearchParams()
+      if (params.provider) queryParams.append('provider', params.provider.trim())
+      const query = queryParams.toString()
+      return `${getGitLabApiBase(params.host)}/groups/${encodedId}/saml_group_links/${encodedName}${query ? `?${query}` : ''}`
     },
     method: 'DELETE',
     headers: (params) => ({

apps/sim/tools/gitlab/types.ts

@@ -774,6 +774,7 @@ interface GitLabInvitation {
   created_at?: string
   expires_at?: string | null
   user_name?: string
+  created_by_name?: string
   invite_token?: string
   member_role_id?: number | null
 }
@@ -792,6 +793,7 @@ interface GitLabSamlGroupLink {
   name: string
   access_level: number
   member_role_id?: number | null
+  provider?: string | null
 }
 
 interface GitLabUser {
@@ -886,11 +888,14 @@ export interface GitLabAddSamlGroupLinkParams extends GitLabBaseParams {
   samlGroupName: string
   accessLevel: number
   memberRoleId?: number
+  provider?: string
 }
 
 export interface GitLabDeleteSamlGroupLinkParams extends GitLabBaseParams {
   groupId: string | number
   samlGroupName: string
+  /** Provider name; required by GitLab when multiple links share the same SAML group name. */
+  provider?: string
 }
 
 export interface GitLabSearchUsersParams extends GitLabBaseParams {

apps/sim/tools/gitlab/user_status_actions.ts

@@ -59,9 +59,10 @@ function createUserStatusActionTool(
         }
       }
 
-      // These endpoints return either `true` or the updated user object.
+      // These endpoints return `true`, `{ message: 'Success' }`, or the updated
+      // user object. Only surface objects that are actually a user record.
       const data = await response.json().catch(() => null)
-      const user = data && typeof data === 'object' ? data : undefined
+      const user = data && typeof data === 'object' && 'id' in data ? data : undefined
 
       return {
         success: true,

apps/sim/tools/registry.ts

@@ -6294,7 +6294,14 @@ export const tools: Record<string, ToolConfig> = {
   github_check_star_v2: githubCheckStarV2Tool,
   github_list_stargazers: githubListStargazersTool,
   github_list_stargazers_v2: githubListStargazersV2Tool,
+  gitlab_activate_user: gitlabActivateUserTool,
+  gitlab_add_member: gitlabAddMemberTool,
+  gitlab_add_saml_group_link: gitlabAddSamlGroupLinkTool,
+  gitlab_approve_access_request: gitlabApproveAccessRequestTool,
   gitlab_approve_merge_request: gitlabApproveMergeRequestTool,
+  gitlab_approve_user: gitlabApproveUserTool,
+  gitlab_ban_user: gitlabBanUserTool,
+  gitlab_block_user: gitlabBlockUserTool,
   gitlab_cancel_pipeline: gitlabCancelPipelineTool,
   gitlab_compare_branches: gitlabCompareBranchesTool,
   gitlab_create_branch: gitlabCreateBranchTool,
@@ -6305,57 +6312,50 @@ export const tools: Record<string, ToolConfig> = {
   gitlab_create_merge_request_note: gitlabCreateMergeRequestNoteTool,
   gitlab_create_pipeline: gitlabCreatePipelineTool,
   gitlab_create_release: gitlabCreateReleaseTool,
+  gitlab_create_user: gitlabCreateUserTool,
+  gitlab_deactivate_user: gitlabDeactivateUserTool,
   gitlab_delete_branch: gitlabDeleteBranchTool,
   gitlab_delete_issue: gitlabDeleteIssueTool,
+  gitlab_delete_saml_group_link: gitlabDeleteSamlGroupLinkTool,
+  gitlab_delete_user: gitlabDeleteUserTool,
+  gitlab_delete_user_identity: gitlabDeleteUserIdentityTool,
+  gitlab_deny_access_request: gitlabDenyAccessRequestTool,
   gitlab_get_file: gitlabGetFileTool,
   gitlab_get_issue: gitlabGetIssueTool,
   gitlab_get_job_log: gitlabGetJobLogTool,
   gitlab_get_merge_request: gitlabGetMergeRequestTool,
   gitlab_get_merge_request_changes: gitlabGetMergeRequestChangesTool,
   gitlab_get_pipeline: gitlabGetPipelineTool,
   gitlab_get_project: gitlabGetProjectTool,
+  gitlab_invite_member: gitlabInviteMemberTool,
+  gitlab_list_access_requests: gitlabListAccessRequestsTool,
   gitlab_list_branches: gitlabListBranchesTool,
   gitlab_list_commits: gitlabListCommitsTool,
+  gitlab_list_invitations: gitlabListInvitationsTool,
   gitlab_list_issues: gitlabListIssuesTool,
+  gitlab_list_members: gitlabListMembersTool,
   gitlab_list_merge_requests: gitlabListMergeRequestsTool,
   gitlab_list_pipeline_jobs: gitlabListPipelineJobsTool,
   gitlab_list_pipelines: gitlabListPipelinesTool,
   gitlab_list_projects: gitlabListProjectsTool,
   gitlab_list_releases: gitlabListReleasesTool,
   gitlab_list_repository_tree: gitlabListRepositoryTreeTool,
+  gitlab_list_saml_group_links: gitlabListSamlGroupLinksTool,
   gitlab_merge_merge_request: gitlabMergeMergeRequestTool,
   gitlab_play_job: gitlabPlayJobTool,
+  gitlab_reject_user: gitlabRejectUserTool,
+  gitlab_remove_member: gitlabRemoveMemberTool,
   gitlab_retry_pipeline: gitlabRetryPipelineTool,
+  gitlab_revoke_invitation: gitlabRevokeInvitationTool,
+  gitlab_search_users: gitlabSearchUsersTool,
+  gitlab_unban_user: gitlabUnbanUserTool,
+  gitlab_unblock_user: gitlabUnblockUserTool,
   gitlab_update_file: gitlabUpdateFileTool,
+  gitlab_update_invitation: gitlabUpdateInvitationTool,
   gitlab_update_issue: gitlabUpdateIssueTool,
-  gitlab_update_merge_request: gitlabUpdateMergeRequestTool,
-  gitlab_list_members: gitlabListMembersTool,
-  gitlab_add_member: gitlabAddMemberTool,
   gitlab_update_member: gitlabUpdateMemberTool,
-  gitlab_remove_member: gitlabRemoveMemberTool,
-  gitlab_invite_member: gitlabInviteMemberTool,
-  gitlab_list_invitations: gitlabListInvitationsTool,
-  gitlab_update_invitation: gitlabUpdateInvitationTool,
-  gitlab_revoke_invitation: gitlabRevokeInvitationTool,
-  gitlab_list_access_requests: gitlabListAccessRequestsTool,
-  gitlab_approve_access_request: gitlabApproveAccessRequestTool,
-  gitlab_deny_access_request: gitlabDenyAccessRequestTool,
-  gitlab_list_saml_group_links: gitlabListSamlGroupLinksTool,
-  gitlab_search_users: gitlabSearchUsersTool,
-  gitlab_create_user: gitlabCreateUserTool,
+  gitlab_update_merge_request: gitlabUpdateMergeRequestTool,
   gitlab_update_user: gitlabUpdateUserTool,
-  gitlab_delete_user: gitlabDeleteUserTool,
-  gitlab_block_user: gitlabBlockUserTool,
-  gitlab_unblock_user: gitlabUnblockUserTool,
-  gitlab_deactivate_user: gitlabDeactivateUserTool,
-  gitlab_activate_user: gitlabActivateUserTool,
-  gitlab_ban_user: gitlabBanUserTool,
-  gitlab_unban_user: gitlabUnbanUserTool,
-  gitlab_approve_user: gitlabApproveUserTool,
-  gitlab_reject_user: gitlabRejectUserTool,
-  gitlab_delete_user_identity: gitlabDeleteUserIdentityTool,
-  gitlab_add_saml_group_link: gitlabAddSamlGroupLinkTool,
-  gitlab_delete_saml_group_link: gitlabDeleteSamlGroupLinkTool,
   grain_list_recordings: grainListRecordingsTool,
   grain_get_recording: grainGetRecordingTool,
   grain_get_transcript: grainGetTranscriptTool,