From 73f1575358637ee8509cbef53eb60ffc4fdd6eef Mon Sep 17 00:00:00 2001
From: Khanh Dinh Nguyen <77538987+beiryu@users.noreply.github.com>
Date: Fri, 16 Oct 2026 10:32:34 +0700
Subject: [PATCH] mcp: detach SSE client event stream from the Connect context

Fixes #1331
---
 mcp/sse.go      | 20 +++++++++++++++++++-
 mcp/sse_test.go | 23 +++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/mcp/sse.go b/mcp/sse.go
index 21ad3863..b9eede0f 100644
--- a/mcp/sse.go
+++ b/mcp/sse.go
@@ -426,7 +426,17 @@ func (c *SSEClientTransport) Connect(ctx context.Context) (Connection, error) {
 	if err != nil {
 		return nil, fmt.Errorf("invalid endpoint: %v", err)
 	}
-	req, err := http.NewRequestWithContext(ctx, "GET", c.Endpoint, nil)
+	// The event stream outlives ctx; ctx only bounds the handshake.
+	streamCtx, cancel := context.WithCancel(context.WithoutCancel(ctx))
+	stopWatch := context.AfterFunc(ctx, cancel)
+	connected := false
+	defer func() {
+		if !connected {
+			stopWatch()
+			cancel()
+		}
+	}()
+	req, err := http.NewRequestWithContext(streamCtx, "GET", c.Endpoint, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -475,7 +485,13 @@ func (c *SSEClientTransport) Connect(ctx context.Context) (Connection, error) {
 	}
 
 	// From here on, the stream takes ownership of resp.Body.
+	if !stopWatch() {
+		resp.Body.Close()
+		return nil, ctx.Err()
+	}
+	connected = true
 	s := &sseClientConn{
+		cancel:      cancel,
 		client:      httpClient,
 		msgEndpoint: msgEndpoint,
 		incoming:    make(chan []byte, 100),
@@ -510,6 +526,7 @@ type sseClientConn struct {
 	client      *http.Client // HTTP client to use for requests
 	msgEndpoint *url.URL     // session endpoint for POSTs
 	incoming    chan []byte  // queue of incoming messages
+	cancel      context.CancelFunc
 
 	mu     sync.Mutex
 	body   io.ReadCloser // body of the hanging GET
@@ -576,6 +593,7 @@ func (c *sseClientConn) Close() error {
 	defer c.mu.Unlock()
 	if !c.closed {
 		c.closed = true
+		c.cancel()
 		_ = c.body.Close()
 		close(c.done)
 	}
diff --git a/mcp/sse_test.go b/mcp/sse_test.go
index fed1398b..8092e2d5 100644
--- a/mcp/sse_test.go
+++ b/mcp/sse_test.go
@@ -532,3 +532,26 @@ func TestSSECustomMethod(t *testing.T) {
 		t.Errorf("Ping after custom method: %v", err)
 	}
 }
+
+// TestSSEClientConnectContextCanceled verifies that canceling the context
+// passed to Connect after the handshake does not tear down the event stream.
+func TestSSEClientConnectContextCanceled(t *testing.T) {
+	server := NewServer(testImpl, nil)
+	httpServer := httptest.NewServer(NewSSEHandler(func(*http.Request) *Server { return server }, nil))
+	defer httpServer.Close()
+
+	ctx, cancel := context.WithCancel(context.Background())
+	cs, err := NewClient(testImpl, nil).Connect(ctx, &SSEClientTransport{Endpoint: httpServer.URL}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer cs.Close()
+	cancel()
+	time.Sleep(100 * time.Millisecond)
+
+	pingCtx, pingCancel := context.WithTimeout(context.Background(), 2*time.Second)
+	defer pingCancel()
+	if err := cs.Ping(pingCtx, nil); err != nil {
+		t.Errorf("Ping after canceling Connect context failed: %v", err)
+	}
+}