Add pagination support to GraphQL-based tools

README.md

@@ -583,19 +583,21 @@ export GITHUB_MCP_TOOL_ADD_ISSUE_COMMENT_DESCRIPTION="an alternative description
 - **get_discussion_comments** - Get discussion comments
   - `discussionNumber`: Discussion Number (number, required)
   - `owner`: Repository owner (string, required)
+  - `page`: Page number for pagination (min 1) (number, optional)
+  - `perPage`: Results per page for pagination (min 1, max 100) (number, optional)
   - `repo`: Repository name (string, required)
 
 - **list_discussion_categories** - List discussion categories
-  - `after`: Cursor for pagination, use the 'after' field from the previous response (string, optional)
-  - `before`: Cursor for pagination, use the 'before' field from the previous response (string, optional)
-  - `first`: Number of categories to return per page (min 1, max 100) (number, optional)
-  - `last`: Number of categories to return from the end (min 1, max 100) (number, optional)
   - `owner`: Repository owner (string, required)
+  - `page`: Page number for pagination (min 1) (number, optional)
+  - `perPage`: Results per page for pagination (min 1, max 100) (number, optional)
   - `repo`: Repository name (string, required)
 
 - **list_discussions** - List discussions
   - `category`: Optional filter by discussion category ID. If provided, only discussions with this category are listed. (string, optional)
   - `owner`: Repository owner (string, required)
+  - `page`: Page number for pagination (min 1) (number, optional)
+  - `perPage`: Results per page for pagination (min 1, max 100) (number, optional)
   - `repo`: Repository name (string, required)
 
 </details>

pkg/github/actions.go

@@ -62,8 +62,8 @@ func ListWorkflows(getClient GetClientFn, t translations.TranslationHelperFunc)
 
 			// Set up list options
 			opts := &github.ListOptions{
-				PerPage: pagination.perPage,
-				Page:    pagination.page,
+				PerPage: pagination.PerPage,
+				Page:    pagination.Page,
 			}
 
 			workflows, resp, err := client.Actions.ListWorkflows(ctx, owner, repo, opts)
@@ -200,8 +200,8 @@ func ListWorkflowRuns(getClient GetClientFn, t translations.TranslationHelperFun
 				Event:  event,
 				Status: status,
 				ListOptions: github.ListOptions{
-					PerPage: pagination.perPage,
-					Page:    pagination.page,
+					PerPage: pagination.PerPage,
+					Page:    pagination.Page,
 				},
 			}
 
@@ -503,8 +503,8 @@ func ListWorkflowJobs(getClient GetClientFn, t translations.TranslationHelperFun
 			opts := &github.ListWorkflowJobsOptions{
 				Filter: filter,
 				ListOptions: github.ListOptions{
-					PerPage: pagination.perPage,
-					Page:    pagination.page,
+					PerPage: pagination.PerPage,
+					Page:    pagination.Page,
 				},
 			}
 
@@ -1025,8 +1025,8 @@ func ListWorkflowRunArtifacts(getClient GetClientFn, t translations.TranslationH
 
 			// Set up list options
 			opts := &github.ListOptions{
-				PerPage: pagination.perPage,
-				Page:    pagination.page,
+				PerPage: pagination.PerPage,
+				Page:    pagination.Page,
 			}
 
 			artifacts, resp, err := client.Actions.ListWorkflowRunArtifacts(ctx, owner, repo, runID, opts)

pkg/github/discussions.go

@@ -31,6 +31,7 @@ func ListDiscussions(getGQLClient GetGQLClientFn, t translations.TranslationHelp
 			mcp.WithString("category",
 				mcp.Description("Optional filter by discussion category ID. If provided, only discussions with this category are listed."),
 			),
+			WithUnifiedPagination(),
 		),
 		func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
 			// Required params
@@ -49,6 +50,16 @@ func ListDiscussions(getGQLClient GetGQLClientFn, t translations.TranslationHelp
 				return mcp.NewToolResultError(err.Error()), nil
 			}
 
+			// Get pagination parameters and convert to GraphQL format
+			pagination, err := OptionalPaginationParams(request)
+			if err != nil {
+				return nil, err
+			}
+			paginationParams, err := pagination.ToGraphQLParams()
+			if err != nil {
+				return nil, err
+			}
+
 			client, err := getGQLClient(ctx)
 			if err != nil {
 				return mcp.NewToolResultError(fmt.Sprintf("failed to get GitHub GQL client: %v", err)), nil
@@ -61,7 +72,8 @@ func ListDiscussions(getGQLClient GetGQLClientFn, t translations.TranslationHelp
 				categoryID = &id
 			}
 
-			// Now execute the discussions query
+			var out []byte
+
 			var discussions []*github.Discussion
 			if categoryID != nil {
 				// Query with category filter (server-side filtering)
@@ -77,13 +89,18 @@ func ListDiscussions(getGQLClient GetGQLClientFn, t translations.TranslationHelp
 								} `graphql:"category"`
 								URL githubv4.String `graphql:"url"`
 							}
-						} `graphql:"discussions(first: 100, categoryId: $categoryId)"`
+							PageInfo struct {
+								HasNextPage bool
+								EndCursor   string
+							}
+						} `graphql:"discussions(first: $first, categoryId: $categoryId)"`
 					} `graphql:"repository(owner: $owner, name: $repo)"`
 				}
 				vars := map[string]interface{}{
 					"owner":      githubv4.String(owner),
 					"repo":       githubv4.String(repo),
 					"categoryId": *categoryID,
+					"first":      githubv4.Int(*paginationParams.First),
 				}
 				if err := client.Query(ctx, &query, vars); err != nil {
 					return mcp.NewToolResultError(err.Error()), nil
@@ -102,6 +119,11 @@ func ListDiscussions(getGQLClient GetGQLClientFn, t translations.TranslationHelp
 					}
 					discussions = append(discussions, di)
 				}
+
+				out, err = json.Marshal(discussions)
+				if err != nil {
+					return nil, fmt.Errorf("failed to marshal discussions: %w", err)
+				}
 			} else {
 				// Query without category filter
 				var query struct {
@@ -116,12 +138,17 @@ func ListDiscussions(getGQLClient GetGQLClientFn, t translations.TranslationHelp
 								} `graphql:"category"`
 								URL githubv4.String `graphql:"url"`
 							}
-						} `graphql:"discussions(first: 100)"`
+							PageInfo struct {
+								HasNextPage bool
+								EndCursor   string
+							}
+						} `graphql:"discussions(first: $first)"`
 					} `graphql:"repository(owner: $owner, name: $repo)"`
 				}
 				vars := map[string]interface{}{
 					"owner": githubv4.String(owner),
 					"repo":  githubv4.String(repo),
+					"first": githubv4.Int(*paginationParams.First),
 				}
 				if err := client.Query(ctx, &query, vars); err != nil {
 					return mcp.NewToolResultError(err.Error()), nil
@@ -140,13 +167,13 @@ func ListDiscussions(getGQLClient GetGQLClientFn, t translations.TranslationHelp
 					}
 					discussions = append(discussions, di)
 				}
-			}
 
-			// Marshal and return
-			out, err := json.Marshal(discussions)
-			if err != nil {
-				return nil, fmt.Errorf("failed to marshal discussions: %w", err)
+				out, err = json.Marshal(discussions)
+				if err != nil {
+					return nil, fmt.Errorf("failed to marshal discussions: %w", err)
+				}
 			}
+
 			return mcp.NewToolResultText(string(out)), nil
 		}
 }
@@ -236,6 +263,7 @@ func GetDiscussionComments(getGQLClient GetGQLClientFn, t translations.Translati
 			mcp.WithString("owner", mcp.Required(), mcp.Description("Repository owner")),
 			mcp.WithString("repo", mcp.Required(), mcp.Description("Repository name")),
 			mcp.WithNumber("discussionNumber", mcp.Required(), mcp.Description("Discussion Number")),
+			WithUnifiedPagination(),
 		),
 		func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
 			// Decode params
@@ -248,6 +276,28 @@ func GetDiscussionComments(getGQLClient GetGQLClientFn, t translations.Translati
 				return mcp.NewToolResultError(err.Error()), nil
 			}
 
+			// Get pagination parameters and convert to GraphQL format
+			pagination, err := OptionalPaginationParams(request)
+			if err != nil {
+				return nil, err
+			}
+
+			// Check if pagination parameters were explicitly provided
+			_, pageProvided := request.GetArguments()["page"]
+			_, perPageProvided := request.GetArguments()["perPage"]
+			paginationExplicit := pageProvided || perPageProvided
+
+			paginationParams, err := pagination.ToGraphQLParams()
+			if err != nil {
+				return nil, err
+			}
+
+			// Use default of 100 if pagination was not explicitly provided
+			if !paginationExplicit {
+				defaultFirst := int32(100)
+				paginationParams.First = &defaultFirst
+			}
+
 			client, err := getGQLClient(ctx)
 			if err != nil {
 				return mcp.NewToolResultError(fmt.Sprintf("failed to get GitHub GQL client: %v", err)), nil
@@ -260,18 +310,24 @@ func GetDiscussionComments(getGQLClient GetGQLClientFn, t translations.Translati
 							Nodes []struct {
 								Body githubv4.String
 							}
-						} `graphql:"comments(first:100)"`
+							PageInfo struct {
+								HasNextPage githubv4.Boolean
+								EndCursor   githubv4.String
+							}
+						} `graphql:"comments(first: $first)"`
 					} `graphql:"discussion(number: $discussionNumber)"`
 				} `graphql:"repository(owner: $owner, name: $repo)"`
 			}
 			vars := map[string]interface{}{
 				"owner":            githubv4.String(params.Owner),
 				"repo":             githubv4.String(params.Repo),
 				"discussionNumber": githubv4.Int(params.DiscussionNumber),
+				"first":            githubv4.Int(*paginationParams.First),
 			}
 			if err := client.Query(ctx, &q, vars); err != nil {
 				return mcp.NewToolResultError(err.Error()), nil
 			}
+
 			var comments []*github.IssueComment
 			for _, c := range q.Repository.Discussion.Comments.Nodes {
 				comments = append(comments, &github.IssueComment{Body: github.Ptr(string(c.Body))})
@@ -301,79 +357,76 @@ func ListDiscussionCategories(getGQLClient GetGQLClientFn, t translations.Transl
 				mcp.Required(),
 				mcp.Description("Repository name"),
 			),
-			mcp.WithNumber("first",
-				mcp.Description("Number of categories to return per page (min 1, max 100)"),
-				mcp.Min(1),
-				mcp.Max(100),
-			),
-			mcp.WithNumber("last",
-				mcp.Description("Number of categories to return from the end (min 1, max 100)"),
-				mcp.Min(1),
-				mcp.Max(100),
-			),
-			mcp.WithString("after",
-				mcp.Description("Cursor for pagination, use the 'after' field from the previous response"),
-			),
-			mcp.WithString("before",
-				mcp.Description("Cursor for pagination, use the 'before' field from the previous response"),
-			),
+			WithUnifiedPagination(),
 		),
 		func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
 			// Decode params
 			var params struct {
-				Owner  string
-				Repo   string
-				First  int32
-				Last   int32
-				After  string
-				Before string
+				Owner string
+				Repo  string
 			}
 			if err := mapstructure.Decode(request.Params.Arguments, &params); err != nil {
 				return mcp.NewToolResultError(err.Error()), nil
 			}
 
-			// Validate pagination parameters
-			if params.First != 0 && params.Last != 0 {
-				return mcp.NewToolResultError("only one of 'first' or 'last' may be specified"), nil
-			}
-			if params.After != "" && params.Before != "" {
-				return mcp.NewToolResultError("only one of 'after' or 'before' may be specified"), nil
+			// Get pagination parameters and convert to GraphQL format
+			pagination, err := OptionalPaginationParams(request)
+			if err != nil {
+				return nil, err
 			}
-			if params.After != "" && params.Last != 0 {
-				return mcp.NewToolResultError("'after' cannot be used with 'last'. Did you mean to use 'before' instead?"), nil
+
+			// Check if pagination parameters were explicitly provided
+			_, pageProvided := request.GetArguments()["page"]
+			_, perPageProvided := request.GetArguments()["perPage"]
+			paginationExplicit := pageProvided || perPageProvided
+
+			paginationParams, err := pagination.ToGraphQLParams()
+			if err != nil {
+				return nil, err
 			}
-			if params.Before != "" && params.First != 0 {
-				return mcp.NewToolResultError("'before' cannot be used with 'first'. Did you mean to use 'after' instead?"), nil
+
+			// Use default of 100 if pagination was not explicitly provided
+			if !paginationExplicit {
+				defaultFirst := int32(100)
+				paginationParams.First = &defaultFirst
 			}
 
 			client, err := getGQLClient(ctx)
 			if err != nil {
 				return mcp.NewToolResultError(fmt.Sprintf("failed to get GitHub GQL client: %v", err)), nil
 			}
+
 			var q struct {
 				Repository struct {
 					DiscussionCategories struct {
 						Nodes []struct {
 							ID   githubv4.ID
 							Name githubv4.String
 						}
-					} `graphql:"discussionCategories(first: 100)"`
+						PageInfo struct {
+							HasNextPage githubv4.Boolean
+							EndCursor   githubv4.String
+						}
+					} `graphql:"discussionCategories(first: $first)"`
 				} `graphql:"repository(owner: $owner, name: $repo)"`
 			}
 			vars := map[string]interface{}{
 				"owner": githubv4.String(params.Owner),
 				"repo":  githubv4.String(params.Repo),
+				"first": githubv4.Int(*paginationParams.First),
 			}
 			if err := client.Query(ctx, &q, vars); err != nil {
 				return mcp.NewToolResultError(err.Error()), nil
 			}
+
 			var categories []map[string]string
 			for _, c := range q.Repository.DiscussionCategories.Nodes {
 				categories = append(categories, map[string]string{
 					"id":   fmt.Sprint(c.ID),
 					"name": string(c.Name),
 				})
 			}
+
 			out, err := json.Marshal(categories)
 			if err != nil {
 				return nil, fmt.Errorf("failed to marshal discussion categories: %w", err)