dsh-neotui 0.0.22 → 0.0.24

package/package.json

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

@@ -565,6 +565,8 @@ export class ChatView extends Widget {
     this.expanded = new Set();   // node indexes (user-message full text)
     this.expandedTools = new Set();
     this.collapsedBlocks = new Set(); // per-block COLLAPSE (default expanded): `${realIdx}:${bi}`
+    this.blockHeights = new Map();    // collapsed block → its rendered height when collapsed
+                                       // (fixed-height fold: the space below stays put)
     this.thinkMode = "expanded";        // think blocks: expanded by default (t toggles)
     this.bashMode = "expanded";         // tool blocks: expanded | collapsed (b toggles)
     this.todosVisible = true;           // todo block above the input (Shift+T toggles)
@@ -863,7 +865,7 @@ export class ChatView extends Widget {
    *  shift the hit identity between press and release (the 4-line mystery:
    *  the rendered frame and the hit test were consistent, but the identity
    *  was re-resolved at release against a stream that had moved). */
-  #anchorCtx(info) {
+  #anchorCtx(info, pressY = null) {
     const lineKey = (m) => (m ? `${m.nodeIdx}:${m.blockIdx ?? "n"}` : null);
     const topKey = lineKey(this.lineMap[this.view.scrollY]) ?? null;
     let topFirst = -1;
@@ -884,7 +886,8 @@ export class ChatView extends Widget {
     };
     const preHeaderIdx = info ? firstNonEmpty(match) : -1;
     const preHeaderRow = preHeaderIdx >= 0 ? preHeaderIdx - this.view.scrollY : null;
-    return { lineKey, topKey, topFirst, topOffset, match, firstNonEmpty, preHeaderIdx, preHeaderRow };
+    const pressRow = pressY !== null && pressY !== undefined && pressY >= 0 ? pressY - this.view.scrollY : null;
+    return { lineKey, topKey, topFirst, topOffset, match, firstNonEmpty, preHeaderIdx, preHeaderRow, pressY, pressRow };
   }
 
   /** Toggle the block/node under a line-mark, then re-anchor the viewport.
@@ -899,16 +902,17 @@ export class ChatView extends Widget {
     }
     const node = this.nodes[info.nodeIdx];
     if (!node) return false;
-    const { lineKey, topKey, topFirst, topOffset, match, firstNonEmpty, preHeaderIdx, preHeaderRow } = ctx ?? this.#anchorCtx(info);
+    const { lineKey, topKey, topFirst, topOffset, match, firstNonEmpty, preHeaderIdx, preHeaderRow, pressY, pressRow } = ctx ?? this.#anchorCtx(info);
+    let collapsing = false;
     if (process.env.DSH_TUI_DEBUG_CLICK) {
       this.#clickLog(`toggle mark=${JSON.stringify(info)} kind=${node.kind} blockIdx=${info.blockIdx} preHeaderRow=${preHeaderRow} topKey=${topKey} topOffset=${topOffset}`);
     }
     const reanchor = () => {
+      // Fixed-height folds keep the buffer size UNCHANGED (the collapsed
+      // block pads its recorded height with ghost rows), so nothing below
+      // the fold can move — the anchor is only a safety net now.
       // primary anchor: the clicked block's header stays at its pre-click
       // viewport row (zero shift) — only when the header was ON-SCREEN.
-      // When the fold removed the tail content below, the anchored position
-      // may exceed maxScroll: hold it via the view's anchorLock instead of
-      // clamping (the clamp is exactly the slide the user sees).
       if (preHeaderRow !== null && preHeaderRow >= 0 && preHeaderIdx >= 0) {
         const h2 = firstNonEmpty(match);
         if (h2 >= 0) {
@@ -932,26 +936,38 @@ export class ChatView extends Widget {
       if (target > this.view.maxScroll()) this.view.anchorLock = target;
     };
     // never park the viewport on a blank separator row — it reads as a
-    // spurious offset right after the click
+    // spurious offset right after the click. Ghost rows of a fixed-height
+    // fold are INTENTIONAL blanks (marked with a blockIdx) — leave them.
     const nudge = () => {
       while (
         this.view.scrollY < this.lineMap.length - 1 &&
-        !(this.lines[this.view.scrollY] ?? []).some((g) => g.t.trim() !== "")
+        !(this.lines[this.view.scrollY] ?? []).some((g) => g.t.trim() !== "") &&
+        (this.lineMap[this.view.scrollY]?.blockIdx ?? null) === null
       ) 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")) {
         const key = `${info.nodeIdx}:${info.blockIdx}`;
+        // fixed-height fold: remember how tall the block is right now so the
+        // collapsed form can pad the SAME height (nothing below moves)
+        let firstM = -1, lastM = -1;
+        for (let i = 0; i < this.lineMap.length; i++) {
+          if (match(this.lineMap[i])) { if (firstM < 0) firstM = i; lastM = i; }
+        }
         if (b.kind === "reasoning") {
           // clean two-state override: expand ⇄ collapse (never a no-op click)
           const open = this.expanded.has(key) || (!this.collapsedBlocks.has(key) && this.thinkMode === "expanded");
+          collapsing = open;
           if (open) { this.expanded.delete(key); this.collapsedBlocks.add(key); }
           else { this.collapsedBlocks.delete(key); this.expanded.add(key); }
         } else {
+          collapsing = !this.collapsedBlocks.has(key);
           if (this.collapsedBlocks.has(key)) this.collapsedBlocks.delete(key);
           else this.collapsedBlocks.add(key);
         }
+        if (collapsing && firstM >= 0) this.blockHeights.set(key, lastM - firstM + 1);
+        else if (!collapsing) this.blockHeights.delete(key);
         this.#rebuild();
         reanchor(); nudge();
         if (process.env.DSH_TUI_DEBUG_CLICK) {
@@ -1095,6 +1111,7 @@ export class ChatView extends Widget {
                 timing = " 已完成";
               }
               const thinkMeta = `${stepTag}（${b.text?.length ?? 0} 字）${timing}`;
+              const blkLines0 = lines.length;
               lines.push([{ t: "💭 思考" + (b.streaming ? "…" : "") + thinkMeta + (open ? " [t 折叠]" : " [t 展开]"), fg: K.FAINT }]);
               mark(realIdx, bi);
               if (open) {
@@ -1107,6 +1124,13 @@ export class ChatView extends Widget {
                   mark(realIdx, bi);
                 }
               }
+              // fixed-height fold: pad the recorded height with ghost rows so
+              // nothing below the block moves
+              if (!open) {
+                const h = this.blockHeights.get(key) ?? 0;
+                const filler = Math.max(0, h - (lines.length - blkLines0));
+                for (let fi = 0; fi < filler; fi++) { lines.push([{ t: "" }]); mark(realIdx, bi); }
+              }
               sep();
             } else if (b.kind === "tool") {
               const key = `${realIdx}:${bi}`;
@@ -1121,6 +1145,7 @@ export class ChatView extends Widget {
               const glyph = orphan ? "✗" : running ? "⏳" : exitCode !== undefined && exitCode !== 0 ? "✗" : "✓";
               const card = b.view ? renderToolCard(b.view, w, open) : [];
               beginCard(status);
+              const blkLines0 = lines.length;
               let timing = "";
               if (running) {
                 timing = ` 已经过 ${fmtDuration(Date.now() - (b.startedAt ?? Date.now()))}`;
@@ -1144,6 +1169,11 @@ export class ChatView extends Widget {
                   lines.push([{ t: "  " + truncate(summary, w - 6), fg: K.FAINT }]);
                   mark(realIdx, bi);
                 }
+                // fixed-height fold: pad the recorded height with ghost rows so
+                // nothing below the block moves
+                const h = this.blockHeights.get(key) ?? 0;
+                const filler = Math.max(0, h - (lines.length - blkLines0));
+                for (let fi = 0; fi < filler; fi++) { lines.push([{ t: "" }]); mark(realIdx, bi); }
               }
               if (open) {
                 for (const ln of card) { lines.push(ln); mark(realIdx, bi); }
@@ -1166,6 +1196,7 @@ export class ChatView extends Widget {
               sep();
             } else {
               beginCard("CARD");
+              const blkLines0 = lines.length;
               // Text blocks collapse per-block like tool/reasoning blocks:
               // collapsed shows a 3-line preview + trailer, expanded the whole
               // text. Clicking (or the right-click 展开/折叠) toggles it.
@@ -1189,6 +1220,13 @@ export class ChatView extends Widget {
                 lines.push([{ t: `  …共 ${text.length} 字（点击展开）`, fg: K.FAINT }]);
                 mark(realIdx, bi);
               }
+              // fixed-height fold: pad the recorded height with ghost rows so
+              // nothing below the block moves
+              if (!open) {
+                const h = this.blockHeights.get(key) ?? 0;
+                const filler = Math.max(0, h - (lines.length - blkLines0));
+                for (let fi = 0; fi < filler; fi++) { lines.push([{ t: "" }]); mark(realIdx, bi); }
+              }
               sep();
             }
           }
@@ -1347,7 +1385,7 @@ export class ChatView extends Widget {
         // between press and release, so resolving the block at release would
         // toggle a block a few lines away from the one the user saw.
         this.pressInfo = this.lineMap?.[this.pressY] ?? null;
-        this.pressCtx = this.pressInfo ? this.#anchorCtx(this.pressInfo) : null;
+        this.pressCtx = this.pressInfo ? this.#anchorCtx(this.pressInfo, this.pressY) : null;
         if (process.env.DSH_TUI_DEBUG_CLICK) {
           const t = this.lines[this.pressY]?.map((g) => g.t).join("") ?? "";
           this.#clickLog(`press screenY=${ev.y} screenX=${ev.x} lineIdx=${this.pressY} mark=${JSON.stringify(this.pressInfo)} text="${t.slice(0, 40)}" scrollY=${this.view.scrollY} viewY=${this.view.y} viewH=${this.view.h}`);
@@ -2250,6 +2288,7 @@ export class App {
     this.chat.cache.clear();
     this.chat.nodes = [];
     this.chat.collapsedBlocks.clear();
+    this.chat.blockHeights.clear();
     this.chat.expanded.clear();
     this.chat.expandedTools.clear();
     this.chat.queueRebuild();