@tiens.nguyen/gonext-local-worker 1.0.263 → 1.0.265

package/gonext-repl.mjs

@@ -413,6 +413,11 @@ process.on("exit", disableMouse);
 // (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())
@@ -1220,6 +1225,8 @@ async function runAgentTurn(history) {
   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
@@ -1269,35 +1276,45 @@ async function runAgentTurn(history) {
     // Priority: a live command > the model's current Thought clause (task #64, so a
     // long CPU-bound step reads as what it's actually reasoning about, not "Thinking")
     // > the "almost done" heartbeat > the bare fallback.
-    const primary = runningCmd
-      ? `Running ${runningCmd}`
-      : 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);
     const tokLabel =
       dim(` · ${fmtTokens(latestCodeTokens)} tok`) +
       orange(` · ${fmtTokens(sessionMaxCodeTokens)} max`);
-    // 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, unfold it below
-    // as up to 4 wrapped GREY lines (dim). The whole status block rides the viewport bottom as
-    // output scrolls, so line 1 (the thought) sits at row `rows - drawn + 1` — if the mouse is
-    // hovering THAT row, render the label as an underlined bright-green "link".
-    const clickable = !!(fullLiveThought && !runningCmd);
-    const expLines = thoughtExpanded && clickable ? wrapThought(fullLiveThought, max, 4) : [];
+    // Task #96: the thought line is "clickable" only when the fuller thought has MORE text than
+    // fits on line 1 (a live command / bare "Thinking" / a thought that already fits has nothing
+    // to reveal). Line 1 (what's happening now): a live command > the model's current Thought >
+    // "almost done" > "Thinking". When clickable we drive line 1 from the SAME fuller string, so
+    // the grey expansion CONTINUES where line 1 was cut off instead of repeating the head.
+    const clickable = !!fullLiveThought && !runningCmd && fullLiveThought.length > max;
+    const primary = runningCmd
+      ? `Running ${runningCmd}`
+      : clickable
+        ? fullLiveThought
+        : liveThought || (almostDone ? "Almost done" : "Thinking");
+    const label = `${fit(primary)}… (${secs}s)`;
+    // When clicked, unfold the REMAINDER (what fit() dropped, i.e. from char max-1 on) as up to
+    // 4 wrapped GREY lines BETWEEN the thought and the playful-word line.
+    const rest = clickable ? fullLiveThought.slice(max - 1).trim() : "";
+    const expLines = thoughtExpanded && rest ? wrapThought(rest, max, 4) : [];
     const drawn = 2 + expLines.length;
     const rows = process.stdout.rows || 24;
-    const hovering = clickable && hoverRow === rows - drawn + 1;
-    const label = `${fit(primary)}… (${secs}s)`;
+    // Hover-highlight only the THOUGHT line (line 1) — its exact viewport row comes from the
+    // \x1b[6n probe below (`thoughtRow`); fall back to the viewport-bottom assumption only when
+    // the terminal never answered the probe.
+    const tRow = thoughtRow >= 1 ? thoughtRow : rows - drawn + 1;
+    const hovering = clickable && hoverRow === tRow;
     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.
-    // Line 2 (indented): the SPINNER + the playful word together, both in the cycling color.
-    // Task #83/#84: after the word, the running agent-code token count (dim) + per-workspace
-    // PEAK single-request count (orange), e.g. "  ⠙ Caffeinating… · 12.3k tok · 8.1k max".
-    let out =
-      `${green(BULLET)} ${hovering ? hoverThought(label) : green(label)}` +
-      "\n" + `  ${color256(wc, `${glyph} ${thinkWord}…`)}${tokLabel}`;
+    // 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;
@@ -1316,8 +1333,10 @@ async function runAgentTurn(history) {
   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;
@@ -1327,7 +1346,11 @@ 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))) {
@@ -1354,6 +1377,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.263",
+  "version": "1.0.265",
   "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",