Skip to content

Dodaios is an open-source agent OS for your desktop: it runs your coding agents, browser and apps by voice or chat, on your own machine. Formerly Personal Jarvis.

feat(ide): list every branch in the Git tab, not just the newest

rubenluetke10-beepf267de1e27d6
diff --git a/jarvis/agentic_ide/git_overview.py b/jarvis/agentic_ide/git_overview.py
index bf0389eea2..3d412e7c0c 100644
--- a/jarvis/agentic_ide/git_overview.py
+++ b/jarvis/agentic_ide/git_overview.py
@@ -43,10 +43,13 @@ from jarvis.agentic_ide import github_link
from jarvis.core.process_utils import NO_WINDOW_CREATIONFLAGS
_GIT_TIMEOUT_S = 8.0
-#: Most local branches listed; the newest by commit date win.
-MAX_BRANCHES = 60
+#: Most local branches listed; the newest by commit date win. High enough that
+#: a busy repository shows every branch; the cap only guards a pathological one.
+MAX_BRANCHES = 1000
#: Most GitHub-only branches listed beside the local ones.
-MAX_REMOTE_ONLY = 30
+MAX_REMOTE_ONLY = 1000
+#: GitHub branch pages (100 names each) read beyond the first CI-bearing page.
+MAX_REF_PAGES = 10
#: Most target branches a "merged into" check runs against (one git call each).
MAX_MERGE_TARGETS = 4
#: Pull requests kept per branch (the most relevant first).
@@ -99,6 +102,19 @@ fragment Rollup on StatusCheckRollup {
}
"""
+# Every branch name on GitHub, without CI: the main query carries CI for the
+# newest branches only, so older ones would otherwise never show up.
+_REFS_QUERY = """
+query($owner: String!, $name: String!, $after: String) {
+ repository(owner: $owner, name: $name) {
+ refs(refPrefix: "refs/heads/", first: 100, after: $after) {
+ pageInfo { hasNextPage endCursor }
+ nodes { name target { ... on Commit { oid committedDate } } }
+ }
+ }
+}
+"""
+
# CheckRun.status values that have not started yet.
_QUEUED = {"QUEUED", "PENDING", "WAITING", "REQUESTED", "EXPECTED"}
# CheckRun.conclusion values that count as a pass.
@@ -414,7 +430,40 @@ def _fetch_github(repo: str, token: str) -> _GitHubSnapshot:
payload = github_link.graphql(token, _QUERY, {"owner": owner, "name": name})
except github_link.GitHubError as exc: # shown in the tab as github.reason/code
return _GitHubSnapshot(ok=False, reason=str(exc), code=exc.code, fetched_at=now)
- return parse_github(payload, fetched_at=now)
+ snap = parse_github(payload, fetched_at=now)
+ if snap.ok:
+ _add_all_refs(snap, token, owner, name)
+ return snap
+
+
+def _add_all_refs(snap: _GitHubSnapshot, token: str, owner: str, name: str) -> None:
+ """Add every other GitHub branch (without CI) to ``snap``, page by page."""
+ after: str | None = None
+ for _ in range(MAX_REF_PAGES):
+ try:
+ payload = github_link.graphql(
+ token, _REFS_QUERY, {"owner": owner, "name": name, "after": after}
+ )
+ except github_link.GitHubError as exc:
+ # The CI-bearing first page already landed; older branches just stay hidden.
+ logger.debug("Git overview: branch list page failed: {}", exc.code)
+ return
+ repo = ((payload or {}).get("data") or {}).get("repository") or {}
+ refs = repo.get("refs") or {}
+ for node in refs.get("nodes") or []:
+ if not isinstance(node, dict) or not node.get("name"):
+ continue
+ ref_name = str(node["name"])
+ target = node.get("target") or {}
+ if ref_name not in snap.refs:
+ snap.refs[ref_name] = (str(target.get("oid") or "")[:12], CiStatus())
+ stamp = _iso_to_unix(str(target.get("committedDate") or ""))
+ if stamp:
+ snap.ref_dates.setdefault(ref_name, stamp)
+ page = refs.get("pageInfo") or {}
+ after = page.get("endCursor")
+ if not page.get("hasNextPage") or not after:
+ return
class _GitHubCache:
@@ -674,4 +723,6 @@ def overview(folder: str | Path, *, refresh: bool = False, github: bool = True)
info.remote_branches.append(row)
if len(info.remote_branches) >= MAX_REMOTE_ONLY:
break
+ # Newest first, like the local list; the later pages arrive in name order.
+ info.remote_branches.sort(key=lambda row: row.committed_at, reverse=True)
return info
diff --git a/jarvis/ui/web/frontend/src/components/agentic/sidePanel/git/GitOverviewTab.test.tsx b/jarvis/ui/web/frontend/src/components/agentic/sidePanel/git/GitOverviewTab.test.tsx
index dcdb0dcfc0..edf0d9c1d1 100644
--- a/jarvis/ui/web/frontend/src/components/agentic/sidePanel/git/GitOverviewTab.test.tsx
+++ b/jarvis/ui/web/frontend/src/components/agentic/sidePanel/git/GitOverviewTab.test.tsx
@@ -149,6 +149,7 @@ describe("GitOverviewTab", () => {
"feature/queued",
"feature/draft",
"feature/dropped",
+ "only-remote",
]);
expect(row("feature/wip").dataset.current).toBe("true");
expect(row("main").dataset.current).toBeUndefined();
@@ -199,12 +200,12 @@ describe("GitOverviewTab", () => {
expect(tip.textContent).toContain("lint");
});
- it("folds GitHub-only branches away until asked, and forces a GitHub read on refresh", async () => {
+ it("lists GitHub-only branches, folds them on request, and forces a GitHub read on refresh", async () => {
render(<GitOverviewTab />);
await screen.findAllByTestId("git-branch-row");
- expect(screen.queryAllByTestId("git-branch-row").some((el) => el.dataset.branch === "only-remote")).toBe(false);
- fireEvent.click(screen.getByTestId("git-remote-toggle"));
expect(row("only-remote")).toBeTruthy();
+ fireEvent.click(screen.getByTestId("git-remote-toggle"));
+ expect(screen.queryAllByTestId("git-branch-row").some((el) => el.dataset.branch === "only-remote")).toBe(false);
fireEvent.click(screen.getByTestId("git-refresh"));
await vi.waitFor(() => expect(calls.some((url) => url.includes("refresh=true"))).toBe(true));
});
@@ -226,7 +227,7 @@ describe("GitOverviewTab", () => {
expect(screen.getByTestId("git-repo-picker").textContent).toContain("Connect a GitHub repository");
fireEvent.click(choices[0]);
await vi.waitFor(() => expect(puts).toEqual([JSON.stringify({ workspace_id: "w1", repo: "o/r" })]));
- expect(await screen.findAllByTestId("git-branch-row")).toHaveLength(6);
+ expect(await screen.findAllByTestId("git-branch-row")).toHaveLength(7);
expect(screen.queryByTestId("git-repo-picker")).toBeNull();
});
@@ -240,7 +241,7 @@ describe("GitOverviewTab", () => {
});
fireEvent.click(screen.getAllByTestId("git-repo-choice")[0]);
// The local branches and the choice show before GitHub has answered.
- expect(await screen.findAllByTestId("git-branch-row")).toHaveLength(6);
+ expect(await screen.findAllByTestId("git-branch-row")).toHaveLength(7);
expect(screen.queryByTestId("git-repo-picker")).toBeNull();
const state = screen.getByTestId("git-github-state");
expect(state.textContent).toContain("o/r");
@@ -254,14 +255,14 @@ describe("GitOverviewTab", () => {
fireEvent.click(await screen.findByTestId("git-bound-repo"));
await vi.waitFor(() => expect(screen.getAllByTestId("git-repo-choice")).toHaveLength(2));
fireEvent.click(screen.getByLabelText("Keep the current repository"));
- expect(await screen.findAllByTestId("git-branch-row")).toHaveLength(6);
+ expect(await screen.findAllByTestId("git-branch-row")).toHaveLength(7);
});
it("offers to connect GitHub and still lists the local branches", async () => {
answer = { ...OVERVIEW, github: { ...OVERVIEW.github, available: false, code: "not_connected", repo: "" } };
render(<GitOverviewTab />);
expect(await screen.findByTestId("git-connect-github")).toBeTruthy();
- expect(screen.getAllByTestId("git-branch-row")).toHaveLength(6);
+ expect(screen.getAllByTestId("git-branch-row")).toHaveLength(7);
fireEvent.click(screen.getByText("Connect GitHub"));
expect(useEventStore.getState().activeSection).toBe("plugins");
});
@@ -284,7 +285,6 @@ describe("GitOverviewTab", () => {
expect(location("wip/local").textContent).toBe("local only");
expect(location("main").dataset.location).toBe("both");
expect(location("main").textContent).toBe("local + GitHub");
- fireEvent.click(screen.getByTestId("git-remote-toggle"));
expect(location("only-remote").dataset.location).toBe("github_only");
});
diff --git a/jarvis/ui/web/frontend/src/components/agentic/sidePanel/git/GitOverviewTab.tsx b/jarvis/ui/web/frontend/src/components/agentic/sidePanel/git/GitOverviewTab.tsx
index e01b859e0d..5fe4b6ed46 100644
--- a/jarvis/ui/web/frontend/src/components/agentic/sidePanel/git/GitOverviewTab.tsx
+++ b/jarvis/ui/web/frontend/src/components/agentic/sidePanel/git/GitOverviewTab.tsx
@@ -613,7 +613,8 @@ export function GitOverviewTab() {
const workspace = useIdeChatStore((state) => state.workspace);
const workspaceId = workspace?.id ?? null;
const { data, error, routeMissing, loading, refresh } = useGitOverview(workspaceId);
- const [showRemote, setShowRemote] = useState(false);
+ // GitHub-only branches show by default; the header still folds them away.
+ const [showRemote, setShowRemote] = useState(true);
const [showLegend, setShowLegend] = useState(false);
const [query, setQuery] = useState("");
const [filter, setFilter] = useState<BranchFilter>("all");
diff --git a/tests/unit/agentic_ide/test_git_overview.py b/tests/unit/agentic_ide/test_git_overview.py
index c379cb1776..deaa0d5266 100644
--- a/tests/unit/agentic_ide/test_git_overview.py
+++ b/tests/unit/agentic_ide/test_git_overview.py
@@ -203,6 +203,38 @@ def test_a_github_failure_becomes_a_coded_sentence(monkeypatch: pytest.MonkeyPat
)
+def test_fetch_lists_every_github_branch_beyond_the_ci_page(
+ monkeypatch: pytest.MonkeyPatch,
+) -> None:
+ pages = {
+ None: {"hasNextPage": True, "endCursor": "c1"},
+ "c1": {"hasNextPage": False, "endCursor": "c2"},
+ }
+ seen: list[str | None] = []
+
+ def fake_graphql(token: str, query: str, variables: dict | None = None) -> dict:
+ variables = variables or {}
+ if "pageInfo" not in query:
+ return _payload(
+ [], refs=[{"name": "main", "target": {"oid": "0" * 40, "statusCheckRollup": None}}]
+ )
+ after = variables.get("after")
+ seen.append(after)
+ name = "old-a" if after is None else "old-b"
+ nodes = [
+ {"name": "main", "target": {"oid": "0" * 40, "committedDate": "2026-10-02T00:00:00Z"}},
+ {"name": name, "target": {"oid": "2" * 40, "committedDate": "2026-01-01T00:00:00Z"}},
+ ]
+ return {"data": {"repository": {"refs": {"pageInfo": pages[after], "nodes": nodes}}}}
+
+ monkeypatch.setattr(github_link, "graphql", fake_graphql)
+ snap = git_overview._fetch_github("o/r", "t")
+ assert seen == [None, "c1"]
+ assert set(snap.refs) == {"main", "old-a", "old-b"}
+ assert snap.refs["old-b"][1].state == "none"
+ assert snap.ref_dates["old-a"] == 1_767_225_600
+
+
# ------------------------------------------------------------------ local git