dsh-neotui 0.0.13 → 0.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-neotui",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "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

@@ -849,22 +849,37 @@ export class ChatView extends Widget {
       }
       const node = this.nodes[info.nodeIdx];
       // Expand/collapse changes the line count ABOVE the viewport, which would
-      // leave scrollY pointing at unrelated content (the "chaotic" jump).
-      // Anchor: after the rebuild, scroll so the clicked block's first line
-      // sits at the top of the viewport. This applies ALWAYS — even at the
-      // bottom: the tail-follow snap would otherwise fling the clicked header
-      // out of view when a folded block re-expands.
-      const reanchor = (match) => {
-        let fallback = -1;
+      // 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 (!match(this.lineMap[i])) continue;
-          if ((this.lines[i] ?? []).some((g) => g.t.trim() !== "")) {
-            this.view.scrollY = Math.max(0, Math.min(i, this.view.maxScroll()));
-            return;
-          }
-          if (fallback < 0) fallback = i;
+          if (lineKey(this.lineMap[i]) === topKey) { topFirst = i; break; }
+        }
+      }
+      const topOffset = topFirst >= 0 ? this.view.scrollY - topFirst : 0;
+      const reanchor = () => {
+        if (topKey === null || topFirst < 0) return;
+        let first = -1, last = -1;
+        for (let i = 0; i < this.lineMap.length; i++) {
+          if (lineKey(this.lineMap[i]) !== topKey) continue;
+          if (first < 0) first = i;
+          last = i;
         }
-        if (fallback >= 0) this.view.scrollY = Math.max(0, Math.min(fallback, this.view.maxScroll()));
+        if (first < 0) return;
+        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
+        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];
@@ -880,7 +895,7 @@ export class ChatView extends Widget {
             else this.collapsedBlocks.add(key);
           }
           this.#rebuild();
-          reanchor((m) => m?.nodeIdx === info.nodeIdx && m?.blockIdx === info.blockIdx);
+          reanchor();
           return true;
         }
       }
@@ -888,7 +903,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((m) => m?.nodeIdx === info.nodeIdx);
+        reanchor();
         return true;
       }
     }
@@ -1007,12 +1022,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 }]);
@@ -1032,16 +1051,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 },