@alyibrahim/claude-statusline 1.5.3 → 1.5.4

package/README.md

@@ -34,6 +34,13 @@ Done. The statusline configures itself automatically. Restart Claude Code to see
 
 > If auto-setup didn't run: `claude-statusline setup`
 
+**Plugin install (Claude Code marketplace):** Search for `claude-statusline` in the Claude Code plugin browser. The plugin auto-configures on first session start. To get the native Rust binary after a plugin install, run:
+
+```bash
+claude-statusline download-binary
+claude-statusline setup
+```
+
 ---
 
 <div align="center">
@@ -95,15 +102,17 @@ Data is stored at `~/.claude/statusline-history.jsonl`.
 
 ### Claude Code slash commands
 
-History commands are also available directly inside Claude Code as slash commands:
+Commands are also available directly inside Claude Code as slash commands:
 
 - `/history`
 - `/history-enable`
 - `/history-disable`
 - `/history-mode <web|terminal>`
+- `/download-binary`
 
 Project contributors get these from the repo at `.claude/commands/`.
 Global npm installs copy them to `~/.claude/commands/` automatically.
+Plugin installs include them via the plugin's `commands/` directory.
 
 ### Terminal TUI
 
@@ -159,6 +168,8 @@ Rows are color-coded by exit reason: green = normal, yellow = interrupted, orang
 
 Pre-built Rust binaries are available for **Linux x64/arm64, macOS x64/arm64, and Windows x64**. All Linux distributions (Ubuntu, Arch, Fedora, etc.) are supported. Any other platform falls back to the JS implementation automatically — no action needed.
 
+Plugin installs skip `npm install`, so the binary is not downloaded automatically. Run `claude-statusline download-binary` once to get it.
+
 See [PLATFORMS.md](PLATFORMS.md) for the full compatibility guide, per-platform install instructions, and feature availability table.
 
 ---

package/bin/cli.js

@@ -23,7 +23,7 @@ Commands:
 const TERMINAL_FALLBACK_WARNING = [
   '[claude-statusline] terminal mode requires the native binary.',
   'Falling back to web dashboard. To install the binary, run:',
-  '  npm install -g @alyibrahim/claude-statusline'
+  '  claude-statusline download-binary'
 ].join('\n');
 
 function parseHistoryMode(args) {

package/hooks/hooks.json

@@ -6,7 +6,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "${CLAUDE_NODE_EXEC} \"${CLAUDE_PLUGIN_ROOT}/statusline.js\" hook start"
+            "command": "${CLAUDE_NODE_EXEC} \"${CLAUDE_PLUGIN_ROOT}/statusline.js\" hook start --marker=${HOOK_MARKER}"
           }
         ]
       }
@@ -17,7 +17,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "${CLAUDE_NODE_EXEC} \"${CLAUDE_PLUGIN_ROOT}/statusline.js\" hook end"
+            "command": "${CLAUDE_NODE_EXEC} \"${CLAUDE_PLUGIN_ROOT}/statusline.js\" hook end --marker=${HOOK_MARKER}"
           }
         ]
       }

package/hooks/plugin-setup.json

@@ -6,7 +6,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "${CLAUDE_NODE_EXEC} \"${CLAUDE_PLUGIN_ROOT}/scripts/plugin-autosetup.js\""
+            "command": "${CLAUDE_NODE_EXEC} \"${CLAUDE_PLUGIN_ROOT}/scripts/plugin-autosetup.js\" --marker=${HOOK_MARKER}"
           }
         ]
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alyibrahim/claude-statusline",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "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",
@@ -37,7 +37,8 @@
   "scripts": {
     "postinstall": "node scripts/postinstall.js",
     "preuninstall": "node scripts/preuninstall.js",
-    "test": "jest"
+    "test": "jest",
+    "check-versions": "node scripts/check-version-alignment.js"
   },
   "jest": {
     "testPathIgnorePatterns": [
@@ -57,11 +58,11 @@
     "open": "^10.1.0"
   },
   "optionalDependencies": {
-    "@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"
+    "@alyibrahim/claude-statusline-linux-x64": "1.5.4",
+    "@alyibrahim/claude-statusline-linux-arm64": "1.5.4",
+    "@alyibrahim/claude-statusline-darwin-x64": "1.5.4",
+    "@alyibrahim/claude-statusline-darwin-arm64": "1.5.4",
+    "@alyibrahim/claude-statusline-win32-x64": "1.5.4"
   },
   "devDependencies": {
     "jest": "^29.0.0"

package/scripts/check-version-alignment.js

@@ -0,0 +1,84 @@
+#!/usr/bin/env node
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+
+function readJson(filePath) {
+  return JSON.parse(fs.readFileSync(filePath, 'utf8'));
+}
+
+function readCargoVersion(cargoTomlPath) {
+  const content = fs.readFileSync(cargoTomlPath, 'utf8');
+  const match = content.match(/^version\s*=\s*"([^"]+)"/m);
+  return match ? match[1] : null;
+}
+
+function main() {
+  const root = path.resolve(__dirname, '..');
+  const packageJsonPath = path.join(root, 'package.json');
+  const packageLockPath = path.join(root, 'package-lock.json');
+  const cargoTomlPath = path.join(root, 'Cargo.toml');
+  const pluginJsonPath = path.join(root, '.claude-plugin', 'plugin.json');
+  const marketplaceJsonPath = path.join(root, '.claude-plugin', 'marketplace.json');
+
+  const rootPkg = readJson(packageJsonPath);
+  const lock = readJson(packageLockPath);
+  const cargoVersion = readCargoVersion(cargoTomlPath);
+  const pluginJson = readJson(pluginJsonPath);
+  const marketplaceJson = readJson(marketplaceJsonPath);
+  const optionalDeps = rootPkg.optionalDependencies || {};
+
+  const errors = [];
+  const expected = rootPkg.version;
+
+  if (!expected) {
+    errors.push('package.json is missing a version');
+  }
+
+  if (!cargoVersion) {
+    errors.push('Cargo.toml is missing a version');
+  } else if (cargoVersion !== expected) {
+    errors.push(`Cargo.toml version ${cargoVersion} does not match package.json version ${expected}`);
+  }
+
+  if (!pluginJson.version) {
+    errors.push('.claude-plugin/plugin.json is missing a version');
+  } else if (pluginJson.version !== expected) {
+    errors.push(`.claude-plugin/plugin.json version ${pluginJson.version} does not match package.json version ${expected}`);
+  }
+
+  const marketplaceVersion = marketplaceJson.plugins && marketplaceJson.plugins[0] && marketplaceJson.plugins[0].version;
+  if (!marketplaceVersion) {
+    errors.push('.claude-plugin/marketplace.json is missing plugins[0].version');
+  } else if (marketplaceVersion !== expected) {
+    errors.push(`.claude-plugin/marketplace.json plugins[0].version ${marketplaceVersion} does not match package.json version ${expected}`);
+  }
+
+  for (const [name, version] of Object.entries(optionalDeps)) {
+    const lockRootVersion = lock.packages && lock.packages[''] && lock.packages[''].optionalDependencies
+      ? lock.packages[''].optionalDependencies[name]
+      : undefined;
+    if (lockRootVersion !== version) {
+      errors.push(`package-lock.json root optionalDependencies[${name}] is ${lockRootVersion}, expected ${version}`);
+    }
+    // node_modules entries are only resolved once the package exists on npm.
+    // Pre-publish they contain only { optional: true } — skip the version check in that case.
+    const lockPkg = lock.packages && lock.packages[`node_modules/${name}`];
+    if (lockPkg && lockPkg.version !== undefined && lockPkg.version !== version) {
+      errors.push(`package-lock.json node_modules entry for ${name} is ${lockPkg.version}, expected ${version}`);
+    }
+  }
+
+  if (errors.length > 0) {
+    console.error('[check-versions] Failed version alignment checks:');
+    for (const err of errors) {
+      console.error(`- ${err}`);
+    }
+    process.exit(1);
+  }
+
+  console.log(`[check-versions] OK (version ${expected})`);
+}
+
+main();

package/scripts/history.js

@@ -3,6 +3,7 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const open = require('open');
+const { normalizeProjectSlug } = require('./slug-utils');
 
 const JSONL_PATH = path.join(
   process.env.HOME || process.env.USERPROFILE || os.homedir(),
@@ -65,7 +66,7 @@ function handleHookEnd() {
 
     const projectDir = process.env.CLAUDE_PROJECT_DIR || process.cwd();
     const home = process.env.HOME || process.env.USERPROFILE || os.homedir();
-    const slug = projectDir.replace(/[/\\]/g, '-');
+    const slug = normalizeProjectSlug(projectDir);
     const projectsDir = path.join(home, '.claude', 'projects', slug);
 
     // Read session stats from the most recently modified JSONL in the project dir

package/scripts/setup.js

@@ -5,6 +5,7 @@ const config = require('./config');
 const { getSettingsPath, atomicWrite } = config;
 
 const UNSAFE_CHARS = /["`$!()\\]/;
+const HOOK_MARKER = 'claude-statusline-owned-v1';
 
 function buildNodeExecCommand() {
   return `"${process.execPath}"`;
@@ -108,6 +109,7 @@ function updateHooks(settings, enable, { nodeExecCommand = buildNodeExecCommand(
     const resolved = resolveHooksFromFile(f, {
       CLAUDE_PLUGIN_ROOT: escapedRoot,
       CLAUDE_NODE_EXEC: escapedNodeExec,
+      HOOK_MARKER,
     });
     for (const entries of Object.values(resolved)) {
       for (const entry of entries) {
@@ -122,6 +124,7 @@ function updateHooks(settings, enable, { nodeExecCommand = buildNodeExecCommand(
     const resolvedHooks = resolveHooksFromFile(f, {
       CLAUDE_PLUGIN_ROOT: escapedRoot,
       CLAUDE_NODE_EXEC: escapedNodeExec,
+      HOOK_MARKER,
     });
 
     for (const [event, entries] of Object.entries(resolvedHooks)) {
@@ -133,11 +136,21 @@ function updateHooks(settings, enable, { nodeExecCommand = buildNodeExecCommand(
           const hasOwnedMarker = /claude-statusline|CLAUDE_PLUGIN_ROOT/i.test(cmd);
           return hasScript && hasOwnedMarker;
         };
+        const hasOwnedMarker = cmd => cmd && cmd.includes(`--marker=${HOOK_MARKER}`);
+        const isLegacyStatuslineHook = cmd => {
+          if (!cmd) return false;
+          const isHookSuffix = cmd.endsWith(' hook start') || cmd.endsWith(' hook end');
+          if (!isHookSuffix) return false;
+          // Keep backward compatibility with older commands while avoiding broad suffix-only matches.
+          return /(?:^|\s)(?:statusline|claude-statusline)(?:\s|$)/i.test(cmd);
+        };
         const isOurs = inner => inner.command && (
-          // Suffix match — catches hooks written by older package versions
-          inner.command.endsWith(' hook start') || inner.command.endsWith(' hook end') ||
+          // Marker match — canonical ownership check for new installs.
+          hasOwnedMarker(inner.command) ||
           // Exact match — catches current hooks including plugin-setup entries
           ourCommands.has(inner.command) ||
+          // Backward-compatible statusline suffix match for older package versions.
+          isLegacyStatuslineHook(inner.command) ||
           // Legacy autosetup fallback — catches prior install roots
           isLegacyAutosetup(inner.command)
         );

package/scripts/slug-utils.js

@@ -0,0 +1,7 @@
+'use strict';
+
+function normalizeProjectSlug(projectPath) {
+  return String(projectPath || '').replace(/[/\\]/g, '-');
+}
+
+module.exports = { normalizeProjectSlug };

package/statusline.js

@@ -6,6 +6,7 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const { execSync, execFileSync } = require('child_process');
+const { normalizeProjectSlug } = require('./scripts/slug-utils');
 
 const cmd = process.argv[2];
 if (cmd === 'history') {
@@ -30,7 +31,7 @@ if (cmd === 'history') {
 // Returns { totalIn, totalOut } or null on any error.
 function readSessionTokens(claudeDir, session, absDir) {
   if (!session) return null;
-  const slug = absDir.replace(/\//g, '-');
+  const slug = normalizeProjectSlug(absDir);
   const jsonlPath = path.join(claudeDir, 'projects', slug, `${session}.jsonl`);
   const cachePath = path.join(claudeDir, `statusline-tokcache-${session}.json`);
   try {