replace github.com/mark3labs/mcp-go with github.com/modelcontextprotocol/go-sdk

Author: yikakia

cmd/godoc-mcp-server/main.go

@@ -1,27 +1,17 @@
 package main
 
 import (
-	"fmt"
-	"os"
+	"context"
+	"log"
 
-	"github.com/mark3labs/mcp-go/server"
-)
-
-var (
-	version = "1.0.0"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 
 func main() {
-	mcpServer := server.NewMCPServer(
-		"godoc-mcp-server",
-		version,
-	)
-	mcpServer.AddTool(getSearchTool())
-	mcpServer.AddTool(getPackageInfoTool())
+	s := initServer()
 
-	_, _ = fmt.Fprintf(os.Stderr, "godoc-mcp-server running on stdio...\n")
-	err := server.ServeStdio(mcpServer)
+	err := s.Run(context.Background(), mcp.NewStdioTransport())
 	if err != nil {
-		panic(err)
+		log.Fatal("unknown err, will exit. err:", err)
 	}
 }

cmd/godoc-mcp-server/packageInfo.go

@@ -1,57 +1,34 @@
 package main
 
 import (
-	"fmt"
-
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
+	"github.com/yikakia/godoc-mcp-server/pkg/tool"
 )
 
-// requiredParam 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.
-// 2. Checks if the parameter is of the expected type.
-// 3. Checks if the parameter is not empty, i.e: non-zero value
-func requiredParam[T comparable](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, fmt.Errorf("missing required parameter: %s", p)
-	}
-
-	// 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", p, zero)
-	}
-
-	if r.Params.Arguments[p].(T) == zero {
-		return zero, fmt.Errorf("missing required parameter: %s", p)
-
-	}
-
-	return r.Params.Arguments[p].(T), nil
-}
-
-// OptionalParamOK is a helper function that can be used to fetch a requested parameter from the request.
-// It returns the value, a boolean indicating if the parameter was present, and an error if the type is wrong.
-func OptionalParamOK[T any](r mcp.CallToolRequest, p string) (value T, ok bool, err error) {
-	// Check if the parameter is present in the request
-	val, exists := r.Params.Arguments[p]
-	if !exists {
-		// Not present, return zero value, false, no error
-		return
-	}
-
-	// Check if the parameter is of the expected type
-	value, ok = val.(T)
-	if !ok {
-		// Present but wrong type
-		err = fmt.Errorf("parameter %s is not of type %T, is %T", p, value, val)
-		ok = true // Set ok to true because the parameter *was* present, even if wrong type
-		return
-	}
+var (
+	name    = "godoc-mcp-server"
+	version = "v1.0.0"
+)
 
-	// Present and correct type
-	ok = true
-	return
+func initServer() *mcp.Server {
+	server := mcp.NewServer(&mcp.Implementation{
+		Name:    name,
+		Version: version,
+	}, nil)
+
+	mcp.AddTool(server, &mcp.Tool{
+		Description: "provide a golang package name,get package consts,types,functions,variables," +
+			"subpackages and how to use it",
+		Name: "getPackageInfo",
+	}, tool.GetPkgInfoTool())
+
+	mcp.AddTool(server, &mcp.Tool{
+		Description: "provide a query, search related golang packages from pkg.go.dev include " +
+			"name, path, synopsis, go doc url, imported by how many packages, subpackages in this package " +
+			"the path is the package full name. if want to use getPackageInfo. llm should pass the path as " +
+			"packageName to getPackageInfo",
+		Name: "searchPackages",
+	}, tool.GetSearchToolV2())
+
+	return server
 }

cmd/godoc-mcp-server/search.go

@@ -6,7 +6,7 @@ require (
 	github.com/PuerkitoBio/goquery v1.10.2
 	github.com/coocood/freecache v1.2.4
 	github.com/go-resty/resty/v2 v2.16.5
-	github.com/mark3labs/mcp-go v0.18.0
+	github.com/modelcontextprotocol/go-sdk v0.2.0
 	github.com/pkg/errors v0.9.1
 	go.uber.org/multierr v1.11.0
 	golang.org/x/net v0.39.0
@@ -15,6 +15,6 @@ require (
 require (
 	github.com/andybalholm/cascadia v1.3.3 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/google/uuid v1.6.0 // indirect
+	github.com/stretchr/testify v1.9.0 // indirect
 	github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
 )

cmd/godoc-mcp-server/server.go

@@ -11,10 +11,10 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/go-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptdhTM=
 github.com/go-resty/resty/v2 v2.16.5/go.mod h1:hkJtXbA2iKHzJheXYvQ8snQES5ZLGKMwQ07xAwp/fiA=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/mark3labs/mcp-go v0.18.0 h1:YuhgIVjNlTG2ZOwmrkORWyPTp0dz1opPEqvsPtySXao=
-github.com/mark3labs/mcp-go v0.18.0/go.mod h1:KmJndYv7GIgcPVwEKJjNcbhVQ+hJGJhrCCB/9xITzpE=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/modelcontextprotocol/go-sdk v0.2.0 h1:PESNYOmyM1c369tRkzXLY5hHrazj8x9CY1Xu0fLCryM=
+github.com/modelcontextprotocol/go-sdk v0.2.0/go.mod h1:0sL9zUKKs2FTTkeCCVnKqbLJTw5TScefPAzojjU459E=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -92,6 +92,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
+golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

go.mod

@@ -0,0 +1,44 @@
+package tool
+
+import (
+	"context"
+	"encoding/json"
+
+	"github.com/modelcontextprotocol/go-sdk/mcp"
+	"github.com/pkg/errors"
+	"github.com/yikakia/godoc-mcp-server/pkg/godoc"
+)
+
+type GetPkgInfoParams struct {
+	// TODO add the description to the filed pkgName and needURL
+
+	// pkgName
+	// package name for search. if use searchPackages before, and user want to get the subpackage info. you should plus
+	// them for example, when user query mcp, and it return packageName: github.com/mark3labs/mcp-go/mcp and subpackage
+	// client, then if user want to get the client package info, you should set the packageName to
+	// github.com/mark3labs/mcp-go/mcp/client rather than client
+	PkgName string `json:"pkgName" jsonschema:"the package name user search"`
+	// default is false. if it`s true, will return the url of the definition of the package`s consts,types,functions,
+	// variables,subpackages. only when user need it, set it
+	NeedURL bool `json:"needURL" jsonschema:"if user need the link to the definition"`
+}
+
+func GetPkgInfoTool() mcp.ToolHandlerFor[GetPkgInfoParams, any] {
+	return func(ctx context.Context, session *mcp.ServerSession, c *mcp.CallToolParamsFor[GetPkgInfoParams]) (*mcp.CallToolResultFor[any], error) {
+		pkgDoc, err := godoc.GetPackageDocument(godoc.GetPackageRequest{
+			PackageName: c.Arguments.PkgName,
+			NeedURL:     c.Arguments.NeedURL,
+		})
+		if err != nil {
+			return nil, errors.WithMessage(err, "get pkg info failed")
+		}
+		marshal, err := json.Marshal(pkgDoc)
+		if err != nil {
+			return nil, errors.Wrap(err, "marshal pkgDoc failed")
+		}
+
+		return &mcp.CallToolResultFor[any]{
+			Content: []mcp.Content{&mcp.TextContent{Text: string(marshal)}},
+		}, nil
+	}
+}

go.sum

@@ -0,0 +1,31 @@
+package tool
+
+import (
+	"context"
+	"encoding/json"
+
+	"github.com/modelcontextprotocol/go-sdk/mcp"
+	"github.com/pkg/errors"
+	"github.com/yikakia/godoc-mcp-server/pkg/godoc"
+)
+
+type searchParams struct {
+	Q string `json:"q" jsonschema:"query string"`
+}
+
+func GetSearchToolV2() mcp.ToolHandlerFor[searchParams, any] {
+	return func(ctx context.Context, session *mcp.ServerSession, c *mcp.CallToolParamsFor[searchParams]) (*mcp.CallToolResultFor[any], error) {
+
+		search, err := godoc.Search(c.Arguments.Q)
+		if err != nil {
+			return nil, errors.WithMessage(err, "search failed.")
+		}
+		marshal, err := json.Marshal(search.Packages)
+		if err != nil {
+			return nil, errors.Wrap(err, "marshal pkgs failed.")
+		}
+		return &mcp.CallToolResultFor[any]{
+			Content: []mcp.Content{&mcp.TextContent{Text: string(marshal)}},
+		}, nil
+	}
+}