@chongdashu/cc-statusline 1.3.2 → 1.4.0

package/dist/index.js

@@ -61,12 +61,36 @@ function generateMockClaudeInput(config) {
     transcript_path: "/home/user/.claude/conversations/test.jsonl",
     cwd: "/home/user/projects/my-project",
     workspace: {
-      current_dir: "/home/user/projects/my-project"
+      current_dir: "/home/user/projects/my-project",
+      project_dir: "/home/user/projects/my-project"
     },
     model: {
       id: "claude-opus-4-1-20250805",
       display_name: "Opus 4.1",
       version: "20250805"
+    },
+    version: "1.0.80",
+    output_style: {
+      name: "default"
+    },
+    cost: {
+      total_cost_usd: 0.42,
+      total_duration_ms: 18e4,
+      // 3 minutes
+      total_api_duration_ms: 2300,
+      total_lines_added: 156,
+      total_lines_removed: 23
+    },
+    context_window: {
+      total_input_tokens: 15234,
+      total_output_tokens: 4521,
+      context_window_size: 2e5,
+      current_usage: {
+        input_tokens: 8500,
+        output_tokens: 1200,
+        cache_creation_input_tokens: 5e3,
+        cache_read_input_tokens: 2e3
+      }
     }
   };
 }
@@ -310,9 +334,9 @@ async function collectConfiguration() {
         { name: "\u{1F916} Model Name & Version", value: "model", checked: true },
         { name: "\u{1F9E0} Context Remaining", value: "context", checked: true },
         { name: "\u{1F4B5} Usage & Cost", value: "usage", checked: true },
-        { name: "\u231B Session Time Remaining", value: "session", checked: true },
         { name: "\u{1F4CA} Token Statistics", value: "tokens", checked: true },
-        { name: "\u26A1 Burn Rate (tokens/min)", value: "burnrate", checked: true }
+        { name: "\u26A1 Burn Rate ($/hr & tokens/min)", value: "burnrate", checked: true },
+        { name: "\u231B Session Reset Time (requires ccusage)", value: "session", checked: false }
       ],
       validate: (answer) => {
         if (answer.length < 1) {
@@ -345,13 +369,13 @@ async function collectConfiguration() {
       default: "project"
     }
   ]);
+  const needsCcusage = config.features.includes("session");
   return {
     features: config.features,
     runtime: "bash",
     colors: config.colors,
     theme: "detailed",
-    ccusageIntegration: true,
-    // Always enabled since npx works
+    ccusageIntegration: needsCcusage,
     logging: config.logging,
     customEmojis: false,
     installLocation: config.installLocation
@@ -440,60 +464,82 @@ cost_color() { :; }
 burn_color() { :; }
 session_color() { :; }
 `;
+  const needsCcusage = config.showSession || config.showProgressBar;
   return `${colorCode}
 # ---- cost and usage extraction ----
 session_txt=""; session_pct=0; session_bar=""
 cost_usd=""; cost_per_hour=""; tpm=""; tot_tokens=""
 
-# Extract cost data from Claude Code input
+# Extract cost and token data from Claude Code's native input
 if [ "$HAS_JQ" -eq 1 ]; then
-  # Get cost data from Claude Code's input
+  # Cost data
   cost_usd=$(echo "$input" | jq -r '.cost.total_cost_usd // empty' 2>/dev/null)
   total_duration_ms=$(echo "$input" | jq -r '.cost.total_duration_ms // empty' 2>/dev/null)
-  
+
   # Calculate burn rate ($/hour) from cost and duration
   if [ -n "$cost_usd" ] && [ -n "$total_duration_ms" ] && [ "$total_duration_ms" -gt 0 ]; then
-    # Convert ms to hours and calculate rate
     cost_per_hour=$(echo "$cost_usd $total_duration_ms" | awk '{printf "%.2f", $1 * 3600000 / $2}')
   fi
+${config.showTokens ? `
+  # Token data from native context_window (no ccusage needed)
+  input_tokens=$(echo "$input" | jq -r '.context_window.total_input_tokens // 0' 2>/dev/null)
+  output_tokens=$(echo "$input" | jq -r '.context_window.total_output_tokens // 0' 2>/dev/null)
+
+  if [ "$input_tokens" != "null" ] && [ "$output_tokens" != "null" ]; then
+    tot_tokens=$(( input_tokens + output_tokens ))
+    [ "$tot_tokens" -eq 0 ] && tot_tokens=""
+  fi` : ""}
+${config.showBurnRate && config.showTokens ? `
+  # Calculate tokens per minute from native data
+  if [ -n "$tot_tokens" ] && [ -n "$total_duration_ms" ] && [ "$total_duration_ms" -gt 0 ]; then
+    # Convert ms to minutes and calculate rate
+    tpm=$(echo "$tot_tokens $total_duration_ms" | awk '{if ($2 > 0) printf "%.0f", $1 * 60000 / $2; else print ""}')
+  fi` : ""}
 else
   # Bash fallback for cost extraction
   cost_usd=$(echo "$input" | grep -o '"total_cost_usd"[[:space:]]*:[[:space:]]*[0-9.]*' | sed 's/.*:[[:space:]]*\\([0-9.]*\\).*/\\1/')
-  total_duration_ms=$(echo "$input" | grep -o '"total_duration_ms"[[:space:]]*:[[:space:]]*[0-9]*' | sed 's/.*:[[:space:]]*\\([0-9]*\\).*/\\1/')  
-  
+  total_duration_ms=$(echo "$input" | grep -o '"total_duration_ms"[[:space:]]*:[[:space:]]*[0-9]*' | sed 's/.*:[[:space:]]*\\([0-9]*\\).*/\\1/')
+
   # Calculate burn rate ($/hour) from cost and duration
   if [ -n "$cost_usd" ] && [ -n "$total_duration_ms" ] && [ "$total_duration_ms" -gt 0 ]; then
-    # Convert ms to hours and calculate rate
     cost_per_hour=$(echo "$cost_usd $total_duration_ms" | awk '{printf "%.2f", $1 * 3600000 / $2}')
   fi
-fi
+${config.showTokens ? `
+  # Token data from native context_window (bash fallback)
+  input_tokens=$(echo "$input" | grep -o '"total_input_tokens"[[:space:]]*:[[:space:]]*[0-9]*' | sed 's/.*:[[:space:]]*\\([0-9]*\\).*/\\1/')
+  output_tokens=$(echo "$input" | grep -o '"total_output_tokens"[[:space:]]*:[[:space:]]*[0-9]*' | sed 's/.*:[[:space:]]*\\([0-9]*\\).*/\\1/')
 
-# Get token data and session info from ccusage if available
+  if [ -n "$input_tokens" ] && [ -n "$output_tokens" ]; then
+    tot_tokens=$(( input_tokens + output_tokens ))
+    [ "$tot_tokens" -eq 0 ] && tot_tokens=""
+  fi` : ""}
+${config.showBurnRate && config.showTokens ? `
+  # Calculate tokens per minute from native data
+  if [ -n "$tot_tokens" ] && [ -n "$total_duration_ms" ] && [ "$total_duration_ms" -gt 0 ]; then
+    tpm=$(echo "$tot_tokens $total_duration_ms" | awk '{if ($2 > 0) printf "%.0f", $1 * 60000 / $2; else print ""}')
+  fi` : ""}
+fi
+${needsCcusage ? `
+# Session reset time requires ccusage (only feature that needs external tool)
 if command -v ccusage >/dev/null 2>&1 && [ "$HAS_JQ" -eq 1 ]; then
   blocks_output=""
-  
-  # Try ccusage with timeout for token data and session info
+
+  # Try ccusage with timeout
   if command -v timeout >/dev/null 2>&1; then
     blocks_output=$(timeout 5s ccusage blocks --json 2>/dev/null)
   elif command -v gtimeout >/dev/null 2>&1; then
-    # macOS with coreutils installed
     blocks_output=$(gtimeout 5s ccusage blocks --json 2>/dev/null)
   else
-    # No timeout available, run directly (ccusage should be fast)
     blocks_output=$(ccusage blocks --json 2>/dev/null)
   fi
+
   if [ -n "$blocks_output" ]; then
     active_block=$(echo "$blocks_output" | jq -c '.blocks[] | select(.isActive == true)' 2>/dev/null | head -n1)
-    if [ -n "$active_block" ]; then${config.showTokens ? `
-      # Get token count from ccusage
-      tot_tokens=$(echo "$active_block" | jq -r '.totalTokens // empty')` : ""}${config.showBurnRate && config.showTokens ? `
-      # Get tokens per minute from ccusage
-      tpm=$(echo "$active_block" | jq -r '.burnRate.tokensPerMinute // empty')` : ""}${config.showSession || config.showProgressBar ? `
-      
+    if [ -n "$active_block" ]; then
       # Session time calculation from ccusage
       reset_time_str=$(echo "$active_block" | jq -r '.usageLimitResetTime // .endTime // empty')
       start_time_str=$(echo "$active_block" | jq -r '.startTime // empty')
-      
+
       if [ -n "$reset_time_str" ] && [ -n "$start_time_str" ]; then
         start_sec=$(to_epoch "$start_time_str"); end_sec=$(to_epoch "$reset_time_str"); now_sec=$(date +%s)
         total=$(( end_sec - start_sec )); (( total<1 )) && total=1
@@ -504,10 +550,10 @@ if command -v ccusage >/dev/null 2>&1 && [ "$HAS_JQ" -eq 1 ]; then
         end_hm=$(fmt_time_hm "$end_sec")${config.showSession ? `
         session_txt="$(printf '%dh %dm until reset at %s (%d%%)' "$rh" "$rm" "$end_hm" "$session_pct")"` : ""}${config.showProgressBar ? `
         session_bar=$(progress_bar "$session_pct" 10)` : ""}
-      fi` : ""}
+      fi
     fi
   fi
-fi`;
+fi` : ""}`;
 }
 function generateUsageUtilities() {
   return `
@@ -538,7 +584,7 @@ progress_bar() {
 }
 
 // src/generators/bash-generator.ts
-var VERSION = "1.3.2";
+var VERSION = "1.4.0";
 function generateBashStatusline(config) {
   const hasGit = config.features.includes("git");
   const hasUsage = config.features.some((f) => ["usage", "session", "tokens", "burnrate"].includes(f));
@@ -568,6 +614,12 @@ function generateBashStatusline(config) {
 STATUSLINE_VERSION="${VERSION}"
 
 input=$(cat)
+
+# ---- check jq availability ----
+HAS_JQ=0
+if command -v jq >/dev/null 2>&1; then
+  HAS_JQ=1
+fi
 ${config.logging ? generateLoggingCode() : ""}
 ${generateColorBashCode({ enabled: config.colors, theme: config.theme })}
 ${config.colors ? generateBasicColors() : ""}
@@ -589,12 +641,6 @@ SCRIPT_DIR="$(cd "$(dirname "\${BASH_SOURCE[0]}")" && pwd)"
 LOG_FILE="\${SCRIPT_DIR}/statusline.log"
 TIMESTAMP=$(date '+%Y-%m-%d %H:%M:%S')
 
-# ---- check jq availability ----
-HAS_JQ=0
-if command -v jq >/dev/null 2>&1; then
-  HAS_JQ=1
-fi
-
 # ---- logging ----
 {
   echo "[$TIMESTAMP] Status line triggered (cc-statusline v\${STATUSLINE_VERSION})"
@@ -685,47 +731,28 @@ fi
 }
 function generateContextBashCode(colors) {
   return `
-# ---- context window calculation ----
+# ---- context window calculation (native) ----
 context_pct=""
+context_remaining_pct=""
 context_color() { if [ "$use_color" -eq 1 ]; then printf '\\033[1;37m'; fi; }  # default white
 
-# Determine max context based on model
-get_max_context() {
-  local model_name="$1"
-  case "$model_name" in
-    *"Opus 4"*|*"opus 4"*|*"Opus"*|*"opus"*)
-      echo "200000"  # 200K for all Opus versions
-      ;;
-    *"Sonnet 4"*|*"sonnet 4"*|*"Sonnet 3.5"*|*"sonnet 3.5"*|*"Sonnet"*|*"sonnet"*)
-      echo "200000"  # 200K for Sonnet 3.5+ and 4.x
-      ;;
-    *"Haiku 3.5"*|*"haiku 3.5"*|*"Haiku 4"*|*"haiku 4"*|*"Haiku"*|*"haiku"*)
-      echo "200000"  # 200K for modern Haiku
-      ;;
-    *"Claude 3 Haiku"*|*"claude 3 haiku"*)
-      echo "100000"  # 100K for original Claude 3 Haiku
-      ;;
-    *)
-      echo "200000"  # Default to 200K
-      ;;
-  esac
-}
+if [ "$HAS_JQ" -eq 1 ]; then
+  # Get context window size and current usage from native Claude Code input
+  CONTEXT_SIZE=$(echo "$input" | jq -r '.context_window.context_window_size // 200000' 2>/dev/null)
+  USAGE=$(echo "$input" | jq '.context_window.current_usage' 2>/dev/null)
 
-if [ -n "$session_id" ] && [ "$HAS_JQ" -eq 1 ]; then
-  MAX_CONTEXT=$(get_max_context "$model_name")
-  
-  # Convert current dir to session file path
-  project_dir=$(echo "$current_dir" | sed "s|~|$HOME|g" | sed 's|/|-|g' | sed 's|^-||')
-  session_file="$HOME/.claude/projects/-\${project_dir}/\${session_id}.jsonl"
-  
-  if [ -f "$session_file" ]; then
-    # Get the latest input token count from the session file
-    latest_tokens=$(tail -20 "$session_file" | jq -r 'select(.message.usage) | .message.usage | ((.input_tokens // 0) + (.cache_read_input_tokens // 0))' 2>/dev/null | tail -1)
-    
-    if [ -n "$latest_tokens" ] && [ "$latest_tokens" -gt 0 ]; then
-      context_used_pct=$(( latest_tokens * 100 / MAX_CONTEXT ))
+  if [ "$USAGE" != "null" ] && [ -n "$USAGE" ]; then
+    # Calculate current context from current_usage fields
+    # Formula: input_tokens + cache_creation_input_tokens + cache_read_input_tokens
+    CURRENT_TOKENS=$(echo "$USAGE" | jq '(.input_tokens // 0) + (.cache_creation_input_tokens // 0) + (.cache_read_input_tokens // 0)' 2>/dev/null)
+
+    if [ -n "$CURRENT_TOKENS" ] && [ "$CURRENT_TOKENS" -gt 0 ] 2>/dev/null; then
+      context_used_pct=$(( CURRENT_TOKENS * 100 / CONTEXT_SIZE ))
       context_remaining_pct=$(( 100 - context_used_pct ))
-      
+      # Clamp to valid range
+      (( context_remaining_pct < 0 )) && context_remaining_pct=0
+      (( context_remaining_pct > 100 )) && context_remaining_pct=100
+
       # Set color based on remaining percentage
       if [ "$context_remaining_pct" -le 20 ]; then
         context_color() { if [ "$use_color" -eq 1 ]; then printf '\\033[38;5;203m'; fi; }  # coral red
@@ -734,7 +761,7 @@ if [ -n "$session_id" ] && [ "$HAS_JQ" -eq 1 ]; then
       else
         context_color() { if [ "$use_color" -eq 1 ]; then printf '\\033[38;5;158m'; fi; }  # mint green
       fi
-      
+
       context_pct="\${context_remaining_pct}%"
     fi
   fi
@@ -1072,7 +1099,9 @@ async function initCommand(options) {
 \u{1F4C1} ${isGlobal ? "Global" : "Project"} installation complete: ${chalk.white(resolvedPath)}`));
         console.log(chalk.cyan("\nNext steps:"));
         console.log(chalk.white("   1. Restart Claude Code to see your new statusline"));
-        console.log(chalk.white("   2. Usage statistics work via: npx ccusage@latest"));
+        if (config.features.includes("session")) {
+          console.log(chalk.white("   2. Session reset time requires ccusage: npx ccusage@latest"));
+        }
       } catch (error) {
         console.log(chalk.red("\n\u274C Failed to install statusline"));
         if (error instanceof Error && error.message === "USER_CANCELLED_OVERWRITE") {
@@ -1112,7 +1141,7 @@ async function initCommand(options) {
 
 // src/index.ts
 import chalk3 from "chalk";
-var VERSION2 = "1.3.2";
+var VERSION2 = "1.4.0";
 var program = new Command();
 program.name("cc-statusline").description("Interactive CLI tool for generating custom Claude Code statuslines").version(VERSION2);
 program.command("init").description("Create a custom statusline with interactive prompts").option("-o, --output <path>", "Output path for statusline.sh", "./.claude/statusline.sh").option("--no-install", "Don't automatically install to .claude/statusline.sh").action(initCommand);