opencode-usage-report 0.4.0 → 0.5.0

package/src/providers/opencode-go.ts

@@ -10,9 +10,8 @@ import type {
 import { AdapterError } from "../types";
 import { toISODate, toNumber } from "../normalize";
 import { redact } from "../auth";
+import { asRecord, handleError, readBody, request } from "./http";
 
-const VERSION = "0.3.0";
-const USER_AGENT = "opencode-usage-report/" + VERSION;
 const ENDPOINT = "https://opencode.ai/zen/go/v1/usage";
 
 /** Additive options: `sessionId` is optional, so the adapter still satisfies `ProviderAdapter`. */
@@ -28,12 +27,6 @@ function mapStatus(v: unknown): WindowStatus {
   return v === "ok" || v === "rate-limited" ? v : "unknown";
 }
 
-function asRecord(v: unknown): Record<string, unknown> | null {
-  return v !== null && typeof v === "object" && !Array.isArray(v)
-    ? (v as Record<string, unknown>)
-    : null;
-}
-
 function buildWindow(kind: WindowKind, label: string, src: unknown): UsageWindow | null {
   const record = asRecord(src);
   if (!record) return null;
@@ -49,91 +42,42 @@ function buildWindow(kind: WindowKind, label: string, src: unknown): UsageWindow
   };
 }
 
-/** Reads the body once as text and best-effort parses JSON, so error and success paths share it. */
-async function readBody(res: Response): Promise<{ text: string; json: unknown }> {
-  const text = await res.text().catch(() => "");
-  let json: unknown = null;
-  try {
-    json = JSON.parse(text);
-  } catch {
-    json = null;
-  }
-  return { text, json };
-}
-
-async function attempt(cred: Credential, opts: OpenCodeGoFetchOptions): Promise<Response> {
-  return fetch(ENDPOINT, {
-    method: "GET",
-    headers: {
-      Authorization: "Bearer " + cred.key,
-      Accept: "application/json",
-      "User-Agent": USER_AGENT,
-      "x-opencode-session": opts.sessionId ?? "unknown",
-    },
-    signal: AbortSignal.timeout(opts.timeoutMs),
-  });
-}
-
-/** Exactly one retry on a network throw or 5xx; 4xx is returned immediately (never retried). */
-async function request(cred: Credential, opts: OpenCodeGoFetchOptions): Promise<Response> {
-  try {
-    const first = await attempt(cred, opts);
-    if (first.status < 500) return first;
-  } catch {
-    // fall through to the single retry
-  }
-
-  try {
-    return await attempt(cred, opts);
-  } catch (err) {
-    throw new AdapterError(
-      "network",
-      redact(
-        `OpenCode Go request failed: ${err instanceof Error ? err.message : String(err)}`,
-        cred.key,
-      ),
-    );
-  }
-}
-
-async function handleError(res: Response, cred: Credential): Promise<never> {
-  const { text, json } = await readBody(res);
-
-  if (res.status === 401) {
-    throw new AdapterError("auth", redact("invalid OpenCode Go API key", cred.key));
-  }
-  if (res.status === 403) {
-    const record = asRecord(json);
-    const error = record ? asRecord(record.error) : null;
-    if (error && error.type === "EntitlementError") {
-      throw new AdapterError(
-        "no-plan",
-        redact("OpenCode Go subscription not active on this key", cred.key),
-      );
-    }
-    throw new AdapterError(
-      "network",
-      redact("OpenCode Go request blocked (check User-Agent)", cred.key),
-    );
-  }
-  if (res.status === 429) {
-    throw new AdapterError("rate-limited", redact("OpenCode Go rate limit reached", cred.key));
-  }
-  if (res.status >= 500) {
-    throw new AdapterError("network", redact(`OpenCode Go server error ${res.status}`, cred.key));
-  }
-  throw new AdapterError(
-    "bad-response",
-    redact(`OpenCode Go unexpected status ${res.status}: ${text.slice(0, 200)}`, cred.key),
-  );
-}
-
 export const opencodeGoAdapter: ProviderAdapter = {
   id: "opencode-go",
   displayName: "OpenCode Go",
   async fetch(cred: Credential, opts: OpenCodeGoFetchOptions): Promise<AdapterResult> {
-    const res = await request(cred, opts);
-    if (!res.ok) return handleError(res, cred);
+    const res = await request(cred, opts, {
+      endpoint: ENDPOINT,
+      label: "OpenCode Go request failed",
+      headers: { "x-opencode-session": opts.sessionId ?? "unknown" },
+    });
+
+    if (!res.ok) {
+      return handleError(res, cred, (status, { text, json }) => {
+        if (status === 401) return { kind: "auth", message: "invalid OpenCode Go API key" };
+        if (status === 403) {
+          const record = asRecord(json);
+          const error = record ? asRecord(record.error) : null;
+          if (error && error.type === "EntitlementError") {
+            return {
+              kind: "no-plan",
+              message: "OpenCode Go subscription not active on this key",
+            };
+          }
+          return { kind: "network", message: "OpenCode Go request blocked (check User-Agent)" };
+        }
+        if (status === 429) {
+          return { kind: "rate-limited", message: "OpenCode Go rate limit reached" };
+        }
+        if (status >= 500) {
+          return { kind: "network", message: `OpenCode Go server error ${status}` };
+        }
+        return {
+          kind: "bad-response",
+          message: `OpenCode Go unexpected status ${status}: ${text.slice(0, 200)}`,
+        };
+      });
+    }
 
     const { json } = await readBody(res);
     const body = asRecord(json);

package/src/quota-lines.ts

@@ -6,7 +6,7 @@
  */
 import type { TuiPluginApi } from "@opencode-ai/plugin/tui";
 import type { ProviderReport, WindowKind } from "./types";
-import { bar, countdown, percentText, toneFor, windowLabel } from "./tui-format";
+import { bar, clip, countdown, padLabel, percentText, toneFor, windowLabel } from "./tui-format";
 
 type Theme = TuiPluginApi["theme"]["current"];
 type ThemeColor = Theme["text"];
@@ -25,7 +25,7 @@ export const NAMED_WIDTH = 14;
 export const EXTRAS_MAX_LENGTH = 80;
 
 /** Order windows for display; unknown kinds sort last. */
-export const WINDOW_ORDER: Record<WindowKind, number> = {
+const WINDOW_ORDER: Record<WindowKind, number> = {
   "5h": 0,
   weekly: 1,
   monthly: 2,
@@ -33,23 +33,6 @@ export const WINDOW_ORDER: Record<WindowKind, number> = {
   other: 4,
 };
 
-export function windowRank(kind: WindowKind): number {
-  return WINDOW_ORDER[kind] ?? WINDOW_ORDER.other;
-}
-
-/** Collapses whitespace and truncates to a single-line label. */
-export function clip(value: string, max = 60): string {
-  const single = value.replace(/\s+/g, " ").trim();
-  if (single.length <= max) return single;
-  return single.slice(0, Math.max(0, max - 1)) + "…";
-}
-
-/** Pads a label to a fixed width, truncating (with a trailing space) when long. */
-export function alignLabel(label: string): string {
-  const text = label.length > NAMED_WIDTH ? label.slice(0, NAMED_WIDTH - 1) + " " : label;
-  return text.padEnd(NAMED_WIDTH);
-}
-
 /** Flattens provider reports into plain, pre-colored text lines. */
 export function buildLines(
   theme: Theme,
@@ -89,11 +72,11 @@ export function buildLines(
       continue;
     }
 
-    const windows = report.windows.toSorted((a, b) => windowRank(a.kind) - windowRank(b.kind));
+    const windows = report.windows.toSorted((a, b) => WINDOW_ORDER[a.kind] - WINDOW_ORDER[b.kind]);
     for (const w of windows) {
       const tone = toneFor(w.usedPercent, w.status);
       const row: Segment[] = [
-        { text: alignLabel(windowLabel(w.kind, w.label)), fg: theme.textMuted },
+        { text: padLabel(windowLabel(w.kind, w.label), NAMED_WIDTH), fg: theme.textMuted },
         { text: bar(w.usedPercent, barWidth), fg: theme[tone] },
         { text: " ", fg: theme.text },
         { text: percentText(w), fg: theme.text },

package/src/render.ts

@@ -1,39 +1,36 @@
 import type { ProviderReport, UsageWindow } from "./types";
-
-const WEEKDAYS = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
-const MONTHS = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+import { formatAge } from "./tui-format";
 
 const DAY_MS = 24 * 60 * 60 * 1000;
 const LABEL_WIDTH = 8;
 const PERCENT_WIDTH = 10;
 const ABSOLUTES_WIDTH = 24;
 
+const RESET_DATE = new Intl.DateTimeFormat("en-US", {
+  weekday: "short",
+  month: "short",
+  day: "numeric",
+});
+
 function formatNumber(n: number): string {
   return n.toLocaleString("en-US");
 }
 
-/** "14:05" for a same-day reset, "Wed Sep 16" otherwise. */
+/** "14:05" for a same-day reset, "Wed, Sep 16" otherwise. */
 export function formatReset(resetsAt: string, now: Date): string | null {
   const d = new Date(resetsAt);
   if (Number.isNaN(d.getTime())) return null;
   const within24h = Math.abs(d.getTime() - now.getTime()) < DAY_MS;
   if (within24h) {
-    return `${String(d.getHours()).padStart(2, "0")}:${String(d.getMinutes()).padStart(2, "0")}`;
+    return d.toLocaleTimeString("en-US", { hour: "2-digit", minute: "2-digit", hour12: false });
   }
-  return `${WEEKDAYS[d.getDay()]} ${MONTHS[d.getMonth()]} ${d.getDate()}`;
-}
-
-function formatAge(fetchedAt: string, now: Date): string {
-  const then = new Date(fetchedAt).getTime();
-  const minutes = Number.isNaN(then) ? 0 : Math.max(0, Math.floor((now.getTime() - then) / 60000));
-  if (minutes < 60) return `${minutes}m`;
-  return `${Math.floor(minutes / 60)}h`;
+  return RESET_DATE.format(d);
 }
 
 function header(report: ProviderReport, now: Date): string {
   const parts: string[] = [report.source];
   if (report.stale) {
-    parts.push(`stale ${formatAge(report.fetchedAt, now)} old`);
+    parts.push(`stale ${formatAge(report.fetchedAt, now) ?? "0m"} old`);
   }
   return `${report.displayName} (${parts.join(", ")})`;
 }

package/src/tui-format.ts

@@ -13,6 +13,18 @@ export const MIN_REFRESH_INTERVAL_SECONDS = 5;
 export const MAX_REFRESH_INTERVAL_SECONDS = 3600;
 export const DEFAULT_REFRESH_INTERVAL_SECONDS = 60;
 
+/** Collapses whitespace and truncates to a single-line label. */
+export function clip(value: string, max = 60): string {
+  const single = value.replace(/\s+/g, " ").trim();
+  if (single.length <= max) return single;
+  return single.slice(0, Math.max(0, max - 1)) + "…";
+}
+
+/** Pads a label to a fixed width, truncating with an ellipsis when long. */
+export function padLabel(label: string, width: number): string {
+  return clip(label, width).padEnd(width);
+}
+
 /**
  * Renders a fixed-width progress bar. `percent` is clamped to 0-100 and rounded
  * to the nearest filled cell; `null` (or any non-finite value) renders an empty

package/src/tui.tsx

@@ -72,22 +72,19 @@ export const tui: TuiPlugin = async (api, rawOptions) => {
   };
 
   const intervalMs = Math.max(1, Math.floor(options.refreshIntervalSeconds)) * 1000;
-  const timer = setInterval(() => {
+  const refresh = (): void => {
     setTick(Date.now());
     void load();
     void refreshCapture();
-  }, intervalMs);
+  };
+  const timer = setInterval(refresh, intervalMs);
 
   api.lifecycle.onDispose(() => {
     disposed = true;
     clearInterval(timer);
   });
 
-  const offIdle = api.event.on("session.idle", () => {
-    setTick(Date.now());
-    void load();
-    void refreshCapture();
-  });
+  const offIdle = api.event.on("session.idle", refresh);
   api.lifecycle.onDispose(offIdle);
 
   const openDialog = (): void => {