From 922c4572d602d87dc1a9d9660e2bd1850b35501b Mon Sep 17 00:00:00 2001
From: Bruce-Yii <298228875+Bruce-Yii@users.noreply.github.com>
Date: Mon, 7 Sep 2026 08:04:59 +0800
Subject: [PATCH] fix: include file body in get_file_contents text content

For text files the tool returned the body only inside the EmbeddedResource while TextContent carried just the SHA line, so client surfaces that drop embedded resources (e.g. Claude voice mode) left the model with no file content. Carry the body in TextContent as well; resource, order and schema unchanged. Binary, large-file, empty-file and symlink-metadata paths untouched.

Fixes #3189
---
 pkg/github/repositories.go                   |  9 ++-
 pkg/github/repositories_text_content_test.go | 77 ++++++++++++++++++++
 2 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 pkg/github/repositories_text_content_test.go

diff --git a/pkg/github/repositories.go b/pkg/github/repositories.go
index 8e2dd25172..914f1255b5 100644
--- a/pkg/github/repositories.go
+++ b/pkg/github/repositories.go
@@ -1157,7 +1157,14 @@ func GetFileContents(t translations.TranslationHelperFunc) inventory.ServerTool
 						Text:     string(contentBytes),
 						MIMEType: contentType,
 					}
-					message := fmt.Sprintf("successfully downloaded text file (SHA: %s)%s", fileSHA, successNote)
+					// Carry the body in the text content as well as the embedded
+					// resource. Client surfaces that drop embedded resources
+					// (e.g. Claude voice mode, issue #3189) would otherwise show
+					// only the SHA line while the model never sees the file. When
+					// read.Metadata != nil, repositoryReadMessage replaces the
+					// fallback with JSON metadata, which must stay parseable, so
+					// only plain files gain the inline body.
+					message := fmt.Sprintf("successfully downloaded text file (SHA: %s)%s\n\n%s", fileSHA, successNote, string(contentBytes))
 					message = repositoryReadMessage(read, message, successNote)
 					return attachIFC(utils.NewToolResultResource(message, result)), nil, nil
 				}
diff --git a/pkg/github/repositories_text_content_test.go b/pkg/github/repositories_text_content_test.go
new file mode 100644
index 0000000000..12a4c1975b
--- /dev/null
+++ b/pkg/github/repositories_text_content_test.go
@@ -0,0 +1,77 @@
+package github
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+	"net/url"
+	"testing"
+
+	"github.com/github/github-mcp-server/pkg/raw"
+	"github.com/github/github-mcp-server/pkg/translations"
+	"github.com/google/go-github/v89/github"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+// Regression test for https://github.com/github/github-mcp-server/issues/3189.
+//
+// get_file_contents returns text-file bodies ONLY inside an EmbeddedResource.
+// Client surfaces that drop embedded resources (e.g. Claude voice mode) then
+// show just "[non-text content: resource]" plus the short "successfully
+// downloaded text file (SHA: ...)" TextContent, so the model never sees the
+// file. The TextContent must also carry the file body.
+func Test_GetFileContents_TextContentIncludesFileBody(t *testing.T) {
+	t.Parallel()
+
+	fileBody := "# Test Repository\n\nThis is a test repository."
+	serverTool := GetFileContents(translations.NullTranslationHelper)
+
+	mockedClient := MockHTTPClientWithHandlers(map[string]http.HandlerFunc{
+		GetReposGitRefByOwnerByRepoByRef: mockResponse(t, http.StatusOK, "{\"ref\": \"refs/heads/main\", \"object\": {\"sha\": \"\"}}"),
+		GetReposByOwnerByRepo:            mockResponse(t, http.StatusOK, "{\"name\": \"repo\", \"default_branch\": \"main\"}"),
+		GetReposContentsByOwnerByRepoByPath: func(w http.ResponseWriter, _ *http.Request) {
+			w.WriteHeader(http.StatusOK)
+			fileContent := &github.RepositoryContent{
+				Name:    github.Ptr("README.md"),
+				Path:    github.Ptr("README.md"),
+				SHA:     github.Ptr(gitBlobSHA([]byte(fileBody))),
+				Type:    github.Ptr("file"),
+				Content: github.Ptr(fileBody),
+				Size:    github.Ptr(len(fileBody)),
+			}
+			contentBytes, _ := json.Marshal(fileContent)
+			_, _ = w.Write(contentBytes)
+		},
+	})
+
+	client := mustNewGHClient(t, mockedClient)
+	mockRawClient, err := raw.NewClient(client, &url.URL{Scheme: "https", Host: "raw.example.com", Path: "/"})
+	require.NoError(t, err)
+	deps := BaseDeps{Client: client, RawClient: mockRawClient}
+	handler := serverTool.Handler(deps)
+	request := createMCPRequest(map[string]any{
+		"owner": "owner",
+		"repo":  "repo",
+		"path":  "README.md",
+		"ref":   "refs/heads/main",
+	})
+
+	result, err := handler(ContextWithDeps(context.Background(), deps), &request)
+	require.NoError(t, err)
+	require.False(t, result.IsError)
+	require.Len(t, result.Content, 2)
+
+	// The embedded resource keeps carrying the full body (existing contract).
+	resource, ok := result.Content[1].(*mcp.EmbeddedResource)
+	require.True(t, ok, "expected Content[1] to be EmbeddedResource")
+	require.NotNil(t, resource.Resource)
+	assert.Equal(t, fileBody, resource.Resource.Text)
+
+	// The text content must ALSO carry the body so resource-dropping clients
+	// still expose the file to the model (issue #3189).
+	text, ok := result.Content[0].(*mcp.TextContent)
+	require.True(t, ok, "expected Content[0] to be TextContent")
+	assert.Contains(t, text.Text, fileBody)
+}