update pagination to remove from discussions

mattdholloway · mattdholloway · commit 7877d8db963a · 2025-07-18T09:52:36.000+01:00
diff --git a/pkg/github/discussions.go b/pkg/github/discussions.go
@@ -33,7 +33,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(),
+			WithCursorPagination(),
 		),
 		func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
 			// Required params
@@ -53,7 +53,7 @@ func ListDiscussions(getGQLClient GetGQLClientFn, t translations.TranslationHelp
 			}
 
 			// Get pagination parameters and convert to GraphQL format
-			pagination, err := OptionalPaginationParams(request)
+			pagination, err := OptionalCursorPaginationParams(request)
 			if err != nil {
 				return nil, err
 			}
@@ -305,7 +305,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(),
+			WithCursorPagination(),
 		),
 		func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
 			// Decode params
@@ -319,22 +319,21 @@ func GetDiscussionComments(getGQLClient GetGQLClientFn, t translations.Translati
 			}
 
 			// Get pagination parameters and convert to GraphQL format
-			pagination, err := OptionalPaginationParams(request)
+			pagination, err := OptionalCursorPaginationParams(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
+			paginationExplicit := perPageProvided
 
 			paginationParams, err := pagination.ToGraphQLParams()
 			if err != nil {
 				return nil, err
 			}
 
-			// Use default of 100 if pagination was not explicitly provided
+			// Use default of 30 if pagination was not explicitly provided
 			if !paginationExplicit {
 				defaultFirst := int32(DefaultGraphQLPageSize)
 				paginationParams.First = &defaultFirst
@@ -419,7 +418,6 @@ func ListDiscussionCategories(getGQLClient GetGQLClientFn, t translations.Transl
 				mcp.Required(),
 				mcp.Description("Repository name"),
 			),
-			WithUnifiedPagination(),
 		),
 		func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
 			// Decode params
@@ -431,28 +429,6 @@ func ListDiscussionCategories(getGQLClient GetGQLClientFn, t translations.Transl
 				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(DefaultGraphQLPageSize)
-				paginationParams.First = &defaultFirst
-			}
-
 			client, err := getGQLClient(ctx)
 			if err != nil {
 				return mcp.NewToolResultError(fmt.Sprintf("failed to get GitHub GQL client: %v", err)), nil
@@ -472,18 +448,13 @@ func ListDiscussionCategories(getGQLClient GetGQLClientFn, t translations.Transl
 							EndCursor       githubv4.String
 						}
 						TotalCount int
-					} `graphql:"discussionCategories(first: $first, after: $after)"`
+					} `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 paginationParams.After != nil {
-				vars["after"] = githubv4.String(*paginationParams.After)
-			} else {
-				vars["after"] = (*githubv4.String)(nil)
+				"first": githubv4.Int(25),
 			}
 			if err := client.Query(ctx, &q, vars); err != nil {
 				return mcp.NewToolResultError(err.Error()), nil
diff --git a/pkg/github/discussions_test.go b/pkg/github/discussions_test.go
@@ -353,14 +353,13 @@ func Test_GetDiscussionComments(t *testing.T) {
 
 func Test_ListDiscussionCategories(t *testing.T) {
 	// Use exact string query that matches implementation output
-	qListCategories := "query($after:String$first:Int!$owner:String!$repo:String!){repository(owner: $owner, name: $repo){discussionCategories(first: $first, after: $after){nodes{id,name},pageInfo{hasNextPage,hasPreviousPage,startCursor,endCursor},totalCount}}}"
+	qListCategories := "query($first:Int!$owner:String!$repo:String!){repository(owner: $owner, name: $repo){discussionCategories(first: $first){nodes{id,name},pageInfo{hasNextPage,hasPreviousPage,startCursor,endCursor},totalCount}}}"
 
 	// Variables matching what GraphQL receives after JSON marshaling/unmarshaling
 	vars := map[string]interface{}{
 		"owner": "owner",
 		"repo":  "repo",
-		"first": float64(30),
-		"after": (*string)(nil),
+		"first": float64(25),
 	}
 
 	mockResp := githubv4mock.DataResponse(map[string]any{
@@ -397,9 +396,6 @@ func Test_ListDiscussionCategories(t *testing.T) {
 
 	text := getTextResult(t, result).Text
 
-	// Debug: print the actual JSON response
-	t.Logf("JSON response: %s", text)
-
 	var response struct {
 		Categories []map[string]string `json:"categories"`
 		PageInfo   struct {
diff --git a/pkg/github/server.go b/pkg/github/server.go
@@ -212,6 +212,21 @@ func WithUnifiedPagination() mcp.ToolOption {
 	}
 }
 
+// WithCursorPagination adds only cursor-based pagination parameters to a tool (no page parameter).
+func WithCursorPagination() mcp.ToolOption {
+	return func(tool *mcp.Tool) {
+		mcp.WithNumber("perPage",
+			mcp.Description("Results per page for pagination (min 1, max 100)"),
+			mcp.Min(1),
+			mcp.Max(100),
+		)(tool)
+
+		mcp.WithString("after",
+			mcp.Description("Cursor for pagination. Use the endCursor from the previous page's PageInfo for GraphQL APIs."),
+		)(tool)
+	}
+}
+
 type PaginationParams struct {
 	Page    int
 	PerPage int
@@ -243,6 +258,49 @@ func OptionalPaginationParams(r mcp.CallToolRequest) (PaginationParams, error) {
 	}, nil
 }
 
+// OptionalCursorPaginationParams returns the "perPage" and "after" parameters from the request,
+// without the "page" parameter, suitable for cursor-based pagination only.
+func OptionalCursorPaginationParams(r mcp.CallToolRequest) (CursorPaginationParams, error) {
+	perPage, err := OptionalIntParamWithDefault(r, "perPage", 30)
+	if err != nil {
+		return CursorPaginationParams{}, err
+	}
+	after, err := OptionalParam[string](r, "after")
+	if err != nil {
+		return CursorPaginationParams{}, err
+	}
+	return CursorPaginationParams{
+		PerPage: perPage,
+		After:   after,
+	}, nil
+}
+
+type CursorPaginationParams struct {
+	PerPage int
+	After   string
+}
+
+// ToGraphQLParams converts cursor pagination parameters to GraphQL-specific parameters.
+func (p CursorPaginationParams) ToGraphQLParams() (GraphQLPaginationParams, error) {
+	if p.PerPage > 100 {
+		return GraphQLPaginationParams{}, fmt.Errorf("perPage value %d exceeds maximum of 100", p.PerPage)
+	}
+	if p.PerPage < 0 {
+		return GraphQLPaginationParams{}, fmt.Errorf("perPage value %d cannot be negative", p.PerPage)
+	}
+	first := int32(p.PerPage)
+
+	var after *string
+	if p.After != "" {
+		after = &p.After
+	}
+
+	return GraphQLPaginationParams{
+		First: &first,
+		After: after,
+	}, nil
+}
+
 type GraphQLPaginationParams struct {
 	First *int32
 	After *string
