@cardinal4/opencode-fold-diffs 0.3.2 → 0.3.4

package/README.md

@@ -124,7 +124,7 @@ The V2 TUI plugin API (`@opencode/plugin/tui`) has no slot for message parts, so
 
 Renderable classes are matched by duck-typing (`typeof node.diff === "string"`, `content` + `filetype` for code) rather than `instanceof`, because the opentui classes are minified in the shipped binary and their names are not stable.
 
-Blocks are re-scanned on `message.part.updated` and `message.updated`, plus a 2 s sweep that catches a session opened from history, whose parts land before any event this plugin sees.
+Blocks are re-scanned on V2's `session.message.content.updated`, `session.tool.success` and `session.tool.failed`, plus `session.step.ended` and `session.execution.succeeded` (`session.shell.ended` joins them when `bash` folding is on). A 2 s sweep catches a session opened from history, whose parts land before any event this plugin sees.
 
 ## Migrating from V1
 
@@ -132,6 +132,8 @@ V1 plugin implementations do not run in V2. The V2 port made these changes:
 
 - Entrypoint is a `{ id, setup(context) }` definition (`Plugin.define()` is an identity helper, so the shape is the same). `setup` returns the cleanup function instead of `api.lifecycle.onDispose`.
 - `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`.
+- `context.keymap.layer` is called directly from `setup` on 2.0.23+; earlier V2 builds read Solid context there, so the plugin still registers from a component mounted in the `app` slot for them.
+- Event names are V2's: `message.updated` / `message.part.updated` are legacy schemas in V2 and are never emitted. The plugin listens to `session.message.content.updated`, `session.tool.success` / `session.tool.failed`, `session.step.ended` and `session.execution.succeeded` (plus `session.shell.ended` when bash folding is on). These names exist from 2.0.10 on, so older V2 installs get the same fix without upgrading.
 - Tool headers are no longer one string. V1 rendered `"← Edit src/app.ts"`; V2 renders a label node plus a path node, so detection and the stats suffix target the label.
 - `bash` defaults to `false`, because V2 now trims long commands to two lines itself.
 - Config moves from `tui.json` to `cli.json` (or `opencode.json(c)`).
@@ -153,7 +155,7 @@ V1 plugin implementations do not run in V2. The V2 port made these changes:
 
 ## Status
 
-Written against **opencode v2.0.10 / v2.0.11**. 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**, and compatible across the V2 line: the `session.*` events this version 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`.
 
 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.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardinal4/opencode-fold-diffs",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "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

@@ -10,15 +10,15 @@
 // closed without one, so this does it from a plugin.
 //
 // A folded block renders as its header line -- "# Wrote 40 lines · click to
-// expand  src/app.ts" -- and opens on click, or with ctrl+o for every block at
-// once.
+// expand  src/app.ts" -- and opens on click, or with the optional `key`
+// binding for every block at once.
 //
 // Options (cli.json -> ["opencode-fold-diffs", { ... }] or opencode.json(c)):
 //   lines      lines of the body left visible when folded  (default 0, title only)
 //   min_lines  leave blocks with fewer content lines alone  (default 6)
 //   stats      append "40 lines · click to expand" to the header (default true)
 //   folded     new blocks start folded                      (default true)
-//   key        binding that folds/unfolds every block        (default "ctrl+o")
+//   key        binding that folds/unfolds every block        (default "", none)
 //   bash       fold long bash commands too                   (default false on V2)
 //   bash_lines rows of the command left visible when folded  (default 1)
 //
@@ -241,6 +241,16 @@ function dumpNode(node, depth, lines, limit) {
   for (const kid of kids) dumpNode(kid, depth + 1, lines, limit);
 }
 
+// 2.0.23 was the first V2 release whose `keymap.layer` may be called from
+// setup; before that it reads Solid context and needs a mounted component.
+// An unparseable version takes the fallback, which works on every V2 build.
+function supportsSetupKeymap(version) {
+  const match = /(\d+)\.(\d+)\.(\d+)/.exec(String(version ?? ""));
+  if (!match) return false;
+  const [major, minor, patch] = match.slice(1).map(Number);
+  return major > 2 || (major === 2 && (minor > 0 || patch >= 23));
+}
+
 export const PLUGIN_ID = "opencode-fold-diffs";
 
 export default {
@@ -420,17 +430,26 @@ export default {
       }, 120);
     }
 
-    const offs = [
-      context.data.on("message.part.updated", schedule),
-      context.data.on("message.updated", schedule),
+    // V1's message.part.updated / message.updated are legacy schemas in V2 --
+    // the client emits the session.* events instead, so the V1 names were a
+    // silent no-op and a new block only folded on the sweeping timer.
+    const events = [
+      "session.message.content.updated", // a part was appended or replaced
+      "session.tool.success", // a tool body (diff or file) appeared
+      "session.tool.failed", // a failed tool still renders its block
+      "session.step.ended", // the step's final content has arrived
+      "session.execution.succeeded", // the turn settled; take a final look
     ];
+    if (shell) events.push("session.shell.ended"); // the command now carries its "$ " prefix
+    const offs = events.map((name) => context.data.on(name, schedule));
     const timer = setInterval(sweep, SWEEP_MS);
     schedule();
 
-    // `keymap.layer` reads Solid context, so it must run while a component is
-    // rendering, not directly during setup. A null component mounted in the
-    // `app` slot owns the layer for the plugin's lifetime.
-    function FoldCommands() {
+    // The command layer itself is identical everywhere; only who registers it
+    // differs. 2.0.23+ runs `keymap.layer` from setup and owns its teardown.
+    // Older V2 reads Solid context when registering, so there the layer has to
+    // be created by a mounted component. The `app` slot supplies one.
+    function registerCommands() {
       context.keymap.layer(() => ({
         mode: "global",
         priority: 100,
@@ -508,9 +527,17 @@ export default {
         ],
         bindings: opts.key ? ["opencode-fold-diffs.toggle"] : [],
       }));
-      return null;
     }
-    const stopCommands = context.ui.slot({ append: "app", render: () => FoldCommands() });
+    let stopCommands = () => {};
+    if (supportsSetupKeymap(context.app?.version)) {
+      registerCommands();
+    } else {
+      function FoldCommands() {
+        registerCommands();
+        return null;
+      }
+      stopCommands = context.ui.slot({ append: "app", render: () => FoldCommands() });
+    }
 
     return () => {
       stopCommands();