@chongdashu/cc-statusline 1.2.7 → 1.3.2

package/dist/index.js

@@ -441,15 +441,38 @@ burn_color() { :; }
 session_color() { :; }
 `;
   return `${colorCode}
-# ---- ccusage integration ----
+# ---- cost and usage extraction ----
 session_txt=""; session_pct=0; session_bar=""
 cost_usd=""; cost_per_hour=""; tpm=""; tot_tokens=""
 
-if command -v jq >/dev/null 2>&1; then
-  # Run ccusage directly (it has its own internal caching)
+# Extract cost data from Claude Code input
+if [ "$HAS_JQ" -eq 1 ]; then
+  # Get cost data from Claude Code's input
+  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
+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/')  
+  
+  # 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
+
+# Get token data and session info from ccusage if available
+if command -v ccusage >/dev/null 2>&1 && [ "$HAS_JQ" -eq 1 ]; then
   blocks_output=""
   
-  # Try ccusage with timeout
+  # Try ccusage with timeout for token data and session info
   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
@@ -461,13 +484,13 @@ if command -v jq >/dev/null 2>&1; then
   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.showCost ? `
-      cost_usd=$(echo "$active_block" | jq -r '.costUSD // empty')
-      cost_per_hour=$(echo "$active_block" | jq -r '.burnRate.costPerHour // empty')` : ""}${config.showTokens ? `
-      tot_tokens=$(echo "$active_block" | jq -r '.totalTokens // empty')` : ""}${config.showBurnRate ? `
+    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 ? `
       
-      # Session time calculation
+      # 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')
       
@@ -515,6 +538,7 @@ progress_bar() {
 }
 
 // src/generators/bash-generator.ts
+var VERSION = "1.3.2";
 function generateBashStatusline(config) {
   const hasGit = config.features.includes("git");
   const hasUsage = config.features.some((f) => ["usage", "session", "tokens", "burnrate"].includes(f));
@@ -538,9 +562,10 @@ function generateBashStatusline(config) {
   };
   const timestamp = (/* @__PURE__ */ new Date()).toISOString();
   const script = `#!/bin/bash
-# Generated by cc-statusline (https://www.npmjs.com/package/@chongdashu/cc-statusline)
+# Generated by cc-statusline v${VERSION} (https://www.npmjs.com/package/@chongdashu/cc-statusline)
 # Custom Claude Code statusline - Created: ${timestamp}
 # Theme: ${config.theme} | Colors: ${config.colors} | Features: ${config.features.join(", ")}
+STATUSLINE_VERSION="${VERSION}"
 
 input=$(cat)
 ${config.logging ? generateLoggingCode() : ""}
@@ -559,21 +584,72 @@ ${generateDisplaySection(config, gitConfig, usageConfig)}
 }
 function generateLoggingCode() {
   return `
-LOG_FILE="\${HOME}/.claude/statusline.log"
+# Get the directory where this statusline script is located
+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 with input:"
-  (echo "$input" | jq . 2>/dev/null) || echo "$input"
+  echo "[$TIMESTAMP] Status line triggered (cc-statusline v\${STATUSLINE_VERSION})"
+  echo "[$TIMESTAMP] Input:"
+  if [ "$HAS_JQ" -eq 1 ]; then
+    echo "$input" | jq . 2>/dev/null || echo "$input"
+    echo "[$TIMESTAMP] Using jq for JSON parsing"
+  else
+    echo "$input"
+    echo "[$TIMESTAMP] WARNING: jq not found, using bash fallback for JSON parsing"
+  fi
   echo "---"
 } >> "$LOG_FILE" 2>/dev/null
 `;
 }
+function generateJsonExtractorCode() {
+  return `
+# ---- JSON extraction utilities ----
+# Pure bash JSON value extractor (fallback when jq not available)
+extract_json_string() {
+  local json="$1"
+  local key="$2"
+  local default="\${3:-}"
+  
+  # For nested keys like workspace.current_dir, get the last part
+  local field="\${key##*.}"
+  field="\${field%% *}"  # Remove any jq operators
+  
+  # Try to extract string value (quoted)
+  local value=$(echo "$json" | grep -o "\\"\\\${field}\\"[[:space:]]*:[[:space:]]*\\"[^\\"]*\\"" | head -1 | sed 's/.*:[[:space:]]*"\\([^"]*\\)".*/\\1/')
+  
+  # Convert escaped backslashes to forward slashes for Windows paths
+  if [ -n "$value" ]; then
+    value=$(echo "$value" | sed 's/\\\\\\\\/\\//g')
+  fi
+  
+  # If no string value found, try to extract number value (unquoted)
+  if [ -z "$value" ] || [ "$value" = "null" ]; then
+    value=$(echo "$json" | grep -o "\\"\\\${field}\\"[[:space:]]*:[[:space:]]*[0-9.]\\+" | head -1 | sed 's/.*:[[:space:]]*\\([0-9.]\\+\\).*/\\1/')
+  fi
+  
+  # Return value or default
+  if [ -n "$value" ] && [ "$value" != "null" ]; then
+    echo "$value"
+  else
+    echo "$default"
+  fi
+}
+`;
+}
 function generateBasicDataExtraction(hasDirectory, hasModel, hasContext) {
   return `
+${generateJsonExtractorCode()}
 # ---- basics ----
-if command -v jq >/dev/null 2>&1; then${hasDirectory ? `
+if [ "$HAS_JQ" -eq 1 ]; then${hasDirectory ? `
   current_dir=$(echo "$input" | jq -r '.workspace.current_dir // .cwd // "unknown"' 2>/dev/null | sed "s|^$HOME|~|g")` : ""}${hasModel ? `
   model_name=$(echo "$input" | jq -r '.model.display_name // "Claude"' 2>/dev/null)
   model_version=$(echo "$input" | jq -r '.model.version // ""' 2>/dev/null)` : ""}${hasContext ? `
@@ -581,11 +657,29 @@ if command -v jq >/dev/null 2>&1; then${hasDirectory ? `
   cc_version=$(echo "$input" | jq -r '.version // ""' 2>/dev/null)
   output_style=$(echo "$input" | jq -r '.output_style.name // ""' 2>/dev/null)
 else${hasDirectory ? `
-  current_dir="unknown"` : ""}${hasModel ? `
-  model_name="Claude"; model_version=""` : ""}${hasContext ? `
-  session_id=""` : ""}
-  cc_version=""
-  output_style=""
+  # Bash fallback for JSON extraction
+  # Extract current_dir from workspace object - look for the pattern workspace":{"current_dir":"..."}
+  current_dir=$(echo "$input" | grep -o '"workspace"[[:space:]]*:[[:space:]]*{[^}]*"current_dir"[[:space:]]*:[[:space:]]*"[^"]*"' | sed 's/.*"current_dir"[[:space:]]*:[[:space:]]*"\\([^"]*\\)".*/\\1/' | sed 's/\\\\\\\\/\\//g')
+  
+  # Fall back to cwd if workspace extraction failed
+  if [ -z "$current_dir" ] || [ "$current_dir" = "null" ]; then
+    current_dir=$(echo "$input" | grep -o '"cwd"[[:space:]]*:[[:space:]]*"[^"]*"' | sed 's/.*"cwd"[[:space:]]*:[[:space:]]*"\\([^"]*\\)".*/\\1/' | sed 's/\\\\\\\\/\\//g')
+  fi
+  
+  # Fallback to unknown if all extraction failed
+  [ -z "$current_dir" ] && current_dir="unknown"
+  current_dir=$(echo "$current_dir" | sed "s|^$HOME|~|g")` : ""}${hasModel ? `
+  
+  # Extract model name from nested model object
+  model_name=$(echo "$input" | grep -o '"model"[[:space:]]*:[[:space:]]*{[^}]*"display_name"[[:space:]]*:[[:space:]]*"[^"]*"' | sed 's/.*"display_name"[[:space:]]*:[[:space:]]*"\\([^"]*\\)".*/\\1/')
+  [ -z "$model_name" ] && model_name="Claude"
+  # Model version is in the model ID, not a separate field  
+  model_version=""  # Not available in Claude Code JSON` : ""}${hasContext ? `
+  session_id=$(extract_json_string "$input" "session_id" "")` : ""}
+  # CC version is at the root level
+  cc_version=$(echo "$input" | grep -o '"version"[[:space:]]*:[[:space:]]*"[^"]*"' | head -1 | sed 's/.*"version"[[:space:]]*:[[:space:]]*"\\([^"]*\\)".*/\\1/')
+  # Output style is nested
+  output_style=$(echo "$input" | grep -o '"output_style"[[:space:]]*:[[:space:]]*{[^}]*"name"[[:space:]]*:[[:space:]]*"[^"]*"' | sed 's/.*"name"[[:space:]]*:[[:space:]]*"\\([^"]*\\)".*/\\1/')
 fi
 `;
 }
@@ -617,7 +711,7 @@ get_max_context() {
   esac
 }
 
-if [ -n "$session_id" ] && command -v jq >/dev/null 2>&1; then
+if [ -n "$session_id" ] && [ "$HAS_JQ" -eq 1 ]; then
   MAX_CONTEXT=$(get_max_context "$model_name")
   
   # Convert current dir to session file path
@@ -652,6 +746,9 @@ function generateLoggingOutput() {
 # ---- log extracted data ----
 {
   echo "[$TIMESTAMP] Extracted: dir=\${current_dir:-}, model=\${model_name:-}, version=\${model_version:-}, git=\${git_branch:-}, context=\${context_pct:-}, cost=\${cost_usd:-}, cost_ph=\${cost_per_hour:-}, tokens=\${tot_tokens:-}, tpm=\${tpm:-}, session_pct=\${session_pct:-}"
+  if [ "$HAS_JQ" -eq 0 ]; then
+    echo "[$TIMESTAMP] Note: Context, tokens, and session info require jq for full functionality"
+  fi
 } >> "$LOG_FILE" 2>/dev/null
 `;
 }
@@ -829,7 +926,7 @@ async function updateSettingsJson(claudeDir, scriptName, isGlobal) {
         }
       }
     }
-    const commandPath = isGlobal ? `~/.claude/${scriptName}` : `.claude/${scriptName}`;
+    const commandPath = process.platform === "win32" ? `bash ${isGlobal ? ".claude" : ".claude"}/${scriptName}` : isGlobal ? `~/.claude/${scriptName}` : `.claude/${scriptName}`;
     settings.statusLine = {
       type: "command",
       command: commandPath,
@@ -847,11 +944,97 @@ import chalk from "chalk";
 import ora from "ora";
 import path4 from "path";
 import os2 from "os";
+import { execSync } from "child_process";
+function checkJqInstallation() {
+  try {
+    execSync("command -v jq", { stdio: "ignore" });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function getJqInstallInstructions() {
+  const platform = process.platform;
+  if (platform === "darwin") {
+    return `
+${chalk.cyan("\u{1F4E6} Install jq for better performance and reliability:")}
+
+${chalk.green("Using Homebrew (recommended):")}
+  brew install jq
+
+${chalk.green("Using MacPorts:")}
+  sudo port install jq
+
+${chalk.green("Or download directly:")}
+  https://github.com/jqlang/jq/releases
+`;
+  } else if (platform === "linux") {
+    return `
+${chalk.cyan("\u{1F4E6} Install jq for better performance and reliability:")}
+
+${chalk.green("Ubuntu/Debian:")}
+  sudo apt-get install jq
+
+${chalk.green("CentOS/RHEL/Fedora:")}
+  sudo yum install jq
+
+${chalk.green("Arch Linux:")}
+  sudo pacman -S jq
+
+${chalk.green("Or download directly:")}
+  https://github.com/jqlang/jq/releases
+`;
+  } else if (platform === "win32") {
+    return `
+${chalk.cyan("\u{1F4E6} Install jq for better performance and reliability:")}
+
+${chalk.green("Option 1: Using Package Manager")}
+  ${chalk.dim("Chocolatey:")} choco install jq
+  ${chalk.dim("Scoop:")} scoop install jq
+
+${chalk.green("Option 2: Manual Download")}
+  1. Download from: https://github.com/jqlang/jq/releases/latest
+  2. Choose file:
+     ${chalk.dim("\u2022 64-bit Windows:")} jq-windows-amd64.exe
+     ${chalk.dim("\u2022 32-bit Windows:")} jq-windows-i386.exe
+  3. Rename to: jq.exe
+  4. Move to: C:\\Windows\\System32\\ ${chalk.dim("(or add to PATH)")}
+  5. Test: Open new terminal and run: jq --version
+`;
+  } else {
+    return `
+${chalk.cyan("\u{1F4E6} Install jq for better performance and reliability:")}
+
+${chalk.green("Download for your platform:")}
+  https://github.com/jqlang/jq/releases
+`;
+  }
+}
 async function initCommand(options) {
   try {
     const spinner = ora("Initializing statusline generator...").start();
     await new Promise((resolve) => setTimeout(resolve, 500));
     spinner.stop();
+    const hasJq = checkJqInstallation();
+    if (!hasJq) {
+      console.log(chalk.yellow("\n\u26A0\uFE0F  jq is not installed"));
+      console.log(chalk.dim("Your statusline will work without jq, but with limited functionality:"));
+      console.log(chalk.dim("  \u2022 Context remaining percentage won't be displayed"));
+      console.log(chalk.dim("  \u2022 Token statistics may not work"));
+      console.log(chalk.dim("  \u2022 Performance will be slower"));
+      console.log(getJqInstallInstructions());
+      const inquirer3 = (await import("inquirer")).default;
+      const { continueWithoutJq } = await inquirer3.prompt([{
+        type: "confirm",
+        name: "continueWithoutJq",
+        message: "Continue without jq?",
+        default: true
+      }]);
+      if (!continueWithoutJq) {
+        console.log(chalk.cyan("\n\u{1F44D} Install jq and run this command again"));
+        process.exit(0);
+      }
+    }
     const config = await collectConfiguration();
     const validation = validateConfig(config);
     if (!validation.isValid) {
@@ -929,8 +1112,9 @@ async function initCommand(options) {
 
 // src/index.ts
 import chalk3 from "chalk";
+var VERSION2 = "1.3.2";
 var program = new Command();
-program.name("cc-statusline").description("Interactive CLI tool for generating custom Claude Code statuslines").version("1.2.6");
+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);
 program.command("preview").description("Preview existing statusline.sh with mock data").argument("<script-path>", "Path to statusline.sh file to preview").action(async (scriptPath) => {
   const { previewCommand: previewCommand2 } = await Promise.resolve().then(() => (init_preview(), preview_exports));