From 73263e74d08cc51ec6830632ad77465481abb801 Mon Sep 17 00:00:00 2001
From: Mutex <gitea314@libertyprime.org>
Date: Mon, 9 Mar 2026 13:07:27 +0000
Subject: [PATCH] http: set Content-Type for 202/204 streamable responses
 (#149)

Fixes: #148
Reviewed-on: https://gitea.com/gitea/gitea-mcp/pulls/149
Reviewed-by: silverwind <2021+silverwind@noreply.gitea.com>
Co-authored-by: Mutex <gitea314@libertyprime.org>
Co-committed-by: Mutex <gitea314@libertyprime.org>
---
 operation/operation.go                   | 28 ++++++++-
 operation/operation_http_headers_test.go | 77 ++++++++++++++++++++++++
 2 files changed, 102 insertions(+), 3 deletions(-)
 create mode 100644 operation/operation_http_headers_test.go

diff --git a/operation/operation.go b/operation/operation.go
index 8864101..75af00a 100644
--- a/operation/operation.go
+++ b/operation/operation.go
@@ -2,6 +2,7 @@ package operation
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net/http"
 	"os"
@@ -30,6 +31,23 @@ import (
 
 var mcpServer *server.MCPServer
 
+type noBodyContentTypeResponseWriter struct {
+	http.ResponseWriter
+}
+
+func (w *noBodyContentTypeResponseWriter) WriteHeader(statusCode int) {
+	if (statusCode == http.StatusAccepted || statusCode == http.StatusNoContent) && w.Header().Get("Content-Type") == "" {
+		w.Header().Set("Content-Type", "application/json")
+	}
+	w.ResponseWriter.WriteHeader(statusCode)
+}
+
+func withNoBodyContentType(handler http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		handler.ServeHTTP(&noBodyContentTypeResponseWriter{ResponseWriter: w}, r)
+	})
+}
+
 func RegisterTool(s *server.MCPServer) {
 	// User Tool
 	s.AddTools(user.Tool.Tools()...)
@@ -112,12 +130,16 @@ func Run() error {
 			return err
 		}
 	case "http":
-		httpServer := server.NewStreamableHTTPServer(
+		mux := http.NewServeMux()
+		httpServer := &http.Server{Handler: mux}
+		streamableHTTPServer := server.NewStreamableHTTPServer(
 			mcpServer,
 			server.WithLogger(log.New()),
 			server.WithHeartbeatInterval(30*time.Second),
 			server.WithHTTPContextFunc(getContextWithToken),
+			server.WithStreamableHTTPServer(httpServer),
 		)
+		mux.Handle("/mcp", withNoBodyContentType(streamableHTTPServer))
 		log.Infof("Gitea MCP HTTP server listening on :%d", flag.Port)
 
 		// Graceful shutdown setup
@@ -130,13 +152,13 @@ func Run() error {
 			log.Infof("Shutdown signal received, gracefully stopping HTTP server...")
 			shutdownCtx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 			defer cancel()
-			if err := httpServer.Shutdown(shutdownCtx); err != nil {
+			if err := streamableHTTPServer.Shutdown(shutdownCtx); err != nil {
 				log.Errorf("HTTP server shutdown error: %v", err)
 			}
 			close(shutdownDone)
 		}()
 
-		if err := httpServer.Start(fmt.Sprintf(":%d", flag.Port)); err != nil {
+		if err := streamableHTTPServer.Start(fmt.Sprintf(":%d", flag.Port)); err != nil && !errors.Is(err, http.ErrServerClosed) {
 			return err
 		}
 		<-shutdownDone // Wait for shutdown to finish
diff --git a/operation/operation_http_headers_test.go b/operation/operation_http_headers_test.go
new file mode 100644
index 0000000..2e7f0b6
--- /dev/null
+++ b/operation/operation_http_headers_test.go
@@ -0,0 +1,77 @@
+package operation
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+)
+
+func TestWithNoBodyContentTypeAddsContentTypeForAcceptedAndNoContent(t *testing.T) {
+	tests := []struct {
+		name   string
+		status int
+	}{
+		{
+			name:   "accepted",
+			status: http.StatusAccepted,
+		},
+		{
+			name:   "no_content",
+			status: http.StatusNoContent,
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			handler := withNoBodyContentType(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(tc.status)
+			}))
+
+			req := httptest.NewRequest(http.MethodPost, "/mcp", nil)
+			rr := httptest.NewRecorder()
+			handler.ServeHTTP(rr, req)
+
+			if rr.Code != tc.status {
+				t.Fatalf("expected status %d, got %d", tc.status, rr.Code)
+			}
+			if got := rr.Header().Get("Content-Type"); got != "application/json" {
+				t.Fatalf("expected Content-Type application/json, got %q", got)
+			}
+		})
+	}
+}
+
+func TestWithNoBodyContentTypePreservesExistingContentType(t *testing.T) {
+	handler := withNoBodyContentType(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Type", "text/plain")
+		w.WriteHeader(http.StatusAccepted)
+	}))
+
+	req := httptest.NewRequest(http.MethodPost, "/mcp", nil)
+	rr := httptest.NewRecorder()
+	handler.ServeHTTP(rr, req)
+
+	if rr.Code != http.StatusAccepted {
+		t.Fatalf("expected status %d, got %d", http.StatusAccepted, rr.Code)
+	}
+	if got := rr.Header().Get("Content-Type"); got != "text/plain" {
+		t.Fatalf("expected Content-Type text/plain, got %q", got)
+	}
+}
+
+func TestWithNoBodyContentTypeDoesNotModifyOtherStatusCodes(t *testing.T) {
+	handler := withNoBodyContentType(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusOK)
+	}))
+
+	req := httptest.NewRequest(http.MethodPost, "/mcp", nil)
+	rr := httptest.NewRecorder()
+	handler.ServeHTTP(rr, req)
+
+	if rr.Code != http.StatusOK {
+		t.Fatalf("expected status %d, got %d", http.StatusOK, rr.Code)
+	}
+	if got := rr.Header().Get("Content-Type"); got != "" {
+		t.Fatalf("expected empty Content-Type, got %q", got)
+	}
+}