opencode-plugin-context 1.1.0 → 1.1.2

package/dist/tui.js

@@ -21,7 +21,27 @@ function num(v) {
   return typeof v === "number" && Number.isFinite(v) && v > 0 ? Math.round(v) : 0;
 }
 function estimateTokens(input) {
-  return Math.max(0, Math.round(input.length / 4));
+  return Math.max(0, Math.ceil(input.length / 4));
+}
+function formatCompactTokens(tokens) {
+  if (tokens <= 0) return "0";
+  const k = Math.round(tokens / 1e3);
+  return `${Math.max(1, k)}k`;
+}
+function scaleToPrompt(raw, prompt) {
+  const estimated = raw.system + raw.user + raw.assistant + raw.tool;
+  if (estimated <= prompt) {
+    return { ...raw, other: prompt - estimated };
+  }
+  const scale = prompt / estimated;
+  const scaled = {
+    system: Math.floor(raw.system * scale),
+    user: Math.floor(raw.user * scale),
+    assistant: Math.floor(raw.assistant * scale),
+    tool: Math.floor(raw.tool * scale)
+  };
+  const total = scaled.system + scaled.user + scaled.assistant + scaled.tool;
+  return { ...scaled, other: Math.max(0, prompt - total) };
 }
 function computeContext(counts, limits, cost = 0, estimates, exclude = []) {
   const { input, output, reasoning, cacheRead, cacheWrite } = counts;
@@ -30,28 +50,62 @@ function computeContext(counts, limits, cost = 0, estimates, exclude = []) {
   const reserved = limits && limits.output > 0 ? Math.max(0, limits.output - output) : 0;
   const free = window > 0 ? Math.max(0, window - used - reserved) : 0;
   const prompt = input + cacheWrite;
-  const raw = estimates ? [
-    { id: "cached", tokens: cacheRead },
-    { id: "user", tokens: estimates.user },
-    { id: "tools", tokens: estimates.tools },
-    { id: "system", tokens: Math.max(0, prompt - estimates.user - estimates.tools) },
-    { id: "think", tokens: reasoning },
-    { id: "out", tokens: output },
-    { id: "reserved", tokens: reserved },
-    { id: "free", tokens: free }
-  ] : [
-    { id: "cached", tokens: cacheRead },
-    { id: "prompt", tokens: prompt },
-    { id: "think", tokens: reasoning },
-    { id: "out", tokens: output },
-    { id: "reserved", tokens: reserved },
-    { id: "free", tokens: free }
-  ];
+  const normalizeExclude = (id) => {
+    if (id === "tools" || id === "tool") return exclude.includes("tools") || exclude.includes("tool");
+    return exclude.includes(id);
+  };
+  const excluded = (id) => normalizeExclude(id);
+  let raw;
+  if (estimates) {
+    const hasWebCats = estimates.system !== void 0 || estimates.assistant !== void 0 || estimates.tool !== void 0;
+    if (hasWebCats) {
+      const rawTokens = {
+        system: Math.max(0, estimates.system ?? 0),
+        user: Math.max(0, estimates.user ?? 0),
+        assistant: Math.max(0, estimates.assistant ?? 0),
+        tool: Math.max(0, estimates.tool ?? estimates.tools ?? 0)
+      };
+      const scaled = scaleToPrompt(rawTokens, prompt);
+      raw = [
+        { id: "cached", tokens: cacheRead },
+        { id: "system", tokens: scaled.system },
+        { id: "user", tokens: scaled.user },
+        { id: "assistant", tokens: scaled.assistant },
+        { id: "tool", tokens: scaled.tool },
+        { id: "other", tokens: scaled.other },
+        { id: "think", tokens: reasoning },
+        { id: "out", tokens: output },
+        { id: "reserved", tokens: reserved },
+        { id: "free", tokens: free }
+      ];
+    } else {
+      raw = [
+        { id: "cached", tokens: cacheRead },
+        { id: "user", tokens: estimates.user },
+        { id: "tools", tokens: estimates.tools },
+        { id: "system", tokens: Math.max(0, prompt - estimates.user - estimates.tools) },
+        { id: "think", tokens: reasoning },
+        { id: "out", tokens: output },
+        { id: "reserved", tokens: reserved },
+        { id: "free", tokens: free }
+      ];
+    }
+  } else {
+    raw = [
+      { id: "cached", tokens: cacheRead },
+      { id: "prompt", tokens: prompt },
+      { id: "think", tokens: reasoning },
+      { id: "out", tokens: output },
+      { id: "reserved", tokens: reserved },
+      { id: "free", tokens: free }
+    ];
+  }
+  const filtered = raw.filter((segment) => segment.tokens > 0 && !excluded(segment.id));
   return {
     used,
     window,
     percent: window > 0 ? Math.min(100, Math.round(used / window * 100)) : 0,
-    segments: raw.filter((segment) => segment.tokens > 0 && !exclude.includes(segment.id)),
+    segments: filtered,
     cost,
     known: window > 0
   };
@@ -76,8 +130,11 @@ var VALID_SEGMENT_IDS = [
   "cached",
   "user",
   "tools",
+  "tool",
   "system",
   "prompt",
+  "assistant",
+  "other",
   "think",
   "out",
   "reserved",
@@ -98,8 +155,11 @@ var SEGMENT_LABEL = {
   cached: "c",
   user: "u",
   tools: "m",
+  tool: "m",
   system: "s",
   prompt: "p",
+  assistant: "a",
+  other: "x",
   think: "t",
   out: "o",
   reserved: "r",
@@ -107,7 +167,7 @@ var SEGMENT_LABEL = {
 };
 var money = new Intl.NumberFormat("en-US", { style: "currency", currency: "USD" });
 var intFmt = new Intl.NumberFormat("en-US");
-var compactFmt = new Intl.NumberFormat("en", { notation: "compact", maximumFractionDigits: 1 });
+var compact = (n) => formatCompactTokens(n);
 var plugin = {
   id: "opencode-plugin-context",
   tui: async (api, rawOptions) => {
@@ -144,27 +204,55 @@ var plugin = {
   }
 };
 function collectEstimates(api, sessionId) {
+  let system = 0;
   let user = 0;
-  let tools = 0;
-  for (const message of api.state.session.messages(sessionId)) {
+  let assistant = 0;
+  let tool = 0;
+  let systemPrompt;
+  const messages = [...api.state.session.messages(sessionId)];
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const s = messages[i]?.system?.trim();
+    if (s) {
+      systemPrompt = s;
+      break;
+    }
+  }
+  if (systemPrompt) system += estimateTokens(systemPrompt);
+  for (const message of messages) {
     const role = message.role;
     try {
       for (const part of api.state.part(message.id)) {
         const p = part;
-        if (p.type === "text" && role === "user") {
-          user += estimateTokens(p.text ?? "");
-        } else if (p.type === "tool") {
-          const state = p.state;
-          if (!state) continue;
-          if (state.input !== void 0) tools += estimateTokens(JSON.stringify(state.input));
-          if (typeof state.output === "string") tools += estimateTokens(state.output);
-          else if (typeof state.error === "string") tools += estimateTokens(state.error);
+        if (role === "user") {
+          if (p.type === "text") user += estimateTokens(p.text ?? "");
+          else if (p.type === "file") user += estimateTokens(p.source?.text?.value ?? "");
+          else if (p.type === "agent") user += estimateTokens(p.source?.value ?? "");
+        } else if (role === "assistant") {
+          if (p.type === "text" || p.type === "reasoning") {
+            assistant += estimateTokens(p.text ?? "");
+          } else if (p.type === "tool") {
+            const state = p.state;
+            if (!state) continue;
+            const inputKeys = state.input && typeof state.input === "object" ? Object.keys(state.input).length : 0;
+            const inputChars = inputKeys * 16;
+            let out = "";
+            if (state.status === "pending") out = state.raw ?? "";
+            else if (state.status === "completed") out = typeof state.output === "string" ? state.output : "";
+            else if (state.status === "error") out = typeof state.error === "string" ? state.error : "";
+            else {
+              if (typeof state.output === "string") out = state.output;
+              else if (typeof state.error === "string") out = state.error;
+              else if (typeof state.raw === "string") out = state.raw;
+            }
+            const combined = "x".repeat(inputChars) + out;
+            tool += estimateTokens(combined);
+          }
         }
       }
     } catch {
     }
   }
-  return { user, tools };
+  return { system, user, assistant, tool, tools: tool };
 }
 function sessionUsage(api, sessionId, config) {
   const messages = api.state.session.messages(sessionId);
@@ -211,30 +299,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],
+              compact(item.tokens)
+            ] })
+          ] });
+        }) });
       };
-      const usedLegend = legend(["cached", "user", "tools", "system", "think", "out"]);
-      const budgetLegend = legend(["reserved", "free"]);
+      const usedStart = 0;
+      const usedIds = ["cached", "system", "user", "assistant", "tool", "other", "think", "out"];
+      const budgetStart = usedIds.reduce((sum, id) => sum + (cellsById.get(id) ?? (id === "tool" ? cellsById.get("tools") ?? 0 : 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],
+              compact(tokenById.get(cell.id) ?? 0)
+            ] })
+          ] });
+        }) })
       );
     }
   }
@@ -260,15 +364,23 @@ function segmentColor(id, theme, estimate) {
     free: theme.text,
     user: theme.accent,
     tools: theme.accent,
-    system: theme.accent
+    tool: theme.accent,
+    system: theme.accent,
+    assistant: theme.accent,
+    other: theme.accent
   };
   if (!estimate) return base[id];
   const est = {
-    user: theme.info,
-    tools: theme.accent,
-    system: theme.warning,
+    system: theme.info,
+    user: theme.success,
+    assistant: theme.secondary,
+    tool: theme.warning,
+    tools: theme.warning,
+    other: theme.textMuted,
+    cached: theme.success,
     think: theme.secondary,
     out: theme.text,
+    reserved: theme.textMuted,
     free: theme.borderSubtle
   };
   return est[id] ?? base[id];

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.2",
   "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": {
@@ -45,9 +45,9 @@
     "@opentui/solid": ">=0.2.9"
   },
   "devDependencies": {
-    "@opencode-ai/plugin": "1.18.18",
-    "@opentui/core": "0.5.4",
-    "@opentui/solid": "0.5.4",
+    "@opencode-ai/plugin": "1.18.23",
+    "@opentui/core": "0.5.8",
+    "@opentui/solid": "0.5.8",
     "@types/node": "^26.2.0",
     "esbuild": "^0.28.0",
     "solid-js": "1.9.12",