Skip to content

feat(sidebar): show git branch instead of worktree name#66

Merged
neumie merged 1 commit intomainfrom
feat/sidebar-show-git-branch
Mar 27, 2026
Merged

feat(sidebar): show git branch instead of worktree name#66
neumie merged 1 commit intomainfrom
feat/sidebar-show-git-branch

Conversation

@neumie
Copy link
Copy Markdown
Contributor

@neumie neumie commented Mar 27, 2026

Summary

  • Worktree entries in the sidebar now display the current git branch name instead of the stored project name
  • Uses the existing non-blocking git status cache (populated by background poller), falling back to the project name if not yet cached

Changes

  • Modified SidebarProjectInfo::from_project to resolve the branch from okena_git::get_git_status for worktree projects

Test plan

  • Open Okena with a project that has worktrees
  • Verify worktree entries in the sidebar show the branch name (e.g. feat/my-feature) instead of the directory or stored name
  • Verify non-worktree projects still show their project name as before
  • Verify that before git status cache populates, the fallback name is shown correctly

For worktree projects, the sidebar now resolves the current branch
from the git status cache rather than displaying the stored project
name. Falls back to the project name if the cache hasn't populated yet.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@neumie neumie merged commit cfcc886 into main Mar 27, 2026
8 checks passed
@neumie neumie deleted the feat/sidebar-show-git-branch branch March 27, 2026 13:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant