feat(sidebar): show worktrees under their repository

Add an opt-in sidebar mode that lists linked worktrees beneath their main repository so repository switching can stay in the main sidebar instead of requiring the worktree dropdown.

Changes:
- add a secondary appearance setting to show worktrees in the repository sidebar when worktree support is enabled
- group linked worktrees under their main repository and synthesize sidebar rows for worktrees that are not already stored as repositories
- render nested rows with the worktree folder name, keep alias styling behavior unchanged, and avoid duplicate pull-all work for linked worktrees
- persist sidebar worktree metadata in repository state and expose main worktree path helpers needed for grouping
- preload main-repository worktree state for the sidebar, show a loading hint while discovery is in flight, and refresh the parent row when a linked worktree is selected
- use preloaded parent worktree metadata so stored linked worktree rows show their branch pill on first render instead of waiting for an explicit refresh
- add unit coverage for grouped, synthetic, loading, and stored-linked branch-label cases and throttle sidebar worktree refreshes to reduce repeated git worktree list churn during indicator updates

Testing:
- yarn test:unit app/test/unit/repositories-list-grouping-test.ts
- yarn eslint app/src/lib/stores/app-store.ts app/src/models/repository.ts app/src/ui/repositories-list/group-repositories.ts app/src/ui/repositories-list/repositories-list.tsx app/src/ui/repositories-list/repository-list-item.tsx app/test/unit/repositories-list-grouping-test.ts
- yarn compile:dev

Author: ignatremizov

.github/actions/setup-ci-environment/action.yml

@@ -33,7 +33,22 @@ runs:
 
     - name: Install and build dependencies
       shell: bash
-      run: yarn
+      run: |
+        max_attempts=3
+
+        for attempt in $(seq 1 "$max_attempts"); do
+          if yarn; then
+            exit 0
+          fi
+
+          if [ "$attempt" -eq "$max_attempts" ]; then
+            exit 1
+          fi
+
+          sleep_seconds=$((attempt * 10))
+          echo "yarn install failed on attempt $attempt/$max_attempts, retrying in ${sleep_seconds}s..."
+          sleep "$sleep_seconds"
+        done
       env:
         npm_config_arch: ${{ inputs.arch }}
         TARGET_ARCH: ${{ inputs.arch }}

app/src/lib/app-state.ts

@@ -321,6 +321,9 @@ export interface IAppState {
   /** Whether or not the worktrees dropdown should be shown in the toolbar */
   readonly showWorktrees: boolean
 
+  /** Whether linked worktrees should be shown under their repository in the sidebar */
+  readonly showWorktreesInSidebar: boolean
+
   /** Whether or not the Compare tab should be shown in the repository view */
   readonly showCompareTab: boolean
 

app/src/lib/git/worktree.ts

@@ -5,6 +5,36 @@ import type { WorktreeEntry, WorktreeType } from '../../models/worktree'
 import { git } from './core'
 import { normalizePath } from '../helpers/path'
 
+function getDotGitPath(repositoryPath: string): string {
+  return Path.join(repositoryPath, '.git')
+}
+
+function getGitDirPathSync(repositoryPath: string): string | null {
+  const dotGit = getDotGitPath(repositoryPath)
+
+  try {
+    // eslint-disable-next-line no-sync
+    const stats = Fs.statSync(dotGit)
+    if (stats.isDirectory()) {
+      return dotGit
+    }
+
+    if (!stats.isFile()) {
+      return null
+    }
+
+    // eslint-disable-next-line no-sync
+    const contents = Fs.readFileSync(dotGit, 'utf8').trim()
+    if (!contents.startsWith('gitdir: ')) {
+      return null
+    }
+
+    return Path.resolve(repositoryPath, contents.substring('gitdir: '.length))
+  } catch {
+    return null
+  }
+}
+
 export function parseWorktreePorcelainOutput(
   stdout: string
 ): ReadonlyArray<WorktreeEntry> {
@@ -141,11 +171,38 @@ export async function getMainWorktreePath(
  */
 export function isLinkedWorktreeSync(repositoryPath: string): boolean {
   try {
-    const dotGit = Path.join(repositoryPath, '.git')
+    const dotGit = getDotGitPath(repositoryPath)
     // eslint-disable-next-line no-sync
     const stats = Fs.statSync(dotGit)
     return stats.isFile()
   } catch {
     return false
   }
 }
+
+export function getMainWorktreePathSync(repositoryPath: string): string | null {
+  const gitDirPath = getGitDirPathSync(repositoryPath)
+  if (gitDirPath === null) {
+    return null
+  }
+
+  if (!isLinkedWorktreeSync(repositoryPath)) {
+    return repositoryPath
+  }
+
+  try {
+    // eslint-disable-next-line no-sync
+    const commondir = Fs.readFileSync(
+      Path.join(gitDirPath, 'commondir'),
+      'utf8'
+    ).trim()
+    if (commondir.length === 0) {
+      return null
+    }
+
+    const commonGitDir = Path.resolve(gitDirPath, commondir)
+    return Path.dirname(commonGitDir)
+  } catch {
+    return null
+  }
+}

app/src/lib/stores/app-store.ts

@@ -377,6 +377,15 @@ import { BranchPruner } from './helpers/branch-pruner'
 import { createTutorialRepository } from './helpers/create-tutorial-repository'
 import { findRemoteBranchName } from './helpers/find-branch-name'
 import { RepositoryIndicatorUpdater } from './helpers/repository-indicator-updater'
+import {
+  createInitialLoadingSidebarState,
+  createLoadedSidebarState,
+  createLoadingSidebarState,
+  createSidebarStateFromStatus,
+  findSidebarWorktreeStateRepository,
+  getCurrentWorktreeEntryForRepository,
+  shouldRefreshSidebarWorktrees,
+} from './helpers/sidebar-worktrees'
 import { OnboardingTutorialAssessor } from './helpers/tutorial-assessor'
 import {
   getNotificationsEnabled,
@@ -471,6 +480,7 @@ const shellKey = 'shell'
 
 const showRecentRepositoriesKey = 'show-recent-repositories'
 const showWorktreesKey = 'show-worktrees'
+const showWorktreesInSidebarKey = 'show-worktrees-in-sidebar'
 const showCompareTabKey = 'show-compare-tab'
 const showCompareTabDefault = true
 const repositoryIndicatorsEnabledKey = 'enable-repository-indicators'
@@ -641,6 +651,8 @@ export class AppStore extends TypedBaseStore<IAppState> {
   private titleBarStyle: TitleBarStyle = 'native'
   private showRecentRepositories: boolean = true
   private showWorktrees: boolean = false
+  private showWorktreesInSidebar: boolean = false
+  private readonly lastSidebarWorktreeRefreshAt = new Map<string, number>()
   private showCompareTab: boolean = showCompareTabDefault
   private hideWindowOnQuit: boolean = __DARWIN__
 
@@ -762,6 +774,8 @@ export class AppStore extends TypedBaseStore<IAppState> {
 
     this.showRecentRepositories = getBoolean(showRecentRepositoriesKey) ?? true
     this.showWorktrees = getBoolean(showWorktreesKey) ?? false
+    this.showWorktreesInSidebar =
+      this.showWorktrees && (getBoolean(showWorktreesInSidebarKey) ?? false)
     this.showCompareTab = getBoolean(showCompareTabKey, showCompareTabDefault)
 
     this.repositoryIndicatorUpdater = new RepositoryIndicatorUpdater(
@@ -1034,6 +1048,9 @@ export class AppStore extends TypedBaseStore<IAppState> {
     this.repositoriesStore.onDidUpdate(updateRepositories => {
       this.repositories = updateRepositories
       this.updateRepositorySelectionAfterRepositoriesChanged()
+      if (this.showWorktreesInSidebar) {
+        void this.preloadSidebarWorktrees()
+      }
       this.emitUpdate()
     })
 
@@ -1215,6 +1232,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
       titleBarStyle: this.titleBarStyle,
       showRecentRepositories: this.showRecentRepositories,
       showWorktrees: this.showWorktrees,
+      showWorktreesInSidebar: this.showWorktreesInSidebar,
       showCompareTab: this.showCompareTab,
       apiRepositories: this.apiRepositoriesStore.getState(),
       useWindowsOpenSSH: this.useWindowsOpenSSH,
@@ -2463,6 +2481,9 @@ export class AppStore extends TypedBaseStore<IAppState> {
     this.repositories = repositories
 
     this.updateRepositorySelectionAfterRepositoriesChanged()
+    if (this.showWorktreesInSidebar) {
+      void this.preloadSidebarWorktrees()
+    }
 
     this.sidebarWidth = constrain(
       getNumber(sidebarWidthConfigKey, defaultSidebarWidth)
@@ -3959,6 +3980,10 @@ export class AppStore extends TypedBaseStore<IAppState> {
 
     const state = this.repositoryStateCache.get(repository)
     const gitStore = this.gitStoreCache.get(repository)
+    const sidebarRepository = findSidebarWorktreeStateRepository(
+      this.repositories,
+      repository
+    )
 
     // if we cannot get a valid status it's a good indicator that the repository
     // is in a bad state - let's mark it as missing here and give up on the
@@ -3971,10 +3996,43 @@ export class AppStore extends TypedBaseStore<IAppState> {
       return
     }
 
+    if (this.showWorktreesInSidebar) {
+      const existing = this.localRepositoryStateLookup.get(sidebarRepository.id)
+      this.localRepositoryStateLookup.set(
+        sidebarRepository.id,
+        createLoadingSidebarState(sidebarRepository, status, existing)
+      )
+      this.emitUpdate()
+    }
+
     // loadBranches needs the default remote to determine the default branch
     await gitStore.loadRemotes()
     await gitStore.loadBranches()
     await gitStore.loadWorktrees()
+    this.repositoryStateCache.updateWorktreesState(repository, () => ({
+      allWorktrees: gitStore.allWorktrees,
+      currentWorktree: gitStore.currentWorktree,
+    }))
+    if (sidebarRepository !== repository) {
+      this.repositoryStateCache.updateWorktreesState(sidebarRepository, () => ({
+        allWorktrees: gitStore.allWorktrees,
+        currentWorktree: getCurrentWorktreeEntryForRepository(
+          gitStore.allWorktrees,
+          sidebarRepository
+        ),
+      }))
+    }
+    this.lastSidebarWorktreeRefreshAt.set(repository.hash, Date.now())
+    this.lastSidebarWorktreeRefreshAt.set(sidebarRepository.hash, Date.now())
+    this.updateSidebarIndicator(repository, status)
+    const refreshed = this.localRepositoryStateLookup.get(sidebarRepository.id)
+    if (refreshed !== undefined) {
+      this.localRepositoryStateLookup.set(
+        sidebarRepository.id,
+        createLoadedSidebarState(refreshed, gitStore.allWorktrees)
+      )
+    }
+    this.emitUpdate()
 
     const section = state.selectedSection
     let refreshSectionPromise: Promise<void>
@@ -4026,6 +4084,58 @@ export class AppStore extends TypedBaseStore<IAppState> {
     }
   }
 
+  private async preloadSidebarWorktrees() {
+    for (const repository of this.repositories) {
+      if (repository.isLinkedWorktree) {
+        continue
+      }
+
+      const existing = this.localRepositoryStateLookup.get(repository.id)
+      this.localRepositoryStateLookup.set(
+        repository.id,
+        createInitialLoadingSidebarState(repository, existing)
+      )
+    }
+    this.emitUpdate()
+
+    for (const repository of this.repositories) {
+      if (repository.isLinkedWorktree) {
+        continue
+      }
+
+      const exists = await pathExists(repository.path)
+      if (!exists) {
+        continue
+      }
+
+      try {
+        const gitStore = this.gitStoreCache.get(repository)
+        await gitStore.loadWorktrees()
+        this.repositoryStateCache.updateWorktreesState(repository, () => ({
+          allWorktrees: gitStore.allWorktrees,
+          currentWorktree: gitStore.currentWorktree,
+        }))
+
+        const existing = this.localRepositoryStateLookup.get(repository.id)
+        if (existing !== undefined) {
+          this.localRepositoryStateLookup.set(
+            repository.id,
+            createLoadedSidebarState(existing, gitStore.allWorktrees)
+          )
+        }
+        this.lastSidebarWorktreeRefreshAt.set(repository.hash, Date.now())
+        this.emitUpdate()
+      } catch (error) {
+        log.warn(
+          `[AppStore] Failed to preload sidebar worktrees for '${nameOf(
+            repository
+          )}'`,
+          error
+        )
+      }
+    }
+  }
+
   private async updateStashEntryCountMetric(
     repository: Repository,
     desktopStashEntryCount: number,
@@ -4065,12 +4175,16 @@ export class AppStore extends TypedBaseStore<IAppState> {
       return
     }
 
-    lookup.set(repository.id, {
-      aheadBehind: status.branchAheadBehind || null,
-      changedFilesCount: status.workingDirectory.files.length,
-      branchName: status.currentBranch || null,
-      defaultBranchName: repository.defaultBranch,
-    })
+    lookup.set(
+      repository.id,
+      createSidebarStateFromStatus(
+        repository,
+        status,
+        lookup.get(repository.id),
+        this.repositoryStateCache.get(repository).worktreesState.allWorktrees,
+        this.showWorktreesInSidebar
+      )
+    )
   }
   /**
    * Refresh indicator in repository list for a specific repository
@@ -4096,6 +4210,37 @@ export class AppStore extends TypedBaseStore<IAppState> {
       return
     }
 
+    if (
+      this.showWorktreesInSidebar &&
+      !repository.isLinkedWorktree &&
+      shouldRefreshSidebarWorktrees(
+        this.lastSidebarWorktreeRefreshAt.get(repository.hash),
+        this.repositoryStateCache.get(repository).worktreesState.allWorktrees
+      )
+    ) {
+      this.updateSidebarIndicator(repository, status)
+      const existing = lookup.get(repository.id)
+      lookup.set(
+        repository.id,
+        createLoadingSidebarState(repository, status, existing)
+      )
+      this.emitUpdate()
+
+      await gitStore.loadWorktrees()
+      this.repositoryStateCache.updateWorktreesState(repository, () => ({
+        allWorktrees: gitStore.allWorktrees,
+        currentWorktree: gitStore.currentWorktree,
+      }))
+      const refreshed = lookup.get(repository.id)
+      if (refreshed !== undefined) {
+        lookup.set(
+          repository.id,
+          createLoadedSidebarState(refreshed, gitStore.allWorktrees)
+        )
+      }
+      this.lastSidebarWorktreeRefreshAt.set(repository.hash, Date.now())
+    }
+
     this.updateSidebarIndicator(repository, status)
     this.emitUpdate()
 
@@ -4117,6 +4262,8 @@ export class AppStore extends TypedBaseStore<IAppState> {
         changedFilesCount: existing?.changedFilesCount ?? 0,
         branchName: existing?.branchName ?? null,
         defaultBranchName: existing?.defaultBranchName ?? null,
+        isLoadingWorktrees: existing?.isLoadingWorktrees ?? false,
+        allWorktrees: existing?.allWorktrees ?? [],
       })
       this.emitUpdate()
     }
@@ -4191,10 +4338,30 @@ export class AppStore extends TypedBaseStore<IAppState> {
     }
     setBoolean(showWorktreesKey, showWorktrees)
     this.showWorktrees = showWorktrees
+    if (!showWorktrees && this.showWorktreesInSidebar) {
+      setBoolean(showWorktreesInSidebarKey, false)
+      this.showWorktreesInSidebar = false
+      this.lastSidebarWorktreeRefreshAt.clear()
+    }
     this.updateResizableConstraints()
     this.emitUpdate()
   }
 
+  public _setShowWorktreesInSidebar(showWorktreesInSidebar: boolean) {
+    if (this.showWorktreesInSidebar === showWorktreesInSidebar) {
+      return
+    }
+
+    if (showWorktreesInSidebar && !this.showWorktrees) {
+      return
+    }
+
+    setBoolean(showWorktreesInSidebarKey, showWorktreesInSidebar)
+    this.showWorktreesInSidebar = showWorktreesInSidebar
+    this.lastSidebarWorktreeRefreshAt.clear()
+    this.emitUpdate()
+  }
+
   public _setShowCompareTab(showCompareTab: boolean) {
     if (this.showCompareTab === showCompareTab) {
       return