opencode-plugin-context 1.1.0 → 1.1.1

package/dist/tui.js

@@ -211,30 +211,46 @@ function renderPanel(api, sessionId, config) {
       ] })
     );
     if (config.estimate) {
-      const legend = (ids) => {
-        const entries = usage.segments.filter((segment) => ids.includes(segment.id));
-        if (entries.length === 0) return null;
-        return /* @__PURE__ */ jsx("box", { flexDirection: "row", children: entries.map((segment) => /* @__PURE__ */ jsxs("box", { flexDirection: "row", children: [
-          /* @__PURE__ */ jsx("text", { fg: segmentColor(segment.id, theme, true), children: "\u258D" }),
-          /* @__PURE__ */ jsxs("text", { fg: theme.textMuted, children: [
-            SEGMENT_LABEL[segment.id],
-            compactFmt.format(segment.tokens)
-          ] })
-        ] })) });
+      const cellsById = new Map(bar.map((cell) => [cell.id, cell.cells]));
+      const tokenById = new Map(usage.segments.map((segment) => [segment.id, segment.tokens]));
+      const row = (ids, startAt) => {
+        const items = ids.map((id) => ({ id, cells: cellsById.get(id) ?? 0, tokens: tokenById.get(id) ?? 0 })).filter((item) => item.cells > 0 || item.tokens > 0);
+        if (items.length === 0) return null;
+        let cumulative = startAt;
+        return /* @__PURE__ */ jsx("box", { flexDirection: "row", children: items.map((item) => {
+          const marginLeft = cumulative;
+          cumulative += item.cells;
+          return /* @__PURE__ */ jsxs("box", { flexDirection: "row", marginLeft, children: [
+            /* @__PURE__ */ jsx("text", { fg: segmentColor(item.id, theme, true), children: "\u258D" }),
+            /* @__PURE__ */ jsxs("text", { fg: theme.textMuted, children: [
+              SEGMENT_LABEL[item.id],
+              compactFmt.format(item.tokens)
+            ] })
+          ] });
+        }) });
       };
-      const usedLegend = legend(["cached", "user", "tools", "system", "think", "out"]);
-      const budgetLegend = legend(["reserved", "free"]);
+      const usedStart = 0;
+      const usedIds = ["cached", "user", "tools", "system", "think", "out"];
+      const budgetStart = usedIds.reduce((sum, id) => sum + (cellsById.get(id) ?? 0), 0);
+      const usedLegend = row(usedIds, usedStart);
+      const budgetLegend = row(["reserved", "free"], budgetStart);
       if (usedLegend) lines.push(usedLegend);
       if (budgetLegend) lines.push(budgetLegend);
     } else {
+      const tokenById = new Map(usage.segments.map((segment) => [segment.id, segment.tokens]));
+      let cumulative = 0;
       lines.push(
-        /* @__PURE__ */ jsx("box", { flexDirection: "row", gap: 1, children: usage.segments.map((segment) => /* @__PURE__ */ jsxs("box", { flexDirection: "row", children: [
-          /* @__PURE__ */ jsx("text", { fg: segmentColor(segment.id, theme, false), children: "\u258D" }),
-          /* @__PURE__ */ jsxs("text", { fg: theme.textMuted, children: [
-            SEGMENT_LABEL[segment.id],
-            compactFmt.format(segment.tokens)
-          ] })
-        ] })) })
+        /* @__PURE__ */ jsx("box", { flexDirection: "row", children: bar.map((cell) => {
+          const marginLeft = cumulative;
+          cumulative += cell.cells;
+          return /* @__PURE__ */ jsxs("box", { flexDirection: "row", marginLeft, children: [
+            /* @__PURE__ */ jsx("text", { fg: segmentColor(cell.id, theme, false), children: "\u258D" }),
+            /* @__PURE__ */ jsxs("text", { fg: theme.textMuted, children: [
+              SEGMENT_LABEL[cell.id],
+              compactFmt.format(tokenById.get(cell.id) ?? 0)
+            ] })
+          ] });
+        }) })
       );
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "opencode-plugin-context",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "OpenCode TUI plugin that renders the session's context-window usage as a colored, segmented bar (cached / prompt / thinking / output / reserved output) in the sidebar",
   "type": "module",
   "exports": {