feat(pull): add get_comments method to pull_request_read

List regular PR discussion comments via the issue comments endpoint,
since Gitea pull requests are issues internally. Reuses the issue
package's slim comment shape with attachment inlining.

Co-Authored-By: Codet <codet@commitgo.dev> (GPT-5-Codex)

operation/actions/pr_runs_test.go

@@ -1,98 +0,0 @@
-package actions
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"testing"
-
-	"gitea.com/gitea/gitea-mcp/pkg/flag"
-
-	"github.com/modelcontextprotocol/go-sdk/mcp"
-)
-
-func Test_listPullRequestActionRunsFn(t *testing.T) {
-	const (
-		owner      = "octo"
-		repo       = "demo"
-		pullNumber = 42
-		headSHA    = "abc123"
-	)
-
-	var gotRunsQuery string
-
-	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		switch r.URL.Path {
-		case fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d", owner, repo, pullNumber):
-			w.Header().Set("Content-Type", "application/json")
-			_, _ = w.Write(fmt.Appendf(nil, `{"number":%d,"head":{"sha":"%s"}}`, pullNumber, headSHA))
-		case fmt.Sprintf("/api/v1/repos/%s/%s/actions/runs", owner, repo):
-			gotRunsQuery = r.URL.RawQuery
-			w.Header().Set("Content-Type", "application/json")
-			_, _ = w.Write([]byte(`{"total_count":1,"workflow_runs":[{"id":9,"name":"CI","status":"success"}]}`))
-		default:
-			http.NotFound(w, r)
-		}
-	})
-
-	server := httptest.NewServer(handler)
-	defer server.Close()
-
-	origHost := flag.Host
-	origToken := flag.Token
-	flag.Host = server.URL
-	flag.Token = ""
-	defer func() {
-		flag.Host = origHost
-		flag.Token = origToken
-	}()
-
-	args := map[string]any{
-		"owner":       owner,
-		"repo":        repo,
-		"pull_number": float64(pullNumber),
-	}
-
-	result, err := listPullRequestActionRunsFn(context.Background(), args)
-	if err != nil {
-		t.Fatalf("listPullRequestActionRunsFn() error = %v", err)
-	}
-	if result.IsError {
-		t.Fatalf("listPullRequestActionRunsFn() returned error result: %+v", result)
-	}
-
-	if gotRunsQuery == "" {
-		t.Fatalf("expected actions/runs to be called")
-	}
-	values, err := url.ParseQuery(gotRunsQuery)
-	if err != nil {
-		t.Fatalf("parse actions/runs query: %v", err)
-	}
-	if got := values.Get("head_sha"); got != headSHA {
-		t.Fatalf("actions/runs head_sha = %q, want %q", got, headSHA)
-	}
-
-	if len(result.Content) == 0 {
-		t.Fatalf("expected content in result")
-	}
-	textContent, ok := result.Content[0].(*mcp.TextContent)
-	if !ok {
-		t.Fatalf("expected text content, got %T", result.Content[0])
-	}
-
-	var parsed struct {
-		WorkflowRuns []map[string]any `json:"workflow_runs"`
-	}
-	if err := json.Unmarshal([]byte(textContent.Text), &parsed); err != nil {
-		t.Fatalf("unmarshal result text: %v", err)
-	}
-	if len(parsed.WorkflowRuns) != 1 {
-		t.Fatalf("expected 1 run, got %d", len(parsed.WorkflowRuns))
-	}
-	if got := parsed.WorkflowRuns[0]["name"]; got != "CI" {
-		t.Fatalf("run name = %v, want %q", got, "CI")
-	}
-}

operation/actions/runs.go

@@ -29,16 +29,15 @@ var (
 		ActionsRunReadToolName,
 		"Read Actions workflows, runs, jobs, logs, and artifacts.",
 		annotation.ReadOnly("Read Actions workflow, run, job, and artifact data"),
-		tool.String("method", tool.Required(), tool.Enum("list_workflows", "get_workflow", "list_runs", "get_run", "list_pr_runs", "list_jobs", "list_run_jobs", "get_job", "get_job_log_preview", "download_job_log", "list_artifacts", "list_run_artifacts", "get_artifact", "download_artifact")),
+		tool.String("method", tool.Required(), tool.Enum("list_workflows", "get_workflow", "list_runs", "get_run", "list_jobs", "list_run_jobs", "get_job", "get_job_log_preview", "download_job_log", "list_artifacts", "list_run_artifacts", "get_artifact", "download_artifact")),
 		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
 		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
 		tool.String("workflow_id", tool.Description("ID or filename (for 'get_workflow')")),
 		tool.Number("run_id", tool.Description("for 'get_run'/'list_run_jobs'/'list_run_artifacts'")),
-		tool.Number("pull_number", tool.Description("pull request number (for 'list_pr_runs')")),
 		tool.Number("job_id", tool.Description("for 'get_job'/log methods")),
 		tool.Number("artifact_id", tool.Description("for 'get_artifact'/'download_artifact'")),
 		tool.String("artifact_name", tool.Description("name filter for 'list_artifacts'/'list_run_artifacts'")),
-		tool.String("status", tool.Description("filter for 'list_runs'/'list_pr_runs'/'list_jobs'")),
+		tool.String("status", tool.Description("filter for 'list_runs'/'list_jobs'")),
 		tool.Number("tail_lines", tool.Description("log tail lines"), tool.Default(200), tool.Minimum(1)),
 		tool.Number("max_bytes", tool.Description("max log bytes"), tool.Default(65536), tool.Minimum(1024)),
 		tool.String("output_path", tool.Description("for 'download_job_log'/'download_artifact'")),
@@ -79,8 +78,6 @@ func runReadFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, e
 		return listRepoActionRunsFn(ctx, args)
 	case "get_run":
 		return getRepoActionRunFn(ctx, args)
-	case "list_pr_runs":
-		return listPullRequestActionRunsFn(ctx, args)
 	case "list_jobs":
 		return listRepoActionJobsFn(ctx, args)
 	case "list_run_jobs":
@@ -300,61 +297,6 @@ func getRepoActionRunFn(ctx context.Context, args map[string]any) (*mcp.CallTool
 	return to.TextResult(slimActionRun(result))
 }
 
-func listPullRequestActionRunsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
-	owner, err := params.GetString(args, "owner")
-	if err != nil {
-		return to.ErrorResult(err)
-	}
-	repo, err := params.GetString(args, "repo")
-	if err != nil {
-		return to.ErrorResult(err)
-	}
-	pullNumber, err := params.GetIndex(args, "pull_number")
-	if err != nil || pullNumber <= 0 {
-		return to.ErrorResult(errors.New("pull_number is required"))
-	}
-	page, pageSize := params.GetPagination(args, 30)
-	statusFilter, _ := args["status"].(string)
-
-	var pull struct {
-		Head struct {
-			SHA string `json:"sha"`
-		} `json:"head"`
-	}
-	err = doJSONWithFallback(ctx, "GET",
-		[]string{
-			fmt.Sprintf("repos/%s/%s/pulls/%d", url.PathEscape(owner), url.PathEscape(repo), pullNumber),
-		},
-		nil, nil, &pull,
-	)
-	if err != nil {
-		return to.ErrorResult(fmt.Errorf("get pull request err: %v", err))
-	}
-	if pull.Head.SHA == "" {
-		return to.ErrorResult(fmt.Errorf("pull request %d has no head sha", pullNumber))
-	}
-
-	query := url.Values{}
-	query.Set("head_sha", pull.Head.SHA)
-	query.Set("page", strconv.Itoa(page))
-	query.Set("limit", strconv.Itoa(pageSize))
-	if statusFilter != "" {
-		query.Set("status", statusFilter)
-	}
-
-	var result any
-	err = doJSONWithFallback(ctx, "GET",
-		[]string{
-			fmt.Sprintf("repos/%s/%s/actions/runs", url.PathEscape(owner), url.PathEscape(repo)),
-		},
-		query, nil, &result,
-	)
-	if err != nil {
-		return to.ErrorResult(fmt.Errorf("list pull request action runs err: %v", err))
-	}
-	return to.TextResult(slimActionRuns(result))
-}
-
 func cancelRepoActionRunFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
 	owner, err := params.GetString(args, "owner")
 	if err != nil {

operation/pull/pull.go

@@ -20,6 +20,13 @@ import (
 
 var Tool = tool.New("pull_request")
 
+// commentWithAssets wraps the SDK Comment to capture the `assets` field that
+// the SDK currently drops on the issue comments endpoint.
+type commentWithAssets struct {
+	gitea_sdk.Comment
+	Assets []*gitea_sdk.Attachment `json:"assets"`
+}
+
 const (
 	ListRepoPullRequestsToolName   = "list_pull_requests"
 	PullRequestReadToolName        = "pull_request_read"
@@ -43,9 +50,9 @@ var (
 
 	PullRequestReadTool = tool.NewDefinition(
 		PullRequestReadToolName,
-		"Read pull request: details, diff, changed files, head commit status, reviews, review comments.",
+		"Read pull request: details, diff, changed files, head commit status, reviews, review comments, discussion comments.",
 		annotation.ReadOnly("Read pull request details"),
-		tool.String("method", tool.Required(), tool.Enum("get", "get_diff", "get_files", "get_status", "get_reviews", "get_review", "get_review_comments")),
+		tool.String("method", tool.Required(), tool.Enum("get", "get_diff", "get_files", "get_status", "get_reviews", "get_review", "get_review_comments", "get_comments")),
 		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
 		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
 		tool.Number("pull_number", tool.Required()),
@@ -151,6 +158,8 @@ func pullRequestReadFn(ctx context.Context, args map[string]any) (*mcp.CallToolR
 		return getPullRequestReviewFn(ctx, args)
 	case "get_review_comments":
 		return listPullRequestReviewCommentsFn(ctx, args)
+	case "get_comments":
+		return listPullRequestCommentsFn(ctx, args)
 	default:
 		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
 	}
@@ -603,6 +612,36 @@ func listPullRequestReviewCommentsFn(ctx context.Context, args map[string]any) (
 	return to.TextResult(slimReviewComments(comments))
 }
 
+func listPullRequestCommentsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
+	owner, err := params.GetString(args, "owner")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	repo, err := params.GetString(args, "repo")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+	index, err := params.GetIndex(args, "pull_number")
+	if err != nil {
+		return to.ErrorResult(err)
+	}
+
+	// PRs are issues internally, so the regular discussion comments live on
+	// the issue comments endpoint rather than a pull-specific one.
+	var comments []commentWithAssets
+	path := fmt.Sprintf("repos/%s/%s/issues/%d/comments", url.PathEscape(owner), url.PathEscape(repo), index)
+	if _, err := gitea.DoJSON(ctx, "GET", path, nil, nil, &comments); err != nil {
+		return to.ErrorResult(fmt.Errorf("get %v/%v/pr/%v comments err: %v", owner, repo, index, err))
+	}
+	out := make([]map[string]any, 0, len(comments))
+	for i := range comments {
+		m := slimComment(&comments[i].Comment)
+		m["body"] = slim.BodyWithAttachments(comments[i].Body, comments[i].Assets)
+		out = append(out, m)
+	}
+	return to.TextResult(out)
+}
+
 func createPullRequestReviewFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
 	owner, err := params.GetString(args, "owner")
 	if err != nil {

operation/pull/pull_test.go

@@ -943,6 +943,91 @@ func Test_closePullRequestFn(t *testing.T) {
 	}
 }
 
+func Test_listPullRequestCommentsFn_missingArgs(t *testing.T) {
+	result, err := listPullRequestCommentsFn(context.Background(), map[string]any{
+		"owner": "octo",
+		"repo":  "demo",
+	})
+	if err != nil {
+		t.Fatalf("listPullRequestCommentsFn() error = %v", err)
+	}
+	if result == nil || !result.IsError {
+		t.Fatalf("listPullRequestCommentsFn() result = %#v, want an error result for missing pull_number", result)
+	}
+}
+
+func Test_listPullRequestCommentsFn_apiError(t *testing.T) {
+	const (
+		owner = "octo"
+		repo  = "demo"
+		index = 7
+	)
+
+	serveStub(t, func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path != fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/comments", owner, repo, index) {
+			t.Errorf("unexpected request: %s %s", r.Method, r.URL.Path)
+			w.WriteHeader(http.StatusNotFound)
+			return
+		}
+		http.Error(w, "boom", http.StatusInternalServerError)
+	})
+
+	args := map[string]any{
+		"owner": owner, "repo": repo, "pull_number": float64(index),
+	}
+	result, err := listPullRequestCommentsFn(context.Background(), args)
+	if err != nil {
+		t.Fatalf("listPullRequestCommentsFn() error = %v", err)
+	}
+	if result == nil || !result.IsError {
+		t.Fatalf("listPullRequestCommentsFn() result = %#v, want an error result on API failure", result)
+	}
+}
+
+func Test_listPullRequestCommentsFn_decodesComments(t *testing.T) {
+	const (
+		owner = "octo"
+		repo  = "demo"
+		index = 7
+	)
+
+	serveStub(t, func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path != fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/comments", owner, repo, index) {
+			t.Errorf("unexpected request: %s %s", r.Method, r.URL.Path)
+			w.WriteHeader(http.StatusNotFound)
+			return
+		}
+		w.Header().Set("Content-Type", "application/json")
+		_, _ = w.Write([]byte(`[
+			{"id": 1, "body": "see this", "assets": [
+				{"id": 9, "name": "log.txt", "size": 200, "browser_download_url": "https://example/log.txt"}
+			]},
+			{"id": 2, "body": "no attachment", "assets": []}
+		]`))
+	})
+
+	args := map[string]any{
+		"method": "get_comments", "owner": owner, "repo": repo, "pull_number": float64(index),
+	}
+	result, err := pullRequestReadFn(context.Background(), args)
+	if err != nil {
+		t.Fatalf("pullRequestReadFn() error = %v", err)
+	}
+	if result.IsError {
+		t.Fatalf("unexpected error result: %v", result.Content)
+	}
+	body := result.Content[0].(*mcp.TextContent).Text
+	if !strings.Contains(body, `[log.txt](https://example/log.txt)`) {
+		t.Fatalf("expected attachment markdown inlined in body, got: %s", body)
+	}
+	if !strings.Contains(body, `"no attachment"`) {
+		t.Fatalf("expected second comment body preserved, got: %s", body)
+	}
+	if strings.Contains(body, `"assets"`) {
+		t.Fatalf("assets should be inlined into body, not a separate field: %s", body)
+	}
+}
+
 func Test_reopenPullRequestFn(t *testing.T) {
 	const (
 		owner = "octo"

operation/pull/slim.go

@@ -164,3 +164,17 @@ func slimReviewComments(comments []*gitea_sdk.PullReviewComment) []map[string]an
 	}
 	return out
 }
+
+func slimComment(c *gitea_sdk.Comment) map[string]any {
+	if c == nil {
+		return nil
+	}
+	return map[string]any{
+		"id":         c.ID,
+		"body":       c.Body,
+		"user":       slim.UserLogin(c.Poster),
+		"html_url":   c.HTMLURL,
+		"created_at": c.Created,
+		"updated_at": c.Updated,
+	}
+}