@1930dev/opencode-usage 0.1.5 → 0.2.0

package/README.md

@@ -7,7 +7,8 @@ Every connected provider in one table, with each one's remaining budget as a
 comparable percentage — whether the provider bills in tokens, requests, credits or
 neurons.
 
-<!-- Absolute URL so the image also renders on npm, which resolves nothing relative. -->
+<!-- Absolute URL so the image also renders on npm, which resolves nothing relative.
+     It also means updating the file on main updates both, with no republish. -->
 ![The /usage dialog](https://raw.githubusercontent.com/1930-dev/opencode-usage/main/docs/demo.gif)
 
 [![npm](https://img.shields.io/npm/v/@1930dev/opencode-usage)](https://www.npmjs.com/package/@1930dev/opencode-usage)
@@ -123,17 +124,26 @@ Normalized percentage of budget consumed per provider, from these sources (in pr
    - `openrouter`: credits used / total credits
    - `zai`: coding plan quota
 
-2. **Documented limits** — published quotas, used when the provider reports none:
+2. **Documented limits** — published quotas, used when the provider reports none.
+   Each one is read against the period it resets on: a daily limit against today,
+   a monthly one against the calendar month. The window you asked for (`--since`)
+   sizes the table and never the budget.
    - `cerebras`: 1M tokens/day (free tier)
-   - `cloudflare-workers-ai`: 100k neurons/day (free tier)
    - `digitalocean`: 5M tokens/day (paid)
    - `google`: 1500 requests/day (free tier)
    - `groq`: 200k tokens/day (free tier)
+
+   These are documented but not measurable, and show `—`. opencode's database
+   records tokens and requests; a credit and a neuron are the provider's own
+   unit, derived from the model and the request by a rule it does not record.
+   Give them a line in `budgets.json` to get a percentage in USD instead.
+   - `cloudflare-workers-ai`: 100k neurons/day (free tier)
    - `nvidia`: 1000 credits/month (free tier)
    - `orcarouter`: undocumented
    - `snowflake-cortex`: 100 credits/month (paid)
 
-3. **budgets.json** — your monthly USD per provider:
+3. **budgets.json** — your monthly USD per provider, read against what the
+   provider cost so far this calendar month:
    ```json
    {
      "digitalocean": 5,
@@ -186,9 +196,14 @@ bun install          # install workspace deps
 bun run build        # write dist/tui.js and dist/cli.js
 bun run preview      # render the /usage dialog headless, at several widths
 bun test             # run tests
+bun run coverage     # run tests with the coverage gate
 bunx tsc --noEmit    # typecheck
 ```
 
+Every line of every source file is covered, and `bunfig.toml` fails the run if
+that stops being true. `packages/cli/src/cli.ts` holds no logic for that reason:
+the commands live in `main.ts`, which a test drives directly.
+
 The workspace is a Bun monorepo. The packages are listed by dependency order,
 since `cli` and `plugin` both build on `core`:
 

package/dist/cli.js

@@ -61,7 +61,7 @@ var CREATED = "CAST(json_extract(data,'$.time.created') AS INTEGER)";
 var GROUPS = {
   provider: "json_extract(data,'$.providerID')",
   model: "json_extract(data,'$.providerID') || '/' || json_extract(data,'$.modelID')",
-  day: "strftime('%Y-%m-%d', (${" + CREATED + "})/1000, 'unixepoch')",
+  day: `strftime('%Y-%m-%d', (${CREATED})/1000, 'unixepoch')`,
   project: "json_extract(data,'$.path.cwd')",
   agent: "json_extract(data,'$.agent')"
 };
@@ -134,19 +134,6 @@ function localUsageByProvider(db, sinceMs) {
   }
   return map;
 }
-function monthlyUsageByProvider(db, startOfMonthMs) {
-  const rows = db.query(`SELECT COALESCE(json_extract(data,'$.providerID'),'?') AS provider,
-              COALESCE(SUM(CAST(json_extract(data,'$.cost') AS REAL)),0) AS cost
-       FROM message
-       WHERE json_extract(data,'$.role')='assistant'
-         AND CAST(json_extract(data,'$.time.created') AS INTEGER) >= ?
-       GROUP BY provider`).all(startOfMonthMs);
-  const map = new Map;
-  for (const r of rows) {
-    map.set(String(r.provider), Number(r.cost));
-  }
-  return map;
-}
 // packages/core/src/providers.ts
 import { mkdir, readFile as readFile2, writeFile } from "fs/promises";
 import path2 from "path";
@@ -233,6 +220,8 @@ async function fetchOpenRouter(key) {
 
 // packages/core/src/quota/copilot.ts
 function premiumBudget(s) {
+  if (!s)
+    return;
   if (s.unlimited && s.entitlement === 0)
     return;
   const remaining = s.remaining ?? s.quota_remaining;
@@ -600,135 +589,130 @@ async function buildTop(limit) {
 }
 // packages/core/src/budget.ts
 import { readFile as readFile4 } from "fs/promises";
-async function readBudgets() {
-  try {
-    return JSON.parse(await readFile4(budgetsPath(), "utf8"));
-  } catch {
-    return {};
-  }
-}
-function pctFromLimit(provider, limit, usageTokens, usageRequests, isMonthly) {
-  if (limit.limit <= 0)
-    return;
-  const effectiveLimit = limit.metric.endsWith("/day") && limit.metric !== "neurons/day" ? limit.limit * 30 : limit.limit;
-  const metric = limit.metric.replace("/day", "").replace("/month", "");
-  switch (metric) {
-    case "tokens":
-      if (effectiveLimit > 0)
-        return usageTokens / effectiveLimit * 100;
-      return;
-    case "requests":
-      if (effectiveLimit > 0)
-        return usageRequests / effectiveLimit * 100;
-      return;
-    case "credits":
-    case "neurons":
-      return;
-    default:
-      return;
-  }
-}
-function resolvePct(provider, live, budgets, monthCost, usageTokens, usageRequests, limits) {
-  const liveQ = live.get(provider);
-  if (liveQ?.budget && liveQ.ok) {
-    return { pct: liveQ.budget.percentUsed, source: "live", label: liveQ.budget.label };
-  }
-  if (budgets[provider] !== undefined) {
-    const budget = budgets[provider];
-    if (budget <= 0)
-      return { pct: 0, source: "budgets" };
-    return { pct: monthCost / budget * 100, source: "budgets" };
-  }
-  const limit = limits.get(provider);
-  if (limit) {
-    const pct = pctFromLimit(provider, limit, usageTokens, usageRequests, true);
-    if (pct !== undefined) {
-      return { pct, source: "limits", label: `${limit.limit.toLocaleString()} ${limit.unit}/${limit.metric.split("/")[1]}` };
-    }
-  }
-  return { pct: 0, source: "none" };
-}
+
 // packages/core/src/limits.ts
 var PROVIDER_LIMITS = [
   {
-    provider: "groq",
-    metric: "tokens/day",
-    limit: 200000,
+    provider: "cerebras",
     unit: "tokens",
+    period: "day",
+    limit: 1e6,
     tier: "free",
-    source: "https://console.groq.com/docs/rate-limits",
-    note: "Also 30k tokens/minute. Paid tiers higher."
-  },
-  {
-    provider: "google",
-    metric: "requests/day",
-    limit: 1500,
-    unit: "requests",
-    tier: "free",
-    source: "https://ai.google.dev/gemini-api/docs/rate-limits",
-    note: "Free tier: 1500 RPM, 1500 RPD. Paid tiers higher."
+    source: "https://cerebras.ai/",
+    note: "Free tier estimate. Paid tiers much higher."
   },
   {
     provider: "cloudflare-workers-ai",
-    metric: "neurons/day",
-    limit: 1e5,
     unit: "neurons",
+    period: "day",
+    limit: 1e5,
     tier: "free",
     source: "https://developers.cloudflare.com/workers-ai/platform/limits/",
-    note: "100k neurons/day free. Workers AI paid plans higher."
-  },
-  {
-    provider: "nvidia",
-    metric: "credits/month",
-    limit: 1000,
-    unit: "credits",
-    tier: "free",
-    source: "https://build.nvidia.com/",
-    note: "NIM free tier ~1000 credits/month. Varies by model."
+    note: "A neuron is Cloudflare's own unit, per model. Not measurable from tokens."
   },
   {
     provider: "digitalocean",
-    metric: "tokens/day",
-    limit: 5000000,
     unit: "tokens",
+    period: "day",
+    limit: 5000000,
     tier: "paid",
     source: "https://docs.digitalocean.com/products/genai/",
     note: "GenAI platform paid plans. Exact limits per model."
   },
   {
-    provider: "snowflake-cortex",
-    metric: "credits/month",
-    limit: 100,
-    unit: "credits",
-    tier: "paid",
-    source: "https://docs.snowflake.com/en/user-guide/snowflake-cortex",
-    note: "Cortex functions consume credits. Budget per warehouse."
+    provider: "google",
+    unit: "requests",
+    period: "day",
+    limit: 1500,
+    tier: "free",
+    source: "https://ai.google.dev/gemini-api/docs/rate-limits",
+    note: "Free tier: 1500 RPM, 1500 RPD. Paid tiers higher."
   },
   {
-    provider: "cerebras",
-    metric: "tokens/day",
-    limit: 1e6,
+    provider: "groq",
     unit: "tokens",
+    period: "day",
+    limit: 200000,
     tier: "free",
-    source: "https://cerebras.ai/",
-    note: "Free tier estimate. Paid tiers much higher."
+    source: "https://console.groq.com/docs/rate-limits",
+    note: "Also 30k tokens/minute. Paid tiers higher."
+  },
+  {
+    provider: "nvidia",
+    unit: "credits",
+    period: "month",
+    limit: 1000,
+    tier: "free",
+    source: "https://build.nvidia.com/",
+    note: "NIM free tier ~1000 credits/month. A credit varies by model."
   },
   {
     provider: "orcarouter",
-    metric: "tokens/day",
-    limit: 0,
     unit: "tokens",
+    period: "day",
+    limit: 0,
     tier: "unknown",
     source: "unknown",
     note: "Proxy service. No public limits documented."
+  },
+  {
+    provider: "snowflake-cortex",
+    unit: "credits",
+    period: "month",
+    limit: 100,
+    tier: "paid",
+    source: "https://docs.snowflake.com/en/user-guide/snowflake-cortex",
+    note: "Credits follow warehouse time, not tokens. Not measurable from usage."
   }
 ];
+var MEASURED_UNITS = new Set(["tokens", "requests"]);
+function isMeasurable(limit) {
+  return limit.limit > 0 && MEASURED_UNITS.has(limit.unit);
+}
+function limitLabel(limit) {
+  return `${limit.limit.toLocaleString()} ${limit.unit}/${limit.period}`;
+}
 function limitsAsMap() {
   const m = new Map;
   for (const l of PROVIDER_LIMITS)
     m.set(l.provider, l);
   return m;
 }
+
+// packages/core/src/budget.ts
+async function readBudgets() {
+  try {
+    return JSON.parse(await readFile4(budgetsPath(), "utf8"));
+  } catch {
+    return {};
+  }
+}
+function pctFromLimit(limit, usage) {
+  if (!isMeasurable(limit))
+    return;
+  const period = usage[limit.period];
+  const used = limit.unit === "requests" ? period.requests : period.tokens;
+  return used / limit.limit * 100;
+}
+function resolvePct(provider, sources) {
+  const live = sources.live.get(provider);
+  if (live?.budget && live.ok) {
+    return { pct: live.budget.percentUsed, source: "live", label: live.budget.label };
+  }
+  const budget = sources.budgets[provider];
+  if (budget !== undefined) {
+    if (budget <= 0)
+      return { pct: 0, source: "budgets" };
+    return { pct: sources.monthCost / budget * 100, source: "budgets" };
+  }
+  const limit = sources.limits.get(provider);
+  if (limit) {
+    const pct = pctFromLimit(limit, sources.usage);
+    if (pct !== undefined)
+      return { pct, source: "limits", label: limitLabel(limit) };
+  }
+  return { pct: 0, source: "none" };
+}
 // packages/core/src/snapshot.ts
 async function withConnectedProviders(rows) {
   let connected;
@@ -755,36 +739,48 @@ async function withConnectedProviders(rows) {
   }));
   return [...rows, ...idle].sort((a, b) => b.cost - a.cost || b.messages - a.messages || a.provider.localeCompare(b.provider));
 }
+function periodUsage(usage, provider) {
+  const local = usage.get(provider);
+  return { tokens: local?.tokens ?? 0, requests: local?.messages ?? 0 };
+}
+async function resolvePctByProvider(rows, day, month) {
+  const budgets = await readBudgets();
+  const live = new Map;
+  for (const status of await providerStatuses({ noNet: false })) {
+    if (status.quota)
+      live.set(status.provider, status.quota);
+  }
+  const limits = limitsAsMap();
+  const pct = {};
+  for (const row of rows) {
+    const resolved = resolvePct(row.provider, {
+      live,
+      budgets,
+      monthCost: month.get(row.provider)?.cost ?? 0,
+      usage: { day: periodUsage(day, row.provider), month: periodUsage(month, row.provider) },
+      limits
+    });
+    if (resolved.pct > 0 || resolved.source !== "none")
+      pct[row.provider] = resolved;
+  }
+  return pct;
+}
 async function getUsageSnapshot(sinceMs, groupBy, includePct) {
   const db = openDb();
   try {
-    const rows = groupBy === "provider" ? await withConnectedProviders(usageSince(db, sinceMs, groupBy)) : usageSince(db, sinceMs, groupBy);
+    const grouped = usageSince(db, sinceMs, groupBy);
+    const rows = groupBy === "provider" ? await withConnectedProviders(grouped) : grouped;
     const totals = usageTotals(db, sinceMs);
-    let pct;
-    if (includePct) {
-      const budgets = await readBudgets();
-      const live = await providerStatuses({ noNet: false });
-      const liveMap = new Map;
-      for (const s of live) {
-        if (s.quota)
-          liveMap.set(s.provider, s.quota);
-      }
-      const monthCosts = monthlyUsageByProvider(db, startOfMonthMs());
-      const limits = limitsAsMap();
-      const pctMap = new Map;
-      for (const r of rows) {
-        const p = resolvePct(r.provider, liveMap, budgets, monthCosts.get(r.provider) ?? 0, r.tokensInput + r.tokensOutput, r.messages, limits);
-        if (p.pct > 0 || p.source !== "none")
-          pctMap.set(r.provider, p);
-      }
-      pct = pctMap;
-    }
-    return { rows, totals, pct: pct ? Object.fromEntries(pct) : undefined };
+    if (!includePct)
+      return { rows, totals };
+    const day = localUsageByProvider(db, startOfDayMs());
+    const month = localUsageByProvider(db, startOfMonthMs());
+    return { rows, totals, pct: await resolvePctByProvider(rows, day, month) };
   } finally {
     db.close();
   }
 }
-// packages/cli/src/cli.ts
+// packages/cli/src/main.ts
 var USAGE = `opencode-usage \u2014 usage tracking and model ranking for opencode
 
 USAGE
@@ -799,12 +795,14 @@ OPTIONS
   --since     lookback window: Nh, Nd or Nw (default 7d)
   --pct       add % BUDGET column (requires --by provider)
 `;
+
+class CliError extends Error {
+}
 function fail(msg) {
-  console.error(`opencode-usage: ${msg}
-`);
-  process.exit(1);
-  throw new Error("unreachable");
+  throw new CliError(msg);
 }
+var GROUP_BYS = ["provider", "model", "day", "project", "agent"];
+var VALUED_FLAGS = ["--since", "--by", "--limit"];
 function parseArgs(argv) {
   const cmd = argv[0];
   if (!cmd || cmd.startsWith("-"))
@@ -820,69 +818,82 @@ ${USAGE}`);
     const name = `--${key}`;
     if (val !== undefined)
       flags.set(name, val);
-    else if (i + 1 < argv.length && !argv[i + 1].startsWith("--") && ["--since", "--by", "--limit"].includes(name)) {
+    else if (i + 1 < argv.length && !argv[i + 1].startsWith("--") && VALUED_FLAGS.includes(name)) {
       flags.set(name, argv[++i]);
     } else
       flags.set(name, true);
   }
   return { cmd, flags };
 }
+function stringFlag(flags, name) {
+  const v = flags.get(name);
+  return typeof v === "string" ? v : undefined;
+}
+function sinceMsOf(flags) {
+  if (flags.has("--today"))
+    return startOfDayMs();
+  if (!flags.has("--since"))
+    return Date.now() - parseDuration("7d");
+  const v = stringFlag(flags, "--since");
+  if (v === undefined)
+    fail("--since needs a value like 7d");
+  return Date.now() - parseDuration(v);
+}
 async function cmdUsage(flags, json) {
-  const sinceMs = flags.has("--today") ? startOfDayMs() : flags.has("--since") ? (() => {
-    const v = flags.get("--since");
-    if (typeof v !== "string")
-      fail("--since needs a value like 7d");
-    return Date.now() - parseDuration(v);
-  })() : Date.now() - parseDuration("7d");
-  const groupBy = typeof flags.get("--by") === "string" ? flags.get("--by") : "provider";
-  if (!["provider", "model", "day", "project", "agent"].includes(groupBy))
+  const sinceMs = sinceMsOf(flags);
+  const groupBy = stringFlag(flags, "--by") ?? "provider";
+  if (!GROUP_BYS.includes(groupBy))
     fail(`invalid --by: ${groupBy}`);
   const withPct = flags.has("--pct");
   if (withPct && groupBy !== "provider")
     fail("--pct only supported with --by provider");
   const snapshot = await getUsageSnapshot(sinceMs, groupBy, withPct);
   if (json) {
-    const out = {
+    console.log(JSON.stringify({
       since: new Date(sinceMs).toISOString(),
       groupBy,
       rows: snapshot.rows,
       totals: snapshot.totals,
       pct: snapshot.pct
-    };
-    console.log(JSON.stringify(out, null, 2));
-  } else {
-    const label = flags.has("--today") ? "today" : flags.get("--since") ?? "7d";
-    console.log(usageTable(snapshot.rows, snapshot.totals, label, groupBy, snapshot.pct ? new Map(Object.entries(snapshot.pct)) : undefined));
+    }, null, 2));
+    return;
   }
+  const label = flags.has("--today") ? "today" : stringFlag(flags, "--since") ?? "7d";
+  const pct = snapshot.pct ? new Map(Object.entries(snapshot.pct)) : undefined;
+  console.log(usageTable(snapshot.rows, snapshot.totals, label, groupBy, pct));
 }
 async function cmdProviders(flags, json) {
   const statuses = await providerStatuses({ noNet: flags.has("--no-net") });
   const db = openDb();
   try {
     const local = localUsageByProvider(db, Date.now() - parseDuration("7d"));
-    if (json) {
+    if (json)
       console.log(JSON.stringify({ statuses, local: Object.fromEntries(local) }, null, 2));
-    } else {
+    else
       console.log(providersTable(statuses, local));
-    }
   } finally {
     db.close();
   }
 }
+var TOP_HEADERS = ["MODEL", "NAME", "IQ", "CODING", "$/M", "IQ/$"];
+var TOP_WIDTHS = [28, 26, 5, 7, 8, 6];
+function topLine(cells) {
+  return cells.map((c, i) => c.length >= TOP_WIDTHS[i] ? c.slice(0, TOP_WIDTHS[i]) : c.padEnd(TOP_WIDTHS[i])).join("  ");
+}
 async function cmdTop(flags, json) {
-  const limit = typeof flags.get("--limit") === "string" ? Number(flags.get("--limit")) : 20;
+  const raw = stringFlag(flags, "--limit");
+  const limit = raw !== undefined ? Number(raw) : 20;
+  if (!Number.isFinite(limit) || limit <= 0)
+    fail(`invalid --limit: ${raw}`);
   const rows = await buildTop(limit);
   if (json) {
     console.log(JSON.stringify({ attribution: RANKING_ATTRIBUTION, models: rows }, null, 2));
     return;
   }
-  const head = ["MODEL", "NAME", "IQ", "CODING", "$/M", "IQ/$"];
-  const widths = [28, 26, 5, 7, 8, 6];
-  const line = (cells) => cells.map((c, i) => c.length >= widths[i] ? c.slice(0, widths[i]) : c + " ".repeat(widths[i] - c.length)).join("  ");
-  console.log(line(head));
-  console.log(widths.map((w) => "-".repeat(w)).join("  "));
+  console.log(topLine(TOP_HEADERS));
+  console.log(TOP_WIDTHS.map((w) => "-".repeat(w)).join("  "));
   for (const r of rows) {
-    console.log(line([
+    console.log(topLine([
       r.model,
       r.name,
       r.intelligence !== undefined ? r.intelligence.toFixed(0) : "\u2014",
@@ -894,21 +905,28 @@ async function cmdTop(flags, json) {
   console.log(`
 ${RANKING_ATTRIBUTION}`);
 }
-if (import.meta.main) {
-  const { cmd, flags } = parseArgs(process.argv.slice(2));
+async function run(argv) {
+  const { cmd, flags } = parseArgs(argv);
   const json = flags.has("--json");
-  try {
-    if (cmd === "usage")
-      await cmdUsage(flags, json);
-    else if (cmd === "providers")
-      await cmdProviders(flags, json);
-    else if (cmd === "top")
-      await cmdTop(flags, json);
-    else
-      fail(`unknown command: ${cmd}
+  if (cmd === "usage")
+    await cmdUsage(flags, json);
+  else if (cmd === "providers")
+    await cmdProviders(flags, json);
+  else if (cmd === "top")
+    await cmdTop(flags, json);
+  else
+    fail(`unknown command: ${cmd}
 
 ${USAGE}`);
+}
+
+// packages/cli/src/cli.ts
+if (import.meta.main) {
+  try {
+    await run(process.argv.slice(2));
   } catch (err) {
-    fail(err.message);
+    console.error(`opencode-usage: ${err.message}
+`);
+    process.exit(1);
   }
 }

package/dist/tui.js

@@ -51,7 +51,7 @@ var CREATED = "CAST(json_extract(data,'$.time.created') AS INTEGER)";
 var GROUPS = {
   provider: "json_extract(data,'$.providerID')",
   model: "json_extract(data,'$.providerID') || '/' || json_extract(data,'$.modelID')",
-  day: "strftime('%Y-%m-%d', (${" + CREATED + "})/1000, 'unixepoch')",
+  day: `strftime('%Y-%m-%d', (${CREATED})/1000, 'unixepoch')`,
   project: "json_extract(data,'$.path.cwd')",
   agent: "json_extract(data,'$.agent')"
 };
@@ -102,16 +102,25 @@ function usageTotals(db, sinceMs) {
     tokensOutput: Number(r?.tokensOutput ?? 0)
   };
 }
-function monthlyUsageByProvider(db, startOfMonthMs) {
+function localUsageByProvider(db, sinceMs) {
   const rows = db.query(`SELECT COALESCE(json_extract(data,'$.providerID'),'?') AS provider,
-              COALESCE(SUM(CAST(json_extract(data,'$.cost') AS REAL)),0) AS cost
+              COUNT(*) AS messages,
+              COALESCE(SUM(${COST}),0) AS cost,
+              COALESCE(SUM(${T_IN} + ${T_OUT}),0) AS tokens,
+              MAX(${CREATED}) AS lastUsedMs
        FROM message
        WHERE json_extract(data,'$.role')='assistant'
-         AND CAST(json_extract(data,'$.time.created') AS INTEGER) >= ?
-       GROUP BY provider`).all(startOfMonthMs);
+         AND ${CREATED} >= ?
+       GROUP BY provider`).all(sinceMs);
   const map = new Map;
   for (const r of rows) {
-    map.set(String(r.provider), Number(r.cost));
+    map.set(String(r.provider), {
+      provider: String(r.provider),
+      messages: Number(r.messages),
+      cost: Number(r.cost),
+      tokens: Number(r.tokens),
+      lastUsedMs: Number(r.lastUsedMs)
+    });
   }
   return map;
 }
@@ -201,6 +210,8 @@ async function fetchOpenRouter(key) {
 
 // packages/core/src/quota/copilot.ts
 function premiumBudget(s) {
+  if (!s)
+    return;
   if (s.unlimited && s.entitlement === 0)
     return;
   const remaining = s.remaining ?? s.quota_remaining;
@@ -343,135 +354,130 @@ async function providerStatuses(opts) {
 var TTL_MS2 = 24 * 60 * 60 * 1000;
 // packages/core/src/budget.ts
 import { readFile as readFile3 } from "fs/promises";
-async function readBudgets() {
-  try {
-    return JSON.parse(await readFile3(budgetsPath(), "utf8"));
-  } catch {
-    return {};
-  }
-}
-function pctFromLimit(provider, limit, usageTokens, usageRequests, isMonthly) {
-  if (limit.limit <= 0)
-    return;
-  const effectiveLimit = limit.metric.endsWith("/day") && limit.metric !== "neurons/day" ? limit.limit * 30 : limit.limit;
-  const metric = limit.metric.replace("/day", "").replace("/month", "");
-  switch (metric) {
-    case "tokens":
-      if (effectiveLimit > 0)
-        return usageTokens / effectiveLimit * 100;
-      return;
-    case "requests":
-      if (effectiveLimit > 0)
-        return usageRequests / effectiveLimit * 100;
-      return;
-    case "credits":
-    case "neurons":
-      return;
-    default:
-      return;
-  }
-}
-function resolvePct(provider, live, budgets, monthCost, usageTokens, usageRequests, limits) {
-  const liveQ = live.get(provider);
-  if (liveQ?.budget && liveQ.ok) {
-    return { pct: liveQ.budget.percentUsed, source: "live", label: liveQ.budget.label };
-  }
-  if (budgets[provider] !== undefined) {
-    const budget = budgets[provider];
-    if (budget <= 0)
-      return { pct: 0, source: "budgets" };
-    return { pct: monthCost / budget * 100, source: "budgets" };
-  }
-  const limit = limits.get(provider);
-  if (limit) {
-    const pct = pctFromLimit(provider, limit, usageTokens, usageRequests, true);
-    if (pct !== undefined) {
-      return { pct, source: "limits", label: `${limit.limit.toLocaleString()} ${limit.unit}/${limit.metric.split("/")[1]}` };
-    }
-  }
-  return { pct: 0, source: "none" };
-}
+
 // packages/core/src/limits.ts
 var PROVIDER_LIMITS = [
   {
-    provider: "groq",
-    metric: "tokens/day",
-    limit: 200000,
+    provider: "cerebras",
     unit: "tokens",
+    period: "day",
+    limit: 1e6,
     tier: "free",
-    source: "https://console.groq.com/docs/rate-limits",
-    note: "Also 30k tokens/minute. Paid tiers higher."
-  },
-  {
-    provider: "google",
-    metric: "requests/day",
-    limit: 1500,
-    unit: "requests",
-    tier: "free",
-    source: "https://ai.google.dev/gemini-api/docs/rate-limits",
-    note: "Free tier: 1500 RPM, 1500 RPD. Paid tiers higher."
+    source: "https://cerebras.ai/",
+    note: "Free tier estimate. Paid tiers much higher."
   },
   {
     provider: "cloudflare-workers-ai",
-    metric: "neurons/day",
-    limit: 1e5,
     unit: "neurons",
+    period: "day",
+    limit: 1e5,
     tier: "free",
     source: "https://developers.cloudflare.com/workers-ai/platform/limits/",
-    note: "100k neurons/day free. Workers AI paid plans higher."
-  },
-  {
-    provider: "nvidia",
-    metric: "credits/month",
-    limit: 1000,
-    unit: "credits",
-    tier: "free",
-    source: "https://build.nvidia.com/",
-    note: "NIM free tier ~1000 credits/month. Varies by model."
+    note: "A neuron is Cloudflare's own unit, per model. Not measurable from tokens."
   },
   {
     provider: "digitalocean",
-    metric: "tokens/day",
-    limit: 5000000,
     unit: "tokens",
+    period: "day",
+    limit: 5000000,
     tier: "paid",
     source: "https://docs.digitalocean.com/products/genai/",
     note: "GenAI platform paid plans. Exact limits per model."
   },
   {
-    provider: "snowflake-cortex",
-    metric: "credits/month",
-    limit: 100,
-    unit: "credits",
-    tier: "paid",
-    source: "https://docs.snowflake.com/en/user-guide/snowflake-cortex",
-    note: "Cortex functions consume credits. Budget per warehouse."
+    provider: "google",
+    unit: "requests",
+    period: "day",
+    limit: 1500,
+    tier: "free",
+    source: "https://ai.google.dev/gemini-api/docs/rate-limits",
+    note: "Free tier: 1500 RPM, 1500 RPD. Paid tiers higher."
   },
   {
-    provider: "cerebras",
-    metric: "tokens/day",
-    limit: 1e6,
+    provider: "groq",
     unit: "tokens",
+    period: "day",
+    limit: 200000,
     tier: "free",
-    source: "https://cerebras.ai/",
-    note: "Free tier estimate. Paid tiers much higher."
+    source: "https://console.groq.com/docs/rate-limits",
+    note: "Also 30k tokens/minute. Paid tiers higher."
+  },
+  {
+    provider: "nvidia",
+    unit: "credits",
+    period: "month",
+    limit: 1000,
+    tier: "free",
+    source: "https://build.nvidia.com/",
+    note: "NIM free tier ~1000 credits/month. A credit varies by model."
   },
   {
     provider: "orcarouter",
-    metric: "tokens/day",
-    limit: 0,
     unit: "tokens",
+    period: "day",
+    limit: 0,
     tier: "unknown",
     source: "unknown",
     note: "Proxy service. No public limits documented."
+  },
+  {
+    provider: "snowflake-cortex",
+    unit: "credits",
+    period: "month",
+    limit: 100,
+    tier: "paid",
+    source: "https://docs.snowflake.com/en/user-guide/snowflake-cortex",
+    note: "Credits follow warehouse time, not tokens. Not measurable from usage."
   }
 ];
+var MEASURED_UNITS = new Set(["tokens", "requests"]);
+function isMeasurable(limit) {
+  return limit.limit > 0 && MEASURED_UNITS.has(limit.unit);
+}
+function limitLabel(limit) {
+  return `${limit.limit.toLocaleString()} ${limit.unit}/${limit.period}`;
+}
 function limitsAsMap() {
   const m = new Map;
   for (const l of PROVIDER_LIMITS)
     m.set(l.provider, l);
   return m;
 }
+
+// packages/core/src/budget.ts
+async function readBudgets() {
+  try {
+    return JSON.parse(await readFile3(budgetsPath(), "utf8"));
+  } catch {
+    return {};
+  }
+}
+function pctFromLimit(limit, usage) {
+  if (!isMeasurable(limit))
+    return;
+  const period = usage[limit.period];
+  const used = limit.unit === "requests" ? period.requests : period.tokens;
+  return used / limit.limit * 100;
+}
+function resolvePct(provider, sources) {
+  const live = sources.live.get(provider);
+  if (live?.budget && live.ok) {
+    return { pct: live.budget.percentUsed, source: "live", label: live.budget.label };
+  }
+  const budget = sources.budgets[provider];
+  if (budget !== undefined) {
+    if (budget <= 0)
+      return { pct: 0, source: "budgets" };
+    return { pct: sources.monthCost / budget * 100, source: "budgets" };
+  }
+  const limit = sources.limits.get(provider);
+  if (limit) {
+    const pct = pctFromLimit(limit, sources.usage);
+    if (pct !== undefined)
+      return { pct, source: "limits", label: limitLabel(limit) };
+  }
+  return { pct: 0, source: "none" };
+}
 // packages/core/src/snapshot.ts
 async function withConnectedProviders(rows) {
   let connected;
@@ -498,42 +504,57 @@ async function withConnectedProviders(rows) {
   }));
   return [...rows, ...idle].sort((a, b) => b.cost - a.cost || b.messages - a.messages || a.provider.localeCompare(b.provider));
 }
+function periodUsage(usage, provider) {
+  const local = usage.get(provider);
+  return { tokens: local?.tokens ?? 0, requests: local?.messages ?? 0 };
+}
+async function resolvePctByProvider(rows, day, month) {
+  const budgets = await readBudgets();
+  const live = new Map;
+  for (const status of await providerStatuses({ noNet: false })) {
+    if (status.quota)
+      live.set(status.provider, status.quota);
+  }
+  const limits = limitsAsMap();
+  const pct = {};
+  for (const row of rows) {
+    const resolved = resolvePct(row.provider, {
+      live,
+      budgets,
+      monthCost: month.get(row.provider)?.cost ?? 0,
+      usage: { day: periodUsage(day, row.provider), month: periodUsage(month, row.provider) },
+      limits
+    });
+    if (resolved.pct > 0 || resolved.source !== "none")
+      pct[row.provider] = resolved;
+  }
+  return pct;
+}
 async function getUsageSnapshot(sinceMs, groupBy, includePct) {
   const db = openDb();
   try {
-    const rows = groupBy === "provider" ? await withConnectedProviders(usageSince(db, sinceMs, groupBy)) : usageSince(db, sinceMs, groupBy);
+    const grouped = usageSince(db, sinceMs, groupBy);
+    const rows = groupBy === "provider" ? await withConnectedProviders(grouped) : grouped;
     const totals = usageTotals(db, sinceMs);
-    let pct;
-    if (includePct) {
-      const budgets = await readBudgets();
-      const live = await providerStatuses({ noNet: false });
-      const liveMap = new Map;
-      for (const s of live) {
-        if (s.quota)
-          liveMap.set(s.provider, s.quota);
-      }
-      const monthCosts = monthlyUsageByProvider(db, startOfMonthMs());
-      const limits = limitsAsMap();
-      const pctMap = new Map;
-      for (const r of rows) {
-        const p = resolvePct(r.provider, liveMap, budgets, monthCosts.get(r.provider) ?? 0, r.tokensInput + r.tokensOutput, r.messages, limits);
-        if (p.pct > 0 || p.source !== "none")
-          pctMap.set(r.provider, p);
-      }
-      pct = pctMap;
-    }
-    return { rows, totals, pct: pct ? Object.fromEntries(pct) : undefined };
+    if (!includePct)
+      return { rows, totals };
+    const day = localUsageByProvider(db, startOfDayMs());
+    const month = localUsageByProvider(db, startOfMonthMs());
+    return { rows, totals, pct: await resolvePctByProvider(rows, day, month) };
   } finally {
     db.close();
   }
 }
-// packages/plugin/tui.tsx
-import { jsx, jsxs } from "@opentui/solid/jsx-runtime";
-var COMMAND = "opencode-usage.show";
+// packages/plugin/layout.ts
 var SIZE_WIDTH = { medium: 60, large: 88, xlarge: 116 };
 var PADDING = 1;
+var WIDE_BAR = 12;
+var COMPACT_BAR = 6;
+var BUDGET_FIXED = WIDE_BAR + 6;
+var WIDE_MIN = 80;
+var BUDGET_MIN = 14;
 function columnsFor(inner) {
-  const wide = inner >= 80;
+  const wide = inner >= WIDE_MIN;
   const base = wide ? [
     { title: "PROVIDER", width: 21, align: "left" },
     { title: "MSGS", width: 5, align: "right" },
@@ -548,7 +569,7 @@ function columnsFor(inner) {
     { title: "COST", width: 8, align: "right" }
   ];
   const used = base.reduce((a, c) => a + c.width, 0) + base.length;
-  const budget = Math.max(14, inner - used);
+  const budget = Math.max(BUDGET_MIN, inner - used);
   return { cols: [...base, { title: "BUDGET", width: budget, align: "left" }], bar: wide ? WIDE_BAR : COMPACT_BAR };
 }
 function fmtTokens(n) {
@@ -569,9 +590,6 @@ function progressBar(pct, width) {
   const filled = Math.round(Math.min(Math.max(pct, 0), 100) / 100 * width);
   return "\u2588".repeat(filled) + "\u2591".repeat(width - filled);
 }
-var WIDE_BAR = 12;
-var COMPACT_BAR = 6;
-var BUDGET_FIXED = WIDE_BAR + 6;
 function compactLabel(label) {
   return label.replace(/\b\d[\d,]*\b/g, (n) => {
     const v = Number(n.replace(/,/g, ""));
@@ -601,6 +619,13 @@ function windowSuffix(label) {
     return "h";
   return "";
 }
+function budgetTail(pct, label, colWidth, bar) {
+  const head = ` ${pct.toFixed(0).padStart(3)}% `;
+  const room = colWidth - bar - head.length;
+  const compact = compactLabel(label);
+  const text = compact.length <= room ? compact : windowSuffix(label);
+  return (head + text).slice(0, colWidth - bar);
+}
 function toHex(color, fallback) {
   if (typeof color === "string")
     return color;
@@ -611,22 +636,12 @@ function toHex(color, fallback) {
   const hex = (v) => Math.round(Math.min(Math.max(v * scale, 0), 255)).toString(16).padStart(2, "0");
   return `#${hex(c.r)}${hex(c.g)}${hex(c.b)}`;
 }
-function palette(api) {
-  const t = api.theme?.current;
-  return {
-    accent: toHex(t?.primary, "#a277ff"),
-    text: toHex(t?.text, "#e5e5e5"),
-    muted: toHex(t?.textMuted, "#8a8a8a"),
-    subtle: toHex(t?.borderSubtle, "#4a4a4a"),
-    ok: toHex(t?.success, "#4ade80"),
-    warn: toHex(t?.warning, "#facc15"),
-    danger: toHex(t?.error, "#f87171")
-  };
-}
+var DANGER_PCT = 90;
+var WARN_PCT = 70;
 function barColor(pct, p) {
-  if (pct >= 90)
+  if (pct >= DANGER_PCT)
     return p.danger;
-  if (pct >= 70)
+  if (pct >= WARN_PCT)
     return p.warn;
   return p.ok;
 }
@@ -645,6 +660,23 @@ function widthNeeded(longestLabel) {
   const base = cols.slice(0, -1).reduce((a, c) => a + c.width, 0) + cols.length - 1;
   return base + BUDGET_FIXED + longestLabel;
 }
+
+// packages/plugin/tui.tsx
+import { jsx, jsxs } from "@opentui/solid/jsx-runtime";
+var COMMAND = "opencode-usage.show";
+var MAX_ROWS = 20;
+function palette(api) {
+  const t = api.theme?.current;
+  return {
+    accent: toHex(t?.primary, "#a277ff"),
+    text: toHex(t?.text, "#e5e5e5"),
+    muted: toHex(t?.textMuted, "#8a8a8a"),
+    subtle: toHex(t?.borderSubtle, "#4a4a4a"),
+    ok: toHex(t?.success, "#4ade80"),
+    warn: toHex(t?.warning, "#facc15"),
+    danger: toHex(t?.error, "#f87171")
+  };
+}
 function terminalWidth(api) {
   return api.renderer?.width ?? SIZE_WIDTH.medium;
 }
@@ -652,6 +684,10 @@ function innerWidth(api, needed) {
   const terminal = terminalWidth(api);
   return Math.min(SIZE_WIDTH[chooseSize(terminal, needed)], terminal - 2) - PADDING * 2;
 }
+function neededWidth(snapshot) {
+  const labels = Object.values(snapshot.pct ?? {}).map((b) => compactLabel(b.label ?? b.source).length);
+  return widthNeeded(Math.max(0, ...labels));
+}
 function Frame(props) {
   props.api.ui.dialog.setSize(chooseSize(terminalWidth(props.api), props.needed));
   return /* @__PURE__ */ jsxs("box", {
@@ -680,13 +716,6 @@ function Frame(props) {
   });
 }
 function Budget(props) {
-  const tail = () => {
-    const head = ` ${props.pct.toFixed(0).padStart(3)}% `;
-    const room = props.col.width - props.bar - head.length;
-    const compact = compactLabel(props.label);
-    const label = compact.length <= room ? compact : windowSuffix(props.label);
-    return (head + label).slice(0, props.col.width - props.bar);
-  };
   return /* @__PURE__ */ jsxs("box", {
     flexDirection: "row",
     children: [
@@ -698,22 +727,25 @@ function Budget(props) {
       /* @__PURE__ */ jsx("text", {
         fg: props.palette.muted,
         wrapMode: "none",
-        children: tail()
+        children: budgetTail(props.pct, props.label, props.col.width, props.bar)
       })
     ]
   });
 }
-function Table(props) {
-  const p = palette(props.api);
-  const needed = widthNeeded(Math.max(0, ...Object.values(props.snapshot.pct ?? {}).map((b) => compactLabel(b.label ?? b.source).length)));
-  const layout = () => columnsFor(innerWidth(props.api, needed));
-  const lead = (cols, r) => row(cols, [
+function leadCells(cols, r) {
+  const upToBudget = cols.slice(0, -1).reduce((a, c) => a + c.width, 0) + cols.length - 2;
+  return row(cols, [
     r.provider,
     String(r.messages),
     fmtTokens(r.tokensInput),
     fmtTokens(r.tokensOutput),
     `$${r.cost.toFixed(2)}`
-  ]).trimEnd().padEnd(cols.slice(0, -1).reduce((a, c) => a + c.width, 0) + cols.length - 2) + " ";
+  ]).trimEnd().padEnd(upToBudget) + " ";
+}
+function Table(props) {
+  const p = palette(props.api);
+  const needed = neededWidth(props.snapshot);
+  const layout = () => columnsFor(innerWidth(props.api, needed));
   return /* @__PURE__ */ jsxs(Frame, {
     api: props.api,
     palette: p,
@@ -724,7 +756,7 @@ function Table(props) {
         wrapMode: "none",
         children: row(layout().cols, layout().cols.map((c) => c.title))
       }),
-      props.snapshot.rows.slice(0, 20).map((r) => {
+      props.snapshot.rows.slice(0, MAX_ROWS).map((r) => {
         const budget = props.snapshot.pct?.[r.provider];
         return /* @__PURE__ */ jsxs("box", {
           flexDirection: "row",
@@ -732,7 +764,7 @@ function Table(props) {
             /* @__PURE__ */ jsx("text", {
               fg: r.messages > 0 ? p.text : p.muted,
               wrapMode: "none",
-              children: lead(layout().cols, r)
+              children: leadCells(layout().cols, r)
             }),
             budget ? /* @__PURE__ */ jsx(Budget, {
               pct: budget.pct,
@@ -829,5 +861,10 @@ export {
   Message,
   Table,
   tui_default as default,
+  innerWidth,
+  neededWidth,
+  palette,
+  show,
+  terminalWidth,
   tui
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1930dev/opencode-usage",
-  "version": "0.1.5",
+  "version": "0.2.0",
   "description": "Usage tracking, budget percentages and model ranking for opencode \u2014 CLI plus a /usage TUI plugin",
   "type": "module",
   "bin": {
@@ -11,7 +11,8 @@
     "typecheck": "tsc --noEmit",
     "build": "bun scripts/build.ts",
     "preview": "bun run build && bun packages/plugin/preview.ts",
-    "prepublishOnly": "bun run build && bun test && tsc --noEmit"
+    "prepublishOnly": "bun run build && bun test --coverage && tsc --noEmit",
+    "coverage": "bun test --coverage"
   },
   "repository": {
     "type": "git",