opencode-context-indicator 1.2.2 → 1.3.0

package/CHANGELOG.md

@@ -0,0 +1,101 @@
+# Changelog
+
+Notable user-facing changes per release. Dates are commit days (UTC).
+The package also ships a dual V1/V2 plugin — see the README for the surface
+matrix; everything below concerns the V2 path unless stated otherwise.
+
+## 1.3.0 — unreleased
+
+Highlights: per-session cost in `/cx` (family-aggregated for the main session),
+a searchable family-session picker, and `/cx` reachable from subagent session
+views.
+
+- `/cx` panel: new **cost** column (upstream #45417). The main session shows
+  the family-aggregated spend, each subagent its own; `-` when the host has no
+  cost for a session.
+- New panel key `s` — a searchable picker over all family sessions
+  (title / model / cost / running marker). `Enter` navigates: root sessions
+  focus their tab, subagent sessions switch the route.
+- `/cx` now works from **subagent session views**: those views have no prompt
+  input, so the command is also in the command palette and bound to
+  `<leader>c` (ctrl+x, then c) and `f4`. The panel family is rooted at the
+  topmost ancestor, so the whole family is shown, not just the child subtree.
+- OpenTUI pinned `0.5.17`; `@opencode/plugin` types devDep pinned `2.0.26`
+  (drift-watch now tracks both). Tested against opencode **2.0.26**.
+
+## 1.2.2 — 2026-10-08
+
+- TUI entry split for maintainability: `tui.tsx` down to ~195 lines; the
+  components and the data layer moved to `lib/` (`tui-sidebar.tsx`,
+  `tui-panel.tsx`, `tui-data.js` + `.d.ts`, `tui-theme.js`). No behavior
+  change. The pragma regression gate now covers every `lib/*.tsx`.
+- E2E hardened: deterministic fail-closed plugin-load check (isolated global
+  config via `OPENCODE_CONFIG_DIR` + the isolated instance's own log file +
+  a live-surface stamp), cleanup of spawned CLI instances, WMI probe timeouts.
+
+## 1.2.1 — 2026-10-08
+
+- The panel / percentage denominator now equals **opencode's compaction
+  ceiling** (v2.0.23+ `calculateCeiling`: window = `limit.input ||
+  limit.context`; reserve = max(10% of the window, 16k when the window is at
+  least 32k)) — percentages read as "% to compaction", not "% of the raw
+  window" (upstream #51271).
+- `state.json`: new `reserve` field; the panel and `/context` show
+  `compact at X (N reserve)`.
+- Unit harness extended to 34 checks (measured contributors, redacted-export
+  invariants, ceiling formula, hydrate seeding).
+- OpenTUI pinned `0.5.16`.
+
+## 1.2.0 — 2026-10-04
+
+- New: **zero-LLM `/cx` session panel** — a family table (role / model /
+  ctx% / updated) for the current session and all subagent descendants, plus a
+  `largest contributors (measured)` section computed from the in-process
+  message list (per tool call, with message clock times and bounded previews).
+- Redacted export (`e`): no message text, no full session ids, no tool output
+  content — written under `%TEMP%/opencode-context-indicator/exports/`.
+- Keys: `esc` closes, `r` refreshes, `e` exports.
+
+## 1.1.6 — 2026-10-04
+
+- OpenTUI pinned `0.5.14` (opencode 2.0.21+), optional-peer floor aligned.
+- `index.js` split into `lib/` modules (no behavior change).
+
+## 1.1.5 — 2026-10-02
+
+- Security hardening: sanitized table metadata, validated `state.json`
+  (prototype-poisoning keys dropped), ownership-safe state lock, tmp hygiene.
+
+## 1.1.4 — 2026-10-02
+
+- Removed a stray `opencode/process` import from the TUI entry; the prepublish
+  gate now rejects bare `opencode/*` specifiers (not bridged at runtime).
+
+## 1.1.3 — 2026-10-01
+
+- Stable context denominator across plugin instances: a transient
+  `ctx.model.list()` miss falls back to the shared snapshot instead of
+  clobbering persisted windows.
+
+## 1.1.2 — 2026-10-01
+
+- Graceful sidebar/panel disable on npm installs (upstream #33884: `node_modules`
+  plugins skip the host Solid transform, so slots would freeze) — a single hint
+  is logged instead; `@opentui/solid` is shipped pinned; `file://` install docs.
+
+## 1.1.1 — 2026-10-01
+
+- Fixed `Cannot find package 'react'` when loaded from the npm cache: the
+  `@jsxImportSource @opentui/solid` pragma must be the file's first line.
+
+## 1.1.0 — 2026-10-01
+
+- New: `/context` (compact summary) and `/context-breakdown` (full table, main
+  + all subagent sessions) slash commands.
+- Stable per-model window limits; strict subagent discovery.
+
+## 1.0.0 — 2026-09-30
+
+- Initial release: dual V1/V2 plugin, real-time context indicator, per-category
+  token breakdown (system / tool schemas / user / assistant / reasoning / tool
+  args / residual), TUI sidebar.

package/README.md

@@ -3,6 +3,8 @@
 Real-time **context-window usage** indicator for [OpenCode](https://opencode.ai),
 with a **per-category token breakdown** and an optional **terminal-UI sidebar**.
 
+User-facing changes per release: [CHANGELOG.md](./CHANGELOG.md).
+
 It tells you how full the current model's context window is, and *what* is
 filling it: system prompt, tool schemas, user/assistant text, reasoning, tool
 arguments and the residual "other" bucket.
@@ -10,7 +12,7 @@ arguments and the residual "other" bucket.
 The package ships a **dual V1 + V2 plugin** (one entry works in both OpenCode
 generations) plus an optional TUI module (`./tui` entry) that renders a **live
 sidebar** and a **zero-LLM `/cx` breakdown panel** with measured contributors
-and a redacted export. The V2 path is **tested against opencode v2.0.25**; the
+and a redacted export. The V2 path is **tested against opencode v2.0.26**; the
 V1 path against 1.18.29+.
 
 > **V1 is feature-frozen.** It is kept working for compatibility (bug fixes
@@ -240,7 +242,20 @@ back to a plain notice if needed.
 `/cx` opens a full `session.panel` showing the breakdown for the current session
 **and its subagent descendants**, read from the same `state.json` bridge as the
 sidebar. Keys: `/cx` opens, `esc` closes, `r` refreshes (re-read the bridge),
-`e` exports a redacted snapshot.
+`e` exports a redacted snapshot, `s` picks a family session.
+
+Every row carries a **cost** column read from the host data layer: a main
+session shows the **family-aggregated** spend, each subagent its own — no more
+invisible subagent spend (upstream #45417). `s` opens a searchable picker over
+all family sessions (title / model / cost / running marker); `Enter` navigates
+there — root sessions focus their tab, subagent sessions switch the route.
+
+Works from **subagent session views too**: those views have no prompt input
+(the composer switches to its subagents tab), so `/cx` is also registered in
+the command palette and bound to `<leader>c` / `f4` — both fire from any
+session view (the palette itself is only reachable outside the composer).
+Opened from a subagent view, the family is rooted at the topmost ancestor, so
+the whole family is shown, not just the child subtree.
 
 **Zero LLM calls.** Unlike `/context` and `/context-breakdown` (which run a real
 agent turn so the model renders the table), the panel only reads local TUI data
@@ -437,13 +452,13 @@ the sidebar instead.
   gracefully (the breakdown falls back to throttled `session.messages` fetches
   and toasts keep working).
 * **OpenCode ≥ 2.0.16** for the V2 path (built and verified against
-  **2.0.25**).
+  **2.0.26**).
 * **TUI sidebar**: terminal TUI only, requires the OpenTUI rendering stack that
   ships with OpenCode. `@opentui/core` and `solid-js` are **optional** peer
   dependencies resolved by OpenCode at runtime; the main plugin installs and runs
   fine without them (the sidebar simply is not available). `@opentui/solid` is
-  instead shipped as a **pinned direct dependency** (exact `0.5.16`, matching
-  the OpenTUI stack OpenCode 2.0.25 ships): OpenCode's
+  instead shipped as a **pinned direct dependency** (exact `0.5.17`, matching
+  the OpenTUI stack OpenCode 2.0.26 ships): OpenCode's
   TUI loader does not expose a host instance of it, so for npm-installed plugins
   the JSX pragma would otherwise fail to resolve `@opentui/solid/jsx-runtime`
   (upstream: opencode issue #33884 — `node_modules` plugins are excluded from the

package/lib/tui-panel.tsx

@@ -58,27 +58,71 @@ let warnedMessagesUnavailable = false
 // truncated cell visually separated from its neighbour.
 const GUTTER = 2
 const CTX_WIDTH = 12
+const COST_WIDTH = 8
 
 function panelLayout(panelWidth: number): {
   roleW: number
   modelW: number
   ctxW: number
+  costW: number
   updW: number
   gutter: string
 } {
   const w = num(panelWidth) > 0 ? num(panelWidth) : 60
   const ctxW = CTX_WIDTH
-  const updW = Math.max(5, Math.min(8, w - ctxW - 3 * GUTTER - 24))
-  const roleW = Math.max(12, Math.min(20, Math.floor(w * 0.3)))
-  const modelW = Math.max(10, w - roleW - ctxW - updW - 3 * GUTTER)
-  return { roleW, modelW, ctxW, updW, gutter: " ".repeat(GUTTER) }
+  const costW = COST_WIDTH
+  const updW = Math.max(5, Math.min(8, w - ctxW - 4 * GUTTER - 24))
+  const roleW = Math.max(12, Math.min(20, Math.floor(w * 0.28)))
+  const modelW = Math.max(8, w - roleW - ctxW - costW - updW - 4 * GUTTER)
+  return { roleW, modelW, ctxW, costW, updW, gutter: " ".repeat(GUTTER) }
+}
+
+// Dollar formatting for the cost column: compact, always `$`-prefixed, `-`
+// when the host data layer has no cost for the session.
+function money(n: number | null): string {
+  if (n == null || !Number.isFinite(n)) return "-"
+  const a = Math.abs(n)
+  if (a >= 1000) return `$${(n / 1000).toFixed(1)}k`
+  if (a >= 100) return `$${n.toFixed(1)}`
+  return `$${n.toFixed(2)}`
+}
+
+// The topmost ancestor of the panel's session: `/cx` opened from a subagent
+// session view must show the WHOLE family (rooted at the main session), not
+// just the child subtree. Walks parentID upward over the snapshot; `seen`
+// guards against parentID loops.
+function resolveRoot(
+  snapshot: Record<string, StateEntry>,
+  sessionID: string,
+): string {
+  let current = sessionID
+  const seen = new Set<string>([current])
+  for (;;) {
+    const entry = Object.prototype.hasOwnProperty.call(snapshot, current)
+      ? snapshot[current]
+      : undefined
+    const parent = entry?.parentID
+    if (
+      !parent ||
+      typeof parent !== "string" ||
+      !Object.prototype.hasOwnProperty.call(snapshot, parent) ||
+      seen.has(parent)
+    ) {
+      break
+    }
+    seen.add(parent)
+    current = parent
+  }
+  return current
 }
 
 // Full session panel: header + one row per session in the family (root plus
 // subagent descendants). It reads the same state.json bridge as the sidebar via
-// the shared 1 s tick, so both surfaces refresh on ONE poll. `panel.sessionID`
-// selects the root; `cx` opens the panel (registered from the "app" slot in
-// tui.tsx).
+// the shared 1 s tick, so both surfaces refresh on ONE poll. The family is
+// rooted at the panel session's TOPMOST ancestor, so opening the panel from a
+// subagent view shows the whole family. `cx` opens the panel (registered from
+// the "app" slot in tui.tsx; also reachable from the command palette, since
+// subagent views have no prompt input).
 export function BreakdownPanel(props: {
   panel: PanelInput
   snapshot: () => Record<string, StateEntry>
@@ -88,6 +132,32 @@ export function BreakdownPanel(props: {
   const base = () => token(context?.theme?.text?.base, "white")
   const muted = () => token(context?.theme?.text?.muted, base())
 
+  // The host session data layer, re-read per call: individual accessors
+  // (family/get/status/cost) are optional across host versions and every use
+  // site guards them separately.
+  const dataApiSession = () => context?.data?.session
+
+  // Set while the picker dialog is on screen: the panel-local `s` key must not
+  // re-trigger the picker (a printable key typed into the dialog search would
+  // otherwise stack dialogs — the guard is belt-and-braces for hosts where the
+  // panel keeps focus while a dialog is open).
+  let pickerOpen = false
+
+  // Per-session cost from the host data layer (read under the shared poll tick,
+  // so it refreshes reactively). For a ROOT session the host AGGREGATES the
+  // whole family; for a child it is that session's own cost — exactly the
+  // per-subagent spend visibility the community asked for (upstream #45417).
+  // Guarded: older hosts may not expose the accessor.
+  const costOf = (sessionID: string | undefined): number | null => {
+    if (!sessionID) return null
+    try {
+      const cost = context?.data?.session?.cost?.(sessionID)
+      return typeof cost === "number" && Number.isFinite(cost) ? cost : null
+    } catch {
+      return null
+    }
+  }
+
   // Panel-local keys. The layer is owned by this component and disposed with it.
   // mode "global" + an explicit focused check is the portable fallback when no
   // target renderable is available: the keys act only while the panel owns input.
@@ -125,17 +195,29 @@ export function BreakdownPanel(props: {
             if (props.panel.focused) exportRedacted()
           },
         },
+        {
+          id: "context-indicator.breakdown.pick",
+          title: "Pick a family session",
+          bind: "s",
+          enabled: () => props.panel.focused && !pickerOpen,
+          run: () => {
+            if (props.panel.focused && !pickerOpen) openPicker()
+          },
+        },
       ],
     }))
   }
 
   // One snapshot read per poll tick (props.snapshot tracks the shared tick), so
   // the memo recomputes together with the sidebar instead of polling separately.
+  // The family is rooted at the topmost ancestor (resolveRoot): from a subagent
+  // view the whole family is shown, not just the child subtree.
   const data = createMemo(() => {
     const snap = props.snapshot()
+    const rootID = resolveRoot(snap, props.panel.sessionID)
     return {
-      root: snap[props.panel.sessionID],
-      rows: collectFamily(snap, props.panel.sessionID),
+      root: snap[rootID],
+      rows: collectFamily(snap, rootID),
     }
   })
 
@@ -228,6 +310,165 @@ export function BreakdownPanel(props: {
     }
   }
 
+  // Navigate to a family session: root sessions focus their tab (tab-aware,
+  // opens one when needed); child sessions navigate the route directly (tabs
+  // are root-session scoped). Falls back with a toast when the host exposes
+  // neither mechanism.
+  function navigateTo(sessionID: string): void {
+    try {
+      const ui = context?.ui
+      // Child detection is three-sourced: the host session info, OUR snapshot
+      // (state.json parentID), and the host root() accessor — get() alone can
+      // miss a session that has not been synced into the client store yet, and
+      // tabs.focus() on a child ID would target the wrong (root) tab.
+      let isChild = false
+      try {
+        const info = context?.data?.session?.get?.(sessionID)
+        isChild = !!(
+          info &&
+          typeof info === "object" &&
+          (info as Record<string, unknown>).parentID
+        )
+      } catch {
+        /* other sources below */
+      }
+      if (!isChild) {
+        const snapParent = props.snapshot()[sessionID]?.parentID
+        if (typeof snapParent === "string" && snapParent.length > 0) isChild = true
+      }
+      if (!isChild && typeof context?.data?.session?.root === "function") {
+        try {
+          if (context.data.session.root(sessionID) !== sessionID) isChild = true
+        } catch {
+          /* treat as root */
+        }
+      }
+      if (!isChild && ui?.tabs && typeof ui.tabs.focus === "function") {
+        if (ui.tabs.focus(sessionID)) return
+      }
+      if (ui?.router && typeof ui.router.navigate === "function") {
+        ui.router.navigate({ type: "session", sessionID })
+        return
+      }
+      try {
+        context?.ui?.toast?.show({
+          message: "session navigation not supported by this host",
+          variant: "warning",
+        })
+      } catch {
+        /* toast is best-effort */
+      }
+    } catch (err) {
+      console.error("[context-indicator] session navigation failed:", err)
+    }
+  }
+
+  // Family-session picker (key `s`): a select dialog over the host data layer's
+  // family rooted at the TOPMOST ancestor (matches the table; authoritative —
+  // includes registered sessions that never served a step; falls back to our
+  // state.json walk), searchable by title/model, each option carrying its own
+  // cost and a running marker. Enter navigates.
+  function openPicker(): void {
+    if (pickerOpen) return
+    const dialog = context?.ui?.dialog
+    if (!dialog || typeof dialog.select !== "function") {
+      try {
+        context?.ui?.toast?.show({
+          message: "session picker requires opencode 2.0.23+",
+          variant: "warning",
+        })
+      } catch {
+        /* toast is best-effort */
+      }
+      return
+    }
+
+    const rootID = resolveRoot(props.snapshot(), props.panel.sessionID)
+    let ids: string[] = []
+    try {
+      const family = dataApiSession()?.family?.(rootID)
+      if (Array.isArray(family)) ids = family.filter((id) => typeof id === "string")
+    } catch {
+      ids = []
+    }
+    if (ids.length === 0) {
+      // Host family unavailable: fall back to our state.json family walk.
+      ids = collectFamily(props.snapshot(), rootID)
+        .map((e) => e.sessionID)
+        .filter((id): id is string => typeof id === "string" && id.length > 0)
+    }
+
+    const labels = new Map<string, string>()
+    const options = ids.map((id) => {
+      let title = "(untitled)"
+      let model = ""
+      let running = false
+      try {
+        const info = dataApiSession()?.get?.(id)
+        if (info && typeof info === "object") {
+          const raw = info as Record<string, unknown>
+          title = safeText(raw.title) || title
+          const m = raw.model as { modelID?: unknown } | string | undefined
+          model =
+            typeof m === "string"
+              ? safeText(m)
+              : m && typeof m.modelID === "string"
+                ? safeText(m.modelID)
+                : ""
+          running = dataApiSession()?.status?.(id) === "running"
+        }
+      } catch {
+        /* defensive: host data layers may lack get/status */
+      }
+      if (!model) {
+        const fromSnapshot = props.snapshot()[id]?.model
+        if (typeof fromSnapshot === "string" && fromSnapshot !== "unknown") model = safeText(fromSnapshot)
+      }
+      const parts = [model, title, money(costOf(id))]
+      if (running) parts.push("running")
+      const label = parts.filter((p) => p.length > 0).join(" · ")
+      labels.set(id, label)
+      return { title: label, value: id }
+    })
+
+    if (options.length <= 1) {
+      try {
+        context?.ui?.toast?.show({
+          message: "no other family sessions",
+          variant: "info",
+        })
+      } catch {
+        /* toast is best-effort */
+      }
+      return
+    }
+
+    pickerOpen = true
+    try {
+      void dialog
+        .select({
+          title: "Family sessions",
+          options,
+          search: (query, opts) => {
+            const q = query.trim().toLowerCase()
+            if (!q) return opts
+            return opts.filter((o) => (labels.get(o.value) ?? o.title).toLowerCase().includes(q))
+          },
+        })
+        .then((picked) => {
+          pickerOpen = false
+          if (typeof picked === "string" && picked.length > 0) navigateTo(picked)
+        })
+        .catch(() => {
+          pickerOpen = false
+          /* dialog settle races are host-managed; nothing to recover */
+        })
+    } catch (err) {
+      pickerOpen = false
+      console.error("[context-indicator] session picker failed:", err)
+    }
+  }
+
   const header = (): string => {
     const r = data().root
     if (!r) return "Context breakdown"
@@ -245,6 +486,7 @@ export function BreakdownPanel(props: {
     roleW: number
     modelW: number
     ctxW: number
+    costW: number
     updW: number
     gutter: string
   } => panelLayout(props.panel.width)
@@ -258,6 +500,8 @@ export function BreakdownPanel(props: {
       L.gutter +
       fit("ctx", L.ctxW) +
       L.gutter +
+      fit("cost", L.costW) +
+      L.gutter +
       "updated"
     )
   }
@@ -277,6 +521,8 @@ export function BreakdownPanel(props: {
       L.gutter +
       fit(ctx, L.ctxW) +
       L.gutter +
+      fit(money(costOf(e.sessionID)), L.costW) +
+      L.gutter +
       updatedAt(e.updatedAt)
     )
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-context-indicator",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "description": "Real-time OpenCode context-window usage indicator: per-category token breakdown written to a log file, plus an optional TUI sidebar. Dual V1 + V2 plugin entry.",
   "type": "module",
   "license": "MIT",
@@ -13,6 +13,7 @@
     "lib/",
     "tui.tsx",
     "README.md",
+    "CHANGELOG.md",
     "LICENSE"
   ],
   "engines": {
@@ -56,11 +57,11 @@
     }
   },
   "dependencies": {
-    "@opentui/solid": "0.5.16"
+    "@opentui/solid": "0.5.17"
   },
   "devDependencies": {
-    "@opencode/plugin": "^2.0.19",
-    "@opentui/core": "0.5.16",
+    "@opencode/plugin": "2.0.26",
+    "@opentui/core": "0.5.17",
     "@types/node": "26.6.3",
     "esbuild": "^0.28.2",
     "node-pty": "^1.1.0",

package/tui.tsx

@@ -38,7 +38,7 @@
  *
  * Runtime requirements: @opentui/core and solid-js are optional peers resolved
  * by OpenCode at runtime. @opentui/solid is a pinned direct dependency (exact
- * 0.5.16): OpenCode's TUI loader does not expose a host instance of it, so for
+ * 0.5.17): OpenCode's TUI loader does not expose a host instance of it, so for
  * npm-installed plugins the JSX pragma would otherwise fail to resolve
  * `@opentui/solid/jsx-runtime` (upstream opencode issue #33884).
  *
@@ -138,6 +138,15 @@ export default Plugin.define({
                 id: "context-indicator.breakdown",
                 title: "Context breakdown panel",
                 slash: { name: "cx" },
+                // Palette-visible AND directly bound: subagent session views
+                // force the composer into its "subagents" tab, which pushes
+                // keymap mode "composer" — the base-mode palette binding
+                // (ctrl+p) is inert there and there is no prompt to type /cx.
+                // A bind on this mode:"global" layer fires in every mode
+                // (leader matches <leader>b "toggle sidebar"; f4 as a direct
+                // single-chord fallback).
+                palette: true,
+                bind: "<leader>c,f4",
                 run: () => {
                   const panelApi = context?.ui?.panel
                   if (panelApi && typeof panelApi.open === "function") {