dsh-neotui 0.0.17 → 0.0.19

package/package.json

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

@@ -696,7 +696,7 @@ export class ChatView extends Widget {
     if (idx < 0 || idx >= this.nodes.length) return false;
     for (let li = 0; li < this.lineMap.length; li++) {
       if (this.lineMap[li]?.nodeIdx === idx) {
-        this.view.scrollY = Math.max(0, li - 2);
+        this.view.anchorLock = null; this.view.scrollY = Math.max(0, li - 2);
         this.app.redraw();
         return true;
       }
@@ -770,7 +770,7 @@ export class ChatView extends Widget {
     this.#rebuild();
     // Jump to the LIVE tail (the newest content) on open — the view would
     // otherwise sit at the top showing the oldest turns.
-    this.view.scrollY = this.view.maxScroll();
+    this.view.anchorLock = null; this.view.scrollY = this.view.maxScroll();
   }
 
   async loadOlder() {
@@ -817,7 +817,8 @@ export class ChatView extends Widget {
   send(text) {
     if (!this.sessionId) return;
     const trimmed = text.trim();
-    if (trimmed === "/reload") { this.app.reloadApp(); return; }
+    if (trimmed === "/reload") { this.app.softReload(); return; }
+    if (trimmed === "/restart") { this.app.restartApp(); return; }
     if (!trimmed) return;
     const { parts, images, errors } = buildPromptParts(trimmed, {
       readFile: (p) => {
@@ -880,11 +881,16 @@ export class ChatView extends Widget {
     const preHeaderRow = preHeaderIdx >= 0 ? preHeaderIdx - this.view.scrollY : null;
     const reanchor = () => {
       // primary anchor: the clicked block's header stays at its pre-click
-      // viewport row (zero shift) — only when the header was ON-SCREEN
+      // 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 5–6 line slide the user sees).
       if (preHeaderRow !== null && preHeaderRow >= 0 && preHeaderIdx >= 0) {
         const h2 = firstNonEmpty(match);
         if (h2 >= 0) {
-          this.view.scrollY = Math.max(0, Math.min(h2 - preHeaderRow, this.view.maxScroll()));
+          const sy = h2 - preHeaderRow;
+          this.view.scrollY = Math.max(0, sy);
+          if (sy > this.view.maxScroll()) this.view.anchorLock = sy;
           return;
         }
       }
@@ -898,7 +904,8 @@ export class ChatView extends Widget {
       }
       if (first < 0) return;
       const target = Math.min(first + topOffset, last);
-      this.view.scrollY = Math.max(0, Math.min(target, this.view.maxScroll()));
+      this.view.scrollY = Math.max(0, target);
+      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
@@ -1380,12 +1387,12 @@ export class ChatView extends Widget {
       case "pgdn": return this.view.scroll(this.view.h);
     }
     if (ev.name === "char" && ev.key === "g" && !ev.ctrl && !ev.shift) {
-      if (this.gKey) { this.gKey = false; this.view.scrollY = 0; return true; }
+      if (this.gKey) { this.gKey = false; this.view.anchorLock = null; this.view.scrollY = 0; return true; }
       this.gKey = true;
       this.app.toast("再按 g 回顶");
       return true;
     }
-    if (ev.name === "char" && ev.key === "g" && ev.shift) { this.view.scrollY = this.view.maxScroll(); return true; }
+    if (ev.name === "char" && ev.key === "g" && ev.shift) { this.view.anchorLock = null; this.view.scrollY = this.view.maxScroll(); return true; }
     if (ev.name === "escape" && this.app.searchQuery) { this.app.searchQuery = null; this.queueRebuild(); return true; }
     if (ev.name === "escape" && this.selStart !== null) { this.selStart = this.selEnd = null; this.app.redraw(); return true; }
     if (ev.name === "char" && ev.key === "i" && !ev.ctrl) { this.app.focus(this.input); return true; }
@@ -2188,17 +2195,49 @@ export class App {
   showModePicker() { this.overlay = buildModePicker(this); this.redraw(); }
   showPermissionPicker() { this.overlay = buildPermissionPicker(this); this.redraw(); }
 
-  /** /reload: restart the TUI process in the same terminal so a freshly
-   *  published build (the profile symlinks the repo) takes effect without
-   *  quitting and re-running `dsh` by hand. */
-  async reloadApp() {
-    this.toast("正在重启 TUI…");
+  /** /reload: in-place soft reload — fresh session list, fresh chat history,
+   *  panels rebuilt, screen re-rendered. No process churn, no terminal
+   *  handoff (the old process-restart approach leaked mouse bytes into the
+   *  boot of the new instance). */
+  async softReload() {
+    this.closeOverlay();
+    this.menu = null;
+    this.popup = null;
+    for (const p of [this.workspacePanel, this.trajectoryPanel, this.settingsPanel, this.subagentPanel, this.skillsPanel]) {
+      if (p?.dispose) { try { p.dispose(); } catch {} }
+    }
+    this.workspacePanel = this.trajectoryPanel = this.settingsPanel = this.subagentPanel = this.skillsPanel = null;
+    this.chat.cache.clear();
+    this.chat.nodes = [];
+    this.chat.collapsedBlocks.clear();
+    this.chat.expanded.clear();
+    this.chat.expandedTools.clear();
+    this.chat.queueRebuild();
+    this.chat.view.anchorLock = null;
+    this.mode = "chat";
+    this.focus(this.chat);
+    this.toast("正在重新加载…");
+    await this.refreshSessions();
+    if (this.currentSession) await this.openSession(this.currentSession);
+    else await this.newSessionIn(null);
+    this.layout();
+    this.redraw();
+    this.toast("已重新加载会话与界面");
+  }
+
+  /** /restart: restart the TUI process in the same terminal so a freshly
+   *  published build (the profile symlinks the repo) takes effect. The new
+   *  instance starts one second after this process restores the terminal —
+   *  no stray mouse/keyboard bytes leak into its boot. */
+  async restartApp() {
+    this.toast("正在重启 TUI（加载新版本代码）…");
     this.redraw();
     await new Promise((r) => setTimeout(r, 250));
     try { this.term?.stop?.(); } catch {}
     try {
       const { spawn } = await import("node:child_process");
-      const child = spawn(process.argv[0], process.argv.slice(1), { detached: true, stdio: "inherit" });
+      const argv = process.argv.slice(1);
+      const child = spawn("sh", ["-c", 'sleep 1; exec "$@"', "sh", ...argv], { detached: true, stdio: "inherit" });
       child.unref();
     } catch (e) {
       this.toast(`重启失败: ${e.message}（请手动重启）`);

package/src/widgets.js

@@ -27,6 +27,7 @@ export class ScrollView extends Widget {
     super(opts);
     this.lines = [];       // array of arrays of segs: {t, fg, bg, bold, italic, underline, strike, code, link}
     this.scrollY = 0;
+    this.anchorLock = null; // click anchor held beyond maxScroll (fold at the tail)
     this.autoScroll = opts.autoScroll ?? false;
     this.onClick = opts.onClick ?? null;    // (y, ev) => bool
     this.onWheel = null;                    // optional custom wheel handler
@@ -36,7 +37,12 @@ export class ScrollView extends Widget {
   setLines(lines, { keep = false } = {}) {
     const atBottom = this.autoScroll && this.scrollY + this.h >= this.lines.length - 1 || (keep && this.scrollY + this.h >= this.lines.length);
     this.lines = lines;
-    if (atBottom || this.scrollY > Math.max(0, this.lines.length - this.h)) {
+    if (this.anchorLock != null) {
+      // A click fold removed the tail content: hold the exact anchored
+      // position even though the buffer now ends above it (no delayed snap).
+      this.scrollY = this.anchorLock;
+      if (this.scrollY <= Math.max(0, this.lines.length - this.h)) this.anchorLock = null;
+    } else if (atBottom || this.scrollY > Math.max(0, this.lines.length - this.h)) {
       this.scrollY = Math.max(0, this.lines.length - this.h);
     }
   }
@@ -44,6 +50,7 @@ export class ScrollView extends Widget {
   maxScroll() { return Math.max(0, this.lines.length - this.h); }
   scroll(dy) {
     const before = this.scrollY;
+    this.anchorLock = null; // explicit scroll releases the click anchor
     this.scrollY = Math.max(0, Math.min(this.maxScroll(), this.scrollY + dy));
     return this.scrollY !== before;
   }
@@ -78,7 +85,8 @@ export class ScrollView extends Widget {
       const trackH = Math.max(1, this.h - 2);
       const total = Math.max(1, this.lines.length);
       const thumbH = Math.max(1, Math.floor(this.h * this.h / total));
-      const thumbY = Math.floor((this.h - 2) * this.scrollY / Math.max(1, this.maxScroll()));
+      const frac = Math.min(1, this.scrollY / Math.max(1, this.maxScroll()));
+      const thumbY = Math.floor((this.h - 2) * frac);
       for (let i = 0; i < this.h; i++) {
         const inThumb = i >= 1 + thumbY && i < 1 + thumbY + thumbH;
         const inTrack = i >= 1 && i < this.h - 1;
@@ -114,6 +122,7 @@ export class ScrollView extends Widget {
     return false;
   }
   #scrubTo(ey) {
+    this.anchorLock = null; // scrubbing releases the click anchor
     const trackH = Math.max(1, this.h - 2);
     const total = Math.max(1, this.lines.length);
     const thumbH = Math.max(1, Math.floor(this.h * this.h / total));