opencode-usage-report 0.6.0 → 0.6.2

package/README.md

@@ -302,6 +302,19 @@ so a failing check blocks the stage.
 
 ## Changelog
 
+- **0.6.2** — OpenCode 2 context panel fixes: the V2 adapter now reads the
+  model id from the store's `model.id`, so the model lookup succeeds and the
+  cell grid, per-category percentages and compaction-headroom line render
+  again instead of `—`; the translated messages also carry the session id, and
+  the system-prompt capture anchors its freshness check to the turn's user
+  message — OpenCode 2 fires the capture hook just before the assistant
+  message is stamped, which previously marked every capture `(derived)`.
+- **0.6.1** — Kimi Code adapter tracks the 2026-09 quota-model API change:
+  usage windows now come from the `usages.limit_5h` / `limit_7d` /
+  `limit_month_total` ratios (with a `limit_month_code` breakdown), and Extra
+  Usage is read from the camelCase `boosterWallet` (fixed-point `BOOSTER`
+  balance). The pre-2026-09 `usage` / `limits[]` / `totalQuota` /
+  `booster_wallet` shapes remain as fallbacks.
 - **0.4.1** — internal: shared provider HTTP plumbing (`src/providers/http.ts`)
   replaces the copy-pasted fetch/retry/error code; context estimates simplified;
   reset times render as `Wed, Sep 16`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-usage-report",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "opencode plugin: /usage command showing subscription quota windows for configured providers",
   "keywords": [
     "kimi",

package/src/context/dialog.tsx

@@ -4,7 +4,7 @@ import type { AssistantMessage, Model } from "@opencode-ai/sdk/v2";
 import { For, Show, createMemo } from "solid-js";
 import { buildContextLines, type ContextTone } from "./format";
 import { collectContext } from "./collect";
-import { captureIsFresh } from "./system";
+import { captureIsFresh, captureSince } from "./system";
 import type { ContextBreakdown, SystemCapture } from "./types";
 import { buildLines } from "../quota-lines";
 import type { ProviderReport } from "../types";
@@ -98,7 +98,7 @@ export function UsageDialog(props: UsageDialogProps) {
       sessionID: last.sessionID,
       providerID: last.providerID,
       modelID: last.modelID,
-      since: last.time?.created ?? 0,
+      since: captureSince(messages(), last),
     });
     return ok ? capture : null;
   });

package/src/context/system.ts

@@ -110,6 +110,42 @@ export function captureIsFresh(
   if (capture.modelID !== ref.modelID) return false;
   const capturedAt = nonNegative(capture.capturedAt);
   const since = nonNegative(ref.since);
-  if (capturedAt === null || since === null) return false;
+  // A zero boundary means the caller had no usable timestamp — treat it as
+  // unusable rather than "anything is fresh" (epoch 0 is never a real turn).
+  if (capturedAt === null || since === null || since === 0) return false;
   return capturedAt >= since;
 }
+
+function messageCreated(value: unknown): number | null {
+  if (!isRecord(value)) return null;
+  const time = isRecord(value.time) ? value.time : {};
+  const created = nonNegative(time.created);
+  return created !== null && created > 0 ? created : null;
+}
+
+/**
+ * The `since` boundary for `captureIsFresh`: the creation time of the user
+ * message that started the turn `reference` belongs to, falling back to the
+ * reference's own creation time. Returns `0` when neither carries a usable
+ * timestamp, which `captureIsFresh` rejects.
+ *
+ * OpenCode 2 assembles the request — firing the system-transform hook — just
+ * before the assistant message row gets its `time.created`, so a capture from
+ * the current turn is a few milliseconds *older* than the message and the old
+ * `capturedAt >= message.created` boundary rejected every fresh capture. The
+ * turn's user message predates request assembly under both OpenCode 1 and 2,
+ * so it is an ordering-stable boundary; a capture written for an earlier turn
+ * still sits before it and is still rejected.
+ */
+export function captureSince(messages: readonly unknown[], reference: unknown): number {
+  const list = Array.isArray(messages) ? messages : [];
+  const index = list.indexOf(reference);
+  const start = index === -1 ? list.length : index;
+  for (let i = start - 1; i >= 0; i--) {
+    const message = list[i];
+    if (!isRecord(message) || message.role !== "user") continue;
+    const created = messageCreated(message);
+    if (created !== null) return created;
+  }
+  return messageCreated(reference) ?? 0;
+}

package/src/providers/kimi.ts

@@ -65,12 +65,17 @@ function findLimitDetail(limits: unknown, durationMinutes: number): unknown {
   return undefined;
 }
 
-function ratioWindow(kind: UsageWindow["kind"], label: string, value: unknown): UsageWindow {
+/** 0-100 percent from a quota entry's `used_ratio`, or null when it is absent/invalid. */
+function ratioPercent(value: unknown): number | null {
   const ratio = toNumber(pick(value, "used_ratio", "usedRatio"));
+  return ratio === null ? null : ratioToPercent(ratio);
+}
+
+function ratioWindow(kind: UsageWindow["kind"], label: string, value: unknown): UsageWindow {
   return {
     kind,
     label,
-    usedPercent: ratio !== null ? ratioToPercent(ratio) : null,
+    usedPercent: ratioPercent(value),
     used: null,
     limit: null,
     remaining: null,
@@ -88,6 +93,64 @@ function detailWindow(kind: UsageWindow["kind"], label: string, detail: unknown)
   });
 }
 
+/**
+ * Booster-wallet amounts are fixed-point integers in micro-cents
+ * (1_000_000 → 1 cent), matching the official kimi-code parser.
+ */
+const FIXED_POINT_CENTS = 1_000_000;
+
+function fixedPointToCents(value: unknown): number | null {
+  const raw = toNumber(value);
+  if (raw === null) return null;
+  const cents = raw / FIXED_POINT_CENTS;
+  if (cents > 0 && cents < 1) return 1;
+  return Math.round(cents);
+}
+
+function formatMoney(cents: number, currency: string): string {
+  return `$${(cents / 100).toFixed(2)} ${currency}`;
+}
+
+/** Currency for the wallet, taken from whichever money field carries one. */
+function walletCurrency(wallet: unknown): string {
+  for (const key of ["monthlyChargeLimit", "monthlyUsed"]) {
+    const currency = pick(pick(wallet, key), "currency");
+    if (typeof currency === "string" && currency !== "") return currency;
+  }
+  return "USD";
+}
+
+/**
+ * Renders the Extra Usage ("booster") wallet into `extras`. The post-2026-09
+ * quota model sends `boosterWallet.balance` as a `BOOSTER` descriptor with
+ * fixed-point micro-cents; the pre-2026-09 wire sent a scalar `booster_wallet.balance`.
+ */
+function parseBoosterWallet(body: unknown, extras: Record<string, string>): void {
+  const wallet = pick(body, "boosterWallet", "booster_wallet");
+  if (wallet === undefined) return;
+
+  const balance = pick(wallet, "balance");
+  const totalCents =
+    pick(balance, "type") === "BOOSTER" ? fixedPointToCents(pick(balance, "amount")) : null;
+  if (totalCents !== null && totalCents > 0) {
+    const left = fixedPointToCents(pick(balance, "amountLeft")) ?? 0;
+    extras["Booster wallet"] = formatMoney(left, walletCurrency(wallet));
+  } else if (typeof balance === "string" || typeof balance === "number") {
+    extras["Booster wallet"] = String(balance);
+  }
+
+  const monthlyUsed = pick(wallet, "monthlyUsed", "monthly_used");
+  const currency = pick(monthlyUsed, "currency");
+  const priceInCents = toNumber(pick(monthlyUsed, "priceInCents", "price_in_cents"));
+  if (
+    (typeof currency === "string" || typeof currency === "number") &&
+    String(currency) !== "" &&
+    priceInCents !== null
+  ) {
+    extras["Booster used this month"] = formatMoney(priceInCents, String(currency));
+  }
+}
+
 function parse(body: Record<string, unknown>, cred: Credential): AdapterResult {
   const windows: UsageWindow[] = [];
   const extras: Record<string, string> = {};
@@ -96,9 +159,9 @@ function parse(body: Record<string, unknown>, cred: Credential): AdapterResult {
   const usage = pick(body, "usage");
   const limits = pick(body, "limits");
 
-  // Count-based windows are authoritative; the `usages.limit_5h/limit_7d`
-  // ratios are legacy fields the live API returns as stale zeros even while
-  // real usage accrues, so they are only a fallback when counts are missing.
+  // Count-based windows are authoritative when present; the `usages.limit_*`
+  // ratios are the primary wire on the post-2026-09 quota model, where the
+  // absolute `usage`/`limits[]` rows were removed.
   const detail5h = findLimitDetail(limits, 300);
   if (detail5h !== undefined) {
     windows.push(detailWindow("5h", "5-hour", detail5h));
@@ -114,43 +177,36 @@ function parse(body: Record<string, unknown>, cred: Credential): AdapterResult {
     if (limit7d !== undefined) windows.push(ratioWindow("weekly", "Weekly", limit7d));
   }
 
+  // The monthly total joined the quota model; `totalQuota` is the legacy shape.
+  // `limit_month_code` is the code-typed share the official client shows as a
+  // breakdown under the monthly row.
+  const monthTotal = pick(usages, "limit_month_total");
+  if (monthTotal !== undefined) {
+    windows.push(ratioWindow("monthly", "Monthly", monthTotal));
+    const codePercent = ratioPercent(pick(usages, "limit_month_code"));
+    if (codePercent !== null) extras["Monthly code"] = `${codePercent}%`;
+  } else {
+    const totalQuota = pick(body, "totalQuota", "total_quota");
+    const quotaUsed = toNumber(pick(totalQuota, "used"));
+    if (totalQuota !== undefined && quotaUsed !== null && quotaUsed > 0) {
+      windows.push({
+        kind: "monthly",
+        label: "Monthly",
+        usedPercent: null,
+        used: quotaUsed,
+        limit: toNumber(pick(totalQuota, "limit")),
+        remaining: toNumber(pick(totalQuota, "remaining")),
+        resetsAt: toISODate(pick(totalQuota, "resetTime", "reset_time", "resetAt", "resetsAt")),
+        status: "frozen",
+      });
+    }
+  }
+
   const level = pick(pick(body, "user"), "membership");
   const membershipLevel = pick(level, "level");
   if (membershipLevel !== undefined) extras["Plan"] = String(membershipLevel);
 
-  const wallet = pick(body, "booster_wallet");
-
-  // `balance` is a wallet descriptor object on the live API; only render scalar values.
-  const balance = pick(wallet, "balance");
-  if (typeof balance === "string" || typeof balance === "number") {
-    extras["Booster wallet"] = String(balance);
-  }
-
-  const monthlyUsed = pick(wallet, "monthlyUsed", "monthly_used");
-  const currency = pick(monthlyUsed, "currency");
-  const priceInCents = toNumber(pick(monthlyUsed, "priceInCents", "price_in_cents"));
-  if (
-    (typeof currency === "string" || typeof currency === "number") &&
-    String(currency) !== "" &&
-    priceInCents !== null
-  ) {
-    extras["Booster used this month"] = `$${(priceInCents / 100).toFixed(2)} ${String(currency)}`;
-  }
-
-  const totalQuota = pick(body, "totalQuota", "total_quota");
-  const quotaUsed = toNumber(pick(totalQuota, "used"));
-  if (totalQuota !== undefined && quotaUsed !== null && quotaUsed > 0) {
-    windows.push({
-      kind: "monthly",
-      label: "Monthly",
-      usedPercent: null,
-      used: quotaUsed,
-      limit: toNumber(pick(totalQuota, "limit")),
-      remaining: toNumber(pick(totalQuota, "remaining")),
-      resetsAt: toISODate(pick(totalQuota, "resetTime", "reset_time", "resetAt", "resetsAt")),
-      status: "frozen",
-    });
-  }
+  parseBoosterWallet(body, extras);
 
   if (windows.length === 0) {
     throw new AdapterError(

package/src/v2-tui.ts

@@ -62,6 +62,8 @@ export interface V2Route {
 
 export interface V2ModelRef {
   readonly providerID?: string;
+  /** The OpenCode 2 store spells the model id `id`; older mirrors used `modelID`. */
+  readonly id?: string;
   readonly modelID?: string;
 }
 
@@ -249,7 +251,10 @@ function createdAt(message: { readonly time?: { readonly created?: number } }):
  * messages carry a single `text` and an optional file list, so those are
  * synthesized into the same part shape.
  */
-function translateMessage(raw: unknown): {
+function translateMessage(
+  raw: unknown,
+  sessionID: string,
+): {
   record: Record<string, unknown>;
   parts: Array<Record<string, unknown>>;
 } {
@@ -264,9 +269,12 @@ function translateMessage(raw: unknown): {
     return {
       record: {
         id,
+        sessionID,
         role: "assistant",
         providerID: safeString(model.providerID),
-        modelID: safeString(model.modelID),
+        // The store sends `model.id` (e.g. `{ id: "k3", providerID, variant }`);
+        // `model.modelID` is kept as a fallback for older hosts and fixtures.
+        modelID: safeString(model.modelID) || safeString(model.id),
         time: createdAt(message),
         tokens: {
           input: finiteOrNull(tokens.input) ?? 0,
@@ -294,7 +302,7 @@ function translateMessage(raw: unknown): {
       }
     }
     return {
-      record: { id, role: "user", time: createdAt(message), tokens: { ...ZERO_TOKENS } },
+      record: { id, sessionID, role: "user", time: createdAt(message), tokens: { ...ZERO_TOKENS } },
       parts,
     };
   }
@@ -362,7 +370,7 @@ export function createV2Api(ctx: V2Context): TuiPluginApi {
           const messages: Array<Record<string, unknown>> = [];
           partsById.clear();
           for (const raw of list) {
-            const { record, parts } = translateMessage(raw);
+            const { record, parts } = translateMessage(raw, sessionID);
             if (typeof record.id !== "string" || record.id === "") continue;
             messages.push(record);
             partsById.set(record.id, parts);