From 09b0c533b41056fce133f64233a6af7a30efe0dd Mon Sep 17 00:00:00 2001
From: Lukasz Raczylo <lukasz@raczylo.com>
Date: Fri, 12 Dec 2025 01:56:52 +0000
Subject: [PATCH] Add retry logic for GitHub graphql requests

---
 internal/github/client.go  |  6 ++++-
 internal/github/graphql.go | 55 ++++++++++++++++++++++++++++++++++++--
 2 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/internal/github/client.go b/internal/github/client.go
index 5d4dede..e25fd29 100644
--- a/internal/github/client.go
+++ b/internal/github/client.go
@@ -301,12 +301,16 @@ func isRetryableError(err error) bool {
 		"timeout",
 		"temporary failure",
 		"server error",
+		"stream error",
+		"CANCEL",
+		"EOF",
+		"broken pipe",
 		"502",
 		"503",
 		"504",
 	}
 	for _, msg := range retryableMessages {
-		if strings.Contains(strings.ToLower(errStr), msg) {
+		if strings.Contains(strings.ToLower(errStr), strings.ToLower(msg)) {
 			return true
 		}
 	}
diff --git a/internal/github/graphql.go b/internal/github/graphql.go
index 5f6a3cd..d8b8a05 100644
--- a/internal/github/graphql.go
+++ b/internal/github/graphql.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"strings"
 	"time"
 
 	"github.com/charmbracelet/bubbles/progress"
@@ -133,8 +134,28 @@ func fetchGQLPaginated[Q any, T any, R any](
 	}
 
 	for {
-		if err := client.Query(ctx, config.Query, variables); err != nil {
-			return nil, fmt.Errorf("graphql query failed: %w", err)
+		// Retry logic for transient errors
+		var queryErr error
+		for retries := 0; retries < 3; retries++ {
+			queryErr = client.Query(ctx, config.Query, variables)
+			if queryErr == nil {
+				break
+			}
+			// Check if error is retryable
+			if !isGQLRetryableError(queryErr) {
+				break
+			}
+			// Wait before retry with exponential backoff
+			backoff := time.Duration(1<<retries) * time.Second
+			fmt.Fprintf(os.Stderr, "\r      GraphQL retry %d/3 (waiting %s): %v\n", retries+1, backoff, queryErr)
+			select {
+			case <-ctx.Done():
+				return nil, ctx.Err()
+			case <-time.After(backoff):
+			}
+		}
+		if queryErr != nil {
+			return nil, fmt.Errorf("graphql query failed: %w", queryErr)
 		}
 
 		page := config.GetPageResult(config.Query)
@@ -520,3 +541,33 @@ func convertCommentNode(node gqlCommentNode, repoName string, issueNumber int) m
 		CreatedAt:  node.CreatedAt,
 	}
 }
+
+// isGQLRetryableError checks if a GraphQL error is transient and should be retried
+func isGQLRetryableError(err error) bool {
+	if err == nil {
+		return false
+	}
+
+	errStr := strings.ToLower(err.Error())
+	retryablePatterns := []string{
+		"stream error",
+		"cancel",
+		"eof",
+		"connection reset",
+		"connection refused",
+		"timeout",
+		"temporary failure",
+		"broken pipe",
+		"502",
+		"503",
+		"504",
+	}
+
+	for _, pattern := range retryablePatterns {
+		if strings.Contains(errStr, pattern) {
+			return true
+		}
+	}
+
+	return false
+}