@tekmidian/pai 0.39.0 → 0.40.0

package/statusline-command.sh

@@ -35,8 +35,18 @@ DA_COLOR="${DA_COLOR:-purple}"  # Color for the assistant name
 # Extract data from JSON input
 current_dir=$(echo "$input" | jq -r '.workspace.current_dir')
 model_name=$(echo "$input" | jq -r '.model.display_name')
+model_id=$(echo "$input" | jq -r '.model.id // .model.display_name // empty')
 cc_version=$(echo "$input" | jq -r '.version // "unknown"')
 
+# Provider detection: strip any [...] suffix (e.g. the [1m] context marker)
+# so "glm-5.3[1m]" is recognized as a glm model. glm sessions read their plan
+# usage from Z.ai, everything else keeps the Anthropic OAuth path.
+model_base="${model_id%%\[*}"
+is_glm=0
+case "$model_base" in
+    [Gg][Ll][Mm]*) is_glm=1 ;;
+esac
+
 # Get directory name
 dir_name=$(basename "$current_dir")
 
@@ -112,7 +122,14 @@ fi
 
 # Extract context window usage from Claude Code's JSON input (no JSONL parsing needed)
 context_pct=$(echo "$input" | jq -r '.context_window.used_percentage // 0' 2>/dev/null)
-context_size=$(echo "$input" | jq -r '.context_window.context_window_size // 200000' 2>/dev/null)
+# When the payload omits the window size, derive it from the model id instead
+# of assuming 200k for every model: [1m] models carry a 1M window, everything
+# else keeps the claude default. This value is persisted below for hooks.
+default_context_size=200000
+case "$model_id" in
+    *"[1m]") default_context_size=1000000 ;;
+esac
+context_size=$(echo "$input" | jq -r --argjson d "$default_context_size" '.context_window.context_window_size // $d' 2>/dev/null)
 context_used_k=$(( (context_pct * context_size / 100) / 1000 ))
 context_max_k=$((context_size / 1000))
 
@@ -125,7 +142,7 @@ if [ -n "$statusline_session_id" ]; then
     context_state_file="${TMPDIR:-/tmp}/pai-context-${statusline_session_id}.json"
     jq -n \
         --argjson used_percentage "${context_pct:-0}" \
-        --argjson context_window_size "${context_size:-200000}" \
+        --argjson context_window_size "${context_size:-$default_context_size}" \
         --arg session_id "$statusline_session_id" \
         --argjson timestamp "$(date +%s000)" \
         '{used_percentage: $used_percentage, context_window_size: $context_window_size, session_id: $session_id, timestamp: $timestamp}' \
@@ -347,11 +364,22 @@ if [ -n "$mcp_line2" ]; then
 fi
 
 
-# Fetch OAuth usage (5-hour current + 7-day weekly) with caching
+# Usage suffix: provider-aware. glm sessions read the Z.ai plan quota
+# (5-hour + weekly credit windows), everything else keeps the Anthropic
+# OAuth path (5-hour + 1d pace + 7-day). Both cache for usage_cache_ttl.
 usage_cache="/tmp/claude/statusline-usage-cache.json"
+zai_cache="/tmp/claude/statusline-zai-cache.json"
 usage_cache_ttl=60  # seconds
 usage_suffix=""
 
+# Color based on utilization: green < 50%, yellow 50-75%, red > 75%
+_usage_color() {
+    local pct=$1
+    if [ "$pct" -gt 75 ] 2>/dev/null; then echo "$BRIGHT_RED"
+    elif [ "$pct" -gt 50 ] 2>/dev/null; then echo "$BRIGHT_YELLOW"
+    else echo "$BRIGHT_GREEN"; fi
+}
+
 _fetch_usage() {
     # Try to get OAuth token from macOS Keychain
     local token=""
@@ -367,18 +395,21 @@ _fetch_usage() {
     [ -n "$response" ] && echo "$response" > "$usage_cache"
 }
 
-# Use cache if fresh, otherwise fetch in background
-if [ -f "$usage_cache" ]; then
-    cache_age=$(( $(date +%s) - $(stat -f %m "$usage_cache" 2>/dev/null || echo 0) ))
-    if [ "$cache_age" -gt "$usage_cache_ttl" ]; then
+# Use cache if fresh, otherwise fetch in background (Anthropic plan only)
+if [ "$is_glm" -eq 0 ]; then
+    if [ -f "$usage_cache" ]; then
+        cache_age=$(( $(date +%s) - $(stat -f %m "$usage_cache" 2>/dev/null || echo 0) ))
+        if [ "$cache_age" -gt "$usage_cache_ttl" ]; then
+            _fetch_usage &
+        fi
+    else
         _fetch_usage &
     fi
-else
-    _fetch_usage &
 fi
 
-# Read cached usage data
-if [ -f "$usage_cache" ]; then
+# Read cached usage data — skipped on glm sessions so Anthropic-plan numbers
+# (usage line AND the advisor-mode budget file) never leak into a glm statusline
+if [ "$is_glm" -eq 0 ] && [ -f "$usage_cache" ]; then
     five_hour=$(jq -r '.five_hour.utilization // 0' "$usage_cache" 2>/dev/null)
     seven_day=$(jq -r '.seven_day.utilization // 0' "$usage_cache" 2>/dev/null)
     five_reset=$(jq -r '.five_hour.resets_at // empty' "$usage_cache" 2>/dev/null)
@@ -406,14 +437,6 @@ if [ -f "$usage_cache" ]; then
         seven_reset_fmt=$([ "$seven_reset_epoch" -gt 0 ] 2>/dev/null && date -r "$seven_reset_epoch" "+%a %H:%M" 2>/dev/null || echo "")
     fi
 
-    # Color based on utilization: green < 50%, yellow 50-75%, red > 75%
-    _usage_color() {
-        local pct=$1
-        if [ "$pct" -gt 75 ] 2>/dev/null; then echo "$BRIGHT_RED"
-        elif [ "$pct" -gt 50 ] 2>/dev/null; then echo "$BRIGHT_YELLOW"
-        else echo "$BRIGHT_GREEN"; fi
-    }
-
     five_color=$(_usage_color "$five_hour_int")
     seven_color=$(_usage_color "$seven_day_int")
 
@@ -504,6 +527,80 @@ if [ -f "$usage_cache" ]; then
     usage_suffix="${usage_suffix} ${SEPARATOR_COLOR}│${RESET} ${seven_color}${seven_label}${RESET}"
 fi
 
+# Z.ai plan quota (glm sessions). The monitor endpoint exposes two credit
+# windows: limits[] number==5 is the 5-hour window, number==1 the weekly one
+# (nextResetTime in epoch ms) — no 1d window exists on this plan, so none is
+# rendered. PAI_ZAI_QUOTA_URL overrides the endpoint (kill switch / testing).
+_fetch_zai_usage() {
+    local key="${ZAI_API_KEY:-}"
+    if [ -z "$key" ] && [ -f "$HOME/.config/zai/api_key" ]; then
+        key=$(tr -d '[:space:]' < "$HOME/.config/zai/api_key")
+    fi
+    [ -n "$key" ] || return
+    mkdir -p /tmp/claude
+    local response
+    response=$(curl -sf --max-time 3 \
+        -H "Authorization: Bearer $key" \
+        -H "Accept: application/json" \
+        "${PAI_ZAI_QUOTA_URL:-https://api.z.ai/api/monitor/usage/quota/limit}" 2>/dev/null)
+    # A bad key returns HTTP 200 with empty limits — only cache responses
+    # that actually carry quota windows, so a broken fetch is never cached.
+    if [ -n "$response" ] && echo "$response" | jq -e '.data.limits | length > 0' >/dev/null 2>&1; then
+        echo "$response" > "$zai_cache"
+    fi
+}
+
+if [ "$is_glm" -eq 1 ]; then
+    # Use cache if fresh, otherwise fetch in background
+    if [ -f "$zai_cache" ]; then
+        cache_age=$(( $(date +%s) - $(stat -f %m "$zai_cache" 2>/dev/null || echo 0) ))
+        if [ "$cache_age" -gt "$usage_cache_ttl" ]; then
+            _fetch_zai_usage &
+        fi
+    else
+        _fetch_zai_usage &
+    fi
+
+    zai_five_pct=""
+    zai_seven_pct=""
+    zai_five_reset_ms=""
+    zai_seven_reset_ms=""
+    if [ -f "$zai_cache" ]; then
+        zai_five_pct=$(jq -r '.data.limits[]? | select(.number == 5) | .percentage' "$zai_cache" 2>/dev/null | head -1)
+        zai_seven_pct=$(jq -r '.data.limits[]? | select(.number == 1) | .percentage' "$zai_cache" 2>/dev/null | head -1)
+        zai_five_reset_ms=$(jq -r '.data.limits[]? | select(.number == 5) | .nextResetTime' "$zai_cache" 2>/dev/null | head -1)
+        zai_seven_reset_ms=$(jq -r '.data.limits[]? | select(.number == 1) | .nextResetTime' "$zai_cache" 2>/dev/null | head -1)
+    fi
+
+    if [ -n "$zai_five_pct" ] && [ "$zai_five_pct" != "null" ]; then
+        zai_five_int=$(printf "%.0f" "$zai_five_pct" 2>/dev/null || echo "?")
+        zai_five_reset_fmt=""
+        if [ -n "$zai_five_reset_ms" ] && [ "$zai_five_reset_ms" != "null" ]; then
+            # nextResetTime is epoch milliseconds; date -r wants seconds
+            zai_five_epoch=$(( zai_five_reset_ms / 1000 ))
+            [ "$zai_five_epoch" -gt 0 ] 2>/dev/null && zai_five_reset_fmt=$(date -r "$zai_five_epoch" "+%H:%M" 2>/dev/null || echo "")
+        fi
+        zai_five_label="zai 5h: ${zai_five_int}%%"
+        [ -n "$zai_five_reset_fmt" ] && zai_five_label="${zai_five_label} → ${zai_five_reset_fmt}"
+        usage_suffix=" ${SEPARATOR_COLOR}│${RESET} $(_usage_color "$zai_five_int")${zai_five_label}${RESET}"
+        if [ -n "$zai_seven_pct" ] && [ "$zai_seven_pct" != "null" ]; then
+            zai_seven_int=$(printf "%.0f" "$zai_seven_pct" 2>/dev/null || echo "?")
+            zai_seven_reset_fmt=""
+            if [ -n "$zai_seven_reset_ms" ] && [ "$zai_seven_reset_ms" != "null" ]; then
+                zai_seven_epoch=$(( zai_seven_reset_ms / 1000 ))
+                [ "$zai_seven_epoch" -gt 0 ] 2>/dev/null && zai_seven_reset_fmt=$(date -r "$zai_seven_epoch" "+%a %H:%M" 2>/dev/null || echo "")
+            fi
+            zai_seven_label="7d: ${zai_seven_int}%%"
+            [ -n "$zai_seven_reset_fmt" ] && zai_seven_label="${zai_seven_label} → ${zai_seven_reset_fmt}"
+            usage_suffix="${usage_suffix} ${SEPARATOR_COLOR}│${RESET} $(_usage_color "$zai_seven_int")${zai_seven_label}${RESET}"
+        fi
+    else
+        # No key, timeout, non-200 or empty limits — show the marker instead
+        # of silently falling back to Anthropic-plan numbers.
+        usage_suffix=" ${SEPARATOR_COLOR}│${RESET} ${LINE3_ACCENT}zai 5h: ?${RESET}"
+    fi
+fi
+
 # LINE 3 - Context meter + usage limits
 # Auto-compact remaining: how much context left until compaction triggers
 ac_threshold="${CLAUDE_AUTOCOMPACT_PCT_OVERRIDE:-80}"
@@ -517,7 +614,7 @@ elif [ "$ac_remaining" -le 15 ] 2>/dev/null; then
 else
     ac_color="$BRIGHT_GREEN"
 fi
-ac_suffix=" ${ac_color}(${ac_remaining}%%)${RESET}"
+ac_suffix=" ${ac_color}(${ac_remaining}%% left)${RESET}"
 
 if [ "$context_pct" -gt 0 ] 2>/dev/null; then
     # Color based on usage: green < 50%, yellow 50-75%, red > 75%
@@ -545,7 +642,9 @@ elif command -v pai >/dev/null 2>&1; then
     worker_status_cmd="pai worker status-line"
 fi
 if [ -n "$worker_status_cmd" ]; then
-    worker_line="$("$worker_status_cmd" "${ITERM_SESSION_ID:-}" "${PWD:-}" 2>/dev/null)"
+    # third arg: this session's claude id — lets the worker line claim workers
+    # spawned from this session's Bash tool, which carry no terminal identity
+    worker_line="$("$worker_status_cmd" "${ITERM_SESSION_ID:-}" "${PWD:-}" "${statusline_session_id:-}" 2>/dev/null)"
     if [ -n "$worker_line" ]; then
         printf "${LINE3_PRIMARY}🐝 ${RESET}${LINE3_ACCENT}%s${RESET}\n" "$worker_line"
     fi