tokengolf 0.5.1 → 0.5.2

package/CLAUDE.md

@@ -349,11 +349,11 @@ Nine hooks in `hooks/` directory, installed via `tokengolf install`. Most comple
 - Receives live session JSON (cost, context %, model) via stdin
 - **Design D accent bar**: `██` prefix on each line, color-coded (yellow normal, red when budget >75%)
 - Line 1: `██ ⛳ quest  $cost/budget ▓▓▓░░░ pct%  RATING  model  F1/5`
-- Line 2 (optional, when context ≥50%): `██ 🧠 ▓▓▓▓░░░ ctx% 🪶/🎒/📦`
+- Line 2 (always shown when context data available): `██ 🧠 ▓▓▓▓░░░ ctx% 🪶/🎒/📦`
 - Budget progress bar: `▓` filled, `░` empty, 11 chars wide. Red when >75%, yellow otherwise
 - Context progress bar: `▓░` 10 chars wide. Green (50–74%), yellow (75–89%), red (90%+); hidden below 50%
 - Model label: `⚔️ Sonnet`, `⚔️ Sonnet·High`, `🏹 Haiku`, `🧙 Opus·Max`, etc. Effort appended only when explicitly set in settings.json (medium omitted — it's the default)
-- 1 line when context <50% (flow mode is often just 1 line), 2 lines when context visible
+- Always 2 lines when context data is available from Claude Code
 - statusLine config must be an object: `{type:"command", command:"...statusline.sh", padding:1}`
 
 ### Hook installation

package/dist/cli.js

@@ -1796,8 +1796,50 @@ function installHooks() {
   }
   const existing = settings.statusLine;
   const existingCmd = typeof existing === "string" ? existing : existing?.command ?? null;
-  const alreadyOurs = existingCmd === STATUSLINE_PATH || existingCmd === WRAPPER_PATH;
-  if (!alreadyOurs && existingCmd) {
+  const isTgStatusline = (cmd) => cmd && (cmd.includes("tokengolf/hooks/statusline") || cmd.includes("tokengolf\\hooks\\statusline"));
+  const alreadyOurs = isTgStatusline(existingCmd);
+  if (alreadyOurs) {
+    let userStatusline = null;
+    if (existingCmd.includes("statusline-wrapper")) {
+      try {
+        const wrapperContent = fs4.readFileSync(existingCmd, "utf8");
+        const lines = wrapperContent.split("\n").filter((l) => l.includes('echo "$SESSION_JSON"'));
+        for (const line of lines) {
+          const match = line.match(/echo "\$SESSION_JSON" \| (.+?)( 2>|$)/);
+          if (match && !isTgStatusline(match[1])) {
+            userStatusline = match[1];
+            break;
+          }
+        }
+      } catch {
+      }
+    }
+    if (userStatusline) {
+      fs4.writeFileSync(
+        WRAPPER_PATH,
+        [
+          "#!/usr/bin/env bash",
+          "SESSION_JSON=$(cat)",
+          `echo "$SESSION_JSON" | ${userStatusline} 2>/dev/null || true`,
+          `echo "$SESSION_JSON" | bash ${STATUSLINE_PATH}`
+        ].join("\n") + "\n"
+      );
+      fs4.chmodSync(WRAPPER_PATH, 493);
+      settings.statusLine = {
+        type: "command",
+        command: WRAPPER_PATH,
+        padding: existing?.padding ?? 1
+      };
+      console.log("  \u2713 statusLine       \u2192 updated paths (kept your existing statusline)");
+    } else {
+      settings.statusLine = {
+        type: "command",
+        command: STATUSLINE_PATH,
+        padding: existing?.padding ?? 1
+      };
+      console.log("  \u2713 statusLine       \u2192 updated to current install path");
+    }
+  } else if (existingCmd) {
     fs4.writeFileSync(
       WRAPPER_PATH,
       [
@@ -1814,15 +1856,13 @@ function installHooks() {
       padding: 1
     };
     console.log("  \u2713 statusLine       \u2192 wrapped your existing statusline + tokengolf HUD");
-  } else if (!alreadyOurs) {
+  } else {
     settings.statusLine = {
       type: "command",
       command: STATUSLINE_PATH,
       padding: 1
     };
     console.log("  \u2713 statusLine       \u2192 live HUD in every Claude session");
-  } else {
-    console.log("  \u2713 statusLine       \u2192 already installed");
   }
   fs4.writeFileSync(CLAUDE_SETTINGS, JSON.stringify(settings, null, 2));
   console.log("  \u2713 SessionStart     \u2192 injects run context into Claude");

package/hooks/statusline.sh

@@ -72,9 +72,9 @@ else:
     cost_str = f"{tier_emoji} ${cost:.2f}"
     rating_str = ''
 
-# Context bar (line 2, only shown when >= 50%)
+# Context bar (line 2, always shown)
 ctx_line = None
-if ctx_pct is not None and ctx_pct >= 50:
+if ctx_pct is not None:
     ctx_w = 10
     ctx_filled = min(ctx_w, int(ctx_pct / 100 * ctx_w + 0.5))
     ctx_empty = ctx_w - ctx_filled

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tokengolf",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Gamify your Claude Code sessions. Flow mode tracks you. Roguelike mode trains you.",
   "type": "module",
   "bin": {

package/src/lib/install.js

@@ -149,9 +149,59 @@ export function installHooks() {
 
   const existing = settings.statusLine;
   const existingCmd = typeof existing === 'string' ? existing : (existing?.command ?? null);
-  const alreadyOurs = existingCmd === STATUSLINE_PATH || existingCmd === WRAPPER_PATH;
+  // Detect any tokengolf statusline (from any install path — npm, homebrew, project dir)
+  const isTgStatusline = (cmd) =>
+    cmd &&
+    (cmd.includes('tokengolf/hooks/statusline') || cmd.includes('tokengolf\\hooks\\statusline'));
+  const alreadyOurs = isTgStatusline(existingCmd);
+
+  if (alreadyOurs) {
+    // Check if existing wrapper has a non-TG statusline we should preserve
+    let userStatusline = null;
+    if (existingCmd.includes('statusline-wrapper')) {
+      try {
+        const wrapperContent = fs.readFileSync(existingCmd, 'utf8');
+        const lines = wrapperContent.split('\n').filter((l) => l.includes('echo "$SESSION_JSON"'));
+        // Find the line that calls a non-tokengolf statusline
+        for (const line of lines) {
+          const match = line.match(/echo "\$SESSION_JSON" \| (.+?)( 2>|$)/);
+          if (match && !isTgStatusline(match[1])) {
+            userStatusline = match[1];
+            break;
+          }
+        }
+      } catch {}
+    }
 
-  if (!alreadyOurs && existingCmd) {
+    if (userStatusline) {
+      // Re-wrap: preserve user's statusline + update tokengolf path
+      fs.writeFileSync(
+        WRAPPER_PATH,
+        [
+          '#!/usr/bin/env bash',
+          'SESSION_JSON=$(cat)',
+          `echo "$SESSION_JSON" | ${userStatusline} 2>/dev/null || true`,
+          `echo "$SESSION_JSON" | bash ${STATUSLINE_PATH}`,
+        ].join('\n') + '\n'
+      );
+      fs.chmodSync(WRAPPER_PATH, 0o755);
+      settings.statusLine = {
+        type: 'command',
+        command: WRAPPER_PATH,
+        padding: existing?.padding ?? 1,
+      };
+      console.log('  ✓ statusLine       → updated paths (kept your existing statusline)');
+    } else {
+      // Direct install — no user statusline to preserve
+      settings.statusLine = {
+        type: 'command',
+        command: STATUSLINE_PATH,
+        padding: existing?.padding ?? 1,
+      };
+      console.log('  ✓ statusLine       → updated to current install path');
+    }
+  } else if (existingCmd) {
+    // User has a non-TG statusline — wrap it
     fs.writeFileSync(
       WRAPPER_PATH,
       [
@@ -168,15 +218,14 @@ export function installHooks() {
       padding: 1,
     };
     console.log('  ✓ statusLine       → wrapped your existing statusline + tokengolf HUD');
-  } else if (!alreadyOurs) {
+  } else {
+    // No existing statusline — install directly
     settings.statusLine = {
       type: 'command',
       command: STATUSLINE_PATH,
       padding: 1,
     };
     console.log('  ✓ statusLine       → live HUD in every Claude session');
-  } else {
-    console.log('  ✓ statusLine       → already installed');
   }
 
   fs.writeFileSync(CLAUDE_SETTINGS, JSON.stringify(settings, null, 2));