fix: stabilize repository sidebar ordering

Author: pchalamet

CHANGELOG.md

@@ -4,6 +4,8 @@ All notable changes to Forge are documented in this file.
 
 ## [Unreleased]
 
+- Kept the all repositories list alphabetically ordered when selecting a repository.
+
 ## [0.0.31]
 
 

src/App.tsx

@@ -62,6 +62,7 @@ import {
   findNewOpenPullRequests,
   formatDuration,
   githubUrlClickActionForDetail,
+  groupRepositoriesByOwner,
   isLiveStatus,
   latestViewerPullRequestReviewEvent,
   mergeFavoriteRepoSnapshots,
@@ -1210,13 +1211,7 @@ export function App() {
   }, [allRepos, sidebarSearch]);
 
   const repoGroups = useMemo(() => {
-    const groups = new Map<string, RepoSummary[]>();
-    for (const repo of visibleRepos) {
-      const list = groups.get(repo.owner) ?? [];
-      list.push(repo);
-      groups.set(repo.owner, list);
-    }
-    return Array.from(groups.entries()).sort(([a], [b]) => a.localeCompare(b));
+    return groupRepositoriesByOwner(visibleRepos);
   }, [visibleRepos]);
 
   const middleItems = useMemo<MiddleItem[]>(() => {

src/appLogic.test.ts

@@ -19,6 +19,7 @@ import {
   findNewOpenPullRequests,
   formatDuration,
   githubUrlClickActionForDetail,
+  groupRepositoriesByOwner,
   isFailedWorkflowRun,
   isPullRequestAuthor,
   isLiveStatus,
@@ -35,6 +36,24 @@ import {
 } from "./appLogic";
 
 describe("appLogic", () => {
+  it("groups repositories alphabetically by owner and repository name", () => {
+    const repos = [
+      { owner: "zeta", name: "selected", fullName: "zeta/selected", updatedAt: "2026-01-01T00:00:00Z" },
+      { owner: "alpha", name: "zebra", fullName: "alpha/zebra", updatedAt: "2026-01-03T00:00:00Z" },
+      { owner: "alpha", name: "aardvark", fullName: "alpha/aardvark", updatedAt: "2026-01-02T00:00:00Z" },
+      { owner: "beta", name: "repo-10", fullName: "beta/repo-10", updatedAt: "2026-01-04T00:00:00Z" },
+      { owner: "beta", name: "repo-2", fullName: "beta/repo-2", updatedAt: "2026-01-05T00:00:00Z" }
+    ] as RepoSummary[];
+
+    expect(
+      groupRepositoriesByOwner(repos).map(([owner, ownerRepos]) => [owner, ownerRepos.map((repo) => repo.name)])
+    ).toEqual([
+      ["alpha", ["aardvark", "zebra"]],
+      ["beta", ["repo-2", "repo-10"]],
+      ["zeta", ["selected"]]
+    ]);
+  });
+
   it("formats durations for workflow runs", () => {
     expect(formatDuration(null)).toBe("");
     expect(formatDuration(9_800)).toBe("9s");

src/appLogic.ts

@@ -16,6 +16,27 @@ function repoSnapshotKey(repo: Pick<RepoSummary, "owner" | "name">): string {
   return `${repo.owner}/${repo.name}`;
 }
 
+const repositoryNameCollator = new Intl.Collator(undefined, {
+  numeric: true,
+  sensitivity: "base"
+});
+
+export function groupRepositoriesByOwner(repos: RepoSummary[]): Array<[string, RepoSummary[]]> {
+  const groups = new Map<string, RepoSummary[]>();
+  for (const repo of repos) {
+    const list = groups.get(repo.owner) ?? [];
+    list.push(repo);
+    groups.set(repo.owner, list);
+  }
+
+  return Array.from(groups.entries())
+    .map(([owner, ownerRepos]) => [
+      owner,
+      [...ownerRepos].sort((left, right) => repositoryNameCollator.compare(left.name, right.name))
+    ] as [string, RepoSummary[]])
+    .sort(([leftOwner], [rightOwner]) => repositoryNameCollator.compare(leftOwner, rightOwner));
+}
+
 export function mergeFavoriteRepoSnapshots(
   current: FavoriteRepoSnapshots,
   favoriteKeys: string[],