opencode-context-indicator 1.7.0 → 1.8.0

package/CHANGELOG.md

@@ -4,6 +4,97 @@ 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.8.0 — 2026-10-31
+
+- **The TUI sidebar and the `/cx` panel are live for npm installs too**
+  (workaround for upstream anomalyco/opencode#33884). OpenCode skips its
+  Solid/Babel JSX transform for any file inside a `node_modules` directory, so a
+  JSX-built slot mounted from an npm install rendered once and then froze on
+  "no data yet"; 1.7.x avoided that by disabling the surfaces entirely. The TUI
+  tree is now built with `jsx()` plus getter props (`lib/tui-h.ts`), which needs
+  no transform at all: the host rewrites the literal
+  `@opentui/solid/jsx-runtime` import to its own in-process module, so the
+  surfaces stay reactive from any install path. The npm-path auto-disable and its
+  console hint are gone; `file://` installs behave exactly as before.
+  - Relative imports of `.ts` files now carry the extension (`./lib/tui-h.ts`):
+    the host decides which files get the runtime rewrite by walking the import
+    graph with `import.meta.resolve`, which never probes extensions. An
+    extensionless import silently kept the literal `@opentui/solid` specifier
+    and failed with `Cannot find package '@opentui/solid'` - gate (b) now
+    rejects it.
+- **No runtime dependencies at all.** `@opentui/solid` moved from
+  `dependencies` to `devDependencies` (types + local typecheck only, still
+  pinned to an exact version). A fresh install drops from ~28 MB / ~800 files to
+  a 147 KB tarball (27 files, ~419 KB unpacked), and the duplicate
+  `@opentui/core`
+  / Babel toolchain
+  (`@babel/core`, `babel-plugin-module-resolver`, `babel-preset-solid`, `s-js`,
+  `entities`) no longer lands in the opencode cache next to the host's own copy.
+- **Baseline: opencode 2.2.5 / OpenTUI 0.8.** Dev dependencies, the peer floor
+  and the typecheck now target `@opentui/solid` + `@opentui/core` `0.8.0` and
+  `@opencode/plugin` `2.2.5` (opencode 2.2.3 made OpenTUI 0.8 mandatory for TUI
+  plugins; 2.2.5 is the latest release at the time of writing and still ships
+  0.8.0). `jsx()`/getter semantics are unchanged in 0.8 - `spreadExpression`
+  still reads every prop inside a `createRenderEffect` - so the JSX-free tree
+  behaves exactly as before; the whole gate set (types, fast gate, Check C) was
+  re-run on a real 2.2.5 host. A host that still ships OpenTUI 0.7 (opencode
+  2.2.0-2.2.2) may not load the TUI surfaces.
+- **Denominator follows opencode 2.2.5.** The context window used for every
+  percentage is now `input && context ? min(input, context) : input || context`,
+  mirroring core's `inputWindow()` after #60660: a provider that reports an
+  input limit above the context window cannot use it in full, because the
+  context also holds the reply. Before this release an input limit above the
+  context window was used as-is, which overstated the window (and printed a
+  compact-at point the host never reaches). Covered by unit test T37. opencode
+  2.2.5 also accepts a percentage `compaction.buffer`; that setting is not
+  visible to plugins, so a percentage buffer still shows the default reserve.
+- **Gates cover the failure mode end to end.** Fast gate (b) is rewritten: the
+  TUI surface must contain no `.tsx`/`.jsx` file and no `@jsx*` pragma, every
+  TUI source must parse with esbuild `loader:"ts"` (JSX syntax fails), and
+  imports must stay inside the host-bridged allowlist. Gate (c) now walks the
+  real import graph and fails if a host-bridged module is a production
+  dependency. New e2e **Check C**: `npm pack` → extract into a throwaway
+  `node_modules/opencode-context-indicator` → isolated `--standalone` TUI →
+  assert an env-gated getter-driven probe keeps re-rendering (a frozen tree
+  writes the same value forever). `node test/e2e-tui.mjs --check-c` runs it
+  alone, without an LLM call.
+- **Docs:** the README no longer describes a `file://`-only live sidebar;
+  "Live sidebar" documents the JSX-free design and the size win.
+
+## 1.7.1 — 2026-10-29
+
+- **Fixed: the live log no longer prints `ctx=0` above real categories.** A hook
+  breakdown whose instance has no request counters (a mirror that only saw the
+  compaction, so `input`/`ctx` are still 0) used to be printed as-is: the header
+  contradicted the category lines below it. Such an entry now takes the same
+  path as a missing/fallback one and borrows the hook-measured `state.json`
+  snapshot whole (categories, counters, residual and a `snapshot=` stamp; a
+  snapshot without a timestamp is still marked `snapshot=unknown`). A counter is
+  knowledge only when it is positive: a borrowed entry whose own counters are 0,
+  or a ctx-only snapshot with no input, prints the unknown counter as `?`, and
+  the residual as `n/a (input unknown on this instance)` instead of a fabricated
+  `0` (`other = input - sum` needs an input). The same rule now applies to a
+  local hook entry that knows `ctx` but not `input`. T36 covers all four cases:
+  whole-entry borrow, no snapshot, zero-counter snapshot, ctx-only snapshot
+  (86 checks).
+- **Fixed: the compaction reserve is 15 % again (1.7.0 regression).** 1.7.0
+  switched the denominator to a 10 % share on the strength of an unreleased
+  branch head. Every RELEASED host from 2.1.4 through 2.2.2 (2.1.4, 2.2.0,
+  2.2.1, 2.2.2) still has `RESERVE_SHARE = 0.15` in
+  `packages/core/src/session/compaction.ts` (verified tag by tag), so on those
+  hosts 1.7.0 overstated the ceiling and the `compact at` line by ~5 % of the
+  window (~26 k tokens at 512 k) and therefore under-reported every `%`. The
+  plugin now mirrors `max(floor(window * 0.15), window >= 32_000 ? 16_000 : 0)`
+  again; the formula, the 16 k floor and the `2 * RESERVE_MIN` gate are
+  unchanged. Docs, the T16/T26 tables and the seed expectations are back on the
+  15 % numbers.
+- Dev: the isolated e2e (plugin load + state write) was re-run against the
+  **2.2.2** Desktop CLI (`opencode v2.2.2`); the Desktop 2.2.2 `app.asar` still
+  carries the `@opencode/plugin/gui` / `@opencode/plugin/rpc` bridge and the
+  `ComposerPill` / `Rpc.define` / `session.panel` symbols the experimental panel
+  uses, and `opencode-cli.exe` still exposes `opentui:runtime-module:` plus the
+  `node_modules` exclusion filter.
+
 ## 1.7.0 — 2026-10-29
 
 Desktop GUI release (experimental): the plugin now has a surface in the
@@ -60,14 +151,14 @@ OpenCode Desktop app, not just in the terminal.
   its `ctx`/`input` counters, tagged `snapshot=<updatedAt>` — instead of this
   instance's fallback-shaped view. Repeated compactions of one session are also
   no longer collapsed into a single note when the host omits the event id.
-- **Reserve share corrected for opencode 2.2.x.** `calculateCeiling()` keeps the
-  same shape but the reserve share dropped from 15 % to 10 % in 2.2.0 (the
-  "fit output limits to the context window" change, PR #51271), so the plugin
-  now mirrors `max(floor(window * 0.10), window >= 32_000 ? 16_000 : 0)`. Every
-  `%` and the `compact at` line are now computed against the host's actual
-  trigger; on a large window the old formula understated the ceiling by ~5 % of
-  the window (~26 k tokens at 512 k). The 1.6.0 note that the ceiling was
-  unchanged in 2.2.0 was wrong — the `2 * RESERVE_MIN` gate did stay.
+- **Reserve share (claim in 1.7.0 was wrong; corrected in 1.7.1).** This
+  release switched the denominator to a 10 % share; no host in the verified
+  range 2.1.4 through 2.2.2 used it. `calculateCeiling()` in those tags keeps
+  `RESERVE_SHARE = 0.15`, so 1.7.0 overstated the ceiling (and the `compact at`
+  line) by ~5 % of the window (~26 k tokens at 512 k) on them and therefore
+  under-reported every `%`. The 1.6.0 note that the ceiling was unchanged in
+  2.2.0 was right (the formula and the `2 * RESERVE_MIN` gate did stay); the
+  share line here was the wrong part.
 - Dev: `lib/format.js` (pure `fmt`/`num`) extracted so the GUI bundle has no
   `node:*` import; gate (a) now expands `dist/`, gate (e)/(f) scan `gui/` and the
   GUI build config, new gate (g) validates the built CJS bundle (app-provided
@@ -100,11 +191,13 @@ Host alignment release: opencode 2.2.0 moved TUI plugins to OpenTUI 0.7.
   opencode 2.0.16+. The TUI module now ships compiled against OpenTUI 0.7, so
   the sidebar and the `/cx` panel require **opencode ≥ 2.2.0** and cannot load on
   an older host. Older-host installation was not re-verified for this release.
-- **Compaction ceiling unchanged (superseded — see 1.7.0).**
+- **Compaction ceiling unchanged (this note was right; 1.7.0 briefly wrong).**
   `calculateCeiling()` in 2.2.0 is identical
   to 2.1.x, so the `0.15 / 16k / 32k` reserve formula and every `%` denominator
   are unaffected. (2.2.0 changed how a *compaction request* is sized - measured
-  prompt instead of characters - not the trigger.)
+  prompt instead of characters - not the trigger. 1.7.0 later claimed the share
+  had dropped to 10 %; see 1.7.1 - no host in the verified range
+  2.1.4-2.2.2 uses it.)
 - Dev: `drift-watch` is green again (host 2.2.0, OpenTUI 0.7.0); `tsc`,
   `prepublish` and the isolated e2e pass against the 2.2.0 CLI.
 
@@ -150,8 +243,9 @@ Fix-and-hygiene release after a full-project review. No new commands.
 
 - **Compaction ceiling aligned with opencode 2.1.4.** `lib/limits.js`
   now mirrors `calculateCeiling()` exactly: the reserve is
-  `max(floor(window * 0.15), window >= 2 * 16_000 ? 16_000 : 0)` (was 10%;
-  the share moved again in 2.2.0 — see 1.7.0),
+  `max(floor(window * 0.15), window >= 2 * 16_000 ? 16_000 : 0)` (the plugin's
+  older builds used 10 %; no host in the verified range uses it - the share
+  stayed 0.15 there),
   and an override buffer is honored **only while it is smaller than the
   window** — a buffer configured for a larger model is ignored instead of
   leaving zero room. The `compact at` line and the `%` denominator now match the

package/README.md

@@ -15,8 +15,9 @@ 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, and an **experimental Desktop GUI part**
 (`./gui-experimental`: a side-panel tab and a composer pill). The V2 path is
-**tested against opencode 2.2.0** (the isolated load + state-write e2e was also
-re-run against the 2.2.1 Desktop CLI); the V1 path against 1.18.29+.
+**tested against opencode 2.2.5 / OpenTUI 0.8** (the isolated load + state-write
+e2e was also re-run against the 2.2.0-2.2.4 Desktop CLI); the V1 path against
+1.18.29+.
 
 > **V1 is feature-frozen.** It is kept working for compatibility (bug fixes
 > only); all new features land in the V2 path.
@@ -32,7 +33,7 @@ re-run against the 2.2.1 Desktop CLI); the V1 path against 1.18.29+.
 For every served request the plugin estimates how the context window is split:
 
 ```
-[2026-…] session=ses_abc model=… ctx=45.2k/120k (38%) … input=44.1k
+[2026-…] session=ses_abc model=… ctx=45.2k/120k (37.7%) count=45.2k usable=… limit=… maxOutput=… reserved=… input=44.1k
   user        4.2k (est tokens)
   assistant   3.1k (est tokens)
   reasoning   0.8k (est tokens) (exact 1.2k)
@@ -42,7 +43,7 @@ For every served request the plugin estimates how the context window is split:
   tool schemas 1.4k (est tokens)
   other       5.6k (= input - sum of estimates)
   source      context-hook
-  prompt cache read=12.0k (27% of input) write=1.1k (provider-reported)
+  prompt cache read=12.0k write=1.1k (provider-reported; subset of input)
   reclaim     ~9.8k redundant tool output (3 duplicate(s) — estimate)
   subagents   2 session(s): in=8.1k out=2.3k r=1.0k worst=12%
 ```
@@ -61,7 +62,9 @@ For every served request the plugin estimates how the context window is split:
   `input + output + cache.read + cache.write`. Percentages are **not clamped**
   at 100% — exceeding the window stays visible.
 * `prompt cache` is **provider-reported and exact** (`tokens.cache.read` /
-  `tokens.cache.write`), shown as a share of `input`. It is a *subset* of input,
+  `tokens.cache.write`). The live snapshot prints the raw read/write counts;
+  `/context` and `/context-breakdown` also append the read share of `input`
+  when the provider reported it. It is a *subset* of input,
   so it is deliberately **not** added to the category sum: a cache read means the
   provider served those prompt tokens from its prompt cache, not that they are
   absent from the window. `n/a` when the provider reports nothing.
@@ -72,17 +75,23 @@ For every served request the plugin estimates how the context window is split:
   duplicate group), reported honestly as *"N redundant tool outputs ≈ X tokens"*
   — never as "the model wasted effort". Findings are per-session and **path-free
   in the persisted/exported form**.
-* The denominator is the **opencode 2.2.x compaction ceiling**: `window =
-  limit.input || limit.context`; `reserve = max(floor(window * 0.10), window >=
+* The denominator is the **opencode 2.x compaction ceiling**: `window =
+  limit.input && limit.context ? min(limit.input, limit.context) : limit.input
+  || limit.context`; `reserve = max(floor(window * 0.15), window >=
   2 * 16_000 ? 16_000 : 0)`; the ceiling is `window - reserve`. This mirrors
-  `calculateCeiling()` in `packages/core/src/session/compaction.ts` (the reserve
-  share is 10% since 2.2.0 / PR #51271; it was 15% up to 2.1.x). When opencode
+  `calculateCeiling()` in `packages/core/src/session/compaction.ts`, whose
+  `RESERVE_SHARE` is 0.15 in every released host from 2.1.4 through 2.2.5 (the
+  unreleased `v2` branch has a different share; the plugin follows the release,
+  not the branch). When opencode
   carries a `compaction.buffer` configured in its own settings, the plugin
   cannot read that value (it is not exposed to plugins), so the default
   reserve formula is used — set `OPENCODE_CONTEXT_INDICATOR_COMPACT_BUFFER`
   to override the reserve for testing or custom setups (non-negative integer <=
   1e9; invalid values are silently ignored; a buffer that is **not smaller than
   the window** is ignored, exactly like core, so it can never leave zero room).
+  Since opencode 2.2.5 that setting also accepts a percentage (`"buffer": "20%"`),
+  which the plugin cannot read either, so a percentage buffer is **not**
+  reflected in the "compact at" line until it is mirrored from core.
 
 ### Toast (V1 only)
 
@@ -114,9 +123,9 @@ other          5.6k   12%
 updated 12:30:01
 ```
 
-> Requires a `file://` install from a path outside `node_modules`; on the npm
-> path the sidebar is auto-disabled. See
-> [Live sidebar: npm vs file:// install](#live-sidebar-npm-vs-file-install).
+> Works on **every** install path, including the npm one — the TUI surfaces are
+> built without JSX precisely so `node_modules` installs stay live. See
+> [Live sidebar](#live-sidebar).
 
 ### Slash commands (V2)
 
@@ -125,13 +134,13 @@ commands:
 
 | Command | Scope | Delivery | Agent turn? |
 | --- | --- | --- | :---: |
-| `/context` | **this session only** (no subagents); cache + `state.json` only | `resume:true` — the model echoes the 3-line summary into the transcript | yes |
+| `/context` | **this session only** (no subagents); cache + `state.json` only | `resume:true` - the model echoes the short summary into the transcript | yes |
 | `/context-breakdown` | this session **+ all subagent descendants** | `resume:true` — the model echoes the table into the transcript | yes |
 | `/context-diff` | **this session only**; previous measurement vs current | `resume:true` — the model echoes the delta table into the transcript | yes |
 
 #### `/context` — quick summary (main session only)
 
-A 3-line summary of the current session, built purely from the in-memory cache
+A short summary of the current session, built purely from the in-memory cache
 and the `state.json` snapshot: **no subagent traversal and no live RPC**, so
 collection is instant (delivery itself still runs an agent turn — see below).
 The synthetic notice chip shows a self-contained one-liner (label =
@@ -155,6 +164,7 @@ instructions to follow.
 <context-summary>
 **Context** — your-model · 41.5k / 168k (25%)
 usr 2.3k · asst 285 · rsn 9.6k · tool 2.1k · out 24.7k · sys 8.5k · schm 3.8k · oth 4.1k
+compact at 143k (25.0k reserve)
 updated 12:36:16 (snap)
 </context-summary>
 ```
@@ -264,7 +274,8 @@ the content is visible in the Desktop (the chip only shows `description`).
 `CONTEXT_BREAKDOWN_RESUME` controls `/context-breakdown` back to a plain
 notice if needed.
 
-> **E2E note (Desktop 2.0.19, local model `llama3.2:latest`, `build` agent).**
+> **E2E note (historical run on Desktop 2.0.19, local model `llama3.2:latest`,
+> `build` agent).**
 > `resume:true` behaved as designed: the synthetic item was drained into
 > `/message` and a turn ran; the assistant message contained the table verbatim
 > (the trailing `_…_` note line was dropped by the model). Because `resume:true`
@@ -360,9 +371,8 @@ carries its tool name); tool **result outputs** are counted here but not by the
 server's categories — which is why the residual `other` can look large. Top 5
 are shown. Empty state: `no messages yet`.
 
-Live only for a `file://` install from a path outside `node_modules`; the npm
-path auto-disables it (upstream `#33884`). The Desktop has no TUI, so it uses
-`/context`, `/context-breakdown` and `/context-diff` instead.
+Live on every install path (npm and `file://`). The Desktop has no TUI, so it
+uses `/context`, `/context-breakdown` and `/context-diff` instead.
 
 #### Export (redacted)
 
@@ -471,9 +481,8 @@ Notes — these reflect what the plugin API actually exposes today:
   therefore delivers everything through the log file, the TUI sidebar, the
   `/cx` session panel and the `/context` / `/context-breakdown` / `/context-diff` slash commands. The sidebar is a TUI-process
   slot and does not exist in the Desktop app; the slash commands work in **both**.
-  The TUI sidebar is **live only for a `file://` install** from a path outside
-  `node_modules`; on the npm path it is auto-disabled (upstream `#33884`) — see
-  [Live sidebar: npm vs file:// install](#live-sidebar-npm-vs-file-install).
+  The TUI sidebar is live on **every** install path, npm included — see
+  [Live sidebar](#live-sidebar).
 * **V1 has no sidebar and no slash command.** The command/slot API (and the
   `./tui` entry) is a V2 feature; OpenCode 1.x has no equivalent, so V1 is
   toast + log only.
@@ -535,8 +544,8 @@ or add it to `opencode.jsonc`:
 ```
 
 The `./tui` sidebar entry is loaded automatically alongside the main plugin in
-the terminal TUI — but its live behaviour depends on the install method, see
-[Live sidebar: npm vs file:// install](#live-sidebar-npm-vs-file-install) below.
+the terminal TUI, on every install method — see [Live sidebar](#live-sidebar)
+below.
 For a CLI-only setup against remote servers, the package can also be listed in
 [`cli.json`](https://opencode.ai/v2/docs/cli/plugins):
 
@@ -544,45 +553,38 @@ For a CLI-only setup against remote servers, the package can also be listed in
 { "plugins": ["opencode-context-indicator"] }
 ```
 
-### Live sidebar: npm vs file:// install
+### Live sidebar
 
-The TUI sidebar is a **TUI-process slot**. On OpenCode 2.x it behaves
-differently depending on **how the plugin was installed** — an upstream OpenCode
-limitation (`anomalyco/opencode#33884`), not a plugin bug: OpenCode's TUI loader
-skips the host Solid transform for any path inside a `node_modules` directory, so
-a slot mounted from an npm install renders once and then never live-updates.
+The TUI sidebar and the `/cx` panel are **TUI-process slots**, live on every
+install path — npm (`opencode plugin add opencode-context-indicator`), `file://`
+and the local `plugins/` copy alike.
 
-| Install | Desktop | TUI commands | TUI live sidebar | TUI panel (/cx) |
-| --- | :---: | :---: | :---: | :---: |
-| npm (`opencode plugin add opencode-context-indicator`) | ✅ | ✅ | ❌ auto-disabled (upstream #33884) | ❌ auto-disabled |
-| `file://` (path **outside** any `node_modules`) | ✅ | ✅ | ✅ live | ✅ live |
-
-On the **npm** path the plugin detects that it lives under `node_modules` and
-**disables the sidebar and the panel gracefully** — it logs a single hint and
-registers no slot, so you never see a frozen "no data yet" panel. The `/context`
-/ `/context-breakdown` / `/context-diff` slash commands and the breakdown log file keep working on
-every install.
-
-#### Getting the live sidebar (`file://` install)
+That used to be false: OpenCode skips its Solid/JSX transform for any file inside
+a `node_modules` directory (upstream `anomalyco/opencode#33884`), so a JSX-built
+slot mounted from an npm install rendered once and then froze on
+"no data yet". Since **1.8.0** the plugin ships **no JSX at all**: the tree is
+built with `jsx()` and getter props (`lib/tui-h.ts`), which needs no transform,
+and the host rewrites the literal `@opentui/solid/jsx-runtime` import to its own
+in-process module. The package therefore also declares **no runtime
+dependencies** — nothing is installed next to it, so there is no second
+Solid/OpenTUI instance to fight with.
 
-1. Put the package **outside** any `node_modules`: clone the repository, or
-   unpack the npm tarball (`npm pack opencode-context-indicator`, then extract
-   the `.tgz`) — e.g. into `C:\Users\you\plugins\opencode-context-indicator`.
-   Double-check that the chosen path contains **no `node_modules` segment**
-   (e.g. `C:\Users\you\plugins\...`, not `.../node_modules/...`).
-2. Point OpenCode at that directory in `~/.config/opencode/opencode.jsonc`:
+| Install | Desktop | TUI commands | TUI live sidebar | TUI panel (`/cx`) |
+| --- | :---: | :---: | :---: | :---: |
+| npm | ✅ | ✅ | ✅ live | ✅ live |
+| `file://` (any path) | ✅ | ✅ | ✅ live | ✅ live |
 
-   ```jsonc
-   {
-     "plugins": ["file:///C:/Users/you/plugins/opencode-context-indicator"]
-   }
-   ```
+`/context`, `/context-breakdown`, `/context-diff` and the breakdown log file work
+on every install regardless.
 
-3. Restart OpenCode. The sidebar is now live and updates as context grows.
+> If a sidebar shows "no data yet" forever on 1.8.0+, that is a bug — please
+> report it with the host version. On 1.7.x and older, the npm path was disabled
+> by design; upgrading is the fix.
 
-> ⚠️ The `file://` path must **not** contain a `node_modules` segment. If it
-> does, OpenCode skips the Solid transform and the sidebar will not update; the
-> plugin auto-disables it and logs the hint above.
+`test/e2e-tui.mjs` Check C proves this end to end: it runs `npm pack`, extracts
+the tarball into a throwaway `node_modules/opencode-context-indicator`, boots an
+isolated `--standalone` TUI from there and asserts that a getter-driven probe
+node actually re-renders (a frozen tree writes the same value forever).
 
 ### OpenCode 1.x (V1)
 
@@ -599,25 +601,28 @@ Add the package name to the `plugin` array in your `opencode.json`:
 Copy `index.js` and the whole `lib/` directory into
 `~/.config/opencode/plugins/`, keeping the `lib/` subdirectory next to the
 plugin file so the plugin's relative imports resolve. The `lib/` folder is
-support code, not a separate plugin entry:
+support code, not a separate plugin entry; copy **every** module in it
+(`cache.js`, `commands.js`, `contributors.js`, `dedup.js`, `desktop.js`,
+`estimate.js`, `format.js`, `limits.js`, `rpc.js`, `state.js`, `tui-data.js`,
+`tui-data.d.ts`, `tui-h.ts`, `tui-panel.ts`, `tui-sidebar.ts`, `tui-theme.js`,
+`v1.js`, `v2.js`) — a
+missing module only disables the surface that imports it, but the server part
+stops loading if one of its own imports is absent:
 
 ```
-~/.config/opencode/plugins/context-indicator.js
-~/.config/opencode/plugins/lib/cache.js
-~/.config/opencode/plugins/lib/commands.js
-~/.config/opencode/plugins/lib/dedup.js
-~/.config/opencode/plugins/lib/estimate.js
-~/.config/opencode/plugins/lib/limits.js
-~/.config/opencode/plugins/lib/state.js
-~/.config/opencode/plugins/lib/v1.js
-~/.config/opencode/plugins/lib/v2.js
+~/.config/opencode/plugins/context-indicator.js   (this package's index.js)
+~/.config/opencode/plugins/lib/*.js
+~/.config/opencode/plugins/lib/*.ts
 ```
 
+`tui.ts` (the `./tui` entry, at the package root) is only needed for the
+terminal TUI surfaces; it imports `lib/tui-h.ts`, `lib/tui-sidebar.ts` and
+`lib/tui-panel.ts` by their `.ts` file names, so copy those alongside the `.js`
+modules.
+
 To use the sidebar locally as well, point OpenCode at a `file://` copy of the
-package that lives **outside any `node_modules`** (see
-[Live sidebar: npm vs file:// install](#live-sidebar-npm-vs-file-install)) — that
-is the only install path that keeps the sidebar live. An npm install auto-disables
-the sidebar instead.
+package — the sidebar is live there too, exactly as with an npm install (see
+[Live sidebar](#live-sidebar)).
 
 ---
 
@@ -633,25 +638,22 @@ the sidebar instead.
   indicator degrades
   gracefully (the breakdown falls back to throttled `session.messages` fetches
   and toasts keep working).
-* **OpenCode ≥ 2.2.0** for the V2 path with the TUI surfaces (built and verified
-  against **2.2.0**; the isolated load + state-write e2e also passes on the
-  **2.2.1** Desktop CLI). The server-only V2 path keeps working on
-  2.0.16+; the TUI module pins the OpenTUI generation it was compiled against,
-  so a host on OpenTUI 0.6 (opencode ≤ 2.1.4) will not load the TUI surfaces -
-  neither the sidebar nor the `/cx` panel - from a 1.6.x install.
+* **OpenCode ≥ 2.2.3** for the V2 path with the TUI surfaces (built and verified
+  against **2.2.5**, the latest at the time of writing, which still ships OpenTUI
+  **0.8**; the isolated load + state-write e2e also passes on the 2.2.0-2.2.4
+  Desktop CLI). The server-only V2 path keeps working on
+  2.0.16+. The TUI module is typed against the OpenTUI generation the host ships,
+  so a host on an older OpenTUI (0.7 for opencode 2.2.0-2.2.2, 0.6 for
+  opencode ≤ 2.1.4) may not load the TUI surfaces - neither the sidebar nor the
+  `/cx` panel - from a 1.8.x install.
 * **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.7.0`, matching
-  the OpenTUI stack OpenCode 2.2.0 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
-  host Solid transform and get an isolated OpenTUI copy). Because of that same
-  upstream limitation, on the **npm** path the sidebar is **auto-disabled**
-  (the plugin logs one hint and registers no slot) — use a `file://` install for
-  the live sidebar, see [Live sidebar: npm vs file:// install](#live-sidebar-npm-vs-file-install).
+  ships with OpenCode. `@opentui/core`, `@opentui/solid` and `solid-js` are
+  resolved by OpenCode at runtime from its **own** modules (the TUI loader
+  rewrites those imports to in-process instances), so the package declares them
+  as optional peers only and installs **no runtime dependencies at all**. This is
+  what makes the sidebar live for npm installs as well
+  (see [Live sidebar](#live-sidebar)); `@opentui/solid` sits in
+  `devDependencies` purely for local typechecking.
 * **Desktop GUI part** (optional, experimental): needs an OpenCode Desktop
   release that loads the `./gui-experimental` export (opencode 2.2.0+, where the
   GUI plugin API exists). The bundle is prebuilt and ships in the package, so it
@@ -724,10 +726,11 @@ caller.
 
 ```bash
 npm run build:gui             # build dist/gui-experimental.cjs (required by the gate)
-npm run test:prepublish       # fast gate: tarball + tui.tsx + resolve + T1-T35 unit checks + GUI bundle
+npm run test:prepublish       # fast gate: tarball + JSX-free TUI + resolve + T1-T36 unit checks + GUI bundle
 npm run test:types            # tsc for the TUI entry AND the Desktop GUI part
-npm run test:e2e              # full E2E: isolated plugin load + one "Say OK" round-trip
+npm run test:e2e              # full E2E: plugin load + one "Say OK" round-trip + npm-layout liveness
 npm run test:e2e:quick        # E2E load-only, no LLM call
+npm run test:e2e -- --check-c # E2E npm-layout liveness only, no LLM call
 npm run test:drift            # advisory: warns on non-breaking host drift (also in CI)
 npm run test:drift:strict     # release check: fails on ANY host drift
 ```
@@ -736,7 +739,7 @@ npm run test:drift:strict     # release check: fails on ANY host drift
 (`npm run build:gui && node test/prepublish.mjs && node test/e2e-tui.mjs --full`) and is skipped with
 `--ignore-scripts`. The whole chain takes roughly **1 minute** (fast gate ~20 s,
 isolated E2E ~10 s warm / up to ~90 s cold); the E2E is bounded by INIT 45 s +
-STEP 80 s, ~3 min total.
+STEP 80 s + PROBE 45 s, ~4 min total.
 
 ### What the gates check
 
@@ -745,10 +748,10 @@ STEP 80 s, ~3 min total.
 | Step | What | Why |
 |---|---|---|
 | (a) tarball composition | `package.json` `files[]` expands to the base files plus every `lib/*` module (count asserted dynamically); `docs/` may contain images only; `dist/` may contain only the built GUI bundle | no test/node_modules/tsconfig in the tarball, and no published export pointing at nothing |
-| (b) pragma regression | esbuild `--jsx=automatic` → `@opentui/solid/jsx-runtime` present, `react/jsx-runtime` absent | a removed/broken pragma kills the sidebar on npm install |
-| (c) resolve chain | replica install: host-bridged + peer packages resolve; local tui.tsx relative imports resolve via node from the entry (resolve-bridge.cjs) | broken peer/optional dep or a bad local import silently breaks the sidebar |
-| (d) unit harness T1-T35 | limit/agent/state fix assertions plus measureContributors, redacted-export, shared category-helper, sanitizer/unicode, prompt-cache, waste-detector, compaction-reserve, top-consumer, diff, subagent-rollup and Desktop-RPC checks (85 total; T30 schema-vs-builder drift, T31 registration + handler, T32-T35 fallback-vs-hook category priority across the report, the shared state file and the live log, T25c/T25d compaction-hook arming, T34 cross-instance summary merge) | regressions in modelLimits, writeStateFile, hydrate, contributors, export, subagent lifetime, and a GUI/server wire mismatch |
-| (e) corporate-identifier scan | no forbidden identifiers in the published surface (`index.js`, `tui.tsx`, `lib/*`, `gui/*`, `README.md`, `CHANGELOG.md`, `package.json`, the GUI build config) or the test tree | compliance |
+| (b) JSX-free TUI | no `.tsx`/`.jsx` in the TUI surface (root + `lib/`), every TUI source parses with esbuild `loader:"ts"` (JSX syntax fails), no `@jsx*` pragma, imports stay inside the host-bridgeable allowlist, relative imports carry a file extension | OpenCode skips its Solid transform under `node_modules` (#33884): one JSX file freezes the npm-installed sidebar |
+| (c) resolve chain | walks the real TUI import graph (`resolve-bridge.cjs`): every bare specifier is host-bridged, every relative one resolves to a shipped file, and **no host-bridged module is a production dependency** (a second Solid/OpenTUI instance freezes the surfaces) | an accidental runtime dependency, or a bad local import, silently breaks the sidebar |
+| (d) unit harness T1-T36 | limit/agent/state fix assertions plus measureContributors, redacted-export, shared category-helper, sanitizer/unicode, prompt-cache, waste-detector, compaction-reserve, top-consumer, diff, subagent-rollup and Desktop-RPC checks (86 total; T30 schema-vs-builder drift, T31 registration + handler, T32-T36 fallback-vs-hook category priority across the report, the shared state file and the live log (T36: a counter-less hook entry borrows the snapshot or prints `?`), T25c/T25d compaction-hook arming, T34 cross-instance summary merge) | regressions in modelLimits, writeStateFile, hydrate, contributors, export, subagent lifetime, and a GUI/server wire mismatch |
+| (e) corporate-identifier scan | no forbidden identifiers in the published surface (`index.js`, `tui.ts`, `lib/*`, `gui/*`, `README.md`, `CHANGELOG.md`, `package.json`, the GUI build config) or the test tree | compliance |
 | (f) non-English scan | no non-ASCII letters (`\p{L}` above U+007F) in the same published surface and test tree (`docs/` is image-only and is not text-scanned) | English-only source rule |
 | (g) Desktop GUI bundle | `dist/gui-experimental.cjs` exists and is a non-trivial single-file CJS bundle: no ESM `import`, no dynamic `import()`, no Node built-in, and every app-provided module (`solid-js`, `solid-js/web`, `@opencode/plugin/gui`, `@opencode/plugin/rpc`) still a `require()` - no bundled second copy, no React/OpenTUI/bare-`opencode` import | a stale or hand-edited bundle, or a build that inlines the app instance, breaks the Desktop panel at load time |
 
@@ -758,6 +761,7 @@ STEP 80 s, ~3 min total.
 |---|---|---|
 | A — plugin load | spins a private `opencode --standalone` PTY against an **isolated global config** (`OPENCODE_CONFIG_DIR` → `%TEMP%/oci-e2e-config`, sole plugin entry = this checkout's `file://` URL), then asserts **from the host opencode log** (atomic lines, immune to PTY interleaving) that the plugin loaded and its `entrypoint` is **this checkout's `index.js`** — both fail-closed | catches a plugin that no longer imports cleanly, or an isolated config the host did not honor |
 | B — live update | one `opencode run "Say OK" --standalone` round-trip; asserts the LLM answered **and** the isolated `state.json` gained a session with `ctx > 0` | catches a regression in the `session.idle` → `writeStateFile` path |
+| C — npm-layout liveness | `npm pack` → extract into a throwaway `node_modules/opencode-context-indicator` → isolated `--standalone` TUI from there; an env-gated probe node (getter-driven `ref`) must produce three different rendered texts | proves the #33884 workaround: the packaged install stays **reactive** from a `node_modules` path, where the host skips the Solid transform |
 
 The E2E is fully **non-invasive** to your running OpenCode Desktop:
 
@@ -774,6 +778,8 @@ The E2E is fully **non-invasive** to your running OpenCode Desktop:
   Check B uses your real global config read-only (the round-trip needs the
   provider/model defined there). Your real config is never modified;
 - `OPENCODE_DISABLE_PROJECT_CONFIG=1` avoids project-level config;
+- Check C uses its own private config, XDG roots, DB and state file under
+  `%TEMP%/oci-check-c` (nothing is shared with Check A or with your install);
 - any `opencode-cli` instance the test itself spawned is force-killed after each
   check (`serve --service` — your Desktop background service — is never touched);
 - exactly **one** minimal LLM call (`Say OK`) is made, in the isolated session.
@@ -793,7 +799,7 @@ and on a daily schedule (GitHub auto-parks scheduled workflows after 60 days of
 repo inactivity — a push or manual run re-enables them):
 
 1. `npx --no-install tsc --noEmit` and `npx --no-install tsc -p tsconfig.gui.json --noEmit`
-   - typecheck of the TUI entry (`tui.tsx` + its `lib/*` imports) and of the
+   - typecheck of the TUI entry (`tui.ts` + its `lib/*` imports) and of the
    Desktop GUI part (`gui/*.tsx`, Solid JSX);
 2. `npm run build:gui` - build the Desktop GUI bundle before the gate inspects it;
 3. `test/prepublish.mjs` - the full fast gate (a)-(g), including the standalone

package/index.js

@@ -117,7 +117,7 @@
  *     %TEMP%\opencode-context-indicator-state.json   (os.tmpdir())
  *   — a machine-readable { sessionID: { model, providerID, ctx, usable,
  *     reserve, limit, categories{...}, updatedAt } } snapshot consumed by the
- *   optional TUI sidebar in ./tui.tsx (package entry "./tui"). Written atomically
+ *   optional TUI sidebar in ./tui.ts (package entry "./tui"). Written atomically
  *   (temp + rename), keyed by session, bounded to MAX_TRACKED_SESSIONS, and
  *   strictly additive: any failure is swallowed and never affects the log.
  *
@@ -127,11 +127,11 @@
  *
  *   - Metric: the native opencode overflow count — tokens.total when present,
  *     else input + output + cache.read + cache.write — compared against the
- *     model's compaction ceiling (opencode calculateCeiling, core 2.2.x):
- *     window = limit.input || limit.context, reserve = max(10% of window, 16k
- *     when window >= 32k), usable = window - reserve (the share was 15% up to
- *     2.1.x). Percentages are NOT
-  *     clamped at 100% - exceeding the ceiling must stay visible.
+ *     model's compaction ceiling (opencode calculateCeiling, released 2.x):
+ *     window = min(input, context) when both are known, else input || context;
+ *     reserve = max(15% of window, 16k when window >= 32k);
+ *     usable = window - reserve. Percentages are NOT
+ *     clamped at 100% - exceeding the ceiling must stay visible.
  *   - Category estimates use a unicode-aware heuristic (see estimateTokens):
  *     Cyrillic ~2.5 chars/token, CJK ~1.5, latin/ASCII ~4. These are ESTIMATES,
  *     not a tokenizer; "other" is the residual input − sum of estimates.

package/lib/contributors.js

@@ -1,6 +1,7 @@
 // lib/contributors.js
 //
-// Pure contributor-measurement helpers extracted from tui.tsx for unit testing.
+// Pure contributor-measurement helpers extracted from the TUI panel (lib/tui-panel.ts)
+// for unit testing.
 // All functions are stateless transforms of their arguments.
 //
 // Functions: asRecord, safeText, measureContributors, contributorLine,
@@ -185,7 +186,7 @@ function exportFileName(sessionID, now) {
 }
 
 // Build the redacted export payload. All IO (mkdirSync/writeFileSync) and
-// toasts stay in tui.tsx as the thin exportRedacted() wrapper.
+// toasts stay in lib/tui-panel.ts as the thin exportRedacted() wrapper.
 //
 // Fields: generatedAt, session{id8-prefixed id, model, providerID},
 // family[role/model/ctx/usable/limit/pct/updated], contributors[kind/tool/ref/
@@ -193,7 +194,7 @@ function exportFileName(sessionID, now) {
 // content, NO contributor preview text.
 //
 // panelDenom / panelRole are passed as parameters so this file stays pure and
-// tui.tsx controls their source.
+// lib/tui-panel.ts controls their source.
 function buildRedactedPayload({ sessionID, root, rows, contributors, now, panelDenom, panelRole, num }) {
   const id8 = String(sessionID).slice(0, 8);
   return {
@@ -227,7 +228,7 @@ function buildRedactedPayload({ sessionID, root, rows, contributors, now, panelD
 }
 
 // ---------------------------------------------------------------------------
-// Panel helpers (pure, shared with tui.tsx)
+// Panel helpers (pure, shared with lib/tui-panel.ts)
 // ---------------------------------------------------------------------------
 
 // Per-row denominator with the same fallback cascade as the server table: