upgrade go mods

Author: Thomas Stromberg

README.md

@@ -231,7 +231,7 @@ client := prx.NewClient(token, prx.WithCacheStore(store))
 To disable caching persistence (memory-only):
 
 ```go
-import "github.com/codeGROOVE-dev/sfcache/pkg/store/null"
+import "github.com/codeGROOVE-dev/fido/pkg/store/null"
 
 client := prx.NewClient(token, prx.WithCacheStore(null.New[string, prx.PullRequestData]()))
 ```

cmd/prx/main.go

@@ -16,8 +16,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/codeGROOVE-dev/fido/pkg/store/null"
 	"github.com/codeGROOVE-dev/prx/pkg/prx"
-	"github.com/codeGROOVE-dev/sfcache/pkg/store/null"
 )
 
 const (

go.mod

@@ -3,8 +3,14 @@ module github.com/codeGROOVE-dev/prx
 go 1.25.4
 
 require (
-	github.com/codeGROOVE-dev/retry v1.3.0
-	github.com/codeGROOVE-dev/sfcache v1.4.0
+	github.com/codeGROOVE-dev/fido v1.10.0
+	github.com/codeGROOVE-dev/fido/pkg/store/localfs v1.10.0
+	github.com/codeGROOVE-dev/fido/pkg/store/null v1.10.0
+	github.com/codeGROOVE-dev/retry v1.3.1
 )
 
-require github.com/codeGROOVE-dev/sfcache/pkg/store/localfs v1.4.0
+require (
+	github.com/codeGROOVE-dev/fido/pkg/store/compress v1.10.0 // indirect
+	github.com/klauspost/compress v1.18.2 // indirect
+	github.com/puzpuzpuz/xsync/v4 v4.2.0 // indirect
+)

go.sum

@@ -1,6 +1,16 @@
-github.com/codeGROOVE-dev/retry v1.3.0 h1:/+ipAWRJLL6y1R1vprYo0FSjSBvH6fE5j9LKXjpD54g=
-github.com/codeGROOVE-dev/retry v1.3.0/go.mod h1:8OgefgV1XP7lzX2PdKlCXILsYKuz6b4ZpHa/20iLi8E=
-github.com/codeGROOVE-dev/sfcache v1.4.0 h1:F00PqIYuenn/t2uK72MJ2zUCrrhW8WC5xaV+C16VNE4=
-github.com/codeGROOVE-dev/sfcache v1.4.0/go.mod h1:ksV5Y1RwKmOPZZiV0zXpsBOENGUCgO0fVgr/P8f/DJM=
-github.com/codeGROOVE-dev/sfcache/pkg/store/localfs v1.4.0 h1:oyHwsawHd9kUFdAuXSCKYiEQTXuHAVd4y7cdBatjsLY=
-github.com/codeGROOVE-dev/sfcache/pkg/store/localfs v1.4.0/go.mod h1:D/Y1sYT1m3VXHZRkQjHjFwtKQOsb587QZP/GtfJEDSE=
+github.com/codeGROOVE-dev/fido v1.10.0 h1:i4Wb6LDd5nD/4Fnp47KAVUVhG1O1mN5jSRbCYPpBYjw=
+github.com/codeGROOVE-dev/fido v1.10.0/go.mod h1:/mqfMeKCTYTGt/Y0cWm6gh8gYBKG1w8xBsTDmu+A/pU=
+github.com/codeGROOVE-dev/fido/pkg/store/compress v1.10.0 h1:W3AYtR6eyPHQ8QhTsuqjNZYWk/Fev0cJiAiuw04uhlk=
+github.com/codeGROOVE-dev/fido/pkg/store/compress v1.10.0/go.mod h1:0hFYQ8Y6jfrYuJb8eBimYz66tg7DDuVWbZqaI944LQM=
+github.com/codeGROOVE-dev/fido/pkg/store/localfs v1.10.0 h1:oaPwuHHBuzhsWnPm7UCxgwjz7+jG3O0JenSSgPSwqv8=
+github.com/codeGROOVE-dev/fido/pkg/store/localfs v1.10.0/go.mod h1:zUGzODSWykosAod0IHycxdxUOMcd2eVqd6eUdOsU73E=
+github.com/codeGROOVE-dev/fido/pkg/store/null v1.10.0 h1:3F6absPj3zUaPsK7ohTTlwOXZ2XAr+/TudIPCYPamsw=
+github.com/codeGROOVE-dev/fido/pkg/store/null v1.10.0/go.mod h1:mvPXZ0lHnaQuxkSozpmWf2ZKL5bzKe/IIGFLlcQH/F4=
+github.com/codeGROOVE-dev/retry v1.3.1 h1:BAkfDzs6FssxLCGWGgM97bb+6/8GTa40Cs147vXkJOg=
+github.com/codeGROOVE-dev/retry v1.3.1/go.mod h1:+b3huqYGY1+ZJyuCmR8nBVLjd3WJ7qAFss+sI4s6FSc=
+github.com/klauspost/compress v1.18.2 h1:iiPHWW0YrcFgpBYhsA6D1+fqHssJscY/Tm/y2Uqnapk=
+github.com/klauspost/compress v1.18.2/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
+github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU=
+github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/puzpuzpuz/xsync/v4 v4.2.0 h1:dlxm77dZj2c3rxq0/XNvvUKISAmovoXF4a4qM6Wvkr0=
+github.com/puzpuzpuz/xsync/v4 v4.2.0/go.mod h1:VJDmTCJMBt8igNxnkQd86r+8KUeN1quSfNKu5bLYFQo=

pkg/prx/client.go

@@ -17,9 +17,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/codeGROOVE-dev/fido"
+	"github.com/codeGROOVE-dev/fido/pkg/store/localfs"
 	"github.com/codeGROOVE-dev/prx/pkg/prx/github"
-	"github.com/codeGROOVE-dev/sfcache"
-	"github.com/codeGROOVE-dev/sfcache/pkg/store/localfs"
 )
 
 const (
@@ -29,20 +29,30 @@ const (
 	idleConnTimeoutSec  = 90
 
 	// Cache TTL constants.
-	prCacheTTL            = 20 * 24 * time.Hour // 20 days
-	collaboratorsCacheTTL = 4 * time.Hour
+	prCacheTTL            = 20 * 24 * time.Hour // 20 days - validity checked against reference time
+	checkRunsCacheTTL     = 20 * 24 * time.Hour // 20 days - validity checked against reference time
+	collaboratorsCacheTTL = 3 * time.Hour       // 3 hours - repo-level, simple TTL
+	rulesetsCacheTTL      = 3 * time.Hour       // 3 hours - repo-level, simple TTL
 )
 
+// cachedCheckRuns stores check run events with a timestamp for cache validation.
+type cachedCheckRuns struct {
+	CachedAt time.Time
+	Events   []Event
+}
+
 // PRStore is the interface for PR cache storage backends.
-// This is an alias for sfcache.Store with the appropriate type parameters.
-type PRStore = sfcache.Store[string, PullRequestData]
+// This is an alias for fido.Store with the appropriate type parameters.
+type PRStore = fido.Store[string, PullRequestData]
 
 // Client provides methods to fetch GitHub pull request events.
 type Client struct {
 	github             *github.Client
 	logger             *slog.Logger
-	collaboratorsCache *sfcache.MemoryCache[string, map[string]string]
-	prCache            *sfcache.TieredCache[string, PullRequestData]
+	collaboratorsCache *fido.Cache[string, map[string]string]
+	rulesetsCache      *fido.Cache[string, []string]
+	checkRunsCache     *fido.Cache[string, cachedCheckRuns]
+	prCache            *fido.TieredCache[string, PullRequestData]
 	token              string // Store token for recreating client with new transport
 }
 
@@ -73,7 +83,7 @@ func WithHTTPClient(httpClient *http.Client) Option {
 // Use null.New[string, prx.PullRequestData]() to disable persistence.
 func WithCacheStore(store PRStore) Option {
 	return func(c *Client) {
-		prCache, err := sfcache.NewTiered(store, sfcache.TTL(prCacheTTL))
+		prCache, err := fido.NewTiered(store, fido.TTL(prCacheTTL))
 		if err != nil {
 			c.logger.Warn("failed to create cache from store, using default", "error", err)
 			return
@@ -97,7 +107,9 @@ func NewClient(token string, opts ...Option) *Client {
 	c := &Client{
 		logger:             slog.Default(),
 		token:              token,
-		collaboratorsCache: sfcache.New[string, map[string]string](sfcache.TTL(collaboratorsCacheTTL)),
+		collaboratorsCache: fido.New[string, map[string]string](fido.TTL(collaboratorsCacheTTL)),
+		rulesetsCache:      fido.New[string, []string](fido.TTL(rulesetsCacheTTL)),
+		checkRunsCache:     fido.New[string, cachedCheckRuns](fido.TTL(checkRunsCacheTTL)),
 		github: newGitHubClient(
 			&http.Client{
 				Transport: &github.Transport{Base: transport},
@@ -120,7 +132,7 @@ func NewClient(token string, opts ...Option) *Client {
 	return c
 }
 
-func createDefaultCache(log *slog.Logger) *sfcache.TieredCache[string, PullRequestData] {
+func createDefaultCache(log *slog.Logger) *fido.TieredCache[string, PullRequestData] {
 	dir, err := os.UserCacheDir()
 	if err != nil {
 		dir = os.TempDir()
@@ -135,7 +147,7 @@ func createDefaultCache(log *slog.Logger) *sfcache.TieredCache[string, PullReque
 		log.Warn("failed to create cache store, caching disabled", "error", err)
 		return nil
 	}
-	cache, err := sfcache.NewTiered(store, sfcache.TTL(prCacheTTL))
+	cache, err := fido.NewTiered(store, fido.TTL(prCacheTTL))
 	if err != nil {
 		log.Warn("failed to create cache, caching disabled", "error", err)
 		return nil
@@ -156,7 +168,7 @@ func (c *Client) PullRequestWithReferenceTime(
 	refTime time.Time,
 ) (*PullRequestData, error) {
 	if c.prCache == nil {
-		return c.pullRequestViaGraphQL(ctx, owner, repo, pr)
+		return c.pullRequestViaGraphQL(ctx, owner, repo, pr, refTime)
 	}
 
 	key := prCacheKey(owner, repo, pr)
@@ -180,8 +192,8 @@ func (c *Client) PullRequestWithReferenceTime(
 			"owner", owner, "repo", repo, "pr", pr)
 	}
 
-	result, err := c.prCache.GetSet(ctx, key, func(ctx context.Context) (PullRequestData, error) {
-		data, err := c.pullRequestViaGraphQL(ctx, owner, repo, pr)
+	result, err := c.prCache.Fetch(ctx, key, func(ctx context.Context) (PullRequestData, error) {
+		data, err := c.pullRequestViaGraphQL(ctx, owner, repo, pr, refTime)
 		if err != nil {
 			return PullRequestData{}, err
 		}
@@ -230,3 +242,13 @@ func prCacheKey(owner, repo string, prNumber int) string {
 func collaboratorsCacheKey(owner, repo string) string {
 	return fmt.Sprintf("%s/%s", owner, repo)
 }
+
+// rulesetsCacheKey generates a cache key for rulesets data.
+func rulesetsCacheKey(owner, repo string) string {
+	return fmt.Sprintf("%s/%s", owner, repo)
+}
+
+// checkRunsCacheKey generates a cache key for check runs data.
+func checkRunsCacheKey(owner, repo, sha string) string {
+	return fmt.Sprintf("%s/%s/%s", owner, repo, sha)
+}

pkg/prx/client_cache_test.go

@@ -124,7 +124,7 @@ func TestCacheClient(t *testing.T) {
 	}
 	afterSecondRequest := requestCount
 
-	// We expect zero API requests for cached call (sfcache handles persistence)
+	// We expect zero API requests for cached call (fido handles persistence)
 	if afterSecondRequest != beforeSecondRequest {
 		t.Logf("Note: Got %d API requests for cached call (cache may need warming)", afterSecondRequest-beforeSecondRequest)
 	}
@@ -191,3 +191,130 @@ func TestIsHexString(t *testing.T) {
 		}
 	}
 }
+
+func TestRulesetsCacheKey(t *testing.T) {
+	key1 := rulesetsCacheKey("owner", "repo")
+	key2 := rulesetsCacheKey("owner", "repo")
+
+	if key1 != key2 {
+		t.Errorf("Same inputs produced different keys: %s vs %s", key1, key2)
+	}
+
+	key3 := rulesetsCacheKey("other", "repo")
+	if key1 == key3 {
+		t.Error("Different inputs produced same key")
+	}
+
+	// Verify format
+	expected := "owner/repo"
+	if key1 != expected {
+		t.Errorf("Expected key %q, got %q", expected, key1)
+	}
+}
+
+func TestRulesetsCache(t *testing.T) {
+	// Track API calls to rulesets endpoint
+	rulesetsAPICallCount := 0
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case "/graphql":
+			response := `{"data": {"repository": {"pullRequest": {
+				"number": 1,
+				"title": "Test PR",
+				"body": "Test body",
+				"state": "OPEN",
+				"isDraft": false,
+				"createdAt": "2023-01-01T00:00:00Z",
+				"updatedAt": "2023-01-01T01:00:00Z",
+				"closedAt": null,
+				"mergedAt": null,
+				"mergedBy": null,
+				"mergeable": "UNKNOWN",
+				"mergeStateStatus": "UNKNOWN",
+				"additions": 10,
+				"deletions": 5,
+				"changedFiles": 2,
+				"author": {"login": "testuser"},
+				"authorAssociation": "CONTRIBUTOR",
+				"headRef": {"target": {"oid": "abc123"}},
+				"baseRef": {"name": "main", "target": {"oid": "def456"}},
+				"assignees": {"nodes": []},
+				"labels": {"nodes": []},
+				"reviews": {"nodes": []},
+				"reviewRequests": {"nodes": []},
+				"reviewThreads": {"nodes": []},
+				"commits": {"nodes": []},
+				"statusCheckRollup": null,
+				"timelineItems": {"nodes": [], "pageInfo": {"hasNextPage": false}},
+				"comments": {"nodes": []}
+			}}}}`
+			if _, err := w.Write([]byte(response)); err != nil {
+				http.Error(w, err.Error(), http.StatusInternalServerError)
+				return
+			}
+		case "/repos/test/repo/rulesets":
+			rulesetsAPICallCount++
+			// Return rulesets with a required check
+			response := `[{"id": 1, "name": "main protection", "target": "branch", "rules": [{"type": "required_status_checks", "parameters": {"required_status_checks": [{"context": "ci/test"}]}}]}]`
+			if _, err := w.Write([]byte(response)); err != nil {
+				http.Error(w, err.Error(), http.StatusInternalServerError)
+				return
+			}
+		case "/repos/test/repo/commits/abc123/check-runs":
+			if _, err := w.Write([]byte(`{"check_runs": []}`)); err != nil {
+				http.Error(w, err.Error(), http.StatusInternalServerError)
+				return
+			}
+		default:
+			if _, err := w.Write([]byte("[]")); err != nil {
+				http.Error(w, err.Error(), http.StatusInternalServerError)
+				return
+			}
+		}
+	}))
+	defer server.Close()
+
+	client := NewClient("test-token",
+		WithHTTPClient(&http.Client{Transport: &http.Transport{}}),
+		WithLogger(slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelDebug}))),
+	)
+	client.github = newTestGitHubClient(&http.Client{Transport: &http.Transport{}}, "test-token", server.URL)
+	defer func() {
+		if err := client.Close(); err != nil {
+			t.Errorf("Failed to close client: %v", err)
+		}
+	}()
+
+	ctx := context.Background()
+	refTime := time.Now()
+
+	// First request - should call rulesets API
+	_, err := client.pullRequestViaGraphQL(ctx, "test", "repo", 1, refTime)
+	if err != nil {
+		t.Fatalf("First request failed: %v", err)
+	}
+
+	if rulesetsAPICallCount != 1 {
+		t.Errorf("Expected 1 rulesets API call, got %d", rulesetsAPICallCount)
+	}
+
+	// Second request - should use cached rulesets
+	_, err = client.pullRequestViaGraphQL(ctx, "test", "repo", 1, refTime)
+	if err != nil {
+		t.Fatalf("Second request failed: %v", err)
+	}
+
+	if rulesetsAPICallCount != 1 {
+		t.Errorf("Expected rulesets to be cached (still 1 API call), got %d", rulesetsAPICallCount)
+	}
+
+	// Third request for same repo - should still use cache
+	_, err = client.pullRequestViaGraphQL(ctx, "test", "repo", 2, refTime)
+	if err != nil {
+		t.Fatalf("Third request failed: %v", err)
+	}
+
+	if rulesetsAPICallCount != 1 {
+		t.Errorf("Expected rulesets cache to be used across PRs in same repo, got %d API calls", rulesetsAPICallCount)
+	}
+}