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/issue/issue.go

@@ -55,9 +55,9 @@ var (
 
 	IssueReadTool = tool.NewDefinition(
 		IssueReadToolName,
-		"Read issue: details, comments, labels, or the full discussion as Markdown.",
+		"Read issue: details, comments, or labels.",
 		annotation.ReadOnly("Read issue details"),
-		tool.String("method", tool.Required(), tool.Enum("get", "get_comments", "get_labels", "get_discussion_markdown")),
+		tool.String("method", tool.Required(), tool.Enum("get", "get_comments", "get_labels")),
 		tool.String("owner", tool.Required(), tool.Description(params.OwnerDesc)),
 		tool.String("repo", tool.Required(), tool.Description(params.RepoDesc)),
 		tool.Number("issue_number", tool.Required()),
@@ -112,8 +112,6 @@ func issueReadFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult,
 		return getIssueCommentsByIndexFn(ctx, args)
 	case "get_labels":
 		return getIssueLabelsFn(ctx, args)
-	case "get_discussion_markdown":
-		return getIssueDiscussionMarkdownFn(ctx, args)
 	default:
 		return to.ErrorResult(fmt.Errorf("unknown method: %s", method))
 	}
@@ -400,54 +398,6 @@ func getIssueCommentsByIndexFn(ctx context.Context, args map[string]any) (*mcp.C
 	return to.TextResult(out)
 }
 
-func getIssueDiscussionMarkdownFn(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, "issue_number")
-	if err != nil {
-		return to.ErrorResult(err)
-	}
-
-	var issue issueWithAssets
-	issuePath := fmt.Sprintf("repos/%s/%s/issues/%d", url.PathEscape(owner), url.PathEscape(repo), index)
-	if _, err := gitea.DoJSON(ctx, "GET", issuePath, nil, nil, &issue); err != nil {
-		return to.ErrorResult(fmt.Errorf("get %v/%v/issue/%v err: %v", owner, repo, index, err))
-	}
-
-	var comments []commentWithAssets
-	commentsPath := fmt.Sprintf("repos/%s/%s/issues/%d/comments", url.PathEscape(owner), url.PathEscape(repo), index)
-	if _, err := gitea.DoJSON(ctx, "GET", commentsPath, nil, nil, &comments); err != nil {
-		return to.ErrorResult(fmt.Errorf("get %v/%v/issues/%v/comments err: %v", owner, repo, index, err))
-	}
-
-	discComments := make([]discussionComment, 0, len(comments))
-	for i := range comments {
-		discComments = append(discComments, discussionComment{
-			Author:    slim.UserLogin(comments[i].Poster),
-			CreatedAt: comments[i].Created,
-			Body:      slim.BodyWithAttachments(comments[i].Body, comments[i].Assets),
-		})
-	}
-
-	md := formatDiscussionMarkdown(discussionIssue{
-		Number:    issue.Index,
-		Title:     issue.Title,
-		Author:    slim.UserLogin(issue.Poster),
-		State:     string(issue.State),
-		Labels:    slim.LabelNames(issue.Labels),
-		Body:      slim.BodyWithAttachments(issue.Body, issue.Assets),
-		CreatedAt: issue.Created,
-	}, discComments)
-
-	return to.RawTextResult(md)
-}
-
 func getIssueLabelsFn(ctx context.Context, args map[string]any) (*mcp.CallToolResult, error) {
 	owner, err := params.GetString(args, "owner")
 	if err != nil {

operation/issue/issue_test.go

@@ -266,119 +266,6 @@ func Test_getIssueByIndexFn_includesAttachments(t *testing.T) {
 	}
 }
 
-func Test_getIssueDiscussionMarkdownFn(t *testing.T) {
-	const (
-		owner = "octo"
-		repo  = "demo"
-	)
-
-	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		switch r.URL.Path {
-		case "/api/v1/version":
-			w.Header().Set("Content-Type", "application/json")
-			_, _ = w.Write([]byte(`{"version":"1.12.0"}`))
-		case fmt.Sprintf("/api/v1/repos/%s/%s/issues/42", owner, repo):
-			w.Header().Set("Content-Type", "application/json")
-			_, _ = w.Write([]byte(`{
-				"number": 42,
-				"title": "bug with screenshot",
-				"body": "see attached",
-				"state": "open",
-				"user": {"login": "octocat"},
-				"labels": [{"name": "bug"}],
-				"created_at": "2026-01-02T15:04:05Z",
-				"assets": [
-					{"id": 1, "name": "shot.png", "size": 1024, "browser_download_url": "https://example/shot.png"}
-				]
-			}`))
-		case fmt.Sprintf("/api/v1/repos/%s/%s/issues/42/comments", owner, repo):
-			w.Header().Set("Content-Type", "application/json")
-			_, _ = w.Write([]byte(`[
-				{"id": 1, "body": "see this", "user": {"login": "reviewer"}, "created_at": "2026-01-03T09:00:00Z", "assets": [
-					{"id": 9, "name": "log.txt", "size": 200, "browser_download_url": "https://example/log.txt"}
-				]}
-			]`))
-		default:
-			http.NotFound(w, r)
-		}
-	})
-	server := httptest.NewServer(handler)
-	defer server.Close()
-
-	origHost, origToken, origVersion := flag.Host, flag.Token, flag.Version
-	flag.Host, flag.Token, flag.Version = server.URL, "", "test"
-	defer func() { flag.Host, flag.Token, flag.Version = origHost, origToken, origVersion }()
-
-	args := map[string]any{
-		"owner": owner, "repo": repo, "issue_number": float64(42),
-	}
-	res, err := getIssueDiscussionMarkdownFn(context.Background(), args)
-	if err != nil {
-		t.Fatalf("getIssueDiscussionMarkdownFn() error = %v", err)
-	}
-	if res.IsError {
-		t.Fatalf("unexpected error result: %v", res.Content)
-	}
-	body := res.Content[0].(*mcp.TextContent).Text
-	for _, want := range []string{
-		"# bug with screenshot (#42)",
-		"**Author:** octocat",
-		"**State:** open",
-		"**Labels:** bug",
-		"[shot.png](https://example/shot.png)",
-		"### reviewer on 2026-01-03T09:00:00Z",
-		"[log.txt](https://example/log.txt)",
-	} {
-		if !strings.Contains(body, want) {
-			t.Fatalf("expected markdown to contain %q, got:\n%s", want, body)
-		}
-	}
-}
-
-func Test_getIssueDiscussionMarkdownFn_noComments(t *testing.T) {
-	const (
-		owner = "octo"
-		repo  = "demo"
-	)
-
-	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		switch r.URL.Path {
-		case "/api/v1/version":
-			w.Header().Set("Content-Type", "application/json")
-			_, _ = w.Write([]byte(`{"version":"1.12.0"}`))
-		case fmt.Sprintf("/api/v1/repos/%s/%s/issues/7", owner, repo):
-			w.Header().Set("Content-Type", "application/json")
-			_, _ = w.Write([]byte(`{"number": 7, "title": "quiet issue", "state": "open", "user": {"login": "octocat"}}`))
-		case fmt.Sprintf("/api/v1/repos/%s/%s/issues/7/comments", owner, repo):
-			w.Header().Set("Content-Type", "application/json")
-			_, _ = w.Write([]byte(`[]`))
-		default:
-			http.NotFound(w, r)
-		}
-	})
-	server := httptest.NewServer(handler)
-	defer server.Close()
-
-	origHost, origToken, origVersion := flag.Host, flag.Token, flag.Version
-	flag.Host, flag.Token, flag.Version = server.URL, "", "test"
-	defer func() { flag.Host, flag.Token, flag.Version = origHost, origToken, origVersion }()
-
-	args := map[string]any{
-		"owner": owner, "repo": repo, "issue_number": float64(7),
-	}
-	res, err := getIssueDiscussionMarkdownFn(context.Background(), args)
-	if err != nil {
-		t.Fatalf("getIssueDiscussionMarkdownFn() error = %v", err)
-	}
-	if res.IsError {
-		t.Fatalf("unexpected error result: %v", res.Content)
-	}
-	body := res.Content[0].(*mcp.TextContent).Text
-	if !strings.Contains(body, "_No comments yet._") {
-		t.Fatalf("expected placeholder for no comments, got:\n%s", body)
-	}
-}
-
 func Test_getIssueCommentsByIndexFn_includesAttachments(t *testing.T) {
 	const (
 		owner = "octo"

operation/issue/markdown.go

@@ -1,63 +0,0 @@
-package issue
-
-import (
-	"fmt"
-	"strings"
-	"time"
-)
-
-type discussionIssue struct {
-	Number    int64
-	Title     string
-	Author    string
-	State     string
-	Labels    []string
-	Body      string
-	CreatedAt time.Time
-}
-
-type discussionComment struct {
-	Author    string
-	CreatedAt time.Time
-	Body      string
-}
-
-// formatDiscussionMarkdown renders an issue and its comments as a single
-// Markdown document suitable for display without further parsing.
-func formatDiscussionMarkdown(issue discussionIssue, comments []discussionComment) string {
-	var b strings.Builder
-
-	fmt.Fprintf(&b, "# %s (#%d)\n\n", issue.Title, issue.Number)
-	fmt.Fprintf(&b, "**Author:** %s\n", issue.Author)
-	fmt.Fprintf(&b, "**State:** %s\n", issue.State)
-	if len(issue.Labels) > 0 {
-		fmt.Fprintf(&b, "**Labels:** %s\n", strings.Join(issue.Labels, ", "))
-	}
-	if !issue.CreatedAt.IsZero() {
-		fmt.Fprintf(&b, "**Created:** %s\n", issue.CreatedAt.UTC().Format(time.RFC3339))
-	}
-	b.WriteString("\n")
-	b.WriteString(strings.TrimSpace(issue.Body))
-	b.WriteString("\n\n---\n\n## Comments\n\n")
-
-	if len(comments) == 0 {
-		b.WriteString("_No comments yet._\n")
-		return b.String()
-	}
-
-	for i, c := range comments {
-		fmt.Fprintf(&b, "### %s", c.Author)
-		if !c.CreatedAt.IsZero() {
-			fmt.Fprintf(&b, " on %s", c.CreatedAt.UTC().Format(time.RFC3339))
-		}
-		b.WriteString("\n\n")
-		b.WriteString(strings.TrimSpace(c.Body))
-		if i < len(comments)-1 {
-			b.WriteString("\n\n---\n\n")
-		} else {
-			b.WriteString("\n")
-		}
-	}
-
-	return b.String()
-}

operation/issue/markdown_test.go

@@ -1,85 +0,0 @@
-package issue
-
-import (
-	"strings"
-	"testing"
-	"time"
-)
-
-func Test_formatDiscussionMarkdown_includesIssueAndComments(t *testing.T) {
-	created := time.Date(2026, 1, 2, 15, 4, 5, 0, time.UTC)
-	commentTime := time.Date(2026, 1, 3, 9, 0, 0, 0, time.UTC)
-	md := formatDiscussionMarkdown(
-		discussionIssue{
-			Number:    42,
-			Title:     "bug with screenshot",
-			Author:    "octocat",
-			State:     "open",
-			Labels:    []string{"bug", "help wanted"},
-			Body:      "see attached",
-			CreatedAt: created,
-		},
-		[]discussionComment{
-			{Author: "reviewer", CreatedAt: commentTime, Body: "thanks for reporting"},
-		},
-	)
-
-	wantSubstrings := []string{
-		"# bug with screenshot (#42)",
-		"**Author:** octocat",
-		"**State:** open",
-		"**Labels:** bug, help wanted",
-		"**Created:** 2026-01-02T15:04:05Z",
-		"see attached",
-		"## Comments",
-		"### reviewer",
-		"2026-01-03T09:00:00Z",
-		"thanks for reporting",
-	}
-	for _, want := range wantSubstrings {
-		if !strings.Contains(md, want) {
-			t.Fatalf("expected markdown to contain %q, got:\n%s", want, md)
-		}
-	}
-}
-
-func Test_formatDiscussionMarkdown_noComments(t *testing.T) {
-	md := formatDiscussionMarkdown(
-		discussionIssue{
-			Number: 1,
-			Title:  "no comments yet",
-			Author: "octocat",
-			State:  "open",
-		},
-		nil,
-	)
-
-	if !strings.Contains(md, "## Comments") {
-		t.Fatalf("expected a Comments section, got:\n%s", md)
-	}
-	if !strings.Contains(md, "_No comments yet._") {
-		t.Fatalf("expected placeholder for no comments, got:\n%s", md)
-	}
-}
-
-func Test_formatDiscussionMarkdown_attachmentBodyIsInlined(t *testing.T) {
-	md := formatDiscussionMarkdown(
-		discussionIssue{
-			Number: 7,
-			Title:  "with attachment",
-			Author: "octocat",
-			State:  "open",
-			Body:   "see attached\n\n[shot.png](https://example/shot.png)",
-		},
-		[]discussionComment{
-			{Author: "reviewer", Body: "log attached\n\n[log.txt](https://example/log.txt)"},
-		},
-	)
-
-	if !strings.Contains(md, "[shot.png](https://example/shot.png)") {
-		t.Fatalf("expected issue attachment link in markdown, got:\n%s", md)
-	}
-	if !strings.Contains(md, "[log.txt](https://example/log.txt)") {
-		t.Fatalf("expected comment attachment link in markdown, got:\n%s", md)
-	}
-}

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,
+	}
+}

pkg/to/to.go

@@ -23,17 +23,6 @@ func TextResult(v any) (*mcp.CallToolResult, error) {
 	}, nil
 }
 
-// RawTextResult returns text as-is, without JSON-encoding it. Use it for
-// content that is already meant to be read directly, such as Markdown.
-func RawTextResult(text string) (*mcp.CallToolResult, error) {
-	if flag.Debug {
-		log.Debugf("Text Result: %s", text)
-	}
-	return &mcp.CallToolResult{
-		Content: []mcp.Content{&mcp.TextContent{Text: text}},
-	}, nil
-}
-
 func ErrorResult(err error) (*mcp.CallToolResult, error) {
 	log.Errorf("%s", err.Error())
 	var result mcp.CallToolResult