mark3labs
diff --git a/‎client/client.go‎
Lines changed: 13 additions & 0 deletions b/‎client/client.go‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎client/transport/streamable_http.go‎
Lines changed: 8 additions & 4 deletions b/‎client/transport/streamable_http.go‎
Lines changed: 8 additions & 4 deletions
@@ -502,6 +502,19 @@ func (c *Client) handleSamplingRequestTransport(ctx context.Context, request tra
 		}
 	}
 
+	// Fix content parsing - HTTP transport unmarshals TextContent as map[string]any
+	// Use the helper function to properly handle content from different transports
+	for i := range params.Messages {
+		if contentMap, ok := params.Messages[i].Content.(map[string]any); ok {
+			// Parse the content map into a proper Content type
+			content, err := mcp.ParseContent(contentMap)
+			if err != nil {
+				return nil, fmt.Errorf("failed to parse content for message %d: %w", i, err)
+			}
+			params.Messages[i].Content = content
+		}
+	}
+
 	// Create the MCP request
 	mcpRequest := mcp.CreateMessageRequest{
 		Request: mcp.Request{
 
@@ -594,10 +594,14 @@ func (c *StreamableHTTP) IsOAuthEnabled() bool {
 func (c *StreamableHTTP) listenForever(ctx context.Context) {
 	c.logger.Infof("listening to server forever")
 	for {
-		connectCtx, cancel := context.WithCancel(ctx)
-		err := c.createGETConnectionToServer(connectCtx)
-		cancel()
-
+		// Use the original context for continuous listening - no per-iteration timeout
+		// The SSE connection itself will detect disconnections via the underlying HTTP transport,
+		// and the context cancellation will propagate from the parent to stop listening gracefully.
+		// We don't add an artificial timeout here because:
+		// 1. Persistent SSE connections are meant to stay open indefinitely
+		// 2. Network-level timeouts and keep-alives handle connection health
+		// 3. Context cancellation (user-initiated or system shutdown) provides clean shutdown
+		err := c.createGETConnectionToServer(ctx)
 		if errors.Is(err, ErrGetMethodNotAllowed) {
 			// server does not support listening
 			c.logger.Errorf("server does not support listening")