@cardinal4/opencode-fold-diffs 0.3.5 → 0.3.7

package/README.md

@@ -1,7 +1,7 @@
 # opencode-fold-diffs
 
 > [!NOTE]
-> **Unofficial OpenCode V2 port of [Tanner Bruhn](https://github.com/tannerbruhn)'s [`opencode-fold-diffs`](https://github.com/tannerbruhn/opencode-fold-diffs) (npm: `opencode-fold-diffs`) — the OpenCode V1 plugin.** This fork — [`cardin/opencode-fold-diffs`](https://github.com/cardin/opencode-fold-diffs), published as [`@cardinal4/opencode-fold-diffs`](https://www.npmjs.com/package/@cardinal4/opencode-fold-diffs) — ports it to **OpenCode V2** (`@opencode/cli` 2.x, `opencode v2.0.x`). Install this fork on V2, upstream on V1. Tanner has not reviewed or endorsed it; report bugs here, not upstream.
+> **Unofficial OpenCode V2 port of [Tanner Bruhn](https://github.com/tannerbruhn)'s [`opencode-fold-diffs`](https://github.com/tannerbruhn/opencode-fold-diffs) (npm: `opencode-fold-diffs`) — the OpenCode V1 plugin.** This fork — [`cardin/opencode-fold-diffs`](https://github.com/cardin/opencode-fold-diffs), published as [`@cardinal4/opencode-fold-diffs`](https://www.npmjs.com/package/@cardinal4/opencode-fold-diffs) — ports it to **OpenCode V2** (`@opencode/cli` 2.x, tested with `opencode 2.2.0`). Install this fork on V2, upstream on V1. Tanner has not reviewed or endorsed it; report bugs here, not upstream.
 
 **Every `write`, `edit` and `apply_patch` dumps the whole file or the whole diff into your transcript, and stays there.** This plugin folds those blocks down to their header line — `# Wrote 40 lines · click to expand  src/app.ts` — and opens them again on click, or with a fold/unfold-all key if you configure one.
 
@@ -33,7 +33,9 @@ Click the row to open it. If you set the `key` option, that binding folds or unf
 opencode plugin add @cardinal4/opencode-fold-diffs
 ```
 
-Then list it in your CLI config so the terminal loads the TUI entrypoint. Add it to `~/.config/opencode/cli.json` (or `$XDG_CONFIG_HOME/opencode/cli.json`):
+That installs the package and adds it to the global `opencode.json`. The package ships a server entry (`index.js`, a no-op that gives the plugin an id) and a TUI entry (`tui.js`); the TUI part loads automatically with the server entry, so no second configuration is needed.
+
+If the terminal connects to a **remote server**, list the package in `~/.config/opencode/cli.json` (or `$XDG_CONFIG_HOME/opencode/cli.json`) instead so the local TUI loads the TUI part. Do not list it in both files:
 
 ```json
 {
@@ -42,9 +44,7 @@ Then list it in your CLI config so the terminal loads the TUI entrypoint. Add it
 }
 ```
 
-This plugin's behavior is TUI-only (its server entry is a no-op that exists so OpenCode can discover it by id), so configure it in `cli.json`. TUI plugins also stay active when the terminal connects to a remote server.
-
-With options:
+Options go on the plugin entry in either file:
 
 ```json
 {
@@ -115,7 +115,7 @@ Blocks are re-scanned on V2's `session.message.content.updated`, `session.tool.s
 
 ## Status
 
-Written against **opencode v2.0.24** and re-checked against **v2.0.27**; the `session.*` events it listens to exist from v2.0.10 on, so an older V2 install gets the fix without upgrading. The tree-walking, block matching, fold/unfold and toggle logic run green against a mock renderer tree shaped like V2's (`node --test`), and the fold was checked against a real transcript: `visible = false` (Yoga `display: none`) is what actually hides a body, not `maxHeight`.
+Written against **opencode v2.0.24**, re-checked against **v2.0.27** and **v2.2.0**; the `session.*` events it listens to exist from v2.0.10 on, so an older V2 install gets the fix without upgrading. The tree-walking, block matching, fold/unfold and toggle logic run green against a mock renderer tree shaped like V2's (`node --test`), and the fold was checked against a real transcript: `visible = false` (Yoga `display: none`) is what actually hides a body, not `maxHeight`.
 
 To confirm it loaded, restart (`opencode service restart`) and check `/plugins` lists `opencode-fold-diffs` and `Ctrl+P` → **Fold / unfold file diffs** is in the palette. If nothing folds, run **Fold diffs: diagnose** — the toast reports what the plugin can see:
 
@@ -126,6 +126,8 @@ To confirm it loaded, restart (`opencode service restart`) and check `/plugins`
 | `transcript: yes · blocks: N · folded: N` | Detection and folding ran; if the blocks still look expanded, the fold did not take on the renderables. |
 | `stats: off` | Folding works but the header could not be restated (Solid owns the label node). |
 
+The diagnose dump includes up to 80 characters of text from each renderable, so it can contain prompts or tool output. Redact it before sharing; set `dump: false` to skip writing it.
+
 Edits with fewer than `min_lines` changed lines (default 6) are left expanded on purpose — a one-line change is already its own summary. Set `min_lines: 0` to fold every file block.
 
 ## V2 port notes
@@ -136,7 +138,7 @@ The port follows V2's new plugin API and render tree, so the V1 code could not b
 - `api.renderer` → `context.renderer`, `api.route.current.name` → `context.ui.router.current().type`, `api.event.on` → `context.data.on`, `api.ui.toast` → `context.ui.toast.show`, `api.keymap.registerLayer` → `context.keymap.layer` (called straight from `setup` on 2.0.23+, from an `app`-slot component before that).
 - Event names are V2's `session.*` events; `message.updated` / `message.part.updated` are legacy schemas that never fire.
 - Tool headers are a label node plus a path node, so detection and the stats suffix target the label.
-- `bash` defaults to `false` because V2 trims long commands itself, and config moves from `tui.json` to `cli.json`.
+- `bash` defaults to `false` because V2 trims long commands itself, and config moves from `tui.json` to `opencode.json` (or `cli.json` for a remote TUI).
 
 ## License
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardinal4/opencode-fold-diffs",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "description": "Unofficial OpenCode V2 fork of opencode-fold-diffs: write, edit and apply_patch blocks render folded to their header line, click to expand.",
   "license": "MIT",
   "type": "module",

package/tui.js

@@ -221,7 +221,8 @@ function summarise(nodes) {
       }
       continue;
     }
-    lines += node.content.split("\n").length;
+    const content = node.content.endsWith("\n") ? node.content.slice(0, -1) : node.content;
+    lines += content === "" ? 0 : content.split("\n").length;
   }
   if (diffs) return { size: added + removed, label: `+${added} −${removed}` };
   return { size: lines, label: `${lines} ${lines === 1 ? "line" : "lines"}` };
@@ -271,6 +272,10 @@ export default {
     // Folded blocks, by their block renderable. WeakMap so a session switch,
     // which destroys the renderables, drops the state with them.
     const known = new WeakMap();
+    // WeakMap has no iterator, so keep a strong set of adopted blocks only for
+    // cleanup. Destroyed blocks are pruned on the sweep to avoid retaining a
+    // closed session's renderables.
+    const adopted = new Set();
     // The mode new blocks adopt. ctrl+o flips it, so "expand everything" also
     // means "and stop folding what arrives next", the way a verbose toggle works.
     let folding = opts.folded !== false;
@@ -356,6 +361,7 @@ export default {
         folded: false,
       };
       known.set(block, state);
+      adopted.add(block);
 
       block.onMouseUp = () => {
         // Copy-on-select is a drag ending on the block; that is not a click.
@@ -382,6 +388,7 @@ export default {
         folded: false,
       };
       known.set(block, state);
+      adopted.add(block);
 
       // The block's own onMouseUp belongs to the host here -- it is what expands
       // the collapsed command/output -- and opentui declares the handler as a
@@ -404,6 +411,7 @@ export default {
     }
 
     function sweep() {
+      for (const block of adopted) if (block.isDestroyed) adopted.delete(block);
       if (context.ui.router.current().type !== "session") return;
       const box = transcript();
       if (!box) return;
@@ -515,8 +523,10 @@ export default {
                 if (target) {
                   const lines = [];
                   dumpNode(box ?? context.renderer.root, 0, lines, 600);
-                  dump = target;
                   writeFileSync(target, summary.concat("", lines).join("\n"));
+                  // Only advertise the path once the write succeeded; the
+                  // catch below keeps a failed write from taking down diagnose.
+                  dump = target;
                 }
               } catch {}
               context.ui.toast.show({
@@ -550,6 +560,13 @@ export default {
       clearInterval(timer);
       if (pending) clearTimeout(pending);
       for (const off of offs) if (typeof off === "function") off();
+      // The host owns these renderables and keeps them after the plugin is
+      // disabled, so undo our folds instead of leaving the transcript collapsed.
+      for (const block of adopted) {
+        const state = known.get(block);
+        if (state?.folded) apply(state, false);
+      }
+      adopted.clear();
     };
   },
 };