@bastra-recall/statusline 1.0.0 → 1.0.1

package/src/segments/git.ts

@@ -8,7 +8,7 @@ const execAsync = promisify(exec);
 
 export interface GitInfo {
   branch: string;
-  status: "clean" | "dirty" | "conflicts";
+  status: "clean" | "dirty" | "conflicts" | "unknown";
   ahead: number;
   behind: number;
   sha?: string;
@@ -356,7 +356,7 @@ export class GitService {
 
   private async getStatusWithBranchAsync(workingDir: string): Promise<{
     branch: string | null;
-    status: "clean" | "dirty" | "conflicts";
+    status: "clean" | "dirty" | "conflicts" | "unknown";
     workingTree?: {
       staged: number;
       unstaged: number;
@@ -430,7 +430,7 @@ export class GitService {
       debug(`Git status with branch command failed in ${workingDir}:`, error);
       return {
         branch: await this.getFallbackBranch(workingDir),
-        status: "clean",
+        status: "unknown",
       };
     }
   }

package/src/segments/pricing.ts

@@ -332,6 +332,60 @@ export class PricingService {
     return pricing;
   }
 
+  /**
+   * Matches against the live/cached pricing table (not the hardcoded
+   * OFFLINE_PRICING_DATA fallback list) by tier + major version, so a model
+   * released after this file was last updated (e.g. claude-opus-5-5) prices
+   * against its own generation instead of falling through to an older,
+   * differently-priced generation via the static pattern list below.
+   */
+  private static matchLiveTable(
+    lowerModelId: string,
+    allPricing: Record<string, ModelPricing>,
+  ): ModelPricing | null {
+    const tierMatch = lowerModelId.match(/(opus|sonnet|haiku)/);
+    const tier = tierMatch?.[1];
+    if (!tier) return null;
+
+    // Version parts are 1-2 digits; a date suffix (opus-4-20250514) or a
+    // legacy date-only id (claude-3-opus-20240229) must not parse as a version.
+    const versionRe = new RegExp(`${tier}-(\\d{1,2})(?:-(\\d{1,2}))?(?!\\d)`);
+    const targetVersion = lowerModelId.match(versionRe);
+    if (!targetVersion?.[1]) return null;
+    const targetMajor = parseInt(targetVersion[1], 10);
+    const targetMinor = targetVersion[2] ? parseInt(targetVersion[2], 10) : 0;
+
+    const candidates = Object.entries(allPricing)
+      .map(([key, pricing]) => {
+        const m = key.toLowerCase().match(versionRe);
+        if (!m?.[1]) return null;
+        return {
+          key,
+          pricing,
+          major: parseInt(m[1], 10),
+          minor: m[2] ? parseInt(m[2], 10) : 0,
+        };
+      })
+      .filter((c): c is NonNullable<typeof c> => c !== null);
+
+    if (candidates.length === 0) return null;
+
+    const sameVersion = candidates.find(
+      (c) => c.major === targetMajor && c.minor === targetMinor,
+    );
+    if (sameVersion) return sameVersion.pricing;
+
+    const sameMajor = candidates
+      .filter((c) => c.major === targetMajor)
+      .sort((a, b) => b.minor - a.minor);
+    if (sameMajor.length > 0) {
+      return sameMajor[0]!.pricing;
+    }
+
+    candidates.sort((a, b) => b.major - a.major || b.minor - a.minor);
+    return candidates[0]!.pricing;
+  }
+
   private static fuzzyMatchModel(
     modelId: string,
     allPricing: Record<string, ModelPricing>,
@@ -343,6 +397,12 @@ export class PricingService {
         return pricing;
       }
     }
+
+    const liveMatch = this.matchLiveTable(lowerModelId, allPricing);
+    if (liveMatch) {
+      return liveMatch;
+    }
+
     const patterns = [
       {
         pattern: ["opus-4-6", "claude-opus-4-6"],
@@ -409,6 +469,11 @@ export class PricingService {
     if (!usage) {
       return 0;
     }
+    const breakdown = (
+      usage as unknown as {
+        cache_creation?: { ephemeral_1h_input_tokens?: number };
+      }
+    ).cache_creation;
 
     const modelId = this.extractModelId(entry);
     const pricing = await this.getModelPricing(modelId);
@@ -421,8 +486,20 @@ export class PricingService {
     const inputCost = (inputTokens / 1_000_000) * pricing.input;
     const outputCost = (outputTokens / 1_000_000) * pricing.output;
     const cacheReadCost = (cacheReadTokens / 1_000_000) * pricing.cache_read;
+    // The 1h share of cache writes bills at the 1h rate; the rest at 5m.
+    const cacheWrite1hTokens = Math.min(
+      cacheCreationTokens,
+      breakdown?.ephemeral_1h_input_tokens || 0,
+    );
+    // The live pricing table may omit the 1h field for a model. Keep the
+    // estimate numeric using the known 5m rate instead of spreading NaN.
+    const cacheWrite1hRate = Number.isFinite(pricing.cache_write_1h)
+      ? pricing.cache_write_1h
+      : pricing.cache_write_5m;
     const cacheCreationCost =
-      (cacheCreationTokens / 1_000_000) * pricing.cache_write_5m;
+      ((cacheCreationTokens - cacheWrite1hTokens) / 1_000_000) *
+        pricing.cache_write_5m +
+      (cacheWrite1hTokens / 1_000_000) * cacheWrite1hRate;
 
     return inputCost + outputCost + cacheCreationCost + cacheReadCost;
   }

package/src/segments/renderer-bars.ts

@@ -0,0 +1,83 @@
+// Progress-bar drawing shared by the gauge segments (context, block, weekly)
+// of SegmentRenderer (#1039). Pure: the only renderer state a bar needs is the
+// symbol set, passed in by the caller.
+
+import type { BarDisplayStyle, PowerlineSymbols } from "./renderer-types";
+
+interface BarStyleDef {
+  filled: string;
+  empty: string;
+  cap?: string;
+  marker?: string;
+}
+
+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: "◻" },
+};
+
+export function 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);
+}
+
+export function resolveBarStyleDef(
+  symbols: PowerlineSymbols,
+  style: string,
+): BarStyleDef | null {
+  return style === "bar"
+    ? { filled: symbols.bar_filled, empty: symbols.bar_empty }
+    : (BAR_STYLES[style] ?? null);
+}
+
+export function formatPercentageWithBar(
+  symbols: PowerlineSymbols,
+  pct: number,
+  displayStyle?: BarDisplayStyle,
+  timeStr?: string | null,
+): string {
+  const style = displayStyle ?? "text";
+  const barStyleDef = resolveBarStyleDef(symbols, style);
+  const barLength = 10;
+
+  if (barStyleDef) {
+    const filledCount = Math.round((pct / 100) * barLength);
+    const emptyCount = barLength - filledCount;
+    const bar = buildBar(
+      barStyleDef,
+      filledCount,
+      emptyCount,
+      barLength,
+    );
+    return timeStr ? `${bar} ${pct}% (${timeStr})` : `${bar} ${pct}%`;
+  }
+  return timeStr ? `${pct}% (${timeStr})` : `${pct}%`;
+}

package/src/segments/renderer-format.ts

@@ -0,0 +1,89 @@
+// Text formatting shared by the SegmentRenderer segments (#1039): counter
+// plurals, the project-relative directory name and the usage/budget display
+// of the session and today segments. Pure functions, no renderer state.
+
+import type { TokenBreakdown } from ".";
+import type { BudgetItemConfig } from "../config/loader";
+import {
+  formatCost,
+  formatTokens,
+  formatTokenCount,
+  formatTokenBreakdown,
+} from "../utils/formatters";
+import { resolveBudgetDisplay } from "../utils/budget";
+
+/** "1 call" / "2 calls" — the counter is visible in every session, so the
+ *  singular case must not read as a typo. Same for hits. */
+export function plural(n: number, one: string, many: string): string {
+  return `${n} ${n === 1 ? one : many}`;
+}
+
+export function getDisplayDirectoryName(
+  currentDir: string,
+  projectDir?: string,
+): string {
+  if (currentDir.startsWith("~")) {
+    return currentDir;
+  }
+
+  if (projectDir && projectDir !== currentDir) {
+    const base = projectDir.replace(/[\\/]+$/, "");
+    if (
+      currentDir.startsWith(base) &&
+      /[\\/]/.test(currentDir.charAt(base.length))
+    ) {
+      const relativePath = currentDir.slice(base.length + 1);
+      return relativePath || projectDir.split(/[\\/]/).pop() || "project";
+    }
+  }
+
+  return currentDir;
+}
+
+export function 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);
+  }
+}
+
+export function 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 = formatUsageDisplay(
+    cost,
+    tokens,
+    tokenBreakdown,
+    type,
+    showUnits,
+  );
+  return state.percentText
+    ? `${baseDisplay} ${state.percentText}`
+    : baseDisplay;
+}

package/src/segments/renderer-types.ts

@@ -0,0 +1,171 @@
+// Segment configuration and output contract of SegmentRenderer (#1039).
+// Re-exported unchanged from ./renderer, which is the import path every caller
+// (config loader, powerline, browser bundle) keeps using.
+
+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;
+}