@bastra-recall/statusline 0.9.2 → 1.0.1

package/src/segments/renderer.ts

@@ -6,7 +6,6 @@ import type { BlockInfo } from "./block";
 import type { CacheTimerInfo } from "./cacheTimer";
 import type {
   UsageInfo,
-  TokenBreakdown,
   GitInfo,
   ContextInfo,
   MetricsInfo,
@@ -17,10 +16,6 @@ import type { BastraInfo } from "./bastra";
 import {
   formatModelName,
   abbreviateFishStyle,
-  formatCost,
-  formatTokens,
-  formatTokenCount,
-  formatTokenBreakdown,
   formatTimeSince,
   formatDuration,
   formatLongTimeRemaining,
@@ -29,196 +24,67 @@ import {
   collapseHome,
   minutesUntilReset,
 } from "../utils/formatters";
-import { resolveBudgetDisplay } from "../utils/budget";
-import type { BudgetItemConfig } from "../config/loader";
-import { shouldShowIcon } from "../utils/icon-visibility";
-
-export interface SegmentConfig {
-  enabled: boolean;
-  showIcon?: boolean;
-}
-
-export interface DirectorySegmentConfig extends SegmentConfig {
-  showBasename?: boolean;
-  style?: "full" | "fish" | "basename";
-}
 
-export interface GitSegmentConfig extends SegmentConfig {
-  showSha?: boolean;
-  showAheadBehind?: boolean;
-  showWorkingTree?: boolean;
-  showOperation?: boolean;
-  showTag?: boolean;
-  showTimeSinceCommit?: boolean;
-  showStashCount?: boolean;
-  showUpstream?: boolean;
-  showRepoName?: boolean;
-}
-
-export interface UsageSegmentConfig extends SegmentConfig {
-  type: "cost" | "tokens" | "both" | "breakdown";
-  costSource?: "calculated" | "official";
-  /** Show the trailing "tokens" unit on token counts. Only affects `type: "tokens"` and `type: "both"` (default: true). Inert in the `tui` display style, which never renders the suffix. */
-  showUnits?: boolean;
-}
-
-export interface TmuxSegmentConfig extends SegmentConfig {}
-
-export type BarDisplayStyle =
-  | "text"
-  | "ball"
-  | "bar"
-  | "blocks"
-  | "blocks-line"
-  | "capped"
-  | "dots"
-  | "filled"
-  | "geometric"
-  | "line"
-  | "squares";
-
-export interface ContextSegmentConfig extends SegmentConfig {
-  showPercentageOnly?: boolean;
-  displayStyle?: BarDisplayStyle;
-  autocompactBuffer?: number;
-  percentageMode?: "remaining" | "used";
-}
-
-export interface MetricsSegmentConfig extends SegmentConfig {
-  showResponseTime?: boolean;
-  showLastResponseTime?: boolean;
-  showDuration?: boolean;
-  showMessageCount?: boolean;
-  showLinesAdded?: boolean;
-  showLinesRemoved?: boolean;
-}
-
-export interface BlockSegmentConfig extends SegmentConfig {
-  type: "cost" | "tokens" | "both" | "time" | "weighted";
-  burnType?: "cost" | "tokens" | "both" | "none";
-  displayStyle?: BarDisplayStyle;
-}
-
-export interface TodaySegmentConfig extends SegmentConfig {
-  type: "cost" | "tokens" | "both" | "breakdown";
-  /** Show the trailing "tokens" unit on token counts. Only affects `type: "tokens"` and `type: "both"` (default: true). Inert in the `tui` display style, which never renders the suffix. */
-  showUnits?: boolean;
-}
-
-export interface VersionSegmentConfig extends SegmentConfig {}
-
-export interface SessionIdSegmentConfig extends SegmentConfig {
-  showIdLabel?: boolean;
-}
-
-export interface EnvSegmentConfig extends SegmentConfig {
-  variable: string;
-  prefix?: string;
-}
-
-export interface WeeklySegmentConfig extends SegmentConfig {
-  displayStyle?: BarDisplayStyle;
-}
-
-export interface AgentSegmentConfig extends SegmentConfig {
-  showLabel?: boolean;
-}
-
-export interface ThinkingSegmentConfig extends SegmentConfig {
-  showEnabled?: boolean;
-  showEffort?: boolean;
-}
-
-export interface CacheTimerSegmentConfig extends SegmentConfig {
-  displayMode?: "elapsed" | "remaining";
-  ttlSeconds?: number;
-}
-
-export interface BastraSegmentConfig extends SegmentConfig {}
-
-export type AnySegmentConfig =
-  | SegmentConfig
-  | DirectorySegmentConfig
-  | GitSegmentConfig
-  | UsageSegmentConfig
-  | TmuxSegmentConfig
-  | ContextSegmentConfig
-  | MetricsSegmentConfig
-  | BlockSegmentConfig
-  | TodaySegmentConfig
-  | VersionSegmentConfig
-  | SessionIdSegmentConfig
-  | EnvSegmentConfig
-  | WeeklySegmentConfig
-  | AgentSegmentConfig
-  | ThinkingSegmentConfig
-  | CacheTimerSegmentConfig
-  | BastraSegmentConfig;
-
-export interface PowerlineSymbols {
-  right: string;
-  left: string;
-  branch: string;
-  model: string;
-  git_clean: string;
-  git_dirty: string;
-  git_conflicts: string;
-  git_ahead: string;
-  git_behind: string;
-  git_worktree: string;
-  git_tag: string;
-  git_sha: string;
-  git_upstream: string;
-  git_stash: string;
-  git_time: string;
-  session_cost: string;
-  block_cost: string;
-  today_cost: string;
-  context_time: string;
-  metrics_response: string;
-  metrics_last_response: string;
-  metrics_duration: string;
-  metrics_messages: string;
-  metrics_lines_added: string;
-  metrics_lines_removed: string;
-  metrics_burn: string;
-  version: string;
-  bar_filled: string;
-  bar_empty: string;
-  env: string;
-  session_id: string;
-  weekly_cost: string;
-  agent: string;
-  thinking: string;
-  cache_timer: string;
-  bastra: string;
-}
-
-export interface SegmentData {
-  text: string;
-  bgColor: string;
-  fgColor: string;
-  bold?: boolean;
-}
+// #1039: the segment config types, the bar drawing and the shared text
+// formatting live in their own modules; this class keeps one render method per
+// segment and delegates to them. The types are re-exported so every import
+// from "./renderer" keeps working.
+import {
+  plural,
+  getDisplayDirectoryName,
+  formatUsageWithBudget,
+} from "./renderer-format";
+import {
+  buildBar,
+  resolveBarStyleDef,
+  formatPercentageWithBar,
+} from "./renderer-bars";
 
-interface BarStyleDef {
-  filled: string;
-  empty: string;
-  cap?: string;
-  marker?: string;
-}
+import { shouldShowIcon } from "../utils/icon-visibility";
 
-const BAR_STYLES: Record<string, BarStyleDef> = {
-  ball: { filled: "─", empty: "─", marker: "●" },
-  blocks: { filled: "█", empty: "░" },
-  "blocks-line": { filled: "█", empty: "─" },
-  capped: { filled: "━", empty: "┄", cap: "╸" },
-  dots: { filled: "●", empty: "○" },
-  filled: { filled: "■", empty: "□" },
-  geometric: { filled: "▰", empty: "▱" },
-  line: { filled: "━", empty: "┄" },
-  squares: { filled: "◼", empty: "◻" },
-};
+import type {
+  SegmentConfig,
+  DirectorySegmentConfig,
+  GitSegmentConfig,
+  UsageSegmentConfig,
+  ContextSegmentConfig,
+  MetricsSegmentConfig,
+  BlockSegmentConfig,
+  TodaySegmentConfig,
+  VersionSegmentConfig,
+  SessionIdSegmentConfig,
+  EnvSegmentConfig,
+  WeeklySegmentConfig,
+  AgentSegmentConfig,
+  ThinkingSegmentConfig,
+  CacheTimerSegmentConfig,
+  BastraSegmentConfig,
+  PowerlineSymbols,
+  SegmentData,
+} from "./renderer-types";
+export type {
+  SegmentConfig,
+  DirectorySegmentConfig,
+  GitSegmentConfig,
+  UsageSegmentConfig,
+  TmuxSegmentConfig,
+  BarDisplayStyle,
+  ContextSegmentConfig,
+  MetricsSegmentConfig,
+  BlockSegmentConfig,
+  TodaySegmentConfig,
+  VersionSegmentConfig,
+  SessionIdSegmentConfig,
+  EnvSegmentConfig,
+  WeeklySegmentConfig,
+  AgentSegmentConfig,
+  ThinkingSegmentConfig,
+  CacheTimerSegmentConfig,
+  BastraSegmentConfig,
+  AnySegmentConfig,
+  PowerlineSymbols,
+  SegmentData,
+} from "./renderer-types";
 
 export class SegmentRenderer {
   constructor(
@@ -261,7 +127,7 @@ export class SegmentRenderer {
       ? collapseHome(projectDir)
       : projectDir;
 
-    let dirName = this.getDisplayDirectoryName(displayDir, displayProjectDir);
+    let dirName = getDisplayDirectoryName(displayDir, displayProjectDir);
 
     if (style === "fish") {
       dirName = abbreviateFishStyle(dirName);
@@ -361,6 +227,8 @@ export class SegmentRenderer {
       gitStatusIcon = this.symbols.git_conflicts;
     } else if (gitInfo.status === "dirty") {
       gitStatusIcon = this.symbols.git_dirty;
+    } else if (gitInfo.status === "unknown") {
+      gitStatusIcon = "?";
     }
     parts.push(gitStatusIcon);
 
@@ -397,11 +265,12 @@ export class SegmentRenderer {
 
     const getCost = () => {
       if (costSource === "calculated") return usageInfo.session.calculatedCost;
-      if (costSource === "official") return usageInfo.session.officialCost;
+      if (costSource === "official")
+        return usageInfo.session.officialCost ?? usageInfo.session.calculatedCost;
       return usageInfo.session.cost;
     };
 
-    const formattedUsage = this.formatUsageWithBudget(
+    const formattedUsage = formatUsageWithBudget(
       getCost(),
       usageInfo.session.tokens,
       usageInfo.session.tokenBreakdown,
@@ -467,12 +336,15 @@ export class SegmentRenderer {
     const defaultMode = style === "text" ? "remaining" : "used";
     const mode = config?.percentageMode ?? defaultMode;
 
-    const barStyleDef = this.resolveBarStyleDef(style);
+    const barStyleDef = resolveBarStyleDef(this.symbols, style);
 
     const emptyPct = mode === "remaining" ? "100%" : "0%";
     if (!contextInfo) {
       if (barStyleDef) {
-        const emptyBar = barStyleDef.empty.repeat(barLength);
+        const emptyBar =
+          mode === "remaining"
+            ? buildBar(barStyleDef, barLength, 0, barLength)
+            : barStyleDef.empty.repeat(barLength);
         return {
           text: `${emptyBar} ${emptyPct}`,
           bgColor: colors.contextBg,
@@ -505,12 +377,12 @@ export class SegmentRenderer {
         ? contextInfo.contextLeftPercentage
         : contextInfo.usablePercentage;
     const filledCount = Math.round(
-      (contextInfo.usablePercentage / 100) * barLength,
+      (pct / 100) * barLength,
     );
     const emptyCount = barLength - filledCount;
 
     if (barStyleDef) {
-      const bar = this.buildBar(
+      const bar = buildBar(
         barStyleDef,
         filledCount,
         emptyCount,
@@ -532,61 +404,6 @@ export class SegmentRenderer {
     return { text, bgColor, fgColor, bold };
   }
 
-  private buildBar(
-    s: BarStyleDef,
-    filledCount: number,
-    emptyCount: number,
-    barLength: number,
-  ): string {
-    if (s.marker) {
-      const pos = Math.min(filledCount, barLength - 1);
-      return (
-        s.filled.repeat(pos) + s.marker + s.empty.repeat(barLength - pos - 1)
-      );
-    }
-    if (s.cap) {
-      if (filledCount === 0) {
-        return s.cap + s.empty.repeat(barLength - 1);
-      }
-      if (filledCount >= barLength) {
-        return s.filled.repeat(barLength);
-      }
-      return (
-        s.filled.repeat(filledCount - 1) + s.cap + s.empty.repeat(emptyCount)
-      );
-    }
-    return s.filled.repeat(filledCount) + s.empty.repeat(emptyCount);
-  }
-
-  private resolveBarStyleDef(style: string): BarStyleDef | null {
-    return style === "bar"
-      ? { filled: this.symbols.bar_filled, empty: this.symbols.bar_empty }
-      : (BAR_STYLES[style] ?? null);
-  }
-
-  private formatPercentageWithBar(
-    pct: number,
-    displayStyle?: BarDisplayStyle,
-    timeStr?: string | null,
-  ): string {
-    const style = displayStyle ?? "text";
-    const barStyleDef = this.resolveBarStyleDef(style);
-    const barLength = 10;
-
-    if (barStyleDef) {
-      const filledCount = Math.round((pct / 100) * barLength);
-      const emptyCount = barLength - filledCount;
-      const bar = this.buildBar(
-        barStyleDef,
-        filledCount,
-        emptyCount,
-        barLength,
-      );
-      return timeStr ? `${bar} ${pct}% (${timeStr})` : `${bar} ${pct}%`;
-    }
-    return timeStr ? `${pct}% (${timeStr})` : `${pct}%`;
-  }
-
   renderMetrics(
     metricsInfo: MetricsInfo | null,
     colors: PowerlineColors,
@@ -697,7 +514,7 @@ export class SegmentRenderer {
     }
 
     return {
-      text: `${this.leadingIcon(this.symbols.block_cost, config)}${this.formatPercentageWithBar(pct, config?.displayStyle, timeStr)}`,
+      text: `${this.leadingIcon(this.symbols.block_cost, config)}${formatPercentageWithBar(this.symbols, pct, config?.displayStyle, timeStr)}`,
       bgColor,
       fgColor,
       bold,
@@ -731,7 +548,7 @@ export class SegmentRenderer {
     }
 
     return {
-      text: `${this.leadingIcon(this.symbols.weekly_cost, config)}${this.formatPercentageWithBar(pct, config?.displayStyle, timeStr)}`,
+      text: `${this.leadingIcon(this.symbols.weekly_cost, config)}${formatPercentageWithBar(this.symbols, pct, config?.displayStyle, timeStr)}`,
       bgColor,
       fgColor,
       bold,
@@ -749,7 +566,7 @@ export class SegmentRenderer {
         : configOrType;
     const type = config?.type ?? "cost";
     const todayBudget = this.config.budget?.today;
-    const formattedUsage = this.formatUsageWithBudget(
+    const formattedUsage = formatUsageWithBudget(
       todayInfo.cost,
       todayInfo.tokens,
       todayInfo.tokenBreakdown,
@@ -769,72 +586,6 @@ export class SegmentRenderer {
     };
   }
 
-  private getDisplayDirectoryName(
-    currentDir: string,
-    projectDir?: string,
-  ): string {
-    if (currentDir.startsWith("~")) {
-      return currentDir;
-    }
-
-    if (projectDir && projectDir !== currentDir) {
-      if (currentDir.startsWith(projectDir)) {
-        const relativePath = currentDir.slice(projectDir.length + 1);
-        return relativePath || projectDir.split(/[\\/]/).pop() || "project";
-      }
-    }
-
-    return currentDir;
-  }
-
-  private formatUsageDisplay(
-    cost: number | null,
-    tokens: number | null,
-    tokenBreakdown: TokenBreakdown | null,
-    type: string,
-    showUnits: boolean,
-  ): string {
-    const tokenStr = showUnits
-      ? formatTokens(tokens)
-      : formatTokenCount(tokens);
-    switch (type) {
-      case "cost":
-        return formatCost(cost);
-      case "tokens":
-        return tokenStr;
-      case "both":
-        return `${formatCost(cost)} (${tokenStr})`;
-      case "breakdown":
-        return formatTokenBreakdown(tokenBreakdown);
-      default:
-        return formatCost(cost);
-    }
-  }
-
-  private formatUsageWithBudget(
-    cost: number | null,
-    tokens: number | null,
-    tokenBreakdown: TokenBreakdown | null,
-    type: string,
-    budget: BudgetItemConfig | undefined,
-    showUnits: boolean,
-  ): string | null {
-    const state = resolveBudgetDisplay(cost, tokens, budget);
-    if (state.suppressAll) return null;
-    if (!state.showBase) return state.percentText;
-
-    const baseDisplay = this.formatUsageDisplay(
-      cost,
-      tokens,
-      tokenBreakdown,
-      type,
-      showUnits,
-    );
-    return state.percentText
-      ? `${baseDisplay} ${state.percentText}`
-      : baseDisplay;
-  }
-
   renderVersion(
     hookData: ClaudeHookData,
     colors: PowerlineColors,
@@ -939,11 +690,12 @@ export class SegmentRenderer {
     }
 
     const text = `${iconPrefix}${formatCacheTimerElapsed(e)}`;
-    if (e >= 300) {
+    const ttl = config?.ttlSeconds ?? info.detectedTtlSeconds ?? 300;
+    if (e >= ttl) {
       bgColor = colors.contextCriticalBg;
       fgColor = colors.contextCriticalFg;
       bold = colors.contextCriticalBold;
-    } else if (e >= 180) {
+    } else if (e >= ttl * 0.6) {
       bgColor = colors.contextWarningBg;
       fgColor = colors.contextWarningFg;
       bold = colors.contextWarningBold;
@@ -973,7 +725,7 @@ export class SegmentRenderer {
       // Prefer the human-readable banter phrase; fall back to the raw stage
       // name (banter off, or older feed without current_message).
       const label = info.currentMessage ?? info.currentStage;
-      text = `${icon}bastra · ${info.recallCount} calls · ${info.totalHits} hits · ${live}ms · ${label}`;
+      text = `${icon}bastra · ${plural(info.recallCount, "call", "calls")} · ${plural(info.totalHits, "hit", "hits")} · ${live}ms · ${label}`;
     } else {
       // Between/after recalls in this turn — done snapshot. The running-state
       // phrase is too brief (~120ms) for the ≥1s statusline refresh to catch,
@@ -987,9 +739,9 @@ export class SegmentRenderer {
       const tail = showPhrase ? ` · ${info.lastPhrase}` : "";
       // hits come from recalls only; ms from any tool call. Show each only
       // when present, so load_memory-only turns read "N calls · Xms" (no hits).
-      const hits = info.totalHits > 0 ? ` · ${info.totalHits} hits` : "";
+      const hits = info.totalHits > 0 ? ` · ${plural(info.totalHits, "hit", "hits")}` : "";
       const ms = info.totalMs > 0 ? ` · ${info.totalMs}ms` : "";
-      text = `${icon}✓ bastra · ${info.recallCount} calls${hits}${ms}${tail}`;
+      text = `${icon}✓ bastra · ${plural(info.recallCount, "call", "calls")}${hits}${ms}${tail}`;
     }
 
     return {

package/src/segments/session.ts

@@ -4,6 +4,9 @@ import {
   findTranscriptFile,
   findAgentTranscripts,
   parseJsonlFile,
+  readJsonlFile,
+  canReadProjects,
+  createUniqueHash,
   type ParsedEntry,
   type ClaudeHookData,
 } from "../utils/claude";
@@ -68,12 +71,14 @@ export class SessionProvider {
       const transcriptPath = await findTranscriptFile(sessionId);
       if (!transcriptPath) {
         debug(`No transcript found for session: ${sessionId}`);
-        return null;
+        // A session that has not written its transcript yet has spent nothing;
+        // without a readable projects directory the usage is unknown.
+        return (await canReadProjects()) ? { totalCost: 0, entries: [] } : null;
       }
 
       debug(`Found transcript at: ${transcriptPath}`);
 
-      const parsedEntries = await parseJsonlFile(transcriptPath);
+      const parsedEntries = await readJsonlFile(transcriptPath);
       const projectPath = dirname(transcriptPath);
       const agentTranscripts = await findAgentTranscripts(
         sessionId,
@@ -91,10 +96,25 @@ export class SessionProvider {
         return { totalCost: 0, entries: [] };
       }
 
+      const seenHashes = new Set<string>();
+      const dedupedEntries = parsedEntries.filter((entry) => {
+        const hash = createUniqueHash(entry);
+        if (!hash) return true;
+        if (seenHashes.has(hash)) return false;
+        seenHashes.add(hash);
+        return true;
+      });
+
+      if (dedupedEntries.length !== parsedEntries.length) {
+        debug(
+          `Session usage: dropped ${parsedEntries.length - dedupedEntries.length} duplicate entries (retries/reconnects logged twice)`,
+        );
+      }
+
       const entries: SessionUsageEntry[] = [];
       let totalCost = 0;
 
-      for (const entry of parsedEntries) {
+      for (const entry of dedupedEntries) {
         if (entry.message?.usage) {
           const sessionEntry = convertToSessionEntry(entry);
 
@@ -142,7 +162,7 @@ export class SessionProvider {
   ): Promise<SessionInfo> {
     const sessionUsage = await this.getSessionUsage(sessionId);
 
-    if (!sessionUsage || sessionUsage.entries.length === 0) {
+    if (!sessionUsage) {
       return {
         cost: null,
         calculatedCost: null,
@@ -161,7 +181,11 @@ export class SessionProvider {
 
     const calculatedCost = sessionUsage.totalCost;
     const hookDataCost = hookData?.cost?.total_cost_usd ?? null;
-    const cost = calculatedCost ?? hookDataCost;
+    // Prefer Claude Code's own authoritative total_cost_usd (billed, not guessed
+    // from a client-side price list) whenever the hook provides it; the local
+    // per-token recompute is a fallback for older Claude Code versions that
+    // don't send `cost` at all.
+    const cost = hookDataCost ?? calculatedCost;
 
     return {
       cost,

package/src/segments/today.ts

@@ -4,7 +4,7 @@ import type { TokenBreakdown } from "./session";
 import { debug } from "../utils/logger";
 import { PricingService } from "./pricing";
 import { CacheManager } from "../utils/cache";
-import { loadEntriesFromProjects } from "../utils/claude";
+import { loadEntriesFromProjects, canReadProjects } from "../utils/claude";
 
 export interface TodayUsageEntry {
   timestamp: Date;
@@ -69,7 +69,12 @@ export class TodayProvider {
       "today",
       latestMtime,
     )) as TodayUsageEntry[] | null;
-    if (sharedCached) {
+    // The disk cache is keyed on transcript mtime only, so after midnight it
+    // still holds yesterday's entries until a transcript is touched.
+    if (
+      sharedCached &&
+      sharedCached.every((e) => formatDate(e.timestamp) === todayDateString)
+    ) {
       debug("Using shared today usage cache");
       return sharedCached;
     }
@@ -124,20 +129,13 @@ export class TodayProvider {
     return todayEntries;
   }
 
-  private async getTodayEntries(): Promise<TodayUsageEntry[]> {
-    try {
-      return await this.loadTodayEntries();
-    } catch (error) {
-      debug("Error loading today's entries:", error);
-      return [];
-    }
-  }
-
   async getTodayInfo(): Promise<TodayInfo> {
     try {
-      const entries = await this.getTodayEntries();
+      const entries = await this.loadTodayEntries();
 
-      if (entries.length === 0) {
+      // No entries is a measured zero only while the projects directory can
+      // be read; otherwise today's usage is unknown.
+      if (entries.length === 0 && !(await canReadProjects())) {
         return {
           cost: null,
           tokens: null,