Fix merge conflicts

Author: sridharavinash

pkg/github/server.go

@@ -26,78 +26,7 @@ func NewServer(version string, opts ...server.ServerOption) *server.MCPServer {
 		version,
 		opts...,
 	)
-<<<<<<< HEAD
-=======
-
-	// Add GitHub Resources
-	s.AddResourceTemplate(GetRepositoryResourceContent(getClient, t))
-	s.AddResourceTemplate(GetRepositoryResourceBranchContent(getClient, t))
-	s.AddResourceTemplate(GetRepositoryResourceCommitContent(getClient, t))
-	s.AddResourceTemplate(GetRepositoryResourceTagContent(getClient, t))
-	s.AddResourceTemplate(GetRepositoryResourcePrContent(getClient, t))
-
-	// Add GitHub tools - Issues
-	s.AddTool(GetIssue(getClient, t))
-	s.AddTool(SearchIssues(getClient, t))
-	s.AddTool(ListIssues(getClient, t))
-	s.AddTool(GetIssueComments(getClient, t))
-	if !readOnly {
-		s.AddTool(CreateIssue(getClient, t))
-		s.AddTool(AddIssueComment(getClient, t))
-		s.AddTool(UpdateIssue(getClient, t))
-	}
-
-	// Add GitHub tools - Pull Requests
-	s.AddTool(GetPullRequest(getClient, t))
-	s.AddTool(ListPullRequests(getClient, t))
-	s.AddTool(GetPullRequestFiles(getClient, t))
-	s.AddTool(GetPullRequestStatus(getClient, t))
-	s.AddTool(GetPullRequestComments(getClient, t))
-	s.AddTool(GetPullRequestReviews(getClient, t))
-	if !readOnly {
-		s.AddTool(MergePullRequest(getClient, t))
-		s.AddTool(UpdatePullRequestBranch(getClient, t))
-		s.AddTool(CreatePullRequestReview(getClient, t))
-		s.AddTool(CreatePullRequest(getClient, t))
-		s.AddTool(UpdatePullRequest(getClient, t))
-		s.AddTool(AddPullRequestReviewComment(getClient, t))
-	}
-
-	// Add GitHub tools - Repositories
-	s.AddTool(SearchRepositories(getClient, t))
-	s.AddTool(GetFileContents(getClient, t))
-	s.AddTool(GetCommit(getClient, t))
-	s.AddTool(ListCommits(getClient, t))
-	s.AddTool(ListBranches(getClient, t))
-	if !readOnly {
-		s.AddTool(CreateOrUpdateFile(getClient, t))
-		s.AddTool(CreateRepository(getClient, t))
-		s.AddTool(ForkRepository(getClient, t))
-		s.AddTool(CreateBranch(getClient, t))
-		s.AddTool(PushFiles(getClient, t))
-	}
-
-	// Add GitHub tools - Search
-	s.AddTool(SearchCode(getClient, t))
-	s.AddTool(SearchUsers(getClient, t))
-
-	// Add GitHub tools - Users
-	s.AddTool(GetMe(getClient, t))
-
-	// Add GitHub tools - Code Scanning
-	s.AddTool(GetCodeScanningAlert(getClient, t))
-	s.AddTool(ListCodeScanningAlerts(getClient, t))
 
-	// Add GitHub tools - Notifications
-	s.AddTool(GetNotifications(getClient, t))
-	s.AddTool(GetNotificationThread(getClient, t))
-	if !readOnly {
-		s.AddTool(MarkNotificationRead(getClient, t))
-		s.AddTool(MarkAllNotificationsRead(getClient, t))
-		s.AddTool(MarkNotificationDone(getClient, t))
-	}
-
->>>>>>> dbdef79 (refactor: update notification functions to use GetClientFn  . Fix conflicts)
 	return s
 }
 
@@ -190,26 +119,6 @@ func OptionalParam[T any](r mcp.CallToolRequest, p string) (T, error) {
 	return r.Params.Arguments[p].(T), nil
 }
 
-// OptionalParam is a helper function that can be used to fetch a requested parameter from the request.
-// It does the following checks:
-// 1. Checks if the parameter is present in the request, if not, it returns its zero-value
-// 2. If it is present, it checks if the parameter is of the expected type and returns it
-func OptionalParam[T any](r mcp.CallToolRequest, p string) (T, error) {
-	var zero T
-
-	// Check if the parameter is present in the request
-	if _, ok := r.Params.Arguments[p]; !ok {
-		return zero, nil
-	}
-
-	// Check if the parameter is of the expected type
-	if _, ok := r.Params.Arguments[p].(T); !ok {
-		return zero, fmt.Errorf("parameter %s is not of type %T, is %T", p, zero, r.Params.Arguments[p])
-	}
-
-	return r.Params.Arguments[p].(T), nil
-}
-
 // OptionalIntParam is a helper function that can be used to fetch a requested parameter from the request.
 // It does the following checks:
 // 1. Checks if the parameter is present in the request, if not, it returns its zero-value

pkg/github/tools.go

@@ -90,6 +90,19 @@ func InitToolsets(passedToolsets []string, readOnly bool, getClient GetClientFn,
 			toolsets.NewServerTool(GetSecretScanningAlert(getClient, t)),
 			toolsets.NewServerTool(ListSecretScanningAlerts(getClient, t)),
 		)
+
+	notifications := toolsets.NewToolset("notifications", "GitHub Notifications related tools").
+		AddReadTools(
+
+			toolsets.NewServerTool(MarkNotificationRead(getClient, t)),
+			toolsets.NewServerTool(MarkAllNotificationsRead(getClient, t)),
+			toolsets.NewServerTool(MarkNotificationDone(getClient, t)),
+		).
+		AddWriteTools(
+			toolsets.NewServerTool(GetNotifications(getClient, t)),
+			toolsets.NewServerTool(GetNotificationThread(getClient, t)),
+		)
+
 	// Keep experiments alive so the system doesn't error out when it's always enabled
 	experiments := toolsets.NewToolset("experiments", "Experimental features that are not considered stable yet")
 
@@ -100,6 +113,7 @@ func InitToolsets(passedToolsets []string, readOnly bool, getClient GetClientFn,
 	tsg.AddToolset(pullRequests)
 	tsg.AddToolset(codeSecurity)
 	tsg.AddToolset(secretProtection)
+	tsg.AddToolset(notifications)
 	tsg.AddToolset(experiments)
 	// Enable the requested features