opencode-usage-report 0.6.1 → 0.6.2

package/README.md

@@ -302,6 +302,13 @@ 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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-usage-report",
-  "version": "0.6.1",
+  "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/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);