opencode-context-indicator 1.8.1 → 1.8.3

package/lib/v2.js

@@ -29,6 +29,7 @@ import {
 import {
   BREAKDOWN_THROTTLE_MS,
   breakdownCache,
+  breakdownForModel,
   clearChildSubagentTracking,
   clearSessionTracking,
   ERROR_TOAST_DEDUP_MS,
@@ -65,6 +66,7 @@ import { locationDirectory } from "./config.js";
 import {
   debugEvent,
   logErr,
+  pruneSessionState,
   pushFinalSummary,
   readStateSnapshot,
   writeLog,
@@ -376,10 +378,21 @@ function onV2Context(context, ctx) {
     if (!sid) return;
 
     const parts = estimateBreakdownFromContext(context, sid);
+    // Tag the entry with the model whose payload was measured: a later in-session
+    // model switch must not keep showing this split (see breakdownForModel).
+    const reqModel = context.model;
+    const reqModelID =
+      reqModel &&
+      typeof reqModel === "object" &&
+      typeof reqModel.id === "string" &&
+      reqModel.id
+        ? reqModel.id
+        : "unknown";
     breakdownCache.set(sid, {
       ...parts,
       capturedAt: Date.now(),
       source: "context-hook",
+      model: reqModelID,
     });
     pruneMap(breakdownCache, MAX_TRACKED_SESSIONS);
 
@@ -417,10 +430,20 @@ function onV2Compaction(context, ctx) {
     const directory = locationDirectory(ctx);
 
     const parts = estimateBreakdownFromContext(context, sid);
+    // Same model tag as the context hook (see onV2Context / breakdownForModel).
+    const reqModel = context.model;
+    const reqModelID =
+      reqModel &&
+      typeof reqModel === "object" &&
+      typeof reqModel.id === "string" &&
+      reqModel.id
+        ? reqModel.id
+        : "unknown";
     breakdownCache.set(sid, {
       ...parts,
       capturedAt: Date.now(),
       source: "compaction-hook",
+      model: reqModelID,
     });
     pruneMap(breakdownCache, MAX_TRACKED_SESSIONS);
 
@@ -628,6 +651,7 @@ async function ensureV2Breakdown(ctx, sessionID) {
           ...estimateBreakdownFromClientMessages(msgs),
           capturedAt: Date.now(),
           source: "client-context",
+          model: lastKnownModel(sessionID),
         });
         pruneMap(breakdownCache, MAX_TRACKED_SESSIONS);
       }
@@ -746,7 +770,10 @@ function buildLiveLinesV2(sessionID, modelID, providerID, inputTokens, ctxTokens
   // input/ctx belong to ITS view (a mirror that only saw the trailing event has
   // 0), and mixing them with the hook's categories made the header contradict
   // the "other = input - sum of estimates" line right below it.
-  let bd = breakdownCache.get(sessionID);
+  let bd = breakdownForModel(sessionID, modelID);
+  // A breakdown measured for a DIFFERENT model is not this session's split any
+  // more: dropping it falls through to the state.json snapshot path below (which
+  // is model-consistent) or to the header-only path.
   let snapInputTokens = null;
   let snapCtxTokens = null;
   let snapAt = null;
@@ -969,10 +996,11 @@ async function handleV2Event(ctx, event) {
   if (event.type === "session.deleted") {
     const sid = event.data?.sessionID;
     if (!sid) return;
-    // Discovery reads the persisted parentID chain, so a deleted session drops
-    // out of the table as soon as its state.json entry is gone (or, while the
-    // stale entry lingers, via the phantom filter — a deleted session has no
-    // step). No dedicated in-memory index to clean up.
+    // Discovery reads the persisted parentID chain, so the entry has to go too:
+    // clearing the in-memory caches alone leaves the row in state.json until the
+    // tombstone (7 days) or the LRU cap drops it, and there is no step event left
+    // to filter it out as a phantom.
+    pruneSessionState(sid);
     clearSessionTracking(sid);
     // Whatever this session was, its own descendants must go too: a deleted
     // parent takes the whole subtree, and a deleted child takes its own

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-context-indicator",
-  "version": "1.8.1",
+  "version": "1.8.3",
   "description": "Real-time context-window usage for OpenCode: per-category token breakdown, /context-diff, a zero-LLM /cx panel with per-session cost and a searchable family-session picker, a TUI sidebar, and an experimental Desktop panel. Dual V1 + V2 plugin entry.",
   "type": "module",
   "license": "MIT",