371a06403a
Net **-650 LOC** by removing duplication and dead noise. All tests pass.
### Duplication & helpers
- Extracted shared slim helpers (`UserLogin`, `UserLogins`, `LabelNames`, `BodyWithAttachments`, `UserDetail`, `Repo`/`Repos`, `Label`/`Labels`) into `pkg/slim`. Deleted the 4 copies that lived in `issue/`, `pull/`, `search/`, `repo/` (plus duplicate `slimUserDetail`/`slimRepo`/`slimLabels` across packages).
- Added `params.GetOptionalBoolPtr` and `params.GetOptionalStringPtr`. Replaced 18 awkward `new(localVar); if !ok { = nil }` patterns across `repo/`, `pull/`, `issue/`, `label/`, `milestone/`, `search/`.
- Extracted `pullRequestReviewerFn` for the 99%-identical `createPullRequestReviewerFn`/`deletePullRequestReviewerFn` pair.
### Dead code & noise
- Deleted **122** `log.Debugf("Called X")` narration lines (`zap.AddCaller` already records the caller) and pruned 19 unused `log` imports.
- Removed the unused `log.Logger` wrapper; the mcp-go server now uses `log.Default().Sugar()` directly (matches `util.Logger`).
- Deleted dead `s.DeleteTools("")` — confirmed no-op in mcp-go.
- Stripped WHAT-narration comments per project guidance.
### Correctness & consistency
- Fixed `log.Errorf(err.Error())` format-string bug in `pkg/to/to.go` — a `%` in the error would have been interpreted as a directive.
- Standardized `to.TextResult`/`to.ErrorResult` usage; `release.go`, `tag.go`, `branch.go` were bypassing the helpers in 9 sites (skipping the wrapper's debug/error logging).
- Made `params.GetString` reject empty strings; dropped 21 redundant `err != nil || x == ""` checks in `operation/actions/`.
- Replaced raw `args["org"].(string)` in `ListOrgReposFn` with `params.GetString` to match the rest of the codebase.
### Performance
- **Cached `*gitea.Client` by host+token via `sync.Map`** + shared `*http.Transport` via `sync.Once` for both SDK and raw REST paths. Eliminates the SDK's `/api/v1/version` preflight on every tool call and enables connection keep-alive across requests.
- Gated `to.TextResult` debug log behind `flag.Debug` to skip the `string(bytes)` allocation when debug is off.
- Hoisted `8192` and `60s` magic numbers in `pkg/gitea/rest.go` into named constants.
---
This PR was written with the help of Claude Opus 4.7
---------
Co-authored-by: silverwind <silv3rwind@gmail.com>
Reviewed-on: https://gitea.com/gitea/gitea-mcp/pulls/195
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>
Co-committed-by: silverwind <me@silverwind.io>
179 lines
3.5 KiB
Go
179 lines
3.5 KiB
Go
package repo
|
|
|
|
import (
|
|
"gitea.com/gitea/gitea-mcp/pkg/slim"
|
|
|
|
gitea_sdk "code.gitea.io/sdk/gitea"
|
|
)
|
|
|
|
func slimBranch(b *gitea_sdk.Branch) map[string]any {
|
|
if b == nil {
|
|
return nil
|
|
}
|
|
m := map[string]any{
|
|
"name": b.Name,
|
|
"protected": b.Protected,
|
|
}
|
|
if b.Commit != nil {
|
|
m["commit_sha"] = b.Commit.ID
|
|
}
|
|
return m
|
|
}
|
|
|
|
func slimBranches(branches []*gitea_sdk.Branch) []map[string]any {
|
|
out := make([]map[string]any, 0, len(branches))
|
|
for _, b := range branches {
|
|
out = append(out, slimBranch(b))
|
|
}
|
|
return out
|
|
}
|
|
|
|
func slimCommit(c *gitea_sdk.Commit) map[string]any {
|
|
if c == nil {
|
|
return nil
|
|
}
|
|
m := map[string]any{
|
|
"sha": c.SHA,
|
|
"html_url": c.HTMLURL,
|
|
"created": c.Created,
|
|
}
|
|
if c.RepoCommit != nil {
|
|
m["message"] = c.RepoCommit.Message
|
|
if c.RepoCommit.Author != nil {
|
|
m["author"] = map[string]any{
|
|
"name": c.RepoCommit.Author.Name,
|
|
"email": c.RepoCommit.Author.Email,
|
|
"date": c.RepoCommit.Author.Date,
|
|
}
|
|
}
|
|
}
|
|
return m
|
|
}
|
|
|
|
func slimCommits(commits []*gitea_sdk.Commit) []map[string]any {
|
|
out := make([]map[string]any, 0, len(commits))
|
|
for _, c := range commits {
|
|
out = append(out, slimCommit(c))
|
|
}
|
|
return out
|
|
}
|
|
|
|
func slimTag(t *gitea_sdk.Tag) map[string]any {
|
|
if t == nil {
|
|
return nil
|
|
}
|
|
m := map[string]any{
|
|
"name": t.Name,
|
|
"message": t.Message,
|
|
}
|
|
if t.Commit != nil {
|
|
m["commit_sha"] = t.Commit.SHA
|
|
}
|
|
return m
|
|
}
|
|
|
|
func slimTags(tags []*gitea_sdk.Tag) []map[string]any {
|
|
out := make([]map[string]any, 0, len(tags))
|
|
for _, t := range tags {
|
|
m := map[string]any{
|
|
"name": t.Name,
|
|
}
|
|
if t.Commit != nil {
|
|
m["commit_sha"] = t.Commit.SHA
|
|
}
|
|
out = append(out, m)
|
|
}
|
|
return out
|
|
}
|
|
|
|
func slimRelease(r *gitea_sdk.Release) map[string]any {
|
|
if r == nil {
|
|
return nil
|
|
}
|
|
return map[string]any{
|
|
"id": r.ID,
|
|
"tag_name": r.TagName,
|
|
"target": r.Target,
|
|
"title": r.Title,
|
|
"body": r.Note,
|
|
"draft": r.IsDraft,
|
|
"prerelease": r.IsPrerelease,
|
|
"html_url": r.HTMLURL,
|
|
"author": slim.UserLogin(r.Publisher),
|
|
"created_at": r.CreatedAt,
|
|
"published_at": r.PublishedAt,
|
|
}
|
|
}
|
|
|
|
func slimReleases(releases []*gitea_sdk.Release) []map[string]any {
|
|
out := make([]map[string]any, 0, len(releases))
|
|
for _, r := range releases {
|
|
out = append(out, slimRelease(r))
|
|
}
|
|
return out
|
|
}
|
|
|
|
func slimContents(c *gitea_sdk.ContentsResponse) map[string]any {
|
|
if c == nil {
|
|
return nil
|
|
}
|
|
m := map[string]any{
|
|
"name": c.Name,
|
|
"path": c.Path,
|
|
"sha": c.SHA,
|
|
"type": c.Type,
|
|
"size": c.Size,
|
|
}
|
|
if c.Content != nil {
|
|
m["content"] = *c.Content
|
|
}
|
|
if c.Encoding != nil {
|
|
m["encoding"] = *c.Encoding
|
|
}
|
|
if c.HTMLURL != nil {
|
|
m["html_url"] = *c.HTMLURL
|
|
}
|
|
if c.DownloadURL != nil {
|
|
m["download_url"] = *c.DownloadURL
|
|
}
|
|
return m
|
|
}
|
|
|
|
func slimTree(t *gitea_sdk.GitTreeResponse) map[string]any {
|
|
if t == nil {
|
|
return nil
|
|
}
|
|
entries := make([]map[string]any, 0, len(t.Entries))
|
|
for _, e := range t.Entries {
|
|
entries = append(entries, map[string]any{
|
|
"path": e.Path,
|
|
"mode": e.Mode,
|
|
"type": e.Type,
|
|
"size": e.Size,
|
|
"sha": e.SHA,
|
|
})
|
|
}
|
|
return map[string]any{
|
|
"sha": t.SHA,
|
|
"truncated": t.Truncated,
|
|
"total_count": t.TotalCount,
|
|
"tree": entries,
|
|
}
|
|
}
|
|
|
|
func slimDirEntries(entries []*gitea_sdk.ContentsResponse) []map[string]any {
|
|
out := make([]map[string]any, 0, len(entries))
|
|
for _, c := range entries {
|
|
if c == nil {
|
|
continue
|
|
}
|
|
out = append(out, map[string]any{
|
|
"name": c.Name,
|
|
"path": c.Path,
|
|
"type": c.Type,
|
|
"size": c.Size,
|
|
})
|
|
}
|
|
return out
|
|
}
|