@hasna/statusline 0.0.2 → 0.0.3

package/dist/index.js

@@ -51,6 +51,7 @@ import { dirname, join } from "path";
 function defaultConfig() {
   return {
     separator: " \xB7 ",
+    colors: true,
     segments: [
       "machine",
       "project",
@@ -78,7 +79,8 @@ function loadConfig(path = configPath()) {
     const fallback = defaultConfig();
     return {
       separator: typeof raw.separator === "string" ? raw.separator : fallback.separator,
-      segments: Array.isArray(raw.segments) ? raw.segments.filter((s) => typeof s === "string") : fallback.segments
+      segments: Array.isArray(raw.segments) ? raw.segments.filter((s) => typeof s === "string") : fallback.segments,
+      colors: typeof raw.colors === "boolean" ? raw.colors : fallback.colors
     };
   } catch {
     return defaultConfig();
@@ -106,8 +108,15 @@ function parseClaudeInput(input) {
     } : undefined,
     transcriptPath: input?.transcript_path || undefined,
     sessionId: input?.session_id || undefined,
+    sessionName: input?.session_name || undefined,
     version: input?.version || undefined,
-    outputStyle: input?.output_style?.name || undefined
+    outputStyle: input?.output_style?.name || undefined,
+    effort: input?.effort?.level || undefined,
+    thinking: typeof input?.thinking?.enabled === "boolean" ? input.thinking.enabled : undefined,
+    rateLimits: input?.rate_limits ? {
+      fiveHour: { usedPercentage: numberOr(input.rate_limits.five_hour?.used_percentage) },
+      sevenDay: { usedPercentage: numberOr(input.rate_limits.seven_day?.used_percentage) }
+    } : undefined
   };
 }
 function numberOr(v) {
@@ -252,6 +261,146 @@ function windowSize(ctx) {
   return ctx.model?.id?.includes("[1m]") ? 1e6 : 200000;
 }
 
+// src/accounts.ts
+import { existsSync as existsSync3, readFileSync as readFileSync3, realpathSync } from "fs";
+import { homedir as homedir2 } from "os";
+import { join as join2, resolve, sep } from "path";
+var CONFIG_DIR_ENV = "CLAUDE_CONFIG_DIR";
+var DEFAULT_CONFIG_SUBDIR = ".claude";
+var STORE_PATH_ENV = "ACCOUNTS_STORE_PATH";
+var ACCOUNTS_HOME_ENV = "ACCOUNTS_HOME";
+var DEFAULT_ACCOUNTS_HOME = [".hasna", "accounts"];
+var STORE_FILE = "accounts.json";
+var PROFILES_SUBDIR = "profiles";
+var STATE_FILE_PREFERRED = ".config.json";
+var STATE_FILE_PREFIX = ".claude";
+var STATE_FILE_SUFFIX = ".json";
+var CUSTOM_OAUTH_ENV = "CLAUDE_CODE_CUSTOM_OAUTH_URL";
+var OAUTH_VARIANTS = ["", "-custom-oauth", "-local-oauth", "-staging-oauth"];
+function str(value) {
+  return typeof value === "string" && value.trim() ? value.trim() : null;
+}
+function home(env) {
+  return str(env.HOME) ?? homedir2();
+}
+function expandHome(path, env) {
+  return path === "~" || path.startsWith(`~${sep}`) ? join2(home(env), path.slice(1)) : path;
+}
+function canonical(path, env) {
+  const abs = resolve(expandHome(path, env));
+  try {
+    return realpathSync(abs);
+  } catch {
+    return abs;
+  }
+}
+function readJson(path) {
+  try {
+    return JSON.parse(readFileSync3(path, "utf8"));
+  } catch {
+    return null;
+  }
+}
+var ACCOUNTS_STORAGE_MODULE = "@hasna/accounts/storage";
+var storagePromise;
+function accountsStorage() {
+  storagePromise ??= import(ACCOUNTS_STORAGE_MODULE).then((mod) => typeof mod?.storePath === "function" && typeof mod?.profilesDir === "function" ? mod : null, () => null);
+  return storagePromise;
+}
+async function accountsPaths(env) {
+  const homeOverride = str(env[ACCOUNTS_HOME_ENV]);
+  const storeOverride = str(env[STORE_PATH_ENV]);
+  if (!homeOverride && !storeOverride) {
+    const storage = await accountsStorage();
+    try {
+      if (storage)
+        return { store: storage.storePath(), profiles: storage.profilesDir() };
+    } catch {}
+  }
+  const base = homeOverride ?? join2(home(env), ...DEFAULT_ACCOUNTS_HOME);
+  return {
+    store: storeOverride ?? join2(base, STORE_FILE),
+    profiles: join2(base, PROFILES_SUBDIR)
+  };
+}
+function registryEntry(store, configDir, env, tool) {
+  if (!existsSync3(store))
+    return null;
+  const entries = readJson(store)?.profiles;
+  if (!Array.isArray(entries))
+    return null;
+  let untyped = null;
+  let first = null;
+  for (const entry of entries) {
+    const dir = str(entry?.dir);
+    if (!dir || canonical(dir, env) !== configDir)
+      continue;
+    const entryTool = str(entry?.tool);
+    if (tool && entryTool === tool)
+      return entry;
+    if (!entryTool)
+      untyped ??= entry;
+    first ??= entry;
+  }
+  return tool ? untyped : first;
+}
+function layoutProfile(profilesRoot, configDir, env) {
+  if (!existsSync3(configDir))
+    return null;
+  const prefix = canonical(profilesRoot, env) + sep;
+  if (!configDir.startsWith(prefix))
+    return null;
+  const parts = configDir.slice(prefix.length).split(sep);
+  if (parts.length !== 2)
+    return null;
+  const [tool, profile] = parts;
+  if (!tool || !profile)
+    return null;
+  return { configDir, profile, tool, source: "layout" };
+}
+function sessionConfigDir(env = process.env) {
+  return canonical(str(env[CONFIG_DIR_ENV]) ?? join2(home(env), DEFAULT_CONFIG_SUBDIR), env);
+}
+function sessionStateFile(env = process.env) {
+  const base = canonical(str(env[CONFIG_DIR_ENV]) ?? home(env), env);
+  const preferred = join2(base, STATE_FILE_PREFERRED);
+  if (existsSync3(preferred))
+    return preferred;
+  const variants = str(env[CUSTOM_OAUTH_ENV]) ? ["-custom-oauth", ...OAUTH_VARIANTS] : OAUTH_VARIANTS;
+  for (const variant of variants) {
+    const candidate = join2(base, `${STATE_FILE_PREFIX}${variant}${STATE_FILE_SUFFIX}`);
+    if (existsSync3(candidate))
+      return candidate;
+  }
+  return null;
+}
+async function sessionAccount(env = process.env, tool) {
+  const configDir = sessionConfigDir(env);
+  const unresolved = { configDir, profile: null, tool: null, source: null };
+  try {
+    const paths = await accountsPaths(env);
+    const entry = registryEntry(paths.store, configDir, env, tool);
+    const name = str(entry?.name);
+    if (name)
+      return { configDir, profile: name, tool: str(entry?.tool), source: "registry" };
+    return layoutProfile(paths.profiles, configDir, env) ?? unresolved;
+  } catch {
+    return unresolved;
+  }
+}
+async function sessionAccountEmail(env = process.env, tool) {
+  try {
+    const stateFile = sessionStateFile(env);
+    const live = stateFile ? str(readJson(stateFile)?.oauthAccount?.emailAddress) : null;
+    if (live)
+      return live;
+    const paths = await accountsPaths(env);
+    return str(registryEntry(paths.store, sessionConfigDir(env), env, tool)?.email);
+  } catch {
+    return null;
+  }
+}
+
 // src/segments/index.ts
 function friendlyModel(id) {
   let tag = null;
@@ -269,6 +418,14 @@ function friendlyModel(id) {
   return { name: name || mid, tag };
 }
 var dir = (ctx) => ctx.cwd || process.cwd();
+function modelName(ctx) {
+  if (ctx.model?.displayName)
+    return ctx.model.displayName;
+  return ctx.model?.id ? friendlyModel(ctx.model.id).name : null;
+}
+function limitPercent(pct) {
+  return typeof pct === "number" ? pct : 0;
+}
 var segments = [
   {
     id: "machine",
@@ -347,6 +504,66 @@ var segments = [
       return tag ? `${name} ${tag}` : name;
     }
   },
+  {
+    id: "model-with-reasoning",
+    description: "Model name with its reasoning effort (or thinking, when on)",
+    defaultEnabled: false,
+    color: "cyan",
+    render(ctx) {
+      const name = modelName(ctx);
+      if (!name)
+        return null;
+      if (ctx.effort)
+        return `${name} (${ctx.effort})`;
+      if (ctx.thinking)
+        return `${name} (thinking)`;
+      return name;
+    }
+  },
+  {
+    id: "auth-profile",
+    description: "Account profile this session runs as (omitted when unmanaged)",
+    defaultEnabled: false,
+    color: "magenta",
+    async render(ctx) {
+      const account = await sessionAccount(process.env, ctx.provider);
+      return account.profile ?? await sessionAccountEmail(process.env, ctx.provider);
+    }
+  },
+  {
+    id: "auth-email",
+    description: "Account email this session is logged in as (omitted when unknown)",
+    defaultEnabled: false,
+    color: "magenta",
+    render: (ctx) => sessionAccountEmail(process.env, ctx.provider)
+  },
+  {
+    id: "five-hour-limit",
+    description: "Percentage of the 5-hour rate limit used (omitted when unreported)",
+    defaultEnabled: false,
+    color: (ctx) => limitPercent(ctx.rateLimits?.fiveHour?.usedPercentage) >= 80 ? "red" : "yellow",
+    render(ctx) {
+      const pct = ctx.rateLimits?.fiveHour?.usedPercentage;
+      return typeof pct === "number" ? `5h:${Math.round(pct)}%` : null;
+    }
+  },
+  {
+    id: "seven-day-limit",
+    description: "Percentage of the 7-day rate limit used (omitted when unreported)",
+    defaultEnabled: false,
+    color: (ctx) => limitPercent(ctx.rateLimits?.sevenDay?.usedPercentage) >= 80 ? "red" : "yellow",
+    render(ctx) {
+      const pct = ctx.rateLimits?.sevenDay?.usedPercentage;
+      return typeof pct === "number" ? `7d:${Math.round(pct)}%` : null;
+    }
+  },
+  {
+    id: "thread-title",
+    description: "Thread title set with /rename (omitted until named)",
+    defaultEnabled: false,
+    color: "blue",
+    render: (ctx) => ctx.sessionName || null
+  },
   {
     id: "context-used",
     description: "Percentage of context window used (omitted when unknown)",
@@ -437,7 +654,29 @@ function getSegment(id) {
 }
 
 // src/render.ts
+var ANSI = {
+  cyan: "\x1B[36m",
+  magenta: "\x1B[35m",
+  blue: "\x1B[34m",
+  green: "\x1B[32m",
+  yellow: "\x1B[33m",
+  red: "\x1B[31m",
+  bold: "\x1B[1m",
+  dim: "\x1B[2m"
+};
+var RESET = "\x1B[0m";
+function colorsEnabled(cfg, env = process.env) {
+  if (env.NO_COLOR)
+    return false;
+  return cfg.colors !== false;
+}
+function paint(segment, text, ctx) {
+  const color = typeof segment.color === "function" ? segment.color(ctx) : segment.color;
+  const code = color ? ANSI[color] : undefined;
+  return code ? `${code}${text}${RESET}` : text;
+}
 async function renderLine(ctx, cfg) {
+  const colorize = colorsEnabled(cfg);
   const parts = [];
   for (const id of cfg.segments) {
     const segment = getSegment(id);
@@ -446,7 +685,7 @@ async function renderLine(ctx, cfg) {
     try {
       const out = await segment.render(ctx);
       if (out)
-        parts.push(out);
+        parts.push(colorize ? paint(segment, out, ctx) : out);
     } catch {}
   }
   return parts.join(cfg.separator);
@@ -454,7 +693,7 @@ async function renderLine(ctx, cfg) {
 // package.json
 var package_default = {
   name: "@hasna/statusline",
-  version: "0.0.2",
+  version: "0.0.3",
   description: "Tiny composable statusline CLI for AI coding agents \u2014 pre-built toggleable segments for Claude Code, with a provider model for others",
   license: "Apache-2.0",
   type: "module",
@@ -523,21 +762,43 @@ var package_default = {
   }
 };
 // src/install.ts
-import { copyFileSync, existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "fs";
-import { homedir as homedir2 } from "os";
-import { dirname as dirname2, join as join2 } from "path";
-function installClaude(settingsPath = join2(homedir2(), ".claude", "settings.json")) {
+import { copyFileSync, existsSync as existsSync4, mkdirSync as mkdirSync2, readFileSync as readFileSync4, writeFileSync as writeFileSync2 } from "fs";
+import { homedir as homedir3 } from "os";
+import { dirname as dirname2, join as join3, resolve as resolve2 } from "path";
+function defaultSettingsPath(env) {
+  return join3(env.HOME || homedir3(), ".claude", "settings.json");
+}
+function claudeSettingsPath(env = process.env) {
+  const home2 = env.HOME || homedir3();
+  const raw = env.CLAUDE_CONFIG_DIR?.trim();
+  if (!raw)
+    return defaultSettingsPath(env);
+  const configDir = raw === "~" || raw.startsWith("~/") ? join3(home2, raw.slice(1)) : raw;
+  return join3(configDir, "settings.json");
+}
+function installClaude(settingsPath, env = process.env) {
+  const target = settingsPath ?? claudeSettingsPath(env);
   const binary = Bun.which("statusline") || "statusline";
   let settings = {};
-  if (existsSync3(settingsPath)) {
-    settings = JSON.parse(readFileSync3(settingsPath, "utf8"));
-    copyFileSync(settingsPath, `${settingsPath}.bak-statusline`);
+  if (existsSync4(target)) {
+    try {
+      settings = JSON.parse(readFileSync4(target, "utf8"));
+    } catch (error) {
+      throw new Error(`${target} is not valid JSON \u2014 fix or move it first`);
+    }
+    copyFileSync(target, `${target}.bak-statusline`);
+  }
+  settings.statusLine = { ...settings.statusLine, type: "command", command: `${binary} render` };
+  const configDir = dirname2(target);
+  if (!existsSync4(configDir)) {
+    if (resolve2(target) !== resolve2(defaultSettingsPath(env))) {
+      throw new Error(`config dir ${configDir} does not exist \u2014 create the profile first`);
+    }
+    mkdirSync2(configDir, { recursive: true });
   }
-  settings.statusLine = { type: "command", command: `${binary} render` };
-  mkdirSync2(dirname2(settingsPath), { recursive: true });
-  writeFileSync2(settingsPath, JSON.stringify(settings, null, 2) + `
+  writeFileSync2(target, JSON.stringify(settings, null, 2) + `
 `);
-  return settingsPath;
+  return target;
 }
 
 // src/index.ts
@@ -589,6 +850,9 @@ function setSeparator(separator, config = loadConfig()) {
     throw new Error("separator must be a non-empty string");
   return { config: { ...config, separator }, changed: ["separator"] };
 }
+function setColors(colors, config = loadConfig()) {
+  return { config: { ...config, colors }, changed: ["colors"] };
+}
 function resetStatuslineConfig() {
   return defaultConfig();
 }
@@ -601,7 +865,11 @@ function sampleClaudeInput(cwd = process.cwd()) {
     model: { id: "claude-fable-5[1m]", display_name: "Fable" },
     cost: { total_cost_usd: 12.34, total_duration_ms: 5400000, total_lines_added: 42, total_lines_removed: 7 },
     version: statuslineVersion,
-    session_id: "preview0-0000-0000-0000-000000000000"
+    session_id: "preview0-0000-0000-0000-000000000000",
+    session_name: "preview thread",
+    effort: { level: "high" },
+    thinking: { enabled: true },
+    rate_limits: { five_hour: { used_percentage: 42 } }
   };
 }
 async function previewStatusline(config = loadConfig(), cwd = process.cwd()) {
@@ -615,6 +883,11 @@ export {
   trackedLineCount,
   statuslineVersion,
   setSeparator,
+  setColors,
+  sessionStateFile,
+  sessionConfigDir,
+  sessionAccountEmail,
+  sessionAccount,
   segments,
   saveUpdatedConfig,
   saveConfig,
@@ -642,5 +915,6 @@ export {
   configPath,
   compactNum,
   compactDuration,
-  compactAge
+  compactAge,
+  claudeSettingsPath
 };

package/dist/install.d.ts

@@ -1,5 +1,16 @@
+/**
+ * Settings file the running agent actually reads. When a session is bound to
+ * an isolated config dir (multi-account setups export `CLAUDE_CONFIG_DIR`),
+ * `~/.claude/settings.json` is never loaded — installing there wires up a
+ * statusline that silently never runs.
+ */
+export declare function claudeSettingsPath(env?: Record<string, string | undefined>): string;
 /**
  * Wire the statusline into Claude Code's user settings. Existing settings
  * are preserved; the previous file is backed up alongside it.
+ *
+ * `env` resolves the default target and decides whether a missing dir may be
+ * created; pass the same object you would pass to `claudeSettingsPath()` so a
+ * caller driving several profiles is not steered by its own shell.
  */
-export declare function installClaude(settingsPath?: string): string;
+export declare function installClaude(settingsPath?: string, env?: Record<string, string | undefined>): string;