claudeline 1.6.2 → 1.7.0

package/README.md

@@ -171,7 +171,7 @@ Available separators:
 
 ### Usage/Limits
 
-Fetches your 5-hour and 7-day API utilization from Claude's OAuth API. Data is cached for 5 minutes in `$TMPDIR/claudeline-usage-cache.json`, shared across all sessions system-wide. The OAuth token is read automatically from macOS Keychain.
+Requires [Clusage](https://github.com/seventwo-studio/clusage), a macOS menu bar app that tracks your Claude API usage. Clusage writes usage data to `~/.claude/clusage-api.json`, which claudeline reads automatically. Install Clusage and add at least one account for usage components to work.
 
 | Component | Description | Example |
 |-----------|-------------|---------|
@@ -188,6 +188,13 @@ Fetches your 5-hour and 7-day API utilization from Claude's OAuth API. Data is c
 | `usage:5h-emoji` | 5h status emoji (🟢🟡🟠🔴) | `🟢` |
 | `usage:week-emoji` | Weekly status emoji | `🟡` |
 | `usage:7d-emoji` | Alias for `usage:week-emoji` | `🟡` |
+| `usage:velocity` | 5h usage velocity | `2.3 pp/hr` |
+| `usage:intensity` | Usage intensity level | `moderate` |
+| `usage:eta` | Time until rate limit ceiling | `1h 23m` |
+| `usage:7d-granular` | Interpolated 7-day utilization | `46.3%` |
+| `usage:7d-projected` | Projected 7-day at reset | `62%` |
+| `usage:budget` | Daily usage budget | `14.3 pp/day` |
+| `usage:budget-status` | Budget pacing status | `on_track` |
 
 ### File System
 

package/dist/index.js

@@ -166,7 +166,7 @@ function listComponents() {
     {
       name: "Claude/Session",
       prefix: "claude",
-      items: ["model", "model-id", "model-letter", "effort", "version", "session", "session-full", "style"]
+      items: ["model", "model-id", "model-letter", "effort", "effort-icon", "version", "session", "session-full", "style"]
     },
     {
       name: "Context Window",
@@ -439,7 +439,7 @@ var THEMES = {
   nerd: "nerd:nf-dev-nodejs_small env:node-short sep:dot nerd:nf-cod-folder fs:dir sep:dot nerd:nf-dev-git_branch git:branch git:status",
   compact: "claude:model sep:slash fs:dir sep:slash git:branch",
   colorful: "bold:magenta:claude:model sep:arrow cyan:nerd:nf-cod-folder cyan:fs:dir sep:arrow green:nerd:nf-dev-git_branch green:git:branch yellow:git:status sep:arrow blue:nerd:nf-fa-gauge blue:ctx:percent",
-  luca: "bold:magenta:claude:model if:effort(dim:sep:middot text:\u{F09D1} claude:effort) dim:sep:middot cyan:nerd:nf-md-source_branch cyan:git:repo sep:none text:: sep:none green:git:branch if:subdir(sep:none white:text:/ sep:none white:fs:relative) if:dirty(dim:sep:middot git:dirty) dim:sep:middot white:account:email sep:newline bold:white:usage:5h-bar:8 usage:5h (usage:5h-pace) dim:usage:5h-reset dim:sep:middot bold:white:usage:week-bar:8 usage:week (usage:week-pace) dim:usage:week-reset dim:sep:middot white:cost:total"
+  luca: "bold:magenta:claude:model if:effort(dim:sep:middot claude:effort-icon claude:effort) dim:sep:middot cyan:nerd:nf-md-source_branch cyan:git:repo sep:none text:: sep:none green:git:branch if:subdir(sep:none white:text:/ sep:none white:fs:relative) if:dirty(dim:sep:middot git:dirty) dim:sep:middot white:account:email sep:newline bold:white:usage:5h-bar:8 usage:5h (usage:5h-pace) dim:usage:5h-reset dim:sep:middot bold:white:usage:week-bar:8 usage:week (usage:week-pace) dim:usage:week-reset dim:sep:middot usage:intensity usage:velocity dim:sep:middot white:cost:total"
 };
 function getTheme(name) {
   return THEMES[name] || null;
@@ -596,9 +596,9 @@ function getSampleDataJson() {
 
 // src/runtime.ts
 import * as path3 from "path";
-import * as os2 from "os";
+import * as os3 from "os";
 import * as fs3 from "fs";
-import { execSync as execSync2 } from "child_process";
+import { execSync } from "child_process";
 
 // src/separators.ts
 var SEPARATORS = {
@@ -638,89 +638,46 @@ function getSeparator(name) {
 // src/usage.ts
 import * as fs2 from "fs";
 import * as path2 from "path";
-import * as crypto from "crypto";
-import { execSync } from "child_process";
-var CACHE_TTL_MS = 5 * 60 * 1e3;
-var PROFILE_CACHE_TTL_MS = 60 * 60 * 1e3;
-function tokenHash(token) {
-  return crypto.createHash("sha256").update(token).digest("hex").slice(0, 12);
-}
-function getCacheFile(token, type) {
-  const dir = path2.join(getClaudeConfigDir(), "cache");
-  try {
-    fs2.mkdirSync(dir, { recursive: true });
-  } catch {
-  }
-  return path2.join(dir, `claudeline-${type}-${tokenHash(token)}.json`);
-}
-function readCache(cacheFile) {
-  try {
-    const raw = fs2.readFileSync(cacheFile, "utf8");
-    const cached = JSON.parse(raw);
-    if (Date.now() - cached.fetched_at < CACHE_TTL_MS) {
-      return cached;
-    }
-  } catch {
-  }
-  return null;
-}
-function writeCache(cacheFile, data) {
-  try {
-    fs2.writeFileSync(cacheFile, JSON.stringify({ data, fetched_at: Date.now() }));
-  } catch {
-  }
-}
-function getKeychainService() {
-  const configDir = process.env.CLAUDE_CONFIG_DIR;
-  if (configDir) {
-    const suffix = crypto.createHash("sha256").update(configDir).digest("hex").slice(0, 8);
-    return `Claude Code-credentials-${suffix}`;
-  }
-  return "Claude Code-credentials";
-}
-function getOAuthToken() {
+import * as os2 from "os";
+var CLUSAGE_API_FILE = path2.join(os2.homedir(), ".claude", "clusage-api.json");
+var CLUSAGE_STALE_MS = 10 * 60 * 1e3;
+var _clusageCache = null;
+function readClusageAPI() {
   try {
-    const service = getKeychainService();
-    const raw = execSync(
-      `security find-generic-password -s "${service}" -w 2>/dev/null`,
-      { encoding: "utf8" }
-    ).trim();
-    const parsed = JSON.parse(raw);
-    if (typeof parsed === "string") return parsed;
-    if (parsed.claudeAiOauth?.accessToken) return parsed.claudeAiOauth.accessToken;
-    if (parsed.accessToken) return parsed.accessToken;
-    if (parsed.access_token) return parsed.access_token;
-    return null;
+    const raw = fs2.readFileSync(CLUSAGE_API_FILE, "utf8");
+    const payload = JSON.parse(raw);
+    if (!payload.updatedAt || !payload.accounts?.length) return null;
+    const age = Date.now() - new Date(payload.updatedAt).getTime();
+    if (age > CLUSAGE_STALE_MS) return null;
+    _clusageCache = payload;
+    return payload;
   } catch {
     return null;
   }
 }
-function fetchUsage(token) {
-  try {
-    const result = execSync(
-      `curl -s --max-time 5 -H "Authorization: Bearer ${token}" -H "anthropic-beta: oauth-2025-04-20" "https://api.anthropic.com/api/oauth/usage"`,
-      { encoding: "utf8" }
-    ).trim();
-    const data = JSON.parse(result);
-    if (data.five_hour && data.seven_day) {
-      return data;
-    }
-    return null;
-  } catch {
-    return null;
-  }
+function getClusageAccount() {
+  const payload = _clusageCache ?? readClusageAPI();
+  if (!payload || payload.accounts.length === 0) return null;
+  return payload.accounts[0];
 }
 function getUsageData() {
-  const token = getOAuthToken();
-  if (!token) return null;
-  const cacheFile = getCacheFile(token, "usage");
-  const cached = readCache(cacheFile);
-  if (cached) return cached.data;
-  const data = fetchUsage(token);
-  if (data) {
-    writeCache(cacheFile, data);
-  }
-  return data;
+  const account = getClusageAccount();
+  if (!account) return null;
+  return {
+    five_hour: {
+      utilization: account.fiveHour.utilization,
+      resets_at: account.fiveHour.resetsAt
+    },
+    seven_day: {
+      utilization: account.sevenDay.utilization,
+      resets_at: account.sevenDay.resetsAt
+    }
+  };
+}
+function getProfileData() {
+  const account = getClusageAccount();
+  if (!account?.profile) return null;
+  return { email: account.profile.email };
 }
 function formatTimeUntil(isoDate) {
   const reset = new Date(isoDate).getTime();
@@ -770,66 +727,12 @@ function makeBar(pct, width, label) {
   const bar = "\u25B0".repeat(filled) + "\u25B1".repeat(width - filled);
   return label ? label + bar : bar;
 }
-function readProfileCache(cacheFile) {
-  try {
-    const raw = fs2.readFileSync(cacheFile, "utf8");
-    const cached = JSON.parse(raw);
-    if (Date.now() - cached.fetched_at < PROFILE_CACHE_TTL_MS) {
-      return cached;
-    }
-  } catch {
-  }
-  return null;
-}
-function writeProfileCache(cacheFile, data) {
-  try {
-    fs2.writeFileSync(cacheFile, JSON.stringify({ data, fetched_at: Date.now() }));
-  } catch {
-  }
-}
-function fetchProfile(token) {
-  try {
-    const result = execSync(
-      `curl -s --max-time 5 -H "Authorization: Bearer ${token}" -H "anthropic-beta: oauth-2025-04-20" "https://api.anthropic.com/api/oauth/profile"`,
-      { encoding: "utf8" }
-    ).trim();
-    const data = JSON.parse(result);
-    if (data.account?.email) {
-      return data;
-    }
-    return null;
-  } catch {
-    return null;
-  }
-}
-function getProfileData() {
-  const token = getOAuthToken();
-  if (!token) return null;
-  const cacheFile = getCacheFile(token, "profile");
-  const cached = readProfileCache(cacheFile);
-  if (cached) return cached.data;
-  const data = fetchProfile(token);
-  if (data) {
-    writeProfileCache(cacheFile, data);
-  }
-  return data;
-}
 function evaluateAccountComponent(key) {
   const data = getProfileData();
   if (!data) return "";
   switch (key) {
     case "email":
-      return data.account.email;
-    case "name":
-      return data.account.full_name;
-    case "display-name":
-      return data.account.display_name;
-    case "org":
-      return data.organization.name;
-    case "plan":
-      return data.organization.organization_type;
-    case "tier":
-      return data.organization.rate_limit_tier;
+      return data.email;
     default:
       return "";
   }
@@ -901,6 +804,38 @@ function evaluateUsageComponent(key, args, noColor = false) {
       const { delta } = calculatePace(data.seven_day, SEVEN_DAY_MS);
       return formatPaceIcon(delta, noColor);
     }
+    // Clusage momentum/projection data
+    case "velocity": {
+      const m = getClusageAccount()?.momentum;
+      return m ? m.velocity.toFixed(1) + " pp/hr" : "";
+    }
+    case "intensity": {
+      const m = getClusageAccount()?.momentum;
+      return m?.intensity ?? "";
+    }
+    case "eta": {
+      const m = getClusageAccount()?.momentum;
+      if (!m?.etaToCeiling) return "";
+      const h = Math.floor(m.etaToCeiling / 3600);
+      const min = Math.floor(m.etaToCeiling % 3600 / 60);
+      return h > 0 ? `${h}h ${min}m` : `${min}m`;
+    }
+    case "7d-granular": {
+      const p = getClusageAccount()?.projection;
+      return p?.granularSevenDayUtilization != null ? p.granularSevenDayUtilization.toFixed(1) + "%" : "";
+    }
+    case "7d-projected": {
+      const p = getClusageAccount()?.projection;
+      return p ? Math.round(p.projectedAtReset) + "%" : "";
+    }
+    case "budget": {
+      const p = getClusageAccount()?.projection;
+      return p ? p.dailyBudget.toFixed(1) + " pp/day" : "";
+    }
+    case "budget-status": {
+      const p = getClusageAccount()?.projection;
+      return p?.status ?? "";
+    }
     default:
       return "";
   }
@@ -1051,7 +986,7 @@ function formatDuration(ms) {
 }
 function execCommand(cmd) {
   try {
-    return execSync2(cmd, { encoding: "utf8" }).trim();
+    return execSync(cmd, { encoding: "utf8" }).trim();
   } catch {
     return "";
   }
@@ -1062,7 +997,44 @@ function applyStyles(text, styles, noColor) {
   if (codes.length === 0) return text;
   return `\x1B[0;${codes.join(";")}m${text}\x1B[${RESET}m`;
 }
-function evaluateClaudeComponent(key, data, noColor = false) {
+var settingsCache = /* @__PURE__ */ new Map();
+var SETTINGS_CACHE_TTL = 1e4;
+function readSettingsFile(filePath) {
+  const cached = settingsCache.get(filePath);
+  if (cached && Date.now() - cached.ts < SETTINGS_CACHE_TTL) {
+    return cached.data;
+  }
+  try {
+    const data = JSON.parse(fs3.readFileSync(filePath, "utf8"));
+    settingsCache.set(filePath, { data, ts: Date.now() });
+    return data;
+  } catch {
+    return {};
+  }
+}
+var VALID_EFFORTS = ["low", "medium", "high"];
+function resolveEffort(data) {
+  const stdinEffort = data.model?.reasoning_effort;
+  if (stdinEffort && VALID_EFFORTS.includes(stdinEffort)) {
+    return stdinEffort;
+  }
+  let effort = "high";
+  const globalPath = path3.join(os3.homedir(), ".claude", "settings.json");
+  const globalSettings = readSettingsFile(globalPath);
+  if (typeof globalSettings.effortLevel === "string" && VALID_EFFORTS.includes(globalSettings.effortLevel)) {
+    effort = globalSettings.effortLevel;
+  }
+  const projectDir = data.workspace?.project_dir;
+  if (projectDir) {
+    const projectPath = path3.join(projectDir, ".claude", "settings.json");
+    const projectSettings = readSettingsFile(projectPath);
+    if (typeof projectSettings.effortLevel === "string" && VALID_EFFORTS.includes(projectSettings.effortLevel)) {
+      effort = projectSettings.effortLevel;
+    }
+  }
+  return effort;
+}
+function evaluateClaudeComponent(key, data, noColor = false, noIcons = false) {
   switch (key) {
     case "model":
       return data.model?.display_name || "Claude";
@@ -1076,31 +1048,20 @@ function evaluateClaudeComponent(key, data, noColor = false) {
       return (data.session_id || "").slice(0, 8);
     case "session-full":
       return data.session_id || "";
-    case "effort": {
-      try {
-        const globalPath = path3.join(os2.homedir(), ".claude", "settings.json");
-        const projectPath = path3.join(process.cwd(), ".claude", "settings.json");
-        let effort = "high";
-        try {
-          effort = JSON.parse(fs3.readFileSync(globalPath, "utf8")).effortLevel || effort;
-        } catch {
-        }
-        try {
-          effort = JSON.parse(fs3.readFileSync(projectPath, "utf8")).effortLevel || effort;
-        } catch {
-        }
-        if (noColor) return effort;
-        const r = `\x1B[${RESET}m`;
-        const colors = {
-          low: COLORS.green,
-          medium: COLORS.yellow,
-          high: COLORS.red
-        };
-        const code = colors[effort] || "";
-        return code ? `\x1B[0;${code}m${effort}${r}` : effort;
-      } catch {
-        return "";
-      }
+    case "effort":
+    case "effort-icon": {
+      const effort = resolveEffort(data);
+      if (key === "effort-icon" && noIcons) return "";
+      const text = key === "effort-icon" ? "\u{F09D1}" : effort;
+      if (noColor) return text;
+      const r = `\x1B[${RESET}m`;
+      const effortColors = {
+        low: COLORS.green,
+        medium: COLORS.yellow,
+        high: COLORS.red
+      };
+      const code = effortColors[effort] || "";
+      return code ? `\x1B[0;${code}m${text}${r}` : text;
     }
     case "style":
       return data.output_style?.name || "default";
@@ -1119,7 +1080,7 @@ function evaluateFsComponent(key, data) {
     case "project-path":
       return data.workspace?.project_dir || "";
     case "home":
-      return (data.workspace?.current_dir || data.cwd || "").replace(os2.homedir(), "~");
+      return (data.workspace?.current_dir || data.cwd || "").replace(os3.homedir(), "~");
     case "cwd":
       return data.cwd || "";
     case "relative": {
@@ -1134,27 +1095,28 @@ function evaluateFsComponent(key, data) {
       return "";
   }
 }
-function evaluateGitComponent(key, noColor = false) {
+function evaluateGitComponent(key, noColor = false, noIcons = false) {
   switch (key) {
     case "branch":
       return execCommand("git branch --show-current 2>/dev/null");
     case "status":
       try {
-        execSync2("git diff --quiet 2>/dev/null");
+        execSync("git diff --quiet 2>/dev/null");
         return "\u2713";
       } catch {
         return "*";
       }
     case "status-icon":
+      if (noIcons) return "";
       try {
-        execSync2("git diff --quiet 2>/dev/null");
+        execSync("git diff --quiet 2>/dev/null");
         return getNerdIcon("sparkle");
       } catch {
         return getNerdIcon("commit");
       }
     case "status-word":
       try {
-        execSync2("git diff --quiet 2>/dev/null");
+        execSync("git diff --quiet 2>/dev/null");
         return "clean";
       } catch {
         return "dirty";
@@ -1234,7 +1196,7 @@ function evaluateGitComponent(key, noColor = false) {
       return "";
   }
 }
-function evaluateContextComponent(key, data, args) {
+function evaluateContextComponent(key, data, args, noIcons = false) {
   const ctx = data.context_window;
   switch (key) {
     case "percent":
@@ -1259,6 +1221,7 @@ function evaluateContextComponent(key, data, args) {
       return "[" + "\u2588".repeat(filled) + "\u2591".repeat(width - filled) + "]";
     }
     case "icon": {
+      if (noIcons) return "";
       const pct = ctx?.used_percentage || 0;
       const icon = getNerdIcon("circle");
       if (pct < 50) return `\x1B[0;${COLORS.green}m${icon}\x1B[${RESET}m`;
@@ -1337,11 +1300,11 @@ function evaluateEnvComponent(key) {
       return match?.[1] || "";
     }
     case "user":
-      return os2.userInfo().username;
+      return os3.userInfo().username;
     case "hostname":
-      return os2.hostname();
+      return os3.hostname();
     case "hostname-short":
-      return os2.hostname().split(".")[0];
+      return os3.hostname().split(".")[0];
     case "shell":
       return path3.basename(process.env.SHELL || "");
     case "term":
@@ -1351,11 +1314,11 @@ function evaluateEnvComponent(key) {
     case "arch":
       return process.arch;
     case "os-release":
-      return os2.release();
+      return os3.release();
     case "cpus":
-      return os2.cpus().length.toString();
+      return os3.cpus().length.toString();
     case "memory":
-      return Math.round(os2.totalmem() / 1024 / 1024 / 1024) + "GB";
+      return Math.round(os3.totalmem() / 1024 / 1024 / 1024) + "GB";
     default:
       return "";
   }
@@ -1403,41 +1366,53 @@ function evaluateTimeComponent(key, data) {
       return "";
   }
 }
-function evaluateCondition(condition) {
+function evaluateCondition(condition, data) {
   switch (condition) {
     case "git":
       try {
-        execSync2("git rev-parse --git-dir 2>/dev/null");
+        execSync("git rev-parse --git-dir 2>/dev/null");
         return true;
       } catch {
         return false;
       }
     case "dirty":
       try {
-        execSync2("git diff --quiet 2>/dev/null");
+        execSync("git diff --quiet 2>/dev/null");
         return false;
       } catch {
         return true;
       }
     case "clean":
       try {
-        execSync2("git diff --quiet 2>/dev/null");
+        execSync("git diff --quiet 2>/dev/null");
         return true;
       } catch {
         return false;
       }
     case "subdir": {
       const root = execCommand("git rev-parse --show-toplevel 2>/dev/null");
-      return root !== "" && process.cwd() !== root;
+      const currentDir = data.workspace?.current_dir || process.cwd();
+      return root !== "" && currentDir !== root;
     }
-    case "node":
-      return fs3.existsSync("package.json");
-    case "python":
+    case "node": {
+      const projectDir = data.workspace?.project_dir;
+      return projectDir ? fs3.existsSync(path3.join(projectDir, "package.json")) : fs3.existsSync("package.json");
+    }
+    case "python": {
+      const projectDir = data.workspace?.project_dir;
+      if (projectDir) {
+        return fs3.existsSync(path3.join(projectDir, "pyproject.toml")) || fs3.existsSync(path3.join(projectDir, "setup.py")) || fs3.existsSync(path3.join(projectDir, "requirements.txt"));
+      }
       return fs3.existsSync("pyproject.toml") || fs3.existsSync("setup.py") || fs3.existsSync("requirements.txt");
-    case "rust":
-      return fs3.existsSync("Cargo.toml");
-    case "go":
-      return fs3.existsSync("go.mod");
+    }
+    case "rust": {
+      const projectDir = data.workspace?.project_dir;
+      return projectDir ? fs3.existsSync(path3.join(projectDir, "Cargo.toml")) : fs3.existsSync("Cargo.toml");
+    }
+    case "go": {
+      const projectDir = data.workspace?.project_dir;
+      return projectDir ? fs3.existsSync(path3.join(projectDir, "go.mod")) : fs3.existsSync("go.mod");
+    }
     case "effort": {
       return true;
     }
@@ -1449,16 +1424,16 @@ function evaluateComponent(comp, data, options) {
   let result = "";
   switch (comp.type) {
     case "claude":
-      result = evaluateClaudeComponent(comp.key, data, options.noColor);
+      result = evaluateClaudeComponent(comp.key, data, options.noColor, options.noIcons);
       break;
     case "fs":
       result = evaluateFsComponent(comp.key, data);
       break;
     case "git":
-      result = evaluateGitComponent(comp.key, options.noColor);
+      result = evaluateGitComponent(comp.key, options.noColor, options.noIcons);
       break;
     case "ctx":
-      result = evaluateContextComponent(comp.key, data, comp.args);
+      result = evaluateContextComponent(comp.key, data, comp.args, options.noIcons);
       break;
     case "cost":
       result = evaluateCostComponent(comp.key, data);
@@ -1500,7 +1475,7 @@ function evaluateComponent(comp, data, options) {
       break;
     }
     case "conditional": {
-      if (comp.children && evaluateCondition(comp.key)) {
+      if (comp.children && evaluateCondition(comp.key, data)) {
         result = evaluateComponents(comp.children, data, options);
       }
       break;
@@ -1534,7 +1509,7 @@ function evaluateFormat(format, data, options = {}) {
 }
 
 // src/index.ts
-var VERSION = "1.6.2";
+var VERSION = "1.7.0";
 async function readStdin() {
   return new Promise((resolve, reject) => {
     let input = "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudeline",
-  "version": "1.6.2",
+  "version": "1.7.0",
   "description": "Customizable status line generator for Claude Code",
   "type": "module",
   "bin": {