dsh-neotui 0.0.14 → 0.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-neotui",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "Neo-TUI: mouse-driven terminal UI client for DeepSeek Harness (B-tier per dsh-tui-design.md)",
   "type": "module",
   "bin": { "dsh-neotui": "bin/dsh-tui.js" },

package/src/views.js

@@ -836,8 +836,35 @@ export class ChatView extends Widget {
   }
 
   #clickLine(y, ev) {
+    // Capture the viewport geometry BEFORE any flush: the flush can grow the
+    // streaming tail (and atBottom snaps the view 1–2 rows), so anchoring on
+    // the post-flush state would reproduce exactly the shift the user saw.
+    // The pre-flush lineMap is what the user clicked on.
+    const lineKey = (m) => (m ? `${m.nodeIdx}:${m.blockIdx ?? "n"}` : null);
+    const topKey = lineKey(this.lineMap?.[this.view.scrollY]) ?? null;
+    let topFirst = -1;
+    if (topKey !== null) {
+      for (let i = 0; i < this.lineMap.length; i++) {
+        if (lineKey(this.lineMap[i]) === topKey) { topFirst = i; break; }
+      }
+    }
+    const topOffset = topFirst >= 0 ? this.view.scrollY - topFirst : 0;
+    // the clicked block's header (first non-empty line with its mark) and its
+    // pre-click viewport row — the PRIMARY anchor: keep the clicked thing put
+    const preInfo = this.lineMap?.[y];
+    const clickedMatch = preInfo?.blockIdx !== null
+      ? (m) => m?.nodeIdx === preInfo?.nodeIdx && m?.blockIdx === preInfo?.blockIdx
+      : (m) => m?.nodeIdx === preInfo?.nodeIdx;
+    const firstNonEmpty = (match) => {
+      for (let i = 0; i < this.lineMap.length; i++) {
+        if (match(this.lineMap[i]) && (this.lines[i] ?? []).some((g) => g.t.trim() !== "")) return i;
+      }
+      return -1;
+    };
+    const preHeaderIdx = preInfo ? firstNonEmpty(clickedMatch) : -1;
+    const preHeaderRow = preHeaderIdx >= 0 ? preHeaderIdx - this.view.scrollY : null;
     // A queued (deferred) rebuild would leave lineMap one frame behind the
-    // nodes array; flush first so the click maps to the CURRENT node/block.
+    // nodes array; flush now so the click maps to the CURRENT node/block.
     this.flushRebuild();
     // map rendered line back to node via cached line→node map
     const info = this.lineMap?.[y];
@@ -848,22 +875,20 @@ export class ChatView extends Widget {
         if (ref) { this.app.openImage(ref, { all: node.images, index: info.imgIdx }); return true; }
       }
       const node = this.nodes[info.nodeIdx];
-      // Expand/collapse changes the line count ABOVE the viewport, which would
-      // leave scrollY pointing at unrelated content. Anchor: remember the
-      // viewport-top line's identity AND its offset within that block, then
-      // restore the same position after the rebuild — the view does not move
-      // at all when the top line survives (e.g. clicking a block header), and
-      // lands on the fold's last line when the top line itself was collapsed.
-      const lineKey = (m) => (m ? `${m.nodeIdx}:${m.blockIdx ?? "n"}` : null);
-      const topKey = lineKey(this.lineMap[this.view.scrollY]);
-      let topFirst = -1;
-      if (topKey !== null) {
-        for (let i = 0; i < this.lineMap.length; i++) {
-          if (lineKey(this.lineMap[i]) === topKey) { topFirst = i; break; }
-        }
-      }
-      const topOffset = topFirst >= 0 ? this.view.scrollY - topFirst : 0;
+      // Expand/collapse changes the line count around the click. Primary
+      // anchor: the clicked block's header stays at its pre-click viewport
+      // row (zero shift). Fallback (header was above the viewport — a deep
+      // content click): restore the pre-click viewport-top position.
       const reanchor = () => {
+        // primary anchor applies only when the header was ON-SCREEN (a deep
+        // content click has the header above the viewport — use the fallback)
+        if (preHeaderRow !== null && preHeaderRow >= 0 && preHeaderIdx >= 0) {
+          const h2 = firstNonEmpty((m) => m?.nodeIdx === info.nodeIdx && m?.blockIdx === info.blockIdx);
+          if (h2 >= 0) {
+            this.view.scrollY = Math.max(0, Math.min(h2 - preHeaderRow, this.view.maxScroll()));
+            return;
+          }
+        }
         if (topKey === null || topFirst < 0) return;
         let first = -1, last = -1;
         for (let i = 0; i < this.lineMap.length; i++) {
@@ -875,6 +900,14 @@ export class ChatView extends Widget {
         const target = Math.min(first + topOffset, last);
         this.view.scrollY = Math.max(0, Math.min(target, this.view.maxScroll()));
       };
+      // never park the viewport on a blank separator row — it reads as a
+      // spurious offset right after the click
+      const nudge = () => {
+        while (
+          this.view.scrollY < this.lineMap.length - 1 &&
+          !(this.lines[this.view.scrollY] ?? []).some((g) => g.t.trim() !== "")
+        ) this.view.scrollY++;
+      };
       if (node?.kind === "assistant" && info.blockIdx !== null) {
         const b = node.blocks[info.blockIdx];
         if (b && (b.kind === "tool" || b.kind === "reasoning" || b.kind === "other" || b.kind === "text")) {
@@ -889,7 +922,7 @@ export class ChatView extends Widget {
             else this.collapsedBlocks.add(key);
           }
           this.#rebuild();
-          reanchor();
+          reanchor(); nudge();
           return true;
         }
       }
@@ -897,7 +930,7 @@ export class ChatView extends Widget {
         if (this.expanded.has(info.nodeIdx)) this.expanded.delete(info.nodeIdx);
         else this.expanded.add(info.nodeIdx);
         this.#rebuild();
-        reanchor();
+        reanchor(); nudge();
         return true;
       }
     }
@@ -1016,12 +1049,16 @@ export class ChatView extends Widget {
               const open = manuallyExpanded || (!manuallyCollapsed && this.thinkMode === "expanded");
               beginCard("THINKBG");
               // Live blocks tick (已经过…); finished blocks freeze at their
-              // total (已完成,耗时…). No timestamps → no bogus timer shown.
+              // total (已完成,耗时…). Snapshot-derived blocks may lack a
+              // per-block start (the history projection has no block-start):
+              // show a plain 已完成 then — never a bogus ticking timer.
               let timing = "";
               if (b.streaming) {
                 timing = ` 已经过 ${fmtDuration(Date.now() - (b.startedAt ?? Date.now()))}`;
               } else if (b.startedAt !== undefined && b.endedAt !== undefined) {
                 timing = ` 已完成,耗时 ${fmtDuration(b.endedAt - b.startedAt)}`;
+              } else if (b.endedAt !== undefined) {
+                timing = " 已完成";
               }
               const thinkMeta = `${stepTag}（${b.text?.length ?? 0} 字）${timing}`;
               lines.push([{ t: "💭 思考" + (b.streaming ? "…" : "") + thinkMeta + (open ? " [t 折叠]" : " [t 展开]"), fg: K.FAINT }]);
@@ -1041,16 +1078,23 @@ export class ChatView extends Widget {
               const key = `${realIdx}:${bi}`;
               const open = this.bashMode !== "collapsed" && !this.collapsedBlocks.has(key);
               const exitCode = b.view?.view?.exitCode;
-              const status = b.result == null && !b.done ? "TOOLBG" : exitCode !== undefined && exitCode !== 0 ? "TOOLERR" : "TOOLOK";
-              const glyph = b.result == null && !b.done ? "⏳" : exitCode !== undefined && exitCode !== 0 ? "✗" : "✓";
+              // A tool only TICKS while its turn is live. A finalized turn
+              // whose result never matched (orphan) must freeze at 无结果 —
+              // otherwise the timer runs forever ("timing chaos").
+              const running = b.result == null && !b.done && node.streaming;
+              const orphan = b.result == null && !b.done && !node.streaming;
+              const status = orphan ? "TOOLERR" : running ? "TOOLBG" : exitCode !== undefined && exitCode !== 0 ? "TOOLERR" : "TOOLOK";
+              const glyph = orphan ? "✗" : running ? "⏳" : exitCode !== undefined && exitCode !== 0 ? "✗" : "✓";
               const card = b.view ? renderToolCard(b.view, w, open) : [];
               beginCard(status);
               let timing = "";
-              if (b.result == null && !b.done) {
+              if (running) {
                 timing = ` 已经过 ${fmtDuration(Date.now() - (b.startedAt ?? Date.now()))}`;
               } else if (b.startedAt !== undefined && b.endedAt !== undefined) {
                 const failed = exitCode !== undefined && exitCode !== 0;
                 timing = ` ${failed ? "失败" : "已完成"},耗时 ${fmtDuration(b.endedAt - b.startedAt)}`;
+              } else if (orphan) {
+                timing = " 无结果";
               }
               lines.push([
                 { t: open ? "▾ " : "▸ ", fg: K.ACCENT },