@alyibrahim/claude-statusline 1.5.1 → 1.5.2

package/README.md

@@ -7,6 +7,7 @@
 
 [![CI](https://github.com/AlyIbrahim1/claude-statusline/actions/workflows/ci.yml/badge.svg)](https://github.com/AlyIbrahim1/claude-statusline/actions/workflows/ci.yml)
 [![npm](https://img.shields.io/npm/v/@alyibrahim/claude-statusline)](https://www.npmjs.com/package/@alyibrahim/claude-statusline)
+[![Downloads](https://img.shields.io/npm/dt/@alyibrahim/claude-statusline)](https://www.npmjs.com/package/@alyibrahim/claude-statusline)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
 
 **A rich, fast statusline for [Claude Code](https://claude.ai/code)** — shows model, git branch, context usage, rate limits, session cost, and split input/output token counts after every response.
@@ -65,7 +66,7 @@ Done. The statusline configures itself automatically. Restart Claude Code to see
 
 Track token usage, cost, and duration across every Claude Code session. Choose between a **terminal-native TUI** or a **browser dashboard** — your preference is saved automatically.
 
-![history dashboard](assets/dashboard-preview.png)
+![history dashboard](https://raw.githubusercontent.com/AlyIbrahim1/claude-statusline/main/.github/assets/dashboard-preview.png)
 
 Session history is **enabled by default** on setup. Each session records:
 

package/hooks/hooks.json

@@ -0,0 +1,26 @@
+{
+  "hooks": {
+    "SessionStart": [
+      {
+        "matcher": "",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "${CLAUDE_NODE_EXEC} \"${CLAUDE_PLUGIN_ROOT}/statusline.js\" hook start"
+          }
+        ]
+      }
+    ],
+    "SessionEnd": [
+      {
+        "matcher": "",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "${CLAUDE_NODE_EXEC} \"${CLAUDE_PLUGIN_ROOT}/statusline.js\" hook end"
+          }
+        ]
+      }
+    ]
+  }
+}

package/hooks/plugin-setup.json

@@ -0,0 +1,15 @@
+{
+  "hooks": {
+    "SessionStart": [
+      {
+        "matcher": "",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "${CLAUDE_NODE_EXEC} \"${CLAUDE_PLUGIN_ROOT}/scripts/plugin-autosetup.js\""
+          }
+        ]
+      }
+    ]
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alyibrahim/claude-statusline",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "Rich statusline for Claude Code — model, context bar, real-time token tracking, git branch, rate limits, and session stats. Rust binary, ~5ms startup.",
   "keywords": [
     "claude",
@@ -49,6 +49,7 @@
     "statusline.js",
     "bin/",
     "scripts/",
+    "hooks/",
     "README.md"
   ],
   "license": "MIT",
@@ -56,11 +57,11 @@
     "open": "^10.1.0"
   },
   "optionalDependencies": {
-    "@alyibrahim/claude-statusline-linux-x64": "1.5.1",
-    "@alyibrahim/claude-statusline-linux-arm64": "1.5.1",
-    "@alyibrahim/claude-statusline-darwin-x64": "1.5.1",
-    "@alyibrahim/claude-statusline-darwin-arm64": "1.5.1",
-    "@alyibrahim/claude-statusline-win32-x64": "1.5.1"
+    "@alyibrahim/claude-statusline-linux-x64": "1.5.2",
+    "@alyibrahim/claude-statusline-linux-arm64": "1.5.2",
+    "@alyibrahim/claude-statusline-darwin-x64": "1.5.2",
+    "@alyibrahim/claude-statusline-darwin-arm64": "1.5.2",
+    "@alyibrahim/claude-statusline-win32-x64": "1.5.2"
   },
   "devDependencies": {
     "jest": "^29.0.0"

package/scripts/plugin-autosetup.js

@@ -0,0 +1,35 @@
+'use strict';
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const { atomicWrite } = require('./config');
+
+// Only meaningful in plugin context — exit silently otherwise
+const pluginRoot = process.env.CLAUDE_PLUGIN_ROOT;
+if (!pluginRoot) process.exit(0);
+
+const configDir = process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), '.claude');
+const settingsPath = path.join(configDir, 'settings.json');
+
+let settings = {};
+try {
+  settings = JSON.parse(fs.readFileSync(settingsPath, 'utf8'));
+} catch (e) {}
+
+// Already configured — nothing to do
+if (settings.statusLine) process.exit(0);
+
+const script = path.join(pluginRoot, 'statusline.js');
+if (!fs.existsSync(script)) process.exit(0);
+
+settings.statusLine = {
+  type: 'command',
+  command: `"${process.execPath}" "${script}"`,
+};
+
+try {
+  fs.mkdirSync(path.dirname(settingsPath), { recursive: true });
+  atomicWrite(settingsPath, settings);
+} catch (e) {
+  process.exit(0); // Non-fatal — user can run /claude-statusline:setup manually
+}

package/scripts/setup.js

@@ -6,6 +6,35 @@ const { getSettingsPath, atomicWrite } = config;
 
 const UNSAFE_CHARS = /["`$!()\\]/;
 
+function buildNodeExecCommand() {
+  return `"${process.execPath}"`;
+}
+
+function resolveHooksFromFile(filePath, replacements) {
+  let parsed;
+  try {
+    parsed = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+  } catch (err) {
+    const wrapped = new Error(`Hook configuration error in ${path.basename(filePath)}: ${err.message}`);
+    wrapped.code = 'HOOK_CONFIG_ERROR';
+    throw wrapped;
+  }
+
+  const hooks = parsed && parsed.hooks;
+  if (!hooks || typeof hooks !== 'object') {
+    const wrapped = new Error(`Hook configuration error in ${path.basename(filePath)}: missing hooks object`);
+    wrapped.code = 'HOOK_CONFIG_ERROR';
+    throw wrapped;
+  }
+
+  let serialized = JSON.stringify(hooks);
+  for (const [token, value] of Object.entries(replacements)) {
+    serialized = serialized.replace(new RegExp(`\\$\\{${token}\\}`, 'g'), value);
+  }
+
+  return JSON.parse(serialized);
+}
+
 function setup({ force = false } = {}) {
   // CI guard: skip during local/CI npm installs unless forced (e.g. from CLI)
   if (!force && process.env.npm_config_global !== 'true') {
@@ -38,7 +67,11 @@ function setup({ force = false } = {}) {
     : `"${process.execPath}" "${scriptPath}"`;
   settings.statusLine = { type: 'command', command };
 
-  updateHooks(settings, command, true);
+  try {
+    updateHooks(settings, true, { nodeExecCommand: buildNodeExecCommand() });
+  } catch (err) {
+    return { ok: false, error: err.message };
+  }
 
   fs.mkdirSync(path.dirname(settingsPath), { recursive: true });
 
@@ -51,31 +84,74 @@ function setup({ force = false } = {}) {
   return { ok: true, settingsPath };
 }
 
-function updateHooks(settings, command, enable) {
+function updateHooks(settings, enable, { nodeExecCommand = buildNodeExecCommand() } = {}) {
   if (!settings.hooks) settings.hooks = {};
-  
-  const startCmd = `${command} hook start`;
-  const endCmd = `${command} hook end`;
-
-  function toggleHook(hookName, cmdString) {
-    if (!settings.hooks[hookName]) settings.hooks[hookName] = [];
-    // Remove any existing statusline hook entries (both old and new format)
-    settings.hooks[hookName] = settings.hooks[hookName].filter(h => {
-      if (h.hooks) {
-        return !h.hooks.some(inner => inner.command && (inner.command.endsWith(' hook start') || inner.command.endsWith(' hook end')));
-      }
-      return !(h.command && (h.command.endsWith(' hook start') || h.command.endsWith(' hook end')));
+
+  const packageRoot = path.resolve(__dirname, '..');
+  const escapedRoot = packageRoot.replace(/\\/g, '\\\\');
+  const escapedNodeExec = nodeExecCommand
+    .replace(/\\/g, '\\\\')
+    .replace(/"/g, '\\"');
+
+  // When installing, only add history hooks from hooks.json.
+  // When removing, read all our hooks files so every hook we may have written gets cleaned up.
+  const installFile = path.join(packageRoot, 'hooks', 'hooks.json');
+  const allFiles = [
+    installFile,
+    path.join(packageRoot, 'hooks', 'plugin-setup.json'),
+  ].filter(f => fs.existsSync(f));
+  const filesToProcess = enable ? [installFile] : allFiles;
+
+  // Collect every resolved command across all our hooks files for exact-match removal.
+  const ourCommands = new Set();
+  for (const f of allFiles) {
+    const resolved = resolveHooksFromFile(f, {
+      CLAUDE_PLUGIN_ROOT: escapedRoot,
+      CLAUDE_NODE_EXEC: escapedNodeExec,
     });
-    if (enable) {
-      settings.hooks[hookName].push({ matcher: '', hooks: [{ type: 'command', command: cmdString }] });
-    }
-    if (settings.hooks[hookName].length === 0) {
-      delete settings.hooks[hookName];
+    for (const entries of Object.values(resolved)) {
+      for (const entry of entries) {
+        for (const hook of (entry.hooks || [])) {
+          if (hook.command) ourCommands.add(hook.command);
+        }
+      }
     }
   }
 
-  toggleHook('SessionStart', startCmd);
-  toggleHook('SessionEnd', endCmd);
+  for (const f of filesToProcess) {
+    const resolvedHooks = resolveHooksFromFile(f, {
+      CLAUDE_PLUGIN_ROOT: escapedRoot,
+      CLAUDE_NODE_EXEC: escapedNodeExec,
+    });
+
+    for (const [event, entries] of Object.entries(resolvedHooks)) {
+      if (!settings.hooks[event]) settings.hooks[event] = [];
+      settings.hooks[event] = settings.hooks[event].filter(h => {
+        const isLegacyAutosetup = cmd => {
+          if (!cmd) return false;
+          const hasScript = /scripts[\\/]+plugin-autosetup\.js/.test(cmd);
+          const hasOwnedMarker = /claude-statusline|CLAUDE_PLUGIN_ROOT/i.test(cmd);
+          return hasScript && hasOwnedMarker;
+        };
+        const isOurs = inner => inner.command && (
+          // Suffix match — catches hooks written by older package versions
+          inner.command.endsWith(' hook start') || inner.command.endsWith(' hook end') ||
+          // Exact match — catches current hooks including plugin-setup entries
+          ourCommands.has(inner.command) ||
+          // Legacy autosetup fallback — catches prior install roots
+          isLegacyAutosetup(inner.command)
+        );
+        if (h.hooks) return !h.hooks.some(isOurs);
+        return !isOurs(h);
+      });
+      if (enable) {
+        settings.hooks[event].push(...entries);
+      }
+      if (settings.hooks[event].length === 0) {
+        delete settings.hooks[event];
+      }
+    }
+  }
 
   if (Object.keys(settings.hooks).length === 0) {
     delete settings.hooks;
@@ -83,11 +159,6 @@ function updateHooks(settings, command, enable) {
 }
 
 function toggleHistory(enable) {
-  const scriptPath = path.resolve(__dirname, '../statusline.js');
-  const binaryPath = config.resolveBinary();
-  const safeBinary = binaryPath && !UNSAFE_CHARS.test(binaryPath) ? binaryPath : null;
-  const command = safeBinary ? `"${safeBinary}"` : `"${process.execPath}" "${scriptPath}"`;
-
   const settingsPath = getSettingsPath();
   let settings = {};
   if (fs.existsSync(settingsPath)) {
@@ -98,7 +169,11 @@ function toggleHistory(enable) {
     }
   }
 
-  updateHooks(settings, command, enable);
+  try {
+    updateHooks(settings, enable, { nodeExecCommand: buildNodeExecCommand() });
+  } catch (err) {
+    return { ok: false, error: err.message };
+  }
 
   try {
     atomicWrite(settingsPath, settings);

package/scripts/uninstall.js

@@ -19,7 +19,11 @@ function uninstall() {
 
   // Also strip our hooks if they exist
   const { updateHooks } = require('./setup');
-  updateHooks(settings, '', false);
+  try {
+    updateHooks(settings, false);
+  } catch (err) {
+    return { ok: false, error: err.message };
+  }
 
   try {
     atomicWrite(settingsPath, settings);