lint

stephanos · stephanos · commit 1adcc5f61ee0 · 2026-05-03T09:56:41.000-07:00
diff --git a/Sources/AgentTally/Presentation/MenuRowsBuilder.swift b/Sources/AgentTally/Presentation/MenuRowsBuilder.swift
@@ -47,7 +47,8 @@ public enum MenuRowsBuilder {
 
         if spending.isInstalled, state.lastError == nil {
           rows.append(.section("\(spending.name) spending"))
-          rows.append(.disabled("Today: $\(StatusPresenter.displayDollarAmount(for: spending.todayCost))"))
+          rows.append(
+            .disabled("Today: $\(StatusPresenter.displayDollarAmount(for: spending.todayCost))"))
           rows.append(
             .disabled(
               "Month: $\(StatusPresenter.displayDollarAmount(for: spending.monthCost)) (\(state.businessDays) biz days)"
diff --git a/Sources/AgentTally/Usage/UsageDataScanner.swift b/Sources/AgentTally/Usage/UsageDataScanner.swift
@@ -226,7 +226,8 @@ enum UsageDataScanner {
 
     let candidateDirectories: [URL]
     if !envPaths.isEmpty {
-      candidateDirectories = envPaths
+      candidateDirectories =
+        envPaths
         .split(separator: ",")
         .map { String($0).trimmingCharacters(in: .whitespacesAndNewlines) }
         .filter { !$0.isEmpty }
@@ -245,7 +246,8 @@ enum UsageDataScanner {
     for directory in candidateDirectories {
       let normalizedDirectory = directory.standardizedFileURL
       let normalizedPath = normalizedDirectory.path
-      let projectsDirectory = normalizedDirectory
+      let projectsDirectory =
+        normalizedDirectory
         .appendingPathComponent(claudeProjectsDirectoryName)
         .standardizedFileURL
 
diff --git a/Tests/MenuRowsHarness.swift b/Tests/MenuRowsHarness.swift
@@ -18,7 +18,8 @@ func testMenuRowsBuilder() throws {
     avgPerDay: 10.0,
     lastUsageDetectedAt: now.addingTimeInterval(-15)
   )
-  let codexNotInstalled = AgentSpending(name: "Codex", isInstalled: false, todayCost: 0, monthCost: 0, avgPerDay: 0)
+  let codexNotInstalled = AgentSpending(
+    name: "Codex", isInstalled: false, todayCost: 0, monthCost: 0, avgPerDay: 0)
 
   let rows = MenuRowsBuilder.rows(
     for: AppState(
@@ -39,7 +40,8 @@ func testMenuRowsBuilder() throws {
   )
   let headerIndex = rows.firstIndex(of: .disabled("AgentTally v0.1"))!
   if case .disabled(let label) = rows[headerIndex + 1] {
-    try expect(label.hasPrefix("Last refreshed:"), "last updated should appear directly below the header")
+    try expect(
+      label.hasPrefix("Last refreshed:"), "last updated should appear directly below the header")
   } else {
     throw TestFailure(description: "row after header should be 'Last refreshed:' disabled item")
   }
diff --git a/Tests/StatusPresenterHarness.swift b/Tests/StatusPresenterHarness.swift
@@ -1,10 +1,14 @@
 import Foundation
 
 func testStatusPresenter() throws {
-  let claudeSpending = AgentSpending(name: "Claude Code", isInstalled: true, todayCost: 48.35, monthCost: 0, avgPerDay: 0)
-  let codexSpending = AgentSpending(name: "Codex", isInstalled: true, todayCost: 12.0, monthCost: 0, avgPerDay: 0)
-  let codexNotInstalled = AgentSpending(name: "Codex", isInstalled: false, todayCost: 0, monthCost: 0, avgPerDay: 0)
-  let fractionalSpending = AgentSpending(name: "Claude Code", isInstalled: true, todayCost: 0.01, monthCost: 0, avgPerDay: 0)
+  let claudeSpending = AgentSpending(
+    name: "Claude Code", isInstalled: true, todayCost: 48.35, monthCost: 0, avgPerDay: 0)
+  let codexSpending = AgentSpending(
+    name: "Codex", isInstalled: true, todayCost: 12.0, monthCost: 0, avgPerDay: 0)
+  let codexNotInstalled = AgentSpending(
+    name: "Codex", isInstalled: false, todayCost: 0, monthCost: 0, avgPerDay: 0)
+  let fractionalSpending = AgentSpending(
+    name: "Claude Code", isInstalled: true, todayCost: 0.01, monthCost: 0, avgPerDay: 0)
 
   let freshState = AppState(
     isRefreshing: true,
@@ -41,7 +45,8 @@ func testStatusPresenter() throws {
   let codexOnlyState = AppState(
     isRefreshing: false,
     agentSpendings: [
-      AgentSpending(name: "Claude Code", isInstalled: false, todayCost: 0, monthCost: 0, avgPerDay: 0),
+      AgentSpending(
+        name: "Claude Code", isInstalled: false, todayCost: 0, monthCost: 0, avgPerDay: 0),
       codexSpending,
     ],
     businessDays: 0,
diff --git a/Tests/UsageDataScannerHarness.swift b/Tests/UsageDataScannerHarness.swift
@@ -10,12 +10,14 @@ private func testClaudeFingerprintIgnoresNonUsageFiles() throws {
   let homeDirectory = try makeTemporaryDirectory()
   defer { try? fileManager.removeItem(at: homeDirectory) }
 
-  let usageFile = homeDirectory
+  let usageFile =
+    homeDirectory
     .appendingPathComponent(".claude")
     .appendingPathComponent("projects")
     .appendingPathComponent("sample-project")
     .appendingPathComponent("session.jsonl")
-  let settingsFile = homeDirectory
+  let settingsFile =
+    homeDirectory
     .appendingPathComponent(".claude")
     .appendingPathComponent("settings.json")
 
@@ -53,13 +55,15 @@ private func testCodexFingerprintScopesToCurrentMonthSessions() throws {
   defer { try? fileManager.removeItem(at: homeDirectory) }
 
   let codexHome = homeDirectory.appendingPathComponent("codex-home")
-  let previousMonthFile = codexHome
+  let previousMonthFile =
+    codexHome
     .appendingPathComponent("sessions")
     .appendingPathComponent("2026")
     .appendingPathComponent("04")
     .appendingPathComponent("30")
     .appendingPathComponent("old.jsonl")
-  let currentMonthFile = codexHome
+  let currentMonthFile =
+    codexHome
     .appendingPathComponent("sessions")
     .appendingPathComponent("2026")
     .appendingPathComponent("05")
diff --git a/Tests/UsageRefreshControllerHarness.swift b/Tests/UsageRefreshControllerHarness.swift
@@ -188,7 +188,8 @@ private func testApplySuccess() throws {
 
 private func testApplyFailure() throws {
   let now = Date(timeIntervalSinceReferenceDate: 3_000)
-  let spending = AgentSpending(name: "Claude Code", isInstalled: true, todayCost: 48.35, monthCost: 208.12, avgPerDay: 52.03)
+  let spending = AgentSpending(
+    name: "Claude Code", isInstalled: true, todayCost: 48.35, monthCost: 208.12, avgPerDay: 52.03)
   let state = AppState(
     isRefreshing: true,
     agentSpendings: [spending],
diff --git a/tooling/usage-helper.ts b/tooling/usage-helper.ts
@@ -1,9 +1,20 @@
 import { loadDailyUsageData } from "ccusage/data-loader";
-import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync } from "fs";
+import {
+  existsSync,
+  mkdirSync,
+  readdirSync,
+  readFileSync,
+  writeFileSync,
+} from "fs";
 import os from "os";
 import path from "path";
 
-type AgentEntry = { name: string; found: boolean; today: number; month: number };
+type AgentEntry = {
+  name: string;
+  found: boolean;
+  today: number;
+  month: number;
+};
 type UsagePayload = { agents: AgentEntry[] };
 
 function formatLocalDay(date: Date): string {
@@ -17,7 +28,10 @@ function formatLocalDay(date: Date): string {
 
 // ─── Claude Code ────────────────────────────────────────────────────────────
 
-async function loadClaudeData(since: string, offline: boolean): Promise<AgentEntry> {
+async function loadClaudeData(
+  since: string,
+  offline: boolean,
+): Promise<AgentEntry> {
   const dailyData = await loadDailyUsageData({ since, offline });
   const today = formatLocalDay(new Date());
 
@@ -42,14 +56,24 @@ const CODEX_MODEL_ALIASES: Record<string, string> = {
   "gpt-5.3-codex": "gpt-5.2-codex",
 };
 
-const CODEX_PROVIDER_PREFIXES = ["openai/", "azure/openai/", "azure/", "openrouter/openai/"];
+const CODEX_PROVIDER_PREFIXES = [
+  "openai/",
+  "azure/openai/",
+  "azure/",
+  "openrouter/openai/",
+];
 
 // ─── Pricing cache ───────────────────────────────────────────────────────────
 
 const LITELLM_URL =
   "https://raw.githubusercontent.com/BerriAI/litellm/main/model_prices_and_context_window.json";
 const PRICING_CACHE_TTL_MS = 24 * 60 * 60 * 1000;
-const PRICING_CACHE_PATH = path.join(os.homedir(), ".cache", "agenttally", "codex-pricing.json");
+const PRICING_CACHE_PATH = path.join(
+  os.homedir(),
+  ".cache",
+  "agenttally",
+  "codex-pricing.json",
+);
 
 type PricingCache = {
   fetchedAt: number;
@@ -59,31 +83,45 @@ type PricingCache = {
 function parseLiteLLMEntry(data: unknown): ModelPricing | null {
   if (typeof data !== "object" || data == null) return null;
   const d = data as Record<string, unknown>;
-  const input = typeof d.input_cost_per_token === "number" ? d.input_cost_per_token : null;
-  const output = typeof d.output_cost_per_token === "number" ? d.output_cost_per_token : null;
+  const input =
+    typeof d.input_cost_per_token === "number" ? d.input_cost_per_token : null;
+  const output =
+    typeof d.output_cost_per_token === "number"
+      ? d.output_cost_per_token
+      : null;
   if (input == null || output == null) return null;
   return {
     input_cost_per_token: input,
     output_cost_per_token: output,
     cache_read_input_token_cost:
-      typeof d.cache_read_input_token_cost === "number" ? d.cache_read_input_token_cost : undefined,
+      typeof d.cache_read_input_token_cost === "number"
+        ? d.cache_read_input_token_cost
+        : undefined,
   };
 }
 
-async function loadCodexPricing(offline: boolean): Promise<Record<string, ModelPricing>> {
+async function loadCodexPricing(
+  offline: boolean,
+): Promise<Record<string, ModelPricing>> {
   try {
-    const cached = JSON.parse(readFileSync(PRICING_CACHE_PATH, "utf8")) as PricingCache;
+    const cached = JSON.parse(
+      readFileSync(PRICING_CACHE_PATH, "utf8"),
+    ) as PricingCache;
     if (Date.now() - cached.fetchedAt < PRICING_CACHE_TTL_MS) {
       return cached.pricing;
     }
   } catch {
     // cache miss or corrupt
   }
 
-  if (offline) throw new Error("Codex pricing unavailable: cache stale and in offline mode");
+  if (offline)
+    throw new Error(
+      "Codex pricing unavailable: cache stale and in offline mode",
+    );
 
   const response = await fetch(LITELLM_URL);
-  if (!response.ok) throw new Error(`Failed to fetch Codex pricing: HTTP ${response.status}`);
+  if (!response.ok)
+    throw new Error(`Failed to fetch Codex pricing: HTTP ${response.status}`);
   const raw = (await response.json()) as Record<string, unknown>;
 
   const pricing: Record<string, ModelPricing> = {};
@@ -93,18 +131,22 @@ async function loadCodexPricing(offline: boolean): Promise<Record<string, ModelP
   }
 
   mkdirSync(path.dirname(PRICING_CACHE_PATH), { recursive: true });
-  writeFileSync(PRICING_CACHE_PATH, JSON.stringify({ fetchedAt: Date.now(), pricing }));
+  writeFileSync(
+    PRICING_CACHE_PATH,
+    JSON.stringify({ fetchedAt: Date.now(), pricing }),
+  );
   return pricing;
 }
 
 function lookupCodexPricing(
   modelName: string,
-  pricing: Record<string, ModelPricing>
+  pricing: Record<string, ModelPricing>,
 ): ModelPricing | null {
   // Build candidates: bare name + all provider-prefixed variants
   const candidates = [modelName];
   for (const prefix of CODEX_PROVIDER_PREFIXES) {
-    if (modelName.startsWith(prefix)) candidates.push(modelName.slice(prefix.length));
+    if (modelName.startsWith(prefix))
+      candidates.push(modelName.slice(prefix.length));
     else candidates.push(`${prefix}${modelName}`);
   }
 
@@ -118,7 +160,8 @@ function lookupCodexPricing(
   // Fuzzy fallback: substring match
   const lower = modelName.toLowerCase();
   for (const [key, val] of Object.entries(pricing)) {
-    if (key.toLowerCase().includes(lower) || lower.includes(key.toLowerCase())) return val;
+    if (key.toLowerCase().includes(lower) || lower.includes(key.toLowerCase()))
+      return val;
   }
 
   return null;
@@ -133,27 +176,34 @@ type TokenUsage = {
 function calcCost(usage: TokenUsage, pricing: ModelPricing): number {
   const cachedInput = Math.min(usage.cached_input_tokens, usage.input_tokens);
   const nonCachedInput = usage.input_tokens - cachedInput;
-  const cacheRate = pricing.cache_read_input_token_cost ?? pricing.input_cost_per_token;
+  const cacheRate =
+    pricing.cache_read_input_token_cost ?? pricing.input_cost_per_token;
   return (
     nonCachedInput * pricing.input_cost_per_token +
     cachedInput * cacheRate +
     usage.output_tokens * pricing.output_cost_per_token
   );
 }
 
-function subtractTokenUsage(total: TokenUsage, prev: TokenUsage | null): TokenUsage {
+function subtractTokenUsage(
+  total: TokenUsage,
+  prev: TokenUsage | null,
+): TokenUsage {
   if (!prev) return total;
   return {
     input_tokens: Math.max(0, total.input_tokens - prev.input_tokens),
-    cached_input_tokens: Math.max(0, total.cached_input_tokens - prev.cached_input_tokens),
+    cached_input_tokens: Math.max(
+      0,
+      total.cached_input_tokens - prev.cached_input_tokens,
+    ),
     output_tokens: Math.max(0, total.output_tokens - prev.output_tokens),
   };
 }
 
 function parseCodexSession(
   filePath: string,
   pricing: Record<string, ModelPricing>,
-  costsByDate: Map<string, number>
+  costsByDate: Map<string, number>,
 ) {
   let content: string;
   try {
@@ -184,9 +234,13 @@ function parseCodexSession(
 
     if (entry.type !== "event_msg") continue;
     const payload = entry.payload as Record<string, unknown> | null;
-    if ((payload as Record<string, unknown> | null)?.type !== "token_count") continue;
+    if ((payload as Record<string, unknown> | null)?.type !== "token_count")
+      continue;
 
-    const info = (payload as Record<string, unknown>).info as Record<string, unknown> | null;
+    const info = (payload as Record<string, unknown>).info as Record<
+      string,
+      unknown
+    > | null;
     const lastUsage = info?.last_token_usage as TokenUsage | null;
     const totalUsage = info?.total_token_usage as TokenUsage | null;
 
@@ -199,7 +253,9 @@ function parseCodexSession(
     if (totalUsage?.input_tokens != null) prevTotals = totalUsage;
     if (!delta) continue;
 
-    const modelPricing = currentModel ? lookupCodexPricing(currentModel, pricing) : null;
+    const modelPricing = currentModel
+      ? lookupCodexPricing(currentModel, pricing)
+      : null;
     if (!modelPricing) continue;
 
     const cost = calcCost(delta, modelPricing);
@@ -210,8 +266,12 @@ function parseCodexSession(
   }
 }
 
-async function loadCodexData(since: string, offline: boolean): Promise<AgentEntry> {
-  const codexHome = process.env["CODEX_HOME"] ?? path.join(os.homedir(), ".codex");
+async function loadCodexData(
+  since: string,
+  offline: boolean,
+): Promise<AgentEntry> {
+  const codexHome =
+    process.env["CODEX_HOME"] ?? path.join(os.homedir(), ".codex");
   const sessionsDir = path.join(codexHome, "sessions");
   if (!existsSync(sessionsDir)) {
     return { name: "Codex", found: false, today: 0, month: 0 };
@@ -250,7 +310,10 @@ async function loadCodexData(since: string, offline: boolean): Promise<AgentEntr
 const AGENT_LOADERS = {
   claude: loadClaudeData,
   codex: loadCodexData,
-} as const satisfies Record<string, (since: string, offline: boolean) => Promise<AgentEntry>>;
+} as const satisfies Record<
+  string,
+  (since: string, offline: boolean) => Promise<AgentEntry>
+>;
 
 type AgentID = keyof typeof AGENT_LOADERS;
 
@@ -287,7 +350,9 @@ function parseRequestedAgents(args: string[]): AgentID[] {
     }
   }
 
-  return requested.size > 0 ? ALL_AGENTS.filter((agent) => requested.has(agent)) : ALL_AGENTS;
+  return requested.size > 0
+    ? ALL_AGENTS.filter((agent) => requested.has(agent))
+    : ALL_AGENTS;
 }
 
 async function main() {
@@ -299,7 +364,7 @@ async function main() {
   const requestedAgents = parseRequestedAgents(process.argv.slice(3));
 
   const agents = await Promise.all(
-    requestedAgents.map((agent) => AGENT_LOADERS[agent](since, offline))
+    requestedAgents.map((agent) => AGENT_LOADERS[agent](since, offline)),
   );
 
   const payload: UsagePayload = {

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,8 @@ func testMenuRowsBuilder() throws {`
`18`	`18`	`avgPerDay: 10.0,`
`19`	`19`	`lastUsageDetectedAt: now.addingTimeInterval(-15)`
`20`	`20`	`)`
`21`		`- let codexNotInstalled = AgentSpending(name: "Codex", isInstalled: false, todayCost: 0, monthCost: 0, avgPerDay: 0)`
	`21`	`+ let codexNotInstalled = AgentSpending(`
	`22`	`+ name: "Codex", isInstalled: false, todayCost: 0, monthCost: 0, avgPerDay: 0)`
`22`	`23`
`23`	`24`	`let rows = MenuRowsBuilder.rows(`
`24`	`25`	`for: AppState(`
`@@ -39,7 +40,8 @@ func testMenuRowsBuilder() throws {`
`39`	`40`	`)`
`40`	`41`	`let headerIndex = rows.firstIndex(of: .disabled("AgentTally v0.1"))!`
`41`	`42`	`if case .disabled(let label) = rows[headerIndex + 1] {`
`42`		`- try expect(label.hasPrefix("Last refreshed:"), "last updated should appear directly below the header")`
	`43`	`+ try expect(`
	`44`	`+ label.hasPrefix("Last refreshed:"), "last updated should appear directly below the header")`
`43`	`45`	`} else {`
`44`	`46`	`throw TestFailure(description: "row after header should be 'Last refreshed:' disabled item")`
`45`	`47`	`}`