claudeline 1.7.0 → 1.8.0

package/dist/index.js

@@ -598,7 +598,7 @@ function getSampleDataJson() {
 import * as path3 from "path";
 import * as os3 from "os";
 import * as fs3 from "fs";
-import { execSync } from "child_process";
+import { execSync as execSync2 } from "child_process";
 
 // src/separators.ts
 var SEPARATORS = {
@@ -639,6 +639,8 @@ function getSeparator(name) {
 import * as fs2 from "fs";
 import * as path2 from "path";
 import * as os2 from "os";
+import * as crypto from "crypto";
+import { execSync } from "child_process";
 var CLUSAGE_API_FILE = path2.join(os2.homedir(), ".claude", "clusage-api.json");
 var CLUSAGE_STALE_MS = 10 * 60 * 1e3;
 var _clusageCache = null;
@@ -660,24 +662,162 @@ function getClusageAccount() {
   if (!payload || payload.accounts.length === 0) return null;
   return payload.accounts[0];
 }
+var CACHE_TTL_MS = 5 * 60 * 1e3;
+var PROFILE_CACHE_TTL_MS = 60 * 60 * 1e3;
+var ANTHROPIC_BETA_HEADER = "oauth-2025-04-20";
+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, ttlMs) {
+  try {
+    const raw = fs2.readFileSync(cacheFile, "utf8");
+    const cached = JSON.parse(raw);
+    if (Date.now() - cached.fetched_at < ttlMs) {
+      return cached.data;
+    }
+  } catch {
+  }
+  return null;
+}
+function writeCache(cacheFile, data) {
+  try {
+    fs2.writeFileSync(cacheFile, JSON.stringify({ data, fetched_at: Date.now() }));
+  } catch {
+  }
+}
+function extractToken(raw) {
+  try {
+    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;
+  } catch {
+  }
+  return null;
+}
+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 getOAuthTokenMacOS() {
+  try {
+    const service = getKeychainService();
+    const raw = execSync(
+      `security find-generic-password -s "${service}" -w 2>/dev/null`,
+      { encoding: "utf8" }
+    ).trim();
+    return extractToken(raw);
+  } catch {
+    return null;
+  }
+}
+function getOAuthTokenLinux() {
+  try {
+    const configDir = process.env.CLAUDE_CONFIG_DIR || path2.join(os2.homedir(), ".claude");
+    const credPath = path2.join(configDir, ".credentials.json");
+    const raw = fs2.readFileSync(credPath, "utf8").trim();
+    return extractToken(raw);
+  } catch {
+    return null;
+  }
+}
+function getOAuthToken() {
+  switch (process.platform) {
+    case "darwin":
+      return getOAuthTokenMacOS();
+    case "linux":
+      return getOAuthTokenLinux();
+    default:
+      return null;
+  }
+}
+function apiGet(token, urlPath) {
+  try {
+    return execSync(
+      `curl -s --max-time 5 -H "Content-Type: application/json" -H "User-Agent: claude-code/2.1.69" -H "Authorization: Bearer $__CLAUDE_TOKEN" -H "anthropic-beta: ${ANTHROPIC_BETA_HEADER}" "https://api.anthropic.com${urlPath}"`,
+      { encoding: "utf8", env: { ...process.env, __CLAUDE_TOKEN: token } }
+    ).trim();
+  } catch {
+    return null;
+  }
+}
+function fetchUsageDirect(token) {
+  try {
+    const result = apiGet(token, "/api/oauth/usage");
+    if (!result) return null;
+    const data = JSON.parse(result);
+    if (data.five_hour && data.seven_day) return data;
+    return null;
+  } catch {
+    return null;
+  }
+}
+function fetchProfileDirect(token) {
+  try {
+    const result = apiGet(token, "/api/oauth/profile");
+    if (!result) return null;
+    const data = JSON.parse(result);
+    if (data.account?.email) return { email: data.account.email };
+    return null;
+  } catch {
+    return null;
+  }
+}
+function getUsageDataDirect() {
+  const token = getOAuthToken();
+  if (!token) return null;
+  const cacheFile = getCacheFile(token, "usage");
+  const cached = readCache(cacheFile, CACHE_TTL_MS);
+  if (cached) return cached;
+  const data = fetchUsageDirect(token);
+  if (data) writeCache(cacheFile, data);
+  return data;
+}
+function getProfileDataDirect() {
+  const token = getOAuthToken();
+  if (!token) return null;
+  const cacheFile = getCacheFile(token, "profile");
+  const cached = readCache(cacheFile, PROFILE_CACHE_TTL_MS);
+  if (cached) return cached;
+  const data = fetchProfileDirect(token);
+  if (data) writeCache(cacheFile, data);
+  return data;
+}
 function getUsageData() {
   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
-    }
-  };
+  if (account) {
+    return {
+      five_hour: {
+        utilization: account.fiveHour.utilization,
+        resets_at: account.fiveHour.resetsAt
+      },
+      seven_day: {
+        utilization: account.sevenDay.utilization,
+        resets_at: account.sevenDay.resetsAt
+      }
+    };
+  }
+  return getUsageDataDirect();
 }
 function getProfileData() {
   const account = getClusageAccount();
-  if (!account?.profile) return null;
-  return { email: account.profile.email };
+  if (account?.profile) {
+    return { email: account.profile.email };
+  }
+  return getProfileDataDirect();
 }
 function formatTimeUntil(isoDate) {
   const reset = new Date(isoDate).getTime();
@@ -804,7 +944,7 @@ function evaluateUsageComponent(key, args, noColor = false) {
       const { delta } = calculatePace(data.seven_day, SEVEN_DAY_MS);
       return formatPaceIcon(delta, noColor);
     }
-    // Clusage momentum/projection data
+    // Clusage-only momentum/projection data (no direct API fallback)
     case "velocity": {
       const m = getClusageAccount()?.momentum;
       return m ? m.velocity.toFixed(1) + " pp/hr" : "";
@@ -986,7 +1126,7 @@ function formatDuration(ms) {
 }
 function execCommand(cmd) {
   try {
-    return execSync(cmd, { encoding: "utf8" }).trim();
+    return execSync2(cmd, { encoding: "utf8" }).trim();
   } catch {
     return "";
   }
@@ -1101,7 +1241,7 @@ function evaluateGitComponent(key, noColor = false, noIcons = false) {
       return execCommand("git branch --show-current 2>/dev/null");
     case "status":
       try {
-        execSync("git diff --quiet 2>/dev/null");
+        execSync2("git diff --quiet 2>/dev/null");
         return "\u2713";
       } catch {
         return "*";
@@ -1109,14 +1249,14 @@ function evaluateGitComponent(key, noColor = false, noIcons = false) {
     case "status-icon":
       if (noIcons) return "";
       try {
-        execSync("git diff --quiet 2>/dev/null");
+        execSync2("git diff --quiet 2>/dev/null");
         return getNerdIcon("sparkle");
       } catch {
         return getNerdIcon("commit");
       }
     case "status-word":
       try {
-        execSync("git diff --quiet 2>/dev/null");
+        execSync2("git diff --quiet 2>/dev/null");
         return "clean";
       } catch {
         return "dirty";
@@ -1370,21 +1510,21 @@ function evaluateCondition(condition, data) {
   switch (condition) {
     case "git":
       try {
-        execSync("git rev-parse --git-dir 2>/dev/null");
+        execSync2("git rev-parse --git-dir 2>/dev/null");
         return true;
       } catch {
         return false;
       }
     case "dirty":
       try {
-        execSync("git diff --quiet 2>/dev/null");
+        execSync2("git diff --quiet 2>/dev/null");
         return false;
       } catch {
         return true;
       }
     case "clean":
       try {
-        execSync("git diff --quiet 2>/dev/null");
+        execSync2("git diff --quiet 2>/dev/null");
         return true;
       } catch {
         return false;
@@ -1484,16 +1624,43 @@ function evaluateComponent(comp, data, options) {
   return applyStyles(result, comp.styles, options.noColor);
 }
 function evaluateComponents(components, data, options) {
+  const evaluated = components.map((comp) => ({
+    type: comp.type,
+    value: evaluateComponent(comp, data, options)
+  }));
+  const filtered = [];
+  for (let i = 0; i < evaluated.length; i++) {
+    const entry = evaluated[i];
+    if (entry.type === "sep") {
+      let hasBefore = false;
+      for (let j = i - 1; j >= 0; j--) {
+        if (evaluated[j].type === "sep") continue;
+        if (evaluated[j].value) {
+          hasBefore = true;
+        }
+        break;
+      }
+      let hasAfter = false;
+      for (let j = i + 1; j < evaluated.length; j++) {
+        if (evaluated[j].type === "sep") continue;
+        if (evaluated[j].value) {
+          hasAfter = true;
+        }
+        break;
+      }
+      if (!hasBefore || !hasAfter) continue;
+    }
+    filtered.push(entry);
+  }
   const parts = [];
-  for (let i = 0; i < components.length; i++) {
-    const comp = components[i];
-    const prev = components[i - 1];
-    const value = evaluateComponent(comp, data, options);
-    if (i > 0 && comp.type !== "sep" && comp.type !== "conditional" && prev?.type !== "sep" && value) {
+  for (let i = 0; i < filtered.length; i++) {
+    const entry = filtered[i];
+    const prev = filtered[i - 1];
+    if (i > 0 && entry.type !== "sep" && entry.type !== "conditional" && prev?.type !== "sep" && entry.value) {
       parts.push(" ");
     }
-    if (value) {
-      parts.push(value);
+    if (entry.value) {
+      parts.push(entry.value);
     }
   }
   return parts.join("");
@@ -1509,7 +1676,7 @@ function evaluateFormat(format, data, options = {}) {
 }
 
 // src/index.ts
-var VERSION = "1.7.0";
+var VERSION = "1.8.0";
 async function readStdin() {
   return new Promise((resolve, reject) => {
     let input = "";

package/package.json

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