claude-code-tracker 1.1.5 → 1.1.7

package/README.md

@@ -35,8 +35,11 @@ Homebrew only knows about packages in its default registry. `brew tap` adds a th
 ```bash
 brew tap kelsi-andrewss/claude-code-tracker
 brew install claude-code-tracker
+claude-tracker-setup
 ```
 
+The `claude-tracker-setup` command registers the Stop hook in `~/.claude/settings.json`. This must be run separately because Homebrew's install sandbox blocks writes to user directories.
+
 ### Option 3 — git clone
 
 ```bash

package/install.sh

@@ -7,31 +7,29 @@ SETTINGS="$HOME/.claude/settings.json"
 
 echo "Installing claude-code-tracker..."
 
-# Install scripts
-mkdir -p "$INSTALL_DIR"
-
 # Detect Homebrew install (SCRIPT_DIR is inside a Cellar path)
 if [[ "$SCRIPT_DIR" == */Cellar/* ]]; then
-  # Symlink scripts — avoids macOS provenance xattr issues on upgrade.
-  # ln -sf fails if the target has com.apple.provenance (SIP-protected),
-  # so create a temp symlink and mv -f (rename syscall bypasses SIP).
-  for f in "$SCRIPT_DIR/src/"*.sh "$SCRIPT_DIR/src/"*.py; do
-    dest="$INSTALL_DIR/$(basename "$f")"
-    tmplink=$(mktemp -u "$INSTALL_DIR/.tmp.XXXXXX")
-    ln -s "$f" "$tmplink"
-    mv -f "$tmplink" "$dest"
-  done
+  # Resolve stable opt path — survives brew upgrade (Homebrew maintains the symlink)
+  FORMULA_NAME="$(echo "$SCRIPT_DIR" | sed -n 's|.*/Cellar/\([^/]*\)/.*|\1|p')"
+  OPT_PREFIX="$(brew --prefix "$FORMULA_NAME" 2>/dev/null)" || OPT_PREFIX=""
+  if [[ -z "$OPT_PREFIX" ]]; then
+    echo "Error: could not resolve brew --prefix for $FORMULA_NAME" >&2
+    exit 1
+  fi
+  HOOK_CMD="$OPT_PREFIX/libexec/src/stop-hook.sh"
+  echo "Homebrew install detected — hook will point to $HOOK_CMD"
 else
   # Direct copy for npm / git-clone installs
+  mkdir -p "$INSTALL_DIR"
   rm -f "$INSTALL_DIR/"*.sh "$INSTALL_DIR/"*.py 2>/dev/null || true
   cp "$SCRIPT_DIR/src/"*.sh "$SCRIPT_DIR/src/"*.py "$INSTALL_DIR/"
   chmod +x "$INSTALL_DIR/"*.sh "$INSTALL_DIR/"*.py
+  HOOK_CMD="$INSTALL_DIR/stop-hook.sh"
+  echo "Scripts installed to $INSTALL_DIR"
 fi
 
-echo "Scripts installed to $INSTALL_DIR"
-
 # Patch settings.json — add Stop hook if not already present
-python3 - "$SETTINGS" "$INSTALL_DIR/stop-hook.sh" <<'PYEOF'
+python3 - "$SETTINGS" "$HOOK_CMD" <<'PYEOF'
 import sys, json, os
 
 settings_file = sys.argv[1]
@@ -77,15 +75,17 @@ MDEOF
   echo "Tracking instruction added to $CLAUDE_MD"
 fi
 
-# Backfill historical sessions for the current project
-PROJECT_ROOT="$PWD"
-while [[ "$PROJECT_ROOT" != "/" ]]; do
-  [[ -d "$PROJECT_ROOT/.git" ]] && break
-  PROJECT_ROOT="$(dirname "$PROJECT_ROOT")"
-done
-if [[ "$PROJECT_ROOT" != "/" ]]; then
-  echo "Backfilling historical sessions..."
-  python3 "$INSTALL_DIR/backfill.py" "$PROJECT_ROOT"
+# Backfill historical sessions for the current project (skip for Homebrew installs)
+if [[ "$SCRIPT_DIR" != */Cellar/* ]]; then
+  PROJECT_ROOT="$PWD"
+  while [[ "$PROJECT_ROOT" != "/" ]]; do
+    [[ -d "$PROJECT_ROOT/.git" ]] && break
+    PROJECT_ROOT="$(dirname "$PROJECT_ROOT")"
+  done
+  if [[ "$PROJECT_ROOT" != "/" ]]; then
+    echo "Backfilling historical sessions..."
+    python3 "$INSTALL_DIR/backfill.py" "$PROJECT_ROOT"
+  fi
 fi
 
 echo "claude-code-tracker installed. Restart Claude Code to activate."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-code-tracker",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "Automatic token, cost, and prompt tracking for Claude Code sessions",
   "keywords": [
     "claude",

package/src/backfill.py

@@ -50,7 +50,7 @@ for jf in jsonl_files:
     inp = out = cache_create = cache_read = 0
     model = "unknown"
     first_ts = None
-    last_ts = None
+    msgs = []
 
     try:
         with open(jf) as f:
@@ -58,10 +58,13 @@ for jf in jsonl_files:
                 try:
                     obj = json.loads(line)
                     ts = obj.get("timestamp")
-                    if ts:
-                        if first_ts is None:
-                            first_ts = ts
-                        last_ts = ts
+                    if ts and first_ts is None:
+                        first_ts = ts
+                    t = obj.get("type")
+                    if t == "user" and not obj.get("isSidechain") and ts:
+                        msgs.append(("user", ts))
+                    elif t == "assistant" and ts:
+                        msgs.append(("assistant", ts))
                     msg = obj.get("message", {})
                     if isinstance(msg, dict) and msg.get("role") == "assistant":
                         usage = msg.get("usage", {})
@@ -94,15 +97,22 @@ for jf in jsonl_files:
     if not session_date:
         session_date = datetime.fromtimestamp(os.path.getmtime(jf)).strftime("%Y-%m-%d")
 
-    # Duration
+    # Duration: sum of per-turn active thinking time (user -> first assistant reply)
     duration = 0
-    if first_ts and last_ts:
-        try:
-            t0 = datetime.fromisoformat(first_ts.replace("Z", "+00:00"))
-            t1 = datetime.fromisoformat(last_ts.replace("Z", "+00:00"))
-            duration = max(0, int((t1 - t0).total_seconds()))
-        except Exception:
-            pass
+    i = 0
+    while i < len(msgs):
+        if msgs[i][0] == "user":
+            j = i + 1
+            while j < len(msgs) and msgs[j][0] != "assistant":
+                j += 1
+            if j < len(msgs):
+                try:
+                    t0 = datetime.fromisoformat(msgs[i][1].replace("Z", "+00:00"))
+                    t1 = datetime.fromisoformat(msgs[j][1].replace("Z", "+00:00"))
+                    duration += max(0, int((t1 - t0).total_seconds()))
+                except Exception:
+                    pass
+        i += 1
 
     # Cost
     if "opus" in model:

package/uninstall.sh

@@ -1,22 +1,31 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 INSTALL_DIR="$HOME/.claude/tracking"
 SETTINGS="$HOME/.claude/settings.json"
-HOOK_CMD="$INSTALL_DIR/stop-hook.sh"
 
 echo "Uninstalling claude-code-tracker..."
 
-# Remove scripts
-if [[ -d "$INSTALL_DIR" ]]; then
-    rm -f "$INSTALL_DIR/"*.sh "$INSTALL_DIR/"*.py
-    echo "Scripts removed from $INSTALL_DIR"
+# Detect Homebrew install
+if [[ "$SCRIPT_DIR" == */Cellar/* ]]; then
+  FORMULA_NAME="$(echo "$SCRIPT_DIR" | sed -n 's|.*/Cellar/\([^/]*\)/.*|\1|p')"
+  OPT_PREFIX="$(brew --prefix "$FORMULA_NAME" 2>/dev/null)" || OPT_PREFIX=""
+  HOOK_CMD="${OPT_PREFIX:+$OPT_PREFIX/libexec/src/stop-hook.sh}"
+  echo "Homebrew install detected — skipping script removal from $INSTALL_DIR"
 else
-    echo "Nothing to remove at $INSTALL_DIR"
+  HOOK_CMD="$INSTALL_DIR/stop-hook.sh"
+  # Remove scripts
+  if [[ -d "$INSTALL_DIR" ]]; then
+      rm -f "$INSTALL_DIR/"*.sh "$INSTALL_DIR/"*.py
+      echo "Scripts removed from $INSTALL_DIR"
+  else
+      echo "Nothing to remove at $INSTALL_DIR"
+  fi
 fi
 
 # Remove hook entry from settings.json
-if [[ -f "$SETTINGS" ]]; then
+if [[ -f "$SETTINGS" ]] && [[ -n "$HOOK_CMD" ]]; then
     python3 - "$SETTINGS" "$HOOK_CMD" <<'PYEOF'
 import sys, json, os