@jeffreyjyz/opencode-command-code 0.3.9 → 0.3.11

package/dist/index.js

@@ -4063,7 +4063,7 @@ var commandCodeV2 = {
 // package.json
 var package_default = {
   name: "@jeffreyjyz/opencode-command-code",
-  version: "0.3.9",
+  version: "0.3.11",
   description: "Command Code provider + usage dashboard for opencode: two providers (Anthropic wire for Claude, OpenAI wire for everything else) against api.commandcode.ai, live model list, plan gating, /cmd-usage. Requires the cmduse CLI for usage rendering.",
   type: "module",
   main: "dist/index.js",

package/dist/sidebar/useRows.d.ts

@@ -1 +1,25 @@
-export declare function useRows(activeModelId: () => string | undefined, active: () => boolean): import("solid-js").Accessor<import("./rows").SidebarRow[]>;
+import { type ModelUsage, type SidebarRow, type Usage } from "./rows";
+/** Which provider a session is on, as far as this panel is concerned. */
+export type SessionKind = "ours" | "other" | "unknown";
+/**
+ * `unknown` is the frame during a session switch, before the host has resolved
+ * the new session's model. It must not be read as "another provider", or the
+ * panel blanks and refetches on every tab change.
+ */
+export declare function sessionKind(providerID: string | undefined): SessionKind;
+/** Keep an account snapshot for the next panel that needs it. */
+export declare function rememberSnapshot(snapshot: Usage): void;
+/** Rows to paint before this panel's first fetch of the session completes. */
+export declare function seededRows(): SidebarRow[];
+/**
+ * Keep the last figure for a model. Keyed canonically because the session's id
+ * and the stored `modelID` differ by vendor prefix and punctuation.
+ */
+export declare function rememberModelUsage(id: string, usage: ModelUsage): void;
+/**
+ * The remembered figure for `id`, or undefined when that model is unseen. An
+ * undefined id is the frame during a session switch: keeping the previous row up
+ * beats blanking it, the same call `wasOurs` makes for the account block.
+ */
+export declare function seededModelUsage(id: string | undefined): ModelUsage | undefined;
+export declare function useRows(activeModelId: () => string | undefined, providerID: () => string | undefined): import("solid-js").Accessor<SidebarRow[]>;

package/dist/tui.js

@@ -2009,28 +2009,81 @@ function loadModelUsage(modelID, sinceMs, path = usageDbPath()) {
 
 // src/sidebar/useRows.ts
 var POLL_MS = 60000;
-function useRows(activeModelId, active) {
-  const [usage, setUsage] = createSignal([]);
+function sessionKind(providerID) {
+  if (!providerID)
+    return "unknown";
+  return providerID.startsWith("command-code") ? "ours" : "other";
+}
+var lastSnapshot;
+function rememberSnapshot(snapshot) {
+  lastSnapshot = snapshot;
+}
+function seededRows() {
+  return lastSnapshot ? usageRows(lastSnapshot) : [];
+}
+var lastModelUsage;
+function rememberModelUsage(id, usage) {
+  lastModelUsage = {
+    key: modelKey(id),
+    usage
+  };
+}
+function seededModelUsage(id) {
+  if (!lastModelUsage)
+    return;
+  if (id === undefined)
+    return lastModelUsage.usage;
+  return lastModelUsage.key === modelKey(id) ? lastModelUsage.usage : undefined;
+}
+function useRows(activeModelId, providerID) {
+  const [usage, setUsage] = createSignal(seededRows());
   const [meta, setMeta] = createSignal(new Map);
-  const [modelUsage, setModelUsage] = createSignal();
+  const [modelUsage, setModelUsage] = createSignal(lastModelUsage);
+  const [wasOurs, setWasOurs] = createSignal(false);
   loadMeta().then(setMeta).catch(() => {});
+  const refreshModelUsage = (id, sinceMs) => {
+    if (!id)
+      return;
+    const fresh = loadModelUsage(id, sinceMs);
+    if (fresh)
+      rememberModelUsage(id, fresh);
+    setModelUsage(lastModelUsage);
+  };
   const refresh = async () => {
     try {
       const snapshot = await loadUsage();
+      rememberSnapshot(snapshot);
       setUsage(usageRows(snapshot));
-      const id = activeModelId();
-      setModelUsage(id ? loadModelUsage(id, periodStart(snapshot)) ?? undefined : undefined);
+      refreshModelUsage(activeModelId(), periodStart(snapshot));
     } catch {}
   };
   createEffect(() => {
-    if (!active())
+    const kind = sessionKind(providerID());
+    if (kind !== "ours")
       return;
+    setWasOurs(true);
     refresh();
     const timer = setInterval(() => void refresh(), POLL_MS);
     onCleanup(() => clearInterval(timer));
   });
+  createEffect(() => {
+    const id = activeModelId();
+    if (sessionKind(providerID()) !== "ours" || !id)
+      return;
+    refreshModelUsage(id, periodStart(lastSnapshot ?? {}));
+  });
+  const usageFor = (id) => {
+    const seen = modelUsage();
+    if (seen && (id === undefined || seen.key === modelKey(id))) {
+      return seen.usage;
+    }
+    return seededModelUsage(id);
+  };
   return createMemo(() => {
-    if (!active())
+    const kind = sessionKind(providerID());
+    if (kind === "other")
+      return [];
+    if (kind === "unknown" && !wasOurs())
       return [];
     const id = activeModelId();
     const found = id ? meta().get(modelKey(id)) ?? meta().get(id) : undefined;
@@ -2039,17 +2092,16 @@ function useRows(activeModelId, active) {
       tier: found.tier ?? (id ? tierFor(id) : undefined),
       minPlan: id ? minPlan(id) : undefined
     } : undefined;
-    return [...usage(), separator(), ...modelRows(model, modelUsage())];
+    return [...usage(), separator(), ...modelRows(model, usageFor(id))];
   });
 }
 
 // src/tui.tsx
 var ID = "command-code.tui";
-var isOurs = (providerID) => Boolean(providerID?.startsWith("command-code"));
 var themed = (colors) => loadPrefs().colors ? colors : mono(colors);
 function PanelV1(props) {
   const current = () => props.api.state.session.get(props.sessionID)?.model;
-  const rows = useRows(() => current()?.id, () => isOurs(current()?.providerID));
+  const rows = useRows(() => current()?.id, () => current()?.providerID);
   return _$createComponent2(Panel, {
     rows,
     colors: () => themed(legacyColors(props.api.theme.current))
@@ -2075,7 +2127,7 @@ function PanelV2(props) {
     ctx
   } = props;
   const current = () => ctx.data.session.get(props.sessionID)?.model;
-  const rows = useRows(() => current()?.id, () => isOurs(current()?.providerID));
+  const rows = useRows(() => current()?.id, () => current()?.providerID);
   return _$createComponent2(Panel, {
     rows,
     colors: () => themed(hostColors(ctx.theme))

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@jeffreyjyz/opencode-command-code",
- "version": "0.3.9",
+ "version": "0.3.11",
  "description": "Command Code provider + usage dashboard for opencode: two providers (Anthropic wire for Claude, OpenAI wire for everything else) against api.commandcode.ai, live model list, plan gating, /cmd-usage. Requires the cmduse CLI for usage rendering.",
  "type": "module",
  "main": "dist/index.js",