@tiens.nguyen/gonext-local-worker 1.0.262 → 1.0.264

package/gonext-repl.mjs

@@ -48,6 +48,9 @@ const white = (s) => `\x1b[37m${s}\x1b[0m`;
 // code 34 (blue) which many dark-theme palettes render as purple/indigo instead.
 const codeColor = (s) => `\x1b[90m${s}\x1b[0m`;
 const bold = (s) => `\x1b[1m${s}\x1b[0m`;
+// Hover highlight for the clickable thinking line (task #96): bold + underline + bright
+// green so it reads as an interactive "link" the moment the mouse is over it.
+const hoverThought = (s) => `\x1b[1;4;92m${s}\x1b[0m`;
 
 // The worker's "still thinking" heartbeat lines look like "Caffeinating… (90s)" — we
 // SWALLOW them from the terminal (the local ticker below drives progress instead), and
@@ -383,13 +386,15 @@ rl.on("close", () => {
     w(null);
   }
 });
-// Mouse click-to-expand (task #96): while a turn runs we turn ON xterm button tracking so a
-// click on the live "thinking" status can expand it (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. ?1000 = report button press+release only
-// (no motion, so we don't flood on mouse-move); ?1006 = SGR extended coords (no 223-col cap).
-const MOUSE_ON = "\x1b[?1000h\x1b[?1006h";
-const MOUSE_OFF = "\x1b[?1000l\x1b[?1006l";
+// 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.
+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;
@@ -404,9 +409,15 @@ const disableMouse = () => {
 // Safety net: never leave the user's terminal in mouse-reporting mode (would break their
 // shell's selection) if we exit ungracefully.
 process.on("exit", disableMouse);
-// SGR mouse report: ESC [ < btn ; col ; row (M=press, m=release). A left-button PRESS is
-// btn low-2-bits 0 with the wheel bit (64) clear.
+// SGR mouse report: ESC [ < btn ; col ; row (M=press, m=release). btn bit 32 = MOTION
+// (hover/drag), bit 64 = wheel; low 2 bits = which button (0=left). A left CLICK is a press
+// (M) with motion+wheel bits clear and low bits 0; a HOVER is any event with the motion bit.
 const MOUSE_RE = /\x1b\[<(\d+);(\d+);(\d+)([Mm])/g;
+// Cursor Position Report reply to our `\x1b[6n` probe: ESC [ row ; col R. We probe right after
+// clearing the status (cursor is then at the status block's TOP row) to learn the thought
+// line's ABSOLUTE viewport row — so hover/click hit-testing is exact even when the block isn't
+// at the bottom of the screen (task #96 fix). No `<`, so it never collides with MOUSE_RE.
+const DSR_RE = /\x1b\[(\d+);(\d+)R/g;
 const nextLine = () =>
   _lineQueue.length > 0
     ? Promise.resolve(_lineQueue.shift())
@@ -1213,6 +1224,9 @@ async function runAgentTurn(history) {
   // whether the user has clicked to expand it. Both reset when the step's Thought changes.
   let fullLiveThought = "";
   let thoughtExpanded = false;
+  let hoverRow = -1; // last mouse viewport row (from motion events) → highlight when it's on the thought line
+  let thoughtRow = -1; // absolute viewport row of the thought line (line 1), learned via \x1b[6n
+  let lastDsrAt = 0; // throttle the cursor-position probe
   const thinkSecs = () => Math.max(1, Math.round((Date.now() - thinkingSince) / 1000));
 
   // The status is normally TWO in-place lines — the in-progress action, then the playful
@@ -1267,28 +1281,33 @@ async function runAgentTurn(history) {
       : liveThought || (almostDone ? "Almost done" : "Thinking");
     const max = Math.max(24, (process.stdout.columns || 80) - 14);
     const fit = (s) => (s.length > max ? s.slice(0, max - 1) + "…" : s);
-    clearStatus();
-    // Line 1: green ● + green phase/seconds (matches the web's green streaming label).
-    // Line 2 (indented): the SPINNER + the playful word together, both in the cycling
-    // color — the spinner belongs with the word (dot on the label line, spinner leading
-    // the flavor line).
-    // Task #83/#84: after the playful word, show the running agent-code-model token
-    // count (dim) plus the per-workspace PEAK single-request count (orange), e.g.
-    // "  ⠙ Caffeinating… · 12.3k tok · 8.1k max". Both start at 0 and climb.
     const tokLabel =
       dim(` · ${fmtTokens(latestCodeTokens)} tok`) +
       orange(` · ${fmtTokens(sessionMaxCodeTokens)} max`);
-    let out =
-      `${green(BULLET)} ${green(`${fit(primary)}… (${secs}s)`)}` +
-      "\n" + `  ${color256(wc, `${glyph} ${thinkWord}…`)}${tokLabel}`;
-    let drawn = 2;
-    // Task #96: when the user has clicked the thought line, unfold the fuller thought below
-    // it as up to 4 wrapped GREY lines (dim). Only when there's genuinely more to show than
-    // the truncated primary (a live command / bare "Thinking" has nothing to expand).
-    if (thoughtExpanded && fullLiveThought && !runningCmd) {
-      const wrapped = wrapThought(fullLiveThought, max, 4);
-      for (const wl of wrapped) { out += "\n  " + dim(wl); drawn++; }
-    }
+    // Task #96: the thought line is "clickable" only when there's a fuller thought to reveal
+    // (a live command / bare "Thinking" has nothing to expand). When clicked, the fuller
+    // thought unfolds as up to 4 wrapped GREY lines BETWEEN the thought and the playful-word
+    // line. Hover-highlight only the THOUGHT line (line 1) — its exact viewport row comes from
+    // the \x1b[6n probe below (`thoughtRow`); we fall back to the viewport-bottom assumption
+    // only when the terminal never answered the probe.
+    const clickable = !!(fullLiveThought && !runningCmd);
+    const expLines = thoughtExpanded && clickable ? wrapThought(fullLiveThought, max, 4) : [];
+    const drawn = 2 + expLines.length;
+    const rows = process.stdout.rows || 24;
+    const tRow = thoughtRow >= 1 ? thoughtRow : rows - drawn + 1;
+    const hovering = clickable && hoverRow === tRow;
+    const label = `${fit(primary)}… (${secs}s)`;
+    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"); }
+    // 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
+    // (task #83/#84), e.g. "  ⠙ Caffeinating… · 12.3k tok · 8.1k max".
+    let out = `${green(BULLET)} ${hovering ? hoverThought(label) : green(label)}`;
+    for (const wl of expLines) out += "\n  " + dim(wl);
+    out += "\n" + `  ${color256(wc, `${glyph} ${thinkWord}…`)}${tokLabel}`;
     process.stdout.write(out);
     statusLines = drawn;
     statusShown = true;
@@ -1297,17 +1316,20 @@ async function runAgentTurn(history) {
   // seconds still tick once/sec). Only redraws when the model has gone quiet >QUIET_MS.
   const ticker = setInterval(tick, 120);
 
-  // --- Click-to-expand the thinking line (task #96) --------------------------------------
-  // A left-click on the live status block toggles the fuller thought (3-4 grey lines). The
-  // status block sits at the bottom of the viewport (new output keeps scrolling it there),
-  // so we hit-test the click row against the bottom `statusLines` rows. We enable xterm
-  // mouse reporting only for the duration of the turn and always turn it back off in the
-  // finally + on process exit, so the user's shell is never left in mouse-capture mode.
+  // --- Hover + click on the thinking line (task #96) -------------------------------------
+  // HOVER: motion events keep `hoverRow`; the tick highlights the thought line (underlined
+  // bright-green "link") whenever the mouse is on its row. CLICK: a left-click on the status
+  // block toggles the fuller thought (3-4 grey lines). The block sits at the bottom of the
+  // viewport (new output keeps scrolling it there), so we hit-test rows against the bottom
+  // `statusLines` rows. Mouse reporting is on only for the turn and always turned back off in
+  // the finally + on process exit, so the user's shell is never left in mouse-capture mode.
   const onStatusClick = (row) => {
     if (!statusShown) return;
     const rows = process.stdout.rows || 24;
-    const top = rows - statusLines + 1; // 1-based viewport row of the first status line
-    if (row < top || row > rows) return; // click landed outside the status block
+    const top = thoughtRow >= 1 ? thoughtRow : rows - statusLines + 1; // thought line row
+    // Toggle only on the thought line + its grey expansion — NOT the last row (the playful
+    // word / token line), so a click there doesn't expand what it isn't part of.
+    if (row < top || row > top + statusLines - 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;
@@ -1317,14 +1339,19 @@ async function runAgentTurn(history) {
   const onMouseData = (chunk) => {
     if (!following) return;
     const s = chunk.toString("latin1");
-    if (s.indexOf("\x1b[<") === -1) return; // fast reject: no SGR mouse report in this chunk
+    if (s.indexOf("\x1b[") === -1) return; // fast reject: no CSI (mouse report OR cursor reply) here
+    // Cursor-position reply → the thought line's absolute row (see the \x1b[6n probe in tick).
+    DSR_RE.lastIndex = 0;
+    let d;
+    while ((d = DSR_RE.exec(s))) thoughtRow = parseInt(d[1], 10);
     MOUSE_RE.lastIndex = 0;
     let m;
     while ((m = MOUSE_RE.exec(s))) {
       const btn = parseInt(m[1], 10);
       const row = parseInt(m[3], 10);
       const isPress = m[4] === "M";
-      if (isPress && (btn & 0b11) === 0 && (btn & 64) === 0) onStatusClick(row); // left press
+      if (btn & 32) { hoverRow = row; continue; } // MOTION (hover/drag) → track for the highlight
+      if (isPress && (btn & 0b11) === 0 && (btn & 64) === 0) onStatusClick(row); // left click → expand
     }
   };
   if (process.stdin.isTTY) process.stdin.on("data", onMouseData);
@@ -1343,6 +1370,7 @@ async function runAgentTurn(history) {
     fenceThought = "";
     fullLiveThought = "";       // #96: the fuller thought is spent too…
     thoughtExpanded = false;    // …and each new thinking phase starts collapsed.
+    lastDsrAt = 0;              // …content just scrolled → re-probe the thought row next tick.
     lastContentAt = Date.now();
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiens.nguyen/gonext-local-worker",
-  "version": "1.0.262",
+  "version": "1.0.264",
   "description": "Polls GoNext cloud API for async local LLM jobs and runs them against Ollama/OpenAI-compatible servers on this Mac",
   "type": "module",
   "license": "MIT",