Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitdcc6da5

Browse files
feat: implement get_repository_discussions tool with GraphQL support
1 parentbbba3bb commitdcc6da5

File tree

6 files changed

+250
-3
lines changed

6 files changed

+250
-3
lines changed

‎cmd/github-mcp-server/main.go

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ import (
1515
gogithub"github.com/google/go-github/v69/github"
1616
"github.com/mark3labs/mcp-go/mcp"
1717
"github.com/mark3labs/mcp-go/server"
18+
"github.com/shurcooL/githubv4"
1819
log"github.com/sirupsen/logrus"
1920
"github.com/spf13/cobra"
2021
"github.com/spf13/viper"
22+
"golang.org/x/oauth2"
2123
)
2224

2325
varversion="version"
@@ -119,9 +121,20 @@ func runStdioServer(cfg runConfig) error {
119121
iftoken=="" {
120122
cfg.logger.Fatal("GITHUB_PERSONAL_ACCESS_TOKEN not set")
121123
}
122-
ghClient:=gogithub.NewClient(nil).WithAuthToken(token)
124+
125+
// Create OAuth2 token source
126+
ts:=oauth2.StaticTokenSource(
127+
&oauth2.Token{AccessToken:token},
128+
)
129+
httpClient:=oauth2.NewClient(ctx,ts)
130+
131+
// Create REST API client
132+
ghClient:=gogithub.NewClient(httpClient)
123133
ghClient.UserAgent=fmt.Sprintf("github-mcp-server/%s",version)
124134

135+
// Create GraphQL client
136+
graphqlClient:=githubv4.NewClient(httpClient)
137+
125138
// Check GH_HOST env var first, then fall back to viper config
126139
host:=os.Getenv("GH_HOST")
127140
ifhost=="" {
@@ -134,6 +147,9 @@ func runStdioServer(cfg runConfig) error {
134147
iferr!=nil {
135148
returnfmt.Errorf("failed to create GitHub client with host: %w",err)
136149
}
150+
151+
// Also update GraphQL endpoint for enterprise if needed
152+
graphqlClient=githubv4.NewEnterpriseClient(fmt.Sprintf("https://%s/api/graphql",host),httpClient)
137153
}
138154

139155
t,dumpTranslations:=translations.TranslationHelper()
@@ -146,11 +162,16 @@ func runStdioServer(cfg runConfig) error {
146162
returnghClient,nil// closing over client
147163
}
148164

165+
// Add function to get GraphQL client
166+
getGraphQLClient:=func(_ context.Context) (*githubv4.Client,error) {
167+
returngraphqlClient,nil// closing over graphql client
168+
}
169+
149170
hooks:=&server.Hooks{
150171
OnBeforeInitialize: []server.OnBeforeInitializeFunc{beforeInit},
151172
}
152173
// Create
153-
ghServer:=github.NewServer(getClient,version,cfg.readOnly,t,server.WithHooks(hooks))
174+
ghServer:=github.NewServer(getClient,getGraphQLClient,version,cfg.readOnly,t,server.WithHooks(hooks))
154175
stdioServer:=server.NewStdioServer(ghServer)
155176

156177
stdLogger:=stdlog.New(cfg.logger.Writer(),"stdioserver",0)

‎go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ require (
88
github.com/google/go-github/v69v69.2.0
99
github.com/mark3labs/mcp-gov0.18.0
1010
github.com/migueleliasweb/go-github-mockv1.1.0
11+
github.com/shurcooL/githubv4v0.0.0-20240727222349-48295856cce7
1112
github.com/sirupsen/logrusv1.9.3
1213
github.com/spf13/cobrav1.9.1
1314
github.com/spf13/viperv1.20.1
1415
github.com/stretchr/testifyv1.10.0
16+
golang.org/x/oauth2v0.29.0
1517
)
1618

1719
require (
@@ -41,6 +43,7 @@ require (
4143
github.com/pkg/errorsv0.9.1// indirect
4244
github.com/pmezard/go-difflibv1.0.1-0.20181226105442-5d4384ee4fb2// indirect
4345
github.com/sagikazarmark/locaferov0.9.0// indirect
46+
github.com/shurcooL/graphqlv0.0.0-20230722043721-ed46e5a46466// indirect
4447
github.com/sourcegraph/concv0.3.0// indirect
4548
github.com/spf13/aferov1.14.0// indirect
4649
github.com/spf13/castv1.7.1// indirect

‎go.sum

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@ github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWN
8383
github.com/russross/blackfriday/v2v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
8484
github.com/sagikazarmark/locaferov0.9.0 h1:GbgQGNtTrEmddYDSAH9QLRyfAHY12md+8YFTqyMTC9k=
8585
github.com/sagikazarmark/locaferov0.9.0/go.mod h1:UBUyz37V+EdMS3hDF3QWIiVr/2dPrx49OMO0Bn0hJqk=
86+
github.com/shurcooL/githubv4v0.0.0-20240727222349-48295856cce7 h1:cYCy18SHPKRkvclm+pWm1Lk4YrREb4IOIb/YdFO0p2M=
87+
github.com/shurcooL/githubv4v0.0.0-20240727222349-48295856cce7/go.mod h1:zqMwyHmnN/eDOZOdiTohqIUKUrTFX62PNlu7IJdu0q8=
88+
github.com/shurcooL/graphqlv0.0.0-20230722043721-ed46e5a46466 h1:17JxqqJY66GmZVHkmAsGEkcIu0oCe3AM420QDgGwZx0=
89+
github.com/shurcooL/graphqlv0.0.0-20230722043721-ed46e5a46466/go.mod h1:9dIRpgIY7hVhoqfe0/FcYp0bpInZaT7dc3BYOprrIUE=
8690
github.com/sirupsen/logrusv1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
8791
github.com/sirupsen/logrusv1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
8892
github.com/sourcegraph/concv0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
@@ -138,6 +142,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
138142
golang.org/x/netv0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
139143
golang.org/x/netv0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
140144
golang.org/x/netv0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
145+
golang.org/x/oauth2v0.29.0 h1:WdYw2tdTK1S8olAzWHdgeqfy+Mtm9XNhv/xJsY65d98=
146+
golang.org/x/oauth2v0.29.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
141147
golang.org/x/syncv0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
142148
golang.org/x/syncv0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
143149
golang.org/x/syncv0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

‎pkg/github/discussions.go

Lines changed: 199 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,199 @@
1+
package github
2+
3+
import (
4+
"context"
5+
"encoding/json"
6+
"fmt"
7+
8+
"github.com/github/github-mcp-server/pkg/translations"
9+
"github.com/mark3labs/mcp-go/mcp"
10+
"github.com/mark3labs/mcp-go/server"
11+
"github.com/shurcooL/githubv4"
12+
)
13+
14+
// Discussion represents a GitHub Discussion with its essential fields
15+
typeDiscussionstruct {
16+
IDstring`json:"id"`
17+
Numberint`json:"number"`
18+
Titlestring`json:"title"`
19+
Bodystring`json:"body"`
20+
CreatedAtstring`json:"createdAt"`
21+
UpdatedAtstring`json:"updatedAt"`
22+
URLstring`json:"url"`
23+
Categorystring`json:"category"`
24+
Authorstring`json:"author"`
25+
Lockedbool`json:"locked"`
26+
UpvoteCountint`json:"upvoteCount"`
27+
}
28+
29+
// GetRepositoryDiscussions creates a tool to fetch discussions from a specific repository.
30+
funcGetRepositoryDiscussions(getGraphQLClientGetGraphQLClientFn,t translations.TranslationHelperFunc) (tool mcp.Tool,handler server.ToolHandlerFunc) {
31+
returnmcp.NewTool("get_repository_discussions",
32+
mcp.WithDescription(t("TOOL_GET_REPOSITORY_DISCUSSIONS_DESCRIPTION","Get discussions from a specific GitHub repository")),
33+
mcp.WithString("owner",
34+
mcp.Required(),
35+
mcp.Description("Repository owner"),
36+
),
37+
mcp.WithString("repo",
38+
mcp.Required(),
39+
mcp.Description("Repository name"),
40+
),
41+
),
42+
func(ctx context.Context,request mcp.CallToolRequest) (*mcp.CallToolResult,error) {
43+
owner,err:=requiredParam[string](request,"owner")
44+
iferr!=nil {
45+
returnmcp.NewToolResultError(err.Error()),nil
46+
}
47+
48+
repo,err:=requiredParam[string](request,"repo")
49+
iferr!=nil {
50+
returnmcp.NewToolResultError(err.Error()),nil
51+
}
52+
53+
categoryId,err:=OptionalParam[string](request,"categoryId")
54+
iferr!=nil {
55+
returnmcp.NewToolResultError(err.Error()),nil
56+
}
57+
58+
pagination,err:=OptionalPaginationParams(request)
59+
iferr!=nil {
60+
returnmcp.NewToolResultError(err.Error()),nil
61+
}
62+
63+
// Get GraphQL client
64+
client,err:=getGraphQLClient(ctx)
65+
iferr!=nil {
66+
returnnil,fmt.Errorf("failed to get GitHub GraphQL client: %w",err)
67+
}
68+
69+
// Define GraphQL query variables
70+
variables:=map[string]interface{}{
71+
"owner":githubv4.String(owner),
72+
"name":githubv4.String(repo),
73+
"first":githubv4.Int(pagination.perPage),
74+
"after": (*githubv4.String)(nil),// For pagination - null means first page
75+
"categoryId": (*githubv4.ID)(nil),// For category ID - null means no filter
76+
}
77+
78+
// For pagination beyond the first page
79+
// TODO: Fix this to use actual cursor values
80+
// This is a placeholder for the cursor logic
81+
// In a real implementation, you should store and use actual cursor values
82+
ifpagination.perPage>0&&pagination.page>1 {
83+
ifpagination.page>1 {
84+
// We'd need an actual cursor here, but for simplicity we'll compute a rough offset
85+
// In real implementation, you should store and use actual cursor values
86+
cursorStr:=githubv4.String(fmt.Sprintf("%d", (pagination.page-1)*pagination.perPage))
87+
variables["after"]=&cursorStr
88+
}
89+
90+
ifcategoryId!="" {
91+
variables["categoryId"]=githubv4.ID(categoryId)
92+
}
93+
94+
// Define the GraphQL query structure
95+
varquerystruct {
96+
Repositorystruct {
97+
Discussionsstruct {
98+
TotalCountint
99+
Nodes []struct {
100+
ID githubv4.ID
101+
Numberint
102+
Titlestring
103+
Bodystring
104+
CreatedAt githubv4.DateTime
105+
UpdatedAt githubv4.DateTime
106+
URL githubv4.URI
107+
Categorystruct {
108+
Namestring
109+
}
110+
Authorstruct {
111+
Loginstring
112+
}
113+
Lockedbool
114+
UpvoteCountint
115+
}
116+
PageInfostruct {
117+
EndCursor githubv4.String
118+
HasNextPagebool
119+
}
120+
}`graphql:"discussions(first: $first, after: $after, categoryId: $categoryId)"`
121+
}`graphql:"repository(owner: $owner, name: $name)"`
122+
}
123+
124+
// Only include categoryId in the query if it was provided
125+
ifcategoryId=="" {
126+
// Redefine the query without the categoryId filter
127+
query.Repository.Discussions=struct {
128+
TotalCountint
129+
Nodes []struct {
130+
ID githubv4.ID
131+
Numberint
132+
Titlestring
133+
Bodystring
134+
CreatedAt githubv4.DateTime
135+
UpdatedAt githubv4.DateTime
136+
URL githubv4.URI
137+
Categorystruct {
138+
Namestring
139+
}
140+
Authorstruct {
141+
Loginstring
142+
}
143+
Lockedbool
144+
UpvoteCountint
145+
}
146+
PageInfostruct {
147+
EndCursor githubv4.String
148+
HasNextPagebool
149+
}
150+
}{}
151+
}
152+
153+
// Execute the GraphQL query
154+
err=client.Query(ctx,&query,variables)
155+
iferr!=nil {
156+
returnnil,fmt.Errorf("failed to query discussions: %w",err)
157+
}
158+
159+
// Convert the GraphQL response to our Discussion type
160+
discussions:=make([]Discussion,0,len(query.Repository.Discussions.Nodes))
161+
for_,node:=rangequery.Repository.Discussions.Nodes {
162+
discussion:=Discussion{
163+
ID:fmt.Sprintf("%v",node.ID),
164+
Number:node.Number,
165+
Title:node.Title,
166+
Body:node.Body,
167+
CreatedAt:node.CreatedAt.String(),
168+
UpdatedAt:node.UpdatedAt.String(),
169+
URL:node.URL.String(),
170+
Category:node.Category.Name,
171+
Author:node.Author.Login,
172+
Locked:node.Locked,
173+
UpvoteCount:node.UpvoteCount,
174+
}
175+
discussions=append(discussions,discussion)
176+
}
177+
178+
// Create the response
179+
result:=struct {
180+
TotalCountint`json:"totalCount"`
181+
Discussions []Discussion`json:"discussions"`
182+
HasNextPagebool`json:"hasNextPage"`
183+
EndCursorstring`json:"endCursor"`
184+
}{
185+
TotalCount:query.Repository.Discussions.TotalCount,
186+
Discussions:discussions,
187+
HasNextPage:query.Repository.Discussions.PageInfo.HasNextPage,
188+
EndCursor:string(query.Repository.Discussions.PageInfo.EndCursor),
189+
}
190+
191+
// Marshal the result to JSON
192+
r,err:=json.Marshal(result)
193+
iferr!=nil {
194+
returnnil,fmt.Errorf("failed to marshal discussions result: %w",err)
195+
}
196+
197+
returnmcp.NewToolResultText(string(r)),nil
198+
}
199+
}

‎pkg/github/server.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@ import (
1212
"github.com/google/go-github/v69/github"
1313
"github.com/mark3labs/mcp-go/mcp"
1414
"github.com/mark3labs/mcp-go/server"
15+
"github.com/shurcooL/githubv4"
1516
)
1617

1718
typeGetClientFnfunc(context.Context) (*github.Client,error)
19+
typeGetGraphQLClientFnfunc(context.Context) (*githubv4.Client,error)
1820

1921
// NewServer creates a new GitHub MCP server with the specified GH client and logger.
20-
funcNewServer(getClientGetClientFn,versionstring,readOnlybool,t translations.TranslationHelperFunc,opts...server.ServerOption)*server.MCPServer {
22+
funcNewServer(getClientGetClientFn,getGraphQLClientGetGraphQLClientFn,versionstring,readOnlybool,t translations.TranslationHelperFunc,opts...server.ServerOption)*server.MCPServer {
2123
// Add default options
2224
defaultOpts:= []server.ServerOption{
2325
server.WithResourceCapabilities(true,true),
@@ -90,6 +92,10 @@ func NewServer(getClient GetClientFn, version string, readOnly bool, t translati
9092
// Add GitHub tools - Code Scanning
9193
s.AddTool(GetCodeScanningAlert(getClient,t))
9294
s.AddTool(ListCodeScanningAlerts(getClient,t))
95+
96+
// Add GitHub tools - Discussions (GraphQL)
97+
s.AddTool(GetRepositoryDiscussions(getGraphQLClient,t))
98+
9399
returns
94100
}
95101

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
3+
# Test script for the get_repository_discussions function
4+
5+
# Ensure the script exits on any error
6+
set -e
7+
8+
# Run the command and capture the output
9+
echo'{"jsonrpc":"2.0","id":5,"params":{"name":"get_repository_discussions", "arguments":{"owner":"github", "repo":"engineering"}},"method":"tools/call"}'| go run ./cmd/github-mcp-server/main.go stdio| jq.
10+
11+
# Print a message indicating the test is complete
12+
echo"Test for get_repository_discussions completed."

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp