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>
83 lines
2.3 KiB
Go
83 lines
2.3 KiB
Go
package tools
|
|
|
|
import (
|
|
"encoding/json"
|
|
"strings"
|
|
|
|
"gitea.d-ma.be/mathias/gitea-mcp/internal/registry"
|
|
)
|
|
|
|
// Tool implements registry.Tool.
|
|
type Tool = registry.Tool
|
|
|
|
func textOK(v any) (json.RawMessage, error) {
|
|
return json.Marshal(v)
|
|
}
|
|
|
|
func parseArgs(raw json.RawMessage, dst any) error {
|
|
if len(raw) == 0 {
|
|
return json.Unmarshal([]byte("{}"), dst)
|
|
}
|
|
return json.Unmarshal(normalizeAliases(raw), dst)
|
|
}
|
|
|
|
// normalizeAliases reconciles the two spellings of the repo identifier so a tool
|
|
// works whichever the caller sends. `repo` is the canonical, idiomatic name that
|
|
// identifier tools now advertise (#38); `name` is kept as a back-compat alias.
|
|
// The mapping is bidirectional: `name`->`repo` fills the new canonical for old
|
|
// callers, and `repo`->`name` still fills the two create tools (repo_create,
|
|
// create_project_from_template) whose `name` legitimately means "name of the new
|
|
// repo". `index`->`number` is kept for the issue tools whose canonical is
|
|
// `number`. An explicit canonical value always wins over its alias.
|
|
func normalizeAliases(raw json.RawMessage) json.RawMessage {
|
|
var m map[string]json.RawMessage
|
|
if err := json.Unmarshal(raw, &m); err != nil {
|
|
return raw // not a JSON object — leave untouched
|
|
}
|
|
changed := aliasInto(m, "name", "repo")
|
|
changed = aliasInto(m, "repo", "name") || changed
|
|
changed = aliasInto(m, "number", "index") || changed
|
|
if !changed {
|
|
return raw
|
|
}
|
|
if patched, err := json.Marshal(m); err == nil {
|
|
return patched
|
|
}
|
|
return raw
|
|
}
|
|
|
|
// aliasInto copies m[alias] into m[canonical] when canonical is absent or an
|
|
// empty/zero JSON value and alias carries a usable one. An explicit canonical
|
|
// value always wins. Returns true if it wrote canonical.
|
|
func aliasInto(m map[string]json.RawMessage, canonical, alias string) bool {
|
|
av, ok := m[alias]
|
|
if !ok || isEmptyJSON(av) {
|
|
return false
|
|
}
|
|
if cv, ok := m[canonical]; ok && !isEmptyJSON(cv) {
|
|
return false
|
|
}
|
|
m[canonical] = av
|
|
return true
|
|
}
|
|
|
|
func isEmptyJSON(v json.RawMessage) bool {
|
|
switch strings.TrimSpace(string(v)) {
|
|
case "", `""`, "null", "0":
|
|
return true
|
|
default:
|
|
return false
|
|
}
|
|
}
|
|
|
|
// capLimit returns a sane page size: 0 or negative → def, > 50 → 50.
|
|
func capLimit(in, def int) int {
|
|
if in <= 0 {
|
|
return def
|
|
}
|
|
if in > 50 {
|
|
return 50
|
|
}
|
|
return in
|
|
}
|