mathiasandClaude Opus 4.8
93c32edbb5
Every caller (claude.ai connector, LLMs primed on gitea/GitHub) sends the repo identifier as `repo`, but the 33 per-repo identifier tools advertised `name`. The v0.2.8 shim aliased repo->name so it worked, yet the advertised inputSchema still said `name` — a misleading contract, with the shim load-bearing. - Flip all 33 identifier tools: schema property + required + struct field/tag from `name` to `repo`. A compliant `repo` caller now matches the struct directly; the shim is pure back-compat. - normalizeAliases is now bidirectional (name<->repo), so legacy `name` callers still resolve, and repo_create / create_project_from_template — whose `name` means "name of the NEW repo", not an existing-repo id — keep `name` and still accept `repo`. - `number`/`index` left as-is (out of scope; separate pre-existing quirk where pr_merge advertises `index` rather than `number`). - Tests: schema-canonical assertion + flipped alias round-trip (explicit `repo` wins over `name`). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
77 lines
1.8 KiB
Go
77 lines
1.8 KiB
Go
package tools
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
|
|
"gitea.d-ma.be/mathias/gitea-mcp/internal/allowlist"
|
|
"gitea.d-ma.be/mathias/gitea-mcp/internal/gitea"
|
|
"gitea.d-ma.be/mathias/gitea-mcp/internal/registry"
|
|
)
|
|
|
|
type PRMerge struct {
|
|
c *gitea.Client
|
|
a *allowlist.Allowlist
|
|
}
|
|
|
|
func NewPRMerge(c *gitea.Client, a *allowlist.Allowlist) *PRMerge {
|
|
return &PRMerge{c: c, a: a}
|
|
}
|
|
|
|
func (t *PRMerge) Descriptor() registry.ToolDescriptor {
|
|
return registry.ToolDescriptor{
|
|
Name: "pr_merge",
|
|
Description: "Merge a pull request. style: merge (default), squash, or rebase.",
|
|
InputSchema: json.RawMessage(`{
|
|
"type":"object",
|
|
"properties":{
|
|
"owner":{"type":"string"},
|
|
"repo":{"type":"string"},
|
|
"index":{"type":"integer","minimum":1},
|
|
"style":{"type":"string","enum":["merge","squash","rebase"]},
|
|
"merge_message_title":{"type":"string"},
|
|
"merge_message_field":{"type":"string"}
|
|
},
|
|
"required":["owner","repo","index"]
|
|
}`),
|
|
}
|
|
}
|
|
|
|
type prMergeArgs struct {
|
|
Owner string `json:"owner"`
|
|
Repo string `json:"repo"`
|
|
Index int `json:"index"`
|
|
Style string `json:"style"`
|
|
Title string `json:"merge_message_title"`
|
|
Body string `json:"merge_message_field"`
|
|
}
|
|
|
|
func (t *PRMerge) Call(ctx context.Context, raw json.RawMessage) (json.RawMessage, error) {
|
|
var args prMergeArgs
|
|
if err := parseArgs(raw, &args); err != nil {
|
|
return nil, err
|
|
}
|
|
if err := t.a.Check(args.Owner); err != nil {
|
|
return nil, err
|
|
}
|
|
if args.Index < 1 {
|
|
return nil, fmt.Errorf("index must be >= 1: %w", gitea.ErrValidation)
|
|
}
|
|
|
|
style := args.Style
|
|
if style == "" {
|
|
style = "merge"
|
|
}
|
|
|
|
if err := t.c.MergePullRequest(ctx, args.Owner, args.Repo, args.Index, gitea.MergePRArgs{
|
|
Do: style,
|
|
Title: args.Title,
|
|
Body: args.Body,
|
|
}); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return textOK(map[string]any{"merged": true})
|
|
}
|