Skip to content

fix(claude): correct path tilde and add PR number segment to statusline #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fnayou merged 2 commits into from
Jun 24, 2026
Merged

fix(claude): correct path tilde and add PR number segment to statusline #36

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
913fe1d
fix(claude): correct path tilde and add PR number segment to statusline
fnayou Jun 24, 2026
5acb0be
Merge branch 'main' into fix/claude-statusline-path-and-pr
fnayou Jun 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 32 additions & 2 deletions stow/common/claude/.claude/statusline-command.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# Claude Code statusLine — mirrors Oh My Posh theme (Catppuccin Macchiato).
# Managed by the dotfiles `claude` package; theme source is the `omp` package.
# Segments: OS icon | model | path (depth-limited) | git branch+status | ctx % | caveman badge
# Segments: OS icon | model | path (depth-limited) | git branch+status | PR # | ctx % | caveman badge
# Colors match omp.toml: mauve #c6a0f6, teal #8bd5ca, blue #8aadf4, green #a6da95, yellow #eed49f

input=$(cat)
Expand Down Expand Up @@ -32,7 +32,7 @@ model=$(echo "$input" | jq -r '.model.display_name // empty')
# --- Path segment (blue #8aadf4) ---
# Replicate OMP "full" style with max_depth=3, home_icon="~"
display_path="$cwd"
display_path="${display_path/#$HOME/\~}"
display_path="${display_path/#$HOME/~}"
# Truncate to last 3 components if deeper
IFS='/' read -ra parts <<< "$display_path"
if (( ${#parts[@]} > 3 )); then
Expand Down Expand Up @@ -67,6 +67,36 @@ if git -C "$cwd" rev-parse --is-inside-work-tree &>/dev/null 2>&1; then
(( behind > 0 )) && git_str+=" ↓"
fi
printf '\033[38;2;166;218;149m%s\033[0m' "$git_str"

# --- GitHub PR for current branch (mauve #c6a0f6; cached, non-blocking) ---
# `gh pr view` is a ~0.5s network call — too slow to run on every render. Cache the
# open-PR number per repo+branch and refresh in the background so the statusLine never
# blocks; the number appears one render after the branch first gains a PR. Nerd Font
# glyph stored as an octal escape (pure ASCII) and rendered with printf, like the OS icon.
if command -v gh >/dev/null 2>&1 && [[ -n "$branch" ]]; then
cache_dir="${XDG_CACHE_HOME:-$HOME/.cache}/claude-statusline"
mkdir -p "$cache_dir" 2>/dev/null
toplevel=$(git -c core.fsmonitor= --no-optional-locks -C "$cwd" rev-parse --show-toplevel 2>/dev/null)
cache_key="${toplevel//\//_}__${branch//\//_}"
cache_file="$cache_dir/pr_${cache_key}"
ttl=120
now=$(date +%s)
mtime=$(stat -f %m "$cache_file" 2>/dev/null || stat -c %Y "$cache_file" 2>/dev/null || echo 0)
if (( now - mtime > ttl )); then
# Record every attempt (even "no PR" → empty file) so the TTL throttles re-runs.
( pr=$(gh pr view "$branch" --json number,state \
-q 'select(.state=="OPEN") | .number' 2>/dev/null)
printf '%s' "$pr" >"$cache_file.tmp" 2>/dev/null \
&& mv -f "$cache_file.tmp" "$cache_file" 2>/dev/null ) >/dev/null 2>&1 &
disown 2>/dev/null
fi
pr_num=""
[[ -f "$cache_file" ]] && pr_num=$(<"$cache_file")
if [[ "$pr_num" =~ ^[0-9]+$ ]]; then
gh_icon=$(printf '\357\202\233') # GitHub (nf-fa-github, U+F09B)
printf ' \033[38;2;198;160;246m%s #%s\033[0m' "$gh_icon" "$pr_num"
fi
fi
fi

# --- Context window usage (yellow #eed49f; null before first API call / after compact) ---
Expand Down
Loading