@inferhub/usage 0.1.6 → 0.1.8

package/dist/format.d.ts

@@ -1,12 +1,16 @@
 import type { AccountUsage } from "./types.js";
 export declare function money(usdc: string | number | null | undefined, digits?: number): string;
 export declare function tokens(n: number | null | undefined): string;
+/** Compact integer for statusline: 3943 → 3.9k, 28000000 → 28.0M */
+export declare function compactCount(n: number | null | undefined): string;
 export declare function shortModel(model: string | null | undefined): string;
 /**
- * One-line Claude statusline — keep short (Claude only shows one row).
+ * One-line Claude statusline.
  *
  * Example:
- *   InferHub · sess 19r · day 129r · all $0.41 · bal $1.31 · top gpt-5.5
+ *   InferHub · sess 4r/1.2M · day 135r/26.4M · all $0.41/3.9k r/354M · bal $1.31 · top gpt-5.5
+ *
+ * Keep under ~90 chars when possible; tokens use k/M/B.
  */
 export declare function formatStatusLine(usage: AccountUsage, extras?: {
     sessionCostUsd?: number | null;

package/dist/format.js

@@ -6,15 +6,22 @@ export function money(usdc, digits = 2) {
         return "$0";
     if (Math.abs(n) < 0.01)
         return `$${n.toFixed(4)}`;
-    if (Math.abs(n) < 1)
-        return `$${n.toFixed(2)}`;
     return `$${n.toFixed(2)}`;
 }
 export function tokens(n) {
+    return compactCount(n);
+}
+/** Compact integer for statusline: 3943 → 3.9k, 28000000 → 28.0M */
+export function compactCount(n) {
     const v = Number(n ?? 0);
-    if (v >= 1_000_000)
+    if (!Number.isFinite(v))
+        return "0";
+    const abs = Math.abs(v);
+    if (abs >= 1_000_000_000)
+        return `${(v / 1_000_000_000).toFixed(1)}B`;
+    if (abs >= 1_000_000)
         return `${(v / 1_000_000).toFixed(1)}M`;
-    if (v >= 1_000)
+    if (abs >= 1_000)
         return `${(v / 1_000).toFixed(1)}k`;
     return String(Math.round(v));
 }
@@ -24,36 +31,40 @@ export function shortModel(model) {
     const parts = model.split("/");
     return parts[parts.length - 1] || model;
 }
-/** Compact metric for one-line status.
- * - billed: "$0.41" (no req clutter on all-time)
- * - free/zero: "19r"
- * - billed + wantReq: "$0.12/5r" when showReq=true
+/**
+ * Compact metric: "4r/1.2M" free, or "$0.41/3.9kr/355.7M" when billed.
+ * Both requests and tokens use k/M/B.
  */
-function compact(spendUsdc, requests, opts) {
+function compact(spendUsdc, requests, totalTokens) {
     const spend = Number(spendUsdc ?? 0);
     const req = Number(requests ?? 0);
-    if (spend > 0) {
-        if (opts?.showReq && req > 0)
-            return `${money(spend)}/${req}r`;
-        return money(spend);
-    }
-    if (req <= 0)
+    const tok = Number(totalTokens ?? 0);
+    if (req <= 0 && tok <= 0 && spend <= 0)
         return "—";
-    return `${req}r`;
+    const bits = [];
+    if (spend > 0)
+        bits.push(money(spend));
+    if (req > 0)
+        bits.push(`${compactCount(req)}r`);
+    if (tok > 0)
+        bits.push(compactCount(tok));
+    return bits.join("/") || "—";
 }
 /**
- * One-line Claude statusline — keep short (Claude only shows one row).
+ * One-line Claude statusline.
  *
  * Example:
- *   InferHub · sess 19r · day 129r · all $0.41 · bal $1.31 · top gpt-5.5
+ *   InferHub · sess 4r/1.2M · day 135r/26.4M · all $0.41/3.9k r/354M · bal $1.31 · top gpt-5.5
+ *
+ * Keep under ~90 chars when possible; tokens use k/M/B.
  */
 export function formatStatusLine(usage, extras) {
     const parts = ["InferHub"];
-    if (usage.session && (usage.session.requests > 0 || Number(usage.session.spend_usdc) > 0)) {
-        parts.push(`sess ${compact(usage.session.spend_usdc, usage.session.requests)}`);
+    if (usage.session && (usage.session.requests > 0 || Number(usage.session.spend_usdc) > 0 || usage.session.total_tokens > 0)) {
+        parts.push(`sess ${compact(usage.session.spend_usdc, usage.session.requests, usage.session.total_tokens)}`);
     }
-    parts.push(`day ${compact(usage.window.spend_usdc, usage.window.requests)}`);
-    parts.push(`all ${compact(usage.all_time.spend_usdc, usage.all_time.requests)}`);
+    parts.push(`day ${compact(usage.window.spend_usdc, usage.window.requests, usage.window.total_tokens)}`);
+    parts.push(`all ${compact(usage.all_time.spend_usdc, usage.all_time.requests, usage.all_time.total_tokens)}`);
     parts.push(`bal ${money(usage.balance.amount_usdc)}`);
     const top = shortModel(usage.top_model?.model);
     if (top && top !== "—")

package/dist/format.test.js

@@ -7,7 +7,7 @@ test("normalizeBaseUrl adds /v1", () => {
 test("usageUrl", () => {
     assert.equal(usageUrl("https://api.inferhub.dev", "day", "UTC", "abc"), "https://api.inferhub.dev/v1/me/usage?window=day&tz=UTC&session_id=abc");
 });
-test("formatStatusLine is compact one-liner", () => {
+test("formatStatusLine includes tokens compactly", () => {
     const usage = {
         object: "account.usage",
         currency: "USDC",
@@ -48,23 +48,14 @@ test("formatStatusLine is compact one-liner", () => {
         },
         cache: { cached: false, ttl_seconds: 30 },
     };
-    const line = formatStatusLine(usage, {
-        model: "grok-4.5",
-        contextPct: 8,
-    });
-    // Must be short enough for one Claude status row
+    const line = formatStatusLine(usage, { model: "grok-4.5", contextPct: 8 });
+    assert.equal(line, "InferHub · sess 19r/6.0M · day 129r/26.4M · all $0.41/3.9kr/354.2M · bal $1.31 · top gpt-5.5");
     assert.ok(line.length < 100, `too long: ${line.length} ${line}`);
-    assert.equal(line, "InferHub · sess 19r · day 129r · all $0.41 · bal $1.31 · top gpt-5.5");
-    assert.ok(line.length <= 72, `too long: ${line.length}`);
-    // paid day shows money only (no req clutter)
-    const paid = {
-        ...usage,
-        window: { ...usage.window, spend_usdc: "0.12", requests: 5 },
-        session: null,
-    };
-    const paidLine = formatStatusLine(paid);
-    assert.match(paidLine, /day \$0\.12/);
-    assert.doesNotMatch(paidLine, /sess /);
-    assert.doesNotMatch(paidLine, /\/5r/);
+    assert.match(line, /3\.9kr/);
+    assert.match(line, /354\.2M/);
+    assert.doesNotMatch(line, /3933r/);
+    // empty session omitted
+    const noSess = { ...usage, session: null };
+    assert.doesNotMatch(formatStatusLine(noSess), /sess /);
     assert.equal(money("0"), "$0");
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inferhub/usage",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Shared InferHub account usage client for coding-agent plugins",
   "type": "module",
   "main": "./dist/index.js",

package/src/format.test.ts

@@ -14,7 +14,7 @@ test("usageUrl", () => {
   );
 });
 
-test("formatStatusLine is compact one-liner", () => {
+test("formatStatusLine includes tokens compactly", () => {
   const usage: AccountUsage = {
     object: "account.usage",
     currency: "USDC",
@@ -56,29 +56,19 @@ test("formatStatusLine is compact one-liner", () => {
     cache: { cached: false, ttl_seconds: 30 },
   };
 
-  const line = formatStatusLine(usage, {
-    model: "grok-4.5",
-    contextPct: 8,
-  });
-
-  // Must be short enough for one Claude status row
-  assert.ok(line.length < 100, `too long: ${line.length} ${line}`);
+  const line = formatStatusLine(usage, { model: "grok-4.5", contextPct: 8 });
   assert.equal(
     line,
-    "InferHub · sess 19r · day 129r · all $0.41 · bal $1.31 · top gpt-5.5",
+    "InferHub · sess 19r/6.0M · day 129r/26.4M · all $0.41/3.9kr/354.2M · bal $1.31 · top gpt-5.5",
   );
-  assert.ok(line.length <= 72, `too long: ${line.length}`);
+  assert.ok(line.length < 100, `too long: ${line.length} ${line}`);
+  assert.match(line, /3\.9kr/);
+  assert.match(line, /354\.2M/);
+  assert.doesNotMatch(line, /3933r/);
 
-  // paid day shows money only (no req clutter)
-  const paid: AccountUsage = {
-    ...usage,
-    window: { ...usage.window, spend_usdc: "0.12", requests: 5 },
-    session: null,
-  };
-  const paidLine = formatStatusLine(paid);
-  assert.match(paidLine, /day \$0\.12/);
-  assert.doesNotMatch(paidLine, /sess /);
-  assert.doesNotMatch(paidLine, /\/5r/);
+  // empty session omitted
+  const noSess = { ...usage, session: null };
+  assert.doesNotMatch(formatStatusLine(noSess), /sess /);
 
   assert.equal(money("0"), "$0");
 });

package/src/format.ts

@@ -5,14 +5,21 @@ export function money(usdc: string | number | null | undefined, digits = 2): str
   if (!Number.isFinite(n)) return "$0";
   if (n === 0) return "$0";
   if (Math.abs(n) < 0.01) return `$${n.toFixed(4)}`;
-  if (Math.abs(n) < 1) return `$${n.toFixed(2)}`;
   return `$${n.toFixed(2)}`;
 }
 
 export function tokens(n: number | null | undefined): string {
+  return compactCount(n);
+}
+
+/** Compact integer for statusline: 3943 → 3.9k, 28000000 → 28.0M */
+export function compactCount(n: number | null | undefined): string {
   const v = Number(n ?? 0);
-  if (v >= 1_000_000) return `${(v / 1_000_000).toFixed(1)}M`;
-  if (v >= 1_000) return `${(v / 1_000).toFixed(1)}k`;
+  if (!Number.isFinite(v)) return "0";
+  const abs = Math.abs(v);
+  if (abs >= 1_000_000_000) return `${(v / 1_000_000_000).toFixed(1)}B`;
+  if (abs >= 1_000_000) return `${(v / 1_000_000).toFixed(1)}M`;
+  if (abs >= 1_000) return `${(v / 1_000).toFixed(1)}k`;
   return String(Math.round(v));
 }
 
@@ -22,31 +29,34 @@ export function shortModel(model: string | null | undefined): string {
   return parts[parts.length - 1] || model;
 }
 
-/** Compact metric for one-line status.
- * - billed: "$0.41" (no req clutter on all-time)
- * - free/zero: "19r"
- * - billed + wantReq: "$0.12/5r" when showReq=true
+/**
+ * Compact metric: "4r/1.2M" free, or "$0.41/3.9kr/355.7M" when billed.
+ * Both requests and tokens use k/M/B.
  */
 function compact(
   spendUsdc: string | number | null | undefined,
   requests: number | null | undefined,
-  opts?: { showReq?: boolean },
+  totalTokens: number | null | undefined,
 ): string {
   const spend = Number(spendUsdc ?? 0);
   const req = Number(requests ?? 0);
-  if (spend > 0) {
-    if (opts?.showReq && req > 0) return `${money(spend)}/${req}r`;
-    return money(spend);
-  }
-  if (req <= 0) return "—";
-  return `${req}r`;
+  const tok = Number(totalTokens ?? 0);
+  if (req <= 0 && tok <= 0 && spend <= 0) return "—";
+
+  const bits: string[] = [];
+  if (spend > 0) bits.push(money(spend));
+  if (req > 0) bits.push(`${compactCount(req)}r`);
+  if (tok > 0) bits.push(compactCount(tok));
+  return bits.join("/") || "—";
 }
 
 /**
- * One-line Claude statusline — keep short (Claude only shows one row).
+ * One-line Claude statusline.
  *
  * Example:
- *   InferHub · sess 19r · day 129r · all $0.41 · bal $1.31 · top gpt-5.5
+ *   InferHub · sess 4r/1.2M · day 135r/26.4M · all $0.41/3.9k r/354M · bal $1.31 · top gpt-5.5
+ *
+ * Keep under ~90 chars when possible; tokens use k/M/B.
  */
 export function formatStatusLine(
   usage: AccountUsage,
@@ -59,12 +69,18 @@ export function formatStatusLine(
 ): string {
   const parts: string[] = ["InferHub"];
 
-  if (usage.session && (usage.session.requests > 0 || Number(usage.session.spend_usdc) > 0)) {
-    parts.push(`sess ${compact(usage.session.spend_usdc, usage.session.requests)}`);
+  if (usage.session && (usage.session.requests > 0 || Number(usage.session.spend_usdc) > 0 || usage.session.total_tokens > 0)) {
+    parts.push(
+      `sess ${compact(usage.session.spend_usdc, usage.session.requests, usage.session.total_tokens)}`,
+    );
   }
 
-  parts.push(`day ${compact(usage.window.spend_usdc, usage.window.requests)}`);
-  parts.push(`all ${compact(usage.all_time.spend_usdc, usage.all_time.requests)}`);
+  parts.push(
+    `day ${compact(usage.window.spend_usdc, usage.window.requests, usage.window.total_tokens)}`,
+  );
+  parts.push(
+    `all ${compact(usage.all_time.spend_usdc, usage.all_time.requests, usage.all_time.total_tokens)}`,
+  );
   parts.push(`bal ${money(usage.balance.amount_usdc)}`);
 
   const top = shortModel(usage.top_model?.model);