mirror of
https://gitea.com/gitea/gitea-mcp.git
synced 2026-08-03 15:49:23 +02:00
refactor!: replace mcp-go with the official MCP Go SDK
- Swap the mark3labs MCP dependency for modelcontextprotocol/go-sdk v1.7.0 - Add a declarative tool definition and JSON Schema builder to the tool package - Adapt registered tools to the official low-level handler, recovering panics and mapping failures to JSON-RPC errors - Narrow tool handlers to take a plain argument map instead of an SDK request type - Rewire stdio and HTTP transports onto the official server, moving Authorization parsing into receiving middleware - Add a golden contract test that locks the exposed tool schemas, plus SDK integration and helper tests - Add a test target and run it in the pull request workflow BREAKING CHANGE: The exported helpers change signature. Tool.RegisterRead and Tool.RegisterWrite now take tool.ServerTool instead of server.ServerTool, and the annotation constructors return *mcp.ToolAnnotations from the official SDK. Callers must build tool definitions with tool.NewDefinition and handlers with the func(context.Context, map[string]any) signature. The 30-second SSE heartbeat is removed because the official SDK has no equivalent. ServerOptions.KeepAlive is deliberately not used as a substitute, since it sends MCP ping requests and ping is removed in protocol 2026. HTTP stays stateless=false, so new clients negotiate at most 2025-11-25. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -13,8 +13,7 @@ import (
|
||||
"gitea.com/gitea/gitea-mcp/pkg/to"
|
||||
"gitea.com/gitea/gitea-mcp/pkg/tool"
|
||||
|
||||
"github.com/mark3labs/mcp-go/mcp"
|
||||
"github.com/mark3labs/mcp-go/server"
|
||||
"github.com/modelcontextprotocol/go-sdk/mcp"
|
||||
)
|
||||
|
||||
var Tool = tool.New("packages")
|
||||
@@ -25,70 +24,68 @@ const (
|
||||
)
|
||||
|
||||
var (
|
||||
PackageReadTool = mcp.NewTool(
|
||||
PackageReadTool = tool.NewDefinition(
|
||||
PackageReadToolName,
|
||||
mcp.WithToolAnnotation(annotation.ReadOnly("Read package registry")),
|
||||
mcp.WithDescription("Read package registry: list packages (one entry per version, filter via 'q'/'type'), list versions, or get a version."),
|
||||
mcp.WithString("method", mcp.Required(), mcp.Enum("list", "list_versions", "get")),
|
||||
mcp.WithString("owner", mcp.Required(), mcp.Description("user or org")),
|
||||
mcp.WithString("type", mcp.Description("container/npm/maven/pypi/cargo/generic; required except 'list'")),
|
||||
mcp.WithString("name", mcp.Description("slashes auto-encoded; required except 'list'")),
|
||||
mcp.WithString("version", mcp.Description("for 'get'")),
|
||||
mcp.WithString("q", mcp.Description("search query")),
|
||||
mcp.WithNumber("page", mcp.Description(params.PageDesc), mcp.DefaultNumber(1), mcp.Min(1)),
|
||||
mcp.WithNumber("per_page", mcp.Description(params.PaginationDesc), mcp.DefaultNumber(30), mcp.Min(1)),
|
||||
"Read package registry: list packages (one entry per version, filter via 'q'/'type'), list versions, or get a version.",
|
||||
annotation.ReadOnly("Read package registry"),
|
||||
tool.String("method", tool.Required(), tool.Enum("list", "list_versions", "get")),
|
||||
tool.String("owner", tool.Required(), tool.Description("user or org")),
|
||||
tool.String("type", tool.Description("container/npm/maven/pypi/cargo/generic; required except 'list'")),
|
||||
tool.String("name", tool.Description("slashes auto-encoded; required except 'list'")),
|
||||
tool.String("version", tool.Description("for 'get'")),
|
||||
tool.String("q", tool.Description("search query")),
|
||||
tool.Number("page", tool.Description(params.PageDesc), tool.Default(1), tool.Minimum(1)),
|
||||
tool.Number("per_page", tool.Description(params.PaginationDesc), tool.Default(30), tool.Minimum(1)),
|
||||
)
|
||||
|
||||
PackageWriteTool = mcp.NewTool(
|
||||
PackageWriteTool = tool.NewDefinition(
|
||||
PackageWriteToolName,
|
||||
mcp.WithToolAnnotation(annotation.Destructive("Delete a package version")),
|
||||
mcp.WithDescription("Delete a package version (irreversible)."),
|
||||
mcp.WithString("method", mcp.Required(), mcp.Enum("delete")),
|
||||
mcp.WithString("owner", mcp.Required(), mcp.Description("user or org")),
|
||||
mcp.WithString("type", mcp.Required(), mcp.Description("container/npm/maven/pypi/cargo/generic")),
|
||||
mcp.WithString("name", mcp.Required(), mcp.Description("slashes auto-encoded")),
|
||||
mcp.WithString("version", mcp.Required()),
|
||||
"Delete a package version (irreversible).",
|
||||
annotation.Destructive("Delete a package version"),
|
||||
tool.String("method", tool.Required(), tool.Enum("delete")),
|
||||
tool.String("owner", tool.Required(), tool.Description("user or org")),
|
||||
tool.String("type", tool.Required(), tool.Description("container/npm/maven/pypi/cargo/generic")),
|
||||
tool.String("name", tool.Required(), tool.Description("slashes auto-encoded")),
|
||||
tool.String("version", tool.Required()),
|
||||
)
|
||||
)
|
||||
|
||||
func init() {
|
||||
Tool.RegisterRead(server.ServerTool{
|
||||
Tool.RegisterRead(tool.ServerTool{
|
||||
Tool: PackageReadTool,
|
||||
Handler: packageReadFn,
|
||||
})
|
||||
Tool.RegisterWrite(server.ServerTool{
|
||||
Tool.RegisterWrite(tool.ServerTool{
|
||||
Tool: PackageWriteTool,
|
||||
Handler: packageWriteFn,
|
||||
})
|
||||
}
|
||||
|
||||
func packageReadFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
|
||||
args := req.GetArguments()
|
||||
func packageReadFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
|
||||
method, err := params.GetString(args, "method")
|
||||
if err != nil {
|
||||
return to.ErrorResult(err)
|
||||
}
|
||||
switch method {
|
||||
case "list":
|
||||
return listPackagesFn(ctx, req)
|
||||
return listPackagesFn(ctx, args)
|
||||
case "list_versions":
|
||||
return listPackageVersionsFn(ctx, req)
|
||||
return listPackageVersionsFn(ctx, args)
|
||||
case "get":
|
||||
return getPackageFn(ctx, req)
|
||||
return getPackageFn(ctx, args)
|
||||
default:
|
||||
return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
|
||||
}
|
||||
}
|
||||
|
||||
func packageWriteFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
|
||||
args := req.GetArguments()
|
||||
func packageWriteFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
|
||||
method, err := params.GetString(args, "method")
|
||||
if err != nil {
|
||||
return to.ErrorResult(err)
|
||||
}
|
||||
switch method {
|
||||
case "delete":
|
||||
return deletePackageVersionFn(ctx, req)
|
||||
return deletePackageVersionFn(ctx, args)
|
||||
default:
|
||||
return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
|
||||
}
|
||||
@@ -108,8 +105,7 @@ func escapePackageName(name string) string {
|
||||
return url.PathEscape(name)
|
||||
}
|
||||
|
||||
func listPackagesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
|
||||
args := req.GetArguments()
|
||||
func listPackagesFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
|
||||
owner, err := params.GetString(args, "owner")
|
||||
if err != nil {
|
||||
return to.ErrorResult(err)
|
||||
@@ -135,8 +131,7 @@ func listPackagesFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallTool
|
||||
return to.TextResult(slimPackages(result))
|
||||
}
|
||||
|
||||
func listPackageVersionsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
|
||||
args := req.GetArguments()
|
||||
func listPackageVersionsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
|
||||
owner, err := params.GetString(args, "owner")
|
||||
if err != nil {
|
||||
return to.ErrorResult(err)
|
||||
@@ -164,8 +159,7 @@ func listPackageVersionsFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.C
|
||||
return to.TextResult(slimPackages(result))
|
||||
}
|
||||
|
||||
func getPackageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
|
||||
args := req.GetArguments()
|
||||
func getPackageFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
|
||||
owner, err := params.GetString(args, "owner")
|
||||
if err != nil {
|
||||
return to.ErrorResult(err)
|
||||
@@ -192,8 +186,7 @@ func getPackageFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolRe
|
||||
return to.TextResult(slimPackage(result))
|
||||
}
|
||||
|
||||
func deletePackageVersionFn(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
|
||||
args := req.GetArguments()
|
||||
func deletePackageVersionFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
|
||||
owner, err := params.GetString(args, "owner")
|
||||
if err != nil {
|
||||
return to.ErrorResult(err)
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
mcpContext "gitea.com/gitea/gitea-mcp/pkg/context"
|
||||
"gitea.com/gitea/gitea-mcp/pkg/flag"
|
||||
|
||||
"github.com/mark3labs/mcp-go/mcp"
|
||||
"github.com/modelcontextprotocol/go-sdk/mcp"
|
||||
)
|
||||
|
||||
func TestPackageReadList(t *testing.T) {
|
||||
@@ -37,13 +37,12 @@ func TestPackageReadList(t *testing.T) {
|
||||
ctx := context.WithValue(context.Background(), mcpContext.TokenContextKey, "test-token")
|
||||
|
||||
t.Run("basic list", func(t *testing.T) {
|
||||
req := mcp.CallToolRequest{}
|
||||
req.Params.Arguments = map[string]any{
|
||||
args := map[string]any{
|
||||
"method": "list",
|
||||
"owner": "test-org",
|
||||
}
|
||||
|
||||
result, err := packageReadFn(ctx, req)
|
||||
result, err := packageReadFn(ctx, args)
|
||||
if err != nil {
|
||||
t.Fatalf("packageReadFn() error: %v", err)
|
||||
}
|
||||
@@ -51,7 +50,7 @@ func TestPackageReadList(t *testing.T) {
|
||||
t.Fatal("packageReadFn() returned error result")
|
||||
}
|
||||
|
||||
text := result.Content[0].(mcp.TextContent).Text
|
||||
text := result.Content[0].(*mcp.TextContent).Text
|
||||
var packages []map[string]any
|
||||
if err := json.Unmarshal([]byte(text), &packages); err != nil {
|
||||
t.Fatalf("failed to unmarshal result: %v", err)
|
||||
@@ -68,15 +67,14 @@ func TestPackageReadList(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("with type and query filters", func(t *testing.T) {
|
||||
req := mcp.CallToolRequest{}
|
||||
req.Params.Arguments = map[string]any{
|
||||
args := map[string]any{
|
||||
"method": "list",
|
||||
"owner": "test-org",
|
||||
"type": "container",
|
||||
"q": "myimage",
|
||||
}
|
||||
|
||||
_, err := packageReadFn(ctx, req)
|
||||
_, err := packageReadFn(ctx, args)
|
||||
if err != nil {
|
||||
t.Fatalf("packageReadFn() error: %v", err)
|
||||
}
|
||||
@@ -92,15 +90,14 @@ func TestPackageReadList(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("with pagination", func(t *testing.T) {
|
||||
req := mcp.CallToolRequest{}
|
||||
req.Params.Arguments = map[string]any{
|
||||
args := map[string]any{
|
||||
"method": "list",
|
||||
"owner": "test-org",
|
||||
"page": float64(2),
|
||||
"per_page": float64(10),
|
||||
}
|
||||
|
||||
_, err := packageReadFn(ctx, req)
|
||||
_, err := packageReadFn(ctx, args)
|
||||
if err != nil {
|
||||
t.Fatalf("packageReadFn() error: %v", err)
|
||||
}
|
||||
@@ -148,15 +145,14 @@ func TestPackageReadListVersions(t *testing.T) {
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.testName, func(t *testing.T) {
|
||||
req := mcp.CallToolRequest{}
|
||||
req.Params.Arguments = map[string]any{
|
||||
args := map[string]any{
|
||||
"method": "list_versions",
|
||||
"owner": "test-org",
|
||||
"type": "container",
|
||||
"name": tt.name,
|
||||
}
|
||||
|
||||
result, err := packageReadFn(ctx, req)
|
||||
result, err := packageReadFn(ctx, args)
|
||||
if err != nil {
|
||||
t.Fatalf("packageReadFn() error: %v", err)
|
||||
}
|
||||
@@ -171,7 +167,7 @@ func TestPackageReadListVersions(t *testing.T) {
|
||||
}
|
||||
mu.Unlock()
|
||||
|
||||
text := result.Content[0].(mcp.TextContent).Text
|
||||
text := result.Content[0].(*mcp.TextContent).Text
|
||||
var versions []map[string]any
|
||||
if err := json.Unmarshal([]byte(text), &versions); err != nil {
|
||||
t.Fatalf("failed to unmarshal result: %v", err)
|
||||
@@ -215,8 +211,7 @@ func TestPackageReadGet(t *testing.T) {
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.testName, func(t *testing.T) {
|
||||
req := mcp.CallToolRequest{}
|
||||
req.Params.Arguments = map[string]any{
|
||||
args := map[string]any{
|
||||
"method": "get",
|
||||
"owner": "test-org",
|
||||
"type": "container",
|
||||
@@ -224,7 +219,7 @@ func TestPackageReadGet(t *testing.T) {
|
||||
"version": "v1.0.0",
|
||||
}
|
||||
|
||||
result, err := packageReadFn(ctx, req)
|
||||
result, err := packageReadFn(ctx, args)
|
||||
if err != nil {
|
||||
t.Fatalf("packageReadFn() error: %v", err)
|
||||
}
|
||||
@@ -239,7 +234,7 @@ func TestPackageReadGet(t *testing.T) {
|
||||
}
|
||||
mu.Unlock()
|
||||
|
||||
text := result.Content[0].(mcp.TextContent).Text
|
||||
text := result.Content[0].(*mcp.TextContent).Text
|
||||
var pkg map[string]any
|
||||
if err := json.Unmarshal([]byte(text), &pkg); err != nil {
|
||||
t.Fatalf("failed to unmarshal result: %v", err)
|
||||
@@ -277,8 +272,7 @@ func TestPackageWriteDelete(t *testing.T) {
|
||||
|
||||
ctx := context.WithValue(context.Background(), mcpContext.TokenContextKey, "test-token")
|
||||
|
||||
req := mcp.CallToolRequest{}
|
||||
req.Params.Arguments = map[string]any{
|
||||
args := map[string]any{
|
||||
"method": "delete",
|
||||
"owner": "test-org",
|
||||
"type": "container",
|
||||
@@ -286,7 +280,7 @@ func TestPackageWriteDelete(t *testing.T) {
|
||||
"version": "v1.0.0",
|
||||
}
|
||||
|
||||
result, err := packageWriteFn(ctx, req)
|
||||
result, err := packageWriteFn(ctx, args)
|
||||
if err != nil {
|
||||
t.Fatalf("packageWriteFn() error: %v", err)
|
||||
}
|
||||
@@ -307,24 +301,22 @@ func TestPackageWriteDelete(t *testing.T) {
|
||||
|
||||
func TestPackageReadUnknownMethod(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
req := mcp.CallToolRequest{}
|
||||
req.Params.Arguments = map[string]any{
|
||||
args := map[string]any{
|
||||
"method": "bogus",
|
||||
"owner": "test-org",
|
||||
}
|
||||
if _, err := packageReadFn(ctx, req); err == nil {
|
||||
if _, err := packageReadFn(ctx, args); err == nil {
|
||||
t.Fatal("expected error for unknown method")
|
||||
}
|
||||
}
|
||||
|
||||
func TestPackageWriteUnknownMethod(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
req := mcp.CallToolRequest{}
|
||||
req.Params.Arguments = map[string]any{
|
||||
args := map[string]any{
|
||||
"method": "bogus",
|
||||
"owner": "test-org",
|
||||
}
|
||||
if _, err := packageWriteFn(ctx, req); err == nil {
|
||||
if _, err := packageWriteFn(ctx, args); err == nil {
|
||||
t.Fatal("expected error for unknown method")
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user