@alyibrahim/claude-statusline 1.6.0 → 1.6.2

package/README.md

@@ -34,7 +34,7 @@ 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:
+**Plugin install (Claude Code marketplace):** Search for `claude-statusline` in the Claude Code plugin browser. The plugin auto-configures during installation. To get the native Rust binary after a plugin install, run:
 
 ```bash
 claude-statusline download-binary

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alyibrahim/claude-statusline",
-  "version": "1.6.0",
+  "version": "1.6.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",
@@ -58,11 +58,11 @@
     "open": "^10.1.0"
   },
   "optionalDependencies": {
-    "@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"
+    "@alyibrahim/claude-statusline-linux-x64": "1.6.2",
+    "@alyibrahim/claude-statusline-linux-arm64": "1.6.2",
+    "@alyibrahim/claude-statusline-darwin-x64": "1.6.2",
+    "@alyibrahim/claude-statusline-darwin-arm64": "1.6.2",
+    "@alyibrahim/claude-statusline-win32-x64": "1.6.2"
   },
   "devDependencies": {
     "jest": "^29.0.0"

package/scripts/check-version-alignment.js

@@ -15,7 +15,7 @@ function readCargoVersion(cargoTomlPath) {
 }
 
 function main() {
-  const root = path.resolve(__dirname, '..');
+  const root = process.env.CHECK_VERSIONS_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');
@@ -56,6 +56,11 @@ function main() {
   }
 
   for (const [name, version] of Object.entries(optionalDeps)) {
+    // Each platform package must be pinned to the root version — they are published together.
+    if (version !== expected) {
+      errors.push(`optionalDependencies[${name}] is pinned to ${version}, expected root version ${expected}`);
+    }
+
     const lockRootVersion = lock.packages && lock.packages[''] && lock.packages[''].optionalDependencies
       ? lock.packages[''].optionalDependencies[name]
       : undefined;

package/scripts/config.js

@@ -3,6 +3,10 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 
+function getHomeDir() {
+  return process.env.HOME || process.env.USERPROFILE || os.homedir();
+}
+
 function getClaudeConfigDir() {
   const configDir = process.env.CLAUDE_CONFIG_DIR;
   return (configDir && configDir.trim())
@@ -10,6 +14,10 @@ function getClaudeConfigDir() {
     : path.join(os.homedir(), '.claude');
 }
 
+function isPlainObject(value) {
+  return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
+}
+
 function sanitizeSlug(s) {
   return String(s || '')
     .replace(/[^a-zA-Z0-9_-]/g, '-')
@@ -45,6 +53,7 @@ function getSettingsPath() {
 
 function atomicWrite(filePath, obj) {
   const tmpPath = filePath + '.tmp';
+  fs.mkdirSync(path.dirname(filePath), { recursive: true });
   if (fs.existsSync(tmpPath)) fs.unlinkSync(tmpPath);
   fs.writeFileSync(tmpPath, JSON.stringify(obj, null, 2));
   try {
@@ -76,7 +85,9 @@ module.exports = {
   getSettingsPath,
   atomicWrite,
   resolveBinary,
+  getHomeDir,
   getClaudeConfigDir,
+  isPlainObject,
   getRealtimeTtySlug,
   getRealtimePaths,
 };

package/scripts/history.js

@@ -2,15 +2,23 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
-const open = require('open');
 const { normalizeProjectSlug } = require('./slug-utils');
+const { getHomeDir } = require('./config');
 
 const JSONL_PATH = path.join(
-  process.env.HOME || process.env.USERPROFILE || os.homedir(),
+  getHomeDir(),
   '.claude',
   'statusline-history.jsonl'
 );
 
+function safeJsonParse(value, fallback = null) {
+  try {
+    return JSON.parse(value);
+  } catch (e) {
+    return fallback;
+  }
+}
+
 function now() {
   return new Date().toISOString().replace('T', ' ').slice(0, 19);
 }
@@ -61,11 +69,10 @@ function handleHookEnd() {
   process.stdin.setEncoding('utf8');
   process.stdin.on('data', chunk => input += chunk);
   process.stdin.on('end', () => {
-    let reason = 'unknown';
-    try { reason = JSON.parse(input).reason || 'unknown'; } catch (e) {}
+    const reason = safeJsonParse(input, {}).reason || 'unknown';
 
     const projectDir = process.env.CLAUDE_PROJECT_DIR || process.cwd();
-    const home = process.env.HOME || process.env.USERPROFILE || os.homedir();
+    const home = getHomeDir();
     const slug = normalizeProjectSlug(projectDir);
     const projectsDir = path.join(home, '.claude', 'projects', slug);
 
@@ -87,21 +94,20 @@ function handleHookEnd() {
           const lines = fs.readFileSync(newestFile, 'utf8').split('\n');
           for (const line of lines) {
             if (!line.trim()) continue;
-            try {
-              const entry = JSON.parse(line);
-              if (entry.type === 'assistant' && entry.message?.usage) {
-                const u = entry.message.usage;
-                totalIn  += (u.input_tokens || 0)
-                  + Math.round((u.cache_read_input_tokens || 0) * 0.1)
-                  + (u.cache_creation_input_tokens || 0);
-                totalOut += (u.output_tokens || 0);
-                if (!model) model = entry.message.model || '';
-              } else if (entry.type === 'cost') {
-                cost += (entry.cost_usd || 0);
-              } else if (entry.type === 'message_start' && !model) {
-                model = entry.message?.model || '';
-              }
-            } catch (e) {}
+            const entry = safeJsonParse(line);
+            if (!entry) continue;
+            if (entry.type === 'assistant' && entry.message?.usage) {
+              const u = entry.message.usage;
+              totalIn  += (u.input_tokens || 0)
+                + Math.round((u.cache_read_input_tokens || 0) * 0.1)
+                + (u.cache_creation_input_tokens || 0);
+              totalOut += (u.output_tokens || 0);
+              if (!model) model = entry.message.model || '';
+            } else if (entry.type === 'cost') {
+              cost += (entry.cost_usd || 0);
+            } else if (entry.type === 'message_start' && !model) {
+              model = entry.message?.model || '';
+            }
           }
         }
       } catch (e) {}
@@ -165,6 +171,7 @@ async function handleHistory() {
   const tempPath = path.join(os.tmpdir(), 'claude-statusline-dashboard.html');
   fs.writeFileSync(tempPath, html);
   try {
+    const open = require('open');
     await open.default(tempPath);
     console.log(`Dashboard opened: ${tempPath}`);
   } catch (e) {

package/scripts/plugin-autosetup.js

@@ -2,34 +2,49 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
-const { atomicWrite } = require('./config');
+const { atomicWrite, resolveBinary } = require('./config');
 
-// Only meaningful in plugin context — exit silently otherwise
-const pluginRoot = process.env.CLAUDE_PLUGIN_ROOT;
-if (!pluginRoot) process.exit(0);
+function pluginAutoSetup(pluginRoot = process.env.CLAUDE_PLUGIN_ROOT) {
+  // Only meaningful in plugin context.
+  if (!pluginRoot) return { ok: true, configured: false };
 
-const configDir = process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), '.claude');
-const settingsPath = path.join(configDir, 'settings.json');
+  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) {}
+  let settings = {};
+  try {
+    settings = JSON.parse(fs.readFileSync(settingsPath, 'utf8'));
+  } catch (e) {}
 
-// Already configured — nothing to do
-if (settings.statusLine) process.exit(0);
+  // Already configured; leave user config untouched.
+  if (settings.statusLine) return { ok: true, configured: false };
 
-const script = path.join(pluginRoot, 'statusline.js');
-if (!fs.existsSync(script)) process.exit(0);
+  const script = path.join(pluginRoot, 'statusline.js');
+  const binaryPath = resolveBinary();
+  if (!binaryPath && !fs.existsSync(script)) return { ok: true, configured: false };
 
-settings.statusLine = {
-  type: 'command',
-  command: `"${process.execPath}" "${script}"`,
-};
+  const command = binaryPath
+    ? `"${binaryPath}"`
+    : `"${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
+  settings.statusLine = {
+    type: 'command',
+    command,
+  };
+
+  try {
+    fs.mkdirSync(path.dirname(settingsPath), { recursive: true });
+    atomicWrite(settingsPath, settings);
+  } catch (e) {
+    return { ok: true, configured: false }; // Non-fatal.
+  }
+
+  return { ok: true, configured: true };
+}
+
+module.exports = { pluginAutoSetup };
+
+if (require.main === module) {
+  pluginAutoSetup();
+  process.exit(0); // never fail plugin startup
 }

package/scripts/postinstall.js

@@ -3,8 +3,19 @@
 const fs = require('fs');
 const path = require('path');
 const { setup } = require('./setup');
+const { pluginAutoSetup } = require('./plugin-autosetup');
 const config = require('./config');
 try {
+  // Plugin installs run npm scripts in plugin context; configure statusLine once at install time.
+  if (process.env.CLAUDE_PLUGIN_ROOT) {
+    pluginAutoSetup(process.env.CLAUDE_PLUGIN_ROOT);
+    const pluginBinaryPath = config.resolveBinary();
+    if (pluginBinaryPath && process.platform !== 'win32') {
+      try { fs.chmodSync(pluginBinaryPath, 0o755); } catch (e) {}
+    }
+    process.exit(0);
+  }
+
   const result = setup({ force: false });
   if (result.settingsPath === null) process.exit(0); // non-global install, skip silently
 

package/scripts/setup.js

@@ -2,7 +2,7 @@
 const fs = require('fs');
 const path = require('path');
 const config = require('./config');
-const { getSettingsPath, atomicWrite } = config;
+const { getSettingsPath, atomicWrite, isPlainObject } = config;
 
 const UNSAFE_CHARS = /["`$!()\\]/;
 const HOOK_MARKER = 'claude-statusline-owned-v1';
@@ -59,6 +59,9 @@ function setup({ force = false } = {}) {
     } catch (e) {
       return { ok: false, error: 'settings.json contains invalid JSON — fix manually then re-run.' };
     }
+    if (!isPlainObject(settings)) {
+      return { ok: false, error: 'settings.json does not contain a JSON object — fix manually then re-run.' };
+    }
   }
 
   const binaryPath = config.resolveBinary();
@@ -180,6 +183,9 @@ function toggleHistory(enable) {
     } catch (e) {
       return { ok: false, error: 'settings.json contains invalid JSON — fix manually then re-run.' };
     }
+    if (!isPlainObject(settings)) {
+      return { ok: false, error: 'settings.json does not contain a JSON object — fix manually then re-run.' };
+    }
   }
 
   try {
@@ -209,6 +215,9 @@ function getDashboardMode() {
   } catch (e) {
     return { ok: false, error: 'settings.json contains invalid JSON - fix manually then re-run.' };
   }
+  if (!isPlainObject(settings)) {
+    return { ok: false, error: 'settings.json does not contain a JSON object - fix manually then re-run.' };
+  }
 
   const mode = settings.dashboardMode === 'terminal' ? 'terminal' : 'web';
   return { ok: true, settingsPath, mode };
@@ -227,6 +236,9 @@ function setDashboardMode(mode) {
     } catch (e) {
       return { ok: false, error: 'settings.json contains invalid JSON - fix manually then re-run.' };
     }
+    if (!isPlainObject(settings)) {
+      return { ok: false, error: 'settings.json does not contain a JSON object - fix manually then re-run.' };
+    }
   }
 
   settings.dashboardMode = mode;

package/scripts/uninstall.js

@@ -1,6 +1,6 @@
 'use strict';
 const fs = require('fs');
-const { getSettingsPath, atomicWrite } = require('./config');
+const { getSettingsPath, atomicWrite, isPlainObject } = require('./config');
 
 function uninstall() {
   const settingsPath = getSettingsPath();
@@ -12,6 +12,9 @@ function uninstall() {
   } catch (e) {
     return { ok: false, error: 'settings.json contains invalid JSON — cannot safely modify.' };
   }
+  if (!isPlainObject(settings)) {
+    return { ok: false, error: 'settings.json does not contain a JSON object — cannot safely modify.' };
+  }
 
   if (settings.statusLine) {
     delete settings.statusLine;

package/statusline.js

@@ -4,45 +4,34 @@
 
 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 {
+  getHomeDir,
+  getRealtimePaths,
+  atomicWrite: atomicWriteJson,
+} = require('./scripts/config');
 
 function realtimeEnabled() {
   const v = process.env.CLAUDE_STATUSLINE_REALTIME;
   return v === '1' || v === 'true' || v === 'TRUE';
 }
 
-function realtimeTtySlug() {
-  const raw = (process.env.CLAUDE_STATUSLINE_TTY || process.env.TERM_SESSION_ID || `pid-${process.pid}`).trim();
-  return raw.replace(/[^a-zA-Z0-9_-]/g, '-').replace(/-+/g, '-').replace(/^-|-$/g, '');
-}
-
-function atomicWrite(filePath, obj) {
-  const tmp = `${filePath}.tmp`;
-  fs.mkdirSync(path.dirname(filePath), { recursive: true });
-  fs.writeFileSync(tmp, JSON.stringify(obj));
-  fs.renameSync(tmp, filePath);
-}
-
 function emitRealtimeEvent(eventType, payload) {
   if (!realtimeEnabled()) return;
   try {
-    const claudeDir = process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), '.claude');
-    const ttySlug = realtimeTtySlug();
+    const { claudeDir, ttySlug, statePath, registryPath, socketPath } = getRealtimePaths();
     const now = Date.now();
-    const statePath = path.join(claudeDir, `statusline-state-${ttySlug}.json`);
-    const registryPath = path.join(claudeDir, `statusline-renderer-${ttySlug}.json`);
 
-    atomicWrite(registryPath, {
+    atomicWriteJson(registryPath, {
       version: 1,
       pid: process.pid,
       tty_slug: ttySlug,
       heartbeat_at_ms: now,
-      socket_path: path.join(claudeDir, `statusline-rt-${ttySlug}.sock`),
+      socket_path: socketPath,
     });
 
-    atomicWrite(statePath, {
+    atomicWriteJson(statePath, {
       version: 1,
       event_type: eventType,
       tty_slug: ttySlug,
@@ -261,7 +250,7 @@ process.stdin.on('end', () => {
     // Current task from todos
     let task = '';
     let activeAgents = 0;
-    const homeDir = os.homedir();
+    const homeDir = getHomeDir();
     const claudeDir = process.env.CLAUDE_CONFIG_DIR || path.join(homeDir, '.claude');
     const todosDir = path.join(claudeDir, 'todos');
     if (session && fs.existsSync(todosDir)) {