Paginate git branch listing and search results

[juliusmarminge]

Summary

• Added cursor-based pagination to git listBranches, including nextCursor and totalCount metadata.
• Moved branch deduping/query helpers into shared git utilities and applied query filtering before pagination on the server.
• Updated the branch picker to use an infinite query, load additional pages on scroll, and show branch count/loading status.
• Extended contracts, tests, and the branch-list benchmark to cover the new paging behavior.

Testing

• Not run in this context.
• New coverage was added for server-side branch pagination/filtering and client-side branch query invalidation/infinite search behavior.

---

Note

Medium Risk
Medium risk because it changes the git listBranches RPC contract and server-side git status/branch listing behavior, plus updates multiple UI consumers to rely on the new pagination and status flags.

Overview
Adds cursor-based pagination and server-side search to GitCore.listBranches, returning nextCursor/totalCount, applying query filtering before pagination, and deduping origin/* remote refs when a matching local branch exists (logic moved to @t3tools/shared/git).

Extends GitStatusResult/statusDetails to include isRepo, hasOriginRemote, and isDefaultBranch (derived from refs/remotes/origin/HEAD when available) and updates GitManager to gracefully return an explicit non-repo status on “not a git repository” errors.

Updates the branch picker to use an infinite query (gitBranchSearchInfiniteQueryOptions) with prefetch + scroll-to-load pagination and status text, and refactors other UI surfaces to use git.status for repo detection/default-branch checks instead of branch-list queries; tests/fixtures are updated accordingly.

^{Written by Cursor Bugbot for commit 34102bc. This will update automatically on new commits. Configure here.}

Note

Paginate git branch listing and add query filtering with deduplication

• Adds query, cursor, and limit params to GitListBranchesInput and returns nextCursor and totalCount in the response, enabling server-side filtered, paginated branch listing.
• Introduces filterBranchesForListQuery and paginateBranches helpers in GitCore.ts; dedupes origin remote refs when a matching local branch exists via a new shared dedupeRemoteBranchesWithLocalMatches util.
• Replaces useQuery(gitBranchesQueryOptions) with useInfiniteQuery(gitBranchSearchInfiniteQueryOptions) in BranchToolbarBranchSelector.tsx, adding scroll-to-load-more and a count/loading footer.
• Extends GitStatusResult with isRepo, hasOriginRemote, and isDefaultBranch flags; GitActionsControl, ChatView, and DiffPanel now derive repo/default-branch state from status instead of the branches query.
• GitManager.status now returns an explicit non-repo status object instead of erroring when the working directory is not a git repository.

^{Macroscope summarized 34102bc.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 01384974-ccc5-4754-87f9-34a063b98033

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch t3code/git-branch-pagination

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[macroscopeapp]

Approvability

Verdict: Needs human review

This PR adds pagination and search capabilities to git branch listing, modifies API contracts (GitListBranchesResult, GitStatusResult, GitListBranchesInput), and changes frontend data fetching patterns from regular queries to infinite queries. The scope of changes across contracts, server, and client layers with runtime behavior modifications warrants human review.

^{You can customize Macroscope's approvability policy. Learn more.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

There are 3 total unresolved issues (including 2 from previous reviews).

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Unused production re-export of deduplication function
  • Removed the dead re-export of dedupeRemoteBranchesWithLocalMatches from BranchToolbar.logic.ts and updated the test file to import directly from @t3tools/shared/git.

Or push these changes by commenting:

@cursor push e50df67294

Preview (e50df67294)

diff --git a/apps/web/src/components/BranchToolbar.logic.test.ts b/apps/web/src/components/BranchToolbar.logic.test.ts
--- a/apps/web/src/components/BranchToolbar.logic.test.ts
+++ b/apps/web/src/components/BranchToolbar.logic.test.ts
@@ -1,7 +1,7 @@
 import type { GitBranch } from "@t3tools/contracts";
 import { describe, expect, it } from "vitest";
+import { dedupeRemoteBranchesWithLocalMatches } from "@t3tools/shared/git";
 import {
-  dedupeRemoteBranchesWithLocalMatches,
   deriveLocalBranchNameFromRemoteRef,
   resolveBranchSelectionTarget,
   resolveDraftEnvModeAfterBranchChange,

diff --git a/apps/web/src/components/BranchToolbar.logic.ts b/apps/web/src/components/BranchToolbar.logic.ts
--- a/apps/web/src/components/BranchToolbar.logic.ts
+++ b/apps/web/src/components/BranchToolbar.logic.ts
@@ -1,9 +1,6 @@
 import type { GitBranch } from "@t3tools/contracts";
 import { Schema } from "effect";
-export {
-  dedupeRemoteBranchesWithLocalMatches,
-  deriveLocalBranchNameFromRemoteRef,
-} from "@t3tools/shared/git";
+export { deriveLocalBranchNameFromRemoteRef } from "@t3tools/shared/git";
 
 export const EnvMode = Schema.Literals(["local", "worktree"]);
 export type EnvMode = typeof EnvMode.Type;

_{You can send follow-ups to this agent here.}