claudeline 1.2.0 → 1.3.1

package/dist/index.js

@@ -259,6 +259,11 @@ function listComponents() {
         "elapsed"
       ]
     },
+    {
+      name: "Account",
+      prefix: "account",
+      items: ["email", "name", "display-name", "org", "plan", "tier"]
+    },
     {
       name: "Usage/Limits",
       prefix: "usage",
@@ -490,11 +495,14 @@ function listThemes() {
 import * as fs from "fs";
 import * as path from "path";
 import * as os from "os";
+function getClaudeConfigDir() {
+  return process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), ".claude");
+}
 function getClaudeDir(project) {
   if (project) {
     return path.join(process.cwd(), ".claude");
   }
-  return path.join(os.homedir(), ".claude");
+  return getClaudeConfigDir();
 }
 function escapeForShell(str) {
   return str.replace(/'/g, "'\\''");
@@ -625,7 +633,7 @@ function getSampleDataJson() {
 
 // src/runtime.ts
 import * as path3 from "path";
-import * as os3 from "os";
+import * as os2 from "os";
 import * as fs3 from "fs";
 import { execSync as execSync2 } from "child_process";
 
@@ -727,13 +735,24 @@ function getEmoji(name) {
 // src/usage.ts
 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 CACHE_TTL_MS = 5 * 60 * 1e3;
-var CACHE_FILE = path2.join(os2.tmpdir(), "claudeline-usage-cache.json");
-function readCache() {
+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(CACHE_FILE, "utf8");
+    const raw = fs2.readFileSync(cacheFile, "utf8");
     const cached = JSON.parse(raw);
     if (Date.now() - cached.fetched_at < CACHE_TTL_MS) {
       return cached;
@@ -742,16 +761,25 @@ function readCache() {
   }
   return null;
 }
-function writeCache(data) {
+function writeCache(cacheFile, data) {
   try {
-    fs2.writeFileSync(CACHE_FILE, JSON.stringify({ data, fetched_at: Date.now() }));
+    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() {
   try {
+    const service = getKeychainService();
     const raw = execSync(
-      'security find-generic-password -s "Claude Code-credentials" -w 2>/dev/null',
+      `security find-generic-password -s "${service}" -w 2>/dev/null`,
       { encoding: "utf8" }
     ).trim();
     const parsed = JSON.parse(raw);
@@ -764,9 +792,7 @@ function getOAuthToken() {
     return null;
   }
 }
-function fetchUsage() {
-  const token = getOAuthToken();
-  if (!token) 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"`,
@@ -782,11 +808,14 @@ function fetchUsage() {
   }
 }
 function getUsageData() {
-  const cached = readCache();
+  const token = getOAuthToken();
+  if (!token) return null;
+  const cacheFile = getCacheFile(token, "usage");
+  const cached = readCache(cacheFile);
   if (cached) return cached.data;
-  const data = fetchUsage();
+  const data = fetchUsage(token);
   if (data) {
-    writeCache(data);
+    writeCache(cacheFile, data);
   }
   return data;
 }
@@ -809,6 +838,70 @@ 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;
+    default:
+      return "";
+  }
+}
 function evaluateUsageComponent(key, args) {
   const data = getUsageData();
   if (!data) return "";
@@ -999,7 +1092,7 @@ function evaluateFsComponent(key, data) {
     case "project-path":
       return data.workspace?.project_dir || "";
     case "home":
-      return (data.workspace?.current_dir || data.cwd || "").replace(os3.homedir(), "~");
+      return (data.workspace?.current_dir || data.cwd || "").replace(os2.homedir(), "~");
     case "cwd":
       return data.cwd || "";
     case "relative": {
@@ -1216,11 +1309,11 @@ function evaluateEnvComponent(key) {
       return match?.[1] || "";
     }
     case "user":
-      return os3.userInfo().username;
+      return os2.userInfo().username;
     case "hostname":
-      return os3.hostname();
+      return os2.hostname();
     case "hostname-short":
-      return os3.hostname().split(".")[0];
+      return os2.hostname().split(".")[0];
     case "shell":
       return path3.basename(process.env.SHELL || "");
     case "term":
@@ -1230,11 +1323,11 @@ function evaluateEnvComponent(key) {
     case "arch":
       return process.arch;
     case "os-release":
-      return os3.release();
+      return os2.release();
     case "cpus":
-      return os3.cpus().length.toString();
+      return os2.cpus().length.toString();
     case "memory":
-      return Math.round(os3.totalmem() / 1024 / 1024 / 1024) + "GB";
+      return Math.round(os2.totalmem() / 1024 / 1024 / 1024) + "GB";
     default:
       return "";
   }
@@ -1345,6 +1438,9 @@ function evaluateComponent(comp, data, options) {
     case "usage":
       result = evaluateUsageComponent(comp.key, comp.args);
       break;
+    case "account":
+      result = evaluateAccountComponent(comp.key);
+      break;
     case "time":
       result = evaluateTimeComponent(comp.key, data);
       break;
@@ -1404,11 +1500,12 @@ function evaluateFormat(format, data, options = {}) {
     noColor: options.noColor ?? false
   };
   const components = parseFormat(format);
-  return evaluateComponents(components, data, opts);
+  const result = evaluateComponents(components, data, opts);
+  return opts.noColor ? result : result + `\x1B[0m`;
 }
 
 // src/index.ts
-var VERSION = "1.1.0";
+var VERSION = "1.3.1";
 async function readStdin() {
   return new Promise((resolve, reject) => {
     let input = "";

package/package.json

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