@andrewkent/claude-statusline 1.0.0 → 1.1.2

package/assets/statusline.sh

@@ -87,12 +87,34 @@ jq_update() {
     fi
 }
 
+# ── Account label resolution ─────────────────────────────
+# Resolves email to account label (e.g., "work", "personal")
+# Checks ACCOUNT_LABELS config first, then hardcoded fallbacks
+resolve_account_label() {
+    local email="$1"
+    [ -z "$email" ] && return
+
+    # Check ACCOUNT_LABELS config: "work:*@company.com personal:me@gmail.com"
+    if [ -n "$ACCOUNT_LABELS" ]; then
+        local pair label pattern
+        for pair in $ACCOUNT_LABELS; do
+            label="${pair%%:*}"
+            pattern="${pair#*:}"
+            # shellcheck disable=SC2254
+            case "$email" in $pattern) echo "$label"; return ;; esac
+        done
+    fi
+
+    # No config match — use email as label
+    echo "$email"
+}
+
 # ── Reusable ledger function ─────────────────────────────
-# Usage: update_ledger <file> <session_id> <value> <today>
+# Usage: update_ledger <file> <session_id> <value> <today> [acct]
 # Returns the daily delta (sum of all session deltas) via LEDGER_RESULT
 LEDGER_RESULT=0
 update_ledger() {
-    local file="$1" sid="$2" value="$3" today="$4"
+    local file="$1" sid="$2" value="$3" today="$4" acct="${5:-}"
 
     if [ -f "$file" ]; then
         # Single jq call to get date + baseline existence
@@ -103,26 +125,85 @@ update_ledger() {
 
         if [ "$ledger_date" = "$today" ]; then
             if [ -z "$has_baseline" ]; then
-                jq_update "$file" --arg sid "$sid" --argjson val "$value" \
-                    '.sessions[$sid] = {"baseline": $val, "current": $val}'
+                if [ -n "$acct" ]; then
+                    jq_update "$file" --arg sid "$sid" --argjson val "$value" --arg acct "$acct" \
+                        '.sessions[$sid] = {"baseline": $val, "current": $val, "acct": $acct}'
+                else
+                    jq_update "$file" --arg sid "$sid" --argjson val "$value" \
+                        '.sessions[$sid] = {"baseline": $val, "current": $val}'
+                fi
             else
-                jq_update "$file" --arg sid "$sid" --argjson val "$value" \
-                    '.sessions[$sid].current = $val'
+                if [ -n "$acct" ]; then
+                    jq_update "$file" --arg sid "$sid" --argjson val "$value" --arg acct "$acct" \
+                        '.sessions[$sid].current = $val | .sessions[$sid].acct = $acct'
+                else
+                    jq_update "$file" --arg sid "$sid" --argjson val "$value" \
+                        '.sessions[$sid].current = $val'
+                fi
             fi
             LEDGER_RESULT=$(jq '[.sessions[] | .current - .baseline] | add // 0' "$file" 2>/dev/null)
             [ -z "$LEDGER_RESULT" ] && LEDGER_RESULT=0
         else
-            printf '{"date":"%s","sessions":{"%s":{"baseline":%s,"current":%s}}}' \
-                "$today" "$sid" "$value" "$value" > "$file"
+            if [ -n "$acct" ]; then
+                printf '{"date":"%s","sessions":{"%s":{"baseline":%s,"current":%s,"acct":"%s"}}}' \
+                    "$today" "$sid" "$value" "$value" "$acct" > "$file"
+            else
+                printf '{"date":"%s","sessions":{"%s":{"baseline":%s,"current":%s}}}' \
+                    "$today" "$sid" "$value" "$value" > "$file"
+            fi
             LEDGER_RESULT=0
         fi
     else
-        printf '{"date":"%s","sessions":{"%s":{"baseline":%s,"current":%s}}}' \
-            "$today" "$sid" "$value" "$value" > "$file"
+        if [ -n "$acct" ]; then
+            printf '{"date":"%s","sessions":{"%s":{"baseline":%s,"current":%s,"acct":"%s"}}}' \
+                "$today" "$sid" "$value" "$value" "$acct" > "$file"
+        else
+            printf '{"date":"%s","sessions":{"%s":{"baseline":%s,"current":%s}}}' \
+                "$today" "$sid" "$value" "$value" > "$file"
+        fi
         LEDGER_RESULT=0
     fi
 }
 
+# ── Subagent token tracking ──────────────────────────────
+# Sums tokens from subagent JSONL files for the current session.
+# Caches result for 30s to avoid scanning on every render.
+SUBAGENT_TOKENS=0
+get_subagent_tokens() {
+    local sid="$1" cwd="$2"
+    SUBAGENT_TOKENS=0
+    [ -z "$sid" ] || [ -z "$cwd" ] && return
+
+    local cache_file="/tmp/claude/statusline-subagent-${sid}.txt"
+    mkdir -p /tmp/claude
+
+    # Check cache (30s TTL)
+    if [ -f "$cache_file" ]; then
+        local cache_age
+        local cache_mtime
+        cache_mtime=$(stat -f %m "$cache_file" 2>/dev/null || stat -c %Y "$cache_file" 2>/dev/null)
+        cache_age=$(( $(date +%s) - cache_mtime ))
+        if [ "$cache_age" -lt 30 ]; then
+            SUBAGENT_TOKENS=$(cat "$cache_file" 2>/dev/null)
+            [ -z "$SUBAGENT_TOKENS" ] && SUBAGENT_TOKENS=0
+            return
+        fi
+    fi
+
+    # Map CWD to project dir name (Claude's convention: slashes become dashes)
+    local project_dir
+    project_dir=$(echo "$cwd" | tr '/' '-')
+    local subagent_path="$HOME/.claude/projects/${project_dir}/${sid}/subagents"
+
+    if [ -d "$subagent_path" ]; then
+        # Sum input + output tokens across subagent files
+        SUBAGENT_TOKENS=$(jq -s '[.[].message.usage | select(.) | (.input_tokens // 0) + (.output_tokens // 0)] | add // 0' "$subagent_path"/agent-*.jsonl 2>/dev/null)
+        [ -z "$SUBAGENT_TOKENS" ] && SUBAGENT_TOKENS=0
+    fi
+
+    echo "$SUBAGENT_TOKENS" > "$cache_file"
+}
+
 iso_to_epoch() {
     local iso_str="$1"
 
@@ -199,54 +280,69 @@ eval "$(echo "$input" | jq -r '
     "CTX_SIZE=" + (.context_window.context_window_size // 200000 | tostring | @sh)
 ' 2>/dev/null)"
 
+# ── Early account resolution (needed before ledger writes) ──
+ACCT_TAG=""
+ACCT_EMAIL=""
+profile_cache_file="/tmp/claude/statusline-profile-cache.json"
+if [ -f "$profile_cache_file" ]; then
+    ACCT_EMAIL=$(jq -r '.account.email // empty' "$profile_cache_file" 2>/dev/null)
+    ACCT_TAG=$(resolve_account_label "$ACCT_EMAIL")
+fi
+
 # ── Daily cost ledger ──────────────────────────────────
 DAILY_LEDGER="$HOME/.claude/daily-cost.json"
 TODAY=$(date +%Y-%m-%d)
 DAILY_COST="$COST"
 if [ -n "$SESSION_ID" ] && [ "$(awk "BEGIN {print ($COST > 0)}")" = "1" ]; then
-    update_ledger "$DAILY_LEDGER" "$SESSION_ID" "$COST" "$TODAY"
+    update_ledger "$DAILY_LEDGER" "$SESSION_ID" "$COST" "$TODAY" "$ACCT_TAG"
     DAILY_COST="${LEDGER_RESULT:-0}"
 fi
 DAILY_FMT=$(printf "%.2f" "$DAILY_COST")
 
-# ── Token challenge tracker ───────────────────────────────
-TOKEN_LEDGER="$HOME/.claude/token-challenge.json"
+# ── Token challenge tracker (reads stats-cache directly) ─────
 TOKEN_DISPLAY=""
 
 if [ -n "$SESSION_ID" ]; then
     SESSION_TOKENS=$((INPUT_TOKENS + OUTPUT_TOKENS))
-
-    if [ -f "$TOKEN_LEDGER" ]; then
-        TL_HAS_BASE=$(jq --arg sid "$SESSION_ID" '.sessions[$sid].baseline // empty' "$TOKEN_LEDGER" 2>/dev/null)
-        if [ -z "$TL_HAS_BASE" ]; then
-            jq_update "$TOKEN_LEDGER" --arg sid "$SESSION_ID" --argjson tok "$SESSION_TOKENS" \
-                '.sessions[$sid] = {"baseline": $tok, "current": $tok}'
-        else
-            jq_update "$TOKEN_LEDGER" --arg sid "$SESSION_ID" --argjson tok "$SESSION_TOKENS" \
-                '.sessions[$sid].current = $tok'
-        fi
-        CHALLENGE_TOKENS=$(jq '.starting_total + ([.sessions[] | .current - .baseline] | add // 0)' "$TOKEN_LEDGER" 2>/dev/null)
-    else
-        STARTING=0
-        if [ -f "$HOME/.claude/stats-cache.json" ]; then
-            STARTING=$(jq '[.modelUsage[].inputTokens, .modelUsage[].outputTokens] | add // 0' "$HOME/.claude/stats-cache.json" 2>/dev/null)
-            [ -z "$STARTING" ] && STARTING=0
-        fi
-        printf '{"starting_total":%s,"sessions":{"%s":{"baseline":%s,"current":%s}}}' \
-            "$STARTING" "$SESSION_ID" "$SESSION_TOKENS" "$SESSION_TOKENS" > "$TOKEN_LEDGER"
-        CHALLENGE_TOKENS="$STARTING"
+    get_subagent_tokens "$SESSION_ID" "$CWD"
+
+    CHALLENGE_TOKENS=0
+    TOTAL_INPUT=0
+    TOTAL_OUTPUT=0
+    if [ -f "$HOME/.claude/stats-cache.json" ]; then
+        eval "$(jq -r '
+            "TOTAL_INPUT=" + ([.modelUsage[].inputTokens] | add // 0 | tostring),
+            "TOTAL_OUTPUT=" + ([.modelUsage[].outputTokens] | add // 0 | tostring)
+        ' "$HOME/.claude/stats-cache.json" 2>/dev/null)"
+        CHALLENGE_TOKENS=$((TOTAL_INPUT + TOTAL_OUTPUT))
     fi
 
-    if [ -n "$CHALLENGE_TOKENS" ] && [ "$CHALLENGE_TOKENS" != "null" ]; then
+    if [ "$CHALLENGE_TOKENS" -gt 0 ] 2>/dev/null; then
         TOKEN_M=$(awk "BEGIN {printf \"%.1f\", $CHALLENGE_TOKENS / 1000000}")
         GOAL_M="100"
         TOKEN_PCT=$(awk "BEGIN {printf \"%.0f\", $CHALLENGE_TOKENS / (${GOAL_M} * 10000)}")
         [ "$TOKEN_PCT" -gt 100 ] 2>/dev/null && TOKEN_PCT=100
-        TOKEN_BAR=$(build_bar "$TOKEN_PCT" 10)
+
+        # Split bar: cyan for input, magenta for output
+        BAR_WIDTH=10
+        INPUT_PCT=$(awk "BEGIN {printf \"%.0f\", $TOTAL_INPUT / (${GOAL_M} * 10000)}")
+        OUTPUT_PCT=$(awk "BEGIN {printf \"%.0f\", $TOTAL_OUTPUT / (${GOAL_M} * 10000)}")
+        INPUT_DOTS=$(( INPUT_PCT * BAR_WIDTH / 100 ))
+        OUTPUT_DOTS=$(( OUTPUT_PCT * BAR_WIDTH / 100 ))
+        # Clamp so they don't exceed bar width
+        [ $((INPUT_DOTS + OUTPUT_DOTS)) -gt "$BAR_WIDTH" ] && OUTPUT_DOTS=$((BAR_WIDTH - INPUT_DOTS))
+        EMPTY_DOTS=$((BAR_WIDTH - INPUT_DOTS - OUTPUT_DOTS))
+        [ "$EMPTY_DOTS" -lt 0 ] && EMPTY_DOTS=0
+
+        INPUT_STR="" OUTPUT_STR="" EMPTY_STR=""
+        for ((i=0; i<INPUT_DOTS; i++)); do INPUT_STR+="●"; done
+        for ((i=0; i<OUTPUT_DOTS; i++)); do OUTPUT_STR+="●"; done
+        for ((i=0; i<EMPTY_DOTS; i++)); do EMPTY_STR+="○"; done
+        TOKEN_BAR="${cyan}${INPUT_STR}${magenta}${OUTPUT_STR}${dim}${EMPTY_STR}${reset}"
 
         # Daily token tracking
         DAILY_TOKEN_LEDGER="$HOME/.claude/daily-tokens.json"
-        update_ledger "$DAILY_TOKEN_LEDGER" "$SESSION_ID" "$SESSION_TOKENS" "$TODAY"
+        update_ledger "$DAILY_TOKEN_LEDGER" "$SESSION_ID" "$SESSION_TOKENS" "$TODAY" "$ACCT_TAG"
         DAILY_TOKENS="${LEDGER_RESULT:-0}"
 
         # Session token delta
@@ -271,12 +367,18 @@ if [ -n "$SESSION_ID" ]; then
         }")
 
         TOKEN_SUFFIX=" ${magenta}+${SESSION_TOKEN_FMT}${reset}"
+        if [ "$SUBAGENT_TOKENS" -gt 0 ] 2>/dev/null; then
+            sub_fmt=$(format_tokens "$SUBAGENT_TOKENS")
+            TOKEN_SUFFIX+=" ${dim}+${sub_fmt} sub${reset}"
+        fi
         if [ "$DAILY_TOKENS" -gt "$SESSION_DELTA" ] 2>/dev/null; then
             TOKEN_SUFFIX+=" ${dim}(+${DAILY_TOKEN_FMT}/d)${reset}"
         fi
 
         TOKEN_PCT_COLOR=$(color_for_pct "$TOKEN_PCT")
-        TOKEN_DISPLAY="${TOKEN_BAR} ${TOKEN_PCT_COLOR}$(printf "%3d" "$TOKEN_PCT")%${reset} ${magenta}${TOKEN_M}M${reset}${dim}/${GOAL_M}M${reset}${TOKEN_SUFFIX}"
+        INPUT_M=$(awk "BEGIN {printf \"%.1f\", $TOTAL_INPUT / 1000000}")
+        OUTPUT_M=$(awk "BEGIN {printf \"%.1f\", $TOTAL_OUTPUT / 1000000}")
+        TOKEN_DISPLAY="${TOKEN_BAR} ${TOKEN_PCT_COLOR}$(printf "%3d" "$TOKEN_PCT")%${reset} ${dim}(${reset}${cyan}${INPUT_M}${reset}${dim}+${reset}${magenta}${OUTPUT_M}M${reset}${dim})/${GOAL_M}M${reset}${TOKEN_SUFFIX}"
     fi
 fi
 
@@ -479,7 +581,7 @@ get_oauth_token() {
 # ── Fetch rate limits + profile (background, never blocking) ──
 cache_file="/tmp/claude/statusline-usage-cache.json"
 profile_cache_file="/tmp/claude/statusline-profile-cache.json"
-cache_max_age=60
+cache_max_age=300
 profile_cache_max_age=300
 lock_file="/tmp/claude/statusline-refresh.lock"
 mkdir -p /tmp/claude
@@ -489,6 +591,34 @@ needs_refresh=false
 needs_profile_refresh=false
 now=$(date +%s)
 
+# Detect account switch: if credentials file changed, invalidate caches
+creds_mtime_file="/tmp/claude/statusline-creds-mtime"
+creds_file="$HOME/.claude/.credentials.json"
+if [ -f "$creds_file" ]; then
+    creds_mtime=$(stat -f %m "$creds_file" 2>/dev/null || stat -c %Y "$creds_file" 2>/dev/null)
+    old_creds_mtime=$(cat "$creds_mtime_file" 2>/dev/null)
+    if [ "$old_creds_mtime" != "$creds_mtime" ]; then
+        rm -f "$cache_file" "$profile_cache_file" "$lock_file"
+        echo "$creds_mtime" > "$creds_mtime_file"
+        needs_refresh=true
+        # Synchronous profile fetch on account switch — avoids stale label
+        token=$(get_oauth_token)
+        if [ -n "$token" ] && [ "$token" != "null" ]; then
+            p_response=$(curl -s --max-time 2 \
+                -H "Accept: application/json" \
+                -H "Content-Type: application/json" \
+                -H "Authorization: Bearer $token" \
+                -H "anthropic-beta: oauth-2025-04-20" \
+                -H "User-Agent: claude-code/2.1.34" \
+                "https://api.anthropic.com/api/oauth/profile" 2>/dev/null)
+            if [ -n "$p_response" ] && echo "$p_response" | jq -e '.account' >/dev/null 2>&1; then
+                echo "$p_response" > "$profile_cache_file"
+            fi
+        fi
+        needs_profile_refresh=false
+    fi
+fi
+
 if [ -f "$cache_file" ]; then
     cache_mtime=$(stat -f %m "$cache_file" 2>/dev/null || stat -c %Y "$cache_file" 2>/dev/null)
     cache_age=$(( now - cache_mtime ))
@@ -507,6 +637,14 @@ fi
 
 # Fire-and-forget background refresh (never blocks the status line)
 if $needs_refresh || $needs_profile_refresh; then
+    # Clean up stale lock files (PID dead or lock older than 30s)
+    if [ -f "$lock_file" ]; then
+        lock_pid=$(cat "$lock_file" 2>/dev/null)
+        lock_age=$(( now - $(stat -f %m "$lock_file" 2>/dev/null || stat -c %Y "$lock_file" 2>/dev/null || echo "$now") ))
+        if [ "$lock_age" -gt 30 ] || ! kill -0 "$lock_pid" 2>/dev/null; then
+            rm -f "$lock_file"
+        fi
+    fi
     # Use a lock file to prevent concurrent refreshes from racing
     if (set -o noclobber; echo $$ > "$lock_file") 2>/dev/null; then
         (
@@ -548,14 +686,13 @@ usage_data=""
 profile_data=""
 [ -f "$profile_cache_file" ] && profile_data=$(cat "$profile_cache_file" 2>/dev/null)
 
-# ── Account label ──────────────────────────────────────
+# ── Account label (colorize ACCT_TAG resolved earlier) ──
 ACCOUNT_LABEL=""
-if [ -n "$profile_data" ]; then
-    acct_email=$(echo "$profile_data" | jq -r '.account.email // empty' 2>/dev/null)
-    case "$acct_email" in
-        *@coram.ai)       ACCOUNT_LABEL="${cyan}work${reset}" ;;
-        andrewkent10@gmail.com) ACCOUNT_LABEL="${magenta}personal${reset}" ;;
-        ?*)               ACCOUNT_LABEL="${dim}${acct_email}${reset}" ;;
+if [ -n "$ACCT_TAG" ]; then
+    case "$ACCT_TAG" in
+        work)     ACCOUNT_LABEL="${cyan}work${reset}" ;;
+        personal) ACCOUNT_LABEL="${magenta}personal${reset}" ;;
+        *)        ACCOUNT_LABEL="${dim}${ACCT_TAG}${reset}" ;;
     esac
 fi
 
@@ -857,8 +994,8 @@ render_sparkline() {
         local ts
         ts=$(date +%s)
         local entry
-        entry=$(printf '{"ts":%s,"sid":"%s","cost":%s,"tokens":%s,"ctx":%s,"rate":%s}' \
-            "$ts" "$SESSION_ID" "$COST" "$((INPUT_TOKENS + OUTPUT_TOKENS))" "$CONTEXT_INT" "${five_hour_pct:-0}")
+        entry=$(printf '{"ts":%s,"sid":"%s","cost":%s,"tokens":%s,"sub":%s,"ctx":%s,"rate":%s,"acct":"%s"}' \
+            "$ts" "$SESSION_ID" "$COST" "$((INPUT_TOKENS + OUTPUT_TOKENS))" "${SUBAGENT_TOKENS:-0}" "$CONTEXT_INT" "${five_hour_pct:-0}" "${ACCT_TAG:-}")
         echo "$entry" >> "$history_file"
 
         # Prune: keep only last entry per session, max 100 entries
@@ -1053,6 +1190,11 @@ notify_check
 # ── Format dispatch ───────────────────────────────────────
 FORMAT="${STATUSLINE_FORMAT:-${FORMAT:-default}}"
 
+# ── Set terminal tab title ────────────────────────────────
+TAB_TITLE="${DIR_NAME}"
+[ -n "$BRANCH" ] && [ "$BRANCH" != "main" ] && [ "$BRANCH" != "master" ] && TAB_TITLE="${DIR_NAME} (${SHORT_BRANCH})"
+printf '\033]0;%s\007' "$TAB_TITLE"
+
 case "$FORMAT" in
     sigil)     render_sigil ;;
     rprompt)   render_rprompt ;;

package/package.json

@@ -1,8 +1,15 @@
 {
   "name": "@andrewkent/claude-statusline",
-  "version": "1.0.0",
+  "version": "1.1.2",
   "description": "Rich multi-line status bar for Claude Code — model, cost, context, git, rate limits",
-  "keywords": ["claude", "claude-code", "statusline", "status-bar", "terminal", "cli"],
+  "keywords": [
+    "claude",
+    "claude-code",
+    "statusline",
+    "status-bar",
+    "terminal",
+    "cli"
+  ],
   "author": "Andrew Kent",
   "license": "MIT",
   "repository": {