Merge branch 'main' of https://github.com/githubnext/gh-aw-mcpg

Author: lpcox

internal/mcp/connection.go

@@ -234,8 +234,12 @@ func tryStreamableHTTPTransport(ctx context.Context, cancel context.CancelFunc,
 		MaxRetries: 0, // Don't retry on failure - we'll try other transports
 	}
 
-	// Try to connect - this will fail if the server doesn't support streamable HTTP
-	session, err := client.Connect(ctx, transport, nil)
+	// Try to connect with a timeout - this will fail if the server doesn't support streamable HTTP
+	// Use a short timeout to fail fast and try other transports
+	connectCtx, connectCancel := context.WithTimeout(ctx, 5*time.Second)
+	defer connectCancel()
+
+	session, err := client.Connect(connectCtx, transport, nil)
 	if err != nil {
 		return nil, fmt.Errorf("streamable HTTP transport connect failed: %w", err)
 	}
@@ -271,8 +275,12 @@ func trySSETransport(ctx context.Context, cancel context.CancelFunc, url string,
 		HTTPClient: httpClient,
 	}
 
-	// Try to connect - this will fail if the server doesn't support SSE
-	session, err := client.Connect(ctx, transport, nil)
+	// Try to connect with a timeout - this will fail if the server doesn't support SSE
+	// Use a short timeout to fail fast and try other transports
+	connectCtx, connectCancel := context.WithTimeout(ctx, 5*time.Second)
+	defer connectCancel()
+
+	session, err := client.Connect(connectCtx, transport, nil)
 	if err != nil {
 		return nil, fmt.Errorf("SSE transport connect failed: %w", err)
 	}

internal/server/unified_http_backend_test.go

@@ -243,11 +243,14 @@ func TestHTTPBackend_SessionIDPropagation(t *testing.T) {
 	defer mockServer.Close()
 
 	// Create config
+	// Add a dummy header to force plain JSON-RPC transport (SDK transports don't support custom headers)
+	// This avoids the streamable/SSE transport attempts which don't work with simple mock servers
 	cfg := &config.Config{
 		Servers: map[string]*config.ServerConfig{
 			"test-http": {
-				Type: "http",
-				URL:  mockServer.URL,
+				Type:    "http",
+				URL:     mockServer.URL,
+				Headers: map[string]string{"X-Test": "test"},
 			},
 		},
 	}