From 6689033df36f1b85c8847398e105debde1c7b118 Mon Sep 17 00:00:00 2001
From: tommaso-moro <tommaso-moro@github.com>
Date: Mon, 28 Jul 2025 16:49:45 +0100
Subject: [PATCH 1/4] make repo optional, and default to .github when not
 provided. improve tool description

---
 pkg/github/discussions.go | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkg/github/discussions.go b/pkg/github/discussions.go
index fce07ecdb..905a1b709 100644
--- a/pkg/github/discussions.go
+++ b/pkg/github/discussions.go
@@ -119,7 +119,7 @@ func getQueryType(useOrdering bool, categoryID *githubv4.ID) any {
 
 func ListDiscussions(getGQLClient GetGQLClientFn, t translations.TranslationHelperFunc) (tool mcp.Tool, handler server.ToolHandlerFunc) {
 	return mcp.NewTool("list_discussions",
-			mcp.WithDescription(t("TOOL_LIST_DISCUSSIONS_DESCRIPTION", "List discussions for a repository")),
+			mcp.WithDescription(t("TOOL_LIST_DISCUSSIONS_DESCRIPTION", "List discussions for a repository or organisation.")),
 			mcp.WithToolAnnotation(mcp.ToolAnnotation{
 				Title:        t("TOOL_LIST_DISCUSSIONS_USER_TITLE", "List discussions"),
 				ReadOnlyHint: ToBoolPtr(true),
@@ -129,8 +129,7 @@ func ListDiscussions(getGQLClient GetGQLClientFn, t translations.TranslationHelp
 				mcp.Description("Repository owner"),
 			),
 			mcp.WithString("repo",
-				mcp.Required(),
-				mcp.Description("Repository name"),
+				mcp.Description("Repository name. If not provided, discussions will be queried at the organisation level."),
 			),
 			mcp.WithString("category",
 				mcp.Description("Optional filter by discussion category ID. If provided, only discussions with this category are listed."),
@@ -150,10 +149,15 @@ func ListDiscussions(getGQLClient GetGQLClientFn, t translations.TranslationHelp
 			if err != nil {
 				return mcp.NewToolResultError(err.Error()), nil
 			}
-			repo, err := RequiredParam[string](request, "repo")
+			repo, err := OptionalParam[string](request, "repo")
 			if err != nil {
 				return mcp.NewToolResultError(err.Error()), nil
 			}
+			// when not provided, default to the .github repository
+			// this will query discussions at the organisation level
+			if repo == "" {
+				repo = ".github"
+			}
 
 			category, err := OptionalParam[string](request, "category")
 			if err != nil {

From 85379ba5532fc8c0991857477a4cdabe31ce3173 Mon Sep 17 00:00:00 2001
From: tommaso-moro <tommaso-moro@github.com>
Date: Mon, 28 Jul 2025 16:57:21 +0100
Subject: [PATCH 2/4] autogen

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index be9288e40..6172f2b5c 100644
--- a/README.md
+++ b/README.md
@@ -466,7 +466,7 @@ The following sets of tools are available (all are on by default):
   - `orderBy`: Order discussions by field. If provided, the 'direction' also needs to be provided. (string, optional)
   - `owner`: Repository owner (string, required)
   - `perPage`: Results per page for pagination (min 1, max 100) (number, optional)
-  - `repo`: Repository name (string, required)
+  - `repo`: Repository name. If not provided, discussions will be queried at the organisation level. (string, optional)
 
 </details>
 

From 62921eec893ebee0b4a95af622e6756592fafb05 Mon Sep 17 00:00:00 2001
From: tommaso-moro <tommaso-moro@github.com>
Date: Mon, 28 Jul 2025 17:12:16 +0100
Subject: [PATCH 3/4] update tests

---
 pkg/github/discussions_test.go | 77 +++++++++++++++++++++++++++++++++-
 1 file changed, 76 insertions(+), 1 deletion(-)

diff --git a/pkg/github/discussions_test.go b/pkg/github/discussions_test.go
index aefaf2f8c..afa7b0dd2 100644
--- a/pkg/github/discussions_test.go
+++ b/pkg/github/discussions_test.go
@@ -50,6 +50,46 @@ var (
 		},
 	}
 
+	discussionsOrgLevel = []map[string]any{
+		{
+			"number":    1,
+			"title":     "Org Discussion 1 - Community Guidelines",
+			"createdAt": "2023-01-15T00:00:00Z",
+			"updatedAt": "2023-01-15T00:00:00Z",
+			"author":    map[string]any{"login": "org-admin"},
+			"url":       "https://github.com/owner/.github/discussions/1",
+			"category":  map[string]any{"name": "Announcements"},
+		},
+		{
+			"number":    2,
+			"title":     "Org Discussion 2 - Roadmap 2023",
+			"createdAt": "2023-02-20T00:00:00Z",
+			"updatedAt": "2023-02-20T00:00:00Z",
+			"author":    map[string]any{"login": "org-admin"},
+			"url":       "https://github.com/owner/.github/discussions/2",
+			"category":  map[string]any{"name": "General"},
+		},
+		{
+			"number":    3,
+			"title":     "Org Discussion 3 - Roadmap 2024",
+			"createdAt": "2023-02-20T00:00:00Z",
+			"updatedAt": "2023-02-20T00:00:00Z",
+			"author":    map[string]any{"login": "org-admin"},
+			"url":       "https://github.com/owner/.github/discussions/2",
+			"category":  map[string]any{"name": "General"},
+		},
+		{
+			"number":    4,
+			"title":     "Org Discussion 2 - Roadmap 2025",
+			"createdAt": "2023-02-20T00:00:00Z",
+			"updatedAt": "2023-02-20T00:00:00Z",
+			"author":    map[string]any{"login": "org-admin"},
+			"url":       "https://github.com/owner/.github/discussions/2",
+			"category":  map[string]any{"name": "General"},
+		},
+
+	}
+
 	// Ordered mock responses
 	discussionsOrderedCreatedAsc = []map[string]any{
 		discussionsAll[0], // Discussion 1 (created 2023-01-01)
@@ -139,6 +179,22 @@ var (
 			},
 		},
 	})
+
+	mockResponseOrgLevel = githubv4mock.DataResponse(map[string]any{
+		"repository": map[string]any{
+			"discussions": map[string]any{
+				"nodes": discussionsOrgLevel,
+				"pageInfo": map[string]any{
+					"hasNextPage":     false,
+					"hasPreviousPage": false,
+					"startCursor":     "",
+					"endCursor":       "",
+				},
+				"totalCount": 4, 
+			},
+		},
+	})
+
 	mockErrorRepoNotFound = githubv4mock.ErrorResponse("repository not found")
 )
 
@@ -151,7 +207,7 @@ func Test_ListDiscussions(t *testing.T) {
 	assert.Contains(t, toolDef.InputSchema.Properties, "repo")
 	assert.Contains(t, toolDef.InputSchema.Properties, "orderBy")
 	assert.Contains(t, toolDef.InputSchema.Properties, "direction")
-	assert.ElementsMatch(t, toolDef.InputSchema.Required, []string{"owner", "repo"})
+	assert.ElementsMatch(t, toolDef.InputSchema.Required, []string{"owner"})
 
 	// Variables matching what GraphQL receives after JSON marshaling/unmarshaling
 	varsListAll := map[string]interface{}{
@@ -204,6 +260,13 @@ func Test_ListDiscussions(t *testing.T) {
 		"after":            (*string)(nil),
 	}
 
+	varsOrgLevel := map[string]interface{}{
+		"owner": "owner",
+		"repo":  ".github", // This is what gets set when repo is not provided
+		"first": float64(30),
+		"after": (*string)(nil),
+	}
+
 	tests := []struct {
 		name          string
 		reqParams     map[string]interface{}
@@ -314,6 +377,15 @@ func Test_ListDiscussions(t *testing.T) {
 			expectError: true,
 			errContains: "repository not found",
 		},
+		{
+			name: "list org-level discussions (no repo provided)",
+			reqParams: map[string]interface{}{
+				"owner": "owner",
+				// repo is not provided, it will default to ".github"
+			},
+			expectError:   false,
+			expectedCount: 4,
+		},
 	}
 
 	// Define the actual query strings that match the implementation
@@ -351,6 +423,9 @@ func Test_ListDiscussions(t *testing.T) {
 			case "repository not found error":
 				matcher := githubv4mock.NewQueryMatcher(qBasicNoOrder, varsRepoNotFound, mockErrorRepoNotFound)
 				httpClient = githubv4mock.NewMockedHTTPClient(matcher)
+			case "list org-level discussions (no repo provided)":
+				matcher := githubv4mock.NewQueryMatcher(qBasicNoOrder, varsOrgLevel, mockResponseOrgLevel)
+				httpClient = githubv4mock.NewMockedHTTPClient(matcher)
 			}
 
 			gqlClient := githubv4.NewClient(httpClient)

From cda6c9d469f519fc515d80ae7e234f7719dd53c1 Mon Sep 17 00:00:00 2001
From: tommaso-moro <tommaso-moro@github.com>
Date: Tue, 29 Jul 2025 12:02:16 +0100
Subject: [PATCH 4/4] small copy paste error fixes

---
 pkg/github/discussions_test.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/github/discussions_test.go b/pkg/github/discussions_test.go
index afa7b0dd2..1fa90b403 100644
--- a/pkg/github/discussions_test.go
+++ b/pkg/github/discussions_test.go
@@ -75,16 +75,16 @@ var (
 			"createdAt": "2023-02-20T00:00:00Z",
 			"updatedAt": "2023-02-20T00:00:00Z",
 			"author":    map[string]any{"login": "org-admin"},
-			"url":       "https://github.com/owner/.github/discussions/2",
+			"url":       "https://github.com/owner/.github/discussions/3",
 			"category":  map[string]any{"name": "General"},
 		},
 		{
 			"number":    4,
-			"title":     "Org Discussion 2 - Roadmap 2025",
+			"title":     "Org Discussion 4 - Roadmap 2025",
 			"createdAt": "2023-02-20T00:00:00Z",
 			"updatedAt": "2023-02-20T00:00:00Z",
 			"author":    map[string]any{"login": "org-admin"},
-			"url":       "https://github.com/owner/.github/discussions/2",
+			"url":       "https://github.com/owner/.github/discussions/4",
 			"category":  map[string]any{"name": "General"},
 		},
 

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/github/github-mcp-server/pull/775.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/github/github-mcp-server/pull/775.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/github/github-mcp-server/pull/775.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/github/github-mcp-server/pull/775.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>