@tiens.nguyen/gonext-cli 1.0.372 → 1.0.373

package/gonext-repl.mjs

@@ -362,6 +362,7 @@ const COMMANDS = [
   { name: "/server", desc: "pick a deployment server (host/user) for this session" },
   { name: "/manual-edit", aliases: ["/revert"], usage: "/manual-edit [runId]", desc: "undo the agent's file edits so you can edit them yourself (latest run)" },
   { name: "/reset", aliases: ["/new"], desc: "forget this folder's saved conversation and start fresh" },
+  { name: "/hover", desc: "toggle mouse hover/click on the thinking line (costs scrolling while it runs)" },
   { name: "/output-token", desc: "show the agent code-model OUTPUT-token total for this workspace" },
   { name: "/reset-output-token-global", desc: "reset the GLOBAL (you + coding server) output-token total to 0" },
   { name: "/help", desc: "list these commands" },
@@ -762,6 +763,10 @@ if (process.stdin.isTTY) {
       return;
     }
     if (following) {
+      // Ctrl+T expands/collapses the model's current Thought — the keyboard equivalent of the
+      // hover-click, so the fuller thought stays reachable with the mouse capture off (the
+      // capture is what would eat the scroll wheel; see hoverMouse).
+      if (key && key.ctrl && key.name === "t" && toggleActiveThought) toggleActiveThought();
       rl.line = "";
       rl.cursor = 0;
       rl.historyIndex = -1;
@@ -810,18 +815,24 @@ rl.on("close", () => {
     w(null);
   }
 });
-// Mouse hover+click on the thinking line (task #96): while a turn runs we turn ON xterm
-// ANY-MOTION tracking so we can both HIGHLIGHT the line as the mouse hovers it AND expand it
-// on click (see runAgentTurn). Trade-off the user accepted: with tracking on, the terminal's
-// own drag-to-select/copy is captured by us — the user holds Option/Shift to select text
-// meanwhile. ?1003 = report every button press/release AND all mouse MOTION (needed for hover
-// with no button held); ?1006 = SGR extended coords (no 223-col cap). We disable ?1000/?1002
-// too on teardown in case a terminal had them latched.
+// Mouse hover+click on the thinking line (task #96): turns ON xterm ANY-MOTION tracking for
+// the duration of a turn so we can HIGHLIGHT the line as the mouse hovers it AND expand it on
+// click. ?1003 = report every button press/release AND all mouse MOTION (needed for hover with
+// no button held); ?1006 = SGR extended coords (no 223-col cap). We disable ?1000/?1002 too on
+// teardown in case a terminal had them latched.
+//
+// OFF BY DEFAULT, and it has to be: with ANY mouse reporting enabled the terminal hands us the
+// WHEEL events (SGR button 64/65) instead of scrolling its own scrollback, so the user cannot
+// scroll while a turn runs — and no tracking mode reports motion without also grabbing the
+// wheel, so hover and scrolling are mutually exclusive. Scrolling wins by default (it also
+// gives back native drag-to-select); `/hover` opts back into the mouse for a session, and
+// Ctrl+T expands the thought from the keyboard either way.
+let hoverMouse = false;
 const MOUSE_ON = "\x1b[?1003h\x1b[?1006h";
 const MOUSE_OFF = "\x1b[?1003l\x1b[?1002l\x1b[?1000l\x1b[?1006l";
 let _mouseEnabled = false;
 const enableMouse = () => {
-  if (_mouseEnabled || !process.stdin.isTTY) return;
+  if (!hoverMouse || _mouseEnabled || !process.stdin.isTTY) return;
   process.stdout.write(MOUSE_ON);
   _mouseEnabled = true;
 };
@@ -1399,6 +1410,10 @@ let approvalResolve = null;
 // first — otherwise the 120ms ticker keeps redrawing that block on top of the picker and
 // its relative-cursor math lands on the wrong rows (duplicated/interleaved options).
 let clearActiveStatus = null;
+// The active turn's thought expand/collapse (its local toggle), or null between turns — lets
+// Ctrl+T reveal the full Thought from the KEYBOARD, so the feature doesn't depend on the mouse
+// capture that would block scrolling (see hoverMouse).
+let toggleActiveThought = null;
 function drawApprovalOptions(redraw) {
   // Two option lines, redrawn in place. On redraw the cursor sits one row below "No";
   // step up 2 rows, clear+rewrite both, landing back where we started.
@@ -2045,7 +2060,9 @@ async function runAgentTurn(history) {
     clearStatus();
     // Right after clearing, the cursor sits at the status block's TOP-LEFT = the thought line's
     // row. Probe for it (throttled) so hover/click hit-testing is exact wherever the block is.
-    if (process.stdin.isTTY && now - lastDsrAt > 400) { lastDsrAt = now; process.stdout.write("\x1b[6n"); }
+    // Only worth probing when the mouse is captured — thoughtRow exists for hover/click
+    // hit-testing, and with `/hover` off nothing reads it (and nothing would consume the reply).
+    if (hoverMouse && process.stdin.isTTY && now - lastDsrAt > 400) { lastDsrAt = now; process.stdout.write("\x1b[6n"); }
     // Line 1: green ● + green phase/seconds (matches the web's green streaming label), or the
     // underlined bright-green hover style when the mouse is over a clickable thought. Then the
     // GREY expanded lines (if any), then LAST the SPINNER + playful word + token labels
@@ -2085,10 +2102,18 @@ async function runAgentTurn(history) {
     if (row < top || row > top + statusContentLines - 2) return;
     // Only meaningful when there IS a fuller thought to reveal; otherwise ignore the click
     // so we don't flicker an empty expand.
+    if (!thoughtExpanded && !(fullLiveThought && !runningCmd)) return;
+    toggleThought();
+  };
+  // Same expand/collapse, reachable without the mouse: Ctrl+T while a turn runs (see
+  // toggleActiveThought). Ignored when there's nothing more to reveal, so it never flickers an
+  // empty expansion.
+  const toggleThought = () => {
     if (!thoughtExpanded && !(fullLiveThought && !runningCmd)) return;
     thoughtExpanded = !thoughtExpanded;
     clearStatus(); // next tick (≤120ms) redraws at the new size; keeps cursor math correct
   };
+  toggleActiveThought = toggleThought;
   const onMouseData = (chunk) => {
     if (!following) return;
     const s = chunk.toString("latin1");
@@ -2107,7 +2132,9 @@ async function runAgentTurn(history) {
       if (isPress && (btn & 0b11) === 0 && (btn & 64) === 0) onStatusClick(row); // left click → expand
     }
   };
-  if (process.stdin.isTTY) process.stdin.on("data", onMouseData);
+  // Only listen for reports when we're actually capturing the mouse — with `/hover` off there
+  // are none, and no \x1b[6n probe reply to consume either.
+  if (hoverMouse && process.stdin.isTTY) process.stdin.on("data", onMouseData);
   enableMouse();
 
   // Called right before any real (bullet/edit-card/answer) content prints: drop the
@@ -2586,6 +2613,7 @@ async function runAgentTurn(history) {
     clearInterval(ticker);
     clearStatus();
     clearActiveStatus = null; // no turn owns the status wiper between turns
+    toggleActiveThought = null; // …nor the Ctrl+T thought toggle
     // Task #96: stop mouse-reporting the moment the turn ends (also on cancel/error — this
     // finally always runs), and detach the click parser, so the user's shell selection is
     // never captured between turns.
@@ -2831,6 +2859,21 @@ async function main() {
       printCommands();
       continue;
     }
+    if (line === "/hover") {
+      // Mouse hover/click on the thinking line (#96) vs. scrolling during a turn: the terminal
+      // only reports wheel events to US when mouse tracking is on, so they're exclusive. Off by
+      // default; this opts in for the session. Ctrl+T expands the thought either way.
+      hoverMouse = !hoverMouse;
+      console.log(
+        (hoverMouse ? green("hover: ON") : dim("hover: OFF")) +
+          dim(
+            hoverMouse
+              ? " — mouse hover/click expands the thinking line; scrolling and drag-select are captured while a turn runs.\n"
+              : " — scrolling and drag-select work during a turn; use Ctrl+T to expand the thinking line.\n"
+          )
+      );
+      continue;
+    }
     if (line === "/model") {
       await chooseModel();
       continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiens.nguyen/gonext-cli",
-  "version": "1.0.372",
+  "version": "1.0.373",
   "description": "GoNext CLI — the gonext terminal plus the local worker that runs agent / OCR / PDF / embedding jobs on your Mac (Ollama / MLX / OpenAI-compatible).",
   "type": "module",
   "license": "MIT",