Show git repo and branch in header - #89
Merged
Merged
Conversation
Server resolves git metadata via simple-git when CWD changes. Header displays repo:branch alongside shortened CWD path. Non-git directories show CWD only (existing behavior).
Header: repo:branch no longer clips — only the CWD path truncates. Sidebar: shows branch name alongside directory basename. Extracted toCwdInfo helper, simplified branch resolution to prefer symbolic-ref (works in empty repos), DRY'd test steps.
Add data-testid="sidebar-branch" to sidebar git context. Test both header and sidebar show/hide branch in git-context.feature.
…debar Header: ~/path · branch (full shortened path, no separate repo name). Sidebar: dirname · branch. Both use same order for consistency.
Resolve merge conflicts in Header and Sidebar — replace text-slate-* with semantic tokens (text-fg-2, text-fg-3) from the new design system.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The header now displays repo name and branch when the active terminal is inside a git repo, giving instant context about which project and branch you're working in. Non-git directories continue showing just the shortened CWD path.
The server enriches the existing CWD change stream with git metadata resolved via
simple-git(~2ms perrev-parsecall). The PTY layer remains unchanged — it still emits raw paths via OSC 7 — and the oRPC handler maps each path to aCwdInfoobject containing the optionalGitInfobefore streaming to the client. Handles empty repos (no commits yet) by falling back fromrev-parse --abbrev-ref HEADtosymbolic-ref --short HEAD.This is Phase 4a from the implementation plan, laying the groundwork for Phase 4b's worktree-grouped sidebar.
Try it locally
nix run github:juspay/kolu/feat/git-context-header