skill-statusline 2.1.1 → 2.2.1

package/lib/helpers.sh

@@ -1,81 +1,119 @@
-#!/usr/bin/env bash
-# skill-statusline v2 — Shared helpers
-
-# Convert any path to forward slashes (safe on all OS)
-to_fwd() {
-  echo "$1" | tr '\\' '/' | sed 's|//\+|/|g'
-}
-
-# Right-pad a colored string to a visible width
-rpad() {
-  local str="$1" w="$2"
-  local plain
-  plain=$(printf '%b' "$str" | sed $'s/\033\\[[0-9;]*m//g')
-  local vlen=${#plain}
-  local need=$(( w - vlen ))
-  printf '%b' "$str"
-  [ "$need" -gt 0 ] && printf "%${need}s" ""
-}
-
-# Format token count with k/M suffixes
-fmt_tok() {
-  awk -v t="$1" 'BEGIN {
-    if (t >= 1000000) printf "%.1fM", t/1000000
-    else if (t >= 1000) printf "%.0fk", t/1000
-    else printf "%d", t
-  }'
-}
-
-# Format duration from milliseconds to human-readable
-fmt_duration() {
-  awk -v ms="$1" 'BEGIN {
-    s = int(ms / 1000)
-    if (s < 60) printf "%ds", s
-    else if (s < 3600) printf "%dm%ds", int(s/60), s%60
-    else printf "%dh%dm", int(s/3600), int((s%3600)/60)
-  }'
-}
-
-# ── Filesystem caching with TTL ──
-
-CACHE_DIR="/tmp/sl-cache-${USER:-unknown}"
-CACHE_TTL="${SL_CACHE_TTL:-5}"
-
-_sl_cache_init() {
-  [ -d "$CACHE_DIR" ] || mkdir -p "$CACHE_DIR" 2>/dev/null
-}
-
-# cache_get "key" "command" [ttl_seconds]
-# Returns cached result if fresh, otherwise runs command and caches
-cache_get() {
-  local key="$1" cmd="$2" ttl="${3:-$CACHE_TTL}"
-  local f="${CACHE_DIR}/${key}"
-
-  if [ -f "$f" ]; then
-    local now mtime age
-    now=$(date +%s)
-    # Cross-platform stat: Linux/Git Bash vs macOS
-    if stat -c %Y /dev/null >/dev/null 2>&1; then
-      mtime=$(stat -c %Y "$f" 2>/dev/null)
-    else
-      mtime=$(stat -f %m "$f" 2>/dev/null)
-    fi
-    if [ -n "$mtime" ]; then
-      age=$(( now - mtime ))
-      if [ "$age" -lt "$ttl" ]; then
-        cat "$f"
-        return 0
-      fi
-    fi
-  fi
-
-  local result
-  result=$(eval "$cmd" 2>/dev/null)
-  printf '%s' "$result" > "$f" 2>/dev/null
-  printf '%s' "$result"
-}
-
-# Clear all cached data
-cache_clear() {
-  [ -d "$CACHE_DIR" ] && rm -f "${CACHE_DIR}"/* 2>/dev/null
-}
+#!/usr/bin/env bash
+# skill-statusline v2 — Shared helpers
+
+# Convert any path to forward slashes (safe on all OS)
+to_fwd() {
+  echo "$1" | tr '\\' '/' | sed 's|//\+|/|g'
+}
+
+# Right-pad a colored string to a visible width
+rpad() {
+  local str="$1" w="$2"
+  local plain
+  plain=$(printf '%b' "$str" | sed $'s/\033\\[[0-9;]*m//g')
+  local vlen=${#plain}
+  local need=$(( w - vlen ))
+  printf '%b' "$str"
+  [ "$need" -gt 0 ] && printf "%${need}s" ""
+}
+
+# Format token count with k/M suffixes
+fmt_tok() {
+  awk -v t="$1" 'BEGIN {
+    if (t >= 1000000) printf "%.1fM", t/1000000
+    else if (t >= 1000) printf "%.0fk", t/1000
+    else printf "%d", t
+  }'
+}
+
+# Format duration from milliseconds to human-readable
+fmt_duration() {
+  awk -v ms="$1" 'BEGIN {
+    s = int(ms / 1000)
+    if (s < 60) printf "%ds", s
+    else if (s < 3600) printf "%dm%ds", int(s/60), s%60
+    else printf "%dh%dm", int(s/3600), int((s%3600)/60)
+  }'
+}
+
+# ── Run a command with a timeout (seconds) ──
+# Usage: run_with_timeout <seconds> <command...>
+# Returns empty string if timeout exceeded
+run_with_timeout() {
+  local secs="$1"; shift
+  if command -v timeout >/dev/null 2>&1; then
+    timeout "$secs" "$@" 2>/dev/null
+  else
+    # Fallback: background + wait (POSIX-ish)
+    "$@" 2>/dev/null &
+    local pid=$!
+    local i=0
+    while [ $i -lt $(( secs * 10 )) ]; do
+      if ! kill -0 "$pid" 2>/dev/null; then
+        wait "$pid" 2>/dev/null
+        return $?
+      fi
+      sleep 0.1
+      i=$((i + 1))
+    done
+    kill "$pid" 2>/dev/null
+    wait "$pid" 2>/dev/null
+    return 124
+  fi
+}
+
+# ── Filesystem caching with TTL ──
+
+CACHE_DIR="/tmp/sl-cache-${USER:-unknown}"
+CACHE_TTL="${SL_CACHE_TTL:-5}"
+
+# Detect stat flavor once (not on every cache check)
+_SL_STAT_GNU=""
+_sl_cache_init() {
+  [ -d "$CACHE_DIR" ] || mkdir -p "$CACHE_DIR" 2>/dev/null
+  # Detect stat syntax once and cache the result
+  if stat -c %Y "$CACHE_DIR" >/dev/null 2>&1; then
+    _SL_STAT_GNU="yes"
+  else
+    _SL_STAT_GNU="no"
+  fi
+}
+
+# Get file mtime using cached stat detection
+_sl_file_mtime() {
+  if [ "$_SL_STAT_GNU" = "yes" ]; then
+    stat -c %Y "$1" 2>/dev/null
+  else
+    stat -f %m "$1" 2>/dev/null
+  fi
+}
+
+# cache_get "key" "command" [ttl_seconds]
+# Returns cached result if fresh, otherwise runs command and caches
+cache_get() {
+  local key="$1" cmd="$2" ttl="${3:-$CACHE_TTL}"
+  local f="${CACHE_DIR}/${key}"
+
+  if [ -f "$f" ]; then
+    local now mtime age
+    now=$(date +%s)
+    mtime=$(_sl_file_mtime "$f")
+    if [ -n "$mtime" ]; then
+      age=$(( now - mtime ))
+      if [ "$age" -lt "$ttl" ]; then
+        cat "$f"
+        return 0
+      fi
+    fi
+  fi
+
+  local result
+  result=$(eval "$cmd" 2>/dev/null)
+  printf '%s' "$result" > "$f" 2>/dev/null
+  printf '%s' "$result"
+}
+
+# Clear all cached data
+cache_clear() {
+  [ -d "$CACHE_DIR" ] && rm -f "${CACHE_DIR}"/* 2>/dev/null
+}

package/lib/json-parser.sh

@@ -1,71 +1,150 @@
 #!/usr/bin/env bash
-# skill-statusline v2 — JSON parser (no jq, pure grep/sed)
-# Handles both flat and nested Claude Code JSON structures
+# skill-statusline v2 — JSON parser (no jq, single awk pass)
+# Extracts ALL needed fields in one pass for speed on Windows/Git Bash
 
-# ── Flat parsers (v1 compat fallback) ──
+# ── Bulk parser: extract all fields at once ──
+# Sets SL_J_* variables for all known fields
+# This avoids spawning 100+ subshells (grep|sed|head per field)
+sl_parse_json() {
+  eval "$(echo "$input" | awk '
+  BEGIN { FS="" }
+  {
+    s = s $0
+  }
+  END {
+    # Helper: extract "key":value from a string
+    # For strings: "key":"value"
+    # For numbers: "key":number
 
-# Extract a quoted string value: json_val "key" → value
-json_val() {
-  echo "$input" | grep -o "\"$1\"[[:space:]]*:[[:space:]]*\"[^\"]*\"" | head -1 | sed 's/.*:.*"\(.*\)"/\1/'
-}
+    # Top-level strings
+    extract_str(s, "cwd")
+    extract_str(s, "version")
+    extract_str(s, "session_id")
 
-# Extract a numeric value: json_num "key" → number
-json_num() {
-  echo "$input" | grep -o "\"$1\"[[:space:]]*:[[:space:]]*[0-9.]*" | head -1 | sed 's/.*:[[:space:]]*//'
-}
+    # model object
+    extract_nested_str(s, "model", "id")
+    extract_nested_str(s, "model", "display_name")
 
-# ── Nested parsers (v2 — handles Claude Code's real JSON structure) ──
+    # workspace object
+    extract_nested_str(s, "workspace", "current_dir")
+    extract_nested_str(s, "workspace", "project_dir")
 
-# Extract numeric from single-nested object: json_nested "context_window" "used_percentage"
-json_nested() {
-  local parent="$1" key="$2"
-  local block
-  block=$(echo "$input" | sed -n 's/.*"'"$parent"'"[[:space:]]*:[[:space:]]*{\([^}]*\)}.*/\1/p' | head -1)
-  if [ -n "$block" ]; then
-    echo "$block" | grep -o "\"$key\"[[:space:]]*:[[:space:]]*[0-9.]*" | head -1 | sed 's/.*:[[:space:]]*//'
-  fi
-}
+    # cost object
+    extract_nested_num(s, "cost", "total_cost_usd")
+    extract_nested_num(s, "cost", "total_duration_ms")
+    extract_nested_num(s, "cost", "total_api_duration_ms")
+    extract_nested_num(s, "cost", "total_lines_added")
+    extract_nested_num(s, "cost", "total_lines_removed")
 
-# Extract string from single-nested object: json_nested_val "model" "display_name"
-json_nested_val() {
-  local parent="$1" key="$2"
-  local block
-  block=$(echo "$input" | sed -n 's/.*"'"$parent"'"[[:space:]]*:[[:space:]]*{\([^}]*\)}.*/\1/p' | head -1)
-  if [ -n "$block" ]; then
-    echo "$block" | grep -o "\"$key\"[[:space:]]*:[[:space:]]*\"[^\"]*\"" | head -1 | sed 's/.*:.*"\(.*\)"/\1/'
-  fi
-}
+    # context_window object
+    extract_nested_num(s, "context_window", "context_window_size")
+    extract_nested_num(s, "context_window", "used_percentage")
+    extract_nested_num(s, "context_window", "remaining_percentage")
+    extract_nested_num(s, "context_window", "total_input_tokens")
+    extract_nested_num(s, "context_window", "total_output_tokens")
+
+    # context_window.current_usage (double-nested)
+    extract_deep_num(s, "context_window", "current_usage", "input_tokens")
+    extract_deep_num(s, "context_window", "current_usage", "output_tokens")
+    extract_deep_num(s, "context_window", "current_usage", "cache_creation_input_tokens")
+    extract_deep_num(s, "context_window", "current_usage", "cache_read_input_tokens")
+
+    # vim object
+    extract_nested_str(s, "vim", "mode")
+
+    # agent object
+    extract_nested_str(s, "agent", "name")
 
-# Extract numeric from double-nested: json_deep "context_window" "current_usage" "input_tokens"
-# Handles: {"context_window":{..."current_usage":{"input_tokens":8500}...}}
-json_deep() {
-  local p1="$1" p2="$2" key="$3"
-  local outer inner
-  # Get everything inside the outer object (greedy — captures nested braces)
-  outer=$(echo "$input" | sed -n 's/.*"'"$p1"'"[[:space:]]*:[[:space:]]*{\(.*\)}/\1/p' | head -1)
-  if [ -n "$outer" ]; then
-    # Now extract the inner object
-    inner=$(echo "$outer" | sed -n 's/.*"'"$p2"'"[[:space:]]*:[[:space:]]*{\([^}]*\)}.*/\1/p' | head -1)
-    if [ -n "$inner" ]; then
-      echo "$inner" | grep -o "\"$key\"[[:space:]]*:[[:space:]]*[0-9.]*" | head -1 | sed 's/.*:[[:space:]]*//'
-    fi
-  fi
+    # boolean
+    if (match(s, /"exceeds_200k_tokens"[ \t]*:[ \t]*true/)) {
+      print "SL_J_exceeds_200k_tokens=true"
+    }
+  }
+
+  function varname(parts,    r, i) {
+    r = "SL_J"
+    for (i = 1; i <= length(parts); i++) {
+      r = r "_" parts[i]
+    }
+    return r
+  }
+
+  function extract_str(json, key,    pat, val, pos, rest) {
+    pat = "\"" key "\"[ \t]*:[ \t]*\""
+    if (match(json, pat)) {
+      rest = substr(json, RSTART + RLENGTH)
+      if (match(rest, /^[^"]*/)) {
+        val = substr(rest, 1, RLENGTH)
+        gsub(/'\''/, "'\''\\'\'''\''", val)
+        print "SL_J_" key "='\''" val "'\''"
+      }
+    }
+  }
+
+  function extract_nested_str(json, parent, key,    pat, block, rest) {
+    pat = "\"" parent "\"[ \t]*:[ \t]*\\{"
+    if (match(json, pat)) {
+      rest = substr(json, RSTART + RLENGTH)
+      # Find matching brace (simple: first })
+      if (match(rest, /[^}]*/)) {
+        block = substr(rest, 1, RLENGTH)
+        pat = "\"" key "\"[ \t]*:[ \t]*\""
+        if (match(block, pat)) {
+          rest = substr(block, RSTART + RLENGTH)
+          if (match(rest, /^[^"]*/)) {
+            val = substr(rest, 1, RLENGTH)
+            gsub(/'\''/, "'\''\\'\'''\''", val)
+            print "SL_J_" parent "_" key "='\''" val "'\''"
+          }
+        }
+      }
+    }
+  }
+
+  function extract_nested_num(json, parent, key,    pat, block, rest, val) {
+    pat = "\"" parent "\"[ \t]*:[ \t]*\\{"
+    if (match(json, pat)) {
+      rest = substr(json, RSTART + RLENGTH)
+      # For nested nums, search the full remainder (handles double-nested too)
+      block = rest
+      pat = "\"" key "\"[ \t]*:[ \t]*"
+      if (match(block, pat)) {
+        rest = substr(block, RSTART + RLENGTH)
+        if (match(rest, /^[0-9.]+/)) {
+          val = substr(rest, 1, RLENGTH)
+          print "SL_J_" parent "_" key "=" val
+        }
+      }
+    }
+  }
+
+  function extract_deep_num(json, p1, p2, key,    pat, outer, inner, rest, val) {
+    pat = "\"" p1 "\"[ \t]*:[ \t]*\\{"
+    if (match(json, pat)) {
+      outer = substr(json, RSTART + RLENGTH)
+      pat = "\"" p2 "\"[ \t]*:[ \t]*\\{"
+      if (match(outer, pat)) {
+        inner = substr(outer, RSTART + RLENGTH)
+        pat = "\"" key "\"[ \t]*:[ \t]*"
+        if (match(inner, pat)) {
+          rest = substr(inner, RSTART + RLENGTH)
+          if (match(rest, /^[0-9.]+/)) {
+            val = substr(rest, 1, RLENGTH)
+            print "SL_J_" p1 "_" p2 "_" key "=" val
+          }
+        }
+      }
+    }
+  }
+  ')"
 }
 
-# Extract string from double-nested: json_deep_val "context_window" "current_usage" "mode"
-json_deep_val() {
-  local p1="$1" p2="$2" key="$3"
-  local outer inner
-  outer=$(echo "$input" | sed -n 's/.*"'"$p1"'"[[:space:]]*:[[:space:]]*{\(.*\)}/\1/p' | head -1)
-  if [ -n "$outer" ]; then
-    inner=$(echo "$outer" | sed -n 's/.*"'"$p2"'"[[:space:]]*:[[:space:]]*{\([^}]*\)}.*/\1/p' | head -1)
-    if [ -n "$inner" ]; then
-      echo "$inner" | grep -o "\"$key\"[[:space:]]*:[[:space:]]*\"[^\"]*\"" | head -1 | sed 's/.*:.*"\(.*\)"/\1/'
-    fi
-  fi
+# ── Legacy single-field parsers (for v1 fallback only) ──
+
+json_val() {
+  echo "$input" | grep -o "\"$1\"[[:space:]]*:[[:space:]]*\"[^\"]*\"" | head -1 | sed 's/.*:.*"\(.*\)"/\1/'
 }
 
-# Extract boolean: json_bool "exceeds_200k_tokens" → "true" or ""
-json_bool() {
-  echo "$input" | grep -o "\"$1\"[[:space:]]*:[[:space:]]*true" | head -1 | sed 's/.*:[[:space:]]*//'
+json_num() {
+  echo "$input" | grep -o "\"$1\"[[:space:]]*:[[:space:]]*[0-9.]*" | head -1 | sed 's/.*:[[:space:]]*//'
 }

package/package.json

@@ -1,52 +1,52 @@
-{
-  "name": "skill-statusline",
-  "version": "2.1.1",
-  "description": "Rich, themeable statusline for Claude Code — accurate context tracking, 5 themes, 3 layouts, token/cost/GitHub/skill display. Pure bash, zero deps.",
-  "bin": {
-    "skill-statusline": "bin/cli.js",
-    "ccsl": "bin/cli.js"
-  },
-  "files": [
-    "bin/",
-    "lib/",
-    "themes/",
-    "layouts/",
-    "commands/",
-    "README.md",
-    "LICENSE"
-  ],
-  "scripts": {
-    "test": "bash test/run-all.sh"
-  },
-  "keywords": [
-    "claude-code",
-    "statusline",
-    "status-bar",
-    "cli",
-    "claude",
-    "anthropic",
-    "ai-coding",
-    "developer-tools",
-    "terminal",
-    "prompt",
-    "themes",
-    "context-window",
-    "token-tracking"
-  ],
-  "author": {
-    "name": "Anit Chaudhary",
-    "url": "https://github.com/AnitChaudhry"
-  },
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/AnitChaudhry/skill-statusline.git"
-  },
-  "homepage": "https://skills.thinqmesh.com",
-  "bugs": {
-    "url": "https://github.com/AnitChaudhry/skill-statusline/issues"
-  },
-  "engines": {
-    "node": ">=16"
-  }
-}
+{
+  "name": "skill-statusline",
+  "version": "2.2.1",
+  "description": "Rich, themeable statusline for Claude Code — accurate context tracking, 5 themes, 3 layouts, token/cost/GitHub/skill display. Pure bash, zero deps.",
+  "bin": {
+    "skill-statusline": "bin/cli.js",
+    "ccsl": "bin/cli.js"
+  },
+  "files": [
+    "bin/",
+    "lib/",
+    "themes/",
+    "layouts/",
+    "commands/",
+    "README.md",
+    "LICENSE"
+  ],
+  "scripts": {
+    "test": "bash test/run-all.sh"
+  },
+  "keywords": [
+    "claude-code",
+    "statusline",
+    "status-bar",
+    "cli",
+    "claude",
+    "anthropic",
+    "ai-coding",
+    "developer-tools",
+    "terminal",
+    "prompt",
+    "themes",
+    "context-window",
+    "token-tracking"
+  ],
+  "author": {
+    "name": "Anit Chaudhary",
+    "url": "https://github.com/AnitChaudhry"
+  },
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/AnitChaudhry/skill-statusline.git"
+  },
+  "homepage": "https://skills.thinqmesh.com",
+  "bugs": {
+    "url": "https://github.com/AnitChaudhry/skill-statusline/issues"
+  },
+  "engines": {
+    "node": ">=16"
+  }
+}