claudeline 1.6.2 → 1.6.3

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 white:cost:total"
 };
 function getTheme(name) {
   return THEMES[name] || null;
@@ -596,7 +596,7 @@ 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";
 
@@ -638,10 +638,12 @@ function getSeparator(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 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);
 }
@@ -678,29 +680,68 @@ function getKeychainService() {
   }
   return "Claude Code-credentials";
 }
-function getOAuthToken() {
+function extractToken(raw) {
   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;
+  } catch {
+  }
+  return null;
+}
+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 fetchUsage(token) {
+function getOAuthToken() {
+  switch (process.platform) {
+    case "darwin":
+      return getOAuthTokenMacOS();
+    case "linux":
+      return getOAuthTokenLinux();
+    default:
+      return null;
+  }
+}
+function apiGet(token, urlPath) {
   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" }
+    return execSync(
+      `curl -s --max-time 5 -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 apiGetWithRetry(token, urlPath) {
+  const result = apiGet(token, urlPath);
+  if (result !== null) return result;
+  return apiGet(token, urlPath);
+}
+function fetchUsage(token) {
+  try {
+    const result = apiGetWithRetry(token, "/api/oauth/usage");
+    if (!result) return null;
     const data = JSON.parse(result);
     if (data.five_hour && data.seven_day) {
       return data;
@@ -789,10 +830,8 @@ function writeProfileCache(cacheFile, data) {
 }
 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 result = apiGetWithRetry(token, "/api/oauth/profile");
+    if (!result) return null;
     const data = JSON.parse(result);
     if (data.account?.email) {
       return data;
@@ -1062,7 +1101,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 +1152,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 +1184,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,7 +1199,7 @@ 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");
@@ -1146,6 +1211,7 @@ function evaluateGitComponent(key, noColor = false) {
         return "*";
       }
     case "status-icon":
+      if (noIcons) return "";
       try {
         execSync2("git diff --quiet 2>/dev/null");
         return getNerdIcon("sparkle");
@@ -1234,7 +1300,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 +1325,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 +1404,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 +1418,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,7 +1470,7 @@ function evaluateTimeComponent(key, data) {
       return "";
   }
 }
-function evaluateCondition(condition) {
+function evaluateCondition(condition, data) {
   switch (condition) {
     case "git":
       try {
@@ -1428,16 +1495,28 @@ function evaluateCondition(condition) {
       }
     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 +1528,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 +1579,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 +1613,7 @@ function evaluateFormat(format, data, options = {}) {
 }
 
 // src/index.ts
-var VERSION = "1.6.2";
+var VERSION = "1.6.3";
 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.6.3",
   "description": "Customizable status line generator for Claude Code",
   "type": "module",
   "bin": {